cool-mist/SaveCoordinates
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update new Text() to Text.of or Text.translatable

Browse Source
This commit is contained in:
Surya 2022-11-13 15:47:44 +05:30
parent da3dd53e91
commit a458f0546d
10 changed files with 37 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -1,5 +1,5 @@
plugins { plugins {
id 'fabric-loom' version '1.0' id 'fabric-loom' version '1.0-SNAPSHOT'
id 'maven-publish' id 'maven-publish'
} }

4
src/main/java/me/neophyte/mods/savecoords/SaveCoordinatesClient.java
View File

@ -5,7 +5,7 @@ import me.neophyte.mods.savecoords.gui.impl.DIContainer;
import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.text.TranslatableText; import net.minecraft.text.Text;
public class SaveCoordinatesClient implements ClientModInitializer { public class SaveCoordinatesClient implements ClientModInitializer {
@ -35,7 +35,7 @@ public class SaveCoordinatesClient implements ClientModInitializer {
translationKey = TranslationKeys.TOOLTIP_PING_ENABLED; translationKey = TranslationKeys.TOOLTIP_PING_ENABLED;
} }
MinecraftClient.getInstance().player.sendMessage(new TranslatableText(translationKey), true); MinecraftClient.getInstance().player.sendMessage(Text.translatable(translationKey), true);
} }
while(pingKeyBinding.wasPressed()) { while(pingKeyBinding.wasPressed()) {

14
src/main/java/me/neophyte/mods/savecoords/gui/impl/ConfigViewHandler.java
View File

@ -15,9 +15,7 @@ import me.neophyte.mods.savecoords.IKeyBinds.IKeyBinding;
import me.neophyte.mods.savecoords.gui.IRootPanel; import me.neophyte.mods.savecoords.gui.IRootPanel;
import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.util.InputUtil.Type; import net.minecraft.client.util.InputUtil.Type;
import net.minecraft.text.LiteralText;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import net.minecraft.text.TranslatableText;
// TODO: // TODO:
// Clean the mess below on order of event handling // Clean the mess below on order of event handling
@ -33,9 +31,9 @@ class ConfigViewHandler extends ViewHandlerBase<List<IKeyBinding>> {
private ConfigListPanel listPanel; private ConfigListPanel listPanel;
public ConfigViewHandler() { public ConfigViewHandler() {
this.saveButton = new WButton(new TranslatableText(TranslationKeys.MENU_SAVE)); this.saveButton = new WButton(Text.translatable(TranslationKeys.MENU_SAVE));
this.backButton = new WButton(new TranslatableText(TranslationKeys.MENU_BACK)); this.backButton = new WButton(Text.translatable(TranslationKeys.MENU_BACK));
this.resetButton = new WButton(new TranslatableText(TranslationKeys.MENU_RESET)); this.resetButton = new WButton(Text.translatable(TranslationKeys.MENU_RESET));
} }
@Override @Override
@ -217,9 +215,9 @@ class ConfigViewHandler extends ViewHandlerBase<List<IKeyBinding>> {
private int code; private int code;
ConfigItemPanel() { ConfigItemPanel() {
this.configLabel = new WLabel(""); this.configLabel = new WLabel(Text.of(""));
this.configButton = new WButton(); 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) { void setInitialConfig(IKeyBinding config) {
@ -277,7 +275,7 @@ class ConfigViewHandler extends ViewHandlerBase<List<IKeyBinding>> {
private void updateWidgetData(Type type, int code) { private void updateWidgetData(Type type, int code) {
if(focussing) { if(focussing) {
this.configButton.setLabel(new LiteralText("_")); this.configButton.setLabel(Text.of("_"));
return; return;
} }

4
src/main/java/me/neophyte/mods/savecoords/gui/impl/CurrentPositionPingOperation.java
View File

@ -6,7 +6,7 @@ import me.neophyte.mods.savecoords.IFileStore;
import me.neophyte.mods.savecoords.TranslationKeys; import me.neophyte.mods.savecoords.TranslationKeys;
import me.neophyte.mods.savecoords.model.PlayerRawPosition; import me.neophyte.mods.savecoords.model.PlayerRawPosition;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.text.TranslatableText; import net.minecraft.text.Text;
public class CurrentPositionPingOperation extends PingPositionOperation{ public class CurrentPositionPingOperation extends PingPositionOperation{
@ -28,7 +28,7 @@ public class CurrentPositionPingOperation extends PingPositionOperation{
if (enabled) { if (enabled) {
super.executeOperation(fileStore, position); super.executeOperation(fileStore, position);
} else { } else {
MinecraftClient.getInstance().player.sendMessage(new TranslatableText(TranslationKeys.TOOLTIP_PING_LOCK), MinecraftClient.getInstance().player.sendMessage(Text.translatable(TranslationKeys.TOOLTIP_PING_LOCK),
true); true);
} }
} }

13
src/main/java/me/neophyte/mods/savecoords/gui/impl/DefaultViewHandler.java
View File

@ -16,8 +16,7 @@ import me.neophyte.mods.savecoords.model.PlayerPosition;
import me.neophyte.mods.savecoords.model.PlayerRawPosition; import me.neophyte.mods.savecoords.model.PlayerRawPosition;
import me.neophyte.mods.savecoords.model.PositionMetadata; import me.neophyte.mods.savecoords.model.PositionMetadata;
import me.neophyte.mods.savecoords.util.ResourceUtils; import me.neophyte.mods.savecoords.util.ResourceUtils;
import net.minecraft.text.LiteralText; import net.minecraft.text.Text;
import net.minecraft.text.TranslatableText;
class DefaultViewHandler extends ViewHandlerBase<PlayerPosition> { class DefaultViewHandler extends ViewHandlerBase<PlayerPosition> {
@ -173,7 +172,7 @@ class DefaultViewHandler extends ViewHandlerBase<PlayerPosition> {
} }
private WWidget CreateLabelForCoordinate(String label) { private WWidget CreateLabelForCoordinate(String label) {
WButton labelButton = new WButton(new LiteralText(label)); WButton labelButton = new WButton(Text.of(label));
labelButton.setEnabled(false); labelButton.setEnabled(false);
return labelButton; return labelButton;
} }
@ -187,7 +186,7 @@ class DefaultViewHandler extends ViewHandlerBase<PlayerPosition> {
} }
private WTextField CreateLocationField(PlayerPosition existingPosition) { 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) { if (existingPosition != null) {
location.setText(existingPosition.getLocationName()); location.setText(existingPosition.getLocationName());
@ -199,7 +198,7 @@ class DefaultViewHandler extends ViewHandlerBase<PlayerPosition> {
} }
private WTextField CreateNotesField(PlayerPosition existingPosition) { 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) { if (existingPosition != null && existingPosition.getPositionMetadata() != null) {
notes.setText(existingPosition.getPositionMetadata().getNotes()); notes.setText(existingPosition.getPositionMetadata().getNotes());
@ -209,7 +208,7 @@ class DefaultViewHandler extends ViewHandlerBase<PlayerPosition> {
} }
private WTextField CreateWorldField(String defaultWorld) { 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.setMaxLength(7);
world.setText(defaultWorld); world.setText(defaultWorld);
return world; return world;
@ -222,6 +221,6 @@ class DefaultViewHandler extends ViewHandlerBase<PlayerPosition> {
} }
private WButton CreateButton(String translationKey) { private WButton CreateButton(String translationKey) {
return new WButton(new TranslatableText(translationKey)); return new WButton(Text.translatable(translationKey));
} }
} }

6
src/main/java/me/neophyte/mods/savecoords/gui/impl/DimensionButton.java
View File

@ -6,7 +6,7 @@ import me.neophyte.mods.savecoords.IDimensionAware;
import me.neophyte.mods.savecoords.IDimensionAware.IDimension; import me.neophyte.mods.savecoords.IDimensionAware.IDimension;
import me.neophyte.mods.savecoords.model.PlayerRawPosition; import me.neophyte.mods.savecoords.model.PlayerRawPosition;
import me.neophyte.mods.savecoords.util.PartialCircularList; import me.neophyte.mods.savecoords.util.PartialCircularList;
import net.minecraft.text.LiteralText; import net.minecraft.text.Text;
public class DimensionButton extends WButton { public class DimensionButton extends WButton {
@ -27,13 +27,13 @@ public class DimensionButton extends WButton {
IDimension currentDimension = allDimensions.current(); IDimension currentDimension = allDimensions.current();
sprite.setImage(currentDimension.getSpriteIdentifier()); sprite.setImage(currentDimension.getSpriteIdentifier());
setLabel(new LiteralText(currentDimension.getName())); setLabel(Text.of(currentDimension.getName()));
setOnClick(() -> { setOnClick(() -> {
allDimensions.next(); allDimensions.next();
IDimension current = getDimension(); IDimension current = getDimension();
sprite.setImage(current.getSpriteIdentifier()); sprite.setImage(current.getSpriteIdentifier());
setLabel(new LiteralText(current.getName())); setLabel(Text.of(current.getName()));
}); });
} }

25
src/main/java/me/neophyte/mods/savecoords/gui/impl/ListViewHandler.java
View File

@ -19,8 +19,7 @@ import me.neophyte.mods.savecoords.gui.IRootPanel;
import me.neophyte.mods.savecoords.model.PlayerPosition; import me.neophyte.mods.savecoords.model.PlayerPosition;
import me.neophyte.mods.savecoords.model.PlayerRawPosition; import me.neophyte.mods.savecoords.model.PlayerRawPosition;
import me.neophyte.mods.savecoords.util.ResourceUtils; import me.neophyte.mods.savecoords.util.ResourceUtils;
import net.minecraft.text.LiteralText; import net.minecraft.text.Text;
import net.minecraft.text.TranslatableText;
class ListViewHandler extends ViewHandlerBase<Void> { class ListViewHandler extends ViewHandlerBase<Void> {
@ -58,7 +57,7 @@ class ListViewHandler extends ViewHandlerBase<Void> {
} }
private WButton createBackButton() { private WButton createBackButton() {
return new WButton(new TranslatableText(TranslationKeys.MENU_BACK)); return new WButton(Text.translatable(TranslationKeys.MENU_BACK));
} }
private WListPanel<PlayerPosition, CoordinatesListItemPanel> createListPanel(List<PlayerPosition> positions) { private WListPanel<PlayerPosition, CoordinatesListItemPanel> createListPanel(List<PlayerPosition> positions) {
@ -122,14 +121,14 @@ class ListViewHandler extends ViewHandlerBase<Void> {
this.netherCalculator = netherCalculator; this.netherCalculator = netherCalculator;
this.coordinateConvertState = true; this.coordinateConvertState = true;
this.coordinates = new WLabel(""); this.coordinates = new WLabel(Text.of(""));
this.location = new WLabel(""); this.location = new WLabel(Text.of(""));
this.world = new WLabel(""); this.world = new WLabel(Text.of(""));
this.icon = new WSprite(ResourceUtils.getIdentifier("close")); this.icon = new WSprite(ResourceUtils.getIdentifier("close"));
this.deleteButton = createDeleteButton(); this.deleteButton = createDeleteButton();
this.detailButton = new WButton(new LiteralText("")); this.detailButton = new WButton(Text.of(""));
this.pingButton = new WButton(new LiteralText("")); this.pingButton = new WButton(Text.of(""));
this.convertButton = new WButton(new LiteralText("")); this.convertButton = new WButton(Text.of(""));
this.pingButton.setIcon(ResourceUtils.createPingIcon()); this.pingButton.setIcon(ResourceUtils.createPingIcon());
this.detailButton.setIcon(ResourceUtils.createDetailsIcon()); this.detailButton.setIcon(ResourceUtils.createDetailsIcon());
@ -157,17 +156,17 @@ class ListViewHandler extends ViewHandlerBase<Void> {
} }
private WButton createDeleteButton() { private WButton createDeleteButton() {
TexturedButton button = new TexturedButton(new LiteralText("x")); TexturedButton button = new TexturedButton(Text.of("x"));
button.setTexture(ResourceUtils.getIdentifier("close")); button.setTexture(ResourceUtils.getIdentifier("close"));
return button; return button;
} }
void setPosition(PlayerPosition position) { void setPosition(PlayerPosition position) {
this.location.setText(new LiteralText(position.getLocationName())); this.location.setText(Text.of(position.getLocationName()));
this.location.setColor(0x3939ac); this.location.setColor(0x3939ac);
if (position.getPositionMetadata() != null) { if (position.getPositionMetadata() != null) {
this.world.setText(new LiteralText("[" + position.getPositionMetadata().getWorldName() + "]")); this.world.setText(Text.of("[" + position.getPositionMetadata().getWorldName() + "]"));
this.world.setColor(0xb80000); this.world.setColor(0xb80000);
} }
@ -183,7 +182,7 @@ class ListViewHandler extends ViewHandlerBase<Void> {
this.icon.setImage(ResourceUtils.getIdentifier(position.getWorldDimension())); this.icon.setImage(ResourceUtils.getIdentifier(position.getWorldDimension()));
this.coordinates 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.convertButton.setOnClick(() -> setRawPosition(netherCalculator.convert(position)));
this.pingButton.setOnClick(() -> onPing.accept(position)); this.pingButton.setOnClick(() -> onPing.accept(position));
this.coordinateConvertState = !coordinateConvertState; this.coordinateConvertState = !coordinateConvertState;

3
src/main/java/me/neophyte/mods/savecoords/gui/impl/PingPositionOperation.java
View File

@ -5,6 +5,7 @@ import java.util.function.Supplier;
import me.neophyte.mods.savecoords.IFileStore; import me.neophyte.mods.savecoords.IFileStore;
import me.neophyte.mods.savecoords.model.PlayerRawPosition; import me.neophyte.mods.savecoords.model.PlayerRawPosition;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.text.Text;
class PingPositionOperation extends ViewOperationBase<PlayerRawPosition> { class PingPositionOperation extends ViewOperationBase<PlayerRawPosition> {
@ -15,6 +16,6 @@ class PingPositionOperation extends ViewOperationBase<PlayerRawPosition> {
@SuppressWarnings("resource") @SuppressWarnings("resource")
@Override @Override
protected void executeOperation(IFileStore fileStore, PlayerRawPosition position) throws Exception { 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()));
} }
} }

3
src/main/java/me/neophyte/mods/savecoords/impl/KeyBinds.java
View File

@ -18,7 +18,6 @@ import net.minecraft.client.option.KeyBinding;
import net.minecraft.client.util.InputUtil; import net.minecraft.client.util.InputUtil;
import net.minecraft.client.util.InputUtil.Type; import net.minecraft.client.util.InputUtil.Type;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import net.minecraft.text.TranslatableText;
class KeyBinds implements IKeyBinds { class KeyBinds implements IKeyBinds {
@ -120,7 +119,7 @@ class KeyBinds implements IKeyBinds {
@Override @Override
public Text getNameLocalizedText() { public Text getNameLocalizedText() {
return new TranslatableText(getTranslationKey()); return Text.translatable(getTranslationKey());
} }
@Override @Override

4
src/main/resources/fabric.mod.json
View File

@ -25,9 +25,9 @@
}, },
"mixins": [], "mixins": [],
"depends": { "depends": {
"fabricloader": ">=0.11.3", "fabricloader": ">=0.14.9",
"fabric": "*", "fabric": "*",
"minecraft": "1.18.x", "minecraft": "1.19.x",
"java": ">=17" "java": ">=17"
}, },
"suggests": { "suggests": {