From a3a508b7cf57061f88e38444c9023809a551ad33 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 20 Oct 2021 20:37:00 +0100 Subject: [PATCH] 21w42a --- build.gradle | 2 +- .../blaze3d/systems/RenderSystem.mapping | 2 - .../particle/ItemBillboardParticle.mapping | 3 -- .../client/render/item/ItemModels.mapping | 4 -- .../client/world/ClientWorld.mapping | 11 +---- .../client/world/GeneratorType.mapping | 5 +-- .../model/BlockStateModelGenerator.mapping | 1 - .../minecraft/server/MinecraftServer.mapping | 2 - .../noise/OctavePerlinNoiseSampler.mapping | 12 ----- .../world/dimension/DimensionType.mapping | 14 +----- .../world/gen/GeneratorOptions.mapping | 7 +-- .../world/gen/MultiNoiseParameters.mapping | 21 --------- .../world/gen/NoiseColumnSampler.mapping | 44 +------------------ .../blockpredicate/TrueBlockPredicate.mapping | 6 --- .../gen/chunk/ChunkGeneratorSettings.mapping | 18 +------- .../gen/chunk/GenerationShapeConfig.mapping | 6 +-- .../gen/chunk/NoiseChunkGenerator.mapping | 9 ---- .../CaveSurfaceDecoratorConfig.mapping | 2 +- .../gen/feature/SmallDripstoneFeature.mapping | 18 +------- .../SmallDripstoneFeatureConfig.mapping | 8 +--- .../gen/feature/util/DripstoneHelper.mapping | 8 ++-- .../world/gen/random/RandomDeriver.mapping | 1 - .../gen/surfacebuilder/MaterialRules.mapping | 11 +---- .../gen/surfacebuilder/SurfaceBuilder.mapping | 16 +------ .../VanillaSurfaceRules.mapping | 4 -- 25 files changed, 22 insertions(+), 213 deletions(-) delete mode 100644 mappings/net/minecraft/client/particle/ItemBillboardParticle.mapping delete mode 100644 mappings/net/minecraft/world/gen/MultiNoiseParameters.mapping delete mode 100644 mappings/net/minecraft/world/gen/blockpredicate/TrueBlockPredicate.mapping diff --git a/build.gradle b/build.gradle index 2c791b8b13..cfc2a6dd76 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "21w41a" +def minecraft_version = "21w42a" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping index de088570ca..1334599af1 100644 --- a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping +++ b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping @@ -1,8 +1,6 @@ CLASS com/mojang/blaze3d/systems/RenderSystem METHOD activeTexture (I)V ARG 0 texture - METHOD assertThread (Ljava/util/function/Supplier;)V - ARG 0 check METHOD bindTexture (I)V ARG 0 texture METHOD blendEquation (I)V diff --git a/mappings/net/minecraft/client/particle/ItemBillboardParticle.mapping b/mappings/net/minecraft/client/particle/ItemBillboardParticle.mapping deleted file mode 100644 index 447a678ed3..0000000000 --- a/mappings/net/minecraft/client/particle/ItemBillboardParticle.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_6237 net/minecraft/client/particle/ItemBillboardParticle - CLASS class_6238 BarrierFactory - CLASS class_6239 LightFactory diff --git a/mappings/net/minecraft/client/render/item/ItemModels.mapping b/mappings/net/minecraft/client/render/item/ItemModels.mapping index d6edf8ba5b..abe4f4b1e5 100644 --- a/mappings/net/minecraft/client/render/item/ItemModels.mapping +++ b/mappings/net/minecraft/client/render/item/ItemModels.mapping @@ -7,12 +7,8 @@ CLASS net/minecraft/class_763 net/minecraft/client/render/item/ItemModels METHOD method_3303 getModelManager ()Lnet/minecraft/class_1092; METHOD method_3304 getModel (Lnet/minecraft/class_1792;)Lnet/minecraft/class_1087; ARG 1 item - METHOD method_3305 getModelParticleSprite (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1058; - ARG 1 stack METHOD method_3306 getModelId (Lnet/minecraft/class_1792;)I ARG 0 item - METHOD method_3307 getModelParticleSprite (Lnet/minecraft/class_1935;)Lnet/minecraft/class_1058; - ARG 1 item METHOD method_3308 getModel (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1087; ARG 1 stack METHOD method_3309 putModel (Lnet/minecraft/class_1792;Lnet/minecraft/class_1091;)V diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index 5d8e70f3fe..03e60d938c 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -84,13 +84,12 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld METHOD method_2942 addEntity (ILnet/minecraft/class_1297;)V ARG 1 id ARG 2 entity - METHOD method_2943 randomBlockDisplayTick (IIIILjava/util/Random;Lnet/minecraft/class_638$class_6234;Lnet/minecraft/class_2338$class_2339;)V + METHOD method_2943 randomBlockDisplayTick (IIIILjava/util/Random;Lnet/minecraft/class_2248;Lnet/minecraft/class_2338$class_2339;)V ARG 1 centerX ARG 2 centerY ARG 3 centerZ ARG 4 radius ARG 5 random - ARG 6 blockParticle ARG 7 pos METHOD method_2944 setScoreboard (Lnet/minecraft/class_269;)V ARG 1 scoreboard @@ -112,7 +111,7 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld METHOD method_30671 getSpawnAngle ()F METHOD method_32124 (Lnet/minecraft/class_1297;)V ARG 1 entity - METHOD method_35752 getBlockParticle ()Lnet/minecraft/class_638$class_6234; + METHOD method_35752 getBlockParticle ()Lnet/minecraft/class_2248; METHOD method_35753 putMapStates (Ljava/util/Map;)V ARG 1 mapStates METHOD method_35754 getMapStates ()Ljava/util/Map; @@ -161,9 +160,3 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 1 world METHOD method_28106 getHorizonShadingRatio ()D CLASS class_5612 ClientEntityHandler - CLASS class_6234 BlockParticle - FIELD field_32644 block Lnet/minecraft/class_2248; - FIELD field_32645 particle Lnet/minecraft/class_2394; - METHOD (Ljava/lang/String;ILnet/minecraft/class_2248;Lnet/minecraft/class_2394;)V - ARG 3 block - ARG 4 particle diff --git a/mappings/net/minecraft/client/world/GeneratorType.mapping b/mappings/net/minecraft/client/world/GeneratorType.mapping index ef9f0d339d..975034a733 100644 --- a/mappings/net/minecraft/client/world/GeneratorType.mapping +++ b/mappings/net/minecraft/client/world/GeneratorType.mapping @@ -11,10 +11,7 @@ CLASS net/minecraft/class_5317 net/minecraft/client/world/GeneratorType METHOD (Ljava/lang/String;)V ARG 1 translationKeySuffix METHOD method_29075 getDisplayName ()Lnet/minecraft/class_2561; - METHOD method_29076 getChunkGenerator (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;J)Lnet/minecraft/class_2794; - ARG 1 biomeRegistry - ARG 2 chunkGeneratorSettingsRegistry - ARG 3 seed + METHOD method_29076 getChunkGenerator (Lnet/minecraft/class_5455;J)Lnet/minecraft/class_2794; METHOD method_29077 createDefaultOptions (Lnet/minecraft/class_5455$class_5457;JZZ)Lnet/minecraft/class_5285; ARG 1 registryManager ARG 2 seed diff --git a/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping index 7757620d37..83b66141f3 100644 --- a/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping @@ -419,7 +419,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/model/BlockStateModelGe ARG 1 block ARG 2 texture ARG 3 model - METHOD method_35869 registerLightModel ()V METHOD method_36440 registerInfestedDeepslate ()V METHOD method_37317 registerPottedAzaleaBush (Lnet/minecraft/class_2248;)V ARG 1 block diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index 7153f5b091..035428551e 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -173,8 +173,6 @@ CLASS net/minecraft/server/MinecraftServer METHOD method_30002 getOverworld ()Lnet/minecraft/class_3218; METHOD method_30611 getRegistryManager ()Lnet/minecraft/class_5455; METHOD method_30612 getRateLimit ()I - METHOD method_31146 (Lnet/minecraft/class_1959;)Z - ARG 0 biome METHOD method_31371 createFilterer (Lnet/minecraft/class_3222;)Lnet/minecraft/class_5513; ARG 1 player METHOD method_31400 generateKeyPair ()V diff --git a/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping b/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping index e667e17e5e..692f2e44cb 100644 --- a/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping +++ b/mappings/net/minecraft/util/math/noise/OctavePerlinNoiseSampler.mapping @@ -3,18 +3,6 @@ CLASS net/minecraft/class_3537 net/minecraft/util/math/noise/OctavePerlinNoiseSa FIELD field_20659 persistence D FIELD field_20660 lacunarity D FIELD field_26445 amplitudes Lit/unimi/dsi/fastutil/doubles/DoubleList; - METHOD (Lnet/minecraft/class_5819;Lcom/mojang/datafixers/util/Pair;)V - ARG 1 random - ARG 2 offsetAndAmplitudes - METHOD (Lnet/minecraft/class_5819;Lit/unimi/dsi/fastutil/ints/IntSortedSet;)V - ARG 1 random - ARG 2 octaves - METHOD (Lnet/minecraft/class_5819;Ljava/util/List;)V - ARG 1 random - ARG 2 octaves - METHOD (Lnet/minecraft/class_5819;Ljava/util/stream/IntStream;)V - ARG 1 random - ARG 2 octaves METHOD method_15416 sample (DDD)D ARG 1 x ARG 3 y diff --git a/mappings/net/minecraft/world/dimension/DimensionType.mapping b/mappings/net/minecraft/world/dimension/DimensionType.mapping index 3084b497a3..f8f5827183 100644 --- a/mappings/net/minecraft/world/dimension/DimensionType.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionType.mapping @@ -81,11 +81,7 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType ARG 0 ambientLight METHOD method_28516 getBrightness (I)F ARG 1 lightLevel - METHOD method_28517 createDefaultDimensionOptions (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;J)Lnet/minecraft/class_2370; - ARG 0 dimensionRegistry - ARG 1 biomeRegistry - ARG 2 chunkGeneratorSettingsRegistry - ARG 3 seed + METHOD method_28517 createDefaultDimensionOptions (Lnet/minecraft/class_5455;J)Lnet/minecraft/class_2370; METHOD method_28521 worldFromDimensionNbt (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/DataResult; ARG 0 nbt METHOD method_28522 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; @@ -100,14 +96,6 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType COMMENT

This is typically used to determine the size of the moon that should be rendered. ARG 1 time COMMENT the time to calculate the index from - METHOD method_28533 createEndGenerator (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;J)Lnet/minecraft/class_2794; - ARG 0 biomeRegistry - ARG 1 chunkGeneratorSettingsRegistry - ARG 2 seed - METHOD method_28535 createNetherGenerator (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;J)Lnet/minecraft/class_2794; - ARG 0 biomeRegistry - ARG 1 chunkGeneratorSettingsRegistry - ARG 2 seed METHOD method_28537 isNatural ()Z METHOD method_28540 hasEnderDragonFight ()Z METHOD method_29955 isPiglinSafe ()Z diff --git a/mappings/net/minecraft/world/gen/GeneratorOptions.mapping b/mappings/net/minecraft/world/gen/GeneratorOptions.mapping index d69e8852aa..12ab48f0af 100644 --- a/mappings/net/minecraft/world/gen/GeneratorOptions.mapping +++ b/mappings/net/minecraft/world/gen/GeneratorOptions.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/class_5285 net/minecraft/world/gen/GeneratorOptions ARG 4 bonusChest ARG 5 options ARG 6 legacyCustomOptions - METHOD method_28009 getDefaultOptions (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;)Lnet/minecraft/class_5285; + METHOD method_28009 getDefaultOptions (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5285; METHOD method_28021 fromProperties (Lnet/minecraft/class_5455;Ljava/util/Properties;)Lnet/minecraft/class_5285; ARG 0 registryManager ARG 1 properties @@ -34,10 +34,7 @@ CLASS net/minecraft/class_5285 net/minecraft/world/gen/GeneratorOptions METHOD method_28036 withBonusChest ()Lnet/minecraft/class_5285; METHOD method_28037 toggleGenerateStructures ()Lnet/minecraft/class_5285; METHOD method_28038 toggleBonusChest ()Lnet/minecraft/class_5285; - METHOD method_28604 createOverworldGenerator (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;J)Lnet/minecraft/class_3754; - ARG 0 biomeRegistry - ARG 1 chunkGeneratorSettingsRegistry - ARG 2 seed + METHOD method_28604 createOverworldGenerator (Lnet/minecraft/class_5455;J)Lnet/minecraft/class_3754; METHOD method_28606 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_28608 getRegistryWithReplacedOverworldGenerator (Lnet/minecraft/class_2378;Lnet/minecraft/class_2370;Lnet/minecraft/class_2794;)Lnet/minecraft/class_2370; diff --git a/mappings/net/minecraft/world/gen/MultiNoiseParameters.mapping b/mappings/net/minecraft/world/gen/MultiNoiseParameters.mapping deleted file mode 100644 index c2ec580a7a..0000000000 --- a/mappings/net/minecraft/world/gen/MultiNoiseParameters.mapping +++ /dev/null @@ -1,21 +0,0 @@ -CLASS net/minecraft/class_2088 net/minecraft/world/gen/MultiNoiseParameters - FIELD field_24727 CODEC Lcom/mojang/serialization/Codec; - FIELD field_34626 temperature Lnet/minecraft/class_5216$class_5487; - FIELD field_34627 humidity Lnet/minecraft/class_5216$class_5487; - FIELD field_34628 continentalness Lnet/minecraft/class_5216$class_5487; - FIELD field_34629 erosion Lnet/minecraft/class_5216$class_5487; - FIELD field_34630 weirdness Lnet/minecraft/class_5216$class_5487; - FIELD field_34631 shift Lnet/minecraft/class_5216$class_5487; - METHOD (Lnet/minecraft/class_5216$class_5487;Lnet/minecraft/class_5216$class_5487;Lnet/minecraft/class_5216$class_5487;Lnet/minecraft/class_5216$class_5487;Lnet/minecraft/class_5216$class_5487;Lnet/minecraft/class_5216$class_5487;)V - ARG 1 temperature - ARG 2 humidity - ARG 3 continentalness - ARG 4 erosion - ARG 5 weirdness - ARG 6 shift - METHOD method_38365 temperature ()Lnet/minecraft/class_5216$class_5487; - METHOD method_38367 humidity ()Lnet/minecraft/class_5216$class_5487; - METHOD method_38368 continentalness ()Lnet/minecraft/class_5216$class_5487; - METHOD method_38369 erosion ()Lnet/minecraft/class_5216$class_5487; - METHOD method_38370 weirdness ()Lnet/minecraft/class_5216$class_5487; - METHOD method_38371 shift ()Lnet/minecraft/class_5216$class_5487; diff --git a/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping b/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping index 9f5b31ecb1..534ab0c997 100644 --- a/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping +++ b/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping @@ -48,52 +48,12 @@ CLASS net/minecraft/class_5818 net/minecraft/world/gen/NoiseColumnSampler FIELD field_34686 aquiferRandomDeriver Lnet/minecraft/class_6574; FIELD field_35131 aquiferFluidLevelFloodednessNoise Lnet/minecraft/class_5216; FIELD field_35132 aquiferFluidLevelSpreadNoise Lnet/minecraft/class_5216; - FIELD field_35185 SPAGHETTI_3D_RARITY_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35186 SPAGHETTI_3D_THICKNESS_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35187 SPAGHETTI_ROUGHNESS_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35188 SPAGHETTI_ROUGHNESS_MODULATOR_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35189 CAVE_ENTRANCE_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35190 CAVE_LAYER_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35191 CAVE_CHEESE_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35192 JAGGED_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35193 ORE_FREQUENCY_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35194 FIRST_ORE_PLACEMENT_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35195 SECOND_ORE_PLACEMENT_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35196 ORE_GAP_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35197 NOODLE_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35198 NOODLE_THICKNESS_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35199 NOODLE_RIDGE_FIRST_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35200 NOODLE_RIDGE_SECOND_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35201 oreFrequencyNoiseSampler Lnet/minecraft/class_5216; - FIELD field_35202 firstOrePlacementNoise Lnet/minecraft/class_5216; - FIELD field_35203 secondOrePlacementNoise Lnet/minecraft/class_5216; - FIELD field_35204 noodleNoise Lnet/minecraft/class_5216; - FIELD field_35205 noodleThicknessNoise Lnet/minecraft/class_5216; - FIELD field_35206 noodleRidgeFirstNoise Lnet/minecraft/class_5216; - FIELD field_35207 noodleRidgeSecondNoise Lnet/minecraft/class_5216; FIELD field_35208 depthBasedLayerRandomDeriver Lnet/minecraft/class_6574; - FIELD field_35209 AQUIFER_BARRIER_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35210 AQUIFER_FLUID_LEVEL_FLOODEDNESS_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35211 AQUIFER_LAVA_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35212 AQUIFER_FLUID_LEVEL_SPREAD_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35213 PILLAR_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35214 PILLAR_RARENESS_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35215 PILLAR_THICKNESS_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35216 SPAGHETTI_2D_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35217 SPAGHETTI_2D_ELEVATION_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35218 SPAGHETTI_2D_MODULATOR_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35219 SPAGHETTI_2D_THICKNESS_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35220 SPAGHETTI_3D_FIRST_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35221 SPAGHETTI_3D_SECOND_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - METHOD (IIILnet/minecraft/class_5309;Lnet/minecraft/class_2088;ZJLnet/minecraft/class_2919$class_6675;)V + METHOD (IIILnet/minecraft/class_5309;ZJLnet/minecraft/class_2378;Lnet/minecraft/class_2919$class_6675;)V ARG 1 horizontalNoiseResolution ARG 2 verticalNoiseResolution ARG 3 noiseSizeY ARG 4 config - ARG 5 noiseParameters - ARG 6 hasNoiseCaves - ARG 7 seed - ARG 9 randomProvider METHOD method_33645 applySlides (DI)D COMMENT Interpolates the noise at the top and bottom of the world. ARG 1 noise @@ -239,8 +199,6 @@ CLASS net/minecraft/class_5818 net/minecraft/world/gen/NoiseColumnSampler ARG 1 y ARG 2 z METHOD method_39043 getDepthBasedLayerRandomDeriver ()Lnet/minecraft/class_6574; - METHOD method_39044 addDebugInfo (Ljava/lang/StringBuilder;)V - ARG 1 info CLASS class_5841 CaveScaler METHOD method_33835 scaleCaves (D)D ARG 0 value diff --git a/mappings/net/minecraft/world/gen/blockpredicate/TrueBlockPredicate.mapping b/mappings/net/minecraft/world/gen/blockpredicate/TrueBlockPredicate.mapping deleted file mode 100644 index a6e4070a90..0000000000 --- a/mappings/net/minecraft/world/gen/blockpredicate/TrueBlockPredicate.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_6680 net/minecraft/world/gen/blockpredicate/TrueBlockPredicate - FIELD field_35158 INSTANCE Lnet/minecraft/class_6680; - FIELD field_35159 CODEC Lcom/mojang/serialization/Codec; - METHOD test (Ljava/lang/Object;Ljava/lang/Object;)Z - ARG 1 world - ARG 2 pos diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping index 99c690dd86..1e7df3882a 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping @@ -21,25 +21,12 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti FIELD field_28914 deepslate Z FIELD field_33587 oreVeins Z FIELD field_33651 noodleCaves Z - FIELD field_34625 multiNoiseParameters Lnet/minecraft/class_2088; FIELD field_35051 LARGE_BIOMES Lnet/minecraft/class_5321; FIELD field_35184 surfaceRule Lnet/minecraft/class_6686$class_6708; - METHOD (Lnet/minecraft/class_5311;Lnet/minecraft/class_5309;Lnet/minecraft/class_2088;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_6686$class_6708;IIIZZZZZZZ)V + METHOD (Lnet/minecraft/class_5311;Lnet/minecraft/class_5309;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_6686$class_6708;IIIZZZZZZZ)V ARG 1 structuresConfig ARG 2 generationShapeConfig - ARG 3 multiNoiseParameters ARG 4 defaultBlock - ARG 5 defaultFluid - ARG 6 surfaceRule - ARG 7 bedrockCeilingY - ARG 8 bedrockFloorY - ARG 9 seaLevel - ARG 10 mobGenerationDisabled - ARG 11 aquifers - ARG 12 noiseCaves - ARG 13 deepslate - ARG 14 oreVeins - ARG 15 noodleCaves METHOD method_16400 getBedrockCeilingY ()I COMMENT Returns the Y level of the bedrock ceiling. COMMENT @@ -69,7 +56,7 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti ARG 0 structuresConfig ARG 1 defaultBlock ARG 2 defaultFluid - METHOD method_30643 createSurfaceSettings (Lnet/minecraft/class_5311;ZZZ)Lnet/minecraft/class_5284; + METHOD method_30643 createSurfaceSettings (Lnet/minecraft/class_5311;ZZ)Lnet/minecraft/class_5284; ARG 0 structuresConfig ARG 1 amplified METHOD method_30644 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_5284;)Lnet/minecraft/class_5284; @@ -81,5 +68,4 @@ CLASS net/minecraft/class_5284 net/minecraft/world/gen/chunk/ChunkGeneratorSetti METHOD method_33839 hasDeepslate ()Z METHOD method_36396 hasOreVeins ()Z METHOD method_36468 hasNoodleCaves ()Z - METHOD method_38364 getMultiNoiseParameters ()Lnet/minecraft/class_2088; METHOD method_39042 getSurfaceRule ()Lnet/minecraft/class_6686$class_6708; diff --git a/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping b/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping index 70577c0654..165e190f5b 100644 --- a/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping +++ b/mappings/net/minecraft/world/gen/chunk/GenerationShapeConfig.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/class_5309 net/minecraft/world/gen/chunk/GenerationShapeConf FIELD comp_182 islandNoiseOverride Z FIELD comp_183 amplified Z FIELD field_24804 CODEC Lcom/mojang/serialization/Codec; - METHOD (IILnet/minecraft/class_5308;Lnet/minecraft/class_5310;Lnet/minecraft/class_5310;IIDDZZZ)V + METHOD (IILnet/minecraft/class_5308;Lnet/minecraft/class_5310;Lnet/minecraft/class_5310;IIDDZZ)V ARG 1 minimumY ARG 2 height ARG 3 sampling @@ -23,7 +23,6 @@ CLASS net/minecraft/class_5309 net/minecraft/world/gen/chunk/GenerationShapeConf ARG 10 densityOffset ARG 12 simplexSurfaceNoise ARG 13 randomDensityOffset - ARG 14 islandNoiseOverride METHOD comp_173 minimumY ()I METHOD comp_174 height ()I METHOD comp_175 sampling ()Lnet/minecraft/class_5308; @@ -37,7 +36,7 @@ CLASS net/minecraft/class_5309 net/minecraft/world/gen/chunk/GenerationShapeConf METHOD comp_183 amplified ()Z METHOD method_28582 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_32994 create (IILnet/minecraft/class_5308;Lnet/minecraft/class_5310;Lnet/minecraft/class_5310;IIDDZZZ)Lnet/minecraft/class_5309; + METHOD method_32994 create (IILnet/minecraft/class_5308;Lnet/minecraft/class_5310;Lnet/minecraft/class_5310;IIDDZZ)Lnet/minecraft/class_5309; ARG 0 minimumY ARG 1 height ARG 2 sampling @@ -49,6 +48,5 @@ CLASS net/minecraft/class_5309 net/minecraft/world/gen/chunk/GenerationShapeConf ARG 9 densityOffset ARG 11 simplexSurfaceNoise ARG 12 randomDensityOffset - ARG 13 islandNoiseOverride METHOD method_32995 checkHeight (Lnet/minecraft/class_5309;)Lcom/mojang/serialization/DataResult; ARG 0 config diff --git a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping index b354142777..2faac412a8 100644 --- a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping @@ -15,15 +15,6 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator FIELD field_34590 blockStateSampler Lnet/minecraft/class_6583; FIELD field_34591 fluidLevelSampler Lnet/minecraft/class_6350$class_6565; FIELD field_35183 surfaceBuilder Lnet/minecraft/class_6724; - METHOD (Lnet/minecraft/class_1966;JLjava/util/function/Supplier;)V - ARG 1 biomeSource - ARG 2 seed - ARG 4 settings - METHOD (Lnet/minecraft/class_1966;Lnet/minecraft/class_1966;JLjava/util/function/Supplier;)V - ARG 1 populationSource - ARG 2 biomeSource - ARG 3 seed - ARG 5 settings METHOD method_26263 sampleHeightmap (II[Lnet/minecraft/class_2680;Ljava/util/function/Predicate;II)Ljava/util/OptionalInt; ARG 1 x ARG 2 z diff --git a/mappings/net/minecraft/world/gen/decorator/CaveSurfaceDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/CaveSurfaceDecoratorConfig.mapping index d474055290..ff82c91d59 100644 --- a/mappings/net/minecraft/world/gen/decorator/CaveSurfaceDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/decorator/CaveSurfaceDecoratorConfig.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/class_5931 net/minecraft/world/gen/decorator/CaveSurfaceDeco FIELD field_29310 CODEC Lcom/mojang/serialization/Codec; FIELD field_29311 surface Lnet/minecraft/class_5932; FIELD field_29312 searchRange I - METHOD (Lnet/minecraft/class_5932;I)V + METHOD (Lnet/minecraft/class_5932;IZ)V ARG 1 surface ARG 2 searchRange METHOD method_34375 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/world/gen/feature/SmallDripstoneFeature.mapping b/mappings/net/minecraft/world/gen/feature/SmallDripstoneFeature.mapping index 42e36fc2b2..1e6b97d1fc 100644 --- a/mappings/net/minecraft/world/gen/feature/SmallDripstoneFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/SmallDripstoneFeature.mapping @@ -1,20 +1,4 @@ CLASS net/minecraft/class_5730 net/minecraft/world/gen/feature/SmallDripstoneFeature - METHOD method_33034 generateDripstoneBlocks (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_2338;)V - ARG 0 world + METHOD method_33034 generateDripstoneBlocks (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_5733;)V ARG 1 random ARG 2 pos - METHOD method_33035 generate (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_5733;)Z - ARG 0 world - ARG 1 random - ARG 2 pos - ARG 3 config - METHOD method_33036 generateDripstone (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_5733;)Z - ARG 0 world - ARG 1 random - ARG 2 pos - ARG 3 direction - ARG 4 config - METHOD method_33037 randomPos (Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_5733;)Lnet/minecraft/class_2338; - ARG 0 random - ARG 1 pos - ARG 2 config diff --git a/mappings/net/minecraft/world/gen/feature/SmallDripstoneFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/SmallDripstoneFeatureConfig.mapping index 6d2b956a65..16eaa0df00 100644 --- a/mappings/net/minecraft/world/gen/feature/SmallDripstoneFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/SmallDripstoneFeatureConfig.mapping @@ -1,13 +1,7 @@ CLASS net/minecraft/class_5733 net/minecraft/world/gen/feature/SmallDripstoneFeatureConfig FIELD field_28237 CODEC Lcom/mojang/serialization/Codec; - FIELD field_28238 maxPlacements I - FIELD field_28239 emptySpaceSearchRadius I - FIELD field_28240 maxOffsetFromOrigin I FIELD field_28241 chanceOfTallerDripstone F - METHOD (IIIF)V - ARG 1 maxPlacements - ARG 2 emptySpaceSearchRadius - ARG 3 maxOffsetFromOrigin + METHOD (FFFF)V ARG 4 chanceOfTallerDripstone METHOD method_33062 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/feature/util/DripstoneHelper.mapping b/mappings/net/minecraft/world/gen/feature/util/DripstoneHelper.mapping index b9f3e7c634..336af9ba4b 100644 --- a/mappings/net/minecraft/world/gen/feature/util/DripstoneHelper.mapping +++ b/mappings/net/minecraft/world/gen/feature/util/DripstoneHelper.mapping @@ -7,17 +7,15 @@ CLASS net/minecraft/class_5726 net/minecraft/world/gen/feature/util/DripstoneHel METHOD method_33006 canGenerate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos - METHOD method_33007 (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2350;Lnet/minecraft/class_2680;)V + METHOD method_33007 (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2350;Lnet/minecraft/class_2680;)V ARG 3 state - METHOD method_33008 generateDripstoneBlock (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;)Z - ARG 0 world + METHOD method_33008 generateDripstoneBlock (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_33009 canGenerateBase (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;I)Z ARG 0 world ARG 1 pos ARG 2 height - METHOD method_33010 generatePointedDripstone (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;IZ)V - ARG 0 world + METHOD method_33010 generatePointedDripstone (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;IZ)V ARG 1 pos ARG 2 direction ARG 3 height diff --git a/mappings/net/minecraft/world/gen/random/RandomDeriver.mapping b/mappings/net/minecraft/world/gen/random/RandomDeriver.mapping index 9618c9702d..bf0ebbbd1b 100644 --- a/mappings/net/minecraft/world/gen/random/RandomDeriver.mapping +++ b/mappings/net/minecraft/world/gen/random/RandomDeriver.mapping @@ -8,6 +8,5 @@ CLASS net/minecraft/class_6574 net/minecraft/world/gen/random/RandomDeriver METHOD method_38995 createRandom (Ljava/lang/String;)Lnet/minecraft/class_5819; ARG 1 string METHOD method_39000 createRandom (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5819; - ARG 1 id METHOD method_39039 addDebugInfo (Ljava/lang/StringBuilder;)V ARG 1 info diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping index 71c21a6b5c..571c06124b 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping @@ -19,15 +19,8 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu METHOD method_39051 aboveY (Lnet/minecraft/class_5843;I)Lnet/minecraft/class_6686$class_6693; ARG 0 anchor ARG 1 runDepthMultiplier - METHOD method_39052 noiseThreshold (Ljava/lang/String;Lnet/minecraft/class_5216$class_5487;D)Lnet/minecraft/class_6686$class_6693; - ARG 0 name - ARG 1 noiseParameters - ARG 2 minThreshold - METHOD method_39053 noiseThreshold (Ljava/lang/String;Lnet/minecraft/class_5216$class_5487;DD)Lnet/minecraft/class_6686$class_6693; - ARG 0 name - ARG 1 noiseParameters - ARG 2 minThreshold - ARG 4 maxThreshold + METHOD method_39052 noiseThreshold (Lnet/minecraft/class_5321;D)Lnet/minecraft/class_6686$class_6693; + METHOD method_39053 noiseThreshold (Lnet/minecraft/class_5321;DD)Lnet/minecraft/class_6686$class_6693; METHOD method_39054 biome (Ljava/util/List;)Lnet/minecraft/class_6686$class_6689; ARG 0 biomes METHOD method_39055 biome ([Lnet/minecraft/class_5321;)Lnet/minecraft/class_6686$class_6693; diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping index d1e4a86a35..f3bf57f5a8 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping @@ -1,8 +1,4 @@ CLASS net/minecraft/class_6724 net/minecraft/world/gen/surfacebuilder/SurfaceBuilder - FIELD field_35269 TERRACOTTA_BANDS_OFFSET_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35270 SURFACE_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35271 ICEBERG_AND_BADLANDS_PILLAR_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; - FIELD field_35272 ICEBERG_AND_BADLANDS_PILLAR_ROOF_NOISE_PARAMETERS Lnet/minecraft/class_5216$class_5487; FIELD field_35275 WHITE_TERRACOTTA Lnet/minecraft/class_2680; FIELD field_35276 ORANGE_TERRACOTTA Lnet/minecraft/class_2680; FIELD field_35277 TERRACOTTA Lnet/minecraft/class_2680; @@ -22,12 +18,8 @@ CLASS net/minecraft/class_6724 net/minecraft/world/gen/surfacebuilder/SurfaceBui FIELD field_35291 noiseSamplers Ljava/util/Map; FIELD field_35292 randomDeriver Lnet/minecraft/class_6574; FIELD field_35293 surfaceNoise Lnet/minecraft/class_5216; - METHOD (Lnet/minecraft/class_5818;Lnet/minecraft/class_2680;IJLnet/minecraft/class_2919$class_6675;)V + METHOD (Lnet/minecraft/class_5818;Lnet/minecraft/class_2378;Lnet/minecraft/class_2680;IJLnet/minecraft/class_2919$class_6675;)V ARG 1 noiseColumnSampler - ARG 2 defaultBlock - ARG 3 seaLevel - ARG 4 seed - ARG 6 randomProvider METHOD method_39102 (IDLnet/minecraft/class_6557;III)V ARG 4 chunk ARG 5 x @@ -70,8 +62,4 @@ CLASS net/minecraft/class_6724 net/minecraft/world/gen/surfacebuilder/SurfaceBui ARG 4 biomeKey ARG 5 chunk ARG 6 pos - METHOD method_39111 (Lnet/minecraft/class_5216$class_5487;Ljava/lang/String;)Lnet/minecraft/class_5216; - ARG 2 name - METHOD method_39112 getNoiseSampler (Ljava/lang/String;Lnet/minecraft/class_5216$class_5487;)Lnet/minecraft/class_5216; - ARG 1 name - ARG 2 noiseParameters + METHOD method_39112 getNoiseSampler (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5216; diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/VanillaSurfaceRules.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/VanillaSurfaceRules.mapping index 6eeee0a105..bb0d71e19b 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/VanillaSurfaceRules.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/VanillaSurfaceRules.mapping @@ -34,9 +34,5 @@ CLASS net/minecraft/class_6725 net/minecraft/world/gen/surfacebuilder/VanillaSur ARG 0 min METHOD method_39136 block (Lnet/minecraft/class_2248;)Lnet/minecraft/class_6686$class_6708; ARG 0 block - METHOD method_39137 noiseThreshold (Ljava/lang/String;IDD)Lnet/minecraft/class_6686$class_6693; - ARG 0 name - ARG 2 minThreshold - ARG 4 maxThreshold METHOD method_39138 createNetherSurfaceRule ()Lnet/minecraft/class_6686$class_6708; METHOD method_39139 getEndStoneRule ()Lnet/minecraft/class_6686$class_6708;