From 1f0b4b7ebc438d22915a76fe1c4182bea3f7ad5e Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 11 Nov 2021 18:05:24 +0000 Subject: [PATCH] 1.18-pre1 --- build.gradle | 2 +- mappings/net/minecraft/class_6780.mapping | 2 + mappings/net/minecraft/class_6797.mapping | 2 + .../client/world/GeneratorType.mapping | 12 --- .../data/report/BiomeListProvider.mapping | 3 +- .../fix/ChunkHeightAndBiomeFix.mapping | 1 - mappings/net/minecraft/entity/Entity.mapping | 2 +- .../server/command/JfrCommand.mapping | 2 +- .../server/command/ResetChunksCommand.mapping | 2 +- .../pool/StructurePoolElement.mapping | 5 +- .../packageinfo/PackageInfo6127.mapping | 1 - .../minecraft/util/StringIdentifiable.mapping | 14 --- .../minecraft/util/collection/IdList.mapping | 2 +- .../util/dynamic/EntryLoader.mapping | 21 +++++ .../util/dynamic/RegistryOps.mapping | 38 ++------ .../minecraft/util/math/MathHelper.mapping | 9 +- .../registry/DynamicRegistryManager.mapping | 14 +-- .../minecraft/util/registry/Registry.mapping | 2 - .../util/registry/SimpleRegistry.mapping | 9 +- .../net/minecraft/world/PortalForcer.mapping | 3 +- .../world/biome/GenerationSettings.mapping | 6 +- .../world/biome/source/BiomeSource.mapping | 2 +- .../source/MultiNoiseBiomeSource.mapping | 16 ++-- .../biome/source/util/MultiNoiseUtil.mapping | 16 +--- .../util/VanillaTerrainParameters.mapping | 6 +- .../VanillaTerrainParametersCreator.mapping | 2 +- .../world/chunk/BlendingData.mapping | 11 --- .../net/minecraft/world/chunk/Chunk.mapping | 17 +--- .../world/chunk/ChunkSection.mapping | 3 +- .../minecraft/world/chunk/ProtoChunk.mapping | 4 +- .../minecraft/world/chunk/WorldChunk.mapping | 2 +- .../world/dimension/DimensionType.mapping | 5 +- .../world/gen/NoiseColumnSampler.mapping | 13 --- .../gen/blockpredicate/BlockPredicate.mapping | 18 ++-- .../MatchingBlocksBlockPredicate.mapping | 3 +- .../MatchingFluidsBlockPredicate.mapping | 3 +- .../blockpredicate/OffsetPredicate.mapping | 6 +- .../WouldSurviveBlockPredicate.mapping | 7 +- .../world/gen/carver/CarverContext.mapping | 3 +- .../minecraft/world/gen/chunk/Blender.mapping | 14 --- .../world/gen/chunk/ChunkNoiseSampler.mapping | 10 +-- .../gen/chunk/NoiseChunkGenerator.mapping | 19 +--- .../decorator/AbstractCountDecorator.mapping | 4 +- .../decorator/AbstractRangeDecorator.mapping | 6 -- .../decorator/BlockFilterDecorator.mapping | 1 - .../BlockFilterDecoratorConfig.mapping | 1 - .../decorator/CarvingMaskDecorator.mapping | 1 - .../decorator/CaveSurfaceDecorator.mapping | 1 - .../CaveSurfaceDecoratorConfig.mapping | 9 -- .../gen/decorator/ChanceDecorator.mapping | 1 - .../decorator/ChanceDecoratorConfig.mapping | 5 -- .../decorator/ConditionalDecorator.mapping | 4 +- .../gen/decorator/ConfiguredDecorator.mapping | 12 --- .../gen/decorator/CountDecorator.mapping | 1 - .../gen/decorator/CountExtraDecorator.mapping | 1 - .../CountExtraDecoratorConfig.mapping | 11 --- .../CountNoiseBiasedDecorator.mapping | 1 - .../gen/decorator/CountNoiseDecorator.mapping | 1 - .../decorator/DarkOakTreeDecorator.mapping | 1 - .../world/gen/decorator/Decoratable.mapping | 51 ----------- .../gen/decorator/DecoratedDecorator.mapping | 1 - .../DecoratedDecoratorConfig.mapping | 11 --- .../world/gen/decorator/Decorator.mapping | 17 ---- .../gen/decorator/DecoratorConfig.mapping | 2 - .../gen/decorator/DecoratorContext.mapping | 2 +- .../gen/decorator/EndGatewayDecorator.mapping | 1 - .../EnvironmentScanDecorator.mapping | 1 - .../EnvironmentScanDecoratorConfig.mapping | 2 - .../gen/decorator/HeightmapDecorator.mapping | 1 - .../gen/decorator/IcebergDecorator.mapping | 1 - .../gen/decorator/LavaLakeDecorator.mapping | 1 - .../world/gen/decorator/NopeDecorator.mapping | 1 - .../gen/decorator/NopeDecoratorConfig.mapping | 3 - .../gen/decorator/RangeDecorator.mapping | 1 - .../gen/decorator/ScatterDecorator.mapping | 1 - .../SurfaceRelativeThresholdDecorator.mapping | 1 - .../WaterDepthThresholdDecorator.mapping | 1 - .../gen/feature/ConfiguredFeature.mapping | 8 -- .../gen/feature/ConfiguredFeatures.mapping | 86 ------------------- .../gen/feature/DecoratedFeature.mapping | 3 - .../feature/DecoratedFeatureConfig.mapping | 9 -- .../feature/HugeFungusFeatureConfig.mapping | 4 - .../NetherForestVegetationFeature.mapping | 5 -- .../gen/feature/OreFeatureConfig.mapping | 6 -- .../feature/PillagerOutpostFeature.mapping | 4 +- .../gen/feature/RandomFeatureConfig.mapping | 3 +- .../gen/feature/RandomFeatureEntry.mapping | 3 +- .../gen/feature/StructureFeature.mapping | 11 +-- .../gen/feature/TwistingVinesFeature.mapping | 14 --- .../gen/surfacebuilder/MaterialRules.mapping | 17 +--- .../gen/surfacebuilder/SurfaceBuilder.mapping | 3 +- 91 files changed, 107 insertions(+), 561 deletions(-) create mode 100644 mappings/net/minecraft/class_6780.mapping create mode 100644 mappings/net/minecraft/class_6797.mapping delete mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo6127.mapping create mode 100644 mappings/net/minecraft/util/dynamic/EntryLoader.mapping delete mode 100644 mappings/net/minecraft/world/chunk/BlendingData.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/AbstractRangeDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/BlockFilterDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/CarvingMaskDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/CaveSurfaceDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/CaveSurfaceDecoratorConfig.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/ChanceDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/ChanceDecoratorConfig.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/ConfiguredDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/CountDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/CountExtraDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/CountExtraDecoratorConfig.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/CountNoiseBiasedDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/CountNoiseDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/DarkOakTreeDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/Decoratable.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/DecoratedDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/DecoratedDecoratorConfig.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/Decorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/DecoratorConfig.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/EndGatewayDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/EnvironmentScanDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/EnvironmentScanDecoratorConfig.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/HeightmapDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/IcebergDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/LavaLakeDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/NopeDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/NopeDecoratorConfig.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/RangeDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/ScatterDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/SurfaceRelativeThresholdDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/decorator/WaterDepthThresholdDecorator.mapping delete mode 100644 mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping delete mode 100644 mappings/net/minecraft/world/gen/feature/DecoratedFeature.mapping delete mode 100644 mappings/net/minecraft/world/gen/feature/DecoratedFeatureConfig.mapping diff --git a/build.gradle b/build.gradle index fb85c08d00..cc6ac183e5 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "21w44a" +def minecraft_version = "1.18-pre1" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/class_6780.mapping b/mappings/net/minecraft/class_6780.mapping new file mode 100644 index 0000000000..bb01f098e7 --- /dev/null +++ b/mappings/net/minecraft/class_6780.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_6780 + METHOD method_38109 getBiome (IIILnet/minecraft/class_6544$class_6552;)Lnet/minecraft/class_1959; diff --git a/mappings/net/minecraft/class_6797.mapping b/mappings/net/minecraft/class_6797.mapping new file mode 100644 index 0000000000..c945acb61d --- /dev/null +++ b/mappings/net/minecraft/class_6797.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_6797 + METHOD method_14452 getPositions (Lnet/minecraft/class_5444;Ljava/util/Random;Lnet/minecraft/class_2338;)Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/client/world/GeneratorType.mapping b/mappings/net/minecraft/client/world/GeneratorType.mapping index 975034a733..909c9c3876 100644 --- a/mappings/net/minecraft/client/world/GeneratorType.mapping +++ b/mappings/net/minecraft/client/world/GeneratorType.mapping @@ -4,8 +4,6 @@ CLASS net/minecraft/class_5317 net/minecraft/client/world/GeneratorType FIELD field_25053 SCREEN_PROVIDERS Ljava/util/Map; FIELD field_25054 FLAT Lnet/minecraft/class_5317; FIELD field_25056 SINGLE_BIOME_SURFACE Lnet/minecraft/class_5317; - FIELD field_25057 SINGLE_BIOME_CAVES Lnet/minecraft/class_5317; - FIELD field_25058 SINGLE_BIOME_FLOATING_ISLANDS Lnet/minecraft/class_5317; FIELD field_25059 DEBUG_ALL_BLOCK_STATES Lnet/minecraft/class_5317; FIELD field_25060 displayName Lnet/minecraft/class_2561; METHOD (Ljava/lang/String;)V @@ -24,21 +22,11 @@ CLASS net/minecraft/class_5317 net/minecraft/client/world/GeneratorType ARG 1 generatorOptions ARG 2 type ARG 3 biome - METHOD method_29080 (Lnet/minecraft/class_525;Lnet/minecraft/class_5285;)Lnet/minecraft/class_437; - ARG 0 screen - ARG 1 generatorOptions - METHOD method_29081 (Lnet/minecraft/class_525;Lnet/minecraft/class_5285;Lnet/minecraft/class_1959;)V - ARG 2 biome METHOD method_29082 (Lnet/minecraft/class_525;Lnet/minecraft/class_5285;Lnet/minecraft/class_3232;)V ARG 2 config METHOD method_29083 getFirstBiome (Lnet/minecraft/class_5455;Lnet/minecraft/class_5285;)Lnet/minecraft/class_1959; ARG 0 registryManager ARG 1 options - METHOD method_29084 (Lnet/minecraft/class_525;Lnet/minecraft/class_5285;)Lnet/minecraft/class_437; - ARG 0 screen - ARG 1 generatorOptions - METHOD method_29085 (Lnet/minecraft/class_525;Lnet/minecraft/class_5285;Lnet/minecraft/class_1959;)V - ARG 2 biome METHOD method_29086 (Lnet/minecraft/class_525;Lnet/minecraft/class_5285;)Lnet/minecraft/class_437; ARG 0 screen ARG 1 generatorOptions diff --git a/mappings/net/minecraft/data/report/BiomeListProvider.mapping b/mappings/net/minecraft/data/report/BiomeListProvider.mapping index 55cd429c66..1ae27ce25e 100644 --- a/mappings/net/minecraft/data/report/BiomeListProvider.mapping +++ b/mappings/net/minecraft/data/report/BiomeListProvider.mapping @@ -4,6 +4,5 @@ CLASS net/minecraft/class_5475 net/minecraft/data/report/BiomeListProvider FIELD field_26379 generator Lnet/minecraft/class_2403; METHOD (Lnet/minecraft/class_2403;)V ARG 1 generator - METHOD method_30682 getPath (Ljava/nio/file/Path;Lnet/minecraft/class_2960;)Ljava/nio/file/Path; + METHOD method_30682 getPath (Ljava/nio/file/Path;Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Ljava/nio/file/Path; ARG 0 root - ARG 1 id diff --git a/mappings/net/minecraft/datafixer/fix/ChunkHeightAndBiomeFix.mapping b/mappings/net/minecraft/datafixer/fix/ChunkHeightAndBiomeFix.mapping index ccdf320278..27d1f2c1c4 100644 --- a/mappings/net/minecraft/datafixer/fix/ChunkHeightAndBiomeFix.mapping +++ b/mappings/net/minecraft/datafixer/fix/ChunkHeightAndBiomeFix.mapping @@ -7,7 +7,6 @@ CLASS net/minecraft/class_6637 net/minecraft/datafixer/fix/ChunkHeightAndBiomeFi FIELD field_35025 HEIGHTMAP_KEYS [Ljava/lang/String; FIELD field_35029 RAW_BIOME_IDS Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; FIELD field_35444 CONTEXT Ljava/lang/String; - FIELD field_35445 OLD_NOISE_STATUSES Ljava/util/Set; METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 schema METHOD method_38793 ceilLog2 (I)I diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index e0d0eca3ed..de61b25612 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -308,7 +308,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT based on its current and destination worlds, plus COMMENT any portals that may be present. ARG 1 destination - METHOD method_30330 getPortalRect (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Z)Ljava/util/Optional; + METHOD method_30330 getPortalRect (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;ZLnet/minecraft/class_2784;)Ljava/util/Optional; ARG 1 destWorld ARG 2 destPos ARG 3 destIsNether diff --git a/mappings/net/minecraft/server/command/JfrCommand.mapping b/mappings/net/minecraft/server/command/JfrCommand.mapping index e7cf2a4b67..b1d33ae3a1 100644 --- a/mappings/net/minecraft/server/command/JfrCommand.mapping +++ b/mappings/net/minecraft/server/command/JfrCommand.mapping @@ -15,5 +15,5 @@ CLASS net/minecraft/class_6607 net/minecraft/server/command/JfrCommand ARG 0 source METHOD method_38618 (Lnet/minecraft/class_2168;)Z ARG 0 source - METHOD method_39499 (Ljava/io/File;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; + METHOD method_39499 (Ljava/nio/file/Path;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583; ARG 1 style diff --git a/mappings/net/minecraft/server/command/ResetChunksCommand.mapping b/mappings/net/minecraft/server/command/ResetChunksCommand.mapping index c0027042cf..cf44a0f22b 100644 --- a/mappings/net/minecraft/server/command/ResetChunksCommand.mapping +++ b/mappings/net/minecraft/server/command/ResetChunksCommand.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_6608 net/minecraft/server/command/ResetChunksCommand ARG 0 context METHOD method_38625 (Lnet/minecraft/class_2168;)Z ARG 0 source - METHOD method_38626 executeResetChunks (Lnet/minecraft/class_2168;I)I + METHOD method_38626 executeResetChunks (Lnet/minecraft/class_2168;IZ)I ARG 0 source ARG 1 radius METHOD method_38627 (Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping b/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping index f957d3c6f2..d038e0362b 100644 --- a/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping +++ b/mappings/net/minecraft/structure/pool/StructurePoolElement.mapping @@ -30,9 +30,8 @@ CLASS net/minecraft/class_3784 net/minecraft/structure/pool/StructurePoolElement ARG 3 rotation METHOD method_16757 getType ()Lnet/minecraft/class_3816; METHOD method_19308 getGroundLevelDelta ()I - METHOD method_30421 ofFeature (Lnet/minecraft/class_2975;)Ljava/util/function/Function; - ARG 0 processors - METHOD method_30422 (Lnet/minecraft/class_2975;Lnet/minecraft/class_3785$class_3786;)Lnet/minecraft/class_3776; + METHOD method_30421 ofFeature (Lnet/minecraft/class_6796;)Ljava/util/function/Function; + METHOD method_30422 (Lnet/minecraft/class_6796;Lnet/minecraft/class_3785$class_3786;)Lnet/minecraft/class_3776; ARG 1 projection METHOD method_30425 ofLegacySingle (Ljava/lang/String;)Ljava/util/function/Function; ARG 0 id diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo6127.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo6127.mapping deleted file mode 100644 index 70dea23f1a..0000000000 --- a/mappings/net/minecraft/unused/packageinfo/PackageInfo6127.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_6127 net/minecraft/unused/packageinfo/PackageInfo6127 diff --git a/mappings/net/minecraft/util/StringIdentifiable.mapping b/mappings/net/minecraft/util/StringIdentifiable.mapping index 796c1abca7..172dbce410 100644 --- a/mappings/net/minecraft/util/StringIdentifiable.mapping +++ b/mappings/net/minecraft/util/StringIdentifiable.mapping @@ -6,21 +6,7 @@ CLASS net/minecraft/class_3542 net/minecraft/util/StringIdentifiable COMMENT and a given decode function. ARG 0 enumValues ARG 1 fromString - METHOD method_28141 createCodec (Ljava/util/function/ToIntFunction;Ljava/util/function/IntFunction;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; - COMMENT Creates a codec that serializes a class implementing this interface using either - COMMENT the given toInt and fromInt mapping functions (when compressed output is - COMMENT requested), or its {@link #asString()} method and a given fromString function. - ARG 0 compressedEncoder - ARG 1 compressedDecoder - ARG 2 decoder METHOD method_28142 toKeyable ([Lnet/minecraft/class_3542;)Lcom/mojang/serialization/Keyable; ARG 0 values METHOD method_28143 ([Ljava/lang/Enum;I)Ljava/lang/Enum; ARG 1 ordinal - CLASS 1 - METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; - ARG 1 value - METHOD method_28148 (Ljava/util/function/Function;Ljava/lang/String;)Lcom/mojang/serialization/DataResult; - ARG 1 name - METHOD method_28149 (Ljava/util/function/IntFunction;Ljava/lang/Number;)Lcom/mojang/serialization/DataResult; - ARG 1 id diff --git a/mappings/net/minecraft/util/collection/IdList.mapping b/mappings/net/minecraft/util/collection/IdList.mapping index 9f5a43028e..3e57e98c67 100644 --- a/mappings/net/minecraft/util/collection/IdList.mapping +++ b/mappings/net/minecraft/util/collection/IdList.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_2361 net/minecraft/util/collection/IdList FIELD field_11098 list Ljava/util/List; FIELD field_11099 nextId I - FIELD field_11100 idMap Ljava/util/IdentityHashMap; + FIELD field_11100 idMap Lit/unimi/dsi/fastutil/objects/Object2IntMap; METHOD (I)V ARG 1 initialSize METHOD method_10203 set (Ljava/lang/Object;I)V diff --git a/mappings/net/minecraft/util/dynamic/EntryLoader.mapping b/mappings/net/minecraft/util/dynamic/EntryLoader.mapping new file mode 100644 index 0000000000..117ab48db9 --- /dev/null +++ b/mappings/net/minecraft/util/dynamic/EntryLoader.mapping @@ -0,0 +1,21 @@ +CLASS net/minecraft/class_5506 net/minecraft/util/dynamic/EntryLoader + METHOD method_31154 resourceBacked (Lnet/minecraft/class_3300;)Lnet/minecraft/class_5506; + ARG 0 resourceManager + METHOD method_31155 load (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Decoder;)Ljava/util/Optional; + ARG 2 registryId + ARG 3 entryId + METHOD method_31156 getKnownEntryPaths (Lnet/minecraft/class_5321;)Ljava/util/Collection; + COMMENT @return A collection of file Identifiers of all known entries of the given registry. + COMMENT Note that these are file Identifiers for use in a resource manager, not the logical names of the entries. + ARG 1 key + CLASS 1 + METHOD method_31158 (Ljava/lang/String;)Z + ARG 0 name + CLASS class_5507 Impl + FIELD field_26741 values Ljava/util/Map; + METHOD method_31159 add (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Encoder;ILjava/lang/Object;Lcom/mojang/serialization/Lifecycle;)V + ARG 1 registryManager + ARG 2 key + ARG 4 rawId + ARG 5 entry + ARG 6 lifecycle diff --git a/mappings/net/minecraft/util/dynamic/RegistryOps.mapping b/mappings/net/minecraft/util/dynamic/RegistryOps.mapping index 1b977c1e7d..24e929ea58 100644 --- a/mappings/net/minecraft/util/dynamic/RegistryOps.mapping +++ b/mappings/net/minecraft/util/dynamic/RegistryOps.mapping @@ -1,11 +1,9 @@ CLASS net/minecraft/class_5382 net/minecraft/util/dynamic/RegistryOps - FIELD field_25509 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_25511 registryManager Lnet/minecraft/class_5455; FIELD field_25512 valueHolders Ljava/util/Map; - FIELD field_26738 entryLoader Lnet/minecraft/class_5382$class_5506; + FIELD field_26738 entryLoader Lnet/minecraft/class_5506; FIELD field_26739 entryOps Lnet/minecraft/class_5382; - FIELD field_33379 JSON_FILE_EXTENSION Ljava/lang/String; - METHOD (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5382$class_5506;Lnet/minecraft/class_5455;Ljava/util/IdentityHashMap;)V + METHOD (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5506;Lnet/minecraft/class_5455;Ljava/util/IdentityHashMap;)V ARG 1 delegate ARG 2 entryLoader ARG 3 registryManager @@ -31,15 +29,12 @@ CLASS net/minecraft/class_5382 net/minecraft/util/dynamic/RegistryOps ARG 4 allowInlineDefinitions METHOD method_29761 getValueHolder (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5382$class_5383; ARG 1 registryRef - METHOD method_29763 readSupplier (Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Lcom/mojang/serialization/Codec;Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult; + METHOD method_29763 readSupplier (Lnet/minecraft/class_5321;Lnet/minecraft/class_2385;Lcom/mojang/serialization/Codec;Lnet/minecraft/class_5321;)Lcom/mojang/serialization/DataResult; COMMENT Reads a supplier for a registry element. COMMENT COMMENT

This logic is used by both {@code decodeOrId} and {@code loadToRegistry}. - ARG 1 key - ARG 2 registry ARG 3 codec - ARG 4 elementId - METHOD method_31150 of (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5382$class_5506;Lnet/minecraft/class_5455;)Lnet/minecraft/class_5382; + METHOD method_31150 of (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5506;Lnet/minecraft/class_5455;)Lnet/minecraft/class_5382; ARG 0 delegate ARG 1 entryLoader ARG 2 registryManager @@ -47,30 +42,7 @@ CLASS net/minecraft/class_5382 net/minecraft/util/dynamic/RegistryOps ARG 1 key METHOD method_36574 ofLoaded (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_3300;Lnet/minecraft/class_5455;)Lnet/minecraft/class_5382; ARG 2 registryManager - METHOD method_36575 ofLoaded (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5382$class_5506;Lnet/minecraft/class_5455;)Lnet/minecraft/class_5382; + METHOD method_36575 ofLoaded (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5506;Lnet/minecraft/class_5455;)Lnet/minecraft/class_5382; ARG 2 registryManager CLASS class_5383 ValueHolder FIELD field_25513 values Ljava/util/Map; - CLASS class_5506 EntryLoader - METHOD method_31154 resourceBacked (Lnet/minecraft/class_3300;)Lnet/minecraft/class_5382$class_5506; - ARG 0 resourceManager - METHOD method_31155 load (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Decoder;)Ljava/util/Optional; - ARG 2 registryId - ARG 3 entryId - METHOD method_31156 getKnownEntryPaths (Lnet/minecraft/class_5321;)Ljava/util/Collection; - COMMENT @return A collection of file Identifiers of all known entries of the given registry. - COMMENT Note that these are file Identifiers for use in a resource manager, not the logical names of the entries. - ARG 1 key - CLASS 1 - METHOD method_31158 (Ljava/lang/String;)Z - ARG 0 name - CLASS class_5507 Impl - FIELD field_26741 values Ljava/util/Map; - FIELD field_26742 entryToRawId Lit/unimi/dsi/fastutil/objects/Object2IntMap; - FIELD field_26743 entryToLifecycle Ljava/util/Map; - METHOD method_31159 add (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_5321;Lcom/mojang/serialization/Encoder;ILjava/lang/Object;Lcom/mojang/serialization/Lifecycle;)V - ARG 1 registryManager - ARG 2 key - ARG 4 rawId - ARG 5 entry - ARG 6 lifecycle diff --git a/mappings/net/minecraft/util/math/MathHelper.mapping b/mappings/net/minecraft/util/math/MathHelper.mapping index b65abdfd35..8f22862bde 100644 --- a/mappings/net/minecraft/util/math/MathHelper.mapping +++ b/mappings/net/minecraft/util/math/MathHelper.mapping @@ -313,10 +313,7 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper ARG 8 end METHOD method_33723 square (D)D ARG 0 n - METHOD method_33825 magnitude (IDI)D - ARG 0 x - ARG 1 y - ARG 3 z + METHOD method_33825 magnitude (DDD)D METHOD method_34939 clamp (BBB)B ARG 0 value ARG 1 min @@ -389,6 +386,4 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper COMMENT {@return {@code a} rounded down to the nearest multiple of {@code b}} ARG 0 a ARG 2 b - METHOD method_39241 hypot (ID)D - ARG 0 a - ARG 1 b + METHOD method_39241 hypot (DD)D diff --git a/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping b/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping index 1c54a5f29e..ccc9c82d7f 100644 --- a/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping +++ b/mappings/net/minecraft/util/registry/DynamicRegistryManager.mapping @@ -50,7 +50,7 @@ CLASS net/minecraft/class_5455 net/minecraft/util/registry/DynamicRegistryManage ARG 1 registryRef ARG 2 entryCodec ARG 3 networkEntryCodec - METHOD method_31141 (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_5382$class_5506$class_5507;Lnet/minecraft/class_5455$class_5456;)V + METHOD method_31141 (Lnet/minecraft/class_5455$class_5457;Lnet/minecraft/class_5506$class_5507;Lnet/minecraft/class_5455$class_5456;)V ARG 0 registryManager ARG 1 entryLoader ARG 2 info @@ -62,17 +62,17 @@ CLASS net/minecraft/class_5455 net/minecraft/util/registry/DynamicRegistryManage COMMENT Represents the serialization behavior of the registries, including the COMMENT id of the registry, the codec for its elements, and whether the registry COMMENT should be sent to the client. - FIELD field_25920 registry Lnet/minecraft/class_5321; - FIELD field_25921 entryCodec Lcom/mojang/serialization/Codec; - FIELD field_26687 networkEntryCodec Lcom/mojang/serialization/Codec; + FIELD comp_293 registry Lnet/minecraft/class_5321; + FIELD comp_294 entryCodec Lcom/mojang/serialization/Codec; + FIELD comp_295 networkEntryCodec Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_5321;Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)V ARG 1 registry ARG 2 entryCodec ARG 3 networkEntryCodec - METHOD method_30535 getRegistry ()Lnet/minecraft/class_5321; - METHOD method_30536 getEntryCodec ()Lcom/mojang/serialization/Codec; + METHOD comp_293 registry ()Lnet/minecraft/class_5321; + METHOD comp_294 entryCodec ()Lcom/mojang/serialization/Codec; + METHOD comp_295 networkEntryCodec ()Lcom/mojang/serialization/Codec; METHOD method_30537 isSynced ()Z - METHOD method_31061 getNetworkEntryCodec ()Lcom/mojang/serialization/Codec; CLASS class_5457 Impl COMMENT An immutable implementation of the dynamic registry manager, representing COMMENT a specialized configuration of registries. It has a codec that allows diff --git a/mappings/net/minecraft/util/registry/Registry.mapping b/mappings/net/minecraft/util/registry/Registry.mapping index b8ad83867d..e8d99a5b60 100644 --- a/mappings/net/minecraft/util/registry/Registry.mapping +++ b/mappings/net/minecraft/util/registry/Registry.mapping @@ -9,7 +9,6 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry FIELD field_11144 REGISTRIES Lnet/minecraft/class_2378; FIELD field_11145 ENTITY_TYPE Lnet/minecraft/class_2348; FIELD field_11146 BLOCK Lnet/minecraft/class_2348; - FIELD field_11148 DECORATOR Lnet/minecraft/class_2378; FIELD field_11150 PAINTING_MOTIVE Lnet/minecraft/class_2348; FIELD field_11152 STAT_TYPE Lnet/minecraft/class_2378; FIELD field_11154 FLUID Lnet/minecraft/class_2348; @@ -87,7 +86,6 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry FIELD field_25109 POTION_KEY Lnet/minecraft/class_5321; FIELD field_25110 CARVER_KEY Lnet/minecraft/class_5321; FIELD field_25112 FEATURE_KEY Lnet/minecraft/class_5321; - FIELD field_25113 DECORATOR_KEY Lnet/minecraft/class_5321; FIELD field_25114 BIOME_KEY Lnet/minecraft/class_5321; FIELD field_25115 BLOCK_STATE_PROVIDER_TYPE_KEY Lnet/minecraft/class_5321; FIELD field_25117 FOLIAGE_PLACER_TYPE_KEY Lnet/minecraft/class_5321; diff --git a/mappings/net/minecraft/util/registry/SimpleRegistry.mapping b/mappings/net/minecraft/util/registry/SimpleRegistry.mapping index f95c058d2e..c261d66db1 100644 --- a/mappings/net/minecraft/util/registry/SimpleRegistry.mapping +++ b/mappings/net/minecraft/util/registry/SimpleRegistry.mapping @@ -32,10 +32,13 @@ CLASS net/minecraft/class_2370 net/minecraft/util/registry/SimpleRegistry ARG 1 lifecycle ARG 2 entryCodec CLASS class_5501 RegistryManagerEntry - FIELD field_26684 key Lnet/minecraft/class_5321; - FIELD field_26685 rawId I - FIELD field_26686 entry Ljava/lang/Object; + FIELD comp_290 key Lnet/minecraft/class_5321; + FIELD comp_291 rawId I + FIELD comp_292 entry Ljava/lang/Object; METHOD (Lnet/minecraft/class_5321;ILjava/lang/Object;)V ARG 1 key ARG 2 rawId ARG 3 entry + METHOD comp_290 key ()Lnet/minecraft/class_5321; + METHOD comp_291 rawId ()I + METHOD comp_292 entry ()Ljava/lang/Object; diff --git a/mappings/net/minecraft/world/PortalForcer.mapping b/mappings/net/minecraft/world/PortalForcer.mapping index 386591ae80..5c1a131ed4 100644 --- a/mappings/net/minecraft/world/PortalForcer.mapping +++ b/mappings/net/minecraft/world/PortalForcer.mapping @@ -8,6 +8,5 @@ CLASS net/minecraft/class_1946 net/minecraft/world/PortalForcer ARG 3 portalDirection ARG 4 distanceOrthogonalToPortal METHOD method_30482 createPortal (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350$class_2351;)Ljava/util/Optional; - METHOD method_30483 getPortalRect (Lnet/minecraft/class_2338;Z)Ljava/util/Optional; - ARG 1 destPos + METHOD method_30483 getPortalRect (Lnet/minecraft/class_2338;ZLnet/minecraft/class_2784;)Ljava/util/Optional; ARG 2 destIsNether diff --git a/mappings/net/minecraft/world/biome/GenerationSettings.mapping b/mappings/net/minecraft/world/biome/GenerationSettings.mapping index f0f777c7ec..4ef7449f55 100644 --- a/mappings/net/minecraft/world/biome/GenerationSettings.mapping +++ b/mappings/net/minecraft/world/biome/GenerationSettings.mapping @@ -14,8 +14,7 @@ CLASS net/minecraft/class_5485 net/minecraft/world/biome/GenerationSettings METHOD method_30983 getFeatures ()Ljava/util/List; COMMENT Returns the lists of features configured for each {@link net.minecraft.world.gen.GenerationStep.Feature feature generation step}, up to the highest step that has a configured feature. COMMENT Entries are guaranteed to not be null, but may be empty lists if an earlier step has no features, but a later step does. - METHOD method_38105 isFeatureAllowed (Lnet/minecraft/class_2975;)Z - ARG 1 feature + METHOD method_38105 isFeatureAllowed (Lnet/minecraft/class_6796;)Z CLASS class_5495 Builder FIELD field_26642 carvers Ljava/util/Map; FIELD field_26643 features Ljava/util/List; @@ -28,6 +27,5 @@ CLASS net/minecraft/class_5485 net/minecraft/world/biome/GenerationSettings METHOD method_30991 carver (Lnet/minecraft/class_2893$class_2894;Lnet/minecraft/class_2922;)Lnet/minecraft/class_5485$class_5495; ARG 1 carverStep ARG 2 carver - METHOD method_30992 feature (Lnet/minecraft/class_2893$class_2895;Lnet/minecraft/class_2975;)Lnet/minecraft/class_5485$class_5495; + METHOD method_30992 feature (Lnet/minecraft/class_2893$class_2895;Lnet/minecraft/class_6796;)Lnet/minecraft/class_5485$class_5495; ARG 1 featureStep - ARG 2 feature diff --git a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping index 4b7f53f480..3637e6843d 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource ARG 1 seed METHOD method_28442 getCodec ()Lcom/mojang/serialization/Codec; METHOD method_28443 getBiomes ()Ljava/util/List; - METHOD method_38109 getBiome (IIILnet/minecraft/class_6544$class_6552;)Lnet/minecraft/class_1959; + METHOD method_38109 (IIILnet/minecraft/class_6544$class_6552;)Lnet/minecraft/class_1959; ARG 1 x ARG 2 y ARG 3 z diff --git a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping index 8bed56c225..b42826a5e1 100644 --- a/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/MultiNoiseBiomeSource.mapping @@ -18,29 +18,25 @@ CLASS net/minecraft/class_4766 net/minecraft/world/biome/source/MultiNoiseBiomeS FIELD field_24723 NETHER Lnet/minecraft/class_4766$class_5305; FIELD field_24724 BY_IDENTIFIER Ljava/util/Map; FIELD field_24725 id Lnet/minecraft/class_2960; - FIELD field_24726 biomeSourceFunction Ljava/util/function/BiFunction; + FIELD field_24726 biomeSourceFunction Ljava/util/function/Function; FIELD field_34499 OVERWORLD Lnet/minecraft/class_4766$class_5305; - METHOD (Lnet/minecraft/class_2960;Ljava/util/function/BiFunction;)V + METHOD (Lnet/minecraft/class_2960;Ljava/util/function/Function;)V ARG 1 id - ARG 2 biomeSourceFunction METHOD method_28469 getBiomeSource (Lnet/minecraft/class_2378;)Lnet/minecraft/class_4766; ARG 1 biomeRegistry - METHOD method_31088 (Lnet/minecraft/class_4766$class_5305;Lnet/minecraft/class_2378;)Lnet/minecraft/class_4766; - ARG 0 preset - ARG 1 biomeRegistry CLASS class_5502 Instance + FIELD comp_274 preset Lnet/minecraft/class_4766$class_5305; + FIELD comp_275 biomeRegistry Lnet/minecraft/class_2378; FIELD field_26694 CODEC Lcom/mojang/serialization/MapCodec; - FIELD field_26695 preset Lnet/minecraft/class_4766$class_5305; - FIELD field_26696 biomeRegistry Lnet/minecraft/class_2378; METHOD (Lnet/minecraft/class_4766$class_5305;Lnet/minecraft/class_2378;)V ARG 1 preset ARG 2 biomeRegistry - METHOD method_31094 getPreset ()Lnet/minecraft/class_4766$class_5305; + METHOD comp_274 preset ()Lnet/minecraft/class_4766$class_5305; + METHOD comp_275 biomeRegistry ()Lnet/minecraft/class_2378; METHOD method_31095 (Lnet/minecraft/class_4766$class_5305;)Lcom/mojang/serialization/DataResult; ARG 0 preset METHOD method_31096 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_31097 (Lnet/minecraft/class_2960;)Lcom/mojang/serialization/DataResult; ARG 0 id - METHOD method_31098 getBiomeRegistry ()Lnet/minecraft/class_2378; METHOD method_31101 getBiomeSource ()Lnet/minecraft/class_4766; diff --git a/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping b/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping index 96b0b2d3bb..4bfce9a183 100644 --- a/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping +++ b/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping @@ -115,17 +115,6 @@ CLASS net/minecraft/class_6544 net/minecraft/world/biome/source/util/MultiNoiseU METHOD (Ljava/util/List;)V ARG 1 entries METHOD method_38128 getEntries ()Ljava/util/List; - METHOD method_38129 getValue (Lnet/minecraft/class_6544$class_6553;)Ljava/lang/Object; - ARG 1 point - METHOD method_38130 getValue (Lnet/minecraft/class_6544$class_6553;Lnet/minecraft/class_6544$class_6545;)Ljava/lang/Object; - ARG 1 point - ARG 2 distanceFunction - METHOD method_38131 getValue (Lnet/minecraft/class_6544$class_6553;Ljava/util/function/Supplier;)Ljava/lang/Object; - ARG 1 point - ARG 2 defaultValue - METHOD method_38132 getValueSimple (Lnet/minecraft/class_6544$class_6553;Ljava/util/function/Supplier;)Ljava/lang/Object; - ARG 1 point - ARG 2 defaultValue CLASS class_6548 SearchTree FIELD field_34486 MAX_NODES_FOR_SIMPLE_TREE I FIELD field_34487 firstNode Lnet/minecraft/class_6544$class_6548$class_6550; @@ -161,10 +150,9 @@ CLASS net/minecraft/class_6544 net/minecraft/world/biome/source/util/MultiNoiseU METHOD method_38157 getEnclosingParameters (Ljava/util/List;)Ljava/util/List; ARG 0 subTree CLASS class_6549 TreeLeafNode - FIELD field_34489 value Ljava/util/function/Supplier; - METHOD (Lnet/minecraft/class_6544$class_4762;Ljava/util/function/Supplier;)V + FIELD field_34489 value Ljava/lang/Object; + METHOD (Lnet/minecraft/class_6544$class_4762;Ljava/lang/Object;)V ARG 1 parameters - ARG 2 value CLASS class_6550 TreeNode FIELD field_34490 parameters [Lnet/minecraft/class_6544$class_6546; METHOD (Ljava/util/List;)V diff --git a/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping b/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping index dc650e1649..7d4f31421a 100644 --- a/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping +++ b/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping @@ -14,9 +14,9 @@ CLASS net/minecraft/class_6555 net/minecraft/world/biome/source/util/VanillaTerr ARG 1 continentalnessNoise ARG 2 erosionNoise ARG 3 weirdnessNoise - METHOD method_38211 createFlatOffsetSpline (FFFFFF)Lnet/minecraft/class_6492; - METHOD method_38212 createLandSpline (FFFFFFZZ)Lnet/minecraft/class_6492; - METHOD method_38213 buildErosionFactorSpline (FZ)Lnet/minecraft/class_6492; + METHOD method_38211 createFlatOffsetSpline (FFFFFFLnet/minecraft/class_6501;)Lnet/minecraft/class_6492; + METHOD method_38212 createLandSpline (FFFFFFZZLnet/minecraft/class_6501;)Lnet/minecraft/class_6492; + METHOD method_38213 buildErosionFactorSpline (FZLnet/minecraft/class_6501;)Lnet/minecraft/class_6492; ARG 0 value METHOD method_38214 getOffset (Lnet/minecraft/class_6555$class_6556;)F ARG 1 point diff --git a/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParametersCreator.mapping b/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParametersCreator.mapping index 232ca97eff..01d0a22066 100644 --- a/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParametersCreator.mapping +++ b/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParametersCreator.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_6765 net/minecraft/world/biome/source/util/VanillaTerrainParametersCreator - METHOD method_39421 createSurfaceParameters ()Lnet/minecraft/class_6555; + METHOD method_39421 createSurfaceParameters (Z)Lnet/minecraft/class_6555; METHOD method_39422 createUndergroundParameters ()Lnet/minecraft/class_6555; METHOD method_39423 createIslandParameters ()Lnet/minecraft/class_6555; diff --git a/mappings/net/minecraft/world/chunk/BlendingData.mapping b/mappings/net/minecraft/world/chunk/BlendingData.mapping deleted file mode 100644 index 9eea0c42b8..0000000000 --- a/mappings/net/minecraft/world/chunk/BlendingData.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/class_6752 net/minecraft/world/chunk/BlendingData - FIELD field_35523 oldBiome Z - FIELD field_35524 oldNoise Z - METHOD (ZZ)V - ARG 1 oldBiome - ARG 2 oldNoise - METHOD method_39356 toNbt ()Lnet/minecraft/class_2487; - METHOD method_39357 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_6752; - ARG 0 nbt - METHOD method_39358 isOldBiome ()Z - METHOD method_39359 isOldNoise ()Z diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index 8a3e6f7a65..ba6a973de6 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -16,8 +16,7 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk FIELD field_34552 structureStarts Ljava/util/Map; FIELD field_34553 structureReferences Ljava/util/Map; FIELD field_35468 blender Lnet/minecraft/class_6749; - FIELD field_35469 blendingData Lnet/minecraft/class_6752; - METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;J[Lnet/minecraft/class_2826;Lnet/minecraft/class_6752;)V + METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;J[Lnet/minecraft/class_2826;Lnet/minecraft/class_6749;)V ARG 1 pos ARG 2 upgradeData ARG 3 heightLimitView @@ -87,21 +86,12 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk ARG 1 pos METHOD method_32914 getGameEventDispatcher (I)Lnet/minecraft/class_5713; ARG 1 ySectionCoord - METHOD method_38255 getOrCreateChunkNoiseSampler (IIIIIILnet/minecraft/class_5818;Ljava/util/function/Supplier;Ljava/util/function/Supplier;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;)Lnet/minecraft/class_6568; - ARG 1 minimumY - ARG 2 height - ARG 3 x - ARG 4 z - ARG 5 horizontalNoiseResolution - ARG 6 verticalNoiseResolutuion - ARG 7 noiseColumnSampler - ARG 9 settings + METHOD method_38255 getOrCreateChunkNoiseSampler (Lnet/minecraft/class_5818;Ljava/util/function/Supplier;Lnet/minecraft/class_5284;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;)Lnet/minecraft/class_6568; METHOD method_38256 fillSectionArray (Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;[Lnet/minecraft/class_2826;)V ARG 0 world ARG 1 biome ARG 2 sectionArray - METHOD method_38257 (Lnet/minecraft/class_1966;Lnet/minecraft/class_6544$class_6552;)V - ARG 1 source + METHOD method_38257 (Lnet/minecraft/class_6780;Lnet/minecraft/class_6544$class_6552;)V ARG 2 sampler METHOD method_38259 getSection (I)Lnet/minecraft/class_2826; ARG 1 yIndex @@ -114,7 +104,6 @@ CLASS net/minecraft/class_2791 net/minecraft/world/chunk/Chunk ARG 1 type METHOD method_39296 getTickSchedulers ()Lnet/minecraft/class_2791$class_6745; METHOD method_39297 usesOldNoise ()Z - METHOD method_39298 getBlendingData ()Lnet/minecraft/class_6752; METHOD method_39299 getBlender ()Lnet/minecraft/class_6749; METHOD method_39300 getBelowZeroRetrogen ()Lnet/minecraft/class_6746; METHOD method_39460 getHeightLimitView ()Lnet/minecraft/class_5539; diff --git a/mappings/net/minecraft/world/chunk/ChunkSection.mapping b/mappings/net/minecraft/world/chunk/ChunkSection.mapping index 2f8c80c3c6..1685413c8b 100644 --- a/mappings/net/minecraft/world/chunk/ChunkSection.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkSection.mapping @@ -51,8 +51,7 @@ CLASS net/minecraft/class_2826 net/minecraft/world/chunk/ChunkSection ARG 2 count METHOD method_31729 blockCoordFromChunkCoord (I)I ARG 0 chunkPos - METHOD method_38291 (Lnet/minecraft/class_1966;Lnet/minecraft/class_6544$class_6552;II)V - ARG 1 source + METHOD method_38291 (Lnet/minecraft/class_6780;Lnet/minecraft/class_6544$class_6552;II)V ARG 2 sampler ARG 3 x ARG 4 z diff --git a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping index 501e06091c..ab47172122 100644 --- a/mappings/net/minecraft/world/chunk/ProtoChunk.mapping +++ b/mappings/net/minecraft/world/chunk/ProtoChunk.mapping @@ -7,13 +7,13 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk FIELD field_35473 belowZeroRetrogen Lnet/minecraft/class_6746; FIELD field_35474 blockTickScheduler Lnet/minecraft/class_4296; FIELD field_35475 fluidTickScheduler Lnet/minecraft/class_4296; - METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;Lnet/minecraft/class_6752;)V + METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;Lnet/minecraft/class_6749;)V ARG 1 pos ARG 2 upgradeData ARG 3 world ARG 4 biomeRegistry ARG 5 blendingData - METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;[Lnet/minecraft/class_2826;Lnet/minecraft/class_4296;Lnet/minecraft/class_4296;Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;Lnet/minecraft/class_6752;)V + METHOD (Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;[Lnet/minecraft/class_2826;Lnet/minecraft/class_4296;Lnet/minecraft/class_4296;Lnet/minecraft/class_5539;Lnet/minecraft/class_2378;Lnet/minecraft/class_6749;)V ARG 1 pos ARG 2 upgradeData ARG 3 sections diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index 13f978a23c..383720dd29 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1923;)V ARG 1 world ARG 2 pos - METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;Lnet/minecraft/class_6755;Lnet/minecraft/class_6755;J[Lnet/minecraft/class_2826;Ljava/util/function/Consumer;Lnet/minecraft/class_6752;)V + METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_1923;Lnet/minecraft/class_2843;Lnet/minecraft/class_6755;Lnet/minecraft/class_6755;J[Lnet/minecraft/class_2826;Ljava/util/function/Consumer;Lnet/minecraft/class_6749;)V ARG 1 world ARG 2 pos ARG 3 upgradeData diff --git a/mappings/net/minecraft/world/dimension/DimensionType.mapping b/mappings/net/minecraft/world/dimension/DimensionType.mapping index f8f5827183..da9be75155 100644 --- a/mappings/net/minecraft/world/dimension/DimensionType.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionType.mapping @@ -81,13 +81,12 @@ 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_5455;J)Lnet/minecraft/class_2370; + METHOD method_28517 createDefaultDimensionOptions (Lnet/minecraft/class_5455;JZ)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; ARG 0 instance - METHOD method_28523 addRegistryDefaults (Lnet/minecraft/class_5455$class_5457;)Lnet/minecraft/class_5455$class_5457; - ARG 0 registryManager + METHOD method_28523 addRegistryDefaults (Lnet/minecraft/class_5455;)Lnet/minecraft/class_5455; METHOD method_28528 getSkyAngle (J)F ARG 1 time METHOD method_28531 getMoonPhase (J)I diff --git a/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping b/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping index 69ec3d4c94..0276657c71 100644 --- a/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping +++ b/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_5818 net/minecraft/world/gen/NoiseColumnSampler COMMENT Samples noise values for use in chunk generation. - FIELD field_28752 verticalNoiseResolution I - FIELD field_28753 noiseSizeY I FIELD field_28754 config Lnet/minecraft/class_5309; FIELD field_28756 islandNoise Lnet/minecraft/class_3541; FIELD field_34633 caveLayerNoise Lnet/minecraft/class_5216; @@ -26,7 +24,6 @@ CLASS net/minecraft/class_5818 net/minecraft/world/gen/NoiseColumnSampler FIELD field_34652 erosionNoise Lnet/minecraft/class_5216; FIELD field_34653 weirdnessNoise Lnet/minecraft/class_5216; FIELD field_34654 shiftNoise Lnet/minecraft/class_5216; - FIELD field_34655 terrainParameters Lnet/minecraft/class_6555; FIELD field_34656 oreGapNoise Lnet/minecraft/class_5216; FIELD field_34657 intialNoiseSampler Lnet/minecraft/class_6568$class_6571; FIELD field_34659 oreFrequencyNoiseSamplerFactory Lnet/minecraft/class_6568$class_6571; @@ -40,7 +37,6 @@ CLASS net/minecraft/class_5818 net/minecraft/world/gen/NoiseColumnSampler FIELD field_34667 hasNoiseCaves Z FIELD field_34680 terrainNoise Lnet/minecraft/class_5822; FIELD field_34681 jaggedNoise Lnet/minecraft/class_5216; - FIELD field_34682 minY I FIELD field_34683 aquiferBarrierNoise Lnet/minecraft/class_5216; FIELD field_34685 aquiferLavaNoise Lnet/minecraft/class_5216; FIELD field_34686 aquiferRandomDeriver Lnet/minecraft/class_6574; @@ -48,15 +44,6 @@ CLASS net/minecraft/class_5818 net/minecraft/world/gen/NoiseColumnSampler FIELD field_35132 aquiferFluidLevelSpreadNoise Lnet/minecraft/class_5216; FIELD field_35208 depthBasedLayerRandomDeriver Lnet/minecraft/class_6574; FIELD field_35362 spawnSuitabilityNoises Ljava/util/List; - 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 hasNoiseCaves - ARG 6 seed - ARG 8 noiseRegistry - ARG 9 randomProvider METHOD method_33645 applySlides (DI)D COMMENT Interpolates the noise at the top and bottom of the world. ARG 1 noise diff --git a/mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping b/mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping index d4e34e44e0..9318797207 100644 --- a/mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping +++ b/mappings/net/minecraft/world/gen/blockpredicate/BlockPredicate.mapping @@ -1,22 +1,19 @@ CLASS net/minecraft/class_6646 net/minecraft/world/gen/blockpredicate/BlockPredicate FIELD field_35054 BASE_CODEC Lcom/mojang/serialization/Codec; METHOD method_38873 getType ()Lnet/minecraft/class_6647; - METHOD method_38876 matchingBlock (Lnet/minecraft/class_2248;Lnet/minecraft/class_2338;)Lnet/minecraft/class_6646; + METHOD method_38876 matchingBlock (Lnet/minecraft/class_2248;Lnet/minecraft/class_2382;)Lnet/minecraft/class_6646; ARG 0 block - ARG 1 offset METHOD method_38877 not (Lnet/minecraft/class_6646;)Lnet/minecraft/class_6646; ARG 0 predicate METHOD method_38878 bothOf (Lnet/minecraft/class_6646;Lnet/minecraft/class_6646;)Lnet/minecraft/class_6646; ARG 0 first ARG 1 second - METHOD method_38879 matchingFluid (Lnet/minecraft/class_3611;Lnet/minecraft/class_2338;)Lnet/minecraft/class_6646; + METHOD method_38879 matchingFluid (Lnet/minecraft/class_3611;Lnet/minecraft/class_2382;)Lnet/minecraft/class_6646; ARG 0 fluid - ARG 1 offset METHOD method_38880 allOf (Ljava/util/List;)Lnet/minecraft/class_6646; ARG 0 predicates - METHOD method_38881 matchingBlocks (Ljava/util/List;Lnet/minecraft/class_2338;)Lnet/minecraft/class_6646; + METHOD method_38881 matchingBlocks (Ljava/util/List;Lnet/minecraft/class_2382;)Lnet/minecraft/class_6646; ARG 0 blocks - ARG 1 offset METHOD method_38882 allOf ([Lnet/minecraft/class_6646;)Lnet/minecraft/class_6646; ARG 0 predicates METHOD method_38883 replaceable ()Lnet/minecraft/class_6646; @@ -25,14 +22,11 @@ CLASS net/minecraft/class_6646 net/minecraft/world/gen/blockpredicate/BlockPredi ARG 1 second METHOD method_38885 anyOf (Ljava/util/List;)Lnet/minecraft/class_6646; ARG 0 predicates - METHOD method_38886 matchingFluids (Ljava/util/List;Lnet/minecraft/class_2338;)Lnet/minecraft/class_6646; + METHOD method_38886 matchingFluids (Ljava/util/List;Lnet/minecraft/class_2382;)Lnet/minecraft/class_6646; ARG 0 fluids - ARG 1 offset METHOD method_38887 anyOf ([Lnet/minecraft/class_6646;)Lnet/minecraft/class_6646; ARG 0 predicates - METHOD method_39009 wouldSurvive (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)Lnet/minecraft/class_6646; + METHOD method_39009 wouldSurvive (Lnet/minecraft/class_2680;Lnet/minecraft/class_2382;)Lnet/minecraft/class_6646; ARG 0 state - ARG 1 offset - METHOD method_39010 replaceable (Lnet/minecraft/class_2338;)Lnet/minecraft/class_6646; - ARG 0 offset + METHOD method_39010 replaceable (Lnet/minecraft/class_2382;)Lnet/minecraft/class_6646; METHOD method_39011 alwaysTrue ()Lnet/minecraft/class_6646; diff --git a/mappings/net/minecraft/world/gen/blockpredicate/MatchingBlocksBlockPredicate.mapping b/mappings/net/minecraft/world/gen/blockpredicate/MatchingBlocksBlockPredicate.mapping index fead42b6fb..8c794078a0 100644 --- a/mappings/net/minecraft/world/gen/blockpredicate/MatchingBlocksBlockPredicate.mapping +++ b/mappings/net/minecraft/world/gen/blockpredicate/MatchingBlocksBlockPredicate.mapping @@ -1,8 +1,7 @@ CLASS net/minecraft/class_6649 net/minecraft/world/gen/blockpredicate/MatchingBlocksBlockPredicate FIELD field_35062 CODEC Lcom/mojang/serialization/Codec; FIELD field_35063 blocks Ljava/util/List; - METHOD (Lnet/minecraft/class_2338;Ljava/util/List;)V - ARG 1 offset + METHOD (Lnet/minecraft/class_2382;Ljava/util/List;)V ARG 2 blocks METHOD method_38894 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/blockpredicate/MatchingFluidsBlockPredicate.mapping b/mappings/net/minecraft/world/gen/blockpredicate/MatchingFluidsBlockPredicate.mapping index 30a77c4543..dd714d31d5 100644 --- a/mappings/net/minecraft/world/gen/blockpredicate/MatchingFluidsBlockPredicate.mapping +++ b/mappings/net/minecraft/world/gen/blockpredicate/MatchingFluidsBlockPredicate.mapping @@ -1,8 +1,7 @@ CLASS net/minecraft/class_6650 net/minecraft/world/gen/blockpredicate/MatchingFluidsBlockPredicate FIELD field_35065 CODEC Lcom/mojang/serialization/Codec; FIELD field_35066 fluids Ljava/util/List; - METHOD (Lnet/minecraft/class_2338;Ljava/util/List;)V - ARG 1 offset + METHOD (Lnet/minecraft/class_2382;Ljava/util/List;)V ARG 2 fluids METHOD method_38898 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/blockpredicate/OffsetPredicate.mapping b/mappings/net/minecraft/world/gen/blockpredicate/OffsetPredicate.mapping index 74bb1c5c4d..41ca8e711f 100644 --- a/mappings/net/minecraft/world/gen/blockpredicate/OffsetPredicate.mapping +++ b/mappings/net/minecraft/world/gen/blockpredicate/OffsetPredicate.mapping @@ -1,12 +1,10 @@ CLASS net/minecraft/class_6679 net/minecraft/world/gen/blockpredicate/OffsetPredicate - FIELD field_35157 offset Lnet/minecraft/class_2338; - METHOD (Lnet/minecraft/class_2338;)V - ARG 1 offset + FIELD field_35157 offset Lnet/minecraft/class_2382; METHOD method_38893 test (Lnet/minecraft/class_2680;)Z ARG 1 state METHOD method_39013 registerOffsetField (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/Products$P1; ARG 0 instance - METHOD method_39014 (Lnet/minecraft/class_6679;)Lnet/minecraft/class_2338; + METHOD method_39014 (Lnet/minecraft/class_6679;)Lnet/minecraft/class_2382; ARG 0 predicate METHOD test (Ljava/lang/Object;Ljava/lang/Object;)Z ARG 1 world diff --git a/mappings/net/minecraft/world/gen/blockpredicate/WouldSurviveBlockPredicate.mapping b/mappings/net/minecraft/world/gen/blockpredicate/WouldSurviveBlockPredicate.mapping index 6767fd35d0..f073a5e583 100644 --- a/mappings/net/minecraft/world/gen/blockpredicate/WouldSurviveBlockPredicate.mapping +++ b/mappings/net/minecraft/world/gen/blockpredicate/WouldSurviveBlockPredicate.mapping @@ -1,15 +1,14 @@ CLASS net/minecraft/class_6681 net/minecraft/world/gen/blockpredicate/WouldSurviveBlockPredicate FIELD field_35160 CODEC Lcom/mojang/serialization/Codec; - FIELD field_35161 offset Lnet/minecraft/class_2338; + FIELD field_35161 offset Lnet/minecraft/class_2382; FIELD field_35162 state Lnet/minecraft/class_2680; - METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V - ARG 1 offset + METHOD (Lnet/minecraft/class_2382;Lnet/minecraft/class_2680;)V ARG 2 state METHOD method_39018 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_39019 (Lnet/minecraft/class_6681;)Lnet/minecraft/class_2680; ARG 0 predicate - METHOD method_39020 (Lnet/minecraft/class_6681;)Lnet/minecraft/class_2338; + METHOD method_39020 (Lnet/minecraft/class_6681;)Lnet/minecraft/class_2382; ARG 0 predicate METHOD test (Ljava/lang/Object;Ljava/lang/Object;)Z ARG 1 world diff --git a/mappings/net/minecraft/world/gen/carver/CarverContext.mapping b/mappings/net/minecraft/world/gen/carver/CarverContext.mapping index b28fc3073a..1173c18faf 100644 --- a/mappings/net/minecraft/world/gen/carver/CarverContext.mapping +++ b/mappings/net/minecraft/world/gen/carver/CarverContext.mapping @@ -1,11 +1,10 @@ CLASS net/minecraft/class_5873 net/minecraft/world/gen/carver/CarverContext FIELD field_35298 chunkGenerator Lnet/minecraft/class_3754; FIELD field_35299 registryManager Lnet/minecraft/class_5455; - METHOD (Lnet/minecraft/class_3754;Lnet/minecraft/class_5455;Lnet/minecraft/class_5539;)V + METHOD (Lnet/minecraft/class_3754;Lnet/minecraft/class_5455;Lnet/minecraft/class_5539;Lnet/minecraft/class_6568;)V ARG 1 chunkGenerator ARG 2 registryManager ARG 3 heightLimitView METHOD method_39114 (Ljava/util/function/Function;Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;Z)Ljava/util/Optional; ARG 2 chunk - ARG 3 pos METHOD method_39115 getRegistryManager ()Lnet/minecraft/class_5455; diff --git a/mappings/net/minecraft/world/gen/chunk/Blender.mapping b/mappings/net/minecraft/world/gen/chunk/Blender.mapping index 7d20424042..1f5428325d 100644 --- a/mappings/net/minecraft/world/gen/chunk/Blender.mapping +++ b/mappings/net/minecraft/world/gen/chunk/Blender.mapping @@ -1,25 +1,11 @@ CLASS net/minecraft/class_6749 net/minecraft/world/gen/chunk/Blender - FIELD field_35512 NULL_BLENDER Lnet/minecraft/class_6749; FIELD field_35515 OLD_HEIGHT_LIMIT Lnet/minecraft/class_5539; FIELD field_35519 SURFACE_BLOCKS Ljava/util/List; - FIELD field_35520 chunkPos Lnet/minecraft/class_1923; - FIELD field_35521 surfaceHeights [D - METHOD (Lnet/minecraft/class_1923;)V - ARG 1 chunkPos - METHOD (Lnet/minecraft/class_2791;Lnet/minecraft/class_2791;Lnet/minecraft/class_2791;Lnet/minecraft/class_2791;)V - ARG 1 chunk1 - ARG 2 chunk2 - ARG 3 chunk3 - ARG 4 chunk4 METHOD method_39347 (ILnet/minecraft/class_2791;II)V ARG 1 index ARG 2 chunk ARG 3 x ARG 4 z - METHOD method_39348 create (Lnet/minecraft/class_3233;II)Lnet/minecraft/class_6749; - ARG 0 chunkRegion - ARG 1 chunkX - ARG 2 chunkZ METHOD method_39349 getSurfaceHeight (Lnet/minecraft/class_2791;II)I ARG 0 chunk ARG 1 x diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping index 33a8839724..88017d7edd 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler - FIELD field_34596 horizontalNoiseResolution I - FIELD field_34597 verticalNoiseResolution I FIELD field_34598 height I FIELD field_34599 horizontalSize I FIELD field_34600 minimumY I @@ -13,17 +11,11 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler FIELD field_34613 aquiferSampler Lnet/minecraft/class_6350; FIELD field_34614 initialNoiseBlockStateSampler Lnet/minecraft/class_6568$class_6569; FIELD field_34615 oreVeinSampler Lnet/minecraft/class_6568$class_6569; - METHOD (IIIIILnet/minecraft/class_5818;IILnet/minecraft/class_6568$class_6572;Ljava/util/function/Supplier;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;)V + METHOD (IIILnet/minecraft/class_5818;IILnet/minecraft/class_6568$class_6572;Lnet/minecraft/class_5284;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;)V ARG 1 horizontalNoiseResolution ARG 2 verticalNoiseResolution ARG 3 horizontalSize - ARG 4 height ARG 5 minimumY - ARG 7 x - ARG 8 z - ARG 9 columnSampler - ARG 10 settings - ARG 11 fluidLevelSampler METHOD method_38336 sampleStartNoise ()V METHOD method_38337 sampleNoiseY (D)V ARG 1 deltaY diff --git a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping index 7e7395578e..044d462ac2 100644 --- a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping @@ -1,16 +1,10 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator - FIELD field_16570 horizontalNoiseResolution I - FIELD field_16572 verticalNoiseResolution I FIELD field_16576 defaultBlock Lnet/minecraft/class_2680; - FIELD field_16578 noiseSizeZ I - FIELD field_16580 noiseSizeX I FIELD field_16648 AIR Lnet/minecraft/class_2680; FIELD field_24773 CODEC Lcom/mojang/serialization/Codec; FIELD field_24774 settings Ljava/util/function/Supplier; FIELD field_24778 seed J - FIELD field_24779 worldHeight I FIELD field_28746 EMPTY [Lnet/minecraft/class_2680; - FIELD field_28747 noiseSizeY I FIELD field_28748 noiseColumnSampler Lnet/minecraft/class_5818; FIELD field_34590 blockStateSampler Lnet/minecraft/class_6583; FIELD field_34591 fluidLevelSampler Lnet/minecraft/class_6350$class_6565; @@ -23,14 +17,9 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator METHOD (Lnet/minecraft/class_2378;Lnet/minecraft/class_1966;Lnet/minecraft/class_1966;JLjava/util/function/Supplier;)V ARG 1 noiseRegistry ARG 4 seed - ARG 6 settings METHOD method_26263 sampleHeightmap (II[Lnet/minecraft/class_2680;Ljava/util/function/Predicate;II)Ljava/util/OptionalInt; - ARG 1 x - ARG 2 z ARG 3 states ARG 4 predicate - ARG 5 minimumY - ARG 6 height METHOD method_28548 matchesSettings (JLnet/minecraft/class_5321;)Z ARG 1 seed ARG 3 settingsKey @@ -50,12 +39,6 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator ARG 3 y METHOD method_38327 (Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V ARG 2 world - ARG 3 chunk - METHOD method_38329 (III)D - ARG 0 x - ARG 1 y - ARG 2 z - METHOD method_39041 (Lnet/minecraft/class_5873;Ljava/util/function/Function;Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;Z)Ljava/util/Optional; + METHOD method_39041 (Lnet/minecraft/class_5873;Ljava/util/function/Function;Lnet/minecraft/class_2791;Lnet/minecraft/class_6568;Lnet/minecraft/class_2338;Z)Ljava/util/Optional; ARG 1 context ARG 3 chunk - ARG 4 pos diff --git a/mappings/net/minecraft/world/gen/decorator/AbstractCountDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/AbstractCountDecorator.mapping index 84ec329236..841baa6854 100644 --- a/mappings/net/minecraft/world/gen/decorator/AbstractCountDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/AbstractCountDecorator.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_5857 net/minecraft/world/gen/decorator/AbstractCountDecorator - METHOD method_14452 getCount (Ljava/util/Random;Lnet/minecraft/class_2998;Lnet/minecraft/class_2338;)I + METHOD method_14452 getCount (Ljava/util/Random;Lnet/minecraft/class_2338;)I ARG 1 random - ARG 2 config - ARG 3 pos diff --git a/mappings/net/minecraft/world/gen/decorator/AbstractRangeDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/AbstractRangeDecorator.mapping deleted file mode 100644 index af710494b1..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/AbstractRangeDecorator.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_5858 net/minecraft/world/gen/decorator/AbstractRangeDecorator - METHOD method_33861 getY (Lnet/minecraft/class_5444;Ljava/util/Random;Lnet/minecraft/class_2998;I)I - ARG 1 context - ARG 2 random - ARG 3 config - ARG 4 y diff --git a/mappings/net/minecraft/world/gen/decorator/BlockFilterDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/BlockFilterDecorator.mapping deleted file mode 100644 index 5c6e76e81e..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/BlockFilterDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_6619 net/minecraft/world/gen/decorator/BlockFilterDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/BlockFilterDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/BlockFilterDecoratorConfig.mapping index 33f8560498..9e211c48a9 100644 --- a/mappings/net/minecraft/world/gen/decorator/BlockFilterDecoratorConfig.mapping +++ b/mappings/net/minecraft/world/gen/decorator/BlockFilterDecoratorConfig.mapping @@ -3,4 +3,3 @@ CLASS net/minecraft/class_6658 net/minecraft/world/gen/decorator/BlockFilterDeco FIELD field_35076 predicate Lnet/minecraft/class_6646; METHOD (Lnet/minecraft/class_6646;)V ARG 1 predicate - METHOD method_38915 getPredicate ()Lnet/minecraft/class_6646; diff --git a/mappings/net/minecraft/world/gen/decorator/CarvingMaskDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/CarvingMaskDecorator.mapping deleted file mode 100644 index f72d2e0e46..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/CarvingMaskDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3234 net/minecraft/world/gen/decorator/CarvingMaskDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/CaveSurfaceDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/CaveSurfaceDecorator.mapping deleted file mode 100644 index a37fe92a5b..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/CaveSurfaceDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_5933 net/minecraft/world/gen/decorator/CaveSurfaceDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/CaveSurfaceDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/CaveSurfaceDecoratorConfig.mapping deleted file mode 100644 index ff82c91d59..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/CaveSurfaceDecoratorConfig.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/class_5931 net/minecraft/world/gen/decorator/CaveSurfaceDecoratorConfig - 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;IZ)V - ARG 1 surface - ARG 2 searchRange - METHOD method_34375 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/decorator/ChanceDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/ChanceDecorator.mapping deleted file mode 100644 index c5eb8308a2..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/ChanceDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3241 net/minecraft/world/gen/decorator/ChanceDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/ChanceDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/ChanceDecoratorConfig.mapping deleted file mode 100644 index 4025ec4ba6..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/ChanceDecoratorConfig.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_3297 net/minecraft/world/gen/decorator/ChanceDecoratorConfig - FIELD field_14289 chance I - FIELD field_24980 CODEC Lcom/mojang/serialization/Codec; - METHOD (I)V - ARG 1 chance diff --git a/mappings/net/minecraft/world/gen/decorator/ConditionalDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/ConditionalDecorator.mapping index 7514bd979c..b458318a1b 100644 --- a/mappings/net/minecraft/world/gen/decorator/ConditionalDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/ConditionalDecorator.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_6661 net/minecraft/world/gen/decorator/ConditionalDecorator - METHOD method_38918 shouldPlace (Lnet/minecraft/class_5444;Ljava/util/Random;Lnet/minecraft/class_2998;Lnet/minecraft/class_2338;)Z + METHOD method_38918 shouldPlace (Lnet/minecraft/class_5444;Ljava/util/Random;Lnet/minecraft/class_2338;)Z ARG 1 context ARG 2 random - ARG 3 config - ARG 4 pos diff --git a/mappings/net/minecraft/world/gen/decorator/ConfiguredDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/ConfiguredDecorator.mapping deleted file mode 100644 index d835432065..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/ConfiguredDecorator.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS net/minecraft/class_3243 net/minecraft/world/gen/decorator/ConfiguredDecorator - FIELD field_14114 config Lnet/minecraft/class_2998; - FIELD field_14115 decorator Lnet/minecraft/class_3284; - FIELD field_24981 CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_3284;Lnet/minecraft/class_2998;)V - ARG 1 decorator - ARG 2 config - METHOD method_30444 getPositions (Lnet/minecraft/class_5444;Ljava/util/Random;Lnet/minecraft/class_2338;)Ljava/util/stream/Stream; - ARG 1 context - ARG 2 random - ARG 3 pos - METHOD method_30445 getConfig ()Lnet/minecraft/class_2998; diff --git a/mappings/net/minecraft/world/gen/decorator/CountDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/CountDecorator.mapping deleted file mode 100644 index 9d406a6ec7..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/CountDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_5440 net/minecraft/world/gen/decorator/CountDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/CountExtraDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/CountExtraDecorator.mapping deleted file mode 100644 index 3b5c1d6d74..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/CountExtraDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3265 net/minecraft/world/gen/decorator/CountExtraDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/CountExtraDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/CountExtraDecoratorConfig.mapping deleted file mode 100644 index 8fcfb5333d..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/CountExtraDecoratorConfig.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/class_3276 net/minecraft/world/gen/decorator/CountExtraDecoratorConfig - FIELD field_14209 extraChance F - FIELD field_14210 extraCount I - FIELD field_14211 count I - FIELD field_24986 CODEC Lcom/mojang/serialization/Codec; - METHOD (IFI)V - ARG 1 count - ARG 2 extraChance - ARG 3 extraCount - METHOD method_28935 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/decorator/CountNoiseBiasedDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/CountNoiseBiasedDecorator.mapping deleted file mode 100644 index d028bdfaa6..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/CountNoiseBiasedDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3316 net/minecraft/world/gen/decorator/CountNoiseBiasedDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/CountNoiseDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/CountNoiseDecorator.mapping deleted file mode 100644 index 1d84b2c589..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/CountNoiseDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_5441 net/minecraft/world/gen/decorator/CountNoiseDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/DarkOakTreeDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/DarkOakTreeDecorator.mapping deleted file mode 100644 index 5fd5488f9a..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/DarkOakTreeDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3315 net/minecraft/world/gen/decorator/DarkOakTreeDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/Decoratable.mapping b/mappings/net/minecraft/world/gen/decorator/Decoratable.mapping deleted file mode 100644 index 0ceea3ac8c..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/Decoratable.mapping +++ /dev/null @@ -1,51 +0,0 @@ -CLASS net/minecraft/class_5432 net/minecraft/world/gen/decorator/Decoratable - METHOD method_30371 spreadHorizontally ()Ljava/lang/Object; - COMMENT Applies the {@code minecraft:square} decorator, which spreads positions - COMMENT horizontally a random amount between 0 and 15 blocks on both horizontal axes. - METHOD method_30372 applyChance (I)Ljava/lang/Object; - COMMENT Applies the {@code minecraft:chance} decorator, which only - COMMENT allows positions with a {@code 1 / count} chance, - COMMENT e.g. a count of 2 would give approximately half of the input positions. - ARG 1 chance - METHOD method_30373 repeat (Lnet/minecraft/class_6017;)Ljava/lang/Object; - COMMENT Applies the {@code minecraft:count} decorator, which repeats - COMMENT the input positions by the value of the {@code count} distribution. - ARG 1 count - COMMENT the distribution of the repetition count - METHOD method_30374 decorate (Lnet/minecraft/class_3243;)Ljava/lang/Object; - ARG 1 decorator - METHOD method_30375 repeat (I)Ljava/lang/Object; - COMMENT Applies the {@code minecraft:count} decorator, which repeats - COMMENT the input positions {@code count} times. - ARG 1 count - COMMENT the repetition count - METHOD method_30376 repeatRandomly (I)Ljava/lang/Object; - COMMENT Applies the {@code minecraft:count} decorator, which repeats - COMMENT the input positions by a random number between 0 and {@code maxCount}. - ARG 1 maxCount - COMMENT the maximum repetition count - METHOD method_33838 range (Lnet/minecraft/class_2997;)Ljava/lang/Object; - ARG 1 config - METHOD method_36296 uniformRange (Lnet/minecraft/class_5843;Lnet/minecraft/class_5843;)Ljava/lang/Object; - ARG 1 min - COMMENT the minimum offset, inclusive - ARG 2 max - COMMENT the maximum offset, inclusive - METHOD method_36297 triangleRange (Lnet/minecraft/class_5843;Lnet/minecraft/class_5843;)Ljava/lang/Object; - ARG 1 min - COMMENT the minimum offset, inclusive - ARG 2 max - COMMENT the maximum offset, inclusive - METHOD method_38670 wouldSurvive (Lnet/minecraft/class_2248;)Ljava/lang/Object; - COMMENT Applies the {@code block_filter} decorator, configured so that the feature will - COMMENT only generate if a given block could be placed at its location. - ARG 1 block - COMMENT the block to check for - METHOD method_38872 onlyInAir ()Ljava/lang/Object; - COMMENT Applies the {@code block_filter} decorator, configured so the feature can only - COMMENT generate if it is in air. - METHOD method_38994 applyBlockFilter (Lnet/minecraft/class_6646;)Ljava/lang/Object; - COMMENT Applies the {@code block_filter} decorator, which will only generate a feature if - COMMENT a given predicate matches. - ARG 1 predicate - COMMENT the block predicate that has to match for the feature to generate diff --git a/mappings/net/minecraft/world/gen/decorator/DecoratedDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/DecoratedDecorator.mapping deleted file mode 100644 index 9294197d93..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/DecoratedDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_5442 net/minecraft/world/gen/decorator/DecoratedDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/DecoratedDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/DecoratedDecoratorConfig.mapping deleted file mode 100644 index 3f6843bc50..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/DecoratedDecoratorConfig.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/class_5443 net/minecraft/world/gen/decorator/DecoratedDecoratorConfig - FIELD field_25854 CODEC Lcom/mojang/serialization/Codec; - FIELD field_25855 outer Lnet/minecraft/class_3243; - FIELD field_25856 inner Lnet/minecraft/class_3243; - METHOD (Lnet/minecraft/class_3243;Lnet/minecraft/class_3243;)V - ARG 1 outer - ARG 2 inner - METHOD method_30455 getOuter ()Lnet/minecraft/class_3243; - METHOD method_30456 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_30457 getInner ()Lnet/minecraft/class_3243; diff --git a/mappings/net/minecraft/world/gen/decorator/Decorator.mapping b/mappings/net/minecraft/world/gen/decorator/Decorator.mapping deleted file mode 100644 index 1b284f2d06..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/Decorator.mapping +++ /dev/null @@ -1,17 +0,0 @@ -CLASS net/minecraft/class_3284 net/minecraft/world/gen/decorator/Decorator - FIELD field_24983 codec Lcom/mojang/serialization/Codec; - METHOD (Lcom/mojang/serialization/Codec;)V - ARG 1 configCodec - METHOD method_14450 register (Ljava/lang/String;Lnet/minecraft/class_3284;)Lnet/minecraft/class_3284; - ARG 0 registryName - ARG 1 decorator - METHOD method_14452 getPositions (Lnet/minecraft/class_5444;Ljava/util/Random;Lnet/minecraft/class_2998;Lnet/minecraft/class_2338;)Ljava/util/stream/Stream; - ARG 1 context - ARG 2 random - ARG 3 config - ARG 4 pos - METHOD method_23475 configure (Lnet/minecraft/class_2998;)Lnet/minecraft/class_3243; - ARG 1 config - METHOD method_28928 getCodec ()Lcom/mojang/serialization/Codec; - METHOD method_28930 (Lnet/minecraft/class_2998;)Lnet/minecraft/class_3243; - ARG 1 config diff --git a/mappings/net/minecraft/world/gen/decorator/DecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/DecoratorConfig.mapping deleted file mode 100644 index 9f306e1e2f..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/DecoratorConfig.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_2998 net/minecraft/world/gen/decorator/DecoratorConfig - FIELD field_13436 DEFAULT Lnet/minecraft/class_3113; diff --git a/mappings/net/minecraft/world/gen/decorator/DecoratorContext.mapping b/mappings/net/minecraft/world/gen/decorator/DecoratorContext.mapping index 4613b9ff97..3121a2c408 100644 --- a/mappings/net/minecraft/world/gen/decorator/DecoratorContext.mapping +++ b/mappings/net/minecraft/world/gen/decorator/DecoratorContext.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_5444 net/minecraft/world/gen/decorator/DecoratorContext FIELD field_25857 world Lnet/minecraft/class_5281; - METHOD (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;)V + METHOD (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Ljava/util/Optional;)V ARG 1 world ARG 2 generator METHOD method_30459 getOrCreateCarvingMask (Lnet/minecraft/class_1923;Lnet/minecraft/class_2893$class_2894;)Lnet/minecraft/class_6643; diff --git a/mappings/net/minecraft/world/gen/decorator/EndGatewayDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/EndGatewayDecorator.mapping deleted file mode 100644 index 7b450e9c00..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/EndGatewayDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3280 net/minecraft/world/gen/decorator/EndGatewayDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/EnvironmentScanDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/EnvironmentScanDecorator.mapping deleted file mode 100644 index ec04889d40..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/EnvironmentScanDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_6660 net/minecraft/world/gen/decorator/EnvironmentScanDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/EnvironmentScanDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/EnvironmentScanDecoratorConfig.mapping deleted file mode 100644 index c9ad03d7fd..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/EnvironmentScanDecoratorConfig.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_6659 net/minecraft/world/gen/decorator/EnvironmentScanDecoratorConfig - FIELD field_35077 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/world/gen/decorator/HeightmapDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/HeightmapDecorator.mapping deleted file mode 100644 index 3497e20ac1..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/HeightmapDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_5438 net/minecraft/world/gen/decorator/HeightmapDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/IcebergDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/IcebergDecorator.mapping deleted file mode 100644 index cb395f52c5..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/IcebergDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_5852 net/minecraft/world/gen/decorator/IcebergDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/LavaLakeDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/LavaLakeDecorator.mapping deleted file mode 100644 index 523fa18366..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/LavaLakeDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_3293 net/minecraft/world/gen/decorator/LavaLakeDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/NopeDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/NopeDecorator.mapping deleted file mode 100644 index ac820374b4..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/NopeDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_5853 net/minecraft/world/gen/decorator/NopeDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/NopeDecoratorConfig.mapping b/mappings/net/minecraft/world/gen/decorator/NopeDecoratorConfig.mapping deleted file mode 100644 index 8ecd3a6a26..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/NopeDecoratorConfig.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_3113 net/minecraft/world/gen/decorator/NopeDecoratorConfig - FIELD field_24891 CODEC Lcom/mojang/serialization/Codec; - FIELD field_24892 INSTANCE Lnet/minecraft/class_3113; diff --git a/mappings/net/minecraft/world/gen/decorator/RangeDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/RangeDecorator.mapping deleted file mode 100644 index 8bbade94ba..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/RangeDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_5855 net/minecraft/world/gen/decorator/RangeDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/ScatterDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/ScatterDecorator.mapping deleted file mode 100644 index 58048efc43..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/ScatterDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_6733 net/minecraft/world/gen/decorator/ScatterDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/SurfaceRelativeThresholdDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/SurfaceRelativeThresholdDecorator.mapping deleted file mode 100644 index c399cbcd7d..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/SurfaceRelativeThresholdDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_6585 net/minecraft/world/gen/decorator/SurfaceRelativeThresholdDecorator diff --git a/mappings/net/minecraft/world/gen/decorator/WaterDepthThresholdDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/WaterDepthThresholdDecorator.mapping deleted file mode 100644 index 31d8d5026f..0000000000 --- a/mappings/net/minecraft/world/gen/decorator/WaterDepthThresholdDecorator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_5935 net/minecraft/world/gen/decorator/WaterDepthThresholdDecorator diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping index 1711ea2acb..10d1221109 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping @@ -12,14 +12,6 @@ CLASS net/minecraft/class_2975 net/minecraft/world/gen/feature/ConfiguredFeature ARG 2 chunkGenerator ARG 3 random ARG 4 origin - METHOD method_23387 withChance (F)Lnet/minecraft/class_3226; - ARG 1 chance METHOD method_30380 getFeature ()Lnet/minecraft/class_3031; METHOD method_30381 getConfig ()Lnet/minecraft/class_3037; METHOD method_30648 getDecoratedFeatures ()Ljava/util/stream/Stream; - METHOD method_38426 generate (Ljava/util/Optional;Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z - ARG 1 feature - ARG 2 world - ARG 3 chunkGenerator - ARG 4 random - ARG 5 origin diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping deleted file mode 100644 index 45051b26bf..0000000000 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredFeatures.mapping +++ /dev/null @@ -1,86 +0,0 @@ -CLASS net/minecraft/class_5464 net/minecraft/world/gen/feature/ConfiguredFeatures - FIELD field_26090 FOREST_FLOWER_VEGETATION_CONFIGS Lcom/google/common/collect/ImmutableList; - FIELD field_29084 IRON_ORE_TARGETS Lcom/google/common/collect/ImmutableList; - FIELD field_29085 REDSTONE_ORE_TARGETS Lcom/google/common/collect/ImmutableList; - FIELD field_29086 GOLD_ORE_TARGETS Lcom/google/common/collect/ImmutableList; - FIELD field_29087 DIAMOND_ORE_TARGETS Lcom/google/common/collect/ImmutableList; - FIELD field_29088 LAPIS_ORE_TARGETS Lcom/google/common/collect/ImmutableList; - FIELD field_29090 IRON_CONFIG Lnet/minecraft/class_3124; - FIELD field_29091 REDSTONE_CONFIG Lnet/minecraft/class_3124; - FIELD field_29508 INFESTED_TARGETS Lcom/google/common/collect/ImmutableList; - FIELD field_29511 RANDOM_BERRIES_CAVE_VINES_BODY_PROVIDER Lnet/minecraft/class_4657; - FIELD field_29512 RANDOM_AGE_CAVE_VINES_HEAD_PROVIDER Lnet/minecraft/class_5929; - FIELD field_29529 FOSSIL_STRUCTURES Lcom/google/common/collect/ImmutableList; - FIELD field_29530 FOSSIL_OVERLAY_STRUCTURES Lcom/google/common/collect/ImmutableList; - FIELD field_33634 EMERALD_ORE_TARGETS Lcom/google/common/collect/ImmutableList; - FIELD field_33635 COPPER_ORE_TARGETS Lcom/google/common/collect/ImmutableList; - FIELD field_33636 COAL_ORE_TARGETS Lcom/google/common/collect/ImmutableList; - FIELD field_35097 ONLY_ON_SNOW Lnet/minecraft/class_6646; - FIELD field_35098 MOVE_ONTO_SNOW_DECORATOR Lnet/minecraft/class_3243; - FIELD field_35167 ONLY_IN_AIR Lnet/minecraft/class_6646; - FIELD field_35170 ONLY_IN_AIR_OR_WATER Lnet/minecraft/class_6646; - METHOD method_30590 register (Ljava/lang/String;Lnet/minecraft/class_2975;)Lnet/minecraft/class_2975; - ARG 0 id - ARG 1 configuredFeature - METHOD method_34666 createBigDripleafFeature (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2975; - ARG 0 blockDirection - METHOD method_34855 createSmallDripleafFeature ()Lnet/minecraft/class_2975; - METHOD method_35926 pool ()Lnet/minecraft/class_6005$class_6006; - METHOD method_38746 buildTree (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;IIII)Lnet/minecraft/class_4643$class_4644; - ARG 0 trunkBlock - ARG 1 foliageBlock - ARG 2 baseHeight - ARG 3 firstRandomHeight - ARG 4 secondRandomHeight - ARG 5 foliageRadius - METHOD method_38747 buildOakTree ()Lnet/minecraft/class_4643$class_4644; - METHOD method_38748 buildBirchTree ()Lnet/minecraft/class_4643$class_4644; - METHOD method_38749 buildTallBirchTree ()Lnet/minecraft/class_4643$class_4644; - METHOD method_38750 buildJungleTree ()Lnet/minecraft/class_4643$class_4644; - METHOD method_38751 buildLargeOakTree ()Lnet/minecraft/class_4643$class_4644; - METHOD method_38946 createRandomPatchFeature (Lnet/minecraft/class_2975;)Lnet/minecraft/class_4638; - ARG 0 feature - METHOD method_38947 createRandomPatchFeature (Lnet/minecraft/class_2975;Ljava/util/List;)Lnet/minecraft/class_4638; - ARG 0 feature - ARG 1 generateOnBlocks - METHOD method_38948 createRandomPatchFeature (Lnet/minecraft/class_2975;Ljava/util/List;I)Lnet/minecraft/class_4638; - ARG 0 feature - ARG 1 generateOnBlocks - ARG 2 tries - METHOD method_38950 createRandomPatchFeature (Lnet/minecraft/class_4651;I)Lnet/minecraft/class_4638; - ARG 0 toPlace - ARG 1 tries - CLASS class_5465 Configs - FIELD field_26141 GRASS_CONFIG Lnet/minecraft/class_4638; - FIELD field_26142 TAIGA_GRASS_CONFIG Lnet/minecraft/class_4638; - FIELD field_26143 LUSH_GRASS_CONFIG Lnet/minecraft/class_4638; - FIELD field_26144 DEFAULT_FLOWER_CONFIG Lnet/minecraft/class_4638; - FIELD field_26145 DEAD_BUSH_CONFIG Lnet/minecraft/class_4638; - FIELD field_26146 SWEET_BERRY_BUSH_CONFIG Lnet/minecraft/class_4638; - FIELD field_26147 TALL_GRASS_CONFIG Lnet/minecraft/class_4638; - FIELD field_26148 SUGAR_CANE_CONFIG Lnet/minecraft/class_4638; - FIELD field_26149 LAVA_SPRING_CONFIG Lnet/minecraft/class_4642; - FIELD field_26150 ENCLOSED_NETHER_SPRING_CONFIG Lnet/minecraft/class_4642; - FIELD field_26151 CRIMSON_ROOTS_CONFIG Lnet/minecraft/class_4634; - FIELD field_26152 WARPED_ROOTS_CONFIG Lnet/minecraft/class_4634; - FIELD field_26153 NETHER_SPROUTS_CONFIG Lnet/minecraft/class_4634; - CLASS class_5466 Decorators - FIELD field_26154 VERY_RARE_BEEHIVES_TREES Lnet/minecraft/class_4659; - FIELD field_26155 REGULAR_BEEHIVES_TREES Lnet/minecraft/class_4659; - FIELD field_26156 MORE_BEEHIVES_TREES Lnet/minecraft/class_4659; - FIELD field_26157 FIRE Lnet/minecraft/class_3243; - FIELD field_26158 HEIGHTMAP Lnet/minecraft/class_3243; - FIELD field_26159 TOP_SOLID_HEIGHTMAP Lnet/minecraft/class_3243; - FIELD field_26160 HEIGHTMAP_WORLD_SURFACE Lnet/minecraft/class_3243; - FIELD field_26165 SQUARE_HEIGHTMAP Lnet/minecraft/class_3243; - FIELD field_26167 SQUARE_TOP_SOLID_HEIGHTMAP Lnet/minecraft/class_3243; - FIELD field_28956 BOTTOM_TO_TOP Lnet/minecraft/class_2997; - FIELD field_28957 BOTTOM_TO_TOP_OFFSET_10 Lnet/minecraft/class_2997; - FIELD field_28958 BOTTOM_TO_TOP_OFFSET_8 Lnet/minecraft/class_2997; - FIELD field_28959 BOTTOM_TO_TOP_OFFSET_4 Lnet/minecraft/class_2997; - FIELD field_28960 DARK_OAK_TREE_HEIGHTMAP Lnet/minecraft/class_3243; - FIELD field_29531 HEIGHTMAP_OCEAN_FLOOR Lnet/minecraft/class_3243; - FIELD field_29533 HEIGHTMAP_OCEAN_FLOOR_NO_WATER Lnet/minecraft/class_3243; - FIELD field_29534 SQUARE_HEIGHTMAP_OCEAN_FLOOR_NO_WATER Lnet/minecraft/class_3243; - FIELD field_34843 HALF_BEEHIVES_TREES Lnet/minecraft/class_4659; - FIELD field_34844 BOTTOM_TO_120 Lnet/minecraft/class_2997; diff --git a/mappings/net/minecraft/world/gen/feature/DecoratedFeature.mapping b/mappings/net/minecraft/world/gen/feature/DecoratedFeature.mapping deleted file mode 100644 index 26fd478795..0000000000 --- a/mappings/net/minecraft/world/gen/feature/DecoratedFeature.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_2988 net/minecraft/world/gen/feature/DecoratedFeature - METHOD method_30384 (Lnet/minecraft/class_5821;Lnet/minecraft/class_2975;Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Ljava/util/Random;Lorg/apache/commons/lang3/mutable/MutableBoolean;Lnet/minecraft/class_2338;)V - ARG 6 origin diff --git a/mappings/net/minecraft/world/gen/feature/DecoratedFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/DecoratedFeatureConfig.mapping deleted file mode 100644 index f8230d0dbb..0000000000 --- a/mappings/net/minecraft/world/gen/feature/DecoratedFeatureConfig.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/class_2986 net/minecraft/world/gen/feature/DecoratedFeatureConfig - FIELD field_13398 decorator Lnet/minecraft/class_3243; - FIELD field_13399 feature Ljava/util/function/Supplier; - FIELD field_24880 CODEC Lcom/mojang/serialization/Codec; - METHOD (Ljava/util/function/Supplier;Lnet/minecraft/class_3243;)V - ARG 1 feature - ARG 2 decorator - METHOD method_28703 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/feature/HugeFungusFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/HugeFungusFeatureConfig.mapping index 19db2fafd8..1023c2f926 100644 --- a/mappings/net/minecraft/world/gen/feature/HugeFungusFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/HugeFungusFeatureConfig.mapping @@ -3,10 +3,6 @@ CLASS net/minecraft/class_4780 net/minecraft/world/gen/feature/HugeFungusFeature FIELD field_22192 hatState Lnet/minecraft/class_2680; FIELD field_22193 decorationState Lnet/minecraft/class_2680; FIELD field_22194 planted Z - FIELD field_22431 CRIMSON_FUNGUS_CONFIG Lnet/minecraft/class_4780; - FIELD field_22432 CRIMSON_FUNGUS_NOT_PLANTED_CONFIG Lnet/minecraft/class_4780; - FIELD field_22433 WARPED_FUNGUS_CONFIG Lnet/minecraft/class_4780; - FIELD field_22434 WARPED_FUNGUS_NOT_PLANTED_CONFIG Lnet/minecraft/class_4780; FIELD field_22435 validBaseBlock Lnet/minecraft/class_2680; FIELD field_24838 CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Z)V diff --git a/mappings/net/minecraft/world/gen/feature/NetherForestVegetationFeature.mapping b/mappings/net/minecraft/world/gen/feature/NetherForestVegetationFeature.mapping index 0fb0752b96..57a14a2827 100644 --- a/mappings/net/minecraft/world/gen/feature/NetherForestVegetationFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/NetherForestVegetationFeature.mapping @@ -1,6 +1 @@ CLASS net/minecraft/class_4782 net/minecraft/world/gen/feature/NetherForestVegetationFeature - METHOD method_26264 generate (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_4634;II)Z - ARG 0 world - ARG 1 random - ARG 2 pos - ARG 3 config diff --git a/mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping index 19f97cbe25..441451f411 100644 --- a/mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/OreFeatureConfig.mapping @@ -24,12 +24,6 @@ CLASS net/minecraft/class_3124 net/minecraft/world/gen/feature/OreFeatureConfig METHOD method_33994 createTarget (Lnet/minecraft/class_3825;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3124$class_5876; ARG 0 test ARG 1 state - CLASS class_5436 Rules - FIELD field_25845 BASE_STONE_OVERWORLD Lnet/minecraft/class_3825; - FIELD field_25846 NETHERRACK Lnet/minecraft/class_3825; - FIELD field_25847 BASE_STONE_NETHER Lnet/minecraft/class_3825; - FIELD field_29065 STONE_ORE_REPLACEABLES Lnet/minecraft/class_3825; - FIELD field_29066 DEEPSLATE_ORE_REPLACEABLES Lnet/minecraft/class_3825; CLASS class_5876 Target FIELD field_29067 CODEC Lcom/mojang/serialization/Codec; FIELD field_29068 target Lnet/minecraft/class_3825; diff --git a/mappings/net/minecraft/world/gen/feature/PillagerOutpostFeature.mapping b/mappings/net/minecraft/world/gen/feature/PillagerOutpostFeature.mapping index 6bc76c3428..bbabe99002 100644 --- a/mappings/net/minecraft/world/gen/feature/PillagerOutpostFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/PillagerOutpostFeature.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_3770 net/minecraft/world/gen/feature/PillagerOutpostFeature FIELD field_16656 MONSTER_SPAWNS Lnet/minecraft/class_6012; - METHOD method_30845 isVillageNearby (Lnet/minecraft/class_2794;JLnet/minecraft/class_2919;Lnet/minecraft/class_1923;)Z + METHOD method_30845 isVillageNearby (Lnet/minecraft/class_2794;JLnet/minecraft/class_1923;)Z ARG 1 generator ARG 2 worldSeed - ARG 4 random - ARG 5 pos diff --git a/mappings/net/minecraft/world/gen/feature/RandomFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/RandomFeatureConfig.mapping index 6c04fb258e..96ef3122bb 100644 --- a/mappings/net/minecraft/world/gen/feature/RandomFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/RandomFeatureConfig.mapping @@ -5,8 +5,7 @@ CLASS net/minecraft/class_3141 net/minecraft/world/gen/feature/RandomFeatureConf METHOD (Ljava/util/List;Ljava/util/function/Supplier;)V ARG 1 features ARG 2 defaultFeature - METHOD (Ljava/util/List;Lnet/minecraft/class_2975;)V + METHOD (Ljava/util/List;Lnet/minecraft/class_6796;)V ARG 1 features - ARG 2 defaultFeature METHOD method_28753 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping b/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping index 1c50992bcf..38916a829c 100644 --- a/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping +++ b/mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping @@ -5,8 +5,7 @@ CLASS net/minecraft/class_3226 net/minecraft/world/gen/feature/RandomFeatureEntr METHOD (Ljava/util/function/Supplier;F)V ARG 1 feature ARG 2 chance - METHOD (Lnet/minecraft/class_2975;F)V - ARG 1 feature + METHOD (Lnet/minecraft/class_6796;F)V ARG 2 chance METHOD method_14271 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z ARG 1 world diff --git a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping index 2fdcc5cd4f..e070e3649e 100644 --- a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping @@ -23,16 +23,14 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature ARG 6 worldSeed ARG 8 config METHOD method_14019 getName ()Ljava/lang/String; - METHOD method_14026 shouldStartAt (Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;JLnet/minecraft/class_2919;Lnet/minecraft/class_1923;Lnet/minecraft/class_1923;Lnet/minecraft/class_3037;Lnet/minecraft/class_5539;)Z + METHOD method_14026 shouldStartAt (Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;JLnet/minecraft/class_1923;Lnet/minecraft/class_3037;Lnet/minecraft/class_5539;)Z COMMENT Checks if this structure can actually be placed at a potential structure position determined via COMMENT {@link #getStartChunk}. Specific structures override this method to reduce the spawn probability or COMMENT restrict the spawn in some other way. ARG 1 chunkGenerator ARG 2 biomeSource ARG 3 worldSeed - ARG 5 random - ARG 6 pos - METHOD method_27218 getStartChunk (Lnet/minecraft/class_5314;JLnet/minecraft/class_2919;II)Lnet/minecraft/class_1923; + METHOD method_27218 getStartChunk (Lnet/minecraft/class_5314;JII)Lnet/minecraft/class_1923; COMMENT Determines the cell of the structure placement grid a chunk belongs to, and COMMENT returns the chunk within that cell, that this structure will actually be placed at. COMMENT

@@ -44,14 +42,11 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature COMMENT @see #isUniformDistribution() ARG 1 config ARG 2 worldSeed - ARG 4 placementRandom - ARG 5 chunkX - ARG 6 chunkY METHOD method_27219 isUniformDistribution ()Z COMMENT If true, this structure's start position will be uniformly distributed within COMMENT a placement grid cell. If false, the structure's starting point will be biased COMMENT towards the center of the cell. - METHOD method_28657 tryPlaceStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;ILnet/minecraft/class_2919;Lnet/minecraft/class_5314;Lnet/minecraft/class_3037;Lnet/minecraft/class_5539;Ljava/util/function/Predicate;)Lnet/minecraft/class_3449; + METHOD method_28657 tryPlaceStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;ILnet/minecraft/class_5314;Lnet/minecraft/class_3037;Lnet/minecraft/class_5539;Ljava/util/function/Predicate;)Lnet/minecraft/class_3449; COMMENT Tries to place a starting point for this type of structure in the given chunk. COMMENT

COMMENT If this structure doesn't have a starting point in the chunk, {@link StructureStart#DEFAULT} diff --git a/mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping b/mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping index d7d94a9c9a..89cee7d138 100644 --- a/mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping @@ -9,20 +9,6 @@ CLASS net/minecraft/class_4953 net/minecraft/world/gen/feature/TwistingVinesFeat ARG 3 maxLength ARG 4 minAge ARG 5 maxAge - METHOD method_25988 generateVinesInArea (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;III)V - ARG 0 world - ARG 1 random - ARG 2 pos - ARG 3 horizontalSpread - ARG 4 verticalSpread - ARG 5 length - METHOD method_26265 tryGenerateVines (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;III)Z - ARG 0 world - ARG 1 random - ARG 2 pos - ARG 3 horizontalSpread - ARG 4 verticalSpread - ARG 5 length METHOD method_27220 canGenerate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338$class_2339;)Z ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping index 7ac2bb7159..aefc67f4f6 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/MaterialRules.mapping @@ -78,24 +78,13 @@ CLASS net/minecraft/class_6686 net/minecraft/world/gen/surfacebuilder/MaterialRu FIELD field_35618 fluidHeight I FIELD field_35619 stoneDepthBelow I FIELD field_35620 stoneDepthAbove I - METHOD (Lnet/minecraft/class_6724;Lnet/minecraft/class_2791;Ljava/util/function/Function;Lnet/minecraft/class_2378;Lnet/minecraft/class_5868;)V + METHOD (Lnet/minecraft/class_6724;Lnet/minecraft/class_2791;Lnet/minecraft/class_6568;Ljava/util/function/Function;Lnet/minecraft/class_2378;Lnet/minecraft/class_5868;)V ARG 1 surfaceBuilder ARG 2 chunk - ARG 3 posToBiome - ARG 4 biomeRegistry - ARG 5 heightContext - METHOD method_39072 initHorizontalContext (III)V + METHOD method_39072 initHorizontalContext (II)V ARG 1 x ARG 2 z - ARG 3 runDepth - METHOD method_39073 initVerticalContext (IIIIIII)V - ARG 1 surfaceMinY - ARG 2 stoneDepthAbove - ARG 3 stoneDepthBelow - ARG 4 fluidHeight - ARG 5 x - ARG 6 y - ARG 7 z + METHOD method_39073 initVerticalContext (IIIIII)V CLASS class_6695 NegativeRunDepthPredicate CLASS class_6696 SteepSlopePredicate CLASS class_6771 SurfacePredicate diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping index 5954b88c0e..2968d9f415 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping @@ -47,11 +47,10 @@ CLASS net/minecraft/class_6724 net/minecraft/world/gen/surfacebuilder/SurfaceBui ARG 1 terracottaBands ARG 2 minBandSize ARG 3 state - METHOD method_39110 (Lnet/minecraft/class_6686$class_6708;Lnet/minecraft/class_5873;Ljava/util/function/Function;Lnet/minecraft/class_2791;Lnet/minecraft/class_2338;Z)Ljava/util/Optional; + METHOD method_39110 (Lnet/minecraft/class_6686$class_6708;Lnet/minecraft/class_5873;Ljava/util/function/Function;Lnet/minecraft/class_2791;Lnet/minecraft/class_6568;Lnet/minecraft/class_2338;Z)Ljava/util/Optional; ARG 1 rule ARG 2 context ARG 4 chunk - ARG 5 pos METHOD method_39112 getNoiseSampler (Lnet/minecraft/class_5321;)Lnet/minecraft/class_5216; METHOD method_39333 isDefaultBlock (Lnet/minecraft/class_2680;)Z ARG 1 state