Fix main detection in 1.19.1-1.19.3

Lassebq · Lassebq · commit fedfe192f235 · 2026-02-26T23:35:53.000+02:00
diff --git a/src/main/java/org/mcphackers/launchwrapper/tweak/injection/vanilla/VanillaTweakContext.java b/src/main/java/org/mcphackers/launchwrapper/tweak/injection/vanilla/VanillaTweakContext.java
@@ -83,6 +83,13 @@ public boolean apply(ClassNodeSource source, LaunchConfig config) {
 				minecraft = source.getClass(invoke.owner);
 				run = NodeHelper.getMethod(minecraft, invoke.name, invoke.desc);
 				break;
+			} else if (insn.getOpcode() == INVOKESTATIC) { /* 1.19.1-1.19.3 wraps real main inside of obfuscated main */
+				MethodInsnNode invoke = (MethodInsnNode)insn;
+				if (invoke.owner.equals(minecraftMain.name)) {
+					main = NodeHelper.getMethod(minecraftMain, invoke.name, invoke.desc);
+					insn = main.instructions.getLast();
+					continue;
+				}
 			}
 			insn = previousInsn(insn);
 		}

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,13 @@ public boolean apply(ClassNodeSource source, LaunchConfig config) {`
`83`	`83`	`minecraft = source.getClass(invoke.owner);`
`84`	`84`	`run = NodeHelper.getMethod(minecraft, invoke.name, invoke.desc);`
`85`	`85`	`break;`
	`86`	`+ } else if (insn.getOpcode() == INVOKESTATIC) { /* 1.19.1-1.19.3 wraps real main inside of obfuscated main */`
	`87`	`+ MethodInsnNode invoke = (MethodInsnNode)insn;`
	`88`	`+ if (invoke.owner.equals(minecraftMain.name)) {`
	`89`	`+ main = NodeHelper.getMethod(minecraftMain, invoke.name, invoke.desc);`
	`90`	`+ insn = main.instructions.getLast();`
	`91`	`+ continue;`
	`92`	`+ }`
`86`	`93`	`}`
`87`	`94`	`insn = previousInsn(insn);`
`88`	`95`	`}`