Replaced protected fields access with methods calls, now code more safe.

2 files changed, 84 insertions, 1 deletions

diff --git a/src/main/java/gregtech/loaders/postload/GT_AE2EnergyTunnelLoader.java b/src/main/java/gregtech/loaders/postload/GT_AE2EnergyTunnelLoader.java
index c6f753d786..bdaa43c408 100644
--- a/src/main/java/gregtech/loaders/postload/GT_AE2EnergyTunnelLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_AE2EnergyTunnelLoader.java
@@ -1,7 +1,6 @@
 package gregtech.loaders.postload;
 
 import appeng.items.parts.PartType;
-import appeng.parts.p2p.PartP2PGTPower;
 import gregtech.GT_Mod;
 import gregtech.api.util.GT_Log;
 
diff --git a/src/main/java/gregtech/loaders/postload/PartP2PGTPower.java b/src/main/java/gregtech/loaders/postload/PartP2PGTPower.java
new file mode 100644
index 0000000000..602b481620
--- /dev/null
+++ b/src/main/java/gregtech/loaders/postload/PartP2PGTPower.java
@@ -0,0 +1,84 @@
+package gregtech.loaders.postload;
+
+import appeng.api.networking.IGridNode;
+import appeng.api.networking.ticking.IGridTickable;
+import appeng.api.networking.ticking.TickRateModulation;
+import appeng.api.networking.ticking.TickingRequest;
+import appeng.parts.p2p.PartP2PIC2Power;
+import gregtech.api.interfaces.tileentity.IEnergyConnected;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public class PartP2PGTPower extends PartP2PIC2Power implements IGridTickable {
+    public PartP2PGTPower(ItemStack is) {
+        super(is);
+    }
+
+    public final World getWorld() {
+        return tile.getWorldObj();
+    }
+
+    public final int getXCoord() {
+        return tile.xCoord;
+    }
+
+    public final short getYCoord() {
+        return (short) tile.yCoord;
+    }
+
+    public final int getZCoord() {
+        return tile.zCoord;
+    }
+
+    public final int getOffsetX(byte aSide, int aMultiplier) {
+        return getXCoord() + ForgeDirection.getOrientation(aSide).offsetX * aMultiplier;
+    }
+
+    public final short getOffsetY(byte aSide, int aMultiplier) {
+        return (short) (getYCoord() + ForgeDirection.getOrientation(aSide).offsetY * aMultiplier);
+    }
+
+    public final int getOffsetZ(byte aSide, int aMultiplier) {
+        return getZCoord() + ForgeDirection.getOrientation(aSide).offsetZ * aMultiplier;
+    }
+
+    public final TileEntity getTileEntity(int aX, int aY, int aZ) {
+        return getWorld().getTileEntity(aX, aY, aZ);
+    }
+
+    public final TileEntity getTileEntityAtSide(byte aSide) {
+        int tX = getOffsetX(aSide, 1), tY = getOffsetY(aSide, 1), tZ = getOffsetZ(aSide, 1);
+        return getWorld().getTileEntity(tX, tY, tZ);
+    }
+
+    public boolean outputEnergy() {
+        if (getOfferedEnergy() == 0) {
+            return false;
+        }
+        TileEntity t = getTileEntityAtSide((byte) side.ordinal());
+        if (t instanceof IEnergyConnected) {
+            long voltage = 8 << (getSourceTier() * 2);
+            if (voltage > getOfferedEnergy()) {
+                voltage = (long) getOfferedEnergy();
+            }
+            if (((IEnergyConnected) t).injectEnergyUnits(GT_Utility.getOppositeSide(side.ordinal()), voltage, 1) > 0) {
+                drawEnergy(voltage);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public TickingRequest getTickingRequest(IGridNode iGridNode) {
+        return new TickingRequest(1, 20, false, false);
+    }
+
+    @Override
+    public TickRateModulation tickingRequest(IGridNode iGridNode, int i) {
+        return outputEnergy() ? TickRateModulation.FASTER : TickRateModulation.SLOWER;
+    }
+}