Tidy up constructors on simple boxes

diff --git a/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxBeacon.java b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxBeacon.java
index f6e11949747179621c019ec39d641a1d1e6e1bf8..cb285aea5047bf443d5cda7af8fe29725a6d9be4 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxBeacon.java
+++ b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxBeacon.java
@@ -8,15 +8,14 @@ public class BoundingBoxBeacon extends BoundingBoxCuboid {
     private final Coords coords;
     private final int level;
 
-    private BoundingBoxBeacon(Coords coords, Coords minCoords, Coords maxCoords, int level, BoundingBoxType beacon) {
-        super(minCoords, maxCoords, beacon);
+    private BoundingBoxBeacon(Coords coords, Coords minCoords, Coords maxCoords, int level, BoundingBoxType type) {
+        super(minCoords, maxCoords, type);
         this.coords = coords;
         this.level = level;
     }
 
     public static BoundingBoxBeacon from(Coords coords, int level) {
-        BoundingBoxType type = BoundingBoxType.Beacon;
-        return from(coords, level, type);
+        return from(coords, level, BoundingBoxType.Beacon);
     }
 
     public static BoundingBoxBeacon from(Coords coords, int level, BoundingBoxType type) {

diff --git a/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxBiomeBorder.java b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxBiomeBorder.java
index c8f7e5e3c902908b03fade24774022136e2d6c96..63c92e1bcb3b372da536c751056279eb83e4ede5 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxBiomeBorder.java
+++ b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxBiomeBorder.java
@@ -11,7 +11,7 @@ public class BoundingBoxBiomeBorder extends AbstractBoundingBox {
     private final boolean south;
     private final boolean west;
 
-    private BoundingBoxBiomeBorder(Coords coords, boolean north, boolean east, boolean south, boolean west) {
+    public BoundingBoxBiomeBorder(Coords coords, boolean north, boolean east, boolean south, boolean west) {
         super(BoundingBoxType.BiomeBorder);
         this.coords = coords;
         this.north = north;
@@ -20,10 +20,6 @@ public class BoundingBoxBiomeBorder extends AbstractBoundingBox {
         this.west = west;
     }
 
-    public static BoundingBoxBiomeBorder from(Coords coords, boolean north, boolean east, boolean south, boolean west) {
-        return new BoundingBoxBiomeBorder(coords, north, east, south, west);
-    }
-
     @Override
     public Boolean intersectsBounds(int minX, int minZ, int maxX, int maxZ) {
         return coords.getX() >= minX &&

diff --git a/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxConduit.java b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxConduit.java
index ecf9d47cb28ed7fa889981bcfe90996a34269cfe..4df25b21fb648e216d6fb429a13e2d13268690bf 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxConduit.java
+++ b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxConduit.java
@@ -13,9 +13,8 @@ public class BoundingBoxConduit extends BoundingBoxSphere {
         this.level = level;
     }
 
-    public static BoundingBoxConduit from(Coords coords, int level) {
-        int radius = 16 * level;
-        return new BoundingBoxConduit(coords, level, radius);
+    public BoundingBoxConduit(Coords coords, int level) {
+        this(coords, level, 16 * level);
     }
 
     @Override

diff --git a/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxSlimeChunk.java b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxSlimeChunk.java
index dce0ad470b19710403c30736b3a6429a4e1c7e68..c7249f28942408b367d77636a9918126a1f59e32 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxSlimeChunk.java
+++ b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxSlimeChunk.java
@@ -5,11 +5,7 @@ import com.irtimaled.bbor.common.models.BoundingBoxCuboid;
 import com.irtimaled.bbor.common.models.Coords;
 
 public class BoundingBoxSlimeChunk extends BoundingBoxCuboid {
-    private BoundingBoxSlimeChunk(Coords minCoords, Coords maxCoords) {
+    public BoundingBoxSlimeChunk(Coords minCoords, Coords maxCoords) {
         super(minCoords, maxCoords, BoundingBoxType.SlimeChunks);
     }
-
-    public static BoundingBoxSlimeChunk from(Coords minCoords, Coords maxCoords) {
-        return new BoundingBoxSlimeChunk(minCoords, maxCoords);
-    }
 }

diff --git a/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxWorldSpawn.java b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxWorldSpawn.java
index d66cdad8a60d6513ec83880abab87f850c4f1433..7715a427930f6095fb57d97c74a478c8572623b0 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxWorldSpawn.java
+++ b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxWorldSpawn.java
@@ -5,11 +5,7 @@ import com.irtimaled.bbor.common.models.BoundingBoxCuboid;
 import com.irtimaled.bbor.common.models.Coords;
 
 public class BoundingBoxWorldSpawn extends BoundingBoxCuboid {
-    private BoundingBoxWorldSpawn(Coords minCoords, Coords maxCoords, BoundingBoxType type) {
+    public BoundingBoxWorldSpawn(Coords minCoords, Coords maxCoords, BoundingBoxType type) {
         super(minCoords, maxCoords, type);
     }
-
-    public static BoundingBoxWorldSpawn from(Coords minCoords, Coords maxCoords, BoundingBoxType type) {
-        return new BoundingBoxWorldSpawn(minCoords, maxCoords, type);
-    }
 }

diff --git a/src/main/java/com/irtimaled/bbor/client/providers/BiomeBorderProvider.java b/src/main/java/com/irtimaled/bbor/client/providers/BiomeBorderProvider.java
index 34990ecdac8301bd5e8d0b123e5f04a5d8c1c7aa..7776c774b893cc635fc3d0413b72a222e705a5fa 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/providers/BiomeBorderProvider.java
+++ b/src/main/java/com/irtimaled/bbor/client/providers/BiomeBorderProvider.java
@@ -93,7 +93,7 @@ public class BiomeBorderProvider implements IBoundingBoxProvider<BoundingBoxBiom
                         boolean south = biomeIds[matchX][matchZ + 1] != biomeId;
                         boolean west = biomeIds[matchX - 1][matchZ] != biomeId;
                         if (north || east || south || west) {
-                            borders.put(coords, BoundingBoxBiomeBorder.from(coords, north, east, south, west));
+                            borders.put(coords, new BoundingBoxBiomeBorder(coords, north, east, south, west));
                         }
                     }
                 }

diff --git a/src/main/java/com/irtimaled/bbor/client/providers/ConduitProvider.java b/src/main/java/com/irtimaled/bbor/client/providers/ConduitProvider.java
index f860a0f51c4f8931706ef3497858bfc3ca5c818f..38de01f09d40f322ce2914144ef82f8d0880eb37 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/providers/ConduitProvider.java
+++ b/src/main/java/com/irtimaled/bbor/client/providers/ConduitProvider.java
@@ -29,7 +29,8 @@ public class ConduitProvider implements IBoundingBoxProvider<BoundingBoxConduit>
             if (blocks == null) return null;
 
             Coords coords = new Coords(conduit.getPos());
-            return BoundingBoxConduit.from(coords, conduit.isActive() ? blocks.size() / 7 : 0);
+            int level = conduit.isActive() ? blocks.size() / 7 : 0;
+            return new BoundingBoxConduit(coords, level);
         });
     }
 }

diff --git a/src/main/java/com/irtimaled/bbor/client/providers/SlimeChunkProvider.java b/src/main/java/com/irtimaled/bbor/client/providers/SlimeChunkProvider.java
index 2b9c600526eb3b73005cbcddc30c5ff21b82919e..7899b2192bf514960705fca02aa24403f581fdaf 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/providers/SlimeChunkProvider.java
+++ b/src/main/java/com/irtimaled/bbor/client/providers/SlimeChunkProvider.java
@@ -53,7 +53,7 @@ public class SlimeChunkProvider implements IBoundingBoxProvider<BoundingBoxSlime
                     int chunkZStart = chunkZ << 4;
                     Coords minCoords = new Coords(chunkXStart, 1, chunkZStart);
                     Coords maxCoords = new Coords(chunkXStart + 15, 38, chunkZStart + 15);
-                    slimeChunks.add(BoundingBoxSlimeChunk.from(minCoords, maxCoords));
+                    slimeChunks.add(new BoundingBoxSlimeChunk(minCoords, maxCoords));
                 }
             }
         }

diff --git a/src/main/java/com/irtimaled/bbor/client/providers/WorldSpawnProvider.java b/src/main/java/com/irtimaled/bbor/client/providers/WorldSpawnProvider.java
index b3884c939f6ee7657496f460335ca6b3b6553a8d..bdccbf5b96466d2620b1a7ac81743721b1b93e82 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/providers/WorldSpawnProvider.java
+++ b/src/main/java/com/irtimaled/bbor/client/providers/WorldSpawnProvider.java
@@ -31,7 +31,7 @@ public class WorldSpawnProvider implements IBoundingBoxProvider<BoundingBoxWorld
         Coords minCoords = new Coords(spawnX - 10, 0, spawnZ - 10);
         Coords maxCoords = new Coords(spawnX + 10, 0, spawnZ + 10);
 
-        return BoundingBoxWorldSpawn.from(minCoords, maxCoords, BoundingBoxType.WorldSpawn);
+        return new BoundingBoxWorldSpawn(minCoords, maxCoords, BoundingBoxType.WorldSpawn);
     }
 
     private static BoundingBoxWorldSpawn buildSpawnChunksBoundingBox(int spawnX, int spawnZ, int size, BoundingBoxType type) {
@@ -46,7 +46,7 @@ public class WorldSpawnProvider implements IBoundingBoxProvider<BoundingBoxWorld
             midZ -= CHUNK_SIZE;
         }
         Coords minCoords = new Coords(midX - midOffset, 0, midZ - midOffset);
-        return BoundingBoxWorldSpawn.from(minCoords, maxCoords, type);
+        return new BoundingBoxWorldSpawn(minCoords, maxCoords, type);
     }
 
     @Override