Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to 1.21.3 #307

Open
wants to merge 25 commits into
base: versions/1.21.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ writtenbooks {
}

compass {
version = '1.21.1'
version = '1.21.3'
}

repositories {
Expand Down
7 changes: 0 additions & 7 deletions data/com/mojang/blaze3d/Blaze3D.mapping

This file was deleted.

11 changes: 11 additions & 0 deletions data/com/mojang/blaze3d/ProjectionType.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
CLASS com/mojang/blaze3d/ProjectionType
METHOD <init> (Ljava/lang/String;ILcom/mojang/blaze3d/vertex/VertexSorting;Lcom/mojang/blaze3d/ProjectionType$LayeringTransform;)V
ARG 3 vertexSorting
ARG 4 layeringTransform
METHOD applyLayeringTransform (Lorg/joml/Matrix4f;F)V
ARG 1 modelViewMatrix
ARG 2 distance
CLASS LayeringTransform
METHOD apply (Lorg/joml/Matrix4f;F)V
ARG 1 modelViewMatrix
ARG 2 distance
3 changes: 3 additions & 0 deletions data/com/mojang/blaze3d/TracyBootstrap.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CLASS com/mojang/blaze3d/TracyBootstrap
METHOD messageColor (Lorg/slf4j/event/Level;)I
ARG 0 level
6 changes: 6 additions & 0 deletions data/com/mojang/blaze3d/TracyFrameCapture.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
CLASS com/mojang/blaze3d/TracyFrameCapture
METHOD capture (Lcom/mojang/blaze3d/pipeline/RenderTarget;)V
ARG 1 renderTarget
METHOD resize (II)V
ARG 1 width
ARG 2 height
3 changes: 3 additions & 0 deletions data/com/mojang/blaze3d/buffers/BufferType.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CLASS com/mojang/blaze3d/buffers/BufferType
METHOD <init> (Ljava/lang/String;II)V
ARG 3 id
5 changes: 5 additions & 0 deletions data/com/mojang/blaze3d/buffers/BufferUsage.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
CLASS com/mojang/blaze3d/buffers/BufferUsage
METHOD <init> (Ljava/lang/String;IIZZ)V
ARG 3 id
ARG 4 readable
ARG 5 writable
21 changes: 21 additions & 0 deletions data/com/mojang/blaze3d/buffers/GpuBuffer.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
CLASS com/mojang/blaze3d/buffers/GpuBuffer
METHOD <init> (Lcom/mojang/blaze3d/buffers/BufferType;Lcom/mojang/blaze3d/buffers/BufferUsage;I)V
ARG 1 type
ARG 2 usage
ARG 3 size
METHOD <init> (Lcom/mojang/blaze3d/buffers/BufferType;Lcom/mojang/blaze3d/buffers/BufferUsage;Ljava/nio/ByteBuffer;)V
ARG 1 type
ARG 2 usage
ARG 3 buffer
METHOD read (II)Lcom/mojang/blaze3d/buffers/GpuBuffer$ReadView;
ARG 1 offset
ARG 2 length
METHOD resize (I)V
ARG 1 size
METHOD write (Ljava/nio/ByteBuffer;I)V
ARG 1 buffer
ARG 2 offset
CLASS ReadView
METHOD <init> (ILjava/nio/ByteBuffer;)V
ARG 1 target
ARG 2 data
3 changes: 3 additions & 0 deletions data/com/mojang/blaze3d/buffers/GpuFence.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
CLASS com/mojang/blaze3d/buffers/GpuFence
METHOD awaitCompletion (J)Z
ARG 1 timeout
10 changes: 10 additions & 0 deletions data/com/mojang/blaze3d/font/TrueTypeGlyphProvider.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ CLASS com/mojang/blaze3d/font/TrueTypeGlyphProvider
ARG 5 shiftX
ARG 6 shiftY
ARG 7 skip
METHOD getOrLoadGlyphInfo (ILcom/mojang/blaze3d/font/TrueTypeGlyphProvider$GlyphEntry;)Lcom/mojang/blaze3d/font/GlyphInfo;
ARG 1 character
ARG 2 glyphEntry
METHOD loadGlyph (ILorg/lwjgl/util/freetype/FT_Face;I)Lcom/mojang/blaze3d/font/GlyphInfo;
ARG 1 character
ARG 2 face
ARG 3 index
CLASS Glyph
METHOD <init> (Lcom/mojang/blaze3d/font/TrueTypeGlyphProvider;FFIIFI)V
ARG 2 bearingX
Expand All @@ -15,3 +22,6 @@ CLASS com/mojang/blaze3d/font/TrueTypeGlyphProvider
ARG 5 height
ARG 6 advance
ARG 7 index
CLASS GlyphEntry
METHOD <init> (I)V
ARG 1 index
76 changes: 76 additions & 0 deletions data/com/mojang/blaze3d/framegraph/FrameGraphBuilder.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
CLASS com/mojang/blaze3d/framegraph/FrameGraphBuilder
METHOD addPass (Ljava/lang/String;)Lcom/mojang/blaze3d/framegraph/FramePass;
ARG 1 name
METHOD assignResourceLifetimes (Ljava/util/Collection;)V
ARG 1 passes
METHOD createInternal (Ljava/lang/String;Lcom/mojang/blaze3d/resource/ResourceDescriptor;)Lcom/mojang/blaze3d/resource/ResourceHandle;
ARG 1 name
ARG 2 descriptor
METHOD createInternalResource (Ljava/lang/String;Lcom/mojang/blaze3d/resource/ResourceDescriptor;Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder$Pass;)Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder$InternalVirtualResource;
ARG 1 name
ARG 2 descriptor
ARG 3 createdBy
METHOD discoverAllRequiredPasses (Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder$Pass;Ljava/util/BitSet;Ljava/util/Deque;)V
ARG 1 pass
ARG 2 passesToKeep
ARG 3 output
METHOD execute (Lcom/mojang/blaze3d/resource/GraphicsResourceAllocator;)V
ARG 1 allocator
METHOD execute (Lcom/mojang/blaze3d/resource/GraphicsResourceAllocator;Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder$Inspector;)V
ARG 1 allocator
ARG 2 inspector
METHOD importExternal (Ljava/lang/String;Ljava/lang/Object;)Lcom/mojang/blaze3d/resource/ResourceHandle;
ARG 1 name
ARG 2 resource
METHOD resolvePassOrder (Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder$Pass;Ljava/util/BitSet;Ljava/util/BitSet;Ljava/util/List;)V
ARG 1 pass
ARG 2 passesToKeep
ARG 3 output
ARG 4 orderedPasses
CLASS Pass
METHOD <init> (Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder;ILjava/lang/String;)V
ARG 2 id
ARG 3 name
METHOD _reads (Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder$Handle;)V
ARG 1 handle
METHOD _readsAndWrites (Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder$Handle;)Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder$Handle;
ARG 1 handle
METHOD markPassRequired (Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder$Pass;)V
ARG 1 pass
METHOD markResourceRequired (Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder$Handle;)V
ARG 1 handle
CLASS Handle
METHOD <init> (Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder$VirtualResource;ILcom/mojang/blaze3d/framegraph/FrameGraphBuilder$Pass;)V
ARG 1 holder
ARG 2 version
ARG 3 createdBy
METHOD writeAndAlias (Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder$Pass;)Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder$Handle;
ARG 1 alias
CLASS Inspector
METHOD acquireResource (Ljava/lang/String;)V
ARG 1 name
METHOD afterExecutePass (Ljava/lang/String;)V
ARG 1 name
METHOD beforeExecutePass (Ljava/lang/String;)V
ARG 1 name
METHOD releaseResource (Ljava/lang/String;)V
ARG 1 name
CLASS VirtualResource
METHOD <init> (Ljava/lang/String;Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder$Pass;)V
ARG 1 name
ARG 2 createdBy
CLASS ExternalResource
METHOD <init> (Ljava/lang/String;Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder$Pass;Ljava/lang/Object;)V
ARG 1 name
ARG 2 createdBy
ARG 3 resource
CLASS InternalVirtualResource
METHOD <init> (ILjava/lang/String;Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder$Pass;Lcom/mojang/blaze3d/resource/ResourceDescriptor;)V
ARG 1 id
ARG 2 name
ARG 3 createdBy
ARG 4 descriptor
METHOD acquire (Lcom/mojang/blaze3d/resource/GraphicsResourceAllocator;)V
ARG 1 allocator
METHOD release (Lcom/mojang/blaze3d/resource/GraphicsResourceAllocator;)V
ARG 1 allocator
12 changes: 12 additions & 0 deletions data/com/mojang/blaze3d/framegraph/FramePass.mapping
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
CLASS com/mojang/blaze3d/framegraph/FramePass
METHOD createsInternal (Ljava/lang/String;Lcom/mojang/blaze3d/resource/ResourceDescriptor;)Lcom/mojang/blaze3d/resource/ResourceHandle;
ARG 1 name
ARG 2 descriptor
METHOD executes (Ljava/lang/Runnable;)V
ARG 1 task
METHOD reads (Lcom/mojang/blaze3d/resource/ResourceHandle;)V
ARG 1 handle
METHOD readsAndWrites (Lcom/mojang/blaze3d/resource/ResourceHandle;)Lcom/mojang/blaze3d/resource/ResourceHandle;
ARG 1 handle
METHOD requires (Lcom/mojang/blaze3d/framegraph/FramePass;)V
ARG 1 pass
3 changes: 0 additions & 3 deletions data/com/mojang/blaze3d/pipeline/RenderPipeline.mapping

This file was deleted.

23 changes: 4 additions & 19 deletions data/com/mojang/blaze3d/pipeline/RenderTarget.mapping
Original file line number Diff line number Diff line change
@@ -1,37 +1,22 @@
CLASS com/mojang/blaze3d/pipeline/RenderTarget
METHOD <init> (Z)V
ARG 1 useDepth
METHOD _bindWrite (Z)V
ARG 1 setViewport
METHOD _blitToScreen (IIZ)V
ARG 1 width
ARG 2 height
ARG 3 disableBlend
METHOD _resize (IIZ)V
ARG 1 width
ARG 2 height
ARG 3 clearError
METHOD bindWrite (Z)V
ARG 1 setViewport
METHOD blitToScreen (II)V
METHOD blitAndBlendToScreen (II)V
ARG 1 width
ARG 2 height
METHOD blitToScreen (IIZ)V
METHOD blitToScreen (II)V
ARG 1 width
ARG 2 height
ARG 3 disableBlend
METHOD clear (Z)V
ARG 1 clearError
METHOD copyDepthFrom (Lcom/mojang/blaze3d/pipeline/RenderTarget;)V
ARG 1 otherTarget
METHOD createBuffers (IIZ)V
METHOD createBuffers (II)V
ARG 1 width
ARG 2 height
ARG 3 clearError
METHOD resize (IIZ)V
METHOD resize (II)V
ARG 1 width
ARG 2 height
ARG 3 clearError
METHOD setClearColor (FFFF)V
ARG 1 red
ARG 2 green
Expand Down
3 changes: 1 addition & 2 deletions data/com/mojang/blaze3d/pipeline/TextureTarget.mapping
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
CLASS com/mojang/blaze3d/pipeline/TextureTarget
METHOD <init> (IIZZ)V
METHOD <init> (IIZ)V
ARG 1 width
ARG 2 height
ARG 3 useDepth
ARG 4 clearError
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
CLASS com/mojang/blaze3d/platform/ClientShutdownWatchdog
METHOD startShutdownWatchdog (Ljava/io/File;J)V
ARG 0 file
ARG 1 threadId
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
CLASS com/mojang/blaze3d/platform/FramerateLimitTracker
METHOD <init> (Lnet/minecraft/client/Options;Lnet/minecraft/client/Minecraft;)V
ARG 1 options
ARG 2 minecraft
METHOD setFramerateLimit (I)V
ARG 1 framerateLimit
31 changes: 25 additions & 6 deletions data/com/mojang/blaze3d/platform/GlStateManager.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ CLASS com/mojang/blaze3d/platform/GlStateManager
ARG 1 dstFactor
ARG 2 srcFactorAlpha
ARG 3 dstFactorAlpha
METHOD _clear (IZ)V
METHOD _clear (I)V
ARG 0 mask
ARG 1 checkError
METHOD _clearColor (FFFF)V
ARG 0 red
ARG 1 green
Expand Down Expand Up @@ -97,6 +96,14 @@ CLASS com/mojang/blaze3d/platform/GlStateManager
ARG 0 target
ARG 1 data
ARG 2 usage
METHOD _glBufferSubData (IILjava/nio/ByteBuffer;)V
ARG 0 target
ARG 1 offset
ARG 2 data
METHOD _glClientWaitSync (JIJ)I
ARG 0 sync
ARG 2 flags
ARG 3 timeout
METHOD _glCopyTexSubImage2D (IIIIIIII)V
ARG 0 target
ARG 1 level
Expand All @@ -112,6 +119,8 @@ CLASS com/mojang/blaze3d/platform/GlStateManager
ARG 0 frameBuffer
METHOD _glDeleteRenderbuffers (I)V
ARG 0 renderBuffer
METHOD _glDeleteSync (J)V
ARG 0 sync
METHOD _glDeleteVertexArrays (I)V
ARG 0 array
METHOD _glDrawPixels (IIIIJ)V
Expand All @@ -120,6 +129,9 @@ CLASS com/mojang/blaze3d/platform/GlStateManager
ARG 2 format
ARG 3 type
ARG 4 pixels
METHOD _glFenceSync (II)J
ARG 0 condition
ARG 1 flags
METHOD _glFramebufferRenderbuffer (IIII)V
ARG 0 target
ARG 1 attachment
Expand All @@ -140,6 +152,11 @@ CLASS com/mojang/blaze3d/platform/GlStateManager
METHOD _glMapBuffer (II)Ljava/nio/ByteBuffer;
ARG 0 target
ARG 1 access
METHOD _glMapBufferRange (IIII)Ljava/nio/ByteBuffer;
ARG 0 target
ARG 1 offset
ARG 2 length
ARG 3 access
METHOD _glRenderbufferStorage (IIII)V
ARG 0 target
ARG 1 internalFormat
Expand Down Expand Up @@ -322,10 +339,9 @@ CLASS com/mojang/blaze3d/platform/GlStateManager
ARG 1 pname
METHOD glLinkProgram (I)V
ARG 0 program
METHOD glShaderSource (ILjava/util/List;)V
ARG 0 shader
COMMENT The shader object whose source code is to be replaced.
ARG 1 shaderData
METHOD glShaderSource (ILjava/lang/String;)V
ARG 0 type
ARG 1 source
METHOD lambda$static$0 (I)Lcom/mojang/blaze3d/platform/GlStateManager$TextureState;
ARG 0 index
METHOD setupGui3DDiffuseLighting (Lorg/joml/Vector3f;Lorg/joml/Vector3f;)V
Expand Down Expand Up @@ -361,3 +377,6 @@ CLASS com/mojang/blaze3d/platform/GlStateManager
CLASS SourceFactor
METHOD <init> (Ljava/lang/String;II)V
ARG 3 value
CLASS FramebufferState
METHOD update (I)Z
ARG 1 binding
22 changes: 6 additions & 16 deletions data/com/mojang/blaze3d/platform/NativeImage.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ CLASS com/mojang/blaze3d/platform/NativeImage
ARG 11 autoClose
METHOD applyToAllPixels (Ljava/util/function/IntUnaryOperator;)V
ARG 1 function
METHOD blendPixel (III)V
ARG 1 x
ARG 2 y
ARG 3 abgrColor
METHOD copyFrom (Lcom/mojang/blaze3d/platform/NativeImage;)V
ARG 1 other
METHOD copyFromFont (Lorg/lwjgl/util/freetype/FT_Face;I)Z
Expand Down Expand Up @@ -67,19 +63,13 @@ CLASS com/mojang/blaze3d/platform/NativeImage
ARG 3 width
ARG 4 height
ARG 5 value
METHOD getBlueOrLuminance (II)B
ARG 1 x
ARG 2 y
METHOD getGreenOrLuminance (II)B
ARG 1 x
ARG 2 y
METHOD getLuminanceOrAlpha (II)B
ARG 1 x
ARG 2 y
METHOD getPixelRGBA (II)I
METHOD getPixel (II)I
ARG 1 x
ARG 2 y
METHOD getRedOrLuminance (II)B
METHOD getPixelABGR (II)I
ARG 1 x
ARG 2 y
METHOD isOutsideBounds (II)Z
Expand Down Expand Up @@ -108,14 +98,14 @@ CLASS com/mojang/blaze3d/platform/NativeImage
METHOD setFilter (ZZ)V
ARG 0 linear
ARG 1 mipmap
METHOD setPixelLuminance (IIB)V
METHOD setPixel (III)V
ARG 1 x
ARG 2 y
ARG 3 luminance
METHOD setPixelRGBA (III)V
ARG 3 color
METHOD setPixelABGR (III)V
ARG 1 x
ARG 2 y
ARG 3 abgrColor
ARG 3 color
METHOD upload (IIIIIIIZZ)V
ARG 1 level
ARG 2 xOffset
Expand Down
Loading
Loading