From ec09b29d49c9fd1fe7ef2d6fa6f1308a24f2e63a Mon Sep 17 00:00:00 2001 From: apple502j <33279053+apple502j@users.noreply.github.com> Date: Sun, 27 Jun 2021 19:18:10 +0900 Subject: [PATCH] Map screen handlers (#2523) --- .../screen/AbstractFurnaceScreenHandler.mapping | 8 ++++++++ .../net/minecraft/screen/AnvilScreenHandler.mapping | 3 +++ .../screen/CartographyTableScreenHandler.mapping | 10 ++++++++++ .../net/minecraft/screen/CraftingScreenHandler.mapping | 10 ++++++++++ .../minecraft/screen/EnchantmentScreenHandler.mapping | 9 +++++++++ .../net/minecraft/screen/ForgingScreenHandler.mapping | 8 ++++++++ .../minecraft/screen/GrindstoneScreenHandler.mapping | 6 ++++++ .../net/minecraft/screen/HorseScreenHandler.mapping | 2 ++ .../net/minecraft/screen/LoomScreenHandler.mapping | 7 +++++++ mappings/net/minecraft/screen/ScreenHandler.mapping | 4 ++++ .../net/minecraft/screen/ScreenHandlerContext.mapping | 3 +++ .../net/minecraft/screen/SmithingScreenHandler.mapping | 10 ++++++++++ .../minecraft/screen/StonecutterScreenHandler.mapping | 10 ++++++++++ 13 files changed, 90 insertions(+) diff --git a/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping b/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping index 67eb909d58..afd0267277 100644 --- a/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping +++ b/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping @@ -7,9 +7,17 @@ CLASS net/minecraft/class_1720 net/minecraft/screen/AbstractFurnaceScreenHandler METHOD (Lnet/minecraft/class_3917;Lnet/minecraft/class_3956;Lnet/minecraft/class_5421;ILnet/minecraft/class_1661;)V ARG 1 type ARG 2 recipeType + ARG 3 category + ARG 4 syncId + ARG 5 playerInventory METHOD (Lnet/minecraft/class_3917;Lnet/minecraft/class_3956;Lnet/minecraft/class_5421;ILnet/minecraft/class_1661;Lnet/minecraft/class_1263;Lnet/minecraft/class_3913;)V ARG 1 type ARG 2 recipeType + ARG 3 category + ARG 4 syncId + ARG 5 playerInventory + ARG 6 inventory + ARG 7 propertyDelegate METHOD method_16945 isFuel (Lnet/minecraft/class_1799;)Z ARG 1 itemStack METHOD method_17363 getCookProgress ()I diff --git a/mappings/net/minecraft/screen/AnvilScreenHandler.mapping b/mappings/net/minecraft/screen/AnvilScreenHandler.mapping index b6e40b313f..146bae551f 100644 --- a/mappings/net/minecraft/screen/AnvilScreenHandler.mapping +++ b/mappings/net/minecraft/screen/AnvilScreenHandler.mapping @@ -13,5 +13,8 @@ CLASS net/minecraft/class_1706 net/minecraft/screen/AnvilScreenHandler METHOD method_17369 getLevelCost ()I METHOD method_20398 getNextCost (I)I ARG 0 cost + METHOD method_24922 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 1 world + ARG 2 pos METHOD method_7625 setNewItemName (Ljava/lang/String;)V ARG 1 newItemName diff --git a/mappings/net/minecraft/screen/CartographyTableScreenHandler.mapping b/mappings/net/minecraft/screen/CartographyTableScreenHandler.mapping index ecd3e5640d..b3e99e96fc 100644 --- a/mappings/net/minecraft/screen/CartographyTableScreenHandler.mapping +++ b/mappings/net/minecraft/screen/CartographyTableScreenHandler.mapping @@ -13,7 +13,17 @@ CLASS net/minecraft/class_3910 net/minecraft/screen/CartographyTableScreenHandle ARG 1 syncId ARG 2 inventory ARG 3 context + METHOD method_17379 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 2 world + ARG 3 pos METHOD method_17381 updateResult (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)V ARG 1 map ARG 2 item ARG 3 oldResult + METHOD method_17382 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 4 world + ARG 5 pos + CLASS 5 + METHOD method_17387 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/screen/CraftingScreenHandler.mapping b/mappings/net/minecraft/screen/CraftingScreenHandler.mapping index f7624d3e9e..520886b1ab 100644 --- a/mappings/net/minecraft/screen/CraftingScreenHandler.mapping +++ b/mappings/net/minecraft/screen/CraftingScreenHandler.mapping @@ -11,7 +11,17 @@ CLASS net/minecraft/class_1714 net/minecraft/screen/CraftingScreenHandler ARG 2 playerInventory ARG 3 context METHOD method_17399 updateResult (Lnet/minecraft/class_1703;Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1715;Lnet/minecraft/class_1731;)V + ARG 0 handler ARG 1 world ARG 2 player ARG 3 craftingInventory ARG 4 resultInventory + METHOD method_17400 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 2 world + ARG 3 pos + METHOD method_17401 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 1 world + ARG 2 pos + METHOD method_17402 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 2 world + ARG 3 pos diff --git a/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping b/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping index 03a06245c6..b30518bfd3 100644 --- a/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping +++ b/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping @@ -13,6 +13,15 @@ CLASS net/minecraft/class_1718 net/minecraft/screen/EnchantmentScreenHandler ARG 1 syncId ARG 2 playerInventory ARG 3 context + METHOD method_17410 (Lnet/minecraft/class_1799;ILnet/minecraft/class_1657;ILnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 6 world + ARG 7 pos + METHOD method_17411 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 2 world + ARG 3 pos + METHOD method_17412 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 2 world + ARG 3 pos METHOD method_17413 getSeed ()I METHOD method_7637 generateEnchantments (Lnet/minecraft/class_1799;II)Ljava/util/List; ARG 1 stack diff --git a/mappings/net/minecraft/screen/ForgingScreenHandler.mapping b/mappings/net/minecraft/screen/ForgingScreenHandler.mapping index 26909c53ba..f87cf48f65 100644 --- a/mappings/net/minecraft/screen/ForgingScreenHandler.mapping +++ b/mappings/net/minecraft/screen/ForgingScreenHandler.mapping @@ -16,9 +16,17 @@ CLASS net/minecraft/class_4861 net/minecraft/screen/ForgingScreenHandler METHOD method_24923 onTakeOutput (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V ARG 1 player ARG 2 stack + METHOD method_24924 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Ljava/lang/Boolean; + ARG 2 world + ARG 3 pos METHOD method_24925 canUse (Lnet/minecraft/class_2680;)Z ARG 1 state + METHOD method_24926 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 2 world + ARG 3 pos METHOD method_24927 canTakeOutput (Lnet/minecraft/class_1657;Z)Z ARG 1 player ARG 2 present METHOD method_24928 updateResult ()V + METHOD method_30025 isUsableAsAddition (Lnet/minecraft/class_1799;)Z + ARG 1 stack diff --git a/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping b/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping index d3ae2f030e..87f13343ac 100644 --- a/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping +++ b/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping @@ -14,6 +14,9 @@ CLASS net/minecraft/class_3803 net/minecraft/screen/GrindstoneScreenHandler ARG 2 damage ARG 3 amount METHOD method_16695 updateResult ()V + METHOD method_17415 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 2 world + ARG 3 pos METHOD method_20268 transferEnchantments (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; ARG 1 target ARG 2 source @@ -22,3 +25,6 @@ CLASS net/minecraft/class_3803 net/minecraft/screen/GrindstoneScreenHandler ARG 1 stack METHOD method_17416 getExperience (Lnet/minecraft/class_1937;)I ARG 1 world + METHOD method_17417 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/screen/HorseScreenHandler.mapping b/mappings/net/minecraft/screen/HorseScreenHandler.mapping index d38fdee119..016ab5d2b3 100644 --- a/mappings/net/minecraft/screen/HorseScreenHandler.mapping +++ b/mappings/net/minecraft/screen/HorseScreenHandler.mapping @@ -6,3 +6,5 @@ CLASS net/minecraft/class_1724 net/minecraft/screen/HorseScreenHandler ARG 2 playerInventory ARG 3 inventory ARG 4 entity + METHOD method_33354 hasChest (Lnet/minecraft/class_1496;)Z + ARG 1 horse diff --git a/mappings/net/minecraft/screen/LoomScreenHandler.mapping b/mappings/net/minecraft/screen/LoomScreenHandler.mapping index 0412f56efb..0353a205a7 100644 --- a/mappings/net/minecraft/screen/LoomScreenHandler.mapping +++ b/mappings/net/minecraft/screen/LoomScreenHandler.mapping @@ -16,6 +16,9 @@ CLASS net/minecraft/class_1726 net/minecraft/screen/LoomScreenHandler ARG 1 syncId ARG 2 playerInventory ARG 3 context + METHOD method_17420 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 2 world + ARG 3 pos METHOD method_17423 setInventoryChangeListener (Ljava/lang/Runnable;)V ARG 1 inventoryChangeListener METHOD method_17428 getBannerSlot ()Lnet/minecraft/class_1735; @@ -24,3 +27,7 @@ CLASS net/minecraft/class_1726 net/minecraft/screen/LoomScreenHandler METHOD method_17431 getOutputSlot ()Lnet/minecraft/class_1735; METHOD method_7647 getSelectedPattern ()I METHOD method_7648 updateOutputSlot ()V + CLASS 6 + METHOD method_17433 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/screen/ScreenHandler.mapping b/mappings/net/minecraft/screen/ScreenHandler.mapping index 29ae338ebf..57a24480a1 100644 --- a/mappings/net/minecraft/screen/ScreenHandler.mapping +++ b/mappings/net/minecraft/screen/ScreenHandler.mapping @@ -65,8 +65,12 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler ARG 1 handler METHOD method_34248 updateSyncHandler (Lnet/minecraft/class_5916;)V ARG 1 handler + METHOD method_34249 (Lnet/minecraft/class_1735;Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V + ARG 3 stack METHOD method_34250 setPreviousCursorStack (Lnet/minecraft/class_1799;)V ARG 1 stack + METHOD method_34251 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1735;Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V + ARG 3 stack METHOD method_34252 syncState ()V METHOD method_34253 checkSlotUpdates (ILnet/minecraft/class_1799;Ljava/util/function/Supplier;)V ARG 1 slot diff --git a/mappings/net/minecraft/screen/ScreenHandlerContext.mapping b/mappings/net/minecraft/screen/ScreenHandlerContext.mapping index fc7dcee90d..25dfcbf33d 100644 --- a/mappings/net/minecraft/screen/ScreenHandlerContext.mapping +++ b/mappings/net/minecraft/screen/ScreenHandlerContext.mapping @@ -11,6 +11,9 @@ CLASS net/minecraft/class_3914 net/minecraft/screen/ScreenHandlerContext COMMENT Runs a {@link BiConsumer} with this context's world and position COMMENT if this context is active. ARG 1 function + METHOD method_17394 (Ljava/util/function/BiConsumer;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Ljava/util/Optional; + ARG 1 world + ARG 2 pos METHOD method_17395 get (Ljava/util/function/BiFunction;)Ljava/util/Optional; COMMENT Gets an optional value from this context's world and position COMMENT with a {@link BiFunction} getter. diff --git a/mappings/net/minecraft/screen/SmithingScreenHandler.mapping b/mappings/net/minecraft/screen/SmithingScreenHandler.mapping index a9864079e7..cdd1317367 100644 --- a/mappings/net/minecraft/screen/SmithingScreenHandler.mapping +++ b/mappings/net/minecraft/screen/SmithingScreenHandler.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_4862 net/minecraft/screen/SmithingScreenHandler + FIELD field_25385 world Lnet/minecraft/class_1937; + FIELD field_25386 currentRecipe Lnet/minecraft/class_5357; + FIELD field_25668 recipes Ljava/util/List; METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId ARG 2 playerInventory @@ -6,3 +9,10 @@ CLASS net/minecraft/class_4862 net/minecraft/screen/SmithingScreenHandler ARG 1 syncId ARG 2 playerInventory ARG 3 context + METHOD method_24929 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 0 world + ARG 1 pos + METHOD method_29539 decrementStack (I)V + ARG 1 slot + METHOD method_30026 (Lnet/minecraft/class_1799;Lnet/minecraft/class_5357;)Z + ARG 1 recipe diff --git a/mappings/net/minecraft/screen/StonecutterScreenHandler.mapping b/mappings/net/minecraft/screen/StonecutterScreenHandler.mapping index 39bbf817d0..74f64b19c9 100644 --- a/mappings/net/minecraft/screen/StonecutterScreenHandler.mapping +++ b/mappings/net/minecraft/screen/StonecutterScreenHandler.mapping @@ -20,9 +20,19 @@ CLASS net/minecraft/class_3971 net/minecraft/screen/StonecutterScreenHandler METHOD method_17855 updateInput (Lnet/minecraft/class_1263;Lnet/minecraft/class_1799;)V ARG 1 input ARG 2 stack + METHOD method_17856 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 2 world + ARG 3 pos METHOD method_17859 setContentsChangedListener (Ljava/lang/Runnable;)V + ARG 1 contentsChangedListener METHOD method_17862 getSelectedRecipe ()I METHOD method_17863 getAvailableRecipes ()Ljava/util/List; METHOD method_17864 getAvailableRecipeCount ()I METHOD method_17865 canCraft ()Z METHOD method_17866 populateResult ()V + METHOD method_30160 isInBounds (I)Z + ARG 1 id + CLASS 2 + METHOD method_17868 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + ARG 1 world + ARG 2 pos