From bd5364bbda46f400f6a88fa48fef1f705cc3865e Mon Sep 17 00:00:00 2001 From: Jamie Mansfield Date: Tue, 16 Aug 2016 01:44:22 +0100 Subject: [PATCH] Improve text mappings - Mojang give away many mappings for free via their #toString() we should use those - impl packages are horrid - net/minecraft/text/event vs net/minecraft/event/text - AbstractTextComponent vs TextComponentBase - TextStyle vs Style --- README.md | 2 +- .../{impl/TextComponentScore.mapping => ScoreComponent.mapping} | 2 +- .../TextComponentSelector.mapping => SelectorComponent.mapping} | 2 +- .../{impl/TextComponentString.mapping => TextComponent.mapping} | 2 +- ...ponentTranslatable.mapping => TranslatableComponent.mapping} | 2 +- mappings/net/minecraft/text/{ => event}/ClickEvent.mapping | 2 +- mappings/net/minecraft/text/{ => event}/HoverEvent.mapping | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename mappings/net/minecraft/text/{impl/TextComponentScore.mapping => ScoreComponent.mapping} (61%) rename mappings/net/minecraft/text/{impl/TextComponentSelector.mapping => SelectorComponent.mapping} (78%) rename mappings/net/minecraft/text/{impl/TextComponentString.mapping => TextComponent.mapping} (79%) rename mappings/net/minecraft/text/{impl/TextComponentTranslatable.mapping => TranslatableComponent.mapping} (87%) rename mappings/net/minecraft/text/{ => event}/ClickEvent.mapping (93%) rename mappings/net/minecraft/text/{ => event}/HoverEvent.mapping (92%) diff --git a/README.md b/README.md index 966defa14b..f83940f840 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ The current version targets Minecraft version **16w32b**. ## Contributing -Download Enigma from [here](http://modmuss50.me:8080/job/Enigma-Asie/) ([source](https://github.com/ChorusMC/Enigma)). Use the "-all" JAR. +Download Enigma from [here](http://modmuss50.me:8080/job/Chorus/job/Enigma-Chorus/) ([source](https://github.com/ChorusMC/Enigma)). Use the "-all" JAR. Please remember that copying and pasting mappings from alternate projects under more restrictive licenses (such as MCP) is **completely forbidden**. It is also good to consult name changes with other people via pull requests. diff --git a/mappings/net/minecraft/text/impl/TextComponentScore.mapping b/mappings/net/minecraft/text/ScoreComponent.mapping similarity index 61% rename from mappings/net/minecraft/text/impl/TextComponentScore.mapping rename to mappings/net/minecraft/text/ScoreComponent.mapping index 67ab993ba0..8abd95ba78 100644 --- a/mappings/net/minecraft/text/impl/TextComponentScore.mapping +++ b/mappings/net/minecraft/text/ScoreComponent.mapping @@ -1,4 +1,4 @@ -CLASS none/fd net/minecraft/text/impl/TextComponentScore +CLASS none/fd net/minecraft/text/ScoreComponent METHOD e getText ()Ljava/lang/String; METHOD equals (Ljava/lang/Object;)Z ARG 0 other diff --git a/mappings/net/minecraft/text/impl/TextComponentSelector.mapping b/mappings/net/minecraft/text/SelectorComponent.mapping similarity index 78% rename from mappings/net/minecraft/text/impl/TextComponentSelector.mapping rename to mappings/net/minecraft/text/SelectorComponent.mapping index 7035819a9c..83ebe6bd3a 100644 --- a/mappings/net/minecraft/text/impl/TextComponentSelector.mapping +++ b/mappings/net/minecraft/text/SelectorComponent.mapping @@ -1,4 +1,4 @@ -CLASS none/fe net/minecraft/text/impl/TextComponentSelector +CLASS none/fe net/minecraft/text/SelectorComponent FIELD b pattern Ljava/lang/String; METHOD (Ljava/lang/String;)V ARG 0 pattern diff --git a/mappings/net/minecraft/text/impl/TextComponentString.mapping b/mappings/net/minecraft/text/TextComponent.mapping similarity index 79% rename from mappings/net/minecraft/text/impl/TextComponentString.mapping rename to mappings/net/minecraft/text/TextComponent.mapping index e9383916a2..cefd08feae 100644 --- a/mappings/net/minecraft/text/impl/TextComponentString.mapping +++ b/mappings/net/minecraft/text/TextComponent.mapping @@ -1,4 +1,4 @@ -CLASS none/fg net/minecraft/text/impl/TextComponentString +CLASS none/fg net/minecraft/text/TextComponent FIELD b text Ljava/lang/String; METHOD (Ljava/lang/String;)V ARG 0 text diff --git a/mappings/net/minecraft/text/impl/TextComponentTranslatable.mapping b/mappings/net/minecraft/text/TranslatableComponent.mapping similarity index 87% rename from mappings/net/minecraft/text/impl/TextComponentTranslatable.mapping rename to mappings/net/minecraft/text/TranslatableComponent.mapping index 79861a3b5a..122e11211f 100644 --- a/mappings/net/minecraft/text/impl/TextComponentTranslatable.mapping +++ b/mappings/net/minecraft/text/TranslatableComponent.mapping @@ -1,4 +1,4 @@ -CLASS none/fh net/minecraft/text/impl/TextComponentTranslatable +CLASS none/fh net/minecraft/text/TranslatableComponent FIELD d key Ljava/lang/String; FIELD e args [Ljava/lang/Object; METHOD (Ljava/lang/String;[Ljava/lang/Object;)V diff --git a/mappings/net/minecraft/text/ClickEvent.mapping b/mappings/net/minecraft/text/event/ClickEvent.mapping similarity index 93% rename from mappings/net/minecraft/text/ClickEvent.mapping rename to mappings/net/minecraft/text/event/ClickEvent.mapping index a855bfe611..f04cc4be74 100644 --- a/mappings/net/minecraft/text/ClickEvent.mapping +++ b/mappings/net/minecraft/text/event/ClickEvent.mapping @@ -1,4 +1,4 @@ -CLASS none/ez net/minecraft/text/ClickEvent +CLASS none/ez net/minecraft/text/event/ClickEvent CLASS none/ez$a Action FIELD a OPEN_URL Lnone/ez$a; FIELD b OPEN_FILE Lnone/ez$a; diff --git a/mappings/net/minecraft/text/HoverEvent.mapping b/mappings/net/minecraft/text/event/HoverEvent.mapping similarity index 92% rename from mappings/net/minecraft/text/HoverEvent.mapping rename to mappings/net/minecraft/text/event/HoverEvent.mapping index 810508242a..1319ccb6b1 100644 --- a/mappings/net/minecraft/text/HoverEvent.mapping +++ b/mappings/net/minecraft/text/event/HoverEvent.mapping @@ -1,4 +1,4 @@ -CLASS none/fc net/minecraft/text/HoverEvent +CLASS none/fc net/minecraft/text/event/HoverEvent CLASS none/fc$a Action FIELD a SHOW_TEXT Lnone/fc$a; FIELD b SHOW_ACHIEVEMENT Lnone/fc$a;