Skip to content

Commit d145b0c

Browse files
Re-enable using Screwdriver to toggle Drum auto output, if Allow Input From Output Side is disabled (#4163)
1 parent fa4e026 commit d145b0c

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,11 @@ protected InteractionResult onScrewdriverClick(Player playerIn, InteractionHand
232232
.translatable("gtceu.machine.basic.input_from_output_side." +
233233
(isAllowInputFromOutputSideFluids() ? "allow" : "disallow"))
234234
.append(Component.translatable("gtceu.creative.tank.fluid")));
235+
} else if (!playerIn.isShiftKeyDown()) {
236+
setAutoOutputFluids(!isAutoOutputFluids());
237+
playerIn.sendSystemMessage(Component
238+
.translatable("gtceu.machine.drum." + (autoOutputFluids ? "enable" : "disable") + "_output"));
239+
return InteractionResult.SUCCESS;
235240
}
236241
return InteractionResult.SUCCESS;
237242
}
@@ -261,14 +266,14 @@ protected InteractionResult onSoftMalletClick(Player playerIn, InteractionHand h
261266
public boolean shouldRenderGrid(Player player, BlockPos pos, BlockState state, ItemStack held,
262267
Set<GTToolType> toolTypes) {
263268
return super.shouldRenderGrid(player, pos, state, held, toolTypes) ||
264-
toolTypes.contains(GTToolType.SOFT_MALLET) ||
265-
(canInputFluidsFromOutputSide() && toolTypes.contains(GTToolType.SCREWDRIVER));
269+
toolTypes.contains(GTToolType.SOFT_MALLET) || toolTypes.contains(GTToolType.SCREWDRIVER);
266270
}
267271

268272
@Override
269273
public @Nullable ResourceTexture sideTips(Player player, BlockPos pos, BlockState state, Set<GTToolType> toolTypes,
270274
Direction side) {
271-
if (toolTypes.contains(GTToolType.SOFT_MALLET)) {
275+
if (toolTypes.contains(GTToolType.SOFT_MALLET) ||
276+
(!canInputFluidsFromOutputSide() && toolTypes.contains(GTToolType.SCREWDRIVER))) {
272277
if (side == getOutputFacingFluids()) {
273278
return isAutoOutputFluids() ? GuiTextures.TOOL_DISABLE_AUTO_OUTPUT : GuiTextures.TOOL_AUTO_OUTPUT;
274279
}

0 commit comments

Comments
 (0)