Add new 1.16 structures

diff --git a/src/main/java/com/irtimaled/bbor/client/providers/CustomBoxProvider.java b/src/main/java/com/irtimaled/bbor/client/providers/CustomBoxProvider.java
index e3b35880caa683ef1662d9dea3f315988df762ff..b44e77a17a436a78d1aaa348847359e85fa599ac 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/providers/CustomBoxProvider.java
+++ b/src/main/java/com/irtimaled/bbor/client/providers/CustomBoxProvider.java
@@ -10,7 +10,7 @@ import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class CustomBoxProvider implements IBoundingBoxProvider<BoundingBoxCuboid> {
-    private final static Map<Integer, Map<Integer, BoundingBoxCuboid>> dimensionCache = new HashMap<>();
+    private static final Map<Integer, Map<Integer, BoundingBoxCuboid>> dimensionCache = new HashMap<>();
 
     private static int getHashKey(Coords minCoords, Coords maxCoords) {
         return (31 + minCoords.hashCode()) * 31 + maxCoords.hashCode();

diff --git a/src/main/java/com/irtimaled/bbor/common/BoundingBoxType.java b/src/main/java/com/irtimaled/bbor/common/BoundingBoxType.java
index b3337db613d1a892ce89e21b7082bf003d1b8a83..1f625c4233aef67b3592764a34d2d2d675430527 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/common/BoundingBoxType.java
+++ b/src/main/java/com/irtimaled/bbor/common/BoundingBoxType.java
@@ -35,6 +35,9 @@ public class BoundingBoxType {
     public static final BoundingBoxType AFKSphere = register(Color.RED, "AFK Sphere", ConfigManager.drawAFKSpheres);
     public static final BoundingBoxType BiomeBorder = register(Color.GREEN, "Biome Border", ConfigManager.drawBiomeBorders);
     public static final BoundingBoxType Beacon = register(Color.WHITE, "Beacon", ConfigManager.drawBeacons);
+    public static final BoundingBoxType NetherFossil = register(Color.WHITE, "Nether_Fossil", ConfigManager.drawNetherFossils);
+    public static final BoundingBoxType BastionRemnant = register(Color.LIGHT_GRAY, "Bastion_Remnant", ConfigManager.drawBastionRemnants);
+    public static final BoundingBoxType RuinedPortal = register(Colors.COOL_PURPLE, "Ruined_Portal", ConfigManager.drawRuinedPortals);
     public static final BoundingBoxType Custom = register(Color.WHITE, "Custom", ConfigManager.drawCustomBoxes);
 
     private static BoundingBoxType register(Color color, String name, Setting<Boolean> shouldRenderSetting) {

diff --git a/src/main/java/com/irtimaled/bbor/common/models/Colors.java b/src/main/java/com/irtimaled/bbor/common/models/Colors.java
index 06d896834619b5cd39d4d5e34e28e460b505ae77..6fd0f69baeea7e2c8d5f974370d971c27b0d757f 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/common/models/Colors.java
+++ b/src/main/java/com/irtimaled/bbor/common/models/Colors.java
@@ -7,4 +7,5 @@ public class Colors {
     public static final Color DARK_GREEN = new Color(0, 96, 0);
     public static final Color BROWN = new Color(139, 69, 19);
     public static final Color PURPLE = new Color(128, 0, 128);
+    public static final Color COOL_PURPLE = new Color(200, 0, 255);
 }

diff --git a/src/main/java/com/irtimaled/bbor/config/ConfigManager.java b/src/main/java/com/irtimaled/bbor/config/ConfigManager.java
index 26f14215836bacd96886790c47b2f5de8760a9ec..633fdac5f063b358613ee539de890500ba1338b0 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/config/ConfigManager.java
+++ b/src/main/java/com/irtimaled/bbor/config/ConfigManager.java
@@ -49,6 +49,9 @@ public class ConfigManager {
     public static Setting<Boolean> renderOnlyCurrentBiome;
     public static Setting<Integer> biomeBordersRenderDistance;
     public static Setting<Integer> biomeBordersMaxY;
+    public static Setting<Boolean> drawNetherFossils;
+    public static Setting<Boolean> drawBastionRemnants;
+    public static Setting<Boolean> drawRuinedPortals;
 
     public static void loadConfig(File mcConfigDir) {
         configDir = new File(mcConfigDir, "config");
@@ -87,6 +90,9 @@ public class ConfigManager {
         drawOceanRuins = setup(config, "structures", "drawOceanRuins", true, "If set to true ocean ruins will be drawn.");
         drawBuriedTreasure = setup(config, "structures", "drawBuriedTreasures", true, "If set to true buried treasure will be drawn.");
         drawPillagerOutposts = setup(config, "structures", "drawPillagerOutposts", true, "If set to true pillager outposts will be drawn.");
+        drawNetherFossils = setup(config, "structures", "drawNetherFossils", true, "If set to true nether fossils will be drawn.");
+        drawBastionRemnants = setup(config, "structures", "drawBastionRemnants", true, "If set to true bastion remnants will be drawn.");
+        drawRuinedPortals = setup(config, "structures", "drawRuinedPortals", true, "If set to true ruined portals will be drawn.");
 
         drawSlimeChunks = setup(config, "slimeChunks", "drawSlimeChunks", true, "If set to true slime chunks bounding boxes are drawn.");
         slimeChunkMaxY = setup(config, "slimeChunks", "slimeChunkMaxY", -1, "The maximum top of the slime chunk bounding box. If set to -1 it will use the value when activated, if set to 0 it will always track the player's feet.");

diff --git a/src/main/resources/assets/bbor/lang/en_us.json b/src/main/resources/assets/bbor/lang/en_us.json
index cd3170719cb020389efc4e791831e0c12e286cea..08be1a8b22449b4a8187c1342d2b2266c61a5270 100644 (file)
--- a/src/main/resources/assets/bbor/lang/en_us.json
+++ b/src/main/resources/assets/bbor/lang/en_us.json
@@ -44,6 +44,10 @@
   "bbor.structures.pillagerOutposts": "Pillager Outposts",
   "bbor.structures.villages": "Villages",
   "bbor.structures.fortresses": "Fortresses",
+  "bbor.structures.endCities": "End Cities",
+  "bbor.structures.netherFossils": "Nether Fossils",
+  "bbor.structures.bastionRemnants": "Bastion Remnants",
+  "bbor.structures.ruinedPortal": "Ruined Portals",
 
   "bbor.features.villageSpheres": "Village Spheres",
   "bbor.features.villageSpheres.doorLines": "Door Lines",