diff options
| author | Dream-Master <dream-master@gmx.net> | 2018-09-20 07:50:37 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2018-09-20 07:50:37 +0200 |
| commit | e28a544140e37443039cc5720fc03134a7d15e34 (patch) | |
| tree | 7dcb2e6cb1bc1dea3d7e91267857f1e9b087cfc9 /src/main/java/gregtech/api/interfaces | |
| parent | 936d25dfca4e67bf9ea8b52709ab9136290490e2 (diff) | |
| parent | 3cce53ccc294c7686d2c4b7bffbedc6e182cb06d (diff) | |
| download | GT5-Unofficial-e28a544140e37443039cc5720fc03134a7d15e34.tar.gz GT5-Unofficial-e28a544140e37443039cc5720fc03134a7d15e34.tar.bz2 GT5-Unofficial-e28a544140e37443039cc5720fc03134a7d15e34.zip | |
Merge branch 'experimental' into GT_Bees_dev
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 | 9 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java index 86232e6439..ead9c8bf8f 100644 --- a/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java +++ b/src/main/java/gregtech/api/interfaces/metatileentity/IMetaTileEntityCable.java @@ -9,5 +9,7 @@ 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); + default public long transferElectricity(byte aSide, long aVoltage, long aAmperage, HashSet<TileEntity> aAlreadyPassedSet) { + return transferElectricity(aSide, aVoltage, aAmperage, new ArrayList<>(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 e707c15850..8c9bac5c01 100644 --- a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java +++ b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java @@ -3,6 +3,7 @@ package gregtech.api.interfaces.tileentity; import cofh.api.energy.IEnergyReceiver; import gregtech.GT_Mod; import gregtech.api.GregTech_API; +import gregtech.api.util.GT_Log; import gregtech.api.util.GT_Utility; import gregtech.common.GT_Pollution; import ic2.api.energy.tile.IEnergySink; @@ -35,13 +36,17 @@ public interface IEnergyConnected extends IColoredTileEntity, IHasWorldObjectAnd * Sided Energy Input */ public boolean inputEnergyFrom(byte aSide); - public boolean inputEnergyFrom(byte aSide, boolean waitForActive); + default public boolean inputEnergyFrom(byte aSide, boolean waitForActive) { + return inputEnergyFrom(aSide); + } /** * Sided Energy Output */ public boolean outputsEnergyTo(byte aSide); - public boolean outputsEnergyTo(byte aSide, boolean waitForActive); + default public boolean outputsEnergyTo(byte aSide, boolean waitForActive) { + return outputsEnergyTo(aSide); + } /** * Utility for the Network |