Chisels/Bits can not convert Little Tiles when chiseling as well as p…

…lacing.
ChiselsAndBits · Dec 30, 2017 · bc51f04 · bc51f04
1 parent e7a724d
commit bc51f04
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/src/main/java/mod/chiselsandbits/events/EventPlayerInteract.java b/src/main/java/mod/chiselsandbits/events/EventPlayerInteract.java
@@ -5,6 +5,7 @@
 import mod.chiselsandbits.chiseledblock.BlockBitInfo;
 import mod.chiselsandbits.core.ClientSide;
 import mod.chiselsandbits.integration.mcmultipart.MCMultipartProxy;
+import mod.chiselsandbits.integration.mods.LittleTiles;
 import mod.chiselsandbits.items.ItemChisel;
 import mod.chiselsandbits.items.ItemChiseledBit;
 import net.minecraft.block.state.IBlockState;
@@ -56,7 +57,7 @@ public void interaction(
 			if ( is != null && ( is.getItem() instanceof ItemChisel || is.getItem() instanceof ItemChiseledBit ) && validEvent )
 			{
 				final IBlockState state = event.getWorld().getBlockState( event.getPos() );
-				if ( BlockBitInfo.canChisel( state ) || MCMultipartProxy.proxyMCMultiPart.isMultiPartTileEntity( event.getWorld(), event.getPos() ) )
+				if ( BlockBitInfo.canChisel( state ) || MCMultipartProxy.proxyMCMultiPart.isMultiPartTileEntity( event.getWorld(), event.getPos() ) || LittleTiles.isLittleTilesBlock( event.getWorld().getTileEntity( event.getPos() ) ) )
 				{
 					if ( event.getWorld().isRemote )
 					{

diff --git a/src/main/java/mod/chiselsandbits/integration/mods/LittleTiles.java b/src/main/java/mod/chiselsandbits/integration/mods/LittleTiles.java
@@ -61,4 +61,26 @@ public static TileEntityBlockChiseled getConvertedTE(
 
 		return null;
 	}
+
+	public static boolean isLittleTilesBlock(
+			TileEntity tileEntity )
+	{
+		try
+		{
+			if ( clz != null && getVoxelBlob != null && clz.isInstance( tileEntity ) )
+			{
+				VoxelBlob blob = (VoxelBlob) getVoxelBlob.invoke( tileEntity, false );
+				if ( blob != null )
+				{
+					return true;
+				}
+			}
+		}
+		catch ( Exception e )
+		{
+			// false!
+		}
+
+		return false;
+	}
 }
diff --git a/src/main/java/mod/chiselsandbits/items/ItemChisel.java b/src/main/java/mod/chiselsandbits/items/ItemChisel.java
@@ -27,6 +27,7 @@
 import mod.chiselsandbits.helpers.LocalStrings;
 import mod.chiselsandbits.helpers.ModUtil;
 import mod.chiselsandbits.integration.mcmultipart.MCMultipartProxy;
+import mod.chiselsandbits.integration.mods.LittleTiles;
 import mod.chiselsandbits.interfaces.IChiselModeItem;
 import mod.chiselsandbits.interfaces.IItemScrollWheel;
 import mod.chiselsandbits.modes.ChiselMode;
@@ -134,7 +135,7 @@ static public boolean fromBreakToChisel(
 			final EnumHand hand )
 	{
 		final IBlockState state = player.getEntityWorld().getBlockState( pos );
-		if ( BlockBitInfo.canChisel( state ) || MCMultipartProxy.proxyMCMultiPart.isMultiPartTileEntity( player.getEntityWorld(), pos ) )
+		if ( BlockBitInfo.canChisel( state ) || MCMultipartProxy.proxyMCMultiPart.isMultiPartTileEntity( player.getEntityWorld(), pos ) || LittleTiles.isLittleTilesBlock( player.getEntityWorld().getTileEntity( pos ) ) )
 		{
 			if ( itemstack != null && ( timer == null || timer.elapsed( TimeUnit.MILLISECONDS ) > 150 ) )
 			{