From 0469014ab7d8ed2bf130629684ccfcf66eaae4fa Mon Sep 17 00:00:00 2001 From: Mike van der Velde Date: Thu, 2 Jan 2020 16:48:11 +0100 Subject: [PATCH 1/2] Changed KillTPSCommand to support localisation Using foundation.utility.Lang (TranslationTextComponents) --- .../foundation/command/KillTPSCommand.java | 28 +++++++++++-------- .../create/foundation/utility/Lang.java | 2 +- .../resources/assets/create/lang/en_us.json | 8 ++++++ 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/simibubi/create/foundation/command/KillTPSCommand.java b/src/main/java/com/simibubi/create/foundation/command/KillTPSCommand.java index 127886d87..a2321e166 100644 --- a/src/main/java/com/simibubi/create/foundation/command/KillTPSCommand.java +++ b/src/main/java/com/simibubi/create/foundation/command/KillTPSCommand.java @@ -3,23 +3,27 @@ package com.simibubi.create.foundation.command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.IntegerArgumentType; import com.simibubi.create.Create; +import com.simibubi.create.foundation.utility.Lang; import net.minecraft.command.CommandSource; import net.minecraft.command.Commands; import net.minecraft.util.text.StringTextComponent; +import net.minecraft.util.text.TranslationTextComponent; public class KillTPSCommand { + + public static void register(CommandDispatcher dispatcher) { dispatcher.register( - Commands.literal("killtps")//todo replace String Components with Translation Components + Commands.literal(Lang.translate("command.killTPSCommand")) .requires(cs -> cs.hasPermissionLevel(2)) .executes(ctx -> { //killtps no arguments - ctx.getSource().sendFeedback(new StringTextComponent(String.format("[Create]: Server tick is currently slowed by %s ms",Create.lagger.isLagging() ? Create.lagger.getTickTime() : 0)), true); + ctx.getSource().sendFeedback(Lang.getTranslationComponent("command.killTPSCommand.status.slowed_by.0", Create.lagger.isLagging() ? Create.lagger.getTickTime() : 0), true); if (Create.lagger.isLagging()) - ctx.getSource().sendFeedback(new StringTextComponent("[Create]: use /killtps stop to bring back server tick to regular speed"), true); + ctx.getSource().sendFeedback(Lang.getTranslationComponent("command.killTPSCommand.status.usage.0"), true); else - ctx.getSource().sendFeedback(new StringTextComponent("[Create]: use /killtps start to artificially slow down the server tick"),true); + ctx.getSource().sendFeedback(Lang.getTranslationComponent("command.killTPSCommand.status.usage.1"),true); return 1; }) @@ -29,22 +33,22 @@ public class KillTPSCommand { int tickTime = Create.lagger.getTickTime(); if (tickTime > 0){ Create.lagger.setLagging(true); - ctx.getSource().sendFeedback(new StringTextComponent(String.format("[Create]: Server tick is slowed by %s ms now :)", tickTime)),true); - ctx.getSource().sendFeedback(new StringTextComponent("[Create]: use /killtps stop to bring back server tick to regular speed"),true); + ctx.getSource().sendFeedback((Lang.getTranslationComponent("command.killTPSCommand.status.slowed_by.1", tickTime)),true); + ctx.getSource().sendFeedback(Lang.getTranslationComponent("command.killTPSCommand.status.usage.0"),true); } else { - ctx.getSource().sendFeedback(new StringTextComponent("[Create]: use /killtps start to artificially slow down the server tick"),true); + ctx.getSource().sendFeedback(Lang.getTranslationComponent("command.killTPSCommand.status.usage.1"),true); } return 1; }) - .then(Commands.argument("tickTime", IntegerArgumentType.integer(1)) + .then(Commands.argument(Lang.translate("command.killTPSCommand.argument.tickTime"), IntegerArgumentType.integer(1)) .executes(ctx -> { //killtps start tickTime - int tickTime = IntegerArgumentType.getInteger(ctx, "tickTime"); + int tickTime = IntegerArgumentType.getInteger(ctx, Lang.translate("command.killTPSCommand.argument.tickTime")); Create.lagger.setTickTime(tickTime); Create.lagger.setLagging(true); - ctx.getSource().sendFeedback(new StringTextComponent(String.format("[Create]: Server tick is slowed by %s ms now :)", tickTime)),true); - ctx.getSource().sendFeedback(new StringTextComponent("[Create]: use /killtps stop to bring server tick to regular speed again"),true); + ctx.getSource().sendFeedback((Lang.getTranslationComponent("command.killTPSCommand.status.slowed_by.1", tickTime)),true); + ctx.getSource().sendFeedback(Lang.getTranslationComponent("command.killTPSCommand.status.usage.0"),true); return 1; }) @@ -54,7 +58,7 @@ public class KillTPSCommand { .executes(ctx -> { //killtps stop Create.lagger.setLagging(false); - ctx.getSource().sendFeedback(new StringTextComponent("[Create]: Server tick is back to regular speed"), false); + ctx.getSource().sendFeedback(Lang.getTranslationComponent("command.killTPSCommand.status.slowed_by.2"), false); return 1; }) diff --git a/src/main/java/com/simibubi/create/foundation/utility/Lang.java b/src/main/java/com/simibubi/create/foundation/utility/Lang.java index 07705b7a3..f19f774ba 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/Lang.java +++ b/src/main/java/com/simibubi/create/foundation/utility/Lang.java @@ -15,7 +15,7 @@ public class Lang { return getTranslationComponent(key, args).getFormattedText(); } - private static TranslationTextComponent getTranslationComponent(String key, Object... args) { + public static TranslationTextComponent getTranslationComponent(String key, Object... args) { return new TranslationTextComponent(Create.ID + "." + key, args); } diff --git a/src/main/resources/assets/create/lang/en_us.json b/src/main/resources/assets/create/lang/en_us.json index 536dd6d7f..413a4409c 100644 --- a/src/main/resources/assets/create/lang/en_us.json +++ b/src/main/resources/assets/create/lang/en_us.json @@ -432,6 +432,14 @@ "create.mechanical_mixer.min_ingredients": "Min. Ingredients", + "create.command.killTPSCommand": "killtps", + "create.command.killTPSCommand.status.slowed_by.0": "[Create]: Server tick is currently slowed by %s ms", + "create.command.killTPSCommand.status.slowed_by.1": "[Create]: Server tick is slowed by %s ms now :)", + "create.command.killTPSCommand.status.slowed_by.2": "[Create]: Server tick is back to regular speed", + "create.command.killTPSCommand.status.usage.0": "[Create]: use /killtps stop to bring back server tick to regular speed", + "create.command.killTPSCommand.status.usage.1": "[Create]: use /killtps start to artificially slow down the server tick", + "create.command.killTPSCommand.argument.tickTime": "tickTime", + "_comment": "-------------------------] ITEM DESCRIPTIONS [------------------------------------------------", "item.create.example_item.tooltip": "EXAMPLE ITEM (just a marker that this tooltip exists)", From f6a99e57d8f7a6545265242b47d1f8e2ae3a87f4 Mon Sep 17 00:00:00 2001 From: Mike van der Velde Date: Sun, 5 Jan 2020 18:33:40 +0100 Subject: [PATCH 2/2] Renamed method getTranslationComponent to createTranslationTextComponent --- .../foundation/command/KillTPSCommand.java | 20 +++++++++---------- .../create/foundation/utility/Lang.java | 6 +++--- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/simibubi/create/foundation/command/KillTPSCommand.java b/src/main/java/com/simibubi/create/foundation/command/KillTPSCommand.java index a2321e166..6cf33ded2 100644 --- a/src/main/java/com/simibubi/create/foundation/command/KillTPSCommand.java +++ b/src/main/java/com/simibubi/create/foundation/command/KillTPSCommand.java @@ -6,8 +6,6 @@ import com.simibubi.create.Create; import com.simibubi.create.foundation.utility.Lang; import net.minecraft.command.CommandSource; import net.minecraft.command.Commands; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TranslationTextComponent; public class KillTPSCommand { @@ -19,11 +17,11 @@ public class KillTPSCommand { .requires(cs -> cs.hasPermissionLevel(2)) .executes(ctx -> { //killtps no arguments - ctx.getSource().sendFeedback(Lang.getTranslationComponent("command.killTPSCommand.status.slowed_by.0", Create.lagger.isLagging() ? Create.lagger.getTickTime() : 0), true); + ctx.getSource().sendFeedback(Lang.createTranslationTextComponent("command.killTPSCommand.status.slowed_by.0", Create.lagger.isLagging() ? Create.lagger.getTickTime() : 0), true); if (Create.lagger.isLagging()) - ctx.getSource().sendFeedback(Lang.getTranslationComponent("command.killTPSCommand.status.usage.0"), true); + ctx.getSource().sendFeedback(Lang.createTranslationTextComponent("command.killTPSCommand.status.usage.0"), true); else - ctx.getSource().sendFeedback(Lang.getTranslationComponent("command.killTPSCommand.status.usage.1"),true); + ctx.getSource().sendFeedback(Lang.createTranslationTextComponent("command.killTPSCommand.status.usage.1"),true); return 1; }) @@ -33,10 +31,10 @@ public class KillTPSCommand { int tickTime = Create.lagger.getTickTime(); if (tickTime > 0){ Create.lagger.setLagging(true); - ctx.getSource().sendFeedback((Lang.getTranslationComponent("command.killTPSCommand.status.slowed_by.1", tickTime)),true); - ctx.getSource().sendFeedback(Lang.getTranslationComponent("command.killTPSCommand.status.usage.0"),true); + ctx.getSource().sendFeedback((Lang.createTranslationTextComponent("command.killTPSCommand.status.slowed_by.1", tickTime)),true); + ctx.getSource().sendFeedback(Lang.createTranslationTextComponent("command.killTPSCommand.status.usage.0"),true); } else { - ctx.getSource().sendFeedback(Lang.getTranslationComponent("command.killTPSCommand.status.usage.1"),true); + ctx.getSource().sendFeedback(Lang.createTranslationTextComponent("command.killTPSCommand.status.usage.1"),true); } return 1; @@ -47,8 +45,8 @@ public class KillTPSCommand { int tickTime = IntegerArgumentType.getInteger(ctx, Lang.translate("command.killTPSCommand.argument.tickTime")); Create.lagger.setTickTime(tickTime); Create.lagger.setLagging(true); - ctx.getSource().sendFeedback((Lang.getTranslationComponent("command.killTPSCommand.status.slowed_by.1", tickTime)),true); - ctx.getSource().sendFeedback(Lang.getTranslationComponent("command.killTPSCommand.status.usage.0"),true); + ctx.getSource().sendFeedback((Lang.createTranslationTextComponent("command.killTPSCommand.status.slowed_by.1", tickTime)),true); + ctx.getSource().sendFeedback(Lang.createTranslationTextComponent("command.killTPSCommand.status.usage.0"),true); return 1; }) @@ -58,7 +56,7 @@ public class KillTPSCommand { .executes(ctx -> { //killtps stop Create.lagger.setLagging(false); - ctx.getSource().sendFeedback(Lang.getTranslationComponent("command.killTPSCommand.status.slowed_by.2"), false); + ctx.getSource().sendFeedback(Lang.createTranslationTextComponent("command.killTPSCommand.status.slowed_by.2"), false); return 1; }) diff --git a/src/main/java/com/simibubi/create/foundation/utility/Lang.java b/src/main/java/com/simibubi/create/foundation/utility/Lang.java index f19f774ba..479ae60e0 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/Lang.java +++ b/src/main/java/com/simibubi/create/foundation/utility/Lang.java @@ -12,15 +12,15 @@ import net.minecraft.util.text.TranslationTextComponent; public class Lang { public static String translate(String key, Object... args) { - return getTranslationComponent(key, args).getFormattedText(); + return createTranslationTextComponent(key, args).getFormattedText(); } - public static TranslationTextComponent getTranslationComponent(String key, Object... args) { + public static TranslationTextComponent createTranslationTextComponent(String key, Object... args) { return new TranslationTextComponent(Create.ID + "." + key, args); } public static void sendStatus(PlayerEntity player, String key, Object... args) { - player.sendStatusMessage(getTranslationComponent(key, args), true); + player.sendStatusMessage(createTranslationTextComponent(key, args), true); } public static List translatedOptions(String prefix, String... keys) {