From 630bd1451b210c7bba82dcfc9972db53860b8811 Mon Sep 17 00:00:00 2001 From: Runemoro Date: Thu, 7 Nov 2019 13:03:04 -0500 Subject: [PATCH] Refactor rendering (#930) * Refactor rendering * Revert #929 and map more things * Fixes by liach * Revert bufferBuilder -> buffer in fields too * Fixes * Update mappings/net/minecraft/util/MessageQueue.mapping Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * Update mappings/net/minecraft/util/MessageQueue.mapping Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * Suggestions by Player * Fix some debug renderer names * More mappings * Fix * Fixes by Player * Improve BufferBuilderStorage names --- .../blaze3d/platform/FramebufferInfo.mapping | 3 + .../blaze3d/platform/GlStateManager.mapping | 8 ++ .../net/minecraft/block/BlockState.mapping | 3 + .../minecraft/client/MinecraftClient.mapping | 16 ++- mappings/net/minecraft/client/RunArgs.mapping | 4 +- .../client/color/block/BlockColors.mapping | 2 +- .../minecraft/client/font/FontStorage.mapping | 2 + .../client/font/GlyphRenderer.mapping | 11 ++ .../client/font/TextRenderer.mapping | 48 ++++++- ...ramebuffer.mapping => Framebuffer.mapping} | 21 ++- .../net/minecraft/client/gl/GlBuffer.mapping | 11 -- .../minecraft/client/gl/VertexBuffer.mapping | 18 +++ .../minecraft/client/model/ModelPart.mapping | 16 ++- .../client/particle/Particle.mapping | 2 +- .../client/render/BackgroundRenderer.mapping | 11 +- .../client/render/BufferBuilder.mapping | 5 +- .../render/BufferBuilderStorage.mapping | 10 ++ .../client/render/BufferRenderer.mapping | 1 + .../client/render/BuiltChunkStorage.mapping | 29 ++++ .../render/ChunkRenderDispatcher.mapping | 17 --- .../client/render/GameRenderer.mapping | 9 +- .../LayeredBufferBuilderStorage.mapping | 10 -- .../LayeredVertexConsumerStorage.mapping | 21 --- .../client/render/LayeredVertexOutput.mapping | 19 +++ ... => OutlineVertexConsumerProvider.mapping} | 2 +- .../client/render/Tessellator.mapping | 2 +- ...ing => TransformingVertexConsumer.mapping} | 2 +- .../client/render/VertexConsumer.mapping | 16 ++- .../render/VertexConsumerProvider.mapping | 21 +++ .../client/render/VertexFormatElement.mapping | 4 + .../client/render/VertexFormats.mapping | 23 ++-- .../client/render/WorldRenderer.mapping | 79 ++++++++--- .../render/block/BlockModelRenderer.mapping | 86 ++++++++++-- .../render/block/BlockRenderManager.mapping | 28 +++- .../client/render/block/FluidRenderer.mapping | 22 ++- .../entity/BedBlockEntityRenderer.mapping | 5 +- .../BlockEntityRenderDispatcher.mapping | 20 ++- .../block/entity/BlockEntityRenderer.mapping | 4 +- ...ping => BlockBufferBuilderStorage.mapping} | 4 +- .../client/render/chunk/ChunkBatcher.mapping | 73 ---------- .../client/render/chunk/ChunkBuilder.mapping | 125 ++++++++++++++++++ .../debug/ChunkBorderDebugRenderer.mapping | 2 + .../debug/CollisionDebugRenderer.mapping | 6 + .../client/render/debug/DebugRenderer.mapping | 69 +++++++++- .../debug/HeightmapDebugRenderer.mapping | 2 + .../debug/NeighborUpdateDebugRenderer.mapping | 7 + .../debug/PathfindingDebugRenderer.mapping | 15 +++ .../PointOfInterestDebugRenderer.mapping | 16 --- .../render/debug/VillageDebugRenderer.mapping | 63 +++++++++ .../render/debug/VoxelDebugRenderer.mapping | 1 - .../render/debug/WaterDebugRenderer.mapping | 2 + .../entity/EntityRenderDispatcher.mapping | 2 +- .../render/entity/EntityRenderer.mapping | 3 +- .../item/BuiltinModelItemRenderer.mapping | 5 + .../FoliageColormapResourceSupplier.mapping | 2 + .../client/sound/SoundEngine.mapping | 1 + .../client/texture/NativeImage.mapping | 24 +++- .../client/texture/TextureManager.mapping | 2 + .../client/util/MonitorTracker.mapping | 2 + .../net/minecraft/client/util/PngFile.mapping | 27 +++- .../net/minecraft/client/util/Window.mapping | 42 ++++-- .../client/util/math/Matrix3f.mapping | 6 +- .../client/util/math/Matrix4f.mapping | 2 +- .../client/util/math/MatrixStack.mapping | 2 +- .../entity/ai/pathing/PathNode.mapping | 1 + .../world/ChunkTaskPrioritySystem.mapping | 19 ++- .../world/ServerLightingProvider.mapping | 4 +- .../world/ThreadedAnvilChunkStorage.mapping | 5 +- mappings/net/minecraft/util/Actor.mapping | 6 - .../net/minecraft/util/ThreadExecutor.mapping | 30 ----- .../util/{SystemUtil.mapping => Util.mapping} | 12 +- mappings/net/minecraft/util/math/Box.mapping | 12 +- .../net/minecraft/util/math/Vec3d.mapping | 1 + .../minecraft/util/shape/VoxelShapes.mapping | 4 + .../util/thread/MessageListener.mapping | 9 ++ .../ReentrantThreadExecutor.mapping} | 2 +- .../TaskExecutor.mapping} | 17 +-- .../TaskQueue.mapping} | 13 +- .../util/thread/ThreadExecutor.mapping | 34 +++++ .../TickPriority.mapping} | 2 +- .../world/dimension/Dimension.mapping | 6 +- 81 files changed, 953 insertions(+), 340 deletions(-) rename mappings/net/minecraft/client/gl/{GlFramebuffer.mapping => Framebuffer.mapping} (67%) delete mode 100644 mappings/net/minecraft/client/gl/GlBuffer.mapping create mode 100644 mappings/net/minecraft/client/gl/VertexBuffer.mapping create mode 100644 mappings/net/minecraft/client/render/BufferBuilderStorage.mapping create mode 100644 mappings/net/minecraft/client/render/BuiltChunkStorage.mapping delete mode 100644 mappings/net/minecraft/client/render/ChunkRenderDispatcher.mapping delete mode 100644 mappings/net/minecraft/client/render/LayeredBufferBuilderStorage.mapping delete mode 100644 mappings/net/minecraft/client/render/LayeredVertexConsumerStorage.mapping create mode 100644 mappings/net/minecraft/client/render/LayeredVertexOutput.mapping rename mappings/net/minecraft/client/render/{FixedColorLayeredDrawer.mapping => OutlineVertexConsumerProvider.mapping} (88%) rename mappings/net/minecraft/client/render/{MatrixVertexConsumer.mapping => TransformingVertexConsumer.mapping} (88%) create mode 100644 mappings/net/minecraft/client/render/VertexConsumerProvider.mapping rename mappings/net/minecraft/client/render/chunk/{BlockLayeredBufferBuilderStorage.mapping => BlockBufferBuilderStorage.mapping} (72%) delete mode 100644 mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping create mode 100644 mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping create mode 100644 mappings/net/minecraft/client/render/debug/CollisionDebugRenderer.mapping delete mode 100644 mappings/net/minecraft/client/render/debug/PointOfInterestDebugRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping delete mode 100644 mappings/net/minecraft/client/render/debug/VoxelDebugRenderer.mapping delete mode 100644 mappings/net/minecraft/util/Actor.mapping delete mode 100644 mappings/net/minecraft/util/ThreadExecutor.mapping rename mappings/net/minecraft/util/{SystemUtil.mapping => Util.mapping} (88%) create mode 100644 mappings/net/minecraft/util/thread/MessageListener.mapping rename mappings/net/minecraft/util/{NonBlockingThreadExecutor.mapping => thread/ReentrantThreadExecutor.mapping} (60%) rename mappings/net/minecraft/util/{MailboxProcessor.mapping => thread/TaskExecutor.mapping} (62%) rename mappings/net/minecraft/util/{Mailbox.mapping => thread/TaskQueue.mapping} (57%) create mode 100644 mappings/net/minecraft/util/thread/ThreadExecutor.mapping rename mappings/net/minecraft/{util/TaskPriority.mapping => world/TickPriority.mapping} (74%) diff --git a/mappings/com/mojang/blaze3d/platform/FramebufferInfo.mapping b/mappings/com/mojang/blaze3d/platform/FramebufferInfo.mapping index 412af7cab8..c98ac14081 100644 --- a/mappings/com/mojang/blaze3d/platform/FramebufferInfo.mapping +++ b/mappings/com/mojang/blaze3d/platform/FramebufferInfo.mapping @@ -1 +1,4 @@ CLASS net/minecraft/class_4492 com/mojang/blaze3d/platform/FramebufferInfo + FIELD field_20457 target I + FIELD field_20458 renderBufferTarget I + FIELD field_20460 attachment I diff --git a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping index 110523391f..bed1f67877 100644 --- a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping +++ b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping @@ -154,6 +154,8 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager METHOD method_21963 lightModel (ILjava/nio/FloatBuffer;)V METHOD method_21964 uniform1 (ILjava/nio/IntBuffer;)V METHOD method_21965 clear (IZ)V + ARG 0 mask + ARG 1 getError METHOD method_21966 uniformMatrix2 (IZLjava/nio/FloatBuffer;)V METHOD method_21968 enableTexGen (Lnet/minecraft/class_4493$class_1036;)V METHOD method_21969 texGenMode (Lnet/minecraft/class_4493$class_1036;I)V @@ -191,6 +193,10 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager METHOD method_22002 getProgram (II)I METHOD method_22003 getTexLevelParameter (III)I METHOD method_22004 framebufferRenderbuffer (IIII)V + ARG 0 target + ARG 1 attachment + ARG 2 renderBufferTarget + ARG 3 renderBuffer METHOD method_22006 getAttribLocation (ILjava/lang/CharSequence;)I METHOD method_22007 uniform2 (ILjava/nio/FloatBuffer;)V METHOD method_22008 uniform3 (ILjava/nio/IntBuffer;)V @@ -230,6 +236,8 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager METHOD method_22044 disableColorMaterial ()V METHOD method_22045 useProgram (I)V METHOD method_22046 bindRenderbuffer (II)V + ARG 0 target + ARG 1 renderbuffer METHOD method_22047 disableDepthTest ()V METHOD method_22048 deleteProgram (I)V METHOD method_22049 getShaderInfoLog (II)Ljava/lang/String; diff --git a/mappings/net/minecraft/block/BlockState.mapping b/mappings/net/minecraft/block/BlockState.mapping index 18686ea909..6c9b41d703 100644 --- a/mappings/net/minecraft/block/BlockState.mapping +++ b/mappings/net/minecraft/block/BlockState.mapping @@ -198,6 +198,9 @@ 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_21743 isFullCube (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z + ARG 1 world + ARG 2 pos METHOD method_22360 canBucketPlace (Lnet/minecraft/class_3611;)Z ARG 1 fluid METHOD method_22361 hasEmissiveLighting ()Z diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index bb5acdb68e..5c85398a8e 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -73,7 +73,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1762 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_1763 bakedModelManager Lnet/minecraft/class_1092; FIELD field_1764 textureManager Lnet/minecraft/class_1060; - FIELD field_1765 hitResult Lnet/minecraft/class_239; + FIELD field_1765 crosshairTarget Lnet/minecraft/class_239; FIELD field_1766 server Lnet/minecraft/class_1132; FIELD field_1767 spriteAtlas Lnet/minecraft/class_1059; FIELD field_1768 dataFixer Lcom/mojang/datafixers/DataFixer; @@ -90,7 +90,9 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_18173 statusEffectSpriteManager Lnet/minecraft/class_4074; FIELD field_18174 resourceReloadFuture Ljava/util/concurrent/CompletableFuture; FIELD field_18175 overlay Lnet/minecraft/class_4071; - FIELD field_20909 bufferBuilderStorage Lnet/minecraft/class_4599; + FIELD field_20909 bufferBuilders Lnet/minecraft/class_4599; + METHOD (Lnet/minecraft/class_542;)V + ARG 1 args METHOD method_1476 checkIs64Bit ()Z METHOD method_1478 getResourceManager ()Lnet/minecraft/class_3300; METHOD method_1479 getResourcePackDir ()Ljava/io/File; @@ -181,7 +183,8 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1583 doItemUse ()V METHOD method_1584 setCurrentServerEntry (Lnet/minecraft/class_642;)V METHOD method_1586 getLevelStorage ()Lnet/minecraft/class_32; - METHOD method_1587 populateCrashReport (Lnet/minecraft/class_128;)Lnet/minecraft/class_128; + METHOD method_1587 addDetailsToCrashReport (Lnet/minecraft/class_128;)Lnet/minecraft/class_128; + ARG 1 report METHOD method_1588 isAmbientOcclusionEnabled ()Z METHOD method_1589 isConnectedToRealms ()Z METHOD method_1590 handleBlockBreaking (Z)V @@ -204,5 +207,10 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_20539 openPauseMenu (Z)V METHOD method_22107 shouldRenderAsync ()Z METHOD method_22108 isRunning ()Z + METHOD method_22681 addSystemDetailsToCrashReport (Lnet/minecraft/class_1076;Ljava/lang/String;Lnet/minecraft/class_315;Lnet/minecraft/class_128;)V + ARG 0 languageManager + ARG 1 version + ARG 2 options + ARG 3 report METHOD method_22683 getWindow ()Lnet/minecraft/class_1041; - METHOD method_22940 getBufferBuilderStorage ()Lnet/minecraft/class_4599; + METHOD method_22940 getBufferBuilders ()Lnet/minecraft/class_4599; diff --git a/mappings/net/minecraft/client/RunArgs.mapping b/mappings/net/minecraft/client/RunArgs.mapping index f78ae4776e..7f8075f760 100644 --- a/mappings/net/minecraft/client/RunArgs.mapping +++ b/mappings/net/minecraft/client/RunArgs.mapping @@ -19,10 +19,10 @@ CLASS net/minecraft/class_542 net/minecraft/client/RunArgs ARG 2 version ARG 3 versionType CLASS class_546 AutoConnect - FIELD field_3294 serverIP Ljava/lang/String; + FIELD field_3294 serverAddress Ljava/lang/String; FIELD field_3295 serverPort I METHOD (Ljava/lang/String;I)V - ARG 1 serverIP + ARG 1 serverAddress ARG 2 serverPort CLASS class_547 Network FIELD field_3296 netProxy Ljava/net/Proxy; diff --git a/mappings/net/minecraft/client/color/block/BlockColors.mapping b/mappings/net/minecraft/client/color/block/BlockColors.mapping index 2da2cf97eb..f2c0701186 100644 --- a/mappings/net/minecraft/client/color/block/BlockColors.mapping +++ b/mappings/net/minecraft/client/color/block/BlockColors.mapping @@ -59,7 +59,7 @@ CLASS net/minecraft/class_324 net/minecraft/client/color/block/BlockColors ARG 1 view ARG 2 pos ARG 3 tintIndex - METHOD method_1697 getColorMultiplier (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;I)I + METHOD method_1697 getColor (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;I)I ARG 1 state ARG 2 view ARG 3 pos diff --git a/mappings/net/minecraft/client/font/FontStorage.mapping b/mappings/net/minecraft/client/font/FontStorage.mapping index f1035f816d..e6a8741bb7 100644 --- a/mappings/net/minecraft/client/font/FontStorage.mapping +++ b/mappings/net/minecraft/client/font/FontStorage.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage + FIELD field_20910 whiteRectangleGlyphRenderer Lnet/minecraft/class_382; FIELD field_2246 id Lnet/minecraft/class_2960; FIELD field_2247 fonts Ljava/util/List; FIELD field_2248 textureManager Lnet/minecraft/class_1060; @@ -27,3 +28,4 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage ARG 1 glyph METHOD method_2014 getGlyphRenderer (C)Lnet/minecraft/class_382; ARG 1 c + METHOD method_22943 getRectangleRenderer ()Lnet/minecraft/class_382; diff --git a/mappings/net/minecraft/client/font/GlyphRenderer.mapping b/mappings/net/minecraft/client/font/GlyphRenderer.mapping index bea9e42441..4b5c98f6cb 100644 --- a/mappings/net/minecraft/client/font/GlyphRenderer.mapping +++ b/mappings/net/minecraft/client/font/GlyphRenderer.mapping @@ -27,8 +27,19 @@ CLASS net/minecraft/class_382 net/minecraft/client/font/GlyphRenderer ARG 8 yMin ARG 9 yMax METHOD method_2025 draw (ZFFLnet/minecraft/class_1159;Lnet/minecraft/class_4588;FFFFI)V + ARG 1 italic + ARG 2 x + ARG 3 y + ARG 4 matrix + ARG 5 vertexConsumer ARG 6 red ARG 7 green ARG 8 blue ARG 9 alpha + ARG 10 light METHOD method_2026 getId ()Lnet/minecraft/class_2960; + METHOD method_22944 drawRectangle (Lnet/minecraft/class_382$class_328;Lnet/minecraft/class_1159;Lnet/minecraft/class_4588;I)V + ARG 1 rectangle + ARG 2 matrix + ARG 3 vertexConsumer + ARG 4 light diff --git a/mappings/net/minecraft/client/font/TextRenderer.mapping b/mappings/net/minecraft/client/font/TextRenderer.mapping index f2905ab45e..b96ea7cf80 100644 --- a/mappings/net/minecraft/client/font/TextRenderer.mapping +++ b/mappings/net/minecraft/client/font/TextRenderer.mapping @@ -15,16 +15,23 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer METHOD method_1710 drawGlyph (Lnet/minecraft/class_382;ZZFFFLnet/minecraft/class_1159;Lnet/minecraft/class_4588;FFFFI)V ARG 1 glyphRenderer ARG 2 bold - ARG 3 strikethrough - ARG 4 boldOffset + ARG 3 italic + ARG 4 weight ARG 5 x ARG 6 y + ARG 7 matrix + ARG 8 vertexConsumer + ARG 9 red + ARG 10 green + ARG 11 blue + ARG 12 alpha + ARG 13 light METHOD method_1711 trimToWidth (Ljava/lang/String;IZ)Ljava/lang/String; ARG 1 string ARG 2 width ARG 3 rightToLeft - METHOD method_1712 drawStringBounded (Ljava/lang/String;IIII)V - ARG 1 str + METHOD method_1712 drawTrimmed (Ljava/lang/String;IIII)V + ARG 1 string ARG 2 x ARG 3 y ARG 4 maxWidth @@ -38,7 +45,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer METHOD method_1716 getCharacterCountForWidth (Ljava/lang/String;I)I ARG 1 text ARG 2 offset - METHOD method_1717 renderStringBounded (Ljava/lang/String;IIII)V + METHOD method_1717 drawWrapped (Ljava/lang/String;IIII)V ARG 1 str ARG 2 x ARG 3 y @@ -55,17 +62,28 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 1 string METHOD method_1722 wrapStringToWidth (Ljava/lang/String;I)Ljava/lang/String; ARG 1 text - METHOD method_1723 draw (Ljava/lang/String;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I + METHOD method_1723 drawInternal (Ljava/lang/String;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I ARG 1 str ARG 2 x ARG 3 y ARG 4 color ARG 5 withShadow + ARG 6 matrix + ARG 7 vertexConsumerProvider + ARG 8 seeThrough + ARG 9 underlineColor + ARG 10 light METHOD method_1724 drawLayer (Ljava/lang/String;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)F ARG 1 str ARG 2 x ARG 3 y ARG 4 color + ARG 5 shadow + ARG 6 matrix + ARG 7 vertexConsumerProvider + ARG 8 seeThrough + ARG 9 underlineColor + ARG 10 light METHOD method_1725 getCharWidth (C)F ARG 1 character METHOD method_1726 isRightToLeft ()Z @@ -78,3 +96,21 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer ARG 2 x ARG 3 y ARG 4 color + METHOD method_22941 draw (Ljava/lang/String;FFILnet/minecraft/class_1159;Z)I + ARG 1 string + ARG 2 x + ARG 3 y + ARG 4 color + ARG 5 matrix + ARG 6 shadow + METHOD method_22942 draw (Ljava/lang/String;FFIZLnet/minecraft/class_1159;Lnet/minecraft/class_4597;ZII)I + ARG 1 string + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 color + ARG 6 matrix + ARG 7 vertexConsumerProvider + ARG 8 seeThrough + ARG 9 underlineColor + ARG 10 light diff --git a/mappings/net/minecraft/client/gl/GlFramebuffer.mapping b/mappings/net/minecraft/client/gl/Framebuffer.mapping similarity index 67% rename from mappings/net/minecraft/client/gl/GlFramebuffer.mapping rename to mappings/net/minecraft/client/gl/Framebuffer.mapping index 694f50de58..6a194a5f3e 100644 --- a/mappings/net/minecraft/client/gl/GlFramebuffer.mapping +++ b/mappings/net/minecraft/client/gl/Framebuffer.mapping @@ -1,13 +1,13 @@ -CLASS net/minecraft/class_276 net/minecraft/client/gl/GlFramebuffer +CLASS net/minecraft/class_276 net/minecraft/client/gl/Framebuffer FIELD field_1474 depthAttachment I FIELD field_1475 colorAttachment I FIELD field_1476 fbo I - FIELD field_1477 viewHeight I + FIELD field_1477 viewportHeight I FIELD field_1478 useDepthAttachment Z FIELD field_1479 clearColor [F - FIELD field_1480 viewWidth I - FIELD field_1481 texHeight I - FIELD field_1482 texWidth I + FIELD field_1480 viewportWidth I + FIELD field_1481 textureHeight I + FIELD field_1482 textureWidth I FIELD field_1483 texFilter I METHOD (IIZZ)V ARG 1 width @@ -21,7 +21,7 @@ CLASS net/minecraft/class_276 net/minecraft/client/gl/GlFramebuffer ARG 2 height ARG 3 getError METHOD method_1232 setTexFilter (I)V - METHOD method_1233 draw (IIZ)V + METHOD method_1233 drawInternal (IIZ)V ARG 1 width ARG 2 height METHOD method_1234 resize (IIZ)V @@ -43,3 +43,12 @@ CLASS net/minecraft/class_276 net/minecraft/client/gl/GlFramebuffer METHOD method_1240 endWrite ()V METHOD method_1241 beginRead ()V METHOD method_1242 endRead ()V + METHOD method_22594 draw (IIZ)V + ARG 1 width + ARG 2 height + METHOD method_22595 bind (Z)V + ARG 1 updateViewport + METHOD method_22596 resizeInternal (IIZ)V + ARG 1 width + ARG 2 height + ARG 3 getError diff --git a/mappings/net/minecraft/client/gl/GlBuffer.mapping b/mappings/net/minecraft/client/gl/GlBuffer.mapping deleted file mode 100644 index 85e99fbf67..0000000000 --- a/mappings/net/minecraft/client/gl/GlBuffer.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/class_291 net/minecraft/client/gl/GlBuffer - FIELD field_1593 vertexCount I - FIELD field_1594 id I - FIELD field_1595 format Lnet/minecraft/class_293; - METHOD (Lnet/minecraft/class_293;)V - ARG 1 format - METHOD method_1351 draw (Lnet/minecraft/class_1159;I)V - METHOD method_1352 set (Lnet/minecraft/class_287;)V - METHOD method_1353 bind ()V - METHOD method_1354 unbind ()V - METHOD method_1355 delete ()V diff --git a/mappings/net/minecraft/client/gl/VertexBuffer.mapping b/mappings/net/minecraft/client/gl/VertexBuffer.mapping new file mode 100644 index 0000000000..3904dd229c --- /dev/null +++ b/mappings/net/minecraft/client/gl/VertexBuffer.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_291 net/minecraft/client/gl/VertexBuffer + FIELD field_1593 vertexCount I + FIELD field_1594 id I + FIELD field_1595 format Lnet/minecraft/class_293; + METHOD (Lnet/minecraft/class_293;)V + ARG 1 format + METHOD method_1351 draw (Lnet/minecraft/class_1159;I)V + ARG 1 matrix + ARG 2 mode + METHOD method_1352 upload (Lnet/minecraft/class_287;)V + ARG 1 buffer + METHOD method_1353 bind ()V + METHOD method_1354 unbind ()V + METHOD method_1355 delete ()V + METHOD method_22643 submitUpload (Lnet/minecraft/class_287;)Ljava/util/concurrent/CompletableFuture; + ARG 1 buffer + METHOD method_22644 uploadInternal (Lnet/minecraft/class_287;)V + ARG 1 buffer diff --git a/mappings/net/minecraft/client/model/ModelPart.mapping b/mappings/net/minecraft/client/model/ModelPart.mapping index 3daa36086d..008079e22a 100644 --- a/mappings/net/minecraft/client/model/ModelPart.mapping +++ b/mappings/net/minecraft/client/model/ModelPart.mapping @@ -82,18 +82,30 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart ARG 1 matrix ARG 2 vertexConsumer ARG 3 pivotDistance - ARG 4 lightmapCoordinates + ARG 4 light + ARG 6 sprite METHOD method_22699 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;FIILnet/minecraft/class_1058;FFF)V ARG 1 matrix ARG 2 vertexConsumer ARG 3 pivotDistance - ARG 4 lightmapCoordinates + ARG 4 light + ARG 5 overlay + ARG 6 sprite + ARG 7 red + ARG 8 green + ARG 9 blue METHOD method_22700 getRandomCuboid (Ljava/util/Random;)Lnet/minecraft/class_630$class_628; ARG 1 random METHOD method_22702 renderCuboids (Lnet/minecraft/class_1159;Lnet/minecraft/class_4588;FIILnet/minecraft/class_1058;FFF)V ARG 1 matrix ARG 2 vertexConsumer ARG 3 pivotDistance + ARG 4 light + ARG 5 overlay + ARG 6 sprite + ARG 7 red + ARG 8 green + ARG 9 blue METHOD method_22703 rotate (Lnet/minecraft/class_4587;F)V ARG 1 matrix ARG 2 pivotDistance diff --git a/mappings/net/minecraft/client/particle/Particle.mapping b/mappings/net/minecraft/client/particle/Particle.mapping index 09c89e2ebb..5cc2a83867 100644 --- a/mappings/net/minecraft/client/particle/Particle.mapping +++ b/mappings/net/minecraft/client/particle/Particle.mapping @@ -58,7 +58,7 @@ CLASS net/minecraft/class_703 net/minecraft/client/particle/Particle METHOD method_3070 tick ()V METHOD method_3072 repositionFromBoundingBox ()V METHOD method_3074 buildGeometry (Lnet/minecraft/class_4588;Lnet/minecraft/class_4184;FFFFFF)V - ARG 1 bufferBuilder + ARG 1 vertexConsumer ARG 2 camera ARG 3 tickDelta METHOD method_3075 move (F)Lnet/minecraft/class_703; diff --git a/mappings/net/minecraft/client/render/BackgroundRenderer.mapping b/mappings/net/minecraft/client/render/BackgroundRenderer.mapping index 5e0b327264..685b964017 100644 --- a/mappings/net/minecraft/client/render/BackgroundRenderer.mapping +++ b/mappings/net/minecraft/client/render/BackgroundRenderer.mapping @@ -8,6 +8,15 @@ CLASS net/minecraft/class_758 net/minecraft/client/render/BackgroundRenderer FIELD field_4038 colorBuffer Ljava/nio/FloatBuffer; FIELD field_4041 nextWaterFogColor I FIELD field_4042 lastWaterFogColorUpdateTime J - METHOD method_3210 renderBackground (Lnet/minecraft/class_4184;FLnet/minecraft/class_1937;IF)V + METHOD method_3210 render (Lnet/minecraft/class_4184;FLnet/minecraft/class_1937;IF)V + ARG 1 camera + ARG 2 tickDelta + ARG 3 world + ARG 4 viewDistance + ARG 5 skyDarkness METHOD method_3211 applyFog (Lnet/minecraft/class_4184;Lnet/minecraft/class_758$class_4596;FZ)V + ARG 0 camera + ARG 1 fogType + ARG 2 viewDistance + ARG 3 thickFog METHOD method_3212 setFogBlack (Z)V diff --git a/mappings/net/minecraft/client/render/BufferBuilder.mapping b/mappings/net/minecraft/client/render/BufferBuilder.mapping index 813d9df340..1844f45bb6 100644 --- a/mappings/net/minecraft/client/render/BufferBuilder.mapping +++ b/mappings/net/minecraft/client/render/BufferBuilder.mapping @@ -2,6 +2,9 @@ CLASS net/minecraft/class_287 net/minecraft/client/render/BufferBuilder CLASS class_288 State FIELD field_1570 format Lnet/minecraft/class_293; FIELD field_20885 buffer Ljava/nio/ByteBuffer; + METHOD (Ljava/nio/ByteBuffer;Lnet/minecraft/class_293;)V + ARG 1 buffer + ARG 2 format CLASS class_4574 DrawArrayParameters FIELD field_20779 vertexFormat Lnet/minecraft/class_293; FIELD field_20780 count I @@ -38,7 +41,7 @@ CLASS net/minecraft/class_287 net/minecraft/client/render/BufferBuilder METHOD method_1328 begin (ILnet/minecraft/class_293;)V ARG 1 drawMode ARG 2 format - METHOD method_1334 toBufferState ()Lnet/minecraft/class_287$class_288; + METHOD method_1334 popState ()Lnet/minecraft/class_287$class_288; METHOD method_1335 grow (I)V ARG 1 size METHOD method_1341 sortQuads (FFF)V diff --git a/mappings/net/minecraft/client/render/BufferBuilderStorage.mapping b/mappings/net/minecraft/client/render/BufferBuilderStorage.mapping new file mode 100644 index 0000000000..45dffdde0b --- /dev/null +++ b/mappings/net/minecraft/client/render/BufferBuilderStorage.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/class_4599 net/minecraft/client/render/BufferBuilderStorage + FIELD field_20956 blockBuilders Lnet/minecraft/class_750; + FIELD field_20957 entityBuilders Ljava/util/SortedMap; + FIELD field_20958 entityVertexConsumers Lnet/minecraft/class_4597$class_4598; + FIELD field_20959 effectVertexConsumers Lnet/minecraft/class_4597$class_4598; + FIELD field_20961 outlineVertexConsumers Lnet/minecraft/class_4618; + METHOD method_22997 getBlockBufferBuilders ()Lnet/minecraft/class_750; + METHOD method_23000 getEntityVertexConsumers ()Lnet/minecraft/class_4597$class_4598; + METHOD method_23001 getEffectVertexConsumers ()Lnet/minecraft/class_4597$class_4598; + METHOD method_23003 getOutlineVertexConsumers ()Lnet/minecraft/class_4618; diff --git a/mappings/net/minecraft/client/render/BufferRenderer.mapping b/mappings/net/minecraft/client/render/BufferRenderer.mapping index d6cf510ab1..2020a82fea 100644 --- a/mappings/net/minecraft/client/render/BufferRenderer.mapping +++ b/mappings/net/minecraft/client/render/BufferRenderer.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_286 net/minecraft/client/render/BufferRenderer METHOD method_1309 draw (Lnet/minecraft/class_287;)V + ARG 0 bufferBuilder METHOD method_22639 draw (Ljava/nio/ByteBuffer;ILnet/minecraft/class_293;I)V ARG 0 buffer ARG 1 mode diff --git a/mappings/net/minecraft/client/render/BuiltChunkStorage.mapping b/mappings/net/minecraft/client/render/BuiltChunkStorage.mapping new file mode 100644 index 0000000000..a7dfba9c02 --- /dev/null +++ b/mappings/net/minecraft/client/render/BuiltChunkStorage.mapping @@ -0,0 +1,29 @@ +CLASS net/minecraft/class_769 net/minecraft/client/render/BuiltChunkStorage + FIELD field_4146 worldRenderer Lnet/minecraft/class_761; + FIELD field_4147 sizeZ I + FIELD field_4148 sizeX I + FIELD field_4149 sizeY I + FIELD field_4150 chunks [Lnet/minecraft/class_846$class_851; + FIELD field_4151 world Lnet/minecraft/class_1937; + METHOD (Lnet/minecraft/class_846;Lnet/minecraft/class_1937;ILnet/minecraft/class_761;)V + ARG 2 world + ARG 3 viewDistance + ARG 4 worldRenderer + METHOD method_16040 scheduleRebuild (IIIZ)V + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 important + METHOD method_3323 getRenderedChunk (Lnet/minecraft/class_2338;)Lnet/minecraft/class_846$class_851; + ARG 1 pos + METHOD method_3324 createChunks (Lnet/minecraft/class_846;)V + METHOD method_3325 setViewDistance (I)V + ARG 1 viewDistance + METHOD method_3326 getChunkIndex (III)I + ARG 1 x + ARG 2 y + ARG 3 z + METHOD method_3327 clear ()V + METHOD method_3330 updateCameraPosition (DD)V + ARG 1 x + ARG 3 z diff --git a/mappings/net/minecraft/client/render/ChunkRenderDispatcher.mapping b/mappings/net/minecraft/client/render/ChunkRenderDispatcher.mapping deleted file mode 100644 index f6d2221794..0000000000 --- a/mappings/net/minecraft/client/render/ChunkRenderDispatcher.mapping +++ /dev/null @@ -1,17 +0,0 @@ -CLASS net/minecraft/class_769 net/minecraft/client/render/ChunkRenderDispatcher - FIELD field_4146 renderer Lnet/minecraft/class_761; - FIELD field_4147 sizeZ I - FIELD field_4148 sizeX I - FIELD field_4149 sizeY I - FIELD field_4150 renderers [Lnet/minecraft/class_846$class_851; - FIELD field_4151 world Lnet/minecraft/class_1937; - METHOD method_16040 scheduleChunkRender (IIIZ)V - ARG 1 x - ARG 2 y - ARG 3 z - METHOD method_3323 getChunkRenderer (Lnet/minecraft/class_2338;)Lnet/minecraft/class_846$class_851; - ARG 1 pos - METHOD method_3324 createChunks (Lnet/minecraft/class_846;)V - METHOD method_3326 getChunkIndex (III)I - METHOD method_3327 delete ()V - METHOD method_3330 updateCameraPosition (DD)V diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index debe923c39..309745af03 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -1,7 +1,8 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer FIELD field_18765 camera Lnet/minecraft/class_4184; - FIELD field_20948 layeredBufferBuilderStorage Lnet/minecraft/class_4599; + FIELD field_20948 buffers Lnet/minecraft/class_4599; FIELD field_20949 overlayTexture Lnet/minecraft/class_4608; + FIELD field_3988 zoomX F FIELD field_3992 renderHand Z FIELD field_3993 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_3994 random Ljava/util/Random; @@ -12,6 +13,8 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer FIELD field_4001 renderingPanorama Z FIELD field_4002 skyDarkness F FIELD field_4003 floatingItemHeight F + FIELD field_4004 zoomY F + FIELD field_4005 zoom F FIELD field_4006 floatingItem Lnet/minecraft/class_1799; FIELD field_4007 floatingItemTimeLeft I FIELD field_4009 blockOutlineEnabled Z @@ -32,10 +35,6 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_3300;Lnet/minecraft/class_4599;)V ARG 1 client METHOD method_19418 getCamera ()Lnet/minecraft/class_4184; - METHOD method_22973 (Lnet/minecraft/class_4184;FZ)Lnet/minecraft/class_1159; - ARG 1 camera - ARG 2 tickDelta - ARG 3 changingFov METHOD method_22974 getLightmapTextureManager ()Lnet/minecraft/class_765; METHOD method_3167 onCameraEntitySet (Lnet/minecraft/class_1297;)V METHOD method_3168 loadShader (Lnet/minecraft/class_2960;)V diff --git a/mappings/net/minecraft/client/render/LayeredBufferBuilderStorage.mapping b/mappings/net/minecraft/client/render/LayeredBufferBuilderStorage.mapping deleted file mode 100644 index c213c2960d..0000000000 --- a/mappings/net/minecraft/client/render/LayeredBufferBuilderStorage.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS net/minecraft/class_4599 net/minecraft/client/render/LayeredBufferBuilderStorage - FIELD field_20956 blockBufferBuilders Lnet/minecraft/class_750; - FIELD field_20957 bufferBuilders Ljava/util/SortedMap; - FIELD field_20958 generalDrawer Lnet/minecraft/class_4597$class_4598; - FIELD field_20959 blockBreakingProgressDrawer Lnet/minecraft/class_4597$class_4598; - FIELD field_20961 teamColorAwareOutlineDrawer Lnet/minecraft/class_4618; - METHOD method_22997 getBlockBufferBuilders ()Lnet/minecraft/class_750; - METHOD method_23000 getGeneralDrawer ()Lnet/minecraft/class_4597$class_4598; - METHOD method_23001 getBlockBreakingProgressDrawer ()Lnet/minecraft/class_4597$class_4598; - METHOD method_23003 getTeamColorAwareOutlineDrawer ()Lnet/minecraft/class_4618; diff --git a/mappings/net/minecraft/client/render/LayeredVertexConsumerStorage.mapping b/mappings/net/minecraft/client/render/LayeredVertexConsumerStorage.mapping deleted file mode 100644 index 41cb30f43d..0000000000 --- a/mappings/net/minecraft/client/render/LayeredVertexConsumerStorage.mapping +++ /dev/null @@ -1,21 +0,0 @@ -CLASS net/minecraft/class_4597 net/minecraft/client/render/LayeredVertexConsumerStorage - CLASS class_4598 Drawer - FIELD field_20952 sharedConsumer Lnet/minecraft/class_287; - FIELD field_20953 layerSpecificConsumers Ljava/util/Map; - FIELD field_20954 currentLayer Ljava/util/Optional; - FIELD field_20955 activeConsumers Ljava/util/Set; - METHOD (Lnet/minecraft/class_287;Ljava/util/Map;)V - ARG 1 sharedConsumer - ARG 2 layerSpecificConsumers - METHOD method_22993 draw ()V - METHOD method_22994 draw (Lnet/minecraft/class_1921;)V - ARG 1 layer - METHOD method_22995 getConsumer (Lnet/minecraft/class_1921;)Lnet/minecraft/class_287; - ARG 1 layer - METHOD getBuffer (Lnet/minecraft/class_1921;)Lnet/minecraft/class_4588; - ARG 1 layer - METHOD method_22991 makeDrawer (Lnet/minecraft/class_287;)Lnet/minecraft/class_4597$class_4598; - ARG 0 vertexConsumer - METHOD method_22992 makeDrawer (Ljava/util/Map;Lnet/minecraft/class_287;)Lnet/minecraft/class_4597$class_4598; - ARG 0 layerSpecificConsumers - ARG 1 vertexConsumer diff --git a/mappings/net/minecraft/client/render/LayeredVertexOutput.mapping b/mappings/net/minecraft/client/render/LayeredVertexOutput.mapping new file mode 100644 index 0000000000..24ffea0def --- /dev/null +++ b/mappings/net/minecraft/client/render/LayeredVertexOutput.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_4597 net/minecraft/client/render/LayeredVertexOutput + CLASS class_4598 Immediate + FIELD field_20952 fallbackBuilder Lnet/minecraft/class_287; + FIELD field_20953 layerBuilders Ljava/util/Map; + FIELD field_20954 currentLayer Ljava/util/Optional; + FIELD field_20955 startedBuilders Ljava/util/Set; + METHOD (Lnet/minecraft/class_287;Ljava/util/Map;)V + ARG 1 fallbackBuilder + ARG 2 layerBuilders + METHOD method_22993 draw ()V + METHOD method_22994 draw (Lnet/minecraft/class_1921;)V + ARG 1 layer + METHOD method_22995 getConsumer (Lnet/minecraft/class_1921;)Lnet/minecraft/class_287; + ARG 1 layer + METHOD method_22991 immediate (Lnet/minecraft/class_287;)Lnet/minecraft/class_4597$class_4598; + ARG 0 builder + METHOD method_22992 immediate (Ljava/util/Map;Lnet/minecraft/class_287;)Lnet/minecraft/class_4597$class_4598; + ARG 0 layerBuilders + ARG 1 fallbackBuilder diff --git a/mappings/net/minecraft/client/render/FixedColorLayeredDrawer.mapping b/mappings/net/minecraft/client/render/OutlineVertexConsumerProvider.mapping similarity index 88% rename from mappings/net/minecraft/client/render/FixedColorLayeredDrawer.mapping rename to mappings/net/minecraft/client/render/OutlineVertexConsumerProvider.mapping index 1524593ff1..4bb5452e9b 100644 --- a/mappings/net/minecraft/client/render/FixedColorLayeredDrawer.mapping +++ b/mappings/net/minecraft/client/render/OutlineVertexConsumerProvider.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4618 net/minecraft/client/render/FixedColorLayeredDrawer +CLASS net/minecraft/class_4618 net/minecraft/client/render/OutlineVertexConsumerProvider CLASS class_4586 VertexConsumer FIELD field_20897 delegate Lnet/minecraft/class_4588; FIELD field_21064 x D diff --git a/mappings/net/minecraft/client/render/Tessellator.mapping b/mappings/net/minecraft/client/render/Tessellator.mapping index 2efbaaa1ef..2251fa75bc 100644 --- a/mappings/net/minecraft/client/render/Tessellator.mapping +++ b/mappings/net/minecraft/client/render/Tessellator.mapping @@ -4,5 +4,5 @@ CLASS net/minecraft/class_289 net/minecraft/client/render/Tessellator METHOD (I)V ARG 1 bufferCapacity METHOD method_1348 getInstance ()Lnet/minecraft/class_289; - METHOD method_1349 getBufferBuilder ()Lnet/minecraft/class_287; + METHOD method_1349 getBuffer ()Lnet/minecraft/class_287; METHOD method_1350 draw ()V diff --git a/mappings/net/minecraft/client/render/MatrixVertexConsumer.mapping b/mappings/net/minecraft/client/render/TransformingVertexConsumer.mapping similarity index 88% rename from mappings/net/minecraft/client/render/MatrixVertexConsumer.mapping rename to mappings/net/minecraft/client/render/TransformingVertexConsumer.mapping index bb6c2324a5..7ca043328e 100644 --- a/mappings/net/minecraft/client/render/MatrixVertexConsumer.mapping +++ b/mappings/net/minecraft/client/render/TransformingVertexConsumer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4583 net/minecraft/client/render/MatrixVertexConsumer +CLASS net/minecraft/class_4583 net/minecraft/client/render/TransformingVertexConsumer FIELD field_20866 vertexConsumer Lnet/minecraft/class_4588; FIELD field_20870 x F FIELD field_20871 y F diff --git a/mappings/net/minecraft/client/render/VertexConsumer.mapping b/mappings/net/minecraft/client/render/VertexConsumer.mapping index e1fef531e7..a1a30d1703 100644 --- a/mappings/net/minecraft/client/render/VertexConsumer.mapping +++ b/mappings/net/minecraft/client/render/VertexConsumer.mapping @@ -35,11 +35,25 @@ CLASS net/minecraft/class_4588 net/minecraft/client/render/VertexConsumer METHOD method_22919 quad (Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;Lnet/minecraft/class_777;FFFII)V ARG 1 modelMatrix ARG 2 normalMatrix + ARG 3 quad + ARG 4 red + ARG 5 green + ARG 6 blue + ARG 7 light + ARG 8 overlay METHOD method_22920 quad (Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;Lnet/minecraft/class_777;[FFFF[IIZ)V ARG 1 modelMatrix ARG 2 normalMatrix + ARG 3 quad + ARG 4 brightness + ARG 5 red + ARG 6 green + ARG 7 blue + ARG 8 light + ARG 9 overlay + ARG 10 hasColorData METHOD method_22921 light (II)Lnet/minecraft/class_4588; ARG 1 u ARG 2 v - METHOD method_22922 defaultOverlay (I)Lnet/minecraft/class_4588; + METHOD method_22922 overlay (I)Lnet/minecraft/class_4588; ARG 1 uv diff --git a/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping b/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping new file mode 100644 index 0000000000..d3b3bba292 --- /dev/null +++ b/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping @@ -0,0 +1,21 @@ +CLASS net/minecraft/class_4597 net/minecraft/client/render/VertexConsumerProvider + CLASS class_4598 Immediate + FIELD field_20952 defaultBuilder Lnet/minecraft/class_287; + FIELD field_20953 layerBuilders Ljava/util/Map; + FIELD field_20954 currentLayer Ljava/util/Optional; + FIELD field_20955 activeConsumers Ljava/util/Set; + METHOD (Lnet/minecraft/class_287;Ljava/util/Map;)V + ARG 1 defaultBuilder + ARG 2 layerBuilders + METHOD method_22993 draw ()V + METHOD method_22994 draw (Lnet/minecraft/class_1921;)V + ARG 1 layer + METHOD method_22995 getConsumer (Lnet/minecraft/class_1921;)Lnet/minecraft/class_287; + ARG 1 layer + METHOD getBuffer (Lnet/minecraft/class_1921;)Lnet/minecraft/class_4588; + ARG 1 layer + METHOD method_22991 immediate (Lnet/minecraft/class_287;)Lnet/minecraft/class_4597$class_4598; + ARG 0 builder + METHOD method_22992 immediate (Ljava/util/Map;Lnet/minecraft/class_287;)Lnet/minecraft/class_4597$class_4598; + ARG 0 layerBuilders + ARG 1 fallbackBuilder diff --git a/mappings/net/minecraft/client/render/VertexFormatElement.mapping b/mappings/net/minecraft/client/render/VertexFormatElement.mapping index a8f3f48839..7af9dfb0f9 100644 --- a/mappings/net/minecraft/client/render/VertexFormatElement.mapping +++ b/mappings/net/minecraft/client/render/VertexFormatElement.mapping @@ -23,6 +23,10 @@ CLASS net/minecraft/class_296 net/minecraft/client/render/VertexFormatElement FIELD field_20784 finisher Ljava/util/function/IntConsumer; METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_296$class_298$class_4575;Ljava/util/function/IntConsumer;)V ARG 3 name + METHOD (Ljava/lang/String;Lnet/minecraft/class_296$class_298$class_4575;Ljava/util/function/IntConsumer;)V + ARG 1 name + ARG 2 starter + ARG 3 finisher METHOD method_1392 getName ()Ljava/lang/String; METHOD method_22654 endDrawing (I)V ARG 1 elementIndex diff --git a/mappings/net/minecraft/client/render/VertexFormats.mapping b/mappings/net/minecraft/client/render/VertexFormats.mapping index dedb04205c..26083c7982 100644 --- a/mappings/net/minecraft/client/render/VertexFormats.mapping +++ b/mappings/net/minecraft/client/render/VertexFormats.mapping @@ -1,17 +1,20 @@ CLASS net/minecraft/class_290 net/minecraft/client/render/VertexFormats - FIELD field_1575 POSITION_UV_COLOR Lnet/minecraft/class_293; + FIELD field_1575 POSITION_TEXTURE_COLOR Lnet/minecraft/class_293; FIELD field_1576 POSITION_COLOR Lnet/minecraft/class_293; - FIELD field_1577 POSITION_UV_COLOR_NORMAL Lnet/minecraft/class_293; + FIELD field_1577 POSITION_TEXTURE_COLOR_NORMAL Lnet/minecraft/class_293; FIELD field_1578 PADDING_ELEMENT Lnet/minecraft/class_296; FIELD field_1579 NORMAL_ELEMENT Lnet/minecraft/class_296; - FIELD field_1580 POSITION_UV_NORMAL_2 Lnet/minecraft/class_293; + FIELD field_1580 POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL Lnet/minecraft/class_293; FIELD field_1581 COLOR_ELEMENT Lnet/minecraft/class_296; - FIELD field_1583 LMAP_ELEMENT Lnet/minecraft/class_296; - FIELD field_1584 POSITION_UV_COLOR_LMAP Lnet/minecraft/class_293; - FIELD field_1585 POSITION_UV Lnet/minecraft/class_293; - FIELD field_1586 POSITION_UV_LMAP_COLOR Lnet/minecraft/class_293; + FIELD field_1583 OVERLAY_ELEMENT Lnet/minecraft/class_296; + FIELD field_1584 POSITION_TEXTURE_COLOR_LIGHT Lnet/minecraft/class_293; + FIELD field_1585 POSITION_TEXTURE Lnet/minecraft/class_293; + FIELD field_1586 POSITION_TEXTURE_LIGHT_COLOR Lnet/minecraft/class_293; FIELD field_1587 POSITION_ELEMENT Lnet/minecraft/class_296; - FIELD field_1590 POSITION_COLOR_UV_NORMAL Lnet/minecraft/class_293; - FIELD field_1591 UV_ELEMENT Lnet/minecraft/class_296; + FIELD field_1590 POSITION_COLOR_TEXTURE_LIGHT_NORMAL Lnet/minecraft/class_293; + FIELD field_1591 TEXTURE_ELEMENT Lnet/minecraft/class_296; FIELD field_1592 POSITION Lnet/minecraft/class_293; - FIELD field_20887 POSITION_COLOR_UV Lnet/minecraft/class_293; + FIELD field_20886 LIGHT_ELEMENT Lnet/minecraft/class_296; + FIELD field_20887 POSITION_COLOR_TEXTURE Lnet/minecraft/class_293; + FIELD field_20888 POSITION_COLOR_TEXTURE_LIGHT Lnet/minecraft/class_293; + FIELD field_21468 POSITION_COLOR_LIGHT Lnet/minecraft/class_293; diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index de69537c11..0d30b6c0fc 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -1,25 +1,30 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer - CLASS class_762 ChunkInfo - FIELD field_4124 renderer Lnet/minecraft/class_846$class_851; + CLASS class_762 BuiltChunkInfo + 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 + METHOD method_3298 (Lnet/minecraft/class_2350;)Z + ARG 1 direction + FIELD field_20792 frame I + FIELD field_20797 RAIN Lnet/minecraft/class_2960; + FIELD field_20798 SNOW Lnet/minecraft/class_2960; FIELD field_20950 blockBreakingProgressions Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; - FIELD field_20951 layeredBufferBuilderStorage Lnet/minecraft/class_4599; + FIELD field_20951 bufferBuilders Lnet/minecraft/class_4599; FIELD field_4055 blockEntities Ljava/util/Set; - FIELD field_4056 forcedFrustum Lnet/minecraft/class_4604; + 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; FIELD field_4059 entityOutlineShader Lnet/minecraft/class_279; FIELD field_4060 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_4061 END_SKY_TEX Lnet/minecraft/class_2960; + FIELD field_4061 END_SKY Lnet/minecraft/class_2960; FIELD field_4062 renderDistance I FIELD field_4064 lastCameraYaw D FIELD field_4069 lastCameraX D FIELD field_4070 lastCameraChunkUpdateZ D - FIELD field_4071 FORCEFIELD_TEX Lnet/minecraft/class_2960; + FIELD field_4071 FORCEFIELD Lnet/minecraft/class_2960; FIELD field_4073 ticks I - FIELD field_4075 chunkRenderers Ljava/util/Set; - FIELD field_4077 terrainUpdateNecessary Z + FIELD field_4075 chunksToRebuild Ljava/util/Set; + FIELD field_4077 needsTerrainUpdate Z FIELD field_4081 lastCameraY D FIELD field_4083 lastTranslucentSortX D FIELD field_4084 cameraChunkX I @@ -28,31 +33,35 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_4088 client Lnet/minecraft/class_310; FIELD field_4089 regularEntityCount I FIELD field_4090 shouldCaptureFrustum Z - FIELD field_4091 forcedFrustumPosition Lnet/minecraft/class_1161; - FIELD field_4092 chunkRendererList Lnet/minecraft/class_758; + FIELD field_4091 capturedFrustumPosition Lnet/minecraft/class_1161; + FIELD field_4092 backgroundRenderer Lnet/minecraft/class_758; FIELD field_4094 cloudsBuffer Lnet/minecraft/class_291; FIELD field_4095 DIRECTIONS [Lnet/minecraft/class_2350; FIELD field_4096 lastCameraZ D - FIELD field_4098 MOON_PHASES_TEX Lnet/minecraft/class_2960; + FIELD field_4098 MOON_PHASES Lnet/minecraft/class_2960; FIELD field_4101 entityOutlinesFramebuffer Lnet/minecraft/class_276; FIELD field_4103 lastTranslucentSortY D FIELD field_4104 lastCameraChunkUpdateX D FIELD field_4105 cameraChunkY I - FIELD field_4106 chunkBatcher Lnet/minecraft/class_846; + FIELD field_4106 chunkBuilder Lnet/minecraft/class_846; FIELD field_4107 cloudsDirty Z - FIELD field_4108 CLOUDS_TEX Lnet/minecraft/class_2960; + FIELD field_4108 CLOUDS Lnet/minecraft/class_2960; FIELD field_4109 entityRenderDispatcher Lnet/minecraft/class_898; FIELD field_4110 blockEntityCount I - FIELD field_4111 SUN_TEX Lnet/minecraft/class_2960; - FIELD field_4112 chunkRenderDispatcher Lnet/minecraft/class_769; + FIELD field_4111 SUN Lnet/minecraft/class_2960; + FIELD field_4112 renderedChunks Lnet/minecraft/class_769; FIELD field_4113 starsBuffer Lnet/minecraft/class_291; FIELD field_4115 lastCameraPitch D FIELD field_4118 lastTranslucentSortZ D FIELD field_4119 playingSongs Ljava/util/Map; FIELD field_4120 lastCameraChunkUpdateY D FIELD field_4121 cameraChunkZ I + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_4599;)V + ARG 1 client + ARG 2 bufferBuilders METHOD method_16037 scheduleSectionRender (Lnet/minecraft/class_2338;Z)V ARG 1 pos + ARG 2 important METHOD method_18145 scheduleBlockRenders (III)V ARG 1 x ARG 2 y @@ -70,8 +79,10 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 3 limitTime ARG 5 renderBlockOutline ARG 6 camera + ARG 7 gameRenderer ARG 8 lightmapTextureManager METHOD method_22712 drawBlockOutline (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_1297;DDDLnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + METHOD method_22714 renderWeather (Lnet/minecraft/class_765;FDDD)V METHOD method_22977 renderEntity (Lnet/minecraft/class_1297;DDDFLnet/minecraft/class_4587;Lnet/minecraft/class_4597;)V ARG 1 entity ARG 2 cameraX @@ -81,6 +92,21 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 9 matrix METHOD method_22979 checkEmpty (Lnet/minecraft/class_4587;)V ARG 1 matrix + METHOD method_22980 drawBox (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;DDDDDDFFFF)V + METHOD method_22981 drawBox (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;DDDDDDFFFFFFF)V + ARG 0 matrix + ARG 1 vertexConsumer + ARG 2 x1 + ARG 4 y1 + ARG 6 z1 + ARG 8 x2 + ARG 10 y2 + ARG 12 z2 + ARG 14 red + ARG 17 alpha + ARG 19 green + ARG 20 blue + METHOD method_22982 drawBox (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_238;FFFF)V METHOD method_22987 removeBlockBreakingInfo (Lnet/minecraft/class_3191;)V METHOD method_3239 renderClouds (Lnet/minecraft/class_287;DDDLnet/minecraft/class_243;)V ARG 8 color @@ -107,14 +133,20 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer METHOD method_3255 renderStars (Lnet/minecraft/class_287;)V ARG 1 buffer METHOD method_3257 renderSky (Lnet/minecraft/class_4587;F)V - METHOD method_3258 buildBoxOutline (Lnet/minecraft/class_287;DDDDDDFFFF)V + METHOD method_3258 drawBox (Lnet/minecraft/class_287;DDDDDDFFFF)V ARG 0 buffer + ARG 1 x1 + ARG 3 y1 + ARG 5 z1 + ARG 7 x2 + ARG 9 y2 + ARG 11 z2 ARG 13 red ARG 14 green ARG 15 blue ARG 16 alpha METHOD method_3259 renderClouds (Lnet/minecraft/class_4587;FDDD)V - METHOD method_3262 drawBoxOutline (Lnet/minecraft/class_4588;DDDDDDFFFF)V + METHOD method_3262 drawBox (Lnet/minecraft/class_4588;DDDDDDFFFF)V METHOD method_3268 getRandomParticleSpawnChance (Z)Lnet/minecraft/class_4066; ARG 1 canSpawnOnMinimal METHOD method_3269 updateChunks (J)V @@ -122,7 +154,17 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer 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 + ARG 1 camera + ARG 2 frustum + ARG 3 hasForcedFrustum + ARG 4 frame + ARG 5 spectator METHOD method_3275 captureFrustum (Lnet/minecraft/class_1159;Lnet/minecraft/class_1159;DDDLnet/minecraft/class_4604;)V + ARG 1 modelMatrix + ARG 3 x + ARG 5 y + ARG 7 z + ARG 9 frustum METHOD method_3276 addParticle (Lnet/minecraft/class_2394;DDDDDD)V ARG 1 parameters ARG 2 x @@ -144,7 +186,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 11 velocityY ARG 13 velocityZ METHOD method_3283 (Lnet/minecraft/class_287;FZ)V - ARG 1 bufferBuilder + ARG 1 buffer ARG 2 y ARG 3 flipX METHOD method_3285 getOpenChunkFaces (Lnet/minecraft/class_2338;)Ljava/util/Set; @@ -167,6 +209,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 1 x ARG 2 y ARG 3 z + ARG 4 important METHOD method_3296 loadEntityOutlineShader ()V METHOD method_8562 playSong (Lnet/minecraft/class_3414;Lnet/minecraft/class_2338;)V ARG 1 song diff --git a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping index 7351c9a075..c5e1466bcc 100644 --- a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping @@ -4,10 +4,16 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRender FIELD field_4191 faces [Lnet/minecraft/class_2350; METHOD method_3378 getData (Lnet/minecraft/class_2350;)Lnet/minecraft/class_778$class_779; CLASS class_780 AmbientOcclusionCalculator - FIELD field_4194 brightness [I - FIELD field_4196 colorMultiplier [F + FIELD field_4194 light [I + FIELD field_4196 brightness [F METHOD method_3386 getAmbientOcclusionBrightness (IIII)I METHOD method_3388 apply (Lnet/minecraft/class_1920;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;[FLjava/util/BitSet;)V + ARG 1 world + ARG 2 state + ARG 3 pos + ARG 4 direction + ARG 5 box + ARG 6 flags METHOD method_3389 getBrightness (IIIIFFFF)I CLASS class_781 Translation FIELD field_4198 thirdCorner I @@ -34,31 +40,83 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRender FIELD field_4179 brightnessCache Ljava/lang/ThreadLocal; METHOD method_20544 enableBrightnessCache ()V METHOD method_20545 disableBrightnessCache ()V - METHOD method_3361 tesselateSmooth (Lnet/minecraft/class_1920;Lnet/minecraft/class_1087;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;ZLjava/util/Random;JI)Z - ARG 1 view + METHOD method_23073 renderQuad (Lnet/minecraft/class_1920;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_4588;Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;Lnet/minecraft/class_777;FFFFIIIII)V + ARG 1 world + ARG 2 state + ARG 3 pos + ARG 4 vertexConsumer + ARG 5 modelMatrix + ARG 6 normalMatrix + ARG 7 quad + ARG 8 brightness1 + ARG 9 brightness2 + ARG 10 brightness3 + ARG 11 brightness4 + ARG 12 light1 + ARG 13 light2 + ARG 14 light3 + ARG 15 light4 + ARG 16 overlay + METHOD method_3361 renderSmooth (Lnet/minecraft/class_1920;Lnet/minecraft/class_1087;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;ZLjava/util/Random;JI)Z + ARG 1 world ARG 2 model ARG 3 state ARG 4 pos ARG 5 buffer - METHOD method_3363 tesselateQuadsSmooth (Lnet/minecraft/class_1920;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Ljava/util/List;[FLjava/util/BitSet;Lnet/minecraft/class_778$class_780;I)V - ARG 1 view - METHOD method_3364 updateShape (Lnet/minecraft/class_1920;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;[ILnet/minecraft/class_2350;[FLjava/util/BitSet;)V - ARG 3 state + ARG 6 vertexConsumer + ARG 7 cull + ARG 8 random + ARG 9 seed + ARG 11 overlay + METHOD method_3363 renderQuadsSmooth (Lnet/minecraft/class_1920;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Ljava/util/List;[FLjava/util/BitSet;Lnet/minecraft/class_778$class_780;I)V + ARG 1 world + ARG 2 state + ARG 3 pos + ARG 4 matrix + ARG 5 vertexConsumer + ARG 6 quads + ARG 7 box + ARG 8 flags + ARG 9 ambientOcclusionCalculator + ARG 10 overlay + METHOD method_3364 getQuadDimensions (Lnet/minecraft/class_1920;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;[ILnet/minecraft/class_2350;[FLjava/util/BitSet;)V + ARG 1 world + ARG 2 state + ARG 3 pos ARG 4 vertexData - ARG 5 facing - ARG 6 faceShape + ARG 5 face + ARG 6 box + ARG 7 flags METHOD method_3365 renderQuad (Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;Lnet/minecraft/class_4588;FFFLjava/util/List;II)V METHOD method_3367 render (Lnet/minecraft/class_1159;Lnet/minecraft/class_4581;Lnet/minecraft/class_4588;Lnet/minecraft/class_2680;Lnet/minecraft/class_1087;FFFII)V - METHOD method_3370 tesselateQuadsFlat (Lnet/minecraft/class_1920;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;IIZLnet/minecraft/class_4587;Lnet/minecraft/class_4588;Ljava/util/List;Ljava/util/BitSet;)V - ARG 4 brightness - METHOD method_3373 tesselateFlat (Lnet/minecraft/class_1920;Lnet/minecraft/class_1087;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;ZLjava/util/Random;JI)Z + METHOD method_3370 renderQuadsFlat (Lnet/minecraft/class_1920;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;IIZLnet/minecraft/class_4587;Lnet/minecraft/class_4588;Ljava/util/List;Ljava/util/BitSet;)V + ARG 1 world + ARG 2 state + ARG 3 pos + ARG 4 light + ARG 5 overlay + ARG 6 useWorldLight + ARG 7 matrix + ARG 8 vertexConsumer + ARG 9 quads + ARG 10 flags + METHOD method_3373 renderFlat (Lnet/minecraft/class_1920;Lnet/minecraft/class_1087;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;ZLjava/util/Random;JI)Z ARG 1 view ARG 2 model ARG 3 state ARG 4 pos ARG 5 buffer - METHOD method_3374 tesselate (Lnet/minecraft/class_1920;Lnet/minecraft/class_1087;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;ZLjava/util/Random;JI)Z + ARG 6 vertexConsumer + ARG 7 cull + ARG 8 random + METHOD method_3374 render (Lnet/minecraft/class_1920;Lnet/minecraft/class_1087;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;ZLjava/util/Random;JI)Z ARG 1 view ARG 2 model ARG 3 state ARG 4 pos + ARG 5 matrix + ARG 6 vertexConsumer + ARG 7 cull + ARG 8 random + ARG 9 seed + ARG 11 overlay diff --git a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping index 1b795877f4..7e624b376c 100644 --- a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping +++ b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping @@ -1,13 +1,31 @@ CLASS net/minecraft/class_776 net/minecraft/client/render/block/BlockRenderManager + FIELD field_20987 blockColors Lnet/minecraft/class_324; FIELD field_4167 fluidRenderer Lnet/minecraft/class_775; FIELD field_4168 models Lnet/minecraft/class_773; FIELD field_4169 random Ljava/util/Random; - FIELD field_4170 renderer Lnet/minecraft/class_778; - METHOD method_23071 tesselateDamage (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_1920;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;)V + FIELD field_4170 blockModelRenderer Lnet/minecraft/class_778; + METHOD method_23071 renderDamage (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_1920;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;)V + ARG 1 state + ARG 2 pos + ARG 3 world + ARG 4 matrix + ARG 5 vertexConsumer METHOD method_3349 getModel (Lnet/minecraft/class_2680;)Lnet/minecraft/class_1087; ARG 1 state METHOD method_3350 getModelRenderer ()Lnet/minecraft/class_778; METHOD method_3351 getModels ()Lnet/minecraft/class_773; - METHOD method_3352 tesselateFluid (Lnet/minecraft/class_2338;Lnet/minecraft/class_1920;Lnet/minecraft/class_4588;Lnet/minecraft/class_3610;)Z - METHOD method_3353 renderOnEntity (Lnet/minecraft/class_2680;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)V - METHOD method_3355 tesselateBlock (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_1920;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;ZLjava/util/Random;)Z + METHOD method_3352 renderFluid (Lnet/minecraft/class_2338;Lnet/minecraft/class_1920;Lnet/minecraft/class_4588;Lnet/minecraft/class_3610;)Z + METHOD method_3353 renderBlockAsEntity (Lnet/minecraft/class_2680;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)V + ARG 1 state + ARG 2 matrix + ARG 3 vertexConsumer + ARG 4 light + ARG 5 overlay + METHOD method_3355 renderBlock (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_1920;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;ZLjava/util/Random;)Z + ARG 1 state + ARG 2 pos + ARG 3 world + ARG 4 matrix + ARG 5 vertexConsumer + ARG 6 cull + ARG 7 random diff --git a/mappings/net/minecraft/client/render/block/FluidRenderer.mapping b/mappings/net/minecraft/client/render/block/FluidRenderer.mapping index a643d3224a..e94397b4e5 100644 --- a/mappings/net/minecraft/client/render/block/FluidRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/FluidRenderer.mapping @@ -2,14 +2,34 @@ CLASS net/minecraft/class_775 net/minecraft/client/render/block/FluidRenderer FIELD field_4164 waterOverlaySprite Lnet/minecraft/class_1058; FIELD field_4165 lavaSprites [Lnet/minecraft/class_1058; FIELD field_4166 waterSprites [Lnet/minecraft/class_1058; + METHOD method_23072 vertex (Lnet/minecraft/class_4588;DDDFFFFFI)V + ARG 1 vertexConsumer + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 red + ARG 9 green + ARG 10 blue + ARG 11 u + ARG 12 v + ARG 13 light + METHOD method_3343 getLight (Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)I + ARG 1 world + ARG 2 pos + METHOD method_3344 isSideCovered (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;F)Z + ARG 0 world + ARG 1 pos + ARG 2 side + ARG 3 height METHOD method_3345 onResourceReload ()V METHOD method_3346 getNorthWestCornerFluidHeight (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3611;)F ARG 1 world ARG 2 pos ARG 3 fluid - METHOD method_3347 tesselate (Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;Lnet/minecraft/class_4588;Lnet/minecraft/class_3610;)Z + METHOD method_3347 render (Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;Lnet/minecraft/class_4588;Lnet/minecraft/class_3610;)Z ARG 1 world ARG 2 pos + ARG 3 vertexConsumer ARG 4 state METHOD method_3348 isSameFluid (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_3610;)Z ARG 0 world diff --git a/mappings/net/minecraft/client/render/block/entity/BedBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BedBlockEntityRenderer.mapping index 135cdf439f..745e456fec 100644 --- a/mappings/net/minecraft/client/render/block/entity/BedBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BedBlockEntityRenderer.mapping @@ -4,4 +4,7 @@ CLASS net/minecraft/class_825 net/minecraft/client/render/block/entity/BedBlockE ARG 1 matrix ARG 2 vertexConsumer ARG 5 sprite - ARG 6 lightmapCoordinates + ARG 6 light + ARG 7 overlay + METHOD render (Lnet/minecraft/class_2587;DDDFLnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)V + ARG 12 overlay diff --git a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping index 875f7d984e..a3b3e4b294 100644 --- a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping @@ -1,13 +1,18 @@ CLASS net/minecraft/class_824 net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher FIELD field_20988 bufferBuilder Lnet/minecraft/class_287; - FIELD field_4342 fontRenderer Lnet/minecraft/class_327; - FIELD field_4344 cameraEntity Lnet/minecraft/class_4184; + FIELD field_4342 textRenderer Lnet/minecraft/class_327; + FIELD field_4344 camera Lnet/minecraft/class_4184; FIELD field_4345 renderers Ljava/util/Map; FIELD field_4346 INSTANCE Lnet/minecraft/class_824; FIELD field_4347 textureManager Lnet/minecraft/class_1060; FIELD field_4348 world Lnet/minecraft/class_1937; - FIELD field_4350 hitResult Lnet/minecraft/class_239; + FIELD field_4350 crosshairTarget Lnet/minecraft/class_239; METHOD method_23077 renderEntity (Lnet/minecraft/class_2586;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)Z + ARG 1 entity + ARG 2 matrix + ARG 3 vertexConsumerProvider + ARG 4 light + ARG 5 overlay METHOD method_23078 register (Lnet/minecraft/class_2591;Lnet/minecraft/class_827;)V METHOD method_23079 render (Lnet/minecraft/class_827;Lnet/minecraft/class_2586;DDDFLnet/minecraft/class_4587;Lnet/minecraft/class_4597;)V ARG 0 renderer @@ -18,9 +23,16 @@ CLASS net/minecraft/class_824 net/minecraft/client/render/block/entity/BlockEnti ARG 8 tickDelta ARG 9 matrix METHOD method_3549 configure (Lnet/minecraft/class_1937;Lnet/minecraft/class_1060;Lnet/minecraft/class_327;Lnet/minecraft/class_4184;Lnet/minecraft/class_239;)V + ARG 1 world + ARG 2 textureManager + ARG 3 textRenderer + ARG 4 camera + ARG 5 crosshairTarget METHOD method_3550 get (Lnet/minecraft/class_2586;)Lnet/minecraft/class_827; METHOD method_3551 setWorld (Lnet/minecraft/class_1937;)V METHOD method_3552 renderEntity (Lnet/minecraft/class_2586;Lnet/minecraft/class_4587;)V + ARG 1 entity + ARG 2 matrix METHOD method_3554 runReported (Lnet/minecraft/class_2586;Ljava/lang/Runnable;)V METHOD method_3555 render (Lnet/minecraft/class_2586;FLnet/minecraft/class_4587;Lnet/minecraft/class_4597;DDD)V ARG 1 blockEntity @@ -29,4 +41,4 @@ CLASS net/minecraft/class_824 net/minecraft/client/render/block/entity/BlockEnti ARG 5 x ARG 7 y ARG 9 z - METHOD method_3556 getFontRenderer ()Lnet/minecraft/class_327; + METHOD method_3556 getTextRenderer ()Lnet/minecraft/class_327; diff --git a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderer.mapping index 82cbf11dc6..a0542b9c06 100644 --- a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderer.mapping @@ -9,4 +9,6 @@ CLASS net/minecraft/class_827 net/minecraft/client/render/block/entity/BlockEnti ARG 6 z ARG 8 tickDelta ARG 9 matrix - ARG 11 lightmapCoordinates + ARG 10 output + ARG 11 light + ARG 12 overlay diff --git a/mappings/net/minecraft/client/render/chunk/BlockLayeredBufferBuilderStorage.mapping b/mappings/net/minecraft/client/render/chunk/BlockBufferBuilderStorage.mapping similarity index 72% rename from mappings/net/minecraft/client/render/chunk/BlockLayeredBufferBuilderStorage.mapping rename to mappings/net/minecraft/client/render/chunk/BlockBufferBuilderStorage.mapping index 6c3b47d833..b94e23ef7c 100644 --- a/mappings/net/minecraft/client/render/chunk/BlockLayeredBufferBuilderStorage.mapping +++ b/mappings/net/minecraft/client/render/chunk/BlockBufferBuilderStorage.mapping @@ -1,5 +1,5 @@ -CLASS net/minecraft/class_750 net/minecraft/client/render/chunk/BlockLayeredBufferBuilderStorage - FIELD field_3951 layerBuilders Ljava/util/Map; +CLASS net/minecraft/class_750 net/minecraft/client/render/chunk/BlockBufferBuilderStorage + FIELD field_3951 builders Ljava/util/Map; METHOD method_22705 clear ()V METHOD method_23501 reset ()V METHOD method_3154 get (Lnet/minecraft/class_1921;)Lnet/minecraft/class_287; diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping deleted file mode 100644 index 7dfa8a88b1..0000000000 --- a/mappings/net/minecraft/client/render/chunk/ChunkBatcher.mapping +++ /dev/null @@ -1,73 +0,0 @@ -CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBatcher - CLASS class_849 ChunkRenderData - FIELD field_4450 nonEmpty Ljava/util/Set; - FIELD field_4451 EMPTY Lnet/minecraft/class_846$class_849; - FIELD field_4452 initialized 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; - FIELD field_4456 blockEntities Ljava/util/List; - METHOD method_3641 isEmpty (Lnet/minecraft/class_1921;)Z - ARG 1 layer - METHOD method_3642 getBlockEntities ()Ljava/util/List; - METHOD method_3645 isEmpty ()Z - METHOD method_3650 isVisibleThrough (Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;)Z - CLASS class_851 ChunkRenderer - CLASS class_4577 Task - FIELD field_20835 priority D - FIELD field_20836 cancelled Ljava/util/concurrent/atomic/AtomicBoolean; - METHOD (Lnet/minecraft/class_846$class_851;D)V - ARG 2 priority - METHOD method_22782 cancel ()V - METHOD method_22783 scheduleBatching (Lnet/minecraft/class_750;)Ljava/util/concurrent/CompletableFuture; - CLASS class_4578 UploadTask - FIELD field_20838 region Lnet/minecraft/class_853; - CLASS class_4579 BuildTask - FIELD field_20841 data Lnet/minecraft/class_846$class_849; - FIELD field_20834 uploadTask Lnet/minecraft/class_846$class_851$class_4578; - FIELD field_4457 blockEntities Ljava/util/Set; - FIELD field_4458 boundingBox Lnet/minecraft/class_238; - FIELD field_4459 data Ljava/util/concurrent/atomic/AtomicReference; - FIELD field_4461 buildTask Lnet/minecraft/class_846$class_851$class_4579; - FIELD field_4462 buffers Ljava/util/Map; - FIELD field_4463 rebuildOnClientThread Z - FIELD field_4464 rebuildScheduled Z - FIELD field_4467 origin Lnet/minecraft/class_2338$class_2339; - FIELD field_4472 neighborPositions [Lnet/minecraft/class_2338$class_2339; - METHOD method_3651 isChunkNonEmpty (Lnet/minecraft/class_2338;)Z - METHOD method_3653 setOrigin (III)V - ARG 1 x - ARG 2 y - ARG 3 z - METHOD method_3654 scheduleRebuild (Z)V - ARG 1 rebuildOnClientThread - METHOD method_3655 beginBufferBuilding (Lnet/minecraft/class_287;)V - METHOD method_3656 getGlBuffer (Lnet/minecraft/class_1921;)Lnet/minecraft/class_291; - METHOD method_3659 delete ()V - METHOD method_3661 shouldRebuildOnClientThread ()Z - METHOD method_3662 unscheduleRebuild ()V - METHOD method_3663 cancel ()V - METHOD method_3668 getSquaredCameraDistance ()D - METHOD method_3670 getOrigin ()Lnet/minecraft/class_2338; - METHOD method_3672 shouldRebuild ()Z - METHOD method_3673 shouldBuild ()Z - METHOD method_3674 startRebuild ()Lnet/minecraft/class_846$class_851$class_4577; - METHOD method_3675 clear ()V - METHOD method_3676 getNeighborPosition (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2338; - ARG 1 direction - METHOD method_3677 getData ()Lnet/minecraft/class_846$class_849; - CLASS class_4690 Result - FIELD field_18766 cameraPosition Lnet/minecraft/class_243; - FIELD field_4435 pendingChunks Ljava/util/PriorityQueue; - FIELD field_4443 pendingUploads Ljava/util/Queue; - FIELD field_4445 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD method_19419 setCameraPosition (Lnet/minecraft/class_243;)V - ARG 1 cameraPosition - METHOD method_19420 getCameraPosition ()Lnet/minecraft/class_243; - METHOD method_3619 stop ()V - METHOD method_3622 getDebugString ()Ljava/lang/String; - METHOD method_3627 rebuildSync (Lnet/minecraft/class_846$class_851;)V - METHOD method_3630 isEmpty ()Z - METHOD method_3632 reset ()V - METHOD method_3633 clear ()V - METHOD method_3635 upload (Lnet/minecraft/class_287;Lnet/minecraft/class_291;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping new file mode 100644 index 0000000000..3d22a3608e --- /dev/null +++ b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping @@ -0,0 +1,125 @@ +CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder + CLASS class_849 ChunkData + CLASS 1 + METHOD isVisibleThrough (Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;)Z + ARG 1 direction + FIELD field_4450 nonEmpty Ljava/util/Set; + FIELD field_4451 EMPTY Lnet/minecraft/class_846$class_849; + FIELD field_4452 initialized 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; + FIELD field_4456 blockEntities Ljava/util/List; + METHOD method_3641 isEmpty (Lnet/minecraft/class_1921;)Z + ARG 1 layer + METHOD method_3642 getBlockEntities ()Ljava/util/List; + METHOD method_3645 isEmpty ()Z + 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_20836 cancelled Ljava/util/concurrent/atomic/AtomicBoolean; + METHOD (D)V + ARG 1 priority + 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 priority + ARG 3 region + METHOD run (Lnet/minecraft/class_750;)Ljava/util/concurrent/CompletableFuture; + ARG 1 buffers + CLASS class_4579 SortTask + FIELD field_20841 data Lnet/minecraft/class_846$class_849; + METHOD (DLnet/minecraft/class_846$class_849;)V + ARG 1 priority + 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; + FIELD field_4459 data Ljava/util/concurrent/atomic/AtomicReference; + FIELD field_4461 sortTask Lnet/minecraft/class_846$class_851$class_4579; + FIELD field_4462 buffers Ljava/util/Map; + FIELD field_4463 needsImportantRebuild Z + FIELD field_4464 needsRebuild Z + FIELD field_4467 origin Lnet/minecraft/class_2338$class_2339; + FIELD field_4471 rebuildFrame I + FIELD field_4472 neighborPositions [Lnet/minecraft/class_2338$class_2339; + METHOD method_22773 scheduleSort (Lnet/minecraft/class_1921;Lnet/minecraft/class_846;)Z + ARG 1 layer + ARG 2 chunkRenderer + METHOD method_22777 scheduleRebuild (Lnet/minecraft/class_846;)V + ARG 1 chunkRenderer + METHOD method_22781 rebuild ()V + METHOD method_3651 isChunkNonEmpty (Lnet/minecraft/class_2338;)Z + ARG 1 pos + METHOD method_3653 setOrigin (III)V + ARG 1 x + ARG 2 y + ARG 3 z + METHOD method_3654 scheduleRebuild (Z)V + ARG 1 important + METHOD method_3655 beginBufferBuilding (Lnet/minecraft/class_287;)V + ARG 1 buffer + METHOD method_3656 getBuffer (Lnet/minecraft/class_1921;)Lnet/minecraft/class_291; + ARG 1 layer + METHOD method_3659 delete ()V + METHOD method_3661 needsImportantRebuild ()Z + METHOD method_3662 cancelRebuild ()V + METHOD method_3663 cancel ()V + METHOD method_3668 getSquaredCameraDistance ()D + METHOD method_3670 getOrigin ()Lnet/minecraft/class_2338; + METHOD method_3671 setRebuildFrame (I)Z + ARG 1 frame + METHOD method_3672 needsRebuild ()Z + METHOD method_3673 shouldBuild ()Z + METHOD method_3674 createRebuildTask ()Lnet/minecraft/class_846$class_851$class_4577; + METHOD method_3675 clear ()V + METHOD method_3676 getNeighborPosition (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2338; + ARG 1 direction + METHOD method_3677 getData ()Lnet/minecraft/class_846$class_849; + CLASS class_4690 Result + FIELD field_18766 cameraPosition Lnet/minecraft/class_243; + FIELD field_20827 threadBuffers Ljava/util/Queue; + FIELD field_20828 buffers Lnet/minecraft/class_750; + FIELD field_20829 mailbox Lnet/minecraft/class_3846; + FIELD field_20830 executor Ljava/util/concurrent/Executor; + FIELD field_20831 world Lnet/minecraft/class_1937; + FIELD field_20832 worldRenderer Lnet/minecraft/class_761; + FIELD field_20992 queuedTaskCount I + FIELD field_20993 bufferCount I + FIELD field_4435 rebuildQueue Ljava/util/PriorityQueue; + FIELD field_4443 uploadQueue Ljava/util/Queue; + FIELD field_4445 LOGGER Lorg/apache/logging/log4j/Logger; + METHOD (Lnet/minecraft/class_1937;Lnet/minecraft/class_761;Ljava/util/concurrent/Executor;ZLnet/minecraft/class_750;)V + ARG 1 world + ARG 2 worldRenderer + ARG 3 executor + ARG 4 is64Bits + ARG 5 buffers + METHOD method_19419 setCameraPosition (Lnet/minecraft/class_243;)V + ARG 1 cameraPosition + METHOD method_19420 getCameraPosition ()Lnet/minecraft/class_243; + METHOD method_22752 setWorld (Lnet/minecraft/class_1937;)V + ARG 1 world + METHOD method_22756 send (Lnet/minecraft/class_846$class_851$class_4577;)V + ARG 1 task + METHOD method_22759 upload (Lnet/minecraft/class_287;Lnet/minecraft/class_291;)Ljava/util/concurrent/CompletableFuture; + ARG 1 buffer + ARG 2 glBuffer + METHOD method_22761 upload ()Z + METHOD method_22763 scheduleRunTasks ()V + METHOD method_3619 stop ()V + METHOD method_3622 getDebugString ()Ljava/lang/String; + METHOD method_3627 rebuild (Lnet/minecraft/class_846$class_851;)V + ARG 1 chunk + METHOD method_3630 isEmpty ()Z + METHOD method_3632 reset ()V + METHOD method_3633 clear ()V + METHOD method_3635 scheduleUpload (Lnet/minecraft/class_287;Lnet/minecraft/class_291;)Ljava/util/concurrent/CompletableFuture; + ARG 1 buffer + ARG 2 glBuffer diff --git a/mappings/net/minecraft/client/render/debug/ChunkBorderDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/ChunkBorderDebugRenderer.mapping index 9e4dd8d3d1..21e41dee91 100644 --- a/mappings/net/minecraft/client/render/debug/ChunkBorderDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/ChunkBorderDebugRenderer.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_862 net/minecraft/client/render/debug/ChunkBorderDebugRenderer FIELD field_4516 client Lnet/minecraft/class_310; + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client diff --git a/mappings/net/minecraft/client/render/debug/CollisionDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/CollisionDebugRenderer.mapping new file mode 100644 index 0000000000..f7ccf3938e --- /dev/null +++ b/mappings/net/minecraft/client/render/debug/CollisionDebugRenderer.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_865 net/minecraft/client/render/debug/CollisionDebugRenderer + FIELD field_4540 client Lnet/minecraft/class_310; + FIELD field_4541 lastUpdateTime D + FIELD field_4542 collisions Ljava/util/List; + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client diff --git a/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping index d8c5c23ee3..0a823a84d9 100644 --- a/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/DebugRenderer.mapping @@ -2,8 +2,8 @@ CLASS net/minecraft/class_863 net/minecraft/client/render/debug/DebugRenderer CLASS class_864 Renderer METHOD method_20414 clear ()V METHOD method_23109 render (J)V - ARG 1 time - FIELD field_18777 pointsOfInterestDebugRenderer Lnet/minecraft/class_4207; + ARG 1 limitTime + 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; @@ -14,7 +14,7 @@ CLASS net/minecraft/class_863 net/minecraft/client/render/debug/DebugRenderer FIELD field_4531 showChunkBorder Z FIELD field_4532 chunkBorderDebugRenderer Lnet/minecraft/class_863$class_864; FIELD field_4533 chunkLoadingDebugRenderer Lnet/minecraft/class_863$class_864; - FIELD field_4534 voxelDebugRenderer Lnet/minecraft/class_863$class_864; + FIELD field_4534 collisionDebugRenderer Lnet/minecraft/class_863$class_864; FIELD field_4535 neighborUpdateDebugRenderer Lnet/minecraft/class_863$class_864; FIELD field_4536 skyLightDebugRenderer Lnet/minecraft/class_863$class_864; FIELD field_4537 worldGenAttemptDebugRenderer Lnet/minecraft/class_863$class_864; @@ -23,10 +23,69 @@ CLASS net/minecraft/class_863 net/minecraft/client/render/debug/DebugRenderer METHOD (Lnet/minecraft/class_310;)V ARG 1 client METHOD method_20413 reset ()V - METHOD method_23098 box (DDDDDDFFFF)V - METHOD method_23102 box (Lnet/minecraft/class_238;FFFF)V + METHOD method_23098 drawBox (DDDDDDFFFF)V + ARG 0 minX + ARG 2 minY + ARG 4 minZ + ARG 6 maxX + ARG 8 maxY + ARG 10 maxZ + ARG 12 red + ARG 13 green + ARG 14 blue + ARG 15 alpha + METHOD method_23099 render (J)V + ARG 1 limitTime + METHOD method_23101 getTargettedEntity (Lnet/minecraft/class_1297;I)Ljava/util/Optional; + ARG 0 entity + ARG 1 maxDistance + METHOD method_23102 drawBox (Lnet/minecraft/class_238;FFFF)V + ARG 0 box + ARG 1 red + ARG 2 green + ARG 3 blue + ARG 4 alpha + METHOD method_23103 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_23104 drawBox (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;FFFF)V + ARG 0 pos1 + ARG 1 pos2 + ARG 2 red + ARG 3 green + ARG 4 blue + ARG 5 alpha METHOD method_23105 drawString (Ljava/lang/String;DDDI)V + ARG 0 string + ARG 1 x + ARG 3 y + ARG 5 z + ARG 7 color METHOD method_23106 drawString (Ljava/lang/String;DDDIF)V + ARG 0 string + ARG 1 x + ARG 3 y + ARG 5 z + ARG 7 color + ARG 8 size METHOD method_23107 drawString (Ljava/lang/String;DDDIFZFZ)V + ARG 0 string + ARG 1 x + ARG 3 y + ARG 5 z + ARG 7 color + ARG 8 size + ARG 9 center + ARG 10 offset + ARG 11 visibleThroughObjects METHOD method_23108 drawString (Ljava/lang/String;IIII)V + ARG 0 string + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 color METHOD method_3713 toggleShowChunkBorder ()Z diff --git a/mappings/net/minecraft/client/render/debug/HeightmapDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/HeightmapDebugRenderer.mapping index 9b544ec92c..6b69ec9350 100644 --- a/mappings/net/minecraft/client/render/debug/HeightmapDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/HeightmapDebugRenderer.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_867 net/minecraft/client/render/debug/HeightmapDebugRenderer FIELD field_4613 client Lnet/minecraft/class_310; + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client diff --git a/mappings/net/minecraft/client/render/debug/NeighborUpdateDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/NeighborUpdateDebugRenderer.mapping index e12b6d5008..b5794118aa 100644 --- a/mappings/net/minecraft/client/render/debug/NeighborUpdateDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/NeighborUpdateDebugRenderer.mapping @@ -1 +1,8 @@ CLASS net/minecraft/class_869 net/minecraft/client/render/debug/NeighborUpdateDebugRenderer + FIELD field_4622 client Lnet/minecraft/class_310; + FIELD field_4623 neighborUpdates Ljava/util/Map; + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client + METHOD method_3870 addNeighborUpdate (JLnet/minecraft/class_2338;)V + ARG 1 time + ARG 3 pos diff --git a/mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping index ce803b8b18..86cf80421f 100644 --- a/mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping @@ -2,6 +2,21 @@ CLASS net/minecraft/class_868 net/minecraft/client/render/debug/PathfindingDebug FIELD field_4614 client Lnet/minecraft/class_310; FIELD field_4615 pathTimes Ljava/util/Map; FIELD field_4616 paths Ljava/util/Map; + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client + METHOD method_23117 drawPathLines (Lnet/minecraft/class_4184;Lnet/minecraft/class_11;)V + ARG 0 camera + ARG 1 path + METHOD method_23118 drawPath (Lnet/minecraft/class_4184;Lnet/minecraft/class_11;FZZ)V + ARG 0 camera + ARG 1 path + METHOD method_23119 getManhattanDistance (Lnet/minecraft/class_4184;Lnet/minecraft/class_2338;)F + ARG 0 camera + ARG 1 pos + METHOD method_23120 getCamera ()Lnet/minecraft/class_4184; + METHOD method_23121 drawPathInternal (Lnet/minecraft/class_4184;Lnet/minecraft/class_11;FZZ)V + ARG 0 camera + ARG 1 path METHOD method_3869 addPath (ILnet/minecraft/class_11;F)V ARG 1 id ARG 2 path diff --git a/mappings/net/minecraft/client/render/debug/PointOfInterestDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/PointOfInterestDebugRenderer.mapping deleted file mode 100644 index d595f10a04..0000000000 --- a/mappings/net/minecraft/client/render/debug/PointOfInterestDebugRenderer.mapping +++ /dev/null @@ -1,16 +0,0 @@ -CLASS net/minecraft/class_4207 net/minecraft/client/render/debug/PointOfInterestDebugRenderer - CLASS class_4232 Brain - CLASS class_4233 PointOfInterest - FIELD field_18931 pos Lnet/minecraft/class_2338; - FIELD field_18933 freeTicketCount I - FIELD field_18786 client Lnet/minecraft/class_310; - FIELD field_18787 pointsOfInterest Ljava/util/Map; - FIELD field_18788 chunkSections Ljava/util/Set; - FIELD field_18920 LOGGER Lorg/apache/logging/log4j/Logger; - FIELD field_18921 brains Ljava/util/Map; - METHOD method_19432 addBrain (Lnet/minecraft/class_4207$class_4232;)V - METHOD method_19433 addChunkSection (Lnet/minecraft/class_4076;)V - METHOD method_19434 removePointOfInterest (Lnet/minecraft/class_2338;)V - METHOD method_19435 removeChunkSection (Lnet/minecraft/class_4076;)V - METHOD method_19701 addPointOfInterest (Lnet/minecraft/class_4207$class_4233;)V - METHOD method_19702 setFreeTicketCount (Lnet/minecraft/class_2338;I)V diff --git a/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping new file mode 100644 index 0000000000..cb924ed635 --- /dev/null +++ b/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping @@ -0,0 +1,63 @@ +CLASS net/minecraft/class_4207 net/minecraft/client/render/debug/VillageDebugRenderer + CLASS class_4232 Brain + FIELD field_18923 uuid Ljava/util/UUID; + FIELD field_18926 pos Lnet/minecraft/class_2374; + FIELD field_19329 xp I + FIELD field_19330 path Lnet/minecraft/class_11; + FIELD field_19373 wantsGolem Z + METHOD (Ljava/util/UUID;ILjava/lang/String;Ljava/lang/String;ILnet/minecraft/class_2374;Ljava/lang/String;Lnet/minecraft/class_11;Z)V + ARG 1 uuid + ARG 5 xp + ARG 6 pos + ARG 8 path + ARG 9 wantsGolem + METHOD method_23149 getUuid ()Ljava/util/UUID; + CLASS class_4233 PointOfInterest + FIELD field_18931 pos Lnet/minecraft/class_2338; + FIELD field_18933 freeTicketCount I + FIELD field_18786 client Lnet/minecraft/class_310; + FIELD field_18787 pointsOfInterest Ljava/util/Map; + 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; + METHOD method_19432 addBrain (Lnet/minecraft/class_4207$class_4232;)V + ARG 1 brain + METHOD method_19433 addSection (Lnet/minecraft/class_4076;)V + ARG 1 pos + METHOD method_19434 removePointOfInterest (Lnet/minecraft/class_2338;)V + METHOD method_19435 removeSection (Lnet/minecraft/class_4076;)V + ARG 1 pos + METHOD method_19701 addPointOfInterest (Lnet/minecraft/class_4207$class_4233;)V + METHOD method_19702 setFreeTicketCount (Lnet/minecraft/class_2338;I)V + ARG 1 pos + ARG 2 freeTicketCount + METHOD method_23131 drawGhostPointOfInterest (Lnet/minecraft/class_2338;Ljava/util/List;)V + METHOD method_23132 drawString (Lnet/minecraft/class_2374;ILjava/lang/String;IF)V + ARG 0 pos + ARG 1 offsetY + ARG 2 string + ARG 3 color + ARG 4 size + METHOD method_23133 drawString (Ljava/lang/String;Lnet/minecraft/class_4207$class_4233;II)V + ARG 0 string + ARG 1 pointOfInterest + ARG 2 offsetY + ARG 3 color + METHOD method_23134 drawString (Ljava/lang/String;Lnet/minecraft/class_2338;II)V + ARG 0 string + ARG 1 pos + ARG 2 offsetY + ARG 3 color + METHOD method_23136 drawPath (Lnet/minecraft/class_4207$class_4232;)V + ARG 1 brain + METHOD method_23137 drawPointOfInterest (Lnet/minecraft/class_4207$class_4233;)V + ARG 1 pointOfInterest + METHOD method_23140 drawBrain (Lnet/minecraft/class_4207$class_4232;)V + ARG 1 brain + 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 + ARG 1 brain + METHOD method_23146 updateTargettedEntity ()V diff --git a/mappings/net/minecraft/client/render/debug/VoxelDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/VoxelDebugRenderer.mapping deleted file mode 100644 index bd7fbc32aa..0000000000 --- a/mappings/net/minecraft/client/render/debug/VoxelDebugRenderer.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_865 net/minecraft/client/render/debug/VoxelDebugRenderer diff --git a/mappings/net/minecraft/client/render/debug/WaterDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/WaterDebugRenderer.mapping index f79bfcd36c..250b148cc9 100644 --- a/mappings/net/minecraft/client/render/debug/WaterDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/WaterDebugRenderer.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_872 net/minecraft/client/render/debug/WaterDebugRenderer FIELD field_4629 client Lnet/minecraft/class_310; + METHOD (Lnet/minecraft/class_310;)V + ARG 1 client diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping index 3c7df99505..60aa1c0dc4 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis ARG 1 textureManager METHOD method_17145 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_897;)V METHOD method_23165 renderFire (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1297;)V - ARG 1 matrices + ARG 1 matrix METHOD method_23167 registerRenderers (Lnet/minecraft/class_918;Lnet/minecraft/class_3296;)V METHOD method_23168 getSquaredDistanceToCamera (Lnet/minecraft/class_1297;)D METHOD method_3941 configure (Lnet/minecraft/class_1937;Lnet/minecraft/class_4184;Lnet/minecraft/class_1297;)V diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping index d6f7588d07..f474b6d925 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping @@ -23,5 +23,6 @@ CLASS net/minecraft/class_897 net/minecraft/client/render/entity/EntityRenderer ARG 6 z ARG 8 yaw ARG 9 tickDelta - ARG 10 matrices + ARG 10 matrix + ARG 11 vertexConsumers METHOD method_3940 getRenderManager ()Lnet/minecraft/class_898; diff --git a/mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping b/mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping index cba2141eec..5412e68123 100644 --- a/mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/BuiltinModelItemRenderer.mapping @@ -11,3 +11,8 @@ CLASS net/minecraft/class_756 net/minecraft/client/render/item/BuiltinModelItemR FIELD field_3985 modelTrident Lnet/minecraft/class_613; FIELD field_3986 INSTANCE Lnet/minecraft/class_756; METHOD method_3166 render (Lnet/minecraft/class_1799;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)V + ARG 1 stack + ARG 2 matrix + ARG 3 vertexConsumerProvider + ARG 4 light + ARG 5 overlay diff --git a/mappings/net/minecraft/client/resource/FoliageColormapResourceSupplier.mapping b/mappings/net/minecraft/client/resource/FoliageColormapResourceSupplier.mapping index dd2804dbf9..d0bb873a09 100644 --- a/mappings/net/minecraft/client/resource/FoliageColormapResourceSupplier.mapping +++ b/mappings/net/minecraft/client/resource/FoliageColormapResourceSupplier.mapping @@ -1,2 +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 + ARG 1 resourceManager diff --git a/mappings/net/minecraft/client/sound/SoundEngine.mapping b/mappings/net/minecraft/client/sound/SoundEngine.mapping index 3cf8ff380e..6098522ceb 100644 --- a/mappings/net/minecraft/client/sound/SoundEngine.mapping +++ b/mappings/net/minecraft/client/sound/SoundEngine.mapping @@ -27,3 +27,4 @@ CLASS net/minecraft/class_4225 net/minecraft/client/sound/SoundEngine METHOD method_19665 getListener ()Lnet/minecraft/class_4227; METHOD method_20050 openDevice ()J METHOD method_20296 getDebugString ()Ljava/lang/String; + METHOD method_20297 getMonoSourceCount ()I diff --git a/mappings/net/minecraft/client/texture/NativeImage.mapping b/mappings/net/minecraft/client/texture/NativeImage.mapping index 70ceec2a26..5dfb52abee 100644 --- a/mappings/net/minecraft/client/texture/NativeImage.mapping +++ b/mappings/net/minecraft/client/texture/NativeImage.mapping @@ -77,6 +77,18 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage ARG 5 pointer METHOD method_15990 read (Ljava/lang/String;)Lnet/minecraft/class_1011; ARG 0 dataUri + METHOD method_22619 upload (IIIIIIIZZZZ)V + ARG 1 level + ARG 2 offsetX + ARG 3 offsetY + ARG 4 unpackSkipPixels + ARG 5 unpackSkipRows + ARG 6 width + ARG 7 height + ARG 8 blur + ARG 9 clamp + ARG 10 mipmap + ARG 11 close METHOD method_4300 resizeSubRectTo (IIIILnet/minecraft/class_1011;)V ARG 1 x ARG 2 y @@ -85,8 +97,8 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage ARG 5 targetImage METHOD method_4301 upload (IIIZ)V ARG 1 level - ARG 2 xOffset - ARG 3 yOffset + ARG 2 offsetX + ARG 3 offsetY ARG 4 mipmap METHOD method_4302 untrack ()V METHOD method_4303 read (Lnet/minecraft/class_1011$class_1012;Ljava/nio/ByteBuffer;)Lnet/minecraft/class_1011; @@ -114,13 +126,14 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage ARG 2 y METHOD method_4312 upload (IIIIIIIZZ)V ARG 1 level - ARG 2 xOffset - ARG 3 yOffset + ARG 2 offsetX + ARG 3 offsetY ARG 4 unpackSkipPixels ARG 5 unpackSkipRows ARG 6 width ARG 7 height ARG 8 mipmap + ARG 9 close METHOD method_4313 setTextureClamp (Z)V ARG 0 clamp METHOD method_4314 writeFile (Ljava/nio/file/Path;)V @@ -143,7 +156,7 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage METHOD method_4318 getFormat ()Lnet/minecraft/class_1011$class_1012; METHOD method_4319 mirrorVertically ()V METHOD method_4320 checkAllocated ()V - METHOD method_4321 upload (IIIIIIIZZZZ)V + METHOD method_4321 uploadInternal (IIIIIIIZZZZ)V ARG 1 level ARG 2 xOffset ARG 3 yOffset @@ -154,6 +167,7 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage ARG 8 blur ARG 9 clamp ARG 10 mipmap + ARG 11 close METHOD method_4322 makePixelArray ()[I METHOD method_4323 getHeight ()I METHOD method_4324 read (Ljava/nio/ByteBuffer;)Lnet/minecraft/class_1011; diff --git a/mappings/net/minecraft/client/texture/TextureManager.mapping b/mappings/net/minecraft/client/texture/TextureManager.mapping index b7b08247ac..59e538b67e 100644 --- a/mappings/net/minecraft/client/texture/TextureManager.mapping +++ b/mappings/net/minecraft/client/texture/TextureManager.mapping @@ -6,6 +6,8 @@ CLASS net/minecraft/class_1060 net/minecraft/client/texture/TextureManager FIELD field_5287 resourceContainer Lnet/minecraft/class_3300; FIELD field_5288 LOGGER Lorg/apache/logging/log4j/Logger; METHOD method_18168 loadTextureAsync (Lnet/minecraft/class_2960;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + METHOD method_22812 runOnRenderThread (Ljava/lang/Runnable;)V + ARG 0 runnable METHOD method_22813 bindTexture (Lnet/minecraft/class_2960;)V METHOD method_4615 destroyTexture (Lnet/minecraft/class_2960;)V METHOD method_4616 registerTexture (Lnet/minecraft/class_2960;Lnet/minecraft/class_1044;)Z diff --git a/mappings/net/minecraft/client/util/MonitorTracker.mapping b/mappings/net/minecraft/client/util/MonitorTracker.mapping index 055c3f8f20..07272f7a11 100644 --- a/mappings/net/minecraft/client/util/MonitorTracker.mapping +++ b/mappings/net/minecraft/client/util/MonitorTracker.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_323 net/minecraft/client/util/MonitorTracker FIELD field_1991 monitorFactory Lnet/minecraft/class_3676; FIELD field_1993 pointerToMonitorMap Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; + METHOD (Lnet/minecraft/class_3676;)V + ARG 1 monitorFactory METHOD method_15991 clamp (III)I ARG 0 value ARG 1 min diff --git a/mappings/net/minecraft/client/util/PngFile.mapping b/mappings/net/minecraft/client/util/PngFile.mapping index edceae3fad..1de3dcc827 100644 --- a/mappings/net/minecraft/client/util/PngFile.mapping +++ b/mappings/net/minecraft/client/util/PngFile.mapping @@ -1,11 +1,36 @@ CLASS net/minecraft/class_1050 net/minecraft/client/util/PngFile CLASS class_1051 Reader + FIELD field_5228 errored Z METHOD method_4543 read (JJI)I + ARG 1 user + ARG 3 data + ARG 5 size + METHOD method_4544 read (JI)I + ARG 1 data + ARG 3 size + METHOD method_4545 skip (I)V + ARG 1 n METHOD method_4546 eof (J)I + ARG 1 user METHOD method_4547 skip (JI)V + ARG 1 user + ARG 3 n CLASS class_1052 ChannelReader - CLASS class_1053 FileReader + FIELD field_5229 channel Ljava/nio/channels/ReadableByteChannel; + FIELD field_5230 readPosition I + FIELD field_5231 bufferPosition I + FIELD field_5232 bufferSize I + FIELD field_5233 buffer J + METHOD method_4548 readToBuffer (I)V + ARG 1 size + CLASS class_1053 SeekableChannelReader + FIELD field_5234 channel Ljava/nio/channels/SeekableByteChannel; + METHOD (Ljava/nio/channels/SeekableByteChannel;)V + ARG 1 channel FIELD field_5226 height I FIELD field_5227 width I + METHOD (Ljava/lang/String;Ljava/io/InputStream;)V + ARG 1 name + ARG 2 in METHOD method_4542 createReader (Ljava/io/InputStream;)Lnet/minecraft/class_1050$class_1051; ARG 0 is diff --git a/mappings/net/minecraft/client/util/Window.mapping b/mappings/net/minecraft/client/util/Window.mapping index 93261383c8..4011a6e55f 100644 --- a/mappings/net/minecraft/client/util/Window.mapping +++ b/mappings/net/minecraft/client/util/Window.mapping @@ -1,12 +1,18 @@ CLASS net/minecraft/class_1041 net/minecraft/client/util/Window FIELD field_16238 framerateLimit I - FIELD field_5176 windowEventHandler Lnet/minecraft/class_3678; + FIELD field_16517 vsync Z + FIELD field_5174 windowedWidth I + FIELD field_5175 windowedX I + FIELD field_5176 eventHandler Lnet/minecraft/class_3678; FIELD field_5178 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_5179 scaleFactor D FIELD field_5180 scaledWidth I FIELD field_5181 framebufferWidth I FIELD field_5182 width I - FIELD field_5183 positionX I + FIELD field_5183 x I + FIELD field_5184 windowedHeight I + FIELD field_5185 windowedY I + FIELD field_5186 videoModeDirty Z FIELD field_5187 handle J FIELD field_5190 errorCallback Lorg/lwjgl/glfw/GLFWErrorCallback; FIELD field_5191 fullscreen Z @@ -16,15 +22,21 @@ CLASS net/minecraft/class_1041 net/minecraft/client/util/Window FIELD field_5195 monitorTracker Lnet/minecraft/class_323; FIELD field_5196 framebufferHeight I FIELD field_5197 height I - FIELD field_5198 positionY I + FIELD field_5198 y I + METHOD (Lnet/minecraft/class_3678;Lnet/minecraft/class_323;Lnet/minecraft/class_543;Ljava/lang/String;Ljava/lang/String;)V + ARG 1 eventHandler + ARG 2 monitorTracker + ARG 3 settings + ARG 4 videoMode + ARG 5 title METHOD method_15997 setScaleFactor (D)V ARG 1 scaleFactor METHOD method_15998 setFullscreen ()V METHOD method_15999 setFramerateLimit (I)V METHOD method_16000 getFramerateLimit ()I METHOD method_20831 getMonitor ()Lnet/minecraft/class_313; - METHOD method_21668 setRawMouseInput (Z)V - ARG 1 rawMouseInput + METHOD method_21668 setRawMouseMotion (Z)V + ARG 1 rawMouseMotion METHOD method_22092 getRefreshRate ()I METHOD method_22093 shouldClose ()Z METHOD method_4474 setPhase (Ljava/lang/String;)V @@ -32,13 +44,14 @@ CLASS net/minecraft/class_1041 net/minecraft/client/util/Window METHOD method_4476 calculateScaleFactor (IZ)I ARG 1 guiScale ARG 2 forceUnicodeFont - METHOD method_4477 getPositionX ()I + METHOD method_4477 getY ()I METHOD method_4478 onWindowPosChanged (JII)V METHOD method_4480 getWidth ()I - METHOD method_4481 throwExceptionOnGlError ()V + METHOD method_4481 throwOnGlError ()V METHOD method_4482 logGlError (IJ)V ARG 1 error ARG 2 description + METHOD method_4483 updateFramebufferSize ()V METHOD method_4486 getScaledWidth ()I METHOD method_4488 onWindowSizeChanged (JII)V ARG 1 window @@ -49,22 +62,33 @@ CLASS net/minecraft/class_1041 net/minecraft/client/util/Window METHOD method_4491 setIcon (Ljava/io/InputStream;Ljava/io/InputStream;)V ARG 1 icon16 ARG 2 icon32 + METHOD method_4492 acceptError (Ljava/util/function/BiConsumer;)V + ARG 0 consumer METHOD method_4494 onWindowFocusChanged (JZ)V ARG 1 window ARG 3 focused METHOD method_4495 getScaleFactor ()D METHOD method_4497 setVsync (Z)V + ARG 1 vsync METHOD method_4498 isFullscreen ()Z - METHOD method_4499 getPositionY ()I + METHOD method_4499 getX ()I METHOD method_4500 toggleFullscreen ()V - METHOD method_4501 throwExceptionForGlError (IJ)V + METHOD method_4501 throwGlError (IJ)V + ARG 0 error + ARG 1 description METHOD method_4502 getScaledHeight ()I METHOD method_4504 onFramebufferSizeChanged (JII)V ARG 1 window ARG 3 width ARG 4 height METHOD method_4505 setVideoMode (Ljava/util/Optional;)V + ARG 1 videoMode METHOD method_4506 getFramebufferHeight ()I METHOD method_4507 getHeight ()I + METHOD method_4510 readImage (Ljava/io/InputStream;Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;)Ljava/nio/ByteBuffer; + ARG 1 in + ARG 2 x + ARG 3 y + ARG 4 channels METHOD method_4511 getVideoMode ()Ljava/util/Optional; METHOD method_4513 logOnGlError ()V diff --git a/mappings/net/minecraft/client/util/math/Matrix3f.mapping b/mappings/net/minecraft/client/util/math/Matrix3f.mapping index ad739eada9..72686072cc 100644 --- a/mappings/net/minecraft/client/util/math/Matrix3f.mapping +++ b/mappings/net/minecraft/client/util/math/Matrix3f.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_4581 net/minecraft/client/util/math/Matrix3f FIELD field_20860 THREE_PLUS_TWO_SQRT_TWO F - FIELD field_20861 COS_PI_EIGHTH F - FIELD field_20862 SIN_PI_EIGHTH F - FIELD field_20863 SQRT_ONE_HALF F + FIELD field_20861 COS_PI_OVER_EIGHT F + FIELD field_20862 SIN_PI_OVER_EIGHT F + FIELD field_20863 SQRT_HALF F FIELD field_20864 components [F METHOD (Lnet/minecraft/class_1158;)V ARG 1 quaternion diff --git a/mappings/net/minecraft/client/util/math/Matrix4f.mapping b/mappings/net/minecraft/client/util/math/Matrix4f.mapping index 01b0e97f63..a9e9cded6e 100644 --- a/mappings/net/minecraft/client/util/math/Matrix4f.mapping +++ b/mappings/net/minecraft/client/util/math/Matrix4f.mapping @@ -37,7 +37,7 @@ CLASS net/minecraft/class_1159 net/minecraft/client/util/math/Matrix4f ARG 2 atBufferStart METHOD method_4929 (DFFF)Lnet/minecraft/class_1159; ARG 0 fov - ARG 2 frameWidthToHeightRatio + ARG 2 aspectRatio ARG 4 viewDistance METHOD method_4931 set (IIF)V ARG 1 row diff --git a/mappings/net/minecraft/client/util/math/MatrixStack.mapping b/mappings/net/minecraft/client/util/math/MatrixStack.mapping index b88955a83a..b9f429e21c 100644 --- a/mappings/net/minecraft/client/util/math/MatrixStack.mapping +++ b/mappings/net/minecraft/client/util/math/MatrixStack.mapping @@ -15,6 +15,6 @@ CLASS net/minecraft/class_4587 net/minecraft/client/util/math/MatrixStack METHOD method_22907 multiply (Lnet/minecraft/class_1158;)V ARG 1 quaternion METHOD method_22909 pop ()V - METHOD method_22910 peek ()Lnet/minecraft/class_1159; + METHOD method_22910 peekModel ()Lnet/minecraft/class_1159; METHOD method_22911 isEmpty ()Z METHOD method_23478 peekNormal ()Lnet/minecraft/class_4581; diff --git a/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping b/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping index 3f21ef77a4..ab04e3481f 100644 --- a/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping +++ b/mappings/net/minecraft/entity/ai/pathing/PathNode.mapping @@ -22,6 +22,7 @@ CLASS net/minecraft/class_9 net/minecraft/entity/ai/pathing/PathNode ARG 1 node METHOD method_21654 getManhattanDistance (Lnet/minecraft/class_2338;)F ARG 1 pos + METHOD method_22879 getPos ()Lnet/minecraft/class_2338; METHOD method_26 copyWithNewPosition (III)Lnet/minecraft/class_9; ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/server/world/ChunkTaskPrioritySystem.mapping b/mappings/net/minecraft/server/world/ChunkTaskPrioritySystem.mapping index 4d9c5deac2..e0747af0ed 100644 --- a/mappings/net/minecraft/server/world/ChunkTaskPrioritySystem.mapping +++ b/mappings/net/minecraft/server/world/ChunkTaskPrioritySystem.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_3900 net/minecraft/server/world/ChunkTaskPrioritySystem - CLASS class_3946 RunnableMessage + CLASS class_3946 Task FIELD field_17446 function Ljava/util/function/Function; FIELD field_17447 pos J FIELD field_17448 lastLevelUpdatedToProvider Ljava/util/function/IntSupplier; @@ -10,6 +10,9 @@ CLASS net/minecraft/class_3900 net/minecraft/server/world/ChunkTaskPrioritySyste CLASS class_3947 SorterMessage FIELD field_17449 runnable Ljava/lang/Runnable; FIELD field_17450 pos J + METHOD (Ljava/lang/Runnable;JZ)V + ARG 1 runnable + ARG 2 pos FIELD field_17248 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_17249 queues Ljava/util/Map; FIELD field_17250 actors Ljava/util/Set; @@ -21,17 +24,19 @@ CLASS net/minecraft/class_3900 net/minecraft/server/world/ChunkTaskPrioritySyste METHOD method_17282 execute (Lnet/minecraft/class_3906;Ljava/util/function/Function;JLjava/util/function/IntSupplier;Z)V ARG 1 actor ARG 5 lastLevelUpdatedToProvider - METHOD method_17614 createSortingActor (Lnet/minecraft/class_3906;)Lnet/minecraft/class_3906; - ARG 1 actor + METHOD method_17614 createSorterExecutor (Lnet/minecraft/class_3906;)Lnet/minecraft/class_3906; + ARG 1 executor METHOD method_17615 sort (Lnet/minecraft/class_3906;JLjava/lang/Runnable;Z)V - METHOD method_17622 createExecutingActor (Lnet/minecraft/class_3906;Z)Lnet/minecraft/class_3906; - ARG 1 actor - METHOD method_17626 createRunnableMessage (Ljava/lang/Runnable;JLjava/util/function/IntSupplier;)Lnet/minecraft/class_3900$class_3946; + METHOD method_17622 createExecutor (Lnet/minecraft/class_3906;Z)Lnet/minecraft/class_3906; + ARG 1 executor + METHOD method_17626 createMessage (Ljava/lang/Runnable;JLjava/util/function/IntSupplier;)Lnet/minecraft/class_3900$class_3946; ARG 0 runnable ARG 1 pos ARG 3 lastLevelUpdatedToProvider METHOD method_17627 createSorterMessage (Ljava/lang/Runnable;JZ)Lnet/minecraft/class_3900$class_3947; - METHOD method_17629 createExecutorMessage (Lnet/minecraft/class_3193;Ljava/lang/Runnable;)Lnet/minecraft/class_3900$class_3946; + ARG 0 runnable + ARG 1 pos + METHOD method_17629 createMessage (Lnet/minecraft/class_3193;Ljava/lang/Runnable;)Lnet/minecraft/class_3900$class_3946; ARG 0 holder ARG 1 runnable METHOD method_17630 (Lnet/minecraft/class_3899;Lnet/minecraft/class_3906;)V diff --git a/mappings/net/minecraft/server/world/ServerLightingProvider.mapping b/mappings/net/minecraft/server/world/ServerLightingProvider.mapping index 7496143466..6988e0c535 100644 --- a/mappings/net/minecraft/server/world/ServerLightingProvider.mapping +++ b/mappings/net/minecraft/server/world/ServerLightingProvider.mapping @@ -4,12 +4,12 @@ CLASS net/minecraft/class_3227 net/minecraft/server/world/ServerLightingProvider FIELD field_17255 processor Lnet/minecraft/class_3846; FIELD field_17256 pendingTasks Lit/unimi/dsi/fastutil/objects/ObjectList; FIELD field_17257 chunkStorage Lnet/minecraft/class_3898; - FIELD field_17259 actor Lnet/minecraft/class_3906; + FIELD field_17259 executor Lnet/minecraft/class_3906; FIELD field_17260 taskBatchSize I METHOD (Lnet/minecraft/class_2823;Lnet/minecraft/class_3898;ZLnet/minecraft/class_3846;Lnet/minecraft/class_3906;)V ARG 2 chunkStorage ARG 4 processor - ARG 5 actor + ARG 5 executor METHOD method_14277 runTasks ()V METHOD method_17303 tick ()V METHOD method_17304 setTaskBatchSize (I)V diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 439d98b8fc..cc136c5b7b 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -34,8 +34,8 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor FIELD field_17221 unloadedChunks Lit/unimi/dsi/fastutil/longs/LongSet; FIELD field_17222 chunkHolderListDirty Z FIELD field_17223 chunkTaskPrioritySystem Lnet/minecraft/class_3900; - FIELD field_17224 worldgenActor Lnet/minecraft/class_3906; - FIELD field_17226 mainActor Lnet/minecraft/class_3906; + FIELD field_17224 worldgenExecutor Lnet/minecraft/class_3906; + FIELD field_17226 mainExecutor Lnet/minecraft/class_3906; FIELD field_17228 ticketManager Lnet/minecraft/class_3898$class_3216; FIELD field_17230 totalChunksLoadedCount Ljava/util/concurrent/atomic/AtomicInteger; FIELD field_17442 worldGenerationProgressListener Lnet/minecraft/class_3949; @@ -52,6 +52,7 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 3 dataFixer ARG 5 workerExecutor ARG 6 mainThreadExecutor + ARG 7 chunkProvider ARG 8 chunkGenerator ARG 9 worldGenerationProgressListener METHOD method_17212 getLightProvider ()Lnet/minecraft/class_3227; diff --git a/mappings/net/minecraft/util/Actor.mapping b/mappings/net/minecraft/util/Actor.mapping deleted file mode 100644 index e287adfcd9..0000000000 --- a/mappings/net/minecraft/util/Actor.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_3906 net/minecraft/util/Actor - METHOD method_16898 getName ()Ljava/lang/String; - METHOD method_16901 send (Ljava/lang/Object;)V - ARG 1 message - METHOD method_17344 createConsumerActor (Ljava/lang/String;Ljava/util/function/Consumer;)Lnet/minecraft/class_3906; - METHOD method_17345 createAndSendFutureActor (Ljava/util/function/Function;)Ljava/util/concurrent/CompletableFuture; diff --git a/mappings/net/minecraft/util/ThreadExecutor.mapping b/mappings/net/minecraft/util/ThreadExecutor.mapping deleted file mode 100644 index c8ba5c9929..0000000000 --- a/mappings/net/minecraft/util/ThreadExecutor.mapping +++ /dev/null @@ -1,30 +0,0 @@ -CLASS net/minecraft/class_1255 net/minecraft/util/ThreadExecutor - FIELD field_18318 name Ljava/lang/String; - FIELD field_18319 executionsInProgress I - FIELD field_5750 taskQueue Ljava/util/Queue; - FIELD field_5751 LOGGER Lorg/apache/logging/log4j/Logger; - METHOD (Ljava/lang/String;)V - ARG 1 name - METHOD method_16075 executeQueuedTask ()Z - METHOD method_16211 createTask (Ljava/lang/Runnable;)Ljava/lang/Runnable; - ARG 1 runnable - METHOD method_18854 isOnThread ()Z - METHOD method_18855 clearTasks ()V - METHOD method_18856 canExecute (Ljava/lang/Runnable;)Z - ARG 1 task - METHOD method_18857 executeTasks (Ljava/util/function/BooleanSupplier;)V - ARG 1 stopCondition - METHOD method_18859 executeTask (Ljava/lang/Runnable;)V - ARG 1 task - METHOD method_19537 executeSync (Ljava/lang/Runnable;)V - ARG 1 runnable - METHOD method_20493 executeFuture (Ljava/lang/Runnable;)Ljava/util/concurrent/CompletableFuture; - METHOD method_20813 waitForTasks ()V - METHOD method_21684 getTaskQueueSize ()I - METHOD method_3777 getThread ()Ljava/lang/Thread; - METHOD method_5382 createFuture (Ljava/lang/Runnable;)Ljava/util/concurrent/CompletableFuture; - ARG 1 runnable - METHOD method_5383 executeQueuedTasks ()V - METHOD method_5384 shouldExecuteAsync ()Z - METHOD method_5385 supply (Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture; - ARG 1 supplier diff --git a/mappings/net/minecraft/util/SystemUtil.mapping b/mappings/net/minecraft/util/Util.mapping similarity index 88% rename from mappings/net/minecraft/util/SystemUtil.mapping rename to mappings/net/minecraft/util/Util.mapping index 8b4aabf2ab..63394cf0f6 100644 --- a/mappings/net/minecraft/util/SystemUtil.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_156 net/minecraft/util/SystemUtil +CLASS net/minecraft/class_156 net/minecraft/util/Util CLASS class_157 IdentityHashStrategy CLASS class_158 OperatingSystem METHOD method_669 open (Ljava/net/URL;)V @@ -41,12 +41,14 @@ CLASS net/minecraft/class_156 net/minecraft/util/SystemUtil METHOD method_648 getMeasuringTimeNano ()J METHOD method_650 getValueAsString (Lnet/minecraft/class_2769;Ljava/lang/Object;)Ljava/lang/String; METHOD method_651 getJVMFlags ()Ljava/util/stream/Stream; - METHOD method_652 thenCombine (Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; + METHOD method_652 combine (Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; ARG 0 futures - METHOD method_654 consume (Ljava/lang/Object;Ljava/util/function/Consumer;)Ljava/lang/Object; + METHOD method_654 create (Ljava/lang/Object;Ljava/util/function/Consumer;)Ljava/lang/Object; + ARG 0 object + ARG 1 initializer METHOD method_655 identityHashStrategy ()Lit/unimi/dsi/fastutil/Hash$Strategy; - METHOD method_656 get (Ljava/util/function/Supplier;)Ljava/lang/Object; - ARG 0 supplier + METHOD method_656 create (Ljava/util/function/Supplier;)Ljava/lang/Object; + ARG 0 factory METHOD method_658 getMeasuringTimeMs ()J METHOD method_659 getEpochTimeMs ()J METHOD method_660 next (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/util/math/Box.mapping b/mappings/net/minecraft/util/math/Box.mapping index aaace7165b..9308eecf35 100644 --- a/mappings/net/minecraft/util/math/Box.mapping +++ b/mappings/net/minecraft/util/math/Box.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_238 net/minecraft/util/math/Box - FIELD field_1320 maxX D - FIELD field_1321 minZ D - FIELD field_1322 minY D - FIELD field_1323 minX D - FIELD field_1324 maxZ D - FIELD field_1325 maxY D + FIELD field_1320 x2 D + FIELD field_1321 z1 D + FIELD field_1322 y1 D + FIELD field_1323 x1 D + FIELD field_1324 z2 D + FIELD field_1325 y2 D METHOD (DDDDDD)V ARG 1 x1 ARG 3 y1 diff --git a/mappings/net/minecraft/util/math/Vec3d.mapping b/mappings/net/minecraft/util/math/Vec3d.mapping index 1aff2eba85..bad03aa0a0 100644 --- a/mappings/net/minecraft/util/math/Vec3d.mapping +++ b/mappings/net/minecraft/util/math/Vec3d.mapping @@ -49,3 +49,4 @@ CLASS net/minecraft/class_243 net/minecraft/util/math/Vec3d ARG 5 multZ METHOD method_18806 multiply (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; ARG 1 mult + METHOD method_22882 negate ()Lnet/minecraft/class_243; diff --git a/mappings/net/minecraft/util/shape/VoxelShapes.mapping b/mappings/net/minecraft/util/shape/VoxelShapes.mapping index e1823f1d2f..7a1a4147c2 100644 --- a/mappings/net/minecraft/util/shape/VoxelShapes.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShapes.mapping @@ -46,6 +46,10 @@ CLASS net/minecraft/class_259 net/minecraft/util/shape/VoxelShapes ARG 0 shape1 ARG 1 shape2 ARG 2 function + METHOD method_1083 isSideCovered (Lnet/minecraft/class_265;Lnet/minecraft/class_265;Lnet/minecraft/class_2350;)Z + ARG 0 shape + ARG 1 neighbor + ARG 2 side METHOD method_1084 union (Lnet/minecraft/class_265;Lnet/minecraft/class_265;)Lnet/minecraft/class_265; ARG 0 first ARG 1 second diff --git a/mappings/net/minecraft/util/thread/MessageListener.mapping b/mappings/net/minecraft/util/thread/MessageListener.mapping new file mode 100644 index 0000000000..78823e7f2b --- /dev/null +++ b/mappings/net/minecraft/util/thread/MessageListener.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_3906 net/minecraft/util/thread/MessageListener + METHOD method_16898 getName ()Ljava/lang/String; + METHOD method_16901 send (Ljava/lang/Object;)V + ARG 1 message + METHOD method_17344 create (Ljava/lang/String;Ljava/util/function/Consumer;)Lnet/minecraft/class_3906; + ARG 0 name + ARG 1 action + METHOD method_17345 ask (Ljava/util/function/Function;)Ljava/util/concurrent/CompletableFuture; + ARG 1 messageProvider diff --git a/mappings/net/minecraft/util/NonBlockingThreadExecutor.mapping b/mappings/net/minecraft/util/thread/ReentrantThreadExecutor.mapping similarity index 60% rename from mappings/net/minecraft/util/NonBlockingThreadExecutor.mapping rename to mappings/net/minecraft/util/thread/ReentrantThreadExecutor.mapping index 97a6fcd554..4cce2146d1 100644 --- a/mappings/net/minecraft/util/NonBlockingThreadExecutor.mapping +++ b/mappings/net/minecraft/util/thread/ReentrantThreadExecutor.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_4093 net/minecraft/util/NonBlockingThreadExecutor +CLASS net/minecraft/class_4093 net/minecraft/util/thread/ReentrantThreadExecutor FIELD field_18320 runningTasks I METHOD (Ljava/lang/String;)V ARG 1 name diff --git a/mappings/net/minecraft/util/MailboxProcessor.mapping b/mappings/net/minecraft/util/thread/TaskExecutor.mapping similarity index 62% rename from mappings/net/minecraft/util/MailboxProcessor.mapping rename to mappings/net/minecraft/util/thread/TaskExecutor.mapping index 9d3285ef08..8dff7483f0 100644 --- a/mappings/net/minecraft/util/MailboxProcessor.mapping +++ b/mappings/net/minecraft/util/thread/TaskExecutor.mapping @@ -1,20 +1,21 @@ -CLASS net/minecraft/class_3846 net/minecraft/util/MailboxProcessor - FIELD field_17039 mailbox Lnet/minecraft/class_3847; +CLASS net/minecraft/class_3846 net/minecraft/util/thread/TaskExecutor + FIELD field_17039 queue Lnet/minecraft/class_3847; FIELD field_17040 LOGGER Lorg/apache/logging/log4j/Logger; FIELD field_17041 stateFlags Ljava/util/concurrent/atomic/AtomicInteger; FIELD field_17042 executor Ljava/util/concurrent/Executor; FIELD field_17043 name Ljava/lang/String; METHOD (Lnet/minecraft/class_3847;Ljava/util/concurrent/Executor;Ljava/lang/String;)V - ARG 1 mailbox + ARG 1 queue + ARG 2 executor ARG 3 name - METHOD method_16900 run (Lit/unimi/dsi/fastutil/ints/Int2BooleanFunction;)I - ARG 1 keepRunningProvider + METHOD method_16900 runWhile (Lit/unimi/dsi/fastutil/ints/Int2BooleanFunction;)I + ARG 1 condition METHOD method_16902 create (Ljava/util/concurrent/Executor;Ljava/lang/String;)Lnet/minecraft/class_3846; ARG 0 executor ARG 1 name - METHOD method_16903 lock ()Z - METHOD method_16904 unlock ()V + METHOD method_16903 unpause ()Z + METHOD method_16904 pause ()V METHOD method_16905 hasMessages ()Z - METHOD method_16906 isLocked ()Z + METHOD method_16906 isUnpaused ()Z METHOD method_16907 runNext ()Z METHOD method_16908 execute ()V diff --git a/mappings/net/minecraft/util/Mailbox.mapping b/mappings/net/minecraft/util/thread/TaskQueue.mapping similarity index 57% rename from mappings/net/minecraft/util/Mailbox.mapping rename to mappings/net/minecraft/util/thread/TaskQueue.mapping index 7c32077ee0..1e78cff37c 100644 --- a/mappings/net/minecraft/util/Mailbox.mapping +++ b/mappings/net/minecraft/util/thread/TaskQueue.mapping @@ -1,17 +1,22 @@ -CLASS net/minecraft/class_3847 net/minecraft/util/Mailbox - CLASS class_3848 PrioritizedQueueMailbox +CLASS net/minecraft/class_3847 net/minecraft/util/thread/TaskQueue + CLASS class_3848 Prioritized FIELD field_17044 queues Ljava/util/List; METHOD (I)V ARG 1 priorityCount - CLASS class_3849 QueueMailbox + CLASS class_3849 Simple FIELD field_17045 queue Ljava/util/Queue; - CLASS class_3907 PrioritizedMessage + METHOD (Ljava/util/Queue;)V + ARG 1 queue + CLASS class_3907 PrioritizedTask FIELD field_17278 priority I FIELD field_17279 runnable Ljava/lang/Runnable; METHOD (ILjava/lang/Runnable;)V ARG 1 priority ARG 2 runnable METHOD method_17347 getPriority ()I + METHOD (Lnet/minecraft/class_3847;Ljava/util/concurrent/Executor;Ljava/lang/String;)V + ARG 1 messages METHOD method_16909 poll ()Ljava/lang/Object; METHOD method_16910 add (Ljava/lang/Object;)Z + ARG 1 message METHOD method_16911 isEmpty ()Z diff --git a/mappings/net/minecraft/util/thread/ThreadExecutor.mapping b/mappings/net/minecraft/util/thread/ThreadExecutor.mapping new file mode 100644 index 0000000000..26e7646180 --- /dev/null +++ b/mappings/net/minecraft/util/thread/ThreadExecutor.mapping @@ -0,0 +1,34 @@ +CLASS net/minecraft/class_1255 net/minecraft/util/thread/ThreadExecutor + FIELD field_18318 name Ljava/lang/String; + FIELD field_18319 executionsInProgress I + FIELD field_5750 tasks Ljava/util/Queue; + FIELD field_5751 LOGGER Lorg/apache/logging/log4j/Logger; + METHOD (Ljava/lang/String;)V + ARG 1 name + METHOD execute (Ljava/lang/Runnable;)V + ARG 1 runnable + METHOD method_16075 runTask ()Z + METHOD method_16211 createTask (Ljava/lang/Runnable;)Ljava/lang/Runnable; + ARG 1 runnable + METHOD method_18854 isOnThread ()Z + METHOD method_18855 cancelTasks ()V + METHOD method_18856 canExecute (Ljava/lang/Runnable;)Z + ARG 1 task + METHOD method_18857 runTasks (Ljava/util/function/BooleanSupplier;)V + ARG 1 stopCondition + METHOD method_18859 executeTask (Ljava/lang/Runnable;)V + ARG 1 task + METHOD method_19537 submitAndJoin (Ljava/lang/Runnable;)V + ARG 1 runnable + METHOD method_20493 submit (Ljava/lang/Runnable;)Ljava/util/concurrent/CompletableFuture; + ARG 1 task + METHOD method_20813 waitForTasks ()V + METHOD method_21684 getTaskCount ()I + METHOD method_3777 getThread ()Ljava/lang/Thread; + METHOD method_5382 submitAsync (Ljava/lang/Runnable;)Ljava/util/concurrent/CompletableFuture; + ARG 1 runnable + METHOD method_5383 runTasks ()V + METHOD method_5384 shouldExecuteAsync ()Z + METHOD method_5385 submit (Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture; + ARG 1 task + METHOD send execute (Ljava/lang/Runnable;)V diff --git a/mappings/net/minecraft/util/TaskPriority.mapping b/mappings/net/minecraft/world/TickPriority.mapping similarity index 74% rename from mappings/net/minecraft/util/TaskPriority.mapping rename to mappings/net/minecraft/world/TickPriority.mapping index b317a86572..2b2093baf4 100644 --- a/mappings/net/minecraft/util/TaskPriority.mapping +++ b/mappings/net/minecraft/world/TickPriority.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_1953 net/minecraft/util/TaskPriority +CLASS net/minecraft/class_1953 net/minecraft/world/TickPriority FIELD field_9308 index I METHOD (Ljava/lang/String;II)V ARG 3 index diff --git a/mappings/net/minecraft/world/dimension/Dimension.mapping b/mappings/net/minecraft/world/dimension/Dimension.mapping index 92c99b263f..f8d7e8f93e 100644 --- a/mappings/net/minecraft/world/dimension/Dimension.mapping +++ b/mappings/net/minecraft/world/dimension/Dimension.mapping @@ -27,9 +27,9 @@ CLASS net/minecraft/class_2869 net/minecraft/world/dimension/Dimension METHOD method_12452 getSpawningBlockInChunk (Lnet/minecraft/class_1923;Z)Lnet/minecraft/class_2338; ARG 1 chunkPos ARG 2 checkMobSpawnValidity - METHOD method_12453 shouldRenderFog (II)Z - ARG 1 entityX - ARG 2 entityZ + METHOD method_12453 isFogThick (II)Z + ARG 1 x + ARG 2 z METHOD method_12454 getMoonPhase (J)I ARG 1 time METHOD method_12455 getCloudHeight ()F