FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2024-11-27 01:55:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup usages of Text (#3916)

Browse source 
* replace Text.literal("") with Text.empty()

* Replace newline `Text` literals with `ScreenTexts.LINE_BREAK`

* Use `Text#translatableWithFallback`

* Fix checkstyle

---------

Co-authored-by: modmuss50 <modmuss50@gmail.com>
This commit is contained in:
RacoonDog 2024-07-07 08:53:03 -04:00 committed by GitHub
parent 8d16166232
commit 6ced4dd946
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fabric-command-api-v2/src/client/java/net/fabricmc/fabric/mixin/command/client/ClientCommandSourceMixin.java
View file

@ -43,7 +43,7 @@ abstract class ClientCommandSourceMixin implements FabricClientCommandSource {
@Override @Override
public void sendError(Text message) { public void sendError(Text message) {
sendFeedback(Text.literal("").append(message).formatted(Formatting.RED)); sendFeedback(Text.empty().append(message).formatted(Formatting.RED));
} }
@Override @Override

5
fabric-game-rule-api-v1/src/client/java/net/fabricmc/fabric/impl/gamerule/widget/DoubleRuleWidget.java
View file

@ -22,6 +22,7 @@ import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.world.EditGameRulesScreen; import net.minecraft.client.gui.screen.world.EditGameRulesScreen;
import net.minecraft.client.gui.widget.TextFieldWidget; import net.minecraft.client.gui.widget.TextFieldWidget;
import net.minecraft.screen.ScreenTexts;
import net.minecraft.text.OrderedText; import net.minecraft.text.OrderedText;
import net.minecraft.text.Text; import net.minecraft.text.Text;
@ -37,9 +38,9 @@ public final class DoubleRuleWidget extends EditGameRulesScreen.NamedRuleWidget
this.textFieldWidget = new TextFieldWidget(MinecraftClient.getInstance().textRenderer, 10, 5, 42, 20, this.textFieldWidget = new TextFieldWidget(MinecraftClient.getInstance().textRenderer, 10, 5, 42, 20,
name.copy() name.copy()
.append("\n") .append(ScreenTexts.LINE_BREAK)
.append(ruleName) .append(ruleName)
.append("\n") .append(ScreenTexts.LINE_BREAK)
); );
this.textFieldWidget.setText(Double.toString(rule.get())); this.textFieldWidget.setText(Double.toString(rule.get()));

8
fabric-game-rule-api-v1/src/client/java/net/fabricmc/fabric/impl/gamerule/widget/EnumRuleWidget.java
View file

@ -23,7 +23,6 @@ import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.gui.screen.world.EditGameRulesScreen; import net.minecraft.client.gui.screen.world.EditGameRulesScreen;
import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.client.gui.widget.ButtonWidget;
import net.minecraft.client.resource.language.I18n;
import net.minecraft.text.OrderedText; import net.minecraft.text.OrderedText;
import net.minecraft.text.Text; import net.minecraft.text.Text;
@ -51,12 +50,7 @@ public final class EnumRuleWidget<E extends Enum<E>> extends EditGameRulesScreen
public Text getValueText(E value) { public Text getValueText(E value) {
final String key = this.rootTranslationKey + "." + value.name().toLowerCase(Locale.ROOT); final String key = this.rootTranslationKey + "." + value.name().toLowerCase(Locale.ROOT);
return Text.translatableWithFallback(key, value.toString());
if (I18n.hasTranslation(key)) {
return Text.translatable(key);
}
return Text.literal(value.toString());
} }
@Override @Override

5
fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/RegistrySyncManager.java
View file

@ -46,6 +46,7 @@ import net.minecraft.network.packet.Packet;
import net.minecraft.registry.Registries; import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry; import net.minecraft.registry.Registry;
import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKey;
import net.minecraft.screen.ScreenTexts;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerConfigurationNetworkHandler; import net.minecraft.server.network.ServerConfigurationNetworkHandler;
import net.minecraft.server.network.ServerPlayerConfigurationTask; import net.minecraft.server.network.ServerPlayerConfigurationTask;
@ -325,7 +326,7 @@ public final class RegistrySyncManager {
} }
// Create a nice user friendly error message. // Create a nice user friendly error message.
MutableText text = Text.literal(""); MutableText text = Text.empty();
final int count = missingEntries.values().stream().mapToInt(List::size).sum(); final int count = missingEntries.values().stream().mapToInt(List::size).sum();
@ -349,7 +350,7 @@ public final class RegistrySyncManager {
for (int i = 0; i < Math.min(namespaces.size(), toDisplay); i++) { for (int i = 0; i < Math.min(namespaces.size(), toDisplay); i++) {
text = text.append(Text.literal(namespaces.get(i)).formatted(Formatting.YELLOW)); text = text.append(Text.literal(namespaces.get(i)).formatted(Formatting.YELLOW));
text = text.append("\n"); text = text.append(ScreenTexts.LINE_BREAK);
} }
if (namespaces.size() > toDisplay) { if (namespaces.size() > toDisplay) {