Support Forge & Fabric 1.15.2 (#78)

* Increase compatible Java version to 8.

* Support Forge & Fabric 1.15.2
This commit is contained in:
ZekerZhayard authored and Alexander Xia committed 2020-01-24 16:56:26 +08:00
1 parent 6fab945eb1
commit 958860ecce
26 files changed
+311 -196

No files matched your search

@@ -85,9 +85,5 @@ public class FakeClientPlayer {
CustomSkinLoader.logger.debug("Legacy Texture (" + resourceLocationIn + ") Loaded as " +
ito.toString() + " (" + location + ")");
}
public void onSkinTextureAvailable(MinecraftProfileTexture.Type typeIn, ResourceLocation location, MinecraftProfileTexture profileTexture) {
this.skinAvailable(typeIn, location, profileTexture);
}
}
}
@@ -1,19 +1,25 @@
package customskinloader.fake;
import java.awt.image.BufferedImage;
import customskinloader.CustomSkinLoader;
import customskinloader.fake.texture.FakeBufferedImage;
import customskinloader.fake.texture.FakeImage;
import customskinloader.fake.texture.FakeNativeImage;
import net.minecraft.client.renderer.IImageBuffer;
import net.minecraft.client.renderer.texture.NativeImage;
import java.awt.image.BufferedImage;
public class FakeSkinBuffer implements net.minecraft.client.renderer.IImageBuffer {
public class FakeSkinBuffer implements IImageBuffer {
private int ratio = 1;
private FakeImage image = null;
//parseUserSkin for 1.15+
public static NativeImage processLegacySkin(NativeImage image) {
return new FakeSkinBuffer().func_195786_a(image);
}
//parseUserSkin for 1.13+
public net.minecraft.client.renderer.texture.NativeImage func_195786_a(net.minecraft.client.renderer.texture.NativeImage image) {
public NativeImage func_195786_a(NativeImage image) {
if (image == null)
return null;
@@ -145,10 +151,6 @@ public class FakeSkinBuffer implements net.minecraft.client.renderer.IImageBuffe
//A callback when skin loaded, nothing to do
}
public void run() {
this.skinAvailable();
}
private static int getARGB(int a, int r, int g, int b) {
return (a << 24) | (r << 16) | (g << 8) | b;
}
@@ -14,12 +14,16 @@ import com.mojang.authlib.minecraft.MinecraftProfileTexture;
import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type;
import com.mojang.authlib.minecraft.MinecraftSessionService;
import customskinloader.CustomSkinLoader;
import customskinloader.fake.itf.IFakeMinecraft;
import customskinloader.fake.itf.IFakeTextureManager_1;
import customskinloader.fake.itf.IFakeTextureManager_2;
import customskinloader.utils.HttpTextureUtil;
import customskinloader.utils.HttpTextureUtil.HttpTextureInfo;
import customskinloader.utils.MinecraftUtil;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.IImageBuffer;
import net.minecraft.client.renderer.texture.SimpleTexture;
import net.minecraft.client.renderer.texture.Texture;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.client.resources.DefaultPlayerSkin;
import net.minecraft.client.resources.SkinManager.SkinAvailableCallback;
@@ -46,13 +50,13 @@ public class FakeSkinManager {
final ResourceLocation resourcelocation = new ResourceLocation("skins/" + info.hash);
if (this.textureManager.getTexture(resourcelocation) != null)//Have already loaded
if (((IFakeTextureManager_1) this.textureManager).func_229267_b_(resourcelocation) != null)//Have already loaded
makeCallback(skinAvailableCallback, textureType, resourcelocation, profileTexture);
else {
SimpleTexture threaddownloadimagedata = MinecraftUtil.createThreadDownloadImageData(info.cacheFile, info.url, DefaultPlayerSkin.getDefaultSkinLegacy(), new BaseBuffer(skinAvailableCallback, textureType, resourcelocation, profileTexture), textureType);
if (skinAvailableCallback instanceof FakeClientPlayer.LegacyBuffer)//Cache for client player
FakeClientPlayer.textureCache.put(resourcelocation, threaddownloadimagedata);
this.textureManager.loadTexture(resourcelocation, threaddownloadimagedata);
((IFakeTextureManager_2) this.textureManager).func_229263_a_(resourcelocation, (Texture) threaddownloadimagedata);
}
return resourcelocation;
}
@@ -63,7 +67,7 @@ public class FakeSkinManager {
final Map<Type, MinecraftProfileTexture> map = Maps.newHashMap();
map.putAll(customskinloader.CustomSkinLoader.loadProfile(profile));
Minecraft.getMinecraft().addScheduledTask(new Runnable() {
((IFakeMinecraft) Minecraft.getMinecraft()).execute(new Runnable() {
public void run() {
for (Type type : Type.values()) {
if (map.containsKey(type)) {
@@ -124,9 +128,5 @@ public class FakeSkinManager {
FakeSkinManager.makeCallback(callback, type, location, texture);
}
public void run() {
this.skinAvailable();
}
}
}
@@ -0,0 +1,17 @@
package customskinloader.fake.itf;
import java.util.concurrent.Executor;
import com.google.common.util.concurrent.ListenableFuture;
public interface IFakeMinecraft extends Executor {
default ListenableFuture<Object> func_152344_a(Runnable runnable) {
this.execute(runnable);
return null;
}
@Override
default void execute(Runnable runnable) {
this.func_152344_a(runnable);
}
}
@@ -0,0 +1,16 @@
package customskinloader.fake.itf;
import net.minecraft.client.renderer.texture.ITextureObject;
import net.minecraft.client.renderer.texture.Texture;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.util.ResourceLocation;
public interface IFakeTextureManager_1 {
default boolean func_229263_a_(ResourceLocation textureLocation, Texture textureObj) {
return ((TextureManager) this).loadTexture(textureLocation, (ITextureObject) textureObj);
}
default Texture func_229267_b_(ResourceLocation textureLocation) {
return (Texture) ((TextureManager) this).getTexture(textureLocation);
}
}
@@ -0,0 +1,10 @@
package customskinloader.fake.itf;
import net.minecraft.client.renderer.texture.Texture;
import net.minecraft.util.ResourceLocation;
public interface IFakeTextureManager_2 {
default void func_229263_a_(ResourceLocation textureLocation, Texture textureObj) {
((IFakeTextureManager_1) this).func_229263_a_(textureLocation, textureObj);
}
}
@@ -10,4 +10,9 @@ public interface IImageBuffer extends Runnable {
NativeImage func_195786_a(NativeImage image);
void skinAvailable();
@Override
default void run() {
this.skinAvailable();
}
}
@@ -0,0 +1,5 @@
package net.minecraft.client.renderer.texture;
// exclude
public interface Texture {
}
+5
View File
@@ -6,6 +6,7 @@ CL: net/minecraft/client/renderer/ThreadDownloadImageData net/minecraft/class_10
CL: net/minecraft/client/renderer/texture/ITextureObject net/minecraft/class_1062
CL: net/minecraft/client/renderer/texture/NativeImage net/minecraft/class_1011
CL: net/minecraft/client/renderer/texture/SimpleTexture net/minecraft/class_1049
CL: net/minecraft/client/renderer/texture/Texture net/minecraft/class_1044
CL: net/minecraft/client/renderer/texture/TextureManager net/minecraft/class_1060
CL: net/minecraft/client/resources/DefaultPlayerSkin net/minecraft/class_1068
CL: net/minecraft/client/resources/SkinManager net/minecraft/class_1071
@@ -17,6 +18,9 @@ CL: net/minecraft/util/Session net/minecraft/class_320
CL: net/minecraft/util/StringUtils net/minecraft/class_3544
FD: net/minecraft/client/Minecraft/field_71412_D net/minecraft/class_310/field_1697
FD: net/minecraft/client/multiplayer/ServerData/field_78845_b net/minecraft/class_642/field_3761
MD: customskinloader/fake/itf/IFakeTextureManager_1/func_229263_a_ (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/Texture;)Z customskinloader/fake/itf/IFakeTextureManager_1/method_4616 (Lnet/minecraft/class_2960;Lnet/minecraft/class_1044;)Z
MD: customskinloader/fake/itf/IFakeTextureManager_1/func_229267_b_ (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/texture/Texture; net/minecraft/class_1060/method_4619 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1044;
MD: customskinloader/fake/itf/IFakeTextureManager_2/func_229263_a_ (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/Texture;)V customskinloader/fake/itf/IFakeTextureManager_1/method_4616 (Lnet/minecraft/class_2960;Lnet/minecraft/class_1044;)V
MD: net/minecraft/client/gui/GuiPlayerTabOverlay/func_175249_a (ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V net/minecraft/class_355/method_1919 (ILnet/minecraft/class_269;Lnet/minecraft/class_266;)V
MD: net/minecraft/client/gui/GuiPlayerTabOverlay/renderPlayerlist (ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V net/minecraft/class_355/method_1919 (ILnet/minecraft/class_269;Lnet/minecraft/class_266;)V
MD: net/minecraft/client/Minecraft/func_110432_I ()Lnet/minecraft/util/Session; net/minecraft/class_310/method_1548 ()Lnet/minecraft/class_320;
@@ -29,6 +33,7 @@ MD: net/minecraft/client/Minecraft/func_71410_x ()Lnet/minecraft/client/Minecraf
MD: net/minecraft/client/Minecraft/isIntegratedServerRunning ()Z net/minecraft/class_310/method_1542 ()Z
MD: net/minecraft/client/renderer/IImageBuffer/func_152634_a ()V net/minecraft/class_760/method_3238 ()V
MD: net/minecraft/client/renderer/IImageBuffer/func_195786_a (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; net/minecraft/class_760/method_3237 (Lnet/minecraft/class_1011;)Lnet/minecraft/class_1011;
MD: net/minecraft/client/renderer/ThreadDownloadImageData/processLegacySkin (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; net/minecraft/class_1046/method_22798 (Lnet/minecraft/class_1011;)Lnet/minecraft/class_1011;
MD: net/minecraft/client/renderer/texture/NativeImage/func_195699_a (IIIIIIZZ)V net/minecraft/class_1011/method_4304 (IIIIIIZZ)V
MD: net/minecraft/client/renderer/texture/NativeImage/func_195700_a (III)V net/minecraft/class_1011/method_4305 (III)V
MD: net/minecraft/client/renderer/texture/NativeImage/func_195702_a ()I net/minecraft/class_1011/method_4307 ()I
+2 -2
View File
@@ -14,9 +14,9 @@ group = "customskinloader"
archivesBaseName = "CustomSkinLoader_Fabric"
ext.shortVersion = getShortVersion()
sourceCompatibility = targetCompatibility = 1.6
sourceCompatibility = targetCompatibility = 1.8
compileJava {
sourceCompatibility = targetCompatibility = 1.6
sourceCompatibility = targetCompatibility = 1.8
}
minecraft {
+1 -1
View File
@@ -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
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
#forge gradle needs forge version
forge_mc_version=1.12.2
forge_version=14.23.5.2768
+3 -3
View File
@@ -2,13 +2,13 @@
"compatibilityLevel": "JAVA_8",
"package": "customskinloader.fabric.mixin",
"client": [
"MixinFakeSkinManager",
"MixinGuiPlayerTabOverlay",
"MixinMinecraft",
"MixinSkinManager"
"MixinSkinManager",
"MixinTextureManager",
"MixinThreadDownloadImageData"
],
"refmap": "mixins.customskinloader.refmap.json",
"plugin": "customskinloader.fabric.MixinConfigPlugin",
"injectors": {
"defaultRequire": 1
}
@@ -1,61 +0,0 @@
package customskinloader.fabric;
import java.util.List;
import java.util.Set;
import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.MethodInsnNode;
import org.objectweb.asm.tree.MethodNode;
import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
public class MixinConfigPlugin implements IMixinConfigPlugin {
public static boolean hasITextureObject = true;
@Override
public void onLoad(String mixinPackage) {
}
@Override
public String getRefMapperConfig() {
return null;
}
@Override
public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
return true;
}
@Override
public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
}
@Override
public List<String> getMixins() {
return null;
}
@Override
public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
if (!hasITextureObject && targetClassName.equals("customskinloader.fake.FakeSkinManager")) {
for (MethodNode mn : targetClass.methods) {
if (mn.name.equals("loadSkin") && mn.desc.equals("(Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/class_1071$class_1072;)Lnet/minecraft/class_2960;")) {
for (AbstractInsnNode ain : mn.instructions.toArray()) {
if (ain instanceof MethodInsnNode) {
MethodInsnNode min = (MethodInsnNode) ain;
min.desc = min.desc.replace("Lnet/minecraft/class_1062;", "Lnet/minecraft/class_1044;");
}
}
}
}
}
}
@Override
public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
}
}
@@ -1,11 +0,0 @@
package customskinloader.fabric.mixin;
import customskinloader.fake.FakeSkinManager;
import org.spongepowered.asm.mixin.Mixin;
/**
* @see customskinloader.fabric.MixinConfigPlugin#preApply
*/
@Mixin(FakeSkinManager.class)
public abstract class MixinFakeSkinManager {
}
@@ -1,15 +1,10 @@
package customskinloader.fabric.mixin;
import java.util.concurrent.Executor;
import com.google.common.util.concurrent.ListenableFuture;
import customskinloader.fake.itf.IFakeMinecraft;
import net.minecraft.client.Minecraft;
import org.spongepowered.asm.mixin.Mixin;
@Mixin(Minecraft.class)
public abstract class MixinMinecraft implements Executor {
public ListenableFuture<Object> func_152344_a(Runnable runnable) {
this.execute(runnable);
return null;
}
public abstract class MixinMinecraft implements IFakeMinecraft {
}
@@ -6,7 +6,6 @@ import java.util.Map;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.minecraft.MinecraftProfileTexture;
import com.mojang.authlib.minecraft.MinecraftSessionService;
import customskinloader.fabric.MixinConfigPlugin;
import customskinloader.fake.FakeSkinManager;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.client.resources.SkinManager;
@@ -26,11 +25,6 @@ public abstract class MixinSkinManager {
at = @At("RETURN")
)
private void inject_init(TextureManager textureManagerInstance, File skinCacheDirectory, MinecraftSessionService sessionService, CallbackInfo callbackInfo) {
try {
Class.forName("net.minecraft.class_1062", false, SkinManager.class.getClassLoader()); // net.minecraft.client.texture.Texture
} catch (ClassNotFoundException e) {
MixinConfigPlugin.hasITextureObject = false;
}
this.fakeManager = new FakeSkinManager(textureManagerInstance, skinCacheDirectory, sessionService);
}
@@ -0,0 +1,23 @@
package customskinloader.fabric.mixin;
import customskinloader.fake.itf.IFakeTextureManager_1;
import customskinloader.fake.itf.IFakeTextureManager_2;
import net.minecraft.client.renderer.texture.TextureManager;
import org.spongepowered.asm.mixin.Implements;
import org.spongepowered.asm.mixin.Interface;
import org.spongepowered.asm.mixin.Mixin;
@Implements({
@Interface(
iface = IFakeTextureManager_1.class,
prefix = "fake1$"
),
@Interface(
iface = IFakeTextureManager_2.class,
prefix = "fake2$"
),
})
@Mixin(TextureManager.class)
public abstract class MixinTextureManager {
}
@@ -0,0 +1,23 @@
package customskinloader.fabric.mixin;
import customskinloader.fake.FakeSkinBuffer;
import net.minecraft.client.renderer.ThreadDownloadImageData;
import net.minecraft.client.renderer.texture.NativeImage;
import org.spongepowered.asm.mixin.Dynamic;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(ThreadDownloadImageData.class)
public class MixinThreadDownloadImageData {
@Dynamic
@Inject(
method = "Lnet/minecraft/client/renderer/ThreadDownloadImageData;processLegacySkin(Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage;",
at = @At("HEAD"),
cancellable = true
)
private static void inject_processLegacySkin(NativeImage image, CallbackInfoReturnable<NativeImage> callbackInfoReturnable) {
callbackInfoReturnable.setReturnValue(FakeSkinBuffer.processLegacySkin(image));
}
}
+2 -2
View File
@@ -25,9 +25,9 @@ archivesBaseName = "CustomSkinLoader_Forge"
version = getCSLVersion()
group = "customskinloader"
sourceCompatibility = targetCompatibility = 1.6
sourceCompatibility = targetCompatibility = 1.8
compileJava {
sourceCompatibility = targetCompatibility = 1.6
sourceCompatibility = targetCompatibility = 1.8
}
jar {
manifest {
+2 -2
View File
@@ -1,7 +1,7 @@
minecraft_version=1.12.2
minecraft_full_versions=1.8,1.8.8,1.8.9,1.9,1.9.4,1.10,1.10.2,1.11,1.11.2,1.12,1.12.1,1.12.2,1.13.2
minecraft_full_versions=1.8,1.8.8,1.8.9,1.9,1.9.4,1.10,1.10.2,1.11,1.11.2,1.12,1.12.1,1.12.2,1.13.2,1.14.2,1.14.3,1.14.4,1.15,1.15.1,1.15.2
#forge gradle needs forge version
forge_mc_version=1.12.2
forge_version=14.23.5.2768
mappings_version=stable_39
srg_notch_map=Fabric.srg
srg_notch_map=Forge.srg
+34 -43
View File
@@ -1,12 +1,10 @@
var InsnList = Java.type('org.objectweb.asm.tree.InsnList');
var InsnNode = Java.type('org.objectweb.asm.tree.InsnNode');
var MethodInsnNode = Java.type('org.objectweb.asm.tree.MethodInsnNode');
var MethodNode = Java.type('org.objectweb.asm.tree.MethodNode');
var VarInsnNode = Java.type('org.objectweb.asm.tree.VarInsnNode');
var Opcodes = Java.type('org.objectweb.asm.Opcodes');
var hasITextureObject = true;
function PlayerTabTransformer(cn, mn) {
var iterator = mn.instructions.iterator();
while (iterator.hasNext()) {
@@ -37,21 +35,27 @@ function initializeCoreMod() {
return cn;
}
},
'SkinAvailableCallbackTransformer': {
// For 1.13+
'AbstractTextureTransformer': {
'target': {
'type': 'CLASS',
'name': 'net/minecraft/client/resources/SkinManager$SkinAvailableCallback'
'name': 'net/minecraft/client/renderer/texture/AbstractTexture'
},
'transformer': function (cn) {
cn.version = Opcodes.V1_8;
cn.methods.forEach(function (mn) {
mn.access -= Opcodes.ACC_ABSTRACT;
for (var j = 0; j < 4; j++) {
mn.instructions.add(new VarInsnNode(Opcodes.ALOAD, j));
}
mn.instructions.add(new MethodInsnNode(Opcodes.INVOKEINTERFACE, cn.name, mn.name.equals("func_180521_a") ? "onSkinTextureAvailable" : "func_180521_a", mn.desc, true));
mn.instructions.add(new InsnNode(Opcodes.RETURN));
});
cn.interfaces.add("net/minecraft/client/renderer/texture/Texture");
return cn;
}
},
'TextureTransformer': {
'target': {
'type': 'CLASS',
'name': 'net/minecraft/client/renderer/texture/Texture'
},
'transformer': function (cn) {
if (cn.access === 0) {
cn.access = Opcodes.ACC_PUBLIC | Opcodes.ACC_INTERFACE | Opcodes.ACC_ABSTRACT;
}
return cn;
}
},
@@ -63,51 +67,38 @@ function initializeCoreMod() {
'name': 'net/minecraft/client/Minecraft'
},
'transformer': function (cn) {
if (!cn.methods.stream().anyMatch(function(mn) {
return mn.name.equals("func_152344_a");
})) {
var methodNode = new MethodNode(Opcodes.ACC_PUBLIC, "func_152344_a", "(Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture;", "(Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture<Ljava/lang/Object;>;", null);
methodNode.instructions.add(new VarInsnNode(Opcodes.ALOAD, 0));
methodNode.instructions.add(new VarInsnNode(Opcodes.ALOAD, 1));
methodNode.instructions.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "net/minecraft/util/concurrent/ThreadTaskExecutor", "execute", "(Ljava/lang/Runnable;)V", false));
methodNode.instructions.add(new InsnNode(Opcodes.ACONST_NULL));
methodNode.instructions.add(new InsnNode(Opcodes.ARETURN));
cn.methods.add(methodNode);
}
cn.interfaces.add("customskinloader/fake/itf/IFakeMinecraft");
return cn;
}
},
// For 1.15+
'ITextureObjectTransformer': {
'TextureManagerTransformer': {
'target': {
'type': 'CLASS',
'name': 'net/minecraft/client/renderer/texture/ITextureObject'
'name': 'net/minecraft/client/renderer/texture/TextureManager'
},
'transformer': function (cn) {
hasITextureObject = !cn.methods.isEmpty();
cn.interfaces.add("customskinloader/fake/itf/IFakeTextureManager_1");
cn.interfaces.add("customskinloader/fake/itf/IFakeTextureManager_2");
return cn;
}
},
'FakeSkinManagerTransformer': {
'DownloadingTextureTransformer': {
'target': {
'type': 'CLASS',
'name': 'customskinloader/fake/FakeSkinManager'
'name': 'net/minecraft/client/renderer/texture/DownloadingTexture'
},
'transformer': function (cn) {
if (!hasITextureObject) {
cn.methods.stream().filter(function (mn) {
return mn.name.equals("loadSkin") && mn.desc.equals("(Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)Lnet/minecraft/util/ResourceLocation;");
}).forEach(function (mn) {
mn.instructions.iterator().forEachRemaining(function (ain) {
if (ain instanceof MethodInsnNode && ain.owner.equals("net/minecraft/client/renderer/texture/TextureManager")) {
if (ain.name.equals("func_110579_a")) ain.name = "func_229263_a_";
if (ain.name.equals("func_110581_b")) ain.name = "func_229267_b_";
ain.desc = ain.desc.replace("Lnet/minecraft/client/renderer/texture/ITextureObject;", "Lnet/minecraft/client/renderer/texture/Texture;");
}
});
});
}
cn.methods.forEach(function (mn) {
if (mn.name.equals("func_229163_c_")) {
var il = new InsnList();
il.add(new VarInsnNode(Opcodes.ALOAD, 0));
il.add(new MethodInsnNode(Opcodes.INVOKESTATIC, "customskinloader/fake/FakeSkinBuffer", "processLegacySkin", "(Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage;", false));
il.add(new InsnNode(Opcodes.ARETURN));
mn.instructions.insert(il);
}
});
return cn;
}
}
@@ -5,14 +5,13 @@ import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import java.util.*;
import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.MethodNode;
import java.util.HashMap;
import java.util.Map;
import customskinloader.Logger;
import javax.annotation.Nullable;
import net.minecraftforge.fml.common.asm.transformers.deobf.FMLDeobfuscatingRemapper;
import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.MethodNode;
public class TransformerManager {
public static Logger logger = new Logger(new File("./CustomSkinLoader/ForgePlugin.log"));
@@ -22,28 +21,54 @@ public class TransformerManager {
public @interface TransformTarget {
String className();
String[] methodNames();
String[] methodNames() default {};
String desc();
String desc() default "";
}
public interface IClassTransformer {
void transform(ClassNode cn);
}
public interface IMethodTransformer {
void transform(ClassNode cn, MethodNode mn);
}
public Map<String, Map<String, IMethodTransformer>> map;
public Map<String, IClassTransformer> classMap = new HashMap<>();
public Map<String, Map<String, IMethodTransformer>> map = new HashMap<>();
public TransformerManager(IMethodTransformer... transformers) {
map = new HashMap<String, Map<String, IMethodTransformer>>();
for (IMethodTransformer t : transformers) {
logger.info("[CSL DEBUG] REGISTERING TRANSFORMER %s", t.getClass().getName());
if (!t.getClass().isAnnotationPresent(TransformTarget.class)) {
logger.info("[CSL DEBUG] ERROR occurs while parsing Annotation.");
continue;
public TransformerManager(IMethodTransformer... methodTransformers) {
this(new IClassTransformer[0], methodTransformers);
}
public TransformerManager(IClassTransformer[] classTransformers, IMethodTransformer[] methodTransformers) {
for (IClassTransformer t : classTransformers) {
TransformTarget tt = this.getTransformTarget(t.getClass());
if (tt != null) {
addClassTransformer(tt.className(), t);
}
}
for (IMethodTransformer t : methodTransformers) {
TransformTarget tt = this.getTransformTarget(t.getClass());
if (tt != null) {
addMethodTransformer(tt, tt.className(), t);
}
}
}
TransformTarget tt = t.getClass().getAnnotation(TransformTarget.class);
addMethodTransformer(tt, tt.className(), t);
private TransformTarget getTransformTarget(Class<?> cl) {
logger.info("[CSL DEBUG] REGISTERING TRANSFORMER %s", cl.getName());
if (!cl.isAnnotationPresent(TransformTarget.class)) {
logger.info("[CSL DEBUG] ERROR occurs while parsing Annotation.");
return null;
}
return cl.getAnnotation(TransformTarget.class);
}
private void addClassTransformer(String className, IClassTransformer transformer) {
if (!classMap.containsKey(className)) {
classMap.put(className, transformer);
logger.info("[CSL DEBUG] REGISTERING CLASS %s", className);
}
}
@@ -56,10 +81,24 @@ public class TransformerManager {
}
}
public ClassNode transform(ClassNode classNode) {
IClassTransformer transformer = classMap.get(FMLDeobfuscatingRemapper.INSTANCE.map(classNode.name).replace("/", "."));
if (transformer != null) {
try {
transformer.transform(classNode);
logger.info("[CSL DEBUG] Successfully transformed class %s", classNode.name);
} catch (Exception e) {
logger.warning("[CSL DEBUG] An error happened when transforming class %s.", classNode.name);
logger.warning(e);
}
}
return classNode;
}
public MethodNode transform(ClassNode classNode, MethodNode methodNode, String className, String methodName, String methodDesc) {
Map<String, IMethodTransformer> transMap = map.get(className);
String methodTarget = methodName + methodDesc;
if (transMap.containsKey(methodTarget)) {
if (transMap != null && transMap.containsKey(methodTarget)) {
try {
transMap.get(methodTarget).transform(classNode, methodNode);
logger.info("[CSL DEBUG] Successfully transformed method %s in class %s", methodName, className);
@@ -1,6 +1,7 @@
package customskinloader.forge.loader;
import customskinloader.forge.TransformerManager;
import customskinloader.forge.transformer.FakeInterfacesTransformer;
import customskinloader.forge.transformer.PlayerTabTransformer;
import customskinloader.forge.transformer.SkinManagerTransformer;
import customskinloader.forge.transformer.SpectatorMenuTransformer;
@@ -10,31 +11,45 @@ import net.minecraftforge.fml.common.asm.transformers.deobf.FMLDeobfuscatingRema
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.MethodNode;
//LaunchWrapper for 1.13-
public class LaunchWrapper implements IClassTransformer {
private static final TransformerManager.IMethodTransformer[] TRANFORMERS = {
new SkinManagerTransformer.InitTransformer(),
new SkinManagerTransformer.LoadSkinTransformer(),
new SkinManagerTransformer.LoadProfileTexturesTransformer(),
new SkinManagerTransformer.LoadSkinFromCacheTransformer(),
new PlayerTabTransformer.ScoreObjectiveTransformer(),
new SpectatorMenuTransformer.PlayerMenuObjectTransformer()
private static final TransformerManager.IClassTransformer[] CLASS_TRANSFORMERS = {
new FakeInterfacesTransformer.MinecraftTransformer(),
new FakeInterfacesTransformer.AbstractTextureTransfomer(),
new FakeInterfacesTransformer.TextureTransformer(),
new FakeInterfacesTransformer.TextureManagerTransformer()
};
private TransformerManager transformerManager = new TransformerManager(TRANFORMERS);
private static final TransformerManager.IMethodTransformer[] TRANFORMERS = {
new SkinManagerTransformer.InitTransformer(),
new SkinManagerTransformer.LoadSkinTransformer(),
new SkinManagerTransformer.LoadProfileTexturesTransformer(),
new SkinManagerTransformer.LoadSkinFromCacheTransformer(),
new PlayerTabTransformer.ScoreObjectiveTransformer(),
new SpectatorMenuTransformer.PlayerMenuObjectTransformer()
};
private TransformerManager transformerManager = new TransformerManager(CLASS_TRANSFORMERS, TRANFORMERS);
//From: https://github.com/RecursiveG/UniSkinMod/blob/1.9.4/src/main/java/org/devinprogress/uniskinmod/coremod/BaseAsmTransformer.java#L83-L114
public byte[] transform(String obfClassName, String className, byte[] bytes) {
if (!transformerManager.map.containsKey(className)) return bytes;//Check if should be transformed
if (!transformerManager.classMap.containsKey(className) && !transformerManager.map.containsKey(className)) return bytes;//Check if should be transformed
//Parse bytes to ClassNode
ClassReader cr = new ClassReader(bytes);
ClassNode cn = new ClassNode();
cr.accept(cn, 0);
if (bytes != null && bytes.length > 0) {
ClassReader cr = new ClassReader(bytes);
cr.accept(cn, 0);
} else {
cn.name = className.replace(".", "/");
cn.version = Opcodes.V1_8;
cn.superName = "java/lang/Object";
}
//Transform ClassNode
transformerManager.transform(cn);
for (MethodNode mn : cn.methods) {
String methodName = FMLDeobfuscatingRemapper.INSTANCE.mapMethodName(obfClassName, mn.name, mn.desc);
String methodDesc = FMLDeobfuscatingRemapper.INSTANCE.mapMethodDesc(mn.desc);
@@ -0,0 +1,50 @@
package customskinloader.forge.transformer;
import customskinloader.forge.TransformerManager;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.tree.ClassNode;
public class FakeInterfacesTransformer {
@TransformerManager.TransformTarget(
className = "net.minecraft.client.Minecraft"
)
public static class MinecraftTransformer implements TransformerManager.IClassTransformer {
@Override
public void transform(ClassNode cn) {
cn.interfaces.add("customskinloader/fake/itf/IFakeMinecraft");
}
}
@TransformerManager.TransformTarget(
className = "net.minecraft.client.renderer.texture.AbstractTexture"
)
public static class AbstractTextureTransfomer implements TransformerManager.IClassTransformer {
@Override
public void transform(ClassNode cn) {
cn.interfaces.add("net/minecraft/client/renderer/texture/Texture");
}
}
@TransformerManager.TransformTarget(
className = "net.minecraft.client.renderer.texture.Texture"
)
public static class TextureTransformer implements TransformerManager.IClassTransformer {
@Override
public void transform(ClassNode cn) {
if (cn.access == 0) {
cn.access = Opcodes.ACC_PUBLIC | Opcodes.ACC_INTERFACE | Opcodes.ACC_ABSTRACT;
}
}
}
@TransformerManager.TransformTarget(
className = "net.minecraft.client.renderer.texture.TextureManager"
)
public static class TextureManagerTransformer implements TransformerManager.IClassTransformer {
@Override
public void transform(ClassNode cn) {
cn.interfaces.add("customskinloader/fake/itf/IFakeTextureManager_1");
cn.interfaces.add("customskinloader/fake/itf/IFakeTextureManager_2");
}
}
}
@@ -14,9 +14,6 @@ public class SkinManager {
private FakeSkinManager fakeManager;
public SkinManager(TextureManager textureManagerInstance, File skinCacheDirectory, MinecraftSessionService sessionService) {
try {
Class.forName("net.minecraft.client.renderer.texture.ITextureObject", false, SkinManager.class.getClassLoader());
} catch (ClassNotFoundException ignore) {}
this.fakeManager = new FakeSkinManager(textureManagerInstance, skinCacheDirectory, sessionService);
}
@@ -47,9 +44,13 @@ public class SkinManager {
}
public interface SkinAvailableCallback {
void skinAvailable(MinecraftProfileTexture.Type typeIn, ResourceLocation location, MinecraftProfileTexture profileTexture);
default void skinAvailable(MinecraftProfileTexture.Type typeIn, ResourceLocation location, MinecraftProfileTexture profileTexture) {
this.onSkinTextureAvailable(typeIn, location, profileTexture);
}
void onSkinTextureAvailable(MinecraftProfileTexture.Type typeIn, ResourceLocation location, MinecraftProfileTexture profileTexture);
default void onSkinTextureAvailable(MinecraftProfileTexture.Type typeIn, ResourceLocation location, MinecraftProfileTexture profileTexture) {
this.skinAvailable(typeIn, location, profileTexture);
}
}
public interface ISkinAvailableCallback extends SkinAvailableCallback {
+2 -2
View File
@@ -26,9 +26,9 @@ group = config.group
archivesBaseName = rootProject.ext.config.name + "_" + config.minecraft_version
ext.shortVersion = getShortVersion()
sourceCompatibility = targetCompatibility = 1.6
sourceCompatibility = targetCompatibility = 1.8
compileJava {
sourceCompatibility = targetCompatibility = 1.6
sourceCompatibility = targetCompatibility = 1.8
}
minecraft {