Allowed IChiseledBlockTileEntity to provide access to collision, occl…

…usion, and swimming boxes.
ChiselsAndBits · Aug 16, 2018 · 5af52ac · 5af52ac
1 parent f25921d
commit 5af52ac
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 6 deletions.
diff --git a/...chiselsandbits/chiseledblock/BoxType.java → .../java/mod/chiselsandbits/api/BoxType.java b/...chiselsandbits/chiseledblock/BoxType.java → .../java/mod/chiselsandbits/api/BoxType.java
@@ -1,4 +1,4 @@
-package mod.chiselsandbits.chiseledblock;
+package mod.chiselsandbits.api;
 
 public enum BoxType
 {

diff --git a/src/main/java/mod/chiselsandbits/api/IChiseledBlockTileEntity.java b/src/main/java/mod/chiselsandbits/api/IChiseledBlockTileEntity.java
@@ -1,6 +1,9 @@
 package mod.chiselsandbits.api;
 
+import java.util.Collection;
+
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.math.AxisAlignedBB;
 
 /**
  * This interface is implemented by Chiseled Block Tile Entities.
@@ -33,4 +36,14 @@ public NBTTagCompound writeTileEntityToTag(
 			final NBTTagCompound tag,
 			final boolean crossWorld );
 
+	/**
+	 * Used for access to the collision, occlusion, and swimming boxes of the
+	 * chiseled block tile entity.
+	 * 
+	 * @param type the type of boxes to return
+	 * @return a collection of the boxes for the tile entity
+	 */
+	Collection<AxisAlignedBB> getBoxes(
+			final BoxType type );
+
 }
diff --git a/src/main/java/mod/chiselsandbits/chiseledblock/BlockChiseled.java b/src/main/java/mod/chiselsandbits/chiseledblock/BlockChiseled.java
@@ -5,6 +5,7 @@
 
 import javax.annotation.Nonnull;
 
+import mod.chiselsandbits.api.BoxType;
 import mod.chiselsandbits.api.IMultiStateBlock;
 import mod.chiselsandbits.chiseledblock.data.BitCollisionIterator;
 import mod.chiselsandbits.chiseledblock.data.BitLocation;

diff --git a/src/main/java/mod/chiselsandbits/chiseledblock/TileEntityBlockChiseled.java b/src/main/java/mod/chiselsandbits/chiseledblock/TileEntityBlockChiseled.java
@@ -5,6 +5,7 @@
 
 import javax.annotation.Nonnull;
 
+import mod.chiselsandbits.api.BoxType;
 import mod.chiselsandbits.api.EventBlockBitPostModification;
 import mod.chiselsandbits.api.EventFullBlockRestoration;
 import mod.chiselsandbits.api.IBitAccess;
@@ -899,6 +900,7 @@ public boolean canMerge(
 		return false;
 	}
 
+	@Override
 	public Collection<AxisAlignedBB> getBoxes(
 			final BoxType type )
 	{

diff --git a/src/main/java/mod/chiselsandbits/chiseledblock/data/VoxelBlobStateInstance.java b/src/main/java/mod/chiselsandbits/chiseledblock/data/VoxelBlobStateInstance.java
@@ -11,8 +11,8 @@
 import java.util.zip.InflaterInputStream;
 
 import io.netty.buffer.Unpooled;
+import mod.chiselsandbits.api.BoxType;
 import mod.chiselsandbits.chiseledblock.BoxCollection;
-import mod.chiselsandbits.chiseledblock.BoxType;
 import mod.chiselsandbits.core.Log;
 import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.math.AxisAlignedBB;

diff --git a/src/main/java/mod/chiselsandbits/chiseledblock/data/VoxelBlobStateReference.java b/src/main/java/mod/chiselsandbits/chiseledblock/data/VoxelBlobStateReference.java
@@ -7,7 +7,7 @@
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import mod.chiselsandbits.chiseledblock.BoxType;
+import mod.chiselsandbits.api.BoxType;
 import mod.chiselsandbits.helpers.IStateRef;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraftforge.fml.common.FMLCommonHandler;

diff --git a/src/main/java/mod/chiselsandbits/integration/mcmultipart/ChiseledBlockMultiPart.java b/src/main/java/mod/chiselsandbits/integration/mcmultipart/ChiseledBlockMultiPart.java
@@ -7,8 +7,8 @@
 import mcmultipart.api.multipart.IMultipart;
 import mcmultipart.api.multipart.IMultipartTile;
 import mcmultipart.api.slot.IPartSlot;
+import mod.chiselsandbits.api.BoxType;
 import mod.chiselsandbits.chiseledblock.BlockChiseled;
-import mod.chiselsandbits.chiseledblock.BoxType;
 import mod.chiselsandbits.chiseledblock.TileEntityBlockChiseled;
 import mod.chiselsandbits.helpers.ModUtil;
 import net.minecraft.block.Block;

diff --git a/src/main/java/mod/chiselsandbits/integration/mcmultipart/ChiseledBlockPart.java b/src/main/java/mod/chiselsandbits/integration/mcmultipart/ChiseledBlockPart.java
@@ -5,7 +5,7 @@
 import mcmultipart.api.multipart.IMultipartTile;
 import mcmultipart.api.multipart.MultipartOcclusionHelper;
 import mcmultipart.api.world.IMultipartWorld;
-import mod.chiselsandbits.chiseledblock.BoxType;
+import mod.chiselsandbits.api.BoxType;
 import mod.chiselsandbits.chiseledblock.TileEntityBlockChiseled;
 import mod.chiselsandbits.chiseledblock.data.VoxelBlob;
 import net.minecraft.tileentity.TileEntity;

diff --git a/src/main/java/mod/chiselsandbits/integration/mcmultipart/MultipartContainerBuilder.java b/src/main/java/mod/chiselsandbits/integration/mcmultipart/MultipartContainerBuilder.java
@@ -5,7 +5,7 @@
 import mcmultipart.api.container.IMultipartContainer;
 import mcmultipart.api.multipart.MultipartHelper;
 import mcmultipart.api.multipart.MultipartOcclusionHelper;
-import mod.chiselsandbits.chiseledblock.BoxType;
+import mod.chiselsandbits.api.BoxType;
 import mod.chiselsandbits.chiseledblock.TileEntityBlockChiseled;
 import mod.chiselsandbits.chiseledblock.data.VoxelBlob;
 import mod.chiselsandbits.core.ChiselsAndBits;