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

2 files changed, 3 insertions, 3 deletions

diff --git a/src/main/java/cc/polyfrost/oneconfig/config/interfaces/BasicOption.java b/src/main/java/cc/polyfrost/oneconfig/config/interfaces/BasicOption.java
index 6fa3254..d4b4498 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/interfaces/BasicOption.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/interfaces/BasicOption.java
@@ -5,11 +5,11 @@ import java.util.function.Supplier;
 
 @SuppressWarnings({"unused"})
 public abstract class BasicOption {
+    public final int size;
     protected final Field field;
     protected final String name;
-    public final int size;
-    private Supplier<Boolean> dependency;
     protected final Object parent;
+    private Supplier<Boolean> dependency;
 
     /**
      * Initialize option
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/interfaces/Config.java b/src/main/java/cc/polyfrost/oneconfig/config/interfaces/Config.java
index 531c374..8eb5eb1 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/interfaces/Config.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/interfaces/Config.java
@@ -22,10 +22,10 @@ import java.util.*;
 import java.util.function.Supplier;
 
 public class Config {
+    public final transient HashMap<String, BasicOption> optionNames = new HashMap<>();
     transient protected final String configFile;
     transient protected final Gson gson = new GsonBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT).setPrettyPrinting().create();
     transient public Mod mod;
-    public final transient HashMap<String, BasicOption> optionNames = new HashMap<>();
     public transient boolean hasBeenInitialized = false;
     public boolean enabled = true;