Fixed Issue with DSU API,

Re-added support for MJ
Re-added support for pipe
Re-added support for BC-Facades.
This commit is contained in:
AlgorithmX2
2014-02-16 12:41:45 -06:00
parent ca738e6065
commit dc095749b7
15 changed files with 72 additions and 45 deletions
@@ -1,4 +1,4 @@
package appeng.integration.modules.dead;
package appeng.integration.modules;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
@@ -14,16 +14,16 @@ import appeng.api.parts.IFacadePart;
import appeng.facade.FacadePart;
import appeng.integration.IIntegrationModule;
import appeng.integration.abstraction.IBC;
import appeng.integration.modules.helpers.dead.BCPipeHandler;
import appeng.integration.modules.helpers.BCPipeHandler;
import buildcraft.BuildCraftEnergy;
import buildcraft.BuildCraftTransport;
import buildcraft.api.tools.IToolWrench;
import buildcraft.api.transport.FacadeManager;
import buildcraft.api.transport.IPipeTile;
import buildcraft.api.transport.IPipeTile.PipeType;
import buildcraft.transport.ItemFacade;
import buildcraft.transport.PipeIconProvider;
import buildcraft.transport.TileGenericPipe;
import cpw.mods.fml.common.event.FMLInterModComms;
public class BC implements IIntegrationModule, IBC
{
@@ -33,10 +33,8 @@ public class BC implements IIntegrationModule, IBC
@Override
public void addFacade(ItemStack item)
{
// Myrathi :
// FMLInterModComms.sendMessage("BuildCraft|Transport", "add-facade",
// <your block ID> + "@" + <your block meta>);
FacadeManager.addFacade( item );
int blkId = Block.blockRegistry.getIDForObject( Block.getBlockFromItem( item.getItem() ) );
FMLInterModComms.sendMessage( "BuildCraft|Transport", "add-facade", blkId + "@" + item.getItemDamage() );
}
@Override
@@ -188,9 +186,9 @@ public class BC implements IIntegrationModule, IBC
}
@Override
public IFacadePart createFacadePart(int[] ids, ForgeDirection side)
public IFacadePart createFacadePart(Block blk, int meta, ForgeDirection side)
{
ItemStack fs = ItemFacade.getStack( ids[0], ids[1] );
ItemStack fs = ItemFacade.getStack( blk, meta );
return new FacadePart( fs, side );
}
@@ -203,7 +201,8 @@ public class BC implements IIntegrationModule, IBC
@Override
public ItemStack getTextureForFacade(ItemStack facade)
{
return new ItemStack( Block.blocksList[ItemFacade.getBlockId( facade )], 1, ItemFacade.getMetaData( facade ) );
Block blk = ItemFacade.getBlock( facade );
return new ItemStack( blk, 1, ItemFacade.getMetaData( facade ) );
}
@Override
@@ -1,9 +1,9 @@
package appeng.integration.modules.dead;
package appeng.integration.modules;
import appeng.integration.IIntegrationModule;
import appeng.integration.abstraction.IMJ;
import appeng.integration.modules.helpers.BaseBCperdition;
import appeng.integration.modules.helpers.dead.BCPerdition;
import appeng.integration.abstraction.helpers.BaseMJperdition;
import appeng.integration.modules.helpers.MJPerdition;
import appeng.tile.powersink.BuildCraft;
import buildcraft.api.power.IPowerReceptor;
@@ -13,17 +13,17 @@ public class MJ implements IIntegrationModule, IMJ
public static MJ instance;
@Override
public BaseBCperdition createPerdition(BuildCraft buildCraft)
public BaseMJperdition createPerdition(BuildCraft buildCraft)
{
if ( buildCraft instanceof IPowerReceptor )
return new BCPerdition( buildCraft );
return new MJPerdition( buildCraft );
return null;
}
@Override
public void Init() throws Throwable
{
if ( ((Object) this) instanceof BCPerdition )
if ( ((Object) this) instanceof MJPerdition )
{
}
@@ -32,7 +32,6 @@ public class MJ implements IIntegrationModule, IMJ
@Override
public void PostInit() throws Throwable
{
// TODO Auto-generated method stub
}
@@ -1,4 +1,4 @@
package appeng.integration.modules.helpers.dead;
package appeng.integration.modules.helpers;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
@@ -1,4 +1,4 @@
package appeng.integration.modules.helpers.dead;
package appeng.integration.modules.helpers;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;
@@ -1,17 +1,18 @@
package appeng.integration.modules.helpers.dead;
package appeng.integration.modules.helpers;
import net.minecraft.nbt.NBTTagCompound;
import appeng.integration.abstraction.helpers.BaseMJperdition;
import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.power.PowerHandler;
import buildcraft.api.power.PowerHandler.PowerReceiver;
import buildcraft.api.power.PowerHandler.Type;
public class BCPerdition extends BaseBCperdition
public class MJPerdition extends BaseMJperdition
{
final protected PowerHandler bcPowerHandler;
public BCPerdition(IPowerReceptor te) {
public MJPerdition(IPowerReceptor te) {
bcPowerHandler = new PowerHandler( te, Type.MACHINE );
}