diff --git a/launchwrapper-micromixin/src/main/java/org/mcphackers/launchwrapper/micromixin/tweak/MicroMixinTweak.java b/launchwrapper-micromixin/src/main/java/org/mcphackers/launchwrapper/micromixin/tweak/MicroMixinTweak.java index 43a32f1..fc4f518 100644 --- a/launchwrapper-micromixin/src/main/java/org/mcphackers/launchwrapper/micromixin/tweak/MicroMixinTweak.java +++ b/launchwrapper-micromixin/src/main/java/org/mcphackers/launchwrapper/micromixin/tweak/MicroMixinTweak.java @@ -28,7 +28,7 @@ public class MicroMixinTweak extends Tweak { protected MicroMixinTweaker microMixinTweaker = new MicroMixinTweaker(); protected MicroMixinInjection microMixinInjection = new MicroMixinInjection(mods, microMixinTweaker); - public MicroMixinTweak(LaunchConfig launch, Tweak tweak) { + public MicroMixinTweak(Tweak tweak, LaunchConfig launch) { super(launch); if (tweak == null) { throw new NullPointerException("tweak mustn't be null"); diff --git a/src/main/java/org/mcphackers/launchwrapper/LaunchConfig.java b/src/main/java/org/mcphackers/launchwrapper/LaunchConfig.java index 1f34889..3b276d6 100644 --- a/src/main/java/org/mcphackers/launchwrapper/LaunchConfig.java +++ b/src/main/java/org/mcphackers/launchwrapper/LaunchConfig.java @@ -77,6 +77,7 @@ public class LaunchConfig { public final LaunchParameterSwitch survival = new LaunchParameterSwitch("survival", false, true); public final LaunchParameterString serverURL = new LaunchParameterString("serverURL", null, true); public final LaunchParameterString serverSHA1 = new LaunchParameterString("serverSHA1", null, true); + public final LaunchParameterSwitch disableSkinFix = new LaunchParameterSwitch("disableSkinFix", false, true); // clang-format on private static File getDefaultGameDir() { diff --git a/src/main/java/org/mcphackers/launchwrapper/protocol/MinecraftURLStreamHandler.java b/src/main/java/org/mcphackers/launchwrapper/protocol/MinecraftURLStreamHandler.java index d482cc3..126fda6 100644 --- a/src/main/java/org/mcphackers/launchwrapper/protocol/MinecraftURLStreamHandler.java +++ b/src/main/java/org/mcphackers/launchwrapper/protocol/MinecraftURLStreamHandler.java @@ -50,7 +50,7 @@ protected URLConnection openConnection(URL url) throws IOException { return new ListLevelsURLConnection(url, levelSaveDir); if (path.startsWith("/MinecraftResources/") || path.startsWith("/resources/")) return new AssetURLConnection(url, assets); - if (path.startsWith("/MinecraftSkins/") || path.startsWith("/skin/") || path.startsWith("/MinecraftCloaks/") || path.startsWith("/cloak/")) + if (!config.disableSkinFix.get() && (path.startsWith("/MinecraftSkins/") || path.startsWith("/skin/") || path.startsWith("/MinecraftCloaks/") || path.startsWith("/cloak/"))) return new SkinURLConnection(url, skins); if (host.equals("assets.minecraft.net") && path.equals("/1_6_has_been_released.flag")) if (config.oneSixFlag.get())