From 138a56992df21c5cef60b75a52bd0c9543d152d0 Mon Sep 17 00:00:00 2001 From: "Urey. Xue" Date: Tue, 12 Feb 2019 04:38:05 -0800 Subject: [PATCH] Decipher RecipeProvider-related mappings (#451) --- mappings/gw.mapping | 2 - mappings/gy.mapping | 7 -- .../data/server/RecipesProvider.mapping | 1 + .../recipe/ComplexRecipeJsonFactory.mapping | 15 ++++ .../recipe/CookingRecipeJsonFactory.mapping | 70 +++++++++++++++++++ .../server/recipe/RecipeJsonProvider.mapping | 12 ++++ .../recipe/ShapedRecipeJsonFactory.mapping | 68 ++++++++++++++++++ .../recipe/ShapelessRecipeJsonFactory.mapping | 64 +++++++++++++++++ .../SingleItemRecipeJsonFactory.mapping | 54 ++++++++++++++ 9 files changed, 284 insertions(+), 9 deletions(-) delete mode 100644 mappings/gw.mapping delete mode 100644 mappings/gy.mapping create mode 100644 mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonFactory.mapping create mode 100644 mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping create mode 100644 mappings/net/minecraft/data/server/recipe/RecipeJsonProvider.mapping create mode 100644 mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.mapping create mode 100644 mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping create mode 100644 mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.mapping diff --git a/mappings/gw.mapping b/mappings/gw.mapping deleted file mode 100644 index 1ba3e4eeec..0000000000 --- a/mappings/gw.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS gw - FIELD a LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/gy.mapping b/mappings/gy.mapping deleted file mode 100644 index de74e5f1a3..0000000000 --- a/mappings/gy.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS gy - CLASS gy$a - FIELD b group Ljava/lang/String; - FIELD c ingredient Lazt; - FIELD d result Laxh; - FIELD e experience F - FIELD f cookingTime I diff --git a/mappings/net/minecraft/data/server/RecipesProvider.mapping b/mappings/net/minecraft/data/server/RecipesProvider.mapping index 7e980000a4..b9f8d3a3e8 100644 --- a/mappings/net/minecraft/data/server/RecipesProvider.mapping +++ b/mappings/net/minecraft/data/server/RecipesProvider.mapping @@ -2,3 +2,4 @@ CLASS gv net/minecraft/data/server/RecipesProvider FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c GSON Lcom/google/gson/Gson; FIELD d root Lfy; + METHOD a generate (Ljava/util/function/Consumer;)V diff --git a/mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonFactory.mapping new file mode 100644 index 0000000000..71acde5f03 --- /dev/null +++ b/mappings/net/minecraft/data/server/recipe/ComplexRecipeJsonFactory.mapping @@ -0,0 +1,15 @@ +CLASS ha net/minecraft/data/server/recipe/ComplexRecipeJsonFactory + CLASS ha$1 + METHOD a (Lcom/google/gson/JsonObject;)V + ARG 1 arg1 + ARG 2 var2 + ARG 3 var4 + ARG 4 var6 + FIELD a serializer Lbaf; + METHOD (Lbaf;)V + ARG 1 serializer + METHOD a create (Lbaf;)Lha; + ARG 0 serializer + METHOD a offerTo (Ljava/util/function/Consumer;Ljava/lang/String;)V + ARG 1 exporter + ARG 2 recipeId diff --git a/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping new file mode 100644 index 0000000000..fc760e4cd5 --- /dev/null +++ b/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping @@ -0,0 +1,70 @@ +CLASS gy net/minecraft/data/server/recipe/CookingRecipeJsonFactory + CLASS gy$a CookingRecipeJsonProvider + FIELD a recipeId Lqd; + FIELD b group Ljava/lang/String; + FIELD c ingredient Lazt; + FIELD d result Laxh; + FIELD e experience F + FIELD f cookingTime I + FIELD g builder Ln$a; + FIELD h advancementId Lqd; + FIELD i cookingRecipeSerializer Lazy; + METHOD (Lqd;Ljava/lang/String;Lazt;Laxh;FILn$a;Lqd;Lazy;)V + ARG 1 recipeId + ARG 2 group + ARG 3 input + ARG 4 output + ARG 5 exp + ARG 6 time + ARG 7 builder + ARG 8 advancementId + ARG 9 serializer + METHOD a (Lcom/google/gson/JsonObject;)V + ARG 1 arg1 + ARG 2 var2 + ARG 3 var4 + ARG 4 var6 + FIELD a output Laxh; + FIELD b input Lazt; + FIELD c exp F + FIELD d time I + FIELD e builder Ln$a; + FIELD f group Ljava/lang/String; + FIELD g serializer Lbae; + METHOD (Lbct;Lazt;FILbae;)V + ARG 1 ouptut + ARG 2 input + ARG 3 exp + ARG 4 time + ARG 5 serializer + METHOD a create (Lazt;Lbct;FILbae;)Lgy; + ARG 0 input + ARG 1 output + ARG 2 exp + ARG 3 time + ARG 4 serializer + METHOD a criterion (Ljava/lang/String;Lv;)Lgy; + ARG 1 criterionName + ARG 2 conditions + METHOD a offerTo (Ljava/util/function/Consumer;)V + ARG 1 exporter + METHOD a offerTo (Ljava/util/function/Consumer;Ljava/lang/String;)V + ARG 1 exporter + ARG 2 recipeIdStr + ARG 3 outputId + ARG 4 recipeId + METHOD a offerTo (Ljava/util/function/Consumer;Lqd;)V + ARG 1 exporter + ARG 2 recipeId + METHOD a validate (Lqd;)V + ARG 1 recipeId + METHOD b createBlasting (Lazt;Lbct;FI)Lgy; + ARG 0 input + ARG 1 output + ARG 2 exp + ARG 3 time + METHOD c createSmelting (Lazt;Lbct;FI)Lgy; + ARG 0 input + ARG 1 output + ARG 2 exp + ARG 3 time diff --git a/mappings/net/minecraft/data/server/recipe/RecipeJsonProvider.mapping b/mappings/net/minecraft/data/server/recipe/RecipeJsonProvider.mapping new file mode 100644 index 0000000000..54c88f1ef6 --- /dev/null +++ b/mappings/net/minecraft/data/server/recipe/RecipeJsonProvider.mapping @@ -0,0 +1,12 @@ +CLASS gu net/minecraft/data/server/recipe/RecipeJsonProvider + METHOD a toJson ()Lcom/google/gson/JsonObject; + ARG 1 json + METHOD a serialize (Lcom/google/gson/JsonObject;)V + ARG 1 json + ARG 2 pattern + ARG 3 inputKeys + ARG 4 result + METHOD b getRecipeId ()Lqd; + METHOD c getSerializer ()Lazy; + METHOD d toAdvancementJson ()Lcom/google/gson/JsonObject; + METHOD e getAdvancementId ()Lqd; diff --git a/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.mapping new file mode 100644 index 0000000000..b5b5d51134 --- /dev/null +++ b/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.mapping @@ -0,0 +1,68 @@ +CLASS gw net/minecraft/data/server/recipe/ShapedRecipeJsonFactory + CLASS gw$a ShapedRecipeJsonProvider + FIELD b recipeId Lqd; + FIELD c output Laxh; + FIELD d resultCount I + FIELD e group Ljava/lang/String; + FIELD f pattern Ljava/util/List; + FIELD g inputs Ljava/util/Map; + FIELD h builder Ln$a; + FIELD i advancementId Lqd; + METHOD (Lgw;Lqd;Laxh;ILjava/lang/String;Ljava/util/List;Ljava/util/Map;Ln$a;Lqd;)V + ARG 2 recipeId + ARG 3 output + ARG 4 outputCount + ARG 5 group + ARG 6 pattern + ARG 7 inputs + ARG 8 builder + ARG 9 advancementId + METHOD a (Lcom/google/gson/JsonObject;)V + ARG 1 arg1 + ARG 2 var2 + ARG 3 var4 + ARG 4 var6 + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b output Laxh; + FIELD c outputCount I + FIELD d pattern Ljava/util/List; + FIELD e inputs Ljava/util/Map; + FIELD f builder Ln$a; + FIELD g group Ljava/lang/String; + METHOD (Lbct;I)V + ARG 1 output + ARG 2 outputCount + METHOD a create (Lbct;)Lgw; + ARG 0 output + METHOD a create (Lbct;I)Lgw; + ARG 0 output + ARG 1 outputCount + METHOD a input (Ljava/lang/Character;Lazt;)Lgw; + ARG 1 c + ARG 2 ingredient + METHOD a input (Ljava/lang/Character;Lbct;)Lgw; + ARG 1 c + ARG 2 itemProvider + METHOD a input (Ljava/lang/Character;Lyn;)Lgw; + ARG 1 c + ARG 2 tag + METHOD a pattern (Ljava/lang/String;)Lgw; + ARG 1 patternStr + METHOD a criterion (Ljava/lang/String;Lv;)Lgw; + ARG 1 criterionName + ARG 2 conditions + METHOD a offerTo (Ljava/util/function/Consumer;)V + ARG 1 exporter + METHOD a offerTo (Ljava/util/function/Consumer;Ljava/lang/String;)V + ARG 1 exporter + ARG 2 recipeIdStr + ARG 3 outputId + METHOD a offerTo (Ljava/util/function/Consumer;Lqd;)V + ARG 1 exporter + ARG 2 recipeId + METHOD a validate (Lqd;)V + ARG 1 recipeId + ARG 2 inputKeys + ARG 6 c + METHOD b group (Ljava/lang/String;)Lgw; + ARG 1 group diff --git a/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping new file mode 100644 index 0000000000..f10ea1e4fa --- /dev/null +++ b/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping @@ -0,0 +1,64 @@ +CLASS gx net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory + CLASS gx$a ShapelessRecipeJsonProvider + FIELD a recipeId Lqd; + FIELD b output Laxh; + FIELD c count I + FIELD d group Ljava/lang/String; + FIELD e inputs Ljava/util/List; + FIELD f builder Ln$a; + FIELD g advancementId Lqd; + METHOD (Lqd;Laxh;ILjava/lang/String;Ljava/util/List;Ln$a;Lqd;)V + ARG 1 recipeId + ARG 2 output + ARG 3 outputCount + ARG 4 group + ARG 5 inputs + ARG 6 builder + ARG 7 advancementId + METHOD a (Lcom/google/gson/JsonObject;)V + ARG 1 arg1 + ARG 2 var2 + ARG 3 var4 + ARG 4 var6 + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b output Laxh; + FIELD c outputCount I + FIELD d inputs Ljava/util/List; + FIELD e builder Ln$a; + FIELD f group Ljava/lang/String; + METHOD (Lbct;I)V + ARG 1 itemProvider + ARG 2 outputCount + METHOD a input (Lazt;)Lgx; + ARG 1 ingredient + METHOD a input (Lazt;I)Lgx; + ARG 1 ingredient + ARG 2 size + METHOD a create (Lbct;)Lgx; + ARG 0 output + METHOD a create (Lbct;I)Lgx; + ARG 0 output + ARG 1 outputCount + METHOD a group (Ljava/lang/String;)Lgx; + ARG 1 group + METHOD a criterion (Ljava/lang/String;Lv;)Lgx; + ARG 1 criterionName + ARG 2 conditions + METHOD a offerTo (Ljava/util/function/Consumer;)V + ARG 1 exporter + METHOD a offerTo (Ljava/util/function/Consumer;Ljava/lang/String;)V + ARG 1 exporter + ARG 2 recipeIdStr + ARG 3 outputId + METHOD a offerTo (Ljava/util/function/Consumer;Lqd;)V + ARG 1 exporter + ARG 2 recipeId + METHOD a validate (Lqd;)V + ARG 1 recipeId + METHOD a input (Lyn;)Lgx; + ARG 1 tag + METHOD b input (Lbct;)Lgx; + ARG 1 itemProvider + METHOD b input (Lbct;I)Lgx; + ARG 1 itemProvider + ARG 2 size diff --git a/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.mapping new file mode 100644 index 0000000000..2ee9b1dcd7 --- /dev/null +++ b/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.mapping @@ -0,0 +1,54 @@ +CLASS gz net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory + CLASS gz$a SingleItemRecipeJsonProvider + FIELD a recipeId Lqd; + FIELD b group Ljava/lang/String; + FIELD c input Lazt; + FIELD d output Laxh; + FIELD e count I + FIELD f builder Ln$a; + FIELD g advancementId Lqd; + FIELD h serializer Lazy; + METHOD (Lqd;Lazy;Ljava/lang/String;Lazt;Laxh;ILn$a;Lqd;)V + ARG 1 recipeId + ARG 2 serializer + ARG 3 group + ARG 4 input + ARG 5 output + ARG 6 outputCount + ARG 7 builder + ARG 8 advancementId + METHOD a (Lcom/google/gson/JsonObject;)V + ARG 1 arg1 + ARG 2 var2 + ARG 3 var4 + ARG 4 var6 + FIELD a output Laxh; + FIELD b input Lazt; + FIELD c count I + FIELD d builder Ln$a; + FIELD e group Ljava/lang/String; + FIELD f serializer Lazy; + METHOD (Lazy;Lazt;Lbct;I)V + ARG 1 serializer + ARG 2 input + ARG 3 output + ARG 4 outputCount + METHOD a create (Lazt;Lbct;)Lgz; + ARG 0 input + ARG 1 output + METHOD a create (Lazt;Lbct;I)Lgz; + ARG 0 input + ARG 1 output + ARG 2 outputCount + METHOD a create (Ljava/lang/String;Lv;)Lgz; + ARG 1 criterionName + ARG 2 conditions + METHOD a offerTo (Ljava/util/function/Consumer;Ljava/lang/String;)V + ARG 1 exporter + ARG 2 recipeIdStr + ARG 3 outputId + METHOD a offerTo (Ljava/util/function/Consumer;Lqd;)V + ARG 1 exporter + ARG 2 recipeId + METHOD a validate (Lqd;)V + ARG 1 recipeId