diff options
| author | Jason Mitchell <mitchej@gmail.com> | 2018-09-08 23:39:14 -0700 |
|---|---|---|
| committer | Jason Mitchell <mitchej@gmail.com> | 2018-09-08 23:39:14 -0700 |
| commit | 39ff969968dc22ce171e565d9aa733b6ea3f4439 (patch) | |
| tree | 5bef18f9c8fb0027981a6ae8bb903380ed8f701e /src/main/java/gregtech/api/interfaces/tileentity | |
| parent | 2aeb6e2ca7fb090d2392490aff6d6f87be48fd19 (diff) | |
| download | GT5-Unofficial-39ff969968dc22ce171e565d9aa733b6ea3f4439.tar.gz GT5-Unofficial-39ff969968dc22ce171e565d9aa733b6ea3f4439.tar.bz2 GT5-Unofficial-39ff969968dc22ce171e565d9aa733b6ea3f4439.zip | |
GC Energy Compat
* GT cables now properly fill GalacticCraft machines with Energy
IC2/AE2 Energy Compat
* Updated IC2 & AE2 energy compatability
* Added an option ic2EnergySourceCompat (default is on) to allow GT cables to pull energy directly from IC2 energy sources (nuclear reactors, MSFEs, etc) without the need for a transformer
* Filling IC2/AE2 energy buffers will now send multiple amps if needed
Misc
* Use a set instead of an arraylist for transfer electricity; deprecated backwards compatiable method left in
Diffstat (limited to 'src/main/java/gregtech/api/interfaces/tileentity')
| -rw-r--r-- | src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java | 4 |
1 files changed, 0 insertions, 4 deletions
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) |