From eff4a632a409391647900f6d0579b4d92c15304b Mon Sep 17 00:00:00 2001 From: Irtimaled Date: Wed, 6 May 2020 15:34:43 -0700 Subject: [PATCH] Move client only boxes to client only namespace --- src/main/java/com/irtimaled/bbor/client/ClientRenderer.java | 6 ++++-- .../irtimaled/bbor/client/interop/SpawningSphereHelper.java | 2 +- .../bbor/{common => client}/models/BoundingBoxBeacon.java | 4 +++- .../{common => client}/models/BoundingBoxBiomeBorder.java | 4 +++- .../{common => client}/models/BoundingBoxMobSpawner.java | 4 +++- .../{common => client}/models/BoundingBoxSlimeChunk.java | 4 +++- .../models/BoundingBoxSpawningSphere.java | 4 +++- .../{common => client}/models/BoundingBoxWorldSpawn.java | 4 +++- .../com/irtimaled/bbor/client/providers/BeaconProvider.java | 2 +- .../bbor/client/providers/BiomeBorderProvider.java | 2 +- .../bbor/client/providers/CustomBeaconProvider.java | 2 +- .../irtimaled/bbor/client/providers/MobSpawnerProvider.java | 2 +- .../irtimaled/bbor/client/providers/SlimeChunkProvider.java | 2 +- .../bbor/client/providers/SpawningSphereProvider.java | 2 +- .../irtimaled/bbor/client/providers/WorldSpawnProvider.java | 2 +- .../com/irtimaled/bbor/client/renderers/BeaconRenderer.java | 2 +- .../bbor/client/renderers/BiomeBorderRenderer.java | 2 +- .../irtimaled/bbor/client/renderers/MobSpawnerRenderer.java | 2 +- .../irtimaled/bbor/client/renderers/SlimeChunkRenderer.java | 2 +- .../bbor/client/renderers/SpawningSphereRenderer.java | 2 +- .../irtimaled/bbor/client/renderers/WorldSpawnRenderer.java | 2 +- 21 files changed, 36 insertions(+), 22 deletions(-) rename src/main/java/com/irtimaled/bbor/{common => client}/models/BoundingBoxBeacon.java (89%) rename src/main/java/com/irtimaled/bbor/{common => client}/models/BoundingBoxBiomeBorder.java (89%) rename src/main/java/com/irtimaled/bbor/{common => client}/models/BoundingBoxMobSpawner.java (84%) rename src/main/java/com/irtimaled/bbor/{common => client}/models/BoundingBoxSlimeChunk.java (73%) rename src/main/java/com/irtimaled/bbor/{common => client}/models/BoundingBoxSpawningSphere.java (86%) rename src/main/java/com/irtimaled/bbor/{common => client}/models/BoundingBoxWorldSpawn.java (74%) 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/common/models/BoundingBoxBeacon.java b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxBeacon.java similarity index 89% rename from src/main/java/com/irtimaled/bbor/common/models/BoundingBoxBeacon.java rename to src/main/java/com/irtimaled/bbor/client/models/BoundingBoxBeacon.java index 7190956..2bdfe8b 100644 --- a/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxBeacon.java +++ b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxBeacon.java @@ -1,6 +1,8 @@ -package com.irtimaled.bbor.common.models; +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; diff --git a/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxBiomeBorder.java b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxBiomeBorder.java similarity index 89% rename from src/main/java/com/irtimaled/bbor/common/models/BoundingBoxBiomeBorder.java rename to src/main/java/com/irtimaled/bbor/client/models/BoundingBoxBiomeBorder.java index 3c7d817..77b81c7 100644 --- a/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxBiomeBorder.java +++ b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxBiomeBorder.java @@ -1,6 +1,8 @@ -package com.irtimaled.bbor.common.models; +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; diff --git a/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxMobSpawner.java b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxMobSpawner.java similarity index 84% rename from src/main/java/com/irtimaled/bbor/common/models/BoundingBoxMobSpawner.java rename to src/main/java/com/irtimaled/bbor/client/models/BoundingBoxMobSpawner.java index 7a6d4ca..cc6c76a 100644 --- a/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxMobSpawner.java +++ b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxMobSpawner.java @@ -1,6 +1,8 @@ -package com.irtimaled.bbor.common.models; +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; diff --git a/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxSlimeChunk.java b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxSlimeChunk.java similarity index 73% rename from src/main/java/com/irtimaled/bbor/common/models/BoundingBoxSlimeChunk.java rename to src/main/java/com/irtimaled/bbor/client/models/BoundingBoxSlimeChunk.java index 5e9c027..dce0ad4 100644 --- a/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxSlimeChunk.java +++ b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxSlimeChunk.java @@ -1,6 +1,8 @@ -package com.irtimaled.bbor.common.models; +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) { diff --git a/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxSpawningSphere.java b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxSpawningSphere.java similarity index 86% rename from src/main/java/com/irtimaled/bbor/common/models/BoundingBoxSpawningSphere.java rename to src/main/java/com/irtimaled/bbor/client/models/BoundingBoxSpawningSphere.java index 1f72a3e..dd5c76a 100644 --- a/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxSpawningSphere.java +++ b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxSpawningSphere.java @@ -1,6 +1,8 @@ -package com.irtimaled.bbor.common.models; +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; diff --git a/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxWorldSpawn.java b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxWorldSpawn.java similarity index 74% rename from src/main/java/com/irtimaled/bbor/common/models/BoundingBoxWorldSpawn.java rename to src/main/java/com/irtimaled/bbor/client/models/BoundingBoxWorldSpawn.java index 31bb601..d66cdad 100644 --- a/src/main/java/com/irtimaled/bbor/common/models/BoundingBoxWorldSpawn.java +++ b/src/main/java/com/irtimaled/bbor/client/models/BoundingBoxWorldSpawn.java @@ -1,6 +1,8 @@ -package com.irtimaled.bbor.common.models; +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) { 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; -- 2.44.0