feat(utils): CFH preset mod name prefix

auioc · Aug 13, 2022 · d4045f1 · d4045f1
1 parent 86a8835
commit d4045f1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/CommandFeedbackHelper.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/CommandFeedbackHelper.java
@@ -1,7 +1,5 @@
 package org.auioc.mcmod.arnicalib.utils.game;
 
-import static org.auioc.mcmod.arnicalib.utils.game.TextUtils.EmptyText;
-import static org.auioc.mcmod.arnicalib.utils.game.TextUtils.I18nText;
 import java.util.function.Function;
 import javax.annotation.Nullable;
 import com.mojang.brigadier.Command;
@@ -28,17 +26,21 @@ public CommandFeedbackHelper(MutableComponent prefix, Function<String, String> i
         this.i18n = i18n;
     }
 
+    public CommandFeedbackHelper(String modName, Function<String, String> i18n) {
+        this(TextUtils.literal("[" + modName + "] ").withStyle(ChatFormatting.AQUA), i18n);
+    }
+
     public CommandFeedbackHelper(Function<String, String> i18n) {
-        this(EmptyText(), i18n);
+        this(TextUtils.empty(), i18n);
     }
 
 
     public MutableComponent createMessage(Component message) {
-        return EmptyText().append(this.prefix).append(message);
+        return (TextUtils.empty()).append(this.prefix).append(message);
     }
 
     public MutableComponent createMessage(String key, Object... args) {
-        return EmptyText().append(this.prefix).append(I18nText(this.i18n.apply("command." + key), args));
+        return (TextUtils.empty()).append(this.prefix).append(TextUtils.translatable(this.i18n.apply("command." + key), args));
     }
 
     public MutableComponent createMessage(String key) {
@@ -56,7 +58,7 @@ public MutableComponent createMessage(MessageType type, String key, @Nullable St
                 sb.append(subKey);
             }
         }
-        return EmptyText().append(this.prefix).append(I18nText(this.i18n.apply(sb.toString()), args));
+        return (TextUtils.empty()).append(this.prefix).append(TextUtils.translatable(this.i18n.apply(sb.toString()), args));
     }
 
 

diff --git a/src/main/java/org/auioc/mcmod/arnicalib/utils/game/TextUtils.java b/src/main/java/org/auioc/mcmod/arnicalib/utils/game/TextUtils.java
@@ -34,6 +34,10 @@ static TextComponent getStringText(String text) {
         return new TextComponent(text);
     }
 
+    static TextComponent literal(String text) {
+        return new TextComponent(text);
+    }
+
     static TextComponent StringText(String text) {
         return new TextComponent(text);
     }
@@ -42,6 +46,10 @@ static TranslatableComponent getI18nText(String key) {
         return new TranslatableComponent(key);
     }
 
+    static TranslatableComponent translatable(String key) {
+        return new TranslatableComponent(key);
+    }
+
     static TranslatableComponent I18nText(String key) {
         return new TranslatableComponent(key);
     }
@@ -50,6 +58,10 @@ static TranslatableComponent getI18nText(String key, Object... arguments) {
         return new TranslatableComponent(key, arguments);
     }
 
+    static TranslatableComponent translatable(String key, Object... arguments) {
+        return new TranslatableComponent(key, arguments);
+    }
+
     static TranslatableComponent I18nText(String key, Object... arguments) {
         return new TranslatableComponent(key, arguments);
     }