diff --git a/src/main/java/appeng/parts/p2p/FEP2PTunnelPart.java b/src/main/java/appeng/parts/p2p/FEP2PTunnelPart.java index aedf5b8b3..a94579d25 100644 --- a/src/main/java/appeng/parts/p2p/FEP2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/FEP2PTunnelPart.java @@ -45,6 +45,11 @@ public class FEP2PTunnelPart extends P2PTunnelPart { super(is); } + @Override + protected float getPowerDrainPerTick() { + return 2.0f; + } + @PartModels public static List getModels() { return MODELS.getModels(); diff --git a/src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java b/src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java index ff530ac21..33a31f57c 100644 --- a/src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java @@ -54,7 +54,8 @@ public class FluidP2PTunnelPart extends P2PTunnelPart { return MODELS.getModels(); } - public float getPowerDrainPerTick() { + @Override + protected float getPowerDrainPerTick() { return 2.0f; } diff --git a/src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java b/src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java index c4454ac31..2c10edf7d 100644 --- a/src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java @@ -68,6 +68,11 @@ public class ItemP2PTunnelPart extends P2PTunnelPart implemen super(is); } + @Override + protected float getPowerDrainPerTick() { + return POWER_DRAIN; + } + @Override public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) { this.cachedInv = null; @@ -235,10 +240,6 @@ public class ItemP2PTunnelPart extends P2PTunnelPart implemen return this.getDestination().getSlotLimit(slot); } - public float getPowerDrainPerTick() { - return POWER_DRAIN; - } - @Override public IPartModel getStaticModels() { return MODELS.getModel(this.isPowered(), this.isActive()); diff --git a/src/main/java/appeng/parts/p2p/LightP2PTunnelPart.java b/src/main/java/appeng/parts/p2p/LightP2PTunnelPart.java index da0ec7d5b..7b4134aaf 100644 --- a/src/main/java/appeng/parts/p2p/LightP2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/LightP2PTunnelPart.java @@ -56,6 +56,10 @@ public class LightP2PTunnelPart extends P2PTunnelPart implem super(is); } + protected float getPowerDrainPerTick() { + return 0.5f; + } + @Override public void chanRender(final MENetworkChannelsChanged c) { this.onTunnelNetworkChange(); @@ -186,10 +190,6 @@ public class LightP2PTunnelPart extends P2PTunnelPart implem return this.doWork() ? TickRateModulation.URGENT : TickRateModulation.SLOWER; } - public float getPowerDrainPerTick() { - return 0.5f; - } - @Override public IPartModel getStaticModels() { return MODELS.getModel(this.isPowered(), this.isActive()); diff --git a/src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java b/src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java index c6fe6e5fb..9edb3e01a 100644 --- a/src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java @@ -67,6 +67,11 @@ public class MEP2PTunnelPart extends P2PTunnelPart implements I this.outerProxy.setFlags(GridFlags.DENSE_CAPACITY, GridFlags.CANNOT_CARRY_COMPRESSED); } + @Override + protected float getPowerDrainPerTick() { + return 2.0f; + } + @Override public void readFromNBT(final CompoundNBT extra) { super.readFromNBT(extra); diff --git a/src/main/java/appeng/parts/p2p/P2PTunnelPart.java b/src/main/java/appeng/parts/p2p/P2PTunnelPart.java index a3e20416c..2a5b81166 100644 --- a/src/main/java/appeng/parts/p2p/P2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/P2PTunnelPart.java @@ -61,6 +61,11 @@ public abstract class P2PTunnelPart extends BasicStateP public P2PTunnelPart(final ItemStack is) { super(is); + this.getProxy().setIdlePowerUsage(this.getPowerDrainPerTick()); + } + + protected float getPowerDrainPerTick() { + return 1.0f; } public TunnelCollection getCollection(final Collection collection, diff --git a/src/main/java/appeng/parts/p2p/RedstoneP2PTunnelPart.java b/src/main/java/appeng/parts/p2p/RedstoneP2PTunnelPart.java index 28ab67696..b5734e922 100644 --- a/src/main/java/appeng/parts/p2p/RedstoneP2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/RedstoneP2PTunnelPart.java @@ -55,6 +55,11 @@ public class RedstoneP2PTunnelPart extends P2PTunnelPart super(is); } + @Override + protected float getPowerDrainPerTick() { + return 0.5f; + } + @MENetworkEventSubscribe public void changeStateA(final MENetworkBootingStatusChange bs) { this.setNetworkReady(); @@ -123,10 +128,6 @@ public class RedstoneP2PTunnelPart extends P2PTunnelPart this.setNetworkReady(); } - public float getPowerDrainPerTick() { - return 0.5f; - } - @Override public void onNeighborChanged(IBlockReader w, BlockPos pos, BlockPos neighbor) { if (!this.isOutput()) {