first elements in new gui

4 files changed, 15 insertions, 9 deletions

diff --git a/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java b/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java
index 15fff4928..5b9bf179c 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/SkyblockHud.java
@@ -1,5 +1,6 @@
 package com.thatgravyboat.skyblockhud;
 
+import at.lorenz.mod.Features;
 import at.lorenz.mod.HideNotClickableItems;
 import at.lorenz.mod.ItemDisplayOverlayFeatures;
 import at.lorenz.mod.bazaar.BazaarApi;
@@ -32,7 +33,8 @@ public class SkyblockHud {
     public static final String MODID = "lorenzmod";
     public static final String VERSION = "0.1";
 
-    public static SBHConfig config;
+    public static SBHConfig config;//TODO delete
+    public static Features feature;
     private File configFile;
 
     //    private static final Set<String> SKYBLOCK_IN_ALL_LANGUAGES = Sets.newHashSet("SKYBLOCK", "\u7A7A\u5C9B\u751F\u5B58");
@@ -43,6 +45,7 @@ public class SkyblockHud {
 
     @EventHandler
     public void preInit(FMLPreInitializationEvent event) {
+
         new BazaarApi();
 
         MinecraftForge.EVENT_BUS.register(this);
@@ -53,7 +56,9 @@ public class SkyblockHud {
         MinecraftForge.EVENT_BUS.register(new HideNotClickableItems());
         MinecraftForge.EVENT_BUS.register(new DungeonHighlightClickedBlocks());
         MinecraftForge.EVENT_BUS.register(new ItemDisplayOverlayFeatures());
+
         Commands.init();
+
         //        MinecraftForge.EVENT_BUS.register(new LeaderboardGetter());
         //        MinecraftForge.EVENT_BUS.register(new SeasonDateHandler());
         //        MinecraftForge.EVENT_BUS.register(new LocationHandler());
@@ -94,13 +99,13 @@ public class SkyblockHud {
 
         if (configFile.exists()) {
             try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(configFile), StandardCharsets.UTF_8))) {
-                config = gson.fromJson(reader, SBHConfig.class);
+                feature = gson.fromJson(reader, Features.class);
             } catch (Exception ignored) {
             }
         }
 
-        if (config == null) {
-            config = new SBHConfig();
+        if (feature == null) {
+            feature = new Features();
             saveConfig();
         }
         //
@@ -120,7 +125,7 @@ public class SkyblockHud {
             configFile.createNewFile();
 
             try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(configFile), StandardCharsets.UTF_8))) {
-                writer.write(gson.toJson(config));
+                writer.write(gson.toJson(feature));
             }
         } catch (IOException ignored) {
         }
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java b/src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java
index 517390a5d..67f340cf0 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/commands/Commands.java
@@ -15,9 +15,9 @@ public class Commands {
     private static final SimpleCommand.ProcessCommandRunnable settingsRunnable = new SimpleCommand.ProcessCommandRunnable() {
         public void processCommand(ICommandSender sender, String[] args) {
             if (args.length > 0) {
-                SkyblockHud.screenToOpen = new GuiScreenElementWrapper(new SBHConfigEditor(SkyblockHud.config, StringUtils.join(args, " ")));
+                SkyblockHud.screenToOpen = new GuiScreenElementWrapper(new SBHConfigEditor(SkyblockHud.feature, StringUtils.join(args, " ")));
             } else {
-                SkyblockHud.screenToOpen = new GuiScreenElementWrapper(new SBHConfigEditor(SkyblockHud.config));
+                SkyblockHud.screenToOpen = new GuiScreenElementWrapper(new SBHConfigEditor(SkyblockHud.feature));
             }
         }
     };
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java b/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java
index 08e72d40d..f62eba4dc 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/config/SBHConfig.java
@@ -112,12 +112,12 @@ public class SBHConfig extends Config {
         public boolean test = false;
 
         @Expose
-        @ConfigOption(name = "Lorenz Small  Test B", desc = "def")
+        @ConfigOption(name = "Lorenz Small  Test B", desc = "abc")
         @ConfigEditorBoolean
         public boolean test2 = false;
 
         @Expose
-        @ConfigOption(name = "Lorenz Small  Test C", desc = "ghi")
+        @ConfigOption(name = "Lorenz Small  Test C", desc = "abc")
         @ConfigEditorBoolean
         public boolean test3 = false;
     }
diff --git a/src/main/java/com/thatgravyboat/skyblockhud/handlers/CooldownHandler.java b/src/main/java/com/thatgravyboat/skyblockhud/handlers/CooldownHandler.java
index 7f382d56d..7ae92df55 100644
--- a/src/main/java/com/thatgravyboat/skyblockhud/handlers/CooldownHandler.java
+++ b/src/main/java/com/thatgravyboat/skyblockhud/handlers/CooldownHandler.java
@@ -1,5 +1,6 @@
 package com.thatgravyboat.skyblockhud.handlers;
 
+import at.lorenz.mod.Features;
 import com.google.common.collect.Sets;
 import com.thatgravyboat.skyblockhud.SkyblockHud;
 import com.thatgravyboat.skyblockhud.api.item.IAbility;