refactor (#36)

* refactor

* fix vig compat

* fix nanovg thingy

* e

* finalize

* gui utils package thingy

2 files changed, 0 insertions, 148 deletions

diff --git a/src/main/java/cc/polyfrost/oneconfig/plugin/asm/tweakers/NanoVGGLConfigTransformer.java b/src/main/java/cc/polyfrost/oneconfig/plugin/asm/tweakers/NanoVGGLConfigTransformer.java
deleted file mode 100644
index 38da8dd..0000000
--- a/src/main/java/cc/polyfrost/oneconfig/plugin/asm/tweakers/NanoVGGLConfigTransformer.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package cc.polyfrost.oneconfig.plugin.asm.tweakers;
-
-import cc.polyfrost.oneconfig.plugin.asm.ITransformer;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.tree.*;
-
-public class NanoVGGLConfigTransformer implements ITransformer {
-    @Override
-    public String[] getClassName() {
-        return new String[]{"org.lwjgl.nanovg.NanoVGGLConfig"};
-    }
-
-    @Override
-    public void transform(String transformedName, ClassNode node) {
-        for (MethodNode method : node.methods) {
-            if (method.name.equals("configGL")) {
-                InsnList list = new InsnList();
-
-                list.add(new VarInsnNode(Opcodes.LLOAD, 0));
-                list.add(new TypeInsnNode(Opcodes.NEW, "cc/polyfrost/oneconfig/lwjgl/plugin/Lwjgl2FunctionProvider"));
-                list.add(new InsnNode(Opcodes.DUP));
-                list.add(new MethodInsnNode(
-                        Opcodes.INVOKESPECIAL,
-                        "cc/polyfrost/oneconfig/lwjgl/plugin/Lwjgl2FunctionProvider",
-                        "<init>",
-                        "()V",
-                        false
-                ));
-                list.add(new MethodInsnNode(
-                        Opcodes.INVOKESTATIC,
-                        "org/lwjgl/nanovg/NanoVGGLConfig",
-                        "config",
-                        "(JLorg/lwjgl/system/FunctionProvider;)V",
-                        false
-                ));
-                list.add(new InsnNode(Opcodes.RETURN));
-
-                method.instructions.clear();
-                method.instructions.insert(list);
-            }
-        }
-    }
-}
diff --git a/src/main/java/cc/polyfrost/oneconfig/plugin/asm/tweakers/VigilantTransformer.java b/src/main/java/cc/polyfrost/oneconfig/plugin/asm/tweakers/VigilantTransformer.java
deleted file mode 100644
index 29cf2fd..0000000
--- a/src/main/java/cc/polyfrost/oneconfig/plugin/asm/tweakers/VigilantTransformer.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package cc.polyfrost.oneconfig.plugin.asm.tweakers;
-
-import cc.polyfrost.oneconfig.config.compatibility.VigilanceConfig;
-import cc.polyfrost.oneconfig.config.core.ConfigCore;
-import cc.polyfrost.oneconfig.config.data.Mod;
-import cc.polyfrost.oneconfig.config.data.ModType;
-import cc.polyfrost.oneconfig.plugin.asm.ITransformer;
-import gg.essential.vigilance.Vigilant;
-import gg.essential.vigilance.data.PropertyCollector;
-import net.minecraft.client.Minecraft;
-import net.minecraftforge.fml.common.Loader;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.tree.*;
-
-import java.io.File;
-
-public class VigilantTransformer implements ITransformer {
-    @SuppressWarnings("unused")
-    public static VigilanceConfig returnNewConfig(Vigilant vigilant, File file) {
-        if (vigilant != null && Minecraft.getMinecraft().isCallingFromMinecraftThread()) {
-            String name = !vigilant.getGuiTitle().equals("Settings") ? vigilant.getGuiTitle() : Loader.instance().activeModContainer() == null ? "Unknown" : Loader.instance().activeModContainer().getName();
-            if (name.equals("OneConfig")) name = "Essential";
-            String finalName = name;
-            // duplicate fix
-            if (ConfigCore.oneConfigMods.stream().anyMatch(mod -> mod.name.equals(finalName))) return null;
-            return new VigilanceConfig(new Mod(name, ModType.THIRD_PARTY), file.getAbsolutePath(), vigilant);
-        } else {
-            return null;
-        }
-    }
-
-    @Override
-    public String[] getClassName() {
-        return new String[]{"gg.essential.vigilance.Vigilant"};
-    }
-
-    @Override
-    public void transform(String transformedName, ClassNode node) {
-        node.fields.add(new FieldNode(Opcodes.ACC_PUBLIC, "oneconfig$config", Type.getDescriptor(VigilanceConfig.class), null, null));
-        node.fields.add(new FieldNode(Opcodes.ACC_PUBLIC | Opcodes.ACC_FINAL, "oneconfig$file", Type.getDescriptor(File.class), null, null));
-
-        node.interfaces.add("cc/polyfrost/oneconfig/config/compatibility/VigilantAccessor");
-        MethodNode methodNode = new MethodNode(Opcodes.ACC_PUBLIC, "getPropertyCollector", "()Lgg/essential/vigilance/data/PropertyCollector;", null, null);
-        LabelNode labelNode = new LabelNode();
-        methodNode.instructions.add(labelNode);
-        methodNode.instructions.add(new LineNumberNode(421421, labelNode));
-        methodNode.instructions.add(new VarInsnNode(Opcodes.ALOAD, 0));
-        methodNode.instructions.add(new FieldInsnNode(Opcodes.GETFIELD, "gg/essential/vigilance/Vigilant", "propertyCollector", Type.getDescriptor(PropertyCollector.class)));
-        methodNode.instructions.add(new InsnNode(Opcodes.ARETURN));
-        node.methods.add(methodNode);
-
-        MethodNode methodNode2 = new MethodNode(Opcodes.ACC_PUBLIC, "handleOneConfigDependency", "(Lgg/essential/vigilance/data/PropertyData;Lgg/essential/vigilance/data/PropertyData;)V", null, null);
-        LabelNode labelNode2 = new LabelNode();
-        LabelNode labelNode3 = new LabelNode();
-        LabelNode labelNode4 = new LabelNode();
-        methodNode2.instructions.add(labelNode2);
-        methodNode2.instructions.add(new LineNumberNode(15636436, labelNode2));
-        methodNode2.instructions.add(new VarInsnNode(Opcodes.ALOAD, 0));
-        methodNode2.instructions.add(new FieldInsnNode(Opcodes.GETFIELD, "gg/essential/vigilance/Vigilant", "oneconfig$config", Type.getDescriptor(VigilanceConfig.class)));
-
-        methodNode2.instructions.add(new JumpInsnNode(Opcodes.IFNULL, labelNode4));
-
-        methodNode2.instructions.add(labelNode3);
-        methodNode2.instructions.add(new LineNumberNode(15636437, labelNode3));
-        methodNode2.instructions.add(new VarInsnNode(Opcodes.ALOAD, 0));
-        methodNode2.instructions.add(new FieldInsnNode(Opcodes.GETFIELD, "gg/essential/vigilance/Vigilant", "oneconfig$config", Type.getDescriptor(VigilanceConfig.class)));
-        methodNode2.instructions.add(new VarInsnNode(Opcodes.ALOAD, 1));
-        methodNode2.instructions.add(new VarInsnNode(Opcodes.ALOAD, 2));
-        methodNode2.instructions.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, Type.getInternalName(VigilanceConfig.class), "addDependency", "(Lgg/essential/vigilance/data/PropertyData;Lgg/essential/vigilance/data/PropertyData;)V", false));
-
-        methodNode2.instructions.add(labelNode4);
-        methodNode2.instructions.add(new LineNumberNode(15636438, labelNode4));
-        methodNode2.instructions.add(new InsnNode(Opcodes.RETURN));
-        node.methods.add(methodNode2);
-
-        for (MethodNode method : node.methods) {
-            if (method.name.equals("initialize")) {
-                InsnList list = new InsnList();
-                list.add(new VarInsnNode(Opcodes.ALOAD, 0));
-                list.add(new VarInsnNode(Opcodes.ALOAD, 0));
-                list.add(new VarInsnNode(Opcodes.ALOAD, 0));
-                list.add(new FieldInsnNode(Opcodes.GETFIELD, "gg/essential/vigilance/Vigilant", "oneconfig$file", Type.getDescriptor(File.class)));
-                list.add(new MethodInsnNode(Opcodes.INVOKESTATIC, Type.getInternalName(getClass()), "returnNewConfig", "(Lgg/essential/vigilance/Vigilant;Ljava/io/File;)Lcc/polyfrost/oneconfig/config/compatibility/VigilanceConfig;", false));
-                list.add(new FieldInsnNode(Opcodes.PUTFIELD, "gg/essential/vigilance/Vigilant", "oneconfig$config", Type.getDescriptor(VigilanceConfig.class)));
-                method.instructions.insertBefore(method.instructions.getLast().getPrevious(), list);
-            } else if (method.name.equals("addDependency") && method.desc.equals("(Lgg/essential/vigilance/data/PropertyData;Lgg/essential/vigilance/data/PropertyData;)V")) {
-                InsnList list = new InsnList();
-
-                list.add(new VarInsnNode(Opcodes.ALOAD, 0));
-                list.add(new VarInsnNode(Opcodes.ALOAD, 1));
-                list.add(new VarInsnNode(Opcodes.ALOAD, 2));
-                list.add(new MethodInsnNode(Opcodes.INVOKEVIRTUAL, "gg/essential/vigilance/Vigilant", "handleOneConfigDependency", "(Lgg/essential/vigilance/data/PropertyData;Lgg/essential/vigilance/data/PropertyData;)V", false));
-
-                method.instructions.insertBefore(method.instructions.getLast().getPrevious(), list);
-            } else if (method.name.equals("<init>") && method.desc.equals("(Ljava/io/File;Ljava/lang/String;Lgg/essential/vigilance/data/PropertyCollector;Lgg/essential/vigilance/data/SortingBehavior;)V")) {
-                InsnList list = new InsnList();
-                list.add(new VarInsnNode(Opcodes.ALOAD, 0));
-                list.add(new VarInsnNode(Opcodes.ALOAD, 1));
-                list.add(new FieldInsnNode(Opcodes.PUTFIELD, "gg/essential/vigilance/Vigilant", "oneconfig$file", Type.getDescriptor(File.class)));
-                method.instructions.insertBefore(method.instructions.getLast().getPrevious(), list);
-            }
-        }
-    }
-}