Update dependencies + JSONs

Author: PhoenixVX

.gitignore

@@ -32,3 +32,5 @@ out
 # generated
 repo/
 bin/
+
+run/

build.gradle

@@ -7,18 +7,18 @@ plugins {
 def ENV = System.getenv()
 
 group = 'org.mcphackers'
-version = '1.2.1'
+version = '1.2.2'
 if(!ENV.RELEASE.equals('1')) {
 	project.version += '-SNAPSHOT'
 }
 
-def asm_version = '9.7.1'
+def asm_version = '9.9'
 def depends = [
 	"org.ow2.asm:asm:${asm_version}",
 	// "org.ow2.asm:asm-util:${asm_version}",
 	"org.ow2.asm:asm-tree:${asm_version}",
 	"org.ow2.asm:asm-commons:${asm_version}",
-	"org.json:json:20240303",
+	"org.json:json:20250517",
 ]
 
 dependencies {

doc/MultiMC.md

@@ -33,19 +33,19 @@ Edit "LaunchWrapper" component and modify `libraries` array:
 ```diff
      "libraries": [
          {
-             "name": "org.mcphackers:launchwrapper:1.1.3",
+             "name": "org.mcphackers:launchwrapper:1.2.2",
              "url": "https://maven.glass-launcher.net/releases/"
          },
 -        {
--            "name": "org.ow2.asm:asm:9.7.1",
+-            "name": "org.ow2.asm:asm:9.9",
 -            "url": "https://maven.fabricmc.net/"
 -        },
 -        {
--            "name": "org.ow2.asm:asm-tree:9.7.1",
+-            "name": "org.ow2.asm:asm-tree:9.9",
 -            "url": "https://maven.fabricmc.net/"
 -        },
          {
-             "name": "org.json:json:20240303",
+             "name": "org.json:json:20250517",
              "url": "https://repo1.maven.org/maven2/"
          }
      ],

doc/org.mcphackers.launchwrapper.fabric.json

@@ -2,10 +2,10 @@
     "formatVersion": 1,
     "name": "LaunchWrapper Fabric Compat",
     "uid": "org.mcphackers.launchwrapper.fabric",
-    "version": "1.1.2",
+    "version": "1.2.2",
     "libraries": [
         {
-            "name": "org.mcphackers:launchwrapper-fabric:1.1.2",
+            "name": "org.mcphackers:launchwrapper-fabric:1.2.2",
             "url": "https://maven.glass-launcher.net/releases/"
         }
     ],

doc/org.mcphackers.launchwrapper.json

@@ -4,19 +4,19 @@
     ],
     "libraries": [
         {
-            "name": "org.mcphackers:launchwrapper:1.1.3",
+            "name": "org.mcphackers:launchwrapper:1.2.2",
             "url": "https://maven.glass-launcher.net/releases/"
         },
         {
-            "name": "org.ow2.asm:asm:9.7.1",
+            "name": "org.ow2.asm:asm:9.9",
             "url": "https://maven.fabricmc.net/"
         },
         {
-            "name": "org.ow2.asm:asm-tree:9.7.1",
+            "name": "org.ow2.asm:asm-tree:9.9",
             "url": "https://maven.fabricmc.net/"
         },
         {
-            "name": "org.json:json:20240303",
+            "name": "org.json:json:20250517",
             "url": "https://repo1.maven.org/maven2/"
         }
     ],
@@ -30,5 +30,5 @@
     "formatVersion": 1,
     "name": "LaunchWrapper",
     "uid": "org.mcphackers.launchwrapper",
-    "version": "1.1.2"
+    "version": "1.2.2"
 }

doc/org.mcphackers.launchwrapper.micromixin.json

@@ -2,10 +2,10 @@
     "formatVersion": 1,
     "name": "LaunchWrapper Micromixin",
     "uid": "org.mcphackers.launchwrapper.micromixin",
-    "version": "1.1.2",
+    "version": "1.2.2",
     "libraries": [
         {
-            "name": "org.mcphackers:launchwrapper-micromixin:1.1.2",
+            "name": "org.mcphackers:launchwrapper-micromixin:1.2.2",
             "url": "https://maven.glass-launcher.net/releases/"
         },
         {
@@ -29,27 +29,27 @@
             "url": "https://stianloader.org/maven/"
         },
         {
-            "name": "net.fabricmc:mapping-io:0.3.0",
+            "name": "net.fabricmc:mapping-io:0.7.1",
             "url": "https://maven.fabricmc.net/"
         },
         {
             "name": "net.fabricmc:access-widener:2.1.0",
             "url": "https://maven.fabricmc.net/"
         },
         {
-            "name": "org.json:json:20230311",
+            "name": "org.json:json:20250517",
             "url": "https://repo1.maven.org/maven2/"
         },
         {
-            "name": "org.ow2.asm:asm:9.7.1",
+            "name": "org.ow2.asm:asm:9.9",
             "url": "https://maven.fabricmc.net/"
         },
         {
-            "name": "org.ow2.asm:asm-tree:9.7.1",
+            "name": "org.ow2.asm:asm-tree:9.9",
             "url": "https://maven.fabricmc.net/"
         },
         {
-            "name": "org.ow2.asm:asm-util:9.7.1",
+            "name": "org.ow2.asm:asm-util:9.9",
             "url": "https://maven.fabricmc.net/"
         }
     ],

launchwrapper-fabric/build.gradle

@@ -12,7 +12,7 @@ compileJava {
 }
 
 dependencies {
-	implementation "net.fabricmc:fabric-loader:0.16.10"
-	runtimeOnly "net.fabricmc:sponge-mixin:0.15.4+mixin.0.8.7"
-	runtimeOnly "org.ow2.asm:asm-commons:9.7.1"
+	implementation "net.fabricmc:fabric-loader:0.17.2"
+	runtimeOnly "net.fabricmc:sponge-mixin:0.16.4+mixin.0.8.7"
+	runtimeOnly "org.ow2.asm:asm-commons:9.9"
 }

launchwrapper-fabric/src/main/java/org/mcphackers/launchwrapper/inject/LWGameProvider.java

@@ -7,13 +7,7 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.security.CodeSource;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
+import java.util.*;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.loader.api.ObjectShare;
@@ -29,6 +23,7 @@
 import net.fabricmc.loader.impl.game.minecraft.McVersionLookup;
 import net.fabricmc.loader.impl.game.patch.GameTransformer;
 import net.fabricmc.loader.impl.launch.FabricLauncher;
+import net.fabricmc.loader.impl.launch.MappingConfiguration;
 import net.fabricmc.loader.impl.metadata.BuiltinModMetadata;
 import net.fabricmc.loader.impl.metadata.ContactInformationImpl;
 import net.fabricmc.loader.impl.metadata.ModDependencyImpl;
@@ -45,6 +40,9 @@
 import org.mcphackers.launchwrapper.util.ClassNodeSource;
 
 public class LWGameProvider implements GameProvider {
+	private static final Set<BuiltinTransform> TRANSFORM_WIDENALL_STRIPENV_CLASSTWEAKS = EnumSet.of(BuiltinTransform.WIDEN_ALL_PACKAGE_ACCESS, BuiltinTransform.STRIP_ENVIRONMENT, BuiltinTransform.CLASS_TWEAKS);
+	private static final Set<BuiltinTransform> TRANSFORM_WIDENALL_CLASSTWEAKS = EnumSet.of(BuiltinTransform.WIDEN_ALL_PACKAGE_ACCESS, BuiltinTransform.CLASS_TWEAKS);
+	private static final Set<BuiltinTransform> TRANSFORM_STRIPENV = EnumSet.of(BuiltinTransform.STRIP_ENVIRONMENT);
 
 	public LaunchConfig config = FabricBridge.getInstance().config;
 	public MainLaunchTarget target = null;
@@ -85,6 +83,11 @@ public void launch(ClassLoader loader) {
 		}
 	}
 
+	@Override
+	public boolean displayCrash(Throwable exception, String context) {
+		return GameProvider.super.displayCrash(exception, context);
+	}
+
 	private Path getLaunchwrapperSource() {
 		CodeSource source = Launch.class.getProtectionDomain().getCodeSource();
 		if (source != null) {
@@ -209,6 +212,7 @@ public Collection<BuiltinMod> getBuiltinMods() {
 													.setEnvironment(ModEnvironment.CLIENT)
 													.setDescription("Launch wrapper for legacy Minecraft")
 													.addAuthor("lassebq", Collections.emptyMap())
+													.addContributor("Zero_DSRS_VX", Collections.emptyMap())
 													.addIcon(16, "icon_16x16.png")
 													.addIcon(32, "icon_32x32.png")
 													.addIcon(48, "icon_48x48.png")
@@ -244,13 +248,27 @@ public Path getGameJar() {
 	}
 
 	@Override
-	public boolean isObfuscated() {
-		return true;
+	public boolean requiresUrlClassLoader() {
+		return hasModLoader;
 	}
 
 	@Override
-	public boolean requiresUrlClassLoader() {
-		return hasModLoader;
+	public Set<BuiltinTransform> getBuiltinTransforms(String className) {
+		boolean isMinecraftClass = className.startsWith("net.minecraft.") // unobf classes in indev and later
+			|| className.startsWith("com.mojang.minecraft.") // unobf classes in classic
+			|| className.startsWith("com.mojang.rubydung.") // unobf classes in pre-classic
+			|| className.startsWith("com.mojang.blaze3d.") // unobf blaze3d classes
+			|| className.indexOf('.') < 0; // obf classes
+
+		if (isMinecraftClass) {
+			if (FabricLoaderImpl.INSTANCE.isDevelopmentEnvironment()) { // combined client+server jar, strip back down to production equivalent
+				return TRANSFORM_WIDENALL_STRIPENV_CLASSTWEAKS;
+			} else { // environment specific jar, inherently env stripped
+				return TRANSFORM_WIDENALL_CLASSTWEAKS;
+			}
+		} else { // mod class TODO: exclude game libs
+			return TRANSFORM_STRIPENV;
+		}
 	}
 
 	@Override
@@ -267,12 +285,28 @@ public boolean hasAwtSupport() {
 	public void initialize(FabricLauncher launcher) {
 		launcher.setValidParentClassPath(validParentClassPath);
 
-		if (isObfuscated()) {
+
+		String gameNs = System.getProperty(SystemProperties.GAME_MAPPING_NAMESPACE);
+
+		if (gameNs == null) {
+			List<String> mappingNamespaces;
+
+			if (launcher.isDevelopment()) {
+				gameNs = MappingConfiguration.NAMED_NAMESPACE;
+			} else if ((mappingNamespaces = launcher.getMappingConfiguration().getNamespaces()) == null
+				|| mappingNamespaces.contains(MappingConfiguration.OFFICIAL_NAMESPACE)) {
+				gameNs = MappingConfiguration.OFFICIAL_NAMESPACE;
+			} else {
+				gameNs = envType == EnvType.CLIENT ? MappingConfiguration.CLIENT_OFFICIAL_NAMESPACE : MappingConfiguration.SERVER_OFFICIAL_NAMESPACE;
+			}
+		}
+
+		if (!gameNs.equals(launcher.getMappingConfiguration().getRuntimeNamespace())) { // game is obfuscated / in another namespace -> remap
 			Map<String, Path> obfJars = new HashMap<>(1);
 			String clientSide = envType.name().toLowerCase(Locale.ENGLISH);
 			obfJars.put(clientSide, gameJar);
 
-			obfJars = GameProviderHelper.deobfuscate(obfJars,
+			obfJars = GameProviderHelper.deobfuscate(obfJars, gameNs,
 													 getGameId(), getNormalizedGameVersion(),
 													 getLaunchDirectory(),
 													 launcher);
@@ -302,6 +336,11 @@ public String[] getLaunchArguments(boolean sanitize) {
 		return config.getArgs();
 	}
 
+	@Override
+	public String getRuntimeNamespace(String defaultNs) {
+		return GameProvider.super.getRuntimeNamespace(defaultNs);
+	}
+
 	@Override
 	public boolean canOpenErrorGui() {
 		return envType == EnvType.CLIENT;

launchwrapper-micromixin/build.gradle

@@ -21,6 +21,6 @@ dependencies {
 	implementation "org.stianloader:micromixin-annotations:0.6.5-a20240922"
 	implementation "org.stianloader:micromixin-remapper:0.2.0-a20240908" // For remapping mixin annotations
 	implementation "org.stianloader:stianloader-remapper:0.1.0-a20240601" // For remapping classes and references
-	implementation "net.fabricmc:mapping-io:0.3.0"
+	implementation "net.fabricmc:mapping-io:0.7.1"
 	implementation "net.fabricmc:access-widener:2.1.0"
 }

src/main/java/org/mcphackers/launchwrapper/Launch.java

@@ -6,7 +6,7 @@
 
 public class Launch {
 
-	public static final String VERSION = "1.2.1";
+	public static final String VERSION = "1.2.2";
 	public static final Logger LOGGER = new Logger();
 
 	/**