From c8e96c11cd916459b6186541d82165ce1310d9d8 Mon Sep 17 00:00:00 2001 From: 8Mi_Yile Date: Sat, 28 Jan 2023 12:42:38 +0800 Subject: [PATCH 1/3] Add Github Issue Template's options in Report Bug (#242) * Update report_bug.en_US.yml * Update report_bug.zh_CN.yml * Update report_bug.zh_CN.yml * Update report_bug.en_US.yml * Update report_bug.zh_CN.yml * Update report_bug.en_US.yml * Update report_bug.en_US.yml * Update report_bug.zh_CN.yml * Update report_bug.zh_CN.yml * Update report_bug.zh_CN.yml * Update report_bug.en_US.yml * Update report_bug.zh_CN.yml --- .github/ISSUE_TEMPLATE/report_bug.en_US.yml | 34 +++++++++++++++++++-- .github/ISSUE_TEMPLATE/report_bug.zh_CN.yml | 33 ++++++++++++++++++-- 2 files changed, 62 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/report_bug.en_US.yml b/.github/ISSUE_TEMPLATE/report_bug.en_US.yml index fa7f61d..1171443 100644 --- a/.github/ISSUE_TEMPLATE/report_bug.en_US.yml +++ b/.github/ISSUE_TEMPLATE/report_bug.en_US.yml @@ -1,7 +1,14 @@ name: Report Bug description: Report a bug and help us improve CustomSkinLoader labels: [ bug ] +title: "[Bug] " body: + - type: markdown + attributes: + value: | + Here is the Report Bug issue for CustomSkinLoader + With a red asterisk for the mandatory items + Please keep the work order content neat and tidy, do not paste the contents of the log file directly onto the work order, it will look very messy and unattractive work orders - type: textarea id: description attributes: @@ -18,6 +25,10 @@ body: label: Steps to reproduce description: How do you trigger this bug? render: bash + value: | + 1. + 2. + 3. validations: required: true - type: input @@ -27,7 +38,7 @@ body: description: | The files are in the folder `/crash-reports` [Generate URL](https://mclo.gs) - placeholder: "https://" + placeholder: "https://mclo.gs/xxxxxx" - type: input id: csl-log attributes: @@ -35,7 +46,24 @@ body: description: | The path to the file is `/CustomSkinLoader/CustomSkinLoader.log`. [Generate URL](https://mclo.gs) - placeholder: "https://" + placeholder: "https://mclo.gs/xxxxxx" + - type: input + id: latest-log + attributes: + label: Link to latest.log if applicable + description: | + The path to the file is `/logs/latest.log`. + [Generate URL](https://mclo.gs) + placeholder: "https://mclo.gs/xxxxxx" + - type: input + id: forge-log + attributes: + label: "[Only Forge User] Link to debug.log (=>1.12.2) or fml-client-latest.log (=<1.12.2) if applicable" + description: | + The path to the file is `/logs/debug.log` or `/logs/fml-client-latest.log`. + if your mod loader isn't `Forge`, URL can set empty + [Generate URL](https://mclo.gs) + placeholder: "https://mclo.gs/xxxxxx" - type: input id: mod-version attributes: @@ -56,7 +84,7 @@ body: - Quilt - Fabric - Forge - - + - validations: required: true - type: dropdown diff --git a/.github/ISSUE_TEMPLATE/report_bug.zh_CN.yml b/.github/ISSUE_TEMPLATE/report_bug.zh_CN.yml index c247859..0938948 100644 --- a/.github/ISSUE_TEMPLATE/report_bug.zh_CN.yml +++ b/.github/ISSUE_TEMPLATE/report_bug.zh_CN.yml @@ -1,7 +1,14 @@ name: 提交问题 description: 报告问题以帮助我们改进CustomSkinLoader labels: [ bug ] +title: "[Bug] " body: + - type: markdown + attributes: + value: | + 你好,这里是 `CustomSkinLoader` + 标注红色星号的为必填项 + 以及,保持工单干净整洁,不要直接将日志内容粘贴到工单上,比如粘贴到描述内是不行的 - type: textarea id: description attributes: @@ -17,6 +24,10 @@ body: label: 复现步骤 description: 请问你是如何触发这个问题的 render: bash + value: | + 1. + 2. + 3. validations: required: true - type: input @@ -25,8 +36,9 @@ body: label: 崩溃报告查看地址 description: | 在游戏目录下的 `crash-reports` 文件夹下,里面找最近的报告生成时间 + 客户端若无崩溃则直接填写 `客户端无崩溃` [生成连接](https://mclo.gs) - placeholder: "https://" + placeholder: "https://mclo.gs/xxxxxx" - type: input id: csl-log attributes: @@ -34,7 +46,24 @@ body: description: | 文件路径:`<游戏路径>/CustomSkinLoader/CustomSkinLoader.log`. [生成连接](https://mclo.gs) - placeholder: "https://" + placeholder: "https://mclo.gs/xxxxxx" + - type: input + id: latest-log + attributes: + label: latest.log 查看地址 + description: | + 文件路径:`<游戏路径>/logs/latest.log`. + [生成连接](https://mclo.gs) + placeholder: "https://mclo.gs/xxxxxx" + - type: input + id: forge-log + attributes: + label: "[仅Forge用户] debug.log (=>1.12.2) 或者 fml-client-latest.log (=<1.12.2) 查看地址" + description: | + 文件路径:`<游戏路径>/logs/debug.log` 或者 `<游戏路径>/logs/fml-client-latest.log`. + 若没有使用 `Forge` 加载器的,可以不填写 + [生成连接](https://mclo.gs) + placeholder: "https://mclo.gs/xxxxxx" - type: input id: mod-version attributes: From 85923855d87ab364a58ca5dda920aa8c75b1eda4 Mon Sep 17 00:00:00 2001 From: ZekerZhayard Date: Wed, 15 Mar 2023 23:34:05 +0800 Subject: [PATCH 2/3] Support 1.19.4. Remove Vanilla 1.19.3. --- CONTRIBUTING.md | 7 +--- Fabric/build.properties | 2 +- .../fabric/DevEnvRemapper.java | 7 ---- Forge/Active/build.properties | 2 +- .../1.19.3.tsrg => 1.19.4/1.19.4.tsrg} | 42 +++++++++---------- Vanilla/{1.19.3 => 1.19.4}/build.properties | 6 +-- Vanilla/{1.19.3 => 1.19.4}/mixin.tsrg | 42 +++++++++---------- .../resource/mixins.customskinloader.json | 0 build.properties | 2 +- settings.gradle | 2 +- 10 files changed, 51 insertions(+), 61 deletions(-) rename Vanilla/{1.19.3/1.19.3.tsrg => 1.19.4/1.19.4.tsrg} (75%) rename Vanilla/{1.19.3 => 1.19.4}/build.properties (63%) rename Vanilla/{1.19.3 => 1.19.4}/mixin.tsrg (73%) rename Vanilla/{1.19.3 => 1.19.4}/resource/mixins.customskinloader.json (100%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c476d1f..a2272f1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,7 +13,7 @@ There are the available versions in different environments below: | | Forge | Fabric | |:-----------------------:|:-----------------------------------------------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------------------------------------------------:| | Runtime Environment | forge-1.8-11.14.0.1237 ~ 1.13.2-25.0.22
forge-1.13.2-25.0.42 ~ latest | fabric-loader-0.4.3+build.134 ~ latest
Minecraft 18w43b ~ latest
*fabric-api is not required* | -| Development Environment | ForgeGradle-2.1-SNAPSHOT ~ latest
forge-1.8-11.14.3.1503 ~ 1.12.2-14.23.5.2855
forge-1.13.2-25.0.198 ~ latest | fabric-loom-(?) ~ latest
fabric-loader-0.12.0 ~ latest
Minecraft 18w49a ~ latest
*fabric-api is not required* | +| Development Environment | ForgeGradle-2.1-SNAPSHOT ~ latest
forge-1.8-11.14.3.1503 ~ 1.12.2-14.23.5.2860
forge-1.13.2-25.0.198 ~ latest | fabric-loom-(?) ~ latest
fabric-loader-0.12.0 ~ latest
Minecraft 18w49a ~ latest
*fabric-api is not required* | ### Preliminary steps for testing local builds 1. Create a new empty minecraft development environment. @@ -78,10 +78,7 @@ There are the available versions in different environments below: clientRunArgs += ["--tweakClass", "customskinloader.forge.ForgeDevTweaker", "--username", ""] } ``` -1. Run `./gradlew setupDecompWorkspace eclipse` command. -1. Due to the run configurations which generated by ForgeGradle 2 has not been compatible with IntelliJ IDEA 2020 and above, we recommend to install [Eclipser](https://plugins.jetbrains.com/plugin/7153-eclipser) plugin. It can convert Eclipse run configurations to IDEA. (Right click to `*.launch` file in project folder, then select `Convert with Eclipser`, then a new IDEA run configuration will be created.) -1. For IDEA, open `Run/Debug Configurations` dialog, change classpath of module to the name contains `.main`. -1. Add `--tweakClass customskinloader.forge.ForgeDevTweaker --username ` to CLI arguments in `Run/Debug Configurations` dialog. +1. Run `./gradlew setupDecompWorkspace` command. 1. Then you can debug the mod in IDE or through `./gradlew runClient` command. ### For ForgeGradle 3.x ~ 5.x ( forge-1.12.2-14.23.5.2851 ~ latest ) diff --git a/Fabric/build.properties b/Fabric/build.properties index 64db053..d507324 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,1.19.3 +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,1.19.4 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/Fabric/source/customskinloader/fabric/DevEnvRemapper.java b/Fabric/source/customskinloader/fabric/DevEnvRemapper.java index 7fc501c..382bc46 100644 --- a/Fabric/source/customskinloader/fabric/DevEnvRemapper.java +++ b/Fabric/source/customskinloader/fabric/DevEnvRemapper.java @@ -35,13 +35,6 @@ public class DevEnvRemapper extends SimpleRemapper { Lists.newArrayList("customskinloader.fake.itf.FakeInterfaceManager") ) ); - remappedClasses.put( - "net.minecraft.class_1060", - new AbstractMap.SimpleEntry<>( - Lists.newArrayList("customskinloader.fake.itf.IFakeTextureManager$V1", "customskinloader.fake.itf.IFakeTextureManager$V2"), - Lists.newArrayList("customskinloader.fake.itf.FakeInterfaceManager") - ) - ); remappedClasses.put( "net.minecraft.class_3298", new AbstractMap.SimpleEntry<>( diff --git a/Forge/Active/build.properties b/Forge/Active/build.properties index 84239dd..33ef762 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,1.19.3 +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,1.19.4 java_full_versions=16,17,18 #forge gradle needs forge version forge_mc_version=1.12.2 diff --git a/Vanilla/1.19.3/1.19.3.tsrg b/Vanilla/1.19.4/1.19.4.tsrg similarity index 75% rename from Vanilla/1.19.3/1.19.3.tsrg rename to Vanilla/1.19.4/1.19.4.tsrg index 3dcd16d..5404a82 100644 --- a/Vanilla/1.19.3/1.19.3.tsrg +++ b/Vanilla/1.19.4/1.19.4.tsrg @@ -7,28 +7,28 @@ customskinloader/fake/itf/IFakeIResourceManager customskinloader/fake/itf/IFakeI 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 +net/minecraft/client/Minecraft emh 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 +net/minecraft/client/gui/GuiPlayerTabOverlay eoz +net/minecraft/client/gui/spectator/PlayerMenuObject eya +net/minecraft/client/multiplayer/ServerData fdq serverIP b -net/minecraft/client/renderer/RenderType fed +net/minecraft/client/renderer/RenderType fio 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/ThreadDownloadImageData fsq +net/minecraft/client/renderer/entity/RenderPlayer fsf +net/minecraft/client/renderer/entity/layers/LayerCape fqn net/minecraft/client/renderer/texture/ITextureObject net/minecraft/client/renderer/texture/ITextureObject -net/minecraft/client/renderer/texture/NativeImage ede +net/minecraft/client/renderer/texture/NativeImage egf func_195699_a (IIIIIIZZ)V a func_195700_a (III)V a func_195702_a ()I a @@ -37,26 +37,26 @@ net/minecraft/client/renderer/texture/NativeImage ede 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 +net/minecraft/client/renderer/texture/SimpleTexture fsv +net/minecraft/client/renderer/texture/TextureManager ftd 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 +net/minecraft/client/resources/DefaultPlayerSkin ftt getDefaultSkin (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; a -net/minecraft/client/resources/IResource akc +net/minecraft/client/resources/IResource alf getInputStream ()Ljava/io/InputStream; d -net/minecraft/client/resources/IResourceManager ake +net/minecraft/client/resources/IResourceManager alh getResource (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/resources/IResource; getResource -net/minecraft/client/resources/SkinManager fpj +net/minecraft/client/resources/SkinManager fub 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 +net/minecraft/client/resources/SkinManager$3 fub$3 field_152801_c field_152801_c field_152802_d field_152802_d -net/minecraft/client/resources/SkinManager$SkinAvailableCallback fpj$a +net/minecraft/client/resources/SkinManager$SkinAvailableCallback fub$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 +net/minecraft/resources/IResource alf +net/minecraft/resources/IResourceManager alh +net/minecraft/util/ResourceLocation add +net/minecraft/util/StringUtils aqb stripControlCodes (Ljava/lang/String;)Ljava/lang/String; a diff --git a/Vanilla/1.19.3/build.properties b/Vanilla/1.19.4/build.properties similarity index 63% rename from Vanilla/1.19.3/build.properties rename to Vanilla/1.19.4/build.properties index 73dabb1..e1eccf1 100644 --- a/Vanilla/1.19.3/build.properties +++ b/Vanilla/1.19.4/build.properties @@ -1,8 +1,8 @@ -minecraft_version=1.19.3 -minecraft_full_versions=1.19.3 +minecraft_version=1.19.4 +minecraft_full_versions=1.19.4 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 +srg_notch_map=1.19.4.tsrg diff --git a/Vanilla/1.19.3/mixin.tsrg b/Vanilla/1.19.4/mixin.tsrg similarity index 73% rename from Vanilla/1.19.3/mixin.tsrg rename to Vanilla/1.19.4/mixin.tsrg index 156b828..c7c9a09 100644 --- a/Vanilla/1.19.3/mixin.tsrg +++ b/Vanilla/1.19.4/mixin.tsrg @@ -1,46 +1,46 @@ -com/mojang/blaze3d/matrix/MatrixStack eed -net/minecraft/client/Minecraft ejf +com/mojang/blaze3d/matrix/MatrixStack ehe +net/minecraft/client/Minecraft emh isIntegratedServerRunning ()Z Q -net/minecraft/client/entity/AbstractClientPlayer fcw +net/minecraft/client/entity/AbstractClientPlayer fhh 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 +net/minecraft/client/gui/GuiPlayerTabOverlay eoz + 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 a -net/minecraft/client/gui/spectator/PlayerMenuObject ett -net/minecraft/client/model/ModelRenderer eyh +net/minecraft/client/gui/spectator/PlayerMenuObject eya +net/minecraft/client/model/ModelRenderer fcr net/minecraft/client/renderer/IImageBuffer net/minecraft/client/renderer/IImageBuffer -net/minecraft/client/renderer/IRenderTypeBuffer fdv -net/minecraft/client/renderer/RenderType fed +net/minecraft/client/renderer/IRenderTypeBuffer fig +net/minecraft/client/renderer/RenderType fio getEntitySolid (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; b -net/minecraft/client/renderer/ThreadDownloadImageData fnz +net/minecraft/client/renderer/ThreadDownloadImageData fsq 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 +net/minecraft/client/renderer/entity/RenderPlayer fsf 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 +net/minecraft/client/renderer/entity/layers/LayerCape fqn 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 +net/minecraft/client/renderer/texture/NativeImage egf +net/minecraft/client/renderer/texture/TextureManager ftd +net/minecraft/client/resources/SkinManager fub 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 +net/minecraft/client/resources/SkinManager$3 fub$3 run ()V run -net/minecraft/client/resources/SkinManager$3$1 fpj$3$1 +net/minecraft/client/resources/SkinManager$3$1 fub$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 +net/minecraft/client/resources/SkinManager$SkinAvailableCallback fub$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 +net/minecraft/scoreboard/ScoreObjective edz +net/minecraft/scoreboard/Scoreboard eec +net/minecraft/util/ResourceLocation add diff --git a/Vanilla/1.19.3/resource/mixins.customskinloader.json b/Vanilla/1.19.4/resource/mixins.customskinloader.json similarity index 100% rename from Vanilla/1.19.3/resource/mixins.customskinloader.json rename to Vanilla/1.19.4/resource/mixins.customskinloader.json diff --git a/build.properties b/build.properties index 2f22a08..9a2c636 100644 --- a/build.properties +++ b/build.properties @@ -1,4 +1,4 @@ name=CustomSkinLoader group=customskinloader -version=14.16 +version=14.15.3 dev_version= diff --git a/settings.gradle b/settings.gradle index 4b5068a..fe15476 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.3" +include "Vanilla/1.19.4" //Forge Base Project include "Forge/Common" From f5b19894536d496ebad89a160542a04e6f6de882 Mon Sep 17 00:00:00 2001 From: ZekerZhayard Date: Sat, 18 Mar 2023 11:07:34 +0800 Subject: [PATCH 3/3] Fix: Skull textures not loading when using local skins. --- .../fake/FakeMinecraftProfileTexture.java | 4 ++++ .../source/customskinloader/fake/FakeSkinManager.java | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Common/source/customskinloader/fake/FakeMinecraftProfileTexture.java b/Common/source/customskinloader/fake/FakeMinecraftProfileTexture.java index c4db78f..517f5be 100644 --- a/Common/source/customskinloader/fake/FakeMinecraftProfileTexture.java +++ b/Common/source/customskinloader/fake/FakeMinecraftProfileTexture.java @@ -29,6 +29,10 @@ public class FakeMinecraftProfileTexture extends MinecraftProfileTexture { return this.info.url; } + public String getRawUrl() { + return super.getUrl(); + } + @Override public String getHash() { return this.info.hash; diff --git a/Common/source/customskinloader/fake/FakeSkinManager.java b/Common/source/customskinloader/fake/FakeSkinManager.java index 380176a..bbc9d74 100644 --- a/Common/source/customskinloader/fake/FakeSkinManager.java +++ b/Common/source/customskinloader/fake/FakeSkinManager.java @@ -61,11 +61,11 @@ public class FakeSkinManager { FakeMinecraftProfileTexture fakeProfileTexture = (FakeMinecraftProfileTexture) profileTexture; ResourceLocation resourcelocation = fakeProfileTexture.getResourceLocation(); if (fakeProfileTexture.getResourceLocation() != null) { - params[0] = ((FakeMinecraftProfileTexture) profileTexture).getCacheFile(); + params[0] = fakeProfileTexture.getCacheFile(); if (params[params.length - 2] instanceof Boolean) { params[params.length - 2] = true; } - params[params.length - 1] = fakeManager.new BaseBuffer(skinAvailableCallback, textureType, resourcelocation, profileTexture); + params[params.length - 1] = fakeManager.new BaseBuffer(skinAvailableCallback, textureType, resourcelocation, fakeProfileTexture); } } return params; @@ -138,9 +138,9 @@ public class FakeSkinManager { private SkinManager.SkinAvailableCallback callback; private MinecraftProfileTexture.Type type; private ResourceLocation location; - private MinecraftProfileTexture texture; + private FakeMinecraftProfileTexture texture; - public BaseBuffer(SkinManager.SkinAvailableCallback callback, MinecraftProfileTexture.Type type, ResourceLocation location, MinecraftProfileTexture texture) { + public BaseBuffer(SkinManager.SkinAvailableCallback callback, MinecraftProfileTexture.Type type, ResourceLocation location, FakeMinecraftProfileTexture texture) { switch (type) { case SKIN: this.buffer = new FakeSkinBuffer(); break; case CAPE: this.buffer = new FakeCapeBuffer(location); break; @@ -168,7 +168,7 @@ public class FakeSkinManager { Map metadata = Maps.newHashMap(); String type = ((FakeSkinBuffer) buffer).judgeType(); metadata.put("model", type); - texture = new MinecraftProfileTexture(texture.getUrl(), metadata); + texture = new FakeMinecraftProfileTexture(texture.getRawUrl(), metadata); FakeSkinManager.this.modelCache.put(location, texture); } }