aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/interfaces
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2018-09-06 08:40:35 +0200
committerGitHub <noreply@github.com>2018-09-06 08:40:35 +0200
commit8043ad2663d07bd97d7eaf7c9dcaaac72c413e72 (patch)
tree11351ed8e8ff50d06a985956ecb5f90a75842de9 /src/main/java/gregtech/api/interfaces
parent9d530773035ad21cffb1f558fa8309a57021c3b2 (diff)
parent9cd17d07c543a14a80672fa709c419f7c580a344 (diff)
downloadGT5-Unofficial-8043ad2663d07bd97d7eaf7c9dcaaac72c413e72.tar.gz
GT5-Unofficial-8043ad2663d07bd97d7eaf7c9dcaaac72c413e72.tar.bz2
GT5-Unofficial-8043ad2663d07bd97d7eaf7c9dcaaac72c413e72.zip
Merge pull request #144 from GTNewHorizons/pipe_overhaul_and_fluidfilter_fix
Pipe/Cable overhaul & Add filter output on fluid filters
Diffstat (limited to 'src/main/java/gregtech/api/interfaces')
-rw-r--r--src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
index becda3c32d..a78e1185cf 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
@@ -35,18 +35,15 @@ public interface IEnergyConnected extends IColoredTileEntity, IHasWorldObjectAnd
* Sided Energy Input
*/
public boolean inputEnergyFrom(byte aSide);
+ public boolean inputEnergyFrom(byte aSide, boolean waitForActive);
/**
* Sided Energy Output
*/
public boolean outputsEnergyTo(byte aSide);
+ public boolean outputsEnergyTo(byte aSide, boolean waitForActive);
/**
- * Are we ready for energy state?
- */
- public boolean energyStateReady();
-
- /**
* Utility for the Network
*/
public static class Util {