Skip to content

Commit 564d328

Browse files
ghzdudeghzdude
committed
simplify lang key overlay
1 parent 34b9bda commit 564d328

File tree

3 files changed

+35
-44
lines changed

3 files changed

+35
-44
lines changed

‎src/main/java/gregtech/common/covers/detector/CoverDetectorEnergyAdvanced.java‎

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import net.minecraft.util.EnumActionResult;
1717
import net.minecraft.util.EnumFacing;
1818
import net.minecraft.util.EnumHand;
19-
import net.minecraft.util.text.TextFormatting;
2019

2120
import codechicken.lib.raytracer.CuboidRayTraceResult;
2221
import codechicken.lib.render.CCRenderState;
@@ -113,27 +112,25 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager syncManage
113112
.size(72, 18)
114113
.addTooltipLine(IKey.lang("cover.advanced_energy_detector.modes_tooltip"))
115114
.value(new BooleanSyncValue(this::isUsePercent, this::setUsePercent))
116-
.overlay(IKey.lang(() -> {
117-
String lang = "cover.advanced_energy_detector.mode_";
118-
lang += isUsePercent() ? "percent" : "eu";
119-
return lang;
120-
}).style(TextFormatting.WHITE))))
121-
.child(Flow.row()
122-
.name("inverted row")
123-
.coverChildrenHeight()
124-
.child(IKey.lang("cover.generic.advanced_detector.invert_label").asWidget()
125-
.size(72, 18))
126-
.child(new ToggleButton()
127-
.name("inverted button")
128-
.right(0)
129-
.size(72, 18)
130-
.addTooltipLine(IKey.lang("cover.advanced_energy_detector.invert_tooltip"))
131-
.value(new BooleanSyncValue(this::isInverted, this::setInverted))
132-
.overlay(IKey.lang(() -> {
133-
String lang = "cover.advanced_energy_detector.";
134-
lang += (isInverted() ? "inverted" : "normal");
135-
return lang;
136-
}).style(TextFormatting.WHITE)))))
115+
.overlay(true, IKey.lang("cover.advanced_energy_detector.mode_percent")
116+
.style(IKey.WHITE))
117+
.overlay(false, IKey.lang("cover.advanced_energy_detector.mode_eu")
118+
.style(IKey.WHITE)))))
119+
.child(Flow.row()
120+
.name("inverted row")
121+
.coverChildrenHeight()
122+
.child(IKey.lang("cover.generic.advanced_detector.invert_label").asWidget()
123+
.size(72, 18))
124+
.child(new ToggleButton()
125+
.name("inverted button")
126+
.right(0)
127+
.size(72, 18)
128+
.addTooltipLine(IKey.lang("cover.advanced_energy_detector.invert_tooltip"))
129+
.value(new BooleanSyncValue(this::isInverted, this::setInverted))
130+
.overlay(true, IKey.lang("cover.advanced_energy_detector.inverted")
131+
.style(IKey.WHITE))
132+
.overlay(false, IKey.lang("cover.advanced_energy_detector.normal")
133+
.style(IKey.WHITE))))
137134
.bindPlayerInventory();
138135
}
139136

‎src/main/java/gregtech/common/covers/detector/CoverDetectorFluidAdvanced.java‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import net.minecraft.util.EnumActionResult;
1717
import net.minecraft.util.EnumFacing;
1818
import net.minecraft.util.EnumHand;
19-
import net.minecraft.util.text.TextFormatting;
2019
import net.minecraftforge.common.util.Constants;
2120
import net.minecraftforge.fluids.FluidStack;
2221
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
@@ -96,20 +95,18 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan
9695
.size(72, 18)
9796
.value(new BooleanSyncValue(this::isInverted, this::setInverted))
9897
.addTooltipLine(IKey.lang("cover.generic.advanced_detector.invert_tooltip"))
99-
.overlay(IKey.lang(() -> {
100-
String lang = "cover.advanced_energy_detector.";
101-
lang += isInverted() ? "inverted" : "normal";
102-
return lang;
103-
}).style(TextFormatting.WHITE)))
98+
.overlay(true, IKey.lang("cover.advanced_energy_detector.inverted")
99+
.style(IKey.WHITE))
100+
.overlay(false, IKey.lang("cover.advanced_energy_detector.normal")
101+
.style(IKey.WHITE)))
104102
.child(new ToggleButton()
105103
.name("latch button")
106104
.size(72, 18)
107105
.right(0)
108-
.overlay(IKey.lang(() -> {
109-
String lang = "cover.generic.advanced_detector.";
110-
lang += isLatched() ? "latched" : "continuous";
111-
return lang;
112-
}).style(TextFormatting.WHITE))
106+
.overlay(true, IKey.lang("cover.generic.advanced_detector.latched")
107+
.style(IKey.WHITE))
108+
.overlay(false, IKey.lang("cover.generic.advanced_detector.continuous")
109+
.style(IKey.WHITE))
113110
.addTooltipLine(IKey.lang("cover.generic.advanced_detector.latch_tooltip"))
114111
.value(new BooleanSyncValue(this::isLatched, this::setLatched))))
115112
.child(this.fluidFilter.initUI(guiData, guiSyncManager)))

‎src/main/java/gregtech/common/covers/detector/CoverDetectorItemAdvanced.java‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import net.minecraft.util.EnumActionResult;
1717
import net.minecraft.util.EnumFacing;
1818
import net.minecraft.util.EnumHand;
19-
import net.minecraft.util.text.TextFormatting;
2019
import net.minecraftforge.common.util.Constants;
2120
import net.minecraftforge.items.CapabilityItemHandler;
2221
import net.minecraftforge.items.IItemHandler;
@@ -80,22 +79,20 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan
8079
.child(new ToggleButton()
8180
.name("inverted button")
8281
.size(72, 18)
83-
.overlay(IKey.lang(() -> {
84-
String lang = "cover.advanced_energy_detector.";
85-
lang += isInverted() ? "inverted" : "normal";
86-
return lang;
87-
}).style(TextFormatting.WHITE))
82+
.overlay(true, IKey.lang("cover.advanced_energy_detector.inverted")
83+
.style(IKey.WHITE))
84+
.overlay(false, IKey.lang("cover.advanced_energy_detector.normal")
85+
.style(IKey.WHITE))
8886
.addTooltipLine(IKey.lang("cover.generic.advanced_detector.invert_tooltip"))
8987
.value(new BooleanSyncValue(this::isInverted, this::setInverted)))
9088
.child(new ToggleButton()
9189
.name("latch button")
9290
.size(72, 18)
9391
.right(0)
94-
.overlay(IKey.lang(() -> {
95-
String lang = "cover.generic.advanced_detector.";
96-
lang += isLatched() ? "latched" : "continuous";
97-
return lang;
98-
}).style(TextFormatting.WHITE))
92+
.overlay(true, IKey.lang("cover.generic.advanced_detector.latched")
93+
.style(IKey.WHITE))
94+
.overlay(false, IKey.lang("cover.generic.advanced_detector.continuous")
95+
.style(IKey.WHITE))
9996
.addTooltipLine(IKey.lang("cover.generic.advanced_detector.latch_tooltip"))
10097
.value(new BooleanSyncValue(this::isLatched, this::setLatched))))
10198
.child(itemFilter.initUI(guiData, guiSyncManager)))

0 commit comments

Comments
 (0)