diff --git a/mappings/net/minecraft/block/EnchantingTableBlock.mapping b/mappings/net/minecraft/block/EnchantingTableBlock.mapping index 836f2141d2..5c730dd806 100644 --- a/mappings/net/minecraft/block/EnchantingTableBlock.mapping +++ b/mappings/net/minecraft/block/EnchantingTableBlock.mapping @@ -1,6 +1,13 @@ CLASS net/minecraft/class_2331 net/minecraft/block/EnchantingTableBlock FIELD field_10951 SHAPE Lnet/minecraft/class_265; + FIELD field_36535 BOOKSHELF_OFFSETS Ljava/util/List; METHOD method_17467 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;ILnet/minecraft/class_1661;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1703; ARG 2 syncId ARG 3 inventory ARG 4 player + METHOD method_40445 canAccessBookshelf (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Z + ARG 0 world + ARG 1 tablePos + ARG 2 bookshelfOffset + METHOD method_40446 (Lnet/minecraft/class_2338;)Z + ARG 0 pos diff --git a/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping b/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping index b907d1563e..54921bfb8c 100644 --- a/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping +++ b/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping @@ -3,5 +3,9 @@ CLASS net/minecraft/class_2427 net/minecraft/data/report/RegistryDumpProvider FIELD field_17170 GSON Lcom/google/gson/Gson; METHOD (Lnet/minecraft/class_2403;)V ARG 1 generator + METHOD method_17174 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_6880$class_6883;)V + ARG 1 entry METHOD method_17175 toJson (Lnet/minecraft/class_2378;)Lcom/google/gson/JsonElement; ARG 0 registry + METHOD method_40564 (Lnet/minecraft/class_2378;Lcom/google/gson/JsonObject;Lnet/minecraft/class_6880$class_6883;)V + ARG 2 entry diff --git a/mappings/net/minecraft/data/server/AbstractTagProvider.mapping b/mappings/net/minecraft/data/server/AbstractTagProvider.mapping index 0d08324438..9efd58afb6 100644 --- a/mappings/net/minecraft/data/server/AbstractTagProvider.mapping +++ b/mappings/net/minecraft/data/server/AbstractTagProvider.mapping @@ -41,3 +41,5 @@ CLASS net/minecraft/class_2474 net/minecraft/data/server/AbstractTagProvider ARG 1 id METHOD method_35923 addOptionalTag (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2474$class_5124; ARG 1 id + METHOD method_40565 add ([Lnet/minecraft/class_5321;)Lnet/minecraft/class_2474$class_5124; + ARG 1 keys diff --git a/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping b/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping index ee27c571b1..eb8f039132 100644 --- a/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping +++ b/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/class_1480 net/minecraft/entity/mob/WaterCreatureEntity METHOD method_38986 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z ARG 0 type + ARG 1 world ARG 2 reason + ARG 3 pos ARG 4 random METHOD method_6673 tickWaterBreathingAir (I)V ARG 1 air diff --git a/mappings/net/minecraft/entity/passive/GlowSquidEntity.mapping b/mappings/net/minecraft/entity/passive/GlowSquidEntity.mapping index c9288dd6f2..2a6750c8ea 100644 --- a/mappings/net/minecraft/entity/passive/GlowSquidEntity.mapping +++ b/mappings/net/minecraft/entity/passive/GlowSquidEntity.mapping @@ -5,5 +5,7 @@ CLASS net/minecraft/class_5776 net/minecraft/entity/passive/GlowSquidEntity METHOD method_33334 getDarkTicksRemaining ()I METHOD method_38962 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z ARG 0 type + ARG 1 world ARG 2 reason + ARG 3 pos ARG 4 random diff --git a/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping b/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping index 26a92fef99..b30518bfd3 100644 --- a/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping +++ b/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping @@ -17,6 +17,7 @@ CLASS net/minecraft/class_1718 net/minecraft/screen/EnchantmentScreenHandler 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 diff --git a/mappings/net/minecraft/screen/ScreenHandler.mapping b/mappings/net/minecraft/screen/ScreenHandler.mapping index e64fff00ed..e6f74d800d 100644 --- a/mappings/net/minecraft/screen/ScreenHandler.mapping +++ b/mappings/net/minecraft/screen/ScreenHandler.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler COMMENT A special slot index value ({@value}) indicating that the player has clicked outside the main panel COMMENT of a screen. Used for dropping the cursor stack. FIELD field_34024 revision I + FIELD field_36534 LOGGER Lorg/slf4j/Logger; FIELD field_7757 quickCraftSlots Ljava/util/Set; FIELD field_7759 quickCraftStage I FIELD field_7761 slots Lnet/minecraft/class_2371; @@ -97,6 +98,9 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler METHOD method_37422 nextRevision ()I METHOD method_37449 setPreviousTrackedSlotMutable (ILnet/minecraft/class_1799;)V ARG 1 slot + ARG 2 stack + METHOD method_40442 isValid (I)Z + ARG 1 slot METHOD method_7591 packQuickCraftData (II)I ARG 0 quickCraftStage ARG 1 buttonId diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index 646da78ee0..6d478911aa 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -264,7 +264,7 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry ARG 0 registry METHOD method_29398 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5338; ARG 0 registry - METHOD method_29722 getEntries ()Ljava/util/Set; + METHOD method_29722 getEntrySet ()Ljava/util/Set; METHOD method_30517 getKey ()Lnet/minecraft/class_5321; METHOD method_31138 getLifecycle ()Lcom/mojang/serialization/Lifecycle; METHOD method_31139 getEntryLifecycle (Ljava/lang/Object;)Lcom/mojang/serialization/Lifecycle; diff --git a/mappings/net/minecraft/util/registry/RegistryEntryList.mapping b/mappings/net/minecraft/util/registry/RegistryEntryList.mapping index 4a8e9a8685..8fe85c3cff 100644 --- a/mappings/net/minecraft/util/registry/RegistryEntryList.mapping +++ b/mappings/net/minecraft/util/registry/RegistryEntryList.mapping @@ -18,6 +18,8 @@ CLASS net/minecraft/class_6885 net/minecraft/util/registry/RegistryEntryList ARG 0 entries METHOD method_40247 size ()I METHOD method_40248 getStorage ()Lcom/mojang/datafixers/util/Either; + METHOD method_40560 isOf (Lnet/minecraft/class_2378;)Z + ARG 1 registry CLASS class_6886 Direct FIELD field_36457 entries Ljava/util/List; FIELD field_36458 entrySet Ljava/util/Set; @@ -28,6 +30,10 @@ CLASS net/minecraft/class_6885 net/minecraft/util/registry/RegistryEntryList CLASS class_6888 Named FIELD field_36459 tag Lnet/minecraft/class_6862; FIELD field_36460 entries Ljava/util/List; + FIELD field_36633 registry Lnet/minecraft/class_2378; + METHOD (Lnet/minecraft/class_2378;Lnet/minecraft/class_6862;)V + ARG 1 registry + ARG 2 tag METHOD method_40250 copyOf (Ljava/util/List;)V ARG 1 entries METHOD method_40251 getTag ()Lnet/minecraft/class_6862; diff --git a/mappings/net/minecraft/util/registry/SimpleRegistry.mapping b/mappings/net/minecraft/util/registry/SimpleRegistry.mapping index 6bfdf724f6..8b5a0915f6 100644 --- a/mappings/net/minecraft/util/registry/SimpleRegistry.mapping +++ b/mappings/net/minecraft/util/registry/SimpleRegistry.mapping @@ -11,6 +11,7 @@ CLASS net/minecraft/class_2370 net/minecraft/util/registry/SimpleRegistry FIELD field_36463 frozen Z FIELD field_36464 valueToEntryFunction Ljava/util/function/Function; FIELD field_36465 unfrozenValueToEntry Ljava/util/Map; + FIELD field_36634 cachedEntries Ljava/util/List; METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Lifecycle;Ljava/util/function/Function;)V ARG 1 key ARG 2 lifecycle @@ -27,6 +28,9 @@ CLASS net/minecraft/class_2370 net/minecraft/util/registry/SimpleRegistry ARG 0 entryList METHOD method_40256 (Ljava/util/Map$Entry;)Z ARG 0 entry + METHOD method_40258 (Ljava/util/Map;Lnet/minecraft/class_6862;Ljava/util/List;)V + ARG 2 tag + ARG 3 entries METHOD method_40259 (Ljava/util/Map;Lnet/minecraft/class_6880$class_6883;)V ARG 1 entry METHOD method_40261 (Lnet/minecraft/class_6880$class_6883;)V @@ -46,3 +50,8 @@ CLASS net/minecraft/class_2370 net/minecraft/util/registry/SimpleRegistry ARG 1 key METHOD method_40277 (Lnet/minecraft/class_5321;)Lnet/minecraft/class_6880$class_6883; ARG 1 key + METHOD method_40561 getEntries ()Ljava/util/List; + METHOD method_40562 createNamedEntryList (Lnet/minecraft/class_6862;)Lnet/minecraft/class_6885$class_6888; + ARG 1 tag + METHOD method_40563 (Lnet/minecraft/class_6862;)Ljava/lang/String; + ARG 0 tag diff --git a/mappings/net/minecraft/world/chunk/UpgradeData.mapping b/mappings/net/minecraft/world/chunk/UpgradeData.mapping index e86db057bf..77e5ff8cdd 100644 --- a/mappings/net/minecraft/world/chunk/UpgradeData.mapping +++ b/mappings/net/minecraft/world/chunk/UpgradeData.mapping @@ -7,9 +7,13 @@ CLASS net/minecraft/class_2843 net/minecraft/world/chunk/UpgradeData FIELD field_12955 centerIndicesToUpgrade [[I FIELD field_12956 LOGGER Lorg/slf4j/Logger; FIELD field_31412 INDICES_KEY Ljava/lang/String; + FIELD field_36538 blockTicks Ljava/util/List; + FIELD field_36539 fluidTicks Ljava/util/List; METHOD (Lnet/minecraft/class_2487;Lnet/minecraft/class_5539;)V ARG 1 nbt ARG 2 world + METHOD (Lnet/minecraft/class_5539;)V + ARG 1 world METHOD method_12348 upgradeCenter (Lnet/minecraft/class_2818;)V ARG 1 chunk METHOD method_12349 isDone ()Z @@ -23,8 +27,27 @@ CLASS net/minecraft/class_2843 net/minecraft/world/chunk/UpgradeData METHOD method_12352 upgradeSide (Lnet/minecraft/class_2818;Lnet/minecraft/class_2355;)V ARG 0 chunk ARG 1 side + METHOD method_12353 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2843$class_2844;)V + ARG 1 logic METHOD method_12356 upgrade (Lnet/minecraft/class_2818;)V ARG 1 chunk + METHOD method_40452 (Lnet/minecraft/class_1937;Lnet/minecraft/class_6759;)V + ARG 1 tick + METHOD method_40455 (Ljava/lang/String;)Ljava/util/Optional; + ARG 0 id + METHOD method_40456 addNeighborTicks (Lnet/minecraft/class_2487;Ljava/lang/String;Ljava/util/function/Function;Ljava/util/List;)V + ARG 0 nbt + ARG 1 key + ARG 2 nameToType + ARG 3 ticks + METHOD method_40457 (Lnet/minecraft/class_2499;Lnet/minecraft/class_6759;)V + ARG 0 tick + METHOD method_40458 (Lnet/minecraft/class_1937;Lnet/minecraft/class_6759;)V + ARG 1 tick + METHOD method_40459 (Ljava/lang/String;)Ljava/util/Optional; + ARG 0 id + METHOD method_40460 (Lnet/minecraft/class_2499;Lnet/minecraft/class_6759;)V + ARG 0 tick CLASS class_2844 Logic METHOD method_12357 postUpdate (Lnet/minecraft/class_1936;)V ARG 1 world @@ -38,6 +61,7 @@ CLASS net/minecraft/class_2843 net/minecraft/world/chunk/UpgradeData CLASS class_2845 BuiltinLogic FIELD field_12959 DIRECTIONS [Lnet/minecraft/class_2350; METHOD (Ljava/lang/String;IZ[Lnet/minecraft/class_2248;)V + ARG 3 addCallback ARG 4 blocks METHOD (Ljava/lang/String;I[Lnet/minecraft/class_2248;)V ARG 3 blocks diff --git a/mappings/net/minecraft/world/tick/Tick.mapping b/mappings/net/minecraft/world/tick/Tick.mapping index adac23fd95..b06d5b2068 100644 --- a/mappings/net/minecraft/world/tick/Tick.mapping +++ b/mappings/net/minecraft/world/tick/Tick.mapping @@ -23,11 +23,18 @@ CLASS net/minecraft/class_6759 net/minecraft/world/tick/Tick ARG 3 priority METHOD method_39404 toNbt (Ljava/util/function/Function;)Lnet/minecraft/class_2487; ARG 1 typeToNameFunction + METHOD method_39405 (JLjava/util/function/Consumer;Lnet/minecraft/class_6759;)V + ARG 3 tick METHOD method_39406 tick (Lnet/minecraft/class_2499;Ljava/util/function/Function;Lnet/minecraft/class_1923;Ljava/util/function/Consumer;)V ARG 0 tickList ARG 1 nameToTypeFunction ARG 2 pos ARG 3 tickConsumer + METHOD method_40558 (Lnet/minecraft/class_2487;Ljava/lang/Object;)Lnet/minecraft/class_6759; + ARG 1 type + METHOD method_40559 fromNbt (Lnet/minecraft/class_2487;Ljava/util/function/Function;)Ljava/util/Optional; + ARG 0 nbt + ARG 1 nameToType CLASS 1 METHOD equals (Ljava/lang/Object;Ljava/lang/Object;)Z ARG 1 first