From: Irtimaled Date: Wed, 6 May 2020 22:34:43 +0000 (-0700) Subject: Move client only boxes to client only namespace X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=eff4a632a409391647900f6d0579b4d92c15304b;p=BoundingBoxOutlineReloaded.git 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 f69096e..e177473 100644 --- 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 bc99aef..b937f21 100644 --- 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 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 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 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 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 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 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 1512d05..98071a1 100644 --- 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 feaefca..f5723c1 100644 --- 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 7c58052..adba3b5 100644 --- 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 4fd787a..16a56ec 100644 --- 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 c2a7321..a41b683 100644 --- 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 7b9460c..02a452a 100644 --- 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 { 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 d6b69f7..560423e 100644 --- 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 b3183ab..77b8bbd 100644 --- 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 7828981..8061b5c 100644 --- 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 3024f42..d3ac71c 100644 --- 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 051f7f3..47dea57 100644 --- 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 85132e4..929ecb5 100644 --- 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 4bc93d9..921f01c 100644 --- 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 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 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 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 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 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 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); - } -}