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

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

Browse source
This commit is contained in:
Dimach 2017-09-06 10:47:03 +03:00
parent ded594c86c
commit c6d39f12fd
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/gregtech/loaders/postload/GT_AE2EnergyTunnelLoader.java
View file

@ -1,7 +1,6 @@
package gregtech.loaders.postload; package gregtech.loaders.postload;
import appeng.items.parts.PartType; import appeng.items.parts.PartType;
import appeng.parts.p2p.PartP2PGTPower;
import gregtech.GT_Mod; import gregtech.GT_Mod;
import gregtech.api.util.GT_Log; import gregtech.api.util.GT_Log;

20
src/main/java/appeng/parts/p2p/PartP2PGTPower.java → src/main/java/gregtech/loaders/postload/PartP2PGTPower.java
View file

@ -1,9 +1,10 @@
package appeng.parts.p2p; package gregtech.loaders.postload;
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.p2p.PartP2PIC2Power;
import gregtech.api.interfaces.tileentity.IEnergyConnected; import gregtech.api.interfaces.tileentity.IEnergyConnected;
import gregtech.api.util.GT_Utility; import gregtech.api.util.GT_Utility;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -54,20 +55,17 @@ public class PartP2PGTPower extends PartP2PIC2Power implements IGridTickable {
} }
public boolean outputEnergy() { public boolean outputEnergy() {
if (OutputEnergyA == 0) { if (getOfferedEnergy() == 0) {
return false; return false;
} }
TileEntity t = getTileEntityAtSide((byte) side.ordinal()); TileEntity t = getTileEntityAtSide((byte) side.ordinal());
if (t instanceof IEnergyConnected) { if (t instanceof IEnergyConnected) {
long l = ((IEnergyConnected) t).injectEnergyUnits(GT_Utility.getOppositeSide(side.ordinal()), (long) OutputVoltageA, ((long) OutputEnergyA) / ((long) OutputVoltageA)); long voltage = 8 << (getSourceTier() * 2);
if (l > 0) { if (voltage > getOfferedEnergy()) {
OutputEnergyA -= ((long) OutputVoltageA) * l; voltage = (long) getOfferedEnergy();
if (OutputEnergyA < 1) {
OutputEnergyA = OutputEnergyB;
OutputVoltageA = OutputVoltageB;
OutputEnergyB = 0;
OutputVoltageB = 0;
} }
if (((IEnergyConnected) t).injectEnergyUnits(GT_Utility.getOppositeSide(side.ordinal()), voltage, 1) > 0) {
drawEnergy(voltage);
return true; return true;
} }
} }
@ -76,7 +74,7 @@ public class PartP2PGTPower extends PartP2PIC2Power implements IGridTickable {
@Override @Override
public TickingRequest getTickingRequest(IGridNode iGridNode) { public TickingRequest getTickingRequest(IGridNode iGridNode) {
return new TickingRequest(1, 10, false, false); return new TickingRequest(1, 20, false, false);
} }
@Override @Override