diff --git a/build.gradle b/build.gradle index a63d73585d..023643a9ff 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ plugins { id 'net.fabricmc.filament' version '0.2.0' } -def minecraft_version = "21w15a" +def minecraft_version = "21w16a" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/block/InfestedBlock.mapping b/mappings/net/minecraft/block/InfestedBlock.mapping index 9aae3e4c52..ae56d74b66 100644 --- a/mappings/net/minecraft/block/InfestedBlock.mapping +++ b/mappings/net/minecraft/block/InfestedBlock.mapping @@ -9,8 +9,7 @@ CLASS net/minecraft/class_2384 net/minecraft/block/InfestedBlock COMMENT block settings METHOD method_10269 isInfestable (Lnet/minecraft/class_2680;)Z ARG 0 block - METHOD method_10270 fromRegularBlock (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2680; - ARG 0 regularBlock + METHOD method_10270 fromRegularBlock (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; METHOD method_10271 getRegularBlock ()Lnet/minecraft/class_2248; METHOD method_24797 spawnSilverfish (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V ARG 1 world diff --git a/mappings/net/minecraft/block/PointedDripstoneBlock.mapping b/mappings/net/minecraft/block/PointedDripstoneBlock.mapping index 1428cb4609..1cf84cbc1c 100644 --- a/mappings/net/minecraft/block/PointedDripstoneBlock.mapping +++ b/mappings/net/minecraft/block/PointedDripstoneBlock.mapping @@ -61,14 +61,14 @@ CLASS net/minecraft/class_5689 net/minecraft/block/PointedDripstoneBlock 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;I)Lnet/minecraft/class_2338; + METHOD method_32782 getTipPos (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; ARG 0 state ARG 1 world ARG 2 pos ARG 3 range METHOD method_32783 canDrip (Lnet/minecraft/class_2680;)Z ARG 0 state - METHOD method_32784 isTip (Lnet/minecraft/class_2680;)Z + METHOD method_32784 isTip (Lnet/minecraft/class_2680;Z)Z ARG 0 state METHOD method_32785 isPointingDown (Lnet/minecraft/class_2680;)Z ARG 0 state diff --git a/mappings/net/minecraft/class_6350.mapping b/mappings/net/minecraft/class_6350.mapping new file mode 100644 index 0000000000..f88976a698 --- /dev/null +++ b/mappings/net/minecraft/class_6350.mapping @@ -0,0 +1,38 @@ +CLASS net/minecraft/class_6350 + METHOD a needsFluidTick ()Z + METHOD a apply (Lnet/minecraft/class_5840;IIID)Lnet/minecraft/class_2680; + CLASS class_5832 AquiferSampler + FIELD field_28813 edgeDensityNoise Lnet/minecraft/class_5216; + FIELD field_28814 waterLevelNoise Lnet/minecraft/class_5216; + FIELD field_28815 settings Lnet/minecraft/class_5284; + FIELD field_28816 waterLevels [Lnet/minecraft/class_6350$class_5832$class_6351; + FIELD field_28817 blockPositions [J + FIELD field_28820 needsFluidTick Z + FIELD field_28821 columnSampler Lnet/minecraft/class_5818; + FIELD field_28822 startX I + FIELD field_28823 startY I + FIELD field_28824 startZ I + FIELD field_28825 sizeX I + FIELD field_28826 sizeZ I + METHOD method_33734 getLocalX (I)I + ARG 1 x + METHOD method_33735 calculateDensity (IDLnet/minecraft/class_6350$class_5832$class_6351;Lnet/minecraft/class_6350$class_5832$class_6351;)D + ARG 1 y + ARG 2 noise + METHOD method_33736 maxDistance (II)D + ARG 1 a + ARG 2 b + METHOD method_33738 getWaterLevel (J)Lnet/minecraft/class_6350$class_5832$class_6351; + ARG 1 pos + METHOD method_33740 getLocalY (I)I + ARG 1 y + METHOD method_33741 index (III)I + ARG 1 x + ARG 2 y + ARG 3 z + METHOD method_33743 getLocalZ (I)I + ARG 1 z + METHOD method_33744 getWaterLevel (III)Lnet/minecraft/class_6350$class_5832$class_6351; + ARG 1 x + ARG 2 y + ARG 3 z diff --git a/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping b/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping index 43ef68f38a..0a80d0ba6d 100644 --- a/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping +++ b/mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping @@ -27,7 +27,7 @@ CLASS net/minecraft/class_1066 net/minecraft/client/resource/ClientBuiltinResour METHOD method_4638 loadServerPack (Ljava/io/File;Lnet/minecraft/class_5352;)Ljava/util/concurrent/CompletableFuture; ARG 1 packZip ARG 2 packSource - METHOD method_4640 download (Ljava/lang/String;Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; + METHOD method_4640 download (Ljava/lang/String;Ljava/lang/String;Z)Ljava/util/concurrent/CompletableFuture; METHOD method_4641 verifyFile (Ljava/lang/String;Ljava/io/File;)Z ARG 1 expectedSha1 ARG 2 file diff --git a/mappings/net/minecraft/data/server/RecipesProvider.mapping b/mappings/net/minecraft/data/server/RecipesProvider.mapping index eb7db3be32..4e160a3af7 100644 --- a/mappings/net/minecraft/data/server/RecipesProvider.mapping +++ b/mappings/net/minecraft/data/server/RecipesProvider.mapping @@ -238,5 +238,3 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipesProvider COMMENT

The shaped recipe converts 9 items in a square to a compacted form of the item. COMMENT

The shapeless recipe converts the compacted form to 9 of the normal form. ARG 0 exporter - ARG 1 normal - ARG 2 compact diff --git a/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping index 638059b65d..6b9769b144 100644 --- a/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/CookingRecipeJsonFactory.mapping @@ -12,19 +12,14 @@ CLASS net/minecraft/class_2454 net/minecraft/data/server/recipe/CookingRecipeJso ARG 3 experience ARG 4 cookingTime ARG 5 serializer - METHOD method_10468 offerTo (Ljava/util/function/Consumer;Lnet/minecraft/class_2960;)V + METHOD method_10468 (Ljava/util/function/Consumer;Lnet/minecraft/class_2960;)V ARG 1 exporter ARG 2 recipeId METHOD method_10469 criterion (Ljava/lang/String;Lnet/minecraft/class_184;)Lnet/minecraft/class_2454; ARG 1 criterionName ARG 2 conditions - METHOD method_10470 offerTo (Ljava/util/function/Consumer;)V - ARG 1 exporter METHOD method_10471 validate (Lnet/minecraft/class_2960;)V ARG 1 recipeId - METHOD method_10472 offerTo (Ljava/util/function/Consumer;Ljava/lang/String;)V - ARG 1 exporter - ARG 2 recipeIdStr METHOD method_10473 createBlasting (Lnet/minecraft/class_1856;Lnet/minecraft/class_1935;FI)Lnet/minecraft/class_2454; ARG 0 ingredient ARG 1 result diff --git a/mappings/net/minecraft/data/server/recipe/CraftingRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/CraftingRecipeJsonFactory.mapping index d2768bf1c6..ca8ae32723 100644 --- a/mappings/net/minecraft/data/server/recipe/CraftingRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/CraftingRecipeJsonFactory.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_5797 net/minecraft/data/server/recipe/CraftingRecipeJsonFactory + METHOD a offerTo (Ljava/util/function/Consumer;Lnet/minecraft/class_2960;)V METHOD method_10431 offerTo (Ljava/util/function/Consumer;)V ARG 1 exporter METHOD method_33529 group (Ljava/lang/String;)Lnet/minecraft/class_5797; diff --git a/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.mapping index 154defcf2a..b2db976a3d 100644 --- a/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/ShapedRecipeJsonFactory.mapping @@ -5,14 +5,13 @@ CLASS net/minecraft/class_2447 net/minecraft/data/server/recipe/ShapedRecipeJson FIELD field_11379 builder Lnet/minecraft/class_161$class_162; FIELD field_11380 output Lnet/minecraft/class_1792; FIELD field_11381 group Ljava/lang/String; - FIELD field_11382 LOGGER Lorg/apache/logging/log4j/Logger; METHOD (Lnet/minecraft/class_1935;I)V ARG 1 output ARG 2 outputCount METHOD method_10428 input (Ljava/lang/Character;Lnet/minecraft/class_1856;)Lnet/minecraft/class_2447; ARG 1 c ARG 2 ingredient - METHOD method_10430 offerTo (Ljava/util/function/Consumer;Lnet/minecraft/class_2960;)V + METHOD method_10430 (Ljava/util/function/Consumer;Lnet/minecraft/class_2960;)V ARG 1 exporter ARG 2 recipeId METHOD method_10432 validate (Lnet/minecraft/class_2960;)V @@ -28,9 +27,6 @@ CLASS net/minecraft/class_2447 net/minecraft/data/server/recipe/ShapedRecipeJson ARG 1 outputCount METHOD method_10437 create (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2447; ARG 0 output - METHOD method_10438 offerTo (Ljava/util/function/Consumer;Ljava/lang/String;)V - ARG 1 exporter - ARG 2 recipeIdStr METHOD method_10439 pattern (Ljava/lang/String;)Lnet/minecraft/class_2447; ARG 1 patternStr CLASS class_2448 ShapedRecipeJsonProvider @@ -42,12 +38,3 @@ CLASS net/minecraft/class_2447 net/minecraft/data/server/recipe/ShapedRecipeJson FIELD field_11388 inputs Ljava/util/Map; FIELD field_11389 builder Lnet/minecraft/class_161$class_162; FIELD field_11390 advancementId Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2447;Lnet/minecraft/class_2960;Lnet/minecraft/class_1792;ILjava/lang/String;Ljava/util/List;Ljava/util/Map;Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_2960;)V - ARG 2 recipeId - ARG 3 output - ARG 4 outputCount - ARG 5 group - ARG 6 pattern - ARG 7 inputs - ARG 8 builder - ARG 9 advancementId diff --git a/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping index fe69afa9da..4a5e7962a3 100644 --- a/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/ShapelessRecipeJsonFactory.mapping @@ -3,12 +3,11 @@ CLASS net/minecraft/class_2450 net/minecraft/data/server/recipe/ShapelessRecipeJ FIELD field_11394 inputs Ljava/util/List; FIELD field_11395 outputCount I FIELD field_11396 output Lnet/minecraft/class_1792; - FIELD field_11397 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_11398 group Ljava/lang/String; METHOD (Lnet/minecraft/class_1935;I)V ARG 1 output ARG 2 outputCount - METHOD method_10443 offerTo (Ljava/util/function/Consumer;Lnet/minecraft/class_2960;)V + METHOD method_10443 (Ljava/util/function/Consumer;Lnet/minecraft/class_2960;)V ARG 1 exporter ARG 2 recipeId METHOD method_10445 validate (Lnet/minecraft/class_2960;)V @@ -23,9 +22,6 @@ CLASS net/minecraft/class_2450 net/minecraft/data/server/recipe/ShapelessRecipeJ METHOD method_10449 input (Lnet/minecraft/class_1935;I)Lnet/minecraft/class_2450; ARG 1 itemProvider ARG 2 size - METHOD method_10450 offerTo (Ljava/util/function/Consumer;Ljava/lang/String;)V - ARG 1 exporter - ARG 2 recipeIdStr METHOD method_10451 input (Lnet/minecraft/class_1856;)Lnet/minecraft/class_2450; ARG 1 ingredient METHOD method_10453 input (Lnet/minecraft/class_1856;I)Lnet/minecraft/class_2450; diff --git a/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.mapping b/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.mapping index be6f141382..300a9afd72 100644 --- a/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.mapping +++ b/mappings/net/minecraft/data/server/recipe/SingleItemRecipeJsonFactory.mapping @@ -20,10 +20,7 @@ CLASS net/minecraft/class_3981 net/minecraft/data/server/recipe/SingleItemRecipe METHOD method_17970 createStonecutting (Ljava/lang/String;Lnet/minecraft/class_184;)Lnet/minecraft/class_3981; ARG 1 criterionName ARG 2 conditions - METHOD method_17971 offerTo (Ljava/util/function/Consumer;Ljava/lang/String;)V - ARG 1 exporter - ARG 2 recipeIdStr - METHOD method_17972 offerTo (Ljava/util/function/Consumer;Lnet/minecraft/class_2960;)V + METHOD method_17972 (Ljava/util/function/Consumer;Lnet/minecraft/class_2960;)V ARG 1 exporter ARG 2 recipeId METHOD method_17973 validate (Lnet/minecraft/class_2960;)V diff --git a/mappings/net/minecraft/datafixer/fix/SwimStatsRenameFix.mapping b/mappings/net/minecraft/datafixer/fix/SwimStatsRenameFix.mapping index f48d49707d..7671639bc5 100644 --- a/mappings/net/minecraft/datafixer/fix/SwimStatsRenameFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/SwimStatsRenameFix.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_1213 net/minecraft/datafixer/fix/SwimStatsRenameFix - METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V + METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/Map;)V ARG 1 outputSchema - ARG 2 changesType diff --git a/mappings/net/minecraft/item/DebugStickItem.mapping b/mappings/net/minecraft/item/DebugStickItem.mapping index 399d72e745..64582640c5 100644 --- a/mappings/net/minecraft/item/DebugStickItem.mapping +++ b/mappings/net/minecraft/item/DebugStickItem.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_1763 net/minecraft/item/DebugStickItem ARG 0 state ARG 1 property ARG 2 inverse - METHOD method_7759 use (Lnet/minecraft/class_1657;Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;ZLnet/minecraft/class_1799;)V + METHOD method_7759 use (Lnet/minecraft/class_1657;Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;ZLnet/minecraft/class_1799;)Z ARG 1 player ARG 2 state ARG 3 world diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 751a38e441..d7f8f0d8e3 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -174,7 +174,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT

COMMENT Depending on block implementation, when combined together, the correct item and block may achieve a better mining speed and yield COMMENT drops that would not be obtained when mining otherwise. - COMMENT + COMMENT COMMENT @return values consistent with calls to {@link Item#isSuitableFor} COMMENT @see Item#isSuitableFor(BlockState) ARG 1 state diff --git a/mappings/net/minecraft/stat/ServerStatHandler.mapping b/mappings/net/minecraft/stat/ServerStatHandler.mapping index a03190032e..d5af73ffe8 100644 --- a/mappings/net/minecraft/stat/ServerStatHandler.mapping +++ b/mappings/net/minecraft/stat/ServerStatHandler.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_3442 net/minecraft/stat/ServerStatHandler FIELD field_15305 file Ljava/io/File; - FIELD field_15306 lastStatsUpdate I FIELD field_15307 pendingStats Ljava/util/Set; FIELD field_15308 server Lnet/minecraft/server/MinecraftServer; FIELD field_15309 LOGGER Lorg/apache/logging/log4j/Logger; diff --git a/mappings/net/minecraft/structure/MineshaftGenerator.mapping b/mappings/net/minecraft/structure/MineshaftGenerator.mapping index 8d4dfb3265..abdf7cc9b8 100644 --- a/mappings/net/minecraft/structure/MineshaftGenerator.mapping +++ b/mappings/net/minecraft/structure/MineshaftGenerator.mapping @@ -46,7 +46,6 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator ARG 5 orientation METHOD method_14715 addCobwebsUnderground (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Ljava/util/Random;FIII)V ARG 1 world - ARG 2 boundingBox ARG 3 random ARG 4 threshold ARG 5 x diff --git a/mappings/net/minecraft/structure/StructurePiece.mapping b/mappings/net/minecraft/structure/StructurePiece.mapping index 12041adbc0..5421f7af5b 100644 --- a/mappings/net/minecraft/structure/StructurePiece.mapping +++ b/mappings/net/minecraft/structure/StructurePiece.mapping @@ -147,7 +147,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece METHOD method_14943 writeNbt (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;)V ARG 1 world ARG 2 nbt - METHOD method_14945 addBlockWithRandomThreshold (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Ljava/util/Random;FIIILnet/minecraft/class_2680;Z)V + METHOD method_14945 addBlockWithRandomThreshold (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Ljava/util/Random;FIIILnet/minecraft/class_2680;)V ARG 1 world ARG 2 bounds ARG 3 random diff --git a/mappings/net/minecraft/world/gen/AquiferSampler.mapping b/mappings/net/minecraft/world/gen/AquiferSampler.mapping deleted file mode 100644 index 853b035310..0000000000 --- a/mappings/net/minecraft/world/gen/AquiferSampler.mapping +++ /dev/null @@ -1,52 +0,0 @@ -CLASS net/minecraft/class_5832 net/minecraft/world/gen/AquiferSampler - FIELD field_28813 edgeDensityNoise Lnet/minecraft/class_5216; - FIELD field_28814 waterLevelNoise Lnet/minecraft/class_5216; - FIELD field_28815 settings Lnet/minecraft/class_5284; - FIELD field_28816 waterLevels [I - FIELD field_28817 blockPositions [J - FIELD field_28818 densityAddition D - FIELD field_28819 waterLevel I - FIELD field_28820 needsFluidTick Z - FIELD field_28821 columnSampler Lnet/minecraft/class_5818; - FIELD field_28822 startX I - FIELD field_28823 startY I - FIELD field_28824 startZ I - FIELD field_28825 sizeX I - FIELD field_28826 sizeZ I - METHOD (IILnet/minecraft/class_5216;Lnet/minecraft/class_5216;Lnet/minecraft/class_5284;Lnet/minecraft/class_5818;II)V - ARG 1 x - ARG 2 z - ARG 3 edgeDensityNoise - ARG 4 waterLevelNoise - ARG 6 columnSampler - METHOD method_33733 getWaterLevel ()I - METHOD method_33734 getLocalX (I)I - ARG 1 x - METHOD method_33735 calculateDensity (IDII)D - ARG 1 y - ARG 2 noise - ARG 4 a - ARG 5 b - METHOD method_33736 maxDistance (II)D - ARG 1 a - ARG 2 b - METHOD method_33737 apply (III)V - ARG 1 x - ARG 2 y - ARG 3 z - METHOD method_33738 getWaterLevel (J)I - ARG 1 pos - METHOD method_33739 getDensityAddition ()D - METHOD method_33740 getLocalY (I)I - ARG 1 y - METHOD method_33741 index (III)I - ARG 1 x - ARG 2 y - ARG 3 z - METHOD method_33742 needsFluidTick ()Z - METHOD method_33743 getLocalZ (I)I - ARG 1 z - METHOD method_33744 getWaterLevel (III)I - ARG 1 x - ARG 2 y - ARG 3 z diff --git a/mappings/net/minecraft/world/gen/DeepslateBlockSource.mapping b/mappings/net/minecraft/world/gen/DeepslateBlockSource.mapping index e9d6a9dc5c..4b1e30f3f6 100644 --- a/mappings/net/minecraft/world/gen/DeepslateBlockSource.mapping +++ b/mappings/net/minecraft/world/gen/DeepslateBlockSource.mapping @@ -3,9 +3,8 @@ CLASS net/minecraft/class_5842 net/minecraft/world/gen/DeepslateBlockSource FIELD field_28910 seed J FIELD field_28911 defaultBlock Lnet/minecraft/class_2680; FIELD field_28912 deepslateState Lnet/minecraft/class_2680; - FIELD field_33513 settings Ljava/util/function/Supplier; - METHOD (JLnet/minecraft/class_2680;Lnet/minecraft/class_2680;Ljava/util/function/Supplier;)V + FIELD field_33513 settings Lnet/minecraft/class_5284; + METHOD (JLnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_5284;)V ARG 1 seed ARG 3 defaultBlock ARG 4 deepslateState - ARG 5 settings diff --git a/mappings/net/minecraft/world/gen/NoiseInterpolator.mapping b/mappings/net/minecraft/world/gen/NoiseInterpolator.mapping index 2768a75f6c..ca46d5d1fd 100644 --- a/mappings/net/minecraft/world/gen/NoiseInterpolator.mapping +++ b/mappings/net/minecraft/world/gen/NoiseInterpolator.mapping @@ -21,14 +21,11 @@ CLASS net/minecraft/class_5917 net/minecraft/world/gen/NoiseInterpolator FIELD field_29246 z1 D FIELD field_29247 startX I FIELD field_29248 startZ I - METHOD (IIIIIILnet/minecraft/class_5917$class_5918;)V + METHOD (IIILnet/minecraft/class_1923;ILnet/minecraft/class_5917$class_5918;)V ARG 1 sizeX ARG 2 sizeY ARG 3 sizeZ - ARG 4 chunkX ARG 5 chunkZ - ARG 6 minY - ARG 7 columnSampler METHOD method_34286 sampleStartNoise ()V METHOD method_34287 sampleNoiseY (D)V ARG 1 deltaY diff --git a/mappings/net/minecraft/world/gen/carver/Carver.mapping b/mappings/net/minecraft/world/gen/carver/Carver.mapping index 1ec7d1405f..4851dd477f 100644 --- a/mappings/net/minecraft/world/gen/carver/Carver.mapping +++ b/mappings/net/minecraft/world/gen/carver/Carver.mapping @@ -9,13 +9,12 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver FIELD field_24831 codec Lcom/mojang/serialization/Codec; METHOD (Lcom/mojang/serialization/Codec;)V ARG 1 configCodec - METHOD method_12702 carve (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/Random;ILnet/minecraft/class_1923;Ljava/util/BitSet;)Z + METHOD method_12702 carve (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/Random;Lnet/minecraft/class_6350;Lnet/minecraft/class_1923;Ljava/util/BitSet;)Z ARG 1 context ARG 2 config ARG 3 chunk ARG 4 posToBiome ARG 5 random - ARG 6 seaLevel ARG 7 pos ARG 8 carvingMask METHOD method_12703 canCarveBlock (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)Z @@ -37,8 +36,7 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver METHOD method_12709 canAlwaysCarveBlock (Lnet/minecraft/class_2680;)Z ARG 1 state METHOD method_12710 getBranchFactor ()I - METHOD method_16581 carveAtPoint (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/BitSet;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2338$class_2339;ILorg/apache/commons/lang3/mutable/MutableBoolean;)Z - ARG 1 context + METHOD method_16581 carveAtPoint (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/BitSet;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_6350;Lorg/apache/commons/lang3/mutable/MutableBoolean;)Z ARG 2 config ARG 3 chunk ARG 4 posToBiome @@ -46,7 +44,6 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver ARG 6 random ARG 7 pos ARG 8 downPos - ARG 9 mainChunkX ARG 10 foundSurface METHOD method_28614 configure (Lnet/minecraft/class_5871;)Lnet/minecraft/class_2922; ARG 1 config @@ -66,13 +63,11 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver ARG 5 maxY ARG 6 minZ ARG 7 maxZ - METHOD method_33978 carveRegion (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;JIDDDDDLjava/util/BitSet;Lnet/minecraft/class_2939$class_5874;)Z + METHOD method_33978 carveRegion (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;JLnet/minecraft/class_6350;DDDDDLjava/util/BitSet;Lnet/minecraft/class_2939$class_5874;)Z ARG 1 context ARG 2 config - ARG 3 chunk ARG 4 posToBiome ARG 5 seed - ARG 7 seaLevel ARG 8 x ARG 10 y ARG 12 z @@ -80,8 +75,6 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver ARG 16 verticalScale ARG 18 carvingMask ARG 19 skipPredicate - METHOD method_33979 getState (Lnet/minecraft/class_5871;)Lnet/minecraft/class_2680; - ARG 0 config METHOD method_33980 isDebug (Lnet/minecraft/class_5871;)Z ARG 0 config CLASS class_5874 SkipPredicate diff --git a/mappings/net/minecraft/world/gen/carver/CarverConfig.mapping b/mappings/net/minecraft/world/gen/carver/CarverConfig.mapping index 154a518f5b..6949c58d63 100644 --- a/mappings/net/minecraft/world/gen/carver/CarverConfig.mapping +++ b/mappings/net/minecraft/world/gen/carver/CarverConfig.mapping @@ -4,9 +4,8 @@ CLASS net/minecraft/class_5871 net/minecraft/world/gen/carver/CarverConfig FIELD field_31488 y Lnet/minecraft/class_6122; FIELD field_31489 yScale Lnet/minecraft/class_5863; FIELD field_31490 lavaLevel Lnet/minecraft/class_5843; - METHOD (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;Lnet/minecraft/class_5872;)V + METHOD (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;ZLnet/minecraft/class_5872;)V ARG 1 probability ARG 2 y ARG 3 yScale ARG 4 lavaLevel - ARG 5 debugConfig diff --git a/mappings/net/minecraft/world/gen/carver/CarverDebugConfig.mapping b/mappings/net/minecraft/world/gen/carver/CarverDebugConfig.mapping index 564c13ebb9..58d4227502 100644 --- a/mappings/net/minecraft/world/gen/carver/CarverDebugConfig.mapping +++ b/mappings/net/minecraft/world/gen/carver/CarverDebugConfig.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_5872 net/minecraft/world/gen/carver/CarverDebugConfig FIELD field_29056 CODEC Lcom/mojang/serialization/Codec; FIELD field_29057 debugMode Z FIELD field_29058 debugState Lnet/minecraft/class_2680; - METHOD (ZLnet/minecraft/class_2680;)V + METHOD (ZLnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V ARG 1 debugMode ARG 2 debugState METHOD method_33970 isDebugMode ()Z diff --git a/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping b/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping index 551723cbe6..4f080ebb94 100644 --- a/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping @@ -1,11 +1,10 @@ CLASS net/minecraft/class_2925 net/minecraft/world/gen/carver/CaveCarver - METHOD method_12674 carveCave (Lnet/minecraft/class_5873;Lnet/minecraft/class_6108;Lnet/minecraft/class_2791;Ljava/util/function/Function;JIDDDFDLjava/util/BitSet;Lnet/minecraft/class_2939$class_5874;)V + METHOD method_12674 carveCave (Lnet/minecraft/class_5873;Lnet/minecraft/class_6108;Lnet/minecraft/class_2791;Ljava/util/function/Function;JLnet/minecraft/class_6350;DDDFDLjava/util/BitSet;Lnet/minecraft/class_2939$class_5874;)V ARG 1 context ARG 2 config ARG 3 chunk ARG 4 posToBiome ARG 5 seed - ARG 7 seaLevel ARG 8 x ARG 10 y ARG 12 z @@ -13,13 +12,12 @@ CLASS net/minecraft/class_2925 net/minecraft/world/gen/carver/CaveCarver ARG 15 yawPitchRatio ARG 17 carvingMask ARG 18 skipPredicate - METHOD method_12675 carveTunnels (Lnet/minecraft/class_5873;Lnet/minecraft/class_6108;Lnet/minecraft/class_2791;Ljava/util/function/Function;JIDDDDDFFFIIDLjava/util/BitSet;Lnet/minecraft/class_2939$class_5874;)V + METHOD method_12675 carveTunnels (Lnet/minecraft/class_5873;Lnet/minecraft/class_6108;Lnet/minecraft/class_2791;Ljava/util/function/Function;JLnet/minecraft/class_6350;DDDDDFFFIIDLjava/util/BitSet;Lnet/minecraft/class_2939$class_5874;)V ARG 1 context ARG 2 config ARG 3 chunk ARG 4 posToBiome ARG 5 seed - ARG 7 seaLevel ARG 8 x ARG 10 y ARG 12 z diff --git a/mappings/net/minecraft/world/gen/carver/CaveCarverConfig.mapping b/mappings/net/minecraft/world/gen/carver/CaveCarverConfig.mapping index 65130d8c44..df023feee6 100644 --- a/mappings/net/minecraft/world/gen/carver/CaveCarverConfig.mapping +++ b/mappings/net/minecraft/world/gen/carver/CaveCarverConfig.mapping @@ -3,23 +3,16 @@ CLASS net/minecraft/class_6108 net/minecraft/world/gen/carver/CaveCarverConfig FIELD field_31492 horizontalRadiusMultiplier Lnet/minecraft/class_5863; FIELD field_31493 verticalRadiusMultiplier Lnet/minecraft/class_5863; FIELD field_31494 floorLevel Lnet/minecraft/class_5863; - METHOD (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;)V + METHOD (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;ZLnet/minecraft/class_5863;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;)V ARG 1 probability ARG 2 y ARG 3 yScale ARG 4 lavaLevel - ARG 5 horizontalRadiusMultiplier - ARG 6 verticalRadiusMultiplier - ARG 7 floorLevel - METHOD (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;Lnet/minecraft/class_5872;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;)V + METHOD (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;ZLnet/minecraft/class_5872;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;)V ARG 1 probability ARG 2 y ARG 3 yScale ARG 4 lavaLevel - ARG 5 debugConfig - ARG 6 horizontalRadiusMultiplier - ARG 7 verticalRadiusMultiplier - ARG 8 floorLevel METHOD (Lnet/minecraft/class_5871;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;Lnet/minecraft/class_5863;)V ARG 2 horizontalRadiusMultiplier ARG 3 verticalRadiusMultiplier diff --git a/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping b/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping index 5c5c0176bd..de18d7e0d8 100644 --- a/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping @@ -7,12 +7,11 @@ CLASS net/minecraft/class_2922 net/minecraft/world/gen/carver/ConfiguredCarver METHOD (Lnet/minecraft/class_2939;Lnet/minecraft/class_5871;)V ARG 1 carver ARG 2 config - METHOD method_12668 carve (Lnet/minecraft/class_5873;Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/Random;ILnet/minecraft/class_1923;Ljava/util/BitSet;)Z + METHOD method_12668 carve (Lnet/minecraft/class_5873;Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/Random;Lnet/minecraft/class_6350;Lnet/minecraft/class_1923;Ljava/util/BitSet;)Z ARG 1 context ARG 2 chunk ARG 3 posToBiome ARG 4 random - ARG 5 chunkX ARG 6 pos ARG 7 carvingMask METHOD method_12669 shouldCarve (Ljava/util/Random;)Z diff --git a/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping b/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping index 76cc1bc535..8e2646598d 100644 --- a/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping @@ -6,13 +6,12 @@ CLASS net/minecraft/class_5870 net/minecraft/world/gen/carver/RavineCarver ARG 3 pitch ARG 5 branchCount ARG 6 branchIndex - METHOD method_33961 carveRavine (Lnet/minecraft/class_5873;Lnet/minecraft/class_5869;Lnet/minecraft/class_2791;Ljava/util/function/Function;JIDDDFFFIIDLjava/util/BitSet;)V + METHOD method_33961 carveRavine (Lnet/minecraft/class_5873;Lnet/minecraft/class_5869;Lnet/minecraft/class_2791;Ljava/util/function/Function;JLnet/minecraft/class_6350;DDDFFFIIDLjava/util/BitSet;)V ARG 1 context ARG 2 config ARG 3 chunk ARG 4 posToBiome ARG 5 seed - ARG 7 seaLevel ARG 8 x ARG 10 y ARG 12 z diff --git a/mappings/net/minecraft/world/gen/carver/RavineCarverConfig.mapping b/mappings/net/minecraft/world/gen/carver/RavineCarverConfig.mapping index 8c90fc6321..1ad78a7c76 100644 --- a/mappings/net/minecraft/world/gen/carver/RavineCarverConfig.mapping +++ b/mappings/net/minecraft/world/gen/carver/RavineCarverConfig.mapping @@ -2,14 +2,11 @@ CLASS net/minecraft/class_5869 net/minecraft/world/gen/carver/RavineCarverConfig FIELD field_29041 RAVINE_CODEC Lcom/mojang/serialization/Codec; FIELD field_31479 verticalRotation Lnet/minecraft/class_5863; FIELD field_31480 shape Lnet/minecraft/class_5869$class_6107; - METHOD (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;Lnet/minecraft/class_5872;Lnet/minecraft/class_5863;Lnet/minecraft/class_5869$class_6107;)V + METHOD (FLnet/minecraft/class_6122;Lnet/minecraft/class_5863;Lnet/minecraft/class_5843;ZLnet/minecraft/class_5872;Lnet/minecraft/class_5863;Lnet/minecraft/class_5869$class_6107;)V ARG 1 probability ARG 2 y ARG 3 yScale ARG 4 lavaLevel - ARG 5 debugConfig - ARG 6 verticalRotation - ARG 7 shape METHOD (Lnet/minecraft/class_5871;Lnet/minecraft/class_5863;Lnet/minecraft/class_5869$class_6107;)V ARG 2 verticalRotation ARG 3 shape diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index 4e90f1a539..beb5dcedf5 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -56,7 +56,6 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator COMMENT Generates caves for the given chunk. ARG 1 seed ARG 3 access - ARG 4 chunk ARG 5 carver METHOD method_12109 getStructuresConfig ()Lnet/minecraft/class_5311; METHOD method_12110 buildSurface (Lnet/minecraft/class_3233;Lnet/minecraft/class_2791;)V diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping index 9d1e9601e1..8cf2d7b61e 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti FIELD field_28847 noiseCaves Z FIELD field_28914 deepslate Z FIELD field_33412 minSurfaceLevel I - METHOD (Lnet/minecraft/class_5311;Lnet/minecraft/class_5309;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;IIIIZZZZ)V + METHOD (Lnet/minecraft/class_5311;Lnet/minecraft/class_5309;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;IIIIZZZZZ)V ARG 1 structuresConfig ARG 2 generationShapeConfig ARG 3 defaultBlock diff --git a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping index 003df1cdaf..ac24fbb554 100644 --- a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping @@ -16,7 +16,6 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator FIELD field_28748 noiseColumnSampler Lnet/minecraft/class_5818; FIELD field_28843 edgeDensityNoise Lnet/minecraft/class_5216; FIELD field_28844 waterLevelNoise Lnet/minecraft/class_5216; - FIELD field_28845 hasAquifers Z FIELD field_28913 deepslateSource Lnet/minecraft/class_5840; METHOD (Lnet/minecraft/class_1966;JLjava/util/function/Supplier;)V ARG 1 biomeSource @@ -45,7 +44,7 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator METHOD method_28548 matchesSettings (JLnet/minecraft/class_5321;)Z ARG 1 seed ARG 3 settingsKey - METHOD method_33643 getBlockState (Lnet/minecraft/class_5817;Lnet/minecraft/class_5832;Lnet/minecraft/class_5840;IIID)Lnet/minecraft/class_2680; + METHOD method_33643 getBlockState (Lnet/minecraft/class_5817;Lnet/minecraft/class_6350;Lnet/minecraft/class_5840;IIID)Lnet/minecraft/class_2680; ARG 1 structures ARG 2 aquiferSampler ARG 3 blockInterpolator @@ -56,8 +55,6 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator METHOD method_33754 populateNoise (Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;II)Lnet/minecraft/class_2791; ARG 1 accessor ARG 2 chunk - ARG 3 minY - ARG 4 noiseSizeY METHOD method_34284 sampleNoiseColumn ([DIIII)V ARG 1 buffer ARG 2 x diff --git a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping index 02189f8299..30cf06a458 100644 --- a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping @@ -85,7 +85,7 @@ CLASS net/minecraft/class_3864 net/minecraft/world/gen/feature/DefaultBiomeFeatu ARG 0 builder METHOD method_17004 addDungeons (Lnet/minecraft/class_5485$class_5495;)V ARG 0 builder - METHOD method_17005 addMineables (Lnet/minecraft/class_5485$class_5495;)V + METHOD method_17005 addMineables (Lnet/minecraft/class_5485$class_5495;Z)V ARG 0 builder METHOD method_17006 addDefaultOres (Lnet/minecraft/class_5485$class_5495;)V ARG 0 builder diff --git a/mappings/net/minecraft/world/gen/feature/EmeraldOreFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/EmeraldOreFeatureConfig.mapping index f97718c9a2..c54abc49e9 100644 --- a/mappings/net/minecraft/world/gen/feature/EmeraldOreFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/EmeraldOreFeatureConfig.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_3154 net/minecraft/world/gen/feature/EmeraldOreFeatureConfig - FIELD field_13765 target Lnet/minecraft/class_2680; - FIELD field_13766 state Lnet/minecraft/class_2680; + FIELD field_13765 target Ljava/util/List; FIELD field_24904 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V ARG 1 target diff --git a/mappings/net/minecraft/world/gen/feature/RootSystemFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/RootSystemFeatureConfig.mapping index f36717f880..98fb737d8c 100644 --- a/mappings/net/minecraft/world/gen/feature/RootSystemFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/RootSystemFeatureConfig.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_5926 net/minecraft/world/gen/feature/RootSystemFeature FIELD field_29276 hangingRootVerticalSpan I FIELD field_29277 hangingRootStateProvider Lnet/minecraft/class_4651; FIELD field_29278 hangingRootPlacementAttempts I - METHOD (Ljava/util/function/Supplier;IILnet/minecraft/class_2960;Lnet/minecraft/class_4651;IIIILnet/minecraft/class_4651;I)V + METHOD (Ljava/util/function/Supplier;IILnet/minecraft/class_2960;Lnet/minecraft/class_4651;IIIILnet/minecraft/class_4651;II)V ARG 1 feature ARG 2 requiredVerticalSpaceForTree ARG 3 rootRadius