diff options
| author | Martin Robertz <dream-master@gmx.net> | 2018-09-09 18:43:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-09 18:43:53 +0200 |
| commit | 2fe2bb57ec0bdf9f9ce44c5f13e11ab6d6209b40 (patch) | |
| tree | 21a49af7565123014ac045e6a0ed41c7f3914776 /src/main/java/gregtech/api/interfaces | |
| parent | 2aeb6e2ca7fb090d2392490aff6d6f87be48fd19 (diff) | |
| parent | 6e6baf615dfcef4aa684fbe50816ed184d1ed6a5 (diff) | |
| download | GT5-Unofficial-2fe2bb57ec0bdf9f9ce44c5f13e11ab6d6209b40.tar.gz GT5-Unofficial-2fe2bb57ec0bdf9f9ce44c5f13e11ab6d6209b40.tar.bz2 GT5-Unofficial-2fe2bb57ec0bdf9f9ce44c5f13e11ab6d6209b40.zip | |
Merge pull request #148 from GTNewHorizons/GC_Compat
GC Energy Compatibility & TransferEnergy updates
Diffstat (limited to 'src/main/java/gregtech/api/interfaces')
| -rw-r--r-- | src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java | 4 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java index 17fca8a65f..86232e6439 100644 --- a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java +++ b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java @@ -3,7 +3,11 @@ package gregtech.api.interfaces.metatileentity; import net.minecraft.tileentity.TileEntity; import java.util.ArrayList; +import java.util.HashSet; public interface IMetaTileEntityCable extends IMetaTileEntity { + @Deprecated public long transferElectricity(byte aSide, long aVoltage, long aAmperage, ArrayList<TileEntity> aAlreadyPassedTileEntityList); + + public long transferElectricity(byte aSide, long aVoltage, long aAmperage, HashSet<TileEntity> aAlreadyPassedSet); }
\ No newline at end of file diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java index a78e1185cf..e707c15850 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java @@ -64,10 +64,6 @@ public interface IEnergyConnected extends IColoredTileEntity, IHasWorldObjectAnd if (tColor >= 0 && tColor != aEmitter.getColorization()) continue; } rUsedAmperes += ((IEnergyConnected) tTileEntity).injectEnergyUnits(j, aVoltage, aAmperage - rUsedAmperes); -// } else if (tTileEntity instanceof IEnergySink) { -// if (((IEnergySink)tTileEntity).acceptsEnergyFrom((TileEntity)aEmitter, ForgeDirection.getOrientation(j))) { -// while (aAmperage > rUsedAmperes && ((IEnergySink)tTileEntity).demandedEnergyUnits() > 0 && ((IEnergySink)tTileEntity).injectEnergyUnits(ForgeDirection.getOrientation(j), aVoltage) < aVoltage) rUsedAmperes++; -// } } else if (tTileEntity instanceof IEnergySink) { if (((IEnergySink) tTileEntity).acceptsEnergyFrom((TileEntity) aEmitter, ForgeDirection.getOrientation(j))) { while (aAmperage > rUsedAmperes && ((IEnergySink) tTileEntity).getDemandedEnergy() > 0 && ((IEnergySink) tTileEntity).injectEnergy(ForgeDirection.getOrientation(j), aVoltage, aVoltage) < aVoltage) |