From c9c14ddad6573d501aa1cbe37f67cea36c3a9ee0 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Tue, 28 Sep 2021 12:24:59 -0500 Subject: [PATCH] Fix translation key and display name, close #2693 (#2716) Signed-off-by: liach Co-authored-by: liach --- mappings/net/minecraft/client/world/GeneratorType.mapping | 6 ++++-- mappings/net/minecraft/item/ItemGroup.mapping | 4 ++-- mappings/net/minecraft/scoreboard/AbstractTeam.mapping | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mappings/net/minecraft/client/world/GeneratorType.mapping b/mappings/net/minecraft/client/world/GeneratorType.mapping index 188f9fd489..ef9f0d339d 100644 --- a/mappings/net/minecraft/client/world/GeneratorType.mapping +++ b/mappings/net/minecraft/client/world/GeneratorType.mapping @@ -7,8 +7,10 @@ CLASS net/minecraft/class_5317 net/minecraft/client/world/GeneratorType FIELD field_25057 SINGLE_BIOME_CAVES Lnet/minecraft/class_5317; FIELD field_25058 SINGLE_BIOME_FLOATING_ISLANDS Lnet/minecraft/class_5317; FIELD field_25059 DEBUG_ALL_BLOCK_STATES Lnet/minecraft/class_5317; - FIELD field_25060 translationKey Lnet/minecraft/class_2561; - METHOD method_29075 getTranslationKey ()Lnet/minecraft/class_2561; + FIELD field_25060 displayName Lnet/minecraft/class_2561; + METHOD (Ljava/lang/String;)V + ARG 1 translationKeySuffix + METHOD method_29075 getDisplayName ()Lnet/minecraft/class_2561; METHOD method_29076 getChunkGenerator (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;J)Lnet/minecraft/class_2794; ARG 1 biomeRegistry ARG 2 chunkGeneratorSettingsRegistry diff --git a/mappings/net/minecraft/item/ItemGroup.mapping b/mappings/net/minecraft/item/ItemGroup.mapping index 37afc15879..27341aac69 100644 --- a/mappings/net/minecraft/item/ItemGroup.mapping +++ b/mappings/net/minecraft/item/ItemGroup.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_1761 net/minecraft/item/ItemGroup - FIELD field_26391 translationKey Lnet/minecraft/class_2561; + FIELD field_26391 displayName Lnet/minecraft/class_2561; FIELD field_7914 REDSTONE Lnet/minecraft/class_1761; FIELD field_7915 SEARCH Lnet/minecraft/class_1761; FIELD field_7916 COMBAT Lnet/minecraft/class_1761; @@ -25,7 +25,7 @@ CLASS net/minecraft/class_1761 net/minecraft/item/ItemGroup METHOD (ILjava/lang/String;)V ARG 1 index ARG 2 id - METHOD method_7737 getTranslationKey ()Lnet/minecraft/class_2561; + METHOD method_7737 getDisplayName ()Lnet/minecraft/class_2561; METHOD method_7738 appendStacks (Lnet/minecraft/class_2371;)V ARG 1 stacks METHOD method_7739 setName (Ljava/lang/String;)Lnet/minecraft/class_1761; diff --git a/mappings/net/minecraft/scoreboard/AbstractTeam.mapping b/mappings/net/minecraft/scoreboard/AbstractTeam.mapping index f8ecd5adf7..17e0bddaaa 100644 --- a/mappings/net/minecraft/scoreboard/AbstractTeam.mapping +++ b/mappings/net/minecraft/scoreboard/AbstractTeam.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_270 net/minecraft/scoreboard/AbstractTeam METHOD (Ljava/lang/String;ILjava/lang/String;I)V ARG 3 name ARG 4 value - METHOD method_1209 getTranslationKey ()Lnet/minecraft/class_2561; + METHOD method_1209 getDisplayName ()Lnet/minecraft/class_2561; METHOD method_1210 getRule (Ljava/lang/String;)Lnet/minecraft/class_270$class_271; ARG 0 name CLASS class_272 VisibilityRule @@ -32,4 +32,4 @@ CLASS net/minecraft/class_270 net/minecraft/scoreboard/AbstractTeam ARG 4 value METHOD method_1213 getRule (Ljava/lang/String;)Lnet/minecraft/class_270$class_272; ARG 0 name - METHOD method_1214 getTranslationKey ()Lnet/minecraft/class_2561; + METHOD method_1214 getDisplayName ()Lnet/minecraft/class_2561;