tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Fixed BC Power Handler.

Browse source
This commit is contained in:
AlgorithmX2 2014-01-29 19:21:01 -06:00
parent b21af365cf
commit e7575c157b
8 changed files with 141 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/AppEng.java
View file

@ -76,6 +76,7 @@ public class AppEng
IntegrationSide.BOTH, "Thermal Expansion", "ThermalExpansion", "TE", // TE
IntegrationSide.BOTH, "Mystcraft", "Mystcraft", "Mystcraft", // MC
IntegrationSide.BOTH, "BuildCraft", "BuildCraft|Silicon", "BC", // BC
IntegrationSide.BOTH, "BuildCraft Power", null, "MJ", // BC
IntegrationSide.BOTH, "Greg Tech", "gregtech_addon", "GT", // GT
IntegrationSide.BOTH, "Universal Electricity", null, "UE", // UE
IntegrationSide.BOTH, "Logistics Pipes", "LogisticsPipes|Main", "LP", // LP

4
integration/abstraction/IBC.java
View file

@ -7,8 +7,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraftforge.common.ForgeDirection;
import appeng.api.parts.IFacadePart;
import appeng.tile.powersink.BaseBCperdition;
import appeng.tile.powersink.BuildCraft;
public interface IBC
{
@ -43,6 +41,4 @@ public interface IBC
Icon getFacadeTexture();
BaseBCperdition createPerdition(BuildCraft buildCraft);
}

11
integration/abstraction/IMJ.java Normal file
View file

@ -0,0 +1,11 @@
package appeng.integration.abstraction;
import appeng.integration.modules.helpers.BaseBCperdition;
import appeng.tile.powersink.BuildCraft;
public interface IMJ
{
BaseBCperdition createPerdition(BuildCraft buildCraft);
}

9
integration/modules/BC.java
View file

@ -15,9 +15,6 @@ import appeng.facade.FacadePart;
import appeng.integration.IIntegrationModule;
import appeng.integration.abstraction.IBC;
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.BuildCraftTransport;
import buildcraft.api.tools.IToolWrench;
@ -223,10 +220,4 @@ public class BC implements IIntegrationModule, IBC
// Pipe
}
@Override
public BaseBCperdition createPerdition(BuildCraft buildCraft)
{
return new BCPerdition( buildCraft );
}
}

39
integration/modules/MJ.java Normal file
View file

@ -0,0 +1,39 @@
package appeng.integration.modules;
import appeng.integration.IIntegrationModule;
import appeng.integration.abstraction.IMJ;
import appeng.integration.modules.helpers.BCPerdition;
import appeng.integration.modules.helpers.BaseBCperdition;
import appeng.tile.powersink.BuildCraft;
import buildcraft.api.power.IPowerReceptor;
public class MJ implements IIntegrationModule, IMJ
{
public static MJ instance;
@Override
public BaseBCperdition createPerdition(BuildCraft buildCraft)
{
if ( buildCraft instanceof IPowerReceptor )
return new BCPerdition( buildCraft );
return null;
}
@Override
public void Init() throws Throwable
{
if ( ((Object) this) instanceof BCPerdition )
{
}
}
@Override
public void PostInit() throws Throwable
{
// TODO Auto-generated method stub
}
}

118
tile/powersink/BCPerdition.java → integration/modules/helpers/BCPerdition.java
View file

@ -1,60 +1,60 @@
package appeng.tile.powersink;
import net.minecraft.nbt.NBTTagCompound;
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
{
final protected PowerHandler bcPowerHandler;
public BCPerdition(IPowerReceptor te) {
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" );
}
@Override
public PowerReceiver getPowerReceiver()
{
return bcPowerHandler.getPowerReceiver();
}
@Override
public double useEnergy(float min, float max, boolean doUse)
{
return bcPowerHandler.useEnergy( min, max, doUse );
}
@Override
public void addEnergy(float failed)
{
bcPowerHandler.addEnergy( failed );
}
@Override
public void configure(int i, int j, float f, int k)
{
bcPowerHandler.configure( i, j, f, k );
}
package appeng.integration.modules.helpers;
import net.minecraft.nbt.NBTTagCompound;
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
{
final protected PowerHandler bcPowerHandler;
public BCPerdition(IPowerReceptor te) {
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" );
}
@Override
public PowerReceiver getPowerReceiver()
{
return bcPowerHandler.getPowerReceiver();
}
@Override
public double useEnergy(float min, float max, boolean doUse)
{
return bcPowerHandler.useEnergy( min, max, doUse );
}
@Override
public void addEnergy(float failed)
{
bcPowerHandler.addEnergy( failed );
}
@Override
public void configure(int i, int j, float f, int k)
{
bcPowerHandler.configure( i, j, f, k );
}
}

48
tile/powersink/BaseBCperdition.java → integration/modules/helpers/BaseBCperdition.java
View file

@ -1,24 +1,24 @@
package appeng.tile.powersink;
import appeng.tile.events.AETileEventHandler;
import appeng.tile.events.TileEventType;
import buildcraft.api.power.PowerHandler.PowerReceiver;
import cpw.mods.fml.common.Optional.Method;
public abstract class BaseBCperdition extends AETileEventHandler
{
public BaseBCperdition() {
super( TileEventType.TICK, TileEventType.WORLD_NBT );
}
@Method(modid = "BuildCraftAPI|power")
public abstract PowerReceiver getPowerReceiver();
public abstract double useEnergy(float f, float requred, boolean b);
public abstract void addEnergy(float failed);
public abstract void configure(int i, int j, float f, int k);
}
package appeng.integration.modules.helpers;
import appeng.tile.events.AETileEventHandler;
import appeng.tile.events.TileEventType;
import buildcraft.api.power.PowerHandler.PowerReceiver;
import cpw.mods.fml.common.Optional.Method;
public abstract class BaseBCperdition extends AETileEventHandler
{
public BaseBCperdition() {
super( TileEventType.TICK, TileEventType.WORLD_NBT );
}
@Method(modid = "BuildCraftAPI|power")
public abstract PowerReceiver getPowerReceiver();
public abstract double useEnergy(float f, float requred, boolean b);
public abstract void addEnergy(float failed);
public abstract void configure(int i, int j, float f, int k);
}

16
tile/powersink/BuildCraft.java
View file

@ -4,12 +4,12 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import appeng.api.config.PowerUnits;
import appeng.core.AppEng;
import appeng.integration.abstraction.IBC;
import appeng.integration.abstraction.IMJ;
import appeng.integration.modules.helpers.BaseBCperdition;
import appeng.util.Platform;
import buildcraft.api.power.IPowerReceptor;
import buildcraft.api.power.PowerHandler;
import buildcraft.api.power.PowerHandler.PowerReceiver;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Optional.Interface;
import cpw.mods.fml.common.Optional.Method;
@ -24,16 +24,14 @@ public abstract class BuildCraft extends AERootPoweredTile implements IPowerRece
{
try
{
if ( Loader.isModLoaded( "BuildCraftAPI|power" ) )
if ( AppEng.instance.isIntegrationEnabled( "MJ" ) )
{
if ( AppEng.instance.isIntegrationEnabled( "BC" ) )
IMJ mjIntegration = (IMJ) AppEng.instance.getIntegration( "MJ" );
if ( mjIntegration != null )
{
IBC bcIntegration = (IBC) AppEng.instance.getIntegration( "BC" );
if ( bcIntegration != null )
{
addNewHandler( bcPowerWrapper = bcIntegration.createPerdition( this ) );
addNewHandler( bcPowerWrapper = mjIntegration.createPerdition( this ) );
if ( bcPowerWrapper != null )
bcPowerWrapper.configure( 1, 380, 1.0f / 5.0f, 1000 );
}
}
}
}