Use constants for certain true false displays

pupnewfster · pupnewfster · commit d9df0bba68bc · 2024-04-10T11:54:52.000-05:00
diff --git a/src/main/java/mekanism/client/gui/GuiDimensionalStabilizer.java b/src/main/java/mekanism/client/gui/GuiDimensionalStabilizer.java
@@ -108,8 +108,8 @@ public void updateTooltip(int mouseX, int mouseY) {
                     addRenderableWidget(new TooltipColorButton(this, 63 + 10 * shiftedX, 19 + 10 * shiftedZ, 10, EnumColor.DARK_BLUE,
                           () -> tile.isChunkLoadingAt(shiftedX, shiftedZ),
                           (element, mouseX, mouseY) -> PacketUtils.sendToServer(new PacketGuiInteract(GuiInteraction.TOGGLE_CHUNKLOAD, tile, packetTarget)),
-                          MekanismLang.STABILIZER_TOGGLE_LOADING.translate(OnOff.of(true, true), EnumColor.INDIGO, chunkX, EnumColor.INDIGO, chunkZ),
-                          MekanismLang.STABILIZER_TOGGLE_LOADING.translate(OnOff.of(false, true), EnumColor.INDIGO, chunkX, EnumColor.INDIGO, chunkZ)
+                          MekanismLang.STABILIZER_TOGGLE_LOADING.translate(OnOff.ON_COLORED, EnumColor.INDIGO, chunkX, EnumColor.INDIGO, chunkZ),
+                          MekanismLang.STABILIZER_TOGGLE_LOADING.translate(OnOff.OFF_COLORED, EnumColor.INDIGO, chunkX, EnumColor.INDIGO, chunkZ)
                     ));
                 }
             }
diff --git a/src/main/java/mekanism/client/gui/GuiSecurityDesk.java b/src/main/java/mekanism/client/gui/GuiSecurityDesk.java
@@ -120,7 +120,7 @@ protected void addGuiElements() {
                   PacketUtils.sendToServer(new PacketGuiInteract(GuiInteraction.OVERRIDE_BUTTON, desk.tile));
                   desk.updateButtons();
                   return true;
-              }, MekanismLang.SECURITY_OVERRIDE.translate(OnOff.of(true)), MekanismLang.SECURITY_OVERRIDE.translate(OnOff.of(false))));
+              }, MekanismLang.SECURITY_OVERRIDE.translate(OnOff.ON), MekanismLang.SECURITY_OVERRIDE.translate(OnOff.OFF)));
         updateButtons();
     }
 
diff --git a/src/main/java/mekanism/client/gui/element/tab/GuiVisualsTab.java b/src/main/java/mekanism/client/gui/element/tab/GuiVisualsTab.java
@@ -17,8 +17,8 @@
 
 public class GuiVisualsTab extends GuiInsetElement<IHasVisualization> {
 
-    private static final Component ON = MekanismLang.VISUALS.translate(OnOff.of(true));
-    private static final Component OFF = MekanismLang.VISUALS.translate(OnOff.of(false));
+    private static final Component ON = MekanismLang.VISUALS.translate(OnOff.ON);
+    private static final Component OFF = MekanismLang.VISUALS.translate(OnOff.OFF);
     private static final Component TOO_BIG = MekanismLang.VISUALS_TOO_BIG.translateColored(EnumColor.RED);
     private static final Tooltip VISUALS_ON = Tooltip.create(ON);
     private static final Tooltip VISUALS_OFF = Tooltip.create(OFF);
diff --git a/src/main/java/mekanism/client/gui/element/window/filter/miner/GuiMinerFilterHelper.java b/src/main/java/mekanism/client/gui/element/window/filter/miner/GuiMinerFilterHelper.java
@@ -37,7 +37,7 @@ default void addMinerDefaults(IGuiWrapper gui, int slotOffset, UnaryOperator<Gui
             MinerFilter<?> filter = getFilter();
             filter.requiresReplacement = !filter.requiresReplacement;
             return true;
-        }, MekanismLang.MINER_REQUIRE_REPLACE.translate(YesNo.of(true)), MekanismLang.MINER_REQUIRE_REPLACE.translate(YesNo.of(false))));
+        }, MekanismLang.MINER_REQUIRE_REPLACE.translate(YesNo.YES), MekanismLang.MINER_REQUIRE_REPLACE.translate(YesNo.NO)));
     }
 
     @Override
diff --git a/src/main/java/mekanism/client/gui/element/window/filter/transporter/GuiSorterFilterHelper.java b/src/main/java/mekanism/client/gui/element/window/filter/transporter/GuiSorterFilterHelper.java
@@ -84,7 +84,7 @@ default void renderSorterForeground(GuiGraphics guiGraphics) {
         drawString(guiGraphics, MekanismLang.MIN.translate(""), relativeX + 148, relativeY + 32, titleTextColor());
         drawString(guiGraphics, MekanismLang.MAX.translate(""), relativeX + 148, relativeY + 44, titleTextColor());
         if (isSingleItem() && filter.sizeMode) {
-            drawString(guiGraphics, MekanismLang.SORTER_FILTER_SIZE_MODE.translateColored(EnumColor.RED, OnOff.of(true)), relativeX + 161, relativeY + 58, titleTextColor());
+            drawString(guiGraphics, MekanismLang.SORTER_FILTER_SIZE_MODE.translateColored(EnumColor.RED, OnOff.ON), relativeX + 161, relativeY + 58, titleTextColor());
         } else {
             drawString(guiGraphics, OnOff.of(filter.sizeMode).getTextComponent(), relativeX + 161, relativeY + 58, titleTextColor());
         }
diff --git a/src/main/java/mekanism/client/gui/machine/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/machine/GuiDigitalMinerConfig.java
@@ -101,7 +101,7 @@ protected void addGuiElements() {
               });
         addRenderableWidget(new TooltipToggleButton(this, 35, 137, 14, 16, getButtonLocation("exclamation"), tile::getInverseRequiresReplacement,
               (element, mouseX, mouseY) -> PacketUtils.sendToServer(new PacketGuiInteract(GuiInteraction.INVERSE_REQUIRES_REPLACEMENT_BUTTON, ((GuiDigitalMinerConfig) element.gui()).tile)),
-              MekanismLang.MINER_REQUIRE_REPLACE_INVERSE.translate(YesNo.of(true)), MekanismLang.MINER_REQUIRE_REPLACE_INVERSE.translate(false)));
+              MekanismLang.MINER_REQUIRE_REPLACE_INVERSE.translate(YesNo.YES), MekanismLang.MINER_REQUIRE_REPLACE_INVERSE.translate(YesNo.NO)));
         radiusField = addRenderableWidget(new GuiTextField(this, 13, 45, 38, 11));
         radiusField.setMaxLength(Integer.toString(MekanismConfig.general.minerMaxRadius.get()).length());
         radiusField.setInputValidator(InputValidator.DIGIT);
diff --git a/src/main/java/mekanism/client/gui/machine/GuiFormulaicAssemblicator.java b/src/main/java/mekanism/client/gui/machine/GuiFormulaicAssemblicator.java
@@ -67,7 +67,7 @@ protected void addGuiElements() {
               .setTooltip(MekanismLang.ENCODE_FORMULA);
         stockControlButton = addRenderableWidget(new TooltipToggleButton(this, 26, 75, 16, getButtonLocation("stock_control"), tile::getStockControl,
               (element, mouseX, mouseY) -> PacketUtils.sendToServer(new PacketGuiInteract(GuiInteraction.STOCK_CONTROL_BUTTON, ((GuiFormulaicAssemblicator) element.gui()).tile)),
-              MekanismLang.STOCK_CONTROL.translate(OnOff.of(true)), MekanismLang.STOCK_CONTROL.translate(OnOff.of(false))));
+              MekanismLang.STOCK_CONTROL.translate(OnOff.ON), MekanismLang.STOCK_CONTROL.translate(OnOff.OFF)));
         fillEmptyButton = addRenderableWidget(new ToggleButton(this, 44, 75, 16, 16, getButtonLocation("empty"),
               getButtonLocation("fill"), () -> tile.formula == null, (element, mouseX, mouseY) -> {
             TileEntityFormulaicAssemblicator tile = ((GuiFormulaicAssemblicator) element.gui()).tile;
@@ -82,7 +82,7 @@ protected void addGuiElements() {
               .setTooltip(MekanismLang.CRAFT_AVAILABLE);
         autoModeButton = addRenderableWidget(new TooltipToggleButton(this, 107, 75, 16, getButtonLocation("auto_toggle"), tile::getAutoMode,
               (element, mouseX, mouseY) -> PacketUtils.sendToServer(new PacketGuiInteract(GuiInteraction.NEXT_MODE, ((GuiFormulaicAssemblicator) element.gui()).tile)),
-              MekanismLang.AUTO_MODE.translate(OnOff.of(true)), MekanismLang.AUTO_MODE.translate(OnOff.of(false))));
+              MekanismLang.AUTO_MODE.translate(OnOff.ON), MekanismLang.AUTO_MODE.translate(OnOff.OFF)));
         updateEnabledButtons();
     }
 
diff --git a/src/main/java/mekanism/common/util/text/BooleanStateDisplay.java b/src/main/java/mekanism/common/util/text/BooleanStateDisplay.java
@@ -32,20 +32,28 @@ public Component getTextComponent() {
 
     public static class YesNo extends BooleanStateDisplay {
 
+        public static final YesNo YES = new YesNo(true, false);
+        public static final YesNo NO = new YesNo(false, false);
+        public static final YesNo YES_COLORED = new YesNo(true, true);
+        public static final YesNo NO_COLORED = new YesNo(false, true);
+
         private YesNo(boolean value, boolean colored) {
             super(value, colored);
         }
 
         public static YesNo of(boolean value) {
-            return of(value, false);
+            return value ? YES : NO;
         }
 
         public static YesNo hasInventory(ItemStack stack) {
             return of(ContainerType.ITEM.getAttachmentContainersIfPresent(stack).stream().anyMatch(slot -> !slot.isEmpty()), true);
         }
 
         public static YesNo of(boolean value, boolean colored) {
-            return new YesNo(value, colored);
+            if (colored) {
+                return value ? YES_COLORED : NO_COLORED;
+            }
+            return of(value);
         }
 
         @Override
@@ -56,6 +64,11 @@ protected ILangEntry getLangEntry() {
 
     public static class OnOff extends BooleanStateDisplay {
 
+        public static final OnOff ON = new OnOff(true, false, false);
+        public static final OnOff OFF = new OnOff(false, false, false);
+        public static final OnOff ON_COLORED = new OnOff(true, true, false);
+        public static final OnOff OFF_COLORED = new OnOff(false, true, false);
+
         private final boolean caps;
 
         private OnOff(boolean value, boolean colored, boolean caps) {
@@ -64,11 +77,14 @@ private OnOff(boolean value, boolean colored, boolean caps) {
         }
 
         public static OnOff of(boolean value) {
-            return of(value, false);
+            return value ? ON : OFF;
         }
 
         public static OnOff of(boolean value, boolean colored) {
-            return new OnOff(value, colored, false);
+            if (colored) {
+                return value ? ON_COLORED : OFF_COLORED;
+            }
+            return of(value);
         }
 
         public static OnOff caps(boolean value, boolean colored) {

Original file line number	Diff line number	Diff line change
`@@ -108,8 +108,8 @@ public void updateTooltip(int mouseX, int mouseY) {`
`108`	`108`	`addRenderableWidget(new TooltipColorButton(this, 63 + 10 * shiftedX, 19 + 10 * shiftedZ, 10, EnumColor.DARK_BLUE,`
`109`	`109`	`() -> tile.isChunkLoadingAt(shiftedX, shiftedZ),`
`110`	`110`	`(element, mouseX, mouseY) -> PacketUtils.sendToServer(new PacketGuiInteract(GuiInteraction.TOGGLE_CHUNKLOAD, tile, packetTarget)),`
`111`		`- MekanismLang.STABILIZER_TOGGLE_LOADING.translate(OnOff.of(true, true), EnumColor.INDIGO, chunkX, EnumColor.INDIGO, chunkZ),`
`112`		`- MekanismLang.STABILIZER_TOGGLE_LOADING.translate(OnOff.of(false, true), EnumColor.INDIGO, chunkX, EnumColor.INDIGO, chunkZ)`
	`111`	`+ MekanismLang.STABILIZER_TOGGLE_LOADING.translate(OnOff.ON_COLORED, EnumColor.INDIGO, chunkX, EnumColor.INDIGO, chunkZ),`
	`112`	`+ MekanismLang.STABILIZER_TOGGLE_LOADING.translate(OnOff.OFF_COLORED, EnumColor.INDIGO, chunkX, EnumColor.INDIGO, chunkZ)`
`113`	`113`	`));`
`114`	`114`	`}`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ protected void addGuiElements() {`
`120`	`120`	`PacketUtils.sendToServer(new PacketGuiInteract(GuiInteraction.OVERRIDE_BUTTON, desk.tile));`
`121`	`121`	`desk.updateButtons();`
`122`	`122`	`return true;`
`123`		`- }, MekanismLang.SECURITY_OVERRIDE.translate(OnOff.of(true)), MekanismLang.SECURITY_OVERRIDE.translate(OnOff.of(false))));`
	`123`	`+ }, MekanismLang.SECURITY_OVERRIDE.translate(OnOff.ON), MekanismLang.SECURITY_OVERRIDE.translate(OnOff.OFF)));`
`124`	`124`	`updateButtons();`
`125`	`125`	`}`
`126`	`126`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ default void addMinerDefaults(IGuiWrapper gui, int slotOffset, UnaryOperator<Gui`
`37`	`37`	`MinerFilter<?> filter = getFilter();`
`38`	`38`	`filter.requiresReplacement = !filter.requiresReplacement;`
`39`	`39`	`return true;`
`40`		`- }, MekanismLang.MINER_REQUIRE_REPLACE.translate(YesNo.of(true)), MekanismLang.MINER_REQUIRE_REPLACE.translate(YesNo.of(false))));`
	`40`	`+ }, MekanismLang.MINER_REQUIRE_REPLACE.translate(YesNo.YES), MekanismLang.MINER_REQUIRE_REPLACE.translate(YesNo.NO)));`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ default void renderSorterForeground(GuiGraphics guiGraphics) {`
`84`	`84`	`drawString(guiGraphics, MekanismLang.MIN.translate(""), relativeX + 148, relativeY + 32, titleTextColor());`
`85`	`85`	`drawString(guiGraphics, MekanismLang.MAX.translate(""), relativeX + 148, relativeY + 44, titleTextColor());`
`86`	`86`	`if (isSingleItem() && filter.sizeMode) {`
`87`		`- drawString(guiGraphics, MekanismLang.SORTER_FILTER_SIZE_MODE.translateColored(EnumColor.RED, OnOff.of(true)), relativeX + 161, relativeY + 58, titleTextColor());`
	`87`	`+ drawString(guiGraphics, MekanismLang.SORTER_FILTER_SIZE_MODE.translateColored(EnumColor.RED, OnOff.ON), relativeX + 161, relativeY + 58, titleTextColor());`
`88`	`88`	`} else {`
`89`	`89`	`drawString(guiGraphics, OnOff.of(filter.sizeMode).getTextComponent(), relativeX + 161, relativeY + 58, titleTextColor());`
`90`	`90`	`}`