From 4076d88e21bcba9c08519d5557b9589263e2fdbc Mon Sep 17 00:00:00 2001 From: StaffiX <32968022+StaffiX@users.noreply.github.com> Date: Tue, 12 Nov 2024 00:26:46 +0100 Subject: Add tool batch mode for some multis (#3475) Co-authored-by: Martin Robertz --- src/main/java/ggfab/mte/MTEAdvAssLine.java | 13 ++++++------- .../blocks/tileEntity/MTEComponentAssemblyLine.java | 15 ++++++--------- .../blocks/tileEntity/MTEFuelRefineFactory.java | 15 ++++++--------- .../blocks/tileEntity/MTEPreciseAssembler.java | 11 +++++++++++ .../multi/MTEIndustrialElectromagneticSeparator.java | 12 ++++++++++++ .../machines/multi/MTELargeChemicalReactor.java | 15 +++++++++++++++ .../machines/multi/MTELargeFluidExtractor.java | 15 +++++++++++++++ .../tileentities/machines/multi/MTEMultiAutoclave.java | 13 +++++++++++++ .../tileentities/machines/multi/MTEMultiFurnace.java | 13 +++++++++++++ .../common/tileentities/machines/multi/MTEMultiLathe.java | 13 +++++++++++++ .../tileentities/machines/multi/MTEMultiSolidifier.java | 13 +++++++++++++ .../common/tileentities/machines/multi/MTENanoForge.java | 13 +++++++++++++ .../tileentities/machines/multi/MTEPlasmaForge.java | 12 ++++++++++++ .../multi/production/MTEQuantumForceTransformer.java | 12 ++++++++++++ .../multi/production/mega/MTEMegaAlloyBlastSmelter.java | 15 ++++++--------- 15 files changed, 166 insertions(+), 34 deletions(-) diff --git a/src/main/java/ggfab/mte/MTEAdvAssLine.java b/src/main/java/ggfab/mte/MTEAdvAssLine.java index 18ab96b680..0414d8213e 100644 --- a/src/main/java/ggfab/mte/MTEAdvAssLine.java +++ b/src/main/java/ggfab/mte/MTEAdvAssLine.java @@ -43,6 +43,7 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.StatCollector; import net.minecraft.util.StringUtils; import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; @@ -990,13 +991,11 @@ public class MTEAdvAssLine extends MTEExtendedPowerMultiBlockBase @Override public boolean onWireCutterRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { - if (aPlayer.isSneaking()) { - batchMode = !batchMode; - if (batchMode) { - GTUtility.sendChatToPlayer(aPlayer, "Batch mode enabled"); - } else { - GTUtility.sendChatToPlayer(aPlayer, "Batch mode disabled"); - } + batchMode = !batchMode; + if (batchMode) { + GTUtility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOn")); + } else { + GTUtility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOff")); } return true; } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEComponentAssemblyLine.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEComponentAssemblyLine.java index 5d17832cb5..9318d0d9df 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTEComponentAssemblyLine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEComponentAssemblyLine.java @@ -344,16 +344,13 @@ public class MTEComponentAssemblyLine extends MTEExtendedPowerMultiBlockBase @@ -291,4 +294,16 @@ public class MTELargeChemicalReactor extends MTEEnhancedMultiBlockBase im public boolean supportsBatchMode() { return true; } + + @Override + public boolean onWireCutterRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer, + float aX, float aY, float aZ) { + batchMode = !batchMode; + if (batchMode) { + GTUtility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOn")); + } else { + GTUtility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOff")); + } + return true; + } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiLathe.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiLathe.java index cb25bf1724..bc68695738 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiLathe.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiLathe.java @@ -22,6 +22,7 @@ import java.text.DecimalFormat; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -401,4 +402,16 @@ public class MTEMultiLathe extends MTEExtendedPowerMultiBlockBase logic.setAvailableVoltage(GTUtility.roundUpVoltage(this.getMaxInputVoltage())); logic.setAvailableAmperage(1L); } + + @Override + public boolean onWireCutterRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer, + float aX, float aY, float aZ) { + batchMode = !batchMode; + if (batchMode) { + GTUtility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOn")); + } else { + GTUtility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOff")); + } + return true; + } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiSolidifier.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiSolidifier.java index baaedc2d72..d6c32a2185 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiSolidifier.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEMultiSolidifier.java @@ -21,6 +21,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -508,4 +509,16 @@ public class MTEMultiSolidifier extends MTEExtendedPowerMultiBlockBase i StatCollector.translateToLocal("GT5U.machines.separatebus") + " " + inputSeparation); } + @Override + public boolean onWireCutterRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer, + float aX, float aY, float aZ) { + batchMode = !batchMode; + if (batchMode) { + GTUtility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOn")); + } else { + GTUtility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOff")); + } + return true; + } + @Override public boolean supportsVoidProtection() { return true; @@ -457,4 +469,5 @@ public class MTENanoForge extends MTEExtendedPowerMultiBlockBase i public boolean supportsBatchMode() { return true; } + } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEPlasmaForge.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPlasmaForge.java index a41ee1128d..705aa03916 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEPlasmaForge.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEPlasmaForge.java @@ -1292,4 +1292,16 @@ public class MTEPlasmaForge extends MTEExtendedPowerMultiBlockBase