From 39ff969968dc22ce171e565d9aa733b6ea3f4439 Mon Sep 17 00:00:00 2001
From: Jason Mitchell <mitchej@gmail.com>
Date: Sat, 8 Sep 2018 23:39:14 -0700
Subject: 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
---
 .../gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java  | 4 ++++
 .../java/gregtech/api/interfaces/tileentity/IEnergyConnected.java     | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/java/gregtech/api/interfaces')

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)
-- 
cgit