diff --git a/Common/source/customskinloader/CustomSkinLoader.java b/Common/src/main/java/customskinloader/CustomSkinLoader.java similarity index 100% rename from Common/source/customskinloader/CustomSkinLoader.java rename to Common/src/main/java/customskinloader/CustomSkinLoader.java diff --git a/Common/source/customskinloader/Logger.java b/Common/src/main/java/customskinloader/Logger.java similarity index 100% rename from Common/source/customskinloader/Logger.java rename to Common/src/main/java/customskinloader/Logger.java diff --git a/Common/source/customskinloader/config/Config.java b/Common/src/main/java/customskinloader/config/Config.java similarity index 100% rename from Common/source/customskinloader/config/Config.java rename to Common/src/main/java/customskinloader/config/Config.java diff --git a/Common/source/customskinloader/config/SkinSiteProfile.java b/Common/src/main/java/customskinloader/config/SkinSiteProfile.java similarity index 100% rename from Common/source/customskinloader/config/SkinSiteProfile.java rename to Common/src/main/java/customskinloader/config/SkinSiteProfile.java diff --git a/Common/source/customskinloader/fake/FakeCapeBuffer.java b/Common/src/main/java/customskinloader/fake/FakeCapeBuffer.java similarity index 100% rename from Common/source/customskinloader/fake/FakeCapeBuffer.java rename to Common/src/main/java/customskinloader/fake/FakeCapeBuffer.java diff --git a/Common/source/customskinloader/fake/FakeClientPlayer.java b/Common/src/main/java/customskinloader/fake/FakeClientPlayer.java similarity index 100% rename from Common/source/customskinloader/fake/FakeClientPlayer.java rename to Common/src/main/java/customskinloader/fake/FakeClientPlayer.java diff --git a/Common/source/customskinloader/fake/FakeMinecraftProfileTexture.java b/Common/src/main/java/customskinloader/fake/FakeMinecraftProfileTexture.java similarity index 100% rename from Common/source/customskinloader/fake/FakeMinecraftProfileTexture.java rename to Common/src/main/java/customskinloader/fake/FakeMinecraftProfileTexture.java diff --git a/Common/source/customskinloader/fake/FakeSkinBuffer.java b/Common/src/main/java/customskinloader/fake/FakeSkinBuffer.java similarity index 100% rename from Common/source/customskinloader/fake/FakeSkinBuffer.java rename to Common/src/main/java/customskinloader/fake/FakeSkinBuffer.java diff --git a/Common/source/customskinloader/fake/FakeSkinManager.java b/Common/src/main/java/customskinloader/fake/FakeSkinManager.java similarity index 98% rename from Common/source/customskinloader/fake/FakeSkinManager.java rename to Common/src/main/java/customskinloader/fake/FakeSkinManager.java index 380176a..f0e2e08 100644 --- a/Common/source/customskinloader/fake/FakeSkinManager.java +++ b/Common/src/main/java/customskinloader/fake/FakeSkinManager.java @@ -16,6 +16,7 @@ import com.mojang.authlib.minecraft.MinecraftSessionService; import customskinloader.CustomSkinLoader; import customskinloader.utils.HttpTextureUtil; import customskinloader.utils.MinecraftUtil; +import net.minecraft.client.renderer.texture.NativeImage; import net.minecraft.client.renderer.IImageBuffer; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.resources.SkinManager; @@ -152,7 +153,7 @@ public class FakeSkinManager { this.texture = texture; } - public net.minecraft.client.renderer.texture.NativeImage func_195786_a(net.minecraft.client.renderer.texture.NativeImage image) { + public NativeImage func_195786_a(NativeImage image) { return buffer instanceof FakeSkinBuffer ? ((FakeSkinBuffer) buffer).func_195786_a(image) : image; } diff --git a/Common/source/customskinloader/fake/itf/FakeInterfaceManager.java b/Common/src/main/java/customskinloader/fake/itf/FakeInterfaceManager.java similarity index 100% rename from Common/source/customskinloader/fake/itf/FakeInterfaceManager.java rename to Common/src/main/java/customskinloader/fake/itf/FakeInterfaceManager.java diff --git a/Common/source/customskinloader/fake/itf/IFakeIResource.java b/Common/src/main/java/customskinloader/fake/itf/IFakeIResource.java similarity index 82% rename from Common/source/customskinloader/fake/itf/IFakeIResource.java rename to Common/src/main/java/customskinloader/fake/itf/IFakeIResource.java index 6c8d8ca..9d35957 100644 --- a/Common/source/customskinloader/fake/itf/IFakeIResource.java +++ b/Common/src/main/java/customskinloader/fake/itf/IFakeIResource.java @@ -4,7 +4,7 @@ import java.io.InputStream; import net.minecraft.client.resources.IResource; -/** {@link net.minecraft.client.resources.IResource} is no longer an interface since 22w14a */ +/** {@link IResource} is no longer an interface since 22w14a */ public interface IFakeIResource { // 1.13.2 ~ 22w13a interface V1 { diff --git a/Common/source/customskinloader/fake/itf/IFakeIResourceManager.java b/Common/src/main/java/customskinloader/fake/itf/IFakeIResourceManager.java similarity index 100% rename from Common/source/customskinloader/fake/itf/IFakeIResourceManager.java rename to Common/src/main/java/customskinloader/fake/itf/IFakeIResourceManager.java diff --git a/Common/source/customskinloader/fake/itf/IFakeMinecraft.java b/Common/src/main/java/customskinloader/fake/itf/IFakeMinecraft.java similarity index 100% rename from Common/source/customskinloader/fake/itf/IFakeMinecraft.java rename to Common/src/main/java/customskinloader/fake/itf/IFakeMinecraft.java diff --git a/Common/source/customskinloader/fake/itf/IFakeThreadDownloadImageData.java b/Common/src/main/java/customskinloader/fake/itf/IFakeThreadDownloadImageData.java similarity index 100% rename from Common/source/customskinloader/fake/itf/IFakeThreadDownloadImageData.java rename to Common/src/main/java/customskinloader/fake/itf/IFakeThreadDownloadImageData.java diff --git a/Common/source/customskinloader/fake/texture/FakeBufferedImage.java b/Common/src/main/java/customskinloader/fake/texture/FakeBufferedImage.java similarity index 100% rename from Common/source/customskinloader/fake/texture/FakeBufferedImage.java rename to Common/src/main/java/customskinloader/fake/texture/FakeBufferedImage.java diff --git a/Common/source/customskinloader/fake/texture/FakeImage.java b/Common/src/main/java/customskinloader/fake/texture/FakeImage.java similarity index 100% rename from Common/source/customskinloader/fake/texture/FakeImage.java rename to Common/src/main/java/customskinloader/fake/texture/FakeImage.java diff --git a/Common/source/customskinloader/fake/texture/FakeNativeImage.java b/Common/src/main/java/customskinloader/fake/texture/FakeNativeImage.java similarity index 100% rename from Common/source/customskinloader/fake/texture/FakeNativeImage.java rename to Common/src/main/java/customskinloader/fake/texture/FakeNativeImage.java diff --git a/Common/source/customskinloader/loader/JsonAPILoader.java b/Common/src/main/java/customskinloader/loader/JsonAPILoader.java similarity index 100% rename from Common/source/customskinloader/loader/JsonAPILoader.java rename to Common/src/main/java/customskinloader/loader/JsonAPILoader.java diff --git a/Common/source/customskinloader/loader/LegacyLoader.java b/Common/src/main/java/customskinloader/loader/LegacyLoader.java similarity index 100% rename from Common/source/customskinloader/loader/LegacyLoader.java rename to Common/src/main/java/customskinloader/loader/LegacyLoader.java diff --git a/Common/source/customskinloader/loader/MojangAPILoader.java b/Common/src/main/java/customskinloader/loader/MojangAPILoader.java similarity index 100% rename from Common/source/customskinloader/loader/MojangAPILoader.java rename to Common/src/main/java/customskinloader/loader/MojangAPILoader.java diff --git a/Common/source/customskinloader/loader/ProfileLoader.java b/Common/src/main/java/customskinloader/loader/ProfileLoader.java similarity index 100% rename from Common/source/customskinloader/loader/ProfileLoader.java rename to Common/src/main/java/customskinloader/loader/ProfileLoader.java diff --git a/Common/source/customskinloader/loader/jsonapi/CustomSkinAPI.java b/Common/src/main/java/customskinloader/loader/jsonapi/CustomSkinAPI.java similarity index 100% rename from Common/source/customskinloader/loader/jsonapi/CustomSkinAPI.java rename to Common/src/main/java/customskinloader/loader/jsonapi/CustomSkinAPI.java diff --git a/Common/source/customskinloader/loader/jsonapi/CustomSkinAPIPlus.java b/Common/src/main/java/customskinloader/loader/jsonapi/CustomSkinAPIPlus.java similarity index 100% rename from Common/source/customskinloader/loader/jsonapi/CustomSkinAPIPlus.java rename to Common/src/main/java/customskinloader/loader/jsonapi/CustomSkinAPIPlus.java diff --git a/Common/source/customskinloader/loader/jsonapi/ElyByAPI.java b/Common/src/main/java/customskinloader/loader/jsonapi/ElyByAPI.java similarity index 100% rename from Common/source/customskinloader/loader/jsonapi/ElyByAPI.java rename to Common/src/main/java/customskinloader/loader/jsonapi/ElyByAPI.java diff --git a/Common/source/customskinloader/loader/jsonapi/GlitchlessAPI.java b/Common/src/main/java/customskinloader/loader/jsonapi/GlitchlessAPI.java similarity index 100% rename from Common/source/customskinloader/loader/jsonapi/GlitchlessAPI.java rename to Common/src/main/java/customskinloader/loader/jsonapi/GlitchlessAPI.java diff --git a/Common/source/customskinloader/loader/jsonapi/MinecraftCapesAPI.java b/Common/src/main/java/customskinloader/loader/jsonapi/MinecraftCapesAPI.java similarity index 100% rename from Common/source/customskinloader/loader/jsonapi/MinecraftCapesAPI.java rename to Common/src/main/java/customskinloader/loader/jsonapi/MinecraftCapesAPI.java diff --git a/Common/source/customskinloader/loader/jsonapi/UniSkinAPI.java b/Common/src/main/java/customskinloader/loader/jsonapi/UniSkinAPI.java similarity index 100% rename from Common/source/customskinloader/loader/jsonapi/UniSkinAPI.java rename to Common/src/main/java/customskinloader/loader/jsonapi/UniSkinAPI.java diff --git a/Common/source/customskinloader/loader/jsonapi/WynntilsAPI.java b/Common/src/main/java/customskinloader/loader/jsonapi/WynntilsAPI.java similarity index 100% rename from Common/source/customskinloader/loader/jsonapi/WynntilsAPI.java rename to Common/src/main/java/customskinloader/loader/jsonapi/WynntilsAPI.java diff --git a/Common/source/customskinloader/log/LogManager.java b/Common/src/main/java/customskinloader/log/LogManager.java similarity index 100% rename from Common/source/customskinloader/log/LogManager.java rename to Common/src/main/java/customskinloader/log/LogManager.java diff --git a/Common/source/customskinloader/log/Logger.java b/Common/src/main/java/customskinloader/log/Logger.java similarity index 100% rename from Common/source/customskinloader/log/Logger.java rename to Common/src/main/java/customskinloader/log/Logger.java diff --git a/Common/source/customskinloader/plugin/ICustomSkinLoaderPlugin.java b/Common/src/main/java/customskinloader/plugin/ICustomSkinLoaderPlugin.java similarity index 100% rename from Common/source/customskinloader/plugin/ICustomSkinLoaderPlugin.java rename to Common/src/main/java/customskinloader/plugin/ICustomSkinLoaderPlugin.java diff --git a/Common/source/customskinloader/plugin/PluginLoader.java b/Common/src/main/java/customskinloader/plugin/PluginLoader.java similarity index 100% rename from Common/source/customskinloader/plugin/PluginLoader.java rename to Common/src/main/java/customskinloader/plugin/PluginLoader.java diff --git a/Common/source/customskinloader/profile/DynamicSkullManager.java b/Common/src/main/java/customskinloader/profile/DynamicSkullManager.java similarity index 100% rename from Common/source/customskinloader/profile/DynamicSkullManager.java rename to Common/src/main/java/customskinloader/profile/DynamicSkullManager.java diff --git a/Common/source/customskinloader/profile/ModelManager0.java b/Common/src/main/java/customskinloader/profile/ModelManager0.java similarity index 100% rename from Common/source/customskinloader/profile/ModelManager0.java rename to Common/src/main/java/customskinloader/profile/ModelManager0.java diff --git a/Common/source/customskinloader/profile/ProfileCache.java b/Common/src/main/java/customskinloader/profile/ProfileCache.java similarity index 100% rename from Common/source/customskinloader/profile/ProfileCache.java rename to Common/src/main/java/customskinloader/profile/ProfileCache.java diff --git a/Common/source/customskinloader/profile/UserProfile.java b/Common/src/main/java/customskinloader/profile/UserProfile.java similarity index 100% rename from Common/source/customskinloader/profile/UserProfile.java rename to Common/src/main/java/customskinloader/profile/UserProfile.java diff --git a/Common/source/customskinloader/utils/HttpRequestUtil.java b/Common/src/main/java/customskinloader/utils/HttpRequestUtil.java similarity index 100% rename from Common/source/customskinloader/utils/HttpRequestUtil.java rename to Common/src/main/java/customskinloader/utils/HttpRequestUtil.java diff --git a/Common/source/customskinloader/utils/HttpTextureUtil.java b/Common/src/main/java/customskinloader/utils/HttpTextureUtil.java similarity index 100% rename from Common/source/customskinloader/utils/HttpTextureUtil.java rename to Common/src/main/java/customskinloader/utils/HttpTextureUtil.java diff --git a/Common/source/customskinloader/utils/HttpUtil0.java b/Common/src/main/java/customskinloader/utils/HttpUtil0.java similarity index 100% rename from Common/source/customskinloader/utils/HttpUtil0.java rename to Common/src/main/java/customskinloader/utils/HttpUtil0.java diff --git a/Common/source/customskinloader/utils/JavaUtil.java b/Common/src/main/java/customskinloader/utils/JavaUtil.java similarity index 100% rename from Common/source/customskinloader/utils/JavaUtil.java rename to Common/src/main/java/customskinloader/utils/JavaUtil.java diff --git a/Common/source/customskinloader/utils/MinecraftUtil.java b/Common/src/main/java/customskinloader/utils/MinecraftUtil.java similarity index 100% rename from Common/source/customskinloader/utils/MinecraftUtil.java rename to Common/src/main/java/customskinloader/utils/MinecraftUtil.java diff --git a/Common/source/customskinloader/utils/TextureUtil.java b/Common/src/main/java/customskinloader/utils/TextureUtil.java similarity index 100% rename from Common/source/customskinloader/utils/TextureUtil.java rename to Common/src/main/java/customskinloader/utils/TextureUtil.java diff --git a/Common/source/customskinloader/utils/TimeUtil.java b/Common/src/main/java/customskinloader/utils/TimeUtil.java similarity index 100% rename from Common/source/customskinloader/utils/TimeUtil.java rename to Common/src/main/java/customskinloader/utils/TimeUtil.java diff --git a/Common/source/customskinloader/utils/Version.java b/Common/src/main/java/customskinloader/utils/Version.java similarity index 100% rename from Common/source/customskinloader/utils/Version.java rename to Common/src/main/java/customskinloader/utils/Version.java diff --git a/Common/source/net/minecraft/client/renderer/IImageBuffer.java b/Common/src/main/java/net/minecraft/client/renderer/IImageBuffer.java similarity index 100% rename from Common/source/net/minecraft/client/renderer/IImageBuffer.java rename to Common/src/main/java/net/minecraft/client/renderer/IImageBuffer.java diff --git a/Vanilla/Common/source/net/minecraft/client/renderer/RenderType.java b/Common/src/main/java/net/minecraft/client/renderer/RenderType.java similarity index 100% rename from Vanilla/Common/source/net/minecraft/client/renderer/RenderType.java rename to Common/src/main/java/net/minecraft/client/renderer/RenderType.java diff --git a/Common/source/net/minecraft/client/renderer/texture/NativeImage.java b/Common/src/main/java/net/minecraft/client/renderer/texture/NativeImage.java similarity index 100% rename from Common/source/net/minecraft/client/renderer/texture/NativeImage.java rename to Common/src/main/java/net/minecraft/client/renderer/texture/NativeImage.java diff --git a/Common/source/net/minecraft/client/renderer/texture/Texture.java b/Common/src/main/java/net/minecraft/client/renderer/texture/Texture.java similarity index 100% rename from Common/source/net/minecraft/client/renderer/texture/Texture.java rename to Common/src/main/java/net/minecraft/client/renderer/texture/Texture.java diff --git a/Common/source/net/minecraft/client/resources/IResource.java b/Common/src/main/java/net/minecraft/client/resources/IResource.java similarity index 100% rename from Common/source/net/minecraft/client/resources/IResource.java rename to Common/src/main/java/net/minecraft/client/resources/IResource.java diff --git a/Common/source/net/minecraft/client/resources/IResourceManager.java b/Common/src/main/java/net/minecraft/client/resources/IResourceManager.java similarity index 100% rename from Common/source/net/minecraft/client/resources/IResourceManager.java rename to Common/src/main/java/net/minecraft/client/resources/IResourceManager.java diff --git a/Common/source/net/minecraft/resources/IResource.java b/Common/src/main/java/net/minecraft/resources/IResource.java similarity index 100% rename from Common/source/net/minecraft/resources/IResource.java rename to Common/src/main/java/net/minecraft/resources/IResource.java diff --git a/Common/source/net/minecraft/resources/IResourceManager.java b/Common/src/main/java/net/minecraft/resources/IResourceManager.java similarity index 100% rename from Common/source/net/minecraft/resources/IResourceManager.java rename to Common/src/main/java/net/minecraft/resources/IResourceManager.java diff --git a/Common/resource/BuildInfo.json b/Common/src/main/resources/BuildInfo.json similarity index 100% rename from Common/resource/BuildInfo.json rename to Common/src/main/resources/BuildInfo.json diff --git a/Common/resource/LICENSE b/Common/src/main/resources/LICENSE similarity index 100% rename from Common/resource/LICENSE rename to Common/src/main/resources/LICENSE diff --git a/Fabric/build.gradle b/Fabric/build.gradle index bbc158f..249b3fe 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -1,16 +1,9 @@ jar { - exclude 'customskinloader/tweaker/**' - exclude 'net/minecraft/client/renderer/RenderType.class' - exclude 'net/minecraft/client/renderer/texture/**' exclude 'net/minecraft/client/resources/**' - exclude 'net/minecraft/resources/**' - exclude 'Profile.json' } sourceJar { - exclude 'customskinloader/tweaker/**' exclude 'net/**' - exclude 'Profile.json' } repositories { @@ -18,6 +11,10 @@ repositories { name = "fabric" url = "https://maven.fabricmc.net/" } + maven { + name = "sponge" + url = "https://repo.spongepowered.org/repository/maven-public/" + } } dependencies { @@ -29,7 +26,18 @@ import customskinloader.gradle.util.RemapUtil import customskinloader.gradle.util.SourceUtil import groovy.json.JsonSlurper -SourceUtil.addDependencies project, project(":Common"), project(":Vanilla/Common") +apply plugin: 'org.spongepowered.mixin' + +apply from: rootProject.file("buildSrc/patch.gradle") +patchMixin() + +mixin { + add sourceSets.main, "mixins.customskinloader.refmap.json" + reobfSrgFile = "build/mixin.srg" + reobfNotchSrgFile = "build/mixin.srg" +} + +SourceUtil.addDependencies project, project(":Common") RemapUtil.remapSources project // Resolve snapshot versions diff --git a/Fabric/source/customskinloader/fabric/DevEnvRemapper.java b/Fabric/src/main/java/customskinloader/fabric/DevEnvRemapper.java similarity index 100% rename from Fabric/source/customskinloader/fabric/DevEnvRemapper.java rename to Fabric/src/main/java/customskinloader/fabric/DevEnvRemapper.java diff --git a/Fabric/source/customskinloader/fabric/MixinConfigPlugin.java b/Fabric/src/main/java/customskinloader/fabric/MixinConfigPlugin.java similarity index 97% rename from Fabric/source/customskinloader/fabric/MixinConfigPlugin.java rename to Fabric/src/main/java/customskinloader/fabric/MixinConfigPlugin.java index 925957e..d6d82d0 100644 --- a/Fabric/source/customskinloader/fabric/MixinConfigPlugin.java +++ b/Fabric/src/main/java/customskinloader/fabric/MixinConfigPlugin.java @@ -55,13 +55,13 @@ public class MixinConfigPlugin implements IMixinConfigPlugin { @Override public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { boolean result = true; - if (mixinClassName.endsWith(".MixinThreadDownloadImageDataV2")) { + if (mixinClassName.endsWith(".MixinThreadDownloadImageData$V1")) { result = (this.world_version >= 2205 && this.world_version <= 2722) && ((this.protocol_version >= 554 && this.protocol_version <= 754) || (this.protocol_version >= 801 && this.protocol_version <= 803) || (this.protocol_version >= 0x40000001 && this.protocol_version <= 0x40000022)); // 19w38a ~ 1.17-rc1 - } else if (mixinClassName.endsWith(".MixinSkinManager$V2")) { + } else if (mixinClassName.endsWith(".MixinSkinManager$V1")) { result = this.world_version >= 2205 && this.protocol_version >= 554; // 19w38a+ } else if (mixinClassName.endsWith(".MixinLayerCape") || mixinClassName.endsWith(".MixinRenderPlayer")) { result = this.world_version >= 2210 && this.protocol_version >= 558; // 19w41a+ - } else if (mixinClassName.endsWith(".MixinThreadDownloadImageDataV3")) { + } else if (mixinClassName.endsWith(".MixinThreadDownloadImageData$V2")) { result = this.world_version >= 2723 && ((this.protocol_version >= 755 && this.protocol_version < 801) || (this.protocol_version > 803 && this.protocol_version < 0x40000001) || this.protocol_version >= 0x40000023); // 1.17-rc2+ } logger.info("target: " + targetClassName + ", mixin: " + mixinClassName + ", result: " + result); diff --git a/Vanilla/Common/source/customskinloader/mixin/MixinGuiPlayerTabOverlay.java b/Fabric/src/main/java/customskinloader/mixin/MixinGuiPlayerTabOverlay.java similarity index 100% rename from Vanilla/Common/source/customskinloader/mixin/MixinGuiPlayerTabOverlay.java rename to Fabric/src/main/java/customskinloader/mixin/MixinGuiPlayerTabOverlay.java diff --git a/Vanilla/Common/source/customskinloader/mixin/MixinIResource.java b/Fabric/src/main/java/customskinloader/mixin/MixinIResource.java similarity index 100% rename from Vanilla/Common/source/customskinloader/mixin/MixinIResource.java rename to Fabric/src/main/java/customskinloader/mixin/MixinIResource.java diff --git a/Vanilla/Common/source/customskinloader/mixin/MixinIResourceManager.java b/Fabric/src/main/java/customskinloader/mixin/MixinIResourceManager.java similarity index 100% rename from Vanilla/Common/source/customskinloader/mixin/MixinIResourceManager.java rename to Fabric/src/main/java/customskinloader/mixin/MixinIResourceManager.java diff --git a/Vanilla/Common/source/customskinloader/mixin/MixinLayerCape.java b/Fabric/src/main/java/customskinloader/mixin/MixinLayerCape.java similarity index 100% rename from Vanilla/Common/source/customskinloader/mixin/MixinLayerCape.java rename to Fabric/src/main/java/customskinloader/mixin/MixinLayerCape.java diff --git a/Vanilla/Common/source/customskinloader/mixin/MixinMinecraft.java b/Fabric/src/main/java/customskinloader/mixin/MixinMinecraft.java similarity index 100% rename from Vanilla/Common/source/customskinloader/mixin/MixinMinecraft.java rename to Fabric/src/main/java/customskinloader/mixin/MixinMinecraft.java diff --git a/Vanilla/Common/source/customskinloader/mixin/MixinRenderPlayer.java b/Fabric/src/main/java/customskinloader/mixin/MixinRenderPlayer.java similarity index 100% rename from Vanilla/Common/source/customskinloader/mixin/MixinRenderPlayer.java rename to Fabric/src/main/java/customskinloader/mixin/MixinRenderPlayer.java diff --git a/Vanilla/Common/source/customskinloader/mixin/MixinSkinManager.java b/Fabric/src/main/java/customskinloader/mixin/MixinSkinManager.java similarity index 90% rename from Vanilla/Common/source/customskinloader/mixin/MixinSkinManager.java rename to Fabric/src/main/java/customskinloader/mixin/MixinSkinManager.java index 7aef4a0..3a63973 100644 --- a/Vanilla/Common/source/customskinloader/mixin/MixinSkinManager.java +++ b/Fabric/src/main/java/customskinloader/mixin/MixinSkinManager.java @@ -11,8 +11,6 @@ import com.mojang.authlib.GameProfile; import com.mojang.authlib.minecraft.MinecraftProfileTexture; import com.mojang.authlib.minecraft.MinecraftSessionService; import customskinloader.fake.FakeSkinManager; -import net.minecraft.client.renderer.IImageBuffer; -import net.minecraft.client.renderer.ThreadDownloadImageData; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.resources.SkinManager; import net.minecraft.util.ResourceLocation; @@ -29,6 +27,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.invoke.arg.Args; @Mixin(SkinManager.class) +@SuppressWarnings("target") public abstract class MixinSkinManager { private FakeSkinManager fakeManager; @@ -161,25 +160,21 @@ public abstract class MixinSkinManager { callbackInfoReturnable.setReturnValue(this.fakeManager.loadSkinFromCache(profile)); } - // 1.13+ - @Mixin(SkinManager.class) - public abstract static class V1 { - @Redirect( - method = "Lnet/minecraft/client/resources/SkinManager;func_210275_a(Lcom/mojang/authlib/GameProfile;ZLnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)V", - at = @At( - value = "INVOKE", - target = "Lcom/mojang/authlib/minecraft/MinecraftSessionService;getTextures(Lcom/mojang/authlib/GameProfile;Z)Ljava/util/Map;", - remap = false - ) + @Redirect( + method = "Lnet/minecraft/client/resources/SkinManager;func_210275_a(Lcom/mojang/authlib/GameProfile;ZLnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)V", + at = @At( + value = "INVOKE", + target = "Lcom/mojang/authlib/minecraft/MinecraftSessionService;getTextures(Lcom/mojang/authlib/GameProfile;Z)Ljava/util/Map;", + remap = false ) - private Map redirect_func_210275_a(MinecraftSessionService sessionService, GameProfile profile, boolean requireSecure) { - return FakeSkinManager.getUserProfile(sessionService, profile, requireSecure); - } + ) + private Map redirect_func_210275_a(MinecraftSessionService sessionService, GameProfile profile, boolean requireSecure) { + return FakeSkinManager.getUserProfile(sessionService, profile, requireSecure); } // 19w38a+ @Mixin(SkinManager.class) - public abstract static class V2 { + public abstract static class V1 { @Redirect( method = "Lnet/minecraft/client/resources/SkinManager;func_229297_b_(Ljava/util/Map;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)V", at = @At( diff --git a/Fabric/src/main/java/customskinloader/mixin/MixinThreadDownloadImageData.java b/Fabric/src/main/java/customskinloader/mixin/MixinThreadDownloadImageData.java new file mode 100644 index 0000000..d5fb1da --- /dev/null +++ b/Fabric/src/main/java/customskinloader/mixin/MixinThreadDownloadImageData.java @@ -0,0 +1,57 @@ +package customskinloader.mixin; + +import customskinloader.fake.FakeSkinBuffer; +import net.minecraft.client.renderer.ThreadDownloadImageData; +import net.minecraft.client.renderer.texture.NativeImage; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@SuppressWarnings("target") +public abstract class MixinThreadDownloadImageData { + @Mixin(ThreadDownloadImageData.class) // 19w38a ~ 1.17-rc1 + public abstract static class V1 { + @Final + @Shadow + private Runnable processTask; + + @Shadow + private static NativeImage processLegacySkin(NativeImage nativeImageIn) { + return null; + } + + @Redirect( + method = "Lnet/minecraft/client/renderer/ThreadDownloadImageData;loadTexture(Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage;", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/client/renderer/ThreadDownloadImageData;processLegacySkin(Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage;" + ) + ) + private NativeImage redirect_loadTexture(NativeImage image) { + return FakeSkinBuffer.processLegacySkin(image, this.processTask, MixinThreadDownloadImageData.V1::processLegacySkin); + } + } + + @Mixin(ThreadDownloadImageData.class) // 1.17-rc2+ + public abstract static class V2 { + @Final + @Shadow + private Runnable processTask; + + @Shadow + abstract NativeImage processLegacySkin(NativeImage nativeImageIn); + + @Redirect( + method = "Lnet/minecraft/client/renderer/ThreadDownloadImageData;loadTexture(Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage;", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/client/renderer/ThreadDownloadImageData;processLegacySkin(Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage;" + ) + ) + private NativeImage redirect_loadTexture(ThreadDownloadImageData _this, NativeImage image) { + return FakeSkinBuffer.processLegacySkin(image, this.processTask, this::processLegacySkin); + } + } +} diff --git a/Fabric/resource/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json similarity index 100% rename from Fabric/resource/fabric.mod.json rename to Fabric/src/main/resources/fabric.mod.json diff --git a/Fabric/resource/mixins.customskinloader.json b/Fabric/src/main/resources/mixins.customskinloader.json similarity index 82% rename from Fabric/resource/mixins.customskinloader.json rename to Fabric/src/main/resources/mixins.customskinloader.json index 136f291..b6717c2 100644 --- a/Fabric/resource/mixins.customskinloader.json +++ b/Fabric/src/main/resources/mixins.customskinloader.json @@ -11,9 +11,8 @@ "MixinRenderPlayer", "MixinSkinManager", "MixinSkinManager$V1", - "MixinSkinManager$V2", - "MixinThreadDownloadImageDataV2", - "MixinThreadDownloadImageDataV3" + "MixinThreadDownloadImageData$V1", + "MixinThreadDownloadImageData$V2" ], "refmap": "mixins.customskinloader.refmap.json", "plugin": "customskinloader.fabric.MixinConfigPlugin", diff --git a/Forge/Active/build.gradle b/Forge/Active/build.gradle index bd4728a..817dfd5 100644 --- a/Forge/Active/build.gradle +++ b/Forge/Active/build.gradle @@ -6,10 +6,7 @@ jar { ]) } - exclude 'net/minecraft/client/renderer/RenderType.class' - exclude 'net/minecraft/client/renderer/texture/**' exclude 'net/minecraft/client/resources/**' - exclude 'net/minecraft/resources/**' } sourceJar { exclude 'com/**' diff --git a/Forge/Active/source/customskinloader/forge/ForgeMod.java b/Forge/Active/src/main/java/customskinloader/forge/ForgeMod.java similarity index 100% rename from Forge/Active/source/customskinloader/forge/ForgeMod.java rename to Forge/Active/src/main/java/customskinloader/forge/ForgeMod.java diff --git a/Forge/Active/resource/META-INF/coremods.json b/Forge/Active/src/main/resources/META-INF/coremods.json similarity index 100% rename from Forge/Active/resource/META-INF/coremods.json rename to Forge/Active/src/main/resources/META-INF/coremods.json diff --git a/Forge/Active/resource/META-INF/mods.toml b/Forge/Active/src/main/resources/META-INF/mods.toml similarity index 100% rename from Forge/Active/resource/META-INF/mods.toml rename to Forge/Active/src/main/resources/META-INF/mods.toml diff --git a/Forge/Active/resource/pack.mcmeta b/Forge/Active/src/main/resources/pack.mcmeta similarity index 100% rename from Forge/Active/resource/pack.mcmeta rename to Forge/Active/src/main/resources/pack.mcmeta diff --git a/Forge/Active/resource/transformers.js b/Forge/Active/src/main/resources/transformers.js similarity index 100% rename from Forge/Active/resource/transformers.js rename to Forge/Active/src/main/resources/transformers.js diff --git a/Forge/Common/source/net/minecraftforge/fml/ExtensionPoint.java b/Forge/Common/src/main/java/net/minecraftforge/fml/ExtensionPoint.java similarity index 100% rename from Forge/Common/source/net/minecraftforge/fml/ExtensionPoint.java rename to Forge/Common/src/main/java/net/minecraftforge/fml/ExtensionPoint.java diff --git a/Forge/Common/source/net/minecraftforge/fml/IExtensionPoint.java b/Forge/Common/src/main/java/net/minecraftforge/fml/IExtensionPoint.java similarity index 100% rename from Forge/Common/source/net/minecraftforge/fml/IExtensionPoint.java rename to Forge/Common/src/main/java/net/minecraftforge/fml/IExtensionPoint.java diff --git a/Forge/Common/source/net/minecraftforge/fml/ModLoadingContext.java b/Forge/Common/src/main/java/net/minecraftforge/fml/ModLoadingContext.java similarity index 100% rename from Forge/Common/source/net/minecraftforge/fml/ModLoadingContext.java rename to Forge/Common/src/main/java/net/minecraftforge/fml/ModLoadingContext.java diff --git a/Forge/Common/source/net/minecraftforge/fml/common/Mod.java b/Forge/Common/src/main/java/net/minecraftforge/fml/common/Mod.java similarity index 100% rename from Forge/Common/source/net/minecraftforge/fml/common/Mod.java rename to Forge/Common/src/main/java/net/minecraftforge/fml/common/Mod.java diff --git a/Forge/Legacy/build.gradle b/Forge/Legacy/build.gradle index 1f73ec4..760bce7 100644 --- a/Forge/Legacy/build.gradle +++ b/Forge/Legacy/build.gradle @@ -6,10 +6,11 @@ jar { "TweakOrder": -10 ]) } - exclude 'net/minecraft/client/renderer/texture/**' + + exclude 'net/minecraft/client/resources/IResource.class' + exclude 'net/minecraft/client/resources/IResourceManager.class' exclude 'net/minecraft/client/resources/SkinManager.class' exclude 'net/minecraft/client/resources/SkinManager$ISkinAvailableCallback.class' - exclude 'net/minecraft/resources/**' } sourceJar { exclude 'net/**' diff --git a/Forge/Legacy/source/customskinloader/forge/ForgeDevTweaker.java b/Forge/Legacy/src/main/java/customskinloader/forge/ForgeDevTweaker.java similarity index 100% rename from Forge/Legacy/source/customskinloader/forge/ForgeDevTweaker.java rename to Forge/Legacy/src/main/java/customskinloader/forge/ForgeDevTweaker.java diff --git a/Forge/Legacy/source/customskinloader/forge/ForgeMod.java b/Forge/Legacy/src/main/java/customskinloader/forge/ForgeMod.java similarity index 100% rename from Forge/Legacy/source/customskinloader/forge/ForgeMod.java rename to Forge/Legacy/src/main/java/customskinloader/forge/ForgeMod.java diff --git a/Forge/Legacy/source/customskinloader/forge/ForgePlugin.java b/Forge/Legacy/src/main/java/customskinloader/forge/ForgePlugin.java similarity index 100% rename from Forge/Legacy/source/customskinloader/forge/ForgePlugin.java rename to Forge/Legacy/src/main/java/customskinloader/forge/ForgePlugin.java diff --git a/Forge/Legacy/source/customskinloader/forge/ForgeTweaker.java b/Forge/Legacy/src/main/java/customskinloader/forge/ForgeTweaker.java similarity index 100% rename from Forge/Legacy/source/customskinloader/forge/ForgeTweaker.java rename to Forge/Legacy/src/main/java/customskinloader/forge/ForgeTweaker.java diff --git a/Forge/Legacy/source/customskinloader/forge/TransformerManager.java b/Forge/Legacy/src/main/java/customskinloader/forge/TransformerManager.java similarity index 100% rename from Forge/Legacy/source/customskinloader/forge/TransformerManager.java rename to Forge/Legacy/src/main/java/customskinloader/forge/TransformerManager.java diff --git a/Forge/Legacy/source/customskinloader/forge/loader/LaunchWrapper.java b/Forge/Legacy/src/main/java/customskinloader/forge/loader/LaunchWrapper.java similarity index 100% rename from Forge/Legacy/source/customskinloader/forge/loader/LaunchWrapper.java rename to Forge/Legacy/src/main/java/customskinloader/forge/loader/LaunchWrapper.java diff --git a/Forge/Legacy/source/customskinloader/forge/platform/DefaultFMLPlatform.java b/Forge/Legacy/src/main/java/customskinloader/forge/platform/DefaultFMLPlatform.java similarity index 100% rename from Forge/Legacy/source/customskinloader/forge/platform/DefaultFMLPlatform.java rename to Forge/Legacy/src/main/java/customskinloader/forge/platform/DefaultFMLPlatform.java diff --git a/Forge/Legacy/source/customskinloader/forge/platform/IFMLPlatform.java b/Forge/Legacy/src/main/java/customskinloader/forge/platform/IFMLPlatform.java similarity index 100% rename from Forge/Legacy/source/customskinloader/forge/platform/IFMLPlatform.java rename to Forge/Legacy/src/main/java/customskinloader/forge/platform/IFMLPlatform.java diff --git a/Forge/Legacy/source/customskinloader/forge/transformer/FakeInterfacesTransformer.java b/Forge/Legacy/src/main/java/customskinloader/forge/transformer/FakeInterfacesTransformer.java similarity index 100% rename from Forge/Legacy/source/customskinloader/forge/transformer/FakeInterfacesTransformer.java rename to Forge/Legacy/src/main/java/customskinloader/forge/transformer/FakeInterfacesTransformer.java diff --git a/Forge/Legacy/source/customskinloader/forge/transformer/PlayerTabTransformer.java b/Forge/Legacy/src/main/java/customskinloader/forge/transformer/PlayerTabTransformer.java similarity index 100% rename from Forge/Legacy/source/customskinloader/forge/transformer/PlayerTabTransformer.java rename to Forge/Legacy/src/main/java/customskinloader/forge/transformer/PlayerTabTransformer.java diff --git a/Forge/Legacy/source/customskinloader/forge/transformer/SkinManagerTransformer.java b/Forge/Legacy/src/main/java/customskinloader/forge/transformer/SkinManagerTransformer.java similarity index 100% rename from Forge/Legacy/source/customskinloader/forge/transformer/SkinManagerTransformer.java rename to Forge/Legacy/src/main/java/customskinloader/forge/transformer/SkinManagerTransformer.java diff --git a/Forge/Legacy/source/customskinloader/forge/transformer/SpectatorMenuTransformer.java b/Forge/Legacy/src/main/java/customskinloader/forge/transformer/SpectatorMenuTransformer.java similarity index 100% rename from Forge/Legacy/source/customskinloader/forge/transformer/SpectatorMenuTransformer.java rename to Forge/Legacy/src/main/java/customskinloader/forge/transformer/SpectatorMenuTransformer.java diff --git a/Forge/Legacy/source/net/minecraft/client/resources/SkinManager.java b/Forge/Legacy/src/main/java/net/minecraft/client/resources/SkinManager.java similarity index 100% rename from Forge/Legacy/source/net/minecraft/client/resources/SkinManager.java rename to Forge/Legacy/src/main/java/net/minecraft/client/resources/SkinManager.java diff --git a/Forge/Legacy/resource/META-INF/coremods.json b/Forge/Legacy/src/main/resources/META-INF/coremods.json similarity index 100% rename from Forge/Legacy/resource/META-INF/coremods.json rename to Forge/Legacy/src/main/resources/META-INF/coremods.json diff --git a/Forge/Legacy/resource/META-INF/mods.toml b/Forge/Legacy/src/main/resources/META-INF/mods.toml similarity index 100% rename from Forge/Legacy/resource/META-INF/mods.toml rename to Forge/Legacy/src/main/resources/META-INF/mods.toml diff --git a/Forge/Legacy/resource/META-INF/services/customskinloader.forge.platform.IFMLPlatform b/Forge/Legacy/src/main/resources/META-INF/services/customskinloader.forge.platform.IFMLPlatform similarity index 100% rename from Forge/Legacy/resource/META-INF/services/customskinloader.forge.platform.IFMLPlatform rename to Forge/Legacy/src/main/resources/META-INF/services/customskinloader.forge.platform.IFMLPlatform diff --git a/Forge/Legacy/resource/mcmod.info b/Forge/Legacy/src/main/resources/mcmod.info similarity index 100% rename from Forge/Legacy/resource/mcmod.info rename to Forge/Legacy/src/main/resources/mcmod.info diff --git a/Forge/Legacy/resource/pack.mcmeta b/Forge/Legacy/src/main/resources/pack.mcmeta similarity index 100% rename from Forge/Legacy/resource/pack.mcmeta rename to Forge/Legacy/src/main/resources/pack.mcmeta diff --git a/Forge/Legacy/resource/transformers.js b/Forge/Legacy/src/main/resources/transformers.js similarity index 100% rename from Forge/Legacy/resource/transformers.js rename to Forge/Legacy/src/main/resources/transformers.js diff --git a/Vanilla/1.12.2/1.12.2.tsrg b/Vanilla/1.12.2/1.12.2.tsrg deleted file mode 100644 index 4e7c2d4..0000000 --- a/Vanilla/1.12.2/1.12.2.tsrg +++ /dev/null @@ -1,62 +0,0 @@ -customskinloader/fake/itf/IFakeIResource$V1 customskinloader/fake/itf/IFakeIResource$V1 - func_199027_b ()Ljava/io/InputStream; b -customskinloader/fake/itf/IFakeIResource$V2 customskinloader/fake/itf/IFakeIResource$V2 - open ()Ljava/io/InputStream; open -customskinloader/fake/itf/IFakeIResourceManager customskinloader/fake/itf/IFakeIResourceManager - func_199002_a (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/resources/IResource; a - getResource (Lnet/minecraft/util/ResourceLocation;)Ljava/util/Optional; getResource -customskinloader/fake/itf/IFakeMinecraft customskinloader/fake/itf/IFakeMinecraft - func_195551_G ()Lnet/minecraft/resources/IResourceManager; O -net/minecraft/client/Minecraft bib - gameDir w - getCurrentServerData ()Lnet/minecraft/client/multiplayer/ServerData; C - getMinecraft ()Lnet/minecraft/client/Minecraft; z - getResourceManager ()Lnet/minecraft/client/resources/IResourceManager; O - getSkinManager ()Lnet/minecraft/client/resources/SkinManager; Y - getTextureManager ()Lnet/minecraft/client/renderer/texture/TextureManager; N -net/minecraft/client/gui/GuiPlayerTabOverlay bjq -net/minecraft/client/gui/spectator/PlayerMenuObject boo -net/minecraft/client/multiplayer/ServerData bse - serverIP b -net/minecraft/client/renderer/RenderType net/minecraft/client/renderer/RenderType - func_228644_e_ (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; func_228644_e_ -net/minecraft/client/renderer/IImageBuffer but - func_195786_a (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; func_195786_a - parseUserSkin (Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage; a - skinAvailable ()V a -net/minecraft/client/renderer/ThreadDownloadImageData cdh -net/minecraft/client/renderer/entity/RenderPlayer cct -net/minecraft/client/renderer/entity/layers/LayerCape cbr -net/minecraft/client/renderer/texture/ITextureObject cds -net/minecraft/client/renderer/texture/NativeImage com/mojang/blaze3d/platform/NativeImage - func_195699_a (IIIIIIZZ)V func_195699_a - func_195700_a (III)V func_195700_a - func_195702_a ()I func_195702_a - func_195703_a (Lnet/minecraft/client/renderer/texture/NativeImage;)V func_195703_a - func_195709_a (II)I func_195709_a - func_195713_a (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; func_195713_a - func_195714_b ()I func_195714_b - func_195715_a (IIIII)V func_195715_a -net/minecraft/client/renderer/texture/SimpleTexture cdm -net/minecraft/client/renderer/texture/TextureManager cdr - getTexture (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/texture/ITextureObject; b - loadTexture (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/ITextureObject;)Z a -net/minecraft/client/resources/DefaultPlayerSkin cef - getDefaultSkin (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; a -net/minecraft/client/resources/IResource ceo - getInputStream ()Ljava/io/InputStream; b -net/minecraft/client/resources/IResourceManager cep - getResource (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/resources/IResource; a -net/minecraft/client/resources/SkinManager cex - loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a - loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;)Lnet/minecraft/util/ResourceLocation; a -net/minecraft/client/resources/SkinManager$3 cex$3 - field_152801_c c - field_152802_d d -net/minecraft/client/resources/SkinManager$SkinAvailableCallback cex$a - skinAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V a -net/minecraft/resources/IResource ceo -net/minecraft/resources/IResourceManager cep -net/minecraft/util/ResourceLocation nf -net/minecraft/util/StringUtils rp - stripControlCodes (Ljava/lang/String;)Ljava/lang/String; a diff --git a/Vanilla/1.12.2/build.properties b/Vanilla/1.12.2/build.properties deleted file mode 100644 index e5c348f..0000000 --- a/Vanilla/1.12.2/build.properties +++ /dev/null @@ -1,8 +0,0 @@ -minecraft_version=1.12.2 -minecraft_full_versions=1.12.2 -java_full_versions=8,9,10,11,12,13,14,15,16,17,18 -#forge gradle needs forge version -forge_mc_version=1.12.2 -forge_version=14.23.5.2768 -mappings_version=stable_39 -srg_notch_map=1.12.2.tsrg diff --git a/Vanilla/1.12.2/mixin.tsrg b/Vanilla/1.12.2/mixin.tsrg deleted file mode 100644 index 7ce1887..0000000 --- a/Vanilla/1.12.2/mixin.tsrg +++ /dev/null @@ -1,46 +0,0 @@ -com/mojang/blaze3d/matrix/MatrixStack com/mojang/blaze3d/matrix/MatrixStack -net/minecraft/client/Minecraft bib - isIntegratedServerRunning ()Z D -net/minecraft/client/entity/AbstractClientPlayer bua - getDownloadImageSkin (Lnet/minecraft/util/ResourceLocation;Ljava/lang/String;)Lnet/minecraft/client/renderer/ThreadDownloadImageData; a - getLocationSkin (Ljava/lang/String;)Lnet/minecraft/util/ResourceLocation; e -net/minecraft/client/gui/GuiPlayerTabOverlay bjq - renderPlayerlist (ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V a - renderPlayerlist (Lcom/mojang/blaze3d/matrix/MatrixStack;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V func_238523_a_ -net/minecraft/client/gui/spectator/PlayerMenuObject boo -net/minecraft/client/model/ModelRenderer brs -net/minecraft/client/renderer/IImageBuffer but -net/minecraft/client/renderer/IRenderTypeBuffer net/minecraft/client/renderer/IRenderTypeBuffer -net/minecraft/client/renderer/RenderType net/minecraft/client/renderer/RenderType - getEntitySolid (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; func_228634_a_ -net/minecraft/client/renderer/ThreadDownloadImageData cdh - bufferedImage l - textureUploaded n - processTask field_229155_i_ - loadTexture (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; func_229159_a_ - processLegacySkin (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; func_229163_c_ -net/minecraft/client/renderer/entity/RenderPlayer cct - renderItem (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;ILnet/minecraft/client/entity/AbstractClientPlayer;Lnet/minecraft/client/model/ModelRenderer;Lnet/minecraft/client/model/ModelRenderer;)V func_229145_a_ - renderItem (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;Lnet/minecraft/client/entity/AbstractClientPlayer;Lnet/minecraft/client/model/ModelRenderer;Lnet/minecraft/client/model/ModelRenderer;)V func_229145_a_ -net/minecraft/client/renderer/entity/layers/LayerCape cbr - doRenderLayer (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;ILnet/minecraft/client/entity/AbstractClientPlayer;FFFFFF)V func_225628_a_ - doRenderLayer (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;ILnet/minecraft/client/entity/AbstractClientPlayer;FFFFFFF)V func_225628_a_ -net/minecraft/client/renderer/texture/NativeImage net/minecraft/client/renderer/texture/NativeImage -net/minecraft/client/renderer/texture/TextureManager cdr -net/minecraft/client/resources/SkinManager cex - func_210275_a (Lcom/mojang/authlib/GameProfile;ZLnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)V func_210275_a - func_229297_b_ (Ljava/util/Map;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)V func_229297_b_ - loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a - loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)Lnet/minecraft/util/ResourceLocation; a - loadSkinFromCache (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; a -net/minecraft/client/resources/SkinManager$3 cex$3 - run ()V run -net/minecraft/client/resources/SkinManager$3$1 cex$3$1 - field_152803_a a - field_152804_b b - run ()V run -net/minecraft/client/resources/SkinManager$SkinAvailableCallback cex$a - skinAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V a -net/minecraft/scoreboard/ScoreObjective bhg -net/minecraft/scoreboard/Scoreboard bhk -net/minecraft/util/ResourceLocation nf diff --git a/Vanilla/1.12.2/resource/mixins.customskinloader.json b/Vanilla/1.12.2/resource/mixins.customskinloader.json deleted file mode 100644 index b874f95..0000000 --- a/Vanilla/1.12.2/resource/mixins.customskinloader.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "compatibilityLevel": "JAVA_8", - "mixinPriority": 1010, - "package": "customskinloader.mixin", - "client": [ - "MixinGuiPlayerTabOverlay", - "MixinIResource", - "MixinIResourceManager", - "MixinMinecraft", - "MixinPlayerMenuObject", - "MixinSkinManager", - "MixinSkinManager$3", - "MixinSkinManager$3$1", - "MixinThreadDownloadImageDataV1" - ], - "refmap": "mixins.customskinloader.refmap.json", - "injectors": { - "defaultRequire": 1 - } -} diff --git a/Vanilla/1.16.5/1.16.5.tsrg b/Vanilla/1.16.5/1.16.5.tsrg deleted file mode 100644 index 6f2149c..0000000 --- a/Vanilla/1.16.5/1.16.5.tsrg +++ /dev/null @@ -1,62 +0,0 @@ -customskinloader/fake/itf/IFakeIResource$V1 customskinloader/fake/itf/IFakeIResource$V1 - func_199027_b ()Ljava/io/InputStream; b -customskinloader/fake/itf/IFakeIResource$V2 customskinloader/fake/itf/IFakeIResource$V2 - open ()Ljava/io/InputStream; open -customskinloader/fake/itf/IFakeIResourceManager customskinloader/fake/itf/IFakeIResourceManager - func_199002_a (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/resources/IResource; a - getResource (Lnet/minecraft/util/ResourceLocation;)Ljava/util/Optional; getResource -customskinloader/fake/itf/IFakeMinecraft customskinloader/fake/itf/IFakeMinecraft - func_195551_G ()Lnet/minecraft/resources/IResourceManager; N -net/minecraft/client/Minecraft djz - gameDir n - getCurrentServerData ()Lnet/minecraft/client/multiplayer/ServerData; E - getMinecraft ()Lnet/minecraft/client/Minecraft; C - getResourceManager ()Lnet/minecraft/client/resources/IResourceManager; N - getSkinManager ()Lnet/minecraft/client/resources/SkinManager; Z - getTextureManager ()Lnet/minecraft/client/renderer/texture/TextureManager; M -net/minecraft/client/gui/GuiPlayerTabOverlay dly -net/minecraft/client/gui/spectator/PlayerMenuObject dso -net/minecraft/client/multiplayer/ServerData dwz - serverIP b -net/minecraft/client/renderer/RenderType eao - func_228644_e_ (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; h -net/minecraft/client/renderer/IImageBuffer net/minecraft/client/renderer/IImageBuffer - func_195786_a (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; func_195786_a - parseUserSkin (Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage; func_78432_a - skinAvailable ()V func_152634_a -net/minecraft/client/renderer/ThreadDownloadImageData ejt -net/minecraft/client/renderer/entity/RenderPlayer ejk -net/minecraft/client/renderer/entity/layers/LayerCape ehu -net/minecraft/client/renderer/texture/ITextureObject net/minecraft/client/renderer/texture/ITextureObject -net/minecraft/client/renderer/texture/NativeImage det - func_195699_a (IIIIIIZZ)V a - func_195700_a (III)V a - func_195702_a ()I a - func_195703_a (Lnet/minecraft/client/renderer/texture/NativeImage;)V a - func_195709_a (II)I a - func_195713_a (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; a - func_195714_b ()I b - func_195715_a (IIIII)V a -net/minecraft/client/renderer/texture/SimpleTexture ejy -net/minecraft/client/renderer/texture/TextureManager ekd - getTexture (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/texture/ITextureObject; func_110581_b - loadTexture (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/ITextureObject;)Z func_110579_a -net/minecraft/client/resources/DefaultPlayerSkin ekj - getDefaultSkin (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; a -net/minecraft/client/resources/IResource acg - getInputStream ()Ljava/io/InputStream; b -net/minecraft/client/resources/IResourceManager ach - getResource (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/resources/IResource; a -net/minecraft/client/resources/SkinManager eks - loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a - loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;)Lnet/minecraft/util/ResourceLocation; a -net/minecraft/client/resources/SkinManager$3 eks$3 - field_152801_c field_152801_c - field_152802_d field_152802_d -net/minecraft/client/resources/SkinManager$SkinAvailableCallback eks$a - skinAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V onSkinTextureAvailable -net/minecraft/resources/IResource acg -net/minecraft/resources/IResourceManager ach -net/minecraft/util/ResourceLocation vk -net/minecraft/util/StringUtils aft - stripControlCodes (Ljava/lang/String;)Ljava/lang/String; a diff --git a/Vanilla/1.16.5/build.properties b/Vanilla/1.16.5/build.properties deleted file mode 100644 index eccc13f..0000000 --- a/Vanilla/1.16.5/build.properties +++ /dev/null @@ -1,8 +0,0 @@ -minecraft_version=1.16.5 -minecraft_full_versions=1.16.5 -java_full_versions=8,9,10,11,12,13,14,15,16,17,18 -#forge gradle needs forge version -forge_mc_version=1.12.2 -forge_version=14.23.5.2768 -mappings_version=stable_39 -srg_notch_map=1.16.5.tsrg diff --git a/Vanilla/1.16.5/mixin.tsrg b/Vanilla/1.16.5/mixin.tsrg deleted file mode 100644 index 6815c61..0000000 --- a/Vanilla/1.16.5/mixin.tsrg +++ /dev/null @@ -1,46 +0,0 @@ -com/mojang/blaze3d/matrix/MatrixStack dfm -net/minecraft/client/Minecraft djz - isIntegratedServerRunning ()Z F -net/minecraft/client/entity/AbstractClientPlayer dzj - getDownloadImageSkin (Lnet/minecraft/util/ResourceLocation;Ljava/lang/String;)Lnet/minecraft/client/renderer/ThreadDownloadImageData; a - getLocationSkin (Ljava/lang/String;)Lnet/minecraft/util/ResourceLocation; d -net/minecraft/client/gui/GuiPlayerTabOverlay dly - renderPlayerlist (ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V func_175249_a - renderPlayerlist (Lcom/mojang/blaze3d/matrix/MatrixStack;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V a -net/minecraft/client/gui/spectator/PlayerMenuObject ehx -net/minecraft/client/model/ModelRenderer dwn -net/minecraft/client/renderer/IImageBuffer net/minecraft/client/renderer/IImageBuffer -net/minecraft/client/renderer/IRenderTypeBuffer eag -net/minecraft/client/renderer/RenderType eao - getEntitySolid (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; b -net/minecraft/client/renderer/ThreadDownloadImageData ejt - bufferedImage field_110560_d - textureUploaded k - processTask i - loadTexture (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; a - processLegacySkin (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; c -net/minecraft/client/renderer/entity/RenderPlayer ejk - renderItem (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;ILnet/minecraft/client/entity/AbstractClientPlayer;Lnet/minecraft/client/model/ModelRenderer;Lnet/minecraft/client/model/ModelRenderer;)V a - renderItem (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;Lnet/minecraft/client/entity/AbstractClientPlayer;Lnet/minecraft/client/model/ModelRenderer;Lnet/minecraft/client/model/ModelRenderer;)V func_229145_a_ -net/minecraft/client/renderer/entity/layers/LayerCape ehu - doRenderLayer (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;ILnet/minecraft/client/entity/AbstractClientPlayer;FFFFFF)V a - doRenderLayer (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;ILnet/minecraft/client/entity/AbstractClientPlayer;FFFFFFF)V func_225628_a_ -net/minecraft/client/renderer/texture/NativeImage det -net/minecraft/client/renderer/texture/TextureManager ekd -net/minecraft/client/resources/SkinManager eks - func_210275_a (Lcom/mojang/authlib/GameProfile;ZLnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)V a - func_229297_b_ (Ljava/util/Map;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)V b - loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a - loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)Lnet/minecraft/util/ResourceLocation; a - loadSkinFromCache (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; a -net/minecraft/client/resources/SkinManager$3 eks$3 - run ()V run -net/minecraft/client/resources/SkinManager$3$1 eks$3$1 - field_152803_a field_152803_a - field_152804_b field_152804_b - run ()V run -net/minecraft/client/resources/SkinManager$SkinAvailableCallback eks$a - skinAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V onSkinTextureAvailable -net/minecraft/scoreboard/ScoreObjective ddk -net/minecraft/scoreboard/Scoreboard ddn -net/minecraft/util/ResourceLocation vk diff --git a/Vanilla/1.16.5/resource/mixins.customskinloader.json b/Vanilla/1.16.5/resource/mixins.customskinloader.json deleted file mode 100644 index 20cb47c..0000000 --- a/Vanilla/1.16.5/resource/mixins.customskinloader.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "compatibilityLevel": "JAVA_8", - "mixinPriority": 1010, - "package": "customskinloader.mixin", - "client": [ - "MixinGuiPlayerTabOverlay", - "MixinIResource", - "MixinIResourceManager", - "MixinLayerCape", - "MixinMinecraft", - "MixinRenderPlayer", - "MixinSkinManager", - "MixinSkinManager$V1", - "MixinSkinManager$V2", - "MixinThreadDownloadImageDataV2" - ], - "refmap": "mixins.customskinloader.refmap.json", - "injectors": { - "defaultRequire": 1 - } -} diff --git a/Vanilla/1.18.2/1.18.2.tsrg b/Vanilla/1.18.2/1.18.2.tsrg deleted file mode 100644 index 3cace4a..0000000 --- a/Vanilla/1.18.2/1.18.2.tsrg +++ /dev/null @@ -1,62 +0,0 @@ -customskinloader/fake/itf/IFakeIResource$V1 customskinloader/fake/itf/IFakeIResource$V1 - func_199027_b ()Ljava/io/InputStream; b -customskinloader/fake/itf/IFakeIResource$V2 customskinloader/fake/itf/IFakeIResource$V2 - open ()Ljava/io/InputStream; open -customskinloader/fake/itf/IFakeIResourceManager customskinloader/fake/itf/IFakeIResourceManager - func_199002_a (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/resources/IResource; getResource - getResource (Lnet/minecraft/util/ResourceLocation;)Ljava/util/Optional; getResource -customskinloader/fake/itf/IFakeMinecraft customskinloader/fake/itf/IFakeMinecraft - func_195551_G ()Lnet/minecraft/resources/IResourceManager; N -net/minecraft/client/Minecraft dyr - gameDir o - getCurrentServerData ()Lnet/minecraft/client/multiplayer/ServerData; F - getMinecraft ()Lnet/minecraft/client/Minecraft; D - getResourceManager ()Lnet/minecraft/client/resources/IResourceManager; N - getSkinManager ()Lnet/minecraft/client/resources/SkinManager; Y - getTextureManager ()Lnet/minecraft/client/renderer/texture/TextureManager; M -net/minecraft/client/gui/GuiPlayerTabOverlay eau -net/minecraft/client/gui/spectator/PlayerMenuObject ehx -net/minecraft/client/multiplayer/ServerData emx - serverIP b -net/minecraft/client/renderer/RenderType era - func_228644_e_ (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; h -net/minecraft/client/renderer/IImageBuffer net/minecraft/client/renderer/IImageBuffer - func_195786_a (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; func_195786_a - parseUserSkin (Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage; func_78432_a - skinAvailable ()V func_152634_a -net/minecraft/client/renderer/ThreadDownloadImageData fap -net/minecraft/client/renderer/entity/RenderPlayer faf -net/minecraft/client/renderer/entity/layers/LayerCape eyo -net/minecraft/client/renderer/texture/ITextureObject net/minecraft/client/renderer/texture/ITextureObject -net/minecraft/client/renderer/texture/NativeImage dsn - func_195699_a (IIIIIIZZ)V a - func_195700_a (III)V a - func_195702_a ()I a - func_195703_a (Lnet/minecraft/client/renderer/texture/NativeImage;)V a - func_195709_a (II)I a - func_195713_a (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; a - func_195714_b ()I b - func_195715_a (IIIII)V a -net/minecraft/client/renderer/texture/SimpleTexture fau -net/minecraft/client/renderer/texture/TextureManager faz - getTexture (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/texture/ITextureObject; func_110581_b - loadTexture (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/ITextureObject;)Z func_110579_a -net/minecraft/client/resources/DefaultPlayerSkin fbf - getDefaultSkin (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; a -net/minecraft/client/resources/IResource afz - getInputStream ()Ljava/io/InputStream; b -net/minecraft/client/resources/IResourceManager aga - getResource (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/resources/IResource; getResource -net/minecraft/client/resources/SkinManager fbo - loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a - loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;)Lnet/minecraft/util/ResourceLocation; a -net/minecraft/client/resources/SkinManager$3 fbo$3 - field_152801_c field_152801_c - field_152802_d field_152802_d -net/minecraft/client/resources/SkinManager$SkinAvailableCallback fbo$a - skinAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V onSkinTextureAvailable -net/minecraft/resources/IResource afz -net/minecraft/resources/IResourceManager aga -net/minecraft/util/ResourceLocation yt -net/minecraft/util/StringUtils aju - stripControlCodes (Ljava/lang/String;)Ljava/lang/String; a diff --git a/Vanilla/1.18.2/build.properties b/Vanilla/1.18.2/build.properties deleted file mode 100644 index c9b881f..0000000 --- a/Vanilla/1.18.2/build.properties +++ /dev/null @@ -1,8 +0,0 @@ -minecraft_version=1.18.2 -minecraft_full_versions=1.18.2 -java_full_versions=17,18 -#forge gradle needs forge version -forge_mc_version=1.12.2 -forge_version=14.23.5.2768 -mappings_version=stable_39 -srg_notch_map=1.18.2.tsrg diff --git a/Vanilla/1.18.2/mixin.tsrg b/Vanilla/1.18.2/mixin.tsrg deleted file mode 100644 index 0873f7a..0000000 --- a/Vanilla/1.18.2/mixin.tsrg +++ /dev/null @@ -1,46 +0,0 @@ -com/mojang/blaze3d/matrix/MatrixStack dtm -net/minecraft/client/Minecraft dyr - isIntegratedServerRunning ()Z G -net/minecraft/client/entity/AbstractClientPlayer ept - getDownloadImageSkin (Lnet/minecraft/util/ResourceLocation;Ljava/lang/String;)Lnet/minecraft/client/renderer/ThreadDownloadImageData; a - getLocationSkin (Ljava/lang/String;)Lnet/minecraft/util/ResourceLocation; d -net/minecraft/client/gui/GuiPlayerTabOverlay eau - renderPlayerlist (ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V func_175249_a - renderPlayerlist (Lcom/mojang/blaze3d/matrix/MatrixStack;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V a -net/minecraft/client/gui/spectator/PlayerMenuObject ehx -net/minecraft/client/model/ModelRenderer emb -net/minecraft/client/renderer/IImageBuffer net/minecraft/client/renderer/IImageBuffer -net/minecraft/client/renderer/IRenderTypeBuffer eqs -net/minecraft/client/renderer/RenderType era - getEntitySolid (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; b -net/minecraft/client/renderer/ThreadDownloadImageData fap - bufferedImage field_110560_d - textureUploaded o - processTask m - loadTexture (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; a - processLegacySkin (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; c -net/minecraft/client/renderer/entity/RenderPlayer faf - renderItem (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;ILnet/minecraft/client/entity/AbstractClientPlayer;Lnet/minecraft/client/model/ModelRenderer;Lnet/minecraft/client/model/ModelRenderer;)V a - renderItem (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;Lnet/minecraft/client/entity/AbstractClientPlayer;Lnet/minecraft/client/model/ModelRenderer;Lnet/minecraft/client/model/ModelRenderer;)V func_229145_a_ -net/minecraft/client/renderer/entity/layers/LayerCape eyo - doRenderLayer (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;ILnet/minecraft/client/entity/AbstractClientPlayer;FFFFFF)V a - doRenderLayer (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;ILnet/minecraft/client/entity/AbstractClientPlayer;FFFFFFF)V func_225628_a_ -net/minecraft/client/renderer/texture/NativeImage dsn -net/minecraft/client/renderer/texture/TextureManager faz -net/minecraft/client/resources/SkinManager fbo - func_210275_a (Lcom/mojang/authlib/GameProfile;ZLnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)V a - func_229297_b_ (Ljava/util/Map;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)V b - loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a - loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)Lnet/minecraft/util/ResourceLocation; a - loadSkinFromCache (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; a -net/minecraft/client/resources/SkinManager$3 fbo$3 - run ()V run -net/minecraft/client/resources/SkinManager$3$1 fbo$3$1 - field_152803_a field_152803_a - field_152804_b field_152804_b - run ()V run -net/minecraft/client/resources/SkinManager$SkinAvailableCallback fbo$a - skinAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V onSkinTextureAvailable -net/minecraft/scoreboard/ScoreObjective dqj -net/minecraft/scoreboard/Scoreboard dqm -net/minecraft/util/ResourceLocation yt diff --git a/Vanilla/1.18.2/resource/mixins.customskinloader.json b/Vanilla/1.18.2/resource/mixins.customskinloader.json deleted file mode 100644 index 6f52593..0000000 --- a/Vanilla/1.18.2/resource/mixins.customskinloader.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "compatibilityLevel": "JAVA_8", - "mixinPriority": 1010, - "package": "customskinloader.mixin", - "client": [ - "MixinGuiPlayerTabOverlay", - "MixinIResource", - "MixinIResourceManager", - "MixinLayerCape", - "MixinMinecraft", - "MixinRenderPlayer", - "MixinSkinManager", - "MixinSkinManager$V1", - "MixinSkinManager$V2", - "MixinThreadDownloadImageDataV3" - ], - "refmap": "mixins.customskinloader.refmap.json", - "injectors": { - "defaultRequire": 1 - } -} diff --git a/Vanilla/1.19.3/1.19.3.tsrg b/Vanilla/1.19.3/1.19.3.tsrg deleted file mode 100644 index 3dcd16d..0000000 --- a/Vanilla/1.19.3/1.19.3.tsrg +++ /dev/null @@ -1,62 +0,0 @@ -customskinloader/fake/itf/IFakeIResource$V1 customskinloader/fake/itf/IFakeIResource$V1 - func_199027_b ()Ljava/io/InputStream; func_199027_b -customskinloader/fake/itf/IFakeIResource$V2 customskinloader/fake/itf/IFakeIResource$V2 - open ()Ljava/io/InputStream; d -customskinloader/fake/itf/IFakeIResourceManager customskinloader/fake/itf/IFakeIResourceManager - func_199002_a (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/resources/IResource; func_199002_a - getResource (Lnet/minecraft/util/ResourceLocation;)Ljava/util/Optional; getResource -customskinloader/fake/itf/IFakeMinecraft customskinloader/fake/itf/IFakeMinecraft - func_195551_G ()Lnet/minecraft/resources/IResourceManager; Y -net/minecraft/client/Minecraft ejf - gameDir p - getCurrentServerData ()Lnet/minecraft/client/multiplayer/ServerData; P - getMinecraft ()Lnet/minecraft/client/Minecraft; N - getResourceManager ()Lnet/minecraft/client/resources/IResourceManager; Y - getSkinManager ()Lnet/minecraft/client/resources/SkinManager; ak - getTextureManager ()Lnet/minecraft/client/renderer/texture/TextureManager; X -net/minecraft/client/gui/GuiPlayerTabOverlay elx -net/minecraft/client/gui/spectator/PlayerMenuObject ett -net/minecraft/client/multiplayer/ServerData ezg - serverIP b -net/minecraft/client/renderer/RenderType fed - func_228644_e_ (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; h -net/minecraft/client/renderer/IImageBuffer net/minecraft/client/renderer/IImageBuffer - func_195786_a (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; func_195786_a - parseUserSkin (Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage; func_78432_a - skinAvailable ()V func_152634_a -net/minecraft/client/renderer/ThreadDownloadImageData fnz -net/minecraft/client/renderer/entity/RenderPlayer fnp -net/minecraft/client/renderer/entity/layers/LayerCape flx -net/minecraft/client/renderer/texture/ITextureObject net/minecraft/client/renderer/texture/ITextureObject -net/minecraft/client/renderer/texture/NativeImage ede - func_195699_a (IIIIIIZZ)V a - func_195700_a (III)V a - func_195702_a ()I a - func_195703_a (Lnet/minecraft/client/renderer/texture/NativeImage;)V a - func_195709_a (II)I a - func_195713_a (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; a - func_195714_b ()I b - func_195715_a (IIIII)V a -net/minecraft/client/renderer/texture/SimpleTexture foe -net/minecraft/client/renderer/texture/TextureManager fom - getTexture (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/texture/ITextureObject; func_110581_b - loadTexture (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/ITextureObject;)Z func_110579_a -net/minecraft/client/resources/DefaultPlayerSkin fpb - getDefaultSkin (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; a -net/minecraft/client/resources/IResource akc - getInputStream ()Ljava/io/InputStream; d -net/minecraft/client/resources/IResourceManager ake - getResource (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/resources/IResource; getResource -net/minecraft/client/resources/SkinManager fpj - loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a - loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;)Lnet/minecraft/util/ResourceLocation; a -net/minecraft/client/resources/SkinManager$3 fpj$3 - field_152801_c field_152801_c - field_152802_d field_152802_d -net/minecraft/client/resources/SkinManager$SkinAvailableCallback fpj$a - skinAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V onSkinTextureAvailable -net/minecraft/resources/IResource akc -net/minecraft/resources/IResourceManager ake -net/minecraft/util/ResourceLocation acf -net/minecraft/util/StringUtils aos - stripControlCodes (Ljava/lang/String;)Ljava/lang/String; a diff --git a/Vanilla/1.19.3/build.properties b/Vanilla/1.19.3/build.properties deleted file mode 100644 index 73dabb1..0000000 --- a/Vanilla/1.19.3/build.properties +++ /dev/null @@ -1,8 +0,0 @@ -minecraft_version=1.19.3 -minecraft_full_versions=1.19.3 -java_full_versions=16,17,18 -#forge gradle needs forge version -forge_mc_version=1.12.2 -forge_version=14.23.5.2768 -mappings_version=stable_39 -srg_notch_map=1.19.3.tsrg diff --git a/Vanilla/1.19.3/mixin.tsrg b/Vanilla/1.19.3/mixin.tsrg deleted file mode 100644 index 156b828..0000000 --- a/Vanilla/1.19.3/mixin.tsrg +++ /dev/null @@ -1,46 +0,0 @@ -com/mojang/blaze3d/matrix/MatrixStack eed -net/minecraft/client/Minecraft ejf - isIntegratedServerRunning ()Z Q -net/minecraft/client/entity/AbstractClientPlayer fcw - getDownloadImageSkin (Lnet/minecraft/util/ResourceLocation;Ljava/lang/String;)Lnet/minecraft/client/renderer/ThreadDownloadImageData; a - getLocationSkin (Ljava/lang/String;)Lnet/minecraft/util/ResourceLocation; c -net/minecraft/client/gui/GuiPlayerTabOverlay elx - renderPlayerlist (ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V func_175249_a - renderPlayerlist (Lcom/mojang/blaze3d/matrix/MatrixStack;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V a -net/minecraft/client/gui/spectator/PlayerMenuObject ett -net/minecraft/client/model/ModelRenderer eyh -net/minecraft/client/renderer/IImageBuffer net/minecraft/client/renderer/IImageBuffer -net/minecraft/client/renderer/IRenderTypeBuffer fdv -net/minecraft/client/renderer/RenderType fed - getEntitySolid (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; b -net/minecraft/client/renderer/ThreadDownloadImageData fnz - bufferedImage field_110560_d - textureUploaded o - processTask m - loadTexture (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; a - processLegacySkin (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; c -net/minecraft/client/renderer/entity/RenderPlayer fnp - renderItem (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;ILnet/minecraft/client/entity/AbstractClientPlayer;Lnet/minecraft/client/model/ModelRenderer;Lnet/minecraft/client/model/ModelRenderer;)V a - renderItem (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;Lnet/minecraft/client/entity/AbstractClientPlayer;Lnet/minecraft/client/model/ModelRenderer;Lnet/minecraft/client/model/ModelRenderer;)V func_229145_a_ -net/minecraft/client/renderer/entity/layers/LayerCape flx - doRenderLayer (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;ILnet/minecraft/client/entity/AbstractClientPlayer;FFFFFF)V a - doRenderLayer (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;ILnet/minecraft/client/entity/AbstractClientPlayer;FFFFFFF)V func_225628_a_ -net/minecraft/client/renderer/texture/NativeImage ede -net/minecraft/client/renderer/texture/TextureManager fom -net/minecraft/client/resources/SkinManager fpj - func_210275_a (Lcom/mojang/authlib/GameProfile;ZLnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)V a - func_229297_b_ (Ljava/util/Map;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)V b - loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a - loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)Lnet/minecraft/util/ResourceLocation; a - loadSkinFromCache (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; a -net/minecraft/client/resources/SkinManager$3 fpj$3 - run ()V run -net/minecraft/client/resources/SkinManager$3$1 fpj$3$1 - field_152803_a field_152803_a - field_152804_b field_152804_b - run ()V run -net/minecraft/client/resources/SkinManager$SkinAvailableCallback fpj$a - skinAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V onSkinTextureAvailable -net/minecraft/scoreboard/ScoreObjective eaz -net/minecraft/scoreboard/Scoreboard ebc -net/minecraft/util/ResourceLocation acf diff --git a/Vanilla/1.19.3/resource/mixins.customskinloader.json b/Vanilla/1.19.3/resource/mixins.customskinloader.json deleted file mode 100644 index 6f52593..0000000 --- a/Vanilla/1.19.3/resource/mixins.customskinloader.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "compatibilityLevel": "JAVA_8", - "mixinPriority": 1010, - "package": "customskinloader.mixin", - "client": [ - "MixinGuiPlayerTabOverlay", - "MixinIResource", - "MixinIResourceManager", - "MixinLayerCape", - "MixinMinecraft", - "MixinRenderPlayer", - "MixinSkinManager", - "MixinSkinManager$V1", - "MixinSkinManager$V2", - "MixinThreadDownloadImageDataV3" - ], - "refmap": "mixins.customskinloader.refmap.json", - "injectors": { - "defaultRequire": 1 - } -} diff --git a/Vanilla/1.8.9/1.8.9.tsrg b/Vanilla/1.8.9/1.8.9.tsrg deleted file mode 100644 index c8843b8..0000000 --- a/Vanilla/1.8.9/1.8.9.tsrg +++ /dev/null @@ -1,62 +0,0 @@ -customskinloader/fake/itf/IFakeIResource$V1 customskinloader/fake/itf/IFakeIResource$V1 - func_199027_b ()Ljava/io/InputStream; b -customskinloader/fake/itf/IFakeIResource$V2 customskinloader/fake/itf/IFakeIResource$V2 - open ()Ljava/io/InputStream; open -customskinloader/fake/itf/IFakeIResourceManager customskinloader/fake/itf/IFakeIResourceManager - func_199002_a (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/resources/IResource; a - getResource (Lnet/minecraft/util/ResourceLocation;)Ljava/util/Optional; getResource -customskinloader/fake/itf/IFakeMinecraft customskinloader/fake/itf/IFakeMinecraft - func_195551_G ()Lnet/minecraft/resources/IResourceManager; Q -net/minecraft/client/Minecraft ave - gameDir v - getCurrentServerData ()Lnet/minecraft/client/multiplayer/ServerData; D - getMinecraft ()Lnet/minecraft/client/Minecraft; A - getResourceManager ()Lnet/minecraft/client/resources/IResourceManager; Q - getSkinManager ()Lnet/minecraft/client/resources/SkinManager; ab - getTextureManager ()Lnet/minecraft/client/renderer/texture/TextureManager; P -net/minecraft/client/gui/GuiPlayerTabOverlay awh -net/minecraft/client/gui/spectator/PlayerMenuObject bad -net/minecraft/client/multiplayer/ServerData bde - serverIP b -net/minecraft/client/renderer/RenderType net/minecraft/client/renderer/RenderType - func_228644_e_ (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; func_228644_e_ -net/minecraft/client/renderer/IImageBuffer bfm - func_195786_a (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; func_195786_a - parseUserSkin (Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage; a - skinAvailable ()V a -net/minecraft/client/renderer/ThreadDownloadImageData bma -net/minecraft/client/renderer/entity/RenderPlayer bln -net/minecraft/client/renderer/entity/layers/LayerCape bkp -net/minecraft/client/renderer/texture/ITextureObject bmk -net/minecraft/client/renderer/texture/NativeImage com/mojang/blaze3d/platform/NativeImage - func_195699_a (IIIIIIZZ)V func_195699_a - func_195700_a (III)V func_195700_a - func_195702_a ()I func_195702_a - func_195703_a (Lnet/minecraft/client/renderer/texture/NativeImage;)V func_195703_a - func_195709_a (II)I func_195709_a - func_195713_a (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; func_195713_a - func_195714_b ()I func_195714_b - func_195715_a (IIIII)V func_195715_a -net/minecraft/client/renderer/texture/SimpleTexture bme -net/minecraft/client/renderer/texture/TextureManager bmj - getTexture (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/texture/ITextureObject; b - loadTexture (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/ITextureObject;)Z a -net/minecraft/client/resources/DefaultPlayerSkin bmz - getDefaultSkin (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; a -net/minecraft/client/resources/IResource bnh - getInputStream ()Ljava/io/InputStream; b -net/minecraft/client/resources/IResourceManager bni - getResource (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/resources/IResource; a -net/minecraft/client/resources/SkinManager bnp - loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a - loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;)Lnet/minecraft/util/ResourceLocation; a -net/minecraft/client/resources/SkinManager$3 bnp$3 - field_152801_c c - field_152802_d d -net/minecraft/client/resources/SkinManager$SkinAvailableCallback bnp$a - skinAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V a -net/minecraft/resources/IResource bnh -net/minecraft/resources/IResourceManager bni -net/minecraft/util/ResourceLocation jy -net/minecraft/util/StringUtils nx - stripControlCodes (Ljava/lang/String;)Ljava/lang/String; a diff --git a/Vanilla/1.8.9/build.gradle b/Vanilla/1.8.9/build.gradle deleted file mode 100644 index 4ea0bcc..0000000 --- a/Vanilla/1.8.9/build.gradle +++ /dev/null @@ -1,27 +0,0 @@ - -dependencies { - provided "com.google.guava:guava:21.0" -} - -jar { - // Mixin 0.8 requires Guava 21.0 but Minecraft 1.8.9 uses Guava 17.0 - from configurations.provided.files.collect { - return zipTree(it).matching { filter -> - filter.include { e -> - matchInnerClass e.path as String, - "com/google/common/io/InsecureRecursiveDeleteException", - "com/google/common/io/MoreFiles", - "com/google/common/io/RecursiveDeleteOption" - } - } - } - exclude "net/**" -} - -tasks.signJar { - exclude "com/google/common/io/**" -} - -static boolean matchInnerClass(String path, String... names) { - names.any { name -> path.equals(name + ".class") || (path.startsWith(name + '$') && path.endsWith(".class")) } -} diff --git a/Vanilla/1.8.9/build.properties b/Vanilla/1.8.9/build.properties deleted file mode 100644 index 3254637..0000000 --- a/Vanilla/1.8.9/build.properties +++ /dev/null @@ -1,8 +0,0 @@ -minecraft_version=1.8.9 -minecraft_full_versions=1.8.9 -java_full_versions=8,9,10,11,12,13,14,15,16,17,18 -#forge gradle needs forge version -forge_mc_version=1.12.2 -forge_version=14.23.5.2768 -mappings_version=stable_39 -srg_notch_map=1.8.9.tsrg diff --git a/Vanilla/1.8.9/mixin.tsrg b/Vanilla/1.8.9/mixin.tsrg deleted file mode 100644 index 2889974..0000000 --- a/Vanilla/1.8.9/mixin.tsrg +++ /dev/null @@ -1,46 +0,0 @@ -com/mojang/blaze3d/matrix/MatrixStack com/mojang/blaze3d/matrix/MatrixStack -net/minecraft/client/Minecraft ave - isIntegratedServerRunning ()Z E -net/minecraft/client/entity/AbstractClientPlayer bet - getDownloadImageSkin (Lnet/minecraft/util/ResourceLocation;Ljava/lang/String;)Lnet/minecraft/client/renderer/ThreadDownloadImageData; a - getLocationSkin (Ljava/lang/String;)Lnet/minecraft/util/ResourceLocation; c -net/minecraft/client/gui/GuiPlayerTabOverlay awh - renderPlayerlist (ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V a - renderPlayerlist (Lcom/mojang/blaze3d/matrix/MatrixStack;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V func_238523_a_ -net/minecraft/client/gui/spectator/PlayerMenuObject bad -net/minecraft/client/model/ModelRenderer bct -net/minecraft/client/renderer/IImageBuffer bfm -net/minecraft/client/renderer/IRenderTypeBuffer net/minecraft/client/renderer/IRenderTypeBuffer -net/minecraft/client/renderer/RenderType net/minecraft/client/renderer/RenderType - getEntitySolid (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; func_228634_a_ -net/minecraft/client/renderer/ThreadDownloadImageData bma - bufferedImage l - textureUploaded n - processTask field_229155_i_ - loadTexture (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; func_229159_a_ - processLegacySkin (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; func_229163_c_ -net/minecraft/client/renderer/entity/RenderPlayer bln - renderItem (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;ILnet/minecraft/client/entity/AbstractClientPlayer;Lnet/minecraft/client/model/ModelRenderer;Lnet/minecraft/client/model/ModelRenderer;)V func_229145_a_ - renderItem (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;Lnet/minecraft/client/entity/AbstractClientPlayer;Lnet/minecraft/client/model/ModelRenderer;Lnet/minecraft/client/model/ModelRenderer;)V func_229145_a_ -net/minecraft/client/renderer/entity/layers/LayerCape bkp - doRenderLayer (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;ILnet/minecraft/client/entity/AbstractClientPlayer;FFFFFF)V func_225628_a_ - doRenderLayer (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;ILnet/minecraft/client/entity/AbstractClientPlayer;FFFFFFF)V func_225628_a_ -net/minecraft/client/renderer/texture/NativeImage net/minecraft/client/renderer/texture/NativeImage -net/minecraft/client/renderer/texture/TextureManager bmj -net/minecraft/client/resources/SkinManager bnp - func_210275_a (Lcom/mojang/authlib/GameProfile;ZLnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)V func_210275_a - func_229297_b_ (Ljava/util/Map;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)V func_229297_b_ - loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a - loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)Lnet/minecraft/util/ResourceLocation; a - loadSkinFromCache (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; a -net/minecraft/client/resources/SkinManager$3 bnp$3 - run ()V run -net/minecraft/client/resources/SkinManager$3$1 bnp$3$1 - field_152803_a a - field_152804_b b - run ()V run -net/minecraft/client/resources/SkinManager$SkinAvailableCallback bnp$a - skinAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V a -net/minecraft/scoreboard/ScoreObjective auk -net/minecraft/scoreboard/Scoreboard auo -net/minecraft/util/ResourceLocation jy diff --git a/Vanilla/1.8.9/resource/mixins.customskinloader.json b/Vanilla/1.8.9/resource/mixins.customskinloader.json deleted file mode 100644 index b874f95..0000000 --- a/Vanilla/1.8.9/resource/mixins.customskinloader.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "compatibilityLevel": "JAVA_8", - "mixinPriority": 1010, - "package": "customskinloader.mixin", - "client": [ - "MixinGuiPlayerTabOverlay", - "MixinIResource", - "MixinIResourceManager", - "MixinMinecraft", - "MixinPlayerMenuObject", - "MixinSkinManager", - "MixinSkinManager$3", - "MixinSkinManager$3$1", - "MixinThreadDownloadImageDataV1" - ], - "refmap": "mixins.customskinloader.refmap.json", - "injectors": { - "defaultRequire": 1 - } -} diff --git a/Vanilla/Common/build.gradle b/Vanilla/Common/build.gradle deleted file mode 100644 index 6a2f439..0000000 --- a/Vanilla/Common/build.gradle +++ /dev/null @@ -1,12 +0,0 @@ -// This subproject is only to provide dependency for other subprojects. - -dependencies { - implementation project(':Common') - implementation 'org.spongepowered:mixin:0.8.5' -} - -compileJava { - // Disable Mixin AP - // Since 0.8.4, Mixin no longer provide the jar exclude AP, we should disable them manually - options.compilerArgs << "-proc:none" -} diff --git a/Vanilla/Common/build.properties b/Vanilla/Common/build.properties deleted file mode 100644 index 2c5a53a..0000000 --- a/Vanilla/Common/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -forge_mc_version=1.12.2 -forge_version=14.23.5.2768 -mappings_version=stable_39 -# this subproject is only to provide dependency for other subprojects. -is_real_project=false diff --git a/Vanilla/Common/resource/Profile.json b/Vanilla/Common/resource/Profile.json deleted file mode 100644 index 8047643..0000000 --- a/Vanilla/Common/resource/Profile.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "arguments": { - "game": [ - "--tweakClass", - "customskinloader.tweaker.Tweaker", - "--tweakClass", - "org.spongepowered.asm.launch.MixinTweaker" - ] - }, - "id": "${mcVersion}-CSL-${modShortFullVersion}", - "inheritsFrom": "${mcVersion}", - "libraries": [ - { - "downloads": { - "artifact": { - "path": "customskinloader/CustomSkinLoader_${mcVersion}/${modFullVersion}/CustomSkinLoader_${mcVersion}-${modFullVersion}.jar", - "sha1": "", - "size": 0, - "url": "https://csl.littleservice.cn/libraries/customskinloader/CustomSkinLoader_${mcVersion}/${modFullVersion}/CustomSkinLoader_${mcVersion}-${modFullVersion}.jar" - } - }, - "name": "customskinloader:CustomSkinLoader_${mcVersion}:${modFullVersion}" - }, - { - "downloads": { - "artifact": { - "path": "customskinloader/launchwrapper/2.1.9/launchwrapper-2.1.9.jar", - "sha1": "64d8ecc6f5b996fda4d585decdef3e0bd5463387", - "size": 17440, - "url": "https://csl.littleservice.cn/libraries/customskinloader/launchwrapper/2.1.9/launchwrapper-2.1.9.jar" - } - }, - "name": "customskinloader:launchwrapper:2.1.9" - }, - { - "downloads": { - "artifact": { - "path": "org/ow2/asm/asm/9.4/asm-9.4.jar", - "sha1": "b4e0e2d2e023aa317b7cfcfc916377ea348e07d1", - "size": 122445, - "url": "https://repo1.maven.org/maven2/org/ow2/asm/asm/9.4/asm-9.4.jar" - } - }, - "name": "org.ow2.asm:asm:9.4" - }, - { - "downloads": { - "artifact": { - "path": "org/ow2/asm/asm-analysis/9.4/asm-analysis-9.4.jar", - "sha1": "0a5fec9dfc039448d4fd098fbaffcaf55373b223", - "size": 34331, - "url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.4/asm-analysis-9.4.jar" - } - }, - "name": "org.ow2.asm:asm-analysis:9.4" - }, - { - "downloads": { - "artifact": { - "path": "org/ow2/asm/asm-commons/9.4/asm-commons-9.4.jar", - "sha1": "8fc2810ddbcbbec0a8bbccb3f8eda58321839912", - "size": 72781, - "url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.4/asm-commons-9.4.jar" - } - }, - "name": "org.ow2.asm:asm-commons:9.4" - }, - { - "downloads": { - "artifact": { - "path": "org/ow2/asm/asm-tree/9.4/asm-tree-9.4.jar", - "sha1": "a99175a17d7fdc18cbcbd0e8ea6a5d276844190a", - "size": 52665, - "url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.4/asm-tree-9.4.jar" - } - }, - "name": "org.ow2.asm:asm-tree:9.4" - }, - { - "downloads": { - "artifact": { - "path": "org/ow2/asm/asm-util/9.4/asm-util-9.4.jar", - "sha1": "ab1e0a84b72561dbaf1ee260321e72148ebf4b19", - "size": 91549, - "url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.4/asm-util-9.4.jar" - } - }, - "name": "org.ow2.asm:asm-util:9.4" - }, - { - "downloads": { - "artifact": { - "path": "org/spongepowered/mixin/0.8.5/mixin-0.8.5.jar", - "sha1": "9d1c0c3a304ae6697ecd477218fa61b850bf57fc", - "size": 1089277, - "url": "https://repo.spongepowered.org/repository/maven-public/org/spongepowered/mixin/0.8.5/mixin-0.8.5.jar" - } - }, - "name": "org.spongepowered:mixin:0.8.5" - } - ], - "mainClass": "net.minecraft.launchwrapper.Launch", - "minecraftArguments": "", - "releaseTime": "${releaseTime}", - "time": "${releaseTime}", - "type": "release" -} diff --git a/Vanilla/Common/source/customskinloader/mixin/MixinPlayerMenuObject.java b/Vanilla/Common/source/customskinloader/mixin/MixinPlayerMenuObject.java deleted file mode 100644 index 5ff1040..0000000 --- a/Vanilla/Common/source/customskinloader/mixin/MixinPlayerMenuObject.java +++ /dev/null @@ -1,34 +0,0 @@ -package customskinloader.mixin; - -import customskinloader.fake.FakeClientPlayer; -import net.minecraft.client.gui.spectator.PlayerMenuObject; -import net.minecraft.client.renderer.ThreadDownloadImageData; -import net.minecraft.util.ResourceLocation; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@Mixin(PlayerMenuObject.class) -public abstract class MixinPlayerMenuObject { - @Redirect( - method = "Lnet/minecraft/client/gui/spectator/PlayerMenuObject;(Lcom/mojang/authlib/GameProfile;)V", - at = @At( - value = "INVOKE", - target = "Lnet/minecraft/client/entity/AbstractClientPlayer;getLocationSkin(Ljava/lang/String;)Lnet/minecraft/util/ResourceLocation;" - ) - ) - private ResourceLocation redirect_init(String username) { - return FakeClientPlayer.getLocationSkin(username); - } - - @Redirect( - method = "Lnet/minecraft/client/gui/spectator/PlayerMenuObject;(Lcom/mojang/authlib/GameProfile;)V", - at = @At( - value = "INVOKE", - target = "Lnet/minecraft/client/entity/AbstractClientPlayer;getDownloadImageSkin(Lnet/minecraft/util/ResourceLocation;Ljava/lang/String;)Lnet/minecraft/client/renderer/ThreadDownloadImageData;" - ) - ) - private ThreadDownloadImageData redirect_init(ResourceLocation resourceLocationIn, String username) { - return FakeClientPlayer.getDownloadImageSkin(resourceLocationIn, username); - } -} diff --git a/Vanilla/Common/source/customskinloader/mixin/MixinSkinManager$3$1.java b/Vanilla/Common/source/customskinloader/mixin/MixinSkinManager$3$1.java deleted file mode 100644 index 1649b3c..0000000 --- a/Vanilla/Common/source/customskinloader/mixin/MixinSkinManager$3$1.java +++ /dev/null @@ -1,34 +0,0 @@ -package customskinloader.mixin; - -import java.util.Map; - -import com.mojang.authlib.minecraft.MinecraftProfileTexture; -import customskinloader.fake.FakeSkinManager; -import net.minecraft.client.resources.SkinManager$3; -import net.minecraft.client.resources.SkinManager$3$1; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -// For 1.12.2- -@Mixin(SkinManager$3$1.class) -public abstract class MixinSkinManager$3$1 { - @Final - @Shadow - Map field_152803_a; - - @Final - @Shadow - SkinManager$3 field_152804_b; - - @Inject( - method = "Lnet/minecraft/client/resources/SkinManager$3$1;run()V", - at = @At("RETURN") - ) - private void inject_run(CallbackInfo callbackInfo) { - FakeSkinManager.loadElytraTexture(this.field_152804_b.field_152802_d, this.field_152803_a, this.field_152804_b.field_152801_c); - } -} diff --git a/Vanilla/Common/source/customskinloader/mixin/MixinSkinManager$3.java b/Vanilla/Common/source/customskinloader/mixin/MixinSkinManager$3.java deleted file mode 100644 index 86f87c2..0000000 --- a/Vanilla/Common/source/customskinloader/mixin/MixinSkinManager$3.java +++ /dev/null @@ -1,29 +0,0 @@ -package customskinloader.mixin; - -import java.util.Map; - -import com.mojang.authlib.GameProfile; -import com.mojang.authlib.minecraft.MinecraftProfileTexture; -import com.mojang.authlib.minecraft.MinecraftSessionService; -import customskinloader.fake.FakeSkinManager; -import net.minecraft.client.resources.SkinManager$3; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -// For 1.12.2- -@Mixin(SkinManager$3.class) -public abstract class MixinSkinManager$3 { - @Redirect( - method = "Lnet/minecraft/client/resources/SkinManager$3;run()V", - at = @At( - value = "INVOKE", - target = "Lcom/mojang/authlib/minecraft/MinecraftSessionService;getTextures(Lcom/mojang/authlib/GameProfile;Z)Ljava/util/Map;", - ordinal = 0, - remap = false - ) - ) - private Map redirect_run(MinecraftSessionService sessionService, GameProfile profile, boolean requireSecure) { - return FakeSkinManager.getUserProfile(sessionService, profile, requireSecure); - } -} diff --git a/Vanilla/Common/source/customskinloader/mixin/MixinThreadDownloadImageDataV1.java b/Vanilla/Common/source/customskinloader/mixin/MixinThreadDownloadImageDataV1.java deleted file mode 100644 index 0e64db5..0000000 --- a/Vanilla/Common/source/customskinloader/mixin/MixinThreadDownloadImageDataV1.java +++ /dev/null @@ -1,23 +0,0 @@ -package customskinloader.mixin; - -import java.awt.image.BufferedImage; - -import customskinloader.fake.itf.IFakeThreadDownloadImageData; -import net.minecraft.client.renderer.ThreadDownloadImageData; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; - -@Mixin(ThreadDownloadImageData.class) // This mixin is only for 1.12.2- -public abstract class MixinThreadDownloadImageDataV1 implements IFakeThreadDownloadImageData { - @Shadow - private BufferedImage bufferedImage; - - @Shadow - private boolean textureUploaded; - - @Override - public void resetNewBufferedImage(BufferedImage image) { - this.textureUploaded = false; - this.bufferedImage = image; - } -} diff --git a/Vanilla/Common/source/customskinloader/mixin/MixinThreadDownloadImageDataV2.java b/Vanilla/Common/source/customskinloader/mixin/MixinThreadDownloadImageDataV2.java deleted file mode 100644 index 8a303e9..0000000 --- a/Vanilla/Common/source/customskinloader/mixin/MixinThreadDownloadImageDataV2.java +++ /dev/null @@ -1,34 +0,0 @@ -package customskinloader.mixin; - -import customskinloader.fake.FakeSkinBuffer; -import net.minecraft.client.renderer.ThreadDownloadImageData; -import net.minecraft.client.renderer.texture.NativeImage; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@Mixin(ThreadDownloadImageData.class) -@SuppressWarnings("target") -public abstract class MixinThreadDownloadImageDataV2 { - @Final - @Shadow - private Runnable processTask; - - @Shadow - private static NativeImage processLegacySkin(NativeImage nativeImageIn) { - return null; - } - - @Redirect( - method = "Lnet/minecraft/client/renderer/ThreadDownloadImageData;loadTexture(Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage;", - at = @At( - value = "INVOKE", - target = "Lnet/minecraft/client/renderer/ThreadDownloadImageData;processLegacySkin(Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage;" - ) - ) - private NativeImage redirect_loadTexture(NativeImage image) { - return FakeSkinBuffer.processLegacySkin(image, this.processTask, MixinThreadDownloadImageDataV2::processLegacySkin); - } -} diff --git a/Vanilla/Common/source/customskinloader/mixin/MixinThreadDownloadImageDataV3.java b/Vanilla/Common/source/customskinloader/mixin/MixinThreadDownloadImageDataV3.java deleted file mode 100644 index a15b478..0000000 --- a/Vanilla/Common/source/customskinloader/mixin/MixinThreadDownloadImageDataV3.java +++ /dev/null @@ -1,32 +0,0 @@ -package customskinloader.mixin; - -import customskinloader.fake.FakeSkinBuffer; -import net.minecraft.client.renderer.ThreadDownloadImageData; -import net.minecraft.client.renderer.texture.NativeImage; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@Mixin(ThreadDownloadImageData.class) // 1.17-rc2+ -@SuppressWarnings("target") -public abstract class MixinThreadDownloadImageDataV3 { - @Final - @Shadow - private Runnable processTask; - - @Shadow - abstract NativeImage processLegacySkin(NativeImage nativeImageIn); - - @Redirect( - method = "Lnet/minecraft/client/renderer/ThreadDownloadImageData;loadTexture(Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage;", - at = @At( - value = "INVOKE", - target = "Lnet/minecraft/client/renderer/ThreadDownloadImageData;processLegacySkin(Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage;" - ) - ) - private NativeImage redirect_loadTexture(ThreadDownloadImageData _this, NativeImage image) { - return FakeSkinBuffer.processLegacySkin(image, this.processTask, this::processLegacySkin); - } -} diff --git a/Vanilla/Common/source/customskinloader/tweaker/ModSystemTweaker.java b/Vanilla/Common/source/customskinloader/tweaker/ModSystemTweaker.java deleted file mode 100644 index 46e164d..0000000 --- a/Vanilla/Common/source/customskinloader/tweaker/ModSystemTweaker.java +++ /dev/null @@ -1,40 +0,0 @@ -package customskinloader.tweaker; - -import java.io.File; -import java.util.List; - -import customskinloader.log.LogManager; -import customskinloader.log.Logger; -import net.minecraft.launchwrapper.ITweaker; -import net.minecraft.launchwrapper.LaunchClassLoader; -import org.spongepowered.asm.mixin.MixinEnvironment; -import org.spongepowered.asm.mixin.Mixins; - -public class ModSystemTweaker implements ITweaker { - - public static Logger logger = new Logger(); - - public void acceptOptions(List args, File gameDir, File assetsDir, String profile) { - LogManager.setLogFile(gameDir.toPath().resolve("CustomSkinLoader/CustomSkinLoader.log")); - logger = LogManager.getLogger("ModSystemTweaker"); - - logger.info("Using ModSystemTweaker"); - logger.info("ModSystemTweaker: acceptOptions"); - } - - public void injectIntoClassLoader(LaunchClassLoader classLoader) { - logger.info("ModSystemTweaker: injectIntoClassLoader"); - Mixins.addConfiguration("mixins.customskinloader.json"); - MixinEnvironment.getDefaultEnvironment().setSide(MixinEnvironment.Side.CLIENT); - } - - public String getLaunchTarget() { - logger.info("ModSystemTweaker: getLaunchTarget"); - return "net.minecraft.client.main.Main"; - } - - public String[] getLaunchArguments() { - logger.info("ModSystemTweaker: getLaunchArguments"); - return new String[0]; - } -} diff --git a/Vanilla/Common/source/customskinloader/tweaker/Tweaker.java b/Vanilla/Common/source/customskinloader/tweaker/Tweaker.java deleted file mode 100644 index 38958cf..0000000 --- a/Vanilla/Common/source/customskinloader/tweaker/Tweaker.java +++ /dev/null @@ -1,47 +0,0 @@ -package customskinloader.tweaker; - -import java.io.File; -import java.util.List; - -import customskinloader.log.LogManager; -import customskinloader.log.Logger; -import net.minecraft.launchwrapper.ITweaker; -import net.minecraft.launchwrapper.LaunchClassLoader; -import org.apache.commons.lang3.ArrayUtils; -import org.spongepowered.asm.mixin.MixinEnvironment; -import org.spongepowered.asm.mixin.Mixins; - -public class Tweaker implements ITweaker { - - private String[] args; - - public static Logger logger = new Logger(); - - public void acceptOptions(List args, File gameDir, File assetsDir, String profile) { - LogManager.setLogFile(gameDir.toPath().resolve("CustomSkinLoader/CustomSkinLoader.log")); - logger = LogManager.getLogger("VanillaTweaker"); - - logger.info("Using Tweaker"); - logger.info("Tweaker: acceptOptions"); - - String[] temp={"--gameDir",gameDir.getAbsolutePath(),"--assetsDir",assetsDir.getAbsolutePath(),"--version",profile}; - this.args=ArrayUtils.addAll(args.toArray(new String[0]), temp); - } - - public void injectIntoClassLoader(LaunchClassLoader classLoader) { - logger.info("Tweaker: injectIntoClassLoader"); - logger.info("Loaded as a library."); - Mixins.addConfiguration("mixins.customskinloader.json"); - MixinEnvironment.getDefaultEnvironment().setSide(MixinEnvironment.Side.CLIENT); - } - - public String getLaunchTarget() { - logger.info("Tweaker: getLaunchTarget"); - return "net.minecraft.client.main.Main"; - } - - public String[] getLaunchArguments() { - logger.info("Tweaker: getLaunchArguments"); - return args; - } -} diff --git a/Vanilla/Common/source/net/minecraft/client/resources/SkinManager$3$1.java b/Vanilla/Common/source/net/minecraft/client/resources/SkinManager$3$1.java deleted file mode 100644 index 0b1fa85..0000000 --- a/Vanilla/Common/source/net/minecraft/client/resources/SkinManager$3$1.java +++ /dev/null @@ -1,11 +0,0 @@ -package net.minecraft.client.resources; - -import java.util.Map; - -import com.mojang.authlib.minecraft.MinecraftProfileTexture; - -public class SkinManager$3$1 { - Map field_152803_a; - SkinManager$3 field_152804_b; - public void run() {} -} diff --git a/Vanilla/Common/source/net/minecraft/client/resources/SkinManager$3.java b/Vanilla/Common/source/net/minecraft/client/resources/SkinManager$3.java deleted file mode 100644 index 3fbb911..0000000 --- a/Vanilla/Common/source/net/minecraft/client/resources/SkinManager$3.java +++ /dev/null @@ -1,7 +0,0 @@ -package net.minecraft.client.resources; - -public class SkinManager$3 { - public SkinManager.SkinAvailableCallback field_152801_c; - public SkinManager field_152802_d; - public void run() {} -} diff --git a/Vanilla/common.gradle b/Vanilla/common.gradle deleted file mode 100644 index a9fec0d..0000000 --- a/Vanilla/common.gradle +++ /dev/null @@ -1,92 +0,0 @@ - -jar { - manifest { - attributes 'TweakClass' : 'customskinloader.tweaker.ModSystemTweaker' - attributes 'TweakName' : rootProject.ext.config.name - attributes 'TweakAuthor' : 'xfl03,JLChnToZ' - attributes 'TweakVersion': version - attributes 'TweakOrder' : '-10' - } - exclude 'net/minecraft/client/renderer/RenderType.class' - exclude 'net/minecraft/client/renderer/texture/**' - exclude 'net/minecraft/client/resources/**' - exclude 'net/minecraft/resources/**' - exclude 'Profile.json' -} - -import customskinloader.gradle.util.SourceUtil -import groovy.json.JsonOutput -import groovy.json.JsonSlurper -import java.security.MessageDigest - -SourceUtil.addDependencies project, project(":Common"), project(":Vanilla/Common") - -task afterBuildForVanilla { - doLast { - def file0 = file("build/libs/${archivesBaseName}-${version}.jar") - - //copyProfileJson - File profile = project.file("build/resources/main/Profile.json") - File target = rootProject.file(String.format("build/libs/%s-CSL-%s.json", config.minecraft_version, shortVersion)) - target.parentFile.mkdirs() - - def jsonSlurper = new JsonSlurper() - jsonSlurper.parse(profile, "UTF-8").with { p -> - p.libraries.find({ lib -> - lib.name.startsWith "customskinloader:CustomSkinLoader_" - }).downloads.artifact.with { artifact -> - artifact.sha1 = MessageDigest.getInstance "SHA1" with { digest -> - digest.update file0.bytes - new BigInteger(1, digest.digest()).toString 16 padLeft 40, "0" - } - artifact.size = file0.size() - } - this.plugins.withId "net.minecraftforge.gradle.forge", { plugin -> - // Get the version json from manifest. - // https://github.com/MinecraftForge/ForgeGradle/blob/fc67182a61926f0bdb0d12da5fba7f4322f64d86/src/main/java/net/minecraftforge/gradle/common/BasePlugin.java#L229 - jsonSlurper.parse(new URL(jsonSlurper.parse(plugin.cacheFile("McManifest.json")).versions.find { version -> version.id == this.project.ext.config.minecraft_version }.url)).with { ver -> - if (ver.minecraftArguments != null) { - p.put "minecraftArguments", "${ver.minecraftArguments} ${p.arguments.game.join(" ")}" - p.remove "arguments" - } else { - p.remove "minecraftArguments" - } - } - } - target.write JsonOutput.prettyPrint(JsonOutput.toJson(p)), "UTF-8" - } - } -} -afterBuild.finalizedBy afterBuildForVanilla - -// Make vanilla remap tsrg file via Fabric tsrg file. -task convertFabricMappingToVanilla { - doLast { - [{ Project p -> p.file(p.ext.config.srg_notch_map) }, { Project p -> p.file("mixin.tsrg") }].each { tsrgGetter -> - def lines = [] as List - def mapping = [:] as Map - // Read Fabric tsrg file - tsrgGetter(project(":Fabric")).eachLine { line -> - lines.add line - line.split($/\s/$).with { strs -> strs[strs.length - 1] }.with { str -> mapping.put str, str } - } - // Read Fabric intermediary tiny mappings. - // We don't care about descriptions of the member because all of intermediary names are unique. - new URL("https://raw.githubusercontent.com/FabricMC/intermediary/master/mappings/${project.ext.config.minecraft_version}.tiny").eachLine { line -> - line.split($/\s/$).with { strs -> - if (mapping.containsKey(strs[strs.length - 1])) { - mapping.put strs[strs.length - 1], strs[strs.length - 2] - } - } - } - // Write vanilla tsrg file. - tsrgGetter(project).withWriter { writer -> - lines.each { line -> - line.split($/\s/$).with { strs -> strs[strs.length - 1] }.with { str -> - writer.writeLine line.replace(str, mapping.get(str)) - } - } - } - } - } -} diff --git a/build.gradle b/build.gradle index 07f5dfb..5c82ff2 100644 --- a/build.gradle +++ b/build.gradle @@ -48,23 +48,6 @@ subprojects { replaceIn 'CustomSkinLoader.java' } - repositories { - maven { - name = "sponge" - url = "https://repo.spongepowered.org/repository/maven-public/" - } - } - - // We need to change source dirs for inherited problems. - sourceSets.main { - java { - srcDir "source" - } - resources { - srcDir "resource" - } - } - jar { manifest { attributes([ @@ -77,6 +60,10 @@ subprojects { "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") ]) } + + exclude "net/minecraft/client/renderer/RenderType.class" + exclude "net/minecraft/client/renderer/texture/**" + exclude "net/minecraft/resources/**" } // For real subprojects @@ -99,35 +86,21 @@ subprojects { } } - // Mixin stuffs - if (!project.name.toLowerCase().contains("forge/legacy")) { - apply plugin: 'org.spongepowered.mixin' - - apply from: rootProject.file("buildSrc/patch.gradle") - patchMixin() - - task genSrgMap { - doLast { - if (config.srg_notch_map != null) { - // convert mappings - RemapUtil.tsrg2srg file(config.srg_notch_map), file("build/reobf.srg") - RemapUtil.tsrg2srg file("mixin.tsrg"), file("build/mixin.srg") - } + task genSrgMap { + doLast { + if (!config.srg_notch_map.isEmpty()) { + // convert mappings + RemapUtil.tsrg2srg file(config.srg_notch_map), file("build/reobf.srg") + RemapUtil.tsrg2srg file("mixin.tsrg"), file("build/mixin.srg") } } - deobfCompileDummyTask.dependsOn genSrgMap + } + deobfCompileDummyTask.dependsOn genSrgMap - mixin { - add sourceSets.main, "mixins.customskinloader.refmap.json" - reobfSrgFile = "build/mixin.srg" - reobfNotchSrgFile = "build/mixin.srg" - } - - reobf { - jar { - if (config.srg_notch_map != null) { - mappings = file("build/reobf.srg") - } + reobf { + jar { + if (!config.srg_notch_map.isEmpty()) { + mappings = file("build/reobf.srg") } } } @@ -153,44 +126,12 @@ subprojects { from "build/libs" into "${rootDir}/build/libs" include "**/*.jar" - if (project.name.toLowerCase().contains("vanilla")) { - exclude "**/*-sources.jar" - } } } } build.finalizedBy afterBuild - apply plugin: 'maven-publish' - publishing { - repositories { - maven { - name = "GitHubPackages" - url = uri("https://maven.pkg.github.com/xfl03/MCCustomSkinLoader") - credentials { - username = project.findProperty("gpr.user") ?: System.getenv("USERNAME") - password = project.findProperty("gpr.key") ?: System.getenv("GITHUB_TOKEN") - } - } - } - publications { - gpr(MavenPublication) { - groupId 'customskinloader' - artifactId project.archivesBaseName - from(components.java) - } - } - } - tasks.withType(PublishToMavenRepository) { - onlyIf { System.getenv("GITHUB_TOKEN") != null } - } - - if (project.name.toLowerCase().contains("vanilla/1.")) { - apply from: rootProject.file('Vanilla/common.gradle') - } else { - // Only Fabric and Forge edition should be uploaded to CurseForge and Modrinth - CurseForgeUtil.provideCurseForge project - ModrinthUtil.provideModrinth project - } + CurseForgeUtil.provideCurseForge project + ModrinthUtil.provideModrinth project } } diff --git a/buildSrc/src/main/java/customskinloader/gradle/task/UploadBaseTask.java b/buildSrc/src/main/java/customskinloader/gradle/task/UploadBaseTask.java index a02b516..f272b5c 100644 --- a/buildSrc/src/main/java/customskinloader/gradle/task/UploadBaseTask.java +++ b/buildSrc/src/main/java/customskinloader/gradle/task/UploadBaseTask.java @@ -50,8 +50,6 @@ public abstract class UploadBaseTask extends DefaultTask { if (key.startsWith("mods/") && key.endsWith(".jar") && !key.endsWith("-sources.jar")) { latest.downloads.put(mcversion, url); - } else if (key.endsWith(".json")) { - latest.launchermeta.put(mcversion, url); } } diff --git a/buildSrc/src/main/java/customskinloader/gradle/util/CosUtil.java b/buildSrc/src/main/java/customskinloader/gradle/util/CosUtil.java index 159b296..a677b4e 100644 --- a/buildSrc/src/main/java/customskinloader/gradle/util/CosUtil.java +++ b/buildSrc/src/main/java/customskinloader/gradle/util/CosUtil.java @@ -21,25 +21,12 @@ public class CosUtil { if (name.indexOf('-') == -1) { return null; } - if (filename.endsWith(".json")) - return String.format( - "versions/%s/%s", - name, - filename - ); if (filename.endsWith(".jar")) { if (filename.contains("Fabric") || filename.contains("Forge")) { return String.format( "mods/%s", filename ); - } else { - return String.format( - "libraries/customskinloader/%s/%s/%s", - name.substring(0, name.indexOf('-')), - name.substring(name.indexOf('-') + 1), - filename - ); } } return filename; diff --git a/settings.gradle b/settings.gradle index 4b5068a..184333b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,15 +3,6 @@ rootProject.name = "MCCustomSkinLoader" //Base Project include "Common" -//Vanilla Base Project -include "Vanilla/Common" -//Special Vanilla Edition -include "Vanilla/1.8.9" -include "Vanilla/1.12.2" -include "Vanilla/1.16.5" -include "Vanilla/1.18.2" -include "Vanilla/1.19.3" - //Forge Base Project include "Forge/Common" //Forge Edition for [1.8,1.16.5]