fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #666 Only convert to a cablebus if an IPartItem is attached

Browse Source
This commit is contained in:
yueh
2014-12-31 14:10:50 +01:00
parent 97dabc4a5c
commit ff903e65a5
1 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/integration/modules/ImmibisMicroblocks.java
+19 -13
View File
@@ -18,6 +18,7 @@
package appeng.integration.modules;
import java.lang.reflect.Method;
import net.minecraft.block.Block;
@@ -32,18 +33,20 @@ import mods.immibis.core.api.multipart.IPartContainer;
import appeng.api.AEApi;
import appeng.api.parts.IPartHost;
import appeng.api.parts.IPartItem;
import appeng.core.AELog;
import appeng.integration.BaseModule;
import appeng.integration.abstraction.IImmibisMicroblocks;
public class ImmibisMicroblocks extends BaseModule implements IImmibisMicroblocks
{
public static ImmibisMicroblocks instance;
public static ImmibisMicroblocks INSTANCE;
boolean canConvertTiles = false;
private boolean canConvertTiles = false;
private Class MicroblockAPIUtils;
private Class<?> MicroblockAPIUtils;
private Method mergeIntoMicroblockContainer;
@Override
@@ -79,7 +82,9 @@ public class ImmibisMicroblocks extends BaseModule implements IImmibisMicroblock
{
ICoverSystem ci = ( ( IMultipartTile ) te ).getCoverSystem();
if ( ci != null )
{
ci.convertToContainerBlock();
}
return true;
}
@@ -89,15 +94,16 @@ public class ImmibisMicroblocks extends BaseModule implements IImmibisMicroblock
@Override
public IPartHost getOrCreateHost( EntityPlayer player, int side, TileEntity te )
{
if ( te instanceof IMultipartTile && this.canConvertTiles )
{
Block blk = AEApi.instance().blocks().blockMultiPart.block();
ItemStack what = AEApi.instance().blocks().blockMultiPart.stack( 1 );
final World w = te.getWorldObj();
final int x = te.xCoord;
final int y = te.yCoord;
final int z = te.zCoord;
final boolean isPartItem = player != null && player.getHeldItem() != null && player.getHeldItem().getItem() instanceof IPartItem;
World w = te.getWorldObj();
int x = te.xCoord;
int y = te.yCoord;
int z = te.zCoord;
if ( te instanceof IMultipartTile && this.canConvertTiles && isPartItem )
{
final Block blk = AEApi.instance().blocks().blockMultiPart.block();
final ItemStack what = AEApi.instance().blocks().blockMultiPart.stack( 1 );
try
{
@@ -110,11 +116,11 @@ public class ImmibisMicroblocks extends BaseModule implements IImmibisMicroblock
this.canConvertTiles = false;
return null;
}
}
TileEntity tx = w.getTileEntity( x, y, z );
final TileEntity tx = w.getTileEntity( x, y, z );
if ( tx instanceof IPartHost )
return ( IPartHost ) tx;
}
return null;
}