Merge pull request #26 from DeDiamondPro/master

Crystal hollow overlay

1 files changed, 28 insertions, 23 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
index cbf92fb2..22d3f6ff 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
@@ -6,13 +6,15 @@ import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
 import io.github.moulberry.notenoughupdates.core.GuiScreenElementWrapper;
 import io.github.moulberry.notenoughupdates.core.config.Config;
 import io.github.moulberry.notenoughupdates.core.config.Position;
-import io.github.moulberry.notenoughupdates.core.config.annotations.*;
+import io.github.moulberry.notenoughupdates.core.config.annotations.Category;
 import io.github.moulberry.notenoughupdates.core.config.gui.GuiPositionEditor;
 import io.github.moulberry.notenoughupdates.miscgui.GuiEnchantColour;
 import io.github.moulberry.notenoughupdates.miscgui.GuiInvButtonEditor;
 import io.github.moulberry.notenoughupdates.miscgui.NEUOverlayPlacements;
 import io.github.moulberry.notenoughupdates.options.seperateSections.*;
-import io.github.moulberry.notenoughupdates.overlays.*;
+import io.github.moulberry.notenoughupdates.overlays.MiningOverlay;
+import io.github.moulberry.notenoughupdates.overlays.OverlayManager;
+import io.github.moulberry.notenoughupdates.overlays.TextOverlay;
 import io.github.moulberry.notenoughupdates.util.SBInfo;
 import net.minecraft.client.Minecraft;
 import net.minecraftforge.client.ClientCommandHandler;
@@ -86,10 +88,7 @@ public class NEUConfig extends Config {
                 editOverlay(activeConfigCategory, OverlayManager.bonemerangOverlay, itemOverlays.bonemerangPosition);
                 return;
             case 10:
-                editOverlay(activeConfigCategory, OverlayManager.automatonOverlay, mining.automatonOverlayPosition);
-                return;
-            case 11:
-                editOverlay(activeConfigCategory, OverlayManager.divanMinesOverlay, mining.divanMinesOverlayPosition);
+                editOverlay(activeConfigCategory, OverlayManager.crystalHollowOverlay, mining.crystalHollowOverlayPosition);
         }
     }
 
@@ -339,23 +338,29 @@ public class NEUConfig extends Config {
 
         @Expose public int commissionMilestone = 0;
 
-        @Expose public HashMap<String, Boolean> automatonParts = new HashMap<>();
-
-        @Expose public HashMap<String, Boolean> divanMinesParts = new HashMap<>();
-
-        public HiddenProfileSpecific(){
-            automatonParts.putIfAbsent("Electron Transmitter", false);
-            automatonParts.putIfAbsent("FTX 3070", false);
-            automatonParts.putIfAbsent("Robotron Reflector", false);
-            automatonParts.putIfAbsent("Superlite Motor", false);
-            automatonParts.putIfAbsent("Control Switch", false);
-            automatonParts.putIfAbsent("Synthetic Heart", false);
-
-            divanMinesParts.putIfAbsent("Scavenged Lapis Sword", false);
-            divanMinesParts.putIfAbsent("Scavenged Golden Hammer", false);
-            divanMinesParts.putIfAbsent("Scavenged Diamond Axe", false);
-            divanMinesParts.putIfAbsent("Scavenged Emerald Hammer", false);
-        }
+        @Expose public HashMap<String, Boolean> automatonParts = new HashMap<String, Boolean>(){{
+            put("Electron Transmitter", false);
+            put("FTX 3070", false);
+            put("Robotron Reflector", false);
+            put("Superlite Motor", false);
+            put("Control Switch", false);
+            put("Synthetic Heart", false);
+        }};
+
+        @Expose public HashMap<String, Boolean> divanMinesParts = new HashMap<String, Boolean>(){{
+            put("Scavenged Lapis Sword", false);
+            put("Scavenged Golden Hammer", false);
+            put("Scavenged Diamond Axe", false);
+            put("Scavenged Emerald Hammer", false);
+        }};
+
+        @Expose public HashMap<String, Integer> crystals = new HashMap<String, Integer>(){{
+            put("Jade", 0);
+            put("Amber", 0);
+            put("Amethyst", 0);
+            put("Sapphire", 0);
+            put("Topaz", 0);
+        }};
     }
 
     public static List<InventoryButton> createDefaultInventoryButtons() {