diff --git a/build.gradle b/build.gradle index 44ae243e59..b7a8413bbd 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { id 'java' // for jd gen } -def minecraft_version = "20w49a" +def minecraft_version = "20w51a" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/block/PointedDripstoneBlock.mapping b/mappings/net/minecraft/block/PointedDripstoneBlock.mapping index fcc0b8d157..b59adacadd 100644 --- a/mappings/net/minecraft/block/PointedDripstoneBlock.mapping +++ b/mappings/net/minecraft/block/PointedDripstoneBlock.mapping @@ -11,14 +11,12 @@ CLASS net/minecraft/class_5689 net/minecraft/block/PointedDripstoneBlock METHOD method_32767 getDripPos (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; ARG 0 world ARG 1 pos - METHOD method_32768 createParticle (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5689$class_5690;)V + METHOD method_32768 createParticle (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3611;)V ARG 0 world ARG 1 pos ARG 2 state METHOD method_32769 getCauldronPos (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3611;)Lnet/minecraft/class_2338; ARG 0 world - ARG 1 pos - ARG 2 fluid METHOD method_32770 getThickness (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Z)Lnet/minecraft/class_5691; ARG 0 world ARG 1 pos @@ -43,7 +41,7 @@ CLASS net/minecraft/class_5689 net/minecraft/block/PointedDripstoneBlock METHOD method_32775 getDripFluid (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3611; ARG 0 world ARG 1 pos - METHOD method_32776 getSupportingPos (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;I)Lnet/minecraft/class_2338; + METHOD method_32776 getSupportingPos (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;I)Ljava/util/Optional; ARG 0 world ARG 1 pos ARG 2 state @@ -55,21 +53,10 @@ CLASS net/minecraft/class_5689 net/minecraft/block/PointedDripstoneBlock ARG 0 state ARG 1 world ARG 2 pos - METHOD method_32779 isFluidStill (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z - ARG 0 world - ARG 1 pos - METHOD method_32780 getDripType (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_5689$class_5690; - ARG 0 world - ARG 1 pos - ARG 2 state METHOD method_32781 canPlaceAtWithDirection (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z ARG 0 world ARG 1 pos ARG 2 direction - METHOD method_32782 getTipPos (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; - ARG 0 state - ARG 1 world - ARG 2 pos METHOD method_32783 canDrip (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_32784 isTip (Lnet/minecraft/class_2680;)Z @@ -77,12 +64,3 @@ CLASS net/minecraft/class_5689 net/minecraft/block/PointedDripstoneBlock METHOD method_32785 isPointingDown (Lnet/minecraft/class_2680;)Z ARG 0 state METHOD method_32901 getFluidBlockState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; - ARG 1 state - CLASS class_5690 DripType - FIELD field_28059 fluid Lnet/minecraft/class_3611; - METHOD (Lnet/minecraft/class_3611;Lnet/minecraft/class_2874;)V - ARG 1 fluid - METHOD method_32786 getFluid ()Lnet/minecraft/class_3611; - METHOD method_32787 isLiquid ()Z - COMMENT Checks if the fluid of this drip type is liquid, namely lava or water. - METHOD method_32788 getParticle ()Lnet/minecraft/class_2394; diff --git a/mappings/net/minecraft/class_5759.mapping b/mappings/net/minecraft/class_5759.mapping new file mode 100644 index 0000000000..d6a5ea1b61 --- /dev/null +++ b/mappings/net/minecraft/class_5759.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_5759 + METHOD method_19105 isCloseEnoughForDanger (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z + METHOD method_19618 getNearestHostile (Lnet/minecraft/class_1309;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/class_5761.mapping b/mappings/net/minecraft/class_5761.mapping new file mode 100644 index 0000000000..3281c515fd --- /dev/null +++ b/mappings/net/minecraft/class_5761.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_5761 + METHOD method_6454 setFromBucket (Z)V diff --git a/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping b/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping index 18c88ff4c8..d3dc8d92d8 100644 --- a/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping +++ b/mappings/net/minecraft/client/gui/tooltip/BundleTooltipComponent.mapping @@ -1,11 +1,2 @@ CLASS net/minecraft/class_5682 net/minecraft/client/gui/tooltip/BundleTooltipComponent FIELD field_27995 inventory Lnet/minecraft/class_2371; - FIELD field_27996 hasSpace Z - METHOD method_32658 drawSlot (Lnet/minecraft/class_4587;IIILnet/minecraft/class_1060;Z)V - ARG 1 matrices - ARG 2 x - ARG 3 y - ARG 4 z - ARG 6 plusSlot - METHOD method_32659 getStackCount ()I - METHOD method_32660 getDisplayColumns ()I diff --git a/mappings/net/minecraft/client/item/BundleTooltipData.mapping b/mappings/net/minecraft/client/item/BundleTooltipData.mapping index b2e6c3519b..673570b55e 100644 --- a/mappings/net/minecraft/client/item/BundleTooltipData.mapping +++ b/mappings/net/minecraft/client/item/BundleTooltipData.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_5631 net/minecraft/client/item/BundleTooltipData FIELD field_27874 inventory Lnet/minecraft/class_2371; - FIELD field_27875 hasSpace Z - METHOD (Lnet/minecraft/class_2371;Z)V + METHOD (Lnet/minecraft/class_2371;I)V ARG 1 inventory - ARG 2 hasSpace METHOD method_32340 getInventory ()Lnet/minecraft/class_2371; - METHOD method_32341 hasSpace ()Z + METHOD method_32341 hasSpace ()I diff --git a/mappings/net/minecraft/entity/ai/brain/sensor/VillagerHostilesSensor.mapping b/mappings/net/minecraft/entity/ai/brain/sensor/VillagerHostilesSensor.mapping index fb51a30f4a..c55984e4c4 100644 --- a/mappings/net/minecraft/entity/ai/brain/sensor/VillagerHostilesSensor.mapping +++ b/mappings/net/minecraft/entity/ai/brain/sensor/VillagerHostilesSensor.mapping @@ -2,14 +2,3 @@ CLASS net/minecraft/class_4150 net/minecraft/entity/ai/brain/sensor/VillagerHost FIELD field_18473 SQUARED_DISTANCES_FOR_DANGER Lcom/google/common/collect/ImmutableMap; METHOD method_19104 isHostile (Lnet/minecraft/class_1309;)Z ARG 1 entity - METHOD method_19105 isCloseEnoughForDanger (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z - ARG 1 entity - ARG 2 hostile - METHOD method_19618 getNearestHostile (Lnet/minecraft/class_1309;)Ljava/util/Optional; - ARG 1 entity - METHOD method_19619 compareDistances (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)I - ARG 1 entity - ARG 2 hostile1 - ARG 3 hostile2 - METHOD method_19620 getVisibleMobs (Lnet/minecraft/class_1309;)Ljava/util/Optional; - ARG 1 entity diff --git a/mappings/net/minecraft/entity/ai/brain/task/GoTowardsLookTarget.mapping b/mappings/net/minecraft/entity/ai/brain/task/GoTowardsLookTarget.mapping index 8adcf4abc6..9add2a87e5 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/GoTowardsLookTarget.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/GoTowardsLookTarget.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4120 net/minecraft/entity/ai/brain/task/GoTowardsLookTarget - FIELD field_18378 speed F + FIELD field_18378 speed Ljava/util/function/Function; FIELD field_19002 completionRange I METHOD (FI)V ARG 1 speed diff --git a/mappings/net/minecraft/entity/ai/brain/task/RangedApproachTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/RangedApproachTask.mapping index d78a37f16e..6c9dd84ff2 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/RangedApproachTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/RangedApproachTask.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4822 net/minecraft/entity/ai/brain/task/RangedApproachTask - FIELD field_22323 speed F + FIELD field_22323 speed Ljava/util/function/Function; METHOD (F)V ARG 1 speed METHOD method_24604 forgetWalkTarget (Lnet/minecraft/class_1309;)V diff --git a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardClosestAdultTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardClosestAdultTask.mapping index a8a12ab1e6..2f7d59d73d 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/WalkTowardClosestAdultTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/WalkTowardClosestAdultTask.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_5355 net/minecraft/entity/ai/brain/task/WalkTowardClosestAdultTask FIELD field_25357 executionRange Lnet/minecraft/class_4801; - FIELD field_25358 speed F + FIELD field_25358 speed Ljava/util/function/Function; METHOD (Lnet/minecraft/class_4801;F)V ARG 1 executionRange ARG 2 speed diff --git a/mappings/net/minecraft/entity/passive/AnimalEntity.mapping b/mappings/net/minecraft/entity/passive/AnimalEntity.mapping index eb9b3f139d..84efc13490 100644 --- a/mappings/net/minecraft/entity/passive/AnimalEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AnimalEntity.mapping @@ -12,9 +12,8 @@ CLASS net/minecraft/class_1429 net/minecraft/entity/passive/AnimalEntity METHOD method_29270 getLoveTicks ()I METHOD method_6474 canBreedWith (Lnet/minecraft/class_1429;)Z ARG 1 other - METHOD method_6475 eat (Lnet/minecraft/class_1657;Lnet/minecraft/class_1799;)V + METHOD method_6475 eat (Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;Lnet/minecraft/class_1799;)V ARG 1 player - ARG 2 stack METHOD method_6476 setLoveTicks (I)V ARG 1 loveTicks METHOD method_6477 resetLoveTicks ()V diff --git a/mappings/net/minecraft/entity/passive/DolphinEntity.mapping b/mappings/net/minecraft/entity/passive/DolphinEntity.mapping index b615bd50a3..b53bda7ac2 100644 --- a/mappings/net/minecraft/entity/passive/DolphinEntity.mapping +++ b/mappings/net/minecraft/entity/passive/DolphinEntity.mapping @@ -23,10 +23,6 @@ CLASS net/minecraft/class_1433 net/minecraft/entity/passive/DolphinEntity METHOD method_6493 setTreasurePos (Lnet/minecraft/class_2338;)V ARG 1 treasurePos METHOD method_6494 getTreasurePos ()Lnet/minecraft/class_2338; - CLASS class_1434 DolphinMoveControl - FIELD field_6751 dolphin Lnet/minecraft/class_1433; - METHOD (Lnet/minecraft/class_1433;)V - ARG 1 dolphin CLASS class_1435 LeadToNearbyTreasureGoal FIELD field_6752 dolphin Lnet/minecraft/class_1433; FIELD field_6753 noPathToStructure Z diff --git a/mappings/net/minecraft/entity/passive/FishEntity.mapping b/mappings/net/minecraft/entity/passive/FishEntity.mapping index 12ac0efb1e..57dbf0eb58 100644 --- a/mappings/net/minecraft/entity/passive/FishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FishEntity.mapping @@ -9,8 +9,6 @@ CLASS net/minecraft/class_1422 net/minecraft/entity/passive/FishEntity METHOD method_26879 createFishAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_6452 getFishBucketItem ()Lnet/minecraft/class_1799; METHOD method_6453 isFromBucket ()Z - METHOD method_6454 setFromBucket (Z)V - ARG 1 fromBucket METHOD method_6455 copyDataToStack (Lnet/minecraft/class_1799;)V ARG 1 stack METHOD method_6456 hasSelfControl ()Z diff --git a/mappings/net/minecraft/item/BucketItem.mapping b/mappings/net/minecraft/item/BucketItem.mapping index 8b9df69ef5..3ab4a30a9f 100644 --- a/mappings/net/minecraft/item/BucketItem.mapping +++ b/mappings/net/minecraft/item/BucketItem.mapping @@ -10,5 +10,3 @@ CLASS net/minecraft/class_1755 net/minecraft/item/BucketItem ARG 2 world ARG 3 pos METHOD method_7732 getEmptiedStack (Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;)Lnet/minecraft/class_1799; - ARG 1 stack - ARG 2 player diff --git a/mappings/net/minecraft/item/FishBucketItem.mapping b/mappings/net/minecraft/item/FishBucketItem.mapping index 1c2f75885c..e7eab90d62 100644 --- a/mappings/net/minecraft/item/FishBucketItem.mapping +++ b/mappings/net/minecraft/item/FishBucketItem.mapping @@ -1,9 +1,8 @@ CLASS net/minecraft/class_1785 net/minecraft/item/FishBucketItem FIELD field_7991 fishType Lnet/minecraft/class_1299; - METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_3611;Lnet/minecraft/class_1792$class_1793;)V + METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_3611;Lnet/minecraft/class_3414;Lnet/minecraft/class_1792$class_1793;)V ARG 1 type ARG 2 fluid - ARG 3 settings METHOD method_7824 spawnFish (Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 stack diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index 9eb3ea158e..6728f5c04b 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -112,8 +112,6 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item ARG 1 tag METHOD method_7861 finishUsing (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1799; ARG 1 stack - ARG 2 world - ARG 3 entity METHOD method_7862 getRarity (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1814; ARG 1 stack METHOD method_7864 getName (Lnet/minecraft/class_1799;)Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/network/packet/s2c/play/SynchronizeTagsS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/SynchronizeTagsS2CPacket.mapping index ce4ce4973b..7652c23b24 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/SynchronizeTagsS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/SynchronizeTagsS2CPacket.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/class_2790 net/minecraft/network/packet/s2c/play/SynchronizeTagsS2CPacket - FIELD field_12757 tagManager Lnet/minecraft/class_5415; - METHOD method_12000 getTagManager ()Lnet/minecraft/class_5415; + FIELD field_12757 tagManager Ljava/util/Map; + METHOD method_12000 getTagManager ()Ljava/util/Map; diff --git a/mappings/net/minecraft/resource/ServerResourceManager.mapping b/mappings/net/minecraft/resource/ServerResourceManager.mapping index 0ca517bace..b5ce0b5e14 100644 --- a/mappings/net/minecraft/resource/ServerResourceManager.mapping +++ b/mappings/net/minecraft/resource/ServerResourceManager.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_5350 net/minecraft/resource/ServerResourceManager FIELD field_25342 functionLoader Lnet/minecraft/class_5349; FIELD field_28017 lootFunctionManager Lnet/minecraft/class_5640; METHOD method_29465 getFunctionLoader ()Lnet/minecraft/class_5349; - METHOD method_29466 reload (Ljava/util/List;Lnet/minecraft/class_2170$class_5364;ILjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + METHOD method_29466 reload (Ljava/util/List;Lnet/minecraft/class_5455;Lnet/minecraft/class_2170$class_5364;ILjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 0 packs METHOD method_29468 getLootConditionManager ()Lnet/minecraft/class_4567; METHOD method_29469 getLootManager ()Lnet/minecraft/class_60; diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 5fd0c4aafe..b29daf2dee 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld FIELD field_13951 fluidTickScheduler Lnet/minecraft/class_1949; FIELD field_13952 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_13953 inBlockTick Z - FIELD field_13955 allPlayersSleeping Z FIELD field_13956 portalForcer Lnet/minecraft/class_1946; FIELD field_13957 savingDisabled Z FIELD field_13959 server Lnet/minecraft/server/MinecraftServer; @@ -125,8 +124,6 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 1 player METHOD method_18773 (Lnet/minecraft/class_3222;)V ARG 0 player - METHOD method_18775 (Lnet/minecraft/class_3222;)Z - ARG 0 player METHOD method_18776 getAliveEnderDragons ()Ljava/util/List; METHOD method_18779 getRandomAlivePlayer ()Lnet/minecraft/class_3222; METHOD method_19494 getPointOfInterestStorage ()Lnet/minecraft/class_4153; diff --git a/mappings/net/minecraft/tag/BlockTags.mapping b/mappings/net/minecraft/tag/BlockTags.mapping index 472971d89c..0dd72f895f 100644 --- a/mappings/net/minecraft/tag/BlockTags.mapping +++ b/mappings/net/minecraft/tag/BlockTags.mapping @@ -3,4 +3,3 @@ CLASS net/minecraft/class_3481 net/minecraft/tag/BlockTags METHOD method_15069 register (Ljava/lang/String;)Lnet/minecraft/class_3494$class_5123; ARG 0 id METHOD method_15073 getTagGroup ()Lnet/minecraft/class_5414; - METHOD method_31072 getRequiredTags ()Ljava/util/List; diff --git a/mappings/net/minecraft/tag/EntityTypeTags.mapping b/mappings/net/minecraft/tag/EntityTypeTags.mapping index fea3484920..295142d67e 100644 --- a/mappings/net/minecraft/tag/EntityTypeTags.mapping +++ b/mappings/net/minecraft/tag/EntityTypeTags.mapping @@ -3,4 +3,3 @@ CLASS net/minecraft/class_3483 net/minecraft/tag/EntityTypeTags METHOD method_15077 register (Ljava/lang/String;)Lnet/minecraft/class_3494$class_5123; ARG 0 id METHOD method_15082 getTagGroup ()Lnet/minecraft/class_5414; - METHOD method_31073 getRequiredTags ()Ljava/util/List; diff --git a/mappings/net/minecraft/tag/FluidTags.mapping b/mappings/net/minecraft/tag/FluidTags.mapping index 06f82a064d..69dfaf73ac 100644 --- a/mappings/net/minecraft/tag/FluidTags.mapping +++ b/mappings/net/minecraft/tag/FluidTags.mapping @@ -2,4 +2,3 @@ CLASS net/minecraft/class_3486 net/minecraft/tag/FluidTags FIELD field_23680 REQUIRED_TAGS Lnet/minecraft/class_5120; METHOD method_15095 register (Ljava/lang/String;)Lnet/minecraft/class_3494$class_5123; ARG 0 id - METHOD method_29897 getRequiredTags ()Ljava/util/List; diff --git a/mappings/net/minecraft/tag/GameEventTags.mapping b/mappings/net/minecraft/tag/GameEventTags.mapping index ddec080f21..eb5e1fdd13 100644 --- a/mappings/net/minecraft/tag/GameEventTags.mapping +++ b/mappings/net/minecraft/tag/GameEventTags.mapping @@ -2,4 +2,3 @@ CLASS net/minecraft/class_5698 net/minecraft/tag/GameEventTags FIELD field_28092 REQUIRED_TAGS Lnet/minecraft/class_5120; METHOD method_32823 register (Ljava/lang/String;)Lnet/minecraft/class_3494$class_5123; ARG 0 id - METHOD method_32824 getRequiredTags ()Ljava/util/List; diff --git a/mappings/net/minecraft/tag/ItemTags.mapping b/mappings/net/minecraft/tag/ItemTags.mapping index 7d2f5e3c6f..b5bb3c28fe 100644 --- a/mappings/net/minecraft/tag/ItemTags.mapping +++ b/mappings/net/minecraft/tag/ItemTags.mapping @@ -3,4 +3,3 @@ CLASS net/minecraft/class_3489 net/minecraft/tag/ItemTags METHOD method_15102 register (Ljava/lang/String;)Lnet/minecraft/class_3494$class_5123; ARG 0 id METHOD method_15106 getTagGroup ()Lnet/minecraft/class_5414; - METHOD method_31074 getRequiredTags ()Ljava/util/List; diff --git a/mappings/net/minecraft/tag/RequiredTagList.mapping b/mappings/net/minecraft/tag/RequiredTagList.mapping index a1cd28e0c6..f758fc41c9 100644 --- a/mappings/net/minecraft/tag/RequiredTagList.mapping +++ b/mappings/net/minecraft/tag/RequiredTagList.mapping @@ -2,12 +2,8 @@ CLASS net/minecraft/class_5120 net/minecraft/tag/RequiredTagList COMMENT Stores all required tags of a given type, so they can be updated to point to the new tag instances on datapack reload FIELD field_23682 group Lnet/minecraft/class_5414; FIELD field_23683 tags Ljava/util/List; - FIELD field_25740 groupGetter Ljava/util/function/Function; - METHOD (Ljava/util/function/Function;)V - ARG 1 managerGetter METHOD method_26770 getGroup ()Lnet/minecraft/class_5414; METHOD method_26771 updateTagManager (Lnet/minecraft/class_5415;)V - ARG 1 manager METHOD method_26772 (Lnet/minecraft/class_5414;Lnet/minecraft/class_5120$class_5121;)V ARG 1 tag METHOD method_26773 add (Ljava/lang/String;)Lnet/minecraft/class_3494$class_5123; @@ -19,8 +15,6 @@ CLASS net/minecraft/class_5120 net/minecraft/tag/RequiredTagList ARG 1 id METHOD method_29224 getMissingTags (Lnet/minecraft/class_5415;)Ljava/util/Set; COMMENT Gets the required tags which are not supplied by the current datapacks. - ARG 1 manager - METHOD method_29902 getTags ()Ljava/util/List; CLASS class_5121 TagWrapper FIELD field_23684 id Lnet/minecraft/class_2960; FIELD field_23685 delegate Lnet/minecraft/class_3494; diff --git a/mappings/net/minecraft/tag/RequiredTagListRegistry.mapping b/mappings/net/minecraft/tag/RequiredTagListRegistry.mapping index a07a4bd6a1..ead2e2950c 100644 --- a/mappings/net/minecraft/tag/RequiredTagListRegistry.mapping +++ b/mappings/net/minecraft/tag/RequiredTagListRegistry.mapping @@ -1,18 +1,11 @@ CLASS net/minecraft/class_5413 net/minecraft/tag/RequiredTagListRegistry - FIELD field_25741 REQUIRED_TAG_LISTS Ljava/util/Map; + FIELD field_25741 REQUIRED_TAG_LISTS Ljava/util/List; METHOD method_30196 clearAllTags ()V - METHOD method_30197 (Lnet/minecraft/class_5120;)Z - ARG 0 list METHOD method_30198 updateTagManager (Lnet/minecraft/class_5415;)V ARG 0 tagManager METHOD method_30199 (Lnet/minecraft/class_5415;Lnet/minecraft/class_5120;)V ARG 1 list - METHOD method_30200 (Lcom/google/common/collect/Multimap;Lnet/minecraft/class_5415;Lnet/minecraft/class_2960;Lnet/minecraft/class_5120;)V - ARG 2 id - ARG 3 list - METHOD method_30201 register (Lnet/minecraft/class_2960;Ljava/util/function/Function;)Lnet/minecraft/class_5120; - ARG 0 id - ARG 1 containerGetter + METHOD method_30201 register (Lnet/minecraft/class_5321;Ljava/lang/String;)Lnet/minecraft/class_5120; METHOD method_30202 validateRegistrations ()V METHOD method_30203 getMissingTags (Lnet/minecraft/class_5415;)Lcom/google/common/collect/Multimap; ARG 0 tagManager diff --git a/mappings/net/minecraft/tag/TagGroup.mapping b/mappings/net/minecraft/tag/TagGroup.mapping index 0227438a5c..ec3250e4db 100644 --- a/mappings/net/minecraft/tag/TagGroup.mapping +++ b/mappings/net/minecraft/tag/TagGroup.mapping @@ -8,17 +8,10 @@ CLASS net/minecraft/class_5414 net/minecraft/tag/TagGroup ARG 1 object METHOD method_30207 create (Ljava/util/Map;)Lnet/minecraft/class_5414; ARG 0 tags - METHOD method_30208 toPacket (Lnet/minecraft/class_2540;Lnet/minecraft/class_2348;)V - ARG 1 buf - ARG 2 registry - METHOD method_30209 fromPacket (Lnet/minecraft/class_2540;Lnet/minecraft/class_2378;)Lnet/minecraft/class_5414; - ARG 0 buf - ARG 1 registry + METHOD method_30208 toPacket (Lnet/minecraft/class_2378;)Lnet/minecraft/class_5414$class_5748; METHOD method_30210 getTag (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3494; ARG 1 id METHOD method_30211 getTagIds ()Ljava/util/Collection; - METHOD method_30212 getTagId (Lnet/minecraft/class_3494;)Lnet/minecraft/class_2960; - ARG 1 tag METHOD method_30213 getTagOrEmpty (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3494; ARG 1 id METHOD method_30214 createEmpty ()Lnet/minecraft/class_5414; diff --git a/mappings/net/minecraft/tag/TagGroupLoader.mapping b/mappings/net/minecraft/tag/TagGroupLoader.mapping index c27d26104d..801b4b98a4 100644 --- a/mappings/net/minecraft/tag/TagGroupLoader.mapping +++ b/mappings/net/minecraft/tag/TagGroupLoader.mapping @@ -1,16 +1,11 @@ CLASS net/minecraft/class_3503 net/minecraft/tag/TagGroupLoader FIELD field_15603 JSON_EXTENSION_LENGTH I FIELD field_15605 dataType Ljava/lang/String; - FIELD field_15606 entryType Ljava/lang/String; FIELD field_15607 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_15608 GSON Lcom/google/gson/Gson; FIELD field_15609 registryGetter Ljava/util/function/Function; - METHOD (Ljava/util/function/Function;Ljava/lang/String;Ljava/lang/String;)V + METHOD (Ljava/util/function/Function;Ljava/lang/String;)V ARG 1 registryGetter ARG 2 dataType - ARG 3 entryType - METHOD method_15192 prepareReload (Lnet/minecraft/class_3300;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; - ARG 1 manager - ARG 2 prepareExecutor METHOD method_18242 applyReload (Ljava/util/Map;)Lnet/minecraft/class_5414; ARG 1 tags diff --git a/mappings/net/minecraft/tag/TagManager.mapping b/mappings/net/minecraft/tag/TagManager.mapping index f1bedb2796..e94ab874d1 100644 --- a/mappings/net/minecraft/tag/TagManager.mapping +++ b/mappings/net/minecraft/tag/TagManager.mapping @@ -1,17 +1,5 @@ CLASS net/minecraft/class_5415 net/minecraft/tag/TagManager FIELD field_25744 EMPTY Lnet/minecraft/class_5415; - METHOD method_30215 getBlocks ()Lnet/minecraft/class_5414; - METHOD method_30216 create (Lnet/minecraft/class_5414;Lnet/minecraft/class_5414;Lnet/minecraft/class_5414;Lnet/minecraft/class_5414;Lnet/minecraft/class_5414;)Lnet/minecraft/class_5415; - ARG 0 blocks - ARG 1 items - ARG 2 fluids - ARG 3 entityTypes - METHOD method_30217 toPacket (Lnet/minecraft/class_2540;)V - ARG 1 buf - METHOD method_30218 getItems ()Lnet/minecraft/class_5414; - METHOD method_30219 fromPacket (Lnet/minecraft/class_2540;)Lnet/minecraft/class_5415; - ARG 0 buf - METHOD method_30220 getFluids ()Lnet/minecraft/class_5414; - METHOD method_30221 getEntityTypes ()Lnet/minecraft/class_5414; + METHOD method_30217 toPacket (Lnet/minecraft/class_5455;)Ljava/util/Map; + METHOD method_30219 fromPacket (Lnet/minecraft/class_5455;Ljava/util/Map;)Lnet/minecraft/class_5415; METHOD method_30222 apply ()V - METHOD method_32834 getGameEvents ()Lnet/minecraft/class_5414; diff --git a/mappings/net/minecraft/tag/TagManagerLoader.mapping b/mappings/net/minecraft/tag/TagManagerLoader.mapping index f2adb8b138..bfe6042b65 100644 --- a/mappings/net/minecraft/tag/TagManagerLoader.mapping +++ b/mappings/net/minecraft/tag/TagManagerLoader.mapping @@ -1,7 +1,3 @@ CLASS net/minecraft/class_3505 net/minecraft/tag/TagManagerLoader - FIELD field_15612 blocks Lnet/minecraft/class_3503; - FIELD field_15613 items Lnet/minecraft/class_3503; - FIELD field_15614 fluids Lnet/minecraft/class_3503; - FIELD field_15615 entityTypes Lnet/minecraft/class_3503; FIELD field_25749 tagManager Lnet/minecraft/class_5415; METHOD method_30223 getTagManager ()Lnet/minecraft/class_5415; diff --git a/mappings/net/minecraft/test/TestRunner.mapping b/mappings/net/minecraft/test/TestRunner.mapping index 2c5b7826e0..2a87619727 100644 --- a/mappings/net/minecraft/test/TestRunner.mapping +++ b/mappings/net/minecraft/test/TestRunner.mapping @@ -7,8 +7,6 @@ CLASS net/minecraft/class_4515 net/minecraft/test/TestRunner FIELD field_20551 tests Ljava/util/List; FIELD field_20555 reusablePos Lnet/minecraft/class_2338$class_2339; FIELD field_20556 sizeZ I - METHOD (Ljava/util/Collection;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_4521;I)V - ARG 2 pos METHOD method_22155 getTests ()Ljava/util/List; METHOD method_22156 runBatch (I)V ARG 1 index diff --git a/mappings/net/minecraft/util/collection/DefaultedList.mapping b/mappings/net/minecraft/util/collection/DefaultedList.mapping index 0a6fc2682c..47d7609afd 100644 --- a/mappings/net/minecraft/util/collection/DefaultedList.mapping +++ b/mappings/net/minecraft/util/collection/DefaultedList.mapping @@ -20,4 +20,4 @@ CLASS net/minecraft/class_2371 net/minecraft/util/collection/DefaultedList ARG 1 index METHOD set (ILjava/lang/Object;)Ljava/lang/Object; ARG 1 index - ARG 2 element \ No newline at end of file + ARG 2 element diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index e0222a189d..b531631083 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -233,4 +233,4 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper METHOD method_32855 nextGaussian (Ljava/util/Random;FF)F ARG 0 random ARG 1 mean - ARG 2 deviation \ No newline at end of file + ARG 2 deviation diff --git a/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping b/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping index 6c3351983b..dcb9d8299c 100644 --- a/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping +++ b/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping @@ -12,7 +12,6 @@ CLASS net/minecraft/class_5455 net/minecraft/util/registry/DynamicRegistryManage FIELD field_25918 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_25919 INFOS Ljava/util/Map; FIELD field_26733 BUILTIN Lnet/minecraft/class_5455$class_5457; - METHOD method_30518 getDimensionTypes ()Lnet/minecraft/class_2378; METHOD method_30519 load (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_5382;)V COMMENT Loads a dynamic registry manager from the resource manager's data files. METHOD method_30520 register (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;)V @@ -41,7 +40,7 @@ CLASS net/minecraft/class_5455 net/minecraft/util/registry/DynamicRegistryManage ARG 1 key METHOD method_30528 create ()Lnet/minecraft/class_5455$class_5457; COMMENT Creates a default dynamic registry manager. - METHOD method_30530 get (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2385; + METHOD method_30530 get (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2378; COMMENT Retrieves a registry from this manager, or throws an exception when the COMMENT registry does not exist. COMMENT