From 46b8635e10a3d5005f1729bc03f4cf6134aeda2b Mon Sep 17 00:00:00 2001 From: ZekerZhayard Date: Thu, 28 Jul 2022 09:24:44 +0800 Subject: [PATCH] Support 1.19.1. Remove Vanilla 1.19. (#218) --- .../customskinloader/CustomSkinLoader.java | 7 +++ .../customskinloader/config/Config.java | 2 +- .../customskinloader/fake/FakeCapeBuffer.java | 9 ++- .../fake/FakeSkinManager.java | 7 +-- .../fake/texture/FakeBufferedImage.java | 10 ++- .../fake/texture/FakeImage.java | 5 ++ .../fake/texture/FakeNativeImage.java | 13 ++-- .../client/renderer/texture/NativeImage.java | 6 ++ Fabric/Fabric.tsrg | 1 + Fabric/build.properties | 2 +- Forge/Active/Forge.tsrg | 1 + Forge/Active/build.properties | 2 +- Vanilla/1.12.2/1.12.2.tsrg | 1 + Vanilla/1.16.5/1.16.5.tsrg | 1 + Vanilla/1.18.2/1.18.2.tsrg | 1 + .../{1.19/1.19.tsrg => 1.19.1/1.19.1.tsrg} | 63 ++++++++++--------- Vanilla/{1.19 => 1.19.1}/build.properties | 6 +- Vanilla/{1.19 => 1.19.1}/mixin.tsrg | 36 +++++------ .../resource/mixins.customskinloader.json | 0 Vanilla/1.8.9/1.8.9.tsrg | 1 + settings.gradle | 2 +- 21 files changed, 103 insertions(+), 73 deletions(-) rename Vanilla/{1.19/1.19.tsrg => 1.19.1/1.19.1.tsrg} (71%) rename Vanilla/{1.19 => 1.19.1}/build.properties (63%) rename Vanilla/{1.19 => 1.19.1}/mixin.tsrg (72%) rename Vanilla/{1.19 => 1.19.1}/resource/mixins.customskinloader.json (100%) diff --git a/Common/source/customskinloader/CustomSkinLoader.java b/Common/source/customskinloader/CustomSkinLoader.java index 7510f8d..ecb9832 100644 --- a/Common/source/customskinloader/CustomSkinLoader.java +++ b/Common/source/customskinloader/CustomSkinLoader.java @@ -2,6 +2,7 @@ package customskinloader; import java.io.File; import java.util.Map; +import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ThreadFactory; @@ -44,6 +45,8 @@ public class CustomSkinLoader { private static final ProfileCache profileCache=new ProfileCache(); private static final DynamicSkullManager dynamicSkullManager=new DynamicSkullManager(); + private static final ExecutorService THREAD_POOL = new ThreadPoolExecutor(config.threadPoolSize, config.threadPoolSize, 1L, TimeUnit.MINUTES, new LinkedBlockingQueue<>()); + //Correct thread name in thread pool private static final ThreadFactory defaultFactory = Executors.defaultThreadFactory(); private static final ThreadFactory customFactory = r -> { @@ -59,6 +62,10 @@ public class CustomSkinLoader { new LinkedBlockingQueue<>(333), customFactory, new ThreadPoolExecutor.DiscardOldestPolicy() ); + public static void loadProfileTextures(Runnable runnable) { + THREAD_POOL.execute(runnable); + } + public static void loadProfileLazily(GameProfile gameProfile, Consumer> consumer) { String username = gameProfile.getName(); String credential = MinecraftUtil.getCredential(gameProfile); diff --git a/Common/source/customskinloader/config/Config.java b/Common/source/customskinloader/config/Config.java index bcaf695..0abf538 100644 --- a/Common/source/customskinloader/config/Config.java +++ b/Common/source/customskinloader/config/Config.java @@ -117,7 +117,7 @@ public class Config { try { CustomSkinLoader.logger.info("Try to load config."); String json=FileUtils.readFileToString(CustomSkinLoader.CONFIG_FILE, "UTF-8"); - Config config=CustomSkinLoader.GSON.fromJson(json, Config.class); + Config config=Objects.requireNonNull(CustomSkinLoader.GSON.fromJson(json, Config.class)); CustomSkinLoader.logger.info("Successfully load config."); return config; }catch (Exception e) { diff --git a/Common/source/customskinloader/fake/FakeCapeBuffer.java b/Common/source/customskinloader/fake/FakeCapeBuffer.java index 19ea440..c47b373 100644 --- a/Common/source/customskinloader/fake/FakeCapeBuffer.java +++ b/Common/source/customskinloader/fake/FakeCapeBuffer.java @@ -5,7 +5,6 @@ import java.io.InputStream; import java.util.NoSuchElementException; import java.util.function.BiPredicate; import java.util.function.Predicate; -import javax.imageio.ImageIO; import customskinloader.fake.itf.FakeInterfaceManager; import customskinloader.fake.texture.FakeBufferedImage; @@ -17,14 +16,14 @@ import net.minecraft.util.ResourceLocation; public class FakeCapeBuffer extends FakeSkinBuffer { private static final ResourceLocation TEXTURE_ELYTRA = new ResourceLocation("textures/entity/elytra.png"); private static int loadedGlobal = 0; - private static FakeImage elytraImage = loadElytra(); + private static FakeImage elytraImage; - public static FakeImage loadElytra() { + private static FakeImage loadElytra(FakeImage originalImage) { loadedGlobal++; try { InputStream is = FakeInterfaceManager.IResource_getInputStream(FakeInterfaceManager.IResourceManager_getResource(FakeInterfaceManager.Minecraft_getResourceManager(Minecraft.getMinecraft()), TEXTURE_ELYTRA).get()); if (is != null) { - FakeImage image = new FakeBufferedImage(ImageIO.read(is)); + FakeImage image = originalImage.createImage(is); if (image.getWidth() % 64 != 0 || image.getHeight() % 32 != 0) { // wtf? return elytraImage; } @@ -52,7 +51,7 @@ public class FakeCapeBuffer extends FakeSkinBuffer { // When resource packs were changed, the elytra image needs to be reloaded, and here will be entered again if (this.loaded == loadedGlobal) { - elytraImage = loadElytra(); + elytraImage = loadElytra(image); } this.loaded = loadedGlobal; if (elytraImage != null) { diff --git a/Common/source/customskinloader/fake/FakeSkinManager.java b/Common/source/customskinloader/fake/FakeSkinManager.java index a0f2b09..6efce50 100644 --- a/Common/source/customskinloader/fake/FakeSkinManager.java +++ b/Common/source/customskinloader/fake/FakeSkinManager.java @@ -5,10 +5,6 @@ import java.io.File; import java.util.Iterator; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; import com.google.common.collect.Maps; import com.google.common.hash.Hashing; @@ -27,7 +23,6 @@ import net.minecraft.client.resources.SkinManager; import net.minecraft.util.ResourceLocation; public class FakeSkinManager { - private static final ExecutorService THREAD_POOL = new ThreadPoolExecutor(CustomSkinLoader.config.threadPoolSize, CustomSkinLoader.config.threadPoolSize, 1L, TimeUnit.MINUTES, new LinkedBlockingQueue<>()); private final TextureManager textureManager; private final Map modelCache = new ConcurrentHashMap<>(); @@ -60,7 +55,7 @@ public class FakeSkinManager { } public void loadProfileTextures(final GameProfile profile, final SkinManager.SkinAvailableCallback skinAvailableCallback, final boolean requireSecure) { - THREAD_POOL.execute(() -> CustomSkinLoader.loadProfileLazily(profile, m -> { + CustomSkinLoader.loadProfileTextures(() -> CustomSkinLoader.loadProfileLazily(profile, m -> { final Map map = Maps.newHashMap(); map.putAll(m); diff --git a/Common/source/customskinloader/fake/texture/FakeBufferedImage.java b/Common/source/customskinloader/fake/texture/FakeBufferedImage.java index ea26563..0e96498 100644 --- a/Common/source/customskinloader/fake/texture/FakeBufferedImage.java +++ b/Common/source/customskinloader/fake/texture/FakeBufferedImage.java @@ -1,7 +1,11 @@ package customskinloader.fake.texture; -import java.awt.*; +import java.awt.Color; +import java.awt.Graphics; import java.awt.image.BufferedImage; +import java.io.IOException; +import java.io.InputStream; +import javax.imageio.ImageIO; public class FakeBufferedImage implements FakeImage { private BufferedImage image; @@ -25,6 +29,10 @@ public class FakeBufferedImage implements FakeImage { return new FakeBufferedImage(width, height); } + public FakeImage createImage(InputStream is) throws IOException { + return new FakeBufferedImage(ImageIO.read(is)); + } + public int getWidth() { return image.getWidth(); } diff --git a/Common/source/customskinloader/fake/texture/FakeImage.java b/Common/source/customskinloader/fake/texture/FakeImage.java index 98467d7..7614865 100644 --- a/Common/source/customskinloader/fake/texture/FakeImage.java +++ b/Common/source/customskinloader/fake/texture/FakeImage.java @@ -1,8 +1,13 @@ package customskinloader.fake.texture; +import java.io.IOException; +import java.io.InputStream; + public interface FakeImage { FakeImage createImage(int width, int height); + FakeImage createImage(InputStream is) throws IOException; + int getWidth(); int getHeight(); diff --git a/Common/source/customskinloader/fake/texture/FakeNativeImage.java b/Common/source/customskinloader/fake/texture/FakeNativeImage.java index 3d9fd64..2adcd81 100644 --- a/Common/source/customskinloader/fake/texture/FakeNativeImage.java +++ b/Common/source/customskinloader/fake/texture/FakeNativeImage.java @@ -1,5 +1,7 @@ package customskinloader.fake.texture; +import java.io.InputStream; + import net.minecraft.client.renderer.texture.NativeImage; public class FakeNativeImage implements FakeImage { @@ -21,6 +23,10 @@ public class FakeNativeImage implements FakeImage { return new FakeNativeImage(width, height); } + public FakeImage createImage(InputStream is) { + return new FakeNativeImage(NativeImage.func_195713_a(is)); + } + public int getWidth() { return image.func_195702_a(); } @@ -30,14 +36,11 @@ public class FakeNativeImage implements FakeImage { } public int getRGBA(int x, int y) { - int abgr = image.func_195709_a(x, y); - int b = abgr >>> 16 & 0xFF, r = abgr >>> 0 & 0xFF; - return abgr & 0xFF00FF00 | (r << 16 | b); + return image.func_195709_a(x, y); } public void setRGBA(int x, int y, int rgba) { - int b = rgba >>> 0 & 0xFF, r = rgba >>> 16 & 0xFF; - image.func_195700_a(x, y, rgba & 0xFF00FF00 | (b << 16 | r)); + image.func_195700_a(x, y, rgba); } public void copyImageData(FakeImage image) { diff --git a/Common/source/net/minecraft/client/renderer/texture/NativeImage.java b/Common/source/net/minecraft/client/renderer/texture/NativeImage.java index a2d5f97..54457fa 100644 --- a/Common/source/net/minecraft/client/renderer/texture/NativeImage.java +++ b/Common/source/net/minecraft/client/renderer/texture/NativeImage.java @@ -1,9 +1,15 @@ package net.minecraft.client.renderer.texture; +import java.io.InputStream; + /** * Empty stack for NativeImage */ public class NativeImage { + public static NativeImage func_195713_a(InputStream inputStreamIn) { + return null; + } + public NativeImage(int p_i48122_1_, int p_i48122_2_, boolean p_i48122_3_) { } diff --git a/Fabric/Fabric.tsrg b/Fabric/Fabric.tsrg index c26544c..6ae0d41 100644 --- a/Fabric/Fabric.tsrg +++ b/Fabric/Fabric.tsrg @@ -43,6 +43,7 @@ net/minecraft/client/renderer/texture/NativeImage net/minecraft/class_1011 func_195702_a ()I method_4307 func_195703_a (Lnet/minecraft/client/renderer/texture/NativeImage;)V method_4317 func_195709_a (II)I method_4315 + func_195713_a (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; method_4309 func_195714_b ()I method_4323 func_195715_a (IIIII)V method_4326 net/minecraft/client/renderer/texture/SimpleTexture net/minecraft/class_1049 diff --git a/Fabric/build.properties b/Fabric/build.properties index 25371a0..b43b057 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,1.19 +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,1.19.1 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 4a4937c..942a13d 100644 --- a/Forge/Active/Forge.tsrg +++ b/Forge/Active/Forge.tsrg @@ -43,6 +43,7 @@ net/minecraft/client/renderer/texture/NativeImage com/mojang/blaze3d/platform/Na func_195702_a ()I m_84982_ func_195703_a (Lnet/minecraft/client/renderer/texture/NativeImage;)V m_85054_ func_195709_a (II)I m_84985_ + func_195713_a (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; m_85058_ func_195714_b ()I m_85084_ func_195715_a (IIIII)V m_84997_ net/minecraft/client/renderer/texture/SimpleTexture net/minecraft/client/renderer/texture/SimpleTexture diff --git a/Forge/Active/build.properties b/Forge/Active/build.properties index a02f34f..0ce150d 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,1.19 +minecraft_full_versions=1.17.1,1.18,1.18.1,1.18.2,1.19,1.19.1 java_full_versions=16,17,18 #forge gradle needs forge version forge_mc_version=1.12.2 diff --git a/Vanilla/1.12.2/1.12.2.tsrg b/Vanilla/1.12.2/1.12.2.tsrg index 260f35d..c24b591 100644 --- a/Vanilla/1.12.2/1.12.2.tsrg +++ b/Vanilla/1.12.2/1.12.2.tsrg @@ -43,6 +43,7 @@ net/minecraft/client/renderer/texture/NativeImage com/mojang/blaze3d/platform/Na 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 diff --git a/Vanilla/1.16.5/1.16.5.tsrg b/Vanilla/1.16.5/1.16.5.tsrg index de1e185..4212f45 100644 --- a/Vanilla/1.16.5/1.16.5.tsrg +++ b/Vanilla/1.16.5/1.16.5.tsrg @@ -43,6 +43,7 @@ net/minecraft/client/renderer/texture/NativeImage det 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 diff --git a/Vanilla/1.18.2/1.18.2.tsrg b/Vanilla/1.18.2/1.18.2.tsrg index f44ffe8..b8a8812 100644 --- a/Vanilla/1.18.2/1.18.2.tsrg +++ b/Vanilla/1.18.2/1.18.2.tsrg @@ -43,6 +43,7 @@ net/minecraft/client/renderer/texture/NativeImage dsn 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 diff --git a/Vanilla/1.19/1.19.tsrg b/Vanilla/1.19.1/1.19.1.tsrg similarity index 71% rename from Vanilla/1.19/1.19.tsrg rename to Vanilla/1.19.1/1.19.1.tsrg index 757f77f..fced317 100644 --- a/Vanilla/1.19/1.19.tsrg +++ b/Vanilla/1.19.1/1.19.1.tsrg @@ -6,64 +6,65 @@ customskinloader/fake/itf/IFakeIResourceManager customskinloader/fake/itf/IFakeI 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; Q + func_195551_G ()Lnet/minecraft/resources/IResourceManager; S 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 eev - gameDir o +net/minecraft/client/Minecraft efu + gameDir p addScheduledTask (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; func_152344_a - 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 + getCurrentServerData ()Lnet/minecraft/client/multiplayer/ServerData; K + getMinecraft ()Lnet/minecraft/client/Minecraft; I + getResourceManager ()Lnet/minecraft/client/resources/IResourceManager; S + getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; ac + getSkinManager ()Lnet/minecraft/client/resources/SkinManager; ad + getTextureManager ()Lnet/minecraft/client/renderer/texture/TextureManager; R +net/minecraft/client/gui/GuiPlayerTabOverlay eii +net/minecraft/client/gui/spectator/PlayerMenuObject epw +net/minecraft/client/multiplayer/ServerData evb serverIP b -net/minecraft/client/renderer/RenderType eyc +net/minecraft/client/renderer/RenderType faa 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 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/ThreadDownloadImageData fjv +net/minecraft/client/renderer/entity/RenderPlayer fjk +net/minecraft/client/renderer/entity/layers/LayerCape fhs +net/minecraft/client/renderer/texture/DownloadingTexture fjv net/minecraft/client/renderer/texture/ITextureObject net/minecraft/client/renderer/texture/ITextureObject -net/minecraft/client/renderer/texture/NativeImage dyt +net/minecraft/client/renderer/texture/NativeImage dzq 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 fic -net/minecraft/client/renderer/texture/Texture fhu -net/minecraft/client/renderer/texture/TextureManager fih +net/minecraft/client/renderer/texture/SimpleTexture fka +net/minecraft/client/renderer/texture/Texture fjs +net/minecraft/client/renderer/texture/TextureManager fkf 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 fhx -net/minecraft/client/resources/DefaultPlayerSkin fin +net/minecraft/client/renderer/texture/ThreadDownloadImageData fjv +net/minecraft/client/resources/DefaultPlayerSkin fkl getDefaultSkin (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; a getDefaultSkinLegacy ()Lnet/minecraft/util/ResourceLocation; a -net/minecraft/client/resources/IResource ahs +net/minecraft/client/resources/IResource aik getInputStream ()Ljava/io/InputStream; b -net/minecraft/client/resources/IResourceManager ahu +net/minecraft/client/resources/IResourceManager aim getResource (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/resources/IResource; getResource -net/minecraft/client/resources/SkinManager fiw +net/minecraft/client/resources/SkinManager fku loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a -net/minecraft/client/resources/SkinManager$SkinAvailableCallback fiw$a +net/minecraft/client/resources/SkinManager$SkinAvailableCallback fku$a skinAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V onSkinTextureAvailable -net/minecraft/resources/IResource ahs -net/minecraft/resources/IResourceManager ahu -net/minecraft/util/ResourceLocation aaj -net/minecraft/util/StringUtils ame +net/minecraft/resources/IResource aik +net/minecraft/resources/IResourceManager aim +net/minecraft/util/ResourceLocation abb +net/minecraft/util/StringUtils amx stripControlCodes (Ljava/lang/String;)Ljava/lang/String; a diff --git a/Vanilla/1.19/build.properties b/Vanilla/1.19.1/build.properties similarity index 63% rename from Vanilla/1.19/build.properties rename to Vanilla/1.19.1/build.properties index 39c734d..f6ea6aa 100644 --- a/Vanilla/1.19/build.properties +++ b/Vanilla/1.19.1/build.properties @@ -1,8 +1,8 @@ -minecraft_version=1.19 -minecraft_full_versions=1.19 +minecraft_version=1.19.1 +minecraft_full_versions=1.19.1 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.tsrg +srg_notch_map=1.19.1.tsrg diff --git a/Vanilla/1.19/mixin.tsrg b/Vanilla/1.19.1/mixin.tsrg similarity index 72% rename from Vanilla/1.19/mixin.tsrg rename to Vanilla/1.19.1/mixin.tsrg index 6a035bb..03f29d3 100644 --- a/Vanilla/1.19/mixin.tsrg +++ b/Vanilla/1.19.1/mixin.tsrg @@ -1,35 +1,35 @@ -com/mojang/blaze3d/matrix/MatrixStack dzt -net/minecraft/client/Minecraft eev - isIntegratedServerRunning ()Z J -net/minecraft/client/entity/AbstractClientPlayer ewv +com/mojang/blaze3d/matrix/MatrixStack eaq +net/minecraft/client/Minecraft efu + isIntegratedServerRunning ()Z L +net/minecraft/client/entity/AbstractClientPlayer eyt 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 ehi +net/minecraft/client/gui/GuiPlayerTabOverlay eii 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 esv -net/minecraft/client/renderer/IRenderTypeBuffer exu -net/minecraft/client/renderer/RenderType eyc +net/minecraft/client/model/ModelRenderer eue +net/minecraft/client/renderer/IRenderTypeBuffer ezs +net/minecraft/client/renderer/RenderType faa getEntitySolid (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; b -net/minecraft/client/renderer/ThreadDownloadImageData fhx +net/minecraft/client/renderer/ThreadDownloadImageData fjv 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 fhm +net/minecraft/client/renderer/entity/RenderPlayer fjk 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 ffu +net/minecraft/client/renderer/entity/layers/LayerCape fhs 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 dyt -net/minecraft/client/renderer/texture/TextureManager fih -net/minecraft/client/resources/SkinManager fiw +net/minecraft/client/renderer/texture/NativeImage dzq +net/minecraft/client/renderer/texture/TextureManager fkf +net/minecraft/client/resources/SkinManager fku 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 fiw$a -net/minecraft/scoreboard/ScoreObjective dwo -net/minecraft/scoreboard/Scoreboard dwr -net/minecraft/util/ResourceLocation aaj +net/minecraft/client/resources/SkinManager$SkinAvailableCallback fku$a +net/minecraft/scoreboard/ScoreObjective dxl +net/minecraft/scoreboard/Scoreboard dxo +net/minecraft/util/ResourceLocation abb diff --git a/Vanilla/1.19/resource/mixins.customskinloader.json b/Vanilla/1.19.1/resource/mixins.customskinloader.json similarity index 100% rename from Vanilla/1.19/resource/mixins.customskinloader.json rename to Vanilla/1.19.1/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 3e9e825..3abcff9 100644 --- a/Vanilla/1.8.9/1.8.9.tsrg +++ b/Vanilla/1.8.9/1.8.9.tsrg @@ -43,6 +43,7 @@ net/minecraft/client/renderer/texture/NativeImage com/mojang/blaze3d/platform/Na 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 diff --git a/settings.gradle b/settings.gradle index 494138e..6bb69b1 100644 --- a/settings.gradle +++ b/settings.gradle @@ -10,7 +10,7 @@ include "Vanilla/1.8.9" include "Vanilla/1.12.2" include "Vanilla/1.16.5" include "Vanilla/1.18.2" -include "Vanilla/1.19" +include "Vanilla/1.19.1" //Forge Base Project include "Forge/Common"