From 4c440d8179f00cc35530069af864289647ff74d2 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Wed, 20 May 2020 09:49:55 +1000 Subject: [PATCH] 20w20a stuff (#1351) * some stuff new criterions, gamemode switcher screen, and datafixes * more stuff predicates and the other criterion i missed * more predicate stuff * Update mappings/net/minecraft/advancement/criterion/ItemUsedOnBlockCriterion.mapping Co-authored-by: Yanis48 * Update PlayerGeneratesContainerLootCriterion.mapping * Update GameModeSwitcherScreen.mapping * more gamemode switcher stuff * Update mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping Co-authored-by: Yanis48 * Update mappings/net/minecraft/client/gui/screen/ingame/GameModeSwitcherScreen.mapping Co-authored-by: Yanis48 * toast and tutorial things just figured i'd throw this in Co-authored-by: Yanis48 --- .../realmsclient/client/Errable.mapping} | 2 +- .../advancement/criterion/Criteria.mapping | 3 ++ ...pping => ItemUsedOnBlockCriterion.mapping} | 9 +++- ...yerGeneratesContainerLootCriterion.mapping | 14 +++++ ...hrownItemPickedUpByEntityCriterion.mapping | 16 ++++++ .../ingame/GameModeSwitcherScreen.mapping | 53 +++++++++++++++++++ .../ClientPlayerInteractionManager.mapping | 3 ++ .../client/toast/AdvancementToast.mapping | 2 + .../client/toast/RecipeToast.mapping | 7 ++- .../client/toast/SystemToast.mapping | 14 +++++ .../net/minecraft/client/toast/Toast.mapping | 7 +++ .../client/toast/ToastManager.mapping | 4 ++ .../client/toast/TutorialToast.mapping | 5 ++ .../CraftPlanksTutorialStepHandler.mapping | 2 + .../FindTreeTutorialStepHandler.mapping | 4 +- .../MovementTutorialStepHandler.mapping | 2 + .../tutorial/NoneTutorialStepHandler.mapping | 2 + .../OpenInventoryTutorialStepHandler.mapping | 3 ++ .../PunchTreeTutorialStepHandler.mapping | 3 ++ .../client/tutorial/TutorialManager.mapping | 4 ++ .../client/tutorial/TutorialStep.mapping | 4 ++ .../data/server/AdvancementsProvider.mapping | 2 + .../NetherTabAdvancementGenerator.mapping | 1 + .../datafixer/fix/BitStorageAlignFix.mapping | 3 ++ .../fix/EntityShulkerRotationFix.mapping | 4 ++ .../predicate/BlockPredicate.mapping | 4 ++ .../entity/EntityEquipmentPredicate.mapping | 17 ++++++ .../predicate/entity/EntityPredicate.mapping | 14 +++++ .../entity/LocationPredicate.mapping | 10 ++++ 29 files changed, 212 insertions(+), 6 deletions(-) rename mappings/{net/minecraft/class_5221.mapping => com/mojang/realmsclient/client/Errable.mapping} (60%) rename mappings/net/minecraft/advancement/criterion/{BlockUsedCriterion.mapping => ItemUsedOnBlockCriterion.mapping} (61%) create mode 100644 mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping create mode 100644 mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/ingame/GameModeSwitcherScreen.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/BitStorageAlignFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/EntityShulkerRotationFix.mapping diff --git a/mappings/net/minecraft/class_5221.mapping b/mappings/com/mojang/realmsclient/client/Errable.mapping similarity index 60% rename from mappings/net/minecraft/class_5221.mapping rename to mappings/com/mojang/realmsclient/client/Errable.mapping index 4ee216eca0..acc8036246 100644 --- a/mappings/net/minecraft/class_5221.mapping +++ b/mappings/com/mojang/realmsclient/client/Errable.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_5221 +CLASS net/minecraft/class_5221 com/mojang/realmsclient/client/Errable METHOD method_21067 error (Lnet/minecraft/class_2561;)V METHOD method_27453 error (Ljava/lang/String;)V diff --git a/mappings/net/minecraft/advancement/criterion/Criteria.mapping b/mappings/net/minecraft/advancement/criterion/Criteria.mapping index 50b54d405d..0d13e44679 100644 --- a/mappings/net/minecraft/advancement/criterion/Criteria.mapping +++ b/mappings/net/minecraft/advancement/criterion/Criteria.mapping @@ -38,6 +38,9 @@ CLASS net/minecraft/class_174 net/minecraft/advancement/criterion/Criteria FIELD field_21628 SLIDE_DOWN_BLOCK Lnet/minecraft/class_4713; FIELD field_21629 BEE_NEST_DESTROYED Lnet/minecraft/class_4708; FIELD field_22450 TARGET_HIT Lnet/minecraft/class_4851; + FIELD field_24478 ITEM_USED_ON_BLOCK Lnet/minecraft/class_4711; + FIELD field_24479 PLAYER_GENERATES_CONTAINER_LOOT Lnet/minecraft/class_5282; + FIELD field_24480 THROWN_ITEM_PICKED_UP_BY_ENTITY Lnet/minecraft/class_5279; METHOD method_765 getById (Lnet/minecraft/class_2960;)Lnet/minecraft/class_179; ARG 0 id METHOD method_766 getCriteria ()Ljava/lang/Iterable; diff --git a/mappings/net/minecraft/advancement/criterion/BlockUsedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemUsedOnBlockCriterion.mapping similarity index 61% rename from mappings/net/minecraft/advancement/criterion/BlockUsedCriterion.mapping rename to mappings/net/minecraft/advancement/criterion/ItemUsedOnBlockCriterion.mapping index bfe84cf36d..3bb490aa5d 100644 --- a/mappings/net/minecraft/advancement/criterion/BlockUsedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ItemUsedOnBlockCriterion.mapping @@ -1,5 +1,5 @@ -CLASS net/minecraft/class_4711 net/minecraft/advancement/criterion/BlockUsedCriterion - FIELD field_21576 id Lnet/minecraft/class_2960; +CLASS net/minecraft/class_4711 net/minecraft/advancement/criterion/ItemUsedOnBlockCriterion + FIELD field_21576 ID Lnet/minecraft/class_2960; METHOD method_23888 (Lnet/minecraft/class_2680;Lnet/minecraft/class_3222;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;Lnet/minecraft/class_4711$class_4712;)Z ARG 4 conditions METHOD method_23889 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V @@ -8,8 +8,13 @@ CLASS net/minecraft/class_4711 net/minecraft/advancement/criterion/BlockUsedCrit ARG 3 stack CLASS class_4712 Conditions FIELD field_21579 item Lnet/minecraft/class_2073; + FIELD field_24495 location Lnet/minecraft/class_2090; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2090;Lnet/minecraft/class_2073;)V + ARG 2 location + ARG 3 item METHOD method_23892 test (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)Z ARG 1 state ARG 2 world ARG 3 pos ARG 4 stack + METHOD method_27981 create (Lnet/minecraft/class_2090$class_2091;Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_4711$class_4712; diff --git a/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping new file mode 100644 index 0000000000..f3e3783524 --- /dev/null +++ b/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/class_5282 net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion + FIELD field_24502 ID Lnet/minecraft/class_2960; + METHOD method_27993 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_2960;)V + ARG 1 player + ARG 2 id + CLASS class_5283 Conditions + FIELD field_24503 lootTable Lnet/minecraft/class_2960; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2960;)V + ARG 1 entity + ARG 2 lootTable + METHOD method_27995 create (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5282$class_5283; + ARG 0 lootTable + METHOD method_27996 test (Lnet/minecraft/class_2960;)Z + ARG 1 lootTable diff --git a/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping new file mode 100644 index 0000000000..a6743251c8 --- /dev/null +++ b/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/class_5279 net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion + FIELD field_24492 ID Lnet/minecraft/class_2960; + METHOD method_27975 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_1297;)V + ARG 1 player + ARG 2 stack + ARG 3 entity + CLASS class_5280 Conditions + FIELD field_24493 item Lnet/minecraft/class_2073; + FIELD field_24494 entity Lnet/minecraft/class_2048$class_5258; + METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2048$class_5258;)V + ARG 2 item + ARG 3 entity + METHOD method_27978 create (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073$class_2074;Lnet/minecraft/class_2048$class_5258;)Lnet/minecraft/class_5279$class_5280; + METHOD method_27979 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Z + ARG 1 player + ARG 2 stack diff --git a/mappings/net/minecraft/client/gui/screen/ingame/GameModeSwitcherScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/GameModeSwitcherScreen.mapping new file mode 100644 index 0000000000..2140345f37 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/ingame/GameModeSwitcherScreen.mapping @@ -0,0 +1,53 @@ +CLASS net/minecraft/class_5289 net/minecraft/client/gui/screen/ingame/GameModeSwitcherScreen + FIELD field_24566 TEXTURE Lnet/minecraft/class_2960; + FIELD field_24567 WIDTH I + FIELD field_24568 previousGameMode Ljava/util/Optional; + FIELD field_24569 selectedGameMode Ljava/util/Optional; + FIELD field_24570 cachedMouseX I + FIELD field_24571 cachedMouseY I + FIELD field_24572 useMouse Z + FIELD field_24573 gameModeButtons Ljava/util/List; + METHOD method_28063 drawText (Lnet/minecraft/class_4587;Ljava/lang/String;Ljava/lang/String;II)V + ARG 1 matrices + ARG 2 pressF4 + ARG 3 selectNext + ARG 4 y + ARG 5 x + METHOD method_28064 switchGameMode (Lnet/minecraft/class_310;Ljava/util/Optional;)V + ARG 0 client + ARG 1 gameMode + METHOD method_28068 onClose ()V + METHOD method_28069 shouldClose ()Z + CLASS class_5290 GameMode + FIELD field_24580 MODES [Lnet/minecraft/class_5289$class_5290; + FIELD field_24581 name Lnet/minecraft/class_2561; + FIELD field_24582 command Ljava/lang/String; + FIELD field_24583 icon Lnet/minecraft/class_1799; + METHOD (Ljava/lang/String;ILnet/minecraft/class_2561;Ljava/lang/String;Lnet/minecraft/class_1799;)V + ARG 3 name + ARG 4 command + ARG 5 icon + METHOD method_28070 getName ()Lnet/minecraft/class_2561; + METHOD method_28074 renderIcon (Lnet/minecraft/class_918;II)V + ARG 1 itemRenderer + ARG 2 x + ARG 3 y + METHOD method_28075 getCommand ()Ljava/lang/String; + METHOD method_28076 fromGameMode (Lnet/minecraft/class_1934;)Ljava/util/Optional; + ARG 0 gameMode + METHOD method_28078 getNext ()Ljava/util/Optional; + CLASS class_5291 Button + FIELD field_24586 gameMode Lnet/minecraft/class_5289$class_5290; + FIELD field_24587 selected Z + METHOD (Lnet/minecraft/class_5289;Lnet/minecraft/class_5289$class_5290;II)V + ARG 2 gameMode + ARG 3 x + ARG 4 y + METHOD method_28080 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_1060;)V + ARG 1 matrices + ARG 2 textureManager + METHOD method_28082 renderSelected (Lnet/minecraft/class_4587;Lnet/minecraft/class_1060;)V + ARG 1 matrices + ARG 2 textureManager + METHOD method_28083 select (Z)V + ARG 1 selected diff --git a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping index f747e9497f..9d0f41b573 100644 --- a/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayerInteractionManager.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteractionManager FIELD field_20316 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_20317 unacknowledgedPlayerActions Lit/unimi/dsi/fastutil/objects/Object2ObjectLinkedOpenHashMap; + FIELD field_24608 previousGameMode Lnet/minecraft/class_1934; FIELD field_3712 client Lnet/minecraft/class_310; FIELD field_3713 blockBreakingSoundCooldown F FIELD field_3714 currentBreakingPos Lnet/minecraft/class_2338; @@ -24,6 +25,7 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti ARG 1 action ARG 2 pos ARG 3 direction + METHOD method_28107 getPreviousGameMode ()Lnet/minecraft/class_1934; METHOD method_2895 hasRidingInventory ()Z METHOD method_2896 interactBlock (Lnet/minecraft/class_746;Lnet/minecraft/class_638;Lnet/minecraft/class_1268;Lnet/minecraft/class_3965;)Lnet/minecraft/class_1269; ARG 1 player @@ -59,6 +61,7 @@ CLASS net/minecraft/class_636 net/minecraft/client/network/ClientPlayerInteracti ARG 4 actionType ARG 5 player METHOD method_2907 setGameMode (Lnet/minecraft/class_1934;)V + ARG 1 gameMode METHOD method_2908 hasStatusBars ()Z METHOD method_2909 clickCreativeStack (Lnet/minecraft/class_1799;I)V ARG 1 stack diff --git a/mappings/net/minecraft/client/toast/AdvancementToast.mapping b/mappings/net/minecraft/client/toast/AdvancementToast.mapping index ed73e7a276..816ade53ff 100644 --- a/mappings/net/minecraft/client/toast/AdvancementToast.mapping +++ b/mappings/net/minecraft/client/toast/AdvancementToast.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_367 net/minecraft/client/toast/AdvancementToast FIELD field_2205 advancement Lnet/minecraft/class_161; FIELD field_2206 soundPlayed Z + METHOD (Lnet/minecraft/class_161;)V + ARG 1 advancement diff --git a/mappings/net/minecraft/client/toast/RecipeToast.mapping b/mappings/net/minecraft/client/toast/RecipeToast.mapping index 72b8ea031f..d515841306 100644 --- a/mappings/net/minecraft/client/toast/RecipeToast.mapping +++ b/mappings/net/minecraft/client/toast/RecipeToast.mapping @@ -2,5 +2,10 @@ CLASS net/minecraft/class_366 net/minecraft/client/toast/RecipeToast FIELD field_2202 recipes Ljava/util/List; FIELD field_2203 justUpdated Z FIELD field_2204 startTime J - METHOD method_1984 addRecipe (Lnet/minecraft/class_1860;)V + METHOD (Lnet/minecraft/class_1860;)V + ARG 1 recipes + METHOD method_1984 addRecipes (Lnet/minecraft/class_1860;)V + ARG 1 recipes METHOD method_1985 show (Lnet/minecraft/class_374;Lnet/minecraft/class_1860;)V + ARG 0 manager + ARG 1 recipes diff --git a/mappings/net/minecraft/client/toast/SystemToast.mapping b/mappings/net/minecraft/client/toast/SystemToast.mapping index 629b18a273..4489497401 100644 --- a/mappings/net/minecraft/client/toast/SystemToast.mapping +++ b/mappings/net/minecraft/client/toast/SystemToast.mapping @@ -5,12 +5,26 @@ CLASS net/minecraft/class_370 net/minecraft/client/toast/SystemToast FIELD field_2216 startTime J FIELD field_2217 description Ljava/lang/String; METHOD (Lnet/minecraft/class_370$class_371;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V + ARG 1 type ARG 2 title ARG 3 description METHOD method_1990 show (Lnet/minecraft/class_374;Lnet/minecraft/class_370$class_371;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V + ARG 0 manager + ARG 1 type ARG 2 title ARG 3 description METHOD method_1991 setContent (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 1 title ARG 2 description + METHOD method_27023 addWorldAccessFailureToast (Lnet/minecraft/class_310;Ljava/lang/String;)V + ARG 0 client + ARG 1 worldName + METHOD method_27024 add (Lnet/minecraft/class_374;Lnet/minecraft/class_370$class_371;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V + ARG 0 manager + ARG 1 type + ARG 2 title + ARG 3 description + METHOD method_27025 addWorldDeleteFailureToast (Lnet/minecraft/class_310;Ljava/lang/String;)V + ARG 0 client + ARG 1 worldName CLASS class_371 Type diff --git a/mappings/net/minecraft/client/toast/Toast.mapping b/mappings/net/minecraft/client/toast/Toast.mapping index bf2b4c7680..7d9cfe0e09 100644 --- a/mappings/net/minecraft/client/toast/Toast.mapping +++ b/mappings/net/minecraft/client/toast/Toast.mapping @@ -1,7 +1,14 @@ CLASS net/minecraft/class_368 net/minecraft/client/toast/Toast FIELD field_2207 TOASTS_TEX Lnet/minecraft/class_2960; + FIELD field_2208 TYPE Ljava/lang/Object; METHOD method_1986 draw (Lnet/minecraft/class_4587;Lnet/minecraft/class_374;J)Lnet/minecraft/class_368$class_369; + ARG 1 matrices + ARG 2 manager + ARG 3 startTime METHOD method_1987 getType ()Ljava/lang/Object; CLASS class_369 Visibility FIELD field_2211 sound Lnet/minecraft/class_3414; + METHOD (Ljava/lang/String;ILnet/minecraft/class_3414;)V + ARG 3 sound METHOD method_1988 playSound (Lnet/minecraft/class_1144;)V + ARG 1 soundManager diff --git a/mappings/net/minecraft/client/toast/ToastManager.mapping b/mappings/net/minecraft/client/toast/ToastManager.mapping index 3645946450..f2d6d28a37 100644 --- a/mappings/net/minecraft/client/toast/ToastManager.mapping +++ b/mappings/net/minecraft/client/toast/ToastManager.mapping @@ -6,19 +6,23 @@ CLASS net/minecraft/class_374 net/minecraft/client/toast/ToastManager ARG 1 client METHOD method_1995 getGame ()Lnet/minecraft/class_310; METHOD method_1996 draw (Lnet/minecraft/class_4587;)V + ARG 1 matrices METHOD method_1997 getToast (Ljava/lang/Class;Ljava/lang/Object;)Lnet/minecraft/class_368; ARG 1 toastClass ARG 2 type METHOD method_1999 add (Lnet/minecraft/class_368;)V + ARG 1 toast METHOD method_2000 clear ()V CLASS class_375 Entry FIELD field_2241 instance Lnet/minecraft/class_368; FIELD field_2244 visibility Lnet/minecraft/class_368$class_369; METHOD (Lnet/minecraft/class_374;Lnet/minecraft/class_368;)V ARG 1 instance + ARG 2 toast METHOD method_2001 getInstance ()Lnet/minecraft/class_368; METHOD method_2002 draw (IILnet/minecraft/class_4587;)Z ARG 1 x ARG 2 y + ARG 3 matrices METHOD method_2003 getDissapearProgress (J)F ARG 1 time diff --git a/mappings/net/minecraft/client/toast/TutorialToast.mapping b/mappings/net/minecraft/client/toast/TutorialToast.mapping index b5b580a34d..d6d392d20f 100644 --- a/mappings/net/minecraft/client/toast/TutorialToast.mapping +++ b/mappings/net/minecraft/client/toast/TutorialToast.mapping @@ -8,6 +8,7 @@ CLASS net/minecraft/class_372 net/minecraft/client/toast/TutorialToast FIELD field_2228 progress F FIELD field_2229 lastProgress F METHOD (Lnet/minecraft/class_372$class_373;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Z)V + ARG 1 type ARG 2 title ARG 3 description ARG 4 hasProgressBar @@ -21,3 +22,7 @@ CLASS net/minecraft/class_372 net/minecraft/client/toast/TutorialToast ARG 3 textureSlotX ARG 4 textureSlotY METHOD method_1994 drawIcon (Lnet/minecraft/class_4587;Lnet/minecraft/class_332;II)V + ARG 1 matrices + ARG 2 helper + ARG 3 x + ARG 4 y diff --git a/mappings/net/minecraft/client/tutorial/CraftPlanksTutorialStepHandler.mapping b/mappings/net/minecraft/client/tutorial/CraftPlanksTutorialStepHandler.mapping index 5238273700..71b4373449 100644 --- a/mappings/net/minecraft/client/tutorial/CraftPlanksTutorialStepHandler.mapping +++ b/mappings/net/minecraft/client/tutorial/CraftPlanksTutorialStepHandler.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_1149 net/minecraft/client/tutorial/CraftPlanksTutorial FIELD field_5610 toast Lnet/minecraft/class_372; FIELD field_5611 TITLE Lnet/minecraft/class_2561; FIELD field_5612 DESCRIPTION Lnet/minecraft/class_2561; + METHOD (Lnet/minecraft/class_1156;)V + ARG 1 manager METHOD method_4895 hasCrafted (Lnet/minecraft/class_746;Lnet/minecraft/class_3494;)Z ARG 0 player ARG 1 tag diff --git a/mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping b/mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping index d74f7e0def..2061ccc21a 100644 --- a/mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping +++ b/mappings/net/minecraft/client/tutorial/FindTreeTutorialStepHandler.mapping @@ -1,11 +1,11 @@ CLASS net/minecraft/class_1152 net/minecraft/client/tutorial/FindTreeTutorialStepHandler FIELD field_5628 DESCRIPTION Lnet/minecraft/class_2561; FIELD field_5629 ticks I - FIELD field_5630 tutorialManager Lnet/minecraft/class_1156; + FIELD field_5630 manager Lnet/minecraft/class_1156; FIELD field_5631 TITLE Lnet/minecraft/class_2561; FIELD field_5632 TREE_BLOCKS Ljava/util/Set; FIELD field_5633 toast Lnet/minecraft/class_372; METHOD (Lnet/minecraft/class_1156;)V - ARG 1 tutorialManager + ARG 1 manager METHOD method_4896 hasBrokenTreeBlocks (Lnet/minecraft/class_746;)Z ARG 0 player diff --git a/mappings/net/minecraft/client/tutorial/MovementTutorialStepHandler.mapping b/mappings/net/minecraft/client/tutorial/MovementTutorialStepHandler.mapping index cfdff9e844..9ea54b3ac5 100644 --- a/mappings/net/minecraft/client/tutorial/MovementTutorialStepHandler.mapping +++ b/mappings/net/minecraft/client/tutorial/MovementTutorialStepHandler.mapping @@ -13,3 +13,5 @@ CLASS net/minecraft/class_1151 net/minecraft/client/tutorial/MovementTutorialSte FIELD field_5625 lookAroundCompletionTicks I FIELD field_5626 moveAroundCompletionTicks I FIELD field_5627 lookedAroundTicks I + METHOD (Lnet/minecraft/class_1156;)V + ARG 1 manager diff --git a/mappings/net/minecraft/client/tutorial/NoneTutorialStepHandler.mapping b/mappings/net/minecraft/client/tutorial/NoneTutorialStepHandler.mapping index 8d2ddbc504..5b3b3d2975 100644 --- a/mappings/net/minecraft/client/tutorial/NoneTutorialStepHandler.mapping +++ b/mappings/net/minecraft/client/tutorial/NoneTutorialStepHandler.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_1150 net/minecraft/client/tutorial/NoneTutorialStepHandler FIELD field_5613 manager Lnet/minecraft/class_1156; + METHOD (Lnet/minecraft/class_1156;)V + ARG 1 manager diff --git a/mappings/net/minecraft/client/tutorial/OpenInventoryTutorialStepHandler.mapping b/mappings/net/minecraft/client/tutorial/OpenInventoryTutorialStepHandler.mapping index 660187bbee..b54084f53c 100644 --- a/mappings/net/minecraft/client/tutorial/OpenInventoryTutorialStepHandler.mapping +++ b/mappings/net/minecraft/client/tutorial/OpenInventoryTutorialStepHandler.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_1154 net/minecraft/client/tutorial/OpenInventoryTutorialStepHandler FIELD field_5640 manager Lnet/minecraft/class_1156; FIELD field_5641 ticks I + FIELD field_5642 toast Lnet/minecraft/class_372; FIELD field_5643 TITLE Lnet/minecraft/class_2561; FIELD field_5644 DESCRIPTION Lnet/minecraft/class_2561; + METHOD (Lnet/minecraft/class_1156;)V + ARG 1 manager diff --git a/mappings/net/minecraft/client/tutorial/PunchTreeTutorialStepHandler.mapping b/mappings/net/minecraft/client/tutorial/PunchTreeTutorialStepHandler.mapping index ec4c58104a..0e38c2b8b4 100644 --- a/mappings/net/minecraft/client/tutorial/PunchTreeTutorialStepHandler.mapping +++ b/mappings/net/minecraft/client/tutorial/PunchTreeTutorialStepHandler.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/class_1153 net/minecraft/client/tutorial/PunchTreeTutorialStepHandler FIELD field_5634 manager Lnet/minecraft/class_1156; FIELD field_5636 ticks I + FIELD field_5637 toast Lnet/minecraft/class_372; FIELD field_5638 TITLE Lnet/minecraft/class_2561; FIELD field_5639 DESCRIPTION Lnet/minecraft/class_2561; + METHOD (Lnet/minecraft/class_1156;)V + ARG 1 manager diff --git a/mappings/net/minecraft/client/tutorial/TutorialManager.mapping b/mappings/net/minecraft/client/tutorial/TutorialManager.mapping index 397e95cdfe..cdc2d4130a 100644 --- a/mappings/net/minecraft/client/tutorial/TutorialManager.mapping +++ b/mappings/net/minecraft/client/tutorial/TutorialManager.mapping @@ -1,8 +1,11 @@ CLASS net/minecraft/class_1156 net/minecraft/client/tutorial/TutorialManager FIELD field_5645 client Lnet/minecraft/class_310; FIELD field_5646 currentHandler Lnet/minecraft/class_1155; + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client METHOD method_4905 getGameMode ()Lnet/minecraft/class_1934; METHOD method_4906 onSlotUpdate (Lnet/minecraft/class_1799;)V + ARG 1 stack METHOD method_4907 onBlockAttacked (Lnet/minecraft/class_638;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;F)V ARG 1 world ARG 2 pos @@ -13,6 +16,7 @@ CLASS net/minecraft/class_1156 net/minecraft/client/tutorial/TutorialManager METHOD method_4909 onMovement (Lnet/minecraft/class_744;)V ARG 1 input METHOD method_4910 setStep (Lnet/minecraft/class_1157;)V + ARG 1 step METHOD method_4911 tick (Lnet/minecraft/class_638;Lnet/minecraft/class_239;)V ARG 1 world ARG 2 hitResult diff --git a/mappings/net/minecraft/client/tutorial/TutorialStep.mapping b/mappings/net/minecraft/client/tutorial/TutorialStep.mapping index b82f72a722..a1588a0479 100644 --- a/mappings/net/minecraft/client/tutorial/TutorialStep.mapping +++ b/mappings/net/minecraft/client/tutorial/TutorialStep.mapping @@ -1,7 +1,11 @@ CLASS net/minecraft/class_1157 net/minecraft/client/tutorial/TutorialStep FIELD field_5647 handlerFactory Ljava/util/function/Function; FIELD field_5651 name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;Ljava/util/function/Function;)V + ARG 3 name + ARG 4 factory METHOD method_4918 createHandler (Lnet/minecraft/class_1156;)Lnet/minecraft/class_1155; + ARG 1 manager METHOD method_4919 byName (Ljava/lang/String;)Lnet/minecraft/class_1157; ARG 0 name METHOD method_4920 getName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/data/server/AdvancementsProvider.mapping b/mappings/net/minecraft/data/server/AdvancementsProvider.mapping index b429fcbb4b..16e6fe6c8b 100644 --- a/mappings/net/minecraft/data/server/AdvancementsProvider.mapping +++ b/mappings/net/minecraft/data/server/AdvancementsProvider.mapping @@ -3,6 +3,8 @@ CLASS net/minecraft/class_2409 net/minecraft/data/server/AdvancementsProvider FIELD field_11289 tabGenerators Ljava/util/List; FIELD field_11290 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_11291 GSON Lcom/google/gson/Gson; + METHOD (Lnet/minecraft/class_2403;)V + ARG 1 root METHOD method_10334 getOutput (Ljava/nio/file/Path;Lnet/minecraft/class_161;)Ljava/nio/file/Path; ARG 0 rootOutput ARG 1 advancement diff --git a/mappings/net/minecraft/data/server/NetherTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/NetherTabAdvancementGenerator.mapping index 19e231e81c..06d14244b3 100644 --- a/mappings/net/minecraft/data/server/NetherTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/NetherTabAdvancementGenerator.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_2416 net/minecraft/data/server/NetherTabAdvancementGenerator + FIELD field_24614 NETHER_BIOMES [Lnet/minecraft/class_1959; diff --git a/mappings/net/minecraft/datafixer/fix/BitStorageAlignFix.mapping b/mappings/net/minecraft/datafixer/fix/BitStorageAlignFix.mapping new file mode 100644 index 0000000000..dc743dcaf7 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/BitStorageAlignFix.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_5196 net/minecraft/datafixer/fix/BitStorageAlignFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixer/fix/EntityShulkerRotationFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityShulkerRotationFix.mapping new file mode 100644 index 0000000000..c903947467 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/EntityShulkerRotationFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_5277 net/minecraft/datafixer/fix/EntityShulkerRotationFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD method_27960 fixShulkerRotation (Lcom/mojang/datafixers/Dynamic;)Lcom/mojang/datafixers/Dynamic; diff --git a/mappings/net/minecraft/predicate/BlockPredicate.mapping b/mappings/net/minecraft/predicate/BlockPredicate.mapping index 8ae1dba663..355b0ac705 100644 --- a/mappings/net/minecraft/predicate/BlockPredicate.mapping +++ b/mappings/net/minecraft/predicate/BlockPredicate.mapping @@ -22,3 +22,7 @@ CLASS net/minecraft/class_4550 net/minecraft/predicate/BlockPredicate FIELD field_21575 nbt Lnet/minecraft/class_2105; METHOD method_23880 create ()Lnet/minecraft/class_4550$class_4710; METHOD method_23882 build ()Lnet/minecraft/class_4550; + METHOD method_27962 block (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4550$class_4710; + ARG 1 block + METHOD method_27963 state (Lnet/minecraft/class_4559;)Lnet/minecraft/class_4550$class_4710; + ARG 1 state diff --git a/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping index 8fa562703e..adc9540067 100644 --- a/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping @@ -19,3 +19,20 @@ CLASS net/minecraft/class_3735 net/minecraft/predicate/entity/EntityEquipmentPre METHOD method_16225 toJson ()Lcom/google/gson/JsonElement; METHOD method_16226 test (Lnet/minecraft/class_1297;)Z ARG 1 entity + CLASS class_5278 Builder + FIELD field_24482 head Lnet/minecraft/class_2073; + FIELD field_24483 chest Lnet/minecraft/class_2073; + FIELD field_24484 legs Lnet/minecraft/class_2073; + FIELD field_24485 feet Lnet/minecraft/class_2073; + FIELD field_24486 mainhand Lnet/minecraft/class_2073; + FIELD field_24487 offhand Lnet/minecraft/class_2073; + METHOD method_27965 create ()Lnet/minecraft/class_3735$class_5278; + METHOD method_27966 head (Lnet/minecraft/class_2073;)Lnet/minecraft/class_3735$class_5278; + ARG 1 head + METHOD method_27967 build ()Lnet/minecraft/class_3735; + METHOD method_27968 chest (Lnet/minecraft/class_2073;)Lnet/minecraft/class_3735$class_5278; + ARG 1 chest + METHOD method_27969 legs (Lnet/minecraft/class_2073;)Lnet/minecraft/class_3735$class_5278; + ARG 1 legs + METHOD method_27970 feet (Lnet/minecraft/class_2073;)Lnet/minecraft/class_3735$class_5278; + ARG 1 feet diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping index 589c72e267..50cf9affae 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate FIELD field_20697 player Lnet/minecraft/class_4553; FIELD field_20698 team Ljava/lang/String; FIELD field_23135 fishingHook Lnet/minecraft/class_4965; + FIELD field_24488 vehicle Lnet/minecraft/class_2048; + FIELD field_24489 targetedEntity Lnet/minecraft/class_2048; FIELD field_9594 effects Lnet/minecraft/class_2102; FIELD field_9595 type Lnet/minecraft/class_2050; FIELD field_9596 location Lnet/minecraft/class_2090; @@ -21,6 +23,10 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate ARG 7 equipment ARG 8 player ARG 9 fishingHook + ARG 10 vehicle + ARG 11 targetedEntity + ARG 12 team + ARG 13 catType METHOD method_27802 createAdvancementEntityLootContext (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)Lnet/minecraft/class_47; ARG 0 player ARG 1 target @@ -40,6 +46,8 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate FIELD field_20699 player Lnet/minecraft/class_4553; FIELD field_20700 team Ljava/lang/String; FIELD field_23136 fishHook Lnet/minecraft/class_4965; + FIELD field_24490 vehicle Lnet/minecraft/class_2048; + FIELD field_24491 targetedEntity Lnet/minecraft/class_2048; FIELD field_9602 distance Lnet/minecraft/class_2025; FIELD field_9603 nbt Lnet/minecraft/class_2105; FIELD field_9604 location Lnet/minecraft/class_2090; @@ -58,6 +66,10 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate ARG 1 team METHOD method_26090 fishHook (Lnet/minecraft/class_4965;)Lnet/minecraft/class_2048$class_2049; ARG 1 fishHook + METHOD method_27971 vehicle (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2048$class_2049; + ARG 1 vehicle + METHOD method_27972 targetedEntity (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2048$class_2049; + ARG 1 targetedEntity METHOD method_8915 nbt (Lnet/minecraft/class_2105;)Lnet/minecraft/class_2048$class_2049; ARG 1 nbt METHOD method_8916 create ()Lnet/minecraft/class_2048$class_2049; @@ -111,3 +123,5 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate ARG 0 root ARG 1 key ARG 2 predicateDeserializer + METHOD method_27973 create ([Lnet/minecraft/class_4570;)Lnet/minecraft/class_2048$class_5258; + ARG 0 conditions diff --git a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping index 53d7f394d3..7ef9c80242 100644 --- a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate FIELD field_20714 light Lnet/minecraft/class_4552; FIELD field_20715 block Lnet/minecraft/class_4550; FIELD field_20716 fluid Lnet/minecraft/class_4551; + FIELD field_24500 smokey Ljava/lang/Boolean; FIELD field_9681 z Lnet/minecraft/class_2096$class_2099; FIELD field_9682 x Lnet/minecraft/class_2096$class_2099; FIELD field_9683 biome Lnet/minecraft/class_1959; @@ -16,6 +17,10 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate ARG 4 biome ARG 5 feature ARG 6 dimension + ARG 7 smokey + ARG 8 light + ARG 9 block + ARG 10 fluid METHOD method_9016 dimension (Lnet/minecraft/class_2874;)Lnet/minecraft/class_2090; ARG 0 dimension METHOD method_9017 feature (Lnet/minecraft/class_3195;)Lnet/minecraft/class_2090; @@ -39,6 +44,7 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate FIELD field_20717 light Lnet/minecraft/class_4552; FIELD field_20718 block Lnet/minecraft/class_4550; FIELD field_20719 fluid Lnet/minecraft/class_4551; + FIELD field_24501 smokey Ljava/lang/Boolean; FIELD field_9688 feature Lnet/minecraft/class_3195; FIELD field_9689 y Lnet/minecraft/class_2096$class_2099; FIELD field_9690 biome Lnet/minecraft/class_1959; @@ -46,6 +52,10 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate FIELD field_9692 z Lnet/minecraft/class_2096$class_2099; FIELD field_9693 x Lnet/minecraft/class_2096$class_2099; METHOD method_22484 create ()Lnet/minecraft/class_2090$class_2091; + METHOD method_27989 block (Lnet/minecraft/class_4550;)Lnet/minecraft/class_2090$class_2091; + ARG 1 block + METHOD method_27990 smokey (Ljava/lang/Boolean;)Lnet/minecraft/class_2090$class_2091; + ARG 1 smokey METHOD method_9023 build ()Lnet/minecraft/class_2090; METHOD method_9024 biome (Lnet/minecraft/class_1959;)Lnet/minecraft/class_2090$class_2091; ARG 1 biome