Fixed Bug: #0830 - Microblocks disappear after shift-click on cable
You can now place AE2 parts in the same block as Immibis Microblocks
This commit is contained in:
parent
bb83252f38
commit
36cd261683
5 changed files with 136 additions and 1 deletions
|
@ -38,7 +38,9 @@ public enum IntegrationType
|
|||
|
||||
CraftGuide(IntegrationSide.CLIENT, "Craft Guide", "craftguide"),
|
||||
|
||||
Mekanism(IntegrationSide.BOTH, "Mekanism", "Mekanism");
|
||||
Mekanism(IntegrationSide.BOTH, "Mekanism", "Mekanism"),
|
||||
|
||||
ImmibisMicroblocks(IntegrationSide.BOTH, "ImmibisMicroblocks", "ImmibisMicroblocks");
|
||||
|
||||
public final IntegrationSide side;
|
||||
public final String dspName;
|
||||
|
|
18
integration/abstraction/IImmibisMicroblocks.java
Normal file
18
integration/abstraction/IImmibisMicroblocks.java
Normal file
|
@ -0,0 +1,18 @@
|
|||
package appeng.integration.abstraction;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import appeng.api.parts.IPartHost;
|
||||
|
||||
public interface IImmibisMicroblocks
|
||||
{
|
||||
|
||||
IPartHost getOrCreateHost(EntityPlayer player, int side, TileEntity te);
|
||||
|
||||
/**
|
||||
* @param te
|
||||
* @return true if this worked..
|
||||
*/
|
||||
boolean leaveParts(TileEntity te);
|
||||
|
||||
}
|
101
integration/modules/ImmibisMicroblocks.java
Normal file
101
integration/modules/ImmibisMicroblocks.java
Normal file
|
@ -0,0 +1,101 @@
|
|||
package appeng.integration.modules;
|
||||
|
||||
import java.lang.reflect.Method;
|
||||
|
||||
import mods.immibis.core.api.multipart.ICoverSystem;
|
||||
import mods.immibis.core.api.multipart.IMultipartTile;
|
||||
import mods.immibis.core.api.multipart.IPartContainer;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import appeng.api.AEApi;
|
||||
import appeng.api.parts.IPartHost;
|
||||
import appeng.core.AELog;
|
||||
import appeng.integration.BaseModule;
|
||||
import appeng.integration.abstraction.IImmibisMicroblocks;
|
||||
|
||||
public class ImmibisMicroblocks extends BaseModule implements IImmibisMicroblocks
|
||||
{
|
||||
|
||||
public static ImmibisMicroblocks instance;
|
||||
|
||||
boolean canConvertTiles = false;
|
||||
|
||||
private Class MicroblockAPIUtils;
|
||||
private Method mergeIntoMicroblockContainer;
|
||||
|
||||
@Override
|
||||
public void Init() throws Throwable
|
||||
{
|
||||
TestClass( IMultipartTile.class );
|
||||
TestClass( ICoverSystem.class );
|
||||
TestClass( IPartContainer.class );
|
||||
|
||||
try
|
||||
{
|
||||
MicroblockAPIUtils = Class.forName( "mods.immibis.microblocks.api.MicroblockAPIUtils" );
|
||||
mergeIntoMicroblockContainer = MicroblockAPIUtils.getMethod( "mergeIntoMicroblockContainer", ItemStack.class, EntityPlayer.class, World.class,
|
||||
int.class, int.class, int.class, int.class, Block.class, int.class );
|
||||
canConvertTiles = true;
|
||||
}
|
||||
catch (Throwable t)
|
||||
{
|
||||
AELog.error( t );
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void PostInit() throws Throwable
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean leaveParts(TileEntity te)
|
||||
{
|
||||
if ( te instanceof IMultipartTile )
|
||||
{
|
||||
ICoverSystem ci = ((IMultipartTile) te).getCoverSystem();
|
||||
if ( ci != null )
|
||||
ci.convertToContainerBlock();
|
||||
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IPartHost getOrCreateHost(EntityPlayer player, int side, TileEntity te)
|
||||
{
|
||||
if ( te instanceof IMultipartTile && canConvertTiles )
|
||||
{
|
||||
Block blk = AEApi.instance().blocks().blockMultiPart.block();
|
||||
ItemStack what = AEApi.instance().blocks().blockMultiPart.stack( 1 );
|
||||
|
||||
World w = te.getWorldObj();
|
||||
int x = te.xCoord;
|
||||
int y = te.yCoord;
|
||||
int z = te.zCoord;
|
||||
|
||||
try
|
||||
{
|
||||
// ItemStack.class, EntityPlayer.class, World.class,
|
||||
// int.class, int.class, int.class, int.class, Block.class, int.class );
|
||||
mergeIntoMicroblockContainer.invoke( null, what, player, w, x, y, z, side, blk, 0 );
|
||||
}
|
||||
catch (Throwable e)
|
||||
{
|
||||
canConvertTiles = false;
|
||||
return null; // nevermind..
|
||||
}
|
||||
|
||||
TileEntity tx = w.getTileEntity( x, y, z );
|
||||
if ( tx instanceof IPartHost )
|
||||
return (IPartHost) tx;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
|
@ -35,6 +35,7 @@ import appeng.facade.IFacadeItem;
|
|||
import appeng.integration.IntegrationType;
|
||||
import appeng.integration.abstraction.IBC;
|
||||
import appeng.integration.abstraction.IFMP;
|
||||
import appeng.integration.abstraction.IImmibisMicroblocks;
|
||||
import appeng.util.LookDirection;
|
||||
import appeng.util.Platform;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
|
@ -238,6 +239,9 @@ public class PartPlacement
|
|||
if ( host == null && tile != null && AppEng.instance.isIntegrationEnabled( IntegrationType.FMP ) )
|
||||
host = ((IFMP) AppEng.instance.getIntegration( IntegrationType.FMP )).getOrCreateHost( tile );
|
||||
|
||||
if ( host == null && tile != null && AppEng.instance.isIntegrationEnabled( IntegrationType.ImmibisMicroblocks ) )
|
||||
host = ((IImmibisMicroblocks) AppEng.instance.getIntegration( IntegrationType.ImmibisMicroblocks )).getOrCreateHost( player, face, tile );
|
||||
|
||||
// if ( held == null )
|
||||
{
|
||||
Block block = world.getBlock( x, y, z );
|
||||
|
|
|
@ -25,9 +25,12 @@ import appeng.api.util.AECableType;
|
|||
import appeng.api.util.AEColor;
|
||||
import appeng.api.util.DimensionalCoord;
|
||||
import appeng.block.networking.BlockCableBus;
|
||||
import appeng.core.AppEng;
|
||||
import appeng.helpers.AEMultiTile;
|
||||
import appeng.helpers.ICustomCollision;
|
||||
import appeng.hooks.TickHandler;
|
||||
import appeng.integration.IntegrationType;
|
||||
import appeng.integration.abstraction.IImmibisMicroblocks;
|
||||
import appeng.parts.CableBusContainer;
|
||||
import appeng.tile.AEBaseTile;
|
||||
import appeng.tile.events.AETileEventHandler;
|
||||
|
@ -326,6 +329,13 @@ public class TileCableBus extends AEBaseTile implements AEMultiTile, ICustomColl
|
|||
@Override
|
||||
public void cleanup()
|
||||
{
|
||||
if ( AppEng.instance.isIntegrationEnabled( IntegrationType.ImmibisMicroblocks ) )
|
||||
{
|
||||
IImmibisMicroblocks imb = (IImmibisMicroblocks) AppEng.instance.getIntegration( IntegrationType.ImmibisMicroblocks );
|
||||
if ( imb != null && imb.leaveParts( this ) )
|
||||
return;
|
||||
}
|
||||
|
||||
getWorldObj().setBlock( xCoord, yCoord, zCoord, Platform.air );
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue