format using eclipse
This commit is contained in:
11
build.gradle
11
build.gradle
@@ -1,5 +1,6 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'fabric-loom' version '1.2-SNAPSHOT'
|
id 'fabric-loom' version '1.2-SNAPSHOT'
|
||||||
|
id 'com.diffplug.spotless' version '6.19.0'
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceCompatibility = JavaVersion.VERSION_17
|
sourceCompatibility = JavaVersion.VERSION_17
|
||||||
@@ -38,3 +39,13 @@ tasks.withType(JavaCompile).configureEach {
|
|||||||
it.options.encoding = "UTF-8"
|
it.options.encoding = "UTF-8"
|
||||||
it.options.release = 17
|
it.options.release = 17
|
||||||
}
|
}
|
||||||
|
|
||||||
|
spotless {
|
||||||
|
java {
|
||||||
|
importOrder()
|
||||||
|
removeUnusedImports()
|
||||||
|
cleanthat()
|
||||||
|
eclipse()
|
||||||
|
formatAnnotations()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -6,10 +6,10 @@ import org.apache.logging.log4j.LogManager;
|
|||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
public class AutoTrade implements ModInitializer {
|
public class AutoTrade implements ModInitializer {
|
||||||
public static final Logger logger = LogManager.getLogger(Reference.MOD_ID);
|
public static final Logger logger = LogManager.getLogger(Reference.MOD_ID);
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onInitialize() {
|
public void onInitialize() {
|
||||||
InitializationHandler.getInstance().registerInitializationHandler(new InitHandler());
|
InitializationHandler.getInstance().registerInitializationHandler(new InitHandler());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,13 +8,13 @@ import fi.dy.masa.malilib.event.InputEventHandler;
|
|||||||
import fi.dy.masa.malilib.interfaces.IInitializationHandler;
|
import fi.dy.masa.malilib.interfaces.IInitializationHandler;
|
||||||
|
|
||||||
public class InitHandler implements IInitializationHandler {
|
public class InitHandler implements IInitializationHandler {
|
||||||
@Override
|
@Override
|
||||||
public void registerModHandlers() {
|
public void registerModHandlers() {
|
||||||
ConfigManager.getInstance().registerConfigHandler(Reference.MOD_ID, new Configs());
|
ConfigManager.getInstance().registerConfigHandler(Reference.MOD_ID, new Configs());
|
||||||
|
|
||||||
InputHandler handler = new InputHandler();
|
InputHandler handler = new InputHandler();
|
||||||
InputEventHandler.getKeybindManager().registerKeybindProvider(handler);
|
InputEventHandler.getKeybindManager().registerKeybindProvider(handler);
|
||||||
|
|
||||||
KeybindCallbacks.getInstance().setCallbacks();
|
KeybindCallbacks.getInstance().setCallbacks();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ package com.github.sebseb7.autotrade;
|
|||||||
import fi.dy.masa.malilib.util.StringUtils;
|
import fi.dy.masa.malilib.util.StringUtils;
|
||||||
|
|
||||||
public class Reference {
|
public class Reference {
|
||||||
public static final String MOD_ID = "autotrade";
|
public static final String MOD_ID = "autotrade";
|
||||||
public static final String MOD_NAME = "Auto Trade";
|
public static final String MOD_NAME = "Auto Trade";
|
||||||
public static final String MOD_VERSION = StringUtils.getModVersionString(MOD_ID);
|
public static final String MOD_VERSION = StringUtils.getModVersionString(MOD_ID);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,12 +5,12 @@ import com.terraformersmc.modmenu.api.ConfigScreenFactory;
|
|||||||
import com.terraformersmc.modmenu.api.ModMenuApi;
|
import com.terraformersmc.modmenu.api.ModMenuApi;
|
||||||
|
|
||||||
public class ModMenuImpl implements ModMenuApi {
|
public class ModMenuImpl implements ModMenuApi {
|
||||||
@Override
|
@Override
|
||||||
public ConfigScreenFactory<?> getModConfigScreenFactory() {
|
public ConfigScreenFactory<?> getModConfigScreenFactory() {
|
||||||
return (screen) -> {
|
return (screen) -> {
|
||||||
GuiConfigs gui = new GuiConfigs();
|
GuiConfigs gui = new GuiConfigs();
|
||||||
gui.setParent(screen);
|
gui.setParent(screen);
|
||||||
return gui;
|
return gui;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,142 +15,81 @@ import fi.dy.masa.malilib.util.JsonUtils;
|
|||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
public class Configs implements IConfigHandler {
|
public class Configs implements IConfigHandler {
|
||||||
private static final String CONFIG_FILE_NAME = Reference.MOD_ID + ".json";
|
private static final String CONFIG_FILE_NAME = Reference.MOD_ID + ".json";
|
||||||
|
|
||||||
public static class Generic {
|
public static class Generic {
|
||||||
public static final ConfigBoolean ENABLED =
|
public static final ConfigBoolean ENABLED = new ConfigBoolean("enabled", false,
|
||||||
new ConfigBoolean("enabled", false, "Do auto trading with villagers in range");
|
"Do auto trading with villagers in range");
|
||||||
public static final ConfigBoolean ENABLE_SELL =
|
public static final ConfigBoolean ENABLE_SELL = new ConfigBoolean("enableSell", false,
|
||||||
new ConfigBoolean(
|
"Enable buying (if disabled emeralds from the emerald container are taken instead)");
|
||||||
"enableSell",
|
public static final ConfigString BUY_ITEM = new ConfigString("buyItem", "minecraft:gold_ingot",
|
||||||
false,
|
"The item to sell for emerald.");
|
||||||
"Enable buying (if disabled emeralds from the emerald container are taken instead)");
|
public static final ConfigBoolean ENABLE_BUY = new ConfigBoolean("enableBuy", false,
|
||||||
public static final ConfigString BUY_ITEM =
|
"Enable selling (if disabled emeralds are placed in the emerald container)");
|
||||||
new ConfigString("buyItem", "minecraft:gold_ingot", "The item to sell for emerald.");
|
public static final ConfigString SELL_ITEM = new ConfigString("sellItem", "minecraft:redstone",
|
||||||
public static final ConfigBoolean ENABLE_BUY =
|
"The item to buy using emerald.");
|
||||||
new ConfigBoolean(
|
public static final ConfigInteger MAX_INPUT_ITEMS = new ConfigInteger("maxInputStacks", 9, 1, 35,
|
||||||
"enableBuy",
|
"stacks to take from input container (or emerald container in buy-only mode)");
|
||||||
false,
|
public static final ConfigInteger INPUT_CONTAINER_X = new ConfigInteger("inputContainerX", 0, -30000000,
|
||||||
"Enable selling (if disabled emeralds are placed in the emerald container)");
|
30000000, "Input container X (not used when sell disabled)");
|
||||||
public static final ConfigString SELL_ITEM =
|
public static final ConfigInteger INPUT_CONTAINER_Y = new ConfigInteger("inputContainerY", 0, -64, 320,
|
||||||
new ConfigString("sellItem", "minecraft:redstone", "The item to buy using emerald.");
|
"Input container Y (not used when sell disabled)");
|
||||||
public static final ConfigInteger MAX_INPUT_ITEMS =
|
public static final ConfigInteger INPUT_CONTAINER_Z = new ConfigInteger("outputContainerZ", 0, -30000000,
|
||||||
new ConfigInteger(
|
30000000, "Input container Z (not used when sell disabled)");
|
||||||
"maxInputStacks",
|
public static final ConfigInteger OUTPUT_CONTAINER_X = new ConfigInteger("outputContainerX", 0, -30000000,
|
||||||
9,
|
30000000, "Input container X (not used when buy disabled)");
|
||||||
1,
|
public static final ConfigInteger OUTPUT_CONTAINER_Y = new ConfigInteger("outputContainerY", 0, -64, 320,
|
||||||
35,
|
"Output container Y (not used when buy disabled)");
|
||||||
"stacks to take from input container (or emerald container in buy-only mode)");
|
public static final ConfigInteger OUTPUT_CONTAINER_Z = new ConfigInteger("outputContainerZ", 0, -30000000,
|
||||||
public static final ConfigInteger INPUT_CONTAINER_X =
|
30000000, "Output container Z (not used when buy disabled)");
|
||||||
new ConfigInteger(
|
public static final ConfigInteger EMERALD_CONTAINER_X = new ConfigInteger("emeraldContainerX", 0, -30000000,
|
||||||
"inputContainerX",
|
30000000, "Emerald container X (not used when buy&sell enabled)");
|
||||||
0,
|
public static final ConfigInteger EMERALD_CONTAINER_Y = new ConfigInteger("emeraldContainerY", 0, -64, 320,
|
||||||
-30000000,
|
"Emerald container Y (not used when buy&sell enabled)");
|
||||||
30000000,
|
public static final ConfigInteger EMERALD_CONTAINER_Z = new ConfigInteger("emeraldContainerZ", 0, -30000000,
|
||||||
"Input container X (not used when sell disabled)");
|
30000000, "Emerald container Z (not used when buy&sell enabled)");
|
||||||
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<IConfigValue> OPTIONS =
|
public static final ImmutableList<IConfigValue> OPTIONS = ImmutableList.of(ENABLED, ENABLE_BUY, BUY_ITEM,
|
||||||
ImmutableList.of(
|
ENABLE_SELL, SELL_ITEM, MAX_INPUT_ITEMS, INPUT_CONTAINER_X, INPUT_CONTAINER_Y, INPUT_CONTAINER_Z,
|
||||||
ENABLED,
|
OUTPUT_CONTAINER_X, OUTPUT_CONTAINER_Y, OUTPUT_CONTAINER_Z, EMERALD_CONTAINER_X, EMERALD_CONTAINER_Y,
|
||||||
ENABLE_BUY,
|
EMERALD_CONTAINER_Z);
|
||||||
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() {
|
public static void loadFromFile() {
|
||||||
File configFile = new File(FileUtils.getConfigDirectory(), CONFIG_FILE_NAME);
|
File configFile = new File(FileUtils.getConfigDirectory(), CONFIG_FILE_NAME);
|
||||||
|
|
||||||
if (configFile.exists() && configFile.isFile() && configFile.canRead()) {
|
if (configFile.exists() && configFile.isFile() && configFile.canRead()) {
|
||||||
JsonElement element = JsonUtils.parseJsonFile(configFile);
|
JsonElement element = JsonUtils.parseJsonFile(configFile);
|
||||||
|
|
||||||
if (element != null && element.isJsonObject()) {
|
if (element != null && element.isJsonObject()) {
|
||||||
JsonObject root = element.getAsJsonObject();
|
JsonObject root = element.getAsJsonObject();
|
||||||
|
|
||||||
ConfigUtils.readConfigBase(root, "Generic", Generic.OPTIONS);
|
ConfigUtils.readConfigBase(root, "Generic", Generic.OPTIONS);
|
||||||
ConfigUtils.readConfigBase(root, "Hotkeys", Hotkeys.HOTKEY_LIST);
|
ConfigUtils.readConfigBase(root, "Hotkeys", Hotkeys.HOTKEY_LIST);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void saveToFile() {
|
public static void saveToFile() {
|
||||||
File dir = FileUtils.getConfigDirectory();
|
File dir = FileUtils.getConfigDirectory();
|
||||||
|
|
||||||
if ((dir.exists() && dir.isDirectory()) || dir.mkdirs()) {
|
if ((dir.exists() && dir.isDirectory()) || dir.mkdirs()) {
|
||||||
JsonObject root = new JsonObject();
|
JsonObject root = new JsonObject();
|
||||||
|
|
||||||
ConfigUtils.writeConfigBase(root, "Generic", Generic.OPTIONS);
|
ConfigUtils.writeConfigBase(root, "Generic", Generic.OPTIONS);
|
||||||
ConfigUtils.writeConfigBase(root, "Hotkeys", Hotkeys.HOTKEY_LIST);
|
ConfigUtils.writeConfigBase(root, "Hotkeys", Hotkeys.HOTKEY_LIST);
|
||||||
|
|
||||||
JsonUtils.writeJsonToFile(root, new File(dir, CONFIG_FILE_NAME));
|
JsonUtils.writeJsonToFile(root, new File(dir, CONFIG_FILE_NAME));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void load() {
|
public void load() {
|
||||||
loadFromFile();
|
loadFromFile();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void save() {
|
public void save() {
|
||||||
saveToFile();
|
saveToFile();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,28 +5,20 @@ import fi.dy.masa.malilib.config.options.ConfigHotkey;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class Hotkeys {
|
public class Hotkeys {
|
||||||
public static final ConfigHotkey TOGGLE_KEY =
|
public static final ConfigHotkey TOGGLE_KEY = new ConfigHotkey("toggleTrading", "",
|
||||||
new ConfigHotkey("toggleTrading", "", "Enables / disables auto trading");
|
"Enables / disables auto trading");
|
||||||
public static final ConfigHotkey SET_BUY_KEY =
|
public static final ConfigHotkey SET_BUY_KEY = new ConfigHotkey("setSellItem", "",
|
||||||
new ConfigHotkey("setSellItem", "", "Sets the item to sell from hotbar");
|
"Sets the item to sell from hotbar");
|
||||||
public static final ConfigHotkey SET_SELL_KEY =
|
public static final ConfigHotkey SET_SELL_KEY = new ConfigHotkey("setBuyItem", "",
|
||||||
new ConfigHotkey("setBuyItem", "", "Sets the item to buy from hotbar");
|
"Sets the item to buy from hotbar");
|
||||||
public static final ConfigHotkey SET_INPUT_KEY =
|
public static final ConfigHotkey SET_INPUT_KEY = new ConfigHotkey("setInputContainer", "",
|
||||||
new ConfigHotkey("setInputContainer", "", "Sets the input (item to sell) container");
|
"Sets the input (item to sell) container");
|
||||||
public static final ConfigHotkey SET_OUTPUT_KEY =
|
public static final ConfigHotkey SET_OUTPUT_KEY = new ConfigHotkey("setOutputContainer", "",
|
||||||
new ConfigHotkey("setOutputContainer", "", "Sets the output (item bought) container");
|
"Sets the output (item bought) container");
|
||||||
public static final ConfigHotkey SET_EMERALD_KEY =
|
public static final ConfigHotkey SET_EMERALD_KEY = new ConfigHotkey("setEmeraldContainer", "",
|
||||||
new ConfigHotkey("setEmeraldContainer", "", "Set the emerald container");
|
"Set the emerald container");
|
||||||
public static final ConfigHotkey OPEN_GUI_SETTINGS =
|
public static final ConfigHotkey OPEN_GUI_SETTINGS = new ConfigHotkey("openGuiSettings", "", "Open the Config GUI");
|
||||||
new ConfigHotkey("openGuiSettings", "", "Open the Config GUI");
|
|
||||||
|
|
||||||
public static final List<ConfigHotkey> HOTKEY_LIST =
|
public static final List<ConfigHotkey> HOTKEY_LIST = ImmutableList.of(TOGGLE_KEY, SET_BUY_KEY, SET_SELL_KEY,
|
||||||
ImmutableList.of(
|
SET_INPUT_KEY, SET_OUTPUT_KEY, SET_EMERALD_KEY, OPEN_GUI_SETTINGS);
|
||||||
TOGGLE_KEY,
|
|
||||||
SET_BUY_KEY,
|
|
||||||
SET_SELL_KEY,
|
|
||||||
SET_INPUT_KEY,
|
|
||||||
SET_OUTPUT_KEY,
|
|
||||||
SET_EMERALD_KEY,
|
|
||||||
OPEN_GUI_SETTINGS);
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,22 +7,21 @@ import fi.dy.masa.malilib.hotkeys.IKeybindManager;
|
|||||||
import fi.dy.masa.malilib.hotkeys.IKeybindProvider;
|
import fi.dy.masa.malilib.hotkeys.IKeybindProvider;
|
||||||
|
|
||||||
public class InputHandler implements IKeybindProvider {
|
public class InputHandler implements IKeybindProvider {
|
||||||
private final KeybindCallbacks callbacks;
|
private final KeybindCallbacks callbacks;
|
||||||
|
|
||||||
public InputHandler() {
|
public InputHandler() {
|
||||||
this.callbacks = KeybindCallbacks.getInstance();
|
this.callbacks = KeybindCallbacks.getInstance();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addKeysToMap(IKeybindManager manager) {
|
public void addKeysToMap(IKeybindManager manager) {
|
||||||
for (IHotkey hotkey : Hotkeys.HOTKEY_LIST) {
|
for (IHotkey hotkey : Hotkeys.HOTKEY_LIST) {
|
||||||
manager.addKeybindToMap(hotkey.getKeybind());
|
manager.addKeybindToMap(hotkey.getKeybind());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addHotkeys(IKeybindManager manager) {
|
public void addHotkeys(IKeybindManager manager) {
|
||||||
manager.addHotkeysForCategory(
|
manager.addHotkeysForCategory(Reference.MOD_NAME, "autotrade.hotkeys.category.hotkeys", Hotkeys.HOTKEY_LIST);
|
||||||
Reference.MOD_NAME, "autotrade.hotkeys.category.hotkeys", Hotkeys.HOTKEY_LIST);
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,55 +15,54 @@ import net.minecraft.client.MinecraftClient;
|
|||||||
import net.minecraft.client.gui.screen.ingame.HandledScreen;
|
import net.minecraft.client.gui.screen.ingame.HandledScreen;
|
||||||
|
|
||||||
public class KeybindCallbacks implements IHotkeyCallback {
|
public class KeybindCallbacks implements IHotkeyCallback {
|
||||||
private static final KeybindCallbacks INSTANCE = new KeybindCallbacks();
|
private static final KeybindCallbacks INSTANCE = new KeybindCallbacks();
|
||||||
|
|
||||||
public static KeybindCallbacks getInstance() {
|
public static KeybindCallbacks getInstance() {
|
||||||
return INSTANCE;
|
return INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
private KeybindCallbacks() {}
|
private KeybindCallbacks() {
|
||||||
|
}
|
||||||
|
|
||||||
public void setCallbacks() {
|
public void setCallbacks() {
|
||||||
for (ConfigHotkey hotkey : Hotkeys.HOTKEY_LIST) {
|
for (ConfigHotkey hotkey : Hotkeys.HOTKEY_LIST) {
|
||||||
hotkey.getKeybind().setCallback(this);
|
hotkey.getKeybind().setCallback(this);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean functionalityEnabled() {
|
public boolean functionalityEnabled() {
|
||||||
return Configs.Generic.ENABLED.getBooleanValue();
|
return Configs.Generic.ENABLED.getBooleanValue();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onKeyAction(KeyAction action, IKeybind key) {
|
public boolean onKeyAction(KeyAction action, IKeybind key) {
|
||||||
boolean cancel = this.onKeyActionImpl(action, key);
|
boolean cancel = this.onKeyActionImpl(action, key);
|
||||||
return cancel;
|
return cancel;
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean onKeyActionImpl(KeyAction action, IKeybind key) {
|
private boolean onKeyActionImpl(KeyAction action, IKeybind key) {
|
||||||
MinecraftClient mc = MinecraftClient.getInstance();
|
MinecraftClient mc = MinecraftClient.getInstance();
|
||||||
|
|
||||||
if (mc.player == null || mc.world == null) {
|
if (mc.player == null || mc.world == null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (key == Hotkeys.TOGGLE_KEY.getKeybind()) {
|
if (key == Hotkeys.TOGGLE_KEY.getKeybind()) {
|
||||||
Configs.Generic.ENABLED.toggleBooleanValue();
|
Configs.Generic.ENABLED.toggleBooleanValue();
|
||||||
String msg =
|
String msg = this.functionalityEnabled()
|
||||||
this.functionalityEnabled()
|
? "autotrade.message.toggled_mod_on"
|
||||||
? "autotrade.message.toggled_mod_on"
|
: "autotrade.message.toggled_mod_off";
|
||||||
: "autotrade.message.toggled_mod_off";
|
InfoUtils.showGuiOrInGameMessage(Message.MessageType.INFO, msg);
|
||||||
InfoUtils.showGuiOrInGameMessage(Message.MessageType.INFO, msg);
|
return true;
|
||||||
return true;
|
} else if (key == Hotkeys.OPEN_GUI_SETTINGS.getKeybind()) {
|
||||||
} else if (key == Hotkeys.OPEN_GUI_SETTINGS.getKeybind()) {
|
GuiBase.openGui(new GuiConfigs());
|
||||||
GuiBase.openGui(new GuiConfigs());
|
return true;
|
||||||
return true;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (this.functionalityEnabled() == false
|
if (this.functionalityEnabled() == false || (GuiUtils.getCurrentScreen() instanceof HandledScreen) == false) {
|
||||||
|| (GuiUtils.getCurrentScreen() instanceof HandledScreen) == false) {
|
return false;
|
||||||
return false;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,93 +14,92 @@ import java.util.Collections;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class GuiConfigs extends GuiConfigsBase {
|
public class GuiConfigs extends GuiConfigsBase {
|
||||||
private static ConfigGuiTab tab = ConfigGuiTab.GENERIC;
|
private static ConfigGuiTab tab = ConfigGuiTab.GENERIC;
|
||||||
|
|
||||||
public GuiConfigs() {
|
public GuiConfigs() {
|
||||||
super(10, 50, Reference.MOD_ID, null, "autotrade.gui.title.configs");
|
super(10, 50, Reference.MOD_ID, null, "autotrade.gui.title.configs");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void initGui() {
|
public void initGui() {
|
||||||
super.initGui();
|
super.initGui();
|
||||||
this.clearOptions();
|
this.clearOptions();
|
||||||
|
|
||||||
int x = 10;
|
int x = 10;
|
||||||
int y = 26;
|
int y = 26;
|
||||||
|
|
||||||
for (ConfigGuiTab tab : ConfigGuiTab.VALUES) {
|
for (ConfigGuiTab tab : ConfigGuiTab.VALUES) {
|
||||||
x += this.createButton(x, y, -1, tab);
|
x += this.createButton(x, y, -1, tab);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private int createButton(int x, int y, int width, ConfigGuiTab tab) {
|
private int createButton(int x, int y, int width, ConfigGuiTab tab) {
|
||||||
ButtonGeneric button = new ButtonGeneric(x, y, width, 20, tab.getDisplayName());
|
ButtonGeneric button = new ButtonGeneric(x, y, width, 20, tab.getDisplayName());
|
||||||
button.setEnabled(GuiConfigs.tab != tab);
|
button.setEnabled(GuiConfigs.tab != tab);
|
||||||
this.addButton(button, new ButtonListener(tab, this));
|
this.addButton(button, new ButtonListener(tab, this));
|
||||||
|
|
||||||
return button.getWidth() + 2;
|
return button.getWidth() + 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected int getConfigWidth() {
|
protected int getConfigWidth() {
|
||||||
ConfigGuiTab tab = GuiConfigs.tab;
|
ConfigGuiTab tab = GuiConfigs.tab;
|
||||||
|
|
||||||
if (tab == ConfigGuiTab.GENERIC) {
|
if (tab == ConfigGuiTab.GENERIC) {
|
||||||
return 200;
|
return 200;
|
||||||
}
|
}
|
||||||
|
|
||||||
return super.getConfigWidth();
|
return super.getConfigWidth();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<ConfigOptionWrapper> getConfigs() {
|
public List<ConfigOptionWrapper> getConfigs() {
|
||||||
List<? extends IConfigBase> configs;
|
List<? extends IConfigBase> configs;
|
||||||
ConfigGuiTab tab = GuiConfigs.tab;
|
ConfigGuiTab tab = GuiConfigs.tab;
|
||||||
|
|
||||||
if (tab == ConfigGuiTab.GENERIC) {
|
if (tab == ConfigGuiTab.GENERIC) {
|
||||||
configs = Configs.Generic.OPTIONS;
|
configs = Configs.Generic.OPTIONS;
|
||||||
} else if (tab == ConfigGuiTab.HOTKEYS) {
|
} else if (tab == ConfigGuiTab.HOTKEYS) {
|
||||||
configs = Hotkeys.HOTKEY_LIST;
|
configs = Hotkeys.HOTKEY_LIST;
|
||||||
} else {
|
} else {
|
||||||
return Collections.emptyList();
|
return Collections.emptyList();
|
||||||
}
|
}
|
||||||
|
|
||||||
return ConfigOptionWrapper.createFor(configs);
|
return ConfigOptionWrapper.createFor(configs);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class ButtonListener implements IButtonActionListener {
|
private static class ButtonListener implements IButtonActionListener {
|
||||||
private final GuiConfigs parent;
|
private final GuiConfigs parent;
|
||||||
private final ConfigGuiTab tab;
|
private final ConfigGuiTab tab;
|
||||||
|
|
||||||
public ButtonListener(ConfigGuiTab tab, GuiConfigs parent) {
|
public ButtonListener(ConfigGuiTab tab, GuiConfigs parent) {
|
||||||
this.tab = tab;
|
this.tab = tab;
|
||||||
this.parent = parent;
|
this.parent = parent;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void actionPerformedWithButton(ButtonBase button, int mouseButton) {
|
public void actionPerformedWithButton(ButtonBase button, int mouseButton) {
|
||||||
GuiConfigs.tab = this.tab;
|
GuiConfigs.tab = this.tab;
|
||||||
|
|
||||||
this.parent.reCreateListWidget(); // apply the new config width
|
this.parent.reCreateListWidget(); // apply the new config width
|
||||||
this.parent.getListWidget().resetScrollbarPosition();
|
this.parent.getListWidget().resetScrollbarPosition();
|
||||||
this.parent.initGui();
|
this.parent.initGui();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public enum ConfigGuiTab {
|
public enum ConfigGuiTab {
|
||||||
GENERIC("autotrade.gui.button.config_gui.generic"),
|
GENERIC("autotrade.gui.button.config_gui.generic"), HOTKEYS("autotrade.gui.button.config_gui.hotkeys");
|
||||||
HOTKEYS("autotrade.gui.button.config_gui.hotkeys");
|
|
||||||
|
|
||||||
private final String translationKey;
|
private final String translationKey;
|
||||||
|
|
||||||
public static final ImmutableList<ConfigGuiTab> VALUES = ImmutableList.copyOf(values());
|
public static final ImmutableList<ConfigGuiTab> VALUES = ImmutableList.copyOf(values());
|
||||||
|
|
||||||
ConfigGuiTab(String translationKey) {
|
ConfigGuiTab(String translationKey) {
|
||||||
this.translationKey = translationKey;
|
this.translationKey = translationKey;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getDisplayName() {
|
public String getDisplayName() {
|
||||||
return StringUtils.translate(this.translationKey);
|
return StringUtils.translate(this.translationKey);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user