Added allow input from output side for drums and the config (#3789)

Author: Taskeren

src/generated/resources/assets/gtceu/lang/en_ud.json

@@ -1730,6 +1730,7 @@
   "config.gtceu.option.addLoot": "ʇooꞀppɐ",
   "config.gtceu.option.ae2": "ᄅǝɐ",
   "config.gtceu.option.allUniqueStoneTypes": "sǝdʎ⟘ǝuoʇSǝnbıu∩ןןɐ",
+  "config.gtceu.option.allowDrumsInputFluidsFromOutputSide": "ǝpıSʇndʇnOɯoɹℲspınןℲʇnduIsɯnɹᗡʍoןןɐ",
   "config.gtceu.option.animationTime": "ǝɯı⟘uoıʇɐɯıuɐ",
   "config.gtceu.option.arcRecyclingYield": "pןǝıʎbuıןɔʎɔǝᴚɔɹɐ",
   "config.gtceu.option.armorHud": "pnHɹoɯɹɐ",

src/generated/resources/assets/gtceu/lang/en_us.json

@@ -1730,6 +1730,7 @@
   "config.gtceu.option.addLoot": "addLoot",
   "config.gtceu.option.ae2": "ae2",
   "config.gtceu.option.allUniqueStoneTypes": "allUniqueStoneTypes",
+  "config.gtceu.option.allowDrumsInputFluidsFromOutputSide": "allowDrumsInputFluidsFromOutputSide",
   "config.gtceu.option.animationTime": "animationTime",
   "config.gtceu.option.arcRecyclingYield": "arcRecyclingYield",
   "config.gtceu.option.armorHud": "armorHud",

src/main/java/com/gregtechceu/gtceu/common/machine/storage/DrumMachine.java

@@ -12,6 +12,7 @@
 import com.gregtechceu.gtceu.api.machine.feature.IDropSaveMachine;
 import com.gregtechceu.gtceu.api.machine.feature.IInteractedMachine;
 import com.gregtechceu.gtceu.api.machine.trait.NotifiableFluidTank;
+import com.gregtechceu.gtceu.config.ConfigHolder;
 import com.gregtechceu.gtceu.utils.GTTransferUtils;
 
 import com.lowdragmc.lowdraglib.gui.texture.ResourceTexture;
@@ -31,6 +32,7 @@
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
@@ -58,6 +60,8 @@ public class DrumMachine extends MetaMachine implements IAutoOutputFluid, IDropS
     @DescSynced
     @RequireRerender
     protected boolean autoOutputFluids;
+    @Persisted
+    protected boolean allowInputFromOutputSideFluids;
     @Getter
     private final int maxStoredFluids;
     @Persisted
@@ -150,14 +154,20 @@ public void setAutoOutputFluids(boolean allow) {
         updateAutoOutputSubscription();
     }
 
+    private static boolean canInputFluidsFromOutputSide() {
+        return ConfigHolder.INSTANCE.machines.allowDrumsInputFluidsFromOutputSide;
+    }
+
     @Override
     public boolean isAllowInputFromOutputSideFluids() {
-        return false;
+        return canInputFluidsFromOutputSide() && this.allowInputFromOutputSideFluids;
     }
 
-    // always is facing down, and can never accept fluids from output side
+    // always is facing down, and can never accept fluids from output side by default
     @Override
-    public void setAllowInputFromOutputSideFluids(boolean allow) {}
+    public void setAllowInputFromOutputSideFluids(boolean allow) {
+        this.allowInputFromOutputSideFluids = allow;
+    }
 
     @Override
     public void setOutputFacingFluids(@Nullable Direction outputFacing) {
@@ -214,28 +224,61 @@ public boolean saveBreak() {
     @Override
     protected InteractionResult onScrewdriverClick(Player playerIn, InteractionHand hand, Direction gridSide,
                                                    BlockHitResult hitResult) {
+        if (!isRemote()) {
+            if (canInputFluidsFromOutputSide()) {
+                setAllowInputFromOutputSideFluids(!isAllowInputFromOutputSideFluids());
+                playerIn.sendSystemMessage(
+                        Component
+                                .translatable("gtceu.machine.basic.input_from_output_side." +
+                                        (isAllowInputFromOutputSideFluids() ? "allow" : "disallow"))
+                                .append(Component.translatable("gtceu.creative.tank.fluid")));
+            }
+            return InteractionResult.SUCCESS;
+        }
+        return super.onScrewdriverClick(playerIn, hand, gridSide, hitResult);
+    }
+
+    @Override
+    protected InteractionResult onSoftMalletClick(Player playerIn, InteractionHand hand, Direction gridSide,
+                                                  BlockHitResult hitResult) {
         if (!isRemote()) {
             if (!playerIn.isShiftKeyDown()) {
                 setAutoOutputFluids(!isAutoOutputFluids());
-                playerIn.sendSystemMessage(Component
-                        .translatable("gtceu.machine.drum." + (autoOutputFluids ? "enable" : "disable") + "_output"));
+                playerIn.sendSystemMessage(
+                        Component.translatable(
+                                "gtceu.machine.drum." + (autoOutputFluids ? "enable" : "disable") + "_output"));
                 return InteractionResult.SUCCESS;
             }
         }
-        return super.onScrewdriverClick(playerIn, hand, gridSide, hitResult);
+        return super.onSoftMalletClick(playerIn, hand, gridSide, hitResult);
     }
 
     //////////////////////////////////////
     // ******* Rendering ********//
     //////////////////////////////////////
+
+    @Override
+    public boolean shouldRenderGrid(Player player, BlockPos pos, BlockState state, ItemStack held,
+                                    Set<GTToolType> toolTypes) {
+        return super.shouldRenderGrid(player, pos, state, held, toolTypes) ||
+                toolTypes.contains(GTToolType.SOFT_MALLET) ||
+                (canInputFluidsFromOutputSide() && toolTypes.contains(GTToolType.SCREWDRIVER));
+    }
+
     @Override
     public @Nullable ResourceTexture sideTips(Player player, BlockPos pos, BlockState state, Set<GTToolType> toolTypes,
                                               Direction side) {
-        if (toolTypes.contains(GTToolType.SCREWDRIVER)) {
+        if (toolTypes.contains(GTToolType.SOFT_MALLET)) {
             if (side == getOutputFacingFluids()) {
                 return isAutoOutputFluids() ? GuiTextures.TOOL_DISABLE_AUTO_OUTPUT : GuiTextures.TOOL_AUTO_OUTPUT;
             }
         }
+        if (canInputFluidsFromOutputSide() && toolTypes.contains(GTToolType.SCREWDRIVER)) {
+            if (side == getOutputFacingFluids()) {
+                return GuiTextures.TOOL_ALLOW_INPUT;
+            }
+        }
+
         return super.sideTips(player, pos, state, toolTypes, side);
     }
 }

src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java

@@ -576,6 +576,10 @@ public static class MachineConfigs {
         })
         public int steamMultiParallelAmount = 8;
 
+        @Configurable
+        @Configurable.Comment("Whether the Drums can input fluids from the output side (bottom).")
+        public boolean allowDrumsInputFluidsFromOutputSide = false;
+
         @Configurable
         @Configurable.Comment("Small Steam Boiler Options")
         public SmallBoilers smallBoilers = new SmallBoilers();