diff --git a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping index 8f438551c7..77675285ef 100644 --- a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping +++ b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping @@ -191,7 +191,12 @@ CLASS com/mojang/blaze3d/systems/RenderSystem METHOD setProjectionMatrix (Lorg/joml/Matrix4f;)V ARG 0 projectionMatrix METHOD setShader (Ljava/util/function/Supplier;)V - ARG 0 shaderSupplier + COMMENT Sets the {@code RenderSystem}'s global shader program. + COMMENT + COMMENT

Note that this sets both the vertex shader and the fragment shader + COMMENT indirectly through the given shader program. The name of this method is + COMMENT not obfuscated and is kept as is. + ARG 0 program METHOD setShaderColor (FFFF)V ARG 0 red ARG 1 green diff --git a/mappings/net/minecraft/client/gl/EffectGlShader.mapping b/mappings/net/minecraft/client/gl/EffectGlShader.mapping deleted file mode 100644 index 42ed7dd49f..0000000000 --- a/mappings/net/minecraft/client/gl/EffectGlShader.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_5936 net/minecraft/client/gl/EffectGlShader diff --git a/mappings/net/minecraft/client/gl/EffectShaderProgram.mapping b/mappings/net/minecraft/client/gl/EffectShaderProgram.mapping new file mode 100644 index 0000000000..08412a1e58 --- /dev/null +++ b/mappings/net/minecraft/client/gl/EffectShaderProgram.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_5936 net/minecraft/client/gl/EffectShaderProgram diff --git a/mappings/net/minecraft/client/gl/EffectProgram.mapping b/mappings/net/minecraft/client/gl/EffectShaderStage.mapping similarity index 61% rename from mappings/net/minecraft/client/gl/EffectProgram.mapping rename to mappings/net/minecraft/client/gl/EffectShaderStage.mapping index e8dd8ebd28..08d5a0df8f 100644 --- a/mappings/net/minecraft/client/gl/EffectProgram.mapping +++ b/mappings/net/minecraft/client/gl/EffectShaderStage.mapping @@ -1,11 +1,12 @@ -CLASS net/minecraft/class_5937 net/minecraft/client/gl/EffectProgram - COMMENT A program that can be applied to multiple GLShaders. - COMMENT This program will only be released once an equal number of programs referencing it have been released. +CLASS net/minecraft/class_5937 net/minecraft/client/gl/EffectShaderStage + COMMENT A shader stage that can be attached to multiple shader programs. This + COMMENT shader stage will only be released once an equal number of shader + COMMENT programs referencing it have been released. FIELD field_29329 LOADER Lnet/minecraft/class_5913; FIELD field_29330 refCount I METHOD (Lnet/minecraft/class_281$class_282;ILjava/lang/String;)V ARG 1 type - ARG 2 shaderRef + ARG 2 glRef ARG 3 name METHOD method_34414 attachTo (Lnet/minecraft/class_5936;)V ARG 1 program diff --git a/mappings/net/minecraft/client/gl/GlProgramManager.mapping b/mappings/net/minecraft/client/gl/GlProgramManager.mapping index 8553e9bfa3..b55af05809 100644 --- a/mappings/net/minecraft/client/gl/GlProgramManager.mapping +++ b/mappings/net/minecraft/client/gl/GlProgramManager.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_285 net/minecraft/client/gl/GlProgramManager FIELD field_1551 LOGGER Lorg/slf4j/Logger; METHOD method_1304 deleteProgram (Lnet/minecraft/class_3679;)V - ARG 0 shader + ARG 0 program METHOD method_1306 createProgram ()I METHOD method_1307 linkProgram (Lnet/minecraft/class_3679;)V - ARG 0 shader + ARG 0 program METHOD method_22094 useProgram (I)V ARG 0 program diff --git a/mappings/net/minecraft/client/gl/GlShader.mapping b/mappings/net/minecraft/client/gl/GlShader.mapping deleted file mode 100644 index feff60743e..0000000000 --- a/mappings/net/minecraft/client/gl/GlShader.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_3679 net/minecraft/client/gl/GlShader - METHOD method_1270 getProgramRef ()I - METHOD method_1274 getVertexShader ()Lnet/minecraft/class_281; - METHOD method_1278 getFragmentShader ()Lnet/minecraft/class_281; - METHOD method_1279 markUniformsDirty ()V - METHOD method_34418 attachReferencedShaders ()V diff --git a/mappings/net/minecraft/client/gl/JsonEffectGlShader.mapping b/mappings/net/minecraft/client/gl/JsonEffectShaderProgram.mapping similarity index 83% rename from mappings/net/minecraft/client/gl/JsonEffectGlShader.mapping rename to mappings/net/minecraft/client/gl/JsonEffectShaderProgram.mapping index 7c641f8ecd..53d12e6288 100644 --- a/mappings/net/minecraft/client/gl/JsonEffectGlShader.mapping +++ b/mappings/net/minecraft/client/gl/JsonEffectShaderProgram.mapping @@ -1,22 +1,22 @@ -CLASS net/minecraft/class_280 net/minecraft/client/gl/JsonEffectGlShader +CLASS net/minecraft/class_280 net/minecraft/client/gl/JsonEffectShaderProgram FIELD field_1503 samplerNames Ljava/util/List; - FIELD field_1504 attribNames Ljava/util/List; - FIELD field_1505 activeProgramRef I - FIELD field_1506 samplerShaderLocs Ljava/util/List; - FIELD field_1507 uniformLocs Ljava/util/List; + FIELD field_1504 attributeNames Ljava/util/List; + FIELD field_1505 activeProgramGlRef I + FIELD field_1506 samplerLocations Ljava/util/List; + FIELD field_1507 uniformLocations Ljava/util/List; FIELD field_1508 vertexShader Lnet/minecraft/class_5937; FIELD field_1509 name Ljava/lang/String; FIELD field_1510 uniformByName Ljava/util/Map; FIELD field_1511 uniformStateDirty Z - FIELD field_1512 activeShader Lnet/minecraft/class_280; + FIELD field_1512 activeProgram Lnet/minecraft/class_280; FIELD field_1514 LOGGER Lorg/slf4j/Logger; FIELD field_1515 uniformData Ljava/util/List; FIELD field_1516 samplerBinds Ljava/util/Map; FIELD field_1517 blendState Lnet/minecraft/class_277; - FIELD field_1518 attribLocs Ljava/util/List; + FIELD field_1518 attributeLocations Ljava/util/List; FIELD field_1519 fragmentShader Lnet/minecraft/class_5937; FIELD field_1520 DEFAULT_UNIFORM Lnet/minecraft/class_278; - FIELD field_1521 programRef I + FIELD field_1521 glRef I FIELD field_32682 PROGRAM_DIRECTORY Ljava/lang/String; METHOD (Lnet/minecraft/class_3300;Ljava/lang/String;)V ARG 1 resource diff --git a/mappings/net/minecraft/client/gl/PostProcessShader.mapping b/mappings/net/minecraft/client/gl/PostEffectPass.mapping similarity index 93% rename from mappings/net/minecraft/client/gl/PostProcessShader.mapping rename to mappings/net/minecraft/client/gl/PostEffectPass.mapping index cdc4141b32..2931d0a1d0 100644 --- a/mappings/net/minecraft/client/gl/PostProcessShader.mapping +++ b/mappings/net/minecraft/client/gl/PostEffectPass.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_283 net/minecraft/client/gl/PostProcessShader +CLASS net/minecraft/class_283 net/minecraft/client/gl/PostEffectPass FIELD field_1533 samplerWidths Ljava/util/List; FIELD field_1534 samplerValues Ljava/util/List; FIELD field_1535 projectionMatrix Lorg/joml/Matrix4f; diff --git a/mappings/net/minecraft/client/gl/ShaderEffect.mapping b/mappings/net/minecraft/client/gl/PostEffectProcessor.mapping similarity index 96% rename from mappings/net/minecraft/client/gl/ShaderEffect.mapping rename to mappings/net/minecraft/client/gl/PostEffectProcessor.mapping index 0ac86cd061..8264878d4b 100644 --- a/mappings/net/minecraft/client/gl/ShaderEffect.mapping +++ b/mappings/net/minecraft/client/gl/PostEffectProcessor.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_279 net/minecraft/client/gl/ShaderEffect +CLASS net/minecraft/class_279 net/minecraft/client/gl/PostEffectProcessor FIELD field_1492 height I FIELD field_1493 width I FIELD field_1494 name Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gl/ShaderParseException.mapping b/mappings/net/minecraft/client/gl/ShaderParseException.mapping deleted file mode 100644 index f3627ae025..0000000000 --- a/mappings/net/minecraft/client/gl/ShaderParseException.mapping +++ /dev/null @@ -1,19 +0,0 @@ -CLASS net/minecraft/class_2973 net/minecraft/client/gl/ShaderParseException - FIELD field_13371 traces Ljava/util/List; - FIELD field_13372 message Ljava/lang/String; - METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V - ARG 1 message - ARG 2 cause - METHOD method_12854 addFaultyElement (Ljava/lang/String;)V - ARG 1 jsonKey - METHOD method_12855 addFaultyFile (Ljava/lang/String;)V - ARG 1 path - METHOD method_12856 wrap (Ljava/lang/Exception;)Lnet/minecraft/class_2973; - ARG 0 cause - CLASS class_2974 JsonStackTrace - FIELD field_13373 fileName Ljava/lang/String; - FIELD field_13374 faultyElements Ljava/util/List; - METHOD method_12857 joinStackTrace ()Ljava/lang/String; - METHOD method_12858 add (Ljava/lang/String;)V - ARG 1 element - METHOD method_36182 getFileName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/render/Shader.mapping b/mappings/net/minecraft/client/gl/ShaderProgram.mapping similarity index 80% rename from mappings/net/minecraft/client/render/Shader.mapping rename to mappings/net/minecraft/client/gl/ShaderProgram.mapping index 216d6341b6..66ff52e4e1 100644 --- a/mappings/net/minecraft/client/render/Shader.mapping +++ b/mappings/net/minecraft/client/gl/ShaderProgram.mapping @@ -1,10 +1,11 @@ -CLASS net/minecraft/class_5944 net/minecraft/client/render/Shader - COMMENT Represents a program object. +CLASS net/minecraft/class_5944 net/minecraft/client/gl/ShaderProgram + COMMENT Represents a shader program. Also known as a program object that can be + COMMENT created with {@code glCreateProgram}. COMMENT - COMMENT

Warning: This does NOT represent a shader object - COMMENT that can be created with {@code glCreateShader}. However, this class is - COMMENT referred to as a shader in strings, hence the class name. {@link - COMMENT net.minecraft.client.gl.Program} represents a shader object instead. + COMMENT

Warning: This class is referred to as a shader in + COMMENT strings. However, this does NOT represent a shader object that can be + COMMENT created with {@code glCreateShader}. {@link ShaderStage} is what + COMMENT represents a shader object. COMMENT COMMENT @see COMMENT GLSL Object - OpenGL Wiki (Program objects) @@ -29,15 +30,15 @@ CLASS net/minecraft/class_5944 net/minecraft/client/render/Shader FIELD field_29482 chunkOffset Lnet/minecraft/class_284; FIELD field_29483 LOGGER Lorg/slf4j/Logger; FIELD field_29484 DEFAULT_UNIFORM Lnet/minecraft/class_278; - FIELD field_29485 activeShader Lnet/minecraft/class_5944; - FIELD field_29486 activeShaderId I + FIELD field_29485 activeProgram Lnet/minecraft/class_5944; + FIELD field_29486 activeProgramGlRef I FIELD field_29487 samplers Ljava/util/Map; FIELD field_29488 samplerNames Ljava/util/List; FIELD field_29489 loadedSamplerIds Ljava/util/List; FIELD field_29490 uniforms Ljava/util/List; FIELD field_29491 loadedUniformIds Ljava/util/List; FIELD field_29492 loadedUniforms Ljava/util/Map; - FIELD field_29493 programId I + FIELD field_29493 glRef I FIELD field_29494 name Ljava/lang/String; FIELD field_29495 dirty Z FIELD field_32778 SHADERS_DIRECTORY Ljava/lang/String; @@ -49,7 +50,7 @@ CLASS net/minecraft/class_5944 net/minecraft/client/render/Shader ARG 1 factory ARG 2 name ARG 3 format - METHOD method_34579 loadProgram (Lnet/minecraft/class_5912;Lnet/minecraft/class_281$class_282;Ljava/lang/String;)Lnet/minecraft/class_281; + METHOD method_34579 loadShader (Lnet/minecraft/class_5912;Lnet/minecraft/class_281$class_282;Ljava/lang/String;)Lnet/minecraft/class_281; ARG 0 factory ARG 1 type ARG 2 name diff --git a/mappings/net/minecraft/client/gl/ShaderProgramSetupView.mapping b/mappings/net/minecraft/client/gl/ShaderProgramSetupView.mapping new file mode 100644 index 0000000000..844c195c9f --- /dev/null +++ b/mappings/net/minecraft/client/gl/ShaderProgramSetupView.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_3679 net/minecraft/client/gl/ShaderProgramSetupView + COMMENT A superinterface of {@link ShaderProgram} that exposes methods necessary + COMMENT for linking or deleting this shader program. + METHOD method_1270 getGlRef ()I + METHOD method_1274 getVertexShader ()Lnet/minecraft/class_281; + METHOD method_1278 getFragmentShader ()Lnet/minecraft/class_281; + METHOD method_1279 markUniformsDirty ()V + METHOD method_34418 attachReferencedShaders ()V diff --git a/mappings/net/minecraft/client/gl/Program.mapping b/mappings/net/minecraft/client/gl/ShaderStage.mapping similarity index 58% rename from mappings/net/minecraft/client/gl/Program.mapping rename to mappings/net/minecraft/client/gl/ShaderStage.mapping index 9432348e53..4c0dc5b417 100644 --- a/mappings/net/minecraft/client/gl/Program.mapping +++ b/mappings/net/minecraft/client/gl/ShaderStage.mapping @@ -1,22 +1,24 @@ -CLASS net/minecraft/class_281 net/minecraft/client/gl/Program - COMMENT Represents a (vertex or fragment) shader object. +CLASS net/minecraft/class_281 net/minecraft/client/gl/ShaderStage + COMMENT Represents a programmable shader stage (a vertex or a fragment shader) + COMMENT in the graphics pipeline. Also known as a shader object that can be + COMMENT created with {@code glCreateShader}. COMMENT - COMMENT

Warning: This does NOT represent a program object - COMMENT that can be created with {@code glCreateProgram}. However, this class is - COMMENT referred to as a program in strings, hence the class name. {@link - COMMENT net.minecraft.client.render.Shader} represents a program object instead. + COMMENT

Warning: This class is referred to as a program in + COMMENT strings. However, this does NOT represent a program object that can be + COMMENT created with {@code glCreateProgram}. {@link ShaderProgram} is what + COMMENT represents a program object. COMMENT COMMENT @see COMMENT Shader - OpenGL Wiki COMMENT @see COMMENT GLSL Object - OpenGL Wiki (Shader objects) - FIELD field_1523 shaderRef I - FIELD field_1524 shaderType Lnet/minecraft/class_281$class_282; + FIELD field_1523 glRef I + FIELD field_1524 type Lnet/minecraft/class_281$class_282; FIELD field_1525 name Ljava/lang/String; - FIELD field_32037 MAX_SHADER_INFO_LOG_LENGTH I + FIELD field_32037 MAX_INFO_LOG_LENGTH I METHOD (Lnet/minecraft/class_281$class_282;ILjava/lang/String;)V - ARG 1 shaderType - ARG 2 shaderRef + ARG 1 type + ARG 2 glRef ARG 3 name METHOD method_1280 getName ()Ljava/lang/String; METHOD method_1281 attachTo (Lnet/minecraft/class_3679;)V @@ -28,17 +30,17 @@ CLASS net/minecraft/class_281 net/minecraft/client/gl/Program ARG 2 stream ARG 3 domain ARG 4 loader - METHOD method_34416 loadProgram (Lnet/minecraft/class_281$class_282;Ljava/lang/String;Ljava/io/InputStream;Ljava/lang/String;Lnet/minecraft/class_5913;)I + METHOD method_34416 load (Lnet/minecraft/class_281$class_282;Ljava/lang/String;Ljava/io/InputStream;Ljava/lang/String;Lnet/minecraft/class_5913;)I ARG 0 type ARG 1 name ARG 2 stream ARG 3 domain ARG 4 loader - METHOD method_34417 getShaderRef ()I + METHOD method_34417 getGlRef ()I CLASS class_282 Type COMMENT Whether a vertex shader or a fragment shader. FIELD field_1526 name Ljava/lang/String; - FIELD field_1527 programCache Ljava/util/Map; + FIELD field_1527 loadedShaders Ljava/util/Map; FIELD field_1528 fileExtension Ljava/lang/String; FIELD field_1529 glType I FIELD field_1530 VERTEX Lnet/minecraft/class_281$class_282; @@ -50,5 +52,5 @@ CLASS net/minecraft/class_281 net/minecraft/client/gl/Program METHOD method_1284 getFileExtension ()Ljava/lang/String; METHOD method_1286 getName ()Ljava/lang/String; METHOD method_1287 getGlType ()I - METHOD method_1289 getProgramCache ()Ljava/util/Map; - COMMENT Gets a map of loaded shaders. + METHOD method_1289 getLoadedShaders ()Ljava/util/Map; + COMMENT {@return all loaded shaders of this type, keyed by their names} diff --git a/mappings/net/minecraft/client/gl/VertexBuffer.mapping b/mappings/net/minecraft/client/gl/VertexBuffer.mapping index 74d50b8644..d3ea824e89 100644 --- a/mappings/net/minecraft/client/gl/VertexBuffer.mapping +++ b/mappings/net/minecraft/client/gl/VertexBuffer.mapping @@ -29,17 +29,17 @@ CLASS net/minecraft/class_291 net/minecraft/client/gl/VertexBuffer COMMENT

This method must be called before uploading or drawing data. METHOD method_1354 unbind ()V METHOD method_34427 draw (Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lnet/minecraft/class_5944;)V - COMMENT Draws the contents in this vertex buffer with {@code shader}. + COMMENT Draws the contents in this vertex buffer with {@code program}. COMMENT COMMENT

The caller of this method must {@linkplain #bind bind} this vertex COMMENT buffer before calling this method. ARG 1 viewMatrix ARG 2 projectionMatrix - ARG 3 shader + ARG 3 program METHOD method_34431 drawInternal (Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lnet/minecraft/class_5944;)V ARG 1 viewMatrix ARG 2 projectionMatrix - ARG 3 shader + ARG 3 program METHOD method_34435 getVertexFormat ()Lnet/minecraft/class_293; METHOD method_35665 draw ()V COMMENT Draws the contents in this vertex buffer. @@ -47,8 +47,9 @@ CLASS net/minecraft/class_291 net/minecraft/client/gl/VertexBuffer COMMENT

The caller of this method must {@linkplain #bind bind} this vertex COMMENT buffer before calling this method. COMMENT - COMMENT

Unlike {@link #draw(Matrix4f, Matrix4f, Shader)}, the caller of this - COMMENT method must manually bind a shader before calling this method. + COMMENT

Unlike {@link #draw(Matrix4f, Matrix4f, ShaderProgram)}, the caller + COMMENT of this method must manually bind a shader program before calling this + COMMENT method. METHOD method_43442 uploadVertexBuffer (Lnet/minecraft/class_287$class_4574;Ljava/nio/ByteBuffer;)Lnet/minecraft/class_293; ARG 1 parameters ARG 2 vertexBuffer diff --git a/mappings/net/minecraft/client/render/BufferBuilder.mapping b/mappings/net/minecraft/client/render/BufferBuilder.mapping index 1c332fccbd..c2b11efdf9 100644 --- a/mappings/net/minecraft/client/render/BufferBuilder.mapping +++ b/mappings/net/minecraft/client/render/BufferBuilder.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_287 net/minecraft/client/render/BufferBuilder COMMENT

For {@link VertexFormat.DrawMode#LINES LINES} and {@link COMMENT VertexFormat.DrawMode#LINE_STRIP LINE_STRIP} draw modes, this builder COMMENT duplicates every vertex in a line to produce a quad with zero area. See - COMMENT {@link GameRenderer#getRenderTypeLinesShader}. + COMMENT {@link GameRenderer#getRenderTypeLinesProgram}. FIELD field_1553 currentElementId I FIELD field_1554 vertexCount I FIELD field_1555 buffer Ljava/nio/ByteBuffer; diff --git a/mappings/net/minecraft/client/render/BufferRenderer.mapping b/mappings/net/minecraft/client/render/BufferRenderer.mapping index 677fb9efda..01eb93aa57 100644 --- a/mappings/net/minecraft/client/render/BufferRenderer.mapping +++ b/mappings/net/minecraft/client/render/BufferRenderer.mapping @@ -3,8 +3,8 @@ CLASS net/minecraft/class_286 net/minecraft/client/render/BufferRenderer COMMENT BufferBuilder}. FIELD field_38982 currentVertexBuffer Lnet/minecraft/class_291; METHOD method_34420 reset ()V - METHOD method_43433 drawWithShader (Lnet/minecraft/class_287$class_7433;)V - COMMENT Draws {@code buffer} using the shader specified with {@link + METHOD method_43433 drawWithGlobalProgram (Lnet/minecraft/class_287$class_7433;)V + COMMENT Draws {@code buffer} using the shader program specified with {@link COMMENT com.mojang.blaze3d.systems.RenderSystem#setShader COMMENT RenderSystem#setShader} ARG 0 buffer @@ -16,12 +16,12 @@ CLASS net/minecraft/class_286 net/minecraft/client/render/BufferRenderer METHOD method_43437 draw (Lnet/minecraft/class_287$class_7433;)V COMMENT Draws {@code buffer}. COMMENT - COMMENT

Unlike {@link #drawWithShader}, the shader cannot be specified with - COMMENT {@link com.mojang.blaze3d.systems.RenderSystem#setShader + COMMENT

Unlike {@link #drawWithGlobalProgram}, the shader program cannot be + COMMENT specified with {@link com.mojang.blaze3d.systems.RenderSystem#setShader COMMENT RenderSystem#setShader}. The caller of this method must manually bind a - COMMENT shader before calling this method. + COMMENT shader program before calling this method. ARG 0 buffer - METHOD method_43438 drawWithShaderInternal (Lnet/minecraft/class_287$class_7433;)V + METHOD method_43438 drawWithGlobalProgramInternal (Lnet/minecraft/class_287$class_7433;)V ARG 0 buffer METHOD method_43439 upload (Lnet/minecraft/class_287$class_7433;)Lnet/minecraft/class_291; ARG 0 buffer diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index d550034d88..826cee804f 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -3,74 +3,74 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer FIELD field_20948 buffers Lnet/minecraft/class_4599; FIELD field_20949 overlayTexture Lnet/minecraft/class_4608; FIELD field_26730 NAUSEA_OVERLAY Lnet/minecraft/class_2960; - FIELD field_29350 shaders Ljava/util/Map; - FIELD field_29351 positionShader Lnet/minecraft/class_5944; - FIELD field_29352 positionColorShader Lnet/minecraft/class_5944; - FIELD field_29353 positionColorTexShader Lnet/minecraft/class_5944; - FIELD field_29354 positionTexShader Lnet/minecraft/class_5944; - FIELD field_29355 positionTexColorShader Lnet/minecraft/class_5944; - FIELD field_29356 blockShader Lnet/minecraft/class_5944; - FIELD field_29357 newEntityShader Lnet/minecraft/class_5944; - FIELD field_29358 particleShader Lnet/minecraft/class_5944; - FIELD field_29359 positionColorLightmapShader Lnet/minecraft/class_5944; - FIELD field_29360 positionColorTexLightmapShader Lnet/minecraft/class_5944; - FIELD field_29361 positionTexColorNormalShader Lnet/minecraft/class_5944; - FIELD field_29362 positionTexLightmapColorShader Lnet/minecraft/class_5944; - FIELD field_29363 renderTypeSolidShader Lnet/minecraft/class_5944; - FIELD field_29364 renderTypeCutoutMippedShader Lnet/minecraft/class_5944; - FIELD field_29365 renderTypeCutoutShader Lnet/minecraft/class_5944; - FIELD field_29366 renderTypeTranslucentShader Lnet/minecraft/class_5944; - FIELD field_29367 renderTypeEntityGlintShader Lnet/minecraft/class_5944; - FIELD field_29368 renderTypeEntityGlintDirectShader Lnet/minecraft/class_5944; - FIELD field_29369 renderTypeTextShader Lnet/minecraft/class_5944; - FIELD field_29370 renderTypeTextSeeThroughShader Lnet/minecraft/class_5944; - FIELD field_29371 renderTypeLightningShader Lnet/minecraft/class_5944; - FIELD field_29372 renderTypeTripwireShader Lnet/minecraft/class_5944; - FIELD field_29373 renderTypeEndPortalShader Lnet/minecraft/class_5944; - FIELD field_29374 renderTypeEndGatewayShader Lnet/minecraft/class_5944; - FIELD field_29375 renderTypeLinesShader Lnet/minecraft/class_5944; - FIELD field_29376 renderTypeCrumblingShader Lnet/minecraft/class_5944; - FIELD field_29377 renderTypeTranslucentMovingBlockShader Lnet/minecraft/class_5944; - FIELD field_29378 renderTypeTranslucentNoCrumblingShader Lnet/minecraft/class_5944; - FIELD field_29379 renderTypeArmorCutoutNoCullShader Lnet/minecraft/class_5944; - FIELD field_29380 renderTypeEntitySolidShader Lnet/minecraft/class_5944; - FIELD field_29381 renderTypeEntityCutoutShader Lnet/minecraft/class_5944; - FIELD field_29382 renderTypeEntityCutoutNoNullShader Lnet/minecraft/class_5944; - FIELD field_29383 renderTypeEntityCutoutNoNullZOffsetShader Lnet/minecraft/class_5944; - FIELD field_29384 renderTypeItemEntityTranslucentCullShader Lnet/minecraft/class_5944; - FIELD field_29385 renderTypeEntityTranslucentCullShader Lnet/minecraft/class_5944; - FIELD field_29386 renderTypeEntityTranslucentShader Lnet/minecraft/class_5944; - FIELD field_29387 renderTypeEntitySmoothCutoutShader Lnet/minecraft/class_5944; - FIELD field_29388 renderTypeBeaconBeamShader Lnet/minecraft/class_5944; - FIELD field_29389 renderTypeEntityDecalShader Lnet/minecraft/class_5944; - FIELD field_29390 renderTypeEntityNoOutlineShader Lnet/minecraft/class_5944; - FIELD field_29391 renderTypeEntityShadowShader Lnet/minecraft/class_5944; - FIELD field_29392 renderTypeEntityAlphaShader Lnet/minecraft/class_5944; - FIELD field_29393 renderTypeEyesShader Lnet/minecraft/class_5944; - FIELD field_29394 renderTypeEnergySwirlShader Lnet/minecraft/class_5944; - FIELD field_29395 renderTypeLeashShader Lnet/minecraft/class_5944; - FIELD field_29396 renderTypeWaterMaskShader Lnet/minecraft/class_5944; - FIELD field_29397 renderTypeOutlineShader Lnet/minecraft/class_5944; - FIELD field_29398 renderTypeArmorGlintShader Lnet/minecraft/class_5944; - FIELD field_29399 renderTypeArmorEntityGlintShader Lnet/minecraft/class_5944; - FIELD field_29400 renderTypeGlintTranslucentShader Lnet/minecraft/class_5944; - FIELD field_29401 renderTypeGlintShader Lnet/minecraft/class_5944; - FIELD field_29402 renderTypeGlintDirectShader Lnet/minecraft/class_5944; - FIELD field_29403 blitScreenShader Lnet/minecraft/class_5944; + FIELD field_29350 programs Ljava/util/Map; + FIELD field_29351 positionProgram Lnet/minecraft/class_5944; + FIELD field_29352 positionColorProgram Lnet/minecraft/class_5944; + FIELD field_29353 positionColorTexProgram Lnet/minecraft/class_5944; + FIELD field_29354 positionTexProgram Lnet/minecraft/class_5944; + FIELD field_29355 positionTexColorProgram Lnet/minecraft/class_5944; + FIELD field_29356 blockProgram Lnet/minecraft/class_5944; + FIELD field_29357 newEntityProgram Lnet/minecraft/class_5944; + FIELD field_29358 particleProgram Lnet/minecraft/class_5944; + FIELD field_29359 positionColorLightmapProgram Lnet/minecraft/class_5944; + FIELD field_29360 positionColorTexLightmapProgram Lnet/minecraft/class_5944; + FIELD field_29361 positionTexColorNormalProgram Lnet/minecraft/class_5944; + FIELD field_29362 positionTexLightmapColorProgram Lnet/minecraft/class_5944; + FIELD field_29363 renderTypeSolidProgram Lnet/minecraft/class_5944; + FIELD field_29364 renderTypeCutoutMippedProgram Lnet/minecraft/class_5944; + FIELD field_29365 renderTypeCutoutProgram Lnet/minecraft/class_5944; + FIELD field_29366 renderTypeTranslucentProgram Lnet/minecraft/class_5944; + FIELD field_29367 renderTypeEntityGlintProgram Lnet/minecraft/class_5944; + FIELD field_29368 renderTypeEntityGlintDirectProgram Lnet/minecraft/class_5944; + FIELD field_29369 renderTypeTextProgram Lnet/minecraft/class_5944; + FIELD field_29370 renderTypeTextSeeThroughProgram Lnet/minecraft/class_5944; + FIELD field_29371 renderTypeLightningProgram Lnet/minecraft/class_5944; + FIELD field_29372 renderTypeTripwireProgram Lnet/minecraft/class_5944; + FIELD field_29373 renderTypeEndPortalProgram Lnet/minecraft/class_5944; + FIELD field_29374 renderTypeEndGatewayProgram Lnet/minecraft/class_5944; + FIELD field_29375 renderTypeLinesProgram Lnet/minecraft/class_5944; + FIELD field_29376 renderTypeCrumblingProgram Lnet/minecraft/class_5944; + FIELD field_29377 renderTypeTranslucentMovingBlockProgram Lnet/minecraft/class_5944; + FIELD field_29378 renderTypeTranslucentNoCrumblingProgram Lnet/minecraft/class_5944; + FIELD field_29379 renderTypeArmorCutoutNoCullProgram Lnet/minecraft/class_5944; + FIELD field_29380 renderTypeEntitySolidProgram Lnet/minecraft/class_5944; + FIELD field_29381 renderTypeEntityCutoutProgram Lnet/minecraft/class_5944; + FIELD field_29382 renderTypeEntityCutoutNoNullProgram Lnet/minecraft/class_5944; + FIELD field_29383 renderTypeEntityCutoutNoNullZOffsetProgram Lnet/minecraft/class_5944; + FIELD field_29384 renderTypeItemEntityTranslucentCullProgram Lnet/minecraft/class_5944; + FIELD field_29385 renderTypeEntityTranslucentCullProgram Lnet/minecraft/class_5944; + FIELD field_29386 renderTypeEntityTranslucentProgram Lnet/minecraft/class_5944; + FIELD field_29387 renderTypeEntitySmoothCutoutProgram Lnet/minecraft/class_5944; + FIELD field_29388 renderTypeBeaconBeamProgram Lnet/minecraft/class_5944; + FIELD field_29389 renderTypeEntityDecalProgram Lnet/minecraft/class_5944; + FIELD field_29390 renderTypeEntityNoOutlineProgram Lnet/minecraft/class_5944; + FIELD field_29391 renderTypeEntityShadowProgram Lnet/minecraft/class_5944; + FIELD field_29392 renderTypeEntityAlphaProgram Lnet/minecraft/class_5944; + FIELD field_29393 renderTypeEyesProgram Lnet/minecraft/class_5944; + FIELD field_29394 renderTypeEnergySwirlProgram Lnet/minecraft/class_5944; + FIELD field_29395 renderTypeLeashProgram Lnet/minecraft/class_5944; + FIELD field_29396 renderTypeWaterMaskProgram Lnet/minecraft/class_5944; + FIELD field_29397 renderTypeOutlineProgram Lnet/minecraft/class_5944; + FIELD field_29398 renderTypeArmorGlintProgram Lnet/minecraft/class_5944; + FIELD field_29399 renderTypeArmorEntityGlintProgram Lnet/minecraft/class_5944; + FIELD field_29400 renderTypeGlintTranslucentProgram Lnet/minecraft/class_5944; + FIELD field_29401 renderTypeGlintProgram Lnet/minecraft/class_5944; + FIELD field_29402 renderTypeGlintDirectProgram Lnet/minecraft/class_5944; + FIELD field_29403 blitScreenProgram Lnet/minecraft/class_5944; FIELD field_32686 CAMERA_DEPTH F COMMENT Since the camera is conceptualized as a single point, a depth of {@value} COMMENT blocks is used to define a rectangular area to be rendered. COMMENT COMMENT @see Camera#getProjection() - FIELD field_33626 renderTypeTextIntensityShader Lnet/minecraft/class_5944; - FIELD field_33627 renderTypeTextIntensitySeeThroughShader Lnet/minecraft/class_5944; + FIELD field_33626 renderTypeTextIntensityProgram Lnet/minecraft/class_5944; + FIELD field_33627 renderTypeTextIntensitySeeThroughProgram Lnet/minecraft/class_5944; FIELD field_34055 hasWorldIcon Z - FIELD field_38343 renderTypeEntityTranslucentEmissiveShader Lnet/minecraft/class_5944; + FIELD field_38343 renderTypeEntityTranslucentEmissiveProgram Lnet/minecraft/class_5944; FIELD field_3988 zoomX F FIELD field_3992 renderHand Z FIELD field_3993 LOGGER Lorg/slf4j/Logger; FIELD field_3994 random Lnet/minecraft/class_5819; - FIELD field_3996 SHADERS_LOCATIONS [Lnet/minecraft/class_2960; + FIELD field_3996 SUPER_SECRET_SETTING_PROGRAMS [Lnet/minecraft/class_2960; FIELD field_3997 lastSkyDarkness F FIELD field_3998 lastWindowFocusedTime J FIELD field_3999 lastFovMultiplier F @@ -82,15 +82,15 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer FIELD field_4006 floatingItem Lnet/minecraft/class_1799; FIELD field_4007 floatingItemTimeLeft I FIELD field_4009 blockOutlineEnabled Z - FIELD field_4010 SHADER_COUNT I + FIELD field_4010 SUPER_SECRET_SETTING_COUNT I FIELD field_4012 firstPersonRenderer Lnet/minecraft/class_759; - FIELD field_4013 shadersEnabled Z + FIELD field_4013 postProcessorEnabled Z FIELD field_4015 client Lnet/minecraft/class_310; FIELD field_4017 lastWorldIconUpdate J FIELD field_4018 resourceManager Lnet/minecraft/class_3300; FIELD field_4019 fovMultiplier F - FIELD field_4023 forcedShaderIndex I - FIELD field_4024 shader Lnet/minecraft/class_279; + FIELD field_4023 superSecretSettingIndex I + FIELD field_4024 postProcessor Lnet/minecraft/class_279; FIELD field_4025 viewDistance F FIELD field_4026 mapRenderer Lnet/minecraft/class_330; FIELD field_4027 ticks I @@ -114,7 +114,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 1 distortionStrength METHOD method_3167 onCameraEntitySet (Lnet/minecraft/class_1297;)V ARG 1 entity - METHOD method_3168 loadShader (Lnet/minecraft/class_2960;)V + METHOD method_3168 loadPostProcessor (Lnet/minecraft/class_2960;)V ARG 1 id METHOD method_3169 onResized (II)V ARG 1 width @@ -133,8 +133,8 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer METHOD method_3176 updateWorldIcon (Ljava/nio/file/Path;)V ARG 1 path METHOD method_3182 tick ()V - METHOD method_3183 getShader ()Lnet/minecraft/class_279; - METHOD method_3184 toggleShadersEnabled ()V + METHOD method_3183 getPostProcessor ()Lnet/minecraft/class_279; + METHOD method_3184 togglePostProcessorEnabled ()V METHOD method_3186 bobView (Lnet/minecraft/class_4587;F)V ARG 1 matrices ARG 2 tickDelta @@ -164,91 +164,92 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer METHOD method_3199 updateFovMultiplier ()V METHOD method_3202 shouldRenderBlockOutline ()Z METHOD method_3203 reset ()V - METHOD method_3207 disableShader ()V - METHOD method_34495 getRenderTypeSolidShader ()Lnet/minecraft/class_5944; - METHOD method_34496 getRenderTypeCutoutMippedShader ()Lnet/minecraft/class_5944; - METHOD method_34497 getRenderTypeCutoutShader ()Lnet/minecraft/class_5944; - METHOD method_34498 getRenderTypeTranslucentShader ()Lnet/minecraft/class_5944; - METHOD method_34499 getRenderTypeTranslucentMovingBlockShader ()Lnet/minecraft/class_5944; - METHOD method_34500 getRenderTypeTranslucentNoCrumblingShader ()Lnet/minecraft/class_5944; - METHOD method_34501 getRenderTypeArmorCutoutNoCullShader ()Lnet/minecraft/class_5944; - METHOD method_34502 getRenderTypeEntitySolidShader ()Lnet/minecraft/class_5944; - METHOD method_34503 getRenderTypeEntityCutoutShader ()Lnet/minecraft/class_5944; - METHOD method_34504 getRenderTypeEntityCutoutNoNullShader ()Lnet/minecraft/class_5944; - METHOD method_34505 getRenderTypeEntityCutoutNoNullZOffsetShader ()Lnet/minecraft/class_5944; - METHOD method_34506 getRenderTypeItemEntityTranslucentCullShader ()Lnet/minecraft/class_5944; - METHOD method_34507 getRenderTypeEntityTranslucentCullShader ()Lnet/minecraft/class_5944; - METHOD method_34508 getRenderTypeEntityTranslucentShader ()Lnet/minecraft/class_5944; - METHOD method_34509 getRenderTypeEntitySmoothCutoutShader ()Lnet/minecraft/class_5944; - METHOD method_34510 getRenderTypeBeaconBeamShader ()Lnet/minecraft/class_5944; - METHOD method_34511 getRenderTypeEntityDecalShader ()Lnet/minecraft/class_5944; - METHOD method_34512 getRenderTypeEntityNoOutlineShader ()Lnet/minecraft/class_5944; - METHOD method_34513 getRenderTypeEntityShadowShader ()Lnet/minecraft/class_5944; - METHOD method_34514 getRenderTypeEntityAlphaShader ()Lnet/minecraft/class_5944; - METHOD method_34515 getRenderTypeEyesShader ()Lnet/minecraft/class_5944; - METHOD method_34516 getRenderTypeEnergySwirlShader ()Lnet/minecraft/class_5944; - METHOD method_34517 getRenderTypeLeashShader ()Lnet/minecraft/class_5944; - METHOD method_34518 getRenderTypeWaterMaskShader ()Lnet/minecraft/class_5944; - METHOD method_34519 getRenderTypeOutlineShader ()Lnet/minecraft/class_5944; - METHOD method_34520 getRenderTypeArmorGlintShader ()Lnet/minecraft/class_5944; - METHOD method_34521 preloadShaders (Lnet/minecraft/class_5912;)V + METHOD method_3207 disablePostProcessor ()V + METHOD method_34495 getRenderTypeSolidProgram ()Lnet/minecraft/class_5944; + METHOD method_34496 getRenderTypeCutoutMippedProgram ()Lnet/minecraft/class_5944; + METHOD method_34497 getRenderTypeCutoutProgram ()Lnet/minecraft/class_5944; + METHOD method_34498 getRenderTypeTranslucentProgram ()Lnet/minecraft/class_5944; + METHOD method_34499 getRenderTypeTranslucentMovingBlockProgram ()Lnet/minecraft/class_5944; + METHOD method_34500 getRenderTypeTranslucentNoCrumblingProgram ()Lnet/minecraft/class_5944; + METHOD method_34501 getRenderTypeArmorCutoutNoCullProgram ()Lnet/minecraft/class_5944; + METHOD method_34502 getRenderTypeEntitySolidProgram ()Lnet/minecraft/class_5944; + METHOD method_34503 getRenderTypeEntityCutoutProgram ()Lnet/minecraft/class_5944; + METHOD method_34504 getRenderTypeEntityCutoutNoNullProgram ()Lnet/minecraft/class_5944; + METHOD method_34505 getRenderTypeEntityCutoutNoNullZOffsetProgram ()Lnet/minecraft/class_5944; + METHOD method_34506 getRenderTypeItemEntityTranslucentCullProgram ()Lnet/minecraft/class_5944; + METHOD method_34507 getRenderTypeEntityTranslucentCullProgram ()Lnet/minecraft/class_5944; + METHOD method_34508 getRenderTypeEntityTranslucentProgram ()Lnet/minecraft/class_5944; + METHOD method_34509 getRenderTypeEntitySmoothCutoutProgram ()Lnet/minecraft/class_5944; + METHOD method_34510 getRenderTypeBeaconBeamProgram ()Lnet/minecraft/class_5944; + METHOD method_34511 getRenderTypeEntityDecalProgram ()Lnet/minecraft/class_5944; + METHOD method_34512 getRenderTypeEntityNoOutlineProgram ()Lnet/minecraft/class_5944; + METHOD method_34513 getRenderTypeEntityShadowProgram ()Lnet/minecraft/class_5944; + METHOD method_34514 getRenderTypeEntityAlphaProgram ()Lnet/minecraft/class_5944; + METHOD method_34515 getRenderTypeEyesProgram ()Lnet/minecraft/class_5944; + METHOD method_34516 getRenderTypeEnergySwirlProgram ()Lnet/minecraft/class_5944; + METHOD method_34517 getRenderTypeLeashProgram ()Lnet/minecraft/class_5944; + METHOD method_34518 getRenderTypeWaterMaskProgram ()Lnet/minecraft/class_5944; + METHOD method_34519 getRenderTypeOutlineProgram ()Lnet/minecraft/class_5944; + METHOD method_34520 getRenderTypeArmorGlintProgram ()Lnet/minecraft/class_5944; + METHOD method_34521 preloadPrograms (Lnet/minecraft/class_5912;)V ARG 1 factory - METHOD method_34522 loadShader (Lnet/minecraft/class_5912;Ljava/lang/String;Lnet/minecraft/class_293;)Lnet/minecraft/class_5944; + METHOD method_34522 preloadProgram (Lnet/minecraft/class_5912;Ljava/lang/String;Lnet/minecraft/class_293;)Lnet/minecraft/class_5944; ARG 1 factory ARG 2 name - ARG 3 vertexFormat - METHOD method_34523 getRenderTypeArmorEntityGlintShader ()Lnet/minecraft/class_5944; - METHOD method_34524 getRenderTypeGlintTranslucentShader ()Lnet/minecraft/class_5944; - METHOD method_34525 getRenderTypeGlintShader ()Lnet/minecraft/class_5944; - METHOD method_34526 getRenderTypeGlintDirectShader ()Lnet/minecraft/class_5944; - METHOD method_34527 getRenderTypeEntityGlintShader ()Lnet/minecraft/class_5944; - METHOD method_34528 getRenderTypeEntityGlintDirectShader ()Lnet/minecraft/class_5944; - METHOD method_34529 getRenderTypeTextShader ()Lnet/minecraft/class_5944; - METHOD method_34530 getRenderTypeTextSeeThroughShader ()Lnet/minecraft/class_5944; - METHOD method_34531 getRenderTypeLightningShader ()Lnet/minecraft/class_5944; - METHOD method_34532 getRenderTypeTripwireShader ()Lnet/minecraft/class_5944; - METHOD method_34533 getRenderTypeEndPortalShader ()Lnet/minecraft/class_5944; - METHOD method_34534 getRenderTypeEndGatewayShader ()Lnet/minecraft/class_5944; - METHOD method_34535 getRenderTypeLinesShader ()Lnet/minecraft/class_5944; - COMMENT {@return the {@code rendertype_lines} shader} + ARG 3 format + METHOD method_34523 getRenderTypeArmorEntityGlintProgram ()Lnet/minecraft/class_5944; + METHOD method_34524 getRenderTypeGlintTranslucentProgram ()Lnet/minecraft/class_5944; + METHOD method_34525 getRenderTypeGlintProgram ()Lnet/minecraft/class_5944; + METHOD method_34526 getRenderTypeGlintDirectProgram ()Lnet/minecraft/class_5944; + METHOD method_34527 getRenderTypeEntityGlintProgram ()Lnet/minecraft/class_5944; + METHOD method_34528 getRenderTypeEntityGlintDirectProgram ()Lnet/minecraft/class_5944; + METHOD method_34529 getRenderTypeTextProgram ()Lnet/minecraft/class_5944; + METHOD method_34530 getRenderTypeTextSeeThroughProgram ()Lnet/minecraft/class_5944; + METHOD method_34531 getRenderTypeLightningProgram ()Lnet/minecraft/class_5944; + METHOD method_34532 getRenderTypeTripwireProgram ()Lnet/minecraft/class_5944; + METHOD method_34533 getRenderTypeEndPortalProgram ()Lnet/minecraft/class_5944; + METHOD method_34534 getRenderTypeEndGatewayProgram ()Lnet/minecraft/class_5944; + METHOD method_34535 getRenderTypeLinesProgram ()Lnet/minecraft/class_5944; + COMMENT {@return the {@code rendertype_lines} shader program} COMMENT - COMMENT

This shader draws a line by drawing a quad (two triangles pushed - COMMENT together). Each line takes four vertices. The first vertex is the line - COMMENT start. The second one is a duplicate of the first one. The third one - COMMENT is the line end. The fourth one is a duplicate of the third one. + COMMENT

This shader program draws a line by drawing a quad (two triangles + COMMENT pushed together). Each line takes four vertices. The first vertex is + COMMENT the line start. The second one is a duplicate of the first one. The + COMMENT third one is the line end. The fourth one is a duplicate of the third + COMMENT one. COMMENT - COMMENT

The user of this shader should use {@link VertexFormats#LINES} for - COMMENT the vertex format. The normal element is a direction vector from the - COMMENT starting position to the ending position. It's used to calculate in - COMMENT what directions the duplicated vertices should be offset to achieve - COMMENT thick lines. All four vertices should share the same value for the - COMMENT normal element. + COMMENT

The user of this shader program should use {@link + COMMENT VertexFormats#LINES} for the vertex format. The normal element is a + COMMENT direction vector from the starting position to the ending position. + COMMENT It's used to calculate in what directions the duplicated vertices + COMMENT should be offset to achieve thick lines. All four vertices should + COMMENT share the same value for the normal element. COMMENT COMMENT

The width of the line can be set with {@link COMMENT com.mojang.blaze3d.systems.RenderSystem#lineWidth COMMENT RenderSystem#lineWidth}. METHOD method_34536 getRenderTypeCrumblingShader ()Lnet/minecraft/class_5944; - METHOD method_34537 clearShaders ()V - METHOD method_34538 loadShaders (Lnet/minecraft/class_5912;)V + METHOD method_34537 clearPrograms ()V + METHOD method_34538 loadPrograms (Lnet/minecraft/class_5912;)V ARG 1 factory - METHOD method_34539 getPositionShader ()Lnet/minecraft/class_5944; - METHOD method_34540 getPositionColorShader ()Lnet/minecraft/class_5944; - METHOD method_34541 getPositionColorTexShader ()Lnet/minecraft/class_5944; - METHOD method_34542 getPositionTexShader ()Lnet/minecraft/class_5944; - METHOD method_34543 getPositionTexColorShader ()Lnet/minecraft/class_5944; - METHOD method_34544 getBlockShader ()Lnet/minecraft/class_5944; - METHOD method_34545 getNewEntityShader ()Lnet/minecraft/class_5944; - METHOD method_34546 getParticleShader ()Lnet/minecraft/class_5944; - METHOD method_34547 getPositionColorLightmapShader ()Lnet/minecraft/class_5944; - METHOD method_34548 getPositionColorTexLightmapShader ()Lnet/minecraft/class_5944; - METHOD method_34549 getPositionTexColorNormalShader ()Lnet/minecraft/class_5944; - METHOD method_35764 getPositionTexLightmapColorShader ()Lnet/minecraft/class_5944; + METHOD method_34539 getPositionProgram ()Lnet/minecraft/class_5944; + METHOD method_34540 getPositionColorProgram ()Lnet/minecraft/class_5944; + METHOD method_34541 getPositionColorTexProgram ()Lnet/minecraft/class_5944; + METHOD method_34542 getPositionTexProgram ()Lnet/minecraft/class_5944; + METHOD method_34543 getPositionTexColorProgram ()Lnet/minecraft/class_5944; + METHOD method_34544 getBlockProgram ()Lnet/minecraft/class_5944; + METHOD method_34545 getNewEntityProgram ()Lnet/minecraft/class_5944; + METHOD method_34546 getParticleProgram ()Lnet/minecraft/class_5944; + METHOD method_34547 getPositionColorLightmapProgram ()Lnet/minecraft/class_5944; + METHOD method_34548 getPositionColorTexLightmapProgram ()Lnet/minecraft/class_5944; + METHOD method_34549 getPositionTexColorNormalProgram ()Lnet/minecraft/class_5944; + METHOD method_35764 getPositionTexLightmapColorProgram ()Lnet/minecraft/class_5944; METHOD method_35765 isRenderingPanorama ()Z METHOD method_35766 renderWithZoom (FFF)V ARG 1 zoom ARG 2 zoomX ARG 3 zoomY - METHOD method_35767 getShader (Ljava/lang/String;)Lnet/minecraft/class_5944; + METHOD method_35767 getProgram (Ljava/lang/String;)Lnet/minecraft/class_5944; ARG 1 name METHOD method_35768 setRenderHand (Z)V ARG 1 renderHand @@ -256,129 +257,129 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 1 blockOutlineEnabled METHOD method_35770 setRenderingPanorama (Z)V ARG 1 renderingPanorama - METHOD method_35771 loadForcedShader ()V + METHOD method_35771 cycleSuperSecretSetting ()V METHOD method_35772 getClient ()Lnet/minecraft/class_310; - METHOD method_36432 getRenderTypeTextIntensityShader ()Lnet/minecraft/class_5944; - METHOD method_36433 getRenderTypeTextIntensitySeeThroughShader ()Lnet/minecraft/class_5944; + METHOD method_36432 getRenderTypeTextIntensityProgram ()Lnet/minecraft/class_5944; + METHOD method_36433 getRenderTypeTextIntensitySeeThroughProgram ()Lnet/minecraft/class_5944; METHOD method_36486 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36487 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36488 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36489 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36490 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36491 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36492 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36493 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36494 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36495 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36496 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36497 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36498 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36499 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36500 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36501 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36502 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36503 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36504 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36505 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36506 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36507 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36508 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36509 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36510 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36511 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36512 (Lcom/mojang/datafixers/util/Pair;)V ARG 1 pair METHOD method_36513 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36514 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36515 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36516 (Lcom/mojang/datafixers/util/Pair;)V ARG 0 pair METHOD method_36517 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36518 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36519 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36520 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36521 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36522 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36523 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36524 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36525 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36526 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36527 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36528 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36529 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36530 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36531 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36532 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36533 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36534 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36535 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36536 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36537 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36538 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36539 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36540 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_36541 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_37473 updateWorldIcon ()V METHOD method_37474 (Ljava/nio/file/Path;)V ARG 1 path METHOD method_42594 (Lnet/minecraft/class_5944;)V - ARG 0 shader + ARG 0 program METHOD method_42595 getRenderTypeEntityTranslucentEmissiveShader ()Lnet/minecraft/class_5944; - METHOD method_45774 createShaderReloader ()Lnet/minecraft/class_3302; + METHOD method_45774 createProgramReloader ()Lnet/minecraft/class_3302; CLASS 1 METHOD method_45775 (Lnet/minecraft/class_2960;)Z ARG 0 id diff --git a/mappings/net/minecraft/client/render/RenderLayer.mapping b/mappings/net/minecraft/client/render/RenderLayer.mapping index 4c46051dfb..d99da3ebea 100644 --- a/mappings/net/minecraft/client/render/RenderLayer.mapping +++ b/mappings/net/minecraft/client/render/RenderLayer.mapping @@ -2,10 +2,12 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer COMMENT Defines settings that should be used when rendering something. COMMENT COMMENT

This includes {@linkplain VertexFormat vertex format}, {@linkplain - COMMENT VertexFormat.DrawMode draw mode}, {@linkplain Shader shader}, texture, + COMMENT VertexFormat.DrawMode draw mode}, {@linkplain + COMMENT net.minecraft.client.gl.ShaderProgram shader program}, texture, COMMENT some uniform variables values (such as {@code LineWidth} when using the - COMMENT {@link GameRenderer#getRenderTypeLinesShader rendertype_lines} shader), - COMMENT and some GL state values (such as whether to enable depth testing). + COMMENT {@link GameRenderer#getRenderTypeLinesProgram rendertype_lines} shader + COMMENT program), and some GL state values (such as whether to enable depth + COMMENT testing). COMMENT COMMENT

Before drawing something, a render layer setups these states. After COMMENT drawing something, a render layer resets those states to default. @@ -155,7 +157,7 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer METHOD method_29997 getTripwire ()Lnet/minecraft/class_1921; METHOD method_30676 getGlintTranslucent ()Lnet/minecraft/class_1921; METHOD method_34569 of (Lnet/minecraft/class_4668$class_5942;)Lnet/minecraft/class_1921$class_4688; - ARG 0 shader + ARG 0 program METHOD method_34571 getEndGateway ()Lnet/minecraft/class_1921; METHOD method_34572 getLineStrip ()Lnet/minecraft/class_1921; METHOD method_34822 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1921; @@ -256,10 +258,10 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer FIELD field_21420 lineWidth Lnet/minecraft/class_4668$class_4677; FIELD field_21422 phases Lcom/google/common/collect/ImmutableList; FIELD field_21852 outlineMode Lnet/minecraft/class_1921$class_4750; - FIELD field_29461 shader Lnet/minecraft/class_4668$class_5942; + FIELD field_29461 program Lnet/minecraft/class_4668$class_5942; METHOD (Lnet/minecraft/class_4668$class_5939;Lnet/minecraft/class_4668$class_5942;Lnet/minecraft/class_4668$class_4685;Lnet/minecraft/class_4668$class_4672;Lnet/minecraft/class_4668$class_4671;Lnet/minecraft/class_4668$class_4676;Lnet/minecraft/class_4668$class_4679;Lnet/minecraft/class_4668$class_4675;Lnet/minecraft/class_4668$class_4678;Lnet/minecraft/class_4668$class_4684;Lnet/minecraft/class_4668$class_4686;Lnet/minecraft/class_4668$class_4677;Lnet/minecraft/class_1921$class_4750;)V ARG 1 texture - ARG 2 shader + ARG 2 program ARG 3 transparency ARG 4 depthTest ARG 5 cull @@ -284,7 +286,7 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer FIELD field_21436 writeMaskState Lnet/minecraft/class_4668$class_4686; FIELD field_21437 lineWidth Lnet/minecraft/class_4668$class_4677; FIELD field_29462 texture Lnet/minecraft/class_4668$class_5939; - FIELD field_29463 shader Lnet/minecraft/class_4668$class_5942; + FIELD field_29463 program Lnet/minecraft/class_4668$class_5942; METHOD method_23603 cull (Lnet/minecraft/class_4668$class_4671;)Lnet/minecraft/class_1921$class_4688$class_4689; ARG 1 cull METHOD method_23604 depthTest (Lnet/minecraft/class_4668$class_4672;)Lnet/minecraft/class_1921$class_4688$class_4689; @@ -311,8 +313,8 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer ARG 1 outlineMode METHOD method_34577 texture (Lnet/minecraft/class_4668$class_5939;)Lnet/minecraft/class_1921$class_4688$class_4689; ARG 1 texture - METHOD method_34578 shader (Lnet/minecraft/class_4668$class_5942;)Lnet/minecraft/class_1921$class_4688$class_4689; - ARG 1 shader + METHOD method_34578 program (Lnet/minecraft/class_4668$class_5942;)Lnet/minecraft/class_1921$class_4688$class_4689; + ARG 1 program CLASS class_4750 OutlineMode FIELD field_22243 name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V diff --git a/mappings/net/minecraft/client/render/RenderPhase.mapping b/mappings/net/minecraft/client/render/RenderPhase.mapping index c663c590a5..03a0ee9d45 100644 --- a/mappings/net/minecraft/client/render/RenderPhase.mapping +++ b/mappings/net/minecraft/client/render/RenderPhase.mapping @@ -37,59 +37,59 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase FIELD field_25282 WEATHER_TARGET Lnet/minecraft/class_4668$class_4678; FIELD field_25283 CLOUDS_TARGET Lnet/minecraft/class_4668$class_4678; FIELD field_25643 ITEM_TARGET Lnet/minecraft/class_4668$class_4678; - FIELD field_29404 ENTITY_CUTOUT_NONULL_OFFSET_Z_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29405 ITEM_ENTITY_TRANSLUCENT_CULL_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29406 ENTITY_TRANSLUCENT_CULL_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29407 ENTITY_TRANSLUCENT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29408 ENTITY_SMOOTH_CUTOUT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29409 BEACON_BEAM_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29410 ENTITY_DECAL_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29411 ENTITY_NO_OUTLINE_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29412 ENTITY_SHADOW_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29413 ENTITY_ALPHA_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29414 EYES_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29415 ENERGY_SWIRL_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29416 LEASH_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29417 WATER_MASK_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29418 OUTLINE_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29419 ARMOR_GLINT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29420 ARMOR_ENTITY_GLINT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29421 TRANSLUCENT_GLINT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29422 GLINT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29423 DIRECT_GLINT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29424 ENTITY_GLINT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29425 DIRECT_ENTITY_GLINT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29426 CRUMBLING_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29427 TEXT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29428 TRANSPARENT_TEXT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29429 LIGHTNING_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29430 TRIPWIRE_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29431 END_PORTAL_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29432 END_GATEWAY_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29433 LINES_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29434 NO_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29435 BLOCK_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29436 NEW_ENTITY_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29437 POSITION_COLOR_LIGHTMAP_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29438 POSITION_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29439 POSITION_COLOR_TEXTURE_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29440 POSITION_TEXTURE_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29441 POSITION_COLOR_TEXTURE_LIGHTMAP_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29442 COLOR_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29443 SOLID_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29444 CUTOUT_MIPPED_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29445 CUTOUT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29446 TRANSLUCENT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29447 TRANSLUCENT_MOVING_BLOCK_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29448 TRANSLUCENT_NO_CRUMBLING_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29449 ARMOR_CUTOUT_NO_CULL_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29450 ENTITY_SOLID_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29451 ENTITY_CUTOUT_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_29452 ENTITY_CUTOUT_NONULL_SHADER Lnet/minecraft/class_4668$class_5942; + FIELD field_29404 ENTITY_CUTOUT_NONULL_OFFSET_Z_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29405 ITEM_ENTITY_TRANSLUCENT_CULL_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29406 ENTITY_TRANSLUCENT_CULL_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29407 ENTITY_TRANSLUCENT_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29408 ENTITY_SMOOTH_CUTOUT_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29409 BEACON_BEAM_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29410 ENTITY_DECAL_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29411 ENTITY_NO_OUTLINE_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29412 ENTITY_SHADOW_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29413 ENTITY_ALPHA_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29414 EYES_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29415 ENERGY_SWIRL_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29416 LEASH_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29417 WATER_MASK_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29418 OUTLINE_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29419 ARMOR_GLINT_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29420 ARMOR_ENTITY_GLINT_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29421 TRANSLUCENT_GLINT_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29422 GLINT_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29423 DIRECT_GLINT_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29424 ENTITY_GLINT_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29425 DIRECT_ENTITY_GLINT_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29426 CRUMBLING_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29427 TEXT_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29428 TRANSPARENT_TEXT_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29429 LIGHTNING_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29430 TRIPWIRE_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29431 END_PORTAL_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29432 END_GATEWAY_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29433 LINES_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29434 NO_PROGRAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29435 BLOCK_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29436 NEW_ENTITY_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29437 POSITION_COLOR_LIGHTMAP_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29438 POSITION_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29439 POSITION_COLOR_TEXTURE_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29440 POSITION_TEXTURE_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29441 POSITION_COLOR_TEXTURE_LIGHTMAP_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29442 COLOR_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29443 SOLID_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29444 CUTOUT_MIPPED_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29445 CUTOUT_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29446 TRANSLUCENT_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29447 TRANSLUCENT_MOVING_BLOCK_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29448 TRANSLUCENT_NO_CRUMBLING_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29449 ARMOR_CUTOUT_NO_CULL_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29450 ENTITY_SOLID_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29451 ENTITY_CUTOUT_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_29452 ENTITY_CUTOUT_NONULL_PROGAM Lnet/minecraft/class_4668$class_5942; FIELD field_32771 VIEW_OFFSET_Z_LAYERING_SCALE F - FIELD field_33628 TEXT_INTENSITY_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_33629 TRANSPARENT_TEXT_INTENSITY_SHADER Lnet/minecraft/class_4668$class_5942; - FIELD field_38344 ENTITY_TRANSLUCENT_EMISSIVE_SHADER Lnet/minecraft/class_4668$class_5942; + FIELD field_33628 TEXT_INTENSITY_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_33629 TRANSPARENT_TEXT_INTENSITY_PROGAM Lnet/minecraft/class_4668$class_5942; + FIELD field_38344 ENTITY_TRANSLUCENT_EMISSIVE_PROGAM Lnet/minecraft/class_4668$class_5942; METHOD (Ljava/lang/String;Ljava/lang/Runnable;Ljava/lang/Runnable;)V ARG 1 name ARG 2 beginAction @@ -164,7 +164,7 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase ARG 1 id ARG 2 blur ARG 3 mipmap - CLASS class_5942 Shader + CLASS class_5942 ShaderProgram FIELD field_29455 supplier Ljava/util/Optional; METHOD (Ljava/util/function/Supplier;)V ARG 1 supplier diff --git a/mappings/net/minecraft/client/render/Tessellator.mapping b/mappings/net/minecraft/client/render/Tessellator.mapping index 27dae948dc..610cced007 100644 --- a/mappings/net/minecraft/client/render/Tessellator.mapping +++ b/mappings/net/minecraft/client/render/Tessellator.mapping @@ -11,6 +11,6 @@ CLASS net/minecraft/class_289 net/minecraft/client/render/Tessellator METHOD method_1348 getInstance ()Lnet/minecraft/class_289; METHOD method_1349 getBuffer ()Lnet/minecraft/class_287; METHOD method_1350 draw ()V - COMMENT Draws the contents of the buffer builder using the shader specified with - COMMENT {@link com.mojang.blaze3d.systems.RenderSystem#setShader + COMMENT Draws the contents of the buffer builder using the shader program + COMMENT specified with {@link com.mojang.blaze3d.systems.RenderSystem#setShader COMMENT RenderSystem#setShader}. diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index e0d6fed528..bcca4dd09b 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer 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_25279 transparencyPostProcessor Lnet/minecraft/class_279; FIELD field_27740 frustum Lnet/minecraft/class_4604; FIELD field_27741 blockEntityRenderDispatcher Lnet/minecraft/class_824; FIELD field_34807 chunkInfos Lit/unimi/dsi/fastutil/objects/ObjectArrayList; @@ -23,7 +23,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_4055 noCullingBlockEntities Ljava/util/Set; FIELD field_4056 capturedFrustum Lnet/minecraft/class_4604; FIELD field_4058 blockBreakingInfos Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; - FIELD field_4059 entityOutlineShader Lnet/minecraft/class_279; + FIELD field_4059 entityOutlinePostProcessor Lnet/minecraft/class_279; FIELD field_4060 LOGGER Lorg/slf4j/Logger; FIELD field_4061 END_SKY Lnet/minecraft/class_2960; FIELD field_4062 viewDistance I @@ -205,8 +205,8 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer METHOD method_29362 getParticlesFramebuffer ()Lnet/minecraft/class_276; METHOD method_29363 getWeatherFramebuffer ()Lnet/minecraft/class_276; METHOD method_29364 getCloudsFramebuffer ()Lnet/minecraft/class_276; - METHOD method_29365 loadTransparencyShader ()V - METHOD method_29701 resetTransparencyShader ()V + METHOD method_29365 loadTransparencyPostProcessor ()V + METHOD method_29701 resetTransparencyPostProcessor ()V METHOD method_32133 setupFrustum (Lnet/minecraft/class_4587;Lnet/minecraft/class_243;Lorg/joml/Matrix4f;)V ARG 1 matrices ARG 2 pos @@ -344,7 +344,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 2 y ARG 3 z ARG 4 important - METHOD method_3296 loadEntityOutlineShader ()V + METHOD method_3296 loadEntityOutlinePostProcessor ()V METHOD method_34550 renderSky (Lnet/minecraft/class_287;F)Lnet/minecraft/class_287$class_7433; ARG 0 builder METHOD method_34808 collectRenderableChunks (Ljava/util/LinkedHashSet;Lnet/minecraft/class_761$class_5972;Lnet/minecraft/class_243;Ljava/util/Queue;Z)V @@ -369,7 +369,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 14 green ARG 15 blue ARG 16 alpha - METHOD method_35774 reloadTransparencyShader ()V + METHOD method_35774 reloadTransparencyPostProcessor ()V METHOD method_35775 captureFrustum ()V METHOD method_35776 killFrustum ()V METHOD method_38549 enqueueChunksInViewDistance (Lnet/minecraft/class_4184;Ljava/util/Queue;)V @@ -453,7 +453,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 1 ordinal METHOD method_34816 addDirection (Lnet/minecraft/class_2350;)V ARG 1 direction - CLASS class_5347 ShaderException + CLASS class_5347 ProgramInitException METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V ARG 1 message ARG 2 cause diff --git a/mappings/net/minecraft/util/InvalidHierarchicalFileException.mapping b/mappings/net/minecraft/util/InvalidHierarchicalFileException.mapping new file mode 100644 index 0000000000..a6e248f2c4 --- /dev/null +++ b/mappings/net/minecraft/util/InvalidHierarchicalFileException.mapping @@ -0,0 +1,23 @@ +CLASS net/minecraft/class_2973 net/minecraft/util/InvalidHierarchicalFileException + COMMENT An exception that tracks the names of the invalid files and the path to + COMMENT the invalid element in a hierarchical tree structure (such as JSON). + FIELD field_13371 invalidFiles Ljava/util/List; + FIELD field_13372 message Ljava/lang/String; + METHOD (Ljava/lang/String;)V + ARG 1 message + METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V + ARG 1 message + ARG 2 cause + METHOD method_12854 addInvalidKey (Ljava/lang/String;)V + ARG 1 key + METHOD method_12855 addInvalidFile (Ljava/lang/String;)V + ARG 1 fileName + METHOD method_12856 wrap (Ljava/lang/Exception;)Lnet/minecraft/class_2973; + ARG 0 cause + CLASS class_2974 File + FIELD field_13373 name Ljava/lang/String; + FIELD field_13374 keys Ljava/util/List; + METHOD method_12857 joinKeys ()Ljava/lang/String; + METHOD method_12858 addKey (Ljava/lang/String;)V + ARG 1 key + METHOD method_36182 getName ()Ljava/lang/String;