Merge branch 'development' of https://github.com/BiscuitDevelopment/SkyblockAddons into rewrite-asm

iHDeveloper · iHDeveloper · commit 6c41a9a7f488 · 2020-07-27T11:32:54.000+03:00
diff --git a/README.md b/README.md
@@ -1,3 +1,4 @@
+<!--suppress HtmlDeprecatedAttribute -->
 <h1 align="center">SkyblockAddons</h1>
 
 <p align="center">
diff --git a/src/main/java/codes/biscuit/skyblockaddons/asm/hooks/GuiContainerHook.java b/src/main/java/codes/biscuit/skyblockaddons/asm/hooks/GuiContainerHook.java
@@ -6,7 +6,7 @@
 import codes.biscuit.skyblockaddons.features.backpacks.Backpack;
 import codes.biscuit.skyblockaddons.features.backpacks.BackpackColor;
 import codes.biscuit.skyblockaddons.features.craftingpatterns.CraftingPattern;
-import codes.biscuit.skyblockaddons.tweaker.SkyblockAddonsSetup;
+import codes.biscuit.skyblockaddons.tweaker.PreTransformationChecks;
 import codes.biscuit.skyblockaddons.utils.EnumUtils;
 import codes.biscuit.skyblockaddons.utils.ColorCode;
 import codes.biscuit.skyblockaddons.utils.objects.FloatPairString;
@@ -294,7 +294,7 @@ public static void drawSlot(GuiContainer guiContainer, Slot slot) {
     private static Method drawGradientRect = null;
 
     private static void drawRightGradientRect(GuiContainer guiContainer, int left, int top, int right, int bottom, int startColor, int endColor) {
-        if (SkyblockAddonsSetup.isUsingLabyModClient()) { // There are no access transformers in labymod.
+        if (PreTransformationChecks.isLabymodClient()) { // There are no access transformers in labymod.
             try {
                 if (drawGradientRect == null) {
                     drawGradientRect = guiContainer.getClass().getSuperclass().getSuperclass().getDeclaredMethod("a", int.class, int.class, int.class, int.class, int.class, int.class);
@@ -364,7 +364,7 @@ public static void handleMouseClick(Slot slotIn, int slotId, int clickedButton,
     private static Field zLevel = null;
 
     private static void setZLevel(Gui gui, int zLevelToSet) {
-        if (SkyblockAddonsSetup.isUsingLabyModClient()) { // There are no access transformers in labymod.
+        if (PreTransformationChecks.isLabymodClient()) { // There are no access transformers in labymod.
             try {
                 if (zLevel == null) {
                     zLevel = gui.getClass().getDeclaredField("e");
@@ -384,7 +384,7 @@ private static void setZLevel(Gui gui, int zLevelToSet) {
     private static Method drawHoveringText = null;
 
     private static void drawHoveringText(GuiContainer guiContainer, List<String> text, int x, int y) {
-        if (SkyblockAddonsSetup.isUsingLabyModClient()) { // There are no access transformers in labymod.
+        if (PreTransformationChecks.isLabymodClient()) { // There are no access transformers in labymod.
             try {
                 if (drawHoveringText == null) {
                     drawHoveringText = guiContainer.getClass().getSuperclass().getDeclaredMethod("a",
diff --git a/src/main/java/codes/biscuit/skyblockaddons/asm/hooks/GuiNewChatHook.java b/src/main/java/codes/biscuit/skyblockaddons/asm/hooks/GuiNewChatHook.java
@@ -1,7 +1,7 @@
 package codes.biscuit.skyblockaddons.asm.hooks;
 
 import codes.biscuit.skyblockaddons.SkyblockAddons;
-import codes.biscuit.skyblockaddons.tweaker.SkyblockAddonsTransformer;
+import codes.biscuit.skyblockaddons.tweaker.PreTransformationChecks;
 import net.minecraft.client.Minecraft;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.util.IChatComponent;
@@ -11,7 +11,7 @@ public class GuiNewChatHook {
     public static String getUnformattedText(IChatComponent iChatComponent) {
         SkyblockAddons main = SkyblockAddons.getInstance();
         ICommandSender player = Minecraft.getMinecraft().thePlayer;
-        if (main != null && SkyblockAddonsTransformer.isDeobfuscated() || (player != null && player.getName().equals("Biscut"))) {
+        if (main != null && PreTransformationChecks.isDeobfuscated() || (player != null && player.getName().equals("Biscut"))) {
             return iChatComponent.getFormattedText(); // makes it easier for debugging
         }
         return iChatComponent.getUnformattedText();
diff --git a/src/main/java/codes/biscuit/skyblockaddons/asm/hooks/SoundManagerHook.java b/src/main/java/codes/biscuit/skyblockaddons/asm/hooks/SoundManagerHook.java
@@ -1,7 +1,7 @@
 package codes.biscuit.skyblockaddons.asm.hooks;
 
 import codes.biscuit.skyblockaddons.SkyblockAddons;
-import codes.biscuit.skyblockaddons.tweaker.SkyblockAddonsTransformer;
+import codes.biscuit.skyblockaddons.tweaker.PreTransformationChecks;
 import net.minecraft.client.audio.ISound;
 import net.minecraft.client.audio.SoundCategory;
 import net.minecraft.client.audio.SoundManager;
@@ -19,7 +19,7 @@ public static float getNormalizedVolume(SoundManager soundManager, ISound sound,
         if (main != null && main.getUtils() != null && main.getUtils().isPlayingSound()) {
             return 1;
         } else {
-            if (SkyblockAddonsTransformer.isLabymodClient()) { // There are no access transformers in labymod.
+            if (PreTransformationChecks.isLabymodClient()) { // There are no access transformers in labymod.
                 try {
                     if (getNormalizedVolume == null) {
                         getNormalizedVolume = soundManager.getClass().getDeclaredMethod("a", ISound.class, SoundPoolEntry.class, SoundCategory.class);
diff --git a/src/main/java/codes/biscuit/skyblockaddons/asm/hooks/TileEntityEnderChestRendererHook.java b/src/main/java/codes/biscuit/skyblockaddons/asm/hooks/TileEntityEnderChestRendererHook.java
@@ -1,7 +1,7 @@
 package codes.biscuit.skyblockaddons.asm.hooks;
 
 import codes.biscuit.skyblockaddons.SkyblockAddons;
-import codes.biscuit.skyblockaddons.tweaker.SkyblockAddonsTransformer;
+import codes.biscuit.skyblockaddons.tweaker.PreTransformationChecks;
 import codes.biscuit.skyblockaddons.core.Feature;
 import codes.biscuit.skyblockaddons.core.Location;
 import codes.biscuit.skyblockaddons.utils.ColorCode;
@@ -32,7 +32,7 @@ public static void bindTexture(TileEntityEnderChestRenderer tileEntityEnderChest
     }
 
     private static void bindRightTexture(TileEntityEnderChestRenderer tileEntityEnderChestRenderer, ResourceLocation resourceLocation) {
-        if (SkyblockAddonsTransformer.isLabymodClient()) { // There are no access transformers in labymod.
+        if (PreTransformationChecks.isLabymodClient()) { // There are no access transformers in labymod.
             try {
                 if (bindTexture == null) {
                     bindTexture = tileEntityEnderChestRenderer.getClass().getSuperclass().getDeclaredMethod("a", ResourceLocation.class);
diff --git a/src/main/java/codes/biscuit/skyblockaddons/asm/utils/TransformerClass.java b/src/main/java/codes/biscuit/skyblockaddons/asm/utils/TransformerClass.java
@@ -1,6 +1,6 @@
 package codes.biscuit.skyblockaddons.asm.utils;
 
-import codes.biscuit.skyblockaddons.tweaker.SkyblockAddonsTransformer;
+import codes.biscuit.skyblockaddons.tweaker.PreTransformationChecks;
 
 public enum TransformerClass {
 
@@ -71,7 +71,7 @@ public enum TransformerClass {
         this.seargeClass = seargeClass;
         this.notchClass18 = notchClass18;
 
-        if (SkyblockAddonsTransformer.isDeobfuscated() || !SkyblockAddonsTransformer.isUsingNotchMappings()) {
+        if (PreTransformationChecks.isDeobfuscated() || !PreTransformationChecks.isUsingNotchMappings()) {
             name = seargeClass;
         } else {
             name = notchClass18;
@@ -93,7 +93,7 @@ public String getName() {
     }
 
     public String getTransformerName() {
-        if (SkyblockAddonsTransformer.isLabymodClient()) return notchClass18;
+        if (PreTransformationChecks.isLabymodClient()) return notchClass18;
 
         return seargeClass.replaceAll("/", ".");
     }
diff --git a/src/main/java/codes/biscuit/skyblockaddons/asm/utils/TransformerField.java b/src/main/java/codes/biscuit/skyblockaddons/asm/utils/TransformerField.java
@@ -1,6 +1,6 @@
 package codes.biscuit.skyblockaddons.asm.utils;
 
-import codes.biscuit.skyblockaddons.tweaker.SkyblockAddonsTransformer;
+import codes.biscuit.skyblockaddons.tweaker.PreTransformationChecks;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.FieldInsnNode;
 
@@ -52,10 +52,10 @@ public enum TransformerField {
     TransformerField(String deobfName, String seargeName, String notchName18, String type) {
         this.type = type;
 
-        if (SkyblockAddonsTransformer.isDeobfuscated()) {
+        if (PreTransformationChecks.isDeobfuscated()) {
             name = deobfName;
         } else {
-            if (SkyblockAddonsTransformer.isUsingNotchMappings()) {
+            if (PreTransformationChecks.isUsingNotchMappings()) {
                 name = notchName18;
             } else {
                 name = seargeName;
diff --git a/src/main/java/codes/biscuit/skyblockaddons/asm/utils/TransformerMethod.java b/src/main/java/codes/biscuit/skyblockaddons/asm/utils/TransformerMethod.java
@@ -1,6 +1,6 @@
 package codes.biscuit.skyblockaddons.asm.utils;
 
-import codes.biscuit.skyblockaddons.tweaker.SkyblockAddonsTransformer;
+import codes.biscuit.skyblockaddons.tweaker.PreTransformationChecks;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.MethodInsnNode;
 import org.objectweb.asm.tree.MethodNode;
@@ -158,11 +158,11 @@ public enum TransformerMethod {
     }
 
     TransformerMethod(String deobfMethod, String seargeMethod, String notchMethod18, String seargeDescription, String notchDescription, boolean ioException) {
-        if (SkyblockAddonsTransformer.isDeobfuscated()) {
+        if (PreTransformationChecks.isDeobfuscated()) {
             name = deobfMethod;
             description = seargeDescription;
         } else {
-            if (SkyblockAddonsTransformer.isUsingNotchMappings()) {
+            if (PreTransformationChecks.isUsingNotchMappings()) {
                 name = notchMethod18;
                 description = notchDescription;
             } else {
diff --git a/src/main/java/codes/biscuit/skyblockaddons/features/tabtimers/TabEffectManager.java b/src/main/java/codes/biscuit/skyblockaddons/features/tabtimers/TabEffectManager.java
@@ -3,7 +3,7 @@
 import codes.biscuit.skyblockaddons.SkyblockAddons;
 import codes.biscuit.skyblockaddons.core.Feature;
 import codes.biscuit.skyblockaddons.gui.buttons.ButtonLocation;
-import codes.biscuit.skyblockaddons.tweaker.SkyblockAddonsTransformer;
+import codes.biscuit.skyblockaddons.tweaker.PreTransformationChecks;
 import codes.biscuit.skyblockaddons.utils.RomanNumeralParser;
 import lombok.Getter;
 import net.minecraft.client.Minecraft;
@@ -128,7 +128,7 @@ public void updatePotionEffects() {
     private static IChatComponent getFooter() {
         GuiPlayerTabOverlay guiTab = Minecraft.getMinecraft().ingameGUI.getTabList();
 
-        if (SkyblockAddonsTransformer.isLabymodClient()) { // There are no access transformers in labymod.
+        if (PreTransformationChecks.isLabymodClient()) { // There are no access transformers in labymod.
             try {
                 if (footer == null) {
                     footer = guiTab.getClass().getDeclaredField("h");
diff --git a/src/main/java/codes/biscuit/skyblockaddons/tweaker/PreTransformationChecks.java b/src/main/java/codes/biscuit/skyblockaddons/tweaker/PreTransformationChecks.java
@@ -0,0 +1,41 @@
+package codes.biscuit.skyblockaddons.tweaker;
+
+import lombok.Getter;
+
+import java.lang.reflect.Field;
+import java.util.Map;
+
+public class PreTransformationChecks {
+    @Getter
+    private static boolean labymodClient;
+    @Getter
+    private static boolean deobfuscated;
+    @Getter
+    private static boolean usingNotchMappings;
+
+    @SuppressWarnings("unchecked")
+    static void runChecks() {
+        deobfuscated = false;
+        labymodClient = false;
+        boolean foundLaunchClass = false;
+
+        try {
+            Class<?> launch = Class.forName("net.minecraft.launchwrapper.Launch");
+            Field blackboardField = launch.getField("blackboard");
+            Map<String,Object> blackboard = (Map<String, Object>) blackboardField.get(null);
+            deobfuscated = (boolean) blackboard.get("fml.deobfuscatedEnvironment");
+            foundLaunchClass = true;
+        } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException ex) {
+            // If the class doesn't exist, its probably just obfuscated labymod client, so leave it false.
+        }
+
+        try {
+            Class.forName("net.labymod.api.LabyModAddon"); // Try to find a labymod class.
+            PreTransformationChecks.labymodClient = !foundLaunchClass; // If the launch class is also found, they are probably using labymod for forge and not the client.
+        } catch (ClassNotFoundException ex) {
+            // They just aren't using LabyMod.
+        }
+
+        usingNotchMappings = !deobfuscated;
+    }
+}
diff --git a/src/main/java/codes/biscuit/skyblockaddons/tweaker/SkyblockAddonsTransformer.java b/src/main/java/codes/biscuit/skyblockaddons/tweaker/SkyblockAddonsTransformer.java
@@ -15,42 +15,14 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.lang.reflect.Field;
 import java.util.Collection;
-import java.util.Map;
 
-@SuppressWarnings("unchecked")
 public class SkyblockAddonsTransformer implements IClassTransformer {
-
-    private static boolean LABYMOD_CLIENT;
-    private static boolean DEOBFUSCATED;
-
     static {
-        DEOBFUSCATED = false;
-        boolean foundLaunchClass = false;
-        try {
-            // DEOBFUSCATED = (boolean)Launch.blackboard.get("fml.deobfuscatedEnvironment");
-            Class<?> launch = Class.forName("net.minecraft.launchwrapper.Launch");
-            Field blackboardField = launch.getField("blackboard");
-            Map<String,Object> blackboard = (Map<String, Object>) blackboardField.get(null);
-            DEOBFUSCATED = (boolean) blackboard.get("fml.deobfuscatedEnvironment");
-            foundLaunchClass = true;
-        } catch (ClassNotFoundException | NoSuchFieldException | IllegalAccessException ex) {
-            // If the class doesn't exist, its probably just obfuscated labymod client, so leave it false.
-        }
-
-        LABYMOD_CLIENT = false;
-        try {
-            Class.forName("net.labymod.api.LabyModAddon"); // Try to find a labymod class.
-            LABYMOD_CLIENT = !foundLaunchClass; // If the launch class is also found, they are probably using labymod for forge and not the client.
-        } catch (ClassNotFoundException ex) {
-            // They just aren't using labymod.
-        }
+        PreTransformationChecks.runChecks();
     }
 
-    private static boolean USING_NOTCH_MAPPINGS = !DEOBFUSCATED;
-
-    private Logger logger = LogManager.getLogger("SkyblockAddons Transformer");
+    private final Logger logger = LogManager.getLogger("SkyblockAddons Transformer");
     private final Multimap<String, ITransformer> transformerMap = ArrayListMultimap.create();
 
     public SkyblockAddonsTransformer() {
@@ -129,6 +101,7 @@ public byte[] transform(String name, String transformedName, byte[] bytes) {
         return writer.toByteArray();
     }
 
+    @SuppressWarnings("ResultOfMethodCallIgnored")
     private void outputBytecode(String transformedName, ClassWriter writer) {
         try {
             File bytecodeDirectory = new File("bytecode");
@@ -145,15 +118,4 @@ private void outputBytecode(String transformedName, ClassWriter writer) {
         }
     }
 
-    public static boolean isDeobfuscated() {
-        return DEOBFUSCATED;
-    }
-
-    public static boolean isLabymodClient() {
-        return LABYMOD_CLIENT;
-    }
-
-    public static boolean isUsingNotchMappings() {
-        return USING_NOTCH_MAPPINGS;
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+<!--suppress HtmlDeprecatedAttribute -->`
`1`	`2`	`<h1 align="center">SkyblockAddons</h1>`
`2`	`3`
`3`	`4`	`<p align="center">`