diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java index 7f3ca7a0d..bf58cb4c7 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java @@ -56,20 +56,20 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import static com.seibel.distanthorizons.common.wrappers.gui.GuiHelper.*; +import static com.seibel.distanthorizons.common.wrappers.gui.GuiHelper.Translatable; -/** +/* * Based upon TinyConfig but is highly modified * https://github.com/Minenash/TinyConfig * + * Note: floats don't work with this system, use doubles. + * * Credits to Motschen * * @author coolGi * @version 5-21-2022 */ -// FLOATS DONT WORK WITH THIS - -/** This file is going to be removed sometime soon, please dont hook onto anything within this file until the new UI is compleated */ @SuppressWarnings("unchecked") public class ClassicConfigGUI { @@ -178,7 +178,7 @@ public class ClassicConfigGUI } else { - ((ConfigEntry) info).uiSetWithoutSaving(value.intValue()); + ((ConfigEntry) info).uiSetWithoutSaving(value != null ? value.intValue() : 0); } } @@ -249,7 +249,7 @@ public class ClassicConfigGUI protected void init() { super.init(); - if (!reload) + if (!this.reload) { ConfigBase.INSTANCE.configFileINSTANCE.loadFromFile(); } @@ -276,7 +276,7 @@ public class ClassicConfigGUI (buttonWidget) -> { ChangelogScreen changelogScreen = new ChangelogScreen(this); if (changelogScreen.usable) - Objects.requireNonNull(minecraft).setScreen(changelogScreen); + Objects.requireNonNull(this.minecraft).setScreen(changelogScreen); else LOGGER.warn("Changelog was not able to open"); }, @@ -286,17 +286,17 @@ public class ClassicConfigGUI } - addBtn(MakeBtn(Translatable("distanthorizons.general.cancel"), + this.addBtn(MakeBtn(Translatable("distanthorizons.general.cancel"), this.width / 2 - 154, this.height - 28, 150, 20, button -> { ConfigBase.INSTANCE.configFileINSTANCE.loadFromFile(); - Objects.requireNonNull(minecraft).setScreen(parent); + Objects.requireNonNull(this.minecraft).setScreen(this.parent); })); - doneButton = addBtn(MakeBtn(Translatable("distanthorizons.general.done"), this.width / 2 + 4, this.height - 28, 150, 20, (button) -> { + this.doneButton = this.addBtn(MakeBtn(Translatable("distanthorizons.general.done"), this.width / 2 + 4, this.height - 28, 150, 20, (button) -> { ConfigBase.INSTANCE.configFileINSTANCE.saveToFile(); - Objects.requireNonNull(minecraft).setScreen(parent); + Objects.requireNonNull(this.minecraft).setScreen(this.parent); })); this.list = new ConfigListWidget(this.minecraft, this.width * 2, this.height, 32, 32, 25); @@ -312,8 +312,8 @@ public class ClassicConfigGUI { try { - if (info.getCategory().matches(category) && info.getAppearance().showInGui) - addMenuItem(info); + if (info.getCategory().matches(this.category) && info.getAppearance().showInGui) + this.addMenuItem(info); } catch (Exception e) { @@ -336,7 +336,7 @@ public class ClassicConfigGUI private void addMenuItem(AbstractConfigType info) { initEntry(info, this.translationPrefix); - Component name = Translatable(translationPrefix + info.getNameWCategory()); + Component name = Translatable(this.translationPrefix + info.getNameWCategory()); if (ConfigEntry.class.isAssignableFrom(info.getClass())) @@ -345,7 +345,7 @@ public class ClassicConfigGUI ((ConfigEntry) info).uiSetWithoutSaving(((ConfigEntry) info).getDefaultValue()); ((EntryInfo) info.guiValue).index = 0; this.reload = true; - Objects.requireNonNull(minecraft).setScreen(this); + Objects.requireNonNull(this.minecraft).setScreen(this); }; int posX = this.width - ConfigScreenConfigs.SpaceFromRightScreen - 150 - ConfigScreenConfigs.ButtonWidthSpacing - ConfigScreenConfigs.ResetButtonWidth; int posZ = 0; @@ -359,17 +359,17 @@ public class ClassicConfigGUI Map.Entry> widget = (Map.Entry>) ((EntryInfo) info.guiValue).widget; if (info.getType().isEnum()) { - widget.setValue(value -> Translatable(translationPrefix + "enum." + info.getType().getSimpleName() + "." + info.get().toString())); + widget.setValue(value -> Translatable(this.translationPrefix + "enum." + info.getType().getSimpleName() + "." + info.get().toString())); } this.list.addButton(MakeBtn(widget.getValue().apply(info.get()), this.width - 150 - ConfigScreenConfigs.SpaceFromRightScreen, 0, 150, 20, widget.getKey()), resetButton, null, name); return; } else if (((EntryInfo) info.guiValue).widget != null) { - EditBox widget = new EditBox(font, this.width - 150 - ConfigScreenConfigs.SpaceFromRightScreen + 2, 0, 150 - 4, 20, null); + EditBox widget = new EditBox(this.font, this.width - 150 - ConfigScreenConfigs.SpaceFromRightScreen + 2, 0, 150 - 4, 20, Translatable("")); widget.setMaxLength(150); widget.insertText(String.valueOf(info.get())); - Predicate processor = ((BiFunction>) ((EntryInfo) info.guiValue).widget).apply(widget, doneButton); + Predicate processor = ((BiFunction>) ((EntryInfo) info.guiValue).widget).apply(widget, this.doneButton); widget.setFilter(processor); this.list.addButton(widget, resetButton, null, name); return; @@ -379,7 +379,7 @@ public class ClassicConfigGUI { Button widget = MakeBtn(name, this.width / 2 - 100, this.height - 28, 100 * 2, 20, (button -> { ConfigBase.INSTANCE.configFileINSTANCE.saveToFile(); - Objects.requireNonNull(minecraft).setScreen(ClassicConfigGUI.getScreen(this.configBase, this, ((ConfigCategory) info).getDestination())); + Objects.requireNonNull(this.minecraft).setScreen(ClassicConfigGUI.getScreen(this.configBase, this, ((ConfigCategory) info).getDestination())); })); this.list.addButton(widget, null, null, null); return;