From 5045736c2df49b6214c63dc78edff258ed39de0e Mon Sep 17 00:00:00 2001 From: Mary <33456283+FourIsTheNumber@users.noreply.github.com> Date: Wed, 24 Jul 2024 21:14:45 -0400 Subject: 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 --- src/main/resources/assets/gregtech/lang/en_US.lang | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main/resources/assets') diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 9c62c6be6a..b670a6f8c1 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -327,8 +327,8 @@ GT5U.GTPP_MULTI_WASH_PLANT.mode.1=Simple Washer GT5U.GTPP_MULTI_WASH_PLANT.mode.2=Chemical Bath GT5U.GTPP_MULTI_INDUSTRIAL_PLATE_PRESS.mode.0=Bending GT5U.GTPP_MULTI_INDUSTRIAL_PLATE_PRESS.mode.1=Forming Press -GT5U.INDUSTRIAL_ELECTROMAGNETIC_SEPARATOR.mode.0=Electromagnetic Separator -GT5U.INDUSTRIAL_ELECTROMAGNETIC_SEPARATOR.mode.1=Electromagnetic Polarizer +GT5U.INDUSTRIAL_ELECTROMAGNETIC_SEPARATOR.mode.0=Separator +GT5U.INDUSTRIAL_ELECTROMAGNETIC_SEPARATOR.mode.1=Polarizer GT5U.GTPP_MULTI_INDUSTRIAL_MULTI_MACHINE.mode.0=Metal GT5U.GTPP_MULTI_INDUSTRIAL_MULTI_MACHINE.mode.1=Fluid GT5U.GTPP_MULTI_INDUSTRIAL_MULTI_MACHINE.mode.2=Misc @@ -344,6 +344,7 @@ GT5U.GTPP_MULTI_PRECISE_ASSEMBLER.mode.0=Precise GT5U.GTPP_MULTI_PRECISE_ASSEMBLER.mode.1=Normal GT5U.GTPP_MULTI_PACKAGER.mode.0=Packager GT5U.GTPP_MULTI_PACKAGER.mode.1=Unpackager +GT5U.MULTI_MACHINE_CHANGE=Now running in %s mode GT5U.machines.oreprocessor1=§eRunning Mode: GT5U.machines.oreprocessor2=§cTime: %s s GT5U.machines.oreprocessor.void=§eVoid Stone Dust: %s -- cgit