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

Merge #848 

# Conflicts:
#	mappings/net/minecraft/world/CollisionView.mapping
#	mappings/net/minecraft/world/chunk/light/LightingProvider.mapping
This commit is contained in:
modmuss50 2019-09-12 14:34:29 +01:00
parent b198b9c6ca
commit 4130e35c88
15 changed files with 142 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,8 @@ CLASS net/minecraft/class_2231 net/minecraft/block/AbstractPressurePlateBlock
FIELD field_9943 DEFAULT_SHAPE Lnet/minecraft/class_265;
METHOD <init> (Lnet/minecraft/class_2248$class_2251;)V
ARG 1 settings
METHOD canPlaceAt (Lnet/minecraft/class_2680;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z
ARG 2 world
METHOD method_9432 setRedstoneOutput (Lnet/minecraft/class_2680;I)Lnet/minecraft/class_2680;
ARG 1 state
ARG 2 rsOut

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

@ -77,7 +77,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
FIELD field_19312 FULL_CUBE_SHAPE_CACHE Lcom/google/common/cache/LoadingCache;
METHOD <init> (Lnet/minecraft/class_2248$class_2251;)V
ARG 1 settings
METHOD method_16361 isSolidMediumSquare (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z
METHOD method_16361 topCoversMediumSquare (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z
ARG 0 world
ARG 1 pos
METHOD method_16362 canSuffocate (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z
@ -94,7 +94,8 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
ARG 2 state
ARG 3 hitResult
ARG 4 entity
METHOD method_20044 isSolidSmallSquare (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z
METHOD method_20044 sideCoversSmallSquare (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z
ARG 0 world
ARG 1 pos
ARG 2 side
METHOD method_20045 isSideSolidFullSquare (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z
@ -275,6 +276,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
ARG 3 pos
METHOD method_9558 canPlaceAt (Lnet/minecraft/class_2680;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)Z
ARG 1 state
ARG 2 world
ARG 3 pos
METHOD method_9559 getStateForNeighborUpdate (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680;
ARG 1 state

54
mappings/net/minecraft/class_4538.mapping
View File

@ -1,10 +1,62 @@
CLASS net/minecraft/class_4538
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
ARG 1 pos
METHOD method_22341 isRegionLoaded (IIIIII)Z
ARG 1 minX
ARG 2 minY
ARG 3 minZ
ARG 4 maxX
ARG 5 maxY
ARG 6 maxZ
METHOD method_22342 getChunk (IILnet/minecraft/class_2806;)Lnet/minecraft/class_2791;
ARG 1 chunkX
ARG 2 chunkZ
ARG 3 status
METHOD method_22343 isRegionLoaded (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Z
ARG 1 min
ARG 2 max
METHOD method_22344 getStrongRedstonePower (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)I
ARG 1 pos
ARG 2 direction
METHOD method_22345 containsFluid (Lnet/minecraft/class_238;)Z
ARG 1 box
METHOD method_22346 getLightLevel (Lnet/minecraft/class_2338;I)I
ARG 1 pos
ARG 2 ambientDarkness
METHOD method_22347 isAir (Lnet/minecraft/class_2338;)Z
ARG 1 pos
METHOD method_22348 isSkyVisibleAllowingSea (Lnet/minecraft/class_2338;)Z
ARG 1 pos
METHOD method_22349 getBrightness (Lnet/minecraft/class_2338;)F
ARG 1 pos
METHOD method_22350 getChunk (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2791;
ARG 1 pos
METHOD method_22351 isWater (Lnet/minecraft/class_2338;)Z
ARG 1 pos
METHOD method_8392 getChunk (II)Lnet/minecraft/class_2791;
ARG 1 chunkX
ARG 2 chunkZ
METHOD method_8393 isChunkLoaded (II)Z
ARG 1 chunkX
ARG 2 chunkZ
METHOD method_8402 getChunk (IILnet/minecraft/class_2806;Z)Lnet/minecraft/class_2791;
ARG 1 chunkX
ARG 2 chunkZ
ARG 3 leastStatus
ARG 4 create
METHOD method_8594 getAmbientDarkness ()I
METHOD method_8597 getDimension ()Lnet/minecraft/class_2869;
METHOD method_8598 getTopPosition (Lnet/minecraft/class_2902$class_2903;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338;
ARG 1 heightmap
ARG 2 pos
METHOD method_8608 isClient ()Z
METHOD method_8615 getSeaLevel ()I
METHOD method_8624 getLightLevel (Lnet/minecraft/class_2902$class_2903;II)I
METHOD method_8624 getTopY (Lnet/minecraft/class_2902$class_2903;II)I
ARG 1 heightmap
ARG 2 x
ARG 3 z

8
mappings/net/minecraft/server/world/SecondaryServerWorld.mapping
View File

@ -1 +1,9 @@
CLASS net/minecraft/class_3202 net/minecraft/server/world/SecondaryServerWorld
METHOD <init> (Lnet/minecraft/class_3218;Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_29;Lnet/minecraft/class_2874;Lnet/minecraft/class_3695;Lnet/minecraft/class_3949;)V
ARG 1 world
ARG 2 server
ARG 3 workerExecutor
ARG 4 worldSaveHandler
ARG 5 dimensionType
ARG 6 profiler
ARG 7 worldGenerationProgressListener

2
mappings/net/minecraft/util/math/Box.mapping
View File

@ -44,7 +44,7 @@ CLASS net/minecraft/class_238 net/minecraft/util/math/Box
ARG 0 boxes
ARG 1 from
ARG 2 to
ARG 3 blockPos
ARG 3 pos
METHOD method_1011 contract (D)Lnet/minecraft/class_238;
ARG 1 value
METHOD method_1012 stretch (DDD)Lnet/minecraft/class_238;

17
mappings/net/minecraft/world/BlockRenderView.mapping Normal file
View File

@ -0,0 +1,17 @@
CLASS net/minecraft/class_1920 net/minecraft/world/BlockRenderView
METHOD method_22335 getLightLevel (Lnet/minecraft/class_2338;I)I
ARG 1 pos
ARG 2 ambientDarkness
METHOD method_22336 getLightingProvider ()Lnet/minecraft/class_3568;
METHOD method_22337 getLightmapIndex (Lnet/minecraft/class_2338;)I
ARG 1 pos
METHOD method_8310 getBiome (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959;
ARG 1 pos
METHOD method_8311 isSkyVisible (Lnet/minecraft/class_2338;)Z
ARG 1 pos
METHOD method_8313 getLightmapIndex (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)I
ARG 1 state
ARG 2 pos
METHOD method_8314 getLightLevel (Lnet/minecraft/class_1944;Lnet/minecraft/class_2338;)I
ARG 1 type
ARG 2 pos

9
mappings/net/minecraft/world/BlockView.mapping
View File

@ -1,7 +1,16 @@
CLASS net/minecraft/class_1922 net/minecraft/world/BlockView
METHOD method_17742 rayTrace (Lnet/minecraft/class_3959;)Lnet/minecraft/class_3965;
ARG 1 context
METHOD method_17744 rayTrace (Lnet/minecraft/class_3959;Ljava/util/function/BiFunction;Ljava/util/function/Function;)Ljava/lang/Object;
ARG 1 context
ARG 2 blockRaytracer
ARG 3 missProvider
METHOD method_17745 rayTraceBlock (Lnet/minecraft/class_243;Lnet/minecraft/class_243;Lnet/minecraft/class_2338;Lnet/minecraft/class_265;Lnet/minecraft/class_2680;)Lnet/minecraft/class_3965;
ARG 1 start
ARG 2 end
ARG 3 pos
ARG 4 shape
ARG 5 state
METHOD method_8315 getMaxLightLevel ()I
METHOD method_8316 getFluidState (Lnet/minecraft/class_2338;)Lnet/minecraft/class_3610;
ARG 1 pos

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

@ -16,6 +16,8 @@ CLASS net/minecraft/class_3233 net/minecraft/world/ChunkRegion
METHOD <init> (Lnet/minecraft/class_3218;Ljava/util/List;)V
ARG 1 world
ARG 2 chunks
METHOD getChunk (IILnet/minecraft/class_2806;Z)Lnet/minecraft/class_2791;
ARG 4 create
METHOD method_14336 getCenterChunkX ()I
METHOD method_14338 markBlockForPostProcessing (Lnet/minecraft/class_2338;)V
METHOD method_14339 getCenterChunkZ ()I

16
mappings/net/minecraft/world/ViewableWorld.mapping → mappings/net/minecraft/world/CollisionView.mapping
View File

@ -1,6 +1,8 @@
CLASS net/minecraft/class_1941 net/minecraft/world/ViewableWorld
CLASS net/minecraft/class_1941 net/minecraft/world/CollisionView
METHOD method_17892 doesNotCollide (Lnet/minecraft/class_1297;)Z
ARG 1 entity
METHOD method_18026 doesNotCollide (Lnet/minecraft/class_238;)Z
ARG 1 box
METHOD method_20743 getEntityCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/Set;)Ljava/util/stream/Stream;
ARG 1 entity
ARG 2 box
@ -8,14 +10,23 @@ CLASS net/minecraft/class_1941 net/minecraft/world/ViewableWorld
METHOD method_20812 getBlockCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Ljava/util/stream/Stream;
ARG 1 entity
ARG 2 box
METHOD method_22338 getExistingChunk (II)Lnet/minecraft/class_1922;
ARG 1 chunkX
ARG 2 chunkZ
METHOD method_8587 doesNotCollide (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)Z
ARG 1 entity
ARG 2 entityBoundingBox
ARG 2 box
METHOD method_8590 doesNotCollide (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/Set;)Z
ARG 1 entity
ARG 2 entityBoundingBox
ARG 3 otherEntities
METHOD method_8600 getCollisionShapes (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/Set;)Ljava/util/stream/Stream;
ARG 2 box
ARG 3 excluded
METHOD method_8600 getCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/Set;)Ljava/util/stream/Stream;
ARG 1 entity
ARG 2 box
ARG 3 excluded
METHOD method_8603 (Lnet/minecraft/class_2338;I)I
ARG 2 darkness
METHOD method_8606 intersectsEntities (Lnet/minecraft/class_1297;)Z
@ -27,3 +38,4 @@ CLASS net/minecraft/class_1941 net/minecraft/world/ViewableWorld
METHOD method_8628 canPlace (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_3726;)Z
ARG 1 state
ARG 2 pos
ARG 3 context

6
mappings/net/minecraft/world/ExtendedBlockView.mapping
View File

@ -1,6 +0,0 @@
CLASS net/minecraft/class_1920 net/minecraft/world/ExtendedBlockView
METHOD method_8310 getBiome (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1959;
METHOD method_8311 isSkyVisible (Lnet/minecraft/class_2338;)Z
METHOD method_8313 getLightmapIndex (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)I
METHOD method_8314 getLightLevel (Lnet/minecraft/class_1944;Lnet/minecraft/class_2338;)I
ARG 1 type

5
mappings/net/minecraft/world/IWorld.mapping
View File

@ -1,4 +1,7 @@
CLASS net/minecraft/class_1936 net/minecraft/world/IWorld
METHOD isChunkLoaded (II)Z
ARG 1 chunkX
ARG 2 chunkZ
METHOD method_20290 playLevelEvent (ILnet/minecraft/class_2338;I)V
ARG 1 eventId
ARG 3 data
@ -27,6 +30,8 @@ CLASS net/minecraft/class_1936 net/minecraft/world/IWorld
ARG 12 velocityZ
METHOD method_8407 getDifficulty ()Lnet/minecraft/class_1267;
METHOD method_8408 updateNeighbors (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V
ARG 1 pos
ARG 2 block
METHOD method_8409 getRandom ()Ljava/util/Random;
METHOD method_8410 getWorld ()Lnet/minecraft/class_1937;
METHOD method_8412 getSeed ()J

10
mappings/net/minecraft/world/ModifiableWorld.mapping
View File

@ -1,8 +1,16 @@
CLASS net/minecraft/class_1945 net/minecraft/world/ModifiableWorld
METHOD method_22352 breakBlock (Lnet/minecraft/class_2338;Z)Z
ARG 1 pos
ARG 2 drop
METHOD method_8649 spawnEntity (Lnet/minecraft/class_1297;)Z
METHOD method_8650 clearBlockState (Lnet/minecraft/class_2338;Z)Z
ARG 1 entity
METHOD method_8650 removeBlock (Lnet/minecraft/class_2338;Z)Z
ARG 1 pos
ARG 2 move
METHOD method_8651 breakBlock (Lnet/minecraft/class_2338;ZLnet/minecraft/class_1297;)Z
ARG 1 pos
ARG 2 drop
ARG 3 breakingEntity
METHOD method_8652 setBlockState (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;I)Z
ARG 1 pos
ARG 2 state

12
mappings/net/minecraft/world/BlockViewWithStructures.mapping → mappings/net/minecraft/world/StructureHolder.mapping
View File

@ -1,14 +1,14 @@
CLASS net/minecraft/class_2810 net/minecraft/world/BlockViewWithStructures
CLASS net/minecraft/class_2810 net/minecraft/world/StructureHolder
METHOD method_12179 getStructureReferences ()Ljava/util/Map;
METHOD method_12180 getStructureReferences (Ljava/lang/String;)Lit/unimi/dsi/fastutil/longs/LongSet;
ARG 1 structureId
ARG 1 structure
METHOD method_12181 getStructureStart (Ljava/lang/String;)Lnet/minecraft/class_3449;
ARG 1 structureId
ARG 1 structure
METHOD method_12182 addStructureReference (Ljava/lang/String;J)V
ARG 1 structureId
ARG 1 structure
ARG 2 reference
METHOD method_12183 setStructureReferences (Ljava/util/Map;)V
ARG 1 structureReferences
METHOD method_12184 setStructureStart (Ljava/lang/String;Lnet/minecraft/class_3449;)V
ARG 1 structureId
ARG 2 structureStart
ARG 1 structure
ARG 2 start

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

@ -29,6 +29,8 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
ARG 3 chunkManagerProvider
ARG 4 profiler
ARG 5 isClient
METHOD breakBlock (Lnet/minecraft/class_2338;ZLnet/minecraft/class_1297;)Z
ARG 2 drop
METHOD method_16107 getProfiler ()Lnet/minecraft/class_3695;
METHOD method_16109 scheduleBlockRender (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)V
METHOD method_17452 addImportantParticle (Lnet/minecraft/class_2394;ZDDDDDD)V
@ -144,7 +146,8 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
ARG 2 block
METHOD method_8476 isHeightInvalid (I)Z
ARG 0 y
METHOD method_8477 isHeightValidAndBlockLoaded (Lnet/minecraft/class_2338;)Z
METHOD method_8477 canSetBlock (Lnet/minecraft/class_2338;)Z
ARG 1 pos
METHOD method_8478 getThunderGradient (F)F
METHOD method_8479 isReceivingRedstonePower (Lnet/minecraft/class_2338;)Z
METHOD method_8480 hasHighHumidity (Lnet/minecraft/class_2338;)Z
@ -156,8 +159,9 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
ARG 7 sound
METHOD method_8488 getReceivedStrongRedstonePower (Lnet/minecraft/class_2338;)I
METHOD method_8492 updateNeighbor (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;Lnet/minecraft/class_2338;)V
ARG 1 pos
ARG 1 sourcePos
ARG 2 sourceBlock
ARG 3 neighborPos
METHOD method_8494 addImportantParticle (Lnet/minecraft/class_2394;DDDDDD)V
ARG 1 parameters
ARG 2 x
@ -186,7 +190,9 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
METHOD method_8510 getTime ()J
METHOD method_8513 setDefaultSpawnClient ()V
METHOD method_8514 getTagManager ()Lnet/minecraft/class_3505;
METHOD method_8515 doesBlockHaveSolidTopSurface (Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;)Z
METHOD method_8515 isTopSolid (Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;)Z
ARG 1 pos
ARG 2 entity
METHOD method_8516 setTime (J)V
ARG 1 time
METHOD method_8517 setBlockBreakingProgress (ILnet/minecraft/class_2338;I)V

3
mappings/net/minecraft/world/chunk/light/LightingProvider.mapping
View File

@ -28,3 +28,6 @@ CLASS net/minecraft/class_3568 net/minecraft/world/chunk/light/LightingProvider
METHOD method_20601 setRetainData (Lnet/minecraft/class_1923;Z)V
ARG 1 pos
ARG 2 retainData
METHOD method_22363 getLight (Lnet/minecraft/class_2338;I)I
ARG 1 pos
ARG 2 ambientDarkness