Upgrade to 1.13.2

[BoundingBoxOutlineReloaded.git] / src / main / java / com / irtimaled / bbor / client / gui / SettingsScreen.java

diff --git a/src/main/java/com/irtimaled/bbor/client/gui/SettingsScreen.java b/src/main/java/com/irtimaled/bbor/client/gui/SettingsScreen.java
index 1d751fb5d09cba887ee719b9870b84b85dad70e2..f2af58f5a86e05825bc4fc8eb1e273f73a20e8e3 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/gui/SettingsScreen.java
+++ b/src/main/java/com/irtimaled/bbor/client/gui/SettingsScreen.java
@@ -1,6 +1,5 @@
 package com.irtimaled.bbor.client.gui;
 
-import com.irtimaled.bbor.client.ClientProxy;
 import com.irtimaled.bbor.client.ClientRenderer;
 import com.irtimaled.bbor.client.renderers.Renderer;
 import com.irtimaled.bbor.common.BoundingBoxType;
@@ -40,7 +39,7 @@ public class SettingsScreen extends GuiScreen {
 
     private void addControl(IRenderableControl control) {
         this.controls.add(control);
-        TypeHelper.doIfType(control, IGuiEventListener.class, this.eventListeners::add);
+        TypeHelper.doIfType(control, IGuiEventListener.class, this.children::add);
     }
 
     private void addTabs(String... labels) {
@@ -131,8 +130,6 @@ public class SettingsScreen extends GuiScreen {
                 (id, x, y, width) -> new BoolSettingButton(id, x, y, width, "Outer Box Only", ConfigManager.outerBoxesOnly),
                 (id, x, y, width) -> new BoolSettingButton(id, x, y, width, "Fill", ConfigManager.fill),
 
-                (id, x, y, width) -> (IRowHeight) () -> 0.5,
-
                 (id, x, y, width) -> new BoundingBoxTypeButton(id, x, y, width, "Spawn Chunks", BoundingBoxType.WorldSpawn),
                 (id, x, y, width) -> new BoundingBoxTypeButton(id, x, y, width, "Lazy Chunks", BoundingBoxType.LazySpawnChunks),
                 (id, x, y, width) -> new MaxYSettingSlider(id, x, y, width, 39, ConfigManager.worldSpawnMaxY),
@@ -143,7 +140,21 @@ public class SettingsScreen extends GuiScreen {
 
                 (id, x, y, width) -> new BoundingBoxTypeButton(id, x, y, width, "Mob Spawners", BoundingBoxType.MobSpawner),
                 (id, x, y, width) -> new BoolSettingButton(id, x, y, width, "Spawn Area", ConfigManager.renderMobSpawnerSpawnArea),
-                (id, x, y, width) -> new BoolSettingButton(id, x, y, width, "Activation Lines", ConfigManager.renderMobSpawnerActivationLines));
+                (id, x, y, width) -> new BoolSettingButton(id, x, y, width, "Activation Lines", ConfigManager.renderMobSpawnerActivationLines),
+
+                (id, x, y, width) -> new BoundingBoxTypeButton(id, x, y, width, "Spawn Sphere", BoundingBoxType.AFKSphere),
+                (id, x, y, width) -> new BoolSettingButton(id, x, y, width, "Spawnable Blocks", ConfigManager.renderAFKSpawnableBlocks),
+                (id, x, y, width) -> new IntSettingSlider(id, x, y, width, 1, 3, "Distance", ConfigManager.afkSpawnableBlocksRenderDistance)
+                        .addDisplayValue(1, "Nearest")
+                        .addDisplayValue(2, "Nearer")
+                        .addDisplayValue(3, "Normal"),
+
+                (id, x, y, width) -> new BoundingBoxTypeButton(id, x, y, width, "Biome Borders", BoundingBoxType.BiomeBorder),
+                (id, x, y, width) -> new BoolSettingButton(id, x, y, width, "Only This Biome", ConfigManager.renderOnlyCurrentBiome),
+                (id, x, y, width) -> new IntSettingSlider(id, x, y, width, 1, 3, "Distance", ConfigManager.biomeBordersRenderDistance)
+                        .addDisplayValue(1, "Nearest")
+                        .addDisplayValue(2, "Nearer")
+                        .addDisplayValue(3, "Normal"));
         buildTab(1,
                 (id, x, y, width) -> new BoundingBoxTypeButton(id, x, y, width, "Desert Temples", BoundingBoxType.DesertTemple),
                 (id, x, y, width) -> new BoundingBoxTypeButton(id, x, y, width, "Jungle Temples", BoundingBoxType.JungleTemple),