fix mod loading

Author: wdog5

fabric-loader/minecraft/src/main/java/net/fabricmc/loader/impl/game/minecraft/MinecraftGameProvider.java

@@ -91,8 +91,8 @@ public class MinecraftGameProvider implements GameProvider {
 	private boolean hasModLoader = false;
 
 	private final GameTransformer transformer = new GameTransformer(
-			/*new EntrypointPatch(this),
-			new BrandingPatch(),*/
+			new EntrypointPatch(this),
+			/*new BrandingPatch(),*/
 			new EntrypointPatchFML125(),
 			new TinyFDPatch());
 
@@ -527,7 +527,7 @@ public void unlockClassPath(FabricLauncher launcher) {
 
 	@Override
 	public void launch(ClassLoader loader) {
-		String targetClass = "org.bukkit.craftbukkit.Main";
+		String targetClass = System.getProperty("banner.entrypoint"); // Banner - we need org.bukkit.craftbukkit.Main there, but we still need to patch the original server main method in EntrypointPatch.
 
 		if (envType == EnvType.CLIENT && targetClass.contains("Applet")) {
 			targetClass = "net.fabricmc.loader.impl.game.minecraft.applet.AppletMain";

fabric-loader/minecraft/src/main/java/net/fabricmc/loader/impl/game/minecraft/patch/EntrypointPatch.java

@@ -107,7 +107,7 @@ public void process(FabricLauncher launcher, Function<String, ClassNode> classSo
 
 		if (gameEntrypoint == null) {
 			// main method searches
-			MethodNode mainMethod = findMethod(mainClass, (method) -> method.name.equals("main") && method.desc.equals("([Ljava/lang/String;)V") && isPublicStatic(method.access));
+			MethodNode mainMethod = findMethod(mainClass, (method) -> method.name.equals("main") && method.desc.equals("(Ljoptsimple/OptionSet;)V") && isPublicStatic(method.access));
 
 			if (mainMethod == null) {
 				throw new RuntimeException("Could not find main method in " + entrypoint + "!");
@@ -310,7 +310,7 @@ public void process(FabricLauncher launcher, Function<String, ClassNode> classSo
 				}
 			}
 		} else {
-			gameMethod = findMethod(mainClass, (method) -> method.name.equals("main") && method.desc.equals("([Ljava/lang/String;)V") && isPublicStatic(method.access));
+			gameMethod = findMethod(mainClass, (method) -> method.name.equals("main") && method.desc.equals("(Ljoptsimple/OptionSet;)V") && isPublicStatic(method.access));
 		}
 
 		if (gameMethod == null) {
@@ -362,7 +362,7 @@ public void process(FabricLauncher launcher, Function<String, ClassNode> classSo
 				// If we do not find this, then we are certain this is 20w22a.
 				MethodNode serverStartMethod = findMethod(mainClass, method -> {
 					if ((method.access & Opcodes.ACC_SYNTHETIC) == 0 // reject non-synthetic
-							|| method.name.equals("main") && method.desc.equals("([Ljava/lang/String;)V") // reject main method (theoretically superfluous now)
+							|| method.name.equals("main") && method.desc.equals("(Ljoptsimple/OptionSet;)V") // reject main method (theoretically superfluous now)
 							|| VERSION_25w14craftmine.test(gameVersion) && method.parameters.size() < 10) { // reject problematic extra methods
 						return false;
 					}

paperclip/java17/src/main/java/io/papermc/paperclip/Paperclip.java

@@ -26,9 +26,11 @@ public static void main(final String[] args) {
         FabricInstaller.LaunchData launchData = FabricInstaller.initialize(); // Banner
         final URL[] classpathUrls = setupClasspath();
         FabricInstaller.setLibraryURLs(classpathUrls); // Banner
+        FabricInstaller.setupRemappingClasspath(classpathUrls, launchData); // Banner
         final URLClassLoader classLoader = FabricInstaller.createFabricLoaderClassLoader(launchData); // Banner
+        final String mainClassName = findMainClass();
+        System.setProperty("banner.entrypoint", mainClassName); // Banner - Used in fabric loader in MinecraftGameProvider#launch
         System.out.println("Starting " + "net.fabricmc.loader.impl.game.minecraft.BundlerClassPathCapture");// Banner - implement fabric loader
-
         final Thread runThread = new Thread(() -> {
             try {
                 // Banner start
@@ -136,6 +138,19 @@ private static FileEntry[] findFileEntries(final String fileName) {
         }
     }
 
+    private static String findMainClass() {
+        final String mainClassName = System.getProperty("bundlerMainClass");
+        if (mainClassName != null) {
+            return mainClassName;
+        }
+
+        try {
+            return Util.readResourceText("/META-INF/main-class");
+        } catch (final IOException e) {
+            throw Util.fail("Failed to read main-class file", e);
+        }
+    }
+
     private static Map<String, Map<String, URL>> extractAndApplyPatches(final Path originalJar, final PatchEntry[] patches, final Path repoDir) {
         if (originalJar == null && patches.length > 0) {
             throw new IllegalArgumentException("Patch data found without patch target");