Skip to content

Commit ff9b91a

Browse files
committed
fix lang key formatting
1 parent c9d62c9 commit ff9b91a

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

src/main/java/com/cleanroommc/modularui/drawable/text/FontRenderHelper.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.cleanroommc.modularui.api.drawable.IKey;
55

66
import net.minecraft.client.gui.FontRenderer;
7+
import net.minecraft.client.resources.I18n;
78
import net.minecraft.util.text.TextFormatting;
89

910
import org.jetbrains.annotations.Nullable;
@@ -64,8 +65,8 @@ public static String format(@Nullable FormattingState state, @Nullable Formattin
6465
return s.toString();
6566
}
6667

67-
public static String formatArgs(Object[] args, @Nullable FormattingState parentState, String text) {
68-
if (args == null || args.length == 0) return text;
68+
public static String formatArgs(Object[] args, @Nullable FormattingState parentState, String text, boolean translate) {
69+
if (args == null || args.length == 0) return translate ? I18n.format(text) : text;
6970
args = Arrays.copyOf(args, args.length);
7071
for (int i = 0; i < args.length; i++) {
7172
if (args[i] instanceof IKey key) {
@@ -74,7 +75,7 @@ public static String formatArgs(Object[] args, @Nullable FormattingState parentS
7475
.append(TextFormatting.RESET), parentState).toString();
7576
}
7677
}
77-
return String.format(text, args);
78+
return translate ? I18n.format(text, args) : String.format(text, args);
7879
}
7980

8081
public static int getDefaultTextHeight() {

src/main/java/com/cleanroommc/modularui/drawable/text/LangKey.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ public String get() {
6060
public String getFormatted(@Nullable FormattingState parentFormatting) {
6161
Object[] args = this.argsSupplier.get();
6262
if (args == null || args.length == 0) return super.getFormatted(parentFormatting);
63-
String text = I18n.format(Objects.requireNonNull(this.keySupplier.get()));
64-
text = FontRenderHelper.formatArgs(args, FormattingState.merge(parentFormatting, getFormatting()), text);
63+
String text = Objects.requireNonNull(this.keySupplier.get());
64+
text = FontRenderHelper.formatArgs(args, FormattingState.merge(parentFormatting, getFormatting()), text, true);
6565
return FontRenderHelper.format(getFormatting(), parentFormatting, text);
6666
}
6767
}

src/main/java/com/cleanroommc/modularui/drawable/text/StringKey.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public String get() {
2626
@Override
2727
public String getFormatted(@Nullable FormattingState parentFormatting) {
2828
if (this.args == null || this.args.length == 0) return super.getFormatted(parentFormatting);
29-
String text = FontRenderHelper.formatArgs(this.args, FormattingState.merge(parentFormatting, getFormatting()), this.string);
29+
String text = FontRenderHelper.formatArgs(this.args, FormattingState.merge(parentFormatting, getFormatting()), this.string, false);
3030
return FontRenderHelper.format(getFormatting(), parentFormatting, text);
3131
}
3232
}

0 commit comments

Comments
 (0)