diff --git a/src/main/java/top/hendrixshen/magiclib/MagicLib.java b/src/main/java/top/hendrixshen/magiclib/MagicLib.java index 2a6d6e02..33857edc 100644 --- a/src/main/java/top/hendrixshen/magiclib/MagicLib.java +++ b/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(); } } diff --git a/src/main/java/top/hendrixshen/magiclib/config/Configs.java b/src/main/java/top/hendrixshen/magiclib/MagicLibConfigs.java similarity index 87% rename from src/main/java/top/hendrixshen/magiclib/config/Configs.java rename to src/main/java/top/hendrixshen/magiclib/MagicLibConfigs.java index 8a6ed0a6..e3f5520c 100644 --- a/src/main/java/top/hendrixshen/magiclib/config/Configs.java +++ b/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")); diff --git a/src/main/java/top/hendrixshen/magiclib/MagiclibConfigGui.java b/src/main/java/top/hendrixshen/magiclib/MagiclibConfigGui.java new file mode 100644 index 00000000..aa2c9f6b --- /dev/null +++ b/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; + } +} \ No newline at end of file diff --git a/src/main/java/top/hendrixshen/magiclib/api/dependencyValidator/annotation/OptionDependencyPredicate.java b/src/main/java/top/hendrixshen/magiclib/api/dependencyValidator/annotation/OptionDependencyPredicate.java index 1fac718f..f85e9cd7 100644 --- a/src/main/java/top/hendrixshen/magiclib/api/dependencyValidator/annotation/OptionDependencyPredicate.java +++ b/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; diff --git a/src/main/java/top/hendrixshen/magiclib/compat/modmenu/ModMenuApiImpl.java b/src/main/java/top/hendrixshen/magiclib/compat/modmenu/ModMenuApiImpl.java index 86aed167..0dcf1a1c 100644 --- a/src/main/java/top/hendrixshen/magiclib/compat/modmenu/ModMenuApiImpl.java +++ b/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; }; diff --git a/src/main/java/top/hendrixshen/magiclib/util/malilib/ConfigManager.java b/src/main/java/top/hendrixshen/magiclib/config/ConfigManager.java similarity index 97% rename from src/main/java/top/hendrixshen/magiclib/util/malilib/ConfigManager.java rename to src/main/java/top/hendrixshen/magiclib/config/ConfigManager.java index 1748e834..5701e8ea 100644 --- a/src/main/java/top/hendrixshen/magiclib/util/malilib/ConfigManager.java +++ b/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.*; diff --git a/src/main/java/top/hendrixshen/magiclib/config/GuiConfigs.java b/src/main/java/top/hendrixshen/magiclib/config/GuiConfigs.java deleted file mode 100644 index 4cf1d68a..00000000 --- a/src/main/java/top/hendrixshen/magiclib/config/GuiConfigs.java +++ /dev/null @@ -1,21 +0,0 @@ -package top.hendrixshen.magiclib.config; - -import top.hendrixshen.magiclib.MagicLib; -import top.hendrixshen.magiclib.MagicLibReference; -import top.hendrixshen.magiclib.util.malilib.ConfigManager; - -public class GuiConfigs extends top.hendrixshen.magiclib.impl.malilib.ConfigGui { - private static GuiConfigs INSTANCE; - - private GuiConfigs(String identifier, String defaultTab, ConfigManager configManager) { - super(identifier, defaultTab, configManager, "Magiclib Test"); - } - - - public static GuiConfigs getInstance() { - if (INSTANCE == null) { - INSTANCE = new GuiConfigs(MagicLibReference.getModId(), Configs.ConfigCategory.GENERIC, MagicLib.cm); - } - return INSTANCE; - } -} \ No newline at end of file diff --git a/src/main/java/top/hendrixshen/magiclib/util/malilib/Option.java b/src/main/java/top/hendrixshen/magiclib/config/Option.java similarity index 94% rename from src/main/java/top/hendrixshen/magiclib/util/malilib/Option.java rename to src/main/java/top/hendrixshen/magiclib/config/Option.java index fefca107..60cbf0eb 100644 --- a/src/main/java/top/hendrixshen/magiclib/util/malilib/Option.java +++ b/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; diff --git a/src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigBoolean.java b/src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigBoolean.java similarity index 95% rename from src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigBoolean.java rename to src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigBoolean.java index fa9dd092..091e058c 100644 --- a/src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigBoolean.java +++ b/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; diff --git a/src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigBooleanHotkeyed.java b/src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigBooleanHotkeyed.java similarity index 97% rename from src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigBooleanHotkeyed.java rename to src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigBooleanHotkeyed.java index 3a3e4587..d0e55d88 100644 --- a/src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigBooleanHotkeyed.java +++ b/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; diff --git a/src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigColor.java b/src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigColor.java similarity index 93% rename from src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigColor.java rename to src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigColor.java index e72e9a7b..56e2b785 100644 --- a/src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigColor.java +++ b/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; diff --git a/src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigDouble.java b/src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigDouble.java similarity index 97% rename from src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigDouble.java rename to src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigDouble.java index c135b2a1..fbed54bb 100644 --- a/src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigDouble.java +++ b/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; diff --git a/src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigHotkey.java b/src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigHotkey.java similarity index 96% rename from src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigHotkey.java rename to src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigHotkey.java index d7742a10..f8cb3c17 100644 --- a/src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigHotkey.java +++ b/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; diff --git a/src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigInteger.java b/src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigInteger.java similarity index 96% rename from src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigInteger.java rename to src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigInteger.java index 8a2fb47f..e6d731a1 100644 --- a/src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigInteger.java +++ b/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; diff --git a/src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigOptionList.java b/src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigOptionList.java similarity index 95% rename from src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigOptionList.java rename to src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigOptionList.java index 3b4bde84..b01ea297 100644 --- a/src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigOptionList.java +++ b/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; diff --git a/src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigString.java b/src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigString.java similarity index 93% rename from src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigString.java rename to src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigString.java index 2ca63909..6bbcd886 100644 --- a/src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigString.java +++ b/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; diff --git a/src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigStringList.java b/src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigStringList.java similarity index 94% rename from src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigStringList.java rename to src/main/java/top/hendrixshen/magiclib/config/TranslatableConfigStringList.java index 59d7c02a..e0a66575 100644 --- a/src/main/java/top/hendrixshen/magiclib/impl/malilib/TranslatableConfigStringList.java +++ b/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; diff --git a/src/main/java/top/hendrixshen/magiclib/api/malilib/annotation/Config.java b/src/main/java/top/hendrixshen/magiclib/config/annotation/Config.java similarity index 84% rename from src/main/java/top/hendrixshen/magiclib/api/malilib/annotation/Config.java rename to src/main/java/top/hendrixshen/magiclib/config/annotation/Config.java index a37354d9..be60ce39 100644 --- a/src/main/java/top/hendrixshen/magiclib/api/malilib/annotation/Config.java +++ b/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; diff --git a/src/main/java/top/hendrixshen/magiclib/api/malilib/annotation/Hotkey.java b/src/main/java/top/hendrixshen/magiclib/config/annotation/Hotkey.java similarity index 83% rename from src/main/java/top/hendrixshen/magiclib/api/malilib/annotation/Hotkey.java rename to src/main/java/top/hendrixshen/magiclib/config/annotation/Hotkey.java index 54db7ddf..38f54b44 100644 --- a/src/main/java/top/hendrixshen/magiclib/api/malilib/annotation/Hotkey.java +++ b/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; diff --git a/src/main/java/top/hendrixshen/magiclib/impl/malilib/ConfigGui.java b/src/main/java/top/hendrixshen/magiclib/gui/ConfigGui.java similarity index 93% rename from src/main/java/top/hendrixshen/magiclib/impl/malilib/ConfigGui.java rename to src/main/java/top/hendrixshen/magiclib/gui/ConfigGui.java index 2f6a3032..cd6bb39a 100644 --- a/src/main/java/top/hendrixshen/magiclib/impl/malilib/ConfigGui.java +++ b/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;