code cleanup

1. sort java imports above other imports 2. remove unused code 3. other IDE suggested fixes/cleanup 4. unified log level usage pattern
Glease · Jun 22, 2023 · ca31e49 · ca31e49
1 parent 75b57b1
commit ca31e49
Show file tree

Hide file tree

Showing 60 changed files with 289 additions and 260 deletions.
diff --git a/src/main/java/net/glease/tc4tweak/ClientProxy.java b/src/main/java/net/glease/tc4tweak/ClientProxy.java
@@ -1,5 +1,8 @@
 package net.glease.tc4tweak;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
@@ -27,9 +30,6 @@
 import thaumcraft.client.gui.GuiResearchTable;
 import thaumcraft.common.config.ConfigItems;
 
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-
 public class ClientProxy extends CommonProxy {
     static final FMLEventHandler instance = new FMLEventHandler();
     static long lastScroll = 0;

diff --git a/src/main/java/net/glease/tc4tweak/ClientUtils.java b/src/main/java/net/glease/tc4tweak/ClientUtils.java
@@ -1,15 +1,8 @@
 package net.glease.tc4tweak;
 
-import cpw.mods.fml.relauncher.ReflectionHelper;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.renderer.Tessellator;
 
-import java.lang.reflect.Field;
-import java.util.List;
-
 public class ClientUtils {
-    private static final Field fieldButtonList = ReflectionHelper.findField(GuiScreen.class, "buttonList", "field_146292_n");
 
     public static void drawRectTextured(double xmin, double xmax, double ymin, double ymax, double umin, double umax, double vmin, double vmax, double zLevel) {
         // can't just call gui.drawTexturedModalRect, it can't do width scales
@@ -23,13 +16,4 @@ public static void drawRectTextured(double xmin, double xmax, double ymin, doubl
         tessellator.addVertexWithUV(xmin, ymin, zLevel, umin * f, vmin * f);
         tessellator.draw();
     }
-
-    @SuppressWarnings("unchecked")
-    public static List<GuiButton> getButtonList(GuiScreen gui) {
-        try {
-            return (List<GuiButton>) fieldButtonList.get(gui);
-        } catch (IllegalAccessException e1) {
-            throw new RuntimeException(e1);
-        }
-    }
 }
diff --git a/src/main/java/net/glease/tc4tweak/CommonUtils.java b/src/main/java/net/glease/tc4tweak/CommonUtils.java
@@ -1,14 +1,16 @@
 package net.glease.tc4tweak;
 
+import java.lang.reflect.Field;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 import thaumcraft.api.aspects.AspectList;
 import thaumcraft.api.crafting.CrucibleRecipe;
 import thaumcraft.api.research.ResearchCategories;
 import thaumcraft.api.research.ResearchCategoryList;
 
-import java.lang.reflect.Field;
-import java.util.*;
-import java.util.stream.Collectors;
-
 public class CommonUtils {
     // only keep the strings, so tab objects doesn't leak if they are ever removed
     private static final LinkedHashSet<String> originalTabOrders = new LinkedHashSet<>();

diff --git a/src/main/java/net/glease/tc4tweak/ConfigurationHandler.java b/src/main/java/net/glease/tc4tweak/ConfigurationHandler.java
@@ -1,5 +1,11 @@
 package net.glease.tc4tweak;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
 import com.google.common.collect.ImmutableList;
 import cpw.mods.fml.client.event.ConfigChangedEvent;
 import cpw.mods.fml.common.FMLCommonHandler;
@@ -16,9 +22,6 @@
 import net.minecraftforge.oredict.OreDictionary;
 import thaumcraft.api.ThaumcraftApiHelper;
 
-import java.io.File;
-import java.util.*;
-
 public enum ConfigurationHandler {
     INSTANCE;
 

diff --git a/src/main/java/net/glease/tc4tweak/ConfigurationVersion.java b/src/main/java/net/glease/tc4tweak/ConfigurationVersion.java
@@ -1,13 +1,13 @@
 package net.glease.tc4tweak;
 
-import com.google.common.collect.ImmutableMap;
-import net.minecraftforge.common.config.Configuration;
-
 import javax.annotation.Nullable;
 import java.util.Arrays;
 import java.util.Map;
 import java.util.Objects;
 
+import com.google.common.collect.ImmutableMap;
+import net.minecraftforge.common.config.Configuration;
+
 enum ConfigurationVersion {
     LEGACY(null) {
         @Override

diff --git a/src/main/java/net/glease/tc4tweak/GuiFactory.java b/src/main/java/net/glease/tc4tweak/GuiFactory.java
@@ -1,11 +1,11 @@
 package net.glease.tc4tweak;
 
+import java.util.Set;
+
 import cpw.mods.fml.client.IModGuiFactory;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 
-import java.util.Set;
-
 public class GuiFactory implements IModGuiFactory {
     @Override
     public void initialize(Minecraft minecraftInstance) {

diff --git a/src/main/java/net/glease/tc4tweak/GuiModConfig.java b/src/main/java/net/glease/tc4tweak/GuiModConfig.java
@@ -1,14 +1,14 @@
 package net.glease.tc4tweak;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 import cpw.mods.fml.client.config.GuiConfig;
 import cpw.mods.fml.client.config.IConfigElement;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraftforge.common.config.ConfigElement;
 import net.minecraftforge.common.config.Configuration;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 public class GuiModConfig extends GuiConfig {
     public GuiModConfig(GuiScreen guiScreen) {
         super(guiScreen, getConfigElements(), TC4Tweak.MOD_ID, false, false, GuiConfig.getAbridgedConfigPath(ConfigurationHandler.INSTANCE.getConfig().toString()));

diff --git a/src/main/java/net/glease/tc4tweak/TC4Tweak.java b/src/main/java/net/glease/tc4tweak/TC4Tweak.java
@@ -1,5 +1,13 @@
 package net.glease.tc4tweak;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.security.cert.Certificate;
+import java.util.Arrays;
+import java.util.Locale;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 import com.google.common.collect.ImmutableMap;
 import cpw.mods.fml.common.*;
 import cpw.mods.fml.common.event.FMLInitializationEvent;
@@ -18,14 +26,6 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.security.cert.Certificate;
-import java.util.Arrays;
-import java.util.Locale;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 @Mod(modid = TC4Tweak.MOD_ID, name = "TC4 Tweak", version = TC4Tweak.VERSION, dependencies = "required-after:Thaumcraft", guiFactory = "net.glease.tc4tweak.GuiFactory")
 public class TC4Tweak {
     public static final String MOD_ID = "tc4tweak";

diff --git a/src/main/java/net/glease/tc4tweak/asm/ASMCallhook.java b/src/main/java/net/glease/tc4tweak/asm/ASMCallhook.java
@@ -1,5 +1,11 @@
 package net.glease.tc4tweak.asm;
 
+import java.lang.reflect.Field;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.WeakHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 import cpw.mods.fml.relauncher.ReflectionHelper;
 import net.glease.tc4tweak.ClientProxy;
 import net.glease.tc4tweak.ClientUtils;
@@ -15,12 +21,6 @@
 import thaumcraft.client.lib.UtilsFX;
 import thaumcraft.common.tiles.TileMagicWorkbench;
 
-import java.lang.reflect.Field;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.WeakHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 import static net.glease.tc4tweak.TC4Tweak.log;
 
 public class ASMCallhook {

diff --git a/src/main/java/net/glease/tc4tweak/asm/ASMCallhookServer.java b/src/main/java/net/glease/tc4tweak/asm/ASMCallhookServer.java
@@ -1,5 +1,8 @@
 package net.glease.tc4tweak.asm;
 
+import java.util.Map.Entry;
+import java.util.concurrent.ThreadLocalRandom;
+
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
 import net.glease.tc4tweak.ConfigurationHandler;
 import net.glease.tc4tweak.TC4Tweak;
@@ -54,9 +57,6 @@
 import thaumcraft.common.tiles.TileArcaneWorkbench;
 import thaumcraft.common.tiles.TileResearchTable;
 
-import java.util.Map.Entry;
-import java.util.concurrent.ThreadLocalRandom;
-
 import static net.glease.tc4tweak.TC4Tweak.log;
 
 public class ASMCallhookServer {

diff --git a/src/main/java/net/glease/tc4tweak/asm/ASMUtils.java b/src/main/java/net/glease/tc4tweak/asm/ASMUtils.java
@@ -1,10 +1,10 @@
 package net.glease.tc4tweak.asm;
 
+import java.util.Arrays;
+
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Type;
 
-import java.util.Arrays;
-
 import static net.glease.tc4tweak.asm.TC4Transformer.log;
 import static org.objectweb.asm.Opcodes.*;
 
@@ -19,7 +19,7 @@ final class ASMUtils {
         } catch (ClassNotFoundException | NoSuchFieldException e) {
             cfg = null;
         } catch (IllegalAccessException e) {
-            log.warn("Unforeseen changes in hodgepodge. Nothing will be disabled automatically!");
+            log.error("Unforeseen changes in hodgepodge. Nothing will be disabled automatically!");
             cfg = null;
         }
         configHodgePodge = cfg;
@@ -87,7 +87,7 @@ static boolean isHodgepodgeFixActive(@SuppressWarnings("SameParameterValue") Str
         } catch (NoSuchFieldException e) {
             return false;
         } catch (IllegalAccessException e) {
-            log.warn("Unforeseen changes in hodgepodge. Disabling conflicting patches just in case.");
+            log.error("Unforeseen changes in hodgepodge. Disabling conflicting patches just in case.");
             return false;
         }
     }

diff --git a/src/main/java/net/glease/tc4tweak/asm/AddHandleMouseInputVisitor.java b/src/main/java/net/glease/tc4tweak/asm/AddHandleMouseInputVisitor.java
@@ -4,6 +4,7 @@
 import org.objectweb.asm.MethodVisitor;
 
 import static net.glease.tc4tweak.asm.ASMConstants.ASMCALLHOOK_INTERNAL_NAME;
+import static net.glease.tc4tweak.asm.TC4Transformer.log;
 import static org.objectweb.asm.Opcodes.*;
 
 class AddHandleMouseInputVisitor extends ClassVisitor {
@@ -27,7 +28,7 @@ public void visitEnd() {
             name = "handleMouseInput";
         else
             name = "func_146274_d";
-        TC4Transformer.log.debug("Adding {} to {}", name, className);
+        log.debug("Adding {} to {}", name, className);
         MethodVisitor mv = cv.visitMethod(ACC_PUBLIC, name, "()V", null, null);
         mv.visitCode();
         mv.visitVarInsn(ALOAD, 0);

diff --git a/src/main/java/net/glease/tc4tweak/asm/BlockFluxGasVisitor.java b/src/main/java/net/glease/tc4tweak/asm/BlockFluxGasVisitor.java
@@ -3,6 +3,7 @@
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.MethodVisitor;
 
+import static net.glease.tc4tweak.asm.TC4Transformer.log;
 import static org.objectweb.asm.Opcodes.*;
 
 class BlockFluxGasVisitor extends ClassVisitor {
@@ -20,14 +21,14 @@ public void visit(int version, int access, String name, String signature, String
 
     @Override
     public void visitEnd() {
-        TC4Transformer.log.debug("Adding canDrain to {}", className);
+        log.debug("Adding canDrain to {}", className);
         MethodVisitor mv = super.visitMethod(ACC_PUBLIC, "canDrain", "(Lnet/minecraft/world/World;III)Z", null, null);
         mv.visitCode();
         mv.visitInsn(ICONST_0);
         mv.visitInsn(IRETURN);
         mv.visitMaxs(1, 5);
         mv.visitEnd();
-        TC4Transformer.log.debug("Adding drain to {}", className);
+        log.debug("Adding drain to {}", className);
         mv = super.visitMethod(ACC_PUBLIC, "drain", "(Lnet/minecraft/world/World;IIIZ)Lnet/minecraftforge/fluids/FluidStack;", null, null);
         mv.visitCode();
         mv.visitInsn(ACONST_NULL);

diff --git a/src/main/java/net/glease/tc4tweak/asm/BlockJarVisitor.java b/src/main/java/net/glease/tc4tweak/asm/BlockJarVisitor.java
@@ -23,7 +23,7 @@ public MethodVisitor visitMethod(int access, String name, String desc, String si
                 public void visitFieldInsn(int opcode, String owner, String name, String desc) {
                     super.visitFieldInsn(opcode, owner, name, desc);
                     if (opcode == PUTFIELD && name.equals("aspectFilter")) {
-                        log.debug("Adding markDirty & markBlockForUpdate");
+                        log.trace("Adding markDirty & markBlockForUpdate");
                         mv.visitVarInsn(ALOAD, 1);
                         mv.visitVarInsn(ILOAD, 2);
                         mv.visitVarInsn(ILOAD, 3);
@@ -35,14 +35,15 @@ public void visitFieldInsn(int opcode, String owner, String name, String desc) {
                 }
             };
         } else if (name.equals(dev ? "addCollisionBoxesToList" : "func_149743_a")) {
+            log.debug("Modifying {}", name);
             return new MethodVisitor(api, mv) {
                 private int visited = 0;
 
                 @Override
                 public void visitInsn(int opcode) {
                     if (opcode == FCONST_1 || opcode == FCONST_0) {
                         if (visited >= 6)
-                            throw new IllegalStateException();
+                            throw new IllegalStateException("unexpected class bytes");
                         mv.visitInsn(ICONST_0 + visited);
                         mv.visitMethodInsn(INVOKESTATIC, ASMCALLHOOKSERVER_INTERNAL_NAME, "getBlockJarEntityCollisionBoxParameter", "(I)F", false);
                         visited++;

diff --git a/src/main/java/net/glease/tc4tweak/asm/BlockMetalDeviceVisitor.java b/src/main/java/net/glease/tc4tweak/asm/BlockMetalDeviceVisitor.java
@@ -28,7 +28,7 @@ public void visitMethodInsn(int opcode, String owner, String name, String desc,
                             owner.equals("net/minecraft/entity/player/InventoryPlayer") &&
                             name.equals(dev ? "addItemStackToInventory" : "func_70441_a") &&
                             desc.equals("(Lnet/minecraft/item/ItemStack;)Z")) {
-                        log.debug("Redirecting {}", name);
+                        log.trace("Redirecting {}", name);
                         super.visitMethodInsn(INVOKESTATIC, ASMCALLHOOKSERVER_INTERNAL_NAME, "addToPlayerInventoryBiased", "(Lnet/minecraft/entity/player/InventoryPlayer;Lnet/minecraft/item/ItemStack;)Z", false);
                         visited = true;
                     } else {

diff --git a/src/main/java/net/glease/tc4tweak/asm/CellLocVisitor.java b/src/main/java/net/glease/tc4tweak/asm/CellLocVisitor.java
@@ -4,6 +4,7 @@
 import org.objectweb.asm.MethodVisitor;
 
 import static net.glease.tc4tweak.asm.ASMConstants.ASMCALLHOOKSERVER_INTERNAL_NAME;
+import static net.glease.tc4tweak.asm.TC4Transformer.log;
 
 class CellLocVisitor extends ClassVisitor {
     public CellLocVisitor(int api, ClassVisitor cv) {
@@ -14,7 +15,7 @@ public CellLocVisitor(int api, ClassVisitor cv) {
     public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
         MethodVisitor mv = super.visitMethod(access, name, desc, signature, exceptions);
         if (name.equals("hashCode") && desc.equals("()I")) {
-            TC4Transformer.log.debug("Replacing hashCode()I");
+            log.debug("Replacing hashCode()I");
             ASMUtils.writeMethodDeflected(ASMCALLHOOKSERVER_INTERNAL_NAME, "hashCellLoc", mv, "thaumcraft/common/lib/world/dim/CellLoc", desc);
             return null;
         }

diff --git a/src/main/java/net/glease/tc4tweak/asm/ContainerArcaneWorkbenchVisitor.java b/src/main/java/net/glease/tc4tweak/asm/ContainerArcaneWorkbenchVisitor.java
@@ -5,6 +5,7 @@
 
 import static net.glease.tc4tweak.asm.ASMConstants.ASMCALLHOOKSERVER_INTERNAL_NAME;
 import static net.glease.tc4tweak.asm.LoadingPlugin.dev;
+import static net.glease.tc4tweak.asm.TC4Transformer.log;
 import static org.objectweb.asm.Opcodes.*;
 
 class ContainerArcaneWorkbenchVisitor extends ClassVisitor {
@@ -16,7 +17,7 @@ public ContainerArcaneWorkbenchVisitor(int api, ClassVisitor cv) {
     public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
         final MethodVisitor mv = super.visitMethod(access, name, desc, signature, exceptions);
         if (desc.equals("(Lnet/minecraft/inventory/IInventory;)V") && dev ? name.equals("onCraftMatrixChanged") : name.equals("func_75130_a")) {
-            TC4Transformer.log.debug("Replacing {}", name);
+            log.debug("Replacing {}", name);
             mv.visitCode();
             mv.visitVarInsn(ALOAD, 0);
             mv.visitFieldInsn(GETFIELD, "thaumcraft/common/container/ContainerArcaneWorkbench", "tileEntity", "Lthaumcraft/common/tiles/TileArcaneWorkbench;");

diff --git a/src/main/java/net/glease/tc4tweak/asm/FXSonicVisitor.java b/src/main/java/net/glease/tc4tweak/asm/FXSonicVisitor.java
@@ -4,6 +4,7 @@
 import org.objectweb.asm.FieldVisitor;
 import org.objectweb.asm.MethodVisitor;
 
+import static net.glease.tc4tweak.asm.TC4Transformer.log;
 import static org.objectweb.asm.Opcodes.*;
 
 class FXSonicVisitor extends ClassVisitor {
@@ -18,7 +19,7 @@ public FXSonicVisitor(int api, ClassVisitor cv) {
     @Override
     public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
         if (name.equals(FIELD_MODEL_NAME) && desc.equals(FIELD_MODEL_DESC)) {
-            TC4Transformer.log.debug("Making field model static");
+            log.debug("Making field model static");
             return super.visitField(access | ACC_STATIC, name, desc, signature, value);
         } else {
             return super.visitField(access, name, desc, signature, value);
@@ -43,7 +44,7 @@ public FieldModelScrubberVisitor(int api, String name, String desc, MethodVisito
         @Override
         public void visitFieldInsn(int opcode, String owner, String name, String desc) {
             if (owner.equals("thaumcraft/client/fx/other/FXSonic") && name.equals(FIELD_MODEL_NAME) && desc.equals(FIELD_MODEL_DESC)) {
-                TC4Transformer.log.debug("Replacing opcode {} with {} in method {}{}", opcode, opcode - 2, this.name, this.desc);
+                log.trace("Replacing opcode {} with {} in method {}{}", opcode, opcode - 2, this.name, this.desc);
                 if (opcode == GETFIELD) {
                     // before
                     // ..., this, -> ..., model,