Skip to content

Commit

Permalink
First pass at #357
Browse files Browse the repository at this point in the history
  • Loading branch information
AlgorithmX2 committed Dec 25, 2017
1 parent 7e79d39 commit 87af63c
Show file tree
Hide file tree
Showing 4 changed files with 133 additions and 1 deletion.
Expand Up @@ -500,7 +500,7 @@ public void fillWith(
getTileContainer().saveData();
}

private long getPositionRandom(
public static long getPositionRandom(
final BlockPos pos )
{
if ( pos != null && FMLCommonHandler.instance().getSide() == Side.CLIENT )
Expand Down
17 changes: 17 additions & 0 deletions src/main/java/mod/chiselsandbits/helpers/ModUtil.java
Expand Up @@ -17,6 +17,7 @@
import mod.chiselsandbits.core.ChiselsAndBits;
import mod.chiselsandbits.helpers.StateLookup.CachedStateLookup;
import mod.chiselsandbits.integration.mcmultipart.MCMultipartProxy;
import mod.chiselsandbits.integration.mods.LittleTiles;
import mod.chiselsandbits.items.ItemBitBag;
import mod.chiselsandbits.items.ItemBitBag.BagPos;
import mod.chiselsandbits.items.ItemChiseledBit;
Expand Down Expand Up @@ -323,6 +324,22 @@ public static TileEntityBlockChiseled getChiseledTileEntity(
return (TileEntityBlockChiseled) te;
}

if ( te != null )
{
try
{
TileEntityBlockChiseled converted = LittleTiles.getConvertedTE( te, false );
if ( converted != null )
{
return converted;
}
}
catch ( Exception e )
{
e.printStackTrace();
}
}

return MCMultipartProxy.proxyMCMultiPart.getChiseledTileEntity( world, pos, create );
}
return null;
Expand Down
64 changes: 64 additions & 0 deletions src/main/java/mod/chiselsandbits/integration/mods/LittleTiles.java
@@ -0,0 +1,64 @@
package mod.chiselsandbits.integration.mods;

import java.lang.reflect.Method;

import jline.internal.Log;
import mod.chiselsandbits.chiseledblock.BlockChiseled;
import mod.chiselsandbits.chiseledblock.TileEntityBlockChiseled;
import mod.chiselsandbits.chiseledblock.data.VoxelBlob;
import mod.chiselsandbits.chiseledblock.data.VoxelBlob.BlobStats;
import mod.chiselsandbits.chiseledblock.data.VoxelBlobStateReference;
import mod.chiselsandbits.integration.ChiselsAndBitsIntegration;
import mod.chiselsandbits.integration.IntegrationBase;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;

@ChiselsAndBitsIntegration( "littletilescore" )
public class LittleTiles extends IntegrationBase
{

static Class<?> clz = null;
static Method getVoxelBlob = null;

@Override
public void init()
{
try
{
clz = Class.forName( "com.creativemd.littletiles.common.api.te.ILittleTileTE" );
getVoxelBlob = clz.getMethod( "getVoxelBlob", boolean.class );
}
catch ( NoSuchMethodException | SecurityException | ClassNotFoundException e )
{
Log.info( "Little Tiles version is not new enough, or missing API : " + e.getMessage() );
}
}

public static BlockPos forceConvert = BlockPos.ORIGIN;

public static TileEntityBlockChiseled getConvertedTE(
TileEntity te,
boolean force ) throws Exception
{
if ( clz != null && getVoxelBlob != null && clz.isInstance( te ) )
{
VoxelBlob blob = (VoxelBlob) getVoxelBlob.invoke( te, force );
if ( blob != null )
{
TileEntityBlockChiseled cte = new TileEntityBlockChiseled();
// cte.setBlob( blob, false );

BlobStats stats = blob.getVoxelStats();
cte.setState( cte.getBasicState()
.withProperty( BlockChiseled.UProperty_VoxelBlob, new VoxelBlobStateReference( blob, TileEntityBlockChiseled.getPositionRandom( te.getPos() ) ) ) );

cte.setWorldObj( te.getWorld() );
cte.setPos( te.getPos() );
cte.occlusionState = new LittleTilesOccusionState( te.getWorld(), te.getPos(), cte );
return cte;
}
}

return null;
}
}
@@ -0,0 +1,51 @@
package mod.chiselsandbits.integration.mods;

import mod.chiselsandbits.chiseledblock.TileEntityBlockChiseled;
import mod.chiselsandbits.chiseledblock.data.VoxelBlob;
import mod.chiselsandbits.helpers.ModUtil;
import mod.chiselsandbits.interfaces.IChiseledTileContainer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;

public class LittleTilesOccusionState implements IChiseledTileContainer
{

final TileEntityBlockChiseled container;
final World world;
final BlockPos pos;

public LittleTilesOccusionState(
final World w,
final BlockPos position,
final TileEntityBlockChiseled chisledBlockPart )
{
world = w;
pos = position;
container = chisledBlockPart;
}

@Override
public void sendUpdate()
{
ModUtil.sendUpdate( world, pos );
}

@Override
public void saveData()
{
world.setBlockState( pos, container.getPreferedBlock() );
TileEntity te = world.getTileEntity( pos );

if ( te instanceof TileEntityBlockChiseled )
( (TileEntityBlockChiseled) te ).copyFrom( container );
}

@Override
public boolean isBlobOccluded(
final VoxelBlob blob )
{
return false;
}

}

0 comments on commit 87af63c

Please sign in to comment.