mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

19w36a: The art of nether update (#862) 

* 19w37a biomes mappings

also mapped that new world thing to VoxelView (all methods mapped)

Signed-off-by: liach <liach@users.noreply.github.com>

* Fixes two broken packages

Signed-off-by: liach <liach@users.noreply.github.com>

* access -> getStored

Signed-off-by: liach <liach@users.noreply.github.com>

* Few biome fields nearby

Signed-off-by: liach <liach@users.noreply.github.com>

* voronoi

Signed-off-by: liach <liach@users.noreply.github.com>

* cull -> culling

Signed-off-by: liach <liach@users.noreply.github.com>

* voxelview -> worldview, biomeaccessor -> biomeaccess, biomeaccessstrategy -> biomeaccesstype

Signed-off-by: liach <liach@users.noreply.github.com>

* Other improvements

Signed-off-by: liach <liach@users.noreply.github.com>

* fix biome access name in chunkregion

Signed-off-by: liach <liach@users.noreply.github.com>

* addSalt, map another biome array field, also move access things to world/biome from world/biome/source package

Signed-off-by: liach <liach@users.noreply.github.com>

* Revert the is full cube name

(It was like whether to check neighbor for shape check)
This commit is contained in:
liach 2019-10-09 11:44:19 -05:00 committed by Modmuss50
parent c95856c60f
commit e68c809d40
28 changed files with 120 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mappings/net/minecraft/block/Block.mapping
View File

@ -105,8 +105,10 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
ARG 1 world
ARG 2 pos
ARG 3 side
METHOD method_22358 (Lnet/minecraft/class_2680;Lnet/minecraft/class_3611;)Z
METHOD method_22358 canBucketPlace (Lnet/minecraft/class_2680;Lnet/minecraft/class_3611;)Z
ARG 1 state
ARG 2 fluid
METHOD method_22359 hasEmissiveLighting (Lnet/minecraft/class_2680;)Z
METHOD method_9496 randomDisplayTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/Random;)V
ARG 1 state
ARG 2 world
@ -322,7 +324,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
ARG 1 state
ARG 2 mirror
METHOD method_9570 hasBlockEntity ()Z
METHOD method_9571 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265;
METHOD method_9571 getCullingShape (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265;
ARG 1 state
ARG 2 view
ARG 3 pos

7
mappings/net/minecraft/block/BlockState.mapping
View File

@ -115,7 +115,7 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState
ARG 2 pos
ARG 3 entity
METHOD method_11614 getBlock ()Lnet/minecraft/class_2248;
METHOD method_11615 (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265;
METHOD method_11615 getCullingShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265;
ARG 1 view
ARG 2 pos
METHOD method_11616 hasRandomTicks ()Z
@ -178,7 +178,7 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState
ARG 1 view
ARG 2 pos
ARG 3 ePos
METHOD method_16384 getCullShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Lnet/minecraft/class_265;
METHOD method_16384 getCullingShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Lnet/minecraft/class_265;
ARG 1 view
ARG 2 pos
ARG 3 facing
@ -198,3 +198,6 @@ CLASS net/minecraft/class_2680 net/minecraft/block/BlockState
ARG 3 hitResult
ARG 4 projectile
METHOD method_20827 isSideSolidFullSquare (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z
METHOD method_22360 canBucketPlace (Lnet/minecraft/class_3611;)Z
ARG 1 fluid
METHOD method_22361 hasEmissiveLighting ()Z

2
mappings/net/minecraft/block/FenceBlock.mapping
View File

@ -1,5 +1,5 @@
CLASS net/minecraft/class_2354 net/minecraft/block/FenceBlock
FIELD field_11066 SHAPES [Lnet/minecraft/class_265;
FIELD field_11066 cullingShapes [Lnet/minecraft/class_265;
METHOD <init> (Lnet/minecraft/class_2248$class_2251;)V
ARG 1 settings
METHOD h (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265;

4
mappings/net/minecraft/class_4543.mapping
View File

@ -1,4 +0,0 @@
CLASS net/minecraft/class_4543
CLASS class_4544
METHOD method_16359 getBiome (III)Lnet/minecraft/class_1959;
METHOD method_22393 getBiome (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959;

1
mappings/net/minecraft/class_4548.mapping
View File

@ -1 +0,0 @@
CLASS net/minecraft/class_4548

2
mappings/net/minecraft/util/shape/SliceVoxelShape.mapping
View File

@ -1,5 +1,5 @@
CLASS net/minecraft/class_263 net/minecraft/util/shape/SliceVoxelShape
FIELD field_1395 points Lit/unimi/dsi/fastutil/doubles/DoubleList;
FIELD field_1395 POINTS Lit/unimi/dsi/fastutil/doubles/DoubleList;
FIELD field_1396 axis Lnet/minecraft/class_2350$class_2351;
FIELD field_1397 shape Lnet/minecraft/class_265;
METHOD <init> (Lnet/minecraft/class_265;Lnet/minecraft/class_2350$class_2351;I)V

3
mappings/net/minecraft/util/shape/VoxelShapes.mapping
View File

@ -56,6 +56,9 @@ CLASS net/minecraft/class_259 net/minecraft/util/shape/VoxelShapes
METHOD method_1086 findRequiredBitResolution (DD)I
ARG 0 min
ARG 2 max
METHOD method_16344 slice (Lnet/minecraft/class_265;Lnet/minecraft/class_2350;)Lnet/minecraft/class_265;
ARG 0 shape
ARG 1 direction
METHOD method_17786 union (Lnet/minecraft/class_265;[Lnet/minecraft/class_265;)Lnet/minecraft/class_265;
ARG 0 first
ARG 1 others

1
mappings/net/minecraft/world/BlockRenderView.mapping
View File

@ -5,6 +5,7 @@ CLASS net/minecraft/class_1920 net/minecraft/world/BlockRenderView
METHOD method_22336 getLightingProvider ()Lnet/minecraft/class_3568;
METHOD method_22337 getLightmapCoordinates (Lnet/minecraft/class_2338;)I
ARG 1 pos
METHOD method_22385 getBiomeAccess ()Lnet/minecraft/class_4543;
METHOD method_8310 getBiome (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959;
ARG 1 pos
METHOD method_8311 isSkyVisible (Lnet/minecraft/class_2338;)Z

1
mappings/net/minecraft/world/ChunkRegion.mapping
View File

@ -13,6 +13,7 @@ CLASS net/minecraft/class_3233 net/minecraft/world/ChunkRegion
FIELD field_14097 levelProperties Lnet/minecraft/class_31;
FIELD field_14098 chunks Ljava/util/List;
FIELD field_14099 blockTickScheduler Lnet/minecraft/class_1951;
FIELD field_20668 biomeAccess Lnet/minecraft/class_4543;
METHOD <init> (Lnet/minecraft/class_3218;Ljava/util/List;)V
ARG 1 world
ARG 2 chunks

1
mappings/net/minecraft/world/World.mapping
View File

@ -2,6 +2,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
FIELD field_16316 profiler Lnet/minecraft/class_3695;
FIELD field_17086 thread Ljava/lang/Thread;
FIELD field_18139 unloadedBlockEntities Ljava/util/List;
FIELD field_20639 biomeAccess Lnet/minecraft/class_4543;
FIELD field_9223 border Lnet/minecraft/class_2784;
FIELD field_9224 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_9226 ambientDarkness I

9
mappings/net/minecraft/class_4538.mapping → mappings/net/minecraft/world/WorldView.mapping
View File

@ -1,4 +1,7 @@
CLASS net/minecraft/class_4538
CLASS net/minecraft/class_4538 net/minecraft/world/WorldView
METHOD method_22338 (II)Lnet/minecraft/class_1922;
ARG 1 chunkX
ARG 2 chunkZ
METHOD method_22339 getLightLevel (Lnet/minecraft/class_2338;)I
ARG 1 pos
METHOD method_22340 isChunkLoaded (Lnet/minecraft/class_2338;)Z
@ -35,6 +38,10 @@ CLASS net/minecraft/class_4538
ARG 1 pos
METHOD method_22351 isWater (Lnet/minecraft/class_2338;)Z
ARG 1 pos
METHOD method_22387 getGeneratorStoredBiome (III)Lnet/minecraft/class_1959;
ARG 1 biomeX
ARG 2 biomeY
ARG 3 biomeZ
METHOD method_8392 getChunk (II)Lnet/minecraft/class_2791;
ARG 1 chunkX
ARG 2 chunkZ

16
mappings/net/minecraft/world/biome/BiomeAccess.mapping Normal file
View File

@ -0,0 +1,16 @@
CLASS net/minecraft/class_4543 net/minecraft/world/biome/BiomeAccess
CLASS class_4544 Storage
METHOD method_16359 getStoredBiome (III)Lnet/minecraft/class_1959;
ARG 1 biomeX
ARG 2 biomeY
ARG 3 biomeZ
FIELD field_20640 storage Lnet/minecraft/class_4543$class_4544;
FIELD field_20641 seed J
FIELD field_20642 type Lnet/minecraft/class_4545;
METHOD <init> (Lnet/minecraft/class_4543$class_4544;JLnet/minecraft/class_4545;)V
ARG 2 seed
ARG 4 type
METHOD method_22392 withSource (Lnet/minecraft/class_1966;)Lnet/minecraft/class_4543;
ARG 1 source
METHOD method_22393 getBiome (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959;
ARG 1 pos

6
mappings/net/minecraft/world/biome/BiomeAccessType.mapping Normal file
View File

@ -0,0 +1,6 @@
CLASS net/minecraft/class_4545 net/minecraft/world/biome/BiomeAccessType
METHOD method_22396 getBiome (JIIILnet/minecraft/class_4543$class_4544;)Lnet/minecraft/class_1959;
ARG 1 seed
ARG 3 x
ARG 4 y
ARG 5 z

22
mappings/net/minecraft/world/biome/BiomeArray.mapping Normal file
View File

@ -0,0 +1,22 @@
CLASS net/minecraft/class_4548 net/minecraft/world/biome/BiomeArray
FIELD field_20649 DEFAULT_LENGTH I
FIELD field_20650 HORIZONTAL_BIT_MASK I
FIELD field_20651 VERTICAL_BIT_MASK I
FIELD field_20652 HORIZONTAL_SECTION_COUNT I
FIELD field_20653 VERTICAL_SECTION_COUNT I
FIELD field_20654 data [Lnet/minecraft/class_1959;
METHOD <init> (Lnet/minecraft/class_1923;Lnet/minecraft/class_1966;)V
ARG 1 pos
ARG 2 source
METHOD <init> (Lnet/minecraft/class_1923;Lnet/minecraft/class_1966;[I)V
ARG 1 pos
ARG 2 source
ARG 3 rawIds
METHOD <init> (Lnet/minecraft/class_2540;)V
ARG 1 buf
METHOD <init> ([Lnet/minecraft/class_1959;)V
ARG 1 data
METHOD method_22401 toIntArray ()[I
METHOD method_22402 toPacket (Lnet/minecraft/class_2540;)V
ARG 1 buf
METHOD method_22403 copy ()Lnet/minecraft/class_4548;

1
mappings/net/minecraft/world/biome/HorizontalVoronoiBiomeAccessType.mapping Normal file
View File

@ -0,0 +1 @@
CLASS net/minecraft/class_4547 net/minecraft/world/biome/HorizontalVoronoiBiomeAccessType

4
mappings/net/minecraft/world/biome/SeedMixer.mapping Normal file
View File

@ -0,0 +1,4 @@
CLASS net/minecraft/class_4540 net/minecraft/world/biome/SeedMixer
METHOD method_22372 mixSeed (JJ)J
ARG 0 one
ARG 2 two

13
mappings/net/minecraft/world/biome/VoronoiBiomeAccessType.mapping Normal file
View File

@ -0,0 +1,13 @@
CLASS net/minecraft/class_4546 net/minecraft/world/biome/VoronoiBiomeAccessType
METHOD method_22397 sqr (D)D
ARG 0 d
METHOD method_22398 distribute (J)D
ARG 0 seed
METHOD method_22399 calcChance (JIIIDDD)D
ARG 0 seed
ARG 2 x
ARG 3 y
ARG 4 z
ARG 5 xFraction
ARG 7 yFraction
ARG 9 zFraction

3
mappings/net/minecraft/world/biome/layer/CachingLayerContext.mapping
View File

@ -8,3 +8,6 @@ CLASS net/minecraft/class_3631 net/minecraft/world/biome/layer/CachingLayerConte
ARG 1 cacheCapacity
ARG 2 seed
ARG 4 salt
METHOD method_22417 addSalt (JJ)J
ARG 0 seed
ARG 2 salt

14
mappings/net/minecraft/world/biome/source/BiomeSource.mapping
View File

@ -1,16 +1,22 @@
CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource
FIELD field_20643 biomes Ljava/util/Set;
FIELD field_9390 topMaterials Ljava/util/Set;
FIELD field_9391 SPAWN_BIOMES Ljava/util/List;
FIELD field_9392 structureFeatures Ljava/util/Map;
METHOD <init> (Ljava/util/Set;)V
ARG 1 biomes
METHOD method_8754 hasStructureFeature (Lnet/minecraft/class_3195;)Z
ARG 1 feature
METHOD method_8757 getNoiseRange (II)F
METHOD method_8759 getSpawnBiomes ()Ljava/util/List;
METHOD method_8761 getTopMaterials ()Ljava/util/Set;
METHOD method_8762 locateBiome (IIIILjava/util/List;Ljava/util/Random;)Lnet/minecraft/class_2338;
ARG 1 x
ARG 2 z
ARG 3 radius
ARG 2 y
ARG 3 z
ARG 4 radius
METHOD method_8763 getBiomesInArea (IIII)Ljava/util/Set;
ARG 1 x
ARG 2 z
ARG 3 radius
ARG 2 y
ARG 3 z
ARG 4 radius

2
mappings/net/minecraft/world/biome/source/CheckerboardBiomeSource.mapping
View File

@ -1,5 +1,5 @@
CLASS net/minecraft/class_1973 net/minecraft/world/biome/source/CheckerboardBiomeSource
FIELD field_9480 gridSize I
FIELD field_9481 biomes [Lnet/minecraft/class_1959;
FIELD field_9481 biomeArray [Lnet/minecraft/class_1959;
METHOD <init> (Lnet/minecraft/class_1976;)V
ARG 1 config

4
mappings/net/minecraft/world/biome/source/CheckerboardBiomeSourceConfig.mapping
View File

@ -1,5 +1,9 @@
CLASS net/minecraft/class_1976 net/minecraft/world/biome/source/CheckerboardBiomeSourceConfig
FIELD field_9482 size I
FIELD field_9483 biomes [Lnet/minecraft/class_1959;
METHOD method_8777 setBiomes ([Lnet/minecraft/class_1959;)Lnet/minecraft/class_1976;
ARG 1 biomes
METHOD method_8778 getSize ()I
METHOD method_8779 getBiomes ()[Lnet/minecraft/class_1959;
METHOD method_8780 setSize (I)Lnet/minecraft/class_1976;
ARG 1 size

2
mappings/net/minecraft/world/biome/source/TheEndBiomeSource.mapping
View File

@ -1,6 +1,6 @@
CLASS net/minecraft/class_2169 net/minecraft/world/biome/source/TheEndBiomeSource
FIELD field_9829 random Lnet/minecraft/class_2919;
FIELD field_9830 biomes Ljava/util/Set;
FIELD field_9830 BIOMES Ljava/util/Set;
FIELD field_9831 noise Lnet/minecraft/class_3541;
METHOD <init> (Lnet/minecraft/class_2167;)V
ARG 1 config

2
mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSource.mapping
View File

@ -1,5 +1,5 @@
CLASS net/minecraft/class_2088 net/minecraft/world/biome/source/VanillaLayeredBiomeSource
FIELD field_9677 biomes Ljava/util/Set;
FIELD field_9677 BIOMES Ljava/util/Set;
FIELD field_9680 noiseLayer Lnet/minecraft/class_3642;
METHOD <init> (Lnet/minecraft/class_2084;)V
ARG 1 config

4
mappings/net/minecraft/world/biome/source/VanillaLayeredBiomeSourceConfig.mapping
View File

@ -1,5 +1,9 @@
CLASS net/minecraft/class_2084 net/minecraft/world/biome/source/VanillaLayeredBiomeSourceConfig
FIELD field_20619 seed J
FIELD field_20620 generatorType Lnet/minecraft/class_1942;
FIELD field_9669 generatorSettings Lnet/minecraft/class_2906;
METHOD method_22355 getSeed ()J
METHOD method_22356 getGeneratorType ()Lnet/minecraft/class_1942;
METHOD method_9004 setGeneratorSettings (Lnet/minecraft/class_2906;)Lnet/minecraft/class_2084;
ARG 1 generatorSettings
METHOD method_9005 getGeneratorSettings ()Lnet/minecraft/class_2906;

4
mappings/net/minecraft/world/chunk/ChunkStatus.mapping
View File

@ -11,6 +11,7 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus
METHOD doWork (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Ljava/util/List;Lnet/minecraft/class_2791;)V
ARG 2 generator
ARG 4 chunk
CLASS class_4305 NoGenTask
FIELD field_12787 chunkType Lnet/minecraft/class_2806$class_2808;
FIELD field_12788 STATUS_TO_TARGET_GENERATION_RADIUS Lit/unimi/dsi/fastutil/ints/IntList;
FIELD field_12789 id Ljava/lang/String;
@ -22,6 +23,8 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus
FIELD field_16647 previous Lnet/minecraft/class_2806;
FIELD field_19159 PRE_CARVER_HEIGHTMAPS Ljava/util/EnumSet;
FIELD field_19160 POST_CARVER_HEIGHTMAPS Ljava/util/EnumSet;
FIELD field_19345 STATUS_BUMP_NO_GEN_TASK Lnet/minecraft/class_2806$class_4305;
FIELD field_19346 noGenTask Lnet/minecraft/class_2806$class_4305;
METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_2806;ILjava/util/EnumSet;Lnet/minecraft/class_2806$class_2808;Lnet/minecraft/class_2806$class_2807;Lnet/minecraft/class_2806$class_4305;)V
ARG 1 id
ARG 2 previous
@ -68,3 +71,4 @@ CLASS net/minecraft/class_2806 net/minecraft/world/chunk/ChunkStatus
ARG 3 heightMapTypes
ARG 4 chunkType
ARG 5 task
METHOD method_20612 runNoGenTask (Lnet/minecraft/class_3218;Lnet/minecraft/class_3485;Lnet/minecraft/class_3227;Ljava/util/function/Function;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;

1
mappings/net/minecraft/world/chunk/WorldChunk.mapping
View File

@ -23,6 +23,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk
FIELD field_12856 levelTypeProvider Ljava/util/function/Supplier;
FIELD field_12857 fluidTickScheduler Lnet/minecraft/class_1951;
FIELD field_12858 world Lnet/minecraft/class_1937;
FIELD field_20655 biomeArray Lnet/minecraft/class_4548;
METHOD <init> (Lnet/minecraft/class_1937;Lnet/minecraft/class_2839;)V
ARG 1 world
METHOD method_12023 getLightingProvider ()Lnet/minecraft/class_3568;

2
mappings/net/minecraft/world/dimension/DimensionType.mapping
View File

@ -4,6 +4,7 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType
FIELD field_13075 factory Ljava/util/function/BiFunction;
FIELD field_13077 suffix Ljava/lang/String;
FIELD field_13079 saveDir Ljava/lang/String;
FIELD field_20658 biomeAccessType Lnet/minecraft/class_4545;
METHOD <init> (ILjava/lang/String;Ljava/lang/String;Ljava/util/function/BiFunction;ZLnet/minecraft/class_4545;)V
ARG 1 dimensionId
ARG 2 suffix
@ -23,3 +24,4 @@ CLASS net/minecraft/class_2874 net/minecraft/world/dimension/DimensionType
METHOD method_12490 byRawId (I)Lnet/minecraft/class_2874;
METHOD method_12491 hasSkyLight ()Z
METHOD method_19298 deserialize (Lcom/mojang/datafixers/Dynamic;)Lnet/minecraft/class_2874;
METHOD method_22415 getBiomeAccessType ()Lnet/minecraft/class_4545;

2
mappings/net/minecraft/world/level/LevelProperties.mapping
View File

@ -166,6 +166,8 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties
METHOD method_222 isInitialized ()Z
METHOD method_223 setInitialized (Z)V
ARG 1 initialized
METHOD method_22418 sha256Hash (J)J
ARG 0 seed
METHOD method_225 setGeneratorType (Lnet/minecraft/class_1942;)V
METHOD method_226 getPlayerData ()Lnet/minecraft/class_2487;
METHOD method_227 getBorderWarningBlocks ()I