Refactor the directory

src/main/java/top/hendrixshen/magiclib/MagicLib.java

@@ -9,8 +9,7 @@
 import net.fabricmc.api.ModInitializer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import top.hendrixshen.magiclib.config.Configs;
-import top.hendrixshen.magiclib.util.malilib.ConfigManager;
+import top.hendrixshen.magiclib.config.ConfigManager;
 
 public class MagicLib implements ModInitializer {
     public static Logger getLogger() {
@@ -21,7 +20,7 @@ public static Logger getLogger() {
     @Override
     public void onInitialize() {
         getLogger().info(String.format("[%s]: Mod initialized - Version: %s", MagicLibReference.getModName(), MagicLibReference.getModVersion()));
-        cm.parseConfigClass(Configs.class);
-        Configs.init();
+        cm.parseConfigClass(MagicLibConfigs.class);
+        MagicLibConfigs.init();
     }
 }

src/main/java/top/hendrixshen/magiclib/config/Configs.java → src/main/java/top/hendrixshen/magiclib/MagicLibConfigs.java

@@ -1,4 +1,4 @@
-package top.hendrixshen.magiclib.config;
+package top.hendrixshen.magiclib;
 
 import com.google.common.collect.Lists;
 import fi.dy.masa.malilib.config.IConfigOptionListEntry;
@@ -8,18 +8,16 @@
 import net.minecraft.client.Minecraft;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.config.Configurator;
-import top.hendrixshen.magiclib.MagicLib;
-import top.hendrixshen.magiclib.MagicLibReference;
 import top.hendrixshen.magiclib.api.dependencyValidator.annotation.Dependencies;
 import top.hendrixshen.magiclib.api.dependencyValidator.annotation.Dependency;
 import top.hendrixshen.magiclib.api.dependencyValidator.annotation.OptionDependencyPredicate;
-import top.hendrixshen.magiclib.api.malilib.annotation.Config;
-import top.hendrixshen.magiclib.api.malilib.annotation.Hotkey;
-import top.hendrixshen.magiclib.util.malilib.Option;
+import top.hendrixshen.magiclib.config.annotation.Config;
+import top.hendrixshen.magiclib.config.annotation.Hotkey;
+import top.hendrixshen.magiclib.config.Option;
 
 import java.util.ArrayList;
 
-public class Configs {
+public class MagicLibConfigs {
 
     @Hotkey(hotkey = "M,A,G")
     @Config(category = ConfigCategory.GENERIC)
@@ -70,7 +68,7 @@ public boolean test(Option option) {
 
     public static void init() {
         openConfigGui.getKeybind().setCallback((keyAction, iKeybind) -> {
-            Minecraft.getInstance().setScreen(GuiConfigs.getInstance());
+            Minecraft.getInstance().setScreen(MagiclibConfigGui.getInstance());
             return true;
         });
 
@@ -80,7 +78,7 @@ public static void init() {
             } else {
                 Configurator.setLevel(MagicLibReference.getModId(), Level.toLevel("INFO"));
             }
-            GuiConfigs.getInstance().reDraw();
+            MagiclibConfigGui.getInstance().reDraw();
         });
         if (debug) {
             Configurator.setLevel(MagicLibReference.getModId(), Level.toLevel("DEBUG"));

src/main/java/top/hendrixshen/magiclib/MagiclibConfigGui.java

@@ -0,0 +1,20 @@
+package top.hendrixshen.magiclib;
+
+import top.hendrixshen.magiclib.gui.ConfigGui;
+import top.hendrixshen.magiclib.config.ConfigManager;
+
+public class MagiclibConfigGui extends ConfigGui {
+    private static MagiclibConfigGui INSTANCE;
+
+    private MagiclibConfigGui(String identifier, String defaultTab, ConfigManager configManager) {
+        super(identifier, defaultTab, configManager, "Magiclib Test");
+    }
+
+
+    public static MagiclibConfigGui getInstance() {
+        if (INSTANCE == null) {
+            INSTANCE = new MagiclibConfigGui(MagicLibReference.getModId(), MagicLibConfigs.ConfigCategory.GENERIC, MagicLib.cm);
+        }
+        return INSTANCE;
+    }
+}

src/main/java/top/hendrixshen/magiclib/api/dependencyValidator/annotation/OptionDependencyPredicate.java

@@ -1,6 +1,6 @@
 package top.hendrixshen.magiclib.api.dependencyValidator.annotation;
 
-import top.hendrixshen.magiclib.util.malilib.Option;
+import top.hendrixshen.magiclib.config.Option;
 
 import java.util.function.Predicate;
 

src/main/java/top/hendrixshen/magiclib/compat/modmenu/ModMenuApiImpl.java

@@ -2,14 +2,14 @@
 
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
-import top.hendrixshen.magiclib.config.GuiConfigs;
+import top.hendrixshen.magiclib.MagiclibConfigGui;
 
 public class ModMenuApiImpl implements ModMenuApi {
     @Override
     public ConfigScreenFactory<?> getModConfigScreenFactory() {
 
         return (screen) -> {
-            GuiConfigs gui = GuiConfigs.getInstance();
+            MagiclibConfigGui gui = MagiclibConfigGui.getInstance();
             gui.setParent(screen);
             return gui;
         };

src/main/java/top/hendrixshen/magiclib/util/malilib/ConfigManager.java → src/main/java/top/hendrixshen/magiclib/config/ConfigManager.java

@@ -1,14 +1,12 @@
-package top.hendrixshen.magiclib.util.malilib;
+package top.hendrixshen.magiclib.config;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
 import fi.dy.masa.malilib.config.IConfigOptionListEntry;
 import fi.dy.masa.malilib.config.options.*;
 import fi.dy.masa.malilib.util.Color4f;
-import top.hendrixshen.magiclib.MagicLib;
-import top.hendrixshen.magiclib.api.malilib.annotation.Config;
-import top.hendrixshen.magiclib.api.malilib.annotation.Hotkey;
-import top.hendrixshen.magiclib.impl.malilib.*;
+import top.hendrixshen.magiclib.config.annotation.Config;
+import top.hendrixshen.magiclib.config.annotation.Hotkey;
 
 import java.lang.reflect.Field;
 import java.util.*;

src/main/java/top/hendrixshen/magiclib/util/malilib/Option.java → src/main/java/top/hendrixshen/magiclib/config/Option.java

@@ -1,8 +1,8 @@
-package top.hendrixshen.magiclib.util.malilib;
+package top.hendrixshen.magiclib.config;
 
 import fi.dy.masa.malilib.config.options.ConfigBase;
 import top.hendrixshen.magiclib.api.dependencyValidator.annotation.OptionDependencyPredicate;
-import top.hendrixshen.magiclib.api.malilib.annotation.Config;
+import top.hendrixshen.magiclib.config.annotation.Config;
 import top.hendrixshen.magiclib.util.ModDependencies;
 
 import java.lang.reflect.InvocationTargetException;

src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigBoolean.java → src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigBoolean.java

@@ -1,4 +1,4 @@
-package top.hendrixshen.magiclib.impl.malilib;
+package top.hendrixshen.magiclib.config;
 
 import fi.dy.masa.malilib.config.options.ConfigBoolean;
 import fi.dy.masa.malilib.util.StringUtils;

src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigBooleanHotkeyed.java → src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigBooleanHotkeyed.java

@@ -1,4 +1,4 @@
-package top.hendrixshen.magiclib.impl.malilib;
+package top.hendrixshen.magiclib.config;
 
 import fi.dy.masa.malilib.config.options.ConfigBooleanHotkeyed;
 import fi.dy.masa.malilib.hotkeys.KeybindSettings;

src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigColor.java → src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigColor.java

@@ -1,4 +1,4 @@
-package top.hendrixshen.magiclib.impl.malilib;
+package top.hendrixshen.magiclib.config;
 
 import fi.dy.masa.malilib.config.options.ConfigColor;
 import fi.dy.masa.malilib.util.StringUtils;

src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigDouble.java → src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigDouble.java

@@ -1,4 +1,4 @@
-package top.hendrixshen.magiclib.impl.malilib;
+package top.hendrixshen.magiclib.config;
 
 import fi.dy.masa.malilib.config.options.ConfigDouble;
 import fi.dy.masa.malilib.util.StringUtils;

src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigHotkey.java → src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigHotkey.java

@@ -1,4 +1,4 @@
-package top.hendrixshen.magiclib.impl.malilib;
+package top.hendrixshen.magiclib.config;
 
 import fi.dy.masa.malilib.config.options.ConfigHotkey;
 import fi.dy.masa.malilib.hotkeys.KeybindSettings;

src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigInteger.java → src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigInteger.java

@@ -1,4 +1,4 @@
-package top.hendrixshen.magiclib.impl.malilib;
+package top.hendrixshen.magiclib.config;
 
 import fi.dy.masa.malilib.config.options.ConfigInteger;
 import fi.dy.masa.malilib.util.StringUtils;

src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigOptionList.java → src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigOptionList.java

@@ -1,4 +1,4 @@
-package top.hendrixshen.magiclib.impl.malilib;
+package top.hendrixshen.magiclib.config;
 
 import fi.dy.masa.malilib.config.IConfigOptionListEntry;
 import fi.dy.masa.malilib.config.options.ConfigOptionList;

src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigString.java → src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigString.java

@@ -1,4 +1,4 @@
-package top.hendrixshen.magiclib.impl.malilib;
+package top.hendrixshen.magiclib.config;
 
 import fi.dy.masa.malilib.config.options.ConfigString;
 import fi.dy.masa.malilib.util.StringUtils;

src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigStringList.java → src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigStringList.java

@@ -1,4 +1,4 @@
-package top.hendrixshen.magiclib.impl.malilib;
+package top.hendrixshen.magiclib.config;
 
 import com.google.common.collect.ImmutableList;
 import fi.dy.masa.malilib.config.options.ConfigStringList;

src/main/java/top/hendrixshen/magiclib/api/malilib/annotation/Config.java → src/main/java/top/hendrixshen/magiclib/config/annotation/Config.java

@@ -1,8 +1,7 @@
-package top.hendrixshen.magiclib.api.malilib.annotation;
+package top.hendrixshen.magiclib.config.annotation;
 
 import top.hendrixshen.magiclib.api.dependencyValidator.annotation.Dependencies;
 import top.hendrixshen.magiclib.api.dependencyValidator.annotation.OptionDependencyPredicate;
-import top.hendrixshen.magiclib.util.malilib.Option;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/top/hendrixshen/magiclib/api/malilib/annotation/Hotkey.java → src/main/java/top/hendrixshen/magiclib/config/annotation/Hotkey.java

@@ -1,4 +1,4 @@
-package top.hendrixshen.magiclib.api.malilib.annotation;
+package top.hendrixshen.magiclib.config.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/top/hendrixshen/magiclib/impl/malilib/ConfigGui.java → src/main/java/top/hendrixshen/magiclib/gui/ConfigGui.java

@@ -1,12 +1,12 @@
-package top.hendrixshen.magiclib.impl.malilib;
+package top.hendrixshen.magiclib.gui;
 
 import com.google.common.collect.Lists;
 import fi.dy.masa.malilib.config.IConfigBase;
 import fi.dy.masa.malilib.gui.GuiConfigsBase;
 import fi.dy.masa.malilib.gui.button.ButtonGeneric;
 import fi.dy.masa.malilib.util.StringUtils;
-import top.hendrixshen.magiclib.util.malilib.ConfigManager;
-import top.hendrixshen.magiclib.util.malilib.Option;
+import top.hendrixshen.magiclib.config.ConfigManager;
+import top.hendrixshen.magiclib.config.Option;
 
 import java.util.List;
 import java.util.Objects;