mirror of
https://github.com/xfl03/MCCustomSkinLoader.git
synced 2026-11-18 17:19:15 +00:00
Support 26.1 (#368)
This commit is contained in:
1 parent
08033b0502
commit
faebfc9bb1
26 files changed
+84
-32
No files matched your search
@@ -7,6 +7,7 @@ import java.util.function.Function;
|
||||
import java.util.function.Predicate;
|
||||
|
||||
import customskinloader.CustomSkinLoader;
|
||||
import customskinloader.fake.itf.FakeInterfaceManager;
|
||||
import customskinloader.fake.texture.FakeBufferedImage;
|
||||
import customskinloader.fake.texture.FakeImage;
|
||||
import customskinloader.fake.texture.FakeNativeImage;
|
||||
@@ -28,7 +29,9 @@ public class FakeSkinBuffer implements IImageBuffer {
|
||||
|
||||
FakeImage img = parseUserSkin0(new FakeNativeImage(image));
|
||||
if (img instanceof FakeNativeImage) {
|
||||
return FakeNativeImage.Extended.create((FakeNativeImage) img);
|
||||
image = ((FakeNativeImage) img).getImage();
|
||||
FakeInterfaceManager.NativeImage_setFakeImage(image, img);
|
||||
return image;
|
||||
}
|
||||
|
||||
CustomSkinLoader.logger.warning("Failed to parseUserSkin(downloadAndRegisterSkin).");
|
||||
|
||||
@@ -4,6 +4,7 @@ import java.io.InputStream;
|
||||
import java.util.Optional;
|
||||
|
||||
import customskinloader.fake.FakeMinecraftProfileTexture;
|
||||
import customskinloader.fake.texture.FakeNativeImage;
|
||||
import net.minecraft.client.resources.IResource;
|
||||
import net.minecraft.client.resources.IResourceManager;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
@@ -32,6 +33,14 @@ public class FakeInterfaceManager {
|
||||
((IFakeNativeImage) nativeImage).setPixel(x, y, color);
|
||||
}
|
||||
|
||||
public static FakeNativeImage NativeImage_getFakeImage(Object nativeImage) {
|
||||
return ((IFakeNativeImage) nativeImage).getFakeImage();
|
||||
}
|
||||
|
||||
public static void NativeImage_setFakeImage(Object nativeImage, Object fakeImage) {
|
||||
((IFakeNativeImage) nativeImage).setFakeImage((FakeNativeImage) fakeImage);
|
||||
}
|
||||
|
||||
public static FakeMinecraftProfileTexture ResourceLocation_getTexture(Object location) {
|
||||
return ((IFakeResourceLocation) location).getTexture();
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package customskinloader.fake.itf;
|
||||
|
||||
import customskinloader.fake.texture.FakeNativeImage;
|
||||
import net.minecraft.client.renderer.texture.NativeImage;
|
||||
|
||||
public interface IFakeNativeImage {
|
||||
@@ -10,4 +11,8 @@ public interface IFakeNativeImage {
|
||||
default void setPixel(int x, int y, int color) {
|
||||
((NativeImage) this).func_195700_a(x, y, color);
|
||||
}
|
||||
|
||||
FakeNativeImage getFakeImage();
|
||||
|
||||
void setFakeImage(FakeNativeImage fakeImage);
|
||||
}
|
||||
@@ -71,22 +71,4 @@ public class FakeNativeImage implements FakeImage {
|
||||
public void close() {
|
||||
image.close();
|
||||
}
|
||||
|
||||
public static class Extended extends NativeImage {
|
||||
public static NativeImage create(FakeNativeImage fakeImage) {
|
||||
return new FakeNativeImage.Extended(fakeImage);
|
||||
}
|
||||
|
||||
private final FakeNativeImage fakeImage;
|
||||
|
||||
public Extended(FakeNativeImage fakeImage) {
|
||||
super(fakeImage.getWidth(), fakeImage.getHeight(), true);
|
||||
this.func_195703_a(fakeImage.getImage());
|
||||
this.fakeImage = fakeImage;
|
||||
}
|
||||
|
||||
public FakeNativeImage getFakeImage() {
|
||||
return this.fakeImage;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4,6 +4,7 @@ import java.util.concurrent.CompletableFuture;
|
||||
import java.util.function.Function;
|
||||
|
||||
import customskinloader.fake.FakeCapeBuffer;
|
||||
import customskinloader.fake.FakeMinecraftProfileTexture;
|
||||
import customskinloader.fake.FakeSkinBuffer;
|
||||
import customskinloader.fake.FakeSkinManager;
|
||||
import customskinloader.fake.itf.FakeInterfaceManager;
|
||||
@@ -36,8 +37,10 @@ public class FakeThreadDownloadImageData extends SimpleTexture {
|
||||
|
||||
public static Function<NativeImage, CompletableFuture<?>> createTexture(Function<NativeImage, CompletableFuture<?>> function, Function<NativeImage, Function<Object, Object>> cape, Object location, boolean bl) {
|
||||
return bl ? _image -> {
|
||||
if (FakeInterfaceManager.ResourceLocation_getTexture(location) != null && _image instanceof FakeNativeImage.Extended) {
|
||||
FakeSkinManager.BaseBuffer.judgeType(FakeInterfaceManager.ResourceLocation_getTexture(location), () -> FakeSkinBuffer.judgeType0(((FakeNativeImage.Extended) _image).getFakeImage()));
|
||||
FakeMinecraftProfileTexture texture = FakeInterfaceManager.ResourceLocation_getTexture(location);
|
||||
FakeNativeImage image = FakeInterfaceManager.NativeImage_getFakeImage(_image);
|
||||
if (texture != null && image != null) {
|
||||
FakeSkinManager.BaseBuffer.judgeType(texture, () -> FakeSkinBuffer.judgeType0(image));
|
||||
}
|
||||
return function.apply(_image);
|
||||
} : _image -> function.apply(_image).thenApply(cape.apply(_image));
|
||||
|
||||
@@ -3,10 +3,12 @@ net/minecraft/client/Minecraft net/minecraft/class_310
|
||||
isIntegratedServerRunning ()Z method_1542
|
||||
net/minecraft/client/entity/AbstractClientPlayer net/minecraft/class_742
|
||||
net/minecraft/client/gui/Gui net/minecraft/class_332
|
||||
net/minecraft/client/gui/GuiGraphicsExtractor net/minecraft/client/gui/GuiGraphicsExtractor
|
||||
net/minecraft/client/gui/GuiPlayerTabOverlay net/minecraft/class_355
|
||||
renderPlayerlist (ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V method_1919
|
||||
renderPlayerlist (Lcom/mojang/blaze3d/matrix/MatrixStack;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V method_1919
|
||||
renderPlayerlist (Lnet/minecraft/client/gui/Gui;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V method_1919
|
||||
renderPlayerlist (Lnet/minecraft/client/gui/GuiGraphicsExtractor;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V extractRenderState
|
||||
net/minecraft/client/model/ModelRenderer net/minecraft/class_630
|
||||
net/minecraft/client/renderer/IImageBuffer net/minecraft/class_760
|
||||
net/minecraft/client/renderer/IRenderTypeBuffer net/minecraft/class_4597
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
accessWidener v2 intermediary
|
||||
extendable class net/minecraft/class_1011 # 24w46a+
|
||||
extendable class net/minecraft/class_1071$class_8686 # 23w31a+
|
||||
extendable class net/minecraft/class_2960 # 24w46a+
|
||||
accessible method net/minecraft/class_1071$class_8686 <init> (Ljava/util/UUID;Lcom/mojang/authlib/properties/Property;)V # 23w42a+
|
||||
accessible method net/minecraft/class_2960 <init> (Ljava/lang/String;Ljava/lang/String;)V # 24w18a+
|
||||
@@ -17,5 +17,9 @@
|
||||
"mixins": [
|
||||
"mixins.customskinloader.json"
|
||||
],
|
||||
"accessWidener": "customskinloader.accesswidener"
|
||||
"accessWidener": "customskinloader.accesswidener",
|
||||
|
||||
"depends": {
|
||||
"minecraft": "<=1.21.11"
|
||||
}
|
||||
}
|
||||
File renamed without changes.
File renamed without changes.
@@ -1,8 +1,10 @@
|
||||
dependencies=Forge|1.20.6,1.21,1.21.1,1.21.3,1.21.4,1.21.5,1.21.6,1.21.7,1.21.8,1.21.9,1.21.10,1.21.11;\
|
||||
NeoForge|1.20.2,1.20.3,1.20.4,1.20.5,1.20.6,1.21,1.21.1,1.21.2,1.21.3,1.21.4,1.21.5,1.21.6,1.21.7,1.21.8,1.21.9,1.21.10,1.21.11
|
||||
dependencies=Fabric|26.1;\
|
||||
Forge|1.20.6,1.21,1.21.1,1.21.3,1.21.4,1.21.5,1.21.6,1.21.7,1.21.8,1.21.9,1.21.10,1.21.11,26.1;\
|
||||
NeoForge|1.20.2,1.20.3,1.20.4,1.20.5,1.20.6,1.21,1.21.1,1.21.2,1.21.3,1.21.4,1.21.5,1.21.6,1.21.7,1.21.8,1.21.9,1.21.10,1.21.11,26.1;\
|
||||
Quilt|26.1
|
||||
java_full_versions=17,18,19,20,21,22
|
||||
#forge gradle needs forge version
|
||||
forge_mc_version=1.12.2
|
||||
forge_version=14.23.5.2768
|
||||
mappings_version=stable_39
|
||||
srg_notch_map=Forge.tsrg
|
||||
srg_notch_map=Universal.tsrg
|
||||
@@ -3,10 +3,12 @@ net/minecraft/client/Minecraft net/minecraft/client/Minecraft
|
||||
isIntegratedServerRunning ()Z isLocalServer
|
||||
net/minecraft/client/entity/AbstractClientPlayer net/minecraft/client/player/AbstractClientPlayer
|
||||
net/minecraft/client/gui/Gui net/minecraft/client/gui/GuiGraphics
|
||||
net/minecraft/client/gui/GuiGraphicsExtractor net/minecraft/client/gui/GuiGraphicsExtractor
|
||||
net/minecraft/client/gui/GuiPlayerTabOverlay net/minecraft/client/gui/components/PlayerTabOverlay
|
||||
renderPlayerlist (ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V render
|
||||
renderPlayerlist (Lcom/mojang/blaze3d/matrix/MatrixStack;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V render
|
||||
renderPlayerlist (Lnet/minecraft/client/gui/Gui;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V render
|
||||
renderPlayerlist (Lnet/minecraft/client/gui/GuiGraphicsExtractor;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V extractRenderState
|
||||
net/minecraft/client/model/ModelRenderer net/minecraft/client/model/geom/ModelPart
|
||||
net/minecraft/client/renderer/IImageBuffer net/minecraft/client/renderer/HttpTextureProcessor
|
||||
net/minecraft/client/renderer/IRenderTypeBuffer net/minecraft/client/renderer/MultiBufferSource
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
-1
@@ -1,5 +1,4 @@
|
||||
public-f com.mojang.blaze3d.platform.NativeImage # 24w46a+
|
||||
public-f net.minecraft.client.resources.SkinManager$CacheKey # 23w42a+
|
||||
public-f net.minecraft.resources.ResourceLocation # 24w46a+
|
||||
public net.minecraft.client.resources.SkinManager$CacheKey <init>(Ljava/util/UUID;Lcom/mojang/authlib/properties/Property;)V # 23w42a+
|
||||
public net.minecraft.resources.ResourceLocation <init>(Ljava/lang/String;Ljava/lang/String;)V # 24w18a+
|
||||
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,4 @@
|
||||
accessWidener v2 official
|
||||
extendable class com/mojang/blaze3d/platform/NativeImage # 24w46a+
|
||||
extendable class net/minecraft/client/resources/SkinManager$CacheKey # 23w31a+
|
||||
accessible method net/minecraft/client/resources/SkinManager$CacheKey <init> (Ljava/util/UUID;Lcom/mojang/authlib/properties/Property;)V # 23w42a+
|
||||
@@ -0,0 +1,25 @@
|
||||
{
|
||||
"schemaVersion": 1,
|
||||
"id": "customskinloader",
|
||||
"version": "${modFullVersion}",
|
||||
|
||||
"name": "CustomSkinLoader",
|
||||
"description": "Custom Skin Loader for Minecraft",
|
||||
"authors": ["xfl03", "JLChnToZ", "ZekerZhayard"],
|
||||
"contact": {
|
||||
"homepage": "https://github.com/xfl03/MCCustomSkinLoader",
|
||||
"issues": "https://github.com/xfl03/MCCustomSkinLoader/issues",
|
||||
"sources": "https://github.com/xfl03/MCCustomSkinLoader"
|
||||
},
|
||||
"license": "GPL-3.0-only",
|
||||
|
||||
"environment": "client",
|
||||
"mixins": [
|
||||
"mixins.customskinloader.json"
|
||||
],
|
||||
"accessWidener": "customskinloader.accesswidener",
|
||||
|
||||
"depends": {
|
||||
"minecraft": ">1.21.11"
|
||||
}
|
||||
}
|
||||
File renamed without changes.
File renamed without changes.
@@ -13,7 +13,8 @@ public abstract class MixinGuiPlayerTabOverlay {
|
||||
method = {
|
||||
"Lnet/minecraft/client/gui/GuiPlayerTabOverlay;renderPlayerlist(ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V", // 20w16a-
|
||||
"Lnet/minecraft/client/gui/GuiPlayerTabOverlay;renderPlayerlist(Lcom/mojang/blaze3d/matrix/MatrixStack;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V", // 20w17a ~ 23w14a
|
||||
"Lnet/minecraft/client/gui/GuiPlayerTabOverlay;renderPlayerlist(Lnet/minecraft/client/gui/Gui;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V" // 23w16a+
|
||||
"Lnet/minecraft/client/gui/GuiPlayerTabOverlay;renderPlayerlist(Lnet/minecraft/client/gui/Gui;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V", // 23w16a ~ 26.1-snapshot-11
|
||||
"Lnet/minecraft/client/gui/GuiPlayerTabOverlay;renderPlayerlist(Lnet/minecraft/client/gui/GuiGraphicsExtractor;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V" // 26.1-pre-1+
|
||||
},
|
||||
at = @At(
|
||||
value = "INVOKE",
|
||||
|
||||
@@ -1,10 +1,21 @@
|
||||
package customskinloader.mixin;
|
||||
|
||||
import customskinloader.fake.itf.IFakeNativeImage;
|
||||
import customskinloader.fake.texture.FakeNativeImage;
|
||||
import net.minecraft.client.renderer.texture.NativeImage;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
|
||||
@Mixin(NativeImage.class)
|
||||
public abstract class MixinNativeImage implements IFakeNativeImage {
|
||||
private FakeNativeImage fakeImage;
|
||||
|
||||
@Override
|
||||
public FakeNativeImage getFakeImage() {
|
||||
return this.fakeImage;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setFakeImage(FakeNativeImage fakeImage) {
|
||||
this.fakeImage = fakeImage;
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -1,3 +1,3 @@
|
||||
name=CustomSkinLoader
|
||||
group=customskinloader
|
||||
version=14.27
|
||||
version=14.28
|
||||
+4
-3
@@ -13,8 +13,9 @@ include "Forge/Common"
|
||||
include "Forge/V1"
|
||||
//Forge Edition for [1.17,1.20.4]
|
||||
include "Forge/V2"
|
||||
//Forge Edition for [1.20.5,) and NeoForge Edition for [1.20.2,)
|
||||
include "Forge/V3"
|
||||
|
||||
//Fabric Edition for [1.14,)
|
||||
//Fabric Edition for [26.1,), Forge Edition for [1.20.6,) and NeoForge Edition for [1.20.2,)
|
||||
include "Universal"
|
||||
|
||||
//Fabric Edition for [1.14,1.21.11]
|
||||
include "Fabric"
|
||||
Reference in new issue
Block a user