From 3d581ecc5eb5535b62537bb20f2e5cdace7d3243 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Tue, 7 Jul 2020 16:52:06 -0500 Subject: [PATCH] 20w27a recipe book (#1538) * 20w27a recipe book Signed-off-by: liach * Recipe category option * category options Signed-off-by: liach Co-authored-by: liach --- .../listener/ServerPlayPacketListener.mapping | 2 ++ .../RecipeCategoryOptionsC2SPacket.mapping | 11 +++++++ .../minecraft/recipe/book/RecipeBook.mapping | 17 ++++++++++ .../recipe/book/RecipeBookCategory.mapping | 1 + .../recipe/book/RecipeBookOptions.mapping | 33 +++++++++++++++++++ .../AbstractRecipeScreenHandler.mapping | 1 + 6 files changed, 65 insertions(+) create mode 100644 mappings/net/minecraft/network/packet/c2s/play/RecipeCategoryOptionsC2SPacket.mapping create mode 100644 mappings/net/minecraft/recipe/book/RecipeBookCategory.mapping create mode 100644 mappings/net/minecraft/recipe/book/RecipeBookOptions.mapping diff --git a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping index 5b02f29269..6ab165c08e 100644 --- a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping @@ -88,3 +88,5 @@ CLASS net/minecraft/class_2792 net/minecraft/network/listener/ServerPlayPacketLi ARG 1 packet METHOD method_27273 onJigsawGenerating (Lnet/minecraft/class_5194;)V ARG 1 packet + METHOD method_30303 onRecipeCategoryOptions (Lnet/minecraft/class_5427;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/packet/c2s/play/RecipeCategoryOptionsC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/RecipeCategoryOptionsC2SPacket.mapping new file mode 100644 index 0000000000..6f4dccf5d2 --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/play/RecipeCategoryOptionsC2SPacket.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_5427 net/minecraft/network/packet/c2s/play/RecipeCategoryOptionsC2SPacket + FIELD field_25798 category Lnet/minecraft/class_5421; + FIELD field_25799 guiOpen Z + FIELD field_25800 filteringCraftable Z + METHOD (Lnet/minecraft/class_5421;ZZ)V + ARG 1 category + ARG 2 guiOpen + ARG 3 filteringCraftable + METHOD method_30305 getCategory ()Lnet/minecraft/class_5421; + METHOD method_30306 isGuiOpen ()Z + METHOD method_30307 isFilteringCraftable ()Z diff --git a/mappings/net/minecraft/recipe/book/RecipeBook.mapping b/mappings/net/minecraft/recipe/book/RecipeBook.mapping index 2b1f634082..e3fa511058 100644 --- a/mappings/net/minecraft/recipe/book/RecipeBook.mapping +++ b/mappings/net/minecraft/recipe/book/RecipeBook.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_3439 net/minecraft/recipe/book/RecipeBook FIELD field_15295 toBeDisplayed Ljava/util/Set; FIELD field_15300 recipes Ljava/util/Set; + FIELD field_25734 options Lnet/minecraft/class_5411; METHOD method_14875 copyFrom (Lnet/minecraft/class_3439;)V ARG 1 book METHOD method_14876 add (Lnet/minecraft/class_1860;)V @@ -12,17 +13,33 @@ CLASS net/minecraft/class_3439 net/minecraft/recipe/book/RecipeBook METHOD method_14879 remove (Lnet/minecraft/class_2960;)V ARG 1 id METHOD method_14880 isFilteringCraftable (Lnet/minecraft/class_1729;)Z + ARG 1 handler METHOD method_14881 add (Lnet/minecraft/class_2960;)V ARG 1 id METHOD method_14883 shouldDisplay (Lnet/minecraft/class_1860;)Z ARG 1 recipe METHOD method_14884 setGuiOpen (Lnet/minecraft/class_5421;Z)V + ARG 1 category + ARG 2 open METHOD method_14885 display (Lnet/minecraft/class_1860;)V ARG 1 recipe METHOD method_14886 onRecipeDisplayed (Lnet/minecraft/class_1860;)V ARG 1 recipe METHOD method_14887 isGuiOpen (Lnet/minecraft/class_5421;)Z + ARG 1 category METHOD method_14893 remove (Lnet/minecraft/class_1860;)V ARG 1 recipe METHOD method_22845 contains (Lnet/minecraft/class_2960;)Z ARG 1 id + METHOD method_30173 getOptions ()Lnet/minecraft/class_5411; + METHOD method_30174 setOptions (Lnet/minecraft/class_5411;)V + ARG 1 options + METHOD method_30175 setCategoryOptions (Lnet/minecraft/class_5421;ZZ)V + ARG 1 category + ARG 2 guiOpen + ARG 3 filteringCraftable + METHOD method_30176 isFilteringCraftable (Lnet/minecraft/class_5421;)Z + ARG 1 category + METHOD method_30177 setFilteringCraftable (Lnet/minecraft/class_5421;Z)V + ARG 1 category + ARG 2 filteringCraftable diff --git a/mappings/net/minecraft/recipe/book/RecipeBookCategory.mapping b/mappings/net/minecraft/recipe/book/RecipeBookCategory.mapping new file mode 100644 index 0000000000..e20cf6ef44 --- /dev/null +++ b/mappings/net/minecraft/recipe/book/RecipeBookCategory.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_5421 net/minecraft/recipe/book/RecipeBookCategory diff --git a/mappings/net/minecraft/recipe/book/RecipeBookOptions.mapping b/mappings/net/minecraft/recipe/book/RecipeBookOptions.mapping new file mode 100644 index 0000000000..7548d25599 --- /dev/null +++ b/mappings/net/minecraft/recipe/book/RecipeBookOptions.mapping @@ -0,0 +1,33 @@ +CLASS net/minecraft/class_5411 net/minecraft/recipe/book/RecipeBookOptions + FIELD field_25735 CATEGORY_OPTION_NAMES Ljava/util/Map; + FIELD field_25736 categoryOptions Ljava/util/Map; + METHOD (Ljava/util/Map;)V + ARG 1 categoryOptions + METHOD method_30178 copy ()Lnet/minecraft/class_5411; + METHOD method_30179 copyFrom (Lnet/minecraft/class_5411;)V + ARG 1 other + METHOD method_30180 isGuiOpen (Lnet/minecraft/class_5421;)Z + ARG 1 category + METHOD method_30181 setGuiOpen (Lnet/minecraft/class_5421;Z)V + ARG 1 category + ARG 2 open + METHOD method_30183 fromTag (Lnet/minecraft/class_2487;)Lnet/minecraft/class_5411; + ARG 0 tag + METHOD method_30186 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_5411; + ARG 0 buf + METHOD method_30187 isFilteringCraftable (Lnet/minecraft/class_5421;)Z + ARG 1 category + METHOD method_30188 setFilteringCraftable (Lnet/minecraft/class_5421;Z)V + ARG 1 category + ARG 2 filtering + METHOD method_30189 toTag (Lnet/minecraft/class_2487;)V + ARG 1 tag + METHOD method_30190 toPacket (Lnet/minecraft/class_2540;)V + ARG 1 buf + CLASS class_5412 CategoryOption + FIELD field_25737 guiOpen Z + FIELD field_25738 filteringCraftable Z + METHOD (ZZ)V + ARG 1 guiOpen + ARG 2 filteringCraftable + METHOD method_30191 copy ()Lnet/minecraft/class_5411$class_5412; diff --git a/mappings/net/minecraft/screen/AbstractRecipeScreenHandler.mapping b/mappings/net/minecraft/screen/AbstractRecipeScreenHandler.mapping index c6102cdb06..104c7c877d 100644 --- a/mappings/net/minecraft/screen/AbstractRecipeScreenHandler.mapping +++ b/mappings/net/minecraft/screen/AbstractRecipeScreenHandler.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_1729 net/minecraft/screen/AbstractRecipeScreenHandler ARG 1 craftAll ARG 2 recipe ARG 3 player + METHOD method_30264 getCategory ()Lnet/minecraft/class_5421; METHOD method_7652 matches (Lnet/minecraft/class_1860;)Z ARG 1 recipe METHOD method_7653 getCraftingWidth ()I