Move client only boxes to client only namespace

diff --git a/src/main/java/com/irtimaled/bbor/client/ClientRenderer.java b/src/main/java/com/irtimaled/bbor/client/ClientRenderer.java
index f69096e92c5efd499222d80fe39bc060d3fe9ac9..e1774733889a34790dd9ebf8c0cd6510a12eed0c 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/ClientRenderer.java
+++ b/src/main/java/com/irtimaled/bbor/client/ClientRenderer.java
@@ -1,11 +1,13 @@
 package com.irtimaled.bbor.client;
 
 import com.irtimaled.bbor.client.interop.ClientInterop;
-import com.irtimaled.bbor.client.models.BoundingBoxConduit;
+import com.irtimaled.bbor.client.models.*;
 import com.irtimaled.bbor.client.providers.*;
 import com.irtimaled.bbor.client.renderers.*;
 import com.irtimaled.bbor.common.MathHelper;
-import com.irtimaled.bbor.common.models.*;
+import com.irtimaled.bbor.common.models.AbstractBoundingBox;
+import com.irtimaled.bbor.common.models.BoundingBoxCuboid;
+import com.irtimaled.bbor.common.models.BoundingBoxVillage;
 import com.irtimaled.bbor.config.ConfigManager;
 import org.lwjgl.opengl.GL11;
 

diff --git a/src/main/java/com/irtimaled/bbor/client/interop/SpawningSphereHelper.java b/src/main/java/com/irtimaled/bbor/client/interop/SpawningSphereHelper.java
index bc99aef1dcb19ddc0527ef04b7a8dc9e5b4dbe87..b937f21315e6532cd5587351e7879aae6bd531fe 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/interop/SpawningSphereHelper.java
+++ b/src/main/java/com/irtimaled/bbor/client/interop/SpawningSphereHelper.java
@@ -1,7 +1,7 @@
 package com.irtimaled.bbor.client.interop;
 
+import com.irtimaled.bbor.client.models.BoundingBoxSpawningSphere;
 import com.irtimaled.bbor.client.models.Point;
-import com.irtimaled.bbor.common.models.BoundingBoxSpawningSphere;
 import com.irtimaled.bbor.common.models.Coords;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;

diff --git a/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxBeacon.java b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxBeacon.java
new file mode 100644 (file)
index 0000000..2bdfe8b
--- /dev/null
+++ b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxBeacon.java
@@ -0,0 +1,44 @@
+package com.irtimaled.bbor.client.models;
+
+import com.irtimaled.bbor.common.BoundingBoxType;
+import com.irtimaled.bbor.common.models.BoundingBoxCuboid;
+import com.irtimaled.bbor.common.models.Coords;
+
+public class BoundingBoxBeacon extends BoundingBoxCuboid {
+    private final Coords coords;
+    private final int level;
+
+    private BoundingBoxBeacon(Coords coords, Coords minCoords, Coords maxCoords, int level) {
+        super(minCoords, maxCoords, BoundingBoxType.Beacon);
+        this.coords = coords;
+        this.level = level;
+    }
+
+    public static BoundingBoxBeacon from(Coords coords, int level) {
+        int range = 10 + (10 * level);
+        Coords minCoords = new Coords(coords.getX() - range, coords.getY() - range, coords.getZ() - range);
+        Coords maxCoords = new Coords(coords.getX() + range, 324 + range, coords.getZ() + range);
+        return new BoundingBoxBeacon(coords, minCoords, maxCoords, level);
+    }
+
+    @Override
+    public int hashCode() {
+        return coords.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (obj == null || getClass() != obj.getClass()) return false;
+        BoundingBoxBeacon other = (BoundingBoxBeacon) obj;
+        return coords.equals(other.coords);
+    }
+
+    public Coords getCoords() {
+        return coords;
+    }
+
+    public int getLevel() {
+        return level;
+    }
+}

diff --git a/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxBiomeBorder.java b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxBiomeBorder.java
new file mode 100644 (file)
index 0000000..77b81c7
--- /dev/null
+++ b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxBiomeBorder.java
@@ -0,0 +1,55 @@
+package com.irtimaled.bbor.client.models;
+
+import com.irtimaled.bbor.common.BoundingBoxType;
+import com.irtimaled.bbor.common.models.AbstractBoundingBox;
+import com.irtimaled.bbor.common.models.Coords;
+
+public class BoundingBoxBiomeBorder extends AbstractBoundingBox {
+    private final Coords coords;
+    private final boolean north;
+    private final boolean east;
+    private final boolean south;
+    private final boolean west;
+
+    private BoundingBoxBiomeBorder(Coords coords, boolean north, boolean east, boolean south, boolean west) {
+        super(BoundingBoxType.Custom);
+        this.coords = coords;
+        this.north = north;
+        this.east = east;
+        this.south = south;
+        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 &&
+                coords.getZ() >= minZ &&
+                coords.getX() <= maxX &&
+                coords.getZ() <= maxZ;
+    }
+
+    public Coords getCoords() {
+        return coords;
+    }
+
+    public boolean renderNorth() {
+        return north;
+    }
+
+    public boolean renderEast() {
+        return east;
+    }
+
+    public boolean renderSouth() {
+        return south;
+    }
+
+    public boolean renderWest() {
+        return west;
+    }
+
+}

diff --git a/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxMobSpawner.java b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxMobSpawner.java
new file mode 100644 (file)
index 0000000..cc6c76a
--- /dev/null
+++ b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxMobSpawner.java
@@ -0,0 +1,28 @@
+package com.irtimaled.bbor.client.models;
+
+import com.irtimaled.bbor.common.BoundingBoxType;
+import com.irtimaled.bbor.common.models.BoundingBoxCuboid;
+import com.irtimaled.bbor.common.models.Coords;
+
+public class BoundingBoxMobSpawner extends BoundingBoxCuboid {
+    private final Coords coords;
+
+    private BoundingBoxMobSpawner(Coords coords, Coords minCoords, Coords maxCoords) {
+        super(minCoords, maxCoords, BoundingBoxType.MobSpawner);
+        this.coords = coords;
+    }
+
+    public static BoundingBoxMobSpawner from(Coords coords) {
+        Coords minCoords = new Coords(coords.getX() - 5,
+                coords.getY() - 1,
+                coords.getZ() - 5);
+        Coords maxCoords = new Coords(coords.getX() + 5,
+                coords.getY() + 2,
+                coords.getZ() + 5);
+        return new BoundingBoxMobSpawner(coords, minCoords, maxCoords);
+    }
+
+    public Coords getCoords() {
+        return coords;
+    }
+}

diff --git a/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxSlimeChunk.java b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxSlimeChunk.java
new file mode 100644 (file)
index 0000000..dce0ad4
--- /dev/null
+++ b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxSlimeChunk.java
@@ -0,0 +1,15 @@
+package com.irtimaled.bbor.client.models;
+
+import com.irtimaled.bbor.common.BoundingBoxType;
+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) {
+        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/BoundingBoxSpawningSphere.java b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxSpawningSphere.java
new file mode 100644 (file)
index 0000000..dd5c76a
--- /dev/null
+++ b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxSpawningSphere.java
@@ -0,0 +1,32 @@
+package com.irtimaled.bbor.client.models;
+
+import com.irtimaled.bbor.common.BoundingBoxType;
+import com.irtimaled.bbor.common.models.BoundingBoxSphere;
+import com.irtimaled.bbor.common.models.Coords;
+
+public class BoundingBoxSpawningSphere extends BoundingBoxSphere {
+    public static final int SAFE_RADIUS = 24;
+    public static final int SPAWN_RADIUS = 128;
+
+    private Integer spawnableCount;
+
+    public BoundingBoxSpawningSphere(Coords coords, double xOffset, double yOffset, double zOffset) {
+        super(coords, 128, BoundingBoxType.AFKSphere);
+        setCenterOffsets(xOffset, yOffset, zOffset);
+    }
+
+    public boolean isCenter(Coords coords, double xOffset, double yOffset, double zOffset) {
+        return this.getCenter().equals(coords) &&
+                this.getCenterOffsetX() == xOffset &&
+                this.getCenterOffsetY() == yOffset &&
+                this.getCenterOffsetZ() == zOffset;
+    }
+
+    public void setSpawnableCount(int count) {
+        this.spawnableCount = count;
+    }
+
+    public Integer getSpawnableSpacesCount() {
+        return this.spawnableCount;
+    }
+}

diff --git a/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxWorldSpawn.java b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxWorldSpawn.java
new file mode 100644 (file)
index 0000000..d66cdad
--- /dev/null
+++ b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxWorldSpawn.java
@@ -0,0 +1,15 @@
+package com.irtimaled.bbor.client.models;
+
+import com.irtimaled.bbor.common.BoundingBoxType;
+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) {
+        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/BeaconProvider.java b/src/main/java/com/irtimaled/bbor/client/providers/BeaconProvider.java
index 1512d05bc595597e58d12e9fd0b0e75a81fef980..98071a144d58e8d52a27f029d0ccbb4f93d2cee6 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/providers/BeaconProvider.java
+++ b/src/main/java/com/irtimaled/bbor/client/providers/BeaconProvider.java
@@ -1,7 +1,7 @@
 package com.irtimaled.bbor.client.providers;
 
 import com.irtimaled.bbor.client.interop.TileEntitiesHelper;
-import com.irtimaled.bbor.common.models.BoundingBoxBeacon;
+import com.irtimaled.bbor.client.models.BoundingBoxBeacon;
 import com.irtimaled.bbor.common.models.Coords;
 import net.minecraft.tileentity.TileEntityBeacon;
 

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 feaefcac0b962fcc2acf257a8a731544b245dc1e..f5723c1f056452ddb2d42cb3be7fed68e1eddcba 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/providers/BiomeBorderProvider.java
+++ b/src/main/java/com/irtimaled/bbor/client/providers/BiomeBorderProvider.java
@@ -2,9 +2,9 @@ package com.irtimaled.bbor.client.providers;
 
 import com.irtimaled.bbor.client.Player;
 import com.irtimaled.bbor.client.interop.BiomeBorderHelper;
+import com.irtimaled.bbor.client.models.BoundingBoxBiomeBorder;
 import com.irtimaled.bbor.common.BoundingBoxType;
 import com.irtimaled.bbor.common.MathHelper;
-import com.irtimaled.bbor.common.models.BoundingBoxBiomeBorder;
 import com.irtimaled.bbor.common.models.Coords;
 import com.irtimaled.bbor.config.ConfigManager;
 

diff --git a/src/main/java/com/irtimaled/bbor/client/providers/CustomBeaconProvider.java b/src/main/java/com/irtimaled/bbor/client/providers/CustomBeaconProvider.java
index 7c58052e9f6362298c881fa580be39b48ce433ac..adba3b5cacb2d75488cd63ed9ee1de72bf436c27 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/providers/CustomBeaconProvider.java
+++ b/src/main/java/com/irtimaled/bbor/client/providers/CustomBeaconProvider.java
@@ -1,7 +1,7 @@
 package com.irtimaled.bbor.client.providers;
 
 import com.irtimaled.bbor.client.Player;
-import com.irtimaled.bbor.common.models.BoundingBoxBeacon;
+import com.irtimaled.bbor.client.models.BoundingBoxBeacon;
 import com.irtimaled.bbor.common.models.Coords;
 
 import java.util.HashMap;

diff --git a/src/main/java/com/irtimaled/bbor/client/providers/MobSpawnerProvider.java b/src/main/java/com/irtimaled/bbor/client/providers/MobSpawnerProvider.java
index 4fd787a700ab9b5c81b82bd48fb9c89ff4c8e7f8..16a56ec4ab8a03593cafa1cfef379bbd7919b6e6 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/providers/MobSpawnerProvider.java
+++ b/src/main/java/com/irtimaled/bbor/client/providers/MobSpawnerProvider.java
@@ -1,7 +1,7 @@
 package com.irtimaled.bbor.client.providers;
 
 import com.irtimaled.bbor.client.interop.TileEntitiesHelper;
-import com.irtimaled.bbor.common.models.BoundingBoxMobSpawner;
+import com.irtimaled.bbor.client.models.BoundingBoxMobSpawner;
 import com.irtimaled.bbor.common.models.Coords;
 import net.minecraft.tileentity.TileEntityMobSpawner;
 

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 c2a7321095524c3b5e209fcee2b5bde1ba63c204..a41b6836e810886d5c01896052acc0481c2f89fc 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/providers/SlimeChunkProvider.java
+++ b/src/main/java/com/irtimaled/bbor/client/providers/SlimeChunkProvider.java
@@ -2,10 +2,10 @@ package com.irtimaled.bbor.client.providers;
 
 import com.irtimaled.bbor.client.Player;
 import com.irtimaled.bbor.client.interop.ClientInterop;
+import com.irtimaled.bbor.client.models.BoundingBoxSlimeChunk;
 import com.irtimaled.bbor.common.BoundingBoxType;
 import com.irtimaled.bbor.common.Dimensions;
 import com.irtimaled.bbor.common.MathHelper;
-import com.irtimaled.bbor.common.models.BoundingBoxSlimeChunk;
 import com.irtimaled.bbor.common.models.Coords;
 
 import java.util.HashSet;

diff --git a/src/main/java/com/irtimaled/bbor/client/providers/SpawningSphereProvider.java b/src/main/java/com/irtimaled/bbor/client/providers/SpawningSphereProvider.java
index 7b9460cbd559b56e0009ec7afbbdd6c3e080de36..02a452a636e377bfff94eeb3d6ccec01ce1c9b00 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/providers/SpawningSphereProvider.java
+++ b/src/main/java/com/irtimaled/bbor/client/providers/SpawningSphereProvider.java
@@ -2,9 +2,9 @@ package com.irtimaled.bbor.client.providers;
 
 import com.irtimaled.bbor.client.Player;
 import com.irtimaled.bbor.client.interop.SpawningSphereHelper;
+import com.irtimaled.bbor.client.models.BoundingBoxSpawningSphere;
 import com.irtimaled.bbor.client.models.Point;
 import com.irtimaled.bbor.common.MathHelper;
-import com.irtimaled.bbor.common.models.BoundingBoxSpawningSphere;
 import com.irtimaled.bbor.common.models.Coords;
 
 public class SpawningSphereProvider implements IBoundingBoxProvider<BoundingBoxSpawningSphere> {

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 d6b69f7dac0184beb20ad8587f8cc46d7a7da95a..560423e8b42587c1c353f684e71c86fb9fc4d6b9 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/providers/WorldSpawnProvider.java
+++ b/src/main/java/com/irtimaled/bbor/client/providers/WorldSpawnProvider.java
@@ -1,8 +1,8 @@
 package com.irtimaled.bbor.client.providers;
 
+import com.irtimaled.bbor.client.models.BoundingBoxWorldSpawn;
 import com.irtimaled.bbor.common.BoundingBoxType;
 import com.irtimaled.bbor.common.Dimensions;
-import com.irtimaled.bbor.common.models.BoundingBoxWorldSpawn;
 import com.irtimaled.bbor.common.models.Coords;
 
 import java.util.HashSet;

diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/BeaconRenderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/BeaconRenderer.java
index b3183ab5aca704040b7b40dcefce79fea4c698e1..77b8bbd3ce9451129b4730404e61390522388955 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/renderers/BeaconRenderer.java
+++ b/src/main/java/com/irtimaled/bbor/client/renderers/BeaconRenderer.java
@@ -1,6 +1,6 @@
 package com.irtimaled.bbor.client.renderers;
 
-import com.irtimaled.bbor.common.models.BoundingBoxBeacon;
+import com.irtimaled.bbor.client.models.BoundingBoxBeacon;
 import com.irtimaled.bbor.common.models.Coords;
 
 import java.awt.*;

diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/BiomeBorderRenderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/BiomeBorderRenderer.java
index 7828981002c0990be8f12e3aaaf01148692faddb..8061b5ce483d240dfa93bfdd591e908364d066f1 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/renderers/BiomeBorderRenderer.java
+++ b/src/main/java/com/irtimaled/bbor/client/renderers/BiomeBorderRenderer.java
@@ -1,6 +1,6 @@
 package com.irtimaled.bbor.client.renderers;
 
-import com.irtimaled.bbor.common.models.BoundingBoxBiomeBorder;
+import com.irtimaled.bbor.client.models.BoundingBoxBiomeBorder;
 import com.irtimaled.bbor.common.models.Coords;
 import com.irtimaled.bbor.config.ConfigManager;
 

diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/MobSpawnerRenderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/MobSpawnerRenderer.java
index 3024f4266d69a30b8113e7fa6f88429b4c83e6f5..d3ac71cb022992e7375e8527ba9479aeb444ed06 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/renderers/MobSpawnerRenderer.java
+++ b/src/main/java/com/irtimaled/bbor/client/renderers/MobSpawnerRenderer.java
@@ -1,7 +1,7 @@
 package com.irtimaled.bbor.client.renderers;
 
 import com.irtimaled.bbor.client.Player;
-import com.irtimaled.bbor.common.models.BoundingBoxMobSpawner;
+import com.irtimaled.bbor.client.models.BoundingBoxMobSpawner;
 import com.irtimaled.bbor.common.models.Colors;
 import com.irtimaled.bbor.common.models.Coords;
 import com.irtimaled.bbor.config.ConfigManager;

diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/SlimeChunkRenderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/SlimeChunkRenderer.java
index 051f7f3baa058519971d950a6857c82c83c4c4d5..47dea57c853012fbbc9f8b5edefa2ecb1e4ba6c5 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/renderers/SlimeChunkRenderer.java
+++ b/src/main/java/com/irtimaled/bbor/client/renderers/SlimeChunkRenderer.java
@@ -1,7 +1,7 @@
 package com.irtimaled.bbor.client.renderers;
 
 import com.irtimaled.bbor.client.Player;
-import com.irtimaled.bbor.common.models.BoundingBoxSlimeChunk;
+import com.irtimaled.bbor.client.models.BoundingBoxSlimeChunk;
 import com.irtimaled.bbor.config.ConfigManager;
 
 import java.awt.*;

diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/SpawningSphereRenderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/SpawningSphereRenderer.java
index 85132e44681e098ae85e9f9ef4f127d76d69a75c..929ecb56bf859d05c241828e03f6b46e65438d73 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/renderers/SpawningSphereRenderer.java
+++ b/src/main/java/com/irtimaled/bbor/client/renderers/SpawningSphereRenderer.java
@@ -2,8 +2,8 @@ package com.irtimaled.bbor.client.renderers;
 
 import com.irtimaled.bbor.client.Player;
 import com.irtimaled.bbor.client.interop.SpawningSphereHelper;
+import com.irtimaled.bbor.client.models.BoundingBoxSpawningSphere;
 import com.irtimaled.bbor.common.MathHelper;
-import com.irtimaled.bbor.common.models.BoundingBoxSpawningSphere;
 import com.irtimaled.bbor.config.ConfigManager;
 import net.minecraft.client.resources.I18n;
 

diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/WorldSpawnRenderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/WorldSpawnRenderer.java
index 4bc93d953045669188f89f9bbcbe625c3936b8e4..921f01cc10ba5ff4b5fae3d1bb88e1fecf617c5d 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/renderers/WorldSpawnRenderer.java
+++ b/src/main/java/com/irtimaled/bbor/client/renderers/WorldSpawnRenderer.java
@@ -1,7 +1,7 @@
 package com.irtimaled.bbor.client.renderers;
 
 import com.irtimaled.bbor.client.Player;
-import com.irtimaled.bbor.common.models.BoundingBoxWorldSpawn;
+import com.irtimaled.bbor.client.models.BoundingBoxWorldSpawn;
 import com.irtimaled.bbor.common.models.Coords;
 import com.irtimaled.bbor.config.ConfigManager;
 

diff --git a/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxBeacon.java b/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxBeacon.java
deleted file mode 100644 (file)
index 7190956..0000000
--- a/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxBeacon.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.irtimaled.bbor.common.models;
-
-import com.irtimaled.bbor.common.BoundingBoxType;
-
-public class BoundingBoxBeacon extends BoundingBoxCuboid {
-    private final Coords coords;
-    private final int level;
-
-    private BoundingBoxBeacon(Coords coords, Coords minCoords, Coords maxCoords, int level) {
-        super(minCoords, maxCoords, BoundingBoxType.Beacon);
-        this.coords = coords;
-        this.level = level;
-    }
-
-    public static BoundingBoxBeacon from(Coords coords, int level) {
-        int range = 10 + (10 * level);
-        Coords minCoords = new Coords(coords.getX() - range, coords.getY() - range, coords.getZ() - range);
-        Coords maxCoords = new Coords(coords.getX() + range, 324 + range, coords.getZ() + range);
-        return new BoundingBoxBeacon(coords, minCoords, maxCoords, level);
-    }
-
-    @Override
-    public int hashCode() {
-        return coords.hashCode();
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) return true;
-        if (obj == null || getClass() != obj.getClass()) return false;
-        BoundingBoxBeacon other = (BoundingBoxBeacon) obj;
-        return coords.equals(other.coords);
-    }
-
-    public Coords getCoords() {
-        return coords;
-    }
-
-    public int getLevel() {
-        return level;
-    }
-}

diff --git a/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxBiomeBorder.java b/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxBiomeBorder.java
deleted file mode 100644 (file)
index 3c7d817..0000000
--- a/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxBiomeBorder.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.irtimaled.bbor.common.models;
-
-import com.irtimaled.bbor.common.BoundingBoxType;
-
-public class BoundingBoxBiomeBorder extends AbstractBoundingBox {
-    private final Coords coords;
-    private final boolean north;
-    private final boolean east;
-    private final boolean south;
-    private final boolean west;
-
-    private BoundingBoxBiomeBorder(Coords coords, boolean north, boolean east, boolean south, boolean west) {
-        super(BoundingBoxType.Custom);
-        this.coords = coords;
-        this.north = north;
-        this.east = east;
-        this.south = south;
-        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 &&
-                coords.getZ() >= minZ &&
-                coords.getX() <= maxX &&
-                coords.getZ() <= maxZ;
-    }
-
-    public Coords getCoords() {
-        return coords;
-    }
-
-    public boolean renderNorth() {
-        return north;
-    }
-
-    public boolean renderEast() {
-        return east;
-    }
-
-    public boolean renderSouth() {
-        return south;
-    }
-
-    public boolean renderWest() {
-        return west;
-    }
-
-}

diff --git a/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxMobSpawner.java b/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxMobSpawner.java
deleted file mode 100644 (file)
index 7a6d4ca..0000000
--- a/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxMobSpawner.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.irtimaled.bbor.common.models;
-
-import com.irtimaled.bbor.common.BoundingBoxType;
-
-public class BoundingBoxMobSpawner extends BoundingBoxCuboid {
-    private final Coords coords;
-
-    private BoundingBoxMobSpawner(Coords coords, Coords minCoords, Coords maxCoords) {
-        super(minCoords, maxCoords, BoundingBoxType.MobSpawner);
-        this.coords = coords;
-    }
-
-    public static BoundingBoxMobSpawner from(Coords coords) {
-        Coords minCoords = new Coords(coords.getX() - 5,
-                coords.getY() - 1,
-                coords.getZ() - 5);
-        Coords maxCoords = new Coords(coords.getX() + 5,
-                coords.getY() + 2,
-                coords.getZ() + 5);
-        return new BoundingBoxMobSpawner(coords, minCoords, maxCoords);
-    }
-
-    public Coords getCoords() {
-        return coords;
-    }
-}

diff --git a/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxSlimeChunk.java b/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxSlimeChunk.java
deleted file mode 100644 (file)
index 5e9c027..0000000
--- a/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxSlimeChunk.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.irtimaled.bbor.common.models;
-
-import com.irtimaled.bbor.common.BoundingBoxType;
-
-public class BoundingBoxSlimeChunk extends BoundingBoxCuboid {
-    private 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/common/models/BoundingBoxSpawningSphere.java b/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxSpawningSphere.java
deleted file mode 100644 (file)
index 1f72a3e..0000000
--- a/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxSpawningSphere.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.irtimaled.bbor.common.models;
-
-import com.irtimaled.bbor.common.BoundingBoxType;
-
-public class BoundingBoxSpawningSphere extends BoundingBoxSphere {
-    public static final int SAFE_RADIUS = 24;
-    public static final int SPAWN_RADIUS = 128;
-
-    private Integer spawnableCount;
-
-    public BoundingBoxSpawningSphere(Coords coords, double xOffset, double yOffset, double zOffset) {
-        super(coords, 128, BoundingBoxType.AFKSphere);
-        setCenterOffsets(xOffset, yOffset, zOffset);
-    }
-
-    public boolean isCenter(Coords coords, double xOffset, double yOffset, double zOffset) {
-        return this.getCenter().equals(coords) &&
-                this.getCenterOffsetX() == xOffset &&
-                this.getCenterOffsetY() == yOffset &&
-                this.getCenterOffsetZ() == zOffset;
-    }
-
-    public void setSpawnableCount(int count) {
-        this.spawnableCount = count;
-    }
-
-    public Integer getSpawnableSpacesCount() {
-        return this.spawnableCount;
-    }
-}

diff --git a/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxWorldSpawn.java b/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxWorldSpawn.java
deleted file mode 100644 (file)
index 31bb601..0000000
--- a/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxWorldSpawn.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.irtimaled.bbor.common.models;
-
-import com.irtimaled.bbor.common.BoundingBoxType;
-
-public class BoundingBoxWorldSpawn extends BoundingBoxCuboid {
-    private 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);
-    }
-}