Skip to content

Commit 659d36e

Browse files
committed
fixed some hardcoded message strings
1 parent 79fdc9d commit 659d36e

File tree

6 files changed

+22
-8
lines changed

6 files changed

+22
-8
lines changed

src/main/java/me/desht/pneumaticcraft/client/gui/PressureChamberScreen.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,10 @@ public void init() {
4949
addAnimatedStat(xlate("pneumaticcraft.gui.tab.status"), new ItemStack(ModBlocks.PRESSURE_CHAMBER_WALL.get()), 0xFFFFAA00, false)
5050
.setText(ImmutableList.of(
5151
xlate("pneumaticcraft.gui.tab.pressureChamber.chamberSize").withStyle(ChatFormatting.WHITE),
52-
Component.literal( sOut + "x" + sOut + "x" + sOut + " (outside)").withStyle(ChatFormatting.BLACK),
53-
Component.literal( sIn + "x" + sIn + "x" + sIn + " (inside)").withStyle(ChatFormatting.BLACK)
52+
Component.literal( sOut + "x" + sOut + "x" + sOut + " ").append("pneumaticcraft.gui.tab.pressureChamber.chamberSize.outside")
53+
.withStyle(ChatFormatting.BLACK),
54+
Component.literal( sIn + "x" + sIn + "x" + sIn + " ").append("pneumaticcraft.gui.tab.pressureChamber.chamberSize.outside")
55+
.withStyle(ChatFormatting.BLACK)
5456
));
5557
}
5658

src/main/java/me/desht/pneumaticcraft/client/gui/SmartChestScreen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ private void setupPushPullButton(WidgetButtonExtended button, RelativeFace face)
167167
case PULL -> button.setRenderStacks(new ItemStack(Blocks.STICKY_PISTON));
168168
}
169169
button.setTooltipText(ImmutableList.of(
170-
Component.literal(face.toString()).withStyle(ChatFormatting.YELLOW),
170+
xlate(face.getTranslationKey()).withStyle(ChatFormatting.YELLOW),
171171
xlate(mode.getTranslationKey()))
172172
);
173173
}

src/main/java/me/desht/pneumaticcraft/common/block/entity/SideConfigurator.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.mojang.datafixers.util.Either;
2222
import com.mojang.serialization.Codec;
2323
import com.mojang.serialization.codecs.RecordCodecBuilder;
24+
import me.desht.pneumaticcraft.api.misc.ITranslatableEnum;
2425
import me.desht.pneumaticcraft.common.util.DirectionUtil;
2526
import me.desht.pneumaticcraft.lib.Log;
2627
import net.minecraft.core.Direction;
@@ -240,7 +241,7 @@ public static void loadSavedData(ISideConfigurable sideConfigurable, Map<String,
240241
public static final StreamCodec<FriendlyByteBuf,Map<String,Saved>> STREAM_CODEC
241242
= ByteBufCodecs.map(Maps::newHashMapWithExpectedSize, ByteBufCodecs.STRING_UTF8, Saved.STREAM_CODEC);
242243

243-
public enum RelativeFace implements StringRepresentable {
244+
public enum RelativeFace implements StringRepresentable, ITranslatableEnum {
244245
BOTTOM("bottom"),
245246
TOP("top"),
246247
LEFT("left"),
@@ -268,6 +269,11 @@ public enum RelativeFace implements StringRepresentable {
268269
public String getSerializedName() {
269270
return name;
270271
}
272+
273+
@Override
274+
public String getTranslationKey() {
275+
return "pneumaticcraft.gui.relative." + name;
276+
}
271277
}
272278

273279
public record ConnectionEntry<T>(String id, Either<ItemStack,ResourceLocation> texture, BaseCapability<T, ?> cap, Supplier<T> handler) {

src/main/java/me/desht/pneumaticcraft/common/item/AssemblyProgramItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public AssemblyProgram getProgram() {
6363
@Override
6464
@OnlyIn(Dist.CLIENT)
6565
public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> infoList, TooltipFlag par4) {
66-
infoList.add(Component.literal("Required Machines:"));
66+
infoList.add(Component.translatable("item.pneumaticcraft.assembly_program.required"));
6767
infoList.add(bullet().append(xlate(ModBlocks.ASSEMBLY_CONTROLLER.get().getDescriptionId())));
6868
Arrays.stream(getProgram().getRequiredMachines())
6969
.map(machine -> bullet().append(xlate(machine.getMachineBlock().getDescriptionId())))

src/main/java/me/desht/pneumaticcraft/common/item/DrillBitItem.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ public DrillBitType getType() {
4545
public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltip, TooltipFlag flagIn) {
4646
super.appendHoverText(stack, context, tooltip, flagIn);
4747

48-
tooltip.add(xlate("pneumaticcraft.gui.tooltip.item.drillBit.tier").withStyle(ChatFormatting.YELLOW)
49-
.append(Component.literal(getType().tier.toString()).withStyle(ChatFormatting.GOLD)));
5048
tooltip.add(xlate("pneumaticcraft.gui.tooltip.item.drillBit.blocks").withStyle(ChatFormatting.YELLOW)
5149
.append(Component.literal(Integer.toString(getType().getBestDigType().getBlocksDug())).withStyle(ChatFormatting.GOLD)));
5250
tooltip.add(xlate("pneumaticcraft.gui.tooltip.item.drillBit.speed").withStyle(ChatFormatting.YELLOW)

src/main/resources/assets/pneumaticcraft/lang/en_us.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,7 @@
389389
"item.pneumaticcraft.air_grate_module" : "Air Grate Tube Module",
390390
"item.pneumaticcraft.amadron_tablet" : "Amadron Tablet",
391391
"item.pneumaticcraft.armor_upgrade" : "Armor Upgrade",
392+
"item.pneumaticcraft.assembly_program.required" : "Required Machines:",
392393
"item.pneumaticcraft.assembly_program_drill" : "Assembly Program: Drill",
393394
"item.pneumaticcraft.assembly_program_drill_laser" : "Assembly Program: Drill & Laser",
394395
"item.pneumaticcraft.assembly_program_laser" : "Assembly Program: Laser",
@@ -1483,6 +1484,12 @@
14831484
"pneumaticcraft.gui.redstone" : "Redstone",
14841485
"pneumaticcraft.gui.regulatorTube.hudMessage.inverted" : "§cA Regulator Tube Module only regulates air in the direction of the arrow.",
14851486
"pneumaticcraft.gui.regulatorTube.hudMessage.notInLine" : "§cA Regulator Tube Module only regulates air in line of the module.",
1487+
"pneumaticcraft.gui.relative.back" : "Back",
1488+
"pneumaticcraft.gui.relative.bottom" : "Bottom",
1489+
"pneumaticcraft.gui.relative.front" : "Front",
1490+
"pneumaticcraft.gui.relative.left" : "Left",
1491+
"pneumaticcraft.gui.relative.right" : "Right",
1492+
"pneumaticcraft.gui.relative.top" : "Top",
14861493
"pneumaticcraft.gui.remote.boundSecurityStation" : "Remote bound to Security Station @ %s.\nOnly players with access to this Station can modify it.",
14871494
"pneumaticcraft.gui.remote.button.height" : "Height:",
14881495
"pneumaticcraft.gui.remote.button.importRemoteButton" : "Import an existing Remote lay-out from another Remote.",
@@ -1700,6 +1707,8 @@
17001707
"pneumaticcraft.gui.tab.pneumaticDoorBaseRedstone.tooltip" : "If checked, any redstone signal to this Door Base will also affect the connected Pneumatic Door, when in Wooden or Iron Door mode.\nIf not checked, the Pneumatic Door itself must receive a redstone signal to open.",
17011708
"pneumaticcraft.gui.tab.pressure" : "Pressure",
17021709
"pneumaticcraft.gui.tab.pressureChamber.chamberSize" : "Chamber Size:",
1710+
"pneumaticcraft.gui.tab.pressureChamber.chamberSize.inside" : "(inside)",
1711+
"pneumaticcraft.gui.tab.pressureChamber.chamberSize.outside" : "(outside)",
17031712
"pneumaticcraft.gui.tab.status.pressurizedSpawner.spawnRate": "Spawn Interval: %d ticks",
17041713
"pneumaticcraft.gui.tab.status.pressurizedSpawner.airUsage": "Air Usage: %d mL per spawn attempt",
17051714
"pneumaticcraft.gui.tab.problems.advancedAirCompressor.efficiency" : "§fThe Compressor is running at a suboptimal efficiency. Efficiency: %s\n§0Cool the machine down to under 50°C.",
@@ -1976,7 +1985,6 @@
19761985
"pneumaticcraft.gui.tooltip.hacking.rightClickFortify" : "Right-Click: Fortify Node",
19771986
"pneumaticcraft.gui.tooltip.hacking.fortifyProgress" : "Fortify Progress: %d%%",
19781987
"pneumaticcraft.gui.tooltip.hacking.fortified" : "Fortified",
1979-
"pneumaticcraft.gui.tooltip.item.drillBit.tier" : "Drill Bit Tier: ",
19801988
"pneumaticcraft.gui.tooltip.item.drillBit.blocks" : "Max Blocks per Dig: ",
19811989
"pneumaticcraft.gui.tooltip.item.drillBit.speed" : "Base Efficiency: ",
19821990
"pneumaticcraft.gui.tooltip.item.upgrade.shiftMessage" : "Hold Shift to see what uses this upgrade",

0 commit comments

Comments
 (0)