mirror of
https://github.com/xfl03/MCCustomSkinLoader.git
synced 2026-11-22 11:59:45 +00:00
Support Vanilla and Fabric 1.17. Remove Vanilla 1.15.2. (#171)
* Support Fabric 1.17-rc2. * Support Vanilla and Fabric 1.17. Remove Vanilla 1.15.2.
This commit is contained in:
1 parent
04899ff676
commit
dc5ecfb576
11 files changed
+162
-96
No files matched your search
@@ -1,5 +1,5 @@
|
||||
minecraft_version=1.14
|
||||
minecraft_full_versions=1.14,1.14.1,1.14.2,1.14.3,1.14.4,1.15,1.15.1,1.15.2,1.16,1.16.1,1.16.2,1.16.3,1.16.4,1.16.5
|
||||
minecraft_full_versions=1.14,1.14.1,1.14.2,1.14.3,1.14.4,1.15,1.15.1,1.15.2,1.16,1.16.1,1.16.2,1.16.3,1.16.4,1.16.5,1.17
|
||||
#forge gradle needs forge version
|
||||
forge_mc_version=1.12.2
|
||||
forge_version=14.23.5.2768
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
"MixinSkinManager",
|
||||
"MixinTextureManager",
|
||||
"MixinThreadDownloadImageDataV2",
|
||||
"MixinThreadDownloadImageDataV3",
|
||||
"MixinTileEntitySkull"
|
||||
],
|
||||
"refmap": "mixins.customskinloader.refmap.json",
|
||||
|
||||
@@ -55,11 +55,13 @@ public class MixinConfigPlugin implements IMixinConfigPlugin {
|
||||
public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
|
||||
boolean result = true;
|
||||
if (mixinClassName.endsWith(".MixinThreadDownloadImageDataV2")) {
|
||||
result = this.world_version >= 2205 && this.protocol_version >= 554; // 19w38a+
|
||||
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(".MixinLayerCape") || mixinClassName.endsWith(".MixinRenderPlayer")) {
|
||||
result = this.world_version >= 2210 && this.protocol_version >= 558; // 19w41a+
|
||||
} else if (mixinClassName.endsWith(".MixinTileEntitySkull")) {
|
||||
result = this.world_version <= 2715 && (this.protocol_version <= 803 || (this.protocol_version >= 0x40000001 && this.protocol_version <= 0x4000001C)); // 21w20a-
|
||||
} else if (mixinClassName.endsWith(".MixinThreadDownloadImageDataV3")) {
|
||||
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);
|
||||
return result;
|
||||
|
||||
@@ -1,35 +1,35 @@
|
||||
customskinloader/fake/itf/IFakeTextureManager_1 customskinloader/fake/itf/IFakeTextureManager_1
|
||||
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; getTexture
|
||||
getTexture (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/Texture;)Lnet/minecraft/client/renderer/texture/Texture; b
|
||||
customskinloader/fake/itf/IFakeTextureManager_2 customskinloader/fake/itf/IFakeTextureManager_2
|
||||
func_229263_a_ (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/Texture;)V a
|
||||
net/minecraft/client/Minecraft dbn
|
||||
gameDir m
|
||||
net/minecraft/client/Minecraft dvo
|
||||
gameDir o
|
||||
addScheduledTask (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; func_152344_a
|
||||
getCurrentServerData ()Lnet/minecraft/client/multiplayer/ServerData; z
|
||||
getMinecraft ()Lnet/minecraft/client/Minecraft; x
|
||||
getResourceManager ()Lnet/minecraft/client/resources/IResourceManager; I
|
||||
getSession ()Lnet/minecraft/util/Session; E
|
||||
getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; R
|
||||
getSkinManager ()Lnet/minecraft/client/resources/SkinManager; S
|
||||
getTextureManager ()Lnet/minecraft/client/renderer/texture/TextureManager; H
|
||||
net/minecraft/client/gui/GuiPlayerTabOverlay ddj
|
||||
net/minecraft/client/gui/spectator/PlayerMenuObject djn
|
||||
net/minecraft/client/multiplayer/ServerData dnu
|
||||
getCurrentServerData ()Lnet/minecraft/client/multiplayer/ServerData; E
|
||||
getMinecraft ()Lnet/minecraft/client/Minecraft; C
|
||||
getResourceManager ()Lnet/minecraft/client/resources/IResourceManager; N
|
||||
getSession ()Lnet/minecraft/util/Session; J
|
||||
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 dxo
|
||||
net/minecraft/client/gui/spectator/PlayerMenuObject eem
|
||||
net/minecraft/client/multiplayer/ServerData ejm
|
||||
serverIP b
|
||||
net/minecraft/client/renderer/RenderType drb
|
||||
func_228644_e_ (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; e
|
||||
net/minecraft/client/renderer/RenderType enp
|
||||
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 dzz
|
||||
net/minecraft/client/renderer/entity/RenderPlayer dzt
|
||||
net/minecraft/client/renderer/entity/layers/LayerCape dye
|
||||
net/minecraft/client/renderer/texture/DownloadingTexture dzz
|
||||
net/minecraft/client/renderer/ThreadDownloadImageData exc
|
||||
net/minecraft/client/renderer/entity/RenderPlayer ews
|
||||
net/minecraft/client/renderer/entity/layers/LayerCape evb
|
||||
net/minecraft/client/renderer/texture/DownloadingTexture exc
|
||||
net/minecraft/client/renderer/texture/ITextureObject net/minecraft/client/renderer/texture/ITextureObject
|
||||
net/minecraft/client/renderer/texture/NativeImage cxr
|
||||
net/minecraft/client/renderer/texture/NativeImage dpl
|
||||
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 cxr
|
||||
func_195709_a (II)I a
|
||||
func_195714_b ()I b
|
||||
func_195715_a (IIIII)V a
|
||||
net/minecraft/client/renderer/texture/SimpleTexture eaf
|
||||
net/minecraft/client/renderer/texture/Texture dzw
|
||||
net/minecraft/client/renderer/texture/TextureManager eak
|
||||
net/minecraft/client/renderer/texture/SimpleTexture exh
|
||||
net/minecraft/client/renderer/texture/Texture ewz
|
||||
net/minecraft/client/renderer/texture/TextureManager exm
|
||||
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 dzz
|
||||
net/minecraft/client/resources/DefaultPlayerSkin eaq
|
||||
net/minecraft/client/renderer/texture/ThreadDownloadImageData exc
|
||||
net/minecraft/client/resources/DefaultPlayerSkin exs
|
||||
getDefaultSkin (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; a
|
||||
getDefaultSkinLegacy ()Lnet/minecraft/util/ResourceLocation; a
|
||||
net/minecraft/client/resources/IResource za
|
||||
net/minecraft/client/resources/IResource ads
|
||||
getInputStream ()Ljava/io/InputStream; b
|
||||
net/minecraft/client/resources/IResourceManager zb
|
||||
net/minecraft/client/resources/IResourceManager adt
|
||||
getResource (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/resources/IResource; a
|
||||
net/minecraft/client/resources/SkinManager eaz
|
||||
net/minecraft/client/resources/SkinManager eyb
|
||||
loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a
|
||||
net/minecraft/client/resources/SkinManager$SkinAvailableCallback eaz$a
|
||||
net/minecraft/client/resources/SkinManager$SkinAvailableCallback eyb$a
|
||||
skinAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V onSkinTextureAvailable
|
||||
net/minecraft/tileentity/TileEntitySkull bxi
|
||||
net/minecraft/util/ResourceLocation sm
|
||||
net/minecraft/util/Session dbz
|
||||
net/minecraft/tileentity/TileEntitySkull cjq
|
||||
net/minecraft/util/ResourceLocation ww
|
||||
net/minecraft/util/Session dwc
|
||||
getProfile ()Lcom/mojang/authlib/GameProfile; e
|
||||
net/minecraft/util/StringUtils aby
|
||||
net/minecraft/util/StringUtils ahi
|
||||
stripControlCodes (Ljava/lang/String;)Ljava/lang/String; a
|
||||
@@ -1,7 +1,7 @@
|
||||
minecraft_version=1.15.2
|
||||
minecraft_full_versions=1.15.2
|
||||
minecraft_version=1.17
|
||||
minecraft_full_versions=1.17
|
||||
#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.15.2.tsrg
|
||||
srg_notch_map=1.17.tsrg
|
||||
@@ -1,37 +1,37 @@
|
||||
com/mojang/blaze3d/matrix/MatrixStack cyl
|
||||
net/minecraft/client/Minecraft dbn
|
||||
isIntegratedServerRunning ()Z A
|
||||
net/minecraft/client/entity/AbstractClientPlayer dpy
|
||||
com/mojang/blaze3d/matrix/MatrixStack dqk
|
||||
net/minecraft/client/Minecraft dvo
|
||||
isIntegratedServerRunning ()Z F
|
||||
net/minecraft/client/entity/AbstractClientPlayer emi
|
||||
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 ddj
|
||||
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/model/ModelRenderer dni
|
||||
net/minecraft/client/renderer/IRenderTypeBuffer dqt
|
||||
net/minecraft/client/renderer/RenderType drb
|
||||
getEntitySolid (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; a
|
||||
net/minecraft/client/renderer/ThreadDownloadImageData dzz
|
||||
net/minecraft/client/gui/GuiPlayerTabOverlay dxo
|
||||
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 eiq
|
||||
net/minecraft/client/renderer/IRenderTypeBuffer enh
|
||||
net/minecraft/client/renderer/RenderType enp
|
||||
getEntitySolid (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; b
|
||||
net/minecraft/client/renderer/ThreadDownloadImageData exc
|
||||
bufferedImage field_110560_d
|
||||
textureUploaded k
|
||||
processTask i
|
||||
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 dzt
|
||||
net/minecraft/client/renderer/entity/RenderPlayer ews
|
||||
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 dye
|
||||
net/minecraft/client/renderer/entity/layers/LayerCape evb
|
||||
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 cxr
|
||||
net/minecraft/client/renderer/texture/TextureManager eak
|
||||
net/minecraft/client/resources/SkinManager eaz
|
||||
net/minecraft/client/renderer/texture/NativeImage dpl
|
||||
net/minecraft/client/renderer/texture/TextureManager exm
|
||||
net/minecraft/client/resources/SkinManager eyb
|
||||
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 eaz$a
|
||||
net/minecraft/scoreboard/ScoreObjective cwi
|
||||
net/minecraft/scoreboard/Scoreboard cwl
|
||||
net/minecraft/tileentity/TileEntitySkull bxi
|
||||
updateGameProfile (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; b
|
||||
net/minecraft/util/ResourceLocation sm
|
||||
net/minecraft/client/resources/SkinManager$SkinAvailableCallback eyb$a
|
||||
net/minecraft/scoreboard/ScoreObjective dnv
|
||||
net/minecraft/scoreboard/Scoreboard dny
|
||||
net/minecraft/tileentity/TileEntitySkull cjq
|
||||
updateGameProfile (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; func_174884_b
|
||||
net/minecraft/util/ResourceLocation ww
|
||||
+1
-2
@@ -9,8 +9,7 @@
|
||||
"MixinRenderPlayer",
|
||||
"MixinSkinManager",
|
||||
"MixinTextureManager",
|
||||
"MixinThreadDownloadImageDataV2",
|
||||
"MixinTileEntitySkull"
|
||||
"MixinThreadDownloadImageDataV3"
|
||||
],
|
||||
"refmap": "mixins.customskinloader.refmap.json",
|
||||
"injectors": {
|
||||
@@ -37,3 +37,35 @@ task afterBuildForVanilla {
|
||||
}
|
||||
}
|
||||
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<String>
|
||||
def mapping = [:] as Map<String, String>
|
||||
// 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))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -46,68 +46,68 @@
|
||||
{
|
||||
"downloads": {
|
||||
"artifact": {
|
||||
"path": "org/ow2/asm/asm/9.0/asm-9.0.jar",
|
||||
"sha1": "af582ff60bc567c42d931500c3fdc20e0141ddf9",
|
||||
"size": 121783,
|
||||
"url": "https://repo1.maven.org/maven2/org/ow2/asm/asm/9.0/asm-9.0.jar"
|
||||
"path": "org/ow2/asm/asm/9.1/asm-9.1.jar",
|
||||
"sha1": "a99500cf6eea30535eeac6be73899d048f8d12a8",
|
||||
"size": 121790,
|
||||
"url": "https://repo1.maven.org/maven2/org/ow2/asm/asm/9.1/asm-9.1.jar"
|
||||
}
|
||||
},
|
||||
"name": "org.ow2.asm:asm:9.0"
|
||||
"name": "org.ow2.asm:asm:9.1"
|
||||
},
|
||||
{
|
||||
"downloads": {
|
||||
"artifact": {
|
||||
"path": "org/ow2/asm/asm-analysis/9.0/asm-analysis-9.0.jar",
|
||||
"sha1": "4630afefbb43939c739445dde0af1a5729a0fb4e",
|
||||
"size": 33439,
|
||||
"url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.0/asm-analysis-9.0.jar"
|
||||
"path": "org/ow2/asm/asm-analysis/9.1/asm-analysis-9.1.jar",
|
||||
"sha1": "4f61b83b81d8b659958f4bcc48907e93ecea55a0",
|
||||
"size": 34257,
|
||||
"url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.1/asm-analysis-9.1.jar"
|
||||
}
|
||||
},
|
||||
"name": "org.ow2.asm:asm-analysis:9.0"
|
||||
"name": "org.ow2.asm:asm-analysis:9.1"
|
||||
},
|
||||
{
|
||||
"downloads": {
|
||||
"artifact": {
|
||||
"path": "org/ow2/asm/asm-commons/9.0/asm-commons-9.0.jar",
|
||||
"sha1": "5a34a3a9ac44f362f35d1b27932380b0031a3334",
|
||||
"size": 71646,
|
||||
"url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.0/asm-commons-9.0.jar"
|
||||
"path": "org/ow2/asm/asm-commons/9.1/asm-commons-9.1.jar",
|
||||
"sha1": "8b971b182eb5cf100b9e8d4119152d83e00e0fdd",
|
||||
"size": 72641,
|
||||
"url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.1/asm-commons-9.1.jar"
|
||||
}
|
||||
},
|
||||
"name": "org.ow2.asm:asm-commons:9.0"
|
||||
"name": "org.ow2.asm:asm-commons:9.1"
|
||||
},
|
||||
{
|
||||
"downloads": {
|
||||
"artifact": {
|
||||
"path": "org/ow2/asm/asm-tree/9.0/asm-tree-9.0.jar",
|
||||
"sha1": "9df939f25c556b0c7efe00701d47e77a49837f24",
|
||||
"size": 52673,
|
||||
"url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.0/asm-tree-9.0.jar"
|
||||
"path": "org/ow2/asm/asm-tree/9.1/asm-tree-9.1.jar",
|
||||
"sha1": "c333f2a855069cb8eb17a40a3eb8b1b67755d0eb",
|
||||
"size": 52662,
|
||||
"url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.1/asm-tree-9.1.jar"
|
||||
}
|
||||
},
|
||||
"name": "org.ow2.asm:asm-tree:9.0"
|
||||
"name": "org.ow2.asm:asm-tree:9.1"
|
||||
},
|
||||
{
|
||||
"downloads": {
|
||||
"artifact": {
|
||||
"path": "org/ow2/asm/asm-util/9.0/asm-util-9.0.jar",
|
||||
"sha1": "7c059a94ab5eed3347bf954e27fab58e52968848",
|
||||
"size": 84857,
|
||||
"url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.0/asm-util-9.0.jar"
|
||||
"path": "org/ow2/asm/asm-util/9.1/asm-util-9.1.jar",
|
||||
"sha1": "36464a45d871779f3383a8a9aba2b26562a86729",
|
||||
"size": 84679,
|
||||
"url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.1/asm-util-9.1.jar"
|
||||
}
|
||||
},
|
||||
"name": "org.ow2.asm:asm-util:9.0"
|
||||
"name": "org.ow2.asm:asm-util:9.1"
|
||||
},
|
||||
{
|
||||
"downloads": {
|
||||
"artifact": {
|
||||
"path": "org/spongepowered/mixin/0.8.2/mixin-0.8.2.jar",
|
||||
"sha1": "1cf212283d26f706fd3074318870bebd14d2a9ed",
|
||||
"size": 935252,
|
||||
"url": "https://repo.spongepowered.org/repository/maven-public/org/spongepowered/mixin/0.8.2/mixin-0.8.2.jar"
|
||||
"path": "org/spongepowered/mixin/0.8.3-SNAPSHOT/mixin-0.8.3-20210427.123106-6.jar",
|
||||
"sha1": "ac62dd93389087d7568d614146b37da0b1cdc642",
|
||||
"size": 1006436,
|
||||
"url": "https://repo.spongepowered.org/repository/maven-public/org/spongepowered/mixin/0.8.3-SNAPSHOT/mixin-0.8.3-20210427.123106-6.jar"
|
||||
}
|
||||
},
|
||||
"name": "org.spongepowered:mixin:0.8.2"
|
||||
"name": "org.spongepowered:mixin:0.8.3-SNAPSHOT"
|
||||
}
|
||||
],
|
||||
"mainClass": "net.minecraft.launchwrapper.Launch",
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
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);
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -7,8 +7,8 @@ include "Vanilla"
|
||||
//Special Vanilla Edition
|
||||
include "Vanilla/1.8.9"
|
||||
include "Vanilla/1.12.2"
|
||||
include "Vanilla/1.15.2"
|
||||
include "Vanilla/1.16.5"
|
||||
include "Vanilla/1.17"
|
||||
|
||||
//Universal Forge Edition for [1.8,)
|
||||
include "Forge"
|
||||
|
||||
Reference in new issue
Block a user