From ca70d5bc51b4bd180e7cc19bd53c6478f893d6e8 Mon Sep 17 00:00:00 2001 From: Runemoro Date: Mon, 11 Feb 2019 14:19:43 -0500 Subject: [PATCH] More worldgen mappings --- mappings/cck.mapping | 5 --- .../world/gen/PhantomSpawner.mapping | 1 + .../world/gen/PillagerSpawner.mapping | 5 +++ .../gen/chunk/OverworldChunkGenerator.mapping | 1 + .../decorator/CarvingMaskDecorator.mapping | 2 + .../world/gen/decorator/Decorator.mapping | 8 +++- .../gen/decorator/SimpleDecorator.mapping | 9 ++++ .../world/gen/feature/Feature.mapping | 8 ++-- .../gen/feature/OceanRuinFeature.mapping | 2 +- .../world/gen/feature/OreFeature.mapping | 14 ++++++ .../feature/PillagerOutpostFeature.mapping | 3 +- .../world/gen/feature/PumpkinFeature.mapping | 4 ++ .../gen/feature/SavannaTreeFeature.mapping | 7 +++ .../gen/feature/ShipwreckFeature.mapping | 2 +- .../feature/SimpleBlockFeatureConfig.mapping | 2 +- .../gen/feature/StrongholdFeature.mapping | 9 +++- .../gen/feature/StructureFeature.mapping | 10 +++++ .../gen/feature/StructureFeatures.mapping | 5 +++ .../world/gen/feature/SwampHutFeature.mapping | 4 +- .../gen/feature/SwampTreeFeature.mapping | 4 ++ .../gen/feature/TaigaGrassFeature.mapping | 2 + .../world/gen/feature/VillageFeature.mapping | 2 +- .../gen/feature/VillageFeatureConfig.mapping | 2 + .../world/gen/feature/VinesFeature.mapping | 1 + .../feature/WoodlandMansionFeature.mapping | 2 +- .../BadlandsSurfaceBuilder.mapping | 11 +++++ .../ErodedBadlandsSurfaceBuilder.mapping | 3 ++ .../FrozenOceanSurfaceBuilder.mapping | 6 +++ .../NetherSurfaceBuilder.mapping | 6 +++ .../gen/surfacebuilder/SurfaceBuilder.mapping | 2 + .../WoodedBadlandsSurfaceBuilder.mapping | 3 ++ .../world/level/LevelProperties.mapping | 2 + .../world/level/storage/AlphaChunkIo.mapping | 15 +++++++ .../world/level/storage/LevelStorage.mapping | 45 ++++++++++++++++--- .../world/level/storage/LevelSummary.mapping | 5 ++- .../AlternativeLootCondition.mapping | 1 + 36 files changed, 185 insertions(+), 28 deletions(-) delete mode 100644 mappings/cck.mapping create mode 100644 mappings/net/minecraft/world/gen/decorator/SimpleDecorator.mapping diff --git a/mappings/cck.mapping b/mappings/cck.mapping deleted file mode 100644 index da0c4e8479..0000000000 --- a/mappings/cck.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS cck - METHOD a (Lbcv;Lbsh;Ljava/util/Random;Lbvv;Let;)Ljava/util/stream/Stream; - ARG 1 world - ARG 2 generator - ARG 3 random diff --git a/mappings/net/minecraft/world/gen/PhantomSpawner.mapping b/mappings/net/minecraft/world/gen/PhantomSpawner.mapping index 510830188e..301a6f6006 100644 --- a/mappings/net/minecraft/world/gen/PhantomSpawner.mapping +++ b/mappings/net/minecraft/world/gen/PhantomSpawner.mapping @@ -1,4 +1,5 @@ CLASS buf net/minecraft/world/gen/PhantomSpawner + FIELD a ticksUntilNextSpawn I METHOD a spawn (Lbcu;ZZ)I ARG 2 spawnMonsters ARG 3 spawnAnimals diff --git a/mappings/net/minecraft/world/gen/PillagerSpawner.mapping b/mappings/net/minecraft/world/gen/PillagerSpawner.mapping index 5cee7b2fd9..2afd1c582c 100644 --- a/mappings/net/minecraft/world/gen/PillagerSpawner.mapping +++ b/mappings/net/minecraft/world/gen/PillagerSpawner.mapping @@ -4,6 +4,11 @@ CLASS bue net/minecraft/world/gen/PillagerSpawner METHOD (Lahm;I)V ARG 2 weight FIELD a SPAWN_ENTRIES Ljava/util/List; + FIELD b ticksUntilNextSpawn I + METHOD a spawnOneEntity (Lbcu;Let;Ljava/util/Random;Z)V + ARG 1 world + ARG 2 pos + ARG 3 random METHOD a spawn (Lbcu;ZZ)I ARG 2 spawnMonsters ARG 3 spawnAnimals diff --git a/mappings/net/minecraft/world/gen/chunk/OverworldChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/OverworldChunkGenerator.mapping index ba076c6b62..b4dfd4b8ee 100644 --- a/mappings/net/minecraft/world/gen/chunk/OverworldChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/OverworldChunkGenerator.mapping @@ -1,5 +1,6 @@ CLASS bud net/minecraft/world/gen/chunk/OverworldChunkGenerator FIELD h BIOME_WEIGHT_TABLE [F + FIELD i noiseSampler Lcfi; FIELD j amplified Z FIELD k phantomSpawner Lbuf; FIELD l pillagerSpawner Lbue; diff --git a/mappings/net/minecraft/world/gen/decorator/CarvingMaskDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/CarvingMaskDecorator.mapping index 37844be8d0..395e8a070d 100644 --- a/mappings/net/minecraft/world/gen/decorator/CarvingMaskDecorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/CarvingMaskDecorator.mapping @@ -1,4 +1,6 @@ CLASS cav net/minecraft/world/gen/decorator/CarvingMaskDecorator + METHOD (Ljava/util/function/Function;)V + ARG 1 configDeserializer METHOD a (Lbcv;Lbsh;Ljava/util/Random;Lbvv;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator diff --git a/mappings/net/minecraft/world/gen/decorator/Decorator.mapping b/mappings/net/minecraft/world/gen/decorator/Decorator.mapping index dece7839d7..5255b8bb21 100644 --- a/mappings/net/minecraft/world/gen/decorator/Decorator.mapping +++ b/mappings/net/minecraft/world/gen/decorator/Decorator.mapping @@ -1,10 +1,14 @@ CLASS cbz net/minecraft/world/gen/decorator/Decorator - FIELD M factory Ljava/util/function/Function; + FIELD M configDeserializer Ljava/util/function/Function; FIELD h NOPE Lcbz; - METHOD a (Lbcv;Lbsh;Ljava/util/Random;Lbvv;Let;)Ljava/util/stream/Stream; + METHOD (Ljava/util/function/Function;)V + ARG 1 configDeserializer + METHOD a getPositions (Lbcv;Lbsh;Ljava/util/Random;Lbvv;Let;)Ljava/util/stream/Stream; ARG 1 world ARG 2 generator ARG 3 random + ARG 4 config + ARG 5 pos METHOD a generate (Lbcv;Lbsh;Ljava/util/Random;Let;Lbvv;Lbvj;)Z ARG 1 world ARG 2 generator diff --git a/mappings/net/minecraft/world/gen/decorator/SimpleDecorator.mapping b/mappings/net/minecraft/world/gen/decorator/SimpleDecorator.mapping new file mode 100644 index 0000000000..507bc1bc92 --- /dev/null +++ b/mappings/net/minecraft/world/gen/decorator/SimpleDecorator.mapping @@ -0,0 +1,9 @@ +CLASS cck net/minecraft/world/gen/decorator/SimpleDecorator + METHOD a (Lbcv;Lbsh;Ljava/util/Random;Lbvv;Let;)Ljava/util/stream/Stream; + ARG 1 world + ARG 2 generator + ARG 3 random + METHOD a getPositions (Ljava/util/Random;Lbvv;Let;)Ljava/util/stream/Stream; + ARG 1 random + ARG 2 config + ARG 3 pos diff --git a/mappings/net/minecraft/world/gen/feature/Feature.mapping b/mappings/net/minecraft/world/gen/feature/Feature.mapping index 15ae7d1576..2fbec6e291 100644 --- a/mappings/net/minecraft/world/gen/feature/Feature.mapping +++ b/mappings/net/minecraft/world/gen/feature/Feature.mapping @@ -4,7 +4,7 @@ CLASS bwl net/minecraft/world/gen/feature/Feature FIELD G PLAIN_FLOWER Lbwo; FIELD H SWAMP_FLOWER Lbwo; FIELD I GENERAL_FOREST_FLOWER Lbwo; - FIELD a configFactory Ljava/util/function/Function; + FIELD a configDeserializer Ljava/util/function/Function; FIELD aN BONUS_CHEST Lbvb; FIELD aO STRUCTURES Lcom/google/common/collect/BiMap; FIELD aP JIGSAW_STRUCTURES Ljava/util/List; @@ -25,9 +25,9 @@ CLASS bwl net/minecraft/world/gen/feature/Feature FIELD o BURIED_TREASURE Lbzp; FIELD p VILLAGE Lbzp; METHOD (Ljava/util/function/Function;)V - ARG 1 configFactory + ARG 1 configDeserializer METHOD (Ljava/util/function/Function;Z)V - ARG 1 configFactory + ARG 1 configDeserializer ARG 2 emitNeighborBlockUpdates METHOD a generate (Lbcv;Lbsh;Ljava/util/Random;Let;Lbwm;)Z ARG 1 world @@ -39,7 +39,7 @@ CLASS bwl net/minecraft/world/gen/feature/Feature ARG 1 world ARG 2 pos ARG 3 state - METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbwm; + METHOD a deserializeConfig (Lcom/mojang/datafixers/Dynamic;)Lbwm; ARG 1 dynamic METHOD a register (Ljava/lang/String;Lbwl;)Lbwl; ARG 0 name diff --git a/mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping b/mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping index 27d6da7430..8461f722f4 100644 --- a/mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/OceanRuinFeature.mapping @@ -1,5 +1,5 @@ CLASS cdg net/minecraft/world/gen/feature/OceanRuinFeature - CLASS cdg$a + CLASS cdg$a Start METHOD (Lbzp;IILbdr;Lccw;IJ)V ARG 2 chunkX ARG 3 chunkZ diff --git a/mappings/net/minecraft/world/gen/feature/OreFeature.mapping b/mappings/net/minecraft/world/gen/feature/OreFeature.mapping index 3d9b3caf0b..80b7d9f60e 100644 --- a/mappings/net/minecraft/world/gen/feature/OreFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/OreFeature.mapping @@ -1,3 +1,17 @@ CLASS byc net/minecraft/world/gen/feature/OreFeature METHOD (Ljava/util/function/Function;)V ARG 1 configFactory + METHOD a generateVeinPart (Lbcv;Ljava/util/Random;Lbyb;DDDDDDIIIII)Z + ARG 1 world + ARG 2 random + ARG 3 config + ARG 4 startX + ARG 6 endX + ARG 8 startZ + ARG 10 endZ + ARG 12 startY + ARG 14 endY + ARG 16 x + ARG 17 y + ARG 18 z + ARG 19 size diff --git a/mappings/net/minecraft/world/gen/feature/PillagerOutpostFeature.mapping b/mappings/net/minecraft/world/gen/feature/PillagerOutpostFeature.mapping index 3e5b6b6d90..c7a06b0852 100644 --- a/mappings/net/minecraft/world/gen/feature/PillagerOutpostFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/PillagerOutpostFeature.mapping @@ -1,7 +1,8 @@ CLASS bye net/minecraft/world/gen/feature/PillagerOutpostFeature - CLASS bye$a + CLASS bye$a Start METHOD (Lbzp;IILbdr;Lccw;IJ)V ARG 2 chunkX ARG 3 chunkZ + FIELD a MONSTER_SPAWNS Ljava/util/List; METHOD (Ljava/util/function/Function;)V ARG 1 configFactory diff --git a/mappings/net/minecraft/world/gen/feature/PumpkinFeature.mapping b/mappings/net/minecraft/world/gen/feature/PumpkinFeature.mapping index b121f6c55f..38e0e2a607 100644 --- a/mappings/net/minecraft/world/gen/feature/PumpkinFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/PumpkinFeature.mapping @@ -1 +1,5 @@ CLASS bvh net/minecraft/world/gen/feature/PumpkinFeature + FIELD a pumpkin Lbqs; + METHOD (Ljava/util/function/Function;Lbqs;)V + ARG 1 configDeserializer + ARG 2 pumpkin diff --git a/mappings/net/minecraft/world/gen/feature/SavannaTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/SavannaTreeFeature.mapping index f39dc7ec48..d02f1d465a 100644 --- a/mappings/net/minecraft/world/gen/feature/SavannaTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/SavannaTreeFeature.mapping @@ -4,3 +4,10 @@ CLASS byu net/minecraft/world/gen/feature/SavannaTreeFeature METHOD (Ljava/util/function/Function;Z)V ARG 1 configFactory ARG 2 emitNeighborBlockUpdates + METHOD a addLog (Ljava/util/Set;Lbdc;Let;)V + ARG 1 logPositions + ARG 2 world + ARG 3 pos + METHOD b addLeaves (Lbcz;Let;)V + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/world/gen/feature/ShipwreckFeature.mapping b/mappings/net/minecraft/world/gen/feature/ShipwreckFeature.mapping index b9ed4dffeb..01c5fa6e45 100644 --- a/mappings/net/minecraft/world/gen/feature/ShipwreckFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/ShipwreckFeature.mapping @@ -1,5 +1,5 @@ CLASS bza net/minecraft/world/gen/feature/ShipwreckFeature - CLASS bza$a + CLASS bza$a Start METHOD (Lbzp;IILbdr;Lccw;IJ)V ARG 2 chunkX ARG 3 chunkZ diff --git a/mappings/net/minecraft/world/gen/feature/SimpleBlockFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/SimpleBlockFeatureConfig.mapping index 162b53678e..e7ba2354d9 100644 --- a/mappings/net/minecraft/world/gen/feature/SimpleBlockFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/SimpleBlockFeatureConfig.mapping @@ -13,5 +13,5 @@ CLASS bzb net/minecraft/world/gen/feature/SimpleBlockFeatureConfig ARG 2 placeOn ARG 3 placeIn ARG 4 placeUnder - METHOD a make (Lcom/mojang/datafixers/Dynamic;)Lbzb; + METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbzb; ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/feature/StrongholdFeature.mapping b/mappings/net/minecraft/world/gen/feature/StrongholdFeature.mapping index ee26eee638..95fc5c2fe9 100644 --- a/mappings/net/minecraft/world/gen/feature/StrongholdFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/StrongholdFeature.mapping @@ -1,7 +1,14 @@ CLASS bzo net/minecraft/world/gen/feature/StrongholdFeature - CLASS bzo$a + CLASS bzo$a Start METHOD (Lbzp;IILbdr;Lccw;IJ)V ARG 2 chunkX ARG 3 chunkZ + FIELD aR startPositions [Lbch; + FIELD aS starts Ljava/util/List; + FIELD aT lastSeed J + FIELD a stateStillValid Z METHOD (Ljava/util/function/Function;)V ARG 1 configFactory + METHOD a initialize (Lbsh;)V + ARG 1 chunkGenerator + METHOD d invalidateState ()V diff --git a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping index a084bee894..a38a564b10 100644 --- a/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/StructureFeature.mapping @@ -12,10 +12,20 @@ CLASS bzp net/minecraft/world/gen/feature/StructureFeature METHOD a getStructureStartFactory ()Lbzp$a; METHOD a locateStructure (Lbcu;Lbsh;Let;IZ)Let; ARG 5 skipExistingChunks + METHOD a getStructureStarts (Lbcv;II)Ljava/util/List; + ARG 1 world + ARG 2 chunkX + ARG 3 chunkZ + METHOD a isApproximatelyInsideStructure (Lbcv;Let;)Z + METHOD a isInsideStructure (Lbcv;Let;Z)Lcdq; + ARG 1 world + ARG 2 pos + ARG 3 exact METHOD a shouldStartAt (Lbsh;Ljava/util/Random;II)Z ARG 1 chunkGenerator ARG 2 random ARG 3 chunkX ARG 4 chunkZ METHOD b getName ()Ljava/lang/String; + METHOD b isInsideStructure (Lbcv;Let;)Z METHOD c getRadius ()I diff --git a/mappings/net/minecraft/world/gen/feature/StructureFeatures.mapping b/mappings/net/minecraft/world/gen/feature/StructureFeatures.mapping index 7bbe6d3136..59c8edec06 100644 --- a/mappings/net/minecraft/world/gen/feature/StructureFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/StructureFeatures.mapping @@ -16,4 +16,9 @@ CLASS cdn net/minecraft/world/gen/feature/StructureFeatures FIELD o VILLAGE Lbzp; FIELD p LOGGER Lorg/apache/logging/log4j/Logger; METHOD a initialize ()V + METHOD a readStructureStart (Lbsh;Lcej;Lbdt;Lhr;)Lcdq; + ARG 0 chunkGenerator + ARG 1 structureManager + ARG 2 biomeSource + ARG 3 tag METHOD a register (Ljava/lang/String;Lbzp;)Lbzp; diff --git a/mappings/net/minecraft/world/gen/feature/SwampHutFeature.mapping b/mappings/net/minecraft/world/gen/feature/SwampHutFeature.mapping index e81cf3f8b7..8d5ee8687f 100644 --- a/mappings/net/minecraft/world/gen/feature/SwampHutFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/SwampHutFeature.mapping @@ -1,7 +1,9 @@ CLASS bzt net/minecraft/world/gen/feature/SwampHutFeature - CLASS bzt$a + CLASS bzt$a Start METHOD (Lbzp;IILbdr;Lccw;IJ)V ARG 2 chunkX ARG 3 chunkZ + FIELD a MONSTER_SPAWNS Ljava/util/List; + FIELD aR CREATURE_SPAWNS Ljava/util/List; METHOD (Ljava/util/function/Function;)V ARG 1 configFactory diff --git a/mappings/net/minecraft/world/gen/feature/SwampTreeFeature.mapping b/mappings/net/minecraft/world/gen/feature/SwampTreeFeature.mapping index c0623a4cf1..83f2d75061 100644 --- a/mappings/net/minecraft/world/gen/feature/SwampTreeFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/SwampTreeFeature.mapping @@ -3,3 +3,7 @@ CLASS bzs net/minecraft/world/gen/feature/SwampTreeFeature FIELD aR LEAVES Lbqs; METHOD (Ljava/util/function/Function;)V ARG 1 configFactory + METHOD a makeVines (Lbcz;Let;Lbrk;)V + ARG 1 world + ARG 2 pos + ARG 3 directionProperty diff --git a/mappings/net/minecraft/world/gen/feature/TaigaGrassFeature.mapping b/mappings/net/minecraft/world/gen/feature/TaigaGrassFeature.mapping index e3bec6a703..7847ecbbd8 100644 --- a/mappings/net/minecraft/world/gen/feature/TaigaGrassFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/TaigaGrassFeature.mapping @@ -1,3 +1,5 @@ CLASS bzu net/minecraft/world/gen/feature/TaigaGrassFeature METHOD (Ljava/util/function/Function;)V ARG 1 configFactory + METHOD a getGrass (Ljava/util/Random;)Lbqs; + ARG 1 random diff --git a/mappings/net/minecraft/world/gen/feature/VillageFeature.mapping b/mappings/net/minecraft/world/gen/feature/VillageFeature.mapping index 1a6eb0980c..6e1f1905c0 100644 --- a/mappings/net/minecraft/world/gen/feature/VillageFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/VillageFeature.mapping @@ -1,5 +1,5 @@ CLASS bzy net/minecraft/world/gen/feature/VillageFeature - CLASS bzy$a + CLASS bzy$a Start METHOD (Lbzp;IILbdr;Lccw;IJ)V ARG 2 chunkX ARG 3 chunkZ diff --git a/mappings/net/minecraft/world/gen/feature/VillageFeatureConfig.mapping b/mappings/net/minecraft/world/gen/feature/VillageFeatureConfig.mapping index 9cd15b95d8..accda434c7 100644 --- a/mappings/net/minecraft/world/gen/feature/VillageFeatureConfig.mapping +++ b/mappings/net/minecraft/world/gen/feature/VillageFeatureConfig.mapping @@ -4,3 +4,5 @@ CLASS bzx net/minecraft/world/gen/feature/VillageFeatureConfig METHOD (Ljava/lang/String;I)V ARG 1 startPool ARG 2 size + METHOD a deserialize (Lcom/mojang/datafixers/Dynamic;)Lbzx; + ARG 0 dynamic diff --git a/mappings/net/minecraft/world/gen/feature/VinesFeature.mapping b/mappings/net/minecraft/world/gen/feature/VinesFeature.mapping index d75bc31fd9..d48eb430ff 100644 --- a/mappings/net/minecraft/world/gen/feature/VinesFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/VinesFeature.mapping @@ -1,3 +1,4 @@ CLASS caa net/minecraft/world/gen/feature/VinesFeature + FIELD a DIRECTIONS [Ley; METHOD (Ljava/util/function/Function;)V ARG 1 configFactory diff --git a/mappings/net/minecraft/world/gen/feature/WoodlandMansionFeature.mapping b/mappings/net/minecraft/world/gen/feature/WoodlandMansionFeature.mapping index ae44ac3b8e..cb0595da43 100644 --- a/mappings/net/minecraft/world/gen/feature/WoodlandMansionFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/WoodlandMansionFeature.mapping @@ -1,5 +1,5 @@ CLASS cae net/minecraft/world/gen/feature/WoodlandMansionFeature - CLASS cae$a + CLASS cae$a Start METHOD (Lbzp;IILbdr;Lccw;IJ)V ARG 2 chunkX ARG 3 chunkZ diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/BadlandsSurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/BadlandsSurfaceBuilder.mapping index eab24692e0..d5c34f18c3 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/BadlandsSurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/BadlandsSurfaceBuilder.mapping @@ -1 +1,12 @@ CLASS ceq net/minecraft/world/gen/surfacebuilder/BadlandsSurfaceBuilder + FIELD S WHITE_TERACOTTA Lbqs; + FIELD T ORANGE_TERRACOTTA Lbqs; + FIELD U TERACOTTA Lbqs; + FIELD V YELLOW_TERACOTTA Lbqs; + FIELD W BROWN_TERACOTTA Lbqs; + FIELD X RED_TERACOTTA Lbqs; + FIELD Y LIGHT_GRAY_TERACOTTA Lbqs; + FIELD a layerBlocks [Lbqs; + FIELD b seed J + METHOD b initLayerBlocks (J)V + ARG 1 seed diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/ErodedBadlandsSurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/ErodedBadlandsSurfaceBuilder.mapping index c7de9ecfcf..bd91e4cb0e 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/ErodedBadlandsSurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/ErodedBadlandsSurfaceBuilder.mapping @@ -1 +1,4 @@ CLASS cet net/minecraft/world/gen/surfacebuilder/ErodedBadlandsSurfaceBuilder + FIELD S WHITE_TERRACOTTA Lbqs; + FIELD T ORANGE_TERRACOTTA Lbqs; + FIELD U TERACOTTA Lbqs; diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/FrozenOceanSurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/FrozenOceanSurfaceBuilder.mapping index 2203a7dbc5..19354db30f 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/FrozenOceanSurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/FrozenOceanSurfaceBuilder.mapping @@ -1 +1,7 @@ CLASS ceu net/minecraft/world/gen/surfacebuilder/FrozenOceanSurfaceBuilder + FIELD U seed J + FIELD a PACKED_ICE Lbqs; + FIELD b SNOW_BLOCK Lbqs; + FIELD c AIR Lbqs; + FIELD d GRAVEL Lbqs; + FIELD e ICE Lbqs; diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/NetherSurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/NetherSurfaceBuilder.mapping index 1fc0a06f7a..ded7a5f9e1 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/NetherSurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/NetherSurfaceBuilder.mapping @@ -1 +1,7 @@ CLASS cey net/minecraft/world/gen/surfacebuilder/NetherSurfaceBuilder + FIELD S GLOWSTONE Lbqs; + FIELD a seed J + FIELD b noise Lcfi; + FIELD c CAVE_AIR Lbqs; + FIELD d NETHERRACK Lbqs; + FIELD e GRAVEL Lbqs; diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping index 4123b1e427..5d9a7859ca 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/SurfaceBuilder.mapping @@ -39,6 +39,8 @@ CLASS cfb net/minecraft/world/gen/surfacebuilder/SurfaceBuilder FIELD x STONE_CONFIG Lcfc; FIELD y COARSE_DIRT_CONFIG Lcfc; FIELD z SAND_CONFIG Lcfc; + METHOD a initSeed (J)V + ARG 1 seed METHOD a register (Ljava/lang/String;Lcfb;)Lcfb; METHOD a generate (Ljava/util/Random;Lbsg;Lbdr;IIIDLbqs;Lbqs;IJLcfd;)V ARG 1 random diff --git a/mappings/net/minecraft/world/gen/surfacebuilder/WoodedBadlandsSurfaceBuilder.mapping b/mappings/net/minecraft/world/gen/surfacebuilder/WoodedBadlandsSurfaceBuilder.mapping index 3b03b33ede..14f7bfd442 100644 --- a/mappings/net/minecraft/world/gen/surfacebuilder/WoodedBadlandsSurfaceBuilder.mapping +++ b/mappings/net/minecraft/world/gen/surfacebuilder/WoodedBadlandsSurfaceBuilder.mapping @@ -1 +1,4 @@ CLASS cff net/minecraft/world/gen/surfacebuilder/WoodedBadlandsSurfaceBuilder + FIELD S WHITE_TERRACOTTA Lbqs; + FIELD T ORANGE_TERRACOTTA Lbqs; + FIELD U TERRACOTTA Lbqs; diff --git a/mappings/net/minecraft/world/level/LevelProperties.mapping b/mappings/net/minecraft/world/level/LevelProperties.mapping index de993126cb..eaad5b8421 100644 --- a/mappings/net/minecraft/world/level/LevelProperties.mapping +++ b/mappings/net/minecraft/world/level/LevelProperties.mapping @@ -77,6 +77,8 @@ CLASS cjf net/minecraft/world/level/LevelProperties METHOD a setTime (J)V METHOD a setDifficulty (Lagb;)V METHOD a setGameMode (Lbcr;)V + METHOD a loadLevelInfo (Lbcy;)V + ARG 1 levelInfo METHOD a setGeneratorType (Lbdb;)V METHOD a getWorldData (Lbtl;)Lhr; METHOD a setWorldData (Lbtl;Lhr;)V diff --git a/mappings/net/minecraft/world/level/storage/AlphaChunkIo.mapping b/mappings/net/minecraft/world/level/storage/AlphaChunkIo.mapping index 6fdf5189aa..e2820223e8 100644 --- a/mappings/net/minecraft/world/level/storage/AlphaChunkIo.mapping +++ b/mappings/net/minecraft/world/level/storage/AlphaChunkIo.mapping @@ -1,5 +1,20 @@ CLASS btg net/minecraft/world/level/storage/AlphaChunkIo CLASS btg$a AlphaChunk + FIELD a lastUpdate J + FIELD b terrainPopulated Z + FIELD c heightMap [B + FIELD d blockLight Lbsw; + FIELD e skyLight Lbsw; + FIELD f data Lbsw; + FIELD g blocks [B + FIELD h entities Lhx; + FIELD i blockEntities Lhx; + FIELD j blockTicks Lhx; + FIELD k x I + FIELD l z I + METHOD (II)V + ARG 1 x + ARG 2 z METHOD a convertAlphaChunk (Lbtg$a;Lhr;Lbdt;)V ARG 0 alphaChunk ARG 1 tag diff --git a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping index 9bc093d139..521de0bf4c 100644 --- a/mappings/net/minecraft/world/level/storage/LevelStorage.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelStorage.mapping @@ -1,11 +1,42 @@ CLASS cji net/minecraft/world/level/storage/LevelStorage + FIELD a LOGGER Lorg/apache/logging/log4j/Logger; + FIELD b TIME_FORMATTER Ljava/time/format/DateTimeFormatter; + FIELD c savesDirectory Ljava/nio/file/Path; + FIELD d backupsDirectory Ljava/nio/file/Path; + FIELD e dataFixer Lcom/mojang/datafixers/DataFixer; + METHOD (Ljava/nio/file/Path;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;)V + ARG 1 savesDirectory + ARG 2 backupsDirectory + ARG 3 dataFixer METHOD a getName ()Ljava/lang/String; - METHOD a isConvertible (Ljava/lang/String;)Z - METHOD a rename (Ljava/lang/String;Ljava/lang/String;)V - METHOD b getAvailableLevels ()Ljava/util/List; - METHOD b requiresConversion (Ljava/lang/String;)Lcjf; + METHOD a readLevelProperties (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;)Lcjf; + ARG 0 file + ARG 1 dataFixer + METHOD a requiresConversion (Ljava/lang/String;)Z + ARG 1 name + METHOD a renameLevel (Ljava/lang/String;Ljava/lang/String;)V + ARG 1 name + ARG 2 newName + METHOD a convertLevel (Ljava/lang/String;Lzg;)Z + ARG 1 name + ARG 2 progressListener + METHOD a getLevelProperties (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;Ljava/lang/String;)Lcjf; + ARG 0 savesDirectory + ARG 1 dataFixer + ARG 2 name + METHOD a deleteFilesRecursively ([Ljava/io/File;)Z + ARG 0 files + METHOD b getLevelList ()Ljava/util/List; + METHOD b getLevelProperties (Ljava/lang/String;)Lcjf; METHOD b resolveFile (Ljava/lang/String;Ljava/lang/String;)Ljava/io/File; - METHOD c canCreate (Ljava/lang/String;)Z - METHOD d delete (Ljava/lang/String;)Z - METHOD e exists (Ljava/lang/String;)Z + METHOD c getBackupsDirectory ()Ljava/nio/file/Path; + METHOD c isLevelNameValid (Ljava/lang/String;)Z + ARG 1 name + METHOD d getCurrentVersion ()I + METHOD d deleteLevel (Ljava/lang/String;)Z + ARG 1 name + METHOD e levelExists (Ljava/lang/String;)Z + ARG 1 name + METHOD f backupLevel (Ljava/lang/String;)J + ARG 1 name METHOD g resolvePath (Ljava/lang/String;)Ljava/nio/file/Path; diff --git a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping index 4ec0e02962..58b1b0c8ad 100644 --- a/mappings/net/minecraft/world/level/storage/LevelSummary.mapping +++ b/mappings/net/minecraft/world/level/storage/LevelSummary.mapping @@ -22,11 +22,12 @@ CLASS cjj net/minecraft/world/level/storage/LevelSummary METHOD b getDisplayName ()Ljava/lang/String; METHOD c getSizeOnDisk ()J METHOD d requiresConversion ()Z - METHOD e lastPlayed ()J + METHOD e getLastPlayed ()J METHOD f getGameMode ()Lbcr; METHOD g isHardcore ()Z - METHOD h areCommandsAllowed ()Z + METHOD h hasCheats ()Z METHOD i getVersionTextComponent ()Ljc; + METHOD l isDifferentVersion ()Z METHOD m isFutureLevel ()Z METHOD n isLegacyCustomizedWorld ()Z METHOD o isOutdatedLevel ()Z diff --git a/mappings/net/minecraft/world/loot/condition/AlternativeLootCondition.mapping b/mappings/net/minecraft/world/loot/condition/AlternativeLootCondition.mapping index 2fa1fc0bf8..b910dfbf97 100644 --- a/mappings/net/minecraft/world/loot/condition/AlternativeLootCondition.mapping +++ b/mappings/net/minecraft/world/loot/condition/AlternativeLootCondition.mapping @@ -2,4 +2,5 @@ CLASS clt net/minecraft/world/loot/condition/AlternativeLootCondition CLASS clt$a Builder CLASS clt$b Factory FIELD a terms [Lcmc; + FIELD b predicate Ljava/util/function/Predicate; METHOD a or ([Lcmc$a;)Lclt$a;