From 0c91fb3975543a36a9da42e1b25baa2f15495b3a Mon Sep 17 00:00:00 2001 From: Alexander Xia Date: Mon, 9 Dec 2019 23:10:27 +0800 Subject: [PATCH] Fix PlayerTab in 1.14+ --- .../forge/TransformerManager.java | 26 ++++++++++++++----- .../transformer/PlayerTabTransformer.java | 2 +- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Forge/source/customskinloader/forge/TransformerManager.java b/Forge/source/customskinloader/forge/TransformerManager.java index d642fb8..c857649 100644 --- a/Forge/source/customskinloader/forge/TransformerManager.java +++ b/Forge/source/customskinloader/forge/TransformerManager.java @@ -12,13 +12,17 @@ import org.objectweb.asm.tree.MethodNode; import customskinloader.Logger; +import javax.annotation.Nullable; + public class TransformerManager { public static Logger logger = new Logger(new File("./CustomSkinLoader/ForgePlugin.log")); @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface TransformTarget { - String className(); + String className() default ""; + + String[] classNames() default {}; String[] methodNames(); @@ -39,16 +43,24 @@ public class TransformerManager { logger.info("[CSL DEBUG] ERROR occurs while parsing Annotation."); continue; } - addMethodTransformer(t.getClass().getAnnotation(TransformTarget.class), t); + + TransformTarget tt = t.getClass().getAnnotation(TransformTarget.class); + if (!"".equals(tt.className())) { + addMethodTransformer(tt, tt.className(), t); + } else { + for (String name : tt.classNames()) { + addMethodTransformer(tt, name, t); + } + } } } - private void addMethodTransformer(TransformTarget target, IMethodTransformer transformer) { - if (!map.containsKey(target.className())) - map.put(target.className(), new HashMap()); + private void addMethodTransformer(TransformTarget target, String className, IMethodTransformer transformer) { + if (!map.containsKey(className)) + map.put(className, new HashMap()); for (String methodName : target.methodNames()) { - map.get(target.className()).put(methodName + target.desc(), transformer); - logger.info("[CSL DEBUG] REGISTERING METHOD %s(%s)", target.className(), methodName + target.desc()); + map.get(className).put(methodName + target.desc(), transformer); + logger.info("[CSL DEBUG] REGISTERING METHOD %s(%s)", className, methodName + target.desc()); } } diff --git a/Forge/source/customskinloader/forge/transformer/PlayerTabTransformer.java b/Forge/source/customskinloader/forge/transformer/PlayerTabTransformer.java index 771f6c8..a0c75a2 100644 --- a/Forge/source/customskinloader/forge/transformer/PlayerTabTransformer.java +++ b/Forge/source/customskinloader/forge/transformer/PlayerTabTransformer.java @@ -13,7 +13,7 @@ import customskinloader.forge.TransformerManager.IMethodTransformer; import customskinloader.forge.TransformerManager.TransformTarget; public class PlayerTabTransformer { - @TransformTarget(className = "net.minecraft.client.gui.GuiPlayerTabOverlay", + @TransformTarget(classNames = {"net.minecraft.client.gui.GuiPlayerTabOverlay","net.minecraft.client.gui.overlay.PlayerTabOverlayGui"}, methodNames = {"func_175249_a", "renderPlayerlist"}, desc = "(ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V") public static class ScoreObjectiveTransformer implements IMethodTransformer {