Added Insulation Around BC handlers.
Fixed typo in Part Material Registration.
This commit is contained in:
parent
c40d6937d6
commit
d65cd0d82d
|
@ -160,7 +160,7 @@ public class Registration
|
||||||
if ( is != null )
|
if ( is != null )
|
||||||
f.set( materials, new DamagedItemDefinition( is ) );
|
f.set( materials, new DamagedItemDefinition( is ) );
|
||||||
else
|
else
|
||||||
f.set( parts, new NullItemDefinition() );
|
f.set( materials, new NullItemDefinition() );
|
||||||
}
|
}
|
||||||
catch (Throwable err)
|
catch (Throwable err)
|
||||||
{
|
{
|
||||||
|
|
|
@ -7,6 +7,8 @@ import net.minecraft.tileentity.TileEntity;
|
||||||
import net.minecraft.util.Icon;
|
import net.minecraft.util.Icon;
|
||||||
import net.minecraftforge.common.ForgeDirection;
|
import net.minecraftforge.common.ForgeDirection;
|
||||||
import appeng.api.parts.IFacadePart;
|
import appeng.api.parts.IFacadePart;
|
||||||
|
import appeng.tile.powersink.BaseBCperdition;
|
||||||
|
import appeng.tile.powersink.BuildCraft;
|
||||||
|
|
||||||
public interface IBC
|
public interface IBC
|
||||||
{
|
{
|
||||||
|
@ -41,4 +43,6 @@ public interface IBC
|
||||||
|
|
||||||
Icon getFacadeTexture();
|
Icon getFacadeTexture();
|
||||||
|
|
||||||
|
BaseBCperdition createPerdition(BuildCraft buildCraft);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,6 +15,9 @@ import appeng.facade.FacadePart;
|
||||||
import appeng.integration.IIntegrationModule;
|
import appeng.integration.IIntegrationModule;
|
||||||
import appeng.integration.abstraction.IBC;
|
import appeng.integration.abstraction.IBC;
|
||||||
import appeng.integration.modules.helpers.BCPipeHandler;
|
import appeng.integration.modules.helpers.BCPipeHandler;
|
||||||
|
import appeng.tile.powersink.BCPerdition;
|
||||||
|
import appeng.tile.powersink.BaseBCperdition;
|
||||||
|
import appeng.tile.powersink.BuildCraft;
|
||||||
import buildcraft.BuildCraftEnergy;
|
import buildcraft.BuildCraftEnergy;
|
||||||
import buildcraft.BuildCraftTransport;
|
import buildcraft.BuildCraftTransport;
|
||||||
import buildcraft.api.tools.IToolWrench;
|
import buildcraft.api.tools.IToolWrench;
|
||||||
|
@ -220,4 +223,10 @@ public class BC implements IIntegrationModule, IBC
|
||||||
// Pipe
|
// Pipe
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BaseBCperdition createPerdition(BuildCraft buildCraft)
|
||||||
|
{
|
||||||
|
return new BCPerdition( buildCraft );
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,17 +1,14 @@
|
||||||
package appeng.tile.powersink;
|
package appeng.tile.powersink;
|
||||||
|
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraftforge.common.ForgeDirection;
|
import net.minecraftforge.common.ForgeDirection;
|
||||||
import appeng.api.config.PowerUnits;
|
import appeng.api.config.PowerUnits;
|
||||||
import appeng.core.AppEng;
|
import appeng.core.AppEng;
|
||||||
import appeng.tile.events.AETileEventHandler;
|
import appeng.integration.abstraction.IBC;
|
||||||
import appeng.tile.events.TileEventType;
|
|
||||||
import appeng.util.Platform;
|
import appeng.util.Platform;
|
||||||
import buildcraft.api.power.IPowerReceptor;
|
import buildcraft.api.power.IPowerReceptor;
|
||||||
import buildcraft.api.power.PowerHandler;
|
import buildcraft.api.power.PowerHandler;
|
||||||
import buildcraft.api.power.PowerHandler.PowerReceiver;
|
import buildcraft.api.power.PowerHandler.PowerReceiver;
|
||||||
import buildcraft.api.power.PowerHandler.Type;
|
|
||||||
import cpw.mods.fml.common.Loader;
|
import cpw.mods.fml.common.Loader;
|
||||||
import cpw.mods.fml.common.Optional.Interface;
|
import cpw.mods.fml.common.Optional.Interface;
|
||||||
import cpw.mods.fml.common.Optional.Method;
|
import cpw.mods.fml.common.Optional.Method;
|
||||||
|
@ -20,37 +17,7 @@ import cpw.mods.fml.common.Optional.Method;
|
||||||
public abstract class BuildCraft extends AERootPoweredTile implements IPowerReceptor
|
public abstract class BuildCraft extends AERootPoweredTile implements IPowerReceptor
|
||||||
{
|
{
|
||||||
|
|
||||||
private class BCPerdition extends AETileEventHandler
|
BaseBCperdition bcPowerWrapper;
|
||||||
{
|
|
||||||
|
|
||||||
final protected PowerHandler bcPowerHandler;
|
|
||||||
|
|
||||||
public BCPerdition(IPowerReceptor te) {
|
|
||||||
super( TileEventType.TICK, TileEventType.WORLD_NBT );
|
|
||||||
bcPowerHandler = new PowerHandler( te, Type.MACHINE );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void Tick()
|
|
||||||
{
|
|
||||||
bcPowerHandler.update();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void writeToNBT(NBTTagCompound data)
|
|
||||||
{
|
|
||||||
bcPowerHandler.writeToNBT( data, "bcPowerHandler" );
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void readFromNBT(NBTTagCompound data)
|
|
||||||
{
|
|
||||||
bcPowerHandler.readFromNBT( data, "bcPowerHandler" );
|
|
||||||
}
|
|
||||||
|
|
||||||
};
|
|
||||||
|
|
||||||
BCPerdition bcPowerWrapper;
|
|
||||||
|
|
||||||
public BuildCraft() {
|
public BuildCraft() {
|
||||||
if ( Platform.isServer() )
|
if ( Platform.isServer() )
|
||||||
|
@ -59,9 +26,12 @@ public abstract class BuildCraft extends AERootPoweredTile implements IPowerRece
|
||||||
{
|
{
|
||||||
if ( Loader.isModLoaded( "BuildCraftAPI|power" ) )
|
if ( Loader.isModLoaded( "BuildCraftAPI|power" ) )
|
||||||
{
|
{
|
||||||
if ( AppEng.instance.isIntegrationEnabled( "" ) )
|
IBC bcIntegration = (IBC) AppEng.instance.getIntegration( "BC" );
|
||||||
addNewHandler( bcPowerWrapper = new BCPerdition( this ) );
|
if ( bcIntegration != null )
|
||||||
bcPowerWrapper.bcPowerHandler.configure( 1, 380, 1.0f / 5.0f, 1000 );
|
{
|
||||||
|
addNewHandler( bcPowerWrapper = bcIntegration.createPerdition( this ) );
|
||||||
|
bcPowerWrapper.configure( 1, 380, 1.0f / 5.0f, 1000 );
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Throwable t)
|
catch (Throwable t)
|
||||||
|
@ -75,8 +45,8 @@ public abstract class BuildCraft extends AERootPoweredTile implements IPowerRece
|
||||||
@Method(modid = "BuildCraftAPI|power")
|
@Method(modid = "BuildCraftAPI|power")
|
||||||
final public PowerReceiver getPowerReceiver(ForgeDirection side)
|
final public PowerReceiver getPowerReceiver(ForgeDirection side)
|
||||||
{
|
{
|
||||||
if ( internalCanAcceptPower && getPowerSides().contains( side ) )
|
if ( internalCanAcceptPower && getPowerSides().contains( side ) && bcPowerWrapper != null )
|
||||||
return bcPowerWrapper.bcPowerHandler.getPowerReceiver();
|
return bcPowerWrapper.getPowerReceiver();
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -85,9 +55,9 @@ public abstract class BuildCraft extends AERootPoweredTile implements IPowerRece
|
||||||
final public void doWork(PowerHandler workProvider)
|
final public void doWork(PowerHandler workProvider)
|
||||||
{
|
{
|
||||||
float requred = (float) getExternalPowerDemand( PowerUnits.MJ );
|
float requred = (float) getExternalPowerDemand( PowerUnits.MJ );
|
||||||
double failed = injectExternalPower( PowerUnits.MJ, bcPowerWrapper.bcPowerHandler.useEnergy( 0.0f, requred, true ) );
|
double failed = injectExternalPower( PowerUnits.MJ, bcPowerWrapper.useEnergy( 0.0f, requred, true ) );
|
||||||
if ( failed > 0.01 )
|
if ( failed > 0.01 )
|
||||||
bcPowerWrapper.bcPowerHandler.addEnergy( (float) failed );
|
bcPowerWrapper.addEnergy( (float) failed );
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in a new issue