aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/interfaces/tileentity
diff options
context:
space:
mode:
authorJason Mitchell <mitchej+github@gmail.com>2018-09-16 17:08:37 -0700
committerGitHub <noreply@github.com>2018-09-16 17:08:37 -0700
commit3cce53ccc294c7686d2c4b7bffbedc6e182cb06d (patch)
treebcb2b1f6eece928fe13b581dc193548823e3aea8 /src/main/java/gregtech/api/interfaces/tileentity
parent08ccb2df5222870e3a12fc8df7e8fc594ca71902 (diff)
parent189ae4c82675db3bbd894860ea6e465ad679f874 (diff)
downloadGT5-Unofficial-3cce53ccc294c7686d2c4b7bffbedc6e182cb06d.tar.gz
GT5-Unofficial-3cce53ccc294c7686d2c4b7bffbedc6e182cb06d.tar.bz2
GT5-Unofficial-3cce53ccc294c7686d2c4b7bffbedc6e182cb06d.zip
Merge pull request #150 from GTNewHorizons/work_with_gtpp_cables
Work with subclassed GT cables (ie: gt++ cables)
Diffstat (limited to 'src/main/java/gregtech/api/interfaces/tileentity')
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java9
1 files changed, 7 insertions, 2 deletions
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