diff options
| author | Mary <33456283+FourIsTheNumber@users.noreply.github.com> | 2024-08-26 00:53:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-26 06:53:29 +0200 |
| commit | 5732a9656dca1f19a2ace891c012330ae53ff4e8 (patch) | |
| tree | 197435bdb932b1a4351f56115102e7f229e47b6b /src/main/java/gregtech | |
| parent | e5fbecb6061d1695916f9ef4cf6b6c61ea64dff3 (diff) | |
| download | GT5-Unofficial-5732a9656dca1f19a2ace891c012330ae53ff4e8.tar.gz GT5-Unofficial-5732a9656dca1f19a2ace891c012330ae53ff4e8.tar.bz2 GT5-Unofficial-5732a9656dca1f19a2ace891c012330ae53ff4e8.zip | |
Fix some misnames and allow toggling batch mode with wire cutters (wh… (#2975)
Fix some misnames and allow toggling batch mode with wire cutters (while shifting)
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gregtech')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialLaserEngraver.java | 18 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java | 2 |
2 files changed, 15 insertions, 5 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialLaserEngraver.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialLaserEngraver.java index 816a35f557..50c55d11a5 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialLaserEngraver.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialLaserEngraver.java @@ -231,9 +231,20 @@ public class GT_MetaTileEntity_IndustrialLaserEngraver @Override public boolean onWireCutterRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer, float aX, float aY, float aZ, ItemStack aTool) { - if (renderer != null) { - renderer.realism = !renderer.realism; - PlayerUtils.messagePlayer(aPlayer, "Toggling realism!"); + if (aPlayer.isSneaking()) { + batchMode = !batchMode; + if (batchMode) { + GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOn")); + } else { + GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("misc.BatchModeTextOff")); + } + return true; + } else { + if (renderer != null) { + renderer.realism = !renderer.realism; + PlayerUtils.messagePlayer(aPlayer, "Toggling realism!"); + return true; + } } return false; } @@ -311,7 +322,6 @@ public class GT_MetaTileEntity_IndustrialLaserEngraver if (renderer == null) return false; if (glassTier < GTVoltageIndex.UMV && laserSource.mTier > glassTier) return false; - // All checks passed! return true; } diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index ee740c0d15..8ad2a37ba2 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -729,7 +729,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC new GT_MetaTileEntity_IndustrialLaserEngraver( INDUSTRIAL_LASER_ENGRAVER_CONTROLLER.ID, "multimachine.engraver", - "Hyper-Intensity Laser Emitter").getStackForm(1)); + "Hyper-Intensity Laser Engraver").getStackForm(1)); ItemList.Machine_Multi_IndustrialExtractor.set( new GT_MetaTileEntity_IndustrialExtractor( |