diff --git a/mappings/bsz.mapping b/mappings/bsz.mapping deleted file mode 100644 index 2af59d34ff..0000000000 --- a/mappings/bsz.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS bsz - METHOD a spawn (Lbbp;ZZ)I diff --git a/mappings/bta.mapping b/mappings/bta.mapping deleted file mode 100644 index 6dda6f8eb3..0000000000 --- a/mappings/bta.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS bta - METHOD a spawn (Lbbp;ZZ)I diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index fbd36b1ab2..651c296113 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -457,7 +457,7 @@ CLASS bgs net/minecraft/block/Block ARG 2 world ARG 3 pos METHOD k getBlastResistance ()F - METHOD k (Lbpm;Lbbb;Let;)Z + METHOD k shouldPostProcess (Lbpm;Lbbb;Let;)Z ARG 1 state ARG 2 view ARG 3 pos diff --git a/mappings/net/minecraft/block/BlockState.mapping b/mappings/net/minecraft/block/BlockState.mapping index 0541bf0183..761793d72c 100644 --- a/mappings/net/minecraft/block/BlockState.mapping +++ b/mappings/net/minecraft/block/BlockState.mapping @@ -190,6 +190,6 @@ CLASS bpm net/minecraft/block/BlockState METHOD q canSuffocate (Lbbb;Let;)Z ARG 1 view ARG 2 pos - METHOD r (Lbbb;Let;)Z + METHOD r shouldPostProcess (Lbbb;Let;)Z ARG 1 view ARG 2 pos diff --git a/mappings/net/minecraft/block/MagmaBlock.mapping b/mappings/net/minecraft/block/MagmaBlock.mapping index b72d08d6f5..6d9a2f78d6 100644 --- a/mappings/net/minecraft/block/MagmaBlock.mapping +++ b/mappings/net/minecraft/block/MagmaBlock.mapping @@ -37,7 +37,7 @@ CLASS bjz net/minecraft/block/MagmaBlock ARG 2 state ARG 3 pos ARG 4 rnd - METHOD k (Lbpm;Lbbb;Let;)Z + METHOD k shouldPostProcess (Lbpm;Lbbb;Let;)Z ARG 1 state ARG 2 view ARG 3 pos diff --git a/mappings/net/minecraft/block/MushroomPlantBlock.mapping b/mappings/net/minecraft/block/MushroomPlantBlock.mapping index 450545ec29..f7933326b4 100644 --- a/mappings/net/minecraft/block/MushroomPlantBlock.mapping +++ b/mappings/net/minecraft/block/MushroomPlantBlock.mapping @@ -33,7 +33,7 @@ CLASS bkc net/minecraft/block/MushroomPlantBlock ARG 2 state ARG 3 pos ARG 4 rnd - METHOD k (Lbpm;Lbbb;Let;)Z + METHOD k shouldPostProcess (Lbpm;Lbbb;Let;)Z ARG 1 state ARG 2 view ARG 3 pos diff --git a/mappings/net/minecraft/sortme/SpawnHelper.mapping b/mappings/net/minecraft/sortme/SpawnHelper.mapping index 12249f2927..cc2ea8b803 100644 --- a/mappings/net/minecraft/sortme/SpawnHelper.mapping +++ b/mappings/net/minecraft/sortme/SpawnHelper.mapping @@ -2,3 +2,7 @@ CLASS bcb net/minecraft/sortme/SpawnHelper FIELD a LOGGER Lorg/apache/logging/log4j/Logger; METHOD a canSpawn (Lahq$b;Lbbt;Let;Lagz;)Z METHOD a isClearForSpawn (Lbbb;Let;Lbpm;Lcfd;)Z + METHOD a populateEntities (Lbbq;Lbco;IILjava/util/Random;)V + ARG 0 world + ARG 2 chunkX + ARG 3 chunkZ diff --git a/mappings/uy.mapping b/mappings/net/minecraft/world/ChunkRegion.mapping similarity index 80% rename from mappings/uy.mapping rename to mappings/net/minecraft/world/ChunkRegion.mapping index 2074eea134..1ede1a38fc 100644 --- a/mappings/uy.mapping +++ b/mappings/net/minecraft/world/ChunkRegion.mapping @@ -1,25 +1,32 @@ -CLASS uy +CLASS uy net/minecraft/world/ChunkRegion FIELD a LOGGER Lorg/apache/logging/log4j/Logger; - FIELD c chunkX I - FIELD d chunkZ I + FIELD b chunks Ljava/util/List; + FIELD c centerChunkX I + FIELD d centerChunkZ I + FIELD e width I FIELD f world Lbbp; FIELD g seed J FIELD h seaLevel I FIELD i levelProperties Lcih; FIELD j random Ljava/util/Random; FIELD k dimension Lbsf; + FIELD l generatorSettings Lbso; FIELD m blockTickScheduler Lbcg; FIELD n fluidTickScheduler Lbcg; + METHOD (Lbbp;Ljava/util/List;)V + ARG 2 chunks METHOD E getChunkManager ()Lbre; METHOD F getFluidTickScheduler ()Lbcg; METHOD G getBlockTickScheduler ()Lbcg; + METHOD a getCenterChunkX ()I METHOD a getClosestPlayer (DDDDLjava/util/function/Predicate;)Larb; ARG 1 x ARG 3 y - METHOD a (II)Lbra; - ARG 1 chunkX - ARG 2 chunkZ - METHOD a (IILbrf;Z)Lbra; + ARG 5 z + METHOD a getChunk (II)Lbra; + ARG 1 x + ARG 2 z + METHOD a getChunk (IILbrf;Z)Lbra; ARG 1 chunkX ARG 2 chunkZ ARG 3 requiredState @@ -52,6 +59,7 @@ CLASS uy ARG 12 velocityZ METHOD a getEntities (Ljava/lang/Class;Lclz;Ljava/util/function/Predicate;)Ljava/util/List; ARG 1 entityClass + METHOD b getCenterChunkZ ()I METHOD b isChunkLoaded (II)Z METHOD b getBlockState (Let;)Lbpm; ARG 1 pos @@ -60,6 +68,7 @@ CLASS uy ARG 1 pos METHOD d getWorldBorder ()Lbqy; METHOD d isAir (Let;)Z + ARG 1 pos METHOD e isClient ()Z METHOD e getBiome (Let;)Lbco; METHOD f getWorld ()Lbbp; @@ -70,7 +79,9 @@ CLASS uy ARG 1 pos METHOD h getPersistentStateManager ()Lciq; METHOD i getSaveHandler ()Lcii; + METHOD k markBlockForPostProcessing (Let;)V METHOD m getRandom ()Ljava/util/Random; + METHOD n getSpawnPos ()Let; METHOD o getDimension ()Lbsf; METHOD q_ getSeaLevel ()I METHOD r_ getSeed ()J diff --git a/mappings/net/minecraft/world/ExtendedBlockView.mapping b/mappings/net/minecraft/world/ExtendedBlockView.mapping index 2cc0cb7d99..cf8e1cf107 100644 --- a/mappings/net/minecraft/world/ExtendedBlockView.mapping +++ b/mappings/net/minecraft/world/ExtendedBlockView.mapping @@ -4,4 +4,4 @@ CLASS baz net/minecraft/world/ExtendedBlockView METHOD b getLightmapIndex (Let;I)I ARG 1 pos METHOD e getBiome (Let;)Lbco; - METHOD h getSkyLightLevel (Let;)Z + METHOD h isSkyVisible (Let;)Z diff --git a/mappings/net/minecraft/world/IWorld.mapping b/mappings/net/minecraft/world/IWorld.mapping index 357e357924..ca641e1721 100644 --- a/mappings/net/minecraft/world/IWorld.mapping +++ b/mappings/net/minecraft/world/IWorld.mapping @@ -25,4 +25,5 @@ CLASS bbq net/minecraft/world/IWorld METHOD k getSkyAngle (F)F ARG 1 delta METHOD m getRandom ()Ljava/util/Random; + METHOD n getSpawnPos ()Let; METHOD r_ getSeed ()J diff --git a/mappings/net/minecraft/world/ScheduledTick.mapping b/mappings/net/minecraft/world/ScheduledTick.mapping index dce9fe130c..36d5461395 100644 --- a/mappings/net/minecraft/world/ScheduledTick.mapping +++ b/mappings/net/minecraft/world/ScheduledTick.mapping @@ -2,7 +2,7 @@ CLASS bch net/minecraft/world/ScheduledTick FIELD a pos Let; FIELD b time J FIELD c priority Lbci; - FIELD d id_counter J + FIELD d idCounter J FIELD e object Ljava/lang/Object; FIELD f id J METHOD (Let;Ljava/lang/Object;)V diff --git a/mappings/net/minecraft/world/ViewableWorld.mapping b/mappings/net/minecraft/world/ViewableWorld.mapping index 656988a0c2..88c95be9b0 100644 --- a/mappings/net/minecraft/world/ViewableWorld.mapping +++ b/mappings/net/minecraft/world/ViewableWorld.mapping @@ -1,14 +1,26 @@ CLASS bbt net/minecraft/world/ViewableWorld + METHOD D getChunk (Let;)Lbra; + ARG 1 pos METHOD G isBlockLoaded (Let;)Z METHOD a getClosestPlayer (DDDDLjava/util/function/Predicate;)Larb; ARG 1 x ARG 3 y METHOD a getClosestPlayer (DDDDZ)Larb; + METHOD a getChunk (II)Lbra; + ARG 1 x + ARG 2 z METHOD a isAreaLoaded (IIIIII)Z ARG 1 minX ARG 2 minY ARG 3 minZ ARG 4 maxX + ARG 5 maxY + ARG 6 maxZ + METHOD a getChunk (IILbrf;)Lbra; + ARG 1 x + ARG 2 z + ARG 3 requiredState + METHOD a getChunk (IILbrf;Z)Lbra; METHOD a getClosestPlayer (Lagv;D)Larb; METHOD a getCollisionVoxelShapes (Lagv;Lclz;DDD)Ljava/util/stream/Stream; ARG 3 x @@ -25,6 +37,7 @@ CLASS bbt net/minecraft/world/ViewableWorld ARG 1 type METHOD a isAreaLoaded (Let;Let;)Z ARG 1 min + ARG 2 max METHOD a getEmittedStrongRedstonePower (Let;Ley;)I ARG 1 pos METHOD b isChunkLoaded (II)Z @@ -32,6 +45,9 @@ CLASS bbt net/minecraft/world/ViewableWorld METHOD c getAmbientDarkness ()I METHOD d getWorldBorder ()Lbqy; METHOD d isAir (Let;)Z + ARG 1 pos + METHOD d (Let;I)I + ARG 2 darkness METHOD e isClient ()Z METHOD o getDimension ()Lbsf; METHOD q_ getSeaLevel ()I diff --git a/mappings/net/minecraft/world/World.mapping b/mappings/net/minecraft/world/World.mapping index de91ff1406..53fea93eda 100644 --- a/mappings/net/minecraft/world/World.mapping +++ b/mappings/net/minecraft/world/World.mapping @@ -80,9 +80,9 @@ CLASS bbp net/minecraft/world/World METHOD a calculateAmbientDarkness (F)I METHOD a isHeightInvalid (I)Z ARG 0 y - METHOD a (II)Lbra; - ARG 1 chunkX - ARG 2 chunkZ + METHOD a getChunk (II)Lbra; + ARG 1 x + ARG 2 z METHOD a getRandomPosInChunk (IIII)Let; ARG 1 x ARG 2 y @@ -274,6 +274,7 @@ CLASS bbp net/minecraft/world/World METHOD d setTicksSinceLightningClient (I)V METHOD d addGlobalEntity (Lagv;)Z METHOD d isAir (Let;)Z + ARG 1 pos METHOD e isClient ()Z METHOD e getFogColor (F)Lcmd; METHOD e getBiome (Let;)Lbco; @@ -298,6 +299,7 @@ CLASS bbp net/minecraft/world/World METHOD m isHeightInvaid (Let;)Z ARG 0 pos METHOD m_ updateEntities ()V + METHOD n getSpawnPos ()Let; METHOD n getChunk (Let;)Lbrm; METHOD o getDimension ()Lbsf; METHOD o scheduleBlockRender (Let;)V diff --git a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping index 3a207aae33..519a079926 100644 --- a/mappings/net/minecraft/world/biome/source/BiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/BiomeSource.mapping @@ -1,20 +1,35 @@ CLASS bcq net/minecraft/world/biome/source/BiomeSource - FIELD a STRUCTURE_FEATURES Ljava/util/Map; + FIELD a structureFeatures Ljava/util/Map; FIELD b topMaterials Ljava/util/Set; FIELD c SPAWN_BIOMES Ljava/util/List; METHOD a getSpawnBiomes ()Ljava/util/List; METHOD a getBiome (II)Lbco; ARG 1 x ARG 2 z - METHOD a getBiomesInRange (IIII)[Lbco; - METHOD a getBiomesInRange (IIIIZ)[Lbco; - METHOD a (IIILjava/util/List;Ljava/util/Random;)Let; + METHOD a getBiomesInArea (III)Ljava/util/Set; + ARG 1 x + ARG 2 z + ARG 3 radius + METHOD a sampleBiomes (IIII)[Lbco; + ARG 1 x + ARG 2 z + ARG 3 width + ARG 4 height + METHOD a sampleBiomes (IIIIZ)[Lbco; + ARG 1 x + ARG 2 z + ARG 3 width + ARG 4 height + METHOD a locateBiome (IIILjava/util/List;Ljava/util/Random;)Let; + ARG 1 x + ARG 2 z + ARG 3 radius ARG 4 biomes METHOD a hasStructureFeature (Lbyn;)Z ARG 1 feature METHOD a getBiome (Let;)Lbco; ARG 1 pos METHOD b getTopMaterials ()Ljava/util/Set; - METHOD b getBiomeAtCoordinatesTimes4 (II)Lbco; + METHOD b getBiomeForNoiseGen (II)Lbco; ARG 1 x - ARG 2 y + ARG 2 z diff --git a/mappings/net/minecraft/world/biome/source/CheckerboardBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/CheckerboardBiomeSource.mapping index 34aab3cd56..df5b619e04 100644 --- a/mappings/net/minecraft/world/biome/source/CheckerboardBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/CheckerboardBiomeSource.mapping @@ -1,7 +1,18 @@ CLASS bcw net/minecraft/world/biome/source/CheckerboardBiomeSource METHOD a getBiome (II)Lbco; - METHOD a getBiomesInRange (IIIIZ)[Lbco; - METHOD a (IIILjava/util/List;Ljava/util/Random;)Let; + METHOD a getBiomesInArea (III)Ljava/util/Set; + ARG 1 x + ARG 2 z + ARG 3 radius + METHOD a sampleBiomes (IIIIZ)[Lbco; + ARG 1 x + ARG 2 z + ARG 3 width + ARG 4 height + METHOD a locateBiome (IIILjava/util/List;Ljava/util/Random;)Let; + ARG 1 x + ARG 2 z + ARG 3 radius ARG 4 biomes METHOD a hasStructureFeature (Lbyn;)Z ARG 1 feature diff --git a/mappings/net/minecraft/world/biome/source/FixedBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/FixedBiomeSource.mapping index 54e401ad7e..eba2678466 100644 --- a/mappings/net/minecraft/world/biome/source/FixedBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/FixedBiomeSource.mapping @@ -1,7 +1,18 @@ CLASS bdn net/minecraft/world/biome/source/FixedBiomeSource METHOD a getBiome (II)Lbco; - METHOD a getBiomesInRange (IIIIZ)[Lbco; - METHOD a (IIILjava/util/List;Ljava/util/Random;)Let; + METHOD a getBiomesInArea (III)Ljava/util/Set; + ARG 1 x + ARG 2 z + ARG 3 radius + METHOD a sampleBiomes (IIIIZ)[Lbco; + ARG 1 x + ARG 2 z + ARG 3 width + ARG 4 height + METHOD a locateBiome (IIILjava/util/List;Ljava/util/Random;)Let; + ARG 1 x + ARG 2 z + ARG 3 radius ARG 4 biomes METHOD a hasStructureFeature (Lbyn;)Z ARG 1 feature diff --git a/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping index f197ab6244..73c9c0d667 100644 --- a/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping @@ -1,7 +1,18 @@ CLASS bfn net/minecraft/world/biome/source/TheEndBiomeSource METHOD a getBiome (II)Lbco; - METHOD a getBiomesInRange (IIIIZ)[Lbco; - METHOD a (IIILjava/util/List;Ljava/util/Random;)Let; + METHOD a getBiomesInArea (III)Ljava/util/Set; + ARG 1 x + ARG 2 z + ARG 3 radius + METHOD a sampleBiomes (IIIIZ)[Lbco; + ARG 1 x + ARG 2 z + ARG 3 width + ARG 4 height + METHOD a locateBiome (IIILjava/util/List;Ljava/util/Random;)Let; + ARG 1 x + ARG 2 z + ARG 3 radius ARG 4 biomes METHOD a hasStructureFeature (Lbyn;)Z ARG 1 feature diff --git a/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping b/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping index 95d9753b37..ca93f1b4bf 100644 --- a/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping +++ b/mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping @@ -1,12 +1,26 @@ CLASS beo net/minecraft/world/biome/source/VanillaLayeredBiomeSource + FIELD c noiseLayer Lcgc; + FIELD d biomeLayer Lcgc; FIELD e biomes [Lbco; METHOD (Lbep;)V ARG 1 config METHOD a getBiome (II)Lbco; - METHOD a getBiomesInRange (IIIIZ)[Lbco; - METHOD a (IIILjava/util/List;Ljava/util/Random;)Let; + METHOD a getBiomesInArea (III)Ljava/util/Set; + ARG 1 x + ARG 2 z + ARG 3 radius + METHOD a sampleBiomes (IIIIZ)[Lbco; + ARG 1 x + ARG 2 z + ARG 3 width + ARG 4 height + METHOD a locateBiome (IIILjava/util/List;Ljava/util/Random;)Let; + ARG 1 x + ARG 2 z + ARG 3 radius ARG 4 biomes METHOD a hasStructureFeature (Lbyn;)Z ARG 1 feature METHOD b getTopMaterials ()Ljava/util/Set; - METHOD b getBiomeAtCoordinatesTimes4 (II)Lbco; + METHOD b getBiomeForNoiseGen (II)Lbco; + ARG 2 z diff --git a/mappings/net/minecraft/world/chunk/ChunkSection.mapping b/mappings/net/minecraft/world/chunk/ChunkSection.mapping index d0a5817331..58681cce6e 100644 --- a/mappings/net/minecraft/world/chunk/ChunkSection.mapping +++ b/mappings/net/minecraft/world/chunk/ChunkSection.mapping @@ -13,14 +13,32 @@ CLASS brn net/minecraft/world/chunk/ChunkSection ARG 4 nonEmptyFluidCount METHOD a lock ()V METHOD a getBlockState (III)Lbpm; + ARG 1 x + ARG 2 y + ARG 3 z + METHOD a setBlockState (IIILbpm;)Lbpm; + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 state + METHOD a setBlockState (IIILbpm;Z)Lbpm; + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 state + ARG 5 lock METHOD a fromPacket (Lit;)V METHOD b unlock ()V METHOD b getFluidState (III)Lcfd; + ARG 1 x + ARG 2 y + ARG 3 z METHOD b toPacket (Lit;)V METHOD c isEmpty ()Z METHOD d hasRandomTicks ()Z METHOD e hasRandomBlockTicks ()Z METHOD f hasRandomFluidTicks ()Z METHOD g getYOffset ()I + METHOD h computeBlockCounts ()V METHOD i getContainer ()Lbrt; METHOD j getPacketSize ()I diff --git a/mappings/net/minecraft/world/gen/ChunkRandom.mapping b/mappings/net/minecraft/world/gen/ChunkRandom.mapping new file mode 100644 index 0000000000..87b79dab75 --- /dev/null +++ b/mappings/net/minecraft/world/gen/ChunkRandom.mapping @@ -0,0 +1,33 @@ +CLASS btd net/minecraft/world/gen/ChunkRandom + FIELD a sampleCount I + METHOD (J)V + ARG 1 seed + METHOD a consume (I)V + ARG 1 count + METHOD a setSeed (II)J + ARG 1 x + ARG 2 z + METHOD a (IIJJ)Ljava/util/Random; + ARG 0 x + ARG 1 z + ARG 2 worldSeed + ARG 4 localSeed + METHOD a setSeed (JII)J + ARG 1 worldSeed + ARG 3 x + ARG 4 z + METHOD a setStructureSeed (JIII)J + ARG 1 worldSeed + ARG 3 x + ARG 4 z + ARG 5 localSeed + METHOD b setFeatureSeed (JII)J + ARG 1 worldSeed + ARG 3 index + ARG 4 step + METHOD c setStructureSeed (JII)J + ARG 1 worldSeed + ARG 3 x + ARG 4 z + METHOD next (I)I + ARG 1 bound diff --git a/mappings/net/minecraft/world/gen/Heightmap.mapping b/mappings/net/minecraft/world/gen/Heightmap.mapping index 717159caf3..557e773f73 100644 --- a/mappings/net/minecraft/world/gen/Heightmap.mapping +++ b/mappings/net/minecraft/world/gen/Heightmap.mapping @@ -15,11 +15,33 @@ CLASS bst net/minecraft/world/gen/Heightmap METHOD a byName (Ljava/lang/String;)Lbst$a; ARG 0 name METHOD d getBlockPredicate ()Ljava/util/function/Predicate; + CLASS bst$b FIELD a ALWAYS_TRUE Ljava/util/function/Predicate; FIELD b SUFFOCATES Ljava/util/function/Predicate; FIELD c storage Lyi; + FIELD d blockPredicate Ljava/util/function/Predicate; + FIELD e chunk Lbra; METHOD (Lbra;Lbst$a;)V ARG 2 type METHOD a asLongArray ()[J + METHOD a get (I)I + ARG 1 index + METHOD a get (II)I + ARG 1 x + ARG 2 z + METHOD a set (III)V + ARG 1 x + ARG 2 z + ARG 3 height + METHOD a trackUpdate (IIILbpm;)Z + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 state + METHOD a populateHeightmaps (Lbra;Ljava/util/Set;)V + ARG 1 types METHOD a setTo ([J)V ARG 1 heightmap + METHOD c toIndex (II)I + ARG 0 x + ARG 1 z diff --git a/mappings/net/minecraft/world/gen/PhantomSpawner.mapping b/mappings/net/minecraft/world/gen/PhantomSpawner.mapping new file mode 100644 index 0000000000..1f277326f2 --- /dev/null +++ b/mappings/net/minecraft/world/gen/PhantomSpawner.mapping @@ -0,0 +1,4 @@ +CLASS bta net/minecraft/world/gen/PhantomSpawner + METHOD a spawn (Lbbp;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 new file mode 100644 index 0000000000..d082a28064 --- /dev/null +++ b/mappings/net/minecraft/world/gen/PillagerSpawner.mapping @@ -0,0 +1,9 @@ +CLASS bsz net/minecraft/world/gen/PillagerSpawner + CLASS bsz$a SpawnEntry + FIELD b entityType Lagz; + METHOD (Lagz;I)V + ARG 2 weight + FIELD a SPAWN_ENTRIES Ljava/util/List; + METHOD a spawn (Lbbp;ZZ)I + ARG 2 spawnMonsters + ARG 3 spawnAnimals diff --git a/mappings/net/minecraft/world/gen/carver/Carver.mapping b/mappings/net/minecraft/world/gen/carver/Carver.mapping index 21c4a8cdc3..ed976a8029 100644 --- a/mappings/net/minecraft/world/gen/carver/Carver.mapping +++ b/mappings/net/minecraft/world/gen/carver/Carver.mapping @@ -8,4 +8,12 @@ CLASS btm net/minecraft/world/gen/carver/Carver FIELD g CAVE_AIR Lbpm; FIELD h WATER Lcfd; FIELD i LAVA Lcfd; + METHOD a carve (Lbra;Ljava/util/Random;IIIIILjava/util/BitSet;Lbtf;)Z + ARG 1 chunk + ARG 8 carvingMask + ARG 9 config METHOD a register (Ljava/lang/String;Lbtm;)Lbtm; + METHOD a shouldCarve (Ljava/util/Random;IILbtf;)Z + ARG 2 chunkX + ARG 3 chunkZ + ARG 4 config diff --git a/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping b/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping index 2e9f472f7f..22c42e5e2b 100644 --- a/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/CaveCarver.mapping @@ -1 +1,9 @@ CLASS btg net/minecraft/world/gen/carver/CaveCarver + METHOD a carve (Lbra;Ljava/util/Random;IIIIILjava/util/BitSet;Lbtf;)Z + ARG 1 chunk + ARG 8 carvingMask + ARG 9 config + METHOD a shouldCarve (Ljava/util/Random;IILbtf;)Z + ARG 2 chunkX + ARG 3 chunkZ + ARG 4 config diff --git a/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping b/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping index ac1726ca2d..06f83abcad 100644 --- a/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping @@ -4,3 +4,10 @@ CLASS bth net/minecraft/world/gen/carver/ConfiguredCarver METHOD (Lbtm;Lbtf;)V ARG 1 carver ARG 2 config + METHOD a carve (Lbra;Ljava/util/Random;IIIIILjava/util/BitSet;)Z + ARG 4 chunkX + ARG 5 chunkZ + ARG 8 carvingMask + METHOD a shouldCarve (Ljava/util/Random;II)Z + ARG 2 chunkX + ARG 3 chunkZ diff --git a/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping b/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping index 89a371708b..68f02e7e7a 100644 --- a/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping +++ b/mappings/net/minecraft/world/gen/carver/RavineCarver.mapping @@ -1 +1,9 @@ CLASS bte net/minecraft/world/gen/carver/RavineCarver + METHOD a carve (Lbra;Ljava/util/Random;IIIIILjava/util/BitSet;Lbtf;)Z + ARG 1 chunk + ARG 8 carvingMask + ARG 9 config + METHOD a shouldCarve (Ljava/util/Random;IILbtf;)Z + ARG 2 chunkX + ARG 3 chunkZ + ARG 4 config diff --git a/mappings/net/minecraft/world/gen/chunk/CavesChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/CavesChunkGenerator.mapping index 7721ae3a52..2bffb6e129 100644 --- a/mappings/net/minecraft/world/gen/chunk/CavesChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/CavesChunkGenerator.mapping @@ -10,4 +10,8 @@ CLASS bsv net/minecraft/world/gen/chunk/CavesChunkGenerator METHOD a getEntitySpawnList (Lahg;Let;)Ljava/util/List; METHOD a sampleNoiseColumn ([DII)V ARG 1 buffer + ARG 2 x + ARG 3 z + METHOD b getSpawnHeight ()I + METHOD e getMaxY ()I METHOD j buidlNoiseFalloff ()[D diff --git a/mappings/net/minecraft/world/gen/chunk/CavesChunkGeneratorConfig.mapping b/mappings/net/minecraft/world/gen/chunk/CavesChunkGeneratorConfig.mapping new file mode 100644 index 0000000000..7644fcda88 --- /dev/null +++ b/mappings/net/minecraft/world/gen/chunk/CavesChunkGeneratorConfig.mapping @@ -0,0 +1,3 @@ +CLASS bsu net/minecraft/world/gen/chunk/CavesChunkGeneratorConfig + METHOD t getMaxY ()I + METHOD u getMinY ()I diff --git a/mappings/net/minecraft/world/gen/chunk/CavesChunkGeneratorSettings.mapping b/mappings/net/minecraft/world/gen/chunk/CavesChunkGeneratorSettings.mapping deleted file mode 100644 index dec0905adf..0000000000 --- a/mappings/net/minecraft/world/gen/chunk/CavesChunkGeneratorSettings.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS bsu net/minecraft/world/gen/chunk/CavesChunkGeneratorSettings diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping index a12172c514..c801ded612 100644 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping @@ -2,29 +2,38 @@ CLASS brb net/minecraft/world/gen/chunk/ChunkGenerator FIELD a world Lbbq; FIELD b seed J FIELD c biomeSource Lbcq; - FIELD d settings Lbso; + FIELD d config Lbso; METHOD (Lbbq;Lbcq;Lbso;)V ARG 1 world ARG 2 biomeSource - ARG 3 settings + ARG 3 config METHOD a getSettings ()Lbso; METHOD a produceHeight (IILbst$a;)I ARG 1 x ARG 2 z + ARG 3 type METHOD a getEntitySpawnList (Lahg;Let;)Ljava/util/List; METHOD a locateStructure (Lbbp;Ljava/lang/String;Let;IZ)Let; ARG 1 world ARG 2 structureKey ARG 3 origin - METHOD a (Lbbp;ZZ)V + ARG 4 radius + METHOD a spawnEntities (Lbbp;ZZ)V ARG 1 world ARG 2 spawnMonsters + ARG 3 spawnAnimals + METHOD a addStructureReferences (Lbbq;Lbra;)V + ARG 1 world METHOD a hasStructure (Lbco;Lbyn;)Z METHOD a populateBiomes (Lbra;)V METHOD a carve (Lbra;Lbss$a;)V ARG 1 chunk ARG 2 carverStep METHOD a generateFeatures (Luy;)V + METHOD a getDecorationBiome (Luy;II)Lbco; + ARG 2 chunkX + ARG 3 chunkZ + METHOD b getSpawnHeight ()I METHOD b populateNoise (Lbbq;Lbra;)V ARG 1 world ARG 2 chunk @@ -33,4 +42,6 @@ CLASS brb net/minecraft/world/gen/chunk/ChunkGenerator METHOD b populateEntities (Luy;)V METHOD c getBiomeSource ()Lbcq; METHOD c buildSurface (Lbra;)V + ARG 1 chunk METHOD d getSeed ()J + METHOD e getMaxY ()I diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorConfig.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorConfig.mapping new file mode 100644 index 0000000000..80dd186f5d --- /dev/null +++ b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorConfig.mapping @@ -0,0 +1,27 @@ +CLASS bso net/minecraft/world/gen/chunk/ChunkGeneratorConfig + FIELD a villageDistance I + FIELD c oceanMonumentSpacing I + FIELD d oceanMonumentSeparation I + FIELD e strongholdDistance I + FIELD f strongholdCount I + FIELD g strongholdSpread I + FIELD h templeDistance I + FIELD l endCityDistance I + FIELD p mansionDistance I + FIELD r defaultBlock Lbpm; + FIELD s defaultFluid Lbpm; + METHOD a getVillageDistance ()I + METHOD a setDefaultBlock (Lbpm;)V + METHOD b setDefaultFluid (Lbpm;)V + METHOD c getOceanMonumentSpacing ()I + METHOD d getOceanMonumentSeparation ()I + METHOD e getStrongholdDistance ()I + METHOD f getStrongholdCount ()I + METHOD g getStrongholdSpread ()I + METHOD h getTempleDistance ()I + METHOD n getEndCityDistance ()I + METHOD p getMansionDistance ()I + METHOD r getDefaultBlock ()Lbpm; + METHOD s getDefaultFluid ()Lbpm; + METHOD t getMaxY ()I + METHOD u getMinY ()I diff --git a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping b/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping deleted file mode 100644 index 76c79be287..0000000000 --- a/mappings/net/minecraft/world/gen/chunk/ChunkGeneratorSettings.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS bso net/minecraft/world/gen/chunk/ChunkGeneratorSettings - FIELD r defaultBlock Lbpm; - FIELD s defaultFluid Lbpm; - METHOD a setDefaultBlock (Lbpm;)V - METHOD b setDefaultFluid (Lbpm;)V - METHOD r getDefaultBlock ()Lbpm; - METHOD s getDefaultFluid ()Lbpm; diff --git a/mappings/net/minecraft/world/gen/chunk/DebugChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/DebugChunkGenerator.mapping index 19545f64fb..a82f90350b 100644 --- a/mappings/net/minecraft/world/gen/chunk/DebugChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/DebugChunkGenerator.mapping @@ -1,12 +1,18 @@ CLASS bsq net/minecraft/world/gen/chunk/DebugChunkGenerator + METHOD (Lbbq;Lbcq;Lbsp;)V + ARG 1 world + ARG 3 config METHOD a produceHeight (IILbst$a;)I ARG 1 x ARG 2 z + ARG 3 type METHOD a carve (Lbra;Lbss$a;)V ARG 1 chunk ARG 2 carverStep METHOD a generateFeatures (Luy;)V + METHOD b getSpawnHeight ()I METHOD b populateNoise (Lbbq;Lbra;)V ARG 1 world ARG 2 chunk METHOD c buildSurface (Lbra;)V + ARG 1 chunk diff --git a/mappings/net/minecraft/world/gen/chunk/DebugChunkGeneratorConfig.mapping b/mappings/net/minecraft/world/gen/chunk/DebugChunkGeneratorConfig.mapping new file mode 100644 index 0000000000..19e6aa6e24 --- /dev/null +++ b/mappings/net/minecraft/world/gen/chunk/DebugChunkGeneratorConfig.mapping @@ -0,0 +1 @@ +CLASS bsp net/minecraft/world/gen/chunk/DebugChunkGeneratorConfig diff --git a/mappings/net/minecraft/world/gen/chunk/DebugChunkGeneratorSettings.mapping b/mappings/net/minecraft/world/gen/chunk/DebugChunkGeneratorSettings.mapping deleted file mode 100644 index 15fef10a01..0000000000 --- a/mappings/net/minecraft/world/gen/chunk/DebugChunkGeneratorSettings.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS bsp net/minecraft/world/gen/chunk/DebugChunkGeneratorSettings diff --git a/mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping index fca1a7d373..e51514b8b8 100644 --- a/mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/FlatChunkGenerator.mapping @@ -1,18 +1,31 @@ CLASS bsr net/minecraft/world/gen/chunk/FlatChunkGenerator + FIELD e biome Lbco; + FIELD f phantomSpawner Lbta; + METHOD (Lbbq;Lbcq;Lbzp;)V + ARG 1 world + ARG 3 config METHOD a produceHeight (IILbst$a;)I ARG 1 x ARG 2 z + ARG 3 type METHOD a locateStructure (Lbbp;Ljava/lang/String;Let;IZ)Let; ARG 1 world ARG 2 structureKey ARG 3 origin - METHOD a (Lbbp;ZZ)V + ARG 4 radius + METHOD a spawnEntities (Lbbp;ZZ)V ARG 1 world ARG 2 spawnMonsters + ARG 3 spawnAnimals METHOD a hasStructure (Lbco;Lbyn;)Z + METHOD a getDecorationBiome (Luy;II)Lbco; + ARG 2 chunkX + ARG 3 chunkZ + METHOD b getSpawnHeight ()I METHOD b populateNoise (Lbbq;Lbra;)V ARG 1 world ARG 2 chunk METHOD b getStructureConfig (Lbco;Lbyn;)Lbvh; METHOD b getDecorationBiome (Lbra;)Lbco; METHOD c buildSurface (Lbra;)V + ARG 1 chunk diff --git a/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping b/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping new file mode 100644 index 0000000000..b57890316f --- /dev/null +++ b/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig.mapping @@ -0,0 +1,12 @@ +CLASS bzp net/minecraft/world/gen/chunk/FlatChunkGeneratorConfig + FIELD M layers Ljava/util/List; + FIELD N structures Ljava/util/Map; + FIELD O biome Lbco; + FIELD P layerBlocks [Lbpm; + FIELD w LOGGER Lorg/apache/logging/log4j/Logger; + METHOD C getLayerBlocks ()[Lbpm; + METHOD a setBiome (Lbco;)V + METHOD a parseBlock (Ljava/lang/String;)Lbgs; + METHOD v getBiome ()Lbco; + METHOD w getStructures ()Ljava/util/Map; + METHOD x getLayers ()Ljava/util/List; diff --git a/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorSettings.mapping b/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorSettings.mapping deleted file mode 100644 index 2089e03553..0000000000 --- a/mappings/net/minecraft/world/gen/chunk/FlatChunkGeneratorSettings.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS bzp net/minecraft/world/gen/chunk/FlatChunkGeneratorSettings diff --git a/mappings/net/minecraft/world/gen/chunk/FloatingIslandsChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/FloatingIslandsChunkGenerator.mapping index 3e63619c8f..1f370d4a1f 100644 --- a/mappings/net/minecraft/world/gen/chunk/FloatingIslandsChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/FloatingIslandsChunkGenerator.mapping @@ -1,4 +1,5 @@ CLASS btc net/minecraft/world/gen/chunk/FloatingIslandsChunkGenerator + FIELD h center Let; METHOD a computeNoiseFalloff (DDI)D ARG 1 depth ARG 3 scale @@ -8,3 +9,7 @@ CLASS btc net/minecraft/world/gen/chunk/FloatingIslandsChunkGenerator ARG 2 z METHOD a sampleNoiseColumn ([DII)V ARG 1 buffer + ARG 2 x + ARG 3 z + METHOD b getSpawnHeight ()I + METHOD j getCenter ()Let; diff --git a/mappings/net/minecraft/world/gen/chunk/FloatingIslandsChunkGeneratorConfig.mapping b/mappings/net/minecraft/world/gen/chunk/FloatingIslandsChunkGeneratorConfig.mapping new file mode 100644 index 0000000000..5fadd593ba --- /dev/null +++ b/mappings/net/minecraft/world/gen/chunk/FloatingIslandsChunkGeneratorConfig.mapping @@ -0,0 +1,4 @@ +CLASS btb net/minecraft/world/gen/chunk/FloatingIslandsChunkGeneratorConfig + FIELD t center Let; + METHOD a withCenter (Let;)Lbtb; + METHOD v getCenter ()Let; diff --git a/mappings/net/minecraft/world/gen/chunk/FloatingIslandsChunkGeneratorSettings.mapping b/mappings/net/minecraft/world/gen/chunk/FloatingIslandsChunkGeneratorSettings.mapping deleted file mode 100644 index 460de2c49c..0000000000 --- a/mappings/net/minecraft/world/gen/chunk/FloatingIslandsChunkGeneratorSettings.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS btb net/minecraft/world/gen/chunk/FloatingIslandsChunkGeneratorSettings diff --git a/mappings/net/minecraft/world/gen/chunk/OverworldChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/OverworldChunkGenerator.mapping index 30890d318c..ab51a11a19 100644 --- a/mappings/net/minecraft/world/gen/chunk/OverworldChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/OverworldChunkGenerator.mapping @@ -1,4 +1,5 @@ CLASS bsy net/minecraft/world/gen/chunk/OverworldChunkGenerator + FIELD h BIOME_WEIGHT_TABLE [F FIELD j amplified Z FIELD k phantomSpawner Lbta; FIELD l pillagerSpawner Lbsz; @@ -10,9 +11,13 @@ CLASS bsy net/minecraft/world/gen/chunk/OverworldChunkGenerator ARG 1 x ARG 2 z METHOD a getEntitySpawnList (Lahg;Let;)Ljava/util/List; - METHOD a (Lbbp;ZZ)V + METHOD a spawnEntities (Lbbp;ZZ)V ARG 1 world ARG 2 spawnMonsters + ARG 3 spawnAnimals METHOD a sampleNoiseColumn ([DII)V ARG 1 buffer + ARG 2 x + ARG 3 z + METHOD b getSpawnHeight ()I METHOD b populateEntities (Luy;)V diff --git a/mappings/net/minecraft/world/gen/chunk/OverworldChunkGeneratorConfig.mapping b/mappings/net/minecraft/world/gen/chunk/OverworldChunkGeneratorConfig.mapping new file mode 100644 index 0000000000..3c312954f2 --- /dev/null +++ b/mappings/net/minecraft/world/gen/chunk/OverworldChunkGeneratorConfig.mapping @@ -0,0 +1,2 @@ +CLASS bsx net/minecraft/world/gen/chunk/OverworldChunkGeneratorConfig + METHOD u getMinY ()I diff --git a/mappings/net/minecraft/world/gen/chunk/OverworldChunkGeneratorSettings.mapping b/mappings/net/minecraft/world/gen/chunk/OverworldChunkGeneratorSettings.mapping deleted file mode 100644 index b0b597dafa..0000000000 --- a/mappings/net/minecraft/world/gen/chunk/OverworldChunkGeneratorSettings.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS bsx net/minecraft/world/gen/chunk/OverworldChunkGeneratorSettings diff --git a/mappings/net/minecraft/world/gen/chunk/SurfaceChunkGenerator.mapping b/mappings/net/minecraft/world/gen/chunk/SurfaceChunkGenerator.mapping index 81e0d8b22f..2e8172f488 100644 --- a/mappings/net/minecraft/world/gen/chunk/SurfaceChunkGenerator.mapping +++ b/mappings/net/minecraft/world/gen/chunk/SurfaceChunkGenerator.mapping @@ -8,13 +8,14 @@ CLASS bsw net/minecraft/world/gen/chunk/SurfaceChunkGenerator FIELD l noiseSizeX I FIELD m noiseSizeY I FIELD n noiseSizeZ I + FIELD r surfaceDepthNoise Lcek; METHOD (Lbbq;Lbcq;IIILbso;Z)V ARG 1 world ARG 2 biomeSource ARG 3 verticalNoiseResolution ARG 4 horizontalNoiseResolution ARG 5 worldHeight - ARG 6 settings + ARG 6 config METHOD a computeNoiseFalloff (DDI)D ARG 1 depth ARG 3 scale @@ -27,7 +28,12 @@ CLASS bsw net/minecraft/world/gen/chunk/SurfaceChunkGenerator METHOD a produceHeight (IILbst$a;)I ARG 1 x ARG 2 z + ARG 3 type + METHOD a buildBedrock (Lbra;Ljava/util/Random;)V METHOD a sampleNoiseColumn ([DII)V + ARG 1 buffer + ARG 2 x + ARG 3 z METHOD a sampleNoiseColumn ([DIIDDDDII)V ARG 1 buffer ARG 2 x @@ -39,3 +45,5 @@ CLASS bsw net/minecraft/world/gen/chunk/SurfaceChunkGenerator ARG 1 world ARG 2 chunk METHOD c buildSurface (Lbra;)V + ARG 1 chunk + METHOD i getNoiseSizeY ()I diff --git a/mappings/net/minecraft/world/gen/feature/Feature.mapping b/mappings/net/minecraft/world/gen/feature/Feature.mapping index 9113ec0d79..8150402b40 100644 --- a/mappings/net/minecraft/world/gen/feature/Feature.mapping +++ b/mappings/net/minecraft/world/gen/feature/Feature.mapping @@ -7,6 +7,7 @@ CLASS bvg net/minecraft/world/gen/feature/Feature FIELD a configFactory Ljava/util/function/Function; FIELD aO BONUS_CHEST Lbtw; FIELD aP STRUCTURES Lcom/google/common/collect/BiMap; + FIELD aQ JIGSAW_STRUCTURES Ljava/util/List; FIELD aR emitNeighborBlockUpdates Z FIELD b VILLAGE Lbyn; FIELD c PILLAGER_OUTPOST Lbyn; diff --git a/mappings/yi.mapping b/mappings/yi.mapping index 394dbf6337..82922005ce 100644 --- a/mappings/yi.mapping +++ b/mappings/yi.mapping @@ -1,2 +1,4 @@ CLASS yi METHOD a asLongArray ()[J + METHOD a get (I)I + METHOD b set (II)V