Merge fixes

src/main/java/appeng/parts/automation/IdentityAnnihilationPlanePart.java

@@ -32,10 +32,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.BlockPos;
 
-import appeng.api.parts.IPart;
-import appeng.api.parts.IPartHost;
 import appeng.api.parts.IPartModel;
-import appeng.api.util.AEPartLocation;
 import appeng.items.parts.PartModels;
 
 public class IdentityAnnihilationPlanePart extends AnnihilationPlanePart {

src/main/java/appeng/parts/p2p/FluidP2PTunnelPart.java

@@ -60,7 +60,8 @@ public class FluidP2PTunnelPart extends P2PTunnelPart<FluidP2PTunnelPart> {
         return MODELS.getModels();
     }
 
-    public float getPowerDrainPerTick() {
+    @Override
+    protected float getPowerDrainPerTick() {
         return 2.0f;
     }
 

src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java

@@ -66,6 +66,11 @@ public class ItemP2PTunnelPart extends P2PTunnelPart<ItemP2PTunnelPart> implemen
         super(is);
     }
 
+    @Override
+    protected float getPowerDrainPerTick() {
+        return POWER_DRAIN;
+    }
+
     @Override
     public void onNeighborUpdate(BlockView w, BlockPos pos, BlockPos neighbor) {
         this.cachedInv = null;
@@ -199,10 +204,6 @@ public class ItemP2PTunnelPart extends P2PTunnelPart<ItemP2PTunnelPart> implemen
         to.offer(getDestination(), CacheInfo.NOT_CACHABLE);
     }
 
-    public float getPowerDrainPerTick() {
-        return POWER_DRAIN;
-    }
-
     @Override
     public IPartModel getStaticModels() {
         return MODELS.getModel(this.isPowered(), this.isActive());

src/main/java/appeng/parts/p2p/LightP2PTunnelPart.java

@@ -56,6 +56,10 @@ public class LightP2PTunnelPart extends P2PTunnelPart<LightP2PTunnelPart> 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<LightP2PTunnelPart> 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());

src/main/java/appeng/parts/p2p/MEP2PTunnelPart.java

@@ -67,6 +67,11 @@ public class MEP2PTunnelPart extends P2PTunnelPart<MEP2PTunnelPart> implements I
         this.outerProxy.setFlags(GridFlags.DENSE_CAPACITY, GridFlags.CANNOT_CARRY_COMPRESSED);
     }
 
+    @Override
+    protected float getPowerDrainPerTick() {
+        return 2.0f;
+    }
+
     @Override
     public void readFromNBT(final CompoundTag extra) {
         super.readFromNBT(extra);

src/main/java/appeng/parts/p2p/P2PTunnelPart.java

@@ -59,6 +59,11 @@ public abstract class P2PTunnelPart<T extends P2PTunnelPart> extends BasicStateP
 
     public P2PTunnelPart(final ItemStack is) {
         super(is);
+        this.getProxy().setIdlePowerUsage(this.getPowerDrainPerTick());
+    }
+
+    protected float getPowerDrainPerTick() {
+        return 1.0f;
     }
 
     public TunnelCollection<T> getCollection(final Collection<P2PTunnelPart> collection,

src/main/java/appeng/parts/p2p/RedstoneP2PTunnelPart.java

@@ -55,6 +55,11 @@ public class RedstoneP2PTunnelPart extends P2PTunnelPart<RedstoneP2PTunnelPart>
         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<RedstoneP2PTunnelPart>
         this.setNetworkReady();
     }
 
-    public float getPowerDrainPerTick() {
-        return 0.5f;
-    }
-
     @Override
     public void onNeighborUpdate(BlockView w, BlockPos pos, BlockPos neighbor) {
         if (!this.isOutput()) {