Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/cc/polyfrost/oneconfig/gui/OneConfigGui.java
#	src/main/java/cc/polyfrost/oneconfig/gui/animations/EaseInOutQuad.java
#	src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicButton.java
#	src/main/java/cc/polyfrost/oneconfig/gui/elements/BasicElement.java
#	src/main/java/cc/polyfrost/oneconfig/gui/elements/ModCard.java
#	src/main/java/cc/polyfrost/oneconfig/gui/elements/text/NumberInputField.java
#	src/main/java/cc/polyfrost/oneconfig/lwjgl/image/ImageLoader.java
#	src/main/java/cc/polyfrost/oneconfig/utils/GuiUtils.java
#	src/main/java/cc/polyfrost/oneconfig/utils/commands/annotations/Command.java
#	src/main/java/cc/polyfrost/oneconfig/utils/commands/arguments/ArgumentParser.java

1 files changed, 14 insertions, 14 deletions

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
index fecdeed..29cf2fd 100644
--- a/src/main/java/cc/polyfrost/oneconfig/plugin/asm/tweakers/VigilantTransformer.java
+++ b/src/main/java/cc/polyfrost/oneconfig/plugin/asm/tweakers/VigilantTransformer.java
@@ -16,6 +16,20 @@ 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"};
@@ -88,18 +102,4 @@ 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;
-        }
-    }
 }