From 966033b5327b49621001a9adb57c5aa1316607f9 Mon Sep 17 00:00:00 2001 From: Runemoro Date: Mon, 2 Dec 2019 08:47:40 -0500 Subject: [PATCH] More rendering mappings (#986) * More rendering mappings * Even more rendering mappings * Update mappings/net/minecraft/client/render/OverlayTexture.mapping Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * Update mappings/net/minecraft/client/render/OverlayTexture.mapping Co-Authored-By: liach <7806504+liach@users.noreply.github.com> * Fix HashStrategy removed in last PR * Fixes by liach --- .../com/mojang/blaze3d/platform/GLX.mapping | 22 ++ .../blaze3d/platform/GlStateManager.mapping | 344 +++++++++++++++++- .../blaze3d/systems/RenderSystem.mapping | 224 +++++++++++- .../net/minecraft/client/gl/GlDebug.mapping | 1 + .../ingame/AbstractContainerScreen.mapping | 4 +- .../gui/screen/ingame/InventoryScreen.mapping | 5 + .../net/minecraft/client/model/Model.mapping | 11 +- .../minecraft/client/model/ModelPart.mapping | 19 +- .../client/render/DiffuseLighting.mapping | 7 + .../client/render/GuiLighting.mapping | 5 - .../client/render/OverlayTexture.mapping | 5 +- .../client/render/RenderLayer.mapping | 4 +- .../client/render/VertexConsumer.mapping | 14 +- .../render/VertexConsumerProvider.mapping | 16 +- .../client/render/VertexFormatElement.mapping | 4 + .../client/render/WorldRenderer.mapping | 1 + .../entity/BannerBlockEntityRenderer.mapping | 9 +- .../BlockEntityRenderDispatcher.mapping | 3 + .../block/entity/BlockEntityRenderer.mapping | 9 +- .../debug/PathfindingDebugRenderer.mapping | 20 + .../render/debug/VillageDebugRenderer.mapping | 22 +- .../entity/EnderDragonEntityRenderer.mapping | 2 + .../entity/EntityRenderDispatcher.mapping | 47 +++ .../render/entity/EntityRenderer.mapping | 19 +- .../entity/LivingEntityRenderer.mapping | 10 +- .../feature/CapeFeatureRenderer.mapping | 2 + .../entity/feature/FeatureRenderer.mapping | 36 +- ...ing => ShulkerHeadFeatureRenderer.mapping} | 2 +- .../StickingOutThingsFeatureRenderer.mapping | 7 - .../StuckObjectsFeatureRenderer.mapping | 12 + ...g => StuckStingersFeatureRenderer.mapping} | 2 +- .../entity/model/BipedEntityModel.mapping | 2 + .../entity/model/BoatEntityModel.mapping | 4 +- .../render/entity/model/EntityModel.mapping | 6 +- .../entity/model/ParrotEntityModel.mapping | 8 + mappings/net/minecraft/entity/Entity.mapping | 16 +- .../entity/player/PlayerEntity.mapping | 4 +- mappings/net/minecraft/util/Util.mapping | 4 +- 38 files changed, 845 insertions(+), 87 deletions(-) create mode 100644 mappings/com/mojang/blaze3d/platform/GLX.mapping create mode 100644 mappings/net/minecraft/client/render/DiffuseLighting.mapping delete mode 100644 mappings/net/minecraft/client/render/GuiLighting.mapping rename mappings/net/minecraft/client/render/entity/feature/{ShulkerSomethingFeatureRenderer.mapping => ShulkerHeadFeatureRenderer.mapping} (75%) delete mode 100644 mappings/net/minecraft/client/render/entity/feature/StickingOutThingsFeatureRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer.mapping rename mappings/net/minecraft/client/render/entity/feature/{StingerFeatureRenderer.mapping => StuckStingersFeatureRenderer.mapping} (62%) diff --git a/mappings/com/mojang/blaze3d/platform/GLX.mapping b/mappings/com/mojang/blaze3d/platform/GLX.mapping new file mode 100644 index 0000000000..be77ece64f --- /dev/null +++ b/mappings/com/mojang/blaze3d/platform/GLX.mapping @@ -0,0 +1,22 @@ +CLASS com/mojang/blaze3d/platform/GLX + METHOD _getRefreshRate (Lnet/minecraft/class_1041;)I + ARG 0 window + METHOD _init (IZ)V + ARG 0 debugVerbosity + ARG 1 debugSync + METHOD _renderCrosshair (IZZZ)V + ARG 0 size + ARG 1 drawX + ARG 2 drawY + ARG 3 drawZ + METHOD _setGlfwErrorCallback (Lorg/lwjgl/glfw/GLFWErrorCallbackI;)V + ARG 0 callback + METHOD _shouldClose (Lnet/minecraft/class_1041;)Z + ARG 0 window + METHOD getErrorString (I)Ljava/lang/String; + ARG 0 code + METHOD make (Ljava/lang/Object;Ljava/util/function/Consumer;)Ljava/lang/Object; + ARG 0 object + ARG 1 initializer + METHOD make (Ljava/util/function/Supplier;)Ljava/lang/Object; + ARG 0 factory diff --git a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping index f02d927cc3..302e0f2794 100644 --- a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping +++ b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping @@ -6,17 +6,21 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager FIELD field_5044 func I CLASS class_1017 BlendFuncState FIELD field_5045 capState Lnet/minecraft/class_4493$class_1018; - FIELD field_5046 dstAlpha I - FIELD field_5047 srcAlpha I - FIELD field_5048 dfactor I - FIELD field_5049 sfactor I + FIELD field_5046 dstFactorAlpha I + FIELD field_5047 srcFactorAlpha I + FIELD field_5048 dstFactorRGB I + FIELD field_5049 srcFactorRGB I CLASS class_1018 CapabilityTracker FIELD field_5050 cap I FIELD field_5051 state Z + METHOD (I)V + ARG 1 cap METHOD method_4469 disable ()V METHOD method_4470 setState (Z)V + ARG 1 state METHOD method_4471 enable ()V CLASS class_1019 ClearState + FIELD field_16202 clearStencil I FIELD field_5052 clearColor Lnet/minecraft/class_4493$class_1020; FIELD field_5053 clearDepth D CLASS class_1020 Color4 @@ -24,9 +28,14 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager FIELD field_5055 blue F FIELD field_5056 green F FIELD field_5057 red F + METHOD (FFFF)V + ARG 1 red + ARG 2 green + ARG 3 blue + ARG 4 alpha CLASS class_1021 LogicOpState FIELD field_5058 capState Lnet/minecraft/class_4493$class_1018; - FIELD field_5059 opcode I + FIELD field_5059 op I CLASS class_1022 ColorMask FIELD field_5060 alpha Z FIELD field_5061 blue Z @@ -44,7 +53,9 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager FIELD field_5075 func I FIELD field_5076 mask Z CLASS class_1028 FogMode - FIELD field_5093 glValue I + FIELD field_5093 value I + METHOD (I)V + ARG 1 value CLASS class_1029 FogState FIELD field_5098 end F FIELD field_5099 start F @@ -52,21 +63,32 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager FIELD field_5101 density F FIELD field_5102 mode I CLASS class_1030 LogicOp - FIELD field_5108 glValue I + FIELD field_5108 value I + METHOD (I)V + ARG 1 value CLASS class_1031 PolygonOffsetState FIELD field_5121 capLine Lnet/minecraft/class_4493$class_1018; FIELD field_5122 units F FIELD field_5123 capFill Lnet/minecraft/class_4493$class_1018; FIELD field_5124 factor F CLASS class_1034 StencilSubState + FIELD field_16203 ref I + FIELD field_5147 mask I FIELD field_5148 func I CLASS class_1035 StencilState FIELD field_5149 subState Lnet/minecraft/class_4493$class_1034; + FIELD field_5150 dppass I + FIELD field_5151 dpfail I + FIELD field_5152 sfail I + FIELD field_5153 mask I CLASS class_1036 TexCoord CLASS class_1037 TexGenCoordState FIELD field_5159 capState Lnet/minecraft/class_4493$class_1018; FIELD field_5160 mode I FIELD field_5161 coord I + METHOD (II)V + ARG 1 coord + ARG 2 cap CLASS class_1038 TexGenState FIELD field_5162 s Lnet/minecraft/class_4493$class_1037; FIELD field_5163 t Lnet/minecraft/class_4493$class_1037; @@ -80,8 +102,12 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager FIELD field_5170 width I FIELD field_5171 y I FIELD field_5172 x I - CLASS class_4534 DestFactor - CLASS class_4535 SourceFactor + CLASS class_4534 DstFactor + METHOD (I)V + ARG 1 value + CLASS class_4535 SrcFactor + METHOD (I)V + ARG 1 value FIELD field_20466 MATRIX_BUFFER Ljava/nio/FloatBuffer; FIELD field_20468 ALPHA_TEST Lnet/minecraft/class_4493$class_1016; FIELD field_20469 LIGHTING Lnet/minecraft/class_4493$class_1018; @@ -98,23 +124,31 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager FIELD field_20480 STENCIL Lnet/minecraft/class_4493$class_1035; FIELD field_20482 activeTexture I FIELD field_20483 TEXTURES [Lnet/minecraft/class_4493$class_1039; - FIELD field_20484 shadeModel I + FIELD field_20484 modelShadeMode I FIELD field_20485 RESCALE_NORMAL Lnet/minecraft/class_4493$class_1018; FIELD field_20486 COLOR_MASK Lnet/minecraft/class_4493$class_1022; FIELD field_20487 COLOR Lnet/minecraft/class_4493$class_1020; FIELD field_20488 fboMode Lnet/minecraft/class_4493$class_1010; + FIELD field_20771 colorBuffer Ljava/nio/FloatBuffer; + FIELD field_20772 DIFFUSE_LIGHT_0_POSITION Lnet/minecraft/class_1160; + FIELD field_20773 DIFFUSE_LIGHT_1_POSITION Lnet/minecraft/class_1160; METHOD method_21906 enableColorLogicOp ()V METHOD method_21907 matrixMode (I)V + ARG 0 mode METHOD method_21908 disableColorLogicOp ()V METHOD method_21910 enableTexture ()V METHOD method_21911 disableClientState (I)V + ARG 0 cap METHOD method_21912 disableTexture ()V METHOD method_21913 enableClientState (I)V + ARG 0 cap METHOD method_21914 getTexLevelParameter ()I METHOD method_21920 enableRescaleNormal ()V METHOD method_21921 getString (I)Ljava/lang/String; + ARG 0 name METHOD method_21922 disableRescaleNormal ()V METHOD method_21923 getInteger (I)I + ARG 0 pname METHOD method_21924 loadIdentity ()V METHOD method_21926 pushMatrix ()V METHOD method_21928 popMatrix ()V @@ -122,157 +156,427 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager METHOD method_21934 getError ()I METHOD method_21935 pushLightingAttributes ()V METHOD method_21936 clearDepth (D)V + ARG 0 depth METHOD method_21937 scaled (DDD)V - METHOD method_21938 rotated (DDD)V + ARG 0 x + ARG 2 y + ARG 4 z + METHOD method_21938 translated (DDD)V + ARG 0 x + ARG 2 y + ARG 4 z METHOD method_21939 ortho (DDDDDD)V + ARG 0 l + ARG 2 r + ARG 4 b + ARG 6 t + ARG 8 n + ARG 10 f METHOD method_21940 fogDensity (F)V + ARG 0 density METHOD method_21941 polygonOffset (FF)V + ARG 0 factor + ARG 1 units METHOD method_21942 normal3f (FFF)V + ARG 0 nx + ARG 1 ny + ARG 2 nz METHOD method_21943 clearColor (FFFF)V + ARG 0 red + ARG 1 green + ARG 2 blue + ARG 3 alpha METHOD method_21944 enableLight (I)V + ARG 0 light METHOD method_21945 alphaFunc (IF)V ARG 0 func ARG 1 ref METHOD method_21946 multiTexCoords2f (IFF)V + ARG 0 texture + ARG 1 s + ARG 2 t METHOD method_21947 colorMaterial (II)V ARG 0 face ARG 1 mode METHOD method_21949 texEnv (III)V + ARG 0 target + ARG 1 pname + ARG 2 param METHOD method_21950 blendFuncSeparate (IIII)V - ARG 0 sfactor - ARG 1 dfactor - ARG 2 srcAlpha - ARG 3 dstAlpha + ARG 0 srcFactorRGB + ARG 1 dstFactorRGB + ARG 2 srcFactorAlpha + ARG 3 dstFactorAlpha METHOD method_21951 framebufferTexture2D (IIIII)V + ARG 0 target + ARG 1 attachment + ARG 2 textureTarget + ARG 3 texture + ARG 4 level METHOD method_21953 texSubImage2D (IIIIIIIIJ)V + ARG 0 target + ARG 1 level + ARG 2 offsetX + ARG 3 offsetY + ARG 4 width + ARG 5 height + ARG 6 format + ARG 7 type + ARG 8 pixels METHOD method_21954 texImage2D (IIIIIIIILjava/nio/IntBuffer;)V + ARG 0 target + ARG 1 level + ARG 2 internalFormat + ARG 3 width + ARG 4 height + ARG 5 border + ARG 6 format + ARG 7 type + ARG 8 pixels METHOD method_21956 readPixels (IIIIIILjava/nio/ByteBuffer;)V + ARG 0 x + ARG 1 y + ARG 2 width + ARG 3 height + ARG 4 format + ARG 5 type + ARG 6 pixels METHOD method_21957 getTexImage (IIIIJ)V + ARG 0 target + ARG 1 level + ARG 2 format + ARG 3 type + ARG 4 pixels METHOD method_21960 light (IILjava/nio/FloatBuffer;)V + ARG 0 light + ARG 1 pname + ARG 2 params METHOD method_21961 shaderSource (ILjava/lang/CharSequence;)V + ARG 0 shader + ARG 1 source METHOD method_21962 bufferData (ILjava/nio/ByteBuffer;I)V + ARG 0 target + ARG 1 data + ARG 2 usage METHOD method_21963 lightModel (ILjava/nio/FloatBuffer;)V + ARG 0 pname + ARG 1 params METHOD method_21964 uniform1 (ILjava/nio/IntBuffer;)V + ARG 0 location + ARG 1 value METHOD method_21965 clear (IZ)V ARG 0 mask ARG 1 getError METHOD method_21966 uniformMatrix2 (IZLjava/nio/FloatBuffer;)V + ARG 0 location + ARG 1 transpose + ARG 2 value METHOD method_21968 enableTexGen (Lnet/minecraft/class_4493$class_1036;)V + ARG 0 coord METHOD method_21969 texGenMode (Lnet/minecraft/class_4493$class_1036;I)V + ARG 0 coord + ARG 1 mode METHOD method_21970 texGenParam (Lnet/minecraft/class_4493$class_1036;ILjava/nio/FloatBuffer;)V + ARG 0 coord + ARG 1 pname + ARG 2 params METHOD method_21971 multMatrix (Lnet/minecraft/class_1159;)V + ARG 0 matrix METHOD method_21972 multMatrix (Ljava/nio/FloatBuffer;)V + ARG 0 matrix METHOD method_21973 initFramebufferSupport (Lorg/lwjgl/opengl/GLCapabilities;)Ljava/lang/String; ARG 0 capabilities METHOD method_21974 depthMask (Z)V ARG 0 mask METHOD method_21975 colorMask (ZZZZ)V + ARG 0 red + ARG 1 green + ARG 2 blue + ARG 3 alpha METHOD method_21976 pushTextureAttributes ()V METHOD method_21978 fogStart (F)V + ARG 0 start METHOD method_21980 scalef (FFF)V + ARG 0 x + ARG 1 y + ARG 2 z METHOD method_21981 rotatef (FFFF)V + ARG 0 angle + ARG 1 x + ARG 2 y + ARG 3 z METHOD method_21983 pixelTransfer (IF)V + ARG 0 pname + ARG 1 param METHOD method_21984 blendFunc (II)V - ARG 0 sfactor - ARG 1 dfactor + ARG 0 srcFactor + ARG 1 dstFactor METHOD method_21985 texParameter (IIF)V + ARG 0 target + ARG 1 pname + ARG 2 param METHOD method_21986 texParameter (III)V + ARG 0 target + ARG 1 pname + ARG 2 param METHOD method_21987 renderbufferStorage (IIII)V + ARG 0 target + ARG 1 internalFormat + ARG 2 width + ARG 3 height METHOD method_21989 texEnv (ILjava/nio/FloatBuffer;)V + ARG 0 pname + ARG 1 params METHOD method_21990 getUniformLocation (ILjava/lang/CharSequence;)I + ARG 0 program + ARG 1 name METHOD method_21991 uniform1 (ILjava/nio/FloatBuffer;)V + ARG 0 location + ARG 1 value METHOD method_21992 uniform2 (ILjava/nio/IntBuffer;)V + ARG 0 location + ARG 1 value METHOD method_21993 uniformMatrix3 (IZLjava/nio/FloatBuffer;)V + ARG 0 location + ARG 1 transpose + ARG 2 value METHOD method_21995 disableTexGen (Lnet/minecraft/class_4493$class_1036;)V + ARG 0 coord METHOD method_21997 popAttributes ()V METHOD method_21998 fogEnd (F)V + ARG 0 end METHOD method_21999 translatef (FFF)V + ARG 0 x + ARG 1 y + ARG 2 z METHOD method_22000 color4f (FFFF)V + ARG 0 red + ARG 1 green + ARG 2 blue + ARG 3 alpha METHOD method_22001 depthFunc (I)V ARG 0 func METHOD method_22002 getProgram (II)I + ARG 0 program + ARG 1 pname METHOD method_22003 getTexLevelParameter (III)I + ARG 0 target + ARG 1 level + ARG 2 pname METHOD method_22004 framebufferRenderbuffer (IIII)V ARG 0 target ARG 1 attachment - ARG 2 renderBufferTarget - ARG 3 renderBuffer + ARG 2 renderbufferTarget + ARG 3 renderbuffer METHOD method_22006 getAttribLocation (ILjava/lang/CharSequence;)I + ARG 0 program + ARG 1 name METHOD method_22007 uniform2 (ILjava/nio/FloatBuffer;)V + ARG 0 location + ARG 1 value METHOD method_22008 uniform3 (ILjava/nio/IntBuffer;)V + ARG 0 location + ARG 1 value METHOD method_22009 uniformMatrix4 (IZLjava/nio/FloatBuffer;)V + ARG 0 location + ARG 1 transpose + ARG 2 value METHOD method_22010 getGenCoordState (Lnet/minecraft/class_4493$class_1036;)Lnet/minecraft/class_4493$class_1037; ARG 0 coord METHOD method_22012 disableAlphaTest ()V METHOD method_22013 lineWidth (F)V + ARG 0 width METHOD method_22015 blendEquation (I)V + ARG 0 mode METHOD method_22016 attachShader (II)V + ARG 0 program + ARG 1 shader METHOD method_22017 stencilFunc (III)V - METHOD method_22018 blendFuncseparate (IIII)V + ARG 0 func + ARG 1 ref + ARG 2 mask + METHOD method_22018 blendFuncSeparateUntracked (IIII)V + ARG 0 srcFactorRGB + ARG 1 dstFactorRGB + ARG 2 srcFactorAlpha + ARG 3 dstFactorAlpha METHOD method_22019 uniform3 (ILjava/nio/FloatBuffer;)V + ARG 0 location + ARG 1 value METHOD method_22020 uniform4 (ILjava/nio/IntBuffer;)V + ARG 0 location + ARG 1 value METHOD method_22021 enableAlphaTest ()V METHOD method_22023 getShader (II)I + ARG 0 shader + ARG 1 pname METHOD method_22024 stencilOp (III)V + ARG 0 sfail + ARG 1 dpfail + ARG 2 dppass METHOD method_22025 viewport (IIII)V + ARG 0 x + ARG 1 y + ARG 2 width + ARG 3 height METHOD method_22026 uniform4 (ILjava/nio/FloatBuffer;)V + ARG 0 location + ARG 1 value METHOD method_22028 enableLighting ()V METHOD method_22029 deleteShader (I)V + ARG 0 shader METHOD method_22030 uniform1 (II)V + ARG 0 location + ARG 1 value METHOD method_22031 normalPointer (IIJ)V + ARG 0 type + ARG 1 stride + ARG 2 pointer METHOD method_22032 texCoordPointer (IIIJ)V + ARG 0 size + ARG 1 type + ARG 2 stride + ARG 3 pointer METHOD method_22033 fog (I[F)V + ARG 0 pname + ARG 1 params METHOD method_22034 disableLighting ()V METHOD method_22035 createShader (I)I + ARG 0 type METHOD method_22036 bindBuffers (II)V + ARG 0 target + ARG 1 buffer METHOD method_22037 drawArrays (III)V + ARG 0 mode + ARG 1 first + ARG 2 count METHOD method_22038 vertexPointer (IIIJ)V + ARG 0 size + ARG 1 type + ARG 2 stride + ARG 3 pointer METHOD method_22040 enableColorMaterial ()V METHOD method_22041 compileShader (I)V + ARG 0 shader METHOD method_22042 bindFramebuffer (II)V ARG 0 target ARG 1 framebuffer METHOD method_22043 colorPointer (IIIJ)V + ARG 0 size + ARG 1 type + ARG 2 stride + ARG 3 pointer METHOD method_22044 disableColorMaterial ()V METHOD method_22045 useProgram (I)V + ARG 0 program METHOD method_22046 bindRenderbuffer (II)V ARG 0 target ARG 1 renderbuffer METHOD method_22047 disableDepthTest ()V METHOD method_22048 deleteProgram (I)V + ARG 0 program METHOD method_22049 getShaderInfoLog (II)Ljava/lang/String; + ARG 0 shader + ARG 1 maxLength METHOD method_22050 enableDepthTest ()V METHOD method_22051 linkProgram (I)V + ARG 0 program METHOD method_22052 getProgramInfoLog (II)Ljava/lang/String; + ARG 0 program + ARG 1 maxLength METHOD method_22053 disableBlend ()V METHOD method_22054 deleteBuffers (I)V + ARG 0 buffer METHOD method_22055 fogi (II)V + ARG 0 pname + ARG 1 param METHOD method_22056 enableBlend ()V METHOD method_22057 deleteRenderbuffers (I)V + ARG 0 renderbuffers METHOD method_22058 polygonMode (II)V + ARG 0 face + ARG 1 mode METHOD method_22060 deleteFramebuffers (I)V + ARG 0 framebuffers METHOD method_22062 createProgram ()I METHOD method_22063 checkFramebufferStatus (I)I + ARG 0 target METHOD method_22065 genBuffers ()I + METHOD method_22066 activeTextureUntracked (I)V + ARG 0 texture METHOD method_22067 pixelStore (II)V + ARG 0 pname + ARG 1 param METHOD method_22068 genFramebuffers ()I METHOD method_22069 clientActiveTexture (I)V + ARG 0 texture METHOD method_22070 genRenderbuffers ()I METHOD method_22071 fogMode (I)V + ARG 0 mode METHOD method_22072 enableFog ()V METHOD method_22074 disableFog ()V METHOD method_22075 logicOp (I)V + ARG 0 op METHOD method_22076 enableCull ()V METHOD method_22077 activeTexture (I)V + ARG 0 texture METHOD method_22078 disableCull ()V METHOD method_22079 deleteTexture (I)V + ARG 0 texture METHOD method_22080 enablePolygonOffset ()V METHOD method_22081 bindTexture (I)V + ARG 0 texture METHOD method_22082 disablePolygonOffset ()V METHOD method_22083 shadeModel (I)V + ARG 0 mode METHOD method_22084 enableLineOffset ()V METHOD method_22085 stencilMask (I)V + ARG 0 mask METHOD method_22086 disableLineOffset ()V METHOD method_22087 clearStencil (I)V + ARG 0 stencil METHOD method_22606 enableVertexAttribArray (I)V + ARG 0 index + METHOD method_22607 (I)V + ARG 0 index METHOD method_22609 vertexAttribPointer (IIIZIJ)V + ARG 0 index + ARG 1 size + ARG 2 type + ARG 3 normalized + ARG 4 stride + ARG 5 pointer + METHOD method_22610 setupOverlayColor (II)V + ARG 0 texture + ARG 1 size + METHOD method_22613 getBuffer (FFFF)Ljava/nio/FloatBuffer; + ARG 0 a + ARG 1 b + ARG 2 c + ARG 3 d + METHOD method_22616 setupLevelDiffuseLighting (Lnet/minecraft/class_1159;)V + ARG 0 modelMatrix + METHOD method_22617 setupGuiDiffuseLighting (Lnet/minecraft/class_1159;)V + ARG 0 modelMatrix + METHOD method_22618 teardownOverlayColor ()V + METHOD method_22883 blendColor (FFFF)V + ARG 0 red + ARG 1 green + ARG 2 blue + ARG 3 alpha + METHOD method_22885 combineColor (IIII)V + ARG 0 combineColor + ARG 1 source0Color + ARG 2 source1Color + ARG 3 source2Color + METHOD method_22886 combineAlpha (II)V + ARG 0 combineAlpha + ARG 1 source0Alpha + METHOD method_22887 setupEndPortalTexGen ()V + METHOD method_22888 clearTexGen ()V + METHOD method_22889 mulTextureByProjModelView ()V + METHOD method_23281 combineColor (II)V + ARG 0 combineColor + ARG 1 source0Color + METHOD method_23282 setupOutline ()V + METHOD method_23283 teardownOutline ()V diff --git a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping index 52a8db0790..612a278370 100644 --- a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping +++ b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping @@ -1,19 +1,48 @@ CLASS com/mojang/blaze3d/systems/RenderSystem + METHOD activeTexture (I)V + ARG 0 texture METHOD alphaFunc (IF)V ARG 0 func ARG 1 ref + METHOD assertThread (Ljava/util/function/Supplier;)V + ARG 0 check METHOD bindTexture (I)V ARG 0 texture + METHOD blendColor (FFFF)V + ARG 0 red + ARG 1 green + ARG 2 blue + ARG 3 alpha METHOD blendEquation (I)V ARG 0 mode METHOD blendFunc (II)V - ARG 0 sfactor - ARG 1 dfactor + ARG 0 srcFactor + ARG 1 dstFactor + METHOD blendFunc (Lnet/minecraft/class_4493$class_4535;Lnet/minecraft/class_4493$class_4534;)V + ARG 0 srcFactor + ARG 1 dstFactor METHOD blendFuncSeparate (IIII)V - ARG 0 sFactorRGB - ARG 1 dFactorRGB - ARG 2 sFactorAlpha - ARG 3 dFactorAlpha + ARG 0 srcFactorRGB + ARG 1 dstFactorRGB + ARG 2 srcFactorAlpha + ARG 3 dstFactorAlpha + METHOD blendFuncSeparate (Lnet/minecraft/class_4493$class_4535;Lnet/minecraft/class_4493$class_4534;Lnet/minecraft/class_4493$class_4535;Lnet/minecraft/class_4493$class_4534;)V + ARG 0 srcFactor + ARG 1 dstFactor + ARG 2 srcAlpha + ARG 3 dstAlpha + METHOD clear (IZ)V + ARG 0 mask + ARG 1 getError + METHOD clearColor (FFFF)V + ARG 0 red + ARG 1 green + ARG 2 blue + ARG 3 alpha + METHOD clearDepth (D)V + ARG 0 depth + METHOD clearStencil (I)V + ARG 0 stencil METHOD color3f (FFF)V ARG 0 red ARG 1 green @@ -23,22 +52,205 @@ CLASS com/mojang/blaze3d/systems/RenderSystem ARG 1 green ARG 2 blue ARG 3 alpha + METHOD colorMask (ZZZZ)V + ARG 0 red + ARG 1 green + ARG 2 blue + ARG 3 alpha METHOD colorMaterial (II)V ARG 0 face ARG 1 mode + METHOD deleteTexture (I)V + ARG 0 texture METHOD depthFunc (I)V ARG 0 func METHOD depthMask (Z)V ARG 0 mask + METHOD drawArrays (III)V + ARG 0 mode + ARG 1 first + ARG 2 count + METHOD flipFrame (J)V + ARG 0 window + METHOD fog (IFFFF)V + ARG 0 pname + ARG 1 red + ARG 2 green + ARG 3 blue + ARG 4 alpha + METHOD fogDensity (F)V + ARG 0 density + METHOD fogEnd (F)V + ARG 0 end + METHOD fogMode (I)V + ARG 0 mode + METHOD fogMode (Lnet/minecraft/class_4493$class_1028;)V + ARG 0 mode + METHOD fogStart (F)V + ARG 0 start + METHOD fogi (II)V + ARG 0 pname + ARG 1 param + METHOD getString (ILjava/util/function/Consumer;)V + ARG 0 name + ARG 1 consumer + METHOD glBindBuffer (ILjava/util/function/Supplier;)V + ARG 0 target + ARG 1 buffer + METHOD glBufferData (ILjava/nio/ByteBuffer;I)V + ARG 0 target + ARG 1 data + ARG 2 usage + METHOD glDeleteBuffers (I)V + ARG 0 buffer + METHOD glGenBuffers (Ljava/util/function/Consumer;)V + ARG 0 consumer + METHOD glMultiTexCoord2f (IFF)V + ARG 0 texture + ARG 1 s + ARG 2 t + METHOD glUniform1 (ILjava/nio/FloatBuffer;)V + ARG 0 location + ARG 1 value + METHOD glUniform1 (ILjava/nio/IntBuffer;)V + ARG 0 location + ARG 1 value + METHOD glUniform1i (II)V + ARG 0 location + ARG 1 value + METHOD glUniform2 (ILjava/nio/FloatBuffer;)V + ARG 0 location + ARG 1 value + METHOD glUniform2 (ILjava/nio/IntBuffer;)V + ARG 0 location + ARG 1 value + METHOD glUniform3 (ILjava/nio/FloatBuffer;)V + ARG 0 location + ARG 1 value + METHOD glUniform3 (ILjava/nio/IntBuffer;)V + ARG 0 location + ARG 1 value + METHOD glUniform4 (ILjava/nio/FloatBuffer;)V + ARG 0 location + ARG 1 value + METHOD glUniform4 (ILjava/nio/IntBuffer;)V + ARG 0 location + ARG 1 value + METHOD glUniformMatrix2 (IZLjava/nio/FloatBuffer;)V + ARG 0 location + ARG 1 transpose + ARG 2 value + METHOD glUniformMatrix3 (IZLjava/nio/FloatBuffer;)V + ARG 0 location + ARG 1 transpose + ARG 2 value + METHOD glUniformMatrix4 (IZLjava/nio/FloatBuffer;)V + ARG 0 location + ARG 1 transpose + ARG 2 value + METHOD initGameThread (Z)V + ARG 0 assertNotRenderThread + METHOD initRenderer (IZ)V + ARG 0 debugVerbosity + ARG 1 debugSync + METHOD limitDisplayFPS (I)V + ARG 0 fps + METHOD lineWidth (F)V + ARG 0 width + METHOD logicOp (Lnet/minecraft/class_4493$class_1030;)V + ARG 0 op + METHOD matrixMode (I)V + ARG 0 mode + METHOD multMatrix (Lnet/minecraft/class_1159;)V + ARG 0 matrix METHOD normal3f (FFF)V ARG 0 nx ARG 1 ny ARG 2 nz + METHOD ortho (DDDDDD)V + ARG 0 l + ARG 2 r + ARG 4 b + ARG 6 t + ARG 8 n + ARG 10 f + METHOD pixelStore (II)V + ARG 0 pname + ARG 1 param + METHOD pixelTransfer (IF)V + ARG 0 pname + ARG 1 param + METHOD polygonMode (II)V + ARG 0 face + ARG 1 mode METHOD polygonOffset (FF)V ARG 0 factor ARG 1 units + METHOD readPixels (IIIIIILjava/nio/ByteBuffer;)V + ARG 0 x + ARG 1 y + ARG 2 width + ARG 3 height + ARG 4 format + ARG 5 type + ARG 6 pixels + METHOD recordRenderCall (Lnet/minecraft/class_4573;)V + ARG 0 renderCall + METHOD renderCrosshair (I)V + ARG 0 size METHOD rotatef (FFFF)V ARG 0 angle ARG 1 x ARG 2 y ARG 3 z + METHOD scaled (DDD)V + ARG 0 x + ARG 2 y + ARG 4 z + METHOD scalef (FFF)V + ARG 0 x + ARG 1 y + ARG 2 z + METHOD setErrorCallback (Lorg/lwjgl/glfw/GLFWErrorCallbackI;)V + ARG 0 callback + METHOD setupDefaultState (IIII)V + ARG 0 x + ARG 1 y + ARG 2 width + ARG 3 height + METHOD setupGuiDiffuseLighting (Lnet/minecraft/class_1159;)V + ARG 0 modelMatrix + METHOD setupLevelDiffuseLighting (Lnet/minecraft/class_1159;)V + ARG 0 modelMatrix + METHOD setupOverlayColor (Ljava/util/function/IntSupplier;I)V + ARG 0 texture + ARG 1 size + METHOD shadeModel (I)V + ARG 0 mode + METHOD stencilFunc (III)V + ARG 0 func + ARG 1 ref + ARG 2 mask + METHOD stencilMask (I)V + ARG 0 mask + METHOD stencilOp (III)V + ARG 0 sfail + ARG 1 dpfail + ARG 2 dppass + METHOD texParameter (III)V + ARG 0 target + ARG 1 pname + ARG 2 param + METHOD translated (DDD)V + ARG 0 x + ARG 2 y + ARG 4 z + METHOD translatef (FFF)V + ARG 0 x + ARG 1 y + ARG 2 z + METHOD viewport (IIII)V + ARG 0 x + ARG 1 y + ARG 2 width + ARG 3 height diff --git a/mappings/net/minecraft/client/gl/GlDebug.mapping b/mappings/net/minecraft/client/gl/GlDebug.mapping index df5a33009b..b078d529d1 100644 --- a/mappings/net/minecraft/client/gl/GlDebug.mapping +++ b/mappings/net/minecraft/client/gl/GlDebug.mapping @@ -21,5 +21,6 @@ CLASS net/minecraft/class_1008 net/minecraft/client/gl/GlDebug ARG 0 opcode METHOD method_4227 enableDebug (IZ)V ARG 0 verbosity + ARG 1 sync METHOD method_4228 getType (I)Ljava/lang/String; ARG 0 opcode diff --git a/mappings/net/minecraft/client/gui/screen/ingame/AbstractContainerScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/AbstractContainerScreen.mapping index 76b8b482ea..4cfaf7a794 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/AbstractContainerScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/AbstractContainerScreen.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/AbstractContainerScreen FIELD field_17410 playerInventory Lnet/minecraft/class_1661; - FIELD field_2776 left I + FIELD field_2776 x I FIELD field_2777 touchDragSlotStart Lnet/minecraft/class_1735; FIELD field_2778 heldButtonCode I FIELD field_2779 containerHeight I @@ -24,7 +24,7 @@ CLASS net/minecraft/class_465 net/minecraft/client/gui/screen/ingame/AbstractCon FIELD field_2797 container Lnet/minecraft/class_1703; FIELD field_2798 cancelNextRelease Z FIELD field_2799 lastClickedSlot Lnet/minecraft/class_1735; - FIELD field_2800 top I + FIELD field_2800 y I FIELD field_2801 BACKGROUND_TEXTURE Lnet/minecraft/class_2960; FIELD field_2802 touchDropOriginSlot Lnet/minecraft/class_1735; FIELD field_2803 draggedStackRemainder I diff --git a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping index 2965ad3827..4fcd184e8a 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/InventoryScreen.mapping @@ -9,6 +9,11 @@ CLASS net/minecraft/class_490 net/minecraft/client/gui/screen/ingame/InventorySc METHOD (Lnet/minecraft/class_1657;)V ARG 1 player METHOD method_2486 drawEntity (IIIFFLnet/minecraft/class_1309;)V + ARG 0 x + ARG 1 y + ARG 2 size + ARG 3 mouseX + ARG 4 mouseY ARG 5 entity METHOD mouseClicked (DDI)Z ARG 1 mouseX diff --git a/mappings/net/minecraft/client/model/Model.mapping b/mappings/net/minecraft/client/model/Model.mapping index c6521a4e4f..52b51b0fe9 100644 --- a/mappings/net/minecraft/client/model/Model.mapping +++ b/mappings/net/minecraft/client/model/Model.mapping @@ -7,6 +7,11 @@ CLASS net/minecraft/class_3879 net/minecraft/client/model/Model METHOD method_23500 getLayer (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; ARG 1 texture METHOD method_2828 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;IIFFFF)V - ARG 5 r - ARG 6 g - ARG 7 b + ARG 1 matrices + ARG 2 vertexConsumer + ARG 3 light + ARG 4 overlay + ARG 5 red + ARG 6 green + ARG 7 blue + ARG 8 alpha diff --git a/mappings/net/minecraft/client/model/ModelPart.mapping b/mappings/net/minecraft/client/model/ModelPart.mapping index bcabf92eb3..20486b1c36 100644 --- a/mappings/net/minecraft/client/model/ModelPart.mapping +++ b/mappings/net/minecraft/client/model/ModelPart.mapping @@ -77,15 +77,30 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart ARG 3 textureOffsetV METHOD method_17138 copyPositionAndRotation (Lnet/minecraft/class_630;)V METHOD method_22698 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;II)V - ARG 1 matrix + ARG 1 matrices ARG 2 vertexConsumer + ARG 3 light + ARG 4 overlay METHOD method_22699 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;IIFFFF)V - ARG 1 matrix + ARG 1 matrices ARG 2 vertexConsumer + ARG 3 light + ARG 4 overlay + ARG 5 red + ARG 6 green + ARG 7 blue + ARG 8 alpha METHOD method_22700 getRandomCuboid (Ljava/util/Random;)Lnet/minecraft/class_630$class_628; ARG 1 random METHOD method_22702 renderCuboids (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;IIFFFF)V + ARG 1 matrices ARG 2 vertexConsumer + ARG 3 light + ARG 4 overlay + ARG 5 red + ARG 6 green + ARG 7 blue + ARG 8 alpha METHOD method_22703 rotate (Lnet/minecraft/class_4587;)V ARG 1 matrix METHOD method_22971 addCuboid (FFFFFFFFF)V diff --git a/mappings/net/minecraft/client/render/DiffuseLighting.mapping b/mappings/net/minecraft/client/render/DiffuseLighting.mapping new file mode 100644 index 0000000000..9a29d20560 --- /dev/null +++ b/mappings/net/minecraft/client/render/DiffuseLighting.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/class_308 net/minecraft/client/render/DiffuseLighting + METHOD method_1450 disable ()V + METHOD method_1452 enableForLevel (Lnet/minecraft/class_1159;)V + ARG 0 modelMatrix + METHOD method_1453 enableForGui (Lnet/minecraft/class_1159;)V + ARG 0 modelMatrix + METHOD method_22890 enable ()V diff --git a/mappings/net/minecraft/client/render/GuiLighting.mapping b/mappings/net/minecraft/client/render/GuiLighting.mapping deleted file mode 100644 index 2d1441e8ed..0000000000 --- a/mappings/net/minecraft/client/render/GuiLighting.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_308 net/minecraft/client/render/GuiLighting - METHOD method_1450 disable ()V - METHOD method_1452 enable (Lnet/minecraft/class_1159;)V - METHOD method_1453 enableForItems (Lnet/minecraft/class_1159;)V - METHOD method_22890 enable ()V diff --git a/mappings/net/minecraft/client/render/OverlayTexture.mapping b/mappings/net/minecraft/client/render/OverlayTexture.mapping index f0bf08fa75..1d9a7a71ac 100644 --- a/mappings/net/minecraft/client/render/OverlayTexture.mapping +++ b/mappings/net/minecraft/client/render/OverlayTexture.mapping @@ -3,9 +3,12 @@ CLASS net/minecraft/class_4608 net/minecraft/client/render/OverlayTexture FIELD field_21444 DEFAULT_UV I METHOD method_23209 setupOverlayColor ()V METHOD method_23210 getU (F)I + ARG 0 whiteOverlayProgress METHOD method_23212 getV (Z)I + ARG 0 hurt METHOD method_23213 teardownOverlayColor ()V - METHOD method_23624 packUv (FZ)I + METHOD method_23624 getUv (FZ)I + ARG 1 hurt METHOD method_23625 packUv (II)I ARG 0 u ARG 1 v diff --git a/mappings/net/minecraft/client/render/RenderLayer.mapping b/mappings/net/minecraft/client/render/RenderLayer.mapping index 5d470a2daf..44f8b33c48 100644 --- a/mappings/net/minecraft/client/render/RenderLayer.mapping +++ b/mappings/net/minecraft/client/render/RenderLayer.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer CLASS class_4687 MultiPhase + CLASS class_4721 HashStrategy FIELD field_21403 phases Lnet/minecraft/class_1921$class_4688; FIELD field_21404 hash I FIELD field_21696 CACHE Lit/unimi/dsi/fastutil/objects/ObjectOpenCustomHashSet; @@ -146,11 +147,10 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer ARG 0 texture METHOD method_23031 getVertexFormat ()Lnet/minecraft/class_293; METHOD method_23033 getDrawMode ()I - METHOD method_23037 hasCrumbling ()Z METHOD method_23287 getOutline (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; ARG 0 texture METHOD method_23289 getTexture ()Ljava/util/Optional; - METHOD method_23570 getCrumbling (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; + METHOD method_23570 getBlockBreaking (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; ARG 0 texture METHOD method_23572 getEntitySolid (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; ARG 0 texture diff --git a/mappings/net/minecraft/client/render/VertexConsumer.mapping b/mappings/net/minecraft/client/render/VertexConsumer.mapping index 72c7736135..f27be8894c 100644 --- a/mappings/net/minecraft/client/render/VertexConsumer.mapping +++ b/mappings/net/minecraft/client/render/VertexConsumer.mapping @@ -60,16 +60,16 @@ CLASS net/minecraft/class_4588 net/minecraft/client/render/VertexConsumer ARG 2 x ARG 3 y ARG 4 z - METHOD method_23919 elements (FFFFFFFFFIIFFF)V + METHOD method_23919 vertex (FFFFFFFFFIIFFF)V ARG 1 x ARG 2 y ARG 3 z - ARG 4 r - ARG 5 g - ARG 6 b - ARG 7 a - ARG 8 textureU - ARG 9 textureV + ARG 4 red + ARG 5 green + ARG 6 blue + ARG 7 alpha + ARG 8 u + ARG 9 v ARG 10 overlay ARG 11 light ARG 12 normalX diff --git a/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping b/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping index c6597611cc..3d5d1ac781 100644 --- a/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping +++ b/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping @@ -1,20 +1,22 @@ 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_20952 fallbackBuffer Lnet/minecraft/class_287; + FIELD field_20953 layerBuffers 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 + ARG 0 fallbackBuffer + ARG 1 layerBuffers METHOD method_22993 draw ()V METHOD method_22994 draw (Lnet/minecraft/class_1921;)V - METHOD method_22995 getConsumer (Lnet/minecraft/class_1921;)Lnet/minecraft/class_287; + ARG 1 layer + METHOD method_22995 getBufferInternal (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 + ARG 1 buffer METHOD method_22992 immediate (Ljava/util/Map;Lnet/minecraft/class_287;)Lnet/minecraft/class_4597$class_4598; - ARG 0 layerBuilders - ARG 1 fallbackBuilder + ARG 1 layerBuffers + ARG 2 fallbackBuffer 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/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 9f6788a39f..8f311d270d 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -102,6 +102,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 6 cameraZ ARG 8 tickDelta ARG 9 matrix + ARG 10 vertexConsumers 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 diff --git a/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping index 15c9a0497a..77d3449919 100644 --- a/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping @@ -1,4 +1,11 @@ CLASS net/minecraft/class_823 net/minecraft/client/render/block/entity/BannerBlockEntityRenderer - FIELD field_20810 area Lnet/minecraft/class_630; + FIELD field_20810 field Lnet/minecraft/class_630; FIELD field_20811 verticalBar Lnet/minecraft/class_630; FIELD field_20812 topBar Lnet/minecraft/class_630; + METHOD (Lnet/minecraft/class_824;)V + ARG 1 dispatcher + METHOD method_24080 createField ()Lnet/minecraft/class_630; + METHOD render (Lnet/minecraft/class_2573;FLnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)V + ARG 3 matrices + ARG 5 light + ARG 6 overlay diff --git a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping index 011ecd0c5e..1b03a26807 100644 --- a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderDispatcher.mapping @@ -17,6 +17,9 @@ CLASS net/minecraft/class_824 net/minecraft/client/render/block/entity/BlockEnti METHOD method_23079 render (Lnet/minecraft/class_827;Lnet/minecraft/class_2586;FLnet/minecraft/class_4587;Lnet/minecraft/class_4597;)V ARG 0 renderer ARG 1 blockEntity + ARG 2 tickDelta + ARG 3 matrices + ARG 4 vertexConsumers 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 diff --git a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderer.mapping index 5dc912e5b8..96e4a08bff 100644 --- a/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BlockEntityRenderer.mapping @@ -1,6 +1,13 @@ CLASS net/minecraft/class_827 net/minecraft/client/render/block/entity/BlockEntityRenderer - FIELD field_20989 blockEntityRenderDispatcher Lnet/minecraft/class_824; + FIELD field_20989 dispatcher Lnet/minecraft/class_824; + METHOD (Lnet/minecraft/class_824;)V + ARG 1 dispatcher METHOD method_3563 rendersOutsideBoundingBox (Lnet/minecraft/class_2586;)Z ARG 1 blockEntity METHOD method_3569 render (Lnet/minecraft/class_2586;FLnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)V ARG 1 blockEntity + ARG 2 tickDelta + ARG 3 matrices + ARG 4 vertexConsumers + ARG 5 light + ARG 6 overlay diff --git a/mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping index 2ba93e5bc1..169dc3f9b4 100644 --- a/mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/PathfindingDebugRenderer.mapping @@ -2,9 +2,29 @@ CLASS net/minecraft/class_868 net/minecraft/client/render/debug/PathfindingDebug FIELD field_4615 pathTimes Ljava/util/Map; FIELD field_4616 paths Ljava/util/Map; METHOD method_23117 drawPathLines (Lnet/minecraft/class_11;DDD)V + ARG 0 path + ARG 1 cameraX + ARG 3 cameraY + ARG 5 cameraZ METHOD method_23118 drawPath (Lnet/minecraft/class_11;FZZDDD)V + ARG 0 path + ARG 1 nodeSize + ARG 3 drawLabels + ARG 4 cameraX + ARG 6 cameraY + ARG 8 cameraZ METHOD method_23119 getManhattanDistance (Lnet/minecraft/class_2338;DDD)F + ARG 0 pos + ARG 1 x + ARG 3 y + ARG 5 z METHOD method_23121 drawPathInternal (Lnet/minecraft/class_11;FZZDDD)V + ARG 0 path + ARG 1 nodeSize + ARG 3 drawLabels + ARG 4 cameraX + ARG 6 cameraY + ARG 8 cameraZ 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/VillageDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping index 776b4627e0..0f277a5f8b 100644 --- a/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/VillageDebugRenderer.mapping @@ -1,17 +1,21 @@ CLASS net/minecraft/class_4207 net/minecraft/client/render/debug/VillageDebugRenderer CLASS class_4232 Brain FIELD field_18923 uuid Ljava/util/UUID; + FIELD field_18925 profession Ljava/lang/String; FIELD field_18926 pos Lnet/minecraft/class_2374; + FIELD field_18930 pointsOfInterest Ljava/util/Set; 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 4 profession ARG 5 xp ARG 6 pos ARG 8 path ARG 9 wantsGolem METHOD method_23149 getUuid ()Ljava/util/UUID; + METHOD method_23151 isPointOfInterest (Lnet/minecraft/class_2338;)Z CLASS class_4233 PointOfInterest FIELD field_18931 pos Lnet/minecraft/class_2338; FIELD field_18933 freeTicketCount I @@ -33,6 +37,8 @@ CLASS net/minecraft/class_4207 net/minecraft/client/render/debug/VillageDebugRen ARG 1 pos ARG 2 freeTicketCount METHOD method_23131 drawGhostPointOfInterest (Lnet/minecraft/class_2338;Ljava/util/List;)V + ARG 1 pos + ARG 2 brains METHOD method_23132 drawString (Lnet/minecraft/class_2374;ILjava/lang/String;IF)V ARG 0 pos ARG 1 offsetY @@ -51,13 +57,27 @@ CLASS net/minecraft/class_4207 net/minecraft/client/render/debug/VillageDebugRen ARG 3 color METHOD method_23136 drawPath (Lnet/minecraft/class_4207$class_4232;DDD)V ARG 1 brain - METHOD method_23137 drawPointOfInterest (Lnet/minecraft/class_4207$class_4233;)V + ARG 2 cameraX + ARG 4 cameraY + ARG 6 cameraZ + METHOD method_23137 drawPointOfInterestInfo (Lnet/minecraft/class_4207$class_4233;)V ARG 1 pointOfInterest + METHOD method_23138 drawPointOfInterest (Lnet/minecraft/class_2338;)V + ARG 0 pos METHOD method_23140 drawBrain (Lnet/minecraft/class_4207$class_4232;DDD)V ARG 1 brain + ARG 2 cameraX + ARG 4 cameraY + ARG 6 cameraZ METHOD method_23141 getVillagerNames (Lnet/minecraft/class_4207$class_4233;)Ljava/util/Set; ARG 1 pointOfInterest + METHOD method_23142 getBrains (Lnet/minecraft/class_2338;)Ljava/util/Collection; + ARG 1 pointOfInterest + METHOD method_23143 drawSection (Lnet/minecraft/class_4076;)V + ARG 0 pos METHOD method_23144 getGhostPointsOfInterest ()Ljava/util/Map; METHOD method_23145 isTargeted (Lnet/minecraft/class_4207$class_4232;)Z ARG 1 brain + METHOD method_23147 isClose (Lnet/minecraft/class_4207$class_4232;)Z + ARG 1 brain METHOD method_23146 updateTargetedEntity ()V diff --git a/mappings/net/minecraft/client/render/entity/EnderDragonEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/EnderDragonEntityRenderer.mapping index 507d339b91..16a284ca3b 100644 --- a/mappings/net/minecraft/client/render/entity/EnderDragonEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/EnderDragonEntityRenderer.mapping @@ -13,6 +13,8 @@ CLASS net/minecraft/class_895 net/minecraft/client/render/entity/EnderDragonEnti FIELD field_3634 frontLegTip Lnet/minecraft/class_630; FIELD field_3635 wingTip Lnet/minecraft/class_630; FIELD field_3637 neck Lnet/minecraft/class_630; + METHOD animateModel (Lnet/minecraft/class_1510;FFF)V + ARG 3 limbDistance FIELD field_21006 EYES_TEX Lnet/minecraft/class_2960; FIELD field_4668 CRYSTAL_BEAM_TEX Lnet/minecraft/class_2960; FIELD field_4669 EXPLOSION_TEX Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping index 3cb920b1ad..b0ea1d0075 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderDispatcher.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDispatcher + FIELD field_21009 SHADOW_LAYER Lnet/minecraft/class_1921; FIELD field_4678 targetedEntity Lnet/minecraft/class_1297; FIELD field_4680 renderHitboxes Z FIELD field_4681 renderShadows Z @@ -13,10 +14,48 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis METHOD (Lnet/minecraft/class_1060;Lnet/minecraft/class_918;Lnet/minecraft/class_3296;Lnet/minecraft/class_327;Lnet/minecraft/class_315;)V ARG 1 textureManager METHOD method_17145 register (Lnet/minecraft/class_1299;Lnet/minecraft/class_897;)V + METHOD method_23161 fireVertex (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;FFFFF)V + ARG 0 matrix + ARG 1 vertexConsumer + ARG 2 x + ARG 3 y + ARG 4 z + ARG 5 u + ARG 6 v + METHOD method_23162 shadowVertex (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;FFFFFF)V + ARG 0 matrix + ARG 1 vertexConsumer + ARG 2 alpha + ARG 3 x + ARG 4 y + ARG 5 z + ARG 6 u + ARG 7 v + METHOD method_23163 renderShadowPart (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;DDDFF)V + ARG 0 matrix + ARG 1 vertexConsumer + ARG 2 world + ARG 3 pos + ARG 4 x + ARG 6 y + ARG 8 z + ARG 10 size + ARG 11 darkness METHOD method_23165 renderFire (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1297;)V ARG 1 matrix + METHOD method_23166 renderShadow (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;Lnet/minecraft/class_1297;FFLnet/minecraft/class_4538;F)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 entity + ARG 3 darkness + ARG 4 tickDelta + ARG 5 world + ARG 6 size METHOD method_23167 registerRenderers (Lnet/minecraft/class_918;Lnet/minecraft/class_3296;)V METHOD method_23168 getSquaredDistanceToCamera (Lnet/minecraft/class_1297;)D + METHOD method_23839 getLight (Lnet/minecraft/class_1297;F)I + ARG 1 entity + ARG 2 tickDelta METHOD method_3941 configure (Lnet/minecraft/class_1937;Lnet/minecraft/class_4184;Lnet/minecraft/class_1297;)V ARG 1 world METHOD method_3944 setWorld (Lnet/minecraft/class_1937;)V @@ -24,7 +63,13 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis ARG 1 value METHOD method_3949 getTextRenderer ()Lnet/minecraft/class_327; METHOD method_3950 shouldRender (Lnet/minecraft/class_1297;Lnet/minecraft/class_4604;DDD)Z + ARG 1 entity + ARG 2 frustum + ARG 3 cameraX + ARG 5 cameraY + ARG 7 cameraZ METHOD method_3953 getRenderer (Lnet/minecraft/class_1297;)Lnet/minecraft/class_897; + ARG 1 entity METHOD method_3954 render (Lnet/minecraft/class_1297;DDDFFLnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V ARG 1 entity ARG 2 x @@ -33,6 +78,8 @@ CLASS net/minecraft/class_898 net/minecraft/client/render/entity/EntityRenderDis ARG 8 yaw ARG 9 tickDelta ARG 10 matrices + ARG 11 vertexConsumers + ARG 12 light METHOD method_3955 setRenderHitboxes (Z)V ARG 1 value METHOD method_3956 renderHitbox (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_1297;F)V diff --git a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping index 55d12a304b..61b87047b5 100644 --- a/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/EntityRenderer.mapping @@ -1,7 +1,16 @@ CLASS net/minecraft/class_897 net/minecraft/client/render/entity/EntityRenderer + FIELD field_4672 shadowDarkness F + FIELD field_4673 shadowSize F FIELD field_4676 renderManager Lnet/minecraft/class_898; METHOD method_23169 getPositionOffset (Lnet/minecraft/class_1297;F)Lnet/minecraft/class_243; ARG 1 entity + ARG 2 tickDelta + METHOD method_24087 getBlockLight (Lnet/minecraft/class_1297;F)I + ARG 1 entity + ARG 2 tickDelta + METHOD method_24088 getLight (Lnet/minecraft/class_1297;F)I + ARG 1 entity + ARG 2 tickDelta METHOD method_3921 hasLabel (Lnet/minecraft/class_1297;)Z ARG 1 entity METHOD method_3926 renderLabelIfPresent (Lnet/minecraft/class_1297;Ljava/lang/String;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V @@ -9,9 +18,17 @@ CLASS net/minecraft/class_897 net/minecraft/client/render/entity/EntityRenderer METHOD method_3931 getTexture (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2960; ARG 1 entity METHOD method_3932 getFontRenderer ()Lnet/minecraft/class_327; - METHOD method_3933 isVisible (Lnet/minecraft/class_1297;Lnet/minecraft/class_4604;DDD)Z + METHOD method_3933 shouldRender (Lnet/minecraft/class_1297;Lnet/minecraft/class_4604;DDD)Z ARG 1 entity ARG 2 visibleRegion + ARG 3 cameraX + ARG 5 cameraY + ARG 7 cameraZ METHOD method_3936 render (Lnet/minecraft/class_1297;FFLnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V ARG 1 entity + ARG 2 yaw + ARG 3 tickDelta + ARG 4 matrices + ARG 5 vertexConsumers + ARG 6 light METHOD method_3940 getRenderManager ()Lnet/minecraft/class_898; diff --git a/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping index cff4442c1e..6cf88cecde 100644 --- a/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping @@ -3,15 +3,23 @@ CLASS net/minecraft/class_922 net/minecraft/client/render/entity/LivingEntityRen FIELD field_4737 model Lnet/minecraft/class_583; FIELD field_4738 features Ljava/util/List; METHOD method_18656 getYaw (Lnet/minecraft/class_2350;)F + METHOD method_23185 getWhiteOverlayProgress (Lnet/minecraft/class_1309;F)F + ARG 1 entity + ARG 2 tickDelta + METHOD method_23622 getOverlay (Lnet/minecraft/class_1309;F)I + ARG 0 entity + ARG 1 whiteOverlayProgress METHOD method_4039 getLyingAngle (Lnet/minecraft/class_1309;)F METHOD method_4042 scale (Lnet/minecraft/class_1309;Lnet/minecraft/class_4587;F)V ARG 1 entity METHOD method_4044 getHandSwingProgress (Lnet/minecraft/class_1309;F)F ARG 1 entity ARG 2 tickDelta - METHOD method_4045 getAge (Lnet/minecraft/class_1309;F)F + METHOD method_4045 getCustomAngle (Lnet/minecraft/class_1309;F)F ARG 1 entity ARG 2 tickDelta METHOD method_4046 addFeature (Lnet/minecraft/class_3887;)Z METHOD method_4058 setupTransforms (Lnet/minecraft/class_1309;Lnet/minecraft/class_4587;FFF)V ARG 1 entity + METHOD render (Lnet/minecraft/class_1309;FFLnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V + ARG 4 matrices diff --git a/mappings/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.mapping index 1baf1c73e2..8c8241fc78 100644 --- a/mappings/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/class_972 net/minecraft/client/render/entity/feature/CapeFeatureRenderer METHOD (Lnet/minecraft/class_3883;)V ARG 1 context + METHOD render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_742;FFFFFF)V + ARG 1 matrices diff --git a/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping index 420ec81b4b..18f8d16293 100644 --- a/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/FeatureRenderer.mapping @@ -2,9 +2,43 @@ CLASS net/minecraft/class_3887 net/minecraft/client/render/entity/feature/Featur FIELD field_17155 context Lnet/minecraft/class_3883; METHOD (Lnet/minecraft/class_3883;)V ARG 1 context - METHOD method_17165 getModel ()Lnet/minecraft/class_583; + METHOD method_17165 getContextModel ()Lnet/minecraft/class_583; METHOD method_23194 getTexture (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2960; + ARG 1 entity METHOD method_23196 render (Lnet/minecraft/class_583;Lnet/minecraft/class_583;Lnet/minecraft/class_2960;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1309;FFFFFFFFF)V + ARG 0 contextModel + ARG 1 model + ARG 2 texture + ARG 3 matrices + ARG 4 vertexConsumers + ARG 5 light + ARG 6 entity + ARG 7 limbAngle + ARG 8 limbDistance + ARG 9 age + ARG 10 headYaw + ARG 11 headPitch + ARG 13 red + ARG 14 green + ARG 15 blue METHOD method_23199 renderModel (Lnet/minecraft/class_583;Lnet/minecraft/class_2960;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1309;FFF)V + ARG 0 model + ARG 1 texture + ARG 2 matrices + ARG 3 vertexConsumers + ARG 4 light + ARG 5 entity + ARG 6 red + ARG 7 green + ARG 8 blue METHOD method_4199 render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1297;FFFFFF)V + ARG 1 matrices + ARG 2 vertexConsumers + ARG 3 light + ARG 4 entity + ARG 5 limbAngle + ARG 6 limbDistance ARG 7 tickDelta + ARG 8 customAngle + ARG 9 headYaw + ARG 10 headPitch diff --git a/mappings/net/minecraft/client/render/entity/feature/ShulkerSomethingFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/ShulkerHeadFeatureRenderer.mapping similarity index 75% rename from mappings/net/minecraft/client/render/entity/feature/ShulkerSomethingFeatureRenderer.mapping rename to mappings/net/minecraft/client/render/entity/feature/ShulkerHeadFeatureRenderer.mapping index ab8d585f4c..5c6b9d018c 100644 --- a/mappings/net/minecraft/client/render/entity/feature/ShulkerSomethingFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/ShulkerHeadFeatureRenderer.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/class_944 net/minecraft/client/render/entity/feature/ShulkerSomethingFeatureRenderer +CLASS net/minecraft/class_944 net/minecraft/client/render/entity/feature/ShulkerHeadFeatureRenderer METHOD (Lnet/minecraft/class_3883;)V ARG 1 context diff --git a/mappings/net/minecraft/client/render/entity/feature/StickingOutThingsFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/StickingOutThingsFeatureRenderer.mapping deleted file mode 100644 index 7a8dc0b965..0000000000 --- a/mappings/net/minecraft/client/render/entity/feature/StickingOutThingsFeatureRenderer.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/class_4507 net/minecraft/client/render/entity/feature/StickingOutThingsFeatureRenderer - METHOD (Lnet/minecraft/class_922;)V - ARG 1 entityRenderer - METHOD method_22130 renderThing (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1297;FFFF)V - ARG 5 tickDelta - METHOD method_22134 getThingCount (Lnet/minecraft/class_1309;)I - ARG 1 entity diff --git a/mappings/net/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer.mapping new file mode 100644 index 0000000000..46acc855e6 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_4507 net/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer + METHOD (Lnet/minecraft/class_922;)V + ARG 1 entityRenderer + METHOD method_22130 renderObject (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1297;FFFF)V + ARG 1 matrix + ARG 2 vertexConsumers + ARG 5 tickDelta + METHOD method_22134 getObjectCount (Lnet/minecraft/class_1309;)I + ARG 1 entity + METHOD render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1309;FFFFFF)V + ARG 1 matrices + ARG 2 vertexConsumers diff --git a/mappings/net/minecraft/client/render/entity/feature/StingerFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping similarity index 62% rename from mappings/net/minecraft/client/render/entity/feature/StingerFeatureRenderer.mapping rename to mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping index 6c31b722c8..51550284fa 100644 --- a/mappings/net/minecraft/client/render/entity/feature/StingerFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer.mapping @@ -1 +1 @@ -CLASS net/minecraft/class_4506 net/minecraft/client/render/entity/feature/StingerFeatureRenderer +CLASS net/minecraft/class_4506 net/minecraft/client/render/entity/feature/StuckStingersFeatureRenderer diff --git a/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping index 890d1420f9..a925453298 100644 --- a/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping @@ -16,6 +16,8 @@ CLASS net/minecraft/class_572 net/minecraft/client/render/entity/model/BipedEnti FIELD field_3401 rightArm Lnet/minecraft/class_630; METHOD (F)V ARG 1 scale + METHOD animateModel (Lnet/minecraft/class_1309;FFF)V + ARG 3 limbSpeed METHOD method_2804 lerpAngle (FFF)F ARG 1 from ARG 2 to diff --git a/mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping index b057441ef3..7c64568dba 100644 --- a/mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_554 net/minecraft/client/render/entity/model/BoatEntit METHOD method_22954 getBottom ()Lnet/minecraft/class_630; METHOD method_2796 makePaddle (Z)Lnet/minecraft/class_630; ARG 1 isLeft - METHOD method_2797 renderPaddle (Lnet/minecraft/class_1690;IF)V + METHOD method_2797 setPaddleAngle (Lnet/minecraft/class_1690;IF)V ARG 1 boat ARG 2 paddle - ARG 3 scale + ARG 3 angle diff --git a/mappings/net/minecraft/client/render/entity/model/EntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/EntityModel.mapping index 76e3cc4c96..b4008a5bcb 100644 --- a/mappings/net/minecraft/client/render/entity/model/EntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/EntityModel.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_583 net/minecraft/client/render/entity/model/EntityModel FIELD field_3447 handSwingProgress F - FIELD field_3448 isChild Z - FIELD field_3449 isRiding Z + FIELD field_3448 child Z + FIELD field_3449 riding Z METHOD method_17081 copyStateTo (Lnet/minecraft/class_583;)V ARG 1 copy METHOD method_2816 animateModel (Lnet/minecraft/class_1297;FFF)V @@ -13,6 +13,6 @@ CLASS net/minecraft/class_583 net/minecraft/client/render/entity/model/EntityMod ARG 1 entity ARG 2 limbAngle ARG 3 limbDistance - ARG 4 age + ARG 4 customAngle ARG 5 headYaw ARG 6 headPitch diff --git a/mappings/net/minecraft/client/render/entity/model/ParrotEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/ParrotEntityModel.mapping index cc852699bb..e47177321b 100644 --- a/mappings/net/minecraft/client/render/entity/model/ParrotEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/ParrotEntityModel.mapping @@ -12,3 +12,11 @@ CLASS net/minecraft/class_584 net/minecraft/client/render/entity/model/ParrotEnt FIELD field_3460 tail Lnet/minecraft/class_630; FIELD field_3461 forehead Lnet/minecraft/class_630; METHOD method_17107 getPose (Lnet/minecraft/class_1453;)Lnet/minecraft/class_584$class_585; + METHOD method_17111 (Lnet/minecraft/class_584$class_585;IFFFFF)V + ARG 1 pose + ARG 2 age + ARG 3 limbAngle + ARG 4 limbDistance + ARG 5 age + ARG 6 headYaw + ARG 7 headPitch diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 2eeda3958e..d96090ef53 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -23,7 +23,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_5966 teleportRequested Z FIELD field_5968 pushSpeedReduction F FIELD field_5969 prevZ D - FIELD field_5971 prevRenderY D + FIELD field_5971 lastRenderY D FIELD field_5972 portalTime I FIELD field_5973 horizontalSpeed F FIELD field_5974 random Ljava/util/Random; @@ -39,7 +39,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_5986 entityId I FIELD field_5987 x D FIELD field_5988 removed Z - FIELD field_5989 prevRenderZ D + FIELD field_5989 lastRenderZ D FIELD field_5990 FLAGS Lnet/minecraft/class_2940; FIELD field_5991 lastPortalPosition Lnet/minecraft/class_2338; FIELD field_5992 verticalCollision Z @@ -84,7 +84,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_6035 z D FIELD field_6036 prevY D FIELD field_6037 velocityModified Z - FIELD field_6038 prevRenderX D + FIELD field_6038 lastRenderX D FIELD field_6039 prevHorizontalSpeed F METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V ARG 1 type @@ -224,7 +224,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5638 shouldSetPositionOnLoad ()Z METHOD method_5639 setOnFireFor (I)V ARG 1 seconds - METHOD method_5640 shouldRenderAtDistance (D)Z + METHOD method_5640 shouldRender (D)Z ARG 1 distance METHOD method_5641 setPositionAnglesAndUpdate (DDDFF)V ARG 1 x @@ -379,10 +379,10 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 3 pitch METHOD method_5726 toListTag ([F)Lnet/minecraft/class_2499; ARG 1 values - METHOD method_5727 shouldRenderFrom (DDD)Z - ARG 1 x - ARG 3 y - ARG 5 z + METHOD method_5727 shouldRender (DDD)Z + ARG 1 cameraX + ARG 3 cameraY + ARG 5 cameraZ METHOD method_5728 setSprinting (Z)V ARG 1 sprinting METHOD method_5729 setFlag (IZ)V diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 526aa33eef..be70044f7f 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -29,7 +29,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity FIELD field_7513 fishHook Lnet/minecraft/class_1536; FIELD field_7514 inventory Lnet/minecraft/class_1661; FIELD field_7515 spawnForced Z - FIELD field_7518 PLAYER_MODEL_BIT_MASK Lnet/minecraft/class_2940; + FIELD field_7518 PLAYER_MODEL_PARTS Lnet/minecraft/class_2940; FIELD field_7520 experienceLevel I FIELD field_7523 reducedDebugInfo Z FIELD field_7525 selectedItem Lnet/minecraft/class_1799; @@ -186,7 +186,7 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity METHOD method_7345 setShoulderEntityRight (Lnet/minecraft/class_2487;)V ARG 1 entityTag METHOD method_7346 closeContainer ()V - METHOD method_7348 isSkinOverlayVisible (Lnet/minecraft/class_1664;)Z + METHOD method_7348 isPartVisible (Lnet/minecraft/class_1664;)Z ARG 1 modelPart METHOD method_7349 getNextLevelExperience ()I METHOD method_7350 resetLastAttackedTicks ()V diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 63394cf0f6..48dfcc44e0 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -43,11 +43,11 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util METHOD method_651 getJVMFlags ()Ljava/util/stream/Stream; METHOD method_652 combine (Ljava/util/List;)Ljava/util/concurrent/CompletableFuture; ARG 0 futures - METHOD method_654 create (Ljava/lang/Object;Ljava/util/function/Consumer;)Ljava/lang/Object; + METHOD method_654 make (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 create (Ljava/util/function/Supplier;)Ljava/lang/Object; + METHOD method_656 make (Ljava/util/function/Supplier;)Ljava/lang/Object; ARG 0 factory METHOD method_658 getMeasuringTimeMs ()J METHOD method_659 getEpochTimeMs ()J