From f8d8bd2657f0ead128bb4c3e3c88ceaa52f2f507 Mon Sep 17 00:00:00 2001 From: sebseb7 Date: Thu, 29 Jun 2023 14:26:56 +0200 Subject: [PATCH] format using eclipse --- build.gradle | 11 + .../github/sebseb7/autotrade/AutoTrade.java | 30 +-- .../github/sebseb7/autotrade/InitHandler.java | 40 +-- .../github/sebseb7/autotrade/Reference.java | 18 +- .../autotrade/compat/modmenu/ModMenuImpl.java | 32 +-- .../sebseb7/autotrade/config/Configs.java | 251 +++++++----------- .../sebseb7/autotrade/config/Hotkeys.java | 56 ++-- .../sebseb7/autotrade/event/InputHandler.java | 55 ++-- .../autotrade/event/KeybindCallbacks.java | 137 +++++----- .../sebseb7/autotrade/gui/GuiConfigs.java | 211 ++++++++------- 10 files changed, 390 insertions(+), 451 deletions(-) diff --git a/build.gradle b/build.gradle index 414ebd0..49de618 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,6 @@ plugins { id 'fabric-loom' version '1.2-SNAPSHOT' + id 'com.diffplug.spotless' version '6.19.0' } sourceCompatibility = JavaVersion.VERSION_17 @@ -38,3 +39,13 @@ tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" it.options.release = 17 } + +spotless { + java { + importOrder() + removeUnusedImports() + cleanthat() + eclipse() + formatAnnotations() + } +} diff --git a/src/main/java/com/github/sebseb7/autotrade/AutoTrade.java b/src/main/java/com/github/sebseb7/autotrade/AutoTrade.java index 2048a09..d4c4002 100644 --- a/src/main/java/com/github/sebseb7/autotrade/AutoTrade.java +++ b/src/main/java/com/github/sebseb7/autotrade/AutoTrade.java @@ -1,15 +1,15 @@ -package com.github.sebseb7.autotrade; - -import fi.dy.masa.malilib.event.InitializationHandler; -import net.fabricmc.api.ModInitializer; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -public class AutoTrade implements ModInitializer { - public static final Logger logger = LogManager.getLogger(Reference.MOD_ID); - - @Override - public void onInitialize() { - InitializationHandler.getInstance().registerInitializationHandler(new InitHandler()); - } -} +package com.github.sebseb7.autotrade; + +import fi.dy.masa.malilib.event.InitializationHandler; +import net.fabricmc.api.ModInitializer; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class AutoTrade implements ModInitializer { + public static final Logger logger = LogManager.getLogger(Reference.MOD_ID); + + @Override + public void onInitialize() { + InitializationHandler.getInstance().registerInitializationHandler(new InitHandler()); + } +} diff --git a/src/main/java/com/github/sebseb7/autotrade/InitHandler.java b/src/main/java/com/github/sebseb7/autotrade/InitHandler.java index b901428..4684833 100644 --- a/src/main/java/com/github/sebseb7/autotrade/InitHandler.java +++ b/src/main/java/com/github/sebseb7/autotrade/InitHandler.java @@ -1,20 +1,20 @@ -package com.github.sebseb7.autotrade; - -import com.github.sebseb7.autotrade.config.Configs; -import com.github.sebseb7.autotrade.event.InputHandler; -import com.github.sebseb7.autotrade.event.KeybindCallbacks; -import fi.dy.masa.malilib.config.ConfigManager; -import fi.dy.masa.malilib.event.InputEventHandler; -import fi.dy.masa.malilib.interfaces.IInitializationHandler; - -public class InitHandler implements IInitializationHandler { - @Override - public void registerModHandlers() { - ConfigManager.getInstance().registerConfigHandler(Reference.MOD_ID, new Configs()); - - InputHandler handler = new InputHandler(); - InputEventHandler.getKeybindManager().registerKeybindProvider(handler); - - KeybindCallbacks.getInstance().setCallbacks(); - } -} +package com.github.sebseb7.autotrade; + +import com.github.sebseb7.autotrade.config.Configs; +import com.github.sebseb7.autotrade.event.InputHandler; +import com.github.sebseb7.autotrade.event.KeybindCallbacks; +import fi.dy.masa.malilib.config.ConfigManager; +import fi.dy.masa.malilib.event.InputEventHandler; +import fi.dy.masa.malilib.interfaces.IInitializationHandler; + +public class InitHandler implements IInitializationHandler { + @Override + public void registerModHandlers() { + ConfigManager.getInstance().registerConfigHandler(Reference.MOD_ID, new Configs()); + + InputHandler handler = new InputHandler(); + InputEventHandler.getKeybindManager().registerKeybindProvider(handler); + + KeybindCallbacks.getInstance().setCallbacks(); + } +} diff --git a/src/main/java/com/github/sebseb7/autotrade/Reference.java b/src/main/java/com/github/sebseb7/autotrade/Reference.java index d3ce280..96c87e2 100644 --- a/src/main/java/com/github/sebseb7/autotrade/Reference.java +++ b/src/main/java/com/github/sebseb7/autotrade/Reference.java @@ -1,9 +1,9 @@ -package com.github.sebseb7.autotrade; - -import fi.dy.masa.malilib.util.StringUtils; - -public class Reference { - public static final String MOD_ID = "autotrade"; - public static final String MOD_NAME = "Auto Trade"; - public static final String MOD_VERSION = StringUtils.getModVersionString(MOD_ID); -} +package com.github.sebseb7.autotrade; + +import fi.dy.masa.malilib.util.StringUtils; + +public class Reference { + public static final String MOD_ID = "autotrade"; + public static final String MOD_NAME = "Auto Trade"; + public static final String MOD_VERSION = StringUtils.getModVersionString(MOD_ID); +} diff --git a/src/main/java/com/github/sebseb7/autotrade/compat/modmenu/ModMenuImpl.java b/src/main/java/com/github/sebseb7/autotrade/compat/modmenu/ModMenuImpl.java index f0be4a7..177d84e 100644 --- a/src/main/java/com/github/sebseb7/autotrade/compat/modmenu/ModMenuImpl.java +++ b/src/main/java/com/github/sebseb7/autotrade/compat/modmenu/ModMenuImpl.java @@ -1,16 +1,16 @@ -package com.github.sebseb7.autotrade.compat.modmenu; - -import com.github.sebseb7.autotrade.gui.GuiConfigs; -import com.terraformersmc.modmenu.api.ConfigScreenFactory; -import com.terraformersmc.modmenu.api.ModMenuApi; - -public class ModMenuImpl implements ModMenuApi { - @Override - public ConfigScreenFactory getModConfigScreenFactory() { - return (screen) -> { - GuiConfigs gui = new GuiConfigs(); - gui.setParent(screen); - return gui; - }; - } -} +package com.github.sebseb7.autotrade.compat.modmenu; + +import com.github.sebseb7.autotrade.gui.GuiConfigs; +import com.terraformersmc.modmenu.api.ConfigScreenFactory; +import com.terraformersmc.modmenu.api.ModMenuApi; + +public class ModMenuImpl implements ModMenuApi { + @Override + public ConfigScreenFactory getModConfigScreenFactory() { + return (screen) -> { + GuiConfigs gui = new GuiConfigs(); + gui.setParent(screen); + return gui; + }; + } +} diff --git a/src/main/java/com/github/sebseb7/autotrade/config/Configs.java b/src/main/java/com/github/sebseb7/autotrade/config/Configs.java index a36fdf8..99bb757 100644 --- a/src/main/java/com/github/sebseb7/autotrade/config/Configs.java +++ b/src/main/java/com/github/sebseb7/autotrade/config/Configs.java @@ -1,156 +1,95 @@ -package com.github.sebseb7.autotrade.config; - -import com.github.sebseb7.autotrade.Reference; -import com.google.common.collect.ImmutableList; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import fi.dy.masa.malilib.config.ConfigUtils; -import fi.dy.masa.malilib.config.IConfigHandler; -import fi.dy.masa.malilib.config.IConfigValue; -import fi.dy.masa.malilib.config.options.ConfigBoolean; -import fi.dy.masa.malilib.config.options.ConfigInteger; -import fi.dy.masa.malilib.config.options.ConfigString; -import fi.dy.masa.malilib.util.FileUtils; -import fi.dy.masa.malilib.util.JsonUtils; -import java.io.File; - -public class Configs implements IConfigHandler { - private static final String CONFIG_FILE_NAME = Reference.MOD_ID + ".json"; - - public static class Generic { - public static final ConfigBoolean ENABLED = - new ConfigBoolean("enabled", false, "Do auto trading with villagers in range"); - public static final ConfigBoolean ENABLE_SELL = - new ConfigBoolean( - "enableSell", - false, - "Enable buying (if disabled emeralds from the emerald container are taken instead)"); - public static final ConfigString BUY_ITEM = - new ConfigString("buyItem", "minecraft:gold_ingot", "The item to sell for emerald."); - public static final ConfigBoolean ENABLE_BUY = - new ConfigBoolean( - "enableBuy", - false, - "Enable selling (if disabled emeralds are placed in the emerald container)"); - public static final ConfigString SELL_ITEM = - new ConfigString("sellItem", "minecraft:redstone", "The item to buy using emerald."); - public static final ConfigInteger MAX_INPUT_ITEMS = - new ConfigInteger( - "maxInputStacks", - 9, - 1, - 35, - "stacks to take from input container (or emerald container in buy-only mode)"); - public static final ConfigInteger INPUT_CONTAINER_X = - new ConfigInteger( - "inputContainerX", - 0, - -30000000, - 30000000, - "Input container X (not used when sell disabled)"); - public static final ConfigInteger INPUT_CONTAINER_Y = - new ConfigInteger( - "inputContainerY", 0, -64, 320, "Input container Y (not used when sell disabled)"); - public static final ConfigInteger INPUT_CONTAINER_Z = - new ConfigInteger( - "outputContainerZ", - 0, - -30000000, - 30000000, - "Input container Z (not used when sell disabled)"); - public static final ConfigInteger OUTPUT_CONTAINER_X = - new ConfigInteger( - "outputContainerX", - 0, - -30000000, - 30000000, - "Input container X (not used when buy disabled)"); - public static final ConfigInteger OUTPUT_CONTAINER_Y = - new ConfigInteger( - "outputContainerY", 0, -64, 320, "Output container Y (not used when buy disabled)"); - public static final ConfigInteger OUTPUT_CONTAINER_Z = - new ConfigInteger( - "outputContainerZ", - 0, - -30000000, - 30000000, - "Output container Z (not used when buy disabled)"); - public static final ConfigInteger EMERALD_CONTAINER_X = - new ConfigInteger( - "emeraldContainerX", - 0, - -30000000, - 30000000, - "Emerald container X (not used when buy&sell enabled)"); - public static final ConfigInteger EMERALD_CONTAINER_Y = - new ConfigInteger( - "emeraldContainerY", - 0, - -64, - 320, - "Emerald container Y (not used when buy&sell enabled)"); - public static final ConfigInteger EMERALD_CONTAINER_Z = - new ConfigInteger( - "emeraldContainerZ", - 0, - -30000000, - 30000000, - "Emerald container Z (not used when buy&sell enabled)"); - - public static final ImmutableList OPTIONS = - ImmutableList.of( - ENABLED, - ENABLE_BUY, - BUY_ITEM, - ENABLE_SELL, - SELL_ITEM, - MAX_INPUT_ITEMS, - INPUT_CONTAINER_X, - INPUT_CONTAINER_Y, - INPUT_CONTAINER_Z, - OUTPUT_CONTAINER_X, - OUTPUT_CONTAINER_Y, - OUTPUT_CONTAINER_Z, - EMERALD_CONTAINER_X, - EMERALD_CONTAINER_Y, - EMERALD_CONTAINER_Z); - } - - public static void loadFromFile() { - File configFile = new File(FileUtils.getConfigDirectory(), CONFIG_FILE_NAME); - - if (configFile.exists() && configFile.isFile() && configFile.canRead()) { - JsonElement element = JsonUtils.parseJsonFile(configFile); - - if (element != null && element.isJsonObject()) { - JsonObject root = element.getAsJsonObject(); - - ConfigUtils.readConfigBase(root, "Generic", Generic.OPTIONS); - ConfigUtils.readConfigBase(root, "Hotkeys", Hotkeys.HOTKEY_LIST); - } - } - } - - public static void saveToFile() { - File dir = FileUtils.getConfigDirectory(); - - if ((dir.exists() && dir.isDirectory()) || dir.mkdirs()) { - JsonObject root = new JsonObject(); - - ConfigUtils.writeConfigBase(root, "Generic", Generic.OPTIONS); - ConfigUtils.writeConfigBase(root, "Hotkeys", Hotkeys.HOTKEY_LIST); - - JsonUtils.writeJsonToFile(root, new File(dir, CONFIG_FILE_NAME)); - } - } - - @Override - public void load() { - loadFromFile(); - } - - @Override - public void save() { - saveToFile(); - } -} +package com.github.sebseb7.autotrade.config; + +import com.github.sebseb7.autotrade.Reference; +import com.google.common.collect.ImmutableList; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import fi.dy.masa.malilib.config.ConfigUtils; +import fi.dy.masa.malilib.config.IConfigHandler; +import fi.dy.masa.malilib.config.IConfigValue; +import fi.dy.masa.malilib.config.options.ConfigBoolean; +import fi.dy.masa.malilib.config.options.ConfigInteger; +import fi.dy.masa.malilib.config.options.ConfigString; +import fi.dy.masa.malilib.util.FileUtils; +import fi.dy.masa.malilib.util.JsonUtils; +import java.io.File; + +public class Configs implements IConfigHandler { + private static final String CONFIG_FILE_NAME = Reference.MOD_ID + ".json"; + + public static class Generic { + public static final ConfigBoolean ENABLED = new ConfigBoolean("enabled", false, + "Do auto trading with villagers in range"); + public static final ConfigBoolean ENABLE_SELL = new ConfigBoolean("enableSell", false, + "Enable buying (if disabled emeralds from the emerald container are taken instead)"); + public static final ConfigString BUY_ITEM = new ConfigString("buyItem", "minecraft:gold_ingot", + "The item to sell for emerald."); + public static final ConfigBoolean ENABLE_BUY = new ConfigBoolean("enableBuy", false, + "Enable selling (if disabled emeralds are placed in the emerald container)"); + public static final ConfigString SELL_ITEM = new ConfigString("sellItem", "minecraft:redstone", + "The item to buy using emerald."); + public static final ConfigInteger MAX_INPUT_ITEMS = new ConfigInteger("maxInputStacks", 9, 1, 35, + "stacks to take from input container (or emerald container in buy-only mode)"); + public static final ConfigInteger INPUT_CONTAINER_X = new ConfigInteger("inputContainerX", 0, -30000000, + 30000000, "Input container X (not used when sell disabled)"); + public static final ConfigInteger INPUT_CONTAINER_Y = new ConfigInteger("inputContainerY", 0, -64, 320, + "Input container Y (not used when sell disabled)"); + public static final ConfigInteger INPUT_CONTAINER_Z = new ConfigInteger("outputContainerZ", 0, -30000000, + 30000000, "Input container Z (not used when sell disabled)"); + public static final ConfigInteger OUTPUT_CONTAINER_X = new ConfigInteger("outputContainerX", 0, -30000000, + 30000000, "Input container X (not used when buy disabled)"); + public static final ConfigInteger OUTPUT_CONTAINER_Y = new ConfigInteger("outputContainerY", 0, -64, 320, + "Output container Y (not used when buy disabled)"); + public static final ConfigInteger OUTPUT_CONTAINER_Z = new ConfigInteger("outputContainerZ", 0, -30000000, + 30000000, "Output container Z (not used when buy disabled)"); + public static final ConfigInteger EMERALD_CONTAINER_X = new ConfigInteger("emeraldContainerX", 0, -30000000, + 30000000, "Emerald container X (not used when buy&sell enabled)"); + public static final ConfigInteger EMERALD_CONTAINER_Y = new ConfigInteger("emeraldContainerY", 0, -64, 320, + "Emerald container Y (not used when buy&sell enabled)"); + public static final ConfigInteger EMERALD_CONTAINER_Z = new ConfigInteger("emeraldContainerZ", 0, -30000000, + 30000000, "Emerald container Z (not used when buy&sell enabled)"); + + public static final ImmutableList OPTIONS = ImmutableList.of(ENABLED, ENABLE_BUY, BUY_ITEM, + ENABLE_SELL, SELL_ITEM, MAX_INPUT_ITEMS, INPUT_CONTAINER_X, INPUT_CONTAINER_Y, INPUT_CONTAINER_Z, + OUTPUT_CONTAINER_X, OUTPUT_CONTAINER_Y, OUTPUT_CONTAINER_Z, EMERALD_CONTAINER_X, EMERALD_CONTAINER_Y, + EMERALD_CONTAINER_Z); + } + + public static void loadFromFile() { + File configFile = new File(FileUtils.getConfigDirectory(), CONFIG_FILE_NAME); + + if (configFile.exists() && configFile.isFile() && configFile.canRead()) { + JsonElement element = JsonUtils.parseJsonFile(configFile); + + if (element != null && element.isJsonObject()) { + JsonObject root = element.getAsJsonObject(); + + ConfigUtils.readConfigBase(root, "Generic", Generic.OPTIONS); + ConfigUtils.readConfigBase(root, "Hotkeys", Hotkeys.HOTKEY_LIST); + } + } + } + + public static void saveToFile() { + File dir = FileUtils.getConfigDirectory(); + + if ((dir.exists() && dir.isDirectory()) || dir.mkdirs()) { + JsonObject root = new JsonObject(); + + ConfigUtils.writeConfigBase(root, "Generic", Generic.OPTIONS); + ConfigUtils.writeConfigBase(root, "Hotkeys", Hotkeys.HOTKEY_LIST); + + JsonUtils.writeJsonToFile(root, new File(dir, CONFIG_FILE_NAME)); + } + } + + @Override + public void load() { + loadFromFile(); + } + + @Override + public void save() { + saveToFile(); + } +} diff --git a/src/main/java/com/github/sebseb7/autotrade/config/Hotkeys.java b/src/main/java/com/github/sebseb7/autotrade/config/Hotkeys.java index c7fe78b..d61131d 100644 --- a/src/main/java/com/github/sebseb7/autotrade/config/Hotkeys.java +++ b/src/main/java/com/github/sebseb7/autotrade/config/Hotkeys.java @@ -1,32 +1,24 @@ -package com.github.sebseb7.autotrade.config; - -import com.google.common.collect.ImmutableList; -import fi.dy.masa.malilib.config.options.ConfigHotkey; -import java.util.List; - -public class Hotkeys { - public static final ConfigHotkey TOGGLE_KEY = - new ConfigHotkey("toggleTrading", "", "Enables / disables auto trading"); - public static final ConfigHotkey SET_BUY_KEY = - new ConfigHotkey("setSellItem", "", "Sets the item to sell from hotbar"); - public static final ConfigHotkey SET_SELL_KEY = - new ConfigHotkey("setBuyItem", "", "Sets the item to buy from hotbar"); - public static final ConfigHotkey SET_INPUT_KEY = - new ConfigHotkey("setInputContainer", "", "Sets the input (item to sell) container"); - public static final ConfigHotkey SET_OUTPUT_KEY = - new ConfigHotkey("setOutputContainer", "", "Sets the output (item bought) container"); - public static final ConfigHotkey SET_EMERALD_KEY = - new ConfigHotkey("setEmeraldContainer", "", "Set the emerald container"); - public static final ConfigHotkey OPEN_GUI_SETTINGS = - new ConfigHotkey("openGuiSettings", "", "Open the Config GUI"); - - public static final List HOTKEY_LIST = - ImmutableList.of( - TOGGLE_KEY, - SET_BUY_KEY, - SET_SELL_KEY, - SET_INPUT_KEY, - SET_OUTPUT_KEY, - SET_EMERALD_KEY, - OPEN_GUI_SETTINGS); -} +package com.github.sebseb7.autotrade.config; + +import com.google.common.collect.ImmutableList; +import fi.dy.masa.malilib.config.options.ConfigHotkey; +import java.util.List; + +public class Hotkeys { + public static final ConfigHotkey TOGGLE_KEY = new ConfigHotkey("toggleTrading", "", + "Enables / disables auto trading"); + public static final ConfigHotkey SET_BUY_KEY = new ConfigHotkey("setSellItem", "", + "Sets the item to sell from hotbar"); + public static final ConfigHotkey SET_SELL_KEY = new ConfigHotkey("setBuyItem", "", + "Sets the item to buy from hotbar"); + public static final ConfigHotkey SET_INPUT_KEY = new ConfigHotkey("setInputContainer", "", + "Sets the input (item to sell) container"); + public static final ConfigHotkey SET_OUTPUT_KEY = new ConfigHotkey("setOutputContainer", "", + "Sets the output (item bought) container"); + public static final ConfigHotkey SET_EMERALD_KEY = new ConfigHotkey("setEmeraldContainer", "", + "Set the emerald container"); + public static final ConfigHotkey OPEN_GUI_SETTINGS = new ConfigHotkey("openGuiSettings", "", "Open the Config GUI"); + + public static final List HOTKEY_LIST = ImmutableList.of(TOGGLE_KEY, SET_BUY_KEY, SET_SELL_KEY, + SET_INPUT_KEY, SET_OUTPUT_KEY, SET_EMERALD_KEY, OPEN_GUI_SETTINGS); +} diff --git a/src/main/java/com/github/sebseb7/autotrade/event/InputHandler.java b/src/main/java/com/github/sebseb7/autotrade/event/InputHandler.java index 92f98c6..545916d 100644 --- a/src/main/java/com/github/sebseb7/autotrade/event/InputHandler.java +++ b/src/main/java/com/github/sebseb7/autotrade/event/InputHandler.java @@ -1,28 +1,27 @@ -package com.github.sebseb7.autotrade.event; - -import com.github.sebseb7.autotrade.Reference; -import com.github.sebseb7.autotrade.config.Hotkeys; -import fi.dy.masa.malilib.hotkeys.IHotkey; -import fi.dy.masa.malilib.hotkeys.IKeybindManager; -import fi.dy.masa.malilib.hotkeys.IKeybindProvider; - -public class InputHandler implements IKeybindProvider { - private final KeybindCallbacks callbacks; - - public InputHandler() { - this.callbacks = KeybindCallbacks.getInstance(); - } - - @Override - public void addKeysToMap(IKeybindManager manager) { - for (IHotkey hotkey : Hotkeys.HOTKEY_LIST) { - manager.addKeybindToMap(hotkey.getKeybind()); - } - } - - @Override - public void addHotkeys(IKeybindManager manager) { - manager.addHotkeysForCategory( - Reference.MOD_NAME, "autotrade.hotkeys.category.hotkeys", Hotkeys.HOTKEY_LIST); - } -} +package com.github.sebseb7.autotrade.event; + +import com.github.sebseb7.autotrade.Reference; +import com.github.sebseb7.autotrade.config.Hotkeys; +import fi.dy.masa.malilib.hotkeys.IHotkey; +import fi.dy.masa.malilib.hotkeys.IKeybindManager; +import fi.dy.masa.malilib.hotkeys.IKeybindProvider; + +public class InputHandler implements IKeybindProvider { + private final KeybindCallbacks callbacks; + + public InputHandler() { + this.callbacks = KeybindCallbacks.getInstance(); + } + + @Override + public void addKeysToMap(IKeybindManager manager) { + for (IHotkey hotkey : Hotkeys.HOTKEY_LIST) { + manager.addKeybindToMap(hotkey.getKeybind()); + } + } + + @Override + public void addHotkeys(IKeybindManager manager) { + manager.addHotkeysForCategory(Reference.MOD_NAME, "autotrade.hotkeys.category.hotkeys", Hotkeys.HOTKEY_LIST); + } +} diff --git a/src/main/java/com/github/sebseb7/autotrade/event/KeybindCallbacks.java b/src/main/java/com/github/sebseb7/autotrade/event/KeybindCallbacks.java index 59cf289..942aec1 100644 --- a/src/main/java/com/github/sebseb7/autotrade/event/KeybindCallbacks.java +++ b/src/main/java/com/github/sebseb7/autotrade/event/KeybindCallbacks.java @@ -1,69 +1,68 @@ -package com.github.sebseb7.autotrade.event; - -import com.github.sebseb7.autotrade.config.Configs; -import com.github.sebseb7.autotrade.config.Hotkeys; -import com.github.sebseb7.autotrade.gui.GuiConfigs; -import fi.dy.masa.malilib.config.options.ConfigHotkey; -import fi.dy.masa.malilib.gui.GuiBase; -import fi.dy.masa.malilib.gui.Message; -import fi.dy.masa.malilib.hotkeys.IHotkeyCallback; -import fi.dy.masa.malilib.hotkeys.IKeybind; -import fi.dy.masa.malilib.hotkeys.KeyAction; -import fi.dy.masa.malilib.util.GuiUtils; -import fi.dy.masa.malilib.util.InfoUtils; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.screen.ingame.HandledScreen; - -public class KeybindCallbacks implements IHotkeyCallback { - private static final KeybindCallbacks INSTANCE = new KeybindCallbacks(); - - public static KeybindCallbacks getInstance() { - return INSTANCE; - } - - private KeybindCallbacks() {} - - public void setCallbacks() { - for (ConfigHotkey hotkey : Hotkeys.HOTKEY_LIST) { - hotkey.getKeybind().setCallback(this); - } - } - - public boolean functionalityEnabled() { - return Configs.Generic.ENABLED.getBooleanValue(); - } - - @Override - public boolean onKeyAction(KeyAction action, IKeybind key) { - boolean cancel = this.onKeyActionImpl(action, key); - return cancel; - } - - private boolean onKeyActionImpl(KeyAction action, IKeybind key) { - MinecraftClient mc = MinecraftClient.getInstance(); - - if (mc.player == null || mc.world == null) { - return false; - } - - if (key == Hotkeys.TOGGLE_KEY.getKeybind()) { - Configs.Generic.ENABLED.toggleBooleanValue(); - String msg = - this.functionalityEnabled() - ? "autotrade.message.toggled_mod_on" - : "autotrade.message.toggled_mod_off"; - InfoUtils.showGuiOrInGameMessage(Message.MessageType.INFO, msg); - return true; - } else if (key == Hotkeys.OPEN_GUI_SETTINGS.getKeybind()) { - GuiBase.openGui(new GuiConfigs()); - return true; - } - - if (this.functionalityEnabled() == false - || (GuiUtils.getCurrentScreen() instanceof HandledScreen) == false) { - return false; - } - - return false; - } -} +package com.github.sebseb7.autotrade.event; + +import com.github.sebseb7.autotrade.config.Configs; +import com.github.sebseb7.autotrade.config.Hotkeys; +import com.github.sebseb7.autotrade.gui.GuiConfigs; +import fi.dy.masa.malilib.config.options.ConfigHotkey; +import fi.dy.masa.malilib.gui.GuiBase; +import fi.dy.masa.malilib.gui.Message; +import fi.dy.masa.malilib.hotkeys.IHotkeyCallback; +import fi.dy.masa.malilib.hotkeys.IKeybind; +import fi.dy.masa.malilib.hotkeys.KeyAction; +import fi.dy.masa.malilib.util.GuiUtils; +import fi.dy.masa.malilib.util.InfoUtils; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.gui.screen.ingame.HandledScreen; + +public class KeybindCallbacks implements IHotkeyCallback { + private static final KeybindCallbacks INSTANCE = new KeybindCallbacks(); + + public static KeybindCallbacks getInstance() { + return INSTANCE; + } + + private KeybindCallbacks() { + } + + public void setCallbacks() { + for (ConfigHotkey hotkey : Hotkeys.HOTKEY_LIST) { + hotkey.getKeybind().setCallback(this); + } + } + + public boolean functionalityEnabled() { + return Configs.Generic.ENABLED.getBooleanValue(); + } + + @Override + public boolean onKeyAction(KeyAction action, IKeybind key) { + boolean cancel = this.onKeyActionImpl(action, key); + return cancel; + } + + private boolean onKeyActionImpl(KeyAction action, IKeybind key) { + MinecraftClient mc = MinecraftClient.getInstance(); + + if (mc.player == null || mc.world == null) { + return false; + } + + if (key == Hotkeys.TOGGLE_KEY.getKeybind()) { + Configs.Generic.ENABLED.toggleBooleanValue(); + String msg = this.functionalityEnabled() + ? "autotrade.message.toggled_mod_on" + : "autotrade.message.toggled_mod_off"; + InfoUtils.showGuiOrInGameMessage(Message.MessageType.INFO, msg); + return true; + } else if (key == Hotkeys.OPEN_GUI_SETTINGS.getKeybind()) { + GuiBase.openGui(new GuiConfigs()); + return true; + } + + if (this.functionalityEnabled() == false || (GuiUtils.getCurrentScreen() instanceof HandledScreen) == false) { + return false; + } + + return false; + } +} diff --git a/src/main/java/com/github/sebseb7/autotrade/gui/GuiConfigs.java b/src/main/java/com/github/sebseb7/autotrade/gui/GuiConfigs.java index e06fcf3..d7d0ec1 100644 --- a/src/main/java/com/github/sebseb7/autotrade/gui/GuiConfigs.java +++ b/src/main/java/com/github/sebseb7/autotrade/gui/GuiConfigs.java @@ -1,106 +1,105 @@ -package com.github.sebseb7.autotrade.gui; - -import com.github.sebseb7.autotrade.Reference; -import com.github.sebseb7.autotrade.config.Configs; -import com.github.sebseb7.autotrade.config.Hotkeys; -import com.google.common.collect.ImmutableList; -import fi.dy.masa.malilib.config.IConfigBase; -import fi.dy.masa.malilib.gui.GuiConfigsBase; -import fi.dy.masa.malilib.gui.button.ButtonBase; -import fi.dy.masa.malilib.gui.button.ButtonGeneric; -import fi.dy.masa.malilib.gui.button.IButtonActionListener; -import fi.dy.masa.malilib.util.StringUtils; -import java.util.Collections; -import java.util.List; - -public class GuiConfigs extends GuiConfigsBase { - private static ConfigGuiTab tab = ConfigGuiTab.GENERIC; - - public GuiConfigs() { - super(10, 50, Reference.MOD_ID, null, "autotrade.gui.title.configs"); - } - - @Override - public void initGui() { - super.initGui(); - this.clearOptions(); - - int x = 10; - int y = 26; - - for (ConfigGuiTab tab : ConfigGuiTab.VALUES) { - x += this.createButton(x, y, -1, tab); - } - } - - private int createButton(int x, int y, int width, ConfigGuiTab tab) { - ButtonGeneric button = new ButtonGeneric(x, y, width, 20, tab.getDisplayName()); - button.setEnabled(GuiConfigs.tab != tab); - this.addButton(button, new ButtonListener(tab, this)); - - return button.getWidth() + 2; - } - - @Override - protected int getConfigWidth() { - ConfigGuiTab tab = GuiConfigs.tab; - - if (tab == ConfigGuiTab.GENERIC) { - return 200; - } - - return super.getConfigWidth(); - } - - @Override - public List getConfigs() { - List configs; - ConfigGuiTab tab = GuiConfigs.tab; - - if (tab == ConfigGuiTab.GENERIC) { - configs = Configs.Generic.OPTIONS; - } else if (tab == ConfigGuiTab.HOTKEYS) { - configs = Hotkeys.HOTKEY_LIST; - } else { - return Collections.emptyList(); - } - - return ConfigOptionWrapper.createFor(configs); - } - - private static class ButtonListener implements IButtonActionListener { - private final GuiConfigs parent; - private final ConfigGuiTab tab; - - public ButtonListener(ConfigGuiTab tab, GuiConfigs parent) { - this.tab = tab; - this.parent = parent; - } - - @Override - public void actionPerformedWithButton(ButtonBase button, int mouseButton) { - GuiConfigs.tab = this.tab; - - this.parent.reCreateListWidget(); // apply the new config width - this.parent.getListWidget().resetScrollbarPosition(); - this.parent.initGui(); - } - } - - public enum ConfigGuiTab { - GENERIC("autotrade.gui.button.config_gui.generic"), - HOTKEYS("autotrade.gui.button.config_gui.hotkeys"); - - private final String translationKey; - - public static final ImmutableList VALUES = ImmutableList.copyOf(values()); - - ConfigGuiTab(String translationKey) { - this.translationKey = translationKey; - } - - public String getDisplayName() { - return StringUtils.translate(this.translationKey); - } - } -} +package com.github.sebseb7.autotrade.gui; + +import com.github.sebseb7.autotrade.Reference; +import com.github.sebseb7.autotrade.config.Configs; +import com.github.sebseb7.autotrade.config.Hotkeys; +import com.google.common.collect.ImmutableList; +import fi.dy.masa.malilib.config.IConfigBase; +import fi.dy.masa.malilib.gui.GuiConfigsBase; +import fi.dy.masa.malilib.gui.button.ButtonBase; +import fi.dy.masa.malilib.gui.button.ButtonGeneric; +import fi.dy.masa.malilib.gui.button.IButtonActionListener; +import fi.dy.masa.malilib.util.StringUtils; +import java.util.Collections; +import java.util.List; + +public class GuiConfigs extends GuiConfigsBase { + private static ConfigGuiTab tab = ConfigGuiTab.GENERIC; + + public GuiConfigs() { + super(10, 50, Reference.MOD_ID, null, "autotrade.gui.title.configs"); + } + + @Override + public void initGui() { + super.initGui(); + this.clearOptions(); + + int x = 10; + int y = 26; + + for (ConfigGuiTab tab : ConfigGuiTab.VALUES) { + x += this.createButton(x, y, -1, tab); + } + } + + private int createButton(int x, int y, int width, ConfigGuiTab tab) { + ButtonGeneric button = new ButtonGeneric(x, y, width, 20, tab.getDisplayName()); + button.setEnabled(GuiConfigs.tab != tab); + this.addButton(button, new ButtonListener(tab, this)); + + return button.getWidth() + 2; + } + + @Override + protected int getConfigWidth() { + ConfigGuiTab tab = GuiConfigs.tab; + + if (tab == ConfigGuiTab.GENERIC) { + return 200; + } + + return super.getConfigWidth(); + } + + @Override + public List getConfigs() { + List configs; + ConfigGuiTab tab = GuiConfigs.tab; + + if (tab == ConfigGuiTab.GENERIC) { + configs = Configs.Generic.OPTIONS; + } else if (tab == ConfigGuiTab.HOTKEYS) { + configs = Hotkeys.HOTKEY_LIST; + } else { + return Collections.emptyList(); + } + + return ConfigOptionWrapper.createFor(configs); + } + + private static class ButtonListener implements IButtonActionListener { + private final GuiConfigs parent; + private final ConfigGuiTab tab; + + public ButtonListener(ConfigGuiTab tab, GuiConfigs parent) { + this.tab = tab; + this.parent = parent; + } + + @Override + public void actionPerformedWithButton(ButtonBase button, int mouseButton) { + GuiConfigs.tab = this.tab; + + this.parent.reCreateListWidget(); // apply the new config width + this.parent.getListWidget().resetScrollbarPosition(); + this.parent.initGui(); + } + } + + public enum ConfigGuiTab { + GENERIC("autotrade.gui.button.config_gui.generic"), HOTKEYS("autotrade.gui.button.config_gui.hotkeys"); + + private final String translationKey; + + public static final ImmutableList VALUES = ImmutableList.copyOf(values()); + + ConfigGuiTab(String translationKey) { + this.translationKey = translationKey; + } + + public String getDisplayName() { + return StringUtils.translate(this.translationKey); + } + } +}