diff --git a/README.md b/README.md index 2479ada78c..91663a7ff2 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ Yarn is a set of open, unencumbered Minecraft mappings, free for everyone to use under the Creative Commons Zero license. The intention is to let everyone mod Minecraft freely and openly, while also being able to innovate and process the mappings as they see fit. -To see the current version being targetted, check the branch name! +To see the current version being targeted, check the branch name! ## Usage To use yarn-deobfuscated Minecraft for Minecraft modding or as a dependency in a Java project, you can use [loom](https://github.com/fabricmc/fabric-loom) Gradle plugin. See [fabric wiki tutorial](https://fabricmc.net/wiki/tutorial:setup) for more information. diff --git a/mappings/net/minecraft/class_4703.mapping b/mappings/net/minecraft/class_4703.mapping deleted file mode 100644 index 2e5ddd6673..0000000000 --- a/mappings/net/minecraft/class_4703.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_4703 diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index ac8bc20351..61a6c43fbb 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -40,6 +40,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1727 soundManager Lnet/minecraft/class_1144; FIELD field_1728 renderTickCounter Lnet/minecraft/class_317; FIELD field_1729 mouse Lnet/minecraft/class_312; + FIELD field_1730 chunkCullingEnabled Z FIELD field_1731 entityRenderManager Lnet/minecraft/class_898; FIELD field_1732 creativeHotbarStorage Lnet/minecraft/class_302; FIELD field_1733 searchManager Lnet/minecraft/class_1124; diff --git a/mappings/net/minecraft/client/network/packet/CustomPayloadS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/CustomPayloadS2CPacket.mapping index 418329efda..63ce2f4bae 100644 --- a/mappings/net/minecraft/client/network/packet/CustomPayloadS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/CustomPayloadS2CPacket.mapping @@ -16,6 +16,8 @@ CLASS net/minecraft/class_2658 net/minecraft/client/network/packet/CustomPayload FIELD field_19331 DEBUG_RAIDS Lnet/minecraft/class_2960; FIELD field_20599 DEBUG_GAME_TEST_ADD_MARKER Lnet/minecraft/class_2960; FIELD field_20600 DEBUG_GAME_TEST_CLEAR Lnet/minecraft/class_2960; + FIELD field_21559 DEBUG_BEE Lnet/minecraft/class_2960; + FIELD field_21560 DEBUG_HIVE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2540;)V ARG 1 channel ARG 2 data diff --git a/mappings/net/minecraft/client/render/RenderLayer.mapping b/mappings/net/minecraft/client/render/RenderLayer.mapping index 03a4d0b018..5d470a2daf 100644 --- a/mappings/net/minecraft/client/render/RenderLayer.mapping +++ b/mappings/net/minecraft/client/render/RenderLayer.mapping @@ -1,13 +1,27 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer CLASS class_4687 MultiPhase - CLASS class_4721 HashStrategy - FIELD field_21403 data Lnet/minecraft/class_1921$class_4688; + FIELD field_21403 phases Lnet/minecraft/class_1921$class_4688; FIELD field_21404 hash I FIELD field_21696 CACHE Lit/unimi/dsi/fastutil/objects/ObjectOpenCustomHashSet; FIELD field_21697 texture Ljava/util/Optional; + METHOD (Ljava/lang/String;Lnet/minecraft/class_293;IIZZLnet/minecraft/class_1921$class_4688;)V + ARG 1 name + ARG 2 vertexFormat + ARG 3 drawMode + ARG 4 expectedBufferSize + ARG 5 hasCrumbling + ARG 6 translucent + ARG 7 phases METHOD method_24055 of (Ljava/lang/String;Lnet/minecraft/class_293;IIZZLnet/minecraft/class_1921$class_4688;)Lnet/minecraft/class_1921$class_4687; - CLASS class_4688 MultiPhaseData - CLASS class_4689 MultiPhaseDataBuilder + ARG 0 name + ARG 1 vertexFormat + ARG 2 drawMode + ARG 3 expectedBufferSize + ARG 4 hasCrumbling + ARG 5 translucent + ARG 6 phases + CLASS class_4688 PhaseData + CLASS class_4689 Builder FIELD field_21423 texture Lnet/minecraft/class_4668$class_4683; FIELD field_21424 transparency Lnet/minecraft/class_4668$class_4685; FIELD field_21425 diffuseLighting Lnet/minecraft/class_4668$class_4673; @@ -24,20 +38,35 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer FIELD field_21436 writeMaskState Lnet/minecraft/class_4668$class_4686; FIELD field_21437 lineWidth Lnet/minecraft/class_4668$class_4677; METHOD method_23602 alpha (Lnet/minecraft/class_4668$class_4669;)Lnet/minecraft/class_1921$class_4688$class_4689; + ARG 1 alpha METHOD method_23603 cull (Lnet/minecraft/class_4668$class_4671;)Lnet/minecraft/class_1921$class_4688$class_4689; + ARG 1 cull METHOD method_23604 depthTest (Lnet/minecraft/class_4668$class_4672;)Lnet/minecraft/class_1921$class_4688$class_4689; + ARG 1 depthTest METHOD method_23605 diffuseLighting (Lnet/minecraft/class_4668$class_4673;)Lnet/minecraft/class_1921$class_4688$class_4689; + ARG 1 diffuseLighting METHOD method_23606 fog (Lnet/minecraft/class_4668$class_4674;)Lnet/minecraft/class_1921$class_4688$class_4689; + ARG 1 fog METHOD method_23607 layering (Lnet/minecraft/class_4668$class_4675;)Lnet/minecraft/class_1921$class_4688$class_4689; + ARG 1 layering METHOD method_23608 lightmap (Lnet/minecraft/class_4668$class_4676;)Lnet/minecraft/class_1921$class_4688$class_4689; + ARG 1 lightmap METHOD method_23609 lineWidth (Lnet/minecraft/class_4668$class_4677;)Lnet/minecraft/class_1921$class_4688$class_4689; + ARG 1 lineWidth METHOD method_23610 target (Lnet/minecraft/class_4668$class_4678;)Lnet/minecraft/class_1921$class_4688$class_4689; + ARG 1 target METHOD method_23611 overlay (Lnet/minecraft/class_4668$class_4679;)Lnet/minecraft/class_1921$class_4688$class_4689; + ARG 1 overlay METHOD method_23612 shadeModel (Lnet/minecraft/class_4668$class_4681;)Lnet/minecraft/class_1921$class_4688$class_4689; + ARG 1 shadeModel METHOD method_23613 texture (Lnet/minecraft/class_4668$class_4683;)Lnet/minecraft/class_1921$class_4688$class_4689; + ARG 1 texture METHOD method_23614 texturing (Lnet/minecraft/class_4668$class_4684;)Lnet/minecraft/class_1921$class_4688$class_4689; + ARG 1 texturing METHOD method_23615 transparency (Lnet/minecraft/class_4668$class_4685;)Lnet/minecraft/class_1921$class_4688$class_4689; + ARG 1 transparency METHOD method_23616 writeMaskState (Lnet/minecraft/class_4668$class_4686;)Lnet/minecraft/class_1921$class_4688$class_4689; + ARG 1 writeMaskState METHOD method_23617 build (Z)Lnet/minecraft/class_1921$class_4688; ARG 1 textured FIELD field_21406 texture Lnet/minecraft/class_4668$class_4683; @@ -56,8 +85,23 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer FIELD field_21419 writeMaskState Lnet/minecraft/class_4668$class_4686; FIELD field_21420 lineWidth Lnet/minecraft/class_4668$class_4677; FIELD field_21421 textured Z - FIELD field_21422 components Lcom/google/common/collect/ImmutableList; + FIELD field_21422 phases Lcom/google/common/collect/ImmutableList; METHOD (Lnet/minecraft/class_4668$class_4683;Lnet/minecraft/class_4668$class_4685;Lnet/minecraft/class_4668$class_4673;Lnet/minecraft/class_4668$class_4681;Lnet/minecraft/class_4668$class_4669;Lnet/minecraft/class_4668$class_4672;Lnet/minecraft/class_4668$class_4671;Lnet/minecraft/class_4668$class_4676;Lnet/minecraft/class_4668$class_4679;Lnet/minecraft/class_4668$class_4674;Lnet/minecraft/class_4668$class_4675;Lnet/minecraft/class_4668$class_4678;Lnet/minecraft/class_4668$class_4684;Lnet/minecraft/class_4668$class_4686;Lnet/minecraft/class_4668$class_4677;Z)V + ARG 1 texture + ARG 2 transparency + ARG 3 diffuseLighting + ARG 4 shadeModel + ARG 5 alpha + ARG 6 depthTest + ARG 7 cull + ARG 8 lightmap + ARG 9 overlay + ARG 10 fog + ARG 11 layering + ARG 12 target + ARG 13 texturing + ARG 14 writeMaskState + ARG 15 lineWidth ARG 16 textured METHOD method_23598 builder ()Lnet/minecraft/class_1921$class_4688$class_4689; FIELD field_20806 expectedBufferSize I @@ -68,7 +112,8 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer FIELD field_20970 LIGHTNING Lnet/minecraft/class_1921; FIELD field_20972 vertexFormat Lnet/minecraft/class_293; FIELD field_20973 drawMode I - FIELD field_21402 sortQuads Z + FIELD field_20975 hasCrumbling Z + FIELD field_21402 translucent Z FIELD field_9174 CUTOUT Lnet/minecraft/class_1921; FIELD field_9175 CUTOUT_MIPPED Lnet/minecraft/class_1921; FIELD field_9178 SOLID Lnet/minecraft/class_1921; @@ -78,12 +123,17 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer ARG 2 vertexFormat ARG 3 drawMode ARG 4 expectedBufferSize - ARG 6 sortQuads + ARG 5 hasCrumbling + ARG 6 translucent ARG 7 startAction ARG 8 endAction METHOD method_22720 getBlockLayers ()Ljava/util/List; METHOD method_22722 getExpectedBufferSize ()I METHOD method_23012 draw (Lnet/minecraft/class_287;III)V + ARG 1 buffer + ARG 2 cameraX + ARG 3 cameraY + ARG 4 cameraZ METHOD method_23018 getEnergySwirl (Lnet/minecraft/class_2960;FF)Lnet/minecraft/class_1921; ARG 0 texture ARG 1 x @@ -96,10 +146,11 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer ARG 0 texture METHOD method_23031 getVertexFormat ()Lnet/minecraft/class_293; METHOD method_23033 getDrawMode ()I + METHOD method_23037 hasCrumbling ()Z METHOD method_23287 getOutline (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; ARG 0 texture METHOD method_23289 getTexture ()Ljava/util/Optional; - METHOD method_23570 getBlockBreaking (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; + METHOD method_23570 getCrumbling (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; ARG 0 texture METHOD method_23572 getEntitySolid (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; ARG 0 texture @@ -137,5 +188,17 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer METHOD method_23689 getEntityTranslucentCull (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; ARG 0 texture METHOD method_24048 of (Ljava/lang/String;Lnet/minecraft/class_293;IILnet/minecraft/class_1921$class_4688;)Lnet/minecraft/class_1921$class_4687; + ARG 0 name + ARG 1 vertexFormat + ARG 2 drawMode + ARG 3 expectedBufferSize + ARG 4 phaseData METHOD method_24049 of (Ljava/lang/String;Lnet/minecraft/class_293;IIZZLnet/minecraft/class_1921$class_4688;)Lnet/minecraft/class_1921$class_4687; + ARG 0 name + ARG 1 vertexFormat + ARG 2 drawMode + ARG 3 expectedBufferSize + ARG 4 hasCrumbling + ARG 5 translucent + ARG 6 phases METHOD method_24051 createTranslucentPhaseData ()Lnet/minecraft/class_1921$class_4688; diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 56f075c1fd..7b5edec97c 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer - CLASS class_762 BuiltChunkInfo + CLASS class_762 ChunkInfo FIELD field_4124 chunk Lnet/minecraft/class_846$class_851; METHOD (Lnet/minecraft/class_761;Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_2350;I)V ARG 1 renderer @@ -10,7 +10,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_20798 SNOW Lnet/minecraft/class_2960; FIELD field_20950 blockBreakingProgressions Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; FIELD field_20951 bufferBuilders Lnet/minecraft/class_4599; - FIELD field_4055 blockEntities Ljava/util/Set; + FIELD field_4055 noCullingBlockEntities Ljava/util/Set; FIELD field_4056 capturedFrustum Lnet/minecraft/class_4604; FIELD field_4057 textureManager Lnet/minecraft/class_1060; FIELD field_4058 blockBreakingInfos Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; @@ -22,14 +22,18 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_4069 lastCameraX D FIELD field_4070 lastCameraChunkUpdateZ D FIELD field_4071 FORCEFIELD Lnet/minecraft/class_2960; + FIELD field_4072 lastCloudsColor Lnet/minecraft/class_243; FIELD field_4073 ticks I FIELD field_4075 chunksToRebuild Ljava/util/Set; FIELD field_4077 needsTerrainUpdate Z + FIELD field_4080 lastCloudsRenderMode Lnet/minecraft/class_4063; FIELD field_4081 lastCameraY D + FIELD field_4082 lastCloudsBlockX I FIELD field_4083 lastTranslucentSortX D FIELD field_4084 cameraChunkX I FIELD field_4085 world Lnet/minecraft/class_638; - FIELD field_4086 chunkInfos Ljava/util/List; + FIELD field_4086 visibleChunks Ljava/util/List; + FIELD field_4087 lightSkyBuffer Lnet/minecraft/class_291; FIELD field_4088 client Lnet/minecraft/class_310; FIELD field_4089 regularEntityCount I FIELD field_4090 shouldCaptureFrustum Z @@ -37,8 +41,11 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_4094 cloudsBuffer Lnet/minecraft/class_291; FIELD field_4095 DIRECTIONS [Lnet/minecraft/class_2350; FIELD field_4096 lastCameraZ D + FIELD field_4097 lastCloudsBlockY I FIELD field_4098 MOON_PHASES Lnet/minecraft/class_2960; + FIELD field_4100 skyVertexFormat Lnet/minecraft/class_293; FIELD field_4101 entityOutlinesFramebuffer Lnet/minecraft/class_276; + FIELD field_4102 darkSkyBuffer Lnet/minecraft/class_291; FIELD field_4103 lastTranslucentSortY D FIELD field_4104 lastCameraChunkUpdateX D FIELD field_4105 cameraChunkY I @@ -48,9 +55,10 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_4109 entityRenderDispatcher Lnet/minecraft/class_898; FIELD field_4110 blockEntityCount I FIELD field_4111 SUN Lnet/minecraft/class_2960; - FIELD field_4112 renderedChunks Lnet/minecraft/class_769; + FIELD field_4112 chunks Lnet/minecraft/class_769; FIELD field_4113 starsBuffer Lnet/minecraft/class_291; FIELD field_4115 lastCameraPitch D + FIELD field_4116 lastCloudsBlockZ I FIELD field_4118 lastTranslucentSortZ D FIELD field_4119 playingSongs Ljava/util/Map; FIELD field_4120 lastCameraChunkUpdateY D @@ -77,7 +85,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 2 old ARG 3 updated METHOD method_22710 render (Lnet/minecraft/class_4587;FJZLnet/minecraft/class_4184;Lnet/minecraft/class_757;Lnet/minecraft/class_765;Lnet/minecraft/class_1159;)V - ARG 1 matrix + ARG 1 matrices ARG 2 tickDelta ARG 3 limitTime ARG 5 renderBlockOutline @@ -115,15 +123,19 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer METHOD method_23793 getLightmapCoordinates (Lnet/minecraft/class_1920;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)I METHOD method_23794 getLightmapCoordinates (Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)I METHOD method_3239 renderClouds (Lnet/minecraft/class_287;DDDLnet/minecraft/class_243;)V + ARG 1 bufferBuilder + ARG 2 x + ARG 4 y + ARG 6 z ARG 8 color - METHOD method_3241 getAdjacentChunkRenderer (Lnet/minecraft/class_2338;Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_2350;)Lnet/minecraft/class_846$class_851; + METHOD method_3241 getAdjacentChunk (Lnet/minecraft/class_2338;Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_2350;)Lnet/minecraft/class_846$class_851; ARG 1 pos - ARG 2 chunkRenderer + ARG 2 chunk ARG 3 direction METHOD method_3242 onResized (II)V METHOD method_3243 renderWorldBorder (Lnet/minecraft/class_4184;)V METHOD method_3244 setWorld (Lnet/minecraft/class_638;)V - METHOD method_3245 updateBlockEntities (Ljava/util/Collection;Ljava/util/Collection;)V + METHOD method_3245 updateNoCullingBlockEntities (Ljava/util/Collection;Ljava/util/Collection;)V ARG 1 removed ARG 2 added METHOD method_3246 getCompletedChunkCount ()I @@ -151,14 +163,20 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 15 blue ARG 16 alpha METHOD method_3259 renderClouds (Lnet/minecraft/class_4587;FDDD)V + ARG 1 matrices + ARG 2 tickDelta + ARG 3 cameraX + ARG 5 cameraY + ARG 7 cameraZ METHOD method_3262 drawBox (Lnet/minecraft/class_4588;DDDDDDFFFF)V + METHOD method_3265 renderDarkSky ()V METHOD method_3268 getRandomParticleSpawnChance (Z)Lnet/minecraft/class_4066; ARG 1 canSpawnOnMinimal METHOD method_3269 updateChunks (J)V ARG 1 limitTime METHOD method_3270 canDrawEntityOutlines ()Z METHOD method_3272 getEntitiesDebugString ()Ljava/lang/String; - METHOD method_3273 setUpTerrain (Lnet/minecraft/class_4184;Lnet/minecraft/class_4604;ZIZ)V + METHOD method_3273 setupTerrain (Lnet/minecraft/class_4184;Lnet/minecraft/class_4604;ZIZ)V ARG 1 camera ARG 2 frustum ARG 3 hasForcedFrustum @@ -178,6 +196,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 8 velocityX ARG 10 velocityY ARG 12 velocityZ + METHOD method_3277 renderLightSky ()V METHOD method_3279 reload ()V METHOD method_3280 clearChunkRenderers ()V METHOD method_3281 isTerrainRenderComplete ()Z @@ -190,10 +209,10 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 9 velocityX ARG 11 velocityY ARG 13 velocityZ - METHOD method_3283 (Lnet/minecraft/class_287;FZ)V + METHOD method_3283 renderSkyHalf (Lnet/minecraft/class_287;FZ)V ARG 1 buffer ARG 2 y - ARG 3 flipX + ARG 3 bottom METHOD method_3285 getOpenChunkFaces (Lnet/minecraft/class_2338;)Ljava/util/Set; ARG 1 pos METHOD method_3288 spawnParticle (Lnet/minecraft/class_2394;ZZDDDDDD)Lnet/minecraft/class_703; diff --git a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderer.mapping index 554a04b6f9..5dc912e5b8 100644 --- a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderer.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/class_827 net/minecraft/client/render/block/entity/BlockEntityRenderer FIELD field_20989 blockEntityRenderDispatcher Lnet/minecraft/class_824; + METHOD method_3563 rendersOutsideBoundingBox (Lnet/minecraft/class_2586;)Z + ARG 1 blockEntity METHOD method_3569 render (Lnet/minecraft/class_2586;FLnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)V ARG 1 blockEntity diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping index da911ed7f3..afa2293653 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder CLASS class_849 ChunkData - FIELD field_4450 nonEmpty Ljava/util/Set; + FIELD field_4450 nonEmptyLayers Ljava/util/Set; FIELD field_4451 EMPTY Lnet/minecraft/class_846$class_849; - FIELD field_4452 initialized Ljava/util/Set; + FIELD field_4452 initializedLayers Ljava/util/Set; FIELD field_4453 bufferState Lnet/minecraft/class_287$class_288; FIELD field_4454 empty Z FIELD field_4455 occlusionGraph Lnet/minecraft/class_854; @@ -14,15 +14,35 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder METHOD method_3650 isVisibleThrough (Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;)Z CLASS class_851 BuiltChunk CLASS class_4577 Task - FIELD field_20835 priority D + FIELD field_20835 distance D FIELD field_20836 cancelled Ljava/util/concurrent/atomic/AtomicBoolean; + METHOD (D)V + ARG 1 distance + METHOD compareTo (Lnet/minecraft/class_846$class_851$class_4577;)I + ARG 1 task METHOD method_22782 cancel ()V METHOD method_22783 run (Lnet/minecraft/class_750;)Ljava/util/concurrent/CompletableFuture; ARG 1 buffers CLASS class_4578 RebuildTask FIELD field_20838 region Lnet/minecraft/class_853; + METHOD (DLnet/minecraft/class_853;)V + ARG 1 distance + ARG 3 region + METHOD method_22785 render (FFFLnet/minecraft/class_846$class_849;Lnet/minecraft/class_750;)Ljava/util/Set; + ARG 1 cameraX + ARG 2 cameraY + ARG 3 cameraZ + ARG 4 data + ARG 5 buffers + METHOD method_23087 addBlockEntity (Lnet/minecraft/class_846$class_849;Ljava/util/Set;Lnet/minecraft/class_2586;)V + ARG 1 data + ARG 2 blockEntities + ARG 3 blockEntity CLASS class_4579 SortTask FIELD field_20841 data Lnet/minecraft/class_846$class_849; + METHOD (DLnet/minecraft/class_846$class_849;)V + ARG 1 distance + ARG 3 data FIELD field_20834 rebuildTask Lnet/minecraft/class_846$class_851$class_4578; FIELD field_4457 blockEntities Ljava/util/Set; FIELD field_4458 boundingBox Lnet/minecraft/class_238; @@ -39,6 +59,8 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder ARG 2 chunkRenderer METHOD method_22777 scheduleRebuild (Lnet/minecraft/class_846;)V ARG 1 chunkRenderer + METHOD method_22778 setNoCullingBlockEntities (Ljava/util/Set;)V + ARG 1 noCullingBlockEntities METHOD method_22781 rebuild ()V METHOD method_3651 isChunkNonEmpty (Lnet/minecraft/class_2338;)Z ARG 1 pos diff --git a/mappings/net/minecraft/client/render/chunk/ChunkOcclusionGraph.mapping b/mappings/net/minecraft/client/render/chunk/ChunkOcclusionData.mapping similarity index 96% rename from mappings/net/minecraft/client/render/chunk/ChunkOcclusionGraph.mapping rename to mappings/net/minecraft/client/render/chunk/ChunkOcclusionData.mapping index aa1d65d2e7..f6a1748366 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkOcclusionGraph.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkOcclusionData.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_854 net/minecraft/client/render/chunk/ChunkOcclusionGraph +CLASS net/minecraft/class_854 net/minecraft/client/render/chunk/ChunkOcclusionData FIELD field_4491 DIRECTION_COUNT I FIELD field_4492 visibility Ljava/util/BitSet; METHOD method_3692 setVisibleThrough (Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;Z)V diff --git a/mappings/net/minecraft/client/render/chunk/ChunkOcclusionGraphBuilder.mapping b/mappings/net/minecraft/client/render/chunk/ChunkOcclusionDataBuilder.mapping similarity index 96% rename from mappings/net/minecraft/client/render/chunk/ChunkOcclusionGraphBuilder.mapping rename to mappings/net/minecraft/client/render/chunk/ChunkOcclusionDataBuilder.mapping index 373bf25a5a..c3aaa69c78 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkOcclusionGraphBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkOcclusionDataBuilder.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_852 net/minecraft/client/render/chunk/ChunkOcclusionGraphBuilder +CLASS net/minecraft/class_852 net/minecraft/client/render/chunk/ChunkOcclusionDataBuilder FIELD field_4473 openCount I FIELD field_4474 EDGE_POINTS [I FIELD field_4475 STEP_Y I diff --git a/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping new file mode 100644 index 0000000000..8cceb62de8 --- /dev/null +++ b/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping @@ -0,0 +1,106 @@ +CLASS net/minecraft/class_4703 net/minecraft/client/render/debug/BeeDebugRenderer + CLASS class_4704 Bee + FIELD field_21536 uuid Ljava/util/UUID; + FIELD field_21537 id I + FIELD field_21538 pos Lnet/minecraft/class_2374; + FIELD field_21539 path Lnet/minecraft/class_11; + FIELD field_21540 hivePos Lnet/minecraft/class_2338; + FIELD field_21541 flowerPos Lnet/minecraft/class_2338; + FIELD field_21733 travellingTicks I + FIELD field_21734 blacklistedHives Ljava/util/Set; + METHOD (Ljava/util/UUID;ILnet/minecraft/class_2374;Lnet/minecraft/class_11;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;I)V + ARG 1 uuid + ARG 2 id + ARG 3 pos + ARG 4 path + ARG 5 hivePos + ARG 6 flowerPos + ARG 7 travellingTicks + METHOD method_23833 getUuid ()Ljava/util/UUID; + METHOD method_23834 isHive (Lnet/minecraft/class_2338;)Z + ARG 1 pos + METHOD method_23835 getName ()Ljava/lang/String; + METHOD method_23836 hasFlower ()Z + CLASS class_4705 Hive + FIELD field_21543 pos Lnet/minecraft/class_2338; + FIELD field_21545 beeCount I + FIELD field_21546 time J + FIELD field_21625 honeyLevel I + FIELD field_21626 sedated Z + METHOD (Lnet/minecraft/class_2338;Ljava/lang/String;IIZJ)V + ARG 1 pos + ARG 3 beeCount + ARG 4 honeyLevel + ARG 5 sedated + ARG 6 time + FIELD field_21532 client Lnet/minecraft/class_310; + FIELD field_21533 hives Ljava/util/Map; + FIELD field_21534 bees Ljava/util/Map; + FIELD field_21535 targetedEntity Ljava/util/UUID; + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client + METHOD method_23805 addBee (Lnet/minecraft/class_4703$class_4704;)V + ARG 1 bee + METHOD method_23806 getPositionString (Lnet/minecraft/class_4703$class_4704;Lnet/minecraft/class_2338;)Ljava/lang/String; + ARG 1 bee + ARG 2 pos + METHOD method_23807 addHive (Lnet/minecraft/class_4703$class_4705;)V + ARG 1 hive + METHOD method_23808 drawHive (Lnet/minecraft/class_2338;)V + ARG 0 pos + METHOD method_23809 drawBox (Lnet/minecraft/class_2338;FFFFF)V + ARG 0 pos + ARG 1 expand + ARG 2 red + ARG 3 green + ARG 4 blue + ARG 5 alpha + METHOD method_23813 drawHiveBees (Lnet/minecraft/class_2338;Ljava/util/List;)V + ARG 1 pos + ARG 2 bees + METHOD method_23814 drawString (Lnet/minecraft/class_2374;ILjava/lang/String;IF)V + ARG 0 pos + ARG 1 line + ARG 2 string + ARG 3 color + ARG 4 size + METHOD method_23815 drawString (Ljava/lang/String;Lnet/minecraft/class_4703$class_4705;II)V + ARG 0 string + ARG 1 hive + ARG 2 line + ARG 3 color + METHOD method_23816 drawString (Ljava/lang/String;Lnet/minecraft/class_2338;II)V + ARG 0 string + ARG 1 pos + ARG 2 line + ARG 3 color + METHOD method_23819 removeOutdatedHives ()V + METHOD method_23820 drawPath (Lnet/minecraft/class_4703$class_4704;)V + ARG 1 bee + METHOD method_23821 drawHiveInfo (Lnet/minecraft/class_4703$class_4705;Ljava/util/Collection;)V + ARG 1 hive + ARG 2 blacklistingBees + METHOD method_23822 getBeesForHive (Lnet/minecraft/class_2338;)Ljava/util/Collection; + ARG 1 hivePos + METHOD method_23823 render ()V + METHOD method_23824 drawBee (Lnet/minecraft/class_4703$class_4704;)V + ARG 1 bee + METHOD method_23825 toString (Ljava/util/Collection;)Ljava/lang/String; + ARG 0 bees + METHOD method_23826 drawFlowers ()V + METHOD method_23827 isTargeted (Lnet/minecraft/class_4703$class_4704;)Z + ARG 1 bee + METHOD method_23828 getCameraPos ()Lnet/minecraft/class_4184; + METHOD method_23829 isInRange (Lnet/minecraft/class_4703$class_4704;)Z + ARG 1 bee + METHOD method_23830 getBeesByHive ()Ljava/util/Map; + METHOD method_23832 updateTargetedEntity ()V + METHOD method_23952 removeInvalidBees ()V + METHOD method_24081 addToMap (Ljava/util/Map;Lnet/minecraft/class_4703$class_4704;Lnet/minecraft/class_2338;)V + ARG 0 map + ARG 1 arg + ARG 2 pos + METHOD method_24084 getBlacklistingBees ()Ljava/util/Map; + METHOD render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;DDD)V + ARG 1 matrices + ARG 2 vertexConsumer diff --git a/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping index f61f1b05f8..7596a10bbc 100644 --- a/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping @@ -2,10 +2,16 @@ CLASS net/minecraft/class_863 net/minecraft/client/render/debug/DebugRenderer CLASS class_864 Renderer METHOD method_20414 clear ()V METHOD method_23109 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;DDD)V + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 cameraX + ARG 5 cameraY + ARG 7 cameraZ FIELD field_18777 villageDebugRenderer Lnet/minecraft/class_4207; FIELD field_18778 goalSelectorDebugRenderer Lnet/minecraft/class_4205; FIELD field_19325 raidCenterDebugRenderer Lnet/minecraft/class_4304; FIELD field_20519 gameTestDebugRenderer Lnet/minecraft/class_4503; + FIELD field_21547 beeDebugRenderer Lnet/minecraft/class_4703; FIELD field_4517 blockOutlineDebugRenderer Lnet/minecraft/class_863$class_864; FIELD field_4523 pathfindingDebugRenderer Lnet/minecraft/class_868; FIELD field_4528 waterDebugRenderer Lnet/minecraft/class_863$class_864; @@ -34,7 +40,12 @@ CLASS net/minecraft/class_863 net/minecraft/client/render/debug/DebugRenderer ARG 14 blue ARG 15 alpha METHOD method_23099 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597$class_4598;DDD)V - METHOD method_23101 getTargettedEntity (Lnet/minecraft/class_1297;I)Ljava/util/Optional; + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 cameraX + ARG 5 cameraY + ARG 7 cameraZ + METHOD method_23101 getTargetedEntity (Lnet/minecraft/class_1297;I)Ljava/util/Optional; ARG 0 entity ARG 1 maxDistance METHOD method_23102 drawBox (Lnet/minecraft/class_238;FFFF)V diff --git a/mappings/net/minecraft/client/render/debug/VillagerNamer.mapping b/mappings/net/minecraft/client/render/debug/NameGenerator.mapping similarity index 96% rename from mappings/net/minecraft/client/render/debug/VillagerNamer.mapping rename to mappings/net/minecraft/client/render/debug/NameGenerator.mapping index a6c09f8cff..cf341cde23 100644 --- a/mappings/net/minecraft/client/render/debug/VillagerNamer.mapping +++ b/mappings/net/minecraft/client/render/debug/NameGenerator.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4617 net/minecraft/client/render/debug/VillagerNamer +CLASS net/minecraft/class_4617 net/minecraft/client/render/debug/NameGenerator FIELD field_21050 PREFIX [Ljava/lang/String; FIELD field_21051 SUFFIX [Ljava/lang/String; METHOD method_23266 getRandom (Ljava/util/Random;[Ljava/lang/String;)Ljava/lang/String; diff --git a/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping index 95d5a5073c..776b4627e0 100644 --- a/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_4207 net/minecraft/client/render/debug/VillageDebugRen FIELD field_18788 sections Ljava/util/Set; FIELD field_18920 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_18921 brains Ljava/util/Map; - FIELD field_18922 targettedEntity Ljava/util/UUID; + FIELD field_18922 targetedEntity Ljava/util/UUID; METHOD method_19432 addBrain (Lnet/minecraft/class_4207$class_4232;)V ARG 1 brain METHOD method_19433 addSection (Lnet/minecraft/class_4076;)V @@ -58,6 +58,6 @@ CLASS net/minecraft/class_4207 net/minecraft/client/render/debug/VillageDebugRen METHOD method_23141 getVillagerNames (Lnet/minecraft/class_4207$class_4233;)Ljava/util/Set; ARG 1 pointOfInterest METHOD method_23144 getGhostPointsOfInterest ()Ljava/util/Map; - METHOD method_23145 isTargetted (Lnet/minecraft/class_4207$class_4232;)Z + METHOD method_23145 isTargeted (Lnet/minecraft/class_4207$class_4232;)Z ARG 1 brain - METHOD method_23146 updateTargettedEntity ()V + METHOD method_23146 updateTargetedEntity ()V diff --git a/mappings/net/minecraft/client/resource/FoliageColormapResourceSupplier.mapping b/mappings/net/minecraft/client/resource/FoliageColormapResourceSupplier.mapping index d0bb873a09..e9c7330de6 100644 --- a/mappings/net/minecraft/client/resource/FoliageColormapResourceSupplier.mapping +++ b/mappings/net/minecraft/client/resource/FoliageColormapResourceSupplier.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/class_1070 net/minecraft/client/resource/FoliageColormapResourceSupplier - FIELD field_5303 FOLIAGE_COLORMAP_LOC Lnet/minecraft/class_2960; - METHOD method_18660 (Lnet/minecraft/class_3300;Lnet/minecraft/class_3695;)[I + FIELD field_5303 FOLIAGE_COLORMAP Lnet/minecraft/class_2960; + METHOD method_18660 reload (Lnet/minecraft/class_3300;Lnet/minecraft/class_3695;)[I ARG 1 resourceManager diff --git a/mappings/net/minecraft/client/world/ClientWorld.mapping b/mappings/net/minecraft/client/world/ClientWorld.mapping index d47a8b3ef0..472181ce61 100644 --- a/mappings/net/minecraft/client/world/ClientWorld.mapping +++ b/mappings/net/minecraft/client/world/ClientWorld.mapping @@ -41,8 +41,16 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld ARG 2 passenger METHOD method_18648 checkChunk (Lnet/minecraft/class_1297;)V ARG 1 entity + METHOD method_23780 calculateColor (Lnet/minecraft/class_2338;Lnet/minecraft/world/level/ColorResolver;)I + ARG 1 pos + ARG 2 colorResolver METHOD method_23782 resetChunkColor (II)V METHOD method_23784 reloadColor ()V + METHOD method_23785 getCloudsColor (F)Lnet/minecraft/class_243; + ARG 1 tickDelta + METHOD method_23786 getFogColor (F)Lnet/minecraft/class_243; + ARG 1 tickDelta + METHOD method_23788 getSkyDarknessHeight ()D METHOD method_23789 getLightningTicksLeft ()I METHOD method_2932 addParticle (DDDDDLnet/minecraft/class_2394;)V ARG 1 minX diff --git a/mappings/net/minecraft/entity/passive/BeeEntity.mapping b/mappings/net/minecraft/entity/passive/BeeEntity.mapping index 28855066e8..184debefd2 100644 --- a/mappings/net/minecraft/entity/passive/BeeEntity.mapping +++ b/mappings/net/minecraft/entity/passive/BeeEntity.mapping @@ -66,7 +66,7 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity FIELD field_20360 cannotEnterHiveTicks I FIELD field_20361 cropsGrownSincePollination I FIELD field_20362 flowerPos Lnet/minecraft/class_2338; - FIELD field_20363 chosenHive Lnet/minecraft/class_2338; + FIELD field_20363 hivePos Lnet/minecraft/class_2338; FIELD field_21079 pollinateGoal Lnet/minecraft/class_4466$class_4478; FIELD field_21509 ticksInsideWater I FIELD field_21643 ticksLeftToFindHive I diff --git a/mappings/net/minecraft/util/math/Vec3i.mapping b/mappings/net/minecraft/util/math/Vec3i.mapping index b09ca0b170..3272369810 100644 --- a/mappings/net/minecraft/util/math/Vec3i.mapping +++ b/mappings/net/minecraft/util/math/Vec3i.mapping @@ -37,3 +37,4 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i METHOD method_23226 offset (Lnet/minecraft/class_2350;I)Lnet/minecraft/class_2382; METHOD method_23227 down (I)Lnet/minecraft/class_2382; METHOD method_23228 down ()Lnet/minecraft/class_2382; + METHOD method_23854 toShortString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/world/BlockRenderView.mapping b/mappings/net/minecraft/world/BlockRenderView.mapping index 3a335e5ff0..2b319187b0 100644 --- a/mappings/net/minecraft/world/BlockRenderView.mapping +++ b/mappings/net/minecraft/world/BlockRenderView.mapping @@ -3,6 +3,9 @@ CLASS net/minecraft/class_1920 net/minecraft/world/BlockRenderView ARG 1 pos ARG 2 ambientDarkness METHOD method_22336 getLightingProvider ()Lnet/minecraft/class_3568; + METHOD method_23752 getColor (Lnet/minecraft/class_2338;Lnet/minecraft/world/level/ColorResolver;)I + ARG 1 pos + ARG 2 colorResolver METHOD method_8311 isSkyVisible (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_8314 getLightLevel (Lnet/minecraft/class_1944;Lnet/minecraft/class_2338;)I diff --git a/mappings/net/minecraft/world/IWorld.mapping b/mappings/net/minecraft/world/IWorld.mapping index 1dec559c95..fd03651da2 100644 --- a/mappings/net/minecraft/world/IWorld.mapping +++ b/mappings/net/minecraft/world/IWorld.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_1936 net/minecraft/world/IWorld METHOD method_8397 getBlockTickScheduler ()Lnet/minecraft/class_1951; METHOD method_8398 getChunkManager ()Lnet/minecraft/class_2802; METHOD method_8400 getSkyAngle (F)F - ARG 1 delta + ARG 1 tickDelta METHOD method_8401 getLevelProperties ()Lnet/minecraft/class_31; METHOD method_8404 getLocalDifficulty (Lnet/minecraft/class_2338;)Lnet/minecraft/class_1266; ARG 1 pos diff --git a/mappings/net/minecraft/world/dimension/Dimension.mapping b/mappings/net/minecraft/world/dimension/Dimension.mapping index 8b83a01d35..549d74cabb 100644 --- a/mappings/net/minecraft/world/dimension/Dimension.mapping +++ b/mappings/net/minecraft/world/dimension/Dimension.mapping @@ -21,6 +21,7 @@ CLASS net/minecraft/class_2869 net/minecraft/world/dimension/Dimension ARG 1 skyAngle ARG 2 tickDelta METHOD method_12448 canPlayersSleep ()Z + METHOD method_12449 hasGround ()Z METHOD method_12450 saveWorldData ()V METHOD method_12451 hasSkyLight ()Z METHOD method_12452 getSpawningBlockInChunk (Lnet/minecraft/class_1923;Z)Lnet/minecraft/class_2338; @@ -39,7 +40,7 @@ CLASS net/minecraft/class_2869 net/minecraft/world/dimension/Dimension METHOD method_12463 createWorldBorder ()Lnet/minecraft/class_2784; METHOD method_12464 getSkyAngle (JF)F ARG 1 timeOfDay - ARG 3 delta + ARG 3 tickDelta METHOD method_12465 doesWaterVaporize ()Z METHOD method_12466 getForcedSpawnPoint ()Lnet/minecraft/class_2338; METHOD method_12467 isNether ()Z