From fa4da7c6fa482493d86b5400eba801102cf9dc25 Mon Sep 17 00:00:00 2001 From: Jamie Mansfield Date: Sun, 5 May 2019 23:25:15 +0100 Subject: [PATCH] Refactor chat components (#650) Closes #174, Succeeds #567 (partially). This PR brings the naming of chat components in line with Mojang - in both package and *chat* components. --- .../minecraft/{text/TextFormat.mapping => ChatFormat.mapping} | 2 +- .../chat/BaseComponent.mapping} | 2 +- .../minecraft/{text => network/chat}/ChatMessageType.mapping | 2 +- .../minecraft/{text/event => network/chat}/ClickEvent.mapping | 2 +- .../TextComponent.mapping => network/chat/Component.mapping} | 2 +- .../net/minecraft/network/chat/ComponentWithSelectors.mapping | 3 +++ .../TextFormatter.mapping => network/chat/Components.mapping} | 2 +- .../minecraft/{text/event => network/chat}/HoverEvent.mapping | 2 +- .../chat/KeybindComponent.mapping} | 2 +- .../chat/NbtComponent.mapping} | 4 ++-- .../chat/ScoreComponent.mapping} | 2 +- .../chat/SelectorComponent.mapping} | 2 +- mappings/net/minecraft/{text => network/chat}/Style.mapping | 2 +- .../chat/TextComponent.mapping} | 2 +- .../chat/TranslatableComponent.mapping} | 2 +- .../chat/TranslationException.mapping} | 2 +- .../net/minecraft/text/TextComponentWithSelectors.mapping | 3 --- 17 files changed, 19 insertions(+), 19 deletions(-) rename mappings/net/minecraft/{text/TextFormat.mapping => ChatFormat.mapping} (95%) rename mappings/net/minecraft/{text/AbstractTextComponent.mapping => network/chat/BaseComponent.mapping} (67%) rename mappings/net/minecraft/{text => network/chat}/ChatMessageType.mapping (77%) rename mappings/net/minecraft/{text/event => network/chat}/ClickEvent.mapping (92%) rename mappings/net/minecraft/{text/TextComponent.mapping => network/chat/Component.mapping} (97%) create mode 100644 mappings/net/minecraft/network/chat/ComponentWithSelectors.mapping rename mappings/net/minecraft/{text/TextFormatter.mapping => network/chat/Components.mapping} (91%) rename mappings/net/minecraft/{text/event => network/chat}/HoverEvent.mapping (91%) rename mappings/net/minecraft/{text/KeybindTextComponent.mapping => network/chat/KeybindComponent.mapping} (70%) rename mappings/net/minecraft/{text/NbtTextComponent.mapping => network/chat/NbtComponent.mapping} (92%) rename mappings/net/minecraft/{text/ScoreTextComponent.mapping => network/chat/ScoreComponent.mapping} (88%) rename mappings/net/minecraft/{text/SelectorTextComponent.mapping => network/chat/SelectorComponent.mapping} (76%) rename mappings/net/minecraft/{text => network/chat}/Style.mapping (97%) rename mappings/net/minecraft/{text/StringTextComponent.mapping => network/chat/TextComponent.mapping} (71%) rename mappings/net/minecraft/{text/TranslatableTextComponent.mapping => network/chat/TranslatableComponent.mapping} (90%) rename mappings/net/minecraft/{text/ComponentTranslationException.mapping => network/chat/TranslationException.mapping} (73%) delete mode 100644 mappings/net/minecraft/text/TextComponentWithSelectors.mapping diff --git a/mappings/net/minecraft/text/TextFormat.mapping b/mappings/net/minecraft/ChatFormat.mapping similarity index 95% rename from mappings/net/minecraft/text/TextFormat.mapping rename to mappings/net/minecraft/ChatFormat.mapping index 0bde7c0be3..7174e4a432 100644 --- a/mappings/net/minecraft/text/TextFormat.mapping +++ b/mappings/net/minecraft/ChatFormat.mapping @@ -1,4 +1,4 @@ -CLASS c net/minecraft/text/TextFormat +CLASS c net/minecraft/ChatFormat FIELD A modifier Z FIELD B code Ljava/lang/String; FIELD C id I diff --git a/mappings/net/minecraft/text/AbstractTextComponent.mapping b/mappings/net/minecraft/network/chat/BaseComponent.mapping similarity index 67% rename from mappings/net/minecraft/text/AbstractTextComponent.mapping rename to mappings/net/minecraft/network/chat/BaseComponent.mapping index be39374c93..db7e5b1c28 100644 --- a/mappings/net/minecraft/text/AbstractTextComponent.mapping +++ b/mappings/net/minecraft/network/chat/BaseComponent.mapping @@ -1,4 +1,4 @@ -CLASS jj net/minecraft/text/AbstractTextComponent +CLASS jj net/minecraft/network/chat/BaseComponent FIELD a siblings Ljava/util/List; FIELD b style Lju; METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/text/ChatMessageType.mapping b/mappings/net/minecraft/network/chat/ChatMessageType.mapping similarity index 77% rename from mappings/net/minecraft/text/ChatMessageType.mapping rename to mappings/net/minecraft/network/chat/ChatMessageType.mapping index 2c0c7f0289..7202a2eae0 100644 --- a/mappings/net/minecraft/text/ChatMessageType.mapping +++ b/mappings/net/minecraft/network/chat/ChatMessageType.mapping @@ -1,4 +1,4 @@ -CLASS jk net/minecraft/text/ChatMessageType +CLASS jk net/minecraft/network/chat/ChatMessageType FIELD d id B FIELD e interruptsNarration Z METHOD (Ljava/lang/String;IBZ)V diff --git a/mappings/net/minecraft/text/event/ClickEvent.mapping b/mappings/net/minecraft/network/chat/ClickEvent.mapping similarity index 92% rename from mappings/net/minecraft/text/event/ClickEvent.mapping rename to mappings/net/minecraft/network/chat/ClickEvent.mapping index e8d40a196d..1f7aa89b92 100644 --- a/mappings/net/minecraft/text/event/ClickEvent.mapping +++ b/mappings/net/minecraft/network/chat/ClickEvent.mapping @@ -1,4 +1,4 @@ -CLASS jl net/minecraft/text/event/ClickEvent +CLASS jl net/minecraft/network/chat/ClickEvent CLASS jl$a Action FIELD a OPEN_URL Ljl$a; FIELD b OPEN_FILE Ljl$a; diff --git a/mappings/net/minecraft/text/TextComponent.mapping b/mappings/net/minecraft/network/chat/Component.mapping similarity index 97% rename from mappings/net/minecraft/text/TextComponent.mapping rename to mappings/net/minecraft/network/chat/Component.mapping index a638467e14..a0617b7cde 100644 --- a/mappings/net/minecraft/text/TextComponent.mapping +++ b/mappings/net/minecraft/network/chat/Component.mapping @@ -1,4 +1,4 @@ -CLASS jm net/minecraft/text/TextComponent +CLASS jm net/minecraft/network/chat/Component CLASS jm$a Serializer FIELD a GSON Lcom/google/gson/Gson; FIELD b POS_FIELD Ljava/lang/reflect/Field; diff --git a/mappings/net/minecraft/network/chat/ComponentWithSelectors.mapping b/mappings/net/minecraft/network/chat/ComponentWithSelectors.mapping new file mode 100644 index 0000000000..66cb4154c4 --- /dev/null +++ b/mappings/net/minecraft/network/chat/ComponentWithSelectors.mapping @@ -0,0 +1,3 @@ +CLASS jo net/minecraft/network/chat/ComponentWithSelectors + METHOD a resolve (Lcd;Laif;)Ljm; + ARG 1 source diff --git a/mappings/net/minecraft/text/TextFormatter.mapping b/mappings/net/minecraft/network/chat/Components.mapping similarity index 91% rename from mappings/net/minecraft/text/TextFormatter.mapping rename to mappings/net/minecraft/network/chat/Components.mapping index 9dbf05b5b6..5474f036fe 100644 --- a/mappings/net/minecraft/text/TextFormatter.mapping +++ b/mappings/net/minecraft/network/chat/Components.mapping @@ -1,4 +1,4 @@ -CLASS jn net/minecraft/text/TextFormatter +CLASS jn net/minecraft/network/chat/Components METHOD a resolveAndStyle (Lcd;Ljm;Laif;)Ljm; ARG 0 source ARG 1 component diff --git a/mappings/net/minecraft/text/event/HoverEvent.mapping b/mappings/net/minecraft/network/chat/HoverEvent.mapping similarity index 91% rename from mappings/net/minecraft/text/event/HoverEvent.mapping rename to mappings/net/minecraft/network/chat/HoverEvent.mapping index 1125962685..b27573cf96 100644 --- a/mappings/net/minecraft/text/event/HoverEvent.mapping +++ b/mappings/net/minecraft/network/chat/HoverEvent.mapping @@ -1,4 +1,4 @@ -CLASS jp net/minecraft/text/event/HoverEvent +CLASS jp net/minecraft/network/chat/HoverEvent CLASS jp$a Action FIELD a SHOW_TEXT Ljp$a; FIELD b SHOW_ITEM Ljp$a; diff --git a/mappings/net/minecraft/text/KeybindTextComponent.mapping b/mappings/net/minecraft/network/chat/KeybindComponent.mapping similarity index 70% rename from mappings/net/minecraft/text/KeybindTextComponent.mapping rename to mappings/net/minecraft/network/chat/KeybindComponent.mapping index 599b11277a..03ac426389 100644 --- a/mappings/net/minecraft/text/KeybindTextComponent.mapping +++ b/mappings/net/minecraft/network/chat/KeybindComponent.mapping @@ -1,4 +1,4 @@ -CLASS jq net/minecraft/text/KeybindTextComponent +CLASS jq net/minecraft/network/chat/KeybindComponent FIELD c keybind Ljava/lang/String; METHOD equals (Ljava/lang/Object;)Z ARG 1 o diff --git a/mappings/net/minecraft/text/NbtTextComponent.mapping b/mappings/net/minecraft/network/chat/NbtComponent.mapping similarity index 92% rename from mappings/net/minecraft/text/NbtTextComponent.mapping rename to mappings/net/minecraft/network/chat/NbtComponent.mapping index 87f8f175db..e1aacfd297 100644 --- a/mappings/net/minecraft/text/NbtTextComponent.mapping +++ b/mappings/net/minecraft/network/chat/NbtComponent.mapping @@ -1,4 +1,4 @@ -CLASS jr net/minecraft/text/NbtTextComponent +CLASS jr net/minecraft/network/chat/NbtComponent CLASS jr$a BlockPosArgument FIELD e pos Ljava/lang/String; FIELD f parsedPos Ldl; @@ -7,7 +7,7 @@ CLASS jr net/minecraft/text/NbtTextComponent METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD k getPos ()Ljava/lang/String; - CLASS jr$b EntityNbtTextComponent + CLASS jr$b EntityNbtComponent FIELD e selector Ljava/lang/String; FIELD f parsedSelector Lec; METHOD b parseSelector (Ljava/lang/String;)Lec; diff --git a/mappings/net/minecraft/text/ScoreTextComponent.mapping b/mappings/net/minecraft/network/chat/ScoreComponent.mapping similarity index 88% rename from mappings/net/minecraft/text/ScoreTextComponent.mapping rename to mappings/net/minecraft/network/chat/ScoreComponent.mapping index 411625f11b..a7edf8ba19 100644 --- a/mappings/net/minecraft/text/ScoreTextComponent.mapping +++ b/mappings/net/minecraft/network/chat/ScoreComponent.mapping @@ -1,4 +1,4 @@ -CLASS js net/minecraft/text/ScoreTextComponent +CLASS js net/minecraft/network/chat/ScoreComponent FIELD b name Ljava/lang/String; FIELD c selector Lec; FIELD d objective Ljava/lang/String; diff --git a/mappings/net/minecraft/text/SelectorTextComponent.mapping b/mappings/net/minecraft/network/chat/SelectorComponent.mapping similarity index 76% rename from mappings/net/minecraft/text/SelectorTextComponent.mapping rename to mappings/net/minecraft/network/chat/SelectorComponent.mapping index bfc6004f41..bc11a378e9 100644 --- a/mappings/net/minecraft/text/SelectorTextComponent.mapping +++ b/mappings/net/minecraft/network/chat/SelectorComponent.mapping @@ -1,4 +1,4 @@ -CLASS jt net/minecraft/text/SelectorTextComponent +CLASS jt net/minecraft/network/chat/SelectorComponent FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c pattern Ljava/lang/String; METHOD equals (Ljava/lang/Object;)Z diff --git a/mappings/net/minecraft/text/Style.mapping b/mappings/net/minecraft/network/chat/Style.mapping similarity index 97% rename from mappings/net/minecraft/text/Style.mapping rename to mappings/net/minecraft/network/chat/Style.mapping index ad598b8c01..6d6ca62d19 100644 --- a/mappings/net/minecraft/text/Style.mapping +++ b/mappings/net/minecraft/network/chat/Style.mapping @@ -1,4 +1,4 @@ -CLASS ju net/minecraft/text/Style +CLASS ju net/minecraft/network/chat/Style CLASS ju$a Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 functionJson diff --git a/mappings/net/minecraft/text/StringTextComponent.mapping b/mappings/net/minecraft/network/chat/TextComponent.mapping similarity index 71% rename from mappings/net/minecraft/text/StringTextComponent.mapping rename to mappings/net/minecraft/network/chat/TextComponent.mapping index ddc5f81590..eae7976dda 100644 --- a/mappings/net/minecraft/text/StringTextComponent.mapping +++ b/mappings/net/minecraft/network/chat/TextComponent.mapping @@ -1,4 +1,4 @@ -CLASS jv net/minecraft/text/StringTextComponent +CLASS jv net/minecraft/network/chat/TextComponent FIELD b text Ljava/lang/String; METHOD equals (Ljava/lang/Object;)Z ARG 1 o diff --git a/mappings/net/minecraft/text/TranslatableTextComponent.mapping b/mappings/net/minecraft/network/chat/TranslatableComponent.mapping similarity index 90% rename from mappings/net/minecraft/text/TranslatableTextComponent.mapping rename to mappings/net/minecraft/network/chat/TranslatableComponent.mapping index 53b17ca875..4af4413320 100644 --- a/mappings/net/minecraft/text/TranslatableTextComponent.mapping +++ b/mappings/net/minecraft/network/chat/TranslatableComponent.mapping @@ -1,4 +1,4 @@ -CLASS jw net/minecraft/text/TranslatableTextComponent +CLASS jw net/minecraft/network/chat/TranslatableComponent FIELD b translatedText Ljava/util/List; FIELD c PARAM_PATTERN Ljava/util/regex/Pattern; FIELD d EMPTY_LANGUAGE Lhw; diff --git a/mappings/net/minecraft/text/ComponentTranslationException.mapping b/mappings/net/minecraft/network/chat/TranslationException.mapping similarity index 73% rename from mappings/net/minecraft/text/ComponentTranslationException.mapping rename to mappings/net/minecraft/network/chat/TranslationException.mapping index af99d4506f..95ae11a941 100644 --- a/mappings/net/minecraft/text/ComponentTranslationException.mapping +++ b/mappings/net/minecraft/network/chat/TranslationException.mapping @@ -1,4 +1,4 @@ -CLASS jx net/minecraft/text/ComponentTranslationException +CLASS jx net/minecraft/network/chat/TranslationException METHOD (Ljw;I)V ARG 1 component METHOD (Ljw;Ljava/lang/String;)V diff --git a/mappings/net/minecraft/text/TextComponentWithSelectors.mapping b/mappings/net/minecraft/text/TextComponentWithSelectors.mapping deleted file mode 100644 index ef1512f685..0000000000 --- a/mappings/net/minecraft/text/TextComponentWithSelectors.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS jo net/minecraft/text/TextComponentWithSelectors - METHOD a resolve (Lcd;Laif;)Ljm; - ARG 1 source