aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/kekztech
diff options
context:
space:
mode:
authorChristina Berchtold <kekzdealer@gmail.com>2020-04-23 22:06:32 +0200
committerChristina Berchtold <kekzdealer@gmail.com>2020-04-23 22:06:32 +0200
commitd48674f9c4243fe4439999e59c798a13113f3037 (patch)
treeee9ba0d21d6c135ee0153da2fcbbb33bdc6d902b /src/main/java/kekztech
parent35477125b256e6577156911ddf8bcc30a090edc7 (diff)
downloadGT5-Unofficial-d48674f9c4243fe4439999e59c798a13113f3037.tar.gz
GT5-Unofficial-d48674f9c4243fe4439999e59c798a13113f3037.tar.bz2
GT5-Unofficial-d48674f9c4243fe4439999e59c798a13113f3037.zip
Fixed Multi Hatch ignoring circuit in controller when drained from
Diffstat (limited to 'src/main/java/kekztech')
-rw-r--r--src/main/java/kekztech/KekzCore.java2
-rw-r--r--src/main/java/kekztech/MultiFluidHandler.java21
2 files changed, 22 insertions, 1 deletions
diff --git a/src/main/java/kekztech/KekzCore.java b/src/main/java/kekztech/KekzCore.java
index 56645e9050..cff0a69b0a 100644
--- a/src/main/java/kekztech/KekzCore.java
+++ b/src/main/java/kekztech/KekzCore.java
@@ -133,7 +133,7 @@ public class KekzCore {
}
@Mod.EventHandler
- public void init(FMLInitializationEvent event ) {
+ public void init(FMLInitializationEvent event) {
// Multiblock controllers
sofc1 = new GTMTE_SOFuelCellMK1(13101, "multimachine.fuelcellmk1", "Solid-Oxide Fuel Cell Mk I");
sofc2 = new GTMTE_SOFuelCellMK2(13102, "multimachine.fuelcellmk2", "Solid-Oxide Fuel Cell Mk II");
diff --git a/src/main/java/kekztech/MultiFluidHandler.java b/src/main/java/kekztech/MultiFluidHandler.java
index a96094a8f0..880576ca7e 100644
--- a/src/main/java/kekztech/MultiFluidHandler.java
+++ b/src/main/java/kekztech/MultiFluidHandler.java
@@ -15,6 +15,7 @@ public class MultiFluidHandler {
private int capacityPerFluid;
private boolean locked = true;
+ private byte fluidSelector = -1;
public MultiFluidHandler() {
@@ -39,6 +40,26 @@ public class MultiFluidHandler {
locked = state;
}
+ /**
+ * Used to tell the MFH if a fluid is selected by
+ * an Integrated Circuit in the controller.
+ *
+ * @param fluidSelector
+ * Selected fluid or -1 if no fluid is selected
+ */
+ public void setFluidSelector(byte fluidSelector) {
+ this.fluidSelector = fluidSelector;
+ }
+
+ /**
+ *
+ * @return
+ * Selected fluid or -1 if no fluid is selected
+ */
+ public byte getSelectedFluid() {
+ return fluidSelector;
+ }
+
public boolean contains(FluidStack fluid) {
return !locked && fluids.contains(fluid);
}