Merge pull request #3228 from open-osrs/revert-3226-revert-3224-delete-client

client: snake is back on the menu boys

build.gradle.kts

@@ -165,7 +165,7 @@ subprojects {
             exclude("**/RoomType.java")
         }
 
-        /*withType<Jar> {
+        withType<Jar> {
             doLast {
                 // sign jar
                 if (System.getProperty("signKeyStore") != null) {
@@ -187,7 +187,7 @@ subprojects {
                     }
                 }
             }
-        }*/
+        }
     }
 
     configurations.compileOnly.get().extendsFrom(configurations["annotationProcessor"])

buildSrc/src/main/kotlin/BootstrapTask.kt

@@ -155,8 +155,6 @@ open class BootstrapTask @Inject constructor(@Input val type: String) : DefaultT
                     it.file.name.contains("runelite-api") ||
                     it.file.name.contains("runelite-jshell")) {
                 path = "https://github.com/open-osrs/hosting/raw/master/${type}/${it.file.name}"
-            } else if (it.file.name.contains("injection-annotations")) {
-                path = "https://github.com/open-osrs/hosting/raw/master/" + group.replace(".", "/") + "/${name}/$version/${it.file.name}"
             } else if (!group.contains("runelite")) {
                 path = "https://repo.maven.apache.org/maven2/" + group.replace(".", "/") + "/${name}/$version/${name}-$version"
                 if (it.classifier != null && it.classifier != "no_aop") {

runelite-client/runelite-client.gradle.kts

@@ -92,7 +92,6 @@ dependencies {
     implementation(group = "net.runelite.jocl", name = "jocl", version = "1.0")
 
     runtimeOnly(project(":runescape-api"))
-    runtimeOnly(project(":injected-client"))
     runtimeOnly(group = "net.runelite.pushingpixels", name = "trident", version = "1.5.00")
     runtimeOnly(group = "net.runelite.gluegen", name = "gluegen-rt", version = "2.4.0-rc-20220318", classifier = "natives-linux-amd64")
     runtimeOnly(group = "net.runelite.gluegen", name = "gluegen-rt", version = "2.4.0-rc-20220318", classifier = "natives-windows-amd64")

runelite-client/src/main/java/com/thatgamerblue/snake/GameHandler.java

@@ -75,9 +75,6 @@ public class GameHandler implements KeyListener {
 			ateApple = true;
 			score++;
 			SnakeGame.currentRefreshInterval = Math.max(50, DEFAULT_REFRESH_INTERVAL - score);
-			if (score == 15) {
-				game.stop();
-			}
 		}
 
 		if (!ateApple) {

runelite-client/src/main/java/net/runelite/client/RuneLite.java

@@ -180,22 +180,9 @@ public class RuneLite
 
 	private static final String BYPASS_ARG = "--IWillNotComplainIfIGetSentToTheGulagByJamflex";
 
-	public static void main(String[] args) throws Exception
-	{
-		if (!ArrayUtils.contains(args, BYPASS_ARG))
-		{
-			JOptionPane.showMessageDialog(null,
-				String.format("If you want to actually use the client despite the risks add\n%s\nto your launch arguments.\n\nOr score 15 and the client opens anyway.\nI'm not your dad.",
-					"unknown".equals(RuneLiteProperties.getLauncherVersion()) ? BYPASS_ARG : ("--clientargs=\"" + BYPASS_ARG + "\"")),
-				"OpenOSRS",
-				JOptionPane.INFORMATION_MESSAGE);
+	public static void main(String[] args) throws Exception {
 		SnakeGame.main(args);
 	}
-		else
-		{
-			oldMain(args);
-		}
-	}
 
 	public static void oldMain(String[] args) throws Exception
 	{

runelite-mixins/src/main/java/net/runelite/mixins/RSActorMixin.java

@@ -33,6 +33,7 @@ import net.runelite.api.Actor;
 import net.runelite.api.Hitsplat;
 import net.runelite.api.NPC;
 import net.runelite.api.NPCComposition;
+import net.runelite.api.NpcID;
 import net.runelite.api.Perspective;
 import net.runelite.api.Player;
 import net.runelite.api.Point;
@@ -68,7 +69,7 @@ public abstract class RSActorMixin implements RSActor
 	private static RSClient client;
 
 	@Inject
-	private final Set<Integer> combatInfoFilter = ImmutableSet.of(0, 2, 16, 17, 18, 19, 20, 21, 22);
+	private static final Set<Integer> combatInfoFilter = ImmutableSet.of(0, 2, 16, 17, 18, 19, 20, 21, 22);
 
 	@Inject
 	private boolean dead;
@@ -195,6 +196,16 @@ public abstract class RSActorMixin implements RSActor
 	@Inject
 	public void animationChanged(int idx)
 	{
+		if (this instanceof RSNPC)
+		{
+			int id = ((RSNPC) this).getId();
+
+			if (id == NpcID.CORPOREAL_BEAST && this.getAnimation() == 1676)
+			{
+				setDead(true);
+			}
+		}
+
 		AnimationChanged animationChange = new AnimationChanged();
 		animationChange.setActor(this);
 		client.getCallbacks().post(animationChange);
@@ -273,7 +284,7 @@ public abstract class RSActorMixin implements RSActor
 
 		if (healthRatio == 0)
 		{
-			if (!isDead())
+			if (isDead())
 			{
 				return;
 			}
@@ -290,7 +301,7 @@ public abstract class RSActorMixin implements RSActor
 		}
 		else if (healthRatio > 0)
 		{
-			if (this instanceof RSNPC && ((RSNPC) this).getId() == 319 && isDead())
+			if (this instanceof RSNPC && ((RSNPC) this).getId() == NpcID.CORPOREAL_BEAST && isDead())
 			{
 				return;
 			}