Digitalize Super Tank part 2 (#1331)

* fix super tank pipe connecting issue

* Add fifth button and fix translation key

* apply spotless

* fix

5 files changed, 42 insertions, 14 deletions

diff --git a/src/main/java/gregtech/api/gui/GT_Container_DigitalTank.java b/src/main/java/gregtech/api/gui/GT_Container_DigitalTank.java
index ae67dfd59f..bdc2b32c80 100644
--- a/src/main/java/gregtech/api/gui/GT_Container_DigitalTank.java
+++ b/src/main/java/gregtech/api/gui/GT_Container_DigitalTank.java
@@ -12,7 +12,11 @@ import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
 public class GT_Container_DigitalTank extends GT_Container_BasicTank {
-    public boolean outputFluid = false, mLockFluid = false, mVoidFluidPart = false, mVoidFluidFull = false;
+    public boolean outputFluid = false,
+            mLockFluid = false,
+            mVoidFluidPart = false,
+            mVoidFluidFull = false,
+            mAllowInputFromOutputSide = false;
 
     public GT_Container_DigitalTank(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
         super(aInventoryPlayer, aTileEntity);
@@ -27,6 +31,7 @@ public class GT_Container_DigitalTank extends GT_Container_BasicTank {
         addSlotToContainer(new GT_Slot_Holo(mTileEntity, 4, 26, 64, false, true, 1));
         addSlotToContainer(new GT_Slot_Holo(mTileEntity, 5, 44, 64, false, true, 1));
         addSlotToContainer(new GT_Slot_Holo(mTileEntity, 6, 62, 64, false, true, 1));
+        addSlotToContainer(new GT_Slot_Holo(mTileEntity, 7, 80, 64, false, true, 1));
     }
 
     @Override
@@ -37,9 +42,9 @@ public class GT_Container_DigitalTank extends GT_Container_BasicTank {
         if (aSlotIndex == 3) {
             mte.mOutputFluid = !mte.mOutputFluid;
             if (!mte.mOutputFluid) {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("225", "Fluid Auto Output Disabled"));
+                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("262", "Fluid Auto Output Disabled"));
             } else {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("226", "Fluid Auto Output Enabled"));
+                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("263", "Fluid Auto Output Enabled"));
             }
             return null;
         }
@@ -49,37 +54,45 @@ public class GT_Container_DigitalTank extends GT_Container_BasicTank {
             if (mte.mLockFluid) {
                 if (mte.mFluid == null) {
                     mte.lockedFluidName = null;
-                    inBrackets = GT_Utility.trans("227", "currently none, will be locked to the next that is put in");
+                    inBrackets = GT_Utility.trans("264", "currently none, will be locked to the next that is put in");
                 } else {
                     mte.lockedFluidName = mte.getDrainableStack().getUnlocalizedName();
                     inBrackets = mte.getDrainableStack().getLocalizedName();
                 }
                 GT_Utility.sendChatToPlayer(
-                        aPlayer, String.format("%s (%s)", GT_Utility.trans("228", "1 specific Fluid"), inBrackets));
+                        aPlayer, String.format("%s (%s)", GT_Utility.trans("265", "1 specific Fluid"), inBrackets));
             } else {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("229", "Lock Fluid Mode Disabled"));
+                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("266", "Lock Fluid Mode Disabled"));
             }
             return null;
         }
         if (aSlotIndex == 5) {
             mte.mVoidFluidPart = !mte.mVoidFluidPart;
             if (!mte.mVoidFluidPart) {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("230", "Overflow Voiding Mode Disabled"));
+                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("267", "Overflow Voiding Mode Disabled"));
             } else {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("231", "Overflow Voiding Mode Enabled"));
+                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("268", "Overflow Voiding Mode Enabled"));
             }
             return null;
         }
         if (aSlotIndex == 6) {
             mte.mVoidFluidFull = !mte.mVoidFluidFull;
             if (!mte.mVoidFluidFull) {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("232", "Void Full Mode Disabled"));
+                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("269", "Void Full Mode Disabled"));
             } else {
-                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("233", "Void Full Mode Enabled"));
+                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("270", "Void Full Mode Enabled"));
+                return null;
+            }
+        }
+        if (aSlotIndex == 7) {
+            mte.mAllowInputFromOutputSide = !mte.mAllowInputFromOutputSide;
+            if (!mte.mAllowInputFromOutputSide) {
+                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.getTrans("096"));
+            } else {
+                GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.getTrans("095"));
             }
             return null;
         }
-
         return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
     }
 
@@ -105,12 +118,16 @@ public class GT_Container_DigitalTank extends GT_Container_BasicTank {
             if (mVoidFluidFull != mte.mVoidFluidFull) {
                 player.sendProgressBarUpdate(this, 106, mte.mVoidFluidFull ? 1 : 0);
             }
+            if (mAllowInputFromOutputSide != mte.mAllowInputFromOutputSide) {
+                player.sendProgressBarUpdate(this, 107, mte.mAllowInputFromOutputSide ? 1 : 0);
+            }
         }
 
         outputFluid = mte.mOutputFluid;
         mLockFluid = mte.mLockFluid;
         mVoidFluidPart = mte.mVoidFluidPart;
         mVoidFluidFull = mte.mVoidFluidFull;
+        mAllowInputFromOutputSide = mte.mAllowInputFromOutputSide;
     }
 
     @Override
@@ -130,6 +147,9 @@ public class GT_Container_DigitalTank extends GT_Container_BasicTank {
             case 106:
                 mVoidFluidFull = (value != 0);
                 break;
+            case 107:
+                mAllowInputFromOutputSide = (value != 0);
+                break;
         }
     }
 }
diff --git a/src/main/java/gregtech/api/gui/GT_GUIContainer_DigitalTank.java b/src/main/java/gregtech/api/gui/GT_GUIContainer_DigitalTank.java
index c0655ced94..5d72c9ff51 100644
--- a/src/main/java/gregtech/api/gui/GT_GUIContainer_DigitalTank.java
+++ b/src/main/java/gregtech/api/gui/GT_GUIContainer_DigitalTank.java
@@ -50,6 +50,9 @@ public class GT_GUIContainer_DigitalTank extends GT_GUIContainerMetaTile_Machine
                 list.add(StatCollector.translateToLocal("GT5U.machines.digitaltank.voidfull.name"));
                 list.add(StatCollector.translateToLocal("GT5U.machines.digitaltank.voidfull.tooltip"));
             }
+            if (x >= 80 && x <= 96) {
+                list.add(StatCollector.translateToLocal("GT5U.machines.digitaltank.inputfromoutput.name"));
+            }
         }
         if (!list.isEmpty()) drawHoveringText(list, x2, y2, fontRendererObj);
     }
@@ -86,6 +89,9 @@ public class GT_GUIContainer_DigitalTank extends GT_GUIContainerMetaTile_Machine
             if (((GT_Container_DigitalTank) mContainer).mVoidFluidFull) {
                 drawTexturedModalRect(x + 61, y + 63, 176, 54, 18, 18);
             }
+            if (((GT_Container_DigitalTank) mContainer).mAllowInputFromOutputSide) {
+                drawTexturedModalRect(x + 79, y + 63, 176, 72, 18, 18);
+            }
         }
     }
 }
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java
index 7ccd1e62c3..765597283a 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java
+++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java
@@ -87,6 +87,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
             if (lockedFluidName != null && lockedFluidName.length() != 0)
                 aNBT.setString("lockedFluidName", lockedFluidName);
             else aNBT.removeTag("lockedFluidName");
+            aNBT.setBoolean("mAllowInputFromOutputSide", this.mAllowInputFromOutputSide);
         }
         super.setItemNBT(aNBT);
     }
@@ -101,7 +102,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
         if (lockedFluidName != null && lockedFluidName.length() != 0)
             aNBT.setString("lockedFluidName", lockedFluidName);
         else aNBT.removeTag("lockedFluidName");
-        aNBT.setBoolean("mAllowInputFromOutputSide", mAllowInputFromOutputSide);
+        aNBT.setBoolean("mAllowInputFromOutputSide", this.mAllowInputFromOutputSide);
     }
 
     @Override
@@ -355,7 +356,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
 
     @Override
     public boolean isInputFacing(byte aSide) {
-        return mAllowInputFromOutputSide || aSide != getBaseMetaTileEntity().getFrontFacing();
+        return true;
     }
 
     @Override
@@ -370,7 +371,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
 
     @Override
     public boolean isLiquidOutput(byte aSide) {
-        return aSide != getBaseMetaTileEntity().getFrontFacing();
+        return true;
     }
 
     @Override
diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang
index 249e113c8b..017aeedb78 100644
--- a/src/main/resources/assets/gregtech/lang/en_US.lang
+++ b/src/main/resources/assets/gregtech/lang/en_US.lang
@@ -113,6 +113,7 @@ GT5U.machines.digitaltank.voidoverflow.name=Overflow Voiding Mode
 GT5U.machines.digitaltank.voidoverflow.tooltip=§7Overflown Fluid is removing if tank full
 GT5U.machines.digitaltank.voidfull.name=Void Full Mode
 GT5U.machines.digitaltank.voidfull.tooltip=§7Fluid is completely removing
+GT5U.machines.digitaltank.inputfromoutput.name=Input Fluid from Output Side
 GT5U.machines.select_circuit=Select Machine Mode
 GT5U.machines.select_circuit.tooltip=Ghost Circuit Slot
 GT5U.machines.select_circuit.tooltip.1=§7LMB/RMB/scroll to cycle through the list
diff --git a/src/main/resources/assets/gregtech/textures/gui/DigitalTank.png b/src/main/resources/assets/gregtech/textures/gui/DigitalTank.png
index 56ac5d1ba0..5f8348035c 100644
--- a/src/main/resources/assets/gregtech/textures/gui/DigitalTank.png
+++ b/src/main/resources/assets/gregtech/textures/gui/DigitalTank.png