From 1fcdaa7b1e3aa56ea581403713acddbc06df8795 Mon Sep 17 00:00:00 2001 From: kashike Date: Tue, 4 Dec 2018 18:58:25 +1100 Subject: [PATCH] various mappings (#238) --- .../minecraft/block/sapling/AcaciaSaplingGenerator.mapping | 3 ++- .../minecraft/block/sapling/BirchSaplingGenerator.mapping | 3 ++- .../minecraft/block/sapling/DarkOakSaplingGenerator.mapping | 6 ++++-- .../minecraft/block/sapling/JungleSaplingGenerator.mapping | 6 ++++-- .../block/sapling/LargeTreeSaplingGenerator.mapping | 3 ++- .../net/minecraft/block/sapling/OakSaplingGenerator.mapping | 3 ++- .../net/minecraft/block/sapling/SaplingGenerator.mapping | 3 ++- .../minecraft/block/sapling/SpruceSaplingGenerator.mapping | 6 ++++-- .../{TypeEnchantment.mapping => EnchantmentTarget.mapping} | 2 +- mappings/net/minecraft/text/ScoreTextComponent.mapping | 1 + mappings/net/minecraft/text/SelectorTextComponent.mapping | 1 + mappings/net/minecraft/text/StringTextComponent.mapping | 2 ++ mappings/net/minecraft/text/Style.mapping | 2 +- 13 files changed, 28 insertions(+), 13 deletions(-) rename mappings/net/minecraft/enchantment/{TypeEnchantment.mapping => EnchantmentTarget.mapping} (95%) diff --git a/mappings/net/minecraft/block/sapling/AcaciaSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/AcaciaSaplingGenerator.mapping index b1fbf9bacb..18563c2f79 100644 --- a/mappings/net/minecraft/block/sapling/AcaciaSaplingGenerator.mapping +++ b/mappings/net/minecraft/block/sapling/AcaciaSaplingGenerator.mapping @@ -1,2 +1,3 @@ CLASS bnu net/minecraft/block/sapling/AcaciaSaplingGenerator - METHOD b getTreeFeature (Ljava/util/Random;)Lbsk; + METHOD b createTreeFeature (Ljava/util/Random;)Lbsk; + ARG 1 random diff --git a/mappings/net/minecraft/block/sapling/BirchSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/BirchSaplingGenerator.mapping index 933822621a..6bfc8e073c 100644 --- a/mappings/net/minecraft/block/sapling/BirchSaplingGenerator.mapping +++ b/mappings/net/minecraft/block/sapling/BirchSaplingGenerator.mapping @@ -1,2 +1,3 @@ CLASS bnv net/minecraft/block/sapling/BirchSaplingGenerator - METHOD b getTreeFeature (Ljava/util/Random;)Lbsk; + METHOD b createTreeFeature (Ljava/util/Random;)Lbsk; + ARG 1 random diff --git a/mappings/net/minecraft/block/sapling/DarkOakSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/DarkOakSaplingGenerator.mapping index e837fe1c80..8342018fbc 100644 --- a/mappings/net/minecraft/block/sapling/DarkOakSaplingGenerator.mapping +++ b/mappings/net/minecraft/block/sapling/DarkOakSaplingGenerator.mapping @@ -1,3 +1,5 @@ CLASS bnw net/minecraft/block/sapling/DarkOakSaplingGenerator - METHOD a getLargeTreeFeature (Ljava/util/Random;)Lbsk; - METHOD b getTreeFeature (Ljava/util/Random;)Lbsk; + METHOD a createLargeTreeFeature (Ljava/util/Random;)Lbsk; + ARG 1 random + METHOD b createTreeFeature (Ljava/util/Random;)Lbsk; + ARG 1 random diff --git a/mappings/net/minecraft/block/sapling/JungleSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/JungleSaplingGenerator.mapping index 6e84f7f33a..66515c5fd8 100644 --- a/mappings/net/minecraft/block/sapling/JungleSaplingGenerator.mapping +++ b/mappings/net/minecraft/block/sapling/JungleSaplingGenerator.mapping @@ -1,3 +1,5 @@ CLASS bnx net/minecraft/block/sapling/JungleSaplingGenerator - METHOD a getLargeTreeFeature (Ljava/util/Random;)Lbsk; - METHOD b getTreeFeature (Ljava/util/Random;)Lbsk; + METHOD a createLargeTreeFeature (Ljava/util/Random;)Lbsk; + ARG 1 random + METHOD b createTreeFeature (Ljava/util/Random;)Lbsk; + ARG 1 random diff --git a/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping index e581139d4a..f411538bd9 100644 --- a/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping +++ b/mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping @@ -1,3 +1,4 @@ CLASS bns net/minecraft/block/sapling/LargeTreeSaplingGenerator METHOD a generate (Lbar;Let;Lboj;Ljava/util/Random;)Z - METHOD a getLargeTreeFeature (Ljava/util/Random;)Lbsk; + METHOD a createLargeTreeFeature (Ljava/util/Random;)Lbsk; + ARG 1 random diff --git a/mappings/net/minecraft/block/sapling/OakSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/OakSaplingGenerator.mapping index 830d45277b..d5bcb64161 100644 --- a/mappings/net/minecraft/block/sapling/OakSaplingGenerator.mapping +++ b/mappings/net/minecraft/block/sapling/OakSaplingGenerator.mapping @@ -1,2 +1,3 @@ CLASS bny net/minecraft/block/sapling/OakSaplingGenerator - METHOD b getTreeFeature (Ljava/util/Random;)Lbsk; + METHOD b createTreeFeature (Ljava/util/Random;)Lbsk; + ARG 1 random diff --git a/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping index f42d67d2be..16cd9f6b41 100644 --- a/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping +++ b/mappings/net/minecraft/block/sapling/SaplingGenerator.mapping @@ -1,3 +1,4 @@ CLASS bnt net/minecraft/block/sapling/SaplingGenerator METHOD a generate (Lbar;Let;Lboj;Ljava/util/Random;)Z - METHOD b getTreeFeature (Ljava/util/Random;)Lbsk; + METHOD b createTreeFeature (Ljava/util/Random;)Lbsk; + ARG 1 random diff --git a/mappings/net/minecraft/block/sapling/SpruceSaplingGenerator.mapping b/mappings/net/minecraft/block/sapling/SpruceSaplingGenerator.mapping index 8ab05c6d52..4e1802affc 100644 --- a/mappings/net/minecraft/block/sapling/SpruceSaplingGenerator.mapping +++ b/mappings/net/minecraft/block/sapling/SpruceSaplingGenerator.mapping @@ -1,3 +1,5 @@ CLASS bnz net/minecraft/block/sapling/SpruceSaplingGenerator - METHOD a getLargeTreeFeature (Ljava/util/Random;)Lbsk; - METHOD b getTreeFeature (Ljava/util/Random;)Lbsk; + METHOD a createLargeTreeFeature (Ljava/util/Random;)Lbsk; + ARG 1 random + METHOD b createTreeFeature (Ljava/util/Random;)Lbsk; + ARG 1 random diff --git a/mappings/net/minecraft/enchantment/TypeEnchantment.mapping b/mappings/net/minecraft/enchantment/EnchantmentTarget.mapping similarity index 95% rename from mappings/net/minecraft/enchantment/TypeEnchantment.mapping rename to mappings/net/minecraft/enchantment/EnchantmentTarget.mapping index 12a4e22fc3..532c094018 100644 --- a/mappings/net/minecraft/enchantment/TypeEnchantment.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentTarget.mapping @@ -1,4 +1,4 @@ -CLASS ayu net/minecraft/enchantment/TypeEnchantment +CLASS ayu net/minecraft/enchantment/EnchantmentTarget CLASS ayu$1 METHOD a isAcceptableItem (Lavn;)Z ARG 0 item diff --git a/mappings/net/minecraft/text/ScoreTextComponent.mapping b/mappings/net/minecraft/text/ScoreTextComponent.mapping index 8c71e01a6c..dcc697039b 100644 --- a/mappings/net/minecraft/text/ScoreTextComponent.mapping +++ b/mappings/net/minecraft/text/ScoreTextComponent.mapping @@ -5,6 +5,7 @@ CLASS jg net/minecraft/text/ScoreTextComponent FIELD e text Ljava/lang/String; METHOD (Ljava/lang/String;Ljava/lang/String;)V ARG 1 name + ARG 2 objective METHOD b setText (Ljava/lang/String;)V METHOD d getText ()Ljava/lang/String; METHOD g cloneShallow ()Lja; diff --git a/mappings/net/minecraft/text/SelectorTextComponent.mapping b/mappings/net/minecraft/text/SelectorTextComponent.mapping index d046f045e3..826b2019ea 100644 --- a/mappings/net/minecraft/text/SelectorTextComponent.mapping +++ b/mappings/net/minecraft/text/SelectorTextComponent.mapping @@ -1,4 +1,5 @@ CLASS jh net/minecraft/text/SelectorTextComponent + FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c pattern Ljava/lang/String; METHOD d getText ()Ljava/lang/String; METHOD g cloneShallow ()Lja; diff --git a/mappings/net/minecraft/text/StringTextComponent.mapping b/mappings/net/minecraft/text/StringTextComponent.mapping index 49cc27e9c3..0574ece07a 100644 --- a/mappings/net/minecraft/text/StringTextComponent.mapping +++ b/mappings/net/minecraft/text/StringTextComponent.mapping @@ -1,5 +1,7 @@ CLASS jj net/minecraft/text/StringTextComponent FIELD b text Ljava/lang/String; + METHOD (Ljava/lang/String;)V + ARG 1 text METHOD d getText ()Ljava/lang/String; METHOD g cloneShallow ()Lja; METHOD i getTextField ()Ljava/lang/String; diff --git a/mappings/net/minecraft/text/Style.mapping b/mappings/net/minecraft/text/Style.mapping index 8ec1592907..5cb07c0419 100644 --- a/mappings/net/minecraft/text/Style.mapping +++ b/mappings/net/minecraft/text/Style.mapping @@ -30,7 +30,7 @@ CLASS ji net/minecraft/text/Style METHOD k getFormatString ()Ljava/lang/String; METHOD m clone ()Lji; METHOD n copy ()Lji; - CLASS ji$a DeSerializer + CLASS ji$a Serializer METHOD a deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lji; ARG 0 element ARG 1 type