From a458f0546dfbcd606ce746e02a47aa363e5f4b54 Mon Sep 17 00:00:00 2001 From: Surya Date: Sun, 13 Nov 2022 15:47:44 +0530 Subject: [PATCH] Update new Text() to Text.of or Text.translatable --- build.gradle | 2 +- .../savecoords/SaveCoordinatesClient.java | 4 +-- .../gui/impl/ConfigViewHandler.java | 14 +++++------ .../impl/CurrentPositionPingOperation.java | 4 +-- .../gui/impl/DefaultViewHandler.java | 13 +++++----- .../savecoords/gui/impl/DimensionButton.java | 6 ++--- .../savecoords/gui/impl/ListViewHandler.java | 25 +++++++++---------- .../gui/impl/PingPositionOperation.java | 3 ++- .../mods/savecoords/impl/KeyBinds.java | 3 +-- src/main/resources/fabric.mod.json | 4 +-- 10 files changed, 37 insertions(+), 41 deletions(-) diff --git a/build.gradle b/build.gradle index f92fa03..8551313 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.0' + id 'fabric-loom' version '1.0-SNAPSHOT' id 'maven-publish' } diff --git a/src/main/java/me/neophyte/mods/savecoords/SaveCoordinatesClient.java b/src/main/java/me/neophyte/mods/savecoords/SaveCoordinatesClient.java index 6d2cdef..cb9629e 100644 --- a/src/main/java/me/neophyte/mods/savecoords/SaveCoordinatesClient.java +++ b/src/main/java/me/neophyte/mods/savecoords/SaveCoordinatesClient.java @@ -5,7 +5,7 @@ import me.neophyte.mods.savecoords.gui.impl.DIContainer; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.minecraft.client.MinecraftClient; -import net.minecraft.text.TranslatableText; +import net.minecraft.text.Text; public class SaveCoordinatesClient implements ClientModInitializer { @@ -35,7 +35,7 @@ public class SaveCoordinatesClient implements ClientModInitializer { translationKey = TranslationKeys.TOOLTIP_PING_ENABLED; } - MinecraftClient.getInstance().player.sendMessage(new TranslatableText(translationKey), true); + MinecraftClient.getInstance().player.sendMessage(Text.translatable(translationKey), true); } while(pingKeyBinding.wasPressed()) { diff --git a/src/main/java/me/neophyte/mods/savecoords/gui/impl/ConfigViewHandler.java b/src/main/java/me/neophyte/mods/savecoords/gui/impl/ConfigViewHandler.java index ac51925..3c843ae 100644 --- a/src/main/java/me/neophyte/mods/savecoords/gui/impl/ConfigViewHandler.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/impl/ConfigViewHandler.java @@ -15,9 +15,7 @@ import me.neophyte.mods.savecoords.IKeyBinds.IKeyBinding; import me.neophyte.mods.savecoords.gui.IRootPanel; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.util.InputUtil.Type; -import net.minecraft.text.LiteralText; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; // TODO: // Clean the mess below on order of event handling @@ -33,9 +31,9 @@ class ConfigViewHandler extends ViewHandlerBase> { private ConfigListPanel listPanel; public ConfigViewHandler() { - this.saveButton = new WButton(new TranslatableText(TranslationKeys.MENU_SAVE)); - this.backButton = new WButton(new TranslatableText(TranslationKeys.MENU_BACK)); - this.resetButton = new WButton(new TranslatableText(TranslationKeys.MENU_RESET)); + this.saveButton = new WButton(Text.translatable(TranslationKeys.MENU_SAVE)); + this.backButton = new WButton(Text.translatable(TranslationKeys.MENU_BACK)); + this.resetButton = new WButton(Text.translatable(TranslationKeys.MENU_RESET)); } @Override @@ -217,9 +215,9 @@ class ConfigViewHandler extends ViewHandlerBase> { private int code; ConfigItemPanel() { - this.configLabel = new WLabel(""); + this.configLabel = new WLabel(Text.of("")); this.configButton = new WButton(); - this.resetButton = new WButton(new TranslatableText(TranslationKeys.MENU_RESET)); + this.resetButton = new WButton(Text.translatable(TranslationKeys.MENU_RESET)); } void setInitialConfig(IKeyBinding config) { @@ -277,7 +275,7 @@ class ConfigViewHandler extends ViewHandlerBase> { private void updateWidgetData(Type type, int code) { if(focussing) { - this.configButton.setLabel(new LiteralText("_")); + this.configButton.setLabel(Text.of("_")); return; } diff --git a/src/main/java/me/neophyte/mods/savecoords/gui/impl/CurrentPositionPingOperation.java b/src/main/java/me/neophyte/mods/savecoords/gui/impl/CurrentPositionPingOperation.java index d52f385..c0d1007 100644 --- a/src/main/java/me/neophyte/mods/savecoords/gui/impl/CurrentPositionPingOperation.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/impl/CurrentPositionPingOperation.java @@ -6,7 +6,7 @@ import me.neophyte.mods.savecoords.IFileStore; import me.neophyte.mods.savecoords.TranslationKeys; import me.neophyte.mods.savecoords.model.PlayerRawPosition; import net.minecraft.client.MinecraftClient; -import net.minecraft.text.TranslatableText; +import net.minecraft.text.Text; public class CurrentPositionPingOperation extends PingPositionOperation{ @@ -28,7 +28,7 @@ public class CurrentPositionPingOperation extends PingPositionOperation{ if (enabled) { super.executeOperation(fileStore, position); } else { - MinecraftClient.getInstance().player.sendMessage(new TranslatableText(TranslationKeys.TOOLTIP_PING_LOCK), + MinecraftClient.getInstance().player.sendMessage(Text.translatable(TranslationKeys.TOOLTIP_PING_LOCK), true); } } diff --git a/src/main/java/me/neophyte/mods/savecoords/gui/impl/DefaultViewHandler.java b/src/main/java/me/neophyte/mods/savecoords/gui/impl/DefaultViewHandler.java index 67c1a6b..eeb1f58 100644 --- a/src/main/java/me/neophyte/mods/savecoords/gui/impl/DefaultViewHandler.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/impl/DefaultViewHandler.java @@ -16,8 +16,7 @@ import me.neophyte.mods.savecoords.model.PlayerPosition; import me.neophyte.mods.savecoords.model.PlayerRawPosition; import me.neophyte.mods.savecoords.model.PositionMetadata; import me.neophyte.mods.savecoords.util.ResourceUtils; -import net.minecraft.text.LiteralText; -import net.minecraft.text.TranslatableText; +import net.minecraft.text.Text; class DefaultViewHandler extends ViewHandlerBase { @@ -173,7 +172,7 @@ class DefaultViewHandler extends ViewHandlerBase { } private WWidget CreateLabelForCoordinate(String label) { - WButton labelButton = new WButton(new LiteralText(label)); + WButton labelButton = new WButton(Text.of(label)); labelButton.setEnabled(false); return labelButton; } @@ -187,7 +186,7 @@ class DefaultViewHandler extends ViewHandlerBase { } private WTextField CreateLocationField(PlayerPosition existingPosition) { - WTextField location = new WTextField(new TranslatableText(TranslationKeys.MENU_LOCATION)); + WTextField location = new WTextField(Text.translatable(TranslationKeys.MENU_LOCATION)); if (existingPosition != null) { location.setText(existingPosition.getLocationName()); @@ -199,7 +198,7 @@ class DefaultViewHandler extends ViewHandlerBase { } private WTextField CreateNotesField(PlayerPosition existingPosition) { - WTextField notes = new WTextField(new TranslatableText(TranslationKeys.MENU_NOTES)); + WTextField notes = new WTextField(Text.translatable(TranslationKeys.MENU_NOTES)); if (existingPosition != null && existingPosition.getPositionMetadata() != null) { notes.setText(existingPosition.getPositionMetadata().getNotes()); @@ -209,7 +208,7 @@ class DefaultViewHandler extends ViewHandlerBase { } private WTextField CreateWorldField(String defaultWorld) { - WTextField world = new WTextField(new TranslatableText(TranslationKeys.MENU_WORLD_NAME)); + WTextField world = new WTextField(Text.translatable(TranslationKeys.MENU_WORLD_NAME)); world.setMaxLength(7); world.setText(defaultWorld); return world; @@ -222,6 +221,6 @@ class DefaultViewHandler extends ViewHandlerBase { } private WButton CreateButton(String translationKey) { - return new WButton(new TranslatableText(translationKey)); + return new WButton(Text.translatable(translationKey)); } } diff --git a/src/main/java/me/neophyte/mods/savecoords/gui/impl/DimensionButton.java b/src/main/java/me/neophyte/mods/savecoords/gui/impl/DimensionButton.java index fdab7ce..52c88da 100644 --- a/src/main/java/me/neophyte/mods/savecoords/gui/impl/DimensionButton.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/impl/DimensionButton.java @@ -6,7 +6,7 @@ import me.neophyte.mods.savecoords.IDimensionAware; import me.neophyte.mods.savecoords.IDimensionAware.IDimension; import me.neophyte.mods.savecoords.model.PlayerRawPosition; import me.neophyte.mods.savecoords.util.PartialCircularList; -import net.minecraft.text.LiteralText; +import net.minecraft.text.Text; public class DimensionButton extends WButton { @@ -27,13 +27,13 @@ public class DimensionButton extends WButton { IDimension currentDimension = allDimensions.current(); sprite.setImage(currentDimension.getSpriteIdentifier()); - setLabel(new LiteralText(currentDimension.getName())); + setLabel(Text.of(currentDimension.getName())); setOnClick(() -> { allDimensions.next(); IDimension current = getDimension(); sprite.setImage(current.getSpriteIdentifier()); - setLabel(new LiteralText(current.getName())); + setLabel(Text.of(current.getName())); }); } diff --git a/src/main/java/me/neophyte/mods/savecoords/gui/impl/ListViewHandler.java b/src/main/java/me/neophyte/mods/savecoords/gui/impl/ListViewHandler.java index 0a4c235..22a17cd 100644 --- a/src/main/java/me/neophyte/mods/savecoords/gui/impl/ListViewHandler.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/impl/ListViewHandler.java @@ -19,8 +19,7 @@ import me.neophyte.mods.savecoords.gui.IRootPanel; import me.neophyte.mods.savecoords.model.PlayerPosition; import me.neophyte.mods.savecoords.model.PlayerRawPosition; import me.neophyte.mods.savecoords.util.ResourceUtils; -import net.minecraft.text.LiteralText; -import net.minecraft.text.TranslatableText; +import net.minecraft.text.Text; class ListViewHandler extends ViewHandlerBase { @@ -58,7 +57,7 @@ class ListViewHandler extends ViewHandlerBase { } private WButton createBackButton() { - return new WButton(new TranslatableText(TranslationKeys.MENU_BACK)); + return new WButton(Text.translatable(TranslationKeys.MENU_BACK)); } private WListPanel createListPanel(List positions) { @@ -122,14 +121,14 @@ class ListViewHandler extends ViewHandlerBase { this.netherCalculator = netherCalculator; this.coordinateConvertState = true; - this.coordinates = new WLabel(""); - this.location = new WLabel(""); - this.world = new WLabel(""); + this.coordinates = new WLabel(Text.of("")); + this.location = new WLabel(Text.of("")); + this.world = new WLabel(Text.of("")); this.icon = new WSprite(ResourceUtils.getIdentifier("close")); this.deleteButton = createDeleteButton(); - this.detailButton = new WButton(new LiteralText("")); - this.pingButton = new WButton(new LiteralText("")); - this.convertButton = new WButton(new LiteralText("")); + this.detailButton = new WButton(Text.of("")); + this.pingButton = new WButton(Text.of("")); + this.convertButton = new WButton(Text.of("")); this.pingButton.setIcon(ResourceUtils.createPingIcon()); this.detailButton.setIcon(ResourceUtils.createDetailsIcon()); @@ -157,17 +156,17 @@ class ListViewHandler extends ViewHandlerBase { } private WButton createDeleteButton() { - TexturedButton button = new TexturedButton(new LiteralText("x")); + TexturedButton button = new TexturedButton(Text.of("x")); button.setTexture(ResourceUtils.getIdentifier("close")); return button; } void setPosition(PlayerPosition position) { - this.location.setText(new LiteralText(position.getLocationName())); + this.location.setText(Text.of(position.getLocationName())); this.location.setColor(0x3939ac); if (position.getPositionMetadata() != null) { - this.world.setText(new LiteralText("[" + position.getPositionMetadata().getWorldName() + "]")); + this.world.setText(Text.of("[" + position.getPositionMetadata().getWorldName() + "]")); this.world.setColor(0xb80000); } @@ -183,7 +182,7 @@ class ListViewHandler extends ViewHandlerBase { this.icon.setImage(ResourceUtils.getIdentifier(position.getWorldDimension())); this.coordinates - .setText(new LiteralText(position.getX() + ", " + position.getY() + ", " + position.getZ())); + .setText(Text.of(position.getX() + ", " + position.getY() + ", " + position.getZ())); this.convertButton.setOnClick(() -> setRawPosition(netherCalculator.convert(position))); this.pingButton.setOnClick(() -> onPing.accept(position)); this.coordinateConvertState = !coordinateConvertState; diff --git a/src/main/java/me/neophyte/mods/savecoords/gui/impl/PingPositionOperation.java b/src/main/java/me/neophyte/mods/savecoords/gui/impl/PingPositionOperation.java index 7ef0d2d..13ceeab 100644 --- a/src/main/java/me/neophyte/mods/savecoords/gui/impl/PingPositionOperation.java +++ b/src/main/java/me/neophyte/mods/savecoords/gui/impl/PingPositionOperation.java @@ -5,6 +5,7 @@ import java.util.function.Supplier; import me.neophyte.mods.savecoords.IFileStore; import me.neophyte.mods.savecoords.model.PlayerRawPosition; import net.minecraft.client.MinecraftClient; +import net.minecraft.text.Text; class PingPositionOperation extends ViewOperationBase { @@ -15,6 +16,6 @@ class PingPositionOperation extends ViewOperationBase { @SuppressWarnings("resource") @Override protected void executeOperation(IFileStore fileStore, PlayerRawPosition position) throws Exception { - MinecraftClient.getInstance().player.sendChatMessage(position.toString()); + MinecraftClient.getInstance().player.sendChatMessage(position.toString(), Text.of(position.toString())); } } diff --git a/src/main/java/me/neophyte/mods/savecoords/impl/KeyBinds.java b/src/main/java/me/neophyte/mods/savecoords/impl/KeyBinds.java index 89ab06a..bcedd9f 100644 --- a/src/main/java/me/neophyte/mods/savecoords/impl/KeyBinds.java +++ b/src/main/java/me/neophyte/mods/savecoords/impl/KeyBinds.java @@ -18,7 +18,6 @@ import net.minecraft.client.option.KeyBinding; import net.minecraft.client.util.InputUtil; import net.minecraft.client.util.InputUtil.Type; import net.minecraft.text.Text; -import net.minecraft.text.TranslatableText; class KeyBinds implements IKeyBinds { @@ -120,7 +119,7 @@ class KeyBinds implements IKeyBinds { @Override public Text getNameLocalizedText() { - return new TranslatableText(getTranslationKey()); + return Text.translatable(getTranslationKey()); } @Override diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 5bfbf57..0ae1476 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -25,9 +25,9 @@ }, "mixins": [], "depends": { - "fabricloader": ">=0.11.3", + "fabricloader": ">=0.14.9", "fabric": "*", - "minecraft": "1.18.x", + "minecraft": "1.19.x", "java": ">=17" }, "suggests": {