From 563be4317463d750bdf2c0005ed24fa2af138ada Mon Sep 17 00:00:00 2001 From: Pyrofab Date: Sun, 31 May 2020 19:21:17 +0200 Subject: [PATCH] Map transparency shader fields and methods (#1412) * Entity#isAlive(0) -> isValid * Framebuffer#method_29329(1) -> copyFrom * GlStateManager#method_29330(0) -> supportsGl30 * GlStateManager#method_29332(10) -> blitFramebuffer * GlStateManager#method_29333(0) -> getFramebufferAttachmentParameter * GlStateManager#method_29334(0) -> getActiveBoundTexture * GlStateManager#method_29331(8) -> copyTexSubImage2D * GlStateManager#getFramebufferAttachmentParameter(0) -> getFramebufferDepthAttachment * Framebuffer#copyFrom(1) -> copyDepthFrom * WorldRenderer%field_25275 -> entityFramebuffer * WorldRenderer%field_25276 -> particleFramebuffer * WorldRenderer%field_25274 -> translucentFramebuffer * RenderPhase%field_25281 -> PARTICLES_TARGET * RenderPhase%field_25280 -> TRANSLUCENT_TARGET * RenderPhase%field_25282 -> WEATHER_TARGET * RenderPhase%field_25283 -> CLOUDS_TARGET * RenderPhase%field_25284 -> ITEM_TRANSPARENCY * RenderPhase$DepthTest%field_22242 -> depthFunction * +133 doc in RenderPhase$DepthTest%depthFunction * WorldRenderer#method_29362(0) -> getParticlesFramebuffer * WorldRenderer%particleFramebuffer -> particlesFramebuffer * WorldRenderer%field_25278 -> cloudsFramebuffer * WorldRenderer%field_25277 -> weatherFramebuffer * WorldRenderer%field_25279 -> transparencyShader * WorldRenderer#method_29365(0) -> loadTransparencyShader * Lowercase 2d Co-authored-by: liach <7806504+liach@users.noreply.github.com> * Revert "Entity#isAlive(0) -> isValid" This reverts commit 0199e61e6803e769aefd20f6b8cd31ba7a44e085. * Remove whitespace Co-authored-by: liach <7806504+liach@users.noreply.github.com> Co-authored-by: liach <7806504+liach@users.noreply.github.com> --- .../com/mojang/blaze3d/platform/GlStateManager.mapping | 5 +++++ mappings/net/minecraft/client/gl/Framebuffer.mapping | 1 + mappings/net/minecraft/client/render/RenderPhase.mapping | 8 ++++++++ .../net/minecraft/client/render/WorldRenderer.mapping | 8 ++++++++ 4 files changed, 22 insertions(+) diff --git a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping index ef0c6902a9..67e3ccded8 100644 --- a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping +++ b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping @@ -457,6 +457,11 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager METHOD method_23283 teardownOutline ()V METHOD method_24221 setupGuiFlatDiffuseLighting (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;)V METHOD method_24222 setupGui3dDiffuseLighting (Lnet/minecraft/class_1160;Lnet/minecraft/class_1160;)V + METHOD method_29330 supportsGl30 ()Z + METHOD method_29331 copyTexSubImage2d (IIIIIIII)V + METHOD method_29332 blitFramebuffer (IIIIIIIIII)V + METHOD method_29333 getFramebufferDepthAttachment ()I + METHOD method_29334 getActiveBoundTexture ()I CLASS class_1010 FBOMode CLASS class_1016 AlphaTestState FIELD field_5042 capState Lnet/minecraft/class_4493$class_1018; diff --git a/mappings/net/minecraft/client/gl/Framebuffer.mapping b/mappings/net/minecraft/client/gl/Framebuffer.mapping index 6a194a5f3e..18f01d14fe 100644 --- a/mappings/net/minecraft/client/gl/Framebuffer.mapping +++ b/mappings/net/minecraft/client/gl/Framebuffer.mapping @@ -52,3 +52,4 @@ CLASS net/minecraft/class_276 net/minecraft/client/gl/Framebuffer ARG 1 width ARG 2 height ARG 3 getError + METHOD method_29329 copyDepthFrom (Lnet/minecraft/class_276;)V diff --git a/mappings/net/minecraft/client/render/RenderPhase.mapping b/mappings/net/minecraft/client/render/RenderPhase.mapping index 2040d429f2..f6a6f3c098 100644 --- a/mappings/net/minecraft/client/render/RenderPhase.mapping +++ b/mappings/net/minecraft/client/render/RenderPhase.mapping @@ -43,6 +43,11 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase FIELD field_21387 ENABLE_DIFFUSE_LIGHTING Lnet/minecraft/class_4668$class_4673; FIELD field_21388 DISABLE_DIFFUSE_LIGHTING Lnet/minecraft/class_4668$class_4673; FIELD field_22241 VIEW_OFFSET_Z_LAYERING Lnet/minecraft/class_4668$class_4675; + FIELD field_25280 TRANSLUCENT_TARGET Lnet/minecraft/class_4668$class_4678; + FIELD field_25281 PARTICLES_TARGET Lnet/minecraft/class_4668$class_4678; + FIELD field_25282 WEATHER_TARGET Lnet/minecraft/class_4668$class_4678; + FIELD field_25283 CLOUDS_TARGET Lnet/minecraft/class_4668$class_4678; + FIELD field_25284 ITEM_TRANSPARENCY Lnet/minecraft/class_4668$class_4685; METHOD (Ljava/lang/String;Ljava/lang/Runnable;Ljava/lang/Runnable;)V ARG 1 name ARG 2 beginAction @@ -62,6 +67,9 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase ARG 1 culling CLASS class_4672 DepthTest FIELD field_21391 func I + FIELD field_22242 depthFunction Ljava/lang/String; + COMMENT A string representation of the comparison function used by this {@code DepthTest} phase. + COMMENT @see org.lwjgl.opengl.GL11#glDepthFunc(int) CLASS class_4673 DiffuseLighting METHOD (Z)V ARG 1 guiLighting diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 5d83d680e2..a69e29c957 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -6,6 +6,12 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_20950 blockBreakingProgressions Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; FIELD field_20951 bufferBuilders Lnet/minecraft/class_4599; FIELD field_21799 chunkUpdateSmoother Lnet/minecraft/class_4740; + FIELD field_25274 translucentFramebuffer Lnet/minecraft/class_276; + FIELD field_25275 entityFramebuffer Lnet/minecraft/class_276; + FIELD field_25276 particlesFramebuffer Lnet/minecraft/class_276; + FIELD field_25277 weatherFramebuffer Lnet/minecraft/class_276; + FIELD field_25278 cloudsFramebuffer Lnet/minecraft/class_276; + FIELD field_25279 transparencyShader Lnet/minecraft/class_279; FIELD field_4055 noCullingBlockEntities Ljava/util/Set; FIELD field_4056 capturedFrustum Lnet/minecraft/class_4604; FIELD field_4057 textureManager Lnet/minecraft/class_1060; @@ -129,6 +135,8 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer METHOD method_23794 getLightmapCoordinates (Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)I ARG 0 world ARG 1 pos + METHOD method_29362 getParticlesFramebuffer ()Lnet/minecraft/class_276; + METHOD method_29365 loadTransparencyShader ()V METHOD method_3239 renderClouds (Lnet/minecraft/class_287;DDDLnet/minecraft/class_243;)V ARG 1 builder ARG 2 x