diff --git a/Readme.md b/Readme.md index 831004056..5d2e8df03 100644 --- a/Readme.md +++ b/Readme.md @@ -147,3 +147,9 @@ https://tukaani.org/xz/java.html DHJarMerger (To merge multiple mod versions into one jar)\ https://github.com/Ran-helo/DHJarMerger + +Toml for Java (config handling)\ +https://github.com/TheElectronWill/night-config + +Json for Java (config handling)\ +https://mvnrepository.com/artifact/com.googlecode.json-simple/json-simple \ No newline at end of file diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/config/ClassicConfigGUI.java b/common/src/main/java/com/seibel/lod/common/wrappers/config/ClassicConfigGUI.java index 5e1b17406..ab1dcc1dc 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/config/ClassicConfigGUI.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/config/ClassicConfigGUI.java @@ -46,9 +46,9 @@ import net.minecraft.network.chat.Component; import net.minecraft.network.chat.TextComponent; import net.minecraft.network.chat.TranslatableComponent; import net.minecraft.client.resources.language.I18n; // translation -//#if POST_MC_1_17_1 +#if POST_MC_1_17_1 import net.minecraft.client.gui.narration.NarratableEntry; -//#endif +#endif /** * Based upon TinyConfig but is highly modified @@ -225,11 +225,11 @@ public abstract class ClassicConfigGUI { // addRenderableWidget in 1.17 and over // addButton in 1.16 and below private Button addBtn(Button button) { -// #if PRE_MC_1_17_1 -// this.addButton(button); -// #else + #if PRE_MC_1_17_1 + this.addButton(button); + #else this.addRenderableWidget(button); -// #endif + #endif return button; } @@ -408,11 +408,11 @@ public abstract class ClassicConfigGUI { // Only for 1.17 and over // Remove in 1.16 and below -// #if POST_MC_1_17_1 + #if POST_MC_1_17_1 @Override public List narratables() { return children; } -// #endif + #endif } } diff --git a/core b/core index 431072164..e116b891a 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 43107216405b8bd8ac9902fc718fb2ad98515ddb +Subproject commit e116b891a8de0b7b1276ad2000ecac642caa1fe0