From bab8eb645d0997a197d5929653fd9739cf418883 Mon Sep 17 00:00:00 2001 From: Antifluxfield Date: Thu, 14 Sep 2017 13:31:52 +0800 Subject: [PATCH 1/2] Fix #1213 --- .../loaders/postload/PartP2PGTPower.java | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/src/main/java/gregtech/loaders/postload/PartP2PGTPower.java b/src/main/java/gregtech/loaders/postload/PartP2PGTPower.java index 602b4816..87118533 100644 --- a/src/main/java/gregtech/loaders/postload/PartP2PGTPower.java +++ b/src/main/java/gregtech/loaders/postload/PartP2PGTPower.java @@ -4,8 +4,10 @@ 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.AEBasePart; import appeng.parts.p2p.PartP2PIC2Power; import gregtech.api.interfaces.tileentity.IEnergyConnected; +import gregtech.api.util.GT_Log; import gregtech.api.util.GT_Utility; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -18,19 +20,19 @@ public class PartP2PGTPower extends PartP2PIC2Power implements IGridTickable { } public final World getWorld() { - return tile.getWorldObj(); + return getTile().getWorldObj(); } public final int getXCoord() { - return tile.xCoord; + return getTile().xCoord; } public final short getYCoord() { - return (short) tile.yCoord; + return (short) getTile().yCoord; } public final int getZCoord() { - return tile.zCoord; + return getTile().zCoord; } public final int getOffsetX(byte aSide, int aMultiplier) { @@ -58,13 +60,13 @@ public class PartP2PGTPower extends PartP2PIC2Power implements IGridTickable { if (getOfferedEnergy() == 0) { return false; } - TileEntity t = getTileEntityAtSide((byte) side.ordinal()); + TileEntity t = getTileEntityAtSide((byte) getSide().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) { + if (((IEnergyConnected) t).injectEnergyUnits(GT_Utility.getOppositeSide(getSide().ordinal()), voltage, 1) > 0) { drawEnergy(voltage); return true; } @@ -81,4 +83,16 @@ public class PartP2PGTPower extends PartP2PIC2Power implements IGridTickable { public TickRateModulation tickingRequest(IGridNode iGridNode, int i) { return outputEnergy() ? TickRateModulation.FASTER : TickRateModulation.SLOWER; } + + public ForgeDirection getSide(){ + try { + Field fSide = AEBasePart.class.getDeclaredField("side"); + fSide.setAccessible(true); + return (ForgeDirection) fSide.get(this); + } catch (Exception e) { + GT_Log.out.println("A fatal error occured at the P2P tunnel for GT electricity"); + e.printStackTrace(GT_Log.out); + throw new RuntimeException(e); + } + } } From ad544bf68a46edb36bab0f9d96b124ace8f1f433 Mon Sep 17 00:00:00 2001 From: Antifluxfield Date: Thu, 14 Sep 2017 13:40:11 +0800 Subject: [PATCH 2/2] Update PartP2PGTPower.java --- src/main/java/gregtech/loaders/postload/PartP2PGTPower.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/gregtech/loaders/postload/PartP2PGTPower.java b/src/main/java/gregtech/loaders/postload/PartP2PGTPower.java index 87118533..b59103f9 100644 --- a/src/main/java/gregtech/loaders/postload/PartP2PGTPower.java +++ b/src/main/java/gregtech/loaders/postload/PartP2PGTPower.java @@ -1,5 +1,7 @@ package gregtech.loaders.postload; +import java.lang.reflect.Field; + import appeng.api.networking.IGridNode; import appeng.api.networking.ticking.IGridTickable; import appeng.api.networking.ticking.TickRateModulation;