Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1215 from Antifluxfield/patch-1

Browse source 
Fix #1213
This commit is contained in:
Blood-Asp 2017-09-14 19:01:31 +02:00 committed by GitHub
commit 9feee334a0
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/main/java/gregtech/loaders/postload/PartP2PGTPower.java
View file

@ -1,11 +1,15 @@
package gregtech.loaders.postload; package gregtech.loaders.postload;
import java.lang.reflect.Field;
import appeng.api.networking.IGridNode; import appeng.api.networking.IGridNode;
import appeng.api.networking.ticking.IGridTickable; import appeng.api.networking.ticking.IGridTickable;
import appeng.api.networking.ticking.TickRateModulation; import appeng.api.networking.ticking.TickRateModulation;
import appeng.api.networking.ticking.TickingRequest; import appeng.api.networking.ticking.TickingRequest;
import appeng.parts.AEBasePart;
import appeng.parts.p2p.PartP2PIC2Power; import appeng.parts.p2p.PartP2PIC2Power;
import gregtech.api.interfaces.tileentity.IEnergyConnected; import gregtech.api.interfaces.tileentity.IEnergyConnected;
import gregtech.api.util.GT_Log;
import gregtech.api.util.GT_Utility; import gregtech.api.util.GT_Utility;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
@ -18,19 +22,19 @@ public class PartP2PGTPower extends PartP2PIC2Power implements IGridTickable {
} }
public final World getWorld() { public final World getWorld() {
return tile.getWorldObj(); return getTile().getWorldObj();
} }
public final int getXCoord() { public final int getXCoord() {
return tile.xCoord; return getTile().xCoord;
} }
public final short getYCoord() { public final short getYCoord() {
return (short) tile.yCoord; return (short) getTile().yCoord;
} }
public final int getZCoord() { public final int getZCoord() {
return tile.zCoord; return getTile().zCoord;
} }
public final int getOffsetX(byte aSide, int aMultiplier) { public final int getOffsetX(byte aSide, int aMultiplier) {
@ -58,13 +62,13 @@ public class PartP2PGTPower extends PartP2PIC2Power implements IGridTickable {
if (getOfferedEnergy() == 0) { if (getOfferedEnergy() == 0) {
return false; return false;
} }
TileEntity t = getTileEntityAtSide((byte) side.ordinal()); TileEntity t = getTileEntityAtSide((byte) getSide().ordinal());
if (t instanceof IEnergyConnected) { if (t instanceof IEnergyConnected) {
long voltage = 8 << (getSourceTier() * 2); long voltage = 8 << (getSourceTier() * 2);
if (voltage > getOfferedEnergy()) { if (voltage > getOfferedEnergy()) {
voltage = (long) 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); drawEnergy(voltage);
return true; return true;
} }
@ -81,4 +85,16 @@ public class PartP2PGTPower extends PartP2PIC2Power implements IGridTickable {
public TickRateModulation tickingRequest(IGridNode iGridNode, int i) { public TickRateModulation tickingRequest(IGridNode iGridNode, int i) {
return outputEnergy() ? TickRateModulation.FASTER : TickRateModulation.SLOWER; 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);
}
}
} }