Fixed default entrypoints not being called.

Turnip-Labs · Dec 9, 2024 · 3cbac14 · 3cbac14
1 parent a7e306d
commit 3cbac14
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/minecraft/src/main/java/net/fabricmc/loader/impl/game/minecraft/patch/EntrypointPatch.java b/minecraft/src/main/java/net/fabricmc/loader/impl/game/minecraft/patch/EntrypointPatch.java
@@ -16,10 +16,14 @@
 
 package net.fabricmc.loader.impl.game.minecraft.patch;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.ListIterator;
+import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.stream.Collectors;
 
 import net.fabricmc.loader.impl.game.minecraft.applet.AppletLauncher;
 
@@ -460,12 +464,13 @@ public void process(FabricLauncher launcher, Function<String, ClassNode> classSo
 				moveAfter(it, Opcodes.INVOKESPECIAL); /* Object.init */
 				it.add(new FieldInsnNode(Opcodes.GETSTATIC, gameClass.name, runDirectory.name, runDirectory.desc));
 				it.add(new MethodInsnNode(Opcodes.INVOKESTATIC, "net/fabricmc/loader/impl/game/minecraft/applet/AppletMain", "hookGameDir", "(Ljava/io/File;)Ljava/io/File;", false));
-				it.add(new FieldInsnNode(Opcodes.PUTSTATIC, gameClass.name, runDirectory.name, runDirectory.desc));
+				FieldInsnNode node = new FieldInsnNode(Opcodes.PUTSTATIC, gameClass.name, runDirectory.name, runDirectory.desc);
+				it.add(node);
 
 				it = gameMethod.instructions.iterator();
 
 				if (gameConstructor == gameMethod) {
-					moveBefore(it, Opcodes.RETURN);
+					moveBefore(it,Opcodes.IFEQ);
 				}
 
 				it.add(new FieldInsnNode(Opcodes.GETSTATIC, gameClass.name, runDirectory.name, runDirectory.desc));
@@ -532,7 +537,7 @@ public void process(FabricLauncher launcher, Function<String, ClassNode> classSo
 			classEmitter.accept(mainClass);
 		}
 
-		if (isApplet) {
+		if (isApplet || isDirect) {
 			Hooks.appletMainClass = entrypoint;
 		}
 	}