diff --git a/Common/source/customskinloader/config/Config.java b/Common/source/customskinloader/config/Config.java index f8c28f0..e627814 100644 --- a/Common/source/customskinloader/config/Config.java +++ b/Common/source/customskinloader/config/Config.java @@ -32,7 +32,6 @@ public class Config { public boolean forceLoadAllTextures = false; public boolean enableCape = true; public int threadPoolSize = 3; - public int retryTime = 1; /** * Can logger write message to standard output(System.out). * Because standard output won't write to latest.log after Forge 1.17, @@ -81,7 +80,6 @@ public class Config { config.updateLoadlist(); config.initLocalFolder(); config.threadPoolSize = Math.max(config.threadPoolSize, 1); - config.retryTime = Math.max(config.retryTime, 0); if (config.forceIgnoreHttpsCertificate) HttpUtil0.ignoreHttpsCertificate(); if (config.enableCacheAutoClean && !config.enableLocalProfileCache) { diff --git a/Fabric/build.properties b/Fabric/build.properties index 93aecca..64db053 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,1.19.1,1.19.2 +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,1.19.2,1.19.3 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/build.properties b/Forge/Active/build.properties index 3185eb1..84239dd 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,1.19.1,1.19.2 +minecraft_full_versions=1.17.1,1.18,1.18.1,1.18.2,1.19,1.19.1,1.19.2,1.19.3 java_full_versions=16,17,18 #forge gradle needs forge version forge_mc_version=1.12.2 diff --git a/Vanilla/1.19.2/1.19.2.tsrg b/Vanilla/1.19.3/1.19.3.tsrg similarity index 68% rename from Vanilla/1.19.2/1.19.2.tsrg rename to Vanilla/1.19.3/1.19.3.tsrg index 21b4597..8a51886 100644 --- a/Vanilla/1.19.2/1.19.2.tsrg +++ b/Vanilla/1.19.3/1.19.3.tsrg @@ -1,34 +1,34 @@ 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 + 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; S -net/minecraft/client/Minecraft efu + func_195551_G ()Lnet/minecraft/resources/IResourceManager; Y +net/minecraft/client/Minecraft ejf gameDir p - getCurrentServerData ()Lnet/minecraft/client/multiplayer/ServerData; K - getMinecraft ()Lnet/minecraft/client/Minecraft; I - getResourceManager ()Lnet/minecraft/client/resources/IResourceManager; S - 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 + 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 faa +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 fjv -net/minecraft/client/renderer/entity/RenderPlayer fjk -net/minecraft/client/renderer/entity/layers/LayerCape fhs +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 dzq +net/minecraft/client/renderer/texture/NativeImage ede func_195699_a (IIIIIIZZ)V a func_195700_a (III)V a func_195702_a ()I a @@ -37,25 +37,25 @@ net/minecraft/client/renderer/texture/NativeImage dzq 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 fka -net/minecraft/client/renderer/texture/TextureManager fkf +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 fkl +net/minecraft/client/resources/DefaultPlayerSkin fpb getDefaultSkin (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; a -net/minecraft/client/resources/IResource aik - getInputStream ()Ljava/io/InputStream; b -net/minecraft/client/resources/IResourceManager aim +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 fku +net/minecraft/client/resources/SkinManager fpj loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a -net/minecraft/client/resources/SkinManager$3 fku$3 +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 fku$a +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 aik -net/minecraft/resources/IResourceManager aim -net/minecraft/util/ResourceLocation abb -net/minecraft/util/StringUtils amx +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.2/build.properties b/Vanilla/1.19.3/build.properties similarity index 63% rename from Vanilla/1.19.2/build.properties rename to Vanilla/1.19.3/build.properties index bb071b8..73dabb1 100644 --- a/Vanilla/1.19.2/build.properties +++ b/Vanilla/1.19.3/build.properties @@ -1,8 +1,8 @@ -minecraft_version=1.19.2 -minecraft_full_versions=1.19.2 +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.2.tsrg +srg_notch_map=1.19.3.tsrg diff --git a/Vanilla/1.19.2/mixin.tsrg b/Vanilla/1.19.3/mixin.tsrg similarity index 73% rename from Vanilla/1.19.2/mixin.tsrg rename to Vanilla/1.19.3/mixin.tsrg index da7e051..156b828 100644 --- a/Vanilla/1.19.2/mixin.tsrg +++ b/Vanilla/1.19.3/mixin.tsrg @@ -1,46 +1,46 @@ -com/mojang/blaze3d/matrix/MatrixStack eaq -net/minecraft/client/Minecraft efu - isIntegratedServerRunning ()Z L -net/minecraft/client/entity/AbstractClientPlayer eyt +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 eii +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 epw -net/minecraft/client/model/ModelRenderer eue +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 ezs -net/minecraft/client/renderer/RenderType faa +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 fjv +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 fjk +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 fhs +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 dzq -net/minecraft/client/renderer/texture/TextureManager fkf -net/minecraft/client/resources/SkinManager fku +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 fku$3 +net/minecraft/client/resources/SkinManager$3 fpj$3 run ()V run -net/minecraft/client/resources/SkinManager$3$1 fku$3$1 +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 fku$a +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 dxl -net/minecraft/scoreboard/Scoreboard dxo -net/minecraft/util/ResourceLocation abb +net/minecraft/scoreboard/ScoreObjective eaz +net/minecraft/scoreboard/Scoreboard ebc +net/minecraft/util/ResourceLocation acf diff --git a/Vanilla/1.19.2/resource/mixins.customskinloader.json b/Vanilla/1.19.3/resource/mixins.customskinloader.json similarity index 100% rename from Vanilla/1.19.2/resource/mixins.customskinloader.json rename to Vanilla/1.19.3/resource/mixins.customskinloader.json diff --git a/settings.gradle b/settings.gradle index bfc44b8..4b5068a 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.2" +include "Vanilla/1.19.3" //Forge Base Project include "Forge/Common"