aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/interfaces
diff options
context:
space:
mode:
authorJason Mitchell <mitchej@gmail.com>2018-09-03 00:57:51 -0700
committerJason Mitchell <mitchej@gmail.com>2018-09-03 00:57:51 -0700
commit1698e57f729efb52e2b98e865a9671f0b50a5b2e (patch)
tree09b81c4c89478b2e392f7b482eedb064ac520eee /src/main/java/gregtech/api/interfaces
parent9d530773035ad21cffb1f558fa8309a57021c3b2 (diff)
downloadGT5-Unofficial-1698e57f729efb52e2b98e865a9671f0b50a5b2e.tar.gz
GT5-Unofficial-1698e57f729efb52e2b98e865a9671f0b50a5b2e.tar.bz2
GT5-Unofficial-1698e57f729efb52e2b98e865a9671f0b50a5b2e.zip
Pipe/Cable overhaul & Add filter output on fluid filters
* Unified connect() method for pipes/wires - each subclass has it's own canConnect(), letsIn(), and letsOut() methods that map to the specifics for that implementation * Shift Clicking while placing a GT machine will now try connecting to the cable/pipe it is placed on * You can open a connection to the air for pipes & wires, allowing the next thing you place down to auto connect (ie: a JABBA barrel) * Distribute Fluids - Modeled after several of the upstream PRs * Fluid regulators on pipes should stop spazzing out now * Fluid filter covers - Now work with filtering output BUG/TODO: * Spray paint doesn't seem to keep wires/pipes from connecting properly * Spray paint on wires/pipes should force a disconnection check
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 {