From 6b77c377729bc7ca90190deb16f484c3eee8c005 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Sun, 9 Apr 2017 20:27:11 -0400 Subject: [PATCH] Recipe stuff --- mappings/ajl.mapping | 6 --- mappings/ajn.mapping | 7 ---- mappings/net/minecraft/recipe/IRecipe.mapping | 6 --- mappings/net/minecraft/recipe/Recipe.mapping | 15 +++++++ .../minecraft/recipe/RecipeArmorDye.mapping | 5 +++ ...peBanner.mapping => RecipeBanners.mapping} | 16 +++++++- .../minecraft/recipe/RecipeBookClone.mapping | 5 +++ .../minecraft/recipe/RecipeCopyMap.mapping | 5 +++ .../minecraft/recipe/RecipeFireworks.mapping | 5 +++ .../minecraft/recipe/RecipeMapClone.mapping} | 7 +++- .../minecraft/recipe/RecipeMapExtend.mapping | 6 +++ .../minecraft/recipe/RecipeRegistry.mapping | 23 +++++++++++ .../net/minecraft/recipe/RecipeRepair.mapping | 5 +++ .../minecraft/recipe/RecipeScaleMap.mapping | 3 ++ .../net/minecraft/recipe/RecipeShaped.mapping | 41 +++++++++++++++++++ .../minecraft/recipe/RecipeShapeless.mapping | 22 ++++++++++ .../recipe/RecipeShulkerBoxColoring.mapping | 14 +++++++ .../recipe/RecipeTippedArrow.mapping | 5 +++ .../minecraft/recipe/ServerRecipeBook.mapping | 2 + .../minecraft/recipe/ShieldRecipes.mapping | 6 +++ 20 files changed, 182 insertions(+), 22 deletions(-) delete mode 100644 mappings/ajl.mapping delete mode 100644 mappings/ajn.mapping delete mode 100644 mappings/net/minecraft/recipe/IRecipe.mapping create mode 100644 mappings/net/minecraft/recipe/Recipe.mapping rename mappings/net/minecraft/recipe/{RecipeBanner.mapping => RecipeBanners.mapping} (58%) rename mappings/{ajk.mapping => net/minecraft/recipe/RecipeMapClone.mapping} (52%) create mode 100644 mappings/net/minecraft/recipe/RecipeMapExtend.mapping create mode 100644 mappings/net/minecraft/recipe/RecipeShaped.mapping create mode 100644 mappings/net/minecraft/recipe/RecipeShapeless.mapping create mode 100644 mappings/net/minecraft/recipe/RecipeShulkerBoxColoring.mapping diff --git a/mappings/ajl.mapping b/mappings/ajl.mapping deleted file mode 100644 index e89a07d685..0000000000 --- a/mappings/ajl.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS ajl - METHOD a getSize ()I - METHOD a craft (Laeo;)Lahf; - METHOD a matches (Laeo;Lali;)Z - METHOD b getOutput ()Lahf; - METHOD b getRemainingStacks (Laeo;)Lem; diff --git a/mappings/ajn.mapping b/mappings/ajn.mapping deleted file mode 100644 index 3589b437e8..0000000000 --- a/mappings/ajn.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS ajn - CLASS ajn$a - METHOD a getSize ()I - METHOD a craft (Laeo;)Lahf; - METHOD a matches (Laeo;Lali;)Z - METHOD b getOutput ()Lahf; - METHOD b getRemainingStacks (Laeo;)Lem; diff --git a/mappings/net/minecraft/recipe/IRecipe.mapping b/mappings/net/minecraft/recipe/IRecipe.mapping deleted file mode 100644 index f1660137cc..0000000000 --- a/mappings/net/minecraft/recipe/IRecipe.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS ajh net/minecraft/recipe/IRecipe - METHOD a getSize ()I - METHOD a craft (Laeo;)Lahf; - METHOD a matches (Laeo;Lali;)Z - METHOD b getOutput ()Lahf; - METHOD b getRemainingStacks (Laeo;)Lem; diff --git a/mappings/net/minecraft/recipe/Recipe.mapping b/mappings/net/minecraft/recipe/Recipe.mapping new file mode 100644 index 0000000000..60074b9d22 --- /dev/null +++ b/mappings/net/minecraft/recipe/Recipe.mapping @@ -0,0 +1,15 @@ +CLASS ajh net/minecraft/recipe/Recipe + FIELD a id Lmd; + METHOD (Lmd;)V + ARG 0 id + METHOD a getSize ()I + METHOD a craft (Laeo;)Lahf; + ARG 0 inv + METHOD a matches (Laeo;Lali;)Z + ARG 0 inv + ARG 1 world + METHOD b getOutput ()Lahf; + METHOD b getRemainingStacks (Laeo;)Lem; + ARG 0 inv + METHOD c getInputs ()Ljava/util/List; + METHOD e getId ()Lmd; diff --git a/mappings/net/minecraft/recipe/RecipeArmorDye.mapping b/mappings/net/minecraft/recipe/RecipeArmorDye.mapping index 6684a76a5d..d2458cbf36 100644 --- a/mappings/net/minecraft/recipe/RecipeArmorDye.mapping +++ b/mappings/net/minecraft/recipe/RecipeArmorDye.mapping @@ -1,6 +1,11 @@ CLASS aja net/minecraft/recipe/RecipeArmorDye METHOD a getSize ()I METHOD a craft (Laeo;)Lahf; + ARG 0 inv METHOD a matches (Laeo;Lali;)Z + ARG 0 inv + ARG 1 world METHOD b getOutput ()Lahf; METHOD b getRemainingStacks (Laeo;)Lem; + ARG 0 inv + METHOD c getInputs ()Ljava/util/List; diff --git a/mappings/net/minecraft/recipe/RecipeBanner.mapping b/mappings/net/minecraft/recipe/RecipeBanners.mapping similarity index 58% rename from mappings/net/minecraft/recipe/RecipeBanner.mapping rename to mappings/net/minecraft/recipe/RecipeBanners.mapping index 6edd1d78be..f783a31e4d 100644 --- a/mappings/net/minecraft/recipe/RecipeBanner.mapping +++ b/mappings/net/minecraft/recipe/RecipeBanners.mapping @@ -1,15 +1,27 @@ -CLASS ajb net/minecraft/recipe/RecipeBanner +CLASS ajb net/minecraft/recipe/RecipeBanners CLASS ajb$a AddPattern METHOD a getSize ()I METHOD a craft (Laeo;)Lahf; + ARG 0 inv METHOD a matches (Laeo;Lali;)Z + ARG 0 inv + ARG 1 world METHOD b getOutput ()Lahf; METHOD b getRemainingStacks (Laeo;)Lem; + ARG 0 inv + METHOD c getInputs ()Ljava/util/List; METHOD c getPattern (Laeo;)Lats; - CLASS ajb$b Clone + ARG 0 inv + CLASS ajb$b Duplicate METHOD a getSize ()I METHOD a craft (Laeo;)Lahf; + ARG 0 inv METHOD a matches (Laeo;Lali;)Z + ARG 0 inv + ARG 1 world METHOD b getOutput ()Lahf; METHOD b getRemainingStacks (Laeo;)Lem; + ARG 0 inv + METHOD c getInputs ()Ljava/util/List; METHOD a register (Laji;)V + ARG 0 registry diff --git a/mappings/net/minecraft/recipe/RecipeBookClone.mapping b/mappings/net/minecraft/recipe/RecipeBookClone.mapping index ac0e2b6dc6..6b044540f7 100644 --- a/mappings/net/minecraft/recipe/RecipeBookClone.mapping +++ b/mappings/net/minecraft/recipe/RecipeBookClone.mapping @@ -1,6 +1,11 @@ CLASS ajc net/minecraft/recipe/RecipeBookClone METHOD a getSize ()I METHOD a craft (Laeo;)Lahf; + ARG 0 inv METHOD a matches (Laeo;Lali;)Z + ARG 0 inv + ARG 1 world METHOD b getOutput ()Lahf; METHOD b getRemainingStacks (Laeo;)Lem; + ARG 0 inv + METHOD c getInputs ()Ljava/util/List; diff --git a/mappings/net/minecraft/recipe/RecipeCopyMap.mapping b/mappings/net/minecraft/recipe/RecipeCopyMap.mapping index ef88615612..64c1100bd8 100644 --- a/mappings/net/minecraft/recipe/RecipeCopyMap.mapping +++ b/mappings/net/minecraft/recipe/RecipeCopyMap.mapping @@ -1,6 +1,11 @@ CLASS ajf net/minecraft/recipe/RecipeCopyMap METHOD a getSize ()I METHOD a craft (Laeo;)Lahf; + ARG 0 inv METHOD a matches (Laeo;Lali;)Z + ARG 0 inv + ARG 1 world METHOD b getOutput ()Lahf; METHOD b getRemainingStacks (Laeo;)Lem; + ARG 0 inv + METHOD c getInputs ()Ljava/util/List; diff --git a/mappings/net/minecraft/recipe/RecipeFireworks.mapping b/mappings/net/minecraft/recipe/RecipeFireworks.mapping index 684f811b4f..7898961460 100644 --- a/mappings/net/minecraft/recipe/RecipeFireworks.mapping +++ b/mappings/net/minecraft/recipe/RecipeFireworks.mapping @@ -2,6 +2,11 @@ CLASS ajd net/minecraft/recipe/RecipeFireworks FIELD b stack Lahf; METHOD a getSize ()I METHOD a craft (Laeo;)Lahf; + ARG 0 inv METHOD a matches (Laeo;Lali;)Z + ARG 0 inv + ARG 1 world METHOD b getOutput ()Lahf; METHOD b getRemainingStacks (Laeo;)Lem; + ARG 0 inv + METHOD c getInputs ()Ljava/util/List; diff --git a/mappings/ajk.mapping b/mappings/net/minecraft/recipe/RecipeMapClone.mapping similarity index 52% rename from mappings/ajk.mapping rename to mappings/net/minecraft/recipe/RecipeMapClone.mapping index 0e110fa063..60ed50c259 100644 --- a/mappings/ajk.mapping +++ b/mappings/net/minecraft/recipe/RecipeMapClone.mapping @@ -1,6 +1,11 @@ -CLASS ajk +CLASS ajf net/minecraft/recipe/RecipeMapClone METHOD a getSize ()I METHOD a craft (Laeo;)Lahf; + ARG 0 inv METHOD a matches (Laeo;Lali;)Z + ARG 0 inv + ARG 1 world METHOD b getOutput ()Lahf; METHOD b getRemainingStacks (Laeo;)Lem; + ARG 0 inv + METHOD c getInputs ()Ljava/util/List; diff --git a/mappings/net/minecraft/recipe/RecipeMapExtend.mapping b/mappings/net/minecraft/recipe/RecipeMapExtend.mapping new file mode 100644 index 0000000000..8f7b352450 --- /dev/null +++ b/mappings/net/minecraft/recipe/RecipeMapExtend.mapping @@ -0,0 +1,6 @@ +CLASS ajg net/minecraft/recipe/RecipeMapExtend + METHOD a craft (Laeo;)Lahf; + ARG 0 inv + METHOD a matches (Laeo;Lali;)Z + ARG 0 inv + ARG 1 world diff --git a/mappings/net/minecraft/recipe/RecipeRegistry.mapping b/mappings/net/minecraft/recipe/RecipeRegistry.mapping index 3f6ccd8283..145600d8b6 100644 --- a/mappings/net/minecraft/recipe/RecipeRegistry.mapping +++ b/mappings/net/minecraft/recipe/RecipeRegistry.mapping @@ -1,10 +1,33 @@ CLASS aji net/minecraft/recipe/RecipeRegistry + CLASS aji$1 + METHOD a compare (Lajh;Lajh;)I + ARG 0 recipe1 + ARG 1 recipe2 + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b INSTANCE Laji; FIELD c recipes Ljava/util/Map; + FIELD d gson Lcom/google/gson/Gson; METHOD a getInstance ()Laji; METHOD a craft (Laeo;Lali;)Lahf; + ARG 0 inv + ARG 1 world + METHOD a getAllWithOutput (Lahf;)Ljava/util/List; + ARG 0 output + METHOD a stackEquals (Lahf;Lahf;)Z + ARG 0 a + ARG 1 b METHOD a addRecipe (Lajh;)V + ARG 0 recipe METHOD a getById (Lmd;)Lajh; ARG 0 id + METHOD a createRecipe (Lmd;Lcom/google/gson/JsonObject;)Lajh; + ARG 0 id + ARG 1 obj METHOD b getRecipeList ()Ljava/util/Map; + METHOD b getMatchingRecipe (Laeo;Lali;)Lajh; + ARG 0 inv + ARG 1 world + METHOD c loadDefaultRecipes ()V METHOD c getRemainingStacks (Laeo;Lali;)Lem; + ARG 0 inv + ARG 1 world diff --git a/mappings/net/minecraft/recipe/RecipeRepair.mapping b/mappings/net/minecraft/recipe/RecipeRepair.mapping index 783a797229..7c75a55e02 100644 --- a/mappings/net/minecraft/recipe/RecipeRepair.mapping +++ b/mappings/net/minecraft/recipe/RecipeRepair.mapping @@ -1,6 +1,11 @@ CLASS ajj net/minecraft/recipe/RecipeRepair METHOD a getSize ()I METHOD a craft (Laeo;)Lahf; + ARG 0 inv METHOD a matches (Laeo;Lali;)Z + ARG 0 inv + ARG 1 world METHOD b getOutput ()Lahf; METHOD b getRemainingStacks (Laeo;)Lem; + ARG 0 inv + METHOD c getInputs ()Ljava/util/List; diff --git a/mappings/net/minecraft/recipe/RecipeScaleMap.mapping b/mappings/net/minecraft/recipe/RecipeScaleMap.mapping index f73cb3baea..f42a6a09cc 100644 --- a/mappings/net/minecraft/recipe/RecipeScaleMap.mapping +++ b/mappings/net/minecraft/recipe/RecipeScaleMap.mapping @@ -1,3 +1,6 @@ CLASS ajg net/minecraft/recipe/RecipeScaleMap METHOD a craft (Laeo;)Lahf; + ARG 0 inv METHOD a matches (Laeo;Lali;)Z + ARG 0 inv + ARG 1 world diff --git a/mappings/net/minecraft/recipe/RecipeShaped.mapping b/mappings/net/minecraft/recipe/RecipeShaped.mapping new file mode 100644 index 0000000000..7a33534bb7 --- /dev/null +++ b/mappings/net/minecraft/recipe/RecipeShaped.mapping @@ -0,0 +1,41 @@ +CLASS ajk net/minecraft/recipe/RecipeShaped + FIELD b width I + FIELD c height I + FIELD d inputs [Lahf; + FIELD e output Lahf; + METHOD (Lmd;II[Lahf;Lahf;)V + ARG 0 id + ARG 1 width + ARG 2 height + ARG 3 ingredients + ARG 4 output + METHOD a getSize ()I + METHOD a craft (Laeo;)Lahf; + ARG 0 inv + METHOD a matchesSmall (Laeo;IIZ)Z + ARG 0 inv + ARG 1 offsetX + ARG 2 offsetY + METHOD a matches (Laeo;Lali;)Z + ARG 0 inv + ARG 1 world + METHOD a deserializePattern (Lcom/google/gson/JsonArray;)[Ljava/lang/String; + ARG 0 arr + METHOD a deserializeComponents (Lcom/google/gson/JsonObject;)Ljava/util/Map; + ARG 0 obj + METHOD a deserializeStack (Lcom/google/gson/JsonObject;Z)Lahf; + ARG 0 obj + METHOD a deserialize (Lmd;Lcom/google/gson/JsonObject;)Lajk; + ARG 0 id + ARG 1 obj + METHOD a createPattern ([Ljava/lang/String;Ljava/util/Map;II)[Lahf; + ARG 0 pattern + ARG 1 components + ARG 2 width + ARG 3 height + METHOD b getOutput ()Lahf; + METHOD b getRemainingStacks (Laeo;)Lem; + ARG 0 inv + METHOD c getInputs ()Ljava/util/List; + METHOD f getWidth ()I + METHOD g getHeight ()I diff --git a/mappings/net/minecraft/recipe/RecipeShapeless.mapping b/mappings/net/minecraft/recipe/RecipeShapeless.mapping new file mode 100644 index 0000000000..ccc8473f39 --- /dev/null +++ b/mappings/net/minecraft/recipe/RecipeShapeless.mapping @@ -0,0 +1,22 @@ +CLASS ajl net/minecraft/recipe/RecipeShapeless + FIELD b output Lahf; + FIELD c inputs Ljava/util/List; + METHOD (Lmd;Lahf;Ljava/util/List;)V + ARG 0 id + ARG 1 reslut + ARG 2 inputs + METHOD a getSize ()I + METHOD a craft (Laeo;)Lahf; + ARG 0 inv + METHOD a matches (Laeo;Lali;)Z + ARG 0 inv + ARG 1 world + METHOD a deserializeStackList (Lcom/google/gson/JsonArray;)Ljava/util/List; + ARG 0 arr + METHOD a deserialize (Lmd;Lcom/google/gson/JsonObject;)Lajl; + ARG 0 id + ARG 1 obj + METHOD b getOutput ()Lahf; + METHOD b getRemainingStacks (Laeo;)Lem; + ARG 0 inv + METHOD c getInputs ()Ljava/util/List; diff --git a/mappings/net/minecraft/recipe/RecipeShulkerBoxColoring.mapping b/mappings/net/minecraft/recipe/RecipeShulkerBoxColoring.mapping new file mode 100644 index 0000000000..8d5c434048 --- /dev/null +++ b/mappings/net/minecraft/recipe/RecipeShulkerBoxColoring.mapping @@ -0,0 +1,14 @@ +CLASS ajn net/minecraft/recipe/RecipeShulkerBoxColoring + CLASS ajn$a ShulkerBoxColoring + METHOD a getSize ()I + METHOD a craft (Laeo;)Lahf; + ARG 0 inv + METHOD a matches (Laeo;Lali;)Z + ARG 0 inv + ARG 1 world + METHOD b getOutput ()Lahf; + METHOD b getRemainingStacks (Laeo;)Lem; + ARG 0 inv + METHOD c getInputs ()Ljava/util/List; + METHOD a addCraftingRecipes (Laji;)V + ARG 0 registry diff --git a/mappings/net/minecraft/recipe/RecipeTippedArrow.mapping b/mappings/net/minecraft/recipe/RecipeTippedArrow.mapping index ce5b1a8c3f..c977a405bc 100644 --- a/mappings/net/minecraft/recipe/RecipeTippedArrow.mapping +++ b/mappings/net/minecraft/recipe/RecipeTippedArrow.mapping @@ -1,6 +1,11 @@ CLASS ajo net/minecraft/recipe/RecipeTippedArrow METHOD a getSize ()I METHOD a craft (Laeo;)Lahf; + ARG 0 inv METHOD a matches (Laeo;Lali;)Z + ARG 0 inv + ARG 1 world METHOD b getOutput ()Lahf; METHOD b getRemainingStacks (Laeo;)Lem; + ARG 0 inv + METHOD c getInputs ()Ljava/util/List; diff --git a/mappings/net/minecraft/recipe/ServerRecipeBook.mapping b/mappings/net/minecraft/recipe/ServerRecipeBook.mapping index baa7aa19f6..7f7a8f99b1 100644 --- a/mappings/net/minecraft/recipe/ServerRecipeBook.mapping +++ b/mappings/net/minecraft/recipe/ServerRecipeBook.mapping @@ -9,6 +9,8 @@ CLASS pj net/minecraft/recipe/ServerRecipeBook ARG 0 id ARG 1 unlocked ARG 2 displayed + METHOD a (Lnn;)V + ARG 0 player METHOD b deserialize (Lfc;)V ARG 0 tag METHOD b sync (Lnn;)V diff --git a/mappings/net/minecraft/recipe/ShieldRecipes.mapping b/mappings/net/minecraft/recipe/ShieldRecipes.mapping index 7222739990..97ecc4b43b 100644 --- a/mappings/net/minecraft/recipe/ShieldRecipes.mapping +++ b/mappings/net/minecraft/recipe/ShieldRecipes.mapping @@ -2,7 +2,13 @@ CLASS ajm net/minecraft/recipe/ShieldRecipes CLASS ajm$a RecipeShieldDesign METHOD a getSize ()I METHOD a craft (Laeo;)Lahf; + ARG 0 inv METHOD a matches (Laeo;Lali;)Z + ARG 0 inv + ARG 1 world METHOD b getOutput ()Lahf; METHOD b getRemainingStacks (Laeo;)Lem; + ARG 0 inv + METHOD c getInputs ()Ljava/util/List; METHOD a addCraftingRecipes (Laji;)V + ARG 0 registry