aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common
diff options
context:
space:
mode:
authorMary <33456283+FourIsTheNumber@users.noreply.github.com>2024-07-24 21:14:45 -0400
committerGitHub <noreply@github.com>2024-07-25 08:14:45 +0700
commit5045736c2df49b6214c63dc78edff258ed39de0e (patch)
treed8bd169866706365a7b832756ca737d60450bbc0 /src/main/java/gregtech/common
parente53b6c05521f399312502c21bd29bd0f0479aa8b (diff)
downloadGT5-Unofficial-5045736c2df49b6214c63dc78edff258ed39de0e.tar.gz
GT5-Unofficial-5045736c2df49b6214c63dc78edff258ed39de0e.tar.bz2
GT5-Unofficial-5045736c2df49b6214c63dc78edff258ed39de0e.zip
Update multi-machines to display running mode in GUI (#2755)
* Framework for mode text in gui * Add getMachineModeName to all multimachines * Changed lang file for MFE because "Electromagnetic Polarizer" and "Electromagnetic Separator" are too long and make the GUI look bad * Removed leftover code * Removed more leftover code... oops * Moved logic to base class and made mode switch chat message localizable * Merge caused spotless to fail, I guess * Reverted logic from parent class * ahhhh spotless
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialElectromagneticSeparator.java17
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiCanner.java17
2 files changed, 20 insertions, 14 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialElectromagneticSeparator.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialElectromagneticSeparator.java
index 9aa92a8125..e0ac38f31f 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialElectromagneticSeparator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_IndustrialElectromagneticSeparator.java
@@ -346,19 +346,22 @@ public class GT_MetaTileEntity_IndustrialElectromagneticSeparator
}
@Override
+ public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+ setMachineMode(nextMachineMode());
+ PlayerUtils.messagePlayer(
+ aPlayer,
+ String.format(StatCollector.translateToLocal("GT5U.MULTI_MACHINE_CHANGE"), getMachineModeName()));
+ }
+
+ @Override
public void setMachineModeIcons() {
machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_SEPARATOR);
machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_POLARIZER);
}
@Override
- public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
- setMachineMode(nextMachineMode());
- if (machineMode == MACHINEMODE_POLARIZER) {
- PlayerUtils.messagePlayer(aPlayer, "Now running in Polarizing Mode.");
- } else {
- PlayerUtils.messagePlayer(aPlayer, "Now running in Separating Mode.");
- }
+ public String getMachineModeName() {
+ return StatCollector.translateToLocal("GT5U.INDUSTRIAL_ELECTROMAGNETIC_SEPARATOR.mode." + machineMode);
}
@Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiCanner.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiCanner.java
index b28a7bdca7..0a207331dd 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiCanner.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiCanner.java
@@ -234,19 +234,22 @@ public class GT_MetaTileEntity_MultiCanner extends
}
@Override
+ public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
+ setMachineMode(nextMachineMode());
+ PlayerUtils.messagePlayer(
+ aPlayer,
+ String.format(StatCollector.translateToLocal("GT5U.MULTI_MACHINE_CHANGE"), getMachineModeName()));
+ }
+
+ @Override
public void setMachineModeIcons() {
machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_PACKAGER);
machineModeIcons.add(GT_UITextures.OVERLAY_BUTTON_MACHINEMODE_LPF_FLUID);
}
@Override
- public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) {
- setMachineMode(nextMachineMode());
- if (machineMode == MACHINEMODE_FLUIDCANNER) {
- PlayerUtils.messagePlayer(aPlayer, "Now running in Fluid Canning Mode.");
- } else {
- PlayerUtils.messagePlayer(aPlayer, "Now running in Canning Mode.");
- }
+ public String getMachineModeName() {
+ return StatCollector.translateToLocal("GT5U.MULTI_CANNER.mode." + machineMode);
}
@Override