From b2f8d2cc38e82f454e0a26ccaddcffd95b9c424f Mon Sep 17 00:00:00 2001 From: ZekerZhayard Date: Thu, 9 Jun 2022 10:00:10 +0800 Subject: [PATCH] Support 1.19, Remove Vanilla 1.17.1 (#211) --- .../fake/itf/FakeInterfaceManager.java | 2 +- .../fake/itf/IFakeIResource.java | 15 +++- Fabric/Fabric.tsrg | 4 +- Fabric/build.properties | 2 +- Forge/Active/Forge.tsrg | 6 +- Forge/Active/build.properties | 2 +- Forge/Active/resource/transformers.js | 3 +- Forge/Legacy/resource/transformers.js | 3 +- .../FakeInterfacesTransformer.java | 3 +- Vanilla/1.12.2/1.12.2.tsrg | 4 +- Vanilla/1.16.5/1.16.5.tsrg | 4 +- Vanilla/1.18.2/1.18.2.tsrg | 4 +- .../{1.17.1/1.17.1.tsrg => 1.19/1.19.tsrg} | 70 ++++++++++--------- Vanilla/{1.17.1 => 1.19}/build.properties | 6 +- Vanilla/{1.17.1 => 1.19}/mixin.tsrg | 38 +++++----- .../resource/mixins.customskinloader.json | 0 Vanilla/1.8.9/1.8.9.tsrg | 4 +- .../mixin/MixinIResource.java | 2 +- Vanilla/common.gradle | 2 - settings.gradle | 2 +- 20 files changed, 100 insertions(+), 76 deletions(-) rename Vanilla/{1.17.1/1.17.1.tsrg => 1.19/1.19.tsrg} (64%) rename Vanilla/{1.17.1 => 1.19}/build.properties (63%) rename Vanilla/{1.17.1 => 1.19}/mixin.tsrg (72%) rename Vanilla/{1.17.1 => 1.19}/resource/mixins.customskinloader.json (100%) diff --git a/Common/source/customskinloader/fake/itf/FakeInterfaceManager.java b/Common/source/customskinloader/fake/itf/FakeInterfaceManager.java index e8866d8..c3ebdda 100644 --- a/Common/source/customskinloader/fake/itf/FakeInterfaceManager.java +++ b/Common/source/customskinloader/fake/itf/FakeInterfaceManager.java @@ -14,7 +14,7 @@ import net.minecraft.util.ResourceLocation; public class FakeInterfaceManager { public static InputStream IResource_getInputStream(Object resource) { - return ((IFakeIResource) resource).func_199027_b(); + return ((IFakeIResource.V2) resource).open(); } public static Optional IResourceManager_getResource(Object resourceManager, ResourceLocation location) throws IOException { diff --git a/Common/source/customskinloader/fake/itf/IFakeIResource.java b/Common/source/customskinloader/fake/itf/IFakeIResource.java index bd6af84..6c8d8ca 100644 --- a/Common/source/customskinloader/fake/itf/IFakeIResource.java +++ b/Common/source/customskinloader/fake/itf/IFakeIResource.java @@ -6,8 +6,17 @@ import net.minecraft.client.resources.IResource; /** {@link net.minecraft.client.resources.IResource} is no longer an interface since 22w14a */ public interface IFakeIResource { - // 1.13.2+ - default InputStream func_199027_b() { - return ((IResource) this).getInputStream(); + // 1.13.2 ~ 22w13a + interface V1 { + default InputStream func_199027_b() { + return ((IResource) this).getInputStream(); + } + } + + // 22w14a+ + interface V2 { + default InputStream open() { + return ((IFakeIResource.V1) this).func_199027_b(); + } } } diff --git a/Fabric/Fabric.tsrg b/Fabric/Fabric.tsrg index 1030bb0..c26544c 100644 --- a/Fabric/Fabric.tsrg +++ b/Fabric/Fabric.tsrg @@ -1,5 +1,7 @@ -customskinloader/fake/itf/IFakeIResource customskinloader/fake/itf/IFakeIResource +customskinloader/fake/itf/IFakeIResource$V1 customskinloader/fake/itf/IFakeIResource$V1 func_199027_b ()Ljava/io/InputStream; method_14482 +customskinloader/fake/itf/IFakeIResource$V2 customskinloader/fake/itf/IFakeIResource$V2 + open ()Ljava/io/InputStream; method_14482 customskinloader/fake/itf/IFakeIResourceManager customskinloader/fake/itf/IFakeIResourceManager func_199002_a (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/resources/IResource; method_14486 getResource (Lnet/minecraft/util/ResourceLocation;)Ljava/util/Optional; method_14486 diff --git a/Fabric/build.properties b/Fabric/build.properties index a369832..25371a0 100644 --- a/Fabric/build.properties +++ b/Fabric/build.properties @@ -1,5 +1,5 @@ minecraft_version=1.14 -minecraft_full_versions=1.14-Snapshot,1.14,1.14.1,1.14.2,1.14.3,1.14.4,1.15-Snapshot,1.15,1.15.1,1.15.2,1.16-Snapshot,1.16,1.16.1,1.16.2,1.16.3,1.16.4,1.16.5,1.17-Snapshot,1.17,1.17.1,1.18-Snapshot,1.18,1.18.1,1.18.2,1.19-Snapshot +minecraft_full_versions=1.14-Snapshot,1.14,1.14.1,1.14.2,1.14.3,1.14.4,1.15-Snapshot,1.15,1.15.1,1.15.2,1.16-Snapshot,1.16,1.16.1,1.16.2,1.16.3,1.16.4,1.16.5,1.17-Snapshot,1.17,1.17.1,1.18-Snapshot,1.18,1.18.1,1.18.2,1.19-Snapshot,1.19 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 diff --git a/Forge/Active/Forge.tsrg b/Forge/Active/Forge.tsrg index d9b6970..4a4937c 100644 --- a/Forge/Active/Forge.tsrg +++ b/Forge/Active/Forge.tsrg @@ -1,8 +1,10 @@ -customskinloader/fake/itf/IFakeIResource customskinloader/fake/itf/IFakeIResource +customskinloader/fake/itf/IFakeIResource$V1 customskinloader/fake/itf/IFakeIResource$V1 func_199027_b ()Ljava/io/InputStream; m_6679_ +customskinloader/fake/itf/IFakeIResource$V2 customskinloader/fake/itf/IFakeIResource$V2 + open ()Ljava/io/InputStream; m_215507_ customskinloader/fake/itf/IFakeIResourceManager customskinloader/fake/itf/IFakeIResourceManager func_199002_a (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/resources/IResource; m_142591_ - getResource (Lnet/minecraft/util/ResourceLocation;)Ljava/util/Optional; getResource + getResource (Lnet/minecraft/util/ResourceLocation;)Ljava/util/Optional; m_213713_ customskinloader/fake/itf/IFakeMinecraft customskinloader/fake/itf/IFakeMinecraft func_195551_G ()Lnet/minecraft/resources/IResourceManager; m_91098_ customskinloader/fake/itf/IFakeTextureManager$V1 customskinloader/fake/itf/IFakeTextureManager$V1 diff --git a/Forge/Active/build.properties b/Forge/Active/build.properties index e7b400b..a02f34f 100644 --- a/Forge/Active/build.properties +++ b/Forge/Active/build.properties @@ -1,5 +1,5 @@ minecraft_version=1.17.1 -minecraft_full_versions=1.17.1,1.18,1.18.1,1.18.2 +minecraft_full_versions=1.17.1,1.18,1.18.1,1.18.2,1.19 java_full_versions=16,17,18 #forge gradle needs forge version forge_mc_version=1.12.2 diff --git a/Forge/Active/resource/transformers.js b/Forge/Active/resource/transformers.js index 6a351b3..bba30b7 100644 --- a/Forge/Active/resource/transformers.js +++ b/Forge/Active/resource/transformers.js @@ -90,7 +90,8 @@ function initializeCoreMod() { 'name': 'net/minecraft/server/packs/resources/Resource' }, 'transformer': function (cn) { - cn.interfaces.add("customskinloader/fake/itf/IFakeIResource"); + cn.interfaces.add("customskinloader/fake/itf/IFakeIResource$V1"); + cn.interfaces.add("customskinloader/fake/itf/IFakeIResource$V2"); return cn; } }, diff --git a/Forge/Legacy/resource/transformers.js b/Forge/Legacy/resource/transformers.js index a958610..4405377 100644 --- a/Forge/Legacy/resource/transformers.js +++ b/Forge/Legacy/resource/transformers.js @@ -165,7 +165,8 @@ function initializeCoreMod() { 'name': 'net/minecraft/resources/IResource' }, 'transformer': function (cn) { - cn.interfaces.add("customskinloader/fake/itf/IFakeIResource"); + cn.interfaces.add("customskinloader/fake/itf/IFakeIResource$V1"); + cn.interfaces.add("customskinloader/fake/itf/IFakeIResource$V2"); cn.interfaces.add("net/minecraft/client/resources/IResource"); return cn; } diff --git a/Forge/Legacy/source/customskinloader/forge/transformer/FakeInterfacesTransformer.java b/Forge/Legacy/source/customskinloader/forge/transformer/FakeInterfacesTransformer.java index 1743625..6027898 100644 --- a/Forge/Legacy/source/customskinloader/forge/transformer/FakeInterfacesTransformer.java +++ b/Forge/Legacy/source/customskinloader/forge/transformer/FakeInterfacesTransformer.java @@ -88,7 +88,8 @@ public class FakeInterfacesTransformer { public static class ClientIResourceTransformer implements TransformerManager.IClassTransformer { @Override public ClassNode transform(ClassNode cn) { - cn.interfaces.add("customskinloader/fake/itf/IFakeIResource"); + cn.interfaces.add("customskinloader/fake/itf/IFakeIResource$V1"); + cn.interfaces.add("customskinloader/fake/itf/IFakeIResource$V2"); cn.interfaces.add("net/minecraft/resources/IResource"); return cn; } diff --git a/Vanilla/1.12.2/1.12.2.tsrg b/Vanilla/1.12.2/1.12.2.tsrg index 87d7a07..260f35d 100644 --- a/Vanilla/1.12.2/1.12.2.tsrg +++ b/Vanilla/1.12.2/1.12.2.tsrg @@ -1,5 +1,7 @@ -customskinloader/fake/itf/IFakeIResource customskinloader/fake/itf/IFakeIResource +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 diff --git a/Vanilla/1.16.5/1.16.5.tsrg b/Vanilla/1.16.5/1.16.5.tsrg index 36e6281..de1e185 100644 --- a/Vanilla/1.16.5/1.16.5.tsrg +++ b/Vanilla/1.16.5/1.16.5.tsrg @@ -1,5 +1,7 @@ -customskinloader/fake/itf/IFakeIResource customskinloader/fake/itf/IFakeIResource +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 diff --git a/Vanilla/1.18.2/1.18.2.tsrg b/Vanilla/1.18.2/1.18.2.tsrg index 009adfa..f44ffe8 100644 --- a/Vanilla/1.18.2/1.18.2.tsrg +++ b/Vanilla/1.18.2/1.18.2.tsrg @@ -1,5 +1,7 @@ -customskinloader/fake/itf/IFakeIResource customskinloader/fake/itf/IFakeIResource +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 diff --git a/Vanilla/1.17.1/1.17.1.tsrg b/Vanilla/1.19/1.19.tsrg similarity index 64% rename from Vanilla/1.17.1/1.17.1.tsrg rename to Vanilla/1.19/1.19.tsrg index 48f7083..757f77f 100644 --- a/Vanilla/1.17.1/1.17.1.tsrg +++ b/Vanilla/1.19/1.19.tsrg @@ -1,41 +1,43 @@ -customskinloader/fake/itf/IFakeIResource customskinloader/fake/itf/IFakeIResource - func_199027_b ()Ljava/io/InputStream; b +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; b customskinloader/fake/itf/IFakeIResourceManager customskinloader/fake/itf/IFakeIResourceManager - func_199002_a (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/resources/IResource; a + 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; N + func_195551_G ()Lnet/minecraft/resources/IResourceManager; Q customskinloader/fake/itf/IFakeTextureManager$V1 customskinloader/fake/itf/IFakeTextureManager$V1 func_229263_a_ (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/Texture;)Z func_229263_a_ func_229267_b_ (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/texture/Texture; b getTexture (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/Texture;)Lnet/minecraft/client/renderer/texture/Texture; b customskinloader/fake/itf/IFakeTextureManager$V2 customskinloader/fake/itf/IFakeTextureManager$V2 func_229263_a_ (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/Texture;)V a -net/minecraft/client/Minecraft dvp +net/minecraft/client/Minecraft eev gameDir o addScheduledTask (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; func_152344_a - getCurrentServerData ()Lnet/minecraft/client/multiplayer/ServerData; E - getMinecraft ()Lnet/minecraft/client/Minecraft; C - getResourceManager ()Lnet/minecraft/client/resources/IResourceManager; N - getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; Y - getSkinManager ()Lnet/minecraft/client/resources/SkinManager; Z - getTextureManager ()Lnet/minecraft/client/renderer/texture/TextureManager; M -net/minecraft/client/gui/GuiPlayerTabOverlay dxp -net/minecraft/client/gui/spectator/PlayerMenuObject een -net/minecraft/client/multiplayer/ServerData ejn + getCurrentServerData ()Lnet/minecraft/client/multiplayer/ServerData; I + getMinecraft ()Lnet/minecraft/client/Minecraft; G + getResourceManager ()Lnet/minecraft/client/resources/IResourceManager; Q + getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; aa + getSkinManager ()Lnet/minecraft/client/resources/SkinManager; ab + getTextureManager ()Lnet/minecraft/client/renderer/texture/TextureManager; P +net/minecraft/client/gui/GuiPlayerTabOverlay ehi +net/minecraft/client/gui/spectator/PlayerMenuObject eon +net/minecraft/client/multiplayer/ServerData ets serverIP b -net/minecraft/client/renderer/RenderType enq +net/minecraft/client/renderer/RenderType eyc 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 exd -net/minecraft/client/renderer/entity/RenderPlayer ewt -net/minecraft/client/renderer/entity/layers/LayerCape evc -net/minecraft/client/renderer/texture/DownloadingTexture exd +net/minecraft/client/renderer/ThreadDownloadImageData fhx +net/minecraft/client/renderer/entity/RenderPlayer fhm +net/minecraft/client/renderer/entity/layers/LayerCape ffu +net/minecraft/client/renderer/texture/DownloadingTexture fhx net/minecraft/client/renderer/texture/ITextureObject net/minecraft/client/renderer/texture/ITextureObject -net/minecraft/client/renderer/texture/NativeImage dpm +net/minecraft/client/renderer/texture/NativeImage dyt func_195699_a (IIIIIIZZ)V a func_195700_a (III)V a func_195702_a ()I a @@ -43,25 +45,25 @@ net/minecraft/client/renderer/texture/NativeImage dpm func_195709_a (II)I a func_195714_b ()I b func_195715_a (IIIII)V a -net/minecraft/client/renderer/texture/SimpleTexture exi -net/minecraft/client/renderer/texture/Texture exa -net/minecraft/client/renderer/texture/TextureManager exn +net/minecraft/client/renderer/texture/SimpleTexture fic +net/minecraft/client/renderer/texture/Texture fhu +net/minecraft/client/renderer/texture/TextureManager fih 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/renderer/texture/ThreadDownloadImageData exd -net/minecraft/client/resources/DefaultPlayerSkin ext +net/minecraft/client/renderer/texture/ThreadDownloadImageData fhx +net/minecraft/client/resources/DefaultPlayerSkin fin getDefaultSkin (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; a getDefaultSkinLegacy ()Lnet/minecraft/util/ResourceLocation; a -net/minecraft/client/resources/IResource ads +net/minecraft/client/resources/IResource ahs getInputStream ()Ljava/io/InputStream; b -net/minecraft/client/resources/IResourceManager adt - getResource (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/resources/IResource; a -net/minecraft/client/resources/SkinManager eyc +net/minecraft/client/resources/IResourceManager ahu + getResource (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/resources/IResource; getResource +net/minecraft/client/resources/SkinManager fiw loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a -net/minecraft/client/resources/SkinManager$SkinAvailableCallback eyc$a +net/minecraft/client/resources/SkinManager$SkinAvailableCallback fiw$a skinAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V onSkinTextureAvailable -net/minecraft/resources/IResource ads -net/minecraft/resources/IResourceManager adt -net/minecraft/util/ResourceLocation ww -net/minecraft/util/StringUtils ahj +net/minecraft/resources/IResource ahs +net/minecraft/resources/IResourceManager ahu +net/minecraft/util/ResourceLocation aaj +net/minecraft/util/StringUtils ame stripControlCodes (Ljava/lang/String;)Ljava/lang/String; a diff --git a/Vanilla/1.17.1/build.properties b/Vanilla/1.19/build.properties similarity index 63% rename from Vanilla/1.17.1/build.properties rename to Vanilla/1.19/build.properties index bfb54ef..39c734d 100644 --- a/Vanilla/1.17.1/build.properties +++ b/Vanilla/1.19/build.properties @@ -1,8 +1,8 @@ -minecraft_version=1.17.1 -minecraft_full_versions=1.17.1 +minecraft_version=1.19 +minecraft_full_versions=1.19 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.17.1.tsrg +srg_notch_map=1.19.tsrg diff --git a/Vanilla/1.17.1/mixin.tsrg b/Vanilla/1.19/mixin.tsrg similarity index 72% rename from Vanilla/1.17.1/mixin.tsrg rename to Vanilla/1.19/mixin.tsrg index 43757d4..6a035bb 100644 --- a/Vanilla/1.17.1/mixin.tsrg +++ b/Vanilla/1.19/mixin.tsrg @@ -1,35 +1,35 @@ -com/mojang/blaze3d/matrix/MatrixStack dql -net/minecraft/client/Minecraft dvp - isIntegratedServerRunning ()Z F -net/minecraft/client/entity/AbstractClientPlayer emj +com/mojang/blaze3d/matrix/MatrixStack dzt +net/minecraft/client/Minecraft eev + isIntegratedServerRunning ()Z J +net/minecraft/client/entity/AbstractClientPlayer ewv 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 dxp + getLocationSkin (Ljava/lang/String;)Lnet/minecraft/util/ResourceLocation; c +net/minecraft/client/gui/GuiPlayerTabOverlay ehi 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/model/ModelRenderer eir -net/minecraft/client/renderer/IRenderTypeBuffer eni -net/minecraft/client/renderer/RenderType enq +net/minecraft/client/model/ModelRenderer esv +net/minecraft/client/renderer/IRenderTypeBuffer exu +net/minecraft/client/renderer/RenderType eyc getEntitySolid (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; b -net/minecraft/client/renderer/ThreadDownloadImageData exd +net/minecraft/client/renderer/ThreadDownloadImageData fhx 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 ewt +net/minecraft/client/renderer/entity/RenderPlayer fhm 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 evc +net/minecraft/client/renderer/entity/layers/LayerCape ffu 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 dpm -net/minecraft/client/renderer/texture/TextureManager exn -net/minecraft/client/resources/SkinManager eyc +net/minecraft/client/renderer/texture/NativeImage dyt +net/minecraft/client/renderer/texture/TextureManager fih +net/minecraft/client/resources/SkinManager fiw 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$SkinAvailableCallback eyc$a -net/minecraft/scoreboard/ScoreObjective dnv -net/minecraft/scoreboard/Scoreboard dny -net/minecraft/util/ResourceLocation ww +net/minecraft/client/resources/SkinManager$SkinAvailableCallback fiw$a +net/minecraft/scoreboard/ScoreObjective dwo +net/minecraft/scoreboard/Scoreboard dwr +net/minecraft/util/ResourceLocation aaj diff --git a/Vanilla/1.17.1/resource/mixins.customskinloader.json b/Vanilla/1.19/resource/mixins.customskinloader.json similarity index 100% rename from Vanilla/1.17.1/resource/mixins.customskinloader.json rename to Vanilla/1.19/resource/mixins.customskinloader.json diff --git a/Vanilla/1.8.9/1.8.9.tsrg b/Vanilla/1.8.9/1.8.9.tsrg index c9dfbe3..3e9e825 100644 --- a/Vanilla/1.8.9/1.8.9.tsrg +++ b/Vanilla/1.8.9/1.8.9.tsrg @@ -1,5 +1,7 @@ -customskinloader/fake/itf/IFakeIResource customskinloader/fake/itf/IFakeIResource +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 diff --git a/Vanilla/Common/source/customskinloader/mixin/MixinIResource.java b/Vanilla/Common/source/customskinloader/mixin/MixinIResource.java index 5fe37ac..0ba8998 100644 --- a/Vanilla/Common/source/customskinloader/mixin/MixinIResource.java +++ b/Vanilla/Common/source/customskinloader/mixin/MixinIResource.java @@ -5,6 +5,6 @@ import net.minecraft.client.resources.IResource; import org.spongepowered.asm.mixin.Mixin; @Mixin(IResource.class) -public interface MixinIResource extends IFakeIResource { +public interface MixinIResource extends IFakeIResource.V1, IFakeIResource.V2 { } diff --git a/Vanilla/common.gradle b/Vanilla/common.gradle index f1541c3..0b30f2b 100644 --- a/Vanilla/common.gradle +++ b/Vanilla/common.gradle @@ -17,10 +17,8 @@ jar { projectImplementation project(':Common') projectImplementation project(':Vanilla/Common') - import groovy.json.JsonOutput import groovy.json.JsonSlurper - import java.security.MessageDigest task afterBuildForVanilla { diff --git a/settings.gradle b/settings.gradle index e8a6a3e..494138e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,8 +9,8 @@ include "Vanilla/Common" include "Vanilla/1.8.9" include "Vanilla/1.12.2" include "Vanilla/1.16.5" -include "Vanilla/1.17.1" include "Vanilla/1.18.2" +include "Vanilla/1.19" //Forge Base Project include "Forge/Common"