From ab192bcdc5db969a333ee13e14730e916c98e09f Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Wed, 1 Jan 2014 03:03:31 -0600 Subject: [PATCH] No need to handle BC/RtC power on the client now is there... --- tile/powersink/AERootPoweredTile.java | 3 +++ tile/powersink/BuildCraft.java | 22 +++++++++++++--------- tile/powersink/RotaryCraft.java | 3 ++- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/tile/powersink/AERootPoweredTile.java b/tile/powersink/AERootPoweredTile.java index 99ba9c39..8e5458cb 100644 --- a/tile/powersink/AERootPoweredTile.java +++ b/tile/powersink/AERootPoweredTile.java @@ -88,6 +88,9 @@ public abstract class AERootPoweredTile extends AEBaseInvTile implements IAEPowe @Override final public double injectAEPower(double amt, Actionable mode) { + if ( amt < 0.000001 ) + return 0; + if ( mode == Actionable.SIMULATE ) { double fakeBattery = internalCurrentPower + amt; diff --git a/tile/powersink/BuildCraft.java b/tile/powersink/BuildCraft.java index 67726ec9..d7216131 100644 --- a/tile/powersink/BuildCraft.java +++ b/tile/powersink/BuildCraft.java @@ -9,6 +9,7 @@ import appeng.api.config.PowerUnits; import appeng.core.AppEng; import appeng.tile.events.AETileEventHandler; import appeng.tile.events.TileEventType; +import appeng.util.Platform; import buildcraft.api.power.IPowerReceptor; import buildcraft.api.power.PowerHandler; import buildcraft.api.power.PowerHandler.PowerReceiver; @@ -54,18 +55,21 @@ public abstract class BuildCraft extends AERootPoweredTile implements IPowerRece BCPerdition bcPowerWrapper; public BuildCraft() { - try + if ( Platform.isServer() ) { - if ( Loader.isModLoaded( "BuildCraftAPI|power" ) ) + try { - if ( AppEng.instance.isIntegrationEnabled( "" ) ) - addNewHandler( bcPowerWrapper = new BCPerdition( this ) ); - bcPowerWrapper.bcPowerHandler.configure( 1, 380, 1.0f / 5.0f, 1000 ); + if ( Loader.isModLoaded( "BuildCraftAPI|power" ) ) + { + if ( AppEng.instance.isIntegrationEnabled( "" ) ) + addNewHandler( bcPowerWrapper = new BCPerdition( this ) ); + bcPowerWrapper.bcPowerHandler.configure( 1, 380, 1.0f / 5.0f, 1000 ); + } + } + catch (Throwable t) + { + // ignore.. no bc? } - } - catch (Throwable t) - { - // ignore.. no bc? } } diff --git a/tile/powersink/RotaryCraft.java b/tile/powersink/RotaryCraft.java index 1b157ee0..8e3adcf5 100644 --- a/tile/powersink/RotaryCraft.java +++ b/tile/powersink/RotaryCraft.java @@ -35,7 +35,8 @@ public abstract class RotaryCraft extends IC2 implements ShaftPowerReceiver }; public RotaryCraft() { - addNewHandler( new RotaryCraftHandler() ); + if ( Platform.isServer() ) + addNewHandler( new RotaryCraftHandler() ); } @Override