From d3274d73026c7596f6fa2f51ff260a476fb634b9 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Thu, 3 Oct 2024 15:42:51 -0500 Subject: [PATCH] lang update to not cause issues --- .../one/oth3r/sit/command/SitCommand.java | 4 +- .../oth3r/sit/mixin/ReloadCommandMixin.java | 2 +- .../one/oth3r/sit/screen/ConfigScreen.java | 8 ++-- .../sit/screen/UnderConstructionScreen.java | 12 +++--- src/main/java/one/oth3r/sit/utl/Events.java | 14 +++---- src/main/java/one/oth3r/sit/utl/Logic.java | 6 +-- src/main/java/one/oth3r/sit/utl/Utl.java | 8 ++-- .../assets/sit-oth3r/lang/en_us.json | 41 ++++++++++--------- 8 files changed, 47 insertions(+), 48 deletions(-) diff --git a/src/main/java/one/oth3r/sit/command/SitCommand.java b/src/main/java/one/oth3r/sit/command/SitCommand.java index 87ee902..ce1ac48 100644 --- a/src/main/java/one/oth3r/sit/command/SitCommand.java +++ b/src/main/java/one/oth3r/sit/command/SitCommand.java @@ -50,7 +50,7 @@ public class SitCommand { if (player == null) { if (args[0].equalsIgnoreCase("reload")) { Logic.reload(); - Data.LOGGER.info(Utl.lang("msg.reloaded").getString()); + Data.LOGGER.info(Utl.lang("sit!.chat.reloaded").getString()); } return 1; } @@ -76,7 +76,7 @@ public class SitCommand { if (args[0].equalsIgnoreCase("reload")) { Logic.reload(); - player.sendMessage(Utl.messageTag().append(Utl.lang("msg.reloaded").formatted(Formatting.GREEN))); + player.sendMessage(Utl.messageTag().append(Utl.lang("sit!.chat.reloaded").formatted(Formatting.GREEN))); } if (args[0].equalsIgnoreCase("purgeChairEntities")) Utl.Entity.purge(player,true); diff --git a/src/main/java/one/oth3r/sit/mixin/ReloadCommandMixin.java b/src/main/java/one/oth3r/sit/mixin/ReloadCommandMixin.java index 9b3f46a..aefbbe3 100644 --- a/src/main/java/one/oth3r/sit/mixin/ReloadCommandMixin.java +++ b/src/main/java/one/oth3r/sit/mixin/ReloadCommandMixin.java @@ -27,7 +27,7 @@ public class ReloadCommandMixin { // send a reloaded message to all players with permissions for (ServerPlayerEntity player : server.getPlayerManager().getPlayerList()) { if (player.isCreativeLevelTwoOp()) { - player.sendMessage(Utl.messageTag().append(Utl.lang("msg.reloaded").formatted(Formatting.GREEN))); + player.sendMessage(Utl.messageTag().append(Utl.lang("sit!.chat.reloaded").formatted(Formatting.GREEN))); } } } diff --git a/src/main/java/one/oth3r/sit/screen/ConfigScreen.java b/src/main/java/one/oth3r/sit/screen/ConfigScreen.java index d67e1f7..3c31349 100644 --- a/src/main/java/one/oth3r/sit/screen/ConfigScreen.java +++ b/src/main/java/one/oth3r/sit/screen/ConfigScreen.java @@ -16,7 +16,7 @@ public class ConfigScreen extends Screen { protected final Screen parent; public ConfigScreen(Screen parent) { - super(Text.translatable("screen.config")); + super(Text.translatable("sit!.screen.config")); this.parent = parent; } @@ -35,13 +35,13 @@ public class ConfigScreen extends Screen { sittingConfigButton.setPosition(this.width / 2 - (sittingConfigButton.getWidth()/2), startY+36); - TextureButtonWidget issuesButton = this.addDrawableChild(new TextureButtonWidget.Builder(Text.translatable("gui.button.issues"), + TextureButtonWidget issuesButton = this.addDrawableChild(new TextureButtonWidget.Builder(Text.translatable("sit!.gui.button.issues"), ConfirmLinkScreen.opening(this, URI.create("https://github.com/Oth3r/Sit/issues")), true) .dimensions(20,20).texture(Identifier.of(Data.MOD_ID, "issues"), 15, 15).build()); issuesButton.setPosition(this.width / 2 - 125, startY + 72 + 12); - this.addDrawableChild(ButtonWidget.builder(Text.translatable("gui.button.website"), + this.addDrawableChild(ButtonWidget.builder(Text.translatable("sit!.gui.button.website"), ConfirmLinkScreen.opening(this, URI.create("https://modrinth.com/mod/sit!")) ).dimensions(this.width / 2 - 100, startY + 72 + 12, 98, 20).build()); @@ -49,7 +49,7 @@ public class ConfigScreen extends Screen { close(); }).dimensions(this.width / 2 + 2, startY + 72 + 12, 98, 20).build()); - TextureButtonWidget donateButton = this.addDrawableChild(new TextureButtonWidget.Builder(Text.translatable("gui.button.donate"), + TextureButtonWidget donateButton = this.addDrawableChild(new TextureButtonWidget.Builder(Text.translatable("sit!.gui.button.donate"), ConfirmLinkScreen.opening(this, URI.create("https://Ko-fi.com/oth3r")), true) .dimensions(20,20).texture(Identifier.of(Data.MOD_ID, "donate"), 15, 15).build()); donateButton.setPosition(this.width / 2 + 105, startY + 72 + 12); diff --git a/src/main/java/one/oth3r/sit/screen/UnderConstructionScreen.java b/src/main/java/one/oth3r/sit/screen/UnderConstructionScreen.java index 844ae4c..8395f35 100644 --- a/src/main/java/one/oth3r/sit/screen/UnderConstructionScreen.java +++ b/src/main/java/one/oth3r/sit/screen/UnderConstructionScreen.java @@ -20,7 +20,7 @@ public class UnderConstructionScreen> extends Screen { protected T file; public UnderConstructionScreen(Screen parent, T file) { - super(Text.translatable("screen.config")); + super(Text.translatable("sit!.screen.config")); this.parent = parent; this.file = file; } @@ -32,17 +32,17 @@ public class UnderConstructionScreen> extends Screen { Identifier.of(Data.MOD_ID, "textures/gui/fox.png"), ConfirmLinkScreen.opening(this, URI.create("https://www.instagram.com/bunnestbun/")))); foxPNG.setPosition(this.width / 2 - (foxPNG.getWidth()/2), startY-35); - ButtonWidget openFileButton = this.addDrawableChild(new ButtonWidget.Builder(Text.translatable("gui.button.file"), + ButtonWidget openFileButton = this.addDrawableChild(new ButtonWidget.Builder(Text.translatable("sit!.gui.button.file"), (button) -> Util.getOperatingSystem().open(this.file.getFile())) .dimensions(0, 0, 118 ,20).build()); openFileButton.setPosition(this.width / 2 - 70, startY+110); - TextureButtonWidget folderButton = this.addDrawableChild(new TextureButtonWidget.Builder(Text.translatable("gui.button.folder"), + TextureButtonWidget folderButton = this.addDrawableChild(new TextureButtonWidget.Builder(Text.translatable("sit!.gui.button.folder"), (button) -> Util.getOperatingSystem().open(Paths.get(this.file.getFile().getParent())), true) .dimensions(20,20).texture(Identifier.of(Data.MOD_ID, "folder"), 15, 15).build()); folderButton.setPosition(this.width / 2 + 50, startY + 110); - TextureButtonWidget resetButton = this.addDrawableChild(new TextureButtonWidget.Builder(Text.translatable("gui.button.reset"), + TextureButtonWidget resetButton = this.addDrawableChild(new TextureButtonWidget.Builder(Text.translatable("sit!.gui.button.reset"), (button) -> { this.file.reset(); this.file.save(); @@ -50,13 +50,13 @@ public class UnderConstructionScreen> extends Screen { .dimensions(20,20).texture(Identifier.of(Data.MOD_ID, "reset_file"), 15, 15).build()); resetButton.setPosition(this.width / 2 -70, startY + 135); - ButtonWidget revertButton = this.addDrawableChild(new ButtonWidget.Builder(Text.translatable("gui.button.revert"), + ButtonWidget revertButton = this.addDrawableChild(new ButtonWidget.Builder(Text.translatable("sit!.gui.button.revert"), (button) -> this.file.save()) .dimensions(0, 0, 118,20).build()); revertButton.setPosition(this.width / 2 - 48, startY+135); - ButtonWidget saveExitButton = this.addDrawableChild(new ButtonWidget.Builder(Text.translatable("gui.button.save"), + ButtonWidget saveExitButton = this.addDrawableChild(new ButtonWidget.Builder(Text.translatable("sit!.gui.button.save"), (button) -> { this.file.load(); this.file.save(); diff --git a/src/main/java/one/oth3r/sit/utl/Events.java b/src/main/java/one/oth3r/sit/utl/Events.java index 191f148..40d5222 100644 --- a/src/main/java/one/oth3r/sit/utl/Events.java +++ b/src/main/java/one/oth3r/sit/utl/Events.java @@ -34,19 +34,19 @@ public class Events { private static void register() { toggle_key = KeyBindingHelper.registerKeyBinding(new KeyBinding( - "key.toggle", + "key.sit!.toggle", GLFW.GLFW_KEY_UNKNOWN, - "category.sit" + "category.sit!" )); sit_key = KeyBindingHelper.registerKeyBinding(new KeyBinding( - "key.sit", + "key.sit!.sit", GLFW.GLFW_KEY_UNKNOWN, - "category.sit" + "category.sit!" )); config__key = KeyBindingHelper.registerKeyBinding(new KeyBinding( - "key.config", + "key.sit!.config", GLFW.GLFW_KEY_UNKNOWN, - "category.sit" + "category.sit!" )); } @@ -73,7 +73,7 @@ public class Events { player.networkHandler.sendCommand("sit"); } else { // unsupported server message if not in a Sit! server - player.sendMessage(Utl.lang("msg.unsupported") + player.sendMessage(Utl.lang("sit!.chat.unsupported") .formatted(Formatting.RED), true); } } diff --git a/src/main/java/one/oth3r/sit/utl/Logic.java b/src/main/java/one/oth3r/sit/utl/Logic.java index bf7a36f..e0e055e 100644 --- a/src/main/java/one/oth3r/sit/utl/Logic.java +++ b/src/main/java/one/oth3r/sit/utl/Logic.java @@ -164,15 +164,15 @@ public class Logic { // get the message settings - String messageKey = "msg.sit_toggle."+(config.getEnabled()?"on":"off"); + String messageKey = "sit!.chat.sit_toggle."+(config.getEnabled()?"on":"off"); Formatting messageColor = config.getEnabled()?Formatting.GREEN:Formatting.RED; // send the player the actionbar message - return Utl.lang("msg.sit_toggle", + return Utl.lang("sit!.chat.sit_toggle", Utl.lang(messageKey).formatted(messageColor)); } else { // unsupported server message if not in a Sit! server - return Utl.lang("msg.unsupported") + return Utl.lang("sit!.chat.unsupported") .formatted(Formatting.RED); } } diff --git a/src/main/java/one/oth3r/sit/utl/Utl.java b/src/main/java/one/oth3r/sit/utl/Utl.java index 2159530..7cafc96 100644 --- a/src/main/java/one/oth3r/sit/utl/Utl.java +++ b/src/main/java/one/oth3r/sit/utl/Utl.java @@ -15,14 +15,12 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemStack; import net.minecraft.registry.Registries; -import net.minecraft.registry.tag.TagKey; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; import net.minecraft.text.MutableText; import net.minecraft.text.Text; -import net.minecraft.util.Identifier; -import net.minecraft.util.TypeFilter; -import net.minecraft.util.UseAction; +import net.minecraft.text.TextColor; +import net.minecraft.util.*; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.hit.HitResult; import net.minecraft.util.math.BlockPos; @@ -334,7 +332,7 @@ public class Utl { // send a message if needed if (message) { - player.sendMessage(messageTag().append(Utl.lang("msg.purged",Utl.lang("msg.purged.total",count).styled( + player.sendMessage(messageTag().append(Utl.lang("sit!.chat.purged",Utl.lang("sit!.chat.purged.total",count).styled( style -> style.withColor(Colors.LIGHT_GRAY).withItalic(true) )).styled( style -> style.withColor(Colors.GREEN) diff --git a/src/main/resources/assets/sit-oth3r/lang/en_us.json b/src/main/resources/assets/sit-oth3r/lang/en_us.json index dd021bc..d870855 100644 --- a/src/main/resources/assets/sit-oth3r/lang/en_us.json +++ b/src/main/resources/assets/sit-oth3r/lang/en_us.json @@ -1,5 +1,5 @@ { - "category.sit": "Sit!", + "category.sit!": "Sit!", "config.entry.exclusion": "Put a `!` in front of a entry to exclude it!", "config.entry.example": "Entry example: %s", @@ -78,27 +78,28 @@ "config.sitting.hand.filter.custom-tags": "Custom Tags", "config.sitting.hand.filter.custom-tags.description": "A list of custom item tags to add to the filter.", - "msg.sit_toggle": "%s Sitting!", - "msg.sit_toggle.on": "Enabled", - "msg.sit_toggle.off": "Disabled", - "msg.unsupported": "Sit! is not available on this server.", - "msg.reloaded": "Reloaded the config!", - "msg.purged": "Purged all loaded Sit! entities! %s", - "msg.purged.total": "(%s removed)", + "sit!.chat.toggle_sit": "%s Sitting!", + "sit!.chat.toggle_sit.on": "Enabled", + "sit!.chat.toggle_sit.off": "Disabled", + "sit!.chat.unsupported": "Sit! is not available on this server.", + "sit!.chat.reloaded": "Reloaded the config!", + "sit!.chat.purged": "Purged all loaded Sit! entities! %s", + "sit!.chat.purged.total": "(%s removed)", - "key.toggle": "Toggle Sitting", - "key.sit": "Sit", - "key.config": "Open Config", + "key.sit!.toggle": "Toggle Sitting", + "key.sit!.sit": "Sit", + "key.sit!.config": "Open Config", + + "sit!.screen.config": "Sit! Config", + "sit!.gui.button.file": "Open File", + "sit!.gui.button.folder": "Open Folder", + "sit!.gui.button.reset": "Reset", + "sit!.gui.button.issues": "Issues", + "sit!.gui.button.donate": "Donate", + "sit!.gui.button.revert": "Revert Changes", + "sit!.gui.button.save": "Save and Close", + "sit!.gui.button.website": "Website", - "screen.config": "Sit! Config", - "gui.button.file": "Open File", - "gui.button.folder": "Open Folder", - "gui.button.reset": "Reset", - "gui.button.issues": "Issues", - "gui.button.donate": "Donate", - "gui.button.revert": "Revert Changes", - "gui.button.save": "Save and Close", - "gui.button.website": "Website" "sit!.console.connected": "Connected to Sit! server: %s", "sit!.console.player_settings": "Received custom sitting settings from %s!",