Skip to content

Commit

Permalink
specify that some Text.translatable methods take a fallback (#457)
Browse files Browse the repository at this point in the history 
fallback rename
  • Loading branch information
@ix0rai
ix0rai authored Jul 3, 2023
1 parent 83b3b24 commit 59168ea
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions mappings/net/minecraft/text/Text.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CLASS net/minecraft/unmapped/C_rdaqiwdt net/minecraft/text/Text
COMMENT @see Text#nbt(String, boolean, Optional, TextData)
COMMENT @see Text#score(String, String)
COMMENT @see Text#selector(String, Optional)
METHOD m_dbsuxeye translatable (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/unmapped/C_npqneive;
METHOD m_dbsuxeye translatableWithFallback (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/unmapped/C_npqneive;
ARG 0 translationKey
ARG 1 fallback
METHOD m_dmavlphp asOrderedText ()Lnet/minecraft/unmapped/C_apvkgwyi;
Expand Down Expand Up @@ -108,7 +108,7 @@ CLASS net/minecraft/unmapped/C_rdaqiwdt net/minecraft/text/Text
COMMENT @return the new mutable score text
ARG 0 name
ARG 1 objective
METHOD m_ywwehcem translatable (Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)Lnet/minecraft/unmapped/C_npqneive;
METHOD m_ywwehcem translatableWithFallback (Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)Lnet/minecraft/unmapped/C_npqneive;
ARG 0 translationKey
ARG 1 fallback
ARG 2 args
Expand Down

1 comment on commit 59168ea

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With commit 59168ea, 1 file(s) were updated with 6 line(s) added and 6 removed compared to the latest Quilt Mappings version.

View the diff here: 
diff -bur namedTargetSrc/net/minecraft/text/Text.java namedSrc/net/minecraft/text/Text.java
--- namedTargetSrc/net/minecraft/text/Text.java	2023-07-03 21:42:48.263298419 +0000
+++ namedSrc/net/minecraft/text/Text.java	2023-07-03 21:41:18.982054299 +0000
@@ -294,17 +294,17 @@
 
    /**
     * @mapping {@literal hashed m_dbsuxeye Lnet/minecraft/unmapped/C_rdaqiwdt;m_dbsuxeye(Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/unmapped/C_npqneive;}
-    * @mapping {@literal named translatable Lnet/minecraft/text/Text;translatable(Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/text/MutableText;}
+    * @mapping {@literal named translatableWithFallback Lnet/minecraft/text/Text;translatableWithFallback(Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/text/MutableText;}
     */
-   static MutableText translatable(String translationKey, @Nullable String fallback) {
+   static MutableText translatableWithFallback(String translationKey, @Nullable String fallback) {
       return MutableText.create(new TranslatableComponent(translationKey, fallback, TranslatableComponent.EMPTY_ARGS));
    }
 
    /**
     * @mapping {@literal hashed m_ywwehcem Lnet/minecraft/unmapped/C_rdaqiwdt;m_ywwehcem(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)Lnet/minecraft/unmapped/C_npqneive;}
-    * @mapping {@literal named translatable Lnet/minecraft/text/Text;translatable(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)Lnet/minecraft/text/MutableText;}
+    * @mapping {@literal named translatableWithFallback Lnet/minecraft/text/Text;translatableWithFallback(Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)Lnet/minecraft/text/MutableText;}
     */
-   static MutableText translatable(String translationKey, @Nullable String fallback, Object... args) {
+   static MutableText translatableWithFallback(String translationKey, @Nullable String fallback, Object... args) {
       return MutableText.create(new TranslatableComponent(translationKey, fallback, args));
    }
 
@@ -460,9 +460,9 @@
                      objects[i] = unwrap(this.deserialize(jsonArray.get(i), type, jsonDeserializationContext));
                   }
 
-                  lv = Text.translatable(string2, string3, objects);
+                  lv = Text.translatableWithFallback(string2, string3, objects);
                } else {
-                  lv = Text.translatable(string2, string3);
+                  lv = Text.translatableWithFallback(string2, string3);
                }
             } else if (jsonObject.has("score")) {
                JsonObject jsonObject2 = JsonHelper.getObject(jsonObject, "score");

Please sign in to comment.