From fd8c5a74866886532df3fe69ba09bd1c314dbf68 Mon Sep 17 00:00:00 2001 From: Player Date: Wed, 16 Feb 2022 19:13:28 +0100 Subject: [PATCH] 22w07a --- build.gradle | 2 +- mappings/net/minecraft/class_6910.mapping | 3 + mappings/net/minecraft/class_6954.mapping | 6 + mappings/net/minecraft/class_6955.mapping | 13 ++ .../realms/gui/RealmsDataFetcher.mapping | 2 +- .../client/world/GeneratorType.mapping | 2 - .../data/report/RegistryDumpProvider.mapping | 2 - .../entity/FallingBlockEntity.mapping | 1 - .../entity/mob/WaterCreatureEntity.mapping | 2 - .../entity/passive/GlowSquidEntity.mapping | 2 - .../screen/EnchantmentScreenHandler.mapping | 1 - .../minecraft/screen/ScreenHandler.mapping | 1 - .../util/registry/RegistryEntryList.mapping | 2 - .../util/registry/SimpleRegistry.mapping | 7 - .../minecraft/world/StructureLocator.mapping | 6 +- mappings/net/minecraft/world/World.mapping | 2 - .../world/biome/source/BiomeSource.mapping | 2 +- .../biome/source/util/MultiNoiseUtil.mapping | 10 +- .../source/util/TerrainNoisePoint.mapping | 7 - .../util/VanillaTerrainParameters.mapping | 3 - .../net/minecraft/world/chunk/Chunk.mapping | 2 +- .../minecraft/world/chunk/UpgradeData.mapping | 2 - .../minecraft/world/gen/BlockSource.mapping | 2 +- .../world/gen/ChainedBlockSource.mapping | 3 +- .../world/gen/NoiseColumnSampler.mapping | 210 ------------------ .../minecraft/world/gen/NoiseHelper.mapping | 7 - .../world/gen/chunk/AquiferSampler.mapping | 27 +-- .../world/gen/chunk/ChunkGenerator.mapping | 6 - .../world/gen/chunk/ChunkNoiseSampler.mapping | 62 +----- .../gen/chunk/DebugChunkGenerator.mapping | 2 - .../gen/chunk/FlatChunkGenerator.mapping | 2 - .../gen/chunk/NoiseChunkGenerator.mapping | 15 +- .../world/gen/chunk/SlideConfig.mapping | 9 +- .../chunk/placement/StructuresConfig.mapping | 7 - .../ConfiguredStructureFeature.mapping | 2 +- .../ConfiguredStructureFeatures.mapping | 12 - .../gen/feature/StructureFeature.mapping | 7 +- .../net/minecraft/world/tick/Tick.mapping | 2 - 38 files changed, 63 insertions(+), 392 deletions(-) create mode 100644 mappings/net/minecraft/class_6910.mapping create mode 100644 mappings/net/minecraft/class_6954.mapping create mode 100644 mappings/net/minecraft/class_6955.mapping delete mode 100644 mappings/net/minecraft/world/biome/source/util/TerrainNoisePoint.mapping delete mode 100644 mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping diff --git a/build.gradle b/build.gradle index 4878fb6968..37b6c90137 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "22w06a" +def minecraft_version = "22w07a" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/class_6910.mapping b/mappings/net/minecraft/class_6910.mapping new file mode 100644 index 0000000000..612c35b9c7 --- /dev/null +++ b/mappings/net/minecraft/class_6910.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_6910 + CLASS class_6912 + METHOD method_39327 getBlender ()Lnet/minecraft/class_6748; diff --git a/mappings/net/minecraft/class_6954.mapping b/mappings/net/minecraft/class_6954.mapping new file mode 100644 index 0000000000..162cecfabc --- /dev/null +++ b/mappings/net/minecraft/class_6954.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_6954 + CLASS class_5841 CaveScaler + METHOD method_33835 scaleCaves (D)D + ARG 0 value + METHOD method_33836 scaleTunnels (D)D + ARG 0 value diff --git a/mappings/net/minecraft/class_6955.mapping b/mappings/net/minecraft/class_6955.mapping new file mode 100644 index 0000000000..2c1e598408 --- /dev/null +++ b/mappings/net/minecraft/class_6955.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_6955 + CLASS class_6354 VeinType + FIELD field_33605 ore Lnet/minecraft/class_2680; + FIELD field_33606 stone Lnet/minecraft/class_2680; + FIELD field_33607 minY I + FIELD field_33608 maxY I + FIELD field_33668 rawBlock Lnet/minecraft/class_2680; + METHOD (Ljava/lang/String;ILnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;II)V + ARG 3 ore + ARG 4 rawBlock + ARG 5 stone + ARG 6 minY + ARG 7 maxY diff --git a/mappings/net/minecraft/client/realms/gui/RealmsDataFetcher.mapping b/mappings/net/minecraft/client/realms/gui/RealmsDataFetcher.mapping index af81f5440d..ee4052baed 100644 --- a/mappings/net/minecraft/client/realms/gui/RealmsDataFetcher.mapping +++ b/mappings/net/minecraft/client/realms/gui/RealmsDataFetcher.mapping @@ -31,7 +31,7 @@ CLASS net/minecraft/class_4360 net/minecraft/client/realms/gui/RealmsDataFetcher ARG 2 realms ARG 3 persistence METHOD method_21073 isStopped ()Z - METHOD method_21074 removeItem (Lnet/minecraft/class_4877;)V + METHOD method_21074 removeItem (Lnet/minecraft/class_4877;)Ljava/util/List; ARG 1 server METHOD method_21075 isFetchedSinceLastTry (Lnet/minecraft/class_4360$class_4364;)Z ARG 1 task diff --git a/mappings/net/minecraft/client/world/GeneratorType.mapping b/mappings/net/minecraft/client/world/GeneratorType.mapping index e06cf19262..94f716cc8c 100644 --- a/mappings/net/minecraft/client/world/GeneratorType.mapping +++ b/mappings/net/minecraft/client/world/GeneratorType.mapping @@ -24,8 +24,6 @@ CLASS net/minecraft/class_5317 net/minecraft/client/world/GeneratorType METHOD method_29079 createFixedBiomeOptions (Lnet/minecraft/class_5455;Lnet/minecraft/class_5285;Lnet/minecraft/class_6880;)Lnet/minecraft/class_5285; ARG 0 registryManager ARG 1 generatorOptions - METHOD method_29082 (Lnet/minecraft/class_525;Lnet/minecraft/class_5285;Lnet/minecraft/class_3232;)V - ARG 2 config 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/RegistryDumpProvider.mapping b/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping index 060f1ef8c3..b907d1563e 100644 --- a/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping +++ b/mappings/net/minecraft/data/report/RegistryDumpProvider.mapping @@ -3,7 +3,5 @@ CLASS net/minecraft/class_2427 net/minecraft/data/report/RegistryDumpProvider FIELD field_17170 GSON Lcom/google/gson/Gson; METHOD (Lnet/minecraft/class_2403;)V ARG 1 generator - METHOD method_17174 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2960;)V - ARG 1 id METHOD method_17175 toJson (Lnet/minecraft/class_2378;)Lcom/google/gson/JsonElement; ARG 0 registry diff --git a/mappings/net/minecraft/entity/FallingBlockEntity.mapping b/mappings/net/minecraft/entity/FallingBlockEntity.mapping index 847a13f6cf..6561b34aa9 100644 --- a/mappings/net/minecraft/entity/FallingBlockEntity.mapping +++ b/mappings/net/minecraft/entity/FallingBlockEntity.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_1540 net/minecraft/entity/FallingBlockEntity - FIELD field_35671 discardTime J FIELD field_7187 fallHurtAmount F FIELD field_7188 block Lnet/minecraft/class_2680; FIELD field_7189 destroyedOnLanding Z diff --git a/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping b/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping index eb8f039132..ee27c571b1 100644 --- a/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping +++ b/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/class_1480 net/minecraft/entity/mob/WaterCreatureEntity METHOD method_38986 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z ARG 0 type - ARG 1 world ARG 2 reason - ARG 3 pos ARG 4 random METHOD method_6673 tickWaterBreathingAir (I)V ARG 1 air diff --git a/mappings/net/minecraft/entity/passive/GlowSquidEntity.mapping b/mappings/net/minecraft/entity/passive/GlowSquidEntity.mapping index 2a6750c8ea..c9288dd6f2 100644 --- a/mappings/net/minecraft/entity/passive/GlowSquidEntity.mapping +++ b/mappings/net/minecraft/entity/passive/GlowSquidEntity.mapping @@ -5,7 +5,5 @@ CLASS net/minecraft/class_5776 net/minecraft/entity/passive/GlowSquidEntity METHOD method_33334 getDarkTicksRemaining ()I METHOD method_38962 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z ARG 0 type - ARG 1 world ARG 2 reason - ARG 3 pos ARG 4 random diff --git a/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping b/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping index b30518bfd3..26a92fef99 100644 --- a/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping +++ b/mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping @@ -17,7 +17,6 @@ CLASS net/minecraft/class_1718 net/minecraft/screen/EnchantmentScreenHandler ARG 6 world ARG 7 pos METHOD method_17411 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V - ARG 2 world ARG 3 pos METHOD method_17412 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 2 world diff --git a/mappings/net/minecraft/screen/ScreenHandler.mapping b/mappings/net/minecraft/screen/ScreenHandler.mapping index bc6690a8c3..e64fff00ed 100644 --- a/mappings/net/minecraft/screen/ScreenHandler.mapping +++ b/mappings/net/minecraft/screen/ScreenHandler.mapping @@ -97,7 +97,6 @@ CLASS net/minecraft/class_1703 net/minecraft/screen/ScreenHandler METHOD method_37422 nextRevision ()I METHOD method_37449 setPreviousTrackedSlotMutable (ILnet/minecraft/class_1799;)V ARG 1 slot - ARG 2 stack METHOD method_7591 packQuickCraftData (II)I ARG 0 quickCraftStage ARG 1 buttonId diff --git a/mappings/net/minecraft/util/registry/RegistryEntryList.mapping b/mappings/net/minecraft/util/registry/RegistryEntryList.mapping index 080a376fd6..4a8e9a8685 100644 --- a/mappings/net/minecraft/util/registry/RegistryEntryList.mapping +++ b/mappings/net/minecraft/util/registry/RegistryEntryList.mapping @@ -28,8 +28,6 @@ CLASS net/minecraft/class_6885 net/minecraft/util/registry/RegistryEntryList CLASS class_6888 Named FIELD field_36459 tag Lnet/minecraft/class_6862; FIELD field_36460 entries Ljava/util/List; - METHOD (Lnet/minecraft/class_6862;)V - ARG 1 tag METHOD method_40250 copyOf (Ljava/util/List;)V ARG 1 entries METHOD method_40251 getTag ()Lnet/minecraft/class_6862; diff --git a/mappings/net/minecraft/util/registry/SimpleRegistry.mapping b/mappings/net/minecraft/util/registry/SimpleRegistry.mapping index 06ff656636..6bfdf724f6 100644 --- a/mappings/net/minecraft/util/registry/SimpleRegistry.mapping +++ b/mappings/net/minecraft/util/registry/SimpleRegistry.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_2370 net/minecraft/util/registry/SimpleRegistry FIELD field_11107 idToEntry Ljava/util/Map; - FIELD field_11108 randomEntries Ljava/util/List; FIELD field_11109 nextId I FIELD field_25067 keyToEntry Ljava/util/Map; FIELD field_26682 rawIdToEntry Lit/unimi/dsi/fastutil/objects/ObjectList; @@ -24,16 +23,10 @@ CLASS net/minecraft/class_2370 net/minecraft/util/registry/SimpleRegistry ARG 5 checkDuplicateKeys METHOD method_40253 getValue (Lnet/minecraft/class_6880$class_6883;)Ljava/lang/Object; ARG 0 entry - METHOD method_40254 (Lnet/minecraft/class_6880$class_6883;Ljava/util/function/Consumer;)V - ARG 0 entry - ARG 1 valueConsumer METHOD method_40255 (Lnet/minecraft/class_6885$class_6888;)V ARG 0 entryList METHOD method_40256 (Ljava/util/Map$Entry;)Z ARG 0 entry - METHOD method_40258 (Ljava/util/Map;Lnet/minecraft/class_6862;Ljava/util/List;)V - ARG 1 tag - ARG 2 entries METHOD method_40259 (Ljava/util/Map;Lnet/minecraft/class_6880$class_6883;)V ARG 1 entry METHOD method_40261 (Lnet/minecraft/class_6880$class_6883;)V diff --git a/mappings/net/minecraft/world/StructureLocator.mapping b/mappings/net/minecraft/world/StructureLocator.mapping index 9f70f84953..3c2ab11450 100644 --- a/mappings/net/minecraft/world/StructureLocator.mapping +++ b/mappings/net/minecraft/world/StructureLocator.mapping @@ -29,14 +29,12 @@ CLASS net/minecraft/class_6832 net/minecraft/world/StructureLocator METHOD method_39828 cache (JLit/unimi/dsi/fastutil/objects/Object2IntMap;)V ARG 1 pos ARG 3 referencesByStructure - METHOD method_39829 isGenerationPossible (Lnet/minecraft/class_1923;Lnet/minecraft/class_5312;Ljava/util/Collection;)Z + METHOD method_39829 isGenerationPossible (Lnet/minecraft/class_1923;Lnet/minecraft/class_5312;)Z COMMENT {@return whether {@code feature} is able to generate in {@code pos}} COMMENT COMMENT

This method only performs simple checks like biomes. ARG 1 pos ARG 2 feature - ARG 3 allowedBiomes - COMMENT the list of biomes where the {@code feature} can generate METHOD method_39830 incrementReferences (Lnet/minecraft/class_1923;Lnet/minecraft/class_3195;)V ARG 1 pos ARG 2 feature @@ -71,7 +69,5 @@ CLASS net/minecraft/class_6832 net/minecraft/world/StructureLocator ARG 1 referencesByStructure ARG 2 feature ARG 3 skipExistingChunk - METHOD method_39841 (Ljava/util/function/Predicate;Lnet/minecraft/class_6880;)Z - ARG 1 entry METHOD method_39842 collectStructuresAndReferences (Lnet/minecraft/class_2487;)Lit/unimi/dsi/fastutil/objects/Object2IntMap; ARG 1 nbt diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index 78a967df19..426c222469 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -136,8 +136,6 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World METHOD method_39425 shouldTickBlocksInChunk (J)Z COMMENT {@return whether the blocks in the specified chunk should get ticked} ARG 1 chunkPos - METHOD method_39522 shouldRemoveEntityLater (Lnet/minecraft/class_1297$class_5529;)Z - ARG 1 reason METHOD method_8413 updateListeners (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;I)V ARG 1 pos ARG 2 oldState diff --git a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping index 92cd1af98f..e07434f8fc 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource METHOD method_27985 withSeed (J)Lnet/minecraft/class_1966; ARG 1 seed METHOD method_28442 getCodec ()Lcom/mojang/serialization/Codec; - METHOD method_28443 getBiomes ()Ljava/util/stream/Stream; + METHOD method_28443 getBiomes ()Ljava/util/Set; METHOD method_38114 addDebugInfo (Ljava/util/List;Lnet/minecraft/class_2338;Lnet/minecraft/class_6544$class_6552;)V ARG 1 info ARG 2 pos diff --git a/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping b/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping index 0e95752fcd..4323bc96e5 100644 --- a/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping +++ b/mappings/net/minecraft/world/biome/source/util/MultiNoiseUtil.mapping @@ -23,7 +23,7 @@ CLASS net/minecraft/class_6544 net/minecraft/world/biome/source/util/MultiNoiseU ARG 4 depth ARG 5 weirdness ARG 6 offset - METHOD method_39164 findFittestPosition (Ljava/util/List;Lnet/minecraft/class_5818;)Lnet/minecraft/class_2338; + METHOD method_39164 findFittestPosition (Ljava/util/List;Lnet/minecraft/class_6544$class_6552;)Lnet/minecraft/class_2338; ARG 0 noises ARG 1 sampler CLASS class_4762 NoiseHypercube @@ -171,7 +171,7 @@ CLASS net/minecraft/class_6544 net/minecraft/world/biome/source/util/MultiNoiseU ARG 2 subTree CLASS class_6552 MultiNoiseSampler METHOD method_39165 findBestSpawnPosition ()Lnet/minecraft/class_2338; - METHOD sample (III)Lnet/minecraft/class_6544$class_6553; + METHOD method_40444 sample (III)Lnet/minecraft/class_6544$class_6553; ARG 1 x ARG 2 y ARG 3 z @@ -191,15 +191,15 @@ CLASS net/minecraft/class_6544 net/minecraft/world/biome/source/util/MultiNoiseU METHOD method_38166 getNoiseValueList ()[J CLASS class_6729 FittestPositionFinder FIELD field_35360 bestResult Lnet/minecraft/class_6544$class_6729$class_6730; - METHOD (Ljava/util/List;Lnet/minecraft/class_5818;)V + METHOD (Ljava/util/List;Lnet/minecraft/class_6544$class_6552;)V ARG 1 noises ARG 2 sampler - METHOD method_39166 findFittest (Ljava/util/List;Lnet/minecraft/class_5818;FF)V + METHOD method_39166 findFittest (Ljava/util/List;Lnet/minecraft/class_6544$class_6552;FF)V ARG 1 noises ARG 2 sampler ARG 3 maxDistance ARG 4 step - METHOD method_39167 calculateFitness (Ljava/util/List;Lnet/minecraft/class_5818;II)Lnet/minecraft/class_6544$class_6729$class_6730; + METHOD method_39167 calculateFitness (Ljava/util/List;Lnet/minecraft/class_6544$class_6552;II)Lnet/minecraft/class_6544$class_6729$class_6730; ARG 0 noises ARG 1 sampler ARG 2 x diff --git a/mappings/net/minecraft/world/biome/source/util/TerrainNoisePoint.mapping b/mappings/net/minecraft/world/biome/source/util/TerrainNoisePoint.mapping deleted file mode 100644 index e3afd9852d..0000000000 --- a/mappings/net/minecraft/world/biome/source/util/TerrainNoisePoint.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_6576 net/minecraft/world/biome/source/util/TerrainNoisePoint - FIELD comp_77 offset D - FIELD comp_78 factor D - FIELD comp_79 peaks D - METHOD comp_77 offset ()D - METHOD comp_78 factor ()D - METHOD comp_79 peaks ()D diff --git a/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping b/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping index b4255cde50..2d085d2f38 100644 --- a/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping +++ b/mappings/net/minecraft/world/biome/source/util/VanillaTerrainParameters.mapping @@ -12,9 +12,6 @@ CLASS net/minecraft/class_6555 net/minecraft/world/biome/source/util/VanillaTerr METHOD method_38208 getNormalizedWeirdness (F)F ARG 0 weirdness METHOD method_38209 createNoisePoint (FFF)Lnet/minecraft/class_6555$class_6556; - ARG 1 continentalnessNoise - ARG 2 erosionNoise - ARG 3 weirdnessNoise 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; diff --git a/mappings/net/minecraft/world/chunk/Chunk.mapping b/mappings/net/minecraft/world/chunk/Chunk.mapping index cd7bc246b1..b32bd253ef 100644 --- a/mappings/net/minecraft/world/chunk/Chunk.mapping +++ b/mappings/net/minecraft/world/chunk/Chunk.mapping @@ -86,7 +86,7 @@ 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 (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_38255 getOrCreateChunkNoiseSampler (Lnet/minecraft/class_6953;Ljava/util/function/Supplier;Lnet/minecraft/class_5284;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;)Lnet/minecraft/class_6568; ARG 1 noiseColumnSampler ARG 2 columnSampler ARG 3 chunkGeneratorSettings diff --git a/mappings/net/minecraft/world/chunk/UpgradeData.mapping b/mappings/net/minecraft/world/chunk/UpgradeData.mapping index 71c1e1b870..e86db057bf 100644 --- a/mappings/net/minecraft/world/chunk/UpgradeData.mapping +++ b/mappings/net/minecraft/world/chunk/UpgradeData.mapping @@ -10,8 +10,6 @@ CLASS net/minecraft/class_2843 net/minecraft/world/chunk/UpgradeData METHOD (Lnet/minecraft/class_2487;Lnet/minecraft/class_5539;)V ARG 1 nbt ARG 2 world - METHOD (Lnet/minecraft/class_5539;)V - ARG 1 world METHOD method_12348 upgradeCenter (Lnet/minecraft/class_2818;)V ARG 1 chunk METHOD method_12349 isDone ()Z diff --git a/mappings/net/minecraft/world/gen/BlockSource.mapping b/mappings/net/minecraft/world/gen/BlockSource.mapping index 4aaa3db9cf..5d14c1bd45 100644 --- a/mappings/net/minecraft/world/gen/BlockSource.mapping +++ b/mappings/net/minecraft/world/gen/BlockSource.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_6583 net/minecraft/world/gen/BlockSource - METHOD apply (Lnet/minecraft/class_6568;III)Lnet/minecraft/class_2680; + METHOD method_40553 apply (Lnet/minecraft/class_6568;III)Lnet/minecraft/class_2680; ARG 1 sampler ARG 2 x ARG 3 y diff --git a/mappings/net/minecraft/world/gen/ChainedBlockSource.mapping b/mappings/net/minecraft/world/gen/ChainedBlockSource.mapping index 3ed95c8638..183b7c4fc4 100644 --- a/mappings/net/minecraft/world/gen/ChainedBlockSource.mapping +++ b/mappings/net/minecraft/world/gen/ChainedBlockSource.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_6582 net/minecraft/world/gen/ChainedBlockSource - FIELD field_34719 samplers Ljava/util/List; + FIELD comp_437 samplers Ljava/util/List; METHOD (Ljava/util/List;)V ARG 1 samplers + METHOD comp_437 samplers ()Ljava/util/List; diff --git a/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping b/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping deleted file mode 100644 index 9a10b8eb01..0000000000 --- a/mappings/net/minecraft/world/gen/NoiseColumnSampler.mapping +++ /dev/null @@ -1,210 +0,0 @@ -CLASS net/minecraft/class_5818 net/minecraft/world/gen/NoiseColumnSampler - COMMENT Samples noise values for use in chunk generation. - FIELD field_28754 config Lnet/minecraft/class_5309; - FIELD field_28756 islandNoise Lnet/minecraft/class_3541; - FIELD field_34633 caveLayerNoise Lnet/minecraft/class_5216; - FIELD field_34634 pillarNoise Lnet/minecraft/class_5216; - FIELD field_34635 pillarRarenessNoise Lnet/minecraft/class_5216; - FIELD field_34636 pillarThicknessNoise Lnet/minecraft/class_5216; - FIELD field_34637 spaghetti2dNoise Lnet/minecraft/class_5216; - FIELD field_34638 spaghetti2dElevationNoise Lnet/minecraft/class_5216; - FIELD field_34639 spaghetti2dModulatorNoise Lnet/minecraft/class_5216; - FIELD field_34640 spaghetti2dThicknessNoise Lnet/minecraft/class_5216; - FIELD field_34641 spaghetti3dFirstNoise Lnet/minecraft/class_5216; - FIELD field_34642 spaghetti3dSecondNoise Lnet/minecraft/class_5216; - FIELD field_34643 spaghetti3dRarityNoise Lnet/minecraft/class_5216; - FIELD field_34644 spaghetti3dThicknessNoise Lnet/minecraft/class_5216; - FIELD field_34645 spaghettiRoughnessNoise Lnet/minecraft/class_5216; - FIELD field_34646 spaghettiRoughnessModulatorNoise Lnet/minecraft/class_5216; - FIELD field_34647 caveEntranceNoise Lnet/minecraft/class_5216; - FIELD field_34648 caveCheeseNoise Lnet/minecraft/class_5216; - FIELD field_34649 temperatureNoise Lnet/minecraft/class_5216; - FIELD field_34650 humidityNoise Lnet/minecraft/class_5216; - FIELD field_34651 continentalnessNoise Lnet/minecraft/class_5216; - 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_34656 oreGapNoise Lnet/minecraft/class_5216; - FIELD field_34657 initialNoiseSampler Lnet/minecraft/class_6568$class_6571; - FIELD field_34659 oreFrequencyNoiseSamplerFactory Lnet/minecraft/class_6568$class_6571; - FIELD field_34660 firstOrePlacementNoiseFactory Lnet/minecraft/class_6568$class_6571; - FIELD field_34661 secondOrePlacementNoiseFactory Lnet/minecraft/class_6568$class_6571; - FIELD field_34662 oreRandomDeriver Lnet/minecraft/class_6574; - FIELD field_34663 noodleNoiseFactory Lnet/minecraft/class_6568$class_6571; - FIELD field_34664 noodleThicknessNoiseFactory Lnet/minecraft/class_6568$class_6571; - FIELD field_34665 noodleRidgeFirstNoiseFactory Lnet/minecraft/class_6568$class_6571; - FIELD field_34666 noodleRidgeSecondNoiseFactory Lnet/minecraft/class_6568$class_6571; - FIELD field_34667 hasNoiseCaves Z - FIELD field_34680 terrainNoise Lnet/minecraft/class_5822; - FIELD field_34681 jaggedNoise Lnet/minecraft/class_5216; - FIELD field_34683 aquiferBarrierNoise Lnet/minecraft/class_5216; - FIELD field_34685 aquiferLavaNoise Lnet/minecraft/class_5216; - FIELD field_34686 aquiferRandomDeriver Lnet/minecraft/class_6574; - FIELD field_35131 aquiferFluidLevelFloodednessNoise Lnet/minecraft/class_5216; - FIELD field_35132 aquiferFluidLevelSpreadNoise Lnet/minecraft/class_5216; - FIELD field_35208 depthBasedLayerRandomDeriver Lnet/minecraft/class_6574; - FIELD field_35362 spawnSuitabilityNoises Ljava/util/List; - FIELD field_35592 amplified Z - METHOD (Lnet/minecraft/class_5309;ZJLnet/minecraft/class_2378;Lnet/minecraft/class_2919$class_6675;)V - ARG 1 config - ARG 2 hasNoiseCaves - ARG 3 seed - ARG 5 noiseRegistry - ARG 6 randomProvider - METHOD method_33645 applySlides (DI)D - COMMENT Interpolates the noise at the top and bottom of the world. - ARG 1 noise - ARG 3 y - METHOD method_38374 shouldPlaceOreVeinBlock (DD)Z - ARG 1 firstOrePlacementNoise - ARG 3 secondOrePlacementNoise - METHOD method_38375 sampleTemperatureNoise (DDD)D - ARG 1 x - ARG 3 y - ARG 5 z - METHOD method_38376 createTerrainNoisePoint (IIFFFLnet/minecraft/class_6748;)Lnet/minecraft/class_6576; - ARG 1 x - ARG 2 z - ARG 3 continentalness - ARG 4 weirdness - ARG 5 erosion - METHOD method_38377 sampleShiftNoise (III)D - ARG 1 x - ARG 2 y - ARG 3 z - METHOD method_38379 createNoiseSamplerFactory (Lnet/minecraft/class_5216;IIID)Lnet/minecraft/class_6568$class_6571; - ARG 0 noiseSampler - ARG 1 minY - ARG 2 maxY - ARG 3 alternative - ARG 4 scale - METHOD method_38380 sampleNoiseColumn (IIILnet/minecraft/class_6576;Lnet/minecraft/class_6748;)D - ARG 1 x - ARG 2 y - ARG 3 z - ARG 4 point - ARG 5 blender - METHOD method_38381 sampleNoiseColumn (IIILnet/minecraft/class_6576;DZZLnet/minecraft/class_6748;)D - ARG 1 x - ARG 2 y - ARG 3 z - ARG 4 point - ARG 5 noise - ARG 7 hasNoNoiseCaves - ARG 9 blender - METHOD method_38382 (IIILnet/minecraft/class_5216;DIII)D - ARG 6 x - ARG 7 y - ARG 8 z - METHOD method_38383 (IILnet/minecraft/class_6576;)I - ARG 1 x - ARG 2 z - ARG 3 point - METHOD method_38384 (Lnet/minecraft/class_6568$class_6572;Lnet/minecraft/class_6568;)Lnet/minecraft/class_6568$class_6573; - ARG 1 chunkNoiseSampler - METHOD method_38385 (Lnet/minecraft/class_6568$class_6573;Lnet/minecraft/class_2680;Lnet/minecraft/class_6568$class_6573;Lnet/minecraft/class_6568$class_6573;III)Lnet/minecraft/class_2680; - ARG 5 x - ARG 6 y - ARG 7 z - METHOD method_38386 (Lnet/minecraft/class_6568$class_6573;Lnet/minecraft/class_6568$class_6573;Lnet/minecraft/class_6568$class_6573;Lnet/minecraft/class_6568$class_6573;Lnet/minecraft/class_6568$class_6573;Lnet/minecraft/class_6568$class_6572;Lnet/minecraft/class_6568;III)Lnet/minecraft/class_2680; - ARG 7 x - ARG 8 y - ARG 9 z - METHOD method_38387 (Lnet/minecraft/class_6568;)Lnet/minecraft/class_6568$class_6573; - ARG 1 chunkNoiseSampler - METHOD method_38388 (Lnet/minecraft/class_6568;III)D - ARG 2 x - ARG 3 y - ARG 4 z - METHOD method_38389 createAquiferSampler (Lnet/minecraft/class_6568;IIIILnet/minecraft/class_6350$class_6565;Z)Lnet/minecraft/class_6350; - ARG 1 chunkNoiseSampler - ARG 2 x - ARG 3 z - ARG 4 minimumY - ARG 5 height - ARG 6 fluidLevelSampler - ARG 7 hasAquifers - METHOD method_38390 createInitialNoiseBlockStateSampler (Lnet/minecraft/class_6568;Lnet/minecraft/class_6568$class_6572;Z)Lnet/minecraft/class_6568$class_6569; - ARG 1 chunkNoiseSampler - ARG 2 columnSampler - ARG 3 hasNoodleCaves - METHOD method_38391 createOreVeinSampler (Lnet/minecraft/class_6568;Z)Lnet/minecraft/class_6568$class_6569; - ARG 1 chunkNoiseSampler - ARG 2 hasOreVeins - METHOD method_38392 (Lnet/minecraft/class_5818$class_6354;)I - ARG 0 veinType - METHOD method_38393 sample (Lnet/minecraft/class_5216;DDDD)D - ARG 0 sampler - ARG 1 x - ARG 3 y - ARG 5 z - ARG 7 invertedScale - METHOD method_38395 clampBetweenNoiseRange (D)D - ARG 0 value - METHOD method_38396 sampleHumidityNoise (DDD)D - ARG 1 x - ARG 3 y - ARG 5 z - METHOD method_38397 getVeinType (DI)Lnet/minecraft/class_5818$class_6354; - ARG 1 oreFrequencyNoise - ARG 3 y - METHOD method_38398 sampleCaveEntranceNoise (III)D - ARG 1 x - ARG 2 y - ARG 3 z - METHOD method_38399 (Lnet/minecraft/class_5818$class_6354;)I - ARG 0 veinType - METHOD method_38401 sampleContinentalnessNoise (DDD)D - ARG 1 x - ARG 3 y - ARG 5 z - METHOD method_38402 samplePillarNoise (III)D - ARG 1 x - ARG 2 y - ARG 3 z - METHOD method_38404 sampleErosionNoise (DDD)D - ARG 1 x - ARG 3 y - ARG 5 z - METHOD method_38405 sampleCaveLayerNoise (III)D - ARG 1 x - ARG 2 y - ARG 3 z - METHOD method_38407 sampleWeirdnessNoise (DDD)D - ARG 1 x - ARG 3 y - ARG 5 z - METHOD method_38408 sampleSpaghetti3dNoise (III)D - ARG 1 x - ARG 2 y - ARG 3 z - METHOD method_38410 sampleSpaghetti2dNoise (III)D - ARG 1 x - ARG 2 y - ARG 3 z - METHOD method_38411 sampleSpaghettiRoughnessNoise (III)D - ARG 1 x - ARG 2 y - ARG 3 z - METHOD method_38412 (III)Lnet/minecraft/class_2680; - ARG 0 x - ARG 1 y - ARG 2 z - METHOD method_39043 getDepthBasedLayerRandomDeriver ()Lnet/minecraft/class_6574; - CLASS class_5841 CaveScaler - METHOD method_33835 scaleCaves (D)D - ARG 0 value - METHOD method_33836 scaleTunnels (D)D - ARG 0 value - CLASS class_6354 VeinType - FIELD field_33605 ore Lnet/minecraft/class_2680; - FIELD field_33606 stone Lnet/minecraft/class_2680; - FIELD field_33607 minY I - FIELD field_33608 maxY I - FIELD field_33668 rawBlock Lnet/minecraft/class_2680; - METHOD (Ljava/lang/String;ILnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;II)V - ARG 3 ore - ARG 4 rawBlock - ARG 5 stone - ARG 6 minY - ARG 7 maxY diff --git a/mappings/net/minecraft/world/gen/NoiseHelper.mapping b/mappings/net/minecraft/world/gen/NoiseHelper.mapping index 6e51e94d48..254d8cec92 100644 --- a/mappings/net/minecraft/world/gen/NoiseHelper.mapping +++ b/mappings/net/minecraft/world/gen/NoiseHelper.mapping @@ -1,11 +1,4 @@ CLASS net/minecraft/class_5836 net/minecraft/world/gen/NoiseHelper - METHOD method_33782 lerpFromProgress (Lnet/minecraft/class_5216;DDDDD)D - ARG 0 sampler - ARG 1 x - ARG 3 y - ARG 5 z - ARG 7 start - ARG 9 end METHOD method_39119 appendDebugInfo (Ljava/lang/StringBuilder;DDD[B)V ARG 0 builder ARG 1 originX diff --git a/mappings/net/minecraft/world/gen/chunk/AquiferSampler.mapping b/mappings/net/minecraft/world/gen/chunk/AquiferSampler.mapping index 5604246a1e..c81f72ab2f 100644 --- a/mappings/net/minecraft/world/gen/chunk/AquiferSampler.mapping +++ b/mappings/net/minecraft/world/gen/chunk/AquiferSampler.mapping @@ -2,23 +2,16 @@ CLASS net/minecraft/class_6350 net/minecraft/world/gen/chunk/AquiferSampler METHOD method_33742 needsFluidTick ()Z METHOD method_36381 seaLevel (Lnet/minecraft/class_6350$class_6565;)Lnet/minecraft/class_6350; ARG 0 fluidLevelSampler - METHOD method_36382 aquifer (Lnet/minecraft/class_6568;Lnet/minecraft/class_1923;Lnet/minecraft/class_5216;Lnet/minecraft/class_5216;Lnet/minecraft/class_5216;Lnet/minecraft/class_5216;Lnet/minecraft/class_6574;IILnet/minecraft/class_6350$class_6565;)Lnet/minecraft/class_6350; + METHOD method_36382 aquifer (Lnet/minecraft/class_6568;Lnet/minecraft/class_1923;Lnet/minecraft/class_6910;Lnet/minecraft/class_6910;Lnet/minecraft/class_6910;Lnet/minecraft/class_6910;Lnet/minecraft/class_6574;IILnet/minecraft/class_6350$class_6565;)Lnet/minecraft/class_6350; ARG 0 chunkNoiseSampler ARG 1 chunkPos - ARG 2 barrierNoise - ARG 3 fluidLevelFloodednessNoise - ARG 4 fluidLevelSpreadNoise - ARG 5 fluidTypeNoise ARG 6 randomDeriver ARG 7 minY ARG 8 height ARG 9 fluidLevelSampler - METHOD method_38317 apply (IIIDD)Lnet/minecraft/class_2680; - ARG 1 x - ARG 2 y - ARG 3 z + METHOD method_38317 apply (Lnet/minecraft/class_6910$class_6912;D)Lnet/minecraft/class_2680; CLASS class_5832 Impl - FIELD field_28813 barrierNoise Lnet/minecraft/class_5216; + FIELD field_28813 barrierNoise Lnet/minecraft/class_6910; FIELD field_28816 waterLevels [Lnet/minecraft/class_6350$class_6351; FIELD field_28817 blockPositions [J FIELD field_28820 needsFluidTick Z @@ -27,26 +20,22 @@ CLASS net/minecraft/class_6350 net/minecraft/world/gen/chunk/AquiferSampler FIELD field_28824 startZ I FIELD field_28825 sizeX I FIELD field_28826 sizeZ I - FIELD field_33575 fluidTypeNoise Lnet/minecraft/class_5216; + FIELD field_33575 fluidTypeNoise Lnet/minecraft/class_6910; FIELD field_34578 chunkNoiseSampler Lnet/minecraft/class_6568; FIELD field_34579 randomDeriver Lnet/minecraft/class_6574; FIELD field_34580 fluidLevelSampler Lnet/minecraft/class_6350$class_6565; - FIELD field_35122 fluidLevelFloodednessNoise Lnet/minecraft/class_5216; - FIELD field_35123 fluidLevelSpreadNoise Lnet/minecraft/class_5216; - METHOD (Lnet/minecraft/class_6568;Lnet/minecraft/class_1923;Lnet/minecraft/class_5216;Lnet/minecraft/class_5216;Lnet/minecraft/class_5216;Lnet/minecraft/class_5216;Lnet/minecraft/class_6574;IILnet/minecraft/class_6350$class_6565;)V + FIELD field_35122 fluidLevelFloodednessNoise Lnet/minecraft/class_6910; + FIELD field_35123 fluidLevelSpreadNoise Lnet/minecraft/class_6910; + METHOD (Lnet/minecraft/class_6568;Lnet/minecraft/class_1923;Lnet/minecraft/class_6910;Lnet/minecraft/class_6910;Lnet/minecraft/class_6910;Lnet/minecraft/class_6910;Lnet/minecraft/class_6574;IILnet/minecraft/class_6350$class_6565;)V ARG 1 chunkNoiseSampler ARG 2 chunkPos - ARG 3 barrierNoise - ARG 4 fluidLevelFloodednessNoise - ARG 5 fluidLevelSpreadNoise - ARG 6 fluidTypeNoise ARG 7 randomDeriver ARG 8 minY ARG 9 height ARG 10 fluidLevelSampler METHOD method_33734 getLocalX (I)I ARG 1 x - METHOD method_33735 calculateDensity (IIILorg/apache/commons/lang3/mutable/MutableDouble;Lnet/minecraft/class_6350$class_6351;Lnet/minecraft/class_6350$class_6351;)D + METHOD method_33735 calculateDensity (Lnet/minecraft/class_6910$class_6912;Lorg/apache/commons/lang3/mutable/MutableDouble;Lnet/minecraft/class_6350$class_6351;Lnet/minecraft/class_6350$class_6351;)D METHOD method_33736 maxDistance (II)D ARG 1 a METHOD method_33738 getWaterLevel (J)Lnet/minecraft/class_6350$class_6351; diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index fea54903ad..852e824596 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -9,12 +9,6 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator FIELD field_16567 structuresConfig Lnet/minecraft/class_5311; FIELD field_24746 CODEC Lcom/mojang/serialization/Codec; FIELD field_24747 biomeSource Lnet/minecraft/class_1966; - METHOD (Lnet/minecraft/class_1966;Lnet/minecraft/class_1966;Lnet/minecraft/class_5311;J)V - ARG 3 structuresConfig - ARG 4 worldSeed - METHOD (Lnet/minecraft/class_1966;Lnet/minecraft/class_5311;)V - ARG 1 biomeSource - ARG 2 structuresConfig METHOD method_12088 populateNoise (Ljava/util/concurrent/Executor;Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture; COMMENT Generates the base shape of the chunk out of the basic block states as decided by this chunk generator's config. ARG 1 executor diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping index 9c77625c14..2198dfbdbd 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkNoiseSampler.mapping @@ -8,66 +8,40 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler FIELD field_34604 biomeZ I FIELD field_34605 interpolators Ljava/util/List; 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; FIELD field_35487 blender Lnet/minecraft/class_6748; FIELD field_35674 generationShapeConfig Lnet/minecraft/class_5309; - 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 + METHOD (IIILnet/minecraft/class_6953;IILnet/minecraft/class_6910;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 5 minimumY ARG 6 minimumZ - ARG 8 chunkGeneratorSettings - ARG 9 fluidLevelSampler - ARG 10 blender METHOD method_38336 sampleStartNoise ()V - METHOD method_38337 sampleNoiseY (D)V - ARG 1 deltaY + METHOD method_38337 sampleNoiseY (ID)V METHOD method_38338 (DLnet/minecraft/class_6568$class_5917;)V ARG 2 interpolator METHOD method_38339 sampleEndNoise (I)V ARG 1 x - METHOD method_38341 sampleInitialNoiseBlockState (III)Lnet/minecraft/class_2680; - ARG 1 x - ARG 2 y - ARG 3 z METHOD method_38342 (IILnet/minecraft/class_6568$class_5917;)V ARG 2 interpolator - METHOD method_38343 (ILnet/minecraft/class_6568$class_5917;)V - ARG 1 interpolator - METHOD method_38344 createNoiseInterpolator (Lnet/minecraft/class_6568$class_6572;)Lnet/minecraft/class_6568$class_5917; - ARG 1 columnSampler - METHOD method_38345 (Lnet/minecraft/class_6568$class_5917;)V - ARG 0 interpolator - METHOD method_38346 createMultiNoisePoint (II)Lnet/minecraft/class_5818$class_6747; - ARG 1 x - ARG 2 z METHOD method_38348 swapBuffers ()V - METHOD method_38349 sampleNoiseX (D)V - ARG 1 deltaX + METHOD method_38349 sampleNoiseX (ID)V METHOD method_38350 (DLnet/minecraft/class_6568$class_5917;)V ARG 2 interpolator - METHOD method_38352 sampleOreVeins (III)Lnet/minecraft/class_2680; - ARG 1 x - ARG 2 y - ARG 3 z METHOD method_38354 getAquiferSampler ()Lnet/minecraft/class_6350; - METHOD method_38355 sampleNoise (D)V - ARG 1 deltaZ + METHOD method_38355 sampleNoise (ID)V METHOD method_38356 (DLnet/minecraft/class_6568$class_5917;)V ARG 2 interpolator METHOD method_38362 sampleNoiseCorners (II)V ARG 1 noiseY ARG 2 noiseZ - METHOD method_39327 getBlender ()Lnet/minecraft/class_6748; - METHOD method_39542 create (IIIILnet/minecraft/class_5818;Lnet/minecraft/class_5284;Lnet/minecraft/class_6350$class_6565;)Lnet/minecraft/class_6568; + METHOD method_39542 create (IIIILnet/minecraft/class_6953;Lnet/minecraft/class_5284;Lnet/minecraft/class_6350$class_6565;)Lnet/minecraft/class_6568; ARG 0 minimumY ARG 2 horizontalSize ARG 3 verticalNoiseResolution ARG 5 chunkGeneratorSettings ARG 6 fluidLevelSampler - METHOD method_39543 create (Lnet/minecraft/class_2791;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_39543 create (Lnet/minecraft/class_2791;Lnet/minecraft/class_6953;Ljava/util/function/Supplier;Lnet/minecraft/class_5284;Lnet/minecraft/class_6350$class_6565;Lnet/minecraft/class_6748;)Lnet/minecraft/class_6568; ARG 0 chunk ARG 3 chunkGeneratorSettings ARG 4 fluidLevelSampler @@ -89,21 +63,15 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler FIELD field_29244 x1z1 D FIELD field_29245 z0 D FIELD field_29246 z1 D - FIELD field_34623 columnSampler Lnet/minecraft/class_6568$class_6572; + FIELD field_34623 columnSampler Lnet/minecraft/class_6910; FIELD field_34624 result D - METHOD (Lnet/minecraft/class_6568;Lnet/minecraft/class_6568$class_6572;)V + METHOD (Lnet/minecraft/class_6568;Lnet/minecraft/class_6910;)V ARG 2 columnSampler - METHOD method_34286 sampleStartNoise ()V METHOD method_34287 sampleNoiseY (D)V ARG 1 deltaY - METHOD method_34288 sampleEndNoise (I)V - ARG 1 x METHOD method_34289 sampleNoiseCorners (II)V ARG 1 noiseY ARG 2 noiseZ - METHOD method_34290 sampleNoise ([[DI)V - ARG 1 buffer - ARG 2 noiseX METHOD method_34291 swapBuffers ()V METHOD method_34292 sampleNoiseX (D)V ARG 1 deltaX @@ -113,16 +81,4 @@ CLASS net/minecraft/class_6568 net/minecraft/world/gen/chunk/ChunkNoiseSampler METHOD method_38363 sampleNoise (D)V ARG 1 deltaZ CLASS class_6569 BlockStateSampler - METHOD calculate sample (III)Lnet/minecraft/class_2680; - ARG 1 x - ARG 2 y - ARG 3 z - CLASS class_6571 ValueSamplerFactory - METHOD instantiate create (Lnet/minecraft/class_6568;)Lnet/minecraft/class_6568$class_6573; - ARG 1 chunkNoiseSampler - CLASS class_6572 ColumnSampler - METHOD calculateNoise (III)D - ARG 1 x - ARG 2 y - ARG 3 z - CLASS class_6573 ValueSampler + METHOD calculate sample (Lnet/minecraft/class_6910$class_6912;)Lnet/minecraft/class_2680; diff --git a/mappings/net/minecraft/world/gen/chunk/DebugChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/DebugChunkGenerator.mapping index c986d236c2..da8354c031 100644 --- a/mappings/net/minecraft/world/gen/chunk/DebugChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/DebugChunkGenerator.mapping @@ -6,8 +6,6 @@ CLASS net/minecraft/class_2891 net/minecraft/world/gen/chunk/DebugChunkGenerator FIELD field_13164 BARRIER Lnet/minecraft/class_2680; FIELD field_24768 CODEC Lcom/mojang/serialization/Codec; FIELD field_26747 biomeRegistry Lnet/minecraft/class_2378; - METHOD (Lnet/minecraft/class_2378;)V - ARG 1 biomeRegistry METHOD method_12578 getBlockState (II)Lnet/minecraft/class_2680; ARG 0 x ARG 1 z diff --git a/mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping index 823deb9869..f9a1239854 100644 --- a/mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_2897 net/minecraft/world/gen/chunk/FlatChunkGenerator FIELD field_24510 config Lnet/minecraft/class_3232; FIELD field_24769 CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_3232;)V - ARG 1 config METHOD method_28002 (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680; ARG 0 state METHOD method_28545 getConfig ()Lnet/minecraft/class_3232; diff --git a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping index eb7545872f..6ece821c3a 100644 --- a/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping @@ -5,20 +5,15 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator FIELD field_24774 settings Lnet/minecraft/class_6880; FIELD field_24778 seed J FIELD field_28746 EMPTY [Lnet/minecraft/class_2680; - FIELD field_28748 noiseColumnSampler Lnet/minecraft/class_5818; - FIELD field_34590 blockStateSampler Lnet/minecraft/class_6583; + FIELD field_28748 noiseColumnSampler Lnet/minecraft/class_6544$class_6552; FIELD field_34591 fluidLevelSampler Lnet/minecraft/class_6350$class_6565; FIELD field_35183 surfaceBuilder Lnet/minecraft/class_6724; FIELD field_35361 noiseRegistry Lnet/minecraft/class_2378; - METHOD (Lnet/minecraft/class_2378;Lnet/minecraft/class_1966;JLnet/minecraft/class_6880;)V + METHOD (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_1966;JLnet/minecraft/class_6880;)V ARG 1 noiseRegistry - ARG 2 biomeSource - ARG 3 seed - METHOD (Lnet/minecraft/class_2378;Lnet/minecraft/class_1966;Lnet/minecraft/class_1966;JLnet/minecraft/class_6880;)V + METHOD (Lnet/minecraft/class_2378;Lnet/minecraft/class_2378;Lnet/minecraft/class_1966;Lnet/minecraft/class_1966;JLnet/minecraft/class_6880;)V ARG 1 noiseRegistry - ARG 2 populationSource ARG 3 biomeSource - ARG 4 seed METHOD method_26263 sampleHeightmap (II[Lnet/minecraft/class_2680;Ljava/util/function/Predicate;II)Ljava/util/OptionalInt; ARG 3 states ARG 4 predicate @@ -41,10 +36,6 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator ARG 3 y ARG 4 z ARG 5 state - METHOD method_38326 (Lnet/minecraft/class_6568;III)Lnet/minecraft/class_6544$class_6553; - ARG 2 x - ARG 3 y - ARG 4 z METHOD method_38327 populateBiomes (Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V METHOD method_39041 applyMaterialRule (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 diff --git a/mappings/net/minecraft/world/gen/chunk/SlideConfig.mapping b/mappings/net/minecraft/world/gen/chunk/SlideConfig.mapping index b97db2197c..76217c20be 100644 --- a/mappings/net/minecraft/world/gen/chunk/SlideConfig.mapping +++ b/mappings/net/minecraft/world/gen/chunk/SlideConfig.mapping @@ -1,11 +1,14 @@ CLASS net/minecraft/class_5310 net/minecraft/world/gen/chunk/SlideConfig + FIELD comp_432 target D + FIELD comp_433 size I + FIELD comp_434 offset I FIELD field_24817 CODEC Lcom/mojang/serialization/Codec; - FIELD field_24818 target D - FIELD field_24819 size I - FIELD field_24820 offset I METHOD (DII)V ARG 1 target ARG 3 size ARG 4 offset + METHOD comp_432 target ()D + METHOD comp_433 size ()I + METHOD comp_434 offset ()I METHOD method_28595 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/world/gen/chunk/placement/StructuresConfig.mapping b/mappings/net/minecraft/world/gen/chunk/placement/StructuresConfig.mapping index bb6058f490..f0b7350de5 100644 --- a/mappings/net/minecraft/world/gen/chunk/placement/StructuresConfig.mapping +++ b/mappings/net/minecraft/world/gen/chunk/placement/StructuresConfig.mapping @@ -10,7 +10,6 @@ CLASS net/minecraft/class_5311 net/minecraft/world/gen/chunk/placement/Structure FIELD field_24823 STRONGHOLD_PLACEMENT Lnet/minecraft/class_6871; COMMENT Default structure placement for the stronghold. FIELD field_24824 placements Ljava/util/Map; - FIELD field_34696 configuredStructures Lcom/google/common/collect/ImmutableMap; FIELD field_36413 DEFAULT_PLACEMENTS_WITH_STRONGHOLD Lcom/google/common/collect/ImmutableMap; METHOD (Ljava/util/Map;)V ARG 1 placements @@ -27,9 +26,3 @@ CLASS net/minecraft/class_5311 net/minecraft/world/gen/chunk/placement/Structure ARG 1 structureType METHOD method_28601 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_38423 (Ljava/util/Map$Entry;)Lcom/google/common/collect/ImmutableMultimap; - ARG 0 entry - METHOD method_38424 getConfiguredStructureFeature (Lnet/minecraft/class_3195;)Lcom/google/common/collect/ImmutableMultimap; - ARG 1 feature - METHOD method_38425 (Lnet/minecraft/class_3195;)Lcom/google/common/collect/ImmutableMultimap$Builder; - ARG 0 feature diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeature.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeature.mapping index a3d146d010..ff70cb30d5 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeature.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/class_5312 net/minecraft/world/gen/feature/ConfiguredStructu FIELD field_24836 config Lnet/minecraft/class_3037; FIELD field_25834 CODEC Lcom/mojang/serialization/Codec; FIELD field_26757 REGISTRY_ELEMENT_CODEC Lcom/mojang/serialization/Codec; - METHOD (Lnet/minecraft/class_3195;Lnet/minecraft/class_3037;)V + METHOD (Lnet/minecraft/class_3195;Lnet/minecraft/class_3037;Lnet/minecraft/class_6885;)V ARG 1 feature ARG 2 config METHOD method_28622 tryPlaceStart (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;ILnet/minecraft/class_5539;Ljava/util/function/Predicate;)Lnet/minecraft/class_3449; diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeatures.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeatures.mapping index e065a75ed1..c83244827c 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredStructureFeatures.mapping @@ -3,15 +3,3 @@ CLASS net/minecraft/class_5470 net/minecraft/world/gen/feature/ConfiguredStructu ARG 0 id ARG 1 configuredStructureFeature METHOD method_38569 getDefault ()Lnet/minecraft/class_6880; - METHOD method_38570 registerAll (Lnet/minecraft/class_5470$class_6896;)V - METHOD method_38571 register (Lnet/minecraft/class_5470$class_6896;Lnet/minecraft/class_6880;Ljava/util/Set;)V - ARG 2 biomes - METHOD method_38572 register (Lnet/minecraft/class_5470$class_6896;Lnet/minecraft/class_6880;Lnet/minecraft/class_5321;)V - ARG 2 biome - METHOD method_38573 (Lnet/minecraft/class_5470$class_6896;Lnet/minecraft/class_6880;Lnet/minecraft/class_5321;)V - ARG 2 biome - CLASS class_6896 - METHOD accept (Lnet/minecraft/class_3195;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)V - ARG 1 feature - ARG 2 configuredFeatureKey - ARG 3 biomeKey diff --git a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping index baee168276..eb17c4012c 100644 --- a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping @@ -11,7 +11,6 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature ARG 1 configCodec ARG 2 piecesGenerator METHOD (Lcom/mojang/serialization/Codec;Lnet/minecraft/class_6834;Lnet/minecraft/class_6621;)V - ARG 1 configCodec ARG 2 piecesGenerator ARG 3 postPlacementProcessor METHOD method_14019 getName ()Ljava/lang/String; @@ -27,7 +26,7 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature ARG 5 worldSeed ARG 7 pos ARG 8 structureReferences - METHOD method_28659 configure (Lnet/minecraft/class_3037;)Lnet/minecraft/class_5312; + METHOD method_28659 configure (Lnet/minecraft/class_3037;Lnet/minecraft/class_6862;)Lnet/minecraft/class_5312; ARG 1 config METHOD method_28660 readStructureStart (Lnet/minecraft/class_6625;Lnet/minecraft/class_2487;J)Lnet/minecraft/class_3449; ARG 0 context @@ -47,10 +46,6 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature METHOD method_38671 getLocatedPos (Lnet/minecraft/class_6872;Lnet/minecraft/class_1923;)Lnet/minecraft/class_2338; COMMENT {@return a block position for feature location} ARG 1 chunkPos - METHOD method_38688 (Lnet/minecraft/class_5312;)Lnet/minecraft/class_3037; - ARG 0 configuredFeature - METHOD method_38689 (Lnet/minecraft/class_3037;)Lnet/minecraft/class_5312; - ARG 1 config METHOD method_38690 getPostProcessor ()Lnet/minecraft/class_6621; METHOD method_39821 canGenerate (Lnet/minecraft/class_5455;Lnet/minecraft/class_2794;Lnet/minecraft/class_1966;Lnet/minecraft/class_3485;JLnet/minecraft/class_1923;Lnet/minecraft/class_3037;Lnet/minecraft/class_5539;Ljava/util/function/Predicate;)Z ARG 1 registryManager diff --git a/mappings/net/minecraft/world/tick/Tick.mapping b/mappings/net/minecraft/world/tick/Tick.mapping index 9bd9b2f0f7..adac23fd95 100644 --- a/mappings/net/minecraft/world/tick/Tick.mapping +++ b/mappings/net/minecraft/world/tick/Tick.mapping @@ -23,8 +23,6 @@ CLASS net/minecraft/class_6759 net/minecraft/world/tick/Tick ARG 3 priority METHOD method_39404 toNbt (Ljava/util/function/Function;)Lnet/minecraft/class_2487; ARG 1 typeToNameFunction - METHOD method_39405 (Lnet/minecraft/class_2487;JLjava/util/function/Consumer;Ljava/lang/Object;)V - ARG 4 type METHOD method_39406 tick (Lnet/minecraft/class_2499;Ljava/util/function/Function;Lnet/minecraft/class_1923;Ljava/util/function/Consumer;)V ARG 0 tickList ARG 1 nameToTypeFunction