diff --git a/build.gradle b/build.gradle index bf13bb10c..b8e11d20e 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ writtenbooks { } compass { - version = '1.21.1' + version = '1.21.3' } repositories { diff --git a/data/com/mojang/blaze3d/Blaze3D.mapping b/data/com/mojang/blaze3d/Blaze3D.mapping deleted file mode 100644 index 15939d7ef..000000000 --- a/data/com/mojang/blaze3d/Blaze3D.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS com/mojang/blaze3d/Blaze3D - METHOD process (Lcom/mojang/blaze3d/pipeline/RenderPipeline;F)V - ARG 0 pipeline - ARG 1 unknown - METHOD render (Lcom/mojang/blaze3d/pipeline/RenderPipeline;F)V - ARG 0 pipeline - ARG 1 unknown diff --git a/data/com/mojang/blaze3d/ProjectionType.mapping b/data/com/mojang/blaze3d/ProjectionType.mapping new file mode 100644 index 000000000..7ea968faf --- /dev/null +++ b/data/com/mojang/blaze3d/ProjectionType.mapping @@ -0,0 +1,11 @@ +CLASS com/mojang/blaze3d/ProjectionType + METHOD (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 diff --git a/data/com/mojang/blaze3d/TracyBootstrap.mapping b/data/com/mojang/blaze3d/TracyBootstrap.mapping new file mode 100644 index 000000000..56d5dd375 --- /dev/null +++ b/data/com/mojang/blaze3d/TracyBootstrap.mapping @@ -0,0 +1,3 @@ +CLASS com/mojang/blaze3d/TracyBootstrap + METHOD messageColor (Lorg/slf4j/event/Level;)I + ARG 0 level diff --git a/data/com/mojang/blaze3d/TracyFrameCapture.mapping b/data/com/mojang/blaze3d/TracyFrameCapture.mapping new file mode 100644 index 000000000..6671e1872 --- /dev/null +++ b/data/com/mojang/blaze3d/TracyFrameCapture.mapping @@ -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 diff --git a/data/com/mojang/blaze3d/buffers/BufferType.mapping b/data/com/mojang/blaze3d/buffers/BufferType.mapping new file mode 100644 index 000000000..bb6dfe8c5 --- /dev/null +++ b/data/com/mojang/blaze3d/buffers/BufferType.mapping @@ -0,0 +1,3 @@ +CLASS com/mojang/blaze3d/buffers/BufferType + METHOD (Ljava/lang/String;II)V + ARG 3 id diff --git a/data/com/mojang/blaze3d/buffers/BufferUsage.mapping b/data/com/mojang/blaze3d/buffers/BufferUsage.mapping new file mode 100644 index 000000000..fc2606675 --- /dev/null +++ b/data/com/mojang/blaze3d/buffers/BufferUsage.mapping @@ -0,0 +1,5 @@ +CLASS com/mojang/blaze3d/buffers/BufferUsage + METHOD (Ljava/lang/String;IIZZ)V + ARG 3 id + ARG 4 readable + ARG 5 writable diff --git a/data/com/mojang/blaze3d/buffers/GpuBuffer.mapping b/data/com/mojang/blaze3d/buffers/GpuBuffer.mapping new file mode 100644 index 000000000..a8dcaa114 --- /dev/null +++ b/data/com/mojang/blaze3d/buffers/GpuBuffer.mapping @@ -0,0 +1,21 @@ +CLASS com/mojang/blaze3d/buffers/GpuBuffer + METHOD (Lcom/mojang/blaze3d/buffers/BufferType;Lcom/mojang/blaze3d/buffers/BufferUsage;I)V + ARG 1 type + ARG 2 usage + ARG 3 size + METHOD (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 (ILjava/nio/ByteBuffer;)V + ARG 1 target + ARG 2 data diff --git a/data/com/mojang/blaze3d/buffers/GpuFence.mapping b/data/com/mojang/blaze3d/buffers/GpuFence.mapping new file mode 100644 index 000000000..b47423e2c --- /dev/null +++ b/data/com/mojang/blaze3d/buffers/GpuFence.mapping @@ -0,0 +1,3 @@ +CLASS com/mojang/blaze3d/buffers/GpuFence + METHOD awaitCompletion (J)Z + ARG 1 timeout diff --git a/data/com/mojang/blaze3d/font/TrueTypeGlyphProvider.mapping b/data/com/mojang/blaze3d/font/TrueTypeGlyphProvider.mapping index ef9a5cef5..ad0d4a0e3 100644 --- a/data/com/mojang/blaze3d/font/TrueTypeGlyphProvider.mapping +++ b/data/com/mojang/blaze3d/font/TrueTypeGlyphProvider.mapping @@ -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 (Lcom/mojang/blaze3d/font/TrueTypeGlyphProvider;FFIIFI)V ARG 2 bearingX @@ -15,3 +22,6 @@ CLASS com/mojang/blaze3d/font/TrueTypeGlyphProvider ARG 5 height ARG 6 advance ARG 7 index + CLASS GlyphEntry + METHOD (I)V + ARG 1 index diff --git a/data/com/mojang/blaze3d/framegraph/FrameGraphBuilder.mapping b/data/com/mojang/blaze3d/framegraph/FrameGraphBuilder.mapping new file mode 100644 index 000000000..e2e4b7729 --- /dev/null +++ b/data/com/mojang/blaze3d/framegraph/FrameGraphBuilder.mapping @@ -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 (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 (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 (Ljava/lang/String;Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder$Pass;)V + ARG 1 name + ARG 2 createdBy + CLASS ExternalResource + METHOD (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 (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 diff --git a/data/com/mojang/blaze3d/framegraph/FramePass.mapping b/data/com/mojang/blaze3d/framegraph/FramePass.mapping new file mode 100644 index 000000000..50872d1b2 --- /dev/null +++ b/data/com/mojang/blaze3d/framegraph/FramePass.mapping @@ -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 diff --git a/data/com/mojang/blaze3d/pipeline/RenderPipeline.mapping b/data/com/mojang/blaze3d/pipeline/RenderPipeline.mapping deleted file mode 100644 index 818548ad0..000000000 --- a/data/com/mojang/blaze3d/pipeline/RenderPipeline.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS com/mojang/blaze3d/pipeline/RenderPipeline - METHOD recordRenderCall (Lcom/mojang/blaze3d/pipeline/RenderCall;)V - ARG 1 renderCall diff --git a/data/com/mojang/blaze3d/pipeline/RenderTarget.mapping b/data/com/mojang/blaze3d/pipeline/RenderTarget.mapping index 1fd920345..ce52e93ba 100644 --- a/data/com/mojang/blaze3d/pipeline/RenderTarget.mapping +++ b/data/com/mojang/blaze3d/pipeline/RenderTarget.mapping @@ -1,37 +1,22 @@ CLASS com/mojang/blaze3d/pipeline/RenderTarget METHOD (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 diff --git a/data/com/mojang/blaze3d/pipeline/TextureTarget.mapping b/data/com/mojang/blaze3d/pipeline/TextureTarget.mapping index 44c4df8f9..24b8e05f9 100644 --- a/data/com/mojang/blaze3d/pipeline/TextureTarget.mapping +++ b/data/com/mojang/blaze3d/pipeline/TextureTarget.mapping @@ -1,6 +1,5 @@ CLASS com/mojang/blaze3d/pipeline/TextureTarget - METHOD (IIZZ)V + METHOD (IIZ)V ARG 1 width ARG 2 height ARG 3 useDepth - ARG 4 clearError diff --git a/data/com/mojang/blaze3d/platform/ClientShutdownWatchdog.mapping b/data/com/mojang/blaze3d/platform/ClientShutdownWatchdog.mapping new file mode 100644 index 000000000..17203b6a2 --- /dev/null +++ b/data/com/mojang/blaze3d/platform/ClientShutdownWatchdog.mapping @@ -0,0 +1,4 @@ +CLASS com/mojang/blaze3d/platform/ClientShutdownWatchdog + METHOD startShutdownWatchdog (Ljava/io/File;J)V + ARG 0 file + ARG 1 threadId diff --git a/data/com/mojang/blaze3d/platform/FramerateLimitTracker.mapping b/data/com/mojang/blaze3d/platform/FramerateLimitTracker.mapping new file mode 100644 index 000000000..1927b90f2 --- /dev/null +++ b/data/com/mojang/blaze3d/platform/FramerateLimitTracker.mapping @@ -0,0 +1,6 @@ +CLASS com/mojang/blaze3d/platform/FramerateLimitTracker + METHOD (Lnet/minecraft/client/Options;Lnet/minecraft/client/Minecraft;)V + ARG 1 options + ARG 2 minecraft + METHOD setFramerateLimit (I)V + ARG 1 framerateLimit diff --git a/data/com/mojang/blaze3d/platform/GlStateManager.mapping b/data/com/mojang/blaze3d/platform/GlStateManager.mapping index 6ba13566e..a76c724a7 100644 --- a/data/com/mojang/blaze3d/platform/GlStateManager.mapping +++ b/data/com/mojang/blaze3d/platform/GlStateManager.mapping @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -361,3 +377,6 @@ CLASS com/mojang/blaze3d/platform/GlStateManager CLASS SourceFactor METHOD (Ljava/lang/String;II)V ARG 3 value + CLASS FramebufferState + METHOD update (I)Z + ARG 1 binding diff --git a/data/com/mojang/blaze3d/platform/NativeImage.mapping b/data/com/mojang/blaze3d/platform/NativeImage.mapping index 7901c51e3..53635f064 100644 --- a/data/com/mojang/blaze3d/platform/NativeImage.mapping +++ b/data/com/mojang/blaze3d/platform/NativeImage.mapping @@ -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 @@ -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 @@ -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 diff --git a/data/com/mojang/blaze3d/platform/Window.mapping b/data/com/mojang/blaze3d/platform/Window.mapping index c044629ab..9dcd71094 100644 --- a/data/com/mojang/blaze3d/platform/Window.mapping +++ b/data/com/mojang/blaze3d/platform/Window.mapping @@ -29,6 +29,9 @@ CLASS com/mojang/blaze3d/platform/Window ARG 1 window ARG 3 framebufferWidth ARG 4 framebufferHeight + METHOD onIconify (JZ)V + ARG 1 window + ARG 3 iconified METHOD onMove (JII)V ARG 1 window ARG 3 x @@ -39,8 +42,6 @@ CLASS com/mojang/blaze3d/platform/Window ARG 4 height METHOD setErrorSection (Ljava/lang/String;)V ARG 1 errorSection - METHOD setFramerateLimit (I)V - ARG 1 limit METHOD setGuiScale (D)V ARG 1 scaleFactor METHOD setHeight (I)V @@ -54,11 +55,16 @@ CLASS com/mojang/blaze3d/platform/Window ARG 1 title METHOD setWidth (I)V ARG 1 framebufferWidth + METHOD setWindowCloseCallback (Ljava/lang/Runnable;)V + ARG 1 windowCloseCallback METHOD setWindowed (II)V ARG 1 windowedWidth ARG 2 windowedHeight - METHOD updateFullscreen (Z)V + METHOD updateDisplay (Lcom/mojang/blaze3d/TracyFrameCapture;)V + ARG 1 tracyFrameCapture + METHOD updateFullscreen (ZLcom/mojang/blaze3d/TracyFrameCapture;)V ARG 1 vsyncEnabled + ARG 2 tracyFrameCapture METHOD updateRawMouseInput (Z)V ARG 1 enableRawMouseMotion METHOD updateVsync (Z)V diff --git a/data/com/mojang/blaze3d/preprocessor/GlslPreprocessor.mapping b/data/com/mojang/blaze3d/preprocessor/GlslPreprocessor.mapping index d212413fc..d46322dd2 100644 --- a/data/com/mojang/blaze3d/preprocessor/GlslPreprocessor.mapping +++ b/data/com/mojang/blaze3d/preprocessor/GlslPreprocessor.mapping @@ -2,6 +2,9 @@ CLASS com/mojang/blaze3d/preprocessor/GlslPreprocessor METHOD applyImport (ZLjava/lang/String;)Ljava/lang/String; ARG 1 useFullPath ARG 2 directory + METHOD injectDefines (Ljava/lang/String;Lnet/minecraft/client/renderer/ShaderDefines;)Ljava/lang/String; + ARG 0 shaderSource + ARG 1 defines METHOD isDirectiveDisabled (Ljava/lang/String;Ljava/util/regex/Matcher;I)Z ARG 0 shaderData ARG 1 matcher diff --git a/data/com/mojang/blaze3d/resource/CrossFrameResourcePool.mapping b/data/com/mojang/blaze3d/resource/CrossFrameResourcePool.mapping new file mode 100644 index 000000000..d902ddf00 --- /dev/null +++ b/data/com/mojang/blaze3d/resource/CrossFrameResourcePool.mapping @@ -0,0 +1,8 @@ +CLASS com/mojang/blaze3d/resource/CrossFrameResourcePool + METHOD (I)V + ARG 1 framesToKeepResource + CLASS ResourceEntry + METHOD (Lcom/mojang/blaze3d/resource/ResourceDescriptor;Ljava/lang/Object;I)V + ARG 1 descriptor + ARG 2 value + ARG 3 framesToLive diff --git a/data/com/mojang/blaze3d/resource/GraphicsResourceAllocator.mapping b/data/com/mojang/blaze3d/resource/GraphicsResourceAllocator.mapping new file mode 100644 index 000000000..8e4711fce --- /dev/null +++ b/data/com/mojang/blaze3d/resource/GraphicsResourceAllocator.mapping @@ -0,0 +1,6 @@ +CLASS com/mojang/blaze3d/resource/GraphicsResourceAllocator + METHOD acquire (Lcom/mojang/blaze3d/resource/ResourceDescriptor;)Ljava/lang/Object; + ARG 1 descriptor + METHOD release (Lcom/mojang/blaze3d/resource/ResourceDescriptor;Ljava/lang/Object;)V + ARG 1 descriptor + ARG 2 value diff --git a/data/com/mojang/blaze3d/resource/ResourceDescriptor.mapping b/data/com/mojang/blaze3d/resource/ResourceDescriptor.mapping new file mode 100644 index 000000000..3c7250550 --- /dev/null +++ b/data/com/mojang/blaze3d/resource/ResourceDescriptor.mapping @@ -0,0 +1,3 @@ +CLASS com/mojang/blaze3d/resource/ResourceDescriptor + METHOD free (Ljava/lang/Object;)V + ARG 1 target diff --git a/data/com/mojang/blaze3d/shaders/BlendMode.mapping b/data/com/mojang/blaze3d/shaders/BlendMode.mapping deleted file mode 100644 index 6fd00b1c6..000000000 --- a/data/com/mojang/blaze3d/shaders/BlendMode.mapping +++ /dev/null @@ -1,26 +0,0 @@ -CLASS com/mojang/blaze3d/shaders/BlendMode - METHOD (III)V - ARG 1 srcFactor - ARG 2 dstFactor - ARG 3 blendFunc - METHOD (IIIII)V - ARG 1 srcColorFactor - ARG 2 dstColorFactor - ARG 3 srcAlphaFactor - ARG 4 dstAlphaFactor - ARG 5 blendFunc - METHOD (ZZIIIII)V - ARG 1 separateBlend - ARG 2 opaque - ARG 3 srcColorFactor - ARG 4 dstColorFactor - ARG 5 srcAlphaFactor - ARG 6 dstAlphaFactor - ARG 7 blendFunc - METHOD equals (Ljava/lang/Object;)Z - ARG 1 other - METHOD stringToBlendFactor (Ljava/lang/String;)I - ARG 0 factorName - METHOD stringToBlendFunc (Ljava/lang/String;)I - COMMENT Converts a blend function name to an id, returning add (32774) if not recognized. - ARG 0 funcName diff --git a/data/com/mojang/blaze3d/shaders/CompiledShader.mapping b/data/com/mojang/blaze3d/shaders/CompiledShader.mapping new file mode 100644 index 000000000..f55c32683 --- /dev/null +++ b/data/com/mojang/blaze3d/shaders/CompiledShader.mapping @@ -0,0 +1,15 @@ +CLASS com/mojang/blaze3d/shaders/CompiledShader + METHOD (ILnet/minecraft/resources/ResourceLocation;)V + ARG 1 shaderId + ARG 2 id + METHOD compile (Lnet/minecraft/resources/ResourceLocation;Lcom/mojang/blaze3d/shaders/CompiledShader$Type;Ljava/lang/String;)Lcom/mojang/blaze3d/shaders/CompiledShader; + ARG 0 shaderId + ARG 1 type + ARG 2 source + CLASS Type + METHOD (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;I)V + ARG 3 name + ARG 4 extension + ARG 5 glType + METHOD byLocation (Lnet/minecraft/resources/ResourceLocation;)Lcom/mojang/blaze3d/shaders/CompiledShader$Type; + ARG 0 location diff --git a/data/com/mojang/blaze3d/shaders/EffectProgram.mapping b/data/com/mojang/blaze3d/shaders/EffectProgram.mapping deleted file mode 100644 index 66b0105b5..000000000 --- a/data/com/mojang/blaze3d/shaders/EffectProgram.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS com/mojang/blaze3d/shaders/EffectProgram - METHOD (Lcom/mojang/blaze3d/shaders/Program$Type;ILjava/lang/String;)V - ARG 1 type - ARG 2 id - ARG 3 name - METHOD attachToEffect (Lcom/mojang/blaze3d/shaders/Effect;)V - ARG 1 effect - METHOD compileShader (Lcom/mojang/blaze3d/shaders/Program$Type;Ljava/lang/String;Ljava/io/InputStream;Ljava/lang/String;)Lcom/mojang/blaze3d/shaders/EffectProgram; - ARG 0 type - ARG 1 name - ARG 2 shaderData - ARG 3 sourceName diff --git a/data/com/mojang/blaze3d/shaders/Program.mapping b/data/com/mojang/blaze3d/shaders/Program.mapping deleted file mode 100644 index a376796b7..000000000 --- a/data/com/mojang/blaze3d/shaders/Program.mapping +++ /dev/null @@ -1,24 +0,0 @@ -CLASS com/mojang/blaze3d/shaders/Program - METHOD (Lcom/mojang/blaze3d/shaders/Program$Type;ILjava/lang/String;)V - ARG 1 type - ARG 2 id - ARG 3 name - METHOD attachToShader (Lcom/mojang/blaze3d/shaders/Shader;)V - ARG 1 shader - METHOD compileShader (Lcom/mojang/blaze3d/shaders/Program$Type;Ljava/lang/String;Ljava/io/InputStream;Ljava/lang/String;Lcom/mojang/blaze3d/preprocessor/GlslPreprocessor;)Lcom/mojang/blaze3d/shaders/Program; - ARG 0 type - ARG 1 name - ARG 2 shaderData - ARG 3 sourceName - ARG 4 preprocessor - METHOD compileShaderInternal (Lcom/mojang/blaze3d/shaders/Program$Type;Ljava/lang/String;Ljava/io/InputStream;Ljava/lang/String;Lcom/mojang/blaze3d/preprocessor/GlslPreprocessor;)I - ARG 0 type - ARG 1 name - ARG 2 shaderData - ARG 3 sourceName - ARG 4 preprocessor - CLASS Type - METHOD (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;I)V - ARG 3 name - ARG 4 extension - ARG 5 glType diff --git a/data/com/mojang/blaze3d/shaders/ProgramManager.mapping b/data/com/mojang/blaze3d/shaders/ProgramManager.mapping deleted file mode 100644 index defcb4e67..000000000 --- a/data/com/mojang/blaze3d/shaders/ProgramManager.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS com/mojang/blaze3d/shaders/ProgramManager - METHOD glUseProgram (I)V - ARG 0 program - METHOD linkShader (Lcom/mojang/blaze3d/shaders/Shader;)V - ARG 0 shader - METHOD releaseProgram (Lcom/mojang/blaze3d/shaders/Shader;)V - ARG 0 shader diff --git a/data/com/mojang/blaze3d/shaders/Uniform.mapping b/data/com/mojang/blaze3d/shaders/Uniform.mapping index 3089689ee..cb832dff4 100644 --- a/data/com/mojang/blaze3d/shaders/Uniform.mapping +++ b/data/com/mojang/blaze3d/shaders/Uniform.mapping @@ -1,24 +1,21 @@ CLASS com/mojang/blaze3d/shaders/Uniform - METHOD (Ljava/lang/String;IILcom/mojang/blaze3d/shaders/Shader;)V + METHOD (Ljava/lang/String;II)V ARG 1 name ARG 2 type ARG 3 count - ARG 4 parent METHOD getTypeFromString (Ljava/lang/String;)I ARG 0 typeName - METHOD glBindAttribLocation (IILjava/lang/CharSequence;)V - ARG 0 program - ARG 1 index - ARG 2 name - METHOD glGetAttribLocation (ILjava/lang/CharSequence;)I - ARG 0 program - ARG 1 name METHOD glGetUniformLocation (ILjava/lang/CharSequence;)I ARG 0 program ARG 1 name METHOD set (IF)V ARG 1 index ARG 2 value + METHOD setFromConfig (Ljava/util/List;I)V + ARG 1 values + ARG 2 count + METHOD setFromConfig (Lnet/minecraft/client/renderer/ShaderProgramConfig$Uniform;)V + ARG 1 uniform METHOD setLocation (I)V ARG 1 location METHOD uploadInteger (II)V diff --git a/data/com/mojang/blaze3d/systems/RenderSystem.mapping b/data/com/mojang/blaze3d/systems/RenderSystem.mapping index aee0dc2d3..cb394317f 100644 --- a/data/com/mojang/blaze3d/systems/RenderSystem.mapping +++ b/data/com/mojang/blaze3d/systems/RenderSystem.mapping @@ -1,15 +1,4 @@ CLASS com/mojang/blaze3d/systems/RenderSystem - METHOD _setShaderColor (FFFF)V - ARG 0 red - ARG 1 green - ARG 2 blue - ARG 3 alpha - METHOD _setShaderTexture (II)V - ARG 0 shaderTexture - ARG 1 textureId - METHOD _setShaderTexture (ILnet/minecraft/resources/ResourceLocation;)V - ARG 0 shaderTexture - ARG 1 textureId METHOD activeTexture (I)V ARG 0 texture METHOD bindTexture (I)V @@ -34,9 +23,8 @@ CLASS com/mojang/blaze3d/systems/RenderSystem ARG 1 destFactor ARG 2 sourceFactorAlpha ARG 3 destFactorAlpha - METHOD clear (IZ)V + METHOD clear (I)V ARG 0 mask - ARG 1 checkError METHOD clearColor (FFFF)V ARG 0 red ARG 1 green @@ -66,8 +54,9 @@ CLASS com/mojang/blaze3d/systems/RenderSystem ARG 1 y ARG 2 width ARG 3 height - METHOD flipFrame (J)V - ARG 0 windowId + METHOD flipFrame (JLcom/mojang/blaze3d/TracyFrameCapture;)V + ARG 0 window + ARG 2 tracyFrameCapture METHOD getSequentialBuffer (Lcom/mojang/blaze3d/vertex/VertexFormat$Mode;)Lcom/mojang/blaze3d/systems/RenderSystem$AutoStorageIndexBuffer; ARG 0 formatMode METHOD getShaderTexture (I)I @@ -88,10 +77,6 @@ CLASS com/mojang/blaze3d/systems/RenderSystem ARG 0 buffer METHOD glDeleteVertexArrays (I)V ARG 0 array - METHOD glGenBuffers (Ljava/util/function/Consumer;)V - ARG 0 bufferIdConsumer - METHOD glGenVertexArrays (Ljava/util/function/Consumer;)V - ARG 0 arrayObjectIdConsumer METHOD glUniform1 (ILjava/nio/FloatBuffer;)V ARG 0 location ARG 1 value @@ -167,35 +152,22 @@ CLASS com/mojang/blaze3d/systems/RenderSystem ARG 0 renderCall METHOD renderCrosshair (I)V ARG 0 lineLength - METHOD runAsFancy (Ljava/lang/Runnable;)V - ARG 0 fancyRunnable METHOD setErrorCallback (Lorg/lwjgl/glfw/GLFWErrorCallbackI;)V ARG 0 callback - METHOD setProjectionMatrix (Lorg/joml/Matrix4f;Lcom/mojang/blaze3d/vertex/VertexSorting;)V + METHOD setProjectionMatrix (Lorg/joml/Matrix4f;Lcom/mojang/blaze3d/ProjectionType;)V ARG 0 projectionMatrix - ARG 1 vertexSorting - METHOD setShader (Ljava/util/function/Supplier;)V - ARG 0 shaderSupplier + ARG 1 projectionType + METHOD setShader (Lnet/minecraft/client/renderer/CompiledShaderProgram;)V + ARG 0 shader + METHOD setShader (Lnet/minecraft/client/renderer/ShaderProgram;)Lnet/minecraft/client/renderer/CompiledShaderProgram; + ARG 0 shader METHOD setShaderColor (FFFF)V ARG 0 red ARG 1 green ARG 2 blue ARG 3 alpha - METHOD setShaderFogColor (FFF)V - ARG 0 red - ARG 1 green - ARG 2 blue - METHOD setShaderFogColor (FFFF)V - ARG 0 red - ARG 1 green - ARG 2 blue - ARG 3 alpha - METHOD setShaderFogEnd (F)V - ARG 0 shaderFogEnd - METHOD setShaderFogShape (Lcom/mojang/blaze3d/shaders/FogShape;)V - ARG 0 shaderFogShape - METHOD setShaderFogStart (F)V - ARG 0 shaderFogStart + METHOD setShaderFog (Lnet/minecraft/client/renderer/FogParameters;)V + ARG 0 shaderFog METHOD setShaderGameTime (JF)V ARG 0 tickTime ARG 2 partialTicks @@ -231,8 +203,8 @@ CLASS com/mojang/blaze3d/systems/RenderSystem METHOD setupOverlayColor (II)V ARG 0 textureId ARG 1 color - METHOD setupShaderLights (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 instance + METHOD setupShaderLights (Lnet/minecraft/client/renderer/CompiledShaderProgram;)V + ARG 0 shader METHOD stencilFunc (III)V ARG 0 func ARG 1 ref diff --git a/data/com/mojang/blaze3d/vertex/BufferUploader.mapping b/data/com/mojang/blaze3d/vertex/BufferUploader.mapping index 4b2f10a28..ac1098610 100644 --- a/data/com/mojang/blaze3d/vertex/BufferUploader.mapping +++ b/data/com/mojang/blaze3d/vertex/BufferUploader.mapping @@ -1,6 +1,4 @@ CLASS com/mojang/blaze3d/vertex/BufferUploader - METHOD _drawWithShader (Lcom/mojang/blaze3d/vertex/MeshData;)V - ARG 0 meshData METHOD bindImmediateBuffer (Lcom/mojang/blaze3d/vertex/VertexBuffer;)V ARG 0 buffer METHOD bindImmediateBuffer (Lcom/mojang/blaze3d/vertex/VertexFormat;)Lcom/mojang/blaze3d/vertex/VertexBuffer; diff --git a/data/com/mojang/blaze3d/vertex/PoseStack.mapping b/data/com/mojang/blaze3d/vertex/PoseStack.mapping index ff414e582..65a8e45e9 100644 --- a/data/com/mojang/blaze3d/vertex/PoseStack.mapping +++ b/data/com/mojang/blaze3d/vertex/PoseStack.mapping @@ -22,6 +22,8 @@ CLASS com/mojang/blaze3d/vertex/PoseStack ARG 1 x ARG 2 y ARG 3 z + METHOD translate (Lnet/minecraft/world/phys/Vec3;)V + ARG 1 vector CLASS Pose METHOD (Lcom/mojang/blaze3d/vertex/PoseStack$Pose;)V ARG 1 pose diff --git a/data/com/mojang/blaze3d/vertex/VertexBuffer.mapping b/data/com/mojang/blaze3d/vertex/VertexBuffer.mapping index efc754f26..ae0645a5a 100644 --- a/data/com/mojang/blaze3d/vertex/VertexBuffer.mapping +++ b/data/com/mojang/blaze3d/vertex/VertexBuffer.mapping @@ -1,12 +1,8 @@ CLASS com/mojang/blaze3d/vertex/VertexBuffer - METHOD (Lcom/mojang/blaze3d/vertex/VertexBuffer$Usage;)V + METHOD (Lcom/mojang/blaze3d/buffers/BufferUsage;)V ARG 1 usage - METHOD _drawWithShader (Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 1 modelViewMatrix - ARG 2 projectionMatrix - ARG 3 shader - METHOD drawWithShader (Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 1 modelViewMatrix + METHOD drawWithShader (Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lnet/minecraft/client/renderer/CompiledShaderProgram;)V + ARG 1 frustumMatrix ARG 2 projectionMatrix ARG 3 shader METHOD upload (Lcom/mojang/blaze3d/vertex/MeshData;)V @@ -19,6 +15,3 @@ CLASS com/mojang/blaze3d/vertex/VertexBuffer METHOD uploadVertexBuffer (Lcom/mojang/blaze3d/vertex/MeshData$DrawState;Ljava/nio/ByteBuffer;)Lcom/mojang/blaze3d/vertex/VertexFormat; ARG 1 drawState ARG 2 buffer - CLASS Usage - METHOD (Ljava/lang/String;II)V - ARG 3 id diff --git a/data/com/mojang/blaze3d/vertex/VertexConsumer.mapping b/data/com/mojang/blaze3d/vertex/VertexConsumer.mapping index e049f6585..9b3875269 100644 --- a/data/com/mojang/blaze3d/vertex/VertexConsumer.mapping +++ b/data/com/mojang/blaze3d/vertex/VertexConsumer.mapping @@ -73,6 +73,9 @@ CLASS com/mojang/blaze3d/vertex/VertexConsumer ARG 2 normalX ARG 3 normalY ARG 4 normalZ + METHOD setNormal (Lcom/mojang/blaze3d/vertex/PoseStack$Pose;Lorg/joml/Vector3f;)Lcom/mojang/blaze3d/vertex/VertexConsumer; + ARG 1 pose + ARG 2 normalVector METHOD setOverlay (I)Lcom/mojang/blaze3d/vertex/VertexConsumer; ARG 1 packedOverlay METHOD setUv (FF)Lcom/mojang/blaze3d/vertex/VertexConsumer; diff --git a/data/com/mojang/blaze3d/vertex/VertexFormat.mapping b/data/com/mojang/blaze3d/vertex/VertexFormat.mapping index bf1cafe6a..ab0685807 100644 --- a/data/com/mojang/blaze3d/vertex/VertexFormat.mapping +++ b/data/com/mojang/blaze3d/vertex/VertexFormat.mapping @@ -4,6 +4,8 @@ CLASS com/mojang/blaze3d/vertex/VertexFormat ARG 2 names ARG 3 offsets ARG 4 vertexSize + METHOD bindAttributes (I)V + ARG 1 program METHOD contains (Lcom/mojang/blaze3d/vertex/VertexFormatElement;)Z ARG 1 element METHOD equals (Ljava/lang/Object;)Z diff --git a/data/com/mojang/math/MatrixUtil.mapping b/data/com/mojang/math/MatrixUtil.mapping index 10fc7392f..024f2b6be 100644 --- a/data/com/mojang/math/MatrixUtil.mapping +++ b/data/com/mojang/math/MatrixUtil.mapping @@ -1,4 +1,8 @@ CLASS com/mojang/math/MatrixUtil + METHOD approxGivensQuat (FFF)Lcom/mojang/math/GivensParameters; + ARG 0 topCorner + ARG 1 oppositeDiagonalAverage + ARG 2 bottomCorner METHOD eigenvalueJacobi (Lorg/joml/Matrix3f;I)Lorg/joml/Quaternionf; ARG 0 input ARG 1 iterations diff --git a/data/com/mojang/realmsclient/RealmsMainScreen.mapping b/data/com/mojang/realmsclient/RealmsMainScreen.mapping index b5f278436..7962f2445 100644 --- a/data/com/mojang/realmsclient/RealmsMainScreen.mapping +++ b/data/com/mojang/realmsclient/RealmsMainScreen.mapping @@ -1,8 +1,6 @@ CLASS com/mojang/realmsclient/RealmsMainScreen METHOD (Lnet/minecraft/client/gui/screens/Screen;)V ARG 1 lastScreen - METHOD addListEntriesForNotification (Lcom/mojang/realmsclient/dto/RealmsNotification;)Z - ARG 1 notification METHOD callRealmsClient (Lcom/mojang/realmsclient/RealmsMainScreen$RealmsCall;Ljava/util/function/Consumer;)V ARG 0 call ARG 1 onFinish @@ -20,6 +18,9 @@ CLASS com/mojang/realmsclient/RealmsMainScreen ARG 1 layoutState METHOD dismissNotification (Ljava/util/UUID;)V ARG 1 uuid + METHOD getGameModeComponent (IZ)Lnet/minecraft/network/chat/Component; + ARG 0 gamemode + ARG 1 hardcore METHOD getVersionComponent (Ljava/lang/String;I)Lnet/minecraft/network/chat/Component; ARG 0 version ARG 1 color @@ -32,8 +33,55 @@ CLASS com/mojang/realmsclient/RealmsMainScreen ARG 1 server METHOD isSelfOwnedServer (Lcom/mojang/realmsclient/dto/RealmsServer;)Z ARG 0 server + METHOD lambda$callRealmsClient$21 (Ljava/lang/Throwable;)Ljava/lang/Void; + ARG 0 exception + METHOD lambda$confirmToPlay$27 (Lnet/minecraft/client/gui/screens/Screen;Lcom/mojang/realmsclient/dto/RealmsServer;Lnet/minecraft/client/gui/components/PopupScreen;)V + ARG 2 screen + METHOD lambda$dismissNotification$24 (Ljava/util/UUID;Lcom/mojang/realmsclient/client/RealmsClient;)Ljava/lang/Object; + ARG 1 client + METHOD lambda$dismissNotification$25 (Ljava/util/UUID;Lcom/mojang/realmsclient/dto/RealmsNotification;)Z + ARG 1 notification + METHOD lambda$init$0 (Lnet/minecraft/network/chat/Component;Lnet/minecraft/client/gui/components/Button;)V + ARG 2 button + METHOD lambda$init$1 (Lnet/minecraft/client/gui/components/Button;)V + ARG 1 button + METHOD lambda$init$2 (Lnet/minecraft/client/gui/components/Button;)V + ARG 1 button + METHOD lambda$init$3 (Lnet/minecraft/client/gui/components/Button;)V + ARG 1 button + METHOD lambda$init$4 (Lnet/minecraft/client/gui/components/Button;)V + ARG 1 button + METHOD lambda$init$5 (Lnet/minecraft/client/gui/components/Button;)V + ARG 1 button + METHOD lambda$init$6 (Lnet/minecraft/client/gui/components/Button;)V + ARG 1 button + METHOD lambda$init$7 (Lnet/minecraft/client/gui/components/Button;)V + ARG 1 button METHOD lambda$init$8 (Lnet/minecraft/client/gui/components/CycleButton;Ljava/lang/Boolean;)V + ARG 1 button ARG 2 snapshotToggle + METHOD lambda$init$9 (Lcom/mojang/realmsclient/RealmsAvailability$Result;)V + ARG 1 result + METHOD lambda$initDataFetcher$12 (Lcom/mojang/realmsclient/gui/RealmsDataFetcher$ServerListData;)V + ARG 1 serverListData + METHOD lambda$initDataFetcher$13 (Ljava/util/List;)V + ARG 1 notifications + METHOD lambda$initDataFetcher$14 (Ljava/lang/Integer;)V + ARG 1 pendingInvites + METHOD lambda$initDataFetcher$15 (Ljava/lang/Boolean;)V + ARG 1 trialAvailability + METHOD lambda$initDataFetcher$16 (Lcom/mojang/realmsclient/dto/RealmsServerPlayerLists;)V + ARG 1 onlinePlayers + METHOD lambda$initDataFetcher$17 (Lcom/mojang/realmsclient/gui/RealmsDataFetcher;Lcom/mojang/realmsclient/dto/RealmsNews;)V + ARG 2 news + METHOD lambda$leaveClicked$23 (Lcom/mojang/realmsclient/dto/RealmsServer;Lnet/minecraft/client/gui/components/PopupScreen;)V + ARG 2 screen + METHOD lambda$markNotificationsAsSeen$18 (Ljava/util/List;Lcom/mojang/realmsclient/client/RealmsClient;)Ljava/lang/Object; + ARG 1 client + METHOD lambda$updateLayout$10 (Lcom/mojang/realmsclient/RealmsMainScreen;Lnet/minecraft/client/gui/components/events/GuiEventListener;)V + ARG 1 listener + METHOD lambda$updateLayout$11 (Lcom/mojang/realmsclient/RealmsMainScreen;Lnet/minecraft/client/gui/components/events/GuiEventListener;)V + ARG 1 listener METHOD leaveClicked (Lcom/mojang/realmsclient/dto/RealmsServer;)V ARG 1 realmsServer METHOD leaveServer (Lcom/mojang/realmsclient/dto/RealmsServer;)V @@ -77,6 +125,10 @@ CLASS com/mojang/realmsclient/RealmsMainScreen ARG 7 tooltipSupplier METHOD firstLineY (I)I ARG 1 top + METHOD gameModeTextX (IILnet/minecraft/network/chat/Component;)I + ARG 1 left + ARG 2 width + ARG 3 component METHOD renderClampedString (Lnet/minecraft/client/gui/GuiGraphics;Ljava/lang/String;IIII)V ARG 1 guiGraphics ARG 2 text @@ -84,6 +136,12 @@ CLASS com/mojang/realmsclient/RealmsMainScreen ARG 4 y ARG 5 maxX ARG 6 color + METHOD renderGameMode (Lcom/mojang/realmsclient/dto/RealmsServer;Lnet/minecraft/client/gui/GuiGraphics;III)I + ARG 1 server + ARG 2 guiGraphics + ARG 3 left + ARG 4 width + ARG 5 firstLineY METHOD renderStatusLights (Lcom/mojang/realmsclient/dto/RealmsServer;Lnet/minecraft/client/gui/GuiGraphics;IIII)V ARG 1 realmsServer ARG 2 guiGraphics @@ -135,10 +193,11 @@ CLASS com/mojang/realmsclient/RealmsMainScreen ARG 5 height ARG 6 mouseX ARG 7 mouseY - METHOD renderSecondLine (Lnet/minecraft/client/gui/GuiGraphics;II)V + METHOD renderSecondLine (Lnet/minecraft/client/gui/GuiGraphics;III)V ARG 1 guiGraphics ARG 2 top ARG 3 left + ARG 4 width CLASS NotificationButton METHOD (Lnet/minecraft/network/chat/Component;Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/client/gui/components/Button$OnPress;)V ARG 1 message @@ -148,14 +207,27 @@ CLASS com/mojang/realmsclient/RealmsMainScreen ARG 1 guiGraphics METHOD setNotificationCount (I)V ARG 1 notificationCount + CLASS RealmSelectionList + METHOD addEntriesForNotification (Lcom/mojang/realmsclient/dto/RealmsNotification$VisitUrl;Lcom/mojang/realmsclient/RealmsMainScreen;)V + ARG 1 url + ARG 2 mainScreen + METHOD refreshEntries (Lcom/mojang/realmsclient/RealmsMainScreen;Lcom/mojang/realmsclient/dto/RealmsServer;)V + ARG 1 screen + ARG 2 server + METHOD refreshServerEntries (Lcom/mojang/realmsclient/dto/RealmsServer;)V + ARG 1 server CLASS AvailableSnapshotEntry METHOD (Lcom/mojang/realmsclient/RealmsMainScreen;Lcom/mojang/realmsclient/dto/RealmsServer;)V ARG 2 parent + METHOD lambda$addSnapshotRealm$0 (Lnet/minecraft/client/gui/components/PopupScreen;)V + ARG 1 screen CLASS NotificationMessageEntry METHOD (Lcom/mojang/realmsclient/RealmsMainScreen;Lnet/minecraft/network/chat/Component;ILcom/mojang/realmsclient/dto/RealmsNotification;)V ARG 2 text ARG 3 frameItemHeight ARG 4 notification + METHOD lambda$new$0 (Lcom/mojang/realmsclient/dto/RealmsNotification;Lnet/minecraft/client/gui/components/Button;)V + ARG 2 button METHOD lambda$render$1 (Lnet/minecraft/client/gui/GuiGraphics;IIFLnet/minecraft/client/gui/components/AbstractWidget;)V ARG 4 widget METHOD refreshLayout (I)V diff --git a/data/com/mojang/realmsclient/client/FileUpload.mapping b/data/com/mojang/realmsclient/client/FileUpload.mapping index f0695f9e4..b664e5d30 100644 --- a/data/com/mojang/realmsclient/client/FileUpload.mapping +++ b/data/com/mojang/realmsclient/client/FileUpload.mapping @@ -27,12 +27,10 @@ CLASS com/mojang/realmsclient/client/FileUpload METHOD shouldRetry (JI)Z ARG 1 retryDelaySeconds ARG 3 retries - METHOD upload (Ljava/util/function/Consumer;)V - ARG 1 resultConsumer CLASS CustomInputStreamEntity - METHOD (Ljava/io/InputStream;JLcom/mojang/realmsclient/client/UploadStatus;)V - ARG 1 content - ARG 2 length - ARG 4 uploadStatus + METHOD (Lcom/mojang/realmsclient/client/FileUpload;Ljava/io/InputStream;JLcom/mojang/realmsclient/client/UploadStatus;)V + ARG 2 content + ARG 3 length + ARG 5 uploadStatus METHOD writeTo (Ljava/io/OutputStream;)V ARG 1 out diff --git a/data/com/mojang/realmsclient/client/RealmsClient.mapping b/data/com/mojang/realmsclient/client/RealmsClient.mapping index 1f4659c68..aea44d8eb 100644 --- a/data/com/mojang/realmsclient/client/RealmsClient.mapping +++ b/data/com/mojang/realmsclient/client/RealmsClient.mapping @@ -56,12 +56,8 @@ CLASS com/mojang/realmsclient/client/RealmsClient METHOD requestDownloadInfo (JI)Lcom/mojang/realmsclient/dto/WorldDownload; ARG 1 worldId ARG 3 slotId - METHOD requestUploadInfo (JLjava/lang/String;)Lcom/mojang/realmsclient/dto/UploadInfo; + METHOD requestUploadInfo (J)Lcom/mojang/realmsclient/dto/UploadInfo; ARG 1 worldId - ARG 3 token - METHOD resetWorldWithSeed (JLcom/mojang/realmsclient/util/WorldGenerationInfo;)Ljava/lang/Boolean; - ARG 1 worldId - ARG 3 generationInfo METHOD resetWorldWithTemplate (JLjava/lang/String;)Ljava/lang/Boolean; ARG 1 worldId ARG 3 worldTemplateId diff --git a/data/com/mojang/realmsclient/client/UploadStatus.mapping b/data/com/mojang/realmsclient/client/UploadStatus.mapping new file mode 100644 index 000000000..46792a39a --- /dev/null +++ b/data/com/mojang/realmsclient/client/UploadStatus.mapping @@ -0,0 +1,5 @@ +CLASS com/mojang/realmsclient/client/UploadStatus + METHOD onWrite (J)V + ARG 1 bytes + METHOD setTotalBytes (J)V + ARG 1 totalBytes diff --git a/data/com/mojang/realmsclient/client/worldupload/RealmsCreateWorldFlow.mapping b/data/com/mojang/realmsclient/client/worldupload/RealmsCreateWorldFlow.mapping new file mode 100644 index 000000000..00f98f148 --- /dev/null +++ b/data/com/mojang/realmsclient/client/worldupload/RealmsCreateWorldFlow.mapping @@ -0,0 +1,17 @@ +CLASS com/mojang/realmsclient/client/worldupload/RealmsCreateWorldFlow + METHOD createTemporaryWorldFolder (Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/world/level/storage/PrimaryLevelData;Ljava/nio/file/Path;)Ljava/nio/file/Path; + ARG 0 registryAccess + ARG 1 levelData + ARG 2 tempDatapackDir + METHOD createWorld (Lnet/minecraft/client/Minecraft;Lnet/minecraft/client/gui/screens/Screen;Lnet/minecraft/client/gui/screens/Screen;ILcom/mojang/realmsclient/dto/RealmsServer;Lcom/mojang/realmsclient/util/task/RealmCreationTask;)V + ARG 0 minecraft + ARG 1 lastScreen + ARG 2 resetWorldScreen + ARG 3 slot + ARG 4 server + ARG 5 realmCreationTask + METHOD lambda$createWorld$1 (Lnet/minecraft/client/Minecraft;Lnet/minecraft/client/gui/screens/Screen;Lcom/mojang/realmsclient/dto/RealmsServer;ILcom/mojang/realmsclient/util/task/RealmCreationTask;Lnet/minecraft/client/gui/screens/Screen;Lnet/minecraft/client/gui/screens/worldselection/CreateWorldScreen;Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/world/level/storage/PrimaryLevelData;Ljava/nio/file/Path;)Z + ARG 6 createWorldScreen + ARG 7 registryAccess + ARG 8 levelData + ARG 9 tempDataPackDir diff --git a/data/com/mojang/realmsclient/client/worldupload/RealmsUploadFailedException.mapping b/data/com/mojang/realmsclient/client/worldupload/RealmsUploadFailedException.mapping new file mode 100644 index 000000000..519da3c3c --- /dev/null +++ b/data/com/mojang/realmsclient/client/worldupload/RealmsUploadFailedException.mapping @@ -0,0 +1,5 @@ +CLASS com/mojang/realmsclient/client/worldupload/RealmsUploadFailedException + METHOD (Ljava/lang/String;)V + ARG 1 errorMessage + METHOD (Lnet/minecraft/network/chat/Component;)V + ARG 1 errorMessage diff --git a/data/com/mojang/realmsclient/client/worldupload/RealmsUploadTooLargeException.mapping b/data/com/mojang/realmsclient/client/worldupload/RealmsUploadTooLargeException.mapping new file mode 100644 index 000000000..604d601c6 --- /dev/null +++ b/data/com/mojang/realmsclient/client/worldupload/RealmsUploadTooLargeException.mapping @@ -0,0 +1,3 @@ +CLASS com/mojang/realmsclient/client/worldupload/RealmsUploadTooLargeException + METHOD (J)V + ARG 1 sizeLimit diff --git a/data/com/mojang/realmsclient/client/worldupload/RealmsUploadWorldPacker.mapping b/data/com/mojang/realmsclient/client/worldupload/RealmsUploadWorldPacker.mapping new file mode 100644 index 000000000..8f576b362 --- /dev/null +++ b/data/com/mojang/realmsclient/client/worldupload/RealmsUploadWorldPacker.mapping @@ -0,0 +1,14 @@ +CLASS com/mojang/realmsclient/client/worldupload/RealmsUploadWorldPacker + METHOD (Ljava/nio/file/Path;Ljava/util/function/BooleanSupplier;)V + ARG 1 directoryToPack + ARG 2 isCanceled + METHOD addFileToTarGz (Lorg/apache/commons/compress/archivers/tar/TarArchiveOutputStream;Ljava/nio/file/Path;Ljava/lang/String;Z)V + ARG 1 stream + ARG 2 directory + ARG 3 prefix + ARG 4 isRootDirectory + METHOD pack (Ljava/nio/file/Path;Ljava/util/function/BooleanSupplier;)Ljava/io/File; + ARG 0 directoryToPack + ARG 1 isCanceled + METHOD verifyBelowSizeLimit (J)V + ARG 1 size diff --git a/data/com/mojang/realmsclient/client/worldupload/RealmsWorldUpload.mapping b/data/com/mojang/realmsclient/client/worldupload/RealmsWorldUpload.mapping new file mode 100644 index 000000000..105535778 --- /dev/null +++ b/data/com/mojang/realmsclient/client/worldupload/RealmsWorldUpload.mapping @@ -0,0 +1,8 @@ +CLASS com/mojang/realmsclient/client/worldupload/RealmsWorldUpload + METHOD (Ljava/nio/file/Path;Lcom/mojang/realmsclient/dto/RealmsWorldOptions;Lnet/minecraft/client/User;JILcom/mojang/realmsclient/client/worldupload/RealmsWorldUploadStatusTracker;)V + ARG 1 worldFolder + ARG 2 worldOptions + ARG 3 user + ARG 4 realmId + ARG 6 slotId + ARG 7 statusCallback diff --git a/data/com/mojang/realmsclient/dto/RealmsServer.mapping b/data/com/mojang/realmsclient/dto/RealmsServer.mapping index 72781ae8a..9f7da0550 100644 --- a/data/com/mojang/realmsclient/dto/RealmsServer.mapping +++ b/data/com/mojang/realmsclient/dto/RealmsServer.mapping @@ -17,8 +17,14 @@ CLASS com/mojang/realmsclient/dto/RealmsServer ARG 0 json METHOD parseInvited (Lcom/google/gson/JsonArray;)Ljava/util/List; ARG 0 jsonArray + METHOD parseSettings (Lcom/google/gson/JsonElement;)Lcom/mojang/realmsclient/dto/RealmsSettings; + ARG 0 json METHOD parseSlots (Lcom/google/gson/JsonArray;)Ljava/util/Map; ARG 0 jsonArray + METHOD readBoolean (Lcom/google/gson/JsonObject;Ljava/lang/String;Z)Z + ARG 0 json + ARG 1 memberName + ARG 2 defaultValue METHOD setDescription (Ljava/lang/String;)V ARG 1 motd METHOD setName (Ljava/lang/String;)V diff --git a/data/com/mojang/realmsclient/dto/RealmsWorldOptions.mapping b/data/com/mojang/realmsclient/dto/RealmsWorldOptions.mapping index cd8eef8d5..d71c78dbc 100644 --- a/data/com/mojang/realmsclient/dto/RealmsWorldOptions.mapping +++ b/data/com/mojang/realmsclient/dto/RealmsWorldOptions.mapping @@ -1,22 +1,31 @@ CLASS com/mojang/realmsclient/dto/RealmsWorldOptions - METHOD (ZZZZIZIIZLjava/lang/String;Ljava/lang/String;Lcom/mojang/realmsclient/dto/RealmsServer$Compatibility;)V + METHOD (ZZIZIIZZLjava/lang/String;Ljava/lang/String;Lcom/mojang/realmsclient/dto/RealmsServer$Compatibility;)V ARG 1 pvp - ARG 2 spawnAnimals - ARG 3 spawnMonsters - ARG 4 spawnNPCs - ARG 5 spawnProtection - ARG 6 commandBlocks - ARG 7 difficulty - ARG 8 gameMode - ARG 9 forceGameMode - ARG 10 slotName - ARG 11 version - ARG 12 compatibility + ARG 2 spawnMonsters + ARG 3 spawnProtection + ARG 4 commandBlocks + ARG 5 difficulty + ARG 6 gameMode + ARG 7 hardcore + ARG 8 forceGameMode + ARG 9 slotName + ARG 10 version + ARG 11 compatibility + METHOD createDefaultsWith (Lnet/minecraft/world/level/GameType;Lnet/minecraft/world/Difficulty;ZLjava/lang/String;Ljava/lang/String;)Lcom/mojang/realmsclient/dto/RealmsWorldOptions; + ARG 0 gameMode + ARG 1 difficulty + ARG 2 hardcore + ARG 3 version + ARG 4 slotName + METHOD createFromSettings (Lnet/minecraft/world/level/LevelSettings;Ljava/lang/String;)Lcom/mojang/realmsclient/dto/RealmsWorldOptions; + ARG 0 settings + ARG 1 version METHOD getDefaultSlotName (I)Ljava/lang/String; ARG 1 slotIndex METHOD getSlotName (I)Ljava/lang/String; ARG 1 slotIndex - METHOD parse (Lcom/google/gson/JsonObject;)Lcom/mojang/realmsclient/dto/RealmsWorldOptions; + METHOD parse (Lcom/google/gson/JsonObject;Lcom/mojang/realmsclient/dto/RealmsSettings;)Lcom/mojang/realmsclient/dto/RealmsWorldOptions; ARG 0 json + ARG 1 realmsSettings METHOD setEmpty (Z)V ARG 1 empty diff --git a/data/com/mojang/realmsclient/gui/RowButton.mapping b/data/com/mojang/realmsclient/gui/RowButton.mapping index 6d35e41ed..5fc6c869f 100644 --- a/data/com/mojang/realmsclient/gui/RowButton.mapping +++ b/data/com/mojang/realmsclient/gui/RowButton.mapping @@ -9,9 +9,9 @@ CLASS com/mojang/realmsclient/gui/RowButton ARG 2 x ARG 3 y ARG 4 showTooltip - METHOD drawButtonsInRow (Lnet/minecraft/client/gui/GuiGraphics;Ljava/util/List;Lnet/minecraft/realms/RealmsObjectSelectionList;IIII)V + METHOD drawButtonsInRow (Lnet/minecraft/client/gui/GuiGraphics;Ljava/util/List;Lnet/minecraft/client/gui/components/AbstractSelectionList;IIII)V ARG 0 guiGraphics - ARG 1 buttons + ARG 1 rowButtons ARG 2 pendingInvitations ARG 3 x ARG 4 y @@ -25,10 +25,10 @@ CLASS com/mojang/realmsclient/gui/RowButton ARG 5 mouseY METHOD onClick (I)V ARG 1 index - METHOD rowButtonMouseClicked (Lnet/minecraft/realms/RealmsObjectSelectionList;Lnet/minecraft/client/gui/components/ObjectSelectionList$Entry;Ljava/util/List;IDD)V - ARG 0 list + METHOD rowButtonMouseClicked (Lnet/minecraft/client/gui/components/AbstractSelectionList;Lnet/minecraft/client/gui/components/ObjectSelectionList$Entry;Ljava/util/List;IDD)V + ARG 0 pendingInvitations ARG 1 entry - ARG 2 buttons + ARG 2 rowButtons ARG 3 button ARG 4 mouseX ARG 6 mouseY diff --git a/data/com/mojang/realmsclient/gui/screens/RealmsBackupScreen.mapping b/data/com/mojang/realmsclient/gui/screens/RealmsBackupScreen.mapping index 04f26aa8c..82a22a276 100644 --- a/data/com/mojang/realmsclient/gui/screens/RealmsBackupScreen.mapping +++ b/data/com/mojang/realmsclient/gui/screens/RealmsBackupScreen.mapping @@ -12,6 +12,3 @@ CLASS com/mojang/realmsclient/gui/screens/RealmsBackupScreen ARG 1 date METHOD populateChangeList (Lcom/mojang/realmsclient/dto/Backup;)V ARG 1 backup - CLASS BackupObjectSelectionList - METHOD addEntry (Lcom/mojang/realmsclient/dto/Backup;)V - ARG 1 backup diff --git a/data/com/mojang/realmsclient/gui/screens/RealmsCreateRealmScreen.mapping b/data/com/mojang/realmsclient/gui/screens/RealmsCreateRealmScreen.mapping index 280153d32..c560ddfdf 100644 --- a/data/com/mojang/realmsclient/gui/screens/RealmsCreateRealmScreen.mapping +++ b/data/com/mojang/realmsclient/gui/screens/RealmsCreateRealmScreen.mapping @@ -1,11 +1,12 @@ CLASS com/mojang/realmsclient/gui/screens/RealmsCreateRealmScreen - METHOD (Lcom/mojang/realmsclient/RealmsMainScreen;J)V + METHOD (Lcom/mojang/realmsclient/RealmsMainScreen;Lcom/mojang/realmsclient/dto/RealmsServer;Z)V ARG 1 lastScreen - ARG 2 parentId - METHOD (Lcom/mojang/realmsclient/RealmsMainScreen;Lcom/mojang/realmsclient/dto/RealmsServer;)V - ARG 1 lastScreen - ARG 2 realmsServer - METHOD createSnapshotWorld (J)V - ARG 1 parentId - METHOD createWorld (Lcom/mojang/realmsclient/dto/RealmsServer;)V - ARG 1 realmsServer + ARG 2 server + ARG 3 isSnapshor + METHOD createSnapshotRealm (Lcom/mojang/realmsclient/dto/RealmsServer;)Lcom/mojang/realmsclient/dto/RealmsServer; + ARG 0 server + METHOD createWorld (Lcom/mojang/realmsclient/dto/RealmsServer;Z)V + ARG 1 server + ARG 2 isSnapshot + METHOD showResetWorldScreen (Lcom/mojang/realmsclient/dto/RealmsServer;)V + ARG 1 server diff --git a/data/com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen.mapping b/data/com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen.mapping index be188be57..7f98501db 100644 --- a/data/com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen.mapping +++ b/data/com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen.mapping @@ -2,11 +2,16 @@ CLASS com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen METHOD (Lnet/minecraft/client/gui/screens/Screen;Lnet/minecraft/network/chat/Component;)V ARG 1 lastScreen ARG 2 title - METHOD handleInvitation (IZ)V - ARG 1 index - ARG 2 shouldAccept - METHOD shouldAcceptAndRejectButtonBeVisible (I)Z - ARG 1 selectedInvite + METHOD handleInvitation (Z)V + ARG 1 accept + METHOD lambda$init$1 (Lcom/mojang/realmsclient/dto/PendingInvite;)Lcom/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen$Entry; + ARG 1 invite + METHOD lambda$init$3 (Lnet/minecraft/client/gui/components/Button;)V + ARG 1 button + METHOD lambda$init$4 (Lnet/minecraft/client/gui/components/Button;)V + ARG 1 button + METHOD lambda$init$5 (Lnet/minecraft/client/gui/components/Button;)V + ARG 1 button CLASS Entry METHOD (Lcom/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen;Lcom/mojang/realmsclient/dto/PendingInvite;)V ARG 2 pendingInvite @@ -18,7 +23,5 @@ CLASS com/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen ARG 5 mouseX ARG 6 mouseY CLASS PendingInvitationSelectionList - METHOD removeAtIndex (I)V - ARG 1 index - METHOD selectInviteListItem (I)V - ARG 1 index + METHOD removeInvitation (Lcom/mojang/realmsclient/gui/screens/RealmsPendingInvitesScreen$Entry;)V + ARG 1 entry diff --git a/data/com/mojang/realmsclient/gui/screens/RealmsResetNormalWorldScreen.mapping b/data/com/mojang/realmsclient/gui/screens/RealmsResetNormalWorldScreen.mapping deleted file mode 100644 index 2bcf288d5..000000000 --- a/data/com/mojang/realmsclient/gui/screens/RealmsResetNormalWorldScreen.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS com/mojang/realmsclient/gui/screens/RealmsResetNormalWorldScreen - METHOD (Ljava/util/function/Consumer;Lnet/minecraft/network/chat/Component;)V - ARG 1 callback - ARG 2 buttonTitle - METHOD createExperimentsButton (Lnet/minecraft/client/gui/layouts/LinearLayout;)V - ARG 1 layout - METHOD lambda$init$0 (Lnet/minecraft/client/gui/components/CycleButton;Lcom/mojang/realmsclient/util/LevelType;)V - ARG 2 levelType - METHOD lambda$init$1 (Lnet/minecraft/client/gui/components/CycleButton;Ljava/lang/Boolean;)V - ARG 2 generateStructures diff --git a/data/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.mapping b/data/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.mapping index adc7882fa..344f67f16 100644 --- a/data/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.mapping +++ b/data/com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen.mapping @@ -32,8 +32,6 @@ CLASS com/mojang/realmsclient/gui/screens/RealmsResetWorldScreen ARG 0 lastScreen ARG 1 serverData ARG 2 resetWorldRunnable - METHOD generationSelectionCallback (Lcom/mojang/realmsclient/util/WorldGenerationInfo;)V - ARG 1 generationInfo METHOD runResetTasks (Lcom/mojang/realmsclient/util/task/LongRunningTask;)V ARG 1 task METHOD templateSelectionCallback (Lcom/mojang/realmsclient/dto/WorldTemplate;)V diff --git a/data/com/mojang/realmsclient/gui/screens/RealmsSlotOptionsScreen.mapping b/data/com/mojang/realmsclient/gui/screens/RealmsSlotOptionsScreen.mapping index 1580249d7..2a534d61c 100644 --- a/data/com/mojang/realmsclient/gui/screens/RealmsSlotOptionsScreen.mapping +++ b/data/com/mojang/realmsclient/gui/screens/RealmsSlotOptionsScreen.mapping @@ -21,16 +21,6 @@ CLASS com/mojang/realmsclient/gui/screens/RealmsSlotOptionsScreen ARG 2 gameMode METHOD lambda$init$2 (Ljava/lang/Boolean;)V ARG 1 spawnAnimals - METHOD lambda$init$3 (Ljava/lang/Boolean;)V - ARG 1 spawnMonsters - METHOD lambda$init$4 (Lnet/minecraft/client/gui/components/CycleButton;Lnet/minecraft/client/gui/components/CycleButton;Lnet/minecraft/world/Difficulty;)V - ARG 3 difficulty - METHOD lambda$init$5 (Ljava/lang/Boolean;)V - ARG 1 spawnNPCs - METHOD lambda$init$6 (Lnet/minecraft/client/gui/components/CycleButton;Ljava/lang/Boolean;)V - ARG 2 forceGameMode - METHOD lambda$init$7 (Lnet/minecraft/client/gui/components/CycleButton;Ljava/lang/Boolean;)V - ARG 2 commandBlocks METHOD setWorldName (Ljava/lang/String;)V ARG 1 name CLASS SettingsSlider diff --git a/data/com/mojang/realmsclient/gui/screens/RealmsUploadScreen.mapping b/data/com/mojang/realmsclient/gui/screens/RealmsUploadScreen.mapping index e1728f09f..452d0f289 100644 --- a/data/com/mojang/realmsclient/gui/screens/RealmsUploadScreen.mapping +++ b/data/com/mojang/realmsclient/gui/screens/RealmsUploadScreen.mapping @@ -5,11 +5,6 @@ CLASS com/mojang/realmsclient/gui/screens/RealmsUploadScreen ARG 4 slotId ARG 5 lastScreen ARG 6 selectedLevel - METHOD addFileToTarGz (Lorg/apache/commons/compress/archivers/tar/TarArchiveOutputStream;Ljava/lang/String;Ljava/lang/String;Z)V - ARG 1 tarArchiveOutputStream - ARG 2 pathname - ARG 3 name - ARG 4 rootDirectory METHOD drawProgressBar (Lnet/minecraft/client/gui/GuiGraphics;)V ARG 1 guiGraphics METHOD drawUploadSpeed (Lnet/minecraft/client/gui/GuiGraphics;)V @@ -19,7 +14,3 @@ CLASS com/mojang/realmsclient/gui/screens/RealmsUploadScreen ARG 2 bytesPerSecond METHOD setErrorMessage ([Lnet/minecraft/network/chat/Component;)V ARG 1 errorMessage - METHOD tarGzipArchive (Ljava/io/File;)Ljava/io/File; - ARG 1 file - METHOD verify (Ljava/io/File;)Z - ARG 1 file diff --git a/data/com/mojang/realmsclient/util/task/CreateSnapshotRealmTask.mapping b/data/com/mojang/realmsclient/util/task/CreateSnapshotRealmTask.mapping deleted file mode 100644 index 99d6f503b..000000000 --- a/data/com/mojang/realmsclient/util/task/CreateSnapshotRealmTask.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS com/mojang/realmsclient/util/task/CreateSnapshotRealmTask - METHOD (Lcom/mojang/realmsclient/RealmsMainScreen;JLcom/mojang/realmsclient/util/WorldGenerationInfo;Ljava/lang/String;Ljava/lang/String;)V - ARG 1 realmsMainScreen - ARG 2 parentId - ARG 4 generationInfo - ARG 5 name - ARG 6 description diff --git a/data/com/mojang/realmsclient/util/task/ResettingGeneratedWorldTask.mapping b/data/com/mojang/realmsclient/util/task/ResettingGeneratedWorldTask.mapping deleted file mode 100644 index ca772a6be..000000000 --- a/data/com/mojang/realmsclient/util/task/ResettingGeneratedWorldTask.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS com/mojang/realmsclient/util/task/ResettingGeneratedWorldTask - METHOD (Lcom/mojang/realmsclient/util/WorldGenerationInfo;JLnet/minecraft/network/chat/Component;Ljava/lang/Runnable;)V - ARG 1 generationInfo - ARG 2 serverId - ARG 4 title - ARG 5 callback diff --git a/data/net/minecraft/Optionull.mapping b/data/net/minecraft/Optionull.mapping index 845a8369c..10f2cd9c5 100644 --- a/data/net/minecraft/Optionull.mapping +++ b/data/net/minecraft/Optionull.mapping @@ -36,3 +36,6 @@ CLASS net/minecraft/Optionull ARG 0 value ARG 1 mapper ARG 2 supplier + METHOD orElse (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 value + ARG 1 defaultValue diff --git a/data/net/minecraft/TracingExecutor.mapping b/data/net/minecraft/TracingExecutor.mapping new file mode 100644 index 000000000..2814e8bb1 --- /dev/null +++ b/data/net/minecraft/TracingExecutor.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/TracingExecutor + METHOD execute (Ljava/lang/Runnable;)V + ARG 1 task + METHOD forName (Ljava/lang/String;)Ljava/util/concurrent/Executor; + ARG 1 name + METHOD lambda$forName$1 (Ljava/lang/String;Ljava/lang/Runnable;)V + ARG 2 task + METHOD shutdownAndAwait (JLjava/util/concurrent/TimeUnit;)V + ARG 1 timeout + ARG 3 unit + METHOD wrapUnnamed (Ljava/lang/Runnable;)Ljava/lang/Runnable; + ARG 0 task diff --git a/data/net/minecraft/Util.mapping b/data/net/minecraft/Util.mapping index 24e1ec3a8..4f209cb2d 100644 --- a/data/net/minecraft/Util.mapping +++ b/data/net/minecraft/Util.mapping @@ -1,8 +1,52 @@ CLASS net/minecraft/Util METHOD allOf (Ljava/util/List;)Ljava/util/function/Predicate; ARG 0 predicates + METHOD allOf (Ljava/util/function/Predicate;)Ljava/util/function/Predicate; + ARG 0 predicate + METHOD allOf (Ljava/util/function/Predicate;Ljava/util/function/Predicate;)Ljava/util/function/Predicate; + ARG 0 predicate1 + ARG 1 predicate2 + METHOD allOf (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Ljava/util/function/Predicate;)Ljava/util/function/Predicate; + ARG 0 predicate1 + ARG 1 predicate2 + ARG 2 predicate3 + METHOD allOf (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Ljava/util/function/Predicate;Ljava/util/function/Predicate;)Ljava/util/function/Predicate; + ARG 0 predicate1 + ARG 1 predicate2 + ARG 2 predicate3 + ARG 3 predicate4 + METHOD allOf (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Ljava/util/function/Predicate;Ljava/util/function/Predicate;Ljava/util/function/Predicate;)Ljava/util/function/Predicate; + ARG 0 predicate1 + ARG 1 predicate2 + ARG 2 predicate3 + ARG 3 predicate4 + ARG 4 predicate5 + METHOD allOf ([Ljava/util/function/Predicate;)Ljava/util/function/Predicate; + ARG 0 predicates METHOD anyOf (Ljava/util/List;)Ljava/util/function/Predicate; ARG 0 predicates + METHOD anyOf (Ljava/util/function/Predicate;)Ljava/util/function/Predicate; + ARG 0 predicate + METHOD anyOf (Ljava/util/function/Predicate;Ljava/util/function/Predicate;)Ljava/util/function/Predicate; + ARG 0 predicate1 + ARG 1 predicate2 + METHOD anyOf (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Ljava/util/function/Predicate;)Ljava/util/function/Predicate; + ARG 0 predicate1 + ARG 1 predicate2 + ARG 2 predicate3 + METHOD anyOf (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Ljava/util/function/Predicate;Ljava/util/function/Predicate;)Ljava/util/function/Predicate; + ARG 0 predicate1 + ARG 1 predicate2 + ARG 2 predicate3 + ARG 3 predicate4 + METHOD anyOf (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Ljava/util/function/Predicate;Ljava/util/function/Predicate;Ljava/util/function/Predicate;)Ljava/util/function/Predicate; + ARG 0 predicate1 + ARG 1 predicate2 + ARG 2 predicate3 + ARG 3 predicate4 + ARG 4 predicate5 + METHOD anyOf ([Ljava/util/function/Predicate;)Ljava/util/function/Predicate; + ARG 0 predicates METHOD blockUntilDone (Ljava/util/function/Function;)Ljava/util/concurrent/CompletableFuture; ARG 0 task METHOD blockUntilDone (Ljava/util/function/Function;Ljava/util/function/Predicate;)Ljava/lang/Object; @@ -91,6 +135,8 @@ CLASS net/minecraft/Util ARG 0 width ARG 1 height ARG 2 list + METHOD lambda$getVmArguments$19 (Ljava/lang/String;)Z + ARG 0 argument METHOD lastOf (Ljava/util/List;)Ljava/lang/Object; ARG 0 list METHOD logAndPauseIfInIde (Ljava/lang/String;)V @@ -106,9 +152,12 @@ CLASS net/minecraft/Util METHOD makeDescriptionId (Ljava/lang/String;Lnet/minecraft/resources/ResourceLocation;)Ljava/lang/String; ARG 0 type ARG 1 id - METHOD makeExecutor (Ljava/lang/String;)Ljava/util/concurrent/ExecutorService; - ARG 0 serviceName - METHOD makeIoExecutor (Ljava/lang/String;Z)Ljava/util/concurrent/ExecutorService; + METHOD makeEnumMap (Ljava/lang/Class;Ljava/util/function/Function;)Ljava/util/EnumMap; + ARG 0 enumClass + ARG 1 valueGetter + METHOD makeExecutor (Ljava/lang/String;)Lnet/minecraft/TracingExecutor; + ARG 0 name + METHOD makeIoExecutor (Ljava/lang/String;Z)Lnet/minecraft/TracingExecutor; ARG 0 name ARG 1 daemon METHOD memoize (Ljava/util/function/BiFunction;)Ljava/util/function/BiFunction; @@ -142,6 +191,9 @@ CLASS net/minecraft/Util ARG 0 type ARG 1 data ARG 2 partial + METHOD runNamed (Ljava/lang/Runnable;Ljava/lang/String;)V + ARG 0 task + ARG 1 name METHOD runWithRetries (ILjava/lang/String;[Ljava/util/function/BooleanSupplier;)Z ARG 0 maxTries ARG 1 actionName @@ -154,6 +206,7 @@ CLASS net/minecraft/Util ARG 0 current ARG 1 latest ARG 2 oldBackup + ARG 3 restore METHOD sanitizeName (Ljava/lang/String;Lnet/minecraft/CharPredicate;)Ljava/lang/String; ARG 0 fileName ARG 1 characterValidator @@ -175,8 +228,6 @@ CLASS net/minecraft/Util METHOD shuffledCopy ([Ljava/lang/Object;Lnet/minecraft/util/RandomSource;)Ljava/util/List; ARG 0 array ARG 1 random - METHOD shutdownExecutor (Ljava/util/concurrent/ExecutorService;)V - ARG 0 service METHOD singleKeyCache (Ljava/util/function/Function;)Lnet/minecraft/util/SingleKeyCache; ARG 0 computeValue METHOD throwAsRuntime (Ljava/lang/Throwable;)V @@ -187,12 +238,6 @@ CLASS net/minecraft/Util METHOD toShuffledList (Ljava/util/stream/Stream;Lnet/minecraft/util/RandomSource;)Ljava/util/List; ARG 0 stream ARG 1 random - METHOD wrapThreadWithTaskName (Ljava/lang/String;Ljava/lang/Runnable;)Ljava/lang/Runnable; - ARG 0 name - ARG 1 task - METHOD wrapThreadWithTaskName (Ljava/lang/String;Ljava/util/function/Supplier;)Ljava/util/function/Supplier; - ARG 0 name - ARG 1 task METHOD writeAndReadTypedOrThrow (Lcom/mojang/datafixers/Typed;Lcom/mojang/datafixers/types/Type;Ljava/util/function/UnaryOperator;)Lcom/mojang/datafixers/Typed; ARG 0 typed ARG 1 type diff --git a/data/net/minecraft/advancements/AdvancementRewards.mapping b/data/net/minecraft/advancements/AdvancementRewards.mapping index e0e3c2553..878b3e848 100644 --- a/data/net/minecraft/advancements/AdvancementRewards.mapping +++ b/data/net/minecraft/advancements/AdvancementRewards.mapping @@ -1,6 +1,10 @@ CLASS net/minecraft/advancements/AdvancementRewards METHOD grant (Lnet/minecraft/server/level/ServerPlayer;)V ARG 1 player + METHOD lambda$grant$1 (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/commands/CacheableFunction;)Ljava/util/Optional; + ARG 1 function + METHOD lambda$grant$2 (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/commands/functions/CommandFunction;)V + ARG 2 function METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance CLASS Builder @@ -9,9 +13,8 @@ CLASS net/minecraft/advancements/AdvancementRewards ARG 1 experience METHOD addLootTable (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/advancements/AdvancementRewards$Builder; ARG 1 lootTable - METHOD addRecipe (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/advancements/AdvancementRewards$Builder; - COMMENT Adds the given recipe to the rewards. - ARG 1 recipeId + METHOD addRecipe (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/advancements/AdvancementRewards$Builder; + ARG 1 recipe METHOD experience (I)Lnet/minecraft/advancements/AdvancementRewards$Builder; COMMENT Creates a new builder with the given amount of experience as a reward ARG 0 experience @@ -19,8 +22,7 @@ CLASS net/minecraft/advancements/AdvancementRewards ARG 0 functionId METHOD loot (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/advancements/AdvancementRewards$Builder; ARG 0 lootTable - METHOD recipe (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/advancements/AdvancementRewards$Builder; - COMMENT Creates a new builder with the given recipe as a reward. - ARG 0 recipeId + METHOD recipe (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/advancements/AdvancementRewards$Builder; + ARG 0 recipe METHOD runs (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/advancements/AdvancementRewards$Builder; ARG 1 functionId diff --git a/data/net/minecraft/advancements/critereon/BlockPredicate.mapping b/data/net/minecraft/advancements/critereon/BlockPredicate.mapping index 222b21988..2a040ed14 100644 --- a/data/net/minecraft/advancements/critereon/BlockPredicate.mapping +++ b/data/net/minecraft/advancements/critereon/BlockPredicate.mapping @@ -15,11 +15,14 @@ CLASS net/minecraft/advancements/critereon/BlockPredicate CLASS Builder METHOD hasNbt (Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/advancements/critereon/BlockPredicate$Builder; ARG 1 nbt - METHOD of (Ljava/util/Collection;)Lnet/minecraft/advancements/critereon/BlockPredicate$Builder; - ARG 1 blocks - METHOD of (Lnet/minecraft/tags/TagKey;)Lnet/minecraft/advancements/critereon/BlockPredicate$Builder; - ARG 1 tag - METHOD of ([Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/advancements/critereon/BlockPredicate$Builder; - ARG 1 blocks + METHOD of (Lnet/minecraft/core/HolderGetter;Ljava/util/Collection;)Lnet/minecraft/advancements/critereon/BlockPredicate$Builder; + ARG 1 blockRegistry + ARG 2 blocks + METHOD of (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/tags/TagKey;)Lnet/minecraft/advancements/critereon/BlockPredicate$Builder; + ARG 1 blockRegistry + ARG 2 blockTag + METHOD of (Lnet/minecraft/core/HolderGetter;[Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/advancements/critereon/BlockPredicate$Builder; + ARG 1 blockRegistry + ARG 2 blocks METHOD setProperties (Lnet/minecraft/advancements/critereon/StatePropertiesPredicate$Builder;)Lnet/minecraft/advancements/critereon/BlockPredicate$Builder; ARG 1 properties diff --git a/data/net/minecraft/advancements/critereon/ConsumeItemTrigger.mapping b/data/net/minecraft/advancements/critereon/ConsumeItemTrigger.mapping index 9ae616e9b..838f17a40 100644 --- a/data/net/minecraft/advancements/critereon/ConsumeItemTrigger.mapping +++ b/data/net/minecraft/advancements/critereon/ConsumeItemTrigger.mapping @@ -14,5 +14,6 @@ CLASS net/minecraft/advancements/critereon/ConsumeItemTrigger ARG 1 item METHOD usedItem (Lnet/minecraft/advancements/critereon/ItemPredicate$Builder;)Lnet/minecraft/advancements/Criterion; ARG 0 item - METHOD usedItem (Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/advancements/Criterion; - ARG 0 item + METHOD usedItem (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/advancements/Criterion; + ARG 0 itemRegistry + ARG 1 item diff --git a/data/net/minecraft/advancements/critereon/ContextAwarePredicate.mapping b/data/net/minecraft/advancements/critereon/ContextAwarePredicate.mapping index b7591a946..d0bf6e54d 100644 --- a/data/net/minecraft/advancements/critereon/ContextAwarePredicate.mapping +++ b/data/net/minecraft/advancements/critereon/ContextAwarePredicate.mapping @@ -5,3 +5,5 @@ CLASS net/minecraft/advancements/critereon/ContextAwarePredicate ARG 0 conditions METHOD matches (Lnet/minecraft/world/level/storage/loot/LootContext;)Z ARG 1 context + METHOD validate (Lnet/minecraft/world/level/storage/loot/ValidationContext;)V + ARG 1 context diff --git a/data/net/minecraft/advancements/critereon/CriterionValidator.mapping b/data/net/minecraft/advancements/critereon/CriterionValidator.mapping index e4dc808c0..e146386ce 100644 --- a/data/net/minecraft/advancements/critereon/CriterionValidator.mapping +++ b/data/net/minecraft/advancements/critereon/CriterionValidator.mapping @@ -4,13 +4,13 @@ CLASS net/minecraft/advancements/critereon/CriterionValidator ARG 2 lootData METHOD lambda$validateEntity$0 (Ljava/lang/String;Lnet/minecraft/advancements/critereon/ContextAwarePredicate;)V ARG 2 predicate - METHOD validate (Ljava/util/List;Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet;Ljava/lang/String;)V + METHOD validate (Ljava/util/List;Lnet/minecraft/util/context/ContextKeySet;Ljava/lang/String;)V ARG 1 entities - ARG 2 contextParams + ARG 2 contextKeySet ARG 3 name - METHOD validate (Lnet/minecraft/advancements/critereon/ContextAwarePredicate;Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet;Ljava/lang/String;)V + METHOD validate (Lnet/minecraft/advancements/critereon/ContextAwarePredicate;Lnet/minecraft/util/context/ContextKeySet;Ljava/lang/String;)V ARG 1 entity - ARG 2 contextParams + ARG 2 contextKeySet ARG 3 name METHOD validateEntities (Ljava/util/List;Ljava/lang/String;)V ARG 1 entities diff --git a/data/net/minecraft/advancements/critereon/EnterBlockTrigger.mapping b/data/net/minecraft/advancements/critereon/EnterBlockTrigger.mapping index 166c4c891..abff80318 100644 --- a/data/net/minecraft/advancements/critereon/EnterBlockTrigger.mapping +++ b/data/net/minecraft/advancements/critereon/EnterBlockTrigger.mapping @@ -7,6 +7,8 @@ CLASS net/minecraft/advancements/critereon/EnterBlockTrigger CLASS TriggerInstance METHOD entersBlock (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/advancements/Criterion; ARG 0 block + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD matches (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 state METHOD validate (Lnet/minecraft/advancements/critereon/EnterBlockTrigger$TriggerInstance;)Lcom/mojang/serialization/DataResult; diff --git a/data/net/minecraft/advancements/critereon/EntityEquipmentPredicate.mapping b/data/net/minecraft/advancements/critereon/EntityEquipmentPredicate.mapping index 54004b3e4..d7d96c643 100644 --- a/data/net/minecraft/advancements/critereon/EntityEquipmentPredicate.mapping +++ b/data/net/minecraft/advancements/critereon/EntityEquipmentPredicate.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/advancements/critereon/EntityEquipmentPredicate - METHOD captainPredicate (Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/advancements/critereon/EntityEquipmentPredicate; - ARG 0 patternRegistry + METHOD captainPredicate (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/advancements/critereon/EntityEquipmentPredicate; + ARG 0 itemRegistry + ARG 1 patternRegistry METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD matches (Lnet/minecraft/world/entity/Entity;)Z diff --git a/data/net/minecraft/advancements/critereon/EntityPredicate.mapping b/data/net/minecraft/advancements/critereon/EntityPredicate.mapping index cea8210bb..0b5ec3124 100644 --- a/data/net/minecraft/advancements/critereon/EntityPredicate.mapping +++ b/data/net/minecraft/advancements/critereon/EntityPredicate.mapping @@ -44,10 +44,12 @@ CLASS net/minecraft/advancements/critereon/EntityPredicate ARG 1 movement METHOD nbt (Lnet/minecraft/advancements/critereon/NbtPredicate;)Lnet/minecraft/advancements/critereon/EntityPredicate$Builder; ARG 1 nbt - METHOD of (Lnet/minecraft/tags/TagKey;)Lnet/minecraft/advancements/critereon/EntityPredicate$Builder; - ARG 1 entityTypeTag - METHOD of (Lnet/minecraft/world/entity/EntityType;)Lnet/minecraft/advancements/critereon/EntityPredicate$Builder; - ARG 1 entityType + METHOD of (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/tags/TagKey;)Lnet/minecraft/advancements/critereon/EntityPredicate$Builder; + ARG 1 entityTypeRegistry + ARG 2 entityTypeTag + METHOD of (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/world/entity/EntityType;)Lnet/minecraft/advancements/critereon/EntityPredicate$Builder; + ARG 1 entityTypeRegistry + ARG 2 entityType METHOD passenger (Lnet/minecraft/advancements/critereon/EntityPredicate$Builder;)Lnet/minecraft/advancements/critereon/EntityPredicate$Builder; ARG 1 passenger METHOD periodicTick (I)Lnet/minecraft/advancements/critereon/EntityPredicate$Builder; diff --git a/data/net/minecraft/advancements/critereon/EntityTypePredicate.mapping b/data/net/minecraft/advancements/critereon/EntityTypePredicate.mapping index 4ed9eca44..61fd9d0fe 100644 --- a/data/net/minecraft/advancements/critereon/EntityTypePredicate.mapping +++ b/data/net/minecraft/advancements/critereon/EntityTypePredicate.mapping @@ -1,7 +1,9 @@ CLASS net/minecraft/advancements/critereon/EntityTypePredicate METHOD matches (Lnet/minecraft/world/entity/EntityType;)Z ARG 1 type - METHOD of (Lnet/minecraft/tags/TagKey;)Lnet/minecraft/advancements/critereon/EntityTypePredicate; - ARG 0 tag - METHOD of (Lnet/minecraft/world/entity/EntityType;)Lnet/minecraft/advancements/critereon/EntityTypePredicate; - ARG 0 type + METHOD of (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/tags/TagKey;)Lnet/minecraft/advancements/critereon/EntityTypePredicate; + ARG 0 entityTypeRegistry + ARG 1 entityTypeTag + METHOD of (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/world/entity/EntityType;)Lnet/minecraft/advancements/critereon/EntityTypePredicate; + ARG 0 entityTypeRegistry + ARG 1 entityType diff --git a/data/net/minecraft/advancements/critereon/FluidPredicate.mapping b/data/net/minecraft/advancements/critereon/FluidPredicate.mapping index 748edd874..dcf4fbae3 100644 --- a/data/net/minecraft/advancements/critereon/FluidPredicate.mapping +++ b/data/net/minecraft/advancements/critereon/FluidPredicate.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/advancements/critereon/FluidPredicate ARG 1 level ARG 2 pos CLASS Builder + METHOD of (Lnet/minecraft/core/HolderSet;)Lnet/minecraft/advancements/critereon/FluidPredicate$Builder; + ARG 1 fluids METHOD of (Lnet/minecraft/world/level/material/Fluid;)Lnet/minecraft/advancements/critereon/FluidPredicate$Builder; ARG 1 fluid METHOD setProperties (Lnet/minecraft/advancements/critereon/StatePropertiesPredicate;)Lnet/minecraft/advancements/critereon/FluidPredicate$Builder; diff --git a/data/net/minecraft/advancements/critereon/InputPredicate.mapping b/data/net/minecraft/advancements/critereon/InputPredicate.mapping new file mode 100644 index 000000000..dba9661fa --- /dev/null +++ b/data/net/minecraft/advancements/critereon/InputPredicate.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/advancements/critereon/InputPredicate + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD matches (Ljava/util/Optional;Z)Z + ARG 1 input + ARG 2 expectedValue + METHOD matches (Lnet/minecraft/world/entity/player/Input;)Z + ARG 1 input diff --git a/data/net/minecraft/advancements/critereon/ItemPredicate.mapping b/data/net/minecraft/advancements/critereon/ItemPredicate.mapping index c0ee7cfc6..67dd0a27a 100644 --- a/data/net/minecraft/advancements/critereon/ItemPredicate.mapping +++ b/data/net/minecraft/advancements/critereon/ItemPredicate.mapping @@ -1,12 +1,21 @@ CLASS net/minecraft/advancements/critereon/ItemPredicate + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD test (Lnet/minecraft/world/item/ItemStack;)Z + ARG 1 stack CLASS Builder METHOD hasComponents (Lnet/minecraft/core/component/DataComponentPredicate;)Lnet/minecraft/advancements/critereon/ItemPredicate$Builder; ARG 1 components METHOD lambda$of$0 (Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/core/Holder; ARG 0 item - METHOD of (Lnet/minecraft/tags/TagKey;)Lnet/minecraft/advancements/critereon/ItemPredicate$Builder; - ARG 1 tag - METHOD of ([Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/advancements/critereon/ItemPredicate$Builder; - ARG 1 items + METHOD of (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/tags/TagKey;)Lnet/minecraft/advancements/critereon/ItemPredicate$Builder; + ARG 1 itemRegistry + ARG 2 tag + METHOD of (Lnet/minecraft/core/HolderGetter;[Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/advancements/critereon/ItemPredicate$Builder; + ARG 1 itemRegistry + ARG 2 items METHOD withCount (Lnet/minecraft/advancements/critereon/MinMaxBounds$Ints;)Lnet/minecraft/advancements/critereon/ItemPredicate$Builder; ARG 1 count + METHOD withSubPredicate (Lnet/minecraft/advancements/critereon/ItemSubPredicate$Type;Lnet/minecraft/advancements/critereon/ItemSubPredicate;)Lnet/minecraft/advancements/critereon/ItemPredicate$Builder; + ARG 1 type + ARG 2 subPredicate diff --git a/data/net/minecraft/advancements/critereon/ItemUsedOnLocationTrigger.mapping b/data/net/minecraft/advancements/critereon/ItemUsedOnLocationTrigger.mapping index 41ad5c359..675c74031 100644 --- a/data/net/minecraft/advancements/critereon/ItemUsedOnLocationTrigger.mapping +++ b/data/net/minecraft/advancements/critereon/ItemUsedOnLocationTrigger.mapping @@ -18,6 +18,8 @@ CLASS net/minecraft/advancements/critereon/ItemUsedOnLocationTrigger METHOD itemUsedOnLocation (Lnet/minecraft/advancements/critereon/LocationPredicate$Builder;Lnet/minecraft/advancements/critereon/ItemPredicate$Builder;)Lnet/minecraft/advancements/critereon/ItemUsedOnLocationTrigger$TriggerInstance; ARG 0 location ARG 1 tool + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD matches (Lnet/minecraft/world/level/storage/loot/LootContext;)Z ARG 1 context METHOD placedBlock (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/advancements/Criterion; diff --git a/data/net/minecraft/advancements/critereon/KilledByArrowTrigger.mapping b/data/net/minecraft/advancements/critereon/KilledByArrowTrigger.mapping new file mode 100644 index 000000000..7cf108950 --- /dev/null +++ b/data/net/minecraft/advancements/critereon/KilledByArrowTrigger.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/advancements/critereon/KilledByArrowTrigger + METHOD trigger (Lnet/minecraft/server/level/ServerPlayer;Ljava/util/Collection;Lnet/minecraft/world/item/ItemStack;)V + ARG 1 player + ARG 2 victims + ARG 3 firedFromWeapon + CLASS TriggerInstance + METHOD crossbowKilled (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/advancements/critereon/MinMaxBounds$Ints;)Lnet/minecraft/advancements/Criterion; + ARG 0 itemRegistry + ARG 1 uniqueEntityTypes + METHOD crossbowKilled (Lnet/minecraft/core/HolderGetter;[Lnet/minecraft/advancements/critereon/EntityPredicate$Builder;)Lnet/minecraft/advancements/Criterion; + ARG 0 itemRegistry + ARG 1 victims + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD matches (Ljava/util/Collection;ILnet/minecraft/world/item/ItemStack;)Z + ARG 1 context + ARG 2 uniqueEntityTypes + ARG 3 firedFromWeapon diff --git a/data/net/minecraft/advancements/critereon/KilledByCrossbowTrigger.mapping b/data/net/minecraft/advancements/critereon/KilledByCrossbowTrigger.mapping deleted file mode 100644 index 3dbef024f..000000000 --- a/data/net/minecraft/advancements/critereon/KilledByCrossbowTrigger.mapping +++ /dev/null @@ -1,20 +0,0 @@ -CLASS net/minecraft/advancements/critereon/KilledByCrossbowTrigger - METHOD lambda$trigger$0 (Ljava/util/List;Ljava/util/Set;Lnet/minecraft/advancements/critereon/KilledByCrossbowTrigger$TriggerInstance;)Z - ARG 2 instance - METHOD trigger (Lnet/minecraft/server/level/ServerPlayer;Ljava/util/Collection;)V - ARG 1 player - ARG 2 entities - CLASS TriggerInstance - METHOD (Ljava/util/Optional;Ljava/util/List;Lnet/minecraft/advancements/critereon/MinMaxBounds$Ints;)V - ARG 1 player - ARG 2 victims - ARG 3 uniqueEntityTypes - METHOD crossbowKilled (Lnet/minecraft/advancements/critereon/MinMaxBounds$Ints;)Lnet/minecraft/advancements/Criterion; - ARG 0 uniqueEntityTypes - METHOD crossbowKilled ([Lnet/minecraft/advancements/critereon/EntityPredicate$Builder;)Lnet/minecraft/advancements/Criterion; - ARG 0 victims - METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD matches (Ljava/util/Collection;I)Z - ARG 1 contexts - ARG 2 bounds diff --git a/data/net/minecraft/advancements/critereon/PlayerPredicate.mapping b/data/net/minecraft/advancements/critereon/PlayerPredicate.mapping index 013764990..636cfae9a 100644 --- a/data/net/minecraft/advancements/critereon/PlayerPredicate.mapping +++ b/data/net/minecraft/advancements/critereon/PlayerPredicate.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/advancements/critereon/PlayerPredicate METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance CLASS Builder - METHOD addRecipe (Lnet/minecraft/resources/ResourceLocation;Z)Lnet/minecraft/advancements/critereon/PlayerPredicate$Builder; + METHOD addRecipe (Lnet/minecraft/resources/ResourceKey;Z)Lnet/minecraft/advancements/critereon/PlayerPredicate$Builder; ARG 1 recipe ARG 2 unlocked METHOD addStat (Lnet/minecraft/stats/StatType;Lnet/minecraft/core/Holder$Reference;Lnet/minecraft/advancements/critereon/MinMaxBounds$Ints;)Lnet/minecraft/advancements/critereon/PlayerPredicate$Builder; @@ -17,6 +17,8 @@ CLASS net/minecraft/advancements/critereon/PlayerPredicate METHOD checkAdvancementDone (Lnet/minecraft/resources/ResourceLocation;Z)Lnet/minecraft/advancements/critereon/PlayerPredicate$Builder; ARG 1 advancement ARG 2 done + METHOD hasInput (Lnet/minecraft/advancements/critereon/InputPredicate;)Lnet/minecraft/advancements/critereon/PlayerPredicate$Builder; + ARG 1 input METHOD setGameType (Lnet/minecraft/advancements/critereon/GameTypePredicate;)Lnet/minecraft/advancements/critereon/PlayerPredicate$Builder; ARG 1 gameType METHOD setLevel (Lnet/minecraft/advancements/critereon/MinMaxBounds$Ints;)Lnet/minecraft/advancements/critereon/PlayerPredicate$Builder; diff --git a/data/net/minecraft/advancements/critereon/PlayerTrigger.mapping b/data/net/minecraft/advancements/critereon/PlayerTrigger.mapping index 3f1d50f8a..731e647a8 100644 --- a/data/net/minecraft/advancements/critereon/PlayerTrigger.mapping +++ b/data/net/minecraft/advancements/critereon/PlayerTrigger.mapping @@ -12,6 +12,8 @@ CLASS net/minecraft/advancements/critereon/PlayerTrigger ARG 0 entity METHOD located (Lnet/minecraft/advancements/critereon/LocationPredicate$Builder;)Lnet/minecraft/advancements/Criterion; ARG 0 location - METHOD walkOnBlockWithEquipment (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/item/Item;)Lnet/minecraft/advancements/Criterion; - ARG 0 block - ARG 1 equipment + METHOD walkOnBlockWithEquipment (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/core/HolderGetter;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/item/Item;)Lnet/minecraft/advancements/Criterion; + ARG 0 blockRegistry + ARG 1 itemRegistry + ARG 2 block + ARG 3 equipment diff --git a/data/net/minecraft/advancements/critereon/RecipeCraftedTrigger.mapping b/data/net/minecraft/advancements/critereon/RecipeCraftedTrigger.mapping index 047818b19..d7a31c51b 100644 --- a/data/net/minecraft/advancements/critereon/RecipeCraftedTrigger.mapping +++ b/data/net/minecraft/advancements/critereon/RecipeCraftedTrigger.mapping @@ -1,24 +1,18 @@ CLASS net/minecraft/advancements/critereon/RecipeCraftedTrigger - METHOD lambda$trigger$0 (Lnet/minecraft/resources/ResourceLocation;Ljava/util/List;Lnet/minecraft/advancements/critereon/RecipeCraftedTrigger$TriggerInstance;)Z - ARG 2 trigger - METHOD trigger (Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/resources/ResourceLocation;Ljava/util/List;)V + METHOD trigger (Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/resources/ResourceKey;Ljava/util/List;)V ARG 1 player ARG 2 recipeId - ARG 3 items + ARG 3 ingredients CLASS TriggerInstance - METHOD (Ljava/util/Optional;Lnet/minecraft/resources/ResourceLocation;Ljava/util/List;)V - ARG 1 player - ARG 2 recipeId - ARG 3 ingredients - METHOD craftedItem (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/advancements/Criterion; + METHOD craftedItem (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/advancements/Criterion; ARG 0 recipeId - METHOD craftedItem (Lnet/minecraft/resources/ResourceLocation;Ljava/util/List;)Lnet/minecraft/advancements/Criterion; + METHOD craftedItem (Lnet/minecraft/resources/ResourceKey;Ljava/util/List;)Lnet/minecraft/advancements/Criterion; ARG 0 recipeId ARG 1 ingredients - METHOD crafterCraftedItem (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/advancements/Criterion; + METHOD crafterCraftedItem (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/advancements/Criterion; ARG 0 recipeId METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD matches (Lnet/minecraft/resources/ResourceLocation;Ljava/util/List;)Z + METHOD matches (Lnet/minecraft/resources/ResourceKey;Ljava/util/List;)Z ARG 1 recipeId - ARG 2 items + ARG 2 ingredients diff --git a/data/net/minecraft/advancements/critereon/RecipeUnlockedTrigger.mapping b/data/net/minecraft/advancements/critereon/RecipeUnlockedTrigger.mapping index 637636db2..5ed8d7c12 100644 --- a/data/net/minecraft/advancements/critereon/RecipeUnlockedTrigger.mapping +++ b/data/net/minecraft/advancements/critereon/RecipeUnlockedTrigger.mapping @@ -4,12 +4,9 @@ CLASS net/minecraft/advancements/critereon/RecipeUnlockedTrigger METHOD trigger (Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/world/item/crafting/RecipeHolder;)V ARG 1 player ARG 2 recipe - METHOD unlocked (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/advancements/Criterion; - ARG 0 recipeId + METHOD unlocked (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/advancements/Criterion; + ARG 0 recipe CLASS TriggerInstance - METHOD (Ljava/util/Optional;Lnet/minecraft/resources/ResourceLocation;)V - ARG 1 player - ARG 2 recipe METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD matches (Lnet/minecraft/world/item/crafting/RecipeHolder;)Z diff --git a/data/net/minecraft/advancements/critereon/SheepPredicate.mapping b/data/net/minecraft/advancements/critereon/SheepPredicate.mapping new file mode 100644 index 000000000..0a57c5cae --- /dev/null +++ b/data/net/minecraft/advancements/critereon/SheepPredicate.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/advancements/critereon/SheepPredicate + METHOD hasWool (Lnet/minecraft/world/item/DyeColor;)Lnet/minecraft/advancements/critereon/SheepPredicate; + ARG 0 color + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/advancements/critereon/ShotCrossbowTrigger.mapping b/data/net/minecraft/advancements/critereon/ShotCrossbowTrigger.mapping index 7514b19eb..5daff5ebf 100644 --- a/data/net/minecraft/advancements/critereon/ShotCrossbowTrigger.mapping +++ b/data/net/minecraft/advancements/critereon/ShotCrossbowTrigger.mapping @@ -14,5 +14,6 @@ CLASS net/minecraft/advancements/critereon/ShotCrossbowTrigger ARG 1 item METHOD shotCrossbow (Ljava/util/Optional;)Lnet/minecraft/advancements/Criterion; ARG 0 item - METHOD shotCrossbow (Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/advancements/Criterion; - ARG 0 item + METHOD shotCrossbow (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/advancements/Criterion; + ARG 0 itemRegistry + ARG 1 item diff --git a/data/net/minecraft/advancements/critereon/UsedTotemTrigger.mapping b/data/net/minecraft/advancements/critereon/UsedTotemTrigger.mapping index 9fc46400a..dd25bea80 100644 --- a/data/net/minecraft/advancements/critereon/UsedTotemTrigger.mapping +++ b/data/net/minecraft/advancements/critereon/UsedTotemTrigger.mapping @@ -14,5 +14,6 @@ CLASS net/minecraft/advancements/critereon/UsedTotemTrigger ARG 1 item METHOD usedTotem (Lnet/minecraft/advancements/critereon/ItemPredicate;)Lnet/minecraft/advancements/Criterion; ARG 0 item - METHOD usedTotem (Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/advancements/Criterion; - ARG 0 item + METHOD usedTotem (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/advancements/Criterion; + ARG 0 itemRegistry + ARG 1 item diff --git a/data/net/minecraft/client/ClientRecipeBook.mapping b/data/net/minecraft/client/ClientRecipeBook.mapping index 636e2be33..0ed5b1533 100644 --- a/data/net/minecraft/client/ClientRecipeBook.mapping +++ b/data/net/minecraft/client/ClientRecipeBook.mapping @@ -1,24 +1,18 @@ CLASS net/minecraft/client/ClientRecipeBook + METHOD add (Lnet/minecraft/world/item/crafting/display/RecipeDisplayEntry;)V + ARG 1 recipe + METHOD addHighlight (Lnet/minecraft/world/item/crafting/display/RecipeDisplayId;)V + ARG 1 recipe METHOD categorizeAndGroupRecipes (Ljava/lang/Iterable;)Ljava/util/Map; ARG 0 recipes - METHOD getCategory (Lnet/minecraft/world/item/crafting/RecipeHolder;)Lnet/minecraft/client/RecipeBookCategories; - ARG 0 recipe - METHOD getCollection (Lnet/minecraft/client/RecipeBookCategories;)Ljava/util/List; - ARG 1 categories - METHOD lambda$categorizeAndGroupRecipes$4 (Lnet/minecraft/client/RecipeBookCategories;)Ljava/util/List; - ARG 0 category - METHOD lambda$categorizeAndGroupRecipes$5 (Lnet/minecraft/client/RecipeBookCategories;)Ljava/util/List; - ARG 0 categories - METHOD lambda$setupCollections$0 (Lnet/minecraft/core/RegistryAccess;Ljava/util/List;)Lnet/minecraft/client/gui/screens/recipebook/RecipeCollection; - ARG 1 recipeHolders - METHOD lambda$setupCollections$1 (Ljava/util/Map;Lnet/minecraft/core/RegistryAccess;Lcom/google/common/collect/ImmutableList$Builder;Lnet/minecraft/client/RecipeBookCategories;Ljava/util/List;)V - ARG 3 categories - ARG 4 recipeHolderList - METHOD lambda$setupCollections$2 (Ljava/util/Map;Lnet/minecraft/client/RecipeBookCategories;)Ljava/util/stream/Stream; - ARG 1 categories - METHOD lambda$setupCollections$3 (Ljava/util/Map;Lnet/minecraft/client/RecipeBookCategories;Ljava/util/List;)V - ARG 1 aggregatedCategory - ARG 2 categories - METHOD setupCollections (Ljava/lang/Iterable;Lnet/minecraft/core/RegistryAccess;)V - ARG 1 recipes - ARG 2 registryAccess + METHOD getCollection (Lnet/minecraft/world/item/crafting/ExtendedRecipeBookCategory;)Ljava/util/List; + ARG 1 category + METHOD lambda$rebuildCollections$0 (Ljava/util/Map;Lcom/google/common/collect/ImmutableList$Builder;Lnet/minecraft/world/item/crafting/RecipeBookCategory;Ljava/util/List;)V + ARG 2 category + ARG 3 displayEntries + METHOD remove (Lnet/minecraft/world/item/crafting/display/RecipeDisplayId;)V + ARG 1 recipe + METHOD removeHighlight (Lnet/minecraft/world/item/crafting/display/RecipeDisplayId;)V + ARG 1 recipe + METHOD willHighlight (Lnet/minecraft/world/item/crafting/display/RecipeDisplayId;)Z + ARG 1 recipe diff --git a/data/net/minecraft/client/InactivityFpsLimit.mapping b/data/net/minecraft/client/InactivityFpsLimit.mapping new file mode 100644 index 000000000..60e0602ac --- /dev/null +++ b/data/net/minecraft/client/InactivityFpsLimit.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/client/InactivityFpsLimit + METHOD (Ljava/lang/String;IILjava/lang/String;Ljava/lang/String;)V + ARG 3 id + ARG 4 serializedName + ARG 5 key diff --git a/data/net/minecraft/client/KeyboardHandler.mapping b/data/net/minecraft/client/KeyboardHandler.mapping index 10a15cfe8..c493e6a76 100644 --- a/data/net/minecraft/client/KeyboardHandler.mapping +++ b/data/net/minecraft/client/KeyboardHandler.mapping @@ -42,29 +42,10 @@ CLASS net/minecraft/client/KeyboardHandler ARG 6 modifiers METHOD lambda$copyRecreateCommand$1 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Lnet/minecraft/nbt/CompoundTag;)V ARG 3 tag - METHOD lambda$getClipboard$12 (IJ)V - ARG 1 error - ARG 2 descriptionId METHOD lambda$keyPress$3 (Lnet/minecraft/network/chat/Component;)V ARG 1 message METHOD lambda$keyPress$4 (Lnet/minecraft/network/chat/Component;)V ARG 1 component - METHOD lambda$setup$10 (JII)V - ARG 1 windowPointer - ARG 3 codePoint - ARG 4 modifiers - METHOD lambda$setup$8 (JIIII)V - ARG 1 windowPointer - ARG 3 key - ARG 4 scanCode - ARG 5 action - ARG 6 modifiers - METHOD lambda$setup$9 (JIIII)V - ARG 1 windowId - ARG 3 keyCode - ARG 4 scanCode - ARG 5 action - ARG 6 mods METHOD setClipboard (Ljava/lang/String;)V ARG 1 string METHOD setup (J)V diff --git a/data/net/minecraft/client/Minecraft.mapping b/data/net/minecraft/client/Minecraft.mapping index 4a52b31cf..d47cb0f64 100644 --- a/data/net/minecraft/client/Minecraft.mapping +++ b/data/net/minecraft/client/Minecraft.mapping @@ -40,9 +40,6 @@ CLASS net/minecraft/client/Minecraft ARG 2 gameConfig METHOD debugClientMetricsStart (Ljava/util/function/Consumer;)Z ARG 1 logger - METHOD debugFpsMeterKeyPress (I)V - COMMENT Update debugProfilerName in response to number keys in debug screen - ARG 1 keyCount METHOD delayCrash (Lnet/minecraft/CrashReport;)V ARG 1 report METHOD delayCrashRaw (Lnet/minecraft/CrashReport;)V @@ -142,14 +139,14 @@ CLASS net/minecraft/client/Minecraft METHOD reloadResourcePacks (ZLnet/minecraft/client/Minecraft$GameLoadCookie;)Ljava/util/concurrent/CompletableFuture; ARG 1 error ARG 2 gameLoadCookie - METHOD renderFpsMeter (Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/util/profiling/ProfileResults;)V - ARG 1 guiGraphics - ARG 2 profileResults METHOD rollbackResourcePacks (Ljava/lang/Throwable;Lnet/minecraft/client/Minecraft$GameLoadCookie;)V ARG 1 throwable ARG 2 gameLoadCookie METHOD runTick (Z)V ARG 1 renderLevel + METHOD saveReport (Ljava/io/File;Lnet/minecraft/CrashReport;)I + ARG 0 file + ARG 1 crashReport METHOD setCameraEntity (Lnet/minecraft/world/entity/Entity;)V ARG 1 viewingEntity METHOD setLastInputType (Lnet/minecraft/client/InputType;)V @@ -175,6 +172,8 @@ CLASS net/minecraft/client/Minecraft COMMENT Called when the window is closing. Sets 'running' to false which allows the game loop to exit cleanly. METHOD tick ()V COMMENT Runs the current tick. + METHOD triggerResourcePackRecovery (Ljava/lang/Exception;)V + ARG 1 error METHOD updateLevelInEngines (Lnet/minecraft/client/multiplayer/ClientLevel;)V ARG 1 level METHOD updateMaxMipLevel (I)V diff --git a/data/net/minecraft/client/MouseHandler.mapping b/data/net/minecraft/client/MouseHandler.mapping index 36e5fc49d..5b0d169c0 100644 --- a/data/net/minecraft/client/MouseHandler.mapping +++ b/data/net/minecraft/client/MouseHandler.mapping @@ -5,23 +5,6 @@ CLASS net/minecraft/client/MouseHandler COMMENT Will set the focus to ingame if the Minecraft window is the active with focus. Also clears any GUI screen currently displayed METHOD isMouseGrabbed ()Z COMMENT Returns {@code true} if the mouse is grabbed. - METHOD lambda$setup$3 (JDD)V - ARG 1 windowPointer - ARG 3 xpos - ARG 5 ypos - METHOD lambda$setup$5 (JIII)V - ARG 1 windowPointer - ARG 3 button - ARG 4 action - ARG 5 modifiers - METHOD lambda$setup$7 (JDD)V - ARG 1 windowPointer - ARG 3 xOffset - ARG 5 yOffset - METHOD lambda$setup$9 (JIJ)V - ARG 1 window - ARG 3 count - ARG 4 names METHOD onDrop (JLjava/util/List;I)V ARG 1 windowPointer ARG 3 files diff --git a/data/net/minecraft/client/Options.mapping b/data/net/minecraft/client/Options.mapping index 864bea852..d3ea32def 100644 --- a/data/net/minecraft/client/Options.mapping +++ b/data/net/minecraft/client/Options.mapping @@ -39,53 +39,17 @@ CLASS net/minecraft/client/Options ARG 1 sensitivity METHOD lambda$new$1 (Ljava/lang/Double;)V ARG 0 sensitivity - METHOD lambda$new$11 (Lnet/minecraft/client/GraphicsStatus;)Lnet/minecraft/client/gui/components/Tooltip; - ARG 0 status - METHOD lambda$new$12 (Lnet/minecraft/network/chat/Component;Lnet/minecraft/client/GraphicsStatus;)Lnet/minecraft/network/chat/Component; - ARG 0 component - ARG 1 status - METHOD lambda$new$13 (Lnet/minecraft/client/GraphicsStatus;)Z - ARG 0 status - METHOD lambda$new$15 (Lnet/minecraft/client/OptionInstance;Lnet/minecraft/client/GraphicsStatus;)V - ARG 0 statusOption - ARG 1 status - METHOD lambda$new$16 (Lnet/minecraft/client/GraphicsStatus;)V - ARG 0 status - METHOD lambda$new$17 (Ljava/lang/Boolean;)V - ARG 0 ambientOcclusion - METHOD lambda$new$18 (Lnet/minecraft/client/PrioritizeChunkUpdates;)Lnet/minecraft/client/gui/components/Tooltip; - ARG 0 chunkUpdates - METHOD lambda$new$19 (Lnet/minecraft/client/PrioritizeChunkUpdates;)V - ARG 0 value - METHOD lambda$new$20 (Lnet/minecraft/world/entity/player/ChatVisiblity;)V - ARG 0 value - METHOD lambda$new$21 (Lnet/minecraft/network/chat/Component;Ljava/lang/Double;)Lnet/minecraft/network/chat/Component; - ARG 0 component - ARG 1 value - METHOD lambda$new$22 (Ljava/lang/Double;)V - ARG 0 value - METHOD lambda$new$23 (Ljava/lang/Double;)V - ARG 0 value METHOD lambda$new$25 (Ljava/lang/Double;)V ARG 0 value METHOD lambda$new$5 (Lnet/minecraft/network/chat/Component;Ljava/lang/Integer;)Lnet/minecraft/network/chat/Component; ARG 0 component ARG 1 framerateLimit - METHOD lambda$new$52 (Ljava/lang/Boolean;)V - ARG 0 vsync - METHOD lambda$new$53 (Ljava/lang/Boolean;)V - ARG 0 forceUnicode METHOD lambda$new$6 (I)Ljava/lang/Integer; ARG 0 framerateLimit METHOD lambda$new$7 (Ljava/lang/Integer;)I ARG 0 framerateLimit - METHOD lambda$new$74 (Ljava/lang/Double;)V - ARG 0 effectScale METHOD lambda$new$78 (Ljava/lang/Double;)V ARG 0 darknessScale - METHOD lambda$new$79 (Lnet/minecraft/network/chat/Component;Ljava/lang/Double;)Lnet/minecraft/network/chat/Component; - ARG 0 component - ARG 1 glintSpeed METHOD lambda$new$8 (Ljava/lang/Integer;)V ARG 0 framerateLimit METHOD lambda$new$80 (Ljava/lang/Double;)V @@ -115,17 +79,11 @@ CLASS net/minecraft/client/Options COMMENT Saves the options to the options file. METHOD setCameraType (Lnet/minecraft/client/CameraType;)V ARG 1 pointOfView - METHOD setKey (Lnet/minecraft/client/KeyMapping;Lcom/mojang/blaze3d/platform/InputConstants$Key;)V - ARG 1 keyBinding - ARG 2 input METHOD setModelPart (Lnet/minecraft/world/entity/player/PlayerModelPart;Z)V ARG 1 modelPart ARG 2 enable METHOD setServerRenderDistance (I)V ARG 1 serverRenderDistance - METHOD toggleModelPart (Lnet/minecraft/world/entity/player/PlayerModelPart;Z)V - ARG 1 playerModelPart - ARG 2 enable METHOD unlogMouse (D)I ARG 0 input METHOD updateResourcePacks (Lnet/minecraft/server/packs/repository/PackRepository;)V diff --git a/data/net/minecraft/client/ParticleStatus.mapping b/data/net/minecraft/client/ParticleStatus.mapping deleted file mode 100644 index 9c41d05cd..000000000 --- a/data/net/minecraft/client/ParticleStatus.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/client/ParticleStatus - METHOD (Ljava/lang/String;IILjava/lang/String;)V - ARG 3 id - ARG 4 key - METHOD byId (I)Lnet/minecraft/client/ParticleStatus; - ARG 0 id diff --git a/data/net/minecraft/client/RecipeBookCategories.mapping b/data/net/minecraft/client/RecipeBookCategories.mapping deleted file mode 100644 index 90a886d6b..000000000 --- a/data/net/minecraft/client/RecipeBookCategories.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/client/RecipeBookCategories - METHOD (Ljava/lang/String;I[Lnet/minecraft/world/item/ItemStack;)V - ARG 3 itemIcons - METHOD getCategories (Lnet/minecraft/world/inventory/RecipeBookType;)Ljava/util/List; - ARG 0 recipeBookType diff --git a/data/net/minecraft/client/ScrollWheelHandler.mapping b/data/net/minecraft/client/ScrollWheelHandler.mapping new file mode 100644 index 000000000..8a67c3a43 --- /dev/null +++ b/data/net/minecraft/client/ScrollWheelHandler.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/client/ScrollWheelHandler + METHOD getNextScrollWheelSelection (DII)I + ARG 0 yOffset + ARG 2 selected + ARG 3 selectionSize + METHOD onMouseScroll (DD)Lorg/joml/Vector2i; + ARG 1 xOffset + ARG 3 yOffset diff --git a/data/net/minecraft/client/animation/KeyframeAnimations.mapping b/data/net/minecraft/client/animation/KeyframeAnimations.mapping index 799d49437..5b836e5a9 100644 --- a/data/net/minecraft/client/animation/KeyframeAnimations.mapping +++ b/data/net/minecraft/client/animation/KeyframeAnimations.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/client/animation/KeyframeAnimations - METHOD animate (Lnet/minecraft/client/model/HierarchicalModel;Lnet/minecraft/client/animation/AnimationDefinition;JFLorg/joml/Vector3f;)V + METHOD animate (Lnet/minecraft/client/model/Model;Lnet/minecraft/client/animation/AnimationDefinition;JFLorg/joml/Vector3f;)V ARG 0 model - ARG 1 animationDefinition + ARG 1 definition ARG 2 accumulatedTime ARG 4 scale - ARG 5 animationVecCache + ARG 5 vector METHOD degreeVec (FFF)Lorg/joml/Vector3f; ARG 0 xDegrees ARG 1 yDegrees @@ -15,7 +15,7 @@ CLASS net/minecraft/client/animation/KeyframeAnimations METHOD lambda$animate$0 (F[Lnet/minecraft/client/animation/Keyframe;I)Z ARG 2 index METHOD lambda$animate$1 (FLorg/joml/Vector3f;FLnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/client/animation/AnimationChannel;)V - ARG 4 animationChannel + ARG 4 channel METHOD lambda$animate$2 (Ljava/util/List;FLorg/joml/Vector3f;FLnet/minecraft/client/model/geom/ModelPart;)V ARG 4 modelPart METHOD posVec (FFF)Lorg/joml/Vector3f; diff --git a/data/net/minecraft/client/gui/BundleMouseActions.mapping b/data/net/minecraft/client/gui/BundleMouseActions.mapping new file mode 100644 index 000000000..0e5536f6b --- /dev/null +++ b/data/net/minecraft/client/gui/BundleMouseActions.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/client/gui/BundleMouseActions + METHOD (Lnet/minecraft/client/Minecraft;)V + ARG 1 minecraft + METHOD toggleSelectedBundleItem (Lnet/minecraft/world/item/ItemStack;II)V + ARG 1 stack + ARG 2 index + ARG 3 nextIndex + METHOD unselectedBundleItem (Lnet/minecraft/world/item/ItemStack;I)V + ARG 1 bundle + ARG 2 slotIndex diff --git a/data/net/minecraft/client/gui/Font.mapping b/data/net/minecraft/client/gui/Font.mapping index 5cc45db03..d496a86f8 100644 --- a/data/net/minecraft/client/gui/Font.mapping +++ b/data/net/minecraft/client/gui/Font.mapping @@ -13,42 +13,42 @@ CLASS net/minecraft/client/gui/Font ARG 3 y ARG 4 color ARG 5 dropShadow - ARG 6 matrix - ARG 7 buffer + ARG 6 pose + ARG 7 bufferSource ARG 8 displayMode ARG 9 backgroundColor ARG 10 packedLightCoords - METHOD drawInBatch (Ljava/lang/String;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/gui/Font$DisplayMode;IIZ)I + METHOD drawInBatch (Lnet/minecraft/network/chat/Component;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/gui/Font$DisplayMode;II)I ARG 1 text ARG 2 x ARG 3 y ARG 4 color ARG 5 dropShadow - ARG 6 matrix - ARG 7 buffer + ARG 6 pose + ARG 7 bufferSource ARG 8 displayMode ARG 9 backgroundColor ARG 10 packedLightCoords - ARG 11 bidirectional - METHOD drawInBatch (Lnet/minecraft/network/chat/Component;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/gui/Font$DisplayMode;II)I + METHOD drawInBatch (Lnet/minecraft/network/chat/Component;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/gui/Font$DisplayMode;IIZ)I ARG 1 text ARG 2 x ARG 3 y ARG 4 color ARG 5 dropShadow - ARG 6 matrix - ARG 7 buffer + ARG 6 pose + ARG 7 bufferSource ARG 8 displayMode ARG 9 backgroundColor ARG 10 packedLightCoords + ARG 11 inverseDepth METHOD drawInBatch (Lnet/minecraft/util/FormattedCharSequence;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/gui/Font$DisplayMode;II)I ARG 1 text ARG 2 x ARG 3 y ARG 4 color ARG 5 dropShadow - ARG 6 matrix - ARG 7 buffer + ARG 6 pose + ARG 7 bufferSource ARG 8 displayMode ARG 9 backgroundColor ARG 10 packedLightCoords @@ -58,7 +58,7 @@ CLASS net/minecraft/client/gui/Font ARG 3 y ARG 4 color ARG 5 backgroundColor - ARG 6 matrix + ARG 6 pose ARG 7 bufferSource ARG 8 packedLightCoords METHOD drawInternal (Ljava/lang/String;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/gui/Font$DisplayMode;IIZ)I @@ -67,23 +67,24 @@ CLASS net/minecraft/client/gui/Font ARG 3 y ARG 4 color ARG 5 dropShadow - ARG 6 matrix - ARG 7 buffer + ARG 6 pose + ARG 7 bufferSource ARG 8 displayMode ARG 9 backgroundColor ARG 10 packedLightCoords - ARG 11 bidirectional - METHOD drawInternal (Lnet/minecraft/util/FormattedCharSequence;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/gui/Font$DisplayMode;II)I + ARG 11 inverseDepth + METHOD drawInternal (Lnet/minecraft/util/FormattedCharSequence;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/gui/Font$DisplayMode;IIZ)I ARG 1 text ARG 2 x ARG 3 y ARG 4 color ARG 5 dropShadow - ARG 6 matrix - ARG 7 buffer + ARG 6 pose + ARG 7 bufferSource ARG 8 displayMode ARG 9 backgroundColor ARG 10 packedLightCoords + ARG 11 inverseDepth METHOD getFontSet (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/gui/font/FontSet; ARG 1 fontLocation METHOD isBidirectional ()Z @@ -102,42 +103,30 @@ CLASS net/minecraft/client/gui/Font ARG 1 text ARG 2 maxWidth ARG 3 tail - METHOD renderChar (Lnet/minecraft/client/gui/font/glyphs/BakedGlyph;ZZFFFLorg/joml/Matrix4f;Lcom/mojang/blaze3d/vertex/VertexConsumer;FFFFI)V - ARG 1 glyph - ARG 2 bold - ARG 3 italic - ARG 4 boldOffset - ARG 5 x - ARG 6 y - ARG 7 matrix - ARG 8 buffer - ARG 9 red - ARG 10 green - ARG 11 blue - ARG 12 alpha - ARG 13 packedLight - METHOD renderText (Ljava/lang/String;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/gui/Font$DisplayMode;II)F + METHOD renderText (Ljava/lang/String;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/gui/Font$DisplayMode;IIZ)F ARG 1 text ARG 2 x ARG 3 y ARG 4 color ARG 5 dropShadow - ARG 6 matrix - ARG 7 buffer + ARG 6 pose + ARG 7 bufferSource ARG 8 displayMode ARG 9 backgroundColor ARG 10 packedLightCoords - METHOD renderText (Lnet/minecraft/util/FormattedCharSequence;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/gui/Font$DisplayMode;II)F + ARG 11 inverseDepth + METHOD renderText (Lnet/minecraft/util/FormattedCharSequence;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/gui/Font$DisplayMode;IIZ)F ARG 1 text ARG 2 x ARG 3 y ARG 4 color ARG 5 dropShadow - ARG 6 matrix - ARG 7 buffer + ARG 6 pose + ARG 7 bufferSource ARG 8 displayMode ARG 9 backgroundColor ARG 10 packedLightCoords + ARG 11 inverseDepth METHOD split (Lnet/minecraft/network/chat/FormattedText;I)Ljava/util/List; ARG 1 text ARG 2 maxWidth @@ -159,7 +148,20 @@ CLASS net/minecraft/client/gui/Font ARG 1 text ARG 2 maxWidth CLASS StringRenderOutput + METHOD (Lnet/minecraft/client/gui/Font;Lnet/minecraft/client/renderer/MultiBufferSource;FFIIZLorg/joml/Matrix4f;Lnet/minecraft/client/gui/Font$DisplayMode;IZ)V + ARG 1 font + ARG 2 buferSource + ARG 3 x + ARG 4 y + ARG 5 color + ARG 6 backgroundColor + ARG 7 dropShadow + ARG 8 pose + ARG 9 displayMode + ARG 10 packedLightCoords + ARG 11 inverseDepth METHOD (Lnet/minecraft/client/gui/Font;Lnet/minecraft/client/renderer/MultiBufferSource;FFIZLorg/joml/Matrix4f;Lnet/minecraft/client/gui/Font$DisplayMode;I)V + ARG 1 font ARG 2 bufferSource ARG 3 x ARG 4 y @@ -170,6 +172,5 @@ CLASS net/minecraft/client/gui/Font ARG 9 packedLightCoords METHOD addEffect (Lnet/minecraft/client/gui/font/glyphs/BakedGlyph$Effect;)V ARG 1 effect - METHOD finish (IF)F - ARG 1 backgroundColor - ARG 2 x + METHOD finish (F)F + ARG 1 x diff --git a/data/net/minecraft/client/gui/Gui.mapping b/data/net/minecraft/client/gui/Gui.mapping index 71fddee6c..5220fb866 100644 --- a/data/net/minecraft/client/gui/Gui.mapping +++ b/data/net/minecraft/client/gui/Gui.mapping @@ -35,6 +35,9 @@ CLASS net/minecraft/client/gui/Gui COMMENT the GuiGraphics object used for rendering. ARG 2 objective COMMENT the objective representing the scoreboard sidebar. + METHOD getAirBubbleYLine (II)I + ARG 1 vehicleMaxHealth + ARG 2 startX METHOD getBossOverlay ()Lnet/minecraft/client/gui/components/BossHealthOverlay; COMMENT {@return the {@link BossHealthOverlay} instance associated with the client} METHOD getCameraPlayer ()Lnet/minecraft/world/entity/player/Player; @@ -43,6 +46,13 @@ CLASS net/minecraft/client/gui/Gui COMMENT @return the player entity that the camera is focused on, or null if the camera is not focused on a player. METHOD getChat ()Lnet/minecraft/client/gui/components/ChatComponent; COMMENT {@return a pointer to the persistent Chat GUI, containing all previous chat messages and such} + METHOD getCurrentAirSupplyBubble (III)I + ARG 0 currentAirSupply + ARG 1 maxAirSupply + ARG 2 offset + METHOD getEmptyBubbleDelayDuration (IZ)I + ARG 0 airSupply + ARG 1 inWater METHOD getFont ()Lnet/minecraft/client/gui/Font; COMMENT {@return the {@link Font} used for rendering text in the GUI} METHOD getGuiTicks ()I @@ -69,9 +79,9 @@ CLASS net/minecraft/client/gui/Gui COMMENT the health of the mount entity. METHOD isShowingChatDisabledByPlayer ()Z COMMENT {@return {@code true} if the chat disabled message is being shown, {@code false} otherwise} - METHOD lambda$displayScoreboardSidebar$6 (Lnet/minecraft/world/scores/PlayerScoreEntry;)Z - ARG 0 entry - METHOD lambda$displayScoreboardSidebar$7 (Lnet/minecraft/world/scores/Scoreboard;Lnet/minecraft/network/chat/numbers/NumberFormat;Lnet/minecraft/world/scores/PlayerScoreEntry;)Lnet/minecraft/client/gui/Gui$1DisplayEntry; + METHOD lambda$displayScoreboardSidebar$7 (Lnet/minecraft/world/scores/PlayerScoreEntry;)Z + ARG 0 scoreEntry + METHOD lambda$displayScoreboardSidebar$8 (Lnet/minecraft/world/scores/Scoreboard;Lnet/minecraft/network/chat/numbers/NumberFormat;Lnet/minecraft/world/scores/PlayerScoreEntry;)Lnet/minecraft/client/gui/Gui$1DisplayEntry; ARG 3 scoreEntry METHOD lambda$new$0 (Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/DeltaTracker;)V ARG 1 guiGraphics @@ -85,9 +95,19 @@ CLASS net/minecraft/client/gui/Gui METHOD onDisconnected ()V COMMENT Called when the player is disconnected from the server. COMMENT Resets various UI elements and clears messages. + METHOD playAirBubblePoppedSound (ILnet/minecraft/world/entity/player/Player;I)V + ARG 1 bubble + ARG 2 player + ARG 3 pitch METHOD render (Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/DeltaTracker;)V ARG 1 guiGraphics ARG 2 deltaTracker + METHOD renderAirBubbles (Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/world/entity/player/Player;III)V + ARG 1 guiGraphics + ARG 2 player + ARG 3 vehicleMaxHealth + ARG 4 y + ARG 5 x METHOD renderArmor (Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/world/entity/player/Player;IIII)V ARG 0 guiGraphics ARG 1 player @@ -101,6 +121,9 @@ CLASS net/minecraft/client/gui/Gui METHOD renderChat (Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/DeltaTracker;)V ARG 1 guiGraphics ARG 2 deltaTracker + METHOD renderConfusionOverlay (Lnet/minecraft/client/gui/GuiGraphics;F)V + ARG 1 guiGraphics + ARG 2 intensity METHOD renderCrosshair (Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/DeltaTracker;)V ARG 1 guiGraphics ARG 2 deltaTracker diff --git a/data/net/minecraft/client/gui/GuiGraphics.mapping b/data/net/minecraft/client/gui/GuiGraphics.mapping index 34b5d193f..9b2324bf9 100644 --- a/data/net/minecraft/client/gui/GuiGraphics.mapping +++ b/data/net/minecraft/client/gui/GuiGraphics.mapping @@ -10,215 +10,138 @@ CLASS net/minecraft/client/gui/GuiGraphics COMMENT Applies scissoring based on the provided screen rectangle. ARG 1 rectangle COMMENT the screen rectangle to apply scissoring with. Can be null to disable scissoring. - METHOD blit (IIIIILnet/minecraft/client/renderer/texture/TextureAtlasSprite;)V - COMMENT Blits a portion of the specified texture atlas sprite onto the screen at the given coordinates. - ARG 1 x - COMMENT the x-coordinate of the blit position. - ARG 2 y - COMMENT the y-coordinate of the blit position. - ARG 3 blitOffset - COMMENT the z-level offset for rendering order. - ARG 4 width - COMMENT the width of the blitted portion. - ARG 5 height - COMMENT the height of the blitted portion. - ARG 6 sprite - COMMENT the texture atlas sprite to blit. - METHOD blit (IIIIILnet/minecraft/client/renderer/texture/TextureAtlasSprite;FFFF)V - COMMENT Blits a portion of the specified texture atlas sprite onto the screen at the given coordinates with a color tint. - ARG 1 x - COMMENT the x-coordinate of the blit position. - ARG 2 y - COMMENT the y-coordinate of the blit position. - ARG 3 blitOffset - COMMENT the z-level offset for rendering order. - ARG 4 width - COMMENT the width of the blitted portion. - ARG 5 height - COMMENT the height of the blitted portion. - ARG 6 sprite - COMMENT the texture atlas sprite to blit. - ARG 7 red - COMMENT the red component of the color tint. - ARG 8 green - COMMENT the green component of the color tint. - ARG 9 blue - COMMENT the blue component of the color tint. - ARG 10 alpha - COMMENT the alpha component of the color tint. - METHOD blit (Lnet/minecraft/resources/ResourceLocation;IIFFIIII)V - COMMENT Blits a portion of the texture specified by the atlas location onto the screen at the given position and dimensions with texture coordinates. - ARG 1 atlasLocation - COMMENT the location of the texture atlas. - ARG 2 x - COMMENT the x-coordinate of the top-left corner of the blit position. - ARG 3 y - COMMENT the y-coordinate of the top-left corner of the blit position. - ARG 4 uOffset - COMMENT the horizontal texture coordinate offset. - ARG 5 vOffset - COMMENT the vertical texture coordinate offset. - ARG 6 width - COMMENT the width of the blitted portion. - ARG 7 height - COMMENT the height of the blitted portion. - ARG 8 textureWidth - COMMENT the width of the texture. - ARG 9 textureHeight - COMMENT the height of the texture. - METHOD blit (Lnet/minecraft/resources/ResourceLocation;IIIFFIIII)V - COMMENT Blits a portion of the texture specified by the atlas location onto the screen at the given coordinates with a blit offset and texture coordinates. - ARG 1 atlasLocation - COMMENT the location of the texture atlas. - ARG 2 x - COMMENT the x-coordinate of the blit position. - ARG 3 y - COMMENT the y-coordinate of the blit position. - ARG 4 blitOffset - COMMENT the z-level offset for rendering order. + METHOD blit (Ljava/util/function/Function;Lnet/minecraft/resources/ResourceLocation;IIFFIIII)V + ARG 1 renderTypeGetter + ARG 2 atlasLocation + ARG 3 x + ARG 4 y ARG 5 uOffset - COMMENT the horizontal texture coordinate offset. ARG 6 vOffset - COMMENT the vertical texture coordinate offset. ARG 7 uWidth - COMMENT the width of the blitted portion in texture coordinates. ARG 8 vHeight - COMMENT the height of the blitted portion in texture coordinates. ARG 9 textureWidth - COMMENT the width of the texture. ARG 10 textureHeight - COMMENT the height of the texture. - METHOD blit (Lnet/minecraft/resources/ResourceLocation;IIIIFFIIII)V - COMMENT Blits a portion of the texture specified by the atlas location onto the screen at the given position and dimensions with texture coordinates. - ARG 1 atlasLocation - COMMENT the location of the texture atlas. - ARG 2 x - COMMENT the x-coordinate of the top-left corner of the blit position. - ARG 3 y - COMMENT the y-coordinate of the top-left corner of the blit position. - ARG 4 width - COMMENT the width of the blitted portion. - ARG 5 height - COMMENT the height of the blitted portion. - ARG 6 uOffset - COMMENT the horizontal texture coordinate offset. - ARG 7 vOffset - COMMENT the vertical texture coordinate offset. - ARG 8 uWidth - COMMENT the width of the blitted portion in texture coordinates. - ARG 9 vHeight - COMMENT the height of the blitted portion in texture coordinates. - ARG 10 textureWidth - COMMENT the width of the texture. - ARG 11 textureHeight - COMMENT the height of the texture. - METHOD blit (Lnet/minecraft/resources/ResourceLocation;IIIIII)V - COMMENT Blits a portion of the texture specified by the atlas location onto the screen at the given coordinates. - ARG 1 atlasLocation - COMMENT the location of the texture atlas. - ARG 2 x - COMMENT the x-coordinate of the blit position. - ARG 3 y - COMMENT the y-coordinate of the blit position. - ARG 4 uOffset - COMMENT the horizontal texture coordinate offset. - ARG 5 vOffset - COMMENT the vertical texture coordinate offset. - ARG 6 uWidth - COMMENT the width of the blitted portion in texture coordinates. - ARG 7 vHeight - COMMENT the height of the blitted portion in texture coordinates. - METHOD blit (Lnet/minecraft/resources/ResourceLocation;IIIIIIIFFII)V - COMMENT Performs the inner blit operation for rendering a texture with the specified coordinates and texture coordinates. - ARG 1 atlasLocation - COMMENT the location of the texture atlas. - ARG 2 x1 - COMMENT the x-coordinate of the first corner of the blit position. - ARG 3 x2 - COMMENT the x-coordinate of the second corner of the blit position. - ARG 4 y1 - COMMENT the y-coordinate of the first corner of the blit position. - ARG 5 y2 - COMMENT the y-coordinate of the second corner of the blit position. - ARG 6 blitOffset - COMMENT the z-level offset for rendering order. + METHOD blit (Ljava/util/function/Function;Lnet/minecraft/resources/ResourceLocation;IIFFIIIII)V + ARG 1 renderTypeGetter + ARG 2 atlasLocation + ARG 3 x + ARG 4 y + ARG 5 uOffset + ARG 6 vOffset ARG 7 uWidth - COMMENT the width of the blitted portion in texture coordinates. ARG 8 vHeight - COMMENT the height of the blitted portion in texture coordinates. - ARG 9 uOffset - COMMENT the horizontal texture coordinate offset. - ARG 10 vOffset - COMMENT the vertical texture coordinate offset. + ARG 9 textureWidth + ARG 10 textureHeight + ARG 11 color + METHOD blit (Ljava/util/function/Function;Lnet/minecraft/resources/ResourceLocation;IIFFIIIIII)V + ARG 1 renderTypeGetter + ARG 2 atlasLocation + ARG 3 x + ARG 4 y + ARG 5 uOffset + ARG 6 vOffset + ARG 7 uWidth + ARG 8 vHeight + ARG 9 width + ARG 10 height ARG 11 textureWidth - COMMENT the width of the texture. ARG 12 textureHeight - COMMENT the height of the texture. - METHOD blitNineSlicedSprite (Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/client/resources/metadata/gui/GuiSpriteScaling$NineSlice;IIIII)V - ARG 1 sprite - ARG 2 nineSlice + METHOD blit (Ljava/util/function/Function;Lnet/minecraft/resources/ResourceLocation;IIFFIIIIIII)V + ARG 1 renderTypeGetter + ARG 2 atlasLocation ARG 3 x ARG 4 y - ARG 5 blitOffset + ARG 5 uOffset + ARG 6 vOffset + ARG 7 uWidth + ARG 8 vHeight + ARG 9 width + ARG 10 height + ARG 11 textureWidth + ARG 12 textureHeight + ARG 13 color + METHOD blitNineSliceInnerSegment (Ljava/util/function/Function;Lnet/minecraft/client/resources/metadata/gui/GuiSpriteScaling$NineSlice;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;IIIIIIIIIII)V + ARG 1 renderTypeGetter + ARG 2 nineSlice + ARG 3 sprite + ARG 4 x + ARG 5 y ARG 6 width ARG 7 height - METHOD blitSprite (Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;IIIII)V - ARG 1 sprite - ARG 2 x - ARG 3 y - ARG 4 blitOffset + ARG 8 uPosition + ARG 9 vPosition + ARG 10 spriteWidth + ARG 11 spriteHeight + ARG 12 nineSliceWidth + ARG 13 nineSliceHeight + ARG 14 blitOffset + METHOD blitNineSlicedSprite (Ljava/util/function/Function;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/client/resources/metadata/gui/GuiSpriteScaling$NineSlice;IIIII)V + ARG 1 renderTypeGetter + ARG 2 sprite + ARG 3 nineSlice + ARG 4 x + ARG 5 y + ARG 6 blitOffset + ARG 7 width + ARG 8 height + METHOD blitSprite (Ljava/util/function/Function;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;IIII)V + ARG 1 renderTypeGetter + ARG 2 sprite + ARG 3 x + ARG 4 y ARG 5 width ARG 6 height - METHOD blitSprite (Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;IIIIIIIII)V - ARG 1 sprite - ARG 2 textureWidth - ARG 3 textureHeight - ARG 4 uPosition - ARG 5 vPosition - ARG 6 x - ARG 7 y - ARG 8 blitOffset + METHOD blitSprite (Ljava/util/function/Function;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;IIIII)V + ARG 1 renderTypeGetter + ARG 2 sprite + ARG 3 x + ARG 4 y + ARG 5 width + ARG 6 height + ARG 7 blitOffset + METHOD blitSprite (Ljava/util/function/Function;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;IIIIIIIII)V + ARG 1 renderTypeGetter + ARG 2 sprite + ARG 3 textureWidth + ARG 4 textureHeight + ARG 5 uPosition + ARG 6 vPosition + ARG 7 x + ARG 8 y ARG 9 uWidth ARG 10 vHeight - METHOD blitSprite (Lnet/minecraft/resources/ResourceLocation;IIII)V - ARG 1 sprite - ARG 2 x - ARG 3 y - ARG 4 width - ARG 5 height - METHOD blitSprite (Lnet/minecraft/resources/ResourceLocation;IIIII)V - ARG 1 sprite - ARG 2 x - ARG 3 y - ARG 4 blitOffset + ARG 11 blitOffset + METHOD blitSprite (Ljava/util/function/Function;Lnet/minecraft/resources/ResourceLocation;IIII)V + ARG 1 renderTypeGetter + ARG 2 sprite + ARG 3 x + ARG 4 y + ARG 5 width + ARG 6 height + METHOD blitSprite (Ljava/util/function/Function;Lnet/minecraft/resources/ResourceLocation;IIIII)V + ARG 1 renderTypeGetter + ARG 2 sprite + ARG 3 x + ARG 4 y ARG 5 width ARG 6 height - METHOD blitSprite (Lnet/minecraft/resources/ResourceLocation;IIIIIIII)V - ARG 1 sprite - ARG 2 textureWidth - ARG 3 textureHeight - ARG 4 uPosition - ARG 5 vPosition - ARG 6 x - ARG 7 y - ARG 8 uWidth - ARG 9 vHeight - METHOD blitSprite (Lnet/minecraft/resources/ResourceLocation;IIIIIIIII)V - ARG 1 sprite - ARG 2 textureWidth - ARG 3 textureHeight - ARG 4 uPosition - ARG 5 vPosition - ARG 6 x - ARG 7 y - ARG 8 blitOffset + ARG 7 blitOffset + METHOD blitSprite (Ljava/util/function/Function;Lnet/minecraft/resources/ResourceLocation;IIIIIIII)V + ARG 1 renderTypeGetter + ARG 2 sprite + ARG 3 textureWidth + ARG 4 textureHeight + ARG 5 uPosition + ARG 6 vPosition + ARG 7 x + ARG 8 y ARG 9 uWidth ARG 10 vHeight - METHOD blitTiledSprite (Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;IIIIIIIIIII)V - ARG 1 sprite - ARG 2 x - ARG 3 y - ARG 4 blitOffset + METHOD blitTiledSprite (Ljava/util/function/Function;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;IIIIIIIIIII)V + ARG 1 renderTypeGetter + ARG 2 sprite + ARG 3 x + ARG 4 y ARG 5 width ARG 6 height ARG 7 uPosition @@ -227,8 +150,7 @@ CLASS net/minecraft/client/gui/GuiGraphics ARG 10 spriteHeight ARG 11 nineSliceWidth ARG 12 nineSliceHeight - METHOD bufferSource ()Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource; - COMMENT {@return returns the buffer source for rendering.} + ARG 13 blitOffset METHOD containsPointInScissor (II)Z ARG 1 x ARG 2 y @@ -270,10 +192,8 @@ CLASS net/minecraft/client/gui/GuiGraphics COMMENT the y-coordinate of the string. ARG 5 color COMMENT the color of the string. - METHOD drawManaged (Ljava/lang/Runnable;)V - COMMENT Executes a runnable while managing the render state. The render state is flushed before and after executing the runnable. - ARG 1 runnable - COMMENT the runnable to execute. + METHOD drawSpecial (Ljava/util/function/Consumer;)V + ARG 1 drawer METHOD drawString (Lnet/minecraft/client/gui/Font;Ljava/lang/String;III)I COMMENT Draws a string at the specified coordinates using the given font, text, and color. Returns the width of the drawn string. COMMENT

@@ -528,12 +448,6 @@ CLASS net/minecraft/client/gui/GuiGraphics ARG 6 z METHOD flush ()V COMMENT Flushes the render state, ending the current batch and enabling depth testing. - METHOD flushIfManaged ()V - COMMENT Flushes the render state if it is managed. - COMMENT @deprecated This method is deprecated. - METHOD flushIfUnmanaged ()V - COMMENT Flushes the render state if it is not managed. - COMMENT @deprecated This method is deprecated. METHOD guiHeight ()I COMMENT {@return returns the height of the GUI screen in pixels} METHOD guiWidth ()I @@ -560,58 +474,18 @@ CLASS net/minecraft/client/gui/GuiGraphics COMMENT the y-coordinate of the line. ARG 5 color COMMENT the color of the line. - METHOD innerBlit (Lnet/minecraft/resources/ResourceLocation;IIIIIFFFF)V - COMMENT Performs the inner blit operation for rendering a texture with the specified coordinates and texture coordinates without color tinting. - ARG 1 atlasLocation - COMMENT the location of the texture atlas. - ARG 2 x1 - COMMENT the x-coordinate of the first corner of the blit position. - ARG 3 x2 - COMMENT the x-coordinate of the second corner of the blit position. - ARG 4 y1 - COMMENT the y-coordinate of the first corner of the blit position. - ARG 5 y2 - COMMENT the y-coordinate of the second corner of the blit position. - ARG 6 blitOffset - COMMENT the z-level offset for rendering order. - ARG 7 minU - COMMENT the minimum horizontal texture coordinate. - ARG 8 maxU - COMMENT the maximum horizontal texture coordinate. - ARG 9 minV - COMMENT the minimum vertical texture coordinate. - ARG 10 maxV - COMMENT the maximum vertical texture coordinate. - METHOD innerBlit (Lnet/minecraft/resources/ResourceLocation;IIIIIFFFFFFFF)V - COMMENT Performs the inner blit operation for rendering a texture with the specified coordinates, texture coordinates, and color tint. - ARG 1 atlasLocation - COMMENT the location of the texture atlas. - ARG 2 x1 - COMMENT the x-coordinate of the first corner of the blit position. - ARG 3 x2 - COMMENT the x-coordinate of the second corner of the blit position. - ARG 4 y1 - COMMENT the y-coordinate of the first corner of the blit position. - ARG 5 y2 - COMMENT the y-coordinate of the second corner of the blit position. - ARG 6 blitOffset - COMMENT the z-level offset for rendering order. + METHOD innerBlit (Ljava/util/function/Function;Lnet/minecraft/resources/ResourceLocation;IIIIFFFFI)V + ARG 1 renderTypeGetter + ARG 2 atlasLocation + ARG 3 x1 + ARG 4 x2 + ARG 5 y1 + ARG 6 y2 ARG 7 minU - COMMENT the minimum horizontal texture coordinate. ARG 8 maxU - COMMENT the maximum horizontal texture coordinate. ARG 9 minV - COMMENT the minimum vertical texture coordinate. ARG 10 maxV - COMMENT the maximum vertical texture coordinate. - ARG 11 red - COMMENT the red component of the color tint. - ARG 12 green - COMMENT the green component of the color tint. - ARG 13 blue - COMMENT the blue component of the color tint. - ARG 14 alpha - COMMENT the alpha component of the color tint. + ARG 11 color METHOD pose ()Lcom/mojang/blaze3d/vertex/PoseStack; COMMENT {@return returns the PoseStack used for transformations and rendering.} METHOD renderComponentHoverEffect (Lnet/minecraft/client/gui/Font;Lnet/minecraft/network/chat/Style;II)V @@ -634,6 +508,12 @@ CLASS net/minecraft/client/gui/GuiGraphics COMMENT the x-coordinate of the mouse position. ARG 4 mouseY COMMENT the y-coordinate of the mouse position. + METHOD renderComponentTooltip (Lnet/minecraft/client/gui/Font;Ljava/util/List;IILnet/minecraft/resources/ResourceLocation;)V + ARG 1 font + ARG 2 tooltipLines + ARG 3 mouseX + ARG 4 mouseY + ARG 5 sprite METHOD renderFakeItem (Lnet/minecraft/world/item/ItemStack;II)V COMMENT Renders a fake item stack at the specified coordinates. ARG 1 stack @@ -719,6 +599,20 @@ CLASS net/minecraft/client/gui/GuiGraphics COMMENT the random seed. ARG 5 guiOffset COMMENT the GUI offset. + METHOD renderItemBar (Lnet/minecraft/world/item/ItemStack;II)V + ARG 1 stack + ARG 2 x + ARG 3 y + METHOD renderItemCooldown (Lnet/minecraft/world/item/ItemStack;II)V + ARG 1 stack + ARG 2 x + ARG 3 y + METHOD renderItemCount (Lnet/minecraft/client/gui/Font;Lnet/minecraft/world/item/ItemStack;IILjava/lang/String;)V + ARG 1 font + ARG 2 stack + ARG 3 x + ARG 4 y + ARG 5 text METHOD renderItemDecorations (Lnet/minecraft/client/gui/Font;Lnet/minecraft/world/item/ItemStack;II)V COMMENT Renders additional decorations for an item stack at the specified coordinates. ARG 1 font @@ -763,6 +657,12 @@ CLASS net/minecraft/client/gui/GuiGraphics COMMENT the x-coordinate of the mouse position. ARG 4 mouseY COMMENT the y-coordinate of the mouse position. + METHOD renderTooltip (Lnet/minecraft/client/gui/Font;Ljava/util/List;IILnet/minecraft/resources/ResourceLocation;)V + ARG 1 font + ARG 2 tooltipLines + ARG 3 mouseX + ARG 4 mouseY + ARG 5 sprite METHOD renderTooltip (Lnet/minecraft/client/gui/Font;Ljava/util/List;Ljava/util/Optional;II)V COMMENT Renders a tooltip with customizable components at the specified mouse coordinates. ARG 1 font @@ -775,6 +675,13 @@ CLASS net/minecraft/client/gui/GuiGraphics COMMENT the x-coordinate of the mouse position. ARG 5 mouseY COMMENT the y-coordinate of the mouse position. + METHOD renderTooltip (Lnet/minecraft/client/gui/Font;Ljava/util/List;Ljava/util/Optional;IILnet/minecraft/resources/ResourceLocation;)V + ARG 1 font + ARG 2 tooltipLines + ARG 3 visualTooltipComponent + ARG 4 mouseX + ARG 5 mouseY + ARG 6 sprite METHOD renderTooltip (Lnet/minecraft/client/gui/Font;Ljava/util/List;Lnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipPositioner;II)V COMMENT Renders a tooltip with multiple lines of formatted text using a custom tooltip positioner at the specified mouse coordinates. ARG 1 font @@ -797,6 +704,12 @@ CLASS net/minecraft/client/gui/GuiGraphics COMMENT the x-coordinate of the mouse position. ARG 4 mouseY COMMENT the y-coordinate of the mouse position. + METHOD renderTooltip (Lnet/minecraft/client/gui/Font;Lnet/minecraft/network/chat/Component;IILnet/minecraft/resources/ResourceLocation;)V + ARG 1 font + ARG 2 text + ARG 3 mouseX + ARG 4 mouseY + ARG 5 sprite METHOD renderTooltip (Lnet/minecraft/client/gui/Font;Lnet/minecraft/world/item/ItemStack;II)V COMMENT Renders a tooltip for an item stack at the specified mouse coordinates. ARG 1 font @@ -807,28 +720,13 @@ CLASS net/minecraft/client/gui/GuiGraphics COMMENT the x-coordinate of the mouse position. ARG 4 mouseY COMMENT the y-coordinate of the mouse position. - METHOD renderTooltipInternal (Lnet/minecraft/client/gui/Font;Ljava/util/List;IILnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipPositioner;)V - COMMENT Renders an internal tooltip with customizable tooltip components at the specified mouse coordinates using a tooltip positioner. + METHOD renderTooltipInternal (Lnet/minecraft/client/gui/Font;Ljava/util/List;IILnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipPositioner;Lnet/minecraft/resources/ResourceLocation;)V ARG 1 font - COMMENT the font used for rendering text. - ARG 2 components - COMMENT the tooltip components to render. + ARG 2 tooltipLines ARG 3 mouseX - COMMENT the x-coordinate of the mouse position. ARG 4 mouseY - COMMENT the y-coordinate of the mouse position. ARG 5 tooltipPositioner - COMMENT the positioner to determine the tooltip's position. - METHOD setColor (FFFF)V - COMMENT Sets the current rendering color. - ARG 1 red - COMMENT the red component of the color. - ARG 2 green - COMMENT the green component of the color. - ARG 3 blue - COMMENT the blue component of the color. - ARG 4 alpha - COMMENT the alpha component of the color. + ARG 6 sprite METHOD vLine (IIII)V COMMENT Draws a vertical line from minY to maxY at the specified x-coordinate with the given color. ARG 1 x diff --git a/data/net/minecraft/client/gui/ItemSlotMouseAction.mapping b/data/net/minecraft/client/gui/ItemSlotMouseAction.mapping new file mode 100644 index 000000000..a01c84ea8 --- /dev/null +++ b/data/net/minecraft/client/gui/ItemSlotMouseAction.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/client/gui/ItemSlotMouseAction + METHOD matches (Lnet/minecraft/world/inventory/Slot;)Z + ARG 1 slot + METHOD onMouseScrolled (DDILnet/minecraft/world/item/ItemStack;)Z + ARG 1 xOffset + ARG 3 yOffset + ARG 5 hoveredSlotIndex + ARG 6 hoveredSlotItem + METHOD onSlotClicked (Lnet/minecraft/world/inventory/Slot;Lnet/minecraft/world/inventory/ClickType;)V + ARG 1 slot + ARG 2 clickType + METHOD onStopHovering (Lnet/minecraft/world/inventory/Slot;)V + ARG 1 slot diff --git a/data/net/minecraft/client/gui/MapRenderer.mapping b/data/net/minecraft/client/gui/MapRenderer.mapping deleted file mode 100644 index fc30760fe..000000000 --- a/data/net/minecraft/client/gui/MapRenderer.mapping +++ /dev/null @@ -1,35 +0,0 @@ -CLASS net/minecraft/client/gui/MapRenderer - METHOD (Lnet/minecraft/client/renderer/texture/TextureManager;Lnet/minecraft/client/resources/MapDecorationTextureManager;)V - ARG 1 textureManager - ARG 2 decorationTextures - METHOD getOrCreateMapInstance (Lnet/minecraft/world/level/saveddata/maps/MapId;Lnet/minecraft/world/level/saveddata/maps/MapItemSavedData;)Lnet/minecraft/client/gui/MapRenderer$MapInstance; - ARG 1 mapId - ARG 2 mapData - METHOD lambda$getOrCreateMapInstance$0 (Lnet/minecraft/world/level/saveddata/maps/MapItemSavedData;Ljava/lang/Integer;Lnet/minecraft/client/gui/MapRenderer$MapInstance;)Lnet/minecraft/client/gui/MapRenderer$MapInstance; - ARG 2 id - ARG 3 mapInstance - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/world/level/saveddata/maps/MapId;Lnet/minecraft/world/level/saveddata/maps/MapItemSavedData;ZI)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 mapId - ARG 4 mapData - ARG 5 active - ARG 6 packedLight - METHOD resetData ()V - COMMENT Clears the currently loaded maps and removes their corresponding textures - METHOD update (Lnet/minecraft/world/level/saveddata/maps/MapId;Lnet/minecraft/world/level/saveddata/maps/MapItemSavedData;)V - ARG 1 mapId - ARG 2 mapData - CLASS MapInstance - METHOD (Lnet/minecraft/client/gui/MapRenderer;ILnet/minecraft/world/level/saveddata/maps/MapItemSavedData;)V - ARG 2 id - ARG 3 data - METHOD draw (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ZI)V - ARG 1 poseStack - ARG 2 bufferSource - ARG 3 active - ARG 4 packedLight - METHOD replaceMapData (Lnet/minecraft/world/level/saveddata/maps/MapItemSavedData;)V - ARG 1 data - METHOD updateTexture ()V - COMMENT Updates a map texture. diff --git a/data/net/minecraft/client/gui/components/AbstractSelectionList.mapping b/data/net/minecraft/client/gui/components/AbstractSelectionList.mapping index 49f58baf2..c0c6e9fc1 100644 --- a/data/net/minecraft/client/gui/components/AbstractSelectionList.mapping +++ b/data/net/minecraft/client/gui/components/AbstractSelectionList.mapping @@ -117,6 +117,8 @@ CLASS net/minecraft/client/gui/components/AbstractSelectionList ARG 1 scroll METHOD setSelected (Lnet/minecraft/client/gui/components/AbstractSelectionList$Entry;)V ARG 1 selected + METHOD setSelectedIndex (I)V + ARG 1 selected METHOD updateScrollingState (DDI)V ARG 1 mouseX ARG 3 mouseY diff --git a/data/net/minecraft/client/gui/components/AbstractWidget.mapping b/data/net/minecraft/client/gui/components/AbstractWidget.mapping index 75da088ba..0bc8ae14a 100644 --- a/data/net/minecraft/client/gui/components/AbstractWidget.mapping +++ b/data/net/minecraft/client/gui/components/AbstractWidget.mapping @@ -40,6 +40,8 @@ CLASS net/minecraft/client/gui/components/AbstractWidget METHOD onRelease (DD)V ARG 1 mouseX ARG 3 mouseY + METHOD playButtonClickSound (Lnet/minecraft/client/sounds/SoundManager;)V + ARG 0 soundManager METHOD playDownSound (Lnet/minecraft/client/sounds/SoundManager;)V ARG 1 handler METHOD renderScrollingString (Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/gui/Font;II)V diff --git a/data/net/minecraft/client/gui/components/DebugScreenOverlay.mapping b/data/net/minecraft/client/gui/components/DebugScreenOverlay.mapping index 97ffda538..6102c6ec1 100644 --- a/data/net/minecraft/client/gui/components/DebugScreenOverlay.mapping +++ b/data/net/minecraft/client/gui/components/DebugScreenOverlay.mapping @@ -9,12 +9,6 @@ CLASS net/minecraft/client/gui/components/DebugScreenOverlay ARG 1 guiGraphics METHOD getPropertyValueString (Ljava/util/Map$Entry;)Ljava/lang/String; ARG 1 entry - METHOD lambda$getGameInformation$3 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/world/entity/MobCategory;)Ljava/lang/String; - ARG 1 mobCategory - METHOD lambda$printBiome$4 (Lnet/minecraft/resources/ResourceKey;)Ljava/lang/String; - ARG 0 biomeKey - METHOD lambda$printBiome$5 (Lnet/minecraft/world/level/biome/Biome;)Ljava/lang/String; - ARG 0 biome METHOD lambda$static$0 (Ljava/util/EnumMap;)V ARG 0 enumMap METHOD logFrameDuration (J)V diff --git a/data/net/minecraft/client/gui/components/PlayerFaceRenderer.mapping b/data/net/minecraft/client/gui/components/PlayerFaceRenderer.mapping index 2f5369dc9..607347fe3 100644 --- a/data/net/minecraft/client/gui/components/PlayerFaceRenderer.mapping +++ b/data/net/minecraft/client/gui/components/PlayerFaceRenderer.mapping @@ -5,24 +5,27 @@ CLASS net/minecraft/client/gui/components/PlayerFaceRenderer ARG 2 x ARG 3 y ARG 4 size - METHOD draw (Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/resources/ResourceLocation;III)V + METHOD draw (Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/resources/PlayerSkin;IIII)V ARG 0 guiGraphics - ARG 1 atlasLocation + ARG 1 skin ARG 2 x ARG 3 y ARG 4 size - METHOD draw (Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/resources/ResourceLocation;IIIZZ)V + ARG 5 color + METHOD draw (Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/resources/ResourceLocation;IIIZZI)V ARG 0 guiGraphics - ARG 1 atlasLocation + ARG 1 skinTexture ARG 2 x ARG 3 y ARG 4 size ARG 5 drawHat ARG 6 upsideDown - METHOD drawHat (Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/resources/ResourceLocation;IIIZ)V + ARG 7 color + METHOD drawHat (Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/resources/ResourceLocation;IIIZI)V ARG 0 guiGraphics - ARG 1 atlasLocation + ARG 1 skinTexture ARG 2 x ARG 3 y ARG 4 size ARG 5 upsideDown + ARG 6 color diff --git a/data/net/minecraft/client/gui/components/PlayerTabOverlay.mapping b/data/net/minecraft/client/gui/components/PlayerTabOverlay.mapping index d78980560..a00647c9d 100644 --- a/data/net/minecraft/client/gui/components/PlayerTabOverlay.mapping +++ b/data/net/minecraft/client/gui/components/PlayerTabOverlay.mapping @@ -9,16 +9,8 @@ CLASS net/minecraft/client/gui/components/PlayerTabOverlay ARG 2 name METHOD getNameForDisplay (Lnet/minecraft/client/multiplayer/PlayerInfo;)Lnet/minecraft/network/chat/Component; ARG 1 playerInfo - METHOD lambda$render$3 (Lnet/minecraft/client/multiplayer/PlayerInfo;)Ljava/util/UUID; - ARG 0 player - METHOD lambda$render$4 (Ljava/util/Set;Ljava/util/UUID;)Z - ARG 1 healthState - METHOD lambda$renderTablistHearts$5 (ILjava/util/UUID;)Lnet/minecraft/client/gui/components/PlayerTabOverlay$HealthState; - ARG 1 uuid METHOD lambda$static$0 (Lnet/minecraft/client/multiplayer/PlayerInfo;)I ARG 0 info - METHOD lambda$static$1 (Lnet/minecraft/client/multiplayer/PlayerInfo;)Ljava/lang/String; - ARG 0 info METHOD lambda$static$2 (Lnet/minecraft/client/multiplayer/PlayerInfo;)Ljava/lang/String; ARG 0 info METHOD render (Lnet/minecraft/client/gui/GuiGraphics;ILnet/minecraft/world/scores/Scoreboard;Lnet/minecraft/world/scores/Objective;)V diff --git a/data/net/minecraft/client/gui/components/debugchart/ProfilerPieChart.mapping b/data/net/minecraft/client/gui/components/debugchart/ProfilerPieChart.mapping new file mode 100644 index 000000000..b106b5f84 --- /dev/null +++ b/data/net/minecraft/client/gui/components/debugchart/ProfilerPieChart.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/client/gui/components/debugchart/ProfilerPieChart + METHOD (Lnet/minecraft/client/gui/Font;)V + ARG 1 font + METHOD profilerPieChartKeyPress (I)V + ARG 1 index + METHOD render (Lnet/minecraft/client/gui/GuiGraphics;)V + ARG 1 guiGraphics + METHOD setBottomOffset (I)V + ARG 1 bottomOffset + METHOD setPieChartResults (Lnet/minecraft/util/profiling/ProfileResults;)V + ARG 1 pieChartResults diff --git a/data/net/minecraft/client/gui/components/toasts/RecipeToast.mapping b/data/net/minecraft/client/gui/components/toasts/RecipeToast.mapping index e5b84ffbc..734ff9341 100644 --- a/data/net/minecraft/client/gui/components/toasts/RecipeToast.mapping +++ b/data/net/minecraft/client/gui/components/toasts/RecipeToast.mapping @@ -1,8 +1,7 @@ CLASS net/minecraft/client/gui/components/toasts/RecipeToast - METHOD (Lnet/minecraft/world/item/crafting/RecipeHolder;)V - ARG 1 recipe - METHOD addItem (Lnet/minecraft/world/item/crafting/RecipeHolder;)V - ARG 1 recipe - METHOD addOrUpdate (Lnet/minecraft/client/gui/components/toasts/ToastComponent;Lnet/minecraft/world/item/crafting/RecipeHolder;)V - ARG 0 toastComponent - ARG 1 recipe + METHOD addItem (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;)V + ARG 1 categoryItem + ARG 2 unlockedItem + METHOD addOrUpdate (Lnet/minecraft/client/gui/components/toasts/ToastManager;Lnet/minecraft/world/item/crafting/display/RecipeDisplay;)V + ARG 0 toastManager + ARG 1 recipeDisplay diff --git a/data/net/minecraft/client/gui/components/toasts/SystemToast.mapping b/data/net/minecraft/client/gui/components/toasts/SystemToast.mapping index 1be5d3208..c780f85e5 100644 --- a/data/net/minecraft/client/gui/components/toasts/SystemToast.mapping +++ b/data/net/minecraft/client/gui/components/toasts/SystemToast.mapping @@ -8,18 +8,18 @@ CLASS net/minecraft/client/gui/components/toasts/SystemToast ARG 1 id ARG 2 title ARG 3 message - METHOD add (Lnet/minecraft/client/gui/components/toasts/ToastComponent;Lnet/minecraft/client/gui/components/toasts/SystemToast$SystemToastId;Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;)V - ARG 0 toastComponent + METHOD add (Lnet/minecraft/client/gui/components/toasts/ToastManager;Lnet/minecraft/client/gui/components/toasts/SystemToast$SystemToastId;Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;)V + ARG 0 toastManager ARG 1 id ARG 2 title ARG 3 message - METHOD addOrUpdate (Lnet/minecraft/client/gui/components/toasts/ToastComponent;Lnet/minecraft/client/gui/components/toasts/SystemToast$SystemToastId;Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;)V - ARG 0 toastComponent + METHOD addOrUpdate (Lnet/minecraft/client/gui/components/toasts/ToastManager;Lnet/minecraft/client/gui/components/toasts/SystemToast$SystemToastId;Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;)V + ARG 0 toastManager ARG 1 id ARG 2 title ARG 3 message - METHOD forceHide (Lnet/minecraft/client/gui/components/toasts/ToastComponent;Lnet/minecraft/client/gui/components/toasts/SystemToast$SystemToastId;)V - ARG 0 toastComponent + METHOD forceHide (Lnet/minecraft/client/gui/components/toasts/ToastManager;Lnet/minecraft/client/gui/components/toasts/SystemToast$SystemToastId;)V + ARG 0 toastManager ARG 1 id METHOD multiline (Lnet/minecraft/client/Minecraft;Lnet/minecraft/client/gui/components/toasts/SystemToast$SystemToastId;Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;)Lnet/minecraft/client/gui/components/toasts/SystemToast; ARG 0 minecraft diff --git a/data/net/minecraft/client/gui/components/toasts/Toast.mapping b/data/net/minecraft/client/gui/components/toasts/Toast.mapping index 54e4dd115..79631c832 100644 --- a/data/net/minecraft/client/gui/components/toasts/Toast.mapping +++ b/data/net/minecraft/client/gui/components/toasts/Toast.mapping @@ -1,8 +1,11 @@ CLASS net/minecraft/client/gui/components/toasts/Toast - METHOD render (Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/gui/components/toasts/ToastComponent;J)Lnet/minecraft/client/gui/components/toasts/Toast$Visibility; + METHOD render (Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/gui/Font;J)V ARG 1 guiGraphics - ARG 2 toastComponent - ARG 3 timeSinceLastVisible + ARG 2 font + ARG 3 visibilityTime + METHOD update (Lnet/minecraft/client/gui/components/toasts/ToastManager;J)V + ARG 1 toastManager + ARG 2 visibilityTime CLASS Visibility METHOD (Ljava/lang/String;ILnet/minecraft/sounds/SoundEvent;)V ARG 3 soundEvent diff --git a/data/net/minecraft/client/gui/components/toasts/ToastComponent.mapping b/data/net/minecraft/client/gui/components/toasts/ToastComponent.mapping deleted file mode 100644 index 2fc76537b..000000000 --- a/data/net/minecraft/client/gui/components/toasts/ToastComponent.mapping +++ /dev/null @@ -1,26 +0,0 @@ -CLASS net/minecraft/client/gui/components/toasts/ToastComponent - METHOD (Lnet/minecraft/client/Minecraft;)V - ARG 1 minecraft - METHOD addToast (Lnet/minecraft/client/gui/components/toasts/Toast;)V - ARG 1 toast - METHOD findFreeIndex (I)I - ARG 1 slotCount - METHOD getToast (Ljava/lang/Class;Ljava/lang/Object;)Lnet/minecraft/client/gui/components/toasts/Toast; - ARG 1 toastClass - ARG 2 token - METHOD lambda$render$0 (ILnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/gui/components/toasts/ToastComponent$ToastInstance;)Z - ARG 3 toast - METHOD lambda$render$1 (Lnet/minecraft/client/gui/components/toasts/Toast;)Z - ARG 1 toast - METHOD render (Lnet/minecraft/client/gui/GuiGraphics;)V - ARG 1 guiGraphics - CLASS ToastInstance - METHOD (Lnet/minecraft/client/gui/components/toasts/ToastComponent;Lnet/minecraft/client/gui/components/toasts/Toast;II)V - ARG 2 toast - ARG 3 index - ARG 4 slotCount - METHOD getVisibility (J)F - ARG 1 time - METHOD render (ILnet/minecraft/client/gui/GuiGraphics;)Z - ARG 1 screenWidth - ARG 2 guiGraphics diff --git a/data/net/minecraft/client/gui/components/toasts/ToastManager.mapping b/data/net/minecraft/client/gui/components/toasts/ToastManager.mapping new file mode 100644 index 000000000..ee8fb87e3 --- /dev/null +++ b/data/net/minecraft/client/gui/components/toasts/ToastManager.mapping @@ -0,0 +1,22 @@ +CLASS net/minecraft/client/gui/components/toasts/ToastManager + METHOD (Lnet/minecraft/client/Minecraft;)V + ARG 1 minecraft + METHOD addToast (Lnet/minecraft/client/gui/components/toasts/Toast;)V + ARG 1 toast + METHOD findFreeSlotsIndex (I)I + ARG 1 slots + METHOD getToast (Ljava/lang/Class;Ljava/lang/Object;)Lnet/minecraft/client/gui/components/toasts/Toast; + ARG 1 toastClass + ARG 2 token + METHOD render (Lnet/minecraft/client/gui/GuiGraphics;)V + ARG 1 guiGraphics + CLASS ToastInstance + METHOD (Lnet/minecraft/client/gui/components/toasts/ToastManager;Lnet/minecraft/client/gui/components/toasts/Toast;II)V + ARG 2 toast + ARG 3 firstSlotIndex + ARG 4 occupiedSlotCount + METHOD calculateVisiblePortion (J)V + ARG 1 visibilityTime + METHOD render (Lnet/minecraft/client/gui/GuiGraphics;I)V + ARG 1 guiGraphics + ARG 2 guiWidth diff --git a/data/net/minecraft/client/gui/components/toasts/TutorialToast.mapping b/data/net/minecraft/client/gui/components/toasts/TutorialToast.mapping index 9af5d84b9..8e521f5a9 100644 --- a/data/net/minecraft/client/gui/components/toasts/TutorialToast.mapping +++ b/data/net/minecraft/client/gui/components/toasts/TutorialToast.mapping @@ -4,6 +4,12 @@ CLASS net/minecraft/client/gui/components/toasts/TutorialToast ARG 2 title ARG 3 message ARG 4 progressable + METHOD (Lnet/minecraft/client/gui/components/toasts/TutorialToast$Icons;Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;ZI)V + ARG 1 icon + ARG 2 title + ARG 3 message + ARG 4 progressable + ARG 5 timeToDisplayMs METHOD updateProgress (F)V ARG 1 progress CLASS Icons diff --git a/data/net/minecraft/client/gui/font/CodepointMap.mapping b/data/net/minecraft/client/gui/font/CodepointMap.mapping index 4906b59e5..d3f1c5171 100644 --- a/data/net/minecraft/client/gui/font/CodepointMap.mapping +++ b/data/net/minecraft/client/gui/font/CodepointMap.mapping @@ -15,6 +15,8 @@ CLASS net/minecraft/client/gui/font/CodepointMap METHOD put (ILjava/lang/Object;)Ljava/lang/Object; ARG 1 index ARG 2 value + METHOD remove (I)Ljava/lang/Object; + ARG 1 index CLASS Output METHOD accept (ILjava/lang/Object;)V ARG 1 index diff --git a/data/net/minecraft/client/gui/font/FontManager.mapping b/data/net/minecraft/client/gui/font/FontManager.mapping index fcff5f4f4..c4a93fe51 100644 --- a/data/net/minecraft/client/gui/font/FontManager.mapping +++ b/data/net/minecraft/client/gui/font/FontManager.mapping @@ -15,8 +15,6 @@ CLASS net/minecraft/client/gui/font/FontManager ARG 1 fontSet METHOD lambda$new$0 (Lnet/minecraft/client/gui/font/FontSet;)V ARG 0 fontSet - METHOD lambda$reload$1 (Lnet/minecraft/util/profiling/ProfilerFiller;Lnet/minecraft/client/gui/font/FontManager$Preparation;)V - ARG 2 preparation METHOD loadResourceStack (Ljava/util/List;Lnet/minecraft/resources/ResourceLocation;)Ljava/util/List; ARG 0 resources ARG 1 fontId diff --git a/data/net/minecraft/client/gui/font/glyphs/BakedGlyph.mapping b/data/net/minecraft/client/gui/font/glyphs/BakedGlyph.mapping index b7a6efeeb..58f454f97 100644 --- a/data/net/minecraft/client/gui/font/glyphs/BakedGlyph.mapping +++ b/data/net/minecraft/client/gui/font/glyphs/BakedGlyph.mapping @@ -9,17 +9,19 @@ CLASS net/minecraft/client/gui/font/glyphs/BakedGlyph ARG 7 right ARG 8 up ARG 9 down - METHOD render (ZFFLorg/joml/Matrix4f;Lcom/mojang/blaze3d/vertex/VertexConsumer;FFFFI)V + METHOD render (ZFFLorg/joml/Matrix4f;Lcom/mojang/blaze3d/vertex/VertexConsumer;II)V ARG 1 italic ARG 2 x ARG 3 y - ARG 4 matrix + ARG 4 pose ARG 5 buffer - ARG 6 red - ARG 7 green - ARG 8 blue - ARG 9 alpha - ARG 10 packedLight + ARG 6 color + ARG 7 packedLight + METHOD renderChar (Lnet/minecraft/client/gui/font/glyphs/BakedGlyph$GlyphInstance;Lorg/joml/Matrix4f;Lcom/mojang/blaze3d/vertex/VertexConsumer;I)V + ARG 1 glyph + ARG 2 pose + ARG 3 buffer + ARG 4 packedLight METHOD renderEffect (Lnet/minecraft/client/gui/font/glyphs/BakedGlyph$Effect;Lorg/joml/Matrix4f;Lcom/mojang/blaze3d/vertex/VertexConsumer;I)V ARG 1 effect ARG 2 matrix @@ -28,13 +30,10 @@ CLASS net/minecraft/client/gui/font/glyphs/BakedGlyph METHOD renderType (Lnet/minecraft/client/gui/Font$DisplayMode;)Lnet/minecraft/client/renderer/RenderType; ARG 1 displayMode CLASS Effect - METHOD (FFFFFFFFF)V + METHOD (FFFFFI)V ARG 1 x0 ARG 2 y0 ARG 3 x1 ARG 4 y1 ARG 5 depth - ARG 6 r - ARG 7 g - ARG 8 b - ARG 9 a + ARG 6 color diff --git a/data/net/minecraft/client/gui/font/providers/UnihexProvider.mapping b/data/net/minecraft/client/gui/font/providers/UnihexProvider.mapping index e64602a50..f25e058c0 100644 --- a/data/net/minecraft/client/gui/font/providers/UnihexProvider.mapping +++ b/data/net/minecraft/client/gui/font/providers/UnihexProvider.mapping @@ -32,11 +32,15 @@ CLASS net/minecraft/client/gui/font/providers/UnihexProvider METHOD (Lnet/minecraft/resources/ResourceLocation;Ljava/util/List;)V ARG 1 hexFile ARG 2 sizeOverrides + METHOD lambda$static$2 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD load (Lnet/minecraft/server/packs/resources/ResourceManager;)Lcom/mojang/blaze3d/font/GlyphProvider; ARG 1 resourceManager METHOD loadData (Ljava/io/InputStream;)Lnet/minecraft/client/gui/font/providers/UnihexProvider; ARG 1 inputStream CLASS Dimensions + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD left (I)I ARG 0 packedDimensions METHOD pack (II)I @@ -55,6 +59,13 @@ CLASS net/minecraft/client/gui/font/providers/UnihexProvider METHOD read (ILit/unimi/dsi/fastutil/bytes/ByteList;)Lnet/minecraft/client/gui/font/providers/UnihexProvider$LineData; ARG 0 index ARG 1 byteList + CLASS ReaderOutput + METHOD accept (ILnet/minecraft/client/gui/font/providers/UnihexProvider$LineData;)V + ARG 1 codepoint + ARG 2 lineData + CLASS OverrideRange + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS ShortContents METHOD read (ILit/unimi/dsi/fastutil/bytes/ByteList;)Lnet/minecraft/client/gui/font/providers/UnihexProvider$LineData; ARG 0 index diff --git a/data/net/minecraft/client/gui/screens/BackupConfirmScreen.mapping b/data/net/minecraft/client/gui/screens/BackupConfirmScreen.mapping index 909a72239..66eafa1ca 100644 --- a/data/net/minecraft/client/gui/screens/BackupConfirmScreen.mapping +++ b/data/net/minecraft/client/gui/screens/BackupConfirmScreen.mapping @@ -1,4 +1,11 @@ CLASS net/minecraft/client/gui/screens/BackupConfirmScreen + METHOD (Ljava/lang/Runnable;Lnet/minecraft/client/gui/screens/BackupConfirmScreen$Listener;Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;Z)V + ARG 1 onCancel + ARG 2 onProceed + ARG 3 title + ARG 4 description + ARG 5 confirmation + ARG 6 promptForCacheErase METHOD (Ljava/lang/Runnable;Lnet/minecraft/client/gui/screens/BackupConfirmScreen$Listener;Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;Z)V ARG 1 onCancel ARG 2 onProceed diff --git a/data/net/minecraft/client/gui/screens/LevelLoadingScreen.mapping b/data/net/minecraft/client/gui/screens/LevelLoadingScreen.mapping index 9236536ad..0ce6b3514 100644 --- a/data/net/minecraft/client/gui/screens/LevelLoadingScreen.mapping +++ b/data/net/minecraft/client/gui/screens/LevelLoadingScreen.mapping @@ -1,10 +1,12 @@ CLASS net/minecraft/client/gui/screens/LevelLoadingScreen METHOD (Lnet/minecraft/server/level/progress/StoringChunkProgressListener;)V ARG 1 progressListener - METHOD lambda$static$1 (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V + METHOD lambda$static$0 (Lit/unimi/dsi/fastutil/objects/Object2IntOpenHashMap;)V ARG 0 map METHOD renderChunks (Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/server/level/progress/StoringChunkProgressListener;IIII)V ARG 0 guiGraphics ARG 1 progressListener ARG 2 x ARG 3 y + ARG 4 size + ARG 5 spacing diff --git a/data/net/minecraft/client/gui/screens/Screen.mapping b/data/net/minecraft/client/gui/screens/Screen.mapping index b876fa813..fb801ed5c 100644 --- a/data/net/minecraft/client/gui/screens/Screen.mapping +++ b/data/net/minecraft/client/gui/screens/Screen.mapping @@ -11,6 +11,8 @@ CLASS net/minecraft/client/gui/screens/Screen ARG 1 path METHOD createArrowEvent (Lnet/minecraft/client/gui/navigation/ScreenDirection;)Lnet/minecraft/client/gui/navigation/FocusNavigationEvent$ArrowNavigation; ARG 1 direction + METHOD fillCrashDetails (Lnet/minecraft/CrashReport;)V + ARG 1 crashReport METHOD findNarratableWidget (Ljava/util/List;Lnet/minecraft/client/gui/narration/NarratableEntry;)Lnet/minecraft/client/gui/screens/Screen$NarratableSearchResult; ARG 0 entries ARG 1 target @@ -45,6 +47,8 @@ CLASS net/minecraft/client/gui/screens/Screen ARG 1 keyCode ARG 2 scanCode ARG 3 modifiers + METHOD lambda$handleComponentClicked$2 (Ljava/net/URI;Z)V + ARG 2 confirmed METHOD onFilesDrop (Ljava/util/List;)V ARG 1 packs METHOD removeWidget (Lnet/minecraft/client/gui/components/events/GuiEventListener;)V @@ -54,8 +58,6 @@ CLASS net/minecraft/client/gui/screens/Screen ARG 2 mouseX ARG 3 mouseY ARG 4 partialTick - METHOD renderBlurredBackground (F)V - ARG 1 partialTick METHOD renderMenuBackground (Lnet/minecraft/client/gui/GuiGraphics;)V ARG 1 partialTick METHOD renderMenuBackground (Lnet/minecraft/client/gui/GuiGraphics;IIII)V @@ -116,10 +118,6 @@ CLASS net/minecraft/client/gui/screens/Screen ARG 1 output METHOD updateNarratorStatus (Z)V ARG 1 narratorEnabled - METHOD wrapScreenError (Ljava/lang/Runnable;Ljava/lang/String;Ljava/lang/String;)V - ARG 0 action - ARG 1 errorDesc - ARG 2 screenName CLASS NarratableSearchResult METHOD (Lnet/minecraft/client/gui/narration/NarratableEntry;ILnet/minecraft/client/gui/narration/NarratableEntry$NarrationPriority;)V ARG 1 entry diff --git a/data/net/minecraft/client/gui/screens/TitleScreen.mapping b/data/net/minecraft/client/gui/screens/TitleScreen.mapping index 4aeb080cb..d3956b396 100644 --- a/data/net/minecraft/client/gui/screens/TitleScreen.mapping +++ b/data/net/minecraft/client/gui/screens/TitleScreen.mapping @@ -8,18 +8,17 @@ CLASS net/minecraft/client/gui/screens/TitleScreen ARG 2 logoRenderer METHOD confirmDemo (Z)V ARG 1 confirmed - METHOD createDemoMenuOptions (II)V - COMMENT Adds Demo buttons on Main Menu for players who are playing Demo. + METHOD createDemoMenuOptions (II)I ARG 1 y ARG 2 rowHeight - METHOD createNormalMenuOptions (II)V - COMMENT Adds Singleplayer and Multiplayer buttons on Main Menu for players who have bought the game. + METHOD createNormalMenuOptions (II)I + ARG 1 y + ARG 2 rowHeight + METHOD createTestWorldButton (II)I ARG 1 y ARG 2 rowHeight METHOD fadeWidgets (F)V ARG 1 alpha - METHOD lambda$createNormalMenuOptions$6 (Lnet/minecraft/client/gui/components/Button;)V - ARG 1 button METHOD lambda$createNormalMenuOptions$7 (Lnet/minecraft/client/gui/components/Button;)V ARG 1 button METHOD lambda$createNormalMenuOptions$8 (Lnet/minecraft/client/gui/components/Button;)V diff --git a/data/net/minecraft/client/gui/screens/inventory/AbstractContainerScreen.mapping b/data/net/minecraft/client/gui/screens/inventory/AbstractContainerScreen.mapping index bdc31a1c4..98e134852 100644 --- a/data/net/minecraft/client/gui/screens/inventory/AbstractContainerScreen.mapping +++ b/data/net/minecraft/client/gui/screens/inventory/AbstractContainerScreen.mapping @@ -25,12 +25,14 @@ CLASS net/minecraft/client/gui/screens/inventory/AbstractContainerScreen ARG 1 menu ARG 2 playerInventory ARG 3 title + METHOD addItemSlotMouseAction (Lnet/minecraft/client/gui/ItemSlotMouseAction;)V + ARG 1 itemSlotMouseAction METHOD checkHotbarKeyPressed (II)Z ARG 1 keyCode ARG 2 scanCode METHOD checkHotbarMouseClicked (I)V ARG 1 keyCode - METHOD findSlot (DD)Lnet/minecraft/world/inventory/Slot; + METHOD getHoveredSlot (DD)Lnet/minecraft/world/inventory/Slot; ARG 1 mouseX ARG 3 mouseY METHOD getTooltipFromContainerItem (Lnet/minecraft/world/item/ItemStack;)Ljava/util/List; @@ -74,6 +76,11 @@ CLASS net/minecraft/client/gui/screens/inventory/AbstractContainerScreen ARG 1 mouseX ARG 3 mouseY ARG 5 button + METHOD onMouseClickAction (Lnet/minecraft/world/inventory/Slot;Lnet/minecraft/world/inventory/ClickType;)V + ARG 1 slot + ARG 2 type + METHOD onStopHovering (Lnet/minecraft/world/inventory/Slot;)V + ARG 1 slot METHOD renderBg (Lnet/minecraft/client/gui/GuiGraphics;FII)V ARG 1 guiGraphics ARG 2 partialTick @@ -92,15 +99,18 @@ CLASS net/minecraft/client/gui/screens/inventory/AbstractContainerScreen METHOD renderSlot (Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/world/inventory/Slot;)V ARG 1 guiGraphics ARG 2 slot - METHOD renderSlotHighlight (Lnet/minecraft/client/gui/GuiGraphics;III)V - ARG 0 guiGraphics - ARG 1 x - ARG 2 y - ARG 3 blitOffset + METHOD renderSlotHighlightBack (Lnet/minecraft/client/gui/GuiGraphics;)V + ARG 1 guiGraphics + METHOD renderSlotHighlightFront (Lnet/minecraft/client/gui/GuiGraphics;)V + ARG 1 guiGraphics + METHOD renderSlots (Lnet/minecraft/client/gui/GuiGraphics;)V + ARG 1 guiGraphics METHOD renderTooltip (Lnet/minecraft/client/gui/GuiGraphics;II)V ARG 1 guiGraphics ARG 2 x ARG 3 y + METHOD showTooltipWithItemInHand (Lnet/minecraft/world/item/ItemStack;)Z + ARG 1 stack METHOD slotClicked (Lnet/minecraft/world/inventory/Slot;IILnet/minecraft/world/inventory/ClickType;)V COMMENT Called when the mouse is clicked over a slot or outside the gui. ARG 1 slot diff --git a/data/net/minecraft/client/gui/screens/inventory/AbstractFurnaceScreen.mapping b/data/net/minecraft/client/gui/screens/inventory/AbstractFurnaceScreen.mapping index 763b89e82..5a2bced9b 100644 --- a/data/net/minecraft/client/gui/screens/inventory/AbstractFurnaceScreen.mapping +++ b/data/net/minecraft/client/gui/screens/inventory/AbstractFurnaceScreen.mapping @@ -1,34 +1,10 @@ CLASS net/minecraft/client/gui/screens/inventory/AbstractFurnaceScreen - METHOD (Lnet/minecraft/world/inventory/AbstractFurnaceMenu;Lnet/minecraft/client/gui/screens/recipebook/AbstractFurnaceRecipeBookComponent;Lnet/minecraft/world/entity/player/Inventory;Lnet/minecraft/network/chat/Component;Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/resources/ResourceLocation;)V + METHOD (Lnet/minecraft/world/inventory/AbstractFurnaceMenu;Lnet/minecraft/world/entity/player/Inventory;Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/resources/ResourceLocation;Ljava/util/List;)V ARG 1 menu - ARG 2 recipeBookComponent - ARG 3 playerInventory - ARG 4 title + ARG 2 playerInventory + ARG 3 title + ARG 4 recipeFilterName ARG 5 texture - ARG 6 listProgressSprite + ARG 6 litProgressSprite ARG 7 burnProgressSprite - METHOD charTyped (CI)Z - ARG 1 codePoint - ARG 2 modifiers - METHOD hasClickedOutside (DDIII)Z - ARG 1 mouseX - ARG 3 mouseY - ARG 5 guiLeft - ARG 6 guiTop - ARG 7 mouseButton - METHOD keyPressed (III)Z - ARG 1 keyCode - ARG 2 scanCode - ARG 3 modifiers - METHOD lambda$init$0 (Lnet/minecraft/client/gui/components/Button;)V - ARG 1 recipeButton - METHOD mouseClicked (DDI)Z - ARG 1 mouseX - ARG 3 mouseY - ARG 5 button - METHOD slotClicked (Lnet/minecraft/world/inventory/Slot;IILnet/minecraft/world/inventory/ClickType;)V - COMMENT Called when the mouse is clicked over a slot or outside the gui. - ARG 1 slot - ARG 2 slotId - ARG 3 mouseButton - ARG 4 type + ARG 8 tabInfos diff --git a/data/net/minecraft/client/gui/screens/inventory/AbstractRecipeBookScreen.mapping b/data/net/minecraft/client/gui/screens/inventory/AbstractRecipeBookScreen.mapping new file mode 100644 index 000000000..53776ca31 --- /dev/null +++ b/data/net/minecraft/client/gui/screens/inventory/AbstractRecipeBookScreen.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/client/gui/screens/inventory/AbstractRecipeBookScreen + METHOD (Lnet/minecraft/world/inventory/RecipeBookMenu;Lnet/minecraft/client/gui/screens/recipebook/RecipeBookComponent;Lnet/minecraft/world/entity/player/Inventory;Lnet/minecraft/network/chat/Component;)V + ARG 1 menu + ARG 2 recipeBookComponent + ARG 3 playerInventory + ARG 4 title + METHOD lambda$initButton$0 (Lnet/minecraft/client/gui/components/Button;)V + ARG 1 button diff --git a/data/net/minecraft/client/gui/screens/inventory/AbstractSignEditScreen.mapping b/data/net/minecraft/client/gui/screens/inventory/AbstractSignEditScreen.mapping index bc889a47b..4008d7c13 100644 --- a/data/net/minecraft/client/gui/screens/inventory/AbstractSignEditScreen.mapping +++ b/data/net/minecraft/client/gui/screens/inventory/AbstractSignEditScreen.mapping @@ -19,9 +19,8 @@ CLASS net/minecraft/client/gui/screens/inventory/AbstractSignEditScreen ARG 2 state METHOD renderSign (Lnet/minecraft/client/gui/GuiGraphics;)V ARG 1 guiGraphics - METHOD renderSignBackground (Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/world/level/block/state/BlockState;)V + METHOD renderSignBackground (Lnet/minecraft/client/gui/GuiGraphics;)V ARG 1 guiGraphics - ARG 2 state METHOD renderSignText (Lnet/minecraft/client/gui/GuiGraphics;)V ARG 1 guiGraphics METHOD setMessage (Ljava/lang/String;)V diff --git a/data/net/minecraft/client/gui/screens/inventory/BookEditScreen.mapping b/data/net/minecraft/client/gui/screens/inventory/BookEditScreen.mapping index 295be6529..e36149129 100644 --- a/data/net/minecraft/client/gui/screens/inventory/BookEditScreen.mapping +++ b/data/net/minecraft/client/gui/screens/inventory/BookEditScreen.mapping @@ -7,10 +7,11 @@ CLASS net/minecraft/client/gui/screens/inventory/BookEditScreen COMMENT Determines if the signing screen is open FIELD lastClickTime J COMMENT In milliseconds - METHOD (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/InteractionHand;)V + METHOD (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/component/WritableBookContent;)V ARG 1 owner ARG 2 book ARG 3 hand + ARG 4 content METHOD appendPageToBook ()V COMMENT Adds a new page to the book (capped at 100 pages) METHOD bookKeyPressed (III)Z @@ -60,10 +61,16 @@ CLASS net/minecraft/client/gui/screens/inventory/BookEditScreen ARG 1 button METHOD lambda$init$9 (Lnet/minecraft/client/gui/components/Button;)V ARG 1 button + METHOD lambda$new$0 (Ljava/lang/String;)Z + ARG 1 string METHOD lambda$new$2 (Ljava/lang/String;)V ARG 1 title METHOD lambda$new$3 (Ljava/lang/String;)Z ARG 0 input + METHOD lambda$rebuildDisplayCache$10 (Lorg/apache/commons/lang3/mutable/MutableInt;Ljava/lang/String;Lorg/apache/commons/lang3/mutable/MutableBoolean;Lit/unimi/dsi/fastutil/ints/IntList;Ljava/util/List;Lnet/minecraft/network/chat/Style;II)V + ARG 6 style + ARG 7 pos + ARG 8 width METHOD mouseClicked (DDI)Z ARG 1 mouseX ARG 3 mouseY diff --git a/data/net/minecraft/client/gui/screens/inventory/CraftingScreen.mapping b/data/net/minecraft/client/gui/screens/inventory/CraftingScreen.mapping index 675bb24ca..b0f4361f1 100644 --- a/data/net/minecraft/client/gui/screens/inventory/CraftingScreen.mapping +++ b/data/net/minecraft/client/gui/screens/inventory/CraftingScreen.mapping @@ -3,28 +3,3 @@ CLASS net/minecraft/client/gui/screens/inventory/CraftingScreen ARG 1 menu ARG 2 playerInventory ARG 3 title - METHOD hasClickedOutside (DDIII)Z - ARG 1 mouseX - ARG 3 mouseY - ARG 5 guiLeft - ARG 6 guiTop - ARG 7 mouseButton - METHOD isHovering (IIIIDD)Z - ARG 1 x - ARG 2 y - ARG 3 width - ARG 4 height - ARG 5 mouseX - ARG 7 mouseY - METHOD lambda$init$0 (Lnet/minecraft/client/gui/components/Button;)V - ARG 1 recipeButton - METHOD mouseClicked (DDI)Z - ARG 1 mouseX - ARG 3 mouseY - ARG 5 button - METHOD slotClicked (Lnet/minecraft/world/inventory/Slot;IILnet/minecraft/world/inventory/ClickType;)V - COMMENT Called when the mouse is clicked over a slot or outside the gui. - ARG 1 slot - ARG 2 slotId - ARG 3 mouseButton - ARG 4 type diff --git a/data/net/minecraft/client/gui/screens/inventory/EffectRenderingInventoryScreen.mapping b/data/net/minecraft/client/gui/screens/inventory/EffectsInInventory.mapping similarity index 55% rename from data/net/minecraft/client/gui/screens/inventory/EffectRenderingInventoryScreen.mapping rename to data/net/minecraft/client/gui/screens/inventory/EffectsInInventory.mapping index 238c072ca..9a564be71 100644 --- a/data/net/minecraft/client/gui/screens/inventory/EffectRenderingInventoryScreen.mapping +++ b/data/net/minecraft/client/gui/screens/inventory/EffectsInInventory.mapping @@ -1,24 +1,31 @@ -CLASS net/minecraft/client/gui/screens/inventory/EffectRenderingInventoryScreen +CLASS net/minecraft/client/gui/screens/inventory/EffectsInInventory + METHOD (Lnet/minecraft/client/gui/screens/inventory/AbstractContainerScreen;)V + ARG 1 screen METHOD getEffectName (Lnet/minecraft/world/effect/MobEffectInstance;)Lnet/minecraft/network/chat/Component; ARG 1 effect + METHOD render (Lnet/minecraft/client/gui/GuiGraphics;IIF)V + ARG 1 guiGraphics + ARG 2 mouseX + ARG 3 mouseY + ARG 4 partialTick METHOD renderBackgrounds (Lnet/minecraft/client/gui/GuiGraphics;IILjava/lang/Iterable;Z)V ARG 1 guiGraphics - ARG 2 renderX - ARG 3 yOffset - ARG 4 effects - ARG 5 isSmall + ARG 2 x + ARG 3 y + ARG 4 activeEffects + ARG 5 large METHOD renderEffects (Lnet/minecraft/client/gui/GuiGraphics;II)V ARG 1 guiGraphics ARG 2 mouseX ARG 3 mouseY METHOD renderIcons (Lnet/minecraft/client/gui/GuiGraphics;IILjava/lang/Iterable;Z)V ARG 1 guiGraphics - ARG 2 renderX - ARG 3 yOffset - ARG 4 effects - ARG 5 isSmall + ARG 2 x + ARG 3 y + ARG 4 activeEffects + ARG 5 large METHOD renderLabels (Lnet/minecraft/client/gui/GuiGraphics;IILjava/lang/Iterable;)V ARG 1 guiGraphics - ARG 2 renderX - ARG 3 yOffset - ARG 4 effects + ARG 2 x + ARG 3 y + ARG 4 activeEffects diff --git a/data/net/minecraft/client/gui/screens/inventory/InventoryScreen.mapping b/data/net/minecraft/client/gui/screens/inventory/InventoryScreen.mapping index 8fc586f9a..9201fe663 100644 --- a/data/net/minecraft/client/gui/screens/inventory/InventoryScreen.mapping +++ b/data/net/minecraft/client/gui/screens/inventory/InventoryScreen.mapping @@ -5,25 +5,6 @@ CLASS net/minecraft/client/gui/screens/inventory/InventoryScreen COMMENT The old y position of the mouse pointer METHOD (Lnet/minecraft/world/entity/player/Player;)V ARG 1 player - METHOD hasClickedOutside (DDIII)Z - ARG 1 mouseX - ARG 3 mouseY - ARG 5 guiLeft - ARG 6 guiTop - ARG 7 mouseButton - METHOD isHovering (IIIIDD)Z - ARG 1 x - ARG 2 y - ARG 3 width - ARG 4 height - ARG 5 mouseX - ARG 7 mouseY - METHOD lambda$init$0 (Lnet/minecraft/client/gui/components/Button;)V - ARG 1 recipeButton - METHOD mouseClicked (DDI)Z - ARG 1 mouseX - ARG 3 mouseY - ARG 5 button METHOD mouseReleased (DDI)Z ARG 1 mouseX ARG 3 mouseY @@ -48,9 +29,3 @@ CLASS net/minecraft/client/gui/screens/inventory/InventoryScreen ARG 7 mouseX ARG 8 mouseY ARG 9 entity - METHOD slotClicked (Lnet/minecraft/world/inventory/Slot;IILnet/minecraft/world/inventory/ClickType;)V - COMMENT Called when the mouse is clicked over a slot or outside the gui. - ARG 1 slot - ARG 2 slotId - ARG 3 mouseButton - ARG 4 type diff --git a/data/net/minecraft/client/gui/screens/inventory/tooltip/ClientBundleTooltip.mapping b/data/net/minecraft/client/gui/screens/inventory/tooltip/ClientBundleTooltip.mapping index ef4fd9cd8..1f57a95cc 100644 --- a/data/net/minecraft/client/gui/screens/inventory/tooltip/ClientBundleTooltip.mapping +++ b/data/net/minecraft/client/gui/screens/inventory/tooltip/ClientBundleTooltip.mapping @@ -1,20 +1,64 @@ CLASS net/minecraft/client/gui/screens/inventory/tooltip/ClientBundleTooltip METHOD (Lnet/minecraft/world/item/component/BundleContents;)V ARG 1 contents - METHOD blit (Lnet/minecraft/client/gui/GuiGraphics;IILnet/minecraft/client/gui/screens/inventory/tooltip/ClientBundleTooltip$Texture;)V - ARG 1 guiGraphics - ARG 2 x - ARG 3 y - ARG 4 texture - METHOD renderSlot (IIIZLnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/gui/Font;)V + METHOD drawEmptyBundleDescriptionText (IILnet/minecraft/client/gui/Font;Lnet/minecraft/client/gui/GuiGraphics;)V + ARG 0 x + ARG 1 y + ARG 2 font + ARG 3 guiGraphics + METHOD drawProgressbar (IILnet/minecraft/client/gui/Font;Lnet/minecraft/client/gui/GuiGraphics;)V ARG 1 x ARG 2 y - ARG 3 itemIndex - ARG 4 isBundleFull - ARG 5 guiGraphics + ARG 3 font + ARG 4 guiGraphics + METHOD drawSelectedItemTooltip (Lnet/minecraft/client/gui/Font;Lnet/minecraft/client/gui/GuiGraphics;III)V + ARG 1 font + ARG 2 guiGraphics + ARG 3 x + ARG 4 y + ARG 5 width + METHOD getAmountOfHiddenItems (Ljava/util/List;)I + ARG 1 shownItems + METHOD getContentXOffset (I)I + ARG 1 width + METHOD getEmptyBundleBackgroundHeight (Lnet/minecraft/client/gui/Font;)I + ARG 0 font + METHOD getEmptyBundleDescriptionTextHeight (Lnet/minecraft/client/gui/Font;)I + ARG 0 font + METHOD getShownItems (I)Ljava/util/List; + ARG 1 itemsToShow + METHOD renderBundleWithItemsTooltip (Lnet/minecraft/client/gui/Font;IIIILnet/minecraft/client/gui/GuiGraphics;)V + ARG 1 font + ARG 2 x + ARG 3 y + ARG 4 width + ARG 5 height + ARG 6 guiGraphics + METHOD renderCount (IIILnet/minecraft/client/gui/Font;Lnet/minecraft/client/gui/GuiGraphics;)V + ARG 0 slotX + ARG 1 slotY + ARG 2 count + ARG 3 font + ARG 4 guiGraphics + METHOD renderEmptyBundleTooltip (Lnet/minecraft/client/gui/Font;IIIILnet/minecraft/client/gui/GuiGraphics;)V + ARG 1 font + ARG 2 x + ARG 3 y + ARG 4 width + ARG 5 height + ARG 6 guiGraphics + METHOD renderSlot (IIILjava/util/List;ILnet/minecraft/client/gui/Font;Lnet/minecraft/client/gui/GuiGraphics;)V + ARG 1 slotIndex + ARG 2 x + ARG 3 y + ARG 4 shownItems + ARG 5 seed ARG 6 font - CLASS Texture - METHOD (Ljava/lang/String;ILnet/minecraft/resources/ResourceLocation;II)V - ARG 3 sprite - ARG 4 w - ARG 5 h + ARG 7 guiGraphics + METHOD shouldRenderItemSlot (Ljava/util/List;I)Z + ARG 0 shownItems + ARG 1 slotIndex + METHOD shouldRenderSurplusText (ZII)Z + ARG 0 hasEnoughItems + ARG 1 cellX + ARG 2 cellY diff --git a/data/net/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipComponent.mapping b/data/net/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipComponent.mapping index 62affcfbe..e237cc3d6 100644 --- a/data/net/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipComponent.mapping +++ b/data/net/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipComponent.mapping @@ -3,13 +3,17 @@ CLASS net/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipComponent ARG 0 text METHOD create (Lnet/minecraft/world/inventory/tooltip/TooltipComponent;)Lnet/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipComponent; ARG 0 visualTooltipComponent + METHOD getHeight (Lnet/minecraft/client/gui/Font;)I + ARG 1 font METHOD getWidth (Lnet/minecraft/client/gui/Font;)I ARG 1 font - METHOD renderImage (Lnet/minecraft/client/gui/Font;IILnet/minecraft/client/gui/GuiGraphics;)V + METHOD renderImage (Lnet/minecraft/client/gui/Font;IIIILnet/minecraft/client/gui/GuiGraphics;)V ARG 1 font ARG 2 x ARG 3 y - ARG 4 guiGraphics + ARG 4 width + ARG 5 height + ARG 6 guiGraphics METHOD renderText (Lnet/minecraft/client/gui/Font;IILorg/joml/Matrix4f;Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;)V ARG 1 font ARG 2 mouseX diff --git a/data/net/minecraft/client/gui/screens/inventory/tooltip/TooltipRenderUtil.mapping b/data/net/minecraft/client/gui/screens/inventory/tooltip/TooltipRenderUtil.mapping index 1d80625b1..24ce93334 100644 --- a/data/net/minecraft/client/gui/screens/inventory/tooltip/TooltipRenderUtil.mapping +++ b/data/net/minecraft/client/gui/screens/inventory/tooltip/TooltipRenderUtil.mapping @@ -1,47 +1,13 @@ CLASS net/minecraft/client/gui/screens/inventory/tooltip/TooltipRenderUtil - METHOD renderFrameGradient (Lnet/minecraft/client/gui/GuiGraphics;IIIIIII)V + METHOD getBackgroundSprite (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/resources/ResourceLocation; + ARG 0 name + METHOD getFrameSprite (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/resources/ResourceLocation; + ARG 0 name + METHOD renderTooltipBackground (Lnet/minecraft/client/gui/GuiGraphics;IIIIILnet/minecraft/resources/ResourceLocation;)V ARG 0 guiGraphics ARG 1 x ARG 2 y ARG 3 width ARG 4 height ARG 5 z - ARG 6 topColor - ARG 7 bottomColor - METHOD renderHorizontalLine (Lnet/minecraft/client/gui/GuiGraphics;IIIII)V - ARG 0 guiGraphics - ARG 1 x - ARG 2 y - ARG 3 length - ARG 4 z - ARG 5 color - METHOD renderRectangle (Lnet/minecraft/client/gui/GuiGraphics;IIIIII)V - ARG 0 guiGraphics - ARG 1 x - ARG 2 y - ARG 3 width - ARG 4 height - ARG 5 z - ARG 6 color - METHOD renderTooltipBackground (Lnet/minecraft/client/gui/GuiGraphics;IIIII)V - ARG 0 guiGraphics - ARG 1 x - ARG 2 y - ARG 3 width - ARG 4 height - ARG 5 z - METHOD renderVerticalLine (Lnet/minecraft/client/gui/GuiGraphics;IIIII)V - ARG 0 guiGraphics - ARG 1 x - ARG 2 y - ARG 3 length - ARG 4 z - ARG 5 color - METHOD renderVerticalLineGradient (Lnet/minecraft/client/gui/GuiGraphics;IIIIII)V - ARG 0 guiGraphics - ARG 1 x - ARG 2 y - ARG 3 length - ARG 4 z - ARG 5 topColor - ARG 6 bottomColor + ARG 6 sprite diff --git a/data/net/minecraft/client/gui/screens/recipebook/AbstractFurnaceRecipeBookComponent.mapping b/data/net/minecraft/client/gui/screens/recipebook/AbstractFurnaceRecipeBookComponent.mapping deleted file mode 100644 index dddb7957e..000000000 --- a/data/net/minecraft/client/gui/screens/recipebook/AbstractFurnaceRecipeBookComponent.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/client/gui/screens/recipebook/AbstractFurnaceRecipeBookComponent - METHOD slotClicked (Lnet/minecraft/world/inventory/Slot;)V - ARG 1 slot diff --git a/data/net/minecraft/client/gui/screens/recipebook/CraftingRecipeBookComponent.mapping b/data/net/minecraft/client/gui/screens/recipebook/CraftingRecipeBookComponent.mapping new file mode 100644 index 000000000..0bb8f5994 --- /dev/null +++ b/data/net/minecraft/client/gui/screens/recipebook/CraftingRecipeBookComponent.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/client/gui/screens/recipebook/CraftingRecipeBookComponent + METHOD (Lnet/minecraft/world/inventory/AbstractCraftingMenu;)V + ARG 1 menu + METHOD canDisplay (Lnet/minecraft/world/item/crafting/display/RecipeDisplay;)Z + ARG 1 recipeDisplay diff --git a/data/net/minecraft/client/gui/screens/recipebook/FurnaceRecipeBookComponent.mapping b/data/net/minecraft/client/gui/screens/recipebook/FurnaceRecipeBookComponent.mapping new file mode 100644 index 000000000..2951c0119 --- /dev/null +++ b/data/net/minecraft/client/gui/screens/recipebook/FurnaceRecipeBookComponent.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/client/gui/screens/recipebook/FurnaceRecipeBookComponent + METHOD (Lnet/minecraft/world/inventory/AbstractFurnaceMenu;Lnet/minecraft/network/chat/Component;Ljava/util/List;)V + ARG 1 menu + ARG 2 recipeFilterName + ARG 3 tabInfos diff --git a/data/net/minecraft/client/gui/screens/recipebook/GhostRecipe.mapping b/data/net/minecraft/client/gui/screens/recipebook/GhostRecipe.mapping deleted file mode 100644 index a9fb88da6..000000000 --- a/data/net/minecraft/client/gui/screens/recipebook/GhostRecipe.mapping +++ /dev/null @@ -1,21 +0,0 @@ -CLASS net/minecraft/client/gui/screens/recipebook/GhostRecipe - METHOD addIngredient (Lnet/minecraft/world/item/crafting/Ingredient;II)V - ARG 1 ingredient - ARG 2 x - ARG 3 y - METHOD get (I)Lnet/minecraft/client/gui/screens/recipebook/GhostRecipe$GhostIngredient; - ARG 1 index - METHOD render (Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/Minecraft;IIZF)V - ARG 1 guiGraphics - ARG 2 minecraft - ARG 3 leftPos - ARG 4 topPos - ARG 5 offset - ARG 6 partialTick - METHOD setRecipe (Lnet/minecraft/world/item/crafting/RecipeHolder;)V - ARG 1 recipe - CLASS GhostIngredient - METHOD (Lnet/minecraft/client/gui/screens/recipebook/GhostRecipe;Lnet/minecraft/world/item/crafting/Ingredient;II)V - ARG 2 ingredient - ARG 3 x - ARG 4 y diff --git a/data/net/minecraft/client/gui/screens/recipebook/GhostSlots.mapping b/data/net/minecraft/client/gui/screens/recipebook/GhostSlots.mapping new file mode 100644 index 000000000..e8cde34f9 --- /dev/null +++ b/data/net/minecraft/client/gui/screens/recipebook/GhostSlots.mapping @@ -0,0 +1,32 @@ +CLASS net/minecraft/client/gui/screens/recipebook/GhostSlots + METHOD (Lnet/minecraft/client/gui/screens/recipebook/SlotSelectTime;)V + ARG 1 slotSelectTime + METHOD lambda$render$0 (ZLnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/Minecraft;Lnet/minecraft/world/inventory/Slot;Lnet/minecraft/client/gui/screens/recipebook/GhostSlots$GhostSlot;)V + ARG 4 slot + ARG 5 ghostSlot + METHOD render (Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/Minecraft;Z)V + ARG 1 guiGraphics + ARG 2 minecraft + ARG 3 isBiggerResultSlot + METHOD renderTooltip (Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/Minecraft;IILnet/minecraft/world/inventory/Slot;)V + ARG 1 guiGraphics + ARG 2 minecraft + ARG 3 mouseX + ARG 4 mouseY + ARG 5 slot + METHOD setInput (Lnet/minecraft/world/inventory/Slot;Lnet/minecraft/util/context/ContextMap;Lnet/minecraft/world/item/crafting/display/SlotDisplay;)V + ARG 1 slot + ARG 2 contextMap + ARG 3 slotDisplay + METHOD setResult (Lnet/minecraft/world/inventory/Slot;Lnet/minecraft/util/context/ContextMap;Lnet/minecraft/world/item/crafting/display/SlotDisplay;)V + ARG 1 slot + ARG 2 contextMap + ARG 3 slotDisplay + METHOD setSlot (Lnet/minecraft/world/inventory/Slot;Lnet/minecraft/util/context/ContextMap;Lnet/minecraft/world/item/crafting/display/SlotDisplay;Z)V + ARG 1 slot + ARG 2 contextMap + ARG 3 slotDisplay + ARG 4 isResultSlot + CLASS GhostSlot + METHOD getItem (I)Lnet/minecraft/world/item/ItemStack; + ARG 1 index diff --git a/data/net/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent.mapping b/data/net/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent.mapping index 9e4094244..3408f45c2 100644 --- a/data/net/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent.mapping +++ b/data/net/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent.mapping @@ -1,9 +1,16 @@ CLASS net/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent - METHOD init (Lnet/minecraft/client/Minecraft;Lnet/minecraft/client/gui/screens/recipebook/RecipeCollection;IIIIF)V - ARG 1 minecraft - ARG 2 collection - ARG 3 x - ARG 4 y + METHOD (Lnet/minecraft/client/gui/screens/recipebook/SlotSelectTime;Z)V + ARG 1 slotSelectTime + ARG 2 isFurnaceMenu + METHOD init (Lnet/minecraft/client/gui/screens/recipebook/RecipeCollection;Lnet/minecraft/util/context/ContextMap;ZIIIIF)V + ARG 1 collection + ARG 2 contextMap + ARG 3 isFiltering + ARG 4 x + ARG 5 y + ARG 6 overlayX + ARG 7 overlayY + ARG 8 width METHOD isMouseOver (DD)Z ARG 1 mouseX ARG 3 mouseY @@ -14,15 +21,44 @@ CLASS net/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent METHOD setVisible (Z)V ARG 1 isVisible CLASS OverlayRecipeButton - METHOD (Lnet/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent;IILnet/minecraft/world/item/crafting/RecipeHolder;Z)V + METHOD (Lnet/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent;IILnet/minecraft/world/item/crafting/display/RecipeDisplayId;ZLjava/util/List;)V ARG 2 x ARG 3 y ARG 4 recipe ARG 5 isCraftable - METHOD calculateIngredientsPositions (Lnet/minecraft/world/item/crafting/RecipeHolder;)V - ARG 1 recipe + ARG 6 slots + METHOD createGridPos (IILjava/util/List;)Lnet/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent$OverlayRecipeButton$Pos; + ARG 0 x + ARG 1 y + ARG 2 possibleItems + METHOD getSprite (Z)Lnet/minecraft/resources/ResourceLocation; + ARG 1 enabled CLASS Pos - METHOD (Lnet/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent$OverlayRecipeButton;II[Lnet/minecraft/world/item/ItemStack;)V - ARG 2 x - ARG 3 y - ARG 4 ingredients + METHOD (IILjava/util/List;)V + ARG 1 x + ARG 2 y + ARG 3 ingredients + METHOD selectIngredient (I)Lnet/minecraft/world/item/ItemStack; + ARG 1 index + CLASS OverlayCraftingRecipeButton + METHOD (Lnet/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent;IILnet/minecraft/world/item/crafting/display/RecipeDisplayId;Lnet/minecraft/world/item/crafting/display/RecipeDisplay;Lnet/minecraft/util/context/ContextMap;Z)V + ARG 2 x + ARG 3 y + ARG 4 recipe + ARG 5 recipeDisplay + ARG 6 contextMap + ARG 7 isCraftable + METHOD calculateIngredientsPositions (Lnet/minecraft/world/item/crafting/display/RecipeDisplay;Lnet/minecraft/util/context/ContextMap;)Ljava/util/List; + ARG 0 recipeDisplay + ARG 1 contextMap + CLASS OverlaySmeltingRecipeButton + METHOD (Lnet/minecraft/client/gui/screens/recipebook/OverlayRecipeComponent;IILnet/minecraft/world/item/crafting/display/RecipeDisplayId;Lnet/minecraft/world/item/crafting/display/RecipeDisplay;Lnet/minecraft/util/context/ContextMap;Z)V + ARG 2 x + ARG 3 y + ARG 4 recipe + ARG 5 recipeDisplay + ARG 6 contextMap + ARG 7 isCraftable + METHOD calculateIngredientsPositions (Lnet/minecraft/world/item/crafting/display/RecipeDisplay;Lnet/minecraft/util/context/ContextMap;)Ljava/util/List; + ARG 0 recipeDisplay + ARG 1 contextMap diff --git a/data/net/minecraft/client/gui/screens/recipebook/RecipeBookComponent.mapping b/data/net/minecraft/client/gui/screens/recipebook/RecipeBookComponent.mapping index 647bd703a..86e4e7a06 100644 --- a/data/net/minecraft/client/gui/screens/recipebook/RecipeBookComponent.mapping +++ b/data/net/minecraft/client/gui/screens/recipebook/RecipeBookComponent.mapping @@ -1,7 +1,16 @@ CLASS net/minecraft/client/gui/screens/recipebook/RecipeBookComponent + METHOD (Lnet/minecraft/world/inventory/RecipeBookMenu;Ljava/util/List;)V + ARG 1 menu + ARG 2 tabInfos METHOD charTyped (CI)Z ARG 1 codePoint ARG 2 modifiers + METHOD fillGhostRecipe (Lnet/minecraft/client/gui/screens/recipebook/GhostSlots;Lnet/minecraft/world/item/crafting/display/RecipeDisplay;Lnet/minecraft/util/context/ContextMap;)V + ARG 1 ghostSlots + ARG 2 recipeDisplay + ARG 3 contextMap + METHOD fillGhostRecipe (Lnet/minecraft/world/item/crafting/display/RecipeDisplay;)V + ARG 1 recipeDisplay METHOD hasClickedOutside (DDIIIII)Z ARG 1 mouseX ARG 3 mouseY @@ -9,12 +18,14 @@ CLASS net/minecraft/client/gui/screens/recipebook/RecipeBookComponent ARG 6 y ARG 7 width ARG 8 height - METHOD init (IILnet/minecraft/client/Minecraft;ZLnet/minecraft/world/inventory/RecipeBookMenu;)V + ARG 9 mouseButton + METHOD init (IILnet/minecraft/client/Minecraft;Z)V ARG 1 width ARG 2 height ARG 3 minecraft ARG 4 widthTooNarrow - ARG 5 menu + METHOD isCraftingSlot (Lnet/minecraft/world/inventory/Slot;)Z + ARG 1 slot METHOD isMouseOver (DD)Z ARG 1 mouseX ARG 3 mouseY @@ -26,6 +37,8 @@ CLASS net/minecraft/client/gui/screens/recipebook/RecipeBookComponent ARG 1 keyCode ARG 2 scanCode ARG 3 modifiers + METHOD lambda$initVisuals$1 (Lnet/minecraft/client/gui/screens/recipebook/RecipeBookTabButton;)Z + ARG 1 button METHOD mouseClicked (DDI)Z ARG 1 mouseX ARG 3 mouseY @@ -33,34 +46,41 @@ CLASS net/minecraft/client/gui/screens/recipebook/RecipeBookComponent METHOD pirateSpeechForThePeople (Ljava/lang/String;)V COMMENT Check if we should activate the pirate speak easter egg. ARG 1 text - METHOD recipesShown (Ljava/util/List;)V - ARG 1 recipes - METHOD renderGhostRecipe (Lnet/minecraft/client/gui/GuiGraphics;IIZF)V - ARG 1 guiGraphics - ARG 2 leftPos - ARG 3 topPos - ARG 5 partialTick - METHOD renderGhostRecipeTooltip (Lnet/minecraft/client/gui/GuiGraphics;IIII)V + METHOD recipeShown (Lnet/minecraft/world/item/crafting/display/RecipeDisplayId;)V + ARG 1 recipe + METHOD renderGhostRecipe (Lnet/minecraft/client/gui/GuiGraphics;Z)V ARG 1 guiGraphics - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY - METHOD renderTooltip (Lnet/minecraft/client/gui/GuiGraphics;IIII)V + ARG 2 isBiggerResultSlot + METHOD renderTooltip (Lnet/minecraft/client/gui/GuiGraphics;IILnet/minecraft/world/inventory/Slot;)V ARG 1 guiGraphics - ARG 2 renderX - ARG 3 renderY - ARG 4 mouseX - ARG 5 mouseY + ARG 2 mouseX + ARG 3 mouseY + ARG 4 slot + METHOD selectMatchingRecipes (Lnet/minecraft/client/gui/screens/recipebook/RecipeCollection;Lnet/minecraft/world/entity/player/StackedItemContents;)V + ARG 1 possibleRecipes + ARG 2 stackedItemContents METHOD setVisible (Z)V ARG 1 visible - METHOD setupGhostRecipe (Lnet/minecraft/world/item/crafting/RecipeHolder;Ljava/util/List;)V - ARG 1 recipe - ARG 2 slots METHOD slotClicked (Lnet/minecraft/world/inventory/Slot;)V ARG 1 slot - METHOD updateCollections (Z)V + METHOD tryPlaceRecipe (Lnet/minecraft/client/gui/screens/recipebook/RecipeCollection;Lnet/minecraft/world/item/crafting/display/RecipeDisplayId;)Z + ARG 1 recipeCollection + ARG 2 recipe + METHOD updateCollections (ZZ)V ARG 1 resetPageNumber + ARG 2 isFiltering METHOD updateScreenPosition (II)I ARG 1 width ARG 2 imageWidth + METHOD updateTabs (Z)V + ARG 1 isFiltering + CLASS TabInfo + METHOD (Lnet/minecraft/client/gui/screens/recipebook/SearchRecipeBookCategory;)V + ARG 1 category + METHOD (Lnet/minecraft/world/item/Item;Lnet/minecraft/world/item/Item;Lnet/minecraft/world/item/crafting/RecipeBookCategory;)V + ARG 1 primaryIcon + ARG 2 secondaryIcon + ARG 3 category + METHOD (Lnet/minecraft/world/item/Item;Lnet/minecraft/world/item/crafting/RecipeBookCategory;)V + ARG 1 primaryIcon + ARG 2 category diff --git a/data/net/minecraft/client/gui/screens/recipebook/RecipeBookPage.mapping b/data/net/minecraft/client/gui/screens/recipebook/RecipeBookPage.mapping index 823625ee6..7d24e2b2c 100644 --- a/data/net/minecraft/client/gui/screens/recipebook/RecipeBookPage.mapping +++ b/data/net/minecraft/client/gui/screens/recipebook/RecipeBookPage.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/client/gui/screens/recipebook/RecipeBookPage - METHOD addListener (Lnet/minecraft/client/gui/screens/recipebook/RecipeBookComponent;)V - ARG 1 listener + METHOD (Lnet/minecraft/client/gui/screens/recipebook/RecipeBookComponent;Lnet/minecraft/client/gui/screens/recipebook/SlotSelectTime;Z)V + ARG 1 parent + ARG 2 slotSelectTime + ARG 3 isFurnaceMenu METHOD init (Lnet/minecraft/client/Minecraft;II)V ARG 1 minecraft ARG 2 x @@ -11,8 +13,12 @@ CLASS net/minecraft/client/gui/screens/recipebook/RecipeBookPage ARG 1 mouseX ARG 3 mouseY ARG 5 button - METHOD recipesShown (Ljava/util/List;)V - ARG 1 recipes + ARG 6 x + ARG 7 y + ARG 8 width + ARG 9 height + METHOD recipeShown (Lnet/minecraft/world/item/crafting/display/RecipeDisplayId;)V + ARG 1 recipe METHOD render (Lnet/minecraft/client/gui/GuiGraphics;IIIIF)V ARG 1 guiGraphics ARG 2 x @@ -24,6 +30,7 @@ CLASS net/minecraft/client/gui/screens/recipebook/RecipeBookPage ARG 1 guiGraphics ARG 2 x ARG 3 y - METHOD updateCollections (Ljava/util/List;Z)V + METHOD updateCollections (Ljava/util/List;ZZ)V ARG 1 recipeCollections ARG 2 resetPageNumber + ARG 3 isFiltering diff --git a/data/net/minecraft/client/gui/screens/recipebook/RecipeBookTabButton.mapping b/data/net/minecraft/client/gui/screens/recipebook/RecipeBookTabButton.mapping index b2c963dde..d64639a51 100644 --- a/data/net/minecraft/client/gui/screens/recipebook/RecipeBookTabButton.mapping +++ b/data/net/minecraft/client/gui/screens/recipebook/RecipeBookTabButton.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/client/gui/screens/recipebook/RecipeBookTabButton - METHOD (Lnet/minecraft/client/RecipeBookCategories;)V - ARG 1 category - METHOD renderIcon (Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/renderer/entity/ItemRenderer;)V + METHOD (Lnet/minecraft/client/gui/screens/recipebook/RecipeBookComponent$TabInfo;)V + ARG 1 tabInfo + METHOD renderIcon (Lnet/minecraft/client/gui/GuiGraphics;)V ARG 1 guiGraphics - ARG 2 itemRenderer - METHOD startAnimation (Lnet/minecraft/client/Minecraft;)V - ARG 1 minecraft + METHOD startAnimation (Lnet/minecraft/client/ClientRecipeBook;Z)V + ARG 1 recipeBook + ARG 2 isFiltering METHOD updateVisibility (Lnet/minecraft/client/ClientRecipeBook;)Z ARG 1 recipeBook diff --git a/data/net/minecraft/client/gui/screens/recipebook/RecipeButton.mapping b/data/net/minecraft/client/gui/screens/recipebook/RecipeButton.mapping index 0054a9eeb..d8e5e23c1 100644 --- a/data/net/minecraft/client/gui/screens/recipebook/RecipeButton.mapping +++ b/data/net/minecraft/client/gui/screens/recipebook/RecipeButton.mapping @@ -1,6 +1,17 @@ CLASS net/minecraft/client/gui/screens/recipebook/RecipeButton - METHOD init (Lnet/minecraft/client/gui/screens/recipebook/RecipeCollection;Lnet/minecraft/client/gui/screens/recipebook/RecipeBookPage;)V + METHOD (Lnet/minecraft/client/gui/screens/recipebook/SlotSelectTime;)V + ARG 1 slotSelectTime + METHOD getTooltipText (Lnet/minecraft/world/item/ItemStack;)Ljava/util/List; + ARG 1 stack + METHOD init (Lnet/minecraft/client/gui/screens/recipebook/RecipeCollection;ZLnet/minecraft/client/gui/screens/recipebook/RecipeBookPage;Lnet/minecraft/util/context/ContextMap;)V ARG 1 collection - ARG 2 recipeBookPage + ARG 2 isFiltering + ARG 3 page + ARG 4 contextMap METHOD isValidClickButton (I)Z ARG 1 button + METHOD lambda$init$0 (Lnet/minecraft/util/context/ContextMap;Lnet/minecraft/world/item/crafting/display/RecipeDisplayEntry;)Lnet/minecraft/client/gui/screens/recipebook/RecipeButton$ResolvedEntry; + ARG 1 entry + CLASS ResolvedEntry + METHOD selectItem (I)Lnet/minecraft/world/item/ItemStack; + ARG 1 index diff --git a/data/net/minecraft/client/gui/screens/recipebook/RecipeCollection.mapping b/data/net/minecraft/client/gui/screens/recipebook/RecipeCollection.mapping index f28e6921e..63846b8e5 100644 --- a/data/net/minecraft/client/gui/screens/recipebook/RecipeCollection.mapping +++ b/data/net/minecraft/client/gui/screens/recipebook/RecipeCollection.mapping @@ -1,23 +1,14 @@ CLASS net/minecraft/client/gui/screens/recipebook/RecipeCollection - METHOD (Lnet/minecraft/core/RegistryAccess;Ljava/util/List;)V - ARG 1 registryAccess - ARG 2 recipes - METHOD allRecipesHaveSameResult (Lnet/minecraft/core/RegistryAccess;Ljava/util/List;)Z - ARG 0 registryAccess - ARG 1 recipes - METHOD canCraft (Lnet/minecraft/world/entity/player/StackedContents;IILnet/minecraft/stats/RecipeBook;)V - ARG 1 handler - ARG 2 width - ARG 3 height - ARG 4 book - METHOD getDisplayRecipes (Z)Ljava/util/List; - ARG 1 craftable - COMMENT If true, this method will only return craftable recipes. If false, this method will only return uncraftable recipes. - METHOD getRecipes (Z)Ljava/util/List; - ARG 1 onlyCraftable - METHOD hasKnownRecipes ()Z - COMMENT Checks if recipebook is not empty - METHOD isCraftable (Lnet/minecraft/world/item/crafting/RecipeHolder;)Z + METHOD (Ljava/util/List;)V + ARG 1 entries + METHOD allRecipesHaveSameResult (Ljava/util/List;)Z + ARG 0 recipes + METHOD getSelectedRecipes (Lnet/minecraft/client/gui/screens/recipebook/RecipeCollection$CraftableStatus;)Ljava/util/List; + ARG 1 craftableStatus + METHOD isCraftable (Lnet/minecraft/world/item/crafting/display/RecipeDisplayId;)Z ARG 1 recipe - METHOD updateKnownRecipes (Lnet/minecraft/stats/RecipeBook;)V - ARG 1 book + METHOD lambda$getSelectedRecipes$0 (Lnet/minecraft/world/item/crafting/display/RecipeDisplayId;)Z + ARG 1 recipe + METHOD selectRecipes (Lnet/minecraft/world/entity/player/StackedItemContents;Ljava/util/function/Predicate;)V + ARG 1 stackedItemContents + ARG 2 filter diff --git a/data/net/minecraft/client/gui/screens/recipebook/RecipeShownListener.mapping b/data/net/minecraft/client/gui/screens/recipebook/RecipeShownListener.mapping deleted file mode 100644 index 1aaced70d..000000000 --- a/data/net/minecraft/client/gui/screens/recipebook/RecipeShownListener.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/client/gui/screens/recipebook/RecipeShownListener - METHOD recipesShown (Ljava/util/List;)V - ARG 1 recipes diff --git a/data/net/minecraft/client/gui/screens/recipebook/RecipeUpdateListener.mapping b/data/net/minecraft/client/gui/screens/recipebook/RecipeUpdateListener.mapping new file mode 100644 index 000000000..800623350 --- /dev/null +++ b/data/net/minecraft/client/gui/screens/recipebook/RecipeUpdateListener.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/client/gui/screens/recipebook/RecipeUpdateListener + METHOD fillGhostRecipe (Lnet/minecraft/world/item/crafting/display/RecipeDisplay;)V + ARG 1 recipeDisplay diff --git a/data/net/minecraft/client/gui/screens/recipebook/SearchRecipeBookCategory.mapping b/data/net/minecraft/client/gui/screens/recipebook/SearchRecipeBookCategory.mapping new file mode 100644 index 000000000..521573c74 --- /dev/null +++ b/data/net/minecraft/client/gui/screens/recipebook/SearchRecipeBookCategory.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/client/gui/screens/recipebook/SearchRecipeBookCategory + METHOD (Ljava/lang/String;I[Lnet/minecraft/world/item/crafting/RecipeBookCategory;)V + ARG 3 includedCategories diff --git a/data/net/minecraft/client/gui/screens/reporting/ReportReasonSelectionScreen.mapping b/data/net/minecraft/client/gui/screens/reporting/ReportReasonSelectionScreen.mapping index c7353fb78..806d07fa9 100644 --- a/data/net/minecraft/client/gui/screens/reporting/ReportReasonSelectionScreen.mapping +++ b/data/net/minecraft/client/gui/screens/reporting/ReportReasonSelectionScreen.mapping @@ -1,8 +1,9 @@ CLASS net/minecraft/client/gui/screens/reporting/ReportReasonSelectionScreen - METHOD (Lnet/minecraft/client/gui/screens/Screen;Lnet/minecraft/client/multiplayer/chat/report/ReportReason;Ljava/util/function/Consumer;)V + METHOD (Lnet/minecraft/client/gui/screens/Screen;Lnet/minecraft/client/multiplayer/chat/report/ReportReason;Lnet/minecraft/client/multiplayer/chat/report/ReportType;Ljava/util/function/Consumer;)V ARG 1 lastScreen ARG 2 currentlySelectedReason - ARG 3 onSelectedReason + ARG 3 reportType + ARG 4 onSelectedReason CLASS ReasonSelectionList METHOD (Lnet/minecraft/client/gui/screens/reporting/ReportReasonSelectionScreen;Lnet/minecraft/client/Minecraft;)V ARG 2 minecraft diff --git a/data/net/minecraft/client/gui/screens/worldselection/CreateWorldCallback.mapping b/data/net/minecraft/client/gui/screens/worldselection/CreateWorldCallback.mapping new file mode 100644 index 000000000..16817e199 --- /dev/null +++ b/data/net/minecraft/client/gui/screens/worldselection/CreateWorldCallback.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/client/gui/screens/worldselection/CreateWorldCallback + METHOD create (Lnet/minecraft/client/gui/screens/worldselection/CreateWorldScreen;Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/world/level/storage/PrimaryLevelData;Ljava/nio/file/Path;)Z + ARG 1 createWorldScreen + ARG 2 registryAccess + ARG 3 levelData + ARG 4 tempDataPackDir diff --git a/data/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.mapping b/data/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.mapping index 866847e6a..2b46d6c2b 100644 --- a/data/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.mapping +++ b/data/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.mapping @@ -1,16 +1,17 @@ CLASS net/minecraft/client/gui/screens/worldselection/CreateWorldScreen - METHOD (Lnet/minecraft/client/Minecraft;Lnet/minecraft/client/gui/screens/Screen;Lnet/minecraft/client/gui/screens/worldselection/WorldCreationContext;Ljava/util/Optional;Ljava/util/OptionalLong;)V + METHOD (Lnet/minecraft/client/Minecraft;Lnet/minecraft/client/gui/screens/Screen;Lnet/minecraft/client/gui/screens/worldselection/WorldCreationContext;Ljava/util/Optional;Ljava/util/OptionalLong;Lnet/minecraft/client/gui/screens/worldselection/CreateWorldCallback;)V ARG 1 minecraft ARG 2 lastScreen - ARG 3 settings + ARG 3 context ARG 4 preset ARG 5 seed + ARG 6 createWorldCallback METHOD addWidget (Lnet/minecraft/client/gui/components/events/GuiEventListener;)Lnet/minecraft/client/gui/components/events/GuiEventListener; ARG 1 listener METHOD applyNewPackConfig (Lnet/minecraft/server/packs/repository/PackRepository;Lnet/minecraft/world/level/WorldDataConfiguration;Ljava/util/function/Consumer;)V ARG 1 packRepository ARG 2 worldDataConfiguration - ARG 3 consumer + ARG 3 callback METHOD copyBetweenDirs (Ljava/nio/file/Path;Ljava/nio/file/Path;Ljava/nio/file/Path;)V ARG 0 fromDir ARG 1 toDir @@ -22,22 +23,90 @@ CLASS net/minecraft/client/gui/screens/worldselection/CreateWorldScreen ARG 0 minecraft ARG 1 lastScreen ARG 2 levelSettings - ARG 3 settings + ARG 3 context ARG 4 tempDataPackDir METHOD createLevelSettings (Z)Lnet/minecraft/world/level/LevelSettings; ARG 1 debug - METHOD createNewWorld (Lnet/minecraft/world/level/storage/PrimaryLevelData$SpecialWorldProperty;Lnet/minecraft/core/LayeredRegistryAccess;Lcom/mojang/serialization/Lifecycle;)V - ARG 1 specialWorldProperty - ARG 3 worldGenSettingsLifecycle + METHOD createNewWorld (Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/world/level/storage/WorldData;)Z + ARG 1 registryAccess + ARG 2 worldData + METHOD createNewWorldDirectory (Lnet/minecraft/client/Minecraft;Ljava/lang/String;Ljava/nio/file/Path;)Ljava/util/Optional; + ARG 0 minecraft + ARG 1 saveName + ARG 2 tempDataPackDir METHOD createTempDataPackDirFromExistingWorld (Ljava/nio/file/Path;Lnet/minecraft/client/Minecraft;)Ljava/nio/file/Path; ARG 0 datapackDir ARG 1 minecraft + METHOD createWorldAndCleanup (Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/world/level/storage/PrimaryLevelData;)V + ARG 1 registryAccess + ARG 2 levelData METHOD getDataPackSelectionSettings (Lnet/minecraft/world/level/WorldDataConfiguration;)Lcom/mojang/datafixers/util/Pair; ARG 1 worldDataConfiguration METHOD keyPressed (III)Z ARG 1 keyCode ARG 2 scanCode ARG 3 modifiers + METHOD lambda$applyNewPackConfig$23 (Ljava/util/function/Consumer;Z)V + ARG 2 confirmed + METHOD lambda$createFromExisting$9 (Lnet/minecraft/client/gui/screens/worldselection/CreateWorldScreen;Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/world/level/storage/PrimaryLevelData;Ljava/nio/file/Path;)Z + ARG 0 createWorldScreen + ARG 1 registryAccess + ARG 2 levelData + METHOD lambda$createNewWorldDirectory$26 (Ljava/nio/file/Path;Ljava/nio/file/Path;)Z + ARG 1 path + METHOD lambda$createNewWorldDirectory$27 (Ljava/nio/file/Path;Ljava/nio/file/Path;Ljava/nio/file/Path;)V + ARG 2 path + METHOD lambda$createTempDataPackDirFromExistingWorld$28 (Ljava/nio/file/Path;Ljava/nio/file/Path;)Z + ARG 1 path + METHOD lambda$createTempDataPackDirFromExistingWorld$29 (Lorg/apache/commons/lang3/mutable/MutableObject;Ljava/nio/file/Path;Ljava/nio/file/Path;)V + ARG 2 path + METHOD lambda$init$10 (Lnet/minecraft/client/gui/components/Button;)V + ARG 1 button + METHOD lambda$init$11 (Lnet/minecraft/client/gui/components/Button;)V + ARG 1 button + METHOD lambda$init$12 (Lnet/minecraft/client/gui/components/AbstractWidget;)V + ARG 1 widget + METHOD lambda$new$0 (Lnet/minecraft/client/gui/screens/worldselection/CreateWorldScreen;Lnet/minecraft/client/gui/components/events/GuiEventListener;)V + ARG 1 listener + METHOD lambda$openDataPackSelectionScreen$15 (Lnet/minecraft/server/packs/repository/PackRepository;)V + ARG 1 repository + METHOD lambda$openExperimentsScreen$14 (Lnet/minecraft/server/packs/repository/PackRepository;)V + ARG 1 repository + METHOD lambda$openFresh$1 (Lnet/minecraft/client/gui/screens/worldselection/CreateWorldScreen;Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/world/level/storage/PrimaryLevelData;Ljava/nio/file/Path;)Z + ARG 0 createWorldScreen + ARG 1 registryAccess + ARG 2 levelData + ARG 3 tempDataPackDir + METHOD lambda$openFresh$2 (Lnet/minecraft/server/ReloadableServerResources;Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/client/gui/screens/worldselection/DataPackReloadCookie;)Lnet/minecraft/client/gui/screens/worldselection/WorldCreationContext; + ARG 0 dataPackResources + ARG 1 worldGenRegistries + ARG 2 dataPackReloadCookie + METHOD lambda$openFresh$3 (Lnet/minecraft/server/WorldLoader$DataLoadContext;)Lnet/minecraft/world/level/levelgen/WorldGenSettings; + ARG 0 context + METHOD lambda$removeTempDataPackDir$25 (Ljava/nio/file/Path;)V + ARG 0 path + METHOD lambda$testWorld$4 (Lnet/minecraft/server/ReloadableServerResources;Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/client/gui/screens/worldselection/DataPackReloadCookie;)Lnet/minecraft/client/gui/screens/worldselection/WorldCreationContext; + ARG 0 dataPackResources + ARG 1 worldGenSettings + ARG 2 dataPackReloadCookie + METHOD lambda$testWorld$5 (Lnet/minecraft/server/WorldLoader$DataLoadContext;)Lnet/minecraft/world/level/levelgen/WorldGenSettings; + ARG 0 context + METHOD lambda$testWorld$6 (Lnet/minecraft/client/gui/screens/worldselection/CreateWorldScreen;Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/world/level/storage/PrimaryLevelData;Ljava/nio/file/Path;)Z + ARG 0 createWorldScreen + ARG 1 registryAccess + ARG 2 levelData + ARG 3 tempDataPackDir + METHOD lambda$tryApplyNewDataPacks$16 (Ljava/util/List;Ljava/lang/String;)Z + ARG 1 id + METHOD lambda$tryApplyNewDataPacks$17 (Lnet/minecraft/server/packs/repository/PackRepository;Lnet/minecraft/world/level/WorldDataConfiguration;Ljava/util/function/Consumer;Z)V + ARG 4 confirmed + METHOD openCreateWorldScreen (Lnet/minecraft/client/Minecraft;Lnet/minecraft/client/gui/screens/Screen;Ljava/util/function/Function;Lnet/minecraft/client/gui/screens/worldselection/WorldCreationContextMapper;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/client/gui/screens/worldselection/CreateWorldCallback;)V + ARG 0 minecraft + ARG 1 lastScreen + ARG 2 worldGenSettingsGetter + ARG 3 creationContextMapper + ARG 4 preset + ARG 5 createWorldCallback METHOD openDataPackSelectionScreen (Lnet/minecraft/world/level/WorldDataConfiguration;)V ARG 1 worldDataConfiguration METHOD openExperimentsScreen (Lnet/minecraft/world/level/WorldDataConfiguration;)V @@ -45,13 +114,27 @@ CLASS net/minecraft/client/gui/screens/worldselection/CreateWorldScreen METHOD openFresh (Lnet/minecraft/client/Minecraft;Lnet/minecraft/client/gui/screens/Screen;)V ARG 0 minecraft ARG 1 lastScreen + METHOD openFresh (Lnet/minecraft/client/Minecraft;Lnet/minecraft/client/gui/screens/Screen;Lnet/minecraft/client/gui/screens/worldselection/CreateWorldCallback;)V + ARG 0 minecraft + ARG 1 lastScreen + ARG 2 callback METHOD queueLoadScreen (Lnet/minecraft/client/Minecraft;Lnet/minecraft/network/chat/Component;)V ARG 0 minecraft ARG 1 title + METHOD testWorld (Lnet/minecraft/client/Minecraft;Lnet/minecraft/client/gui/screens/Screen;)V + ARG 0 minecraft + ARG 1 lastScreen METHOD tryApplyNewDataPacks (Lnet/minecraft/server/packs/repository/PackRepository;ZLjava/util/function/Consumer;)V ARG 1 packRepository ARG 2 shouldConfirm - ARG 3 consumer + ARG 3 callback + CLASS MoreTab + METHOD lambda$new$0 (Lnet/minecraft/client/gui/components/Button;)V + ARG 1 button + METHOD lambda$new$1 (Lnet/minecraft/client/gui/components/Button;)V + ARG 1 button + METHOD lambda$new$2 (Lnet/minecraft/client/gui/components/Button;)V + ARG 1 button CLASS WorldTab METHOD createTypeButtonNarration (Lnet/minecraft/client/gui/components/CycleButton;)Lnet/minecraft/network/chat/MutableComponent; ARG 0 button diff --git a/data/net/minecraft/client/gui/screens/worldselection/EditGameRulesScreen.mapping b/data/net/minecraft/client/gui/screens/worldselection/EditGameRulesScreen.mapping index 921e05884..24c2cea0c 100644 --- a/data/net/minecraft/client/gui/screens/worldselection/EditGameRulesScreen.mapping +++ b/data/net/minecraft/client/gui/screens/worldselection/EditGameRulesScreen.mapping @@ -24,6 +24,8 @@ CLASS net/minecraft/client/gui/screens/worldselection/EditGameRulesScreen METHOD create (Lnet/minecraft/network/chat/Component;Ljava/util/List;Ljava/lang/String;Lnet/minecraft/world/level/GameRules$Value;)Lnet/minecraft/client/gui/screens/worldselection/EditGameRulesScreen$RuleEntry; ARG 1 label ARG 2 tooltip + ARG 3 description + ARG 4 value CLASS GameRuleEntry METHOD (Lnet/minecraft/client/gui/screens/worldselection/EditGameRulesScreen;Ljava/util/List;Lnet/minecraft/network/chat/Component;)V ARG 2 tooltip @@ -36,11 +38,13 @@ CLASS net/minecraft/client/gui/screens/worldselection/EditGameRulesScreen METHOD (Lnet/minecraft/client/gui/screens/worldselection/EditGameRulesScreen;Lnet/minecraft/network/chat/Component;Ljava/util/List;Ljava/lang/String;Lnet/minecraft/world/level/GameRules$BooleanValue;)V ARG 2 label ARG 3 tooltip + ARG 4 description ARG 5 value CLASS IntegerRuleEntry METHOD (Lnet/minecraft/client/gui/screens/worldselection/EditGameRulesScreen;Lnet/minecraft/network/chat/Component;Ljava/util/List;Ljava/lang/String;Lnet/minecraft/world/level/GameRules$IntegerValue;)V ARG 2 label ARG 3 tooltip + ARG 4 description ARG 5 value CLASS CategoryRuleEntry METHOD (Lnet/minecraft/client/gui/screens/worldselection/EditGameRulesScreen;Lnet/minecraft/network/chat/Component;)V diff --git a/data/net/minecraft/client/gui/screens/worldselection/WorldCreationContext.mapping b/data/net/minecraft/client/gui/screens/worldselection/WorldCreationContext.mapping index eab97ce71..e41787cc3 100644 --- a/data/net/minecraft/client/gui/screens/worldselection/WorldCreationContext.mapping +++ b/data/net/minecraft/client/gui/screens/worldselection/WorldCreationContext.mapping @@ -4,12 +4,13 @@ CLASS net/minecraft/client/gui/screens/worldselection/WorldCreationContext ARG 2 worldGenRegistries ARG 3 dataPackResources ARG 4 dataConfiguration - METHOD (Lnet/minecraft/world/level/levelgen/WorldOptions;Lnet/minecraft/world/level/levelgen/WorldDimensions;Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/server/ReloadableServerResources;Lnet/minecraft/world/level/WorldDataConfiguration;)V - ARG 1 options - ARG 2 selectedDimensions + METHOD (Lnet/minecraft/world/level/levelgen/WorldOptions;Lnet/minecraft/world/level/levelgen/WorldDimensions;Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/server/ReloadableServerResources;Lnet/minecraft/world/level/WorldDataConfiguration;Lnet/minecraft/client/gui/screens/worldselection/InitialWorldCreationOptions;)V + ARG 1 worldOptions + ARG 2 worldDimensions ARG 3 worldGenRegistries ARG 4 dataPackResources ARG 5 dataConfiguration + ARG 6 initialWorldCreationOptions METHOD withDimensions (Lnet/minecraft/client/gui/screens/worldselection/WorldCreationContext$DimensionsUpdater;)Lnet/minecraft/client/gui/screens/worldselection/WorldCreationContext; ARG 1 dimensionsUpdater METHOD withOptions (Lnet/minecraft/client/gui/screens/worldselection/WorldCreationContext$OptionsModifier;)Lnet/minecraft/client/gui/screens/worldselection/WorldCreationContext; diff --git a/data/net/minecraft/client/gui/screens/worldselection/WorldCreationContextMapper.mapping b/data/net/minecraft/client/gui/screens/worldselection/WorldCreationContextMapper.mapping new file mode 100644 index 000000000..340767f05 --- /dev/null +++ b/data/net/minecraft/client/gui/screens/worldselection/WorldCreationContextMapper.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/client/gui/screens/worldselection/WorldCreationContextMapper + METHOD apply (Lnet/minecraft/server/ReloadableServerResources;Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/client/gui/screens/worldselection/DataPackReloadCookie;)Lnet/minecraft/client/gui/screens/worldselection/WorldCreationContext; + ARG 1 dataPackResources + ARG 2 worldGenRegistries + ARG 3 dataPackReloadCookie diff --git a/data/net/minecraft/client/gui/spectator/SpectatorMenuItem.mapping b/data/net/minecraft/client/gui/spectator/SpectatorMenuItem.mapping index dc3cf2b98..d4b1ac860 100644 --- a/data/net/minecraft/client/gui/spectator/SpectatorMenuItem.mapping +++ b/data/net/minecraft/client/gui/spectator/SpectatorMenuItem.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/client/gui/spectator/SpectatorMenuItem - METHOD renderIcon (Lnet/minecraft/client/gui/GuiGraphics;FI)V + METHOD renderIcon (Lnet/minecraft/client/gui/GuiGraphics;FF)V ARG 1 guiGraphics - ARG 2 shadeColor + ARG 2 brightness ARG 3 alpha METHOD selectItem (Lnet/minecraft/client/gui/spectator/SpectatorMenu;)V ARG 1 menu diff --git a/data/net/minecraft/client/main/GameConfig.mapping b/data/net/minecraft/client/main/GameConfig.mapping index 335c7c3c5..0d4be57e3 100644 --- a/data/net/minecraft/client/main/GameConfig.mapping +++ b/data/net/minecraft/client/main/GameConfig.mapping @@ -6,12 +6,13 @@ CLASS net/minecraft/client/main/GameConfig ARG 4 game ARG 5 quickPlay CLASS GameData - METHOD (ZLjava/lang/String;Ljava/lang/String;ZZ)V + METHOD (ZLjava/lang/String;Ljava/lang/String;ZZZ)V ARG 1 demo ARG 2 launchVersion ARG 3 versionType ARG 4 disableMultiplayer ARG 5 disableChat + ARG 6 captureTracyImages CLASS UserData METHOD (Lnet/minecraft/client/User;Lcom/mojang/authlib/properties/PropertyMap;Lcom/mojang/authlib/properties/PropertyMap;Ljava/net/Proxy;)V ARG 1 user diff --git a/data/net/minecraft/client/main/Main.mapping b/data/net/minecraft/client/main/Main.mapping index be752f2d8..f6ceb9cbd 100644 --- a/data/net/minecraft/client/main/Main.mapping +++ b/data/net/minecraft/client/main/Main.mapping @@ -1,6 +1,14 @@ CLASS net/minecraft/client/main/Main METHOD emptyStringToEmptyOptional (Ljava/lang/String;)Ljava/util/Optional; ARG 0 input + METHOD hasValidUuid (Ljoptsimple/OptionSpec;Ljoptsimple/OptionSet;Lorg/slf4j/Logger;)Z + ARG 0 uuidOption + ARG 1 options + ARG 2 logger + METHOD isUuidValid (Ljoptsimple/OptionSpec;Ljoptsimple/OptionSet;Lorg/slf4j/Logger;)Z + ARG 0 uuidOption + ARG 1 optionSet + ARG 2 logger METHOD main ([Ljava/lang/String;)V ARG 0 args METHOD ofNullable (Ljava/lang/Integer;)Ljava/util/OptionalInt; diff --git a/data/net/minecraft/client/model/AbstractBoatModel.mapping b/data/net/minecraft/client/model/AbstractBoatModel.mapping new file mode 100644 index 000000000..3977a0bc6 --- /dev/null +++ b/data/net/minecraft/client/model/AbstractBoatModel.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/client/model/AbstractBoatModel + METHOD animatePaddle (FILnet/minecraft/client/model/geom/ModelPart;)V + ARG 0 rowingTime + ARG 1 side + ARG 2 part diff --git a/data/net/minecraft/client/model/AbstractEquineModel.mapping b/data/net/minecraft/client/model/AbstractEquineModel.mapping new file mode 100644 index 000000000..73e98ed1d --- /dev/null +++ b/data/net/minecraft/client/model/AbstractEquineModel.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/client/model/AbstractEquineModel + METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V + ARG 1 root + METHOD createBabyMesh (Lnet/minecraft/client/model/geom/builders/CubeDeformation;)Lnet/minecraft/client/model/geom/builders/MeshDefinition; + ARG 0 cubeDeformation + METHOD createBodyMesh (Lnet/minecraft/client/model/geom/builders/CubeDeformation;)Lnet/minecraft/client/model/geom/builders/MeshDefinition; + ARG 0 cubeDeformation + METHOD createFullScaleBabyMesh (Lnet/minecraft/client/model/geom/builders/CubeDeformation;)Lnet/minecraft/client/model/geom/builders/MeshDefinition; + ARG 0 cubeDeformation diff --git a/data/net/minecraft/client/model/AbstractPiglinModel.mapping b/data/net/minecraft/client/model/AbstractPiglinModel.mapping new file mode 100644 index 000000000..c67e1f3bb --- /dev/null +++ b/data/net/minecraft/client/model/AbstractPiglinModel.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/client/model/AbstractPiglinModel + METHOD addHead (Lnet/minecraft/client/model/geom/builders/CubeDeformation;Lnet/minecraft/client/model/geom/builders/MeshDefinition;)Lnet/minecraft/client/model/geom/builders/PartDefinition; + ARG 0 cubeDeformation + ARG 1 mesh + METHOD createMesh (Lnet/minecraft/client/model/geom/builders/CubeDeformation;)Lnet/minecraft/client/model/geom/builders/MeshDefinition; + ARG 0 cubeDeformation diff --git a/data/net/minecraft/client/model/AbstractZombieModel.mapping b/data/net/minecraft/client/model/AbstractZombieModel.mapping deleted file mode 100644 index 886a921c0..000000000 --- a/data/net/minecraft/client/model/AbstractZombieModel.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/client/model/AbstractZombieModel - METHOD isAggressive (Lnet/minecraft/world/entity/monster/Monster;)Z - ARG 1 entity - METHOD setupAnim (Lnet/minecraft/world/entity/monster/Monster;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/AgeableHierarchicalModel.mapping b/data/net/minecraft/client/model/AgeableHierarchicalModel.mapping deleted file mode 100644 index 5407550da..000000000 --- a/data/net/minecraft/client/model/AgeableHierarchicalModel.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/client/model/AgeableHierarchicalModel - METHOD (FF)V - ARG 1 youngScaleFactor - ARG 2 bodyYOffset - METHOD (FFLjava/util/function/Function;)V - ARG 1 youngScaleFactor - ARG 2 bodyYOffset - ARG 3 renderType diff --git a/data/net/minecraft/client/model/AgeableListModel.mapping b/data/net/minecraft/client/model/AgeableListModel.mapping deleted file mode 100644 index 6b4fac7bb..000000000 --- a/data/net/minecraft/client/model/AgeableListModel.mapping +++ /dev/null @@ -1,20 +0,0 @@ -CLASS net/minecraft/client/model/AgeableListModel - METHOD (Ljava/util/function/Function;ZFFFFF)V - ARG 1 renderType - ARG 2 scaleHead - ARG 3 babyYHeadOffset - ARG 4 babyZHeadOffset - ARG 5 babyHeadScale - ARG 6 babyBodyScale - ARG 7 bodyYOffset - METHOD (ZFF)V - ARG 1 scaleHead - ARG 2 babyYHeadOffset - ARG 3 babyZHeadOffset - METHOD (ZFFFFF)V - ARG 1 scaleHead - ARG 2 babyYHeadOffset - ARG 3 babyZHeadOffset - ARG 4 babyHeadScale - ARG 5 babyBodyScale - ARG 6 bodyYOffset diff --git a/data/net/minecraft/client/model/AnimationUtils.mapping b/data/net/minecraft/client/model/AnimationUtils.mapping index 5d6fa8e67..d3a1b7ea7 100644 --- a/data/net/minecraft/client/model/AnimationUtils.mapping +++ b/data/net/minecraft/client/model/AnimationUtils.mapping @@ -1,9 +1,10 @@ CLASS net/minecraft/client/model/AnimationUtils - METHOD animateCrossbowCharge (Lnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/world/entity/LivingEntity;Z)V + METHOD animateCrossbowCharge (Lnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/client/model/geom/ModelPart;FIZ)V ARG 0 rightArm ARG 1 leftArm - ARG 2 livingEntity - ARG 3 rightHanded + ARG 2 maxCrossbowChargeDuration + ARG 3 ticksUsingItem + ARG 4 isRightHand METHOD animateCrossbowHold (Lnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/client/model/geom/ModelPart;Z)V ARG 0 rightArm ARG 1 leftArm @@ -23,9 +24,9 @@ CLASS net/minecraft/client/model/AnimationUtils ARG 0 modelPart ARG 1 ageInTicks ARG 2 multiplier - METHOD swingWeaponDown (Lnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/world/entity/Mob;FF)V + METHOD swingWeaponDown (Lnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/world/entity/HumanoidArm;FF)V ARG 0 rightArm ARG 1 leftArm - ARG 2 mob + ARG 2 mainArm ARG 3 attackTime ARG 4 ageInTicks diff --git a/data/net/minecraft/client/model/ArmorStandArmorModel.mapping b/data/net/minecraft/client/model/ArmorStandArmorModel.mapping index 16129d992..08c13ec12 100644 --- a/data/net/minecraft/client/model/ArmorStandArmorModel.mapping +++ b/data/net/minecraft/client/model/ArmorStandArmorModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/ArmorStandArmorModel METHOD createBodyLayer (Lnet/minecraft/client/model/geom/builders/CubeDeformation;)Lnet/minecraft/client/model/geom/builders/LayerDefinition; ARG 0 cubeDeformation - METHOD setupAnim (Lnet/minecraft/world/entity/decoration/ArmorStand;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/ArmorStandModel.mapping b/data/net/minecraft/client/model/ArmorStandModel.mapping index 97ea548a6..4d2e310ed 100644 --- a/data/net/minecraft/client/model/ArmorStandModel.mapping +++ b/data/net/minecraft/client/model/ArmorStandModel.mapping @@ -1,17 +1,4 @@ CLASS net/minecraft/client/model/ArmorStandModel - METHOD prepareMobModel (Lnet/minecraft/world/entity/decoration/ArmorStand;FFF)V - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 partialTick - METHOD setupAnim (Lnet/minecraft/world/entity/decoration/ArmorStand;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch METHOD translateToHand (Lnet/minecraft/world/entity/HumanoidArm;Lcom/mojang/blaze3d/vertex/PoseStack;)V ARG 1 side ARG 2 poseStack diff --git a/data/net/minecraft/client/model/ArrowModel.mapping b/data/net/minecraft/client/model/ArrowModel.mapping new file mode 100644 index 000000000..8b1358ff8 --- /dev/null +++ b/data/net/minecraft/client/model/ArrowModel.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/client/model/ArrowModel + METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V + ARG 1 root diff --git a/data/net/minecraft/client/model/AxolotlModel.mapping b/data/net/minecraft/client/model/AxolotlModel.mapping index 1358c6406..09c30b022 100644 --- a/data/net/minecraft/client/model/AxolotlModel.mapping +++ b/data/net/minecraft/client/model/AxolotlModel.mapping @@ -1,39 +1,20 @@ CLASS net/minecraft/client/model/AxolotlModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD getRotationVector (Lnet/minecraft/client/model/geom/ModelPart;)Lorg/joml/Vector3f; - ARG 1 part - METHOD lerpPart (Lnet/minecraft/client/model/geom/ModelPart;FFF)V - ARG 1 part - ARG 2 xDelta - ARG 3 yDelta - ARG 4 zDelta - METHOD lerpTo (FF)F - ARG 1 start - ARG 2 end - METHOD lerpTo (FFF)F - ARG 1 delta - ARG 2 start - ARG 3 end - METHOD saveAnimationValues (Lnet/minecraft/world/entity/animal/axolotl/Axolotl;)V - ARG 1 axolotl - METHOD setRotationFromVector (Lnet/minecraft/client/model/geom/ModelPart;Lorg/joml/Vector3f;)V - ARG 1 part - ARG 2 rotation + METHOD applyMirrorLegRotations (F)V + ARG 1 factor METHOD setupGroundCrawlingAnimation (FF)V ARG 1 ageInTicks ARG 2 netHeadYaw - METHOD setupInitialAnimationValues (Lnet/minecraft/world/entity/animal/axolotl/Axolotl;FF)V - ARG 1 axolotl - ARG 2 netHeadYaw - ARG 3 headPitch METHOD setupLayStillOnGroundAnimation (FF)V ARG 1 ageInTicks ARG 2 netHeadYaw METHOD setupPlayDeadAnimation (F)V - ARG 1 netHeadYaw - METHOD setupSwimmingAnimation (FF)V + ARG 1 playingDeadFactor + METHOD setupSwimmingAnimation (FFF)V ARG 1 ageInTicks - ARG 2 headPitch - METHOD setupWaterHoveringAnimation (F)V + ARG 2 xRot + ARG 3 movingFactor + METHOD setupWaterHoveringAnimation (FF)V ARG 1 ageInTicks + ARG 2 swimmingFactor diff --git a/data/net/minecraft/client/model/BabyModelTransform.mapping b/data/net/minecraft/client/model/BabyModelTransform.mapping new file mode 100644 index 000000000..d40bec310 --- /dev/null +++ b/data/net/minecraft/client/model/BabyModelTransform.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/client/model/BabyModelTransform + METHOD (Ljava/util/Set;)V + ARG 1 headParts + METHOD (ZFFLjava/util/Set;)V + ARG 1 scaleHead + ARG 2 babyYHeadOffset + ARG 3 babyZHeadOffset + ARG 4 headParts diff --git a/data/net/minecraft/client/model/BatModel.mapping b/data/net/minecraft/client/model/BatModel.mapping index dadd2e44e..c0034b7bd 100644 --- a/data/net/minecraft/client/model/BatModel.mapping +++ b/data/net/minecraft/client/model/BatModel.mapping @@ -3,11 +3,3 @@ CLASS net/minecraft/client/model/BatModel ARG 1 root METHOD applyHeadRotation (F)V ARG 1 headRotation - METHOD setupAnim (Lnet/minecraft/world/entity/ambient/Bat;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/BeeModel.mapping b/data/net/minecraft/client/model/BeeModel.mapping index 539415c3d..23e122f52 100644 --- a/data/net/minecraft/client/model/BeeModel.mapping +++ b/data/net/minecraft/client/model/BeeModel.mapping @@ -1,16 +1,3 @@ CLASS net/minecraft/client/model/BeeModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD prepareMobModel (Lnet/minecraft/world/entity/animal/Bee;FFF)V - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 partialTick - METHOD setupAnim (Lnet/minecraft/world/entity/animal/Bee;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/BeeStingerModel.mapping b/data/net/minecraft/client/model/BeeStingerModel.mapping new file mode 100644 index 000000000..a98f737ce --- /dev/null +++ b/data/net/minecraft/client/model/BeeStingerModel.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/client/model/BeeStingerModel + METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V + ARG 1 root diff --git a/data/net/minecraft/client/model/BellModel.mapping b/data/net/minecraft/client/model/BellModel.mapping new file mode 100644 index 000000000..f049e9485 --- /dev/null +++ b/data/net/minecraft/client/model/BellModel.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/client/model/BellModel + METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V + ARG 1 root + METHOD setupAnim (Lnet/minecraft/world/level/block/entity/BellBlockEntity;F)V + ARG 1 bell + ARG 2 partialTick diff --git a/data/net/minecraft/client/model/BlazeModel.mapping b/data/net/minecraft/client/model/BlazeModel.mapping index b6b5bcf42..71d8f4a3d 100644 --- a/data/net/minecraft/client/model/BlazeModel.mapping +++ b/data/net/minecraft/client/model/BlazeModel.mapping @@ -5,11 +5,3 @@ CLASS net/minecraft/client/model/BlazeModel ARG 0 index METHOD lambda$new$0 (Lnet/minecraft/client/model/geom/ModelPart;I)Lnet/minecraft/client/model/geom/ModelPart; ARG 1 index - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/BoatModel.mapping b/data/net/minecraft/client/model/BoatModel.mapping index 6d214b04a..9f1d8aba3 100644 --- a/data/net/minecraft/client/model/BoatModel.mapping +++ b/data/net/minecraft/client/model/BoatModel.mapping @@ -1,20 +1,5 @@ CLASS net/minecraft/client/model/BoatModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD animatePaddle (Lnet/minecraft/world/entity/vehicle/Boat;ILnet/minecraft/client/model/geom/ModelPart;F)V - ARG 0 boat - ARG 1 side - ARG 2 paddle - ARG 3 limbSwing - METHOD createChildren (Lnet/minecraft/client/model/geom/builders/PartDefinition;)V - ARG 0 root - METHOD createPartsBuilder (Lnet/minecraft/client/model/geom/ModelPart;)Lcom/google/common/collect/ImmutableList$Builder; - ARG 1 root - METHOD setupAnim (Lnet/minecraft/world/entity/vehicle/Boat;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch + METHOD addCommonParts (Lnet/minecraft/client/model/geom/builders/PartDefinition;)V + ARG 0 partDefinition diff --git a/data/net/minecraft/client/model/BookModel.mapping b/data/net/minecraft/client/model/BookModel.mapping index 3dd5fdd8a..77a91e95e 100644 --- a/data/net/minecraft/client/model/BookModel.mapping +++ b/data/net/minecraft/client/model/BookModel.mapping @@ -1,12 +1,6 @@ CLASS net/minecraft/client/model/BookModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;III)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 packedOverlay - ARG 5 color METHOD setupAnim (FFFF)V ARG 1 time ARG 2 rightPageFlipAmount diff --git a/data/net/minecraft/client/model/CamelModel.mapping b/data/net/minecraft/client/model/CamelModel.mapping index 6dd210f00..eb5809d5d 100644 --- a/data/net/minecraft/client/model/CamelModel.mapping +++ b/data/net/minecraft/client/model/CamelModel.mapping @@ -1,10 +1,9 @@ CLASS net/minecraft/client/model/CamelModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD applyHeadRotation (Lnet/minecraft/world/entity/animal/camel/Camel;FFF)V - ARG 1 entity - ARG 2 netHeadYaw - ARG 3 headPitch - ARG 4 ageInTicks - METHOD toggleInvisibleParts (Lnet/minecraft/world/entity/animal/camel/Camel;)V - ARG 1 entity + METHOD applyHeadRotation (Lnet/minecraft/client/renderer/entity/state/CamelRenderState;FF)V + ARG 1 renderState + ARG 2 yRot + ARG 3 xRot + METHOD toggleInvisibleParts (Lnet/minecraft/client/renderer/entity/state/CamelRenderState;)V + ARG 1 renderState diff --git a/data/net/minecraft/client/model/CatModel.mapping b/data/net/minecraft/client/model/CatModel.mapping deleted file mode 100644 index ae23b617b..000000000 --- a/data/net/minecraft/client/model/CatModel.mapping +++ /dev/null @@ -1,14 +0,0 @@ -CLASS net/minecraft/client/model/CatModel - METHOD prepareMobModel (Lnet/minecraft/world/entity/animal/Cat;FFF)V - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 partialTick - METHOD setupAnim (Lnet/minecraft/world/entity/animal/Cat;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/ChestModel.mapping b/data/net/minecraft/client/model/ChestModel.mapping new file mode 100644 index 000000000..8586d0135 --- /dev/null +++ b/data/net/minecraft/client/model/ChestModel.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/client/model/ChestModel + METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V + ARG 1 root + METHOD setupAnim (F)V + ARG 1 openness diff --git a/data/net/minecraft/client/model/ChestedHorseModel.mapping b/data/net/minecraft/client/model/ChestedHorseModel.mapping deleted file mode 100644 index 1f982a7d8..000000000 --- a/data/net/minecraft/client/model/ChestedHorseModel.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/client/model/ChestedHorseModel - METHOD setupAnim (Lnet/minecraft/world/entity/animal/horse/AbstractChestedHorse;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/ChickenModel.mapping b/data/net/minecraft/client/model/ChickenModel.mapping index 451d54b42..742fecd92 100644 --- a/data/net/minecraft/client/model/ChickenModel.mapping +++ b/data/net/minecraft/client/model/ChickenModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/ChickenModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/CodModel.mapping b/data/net/minecraft/client/model/CodModel.mapping index 32146c217..d45a8eb9a 100644 --- a/data/net/minecraft/client/model/CodModel.mapping +++ b/data/net/minecraft/client/model/CodModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/CodModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/ColorableAgeableListModel.mapping b/data/net/minecraft/client/model/ColorableAgeableListModel.mapping deleted file mode 100644 index 6f246f0fd..000000000 --- a/data/net/minecraft/client/model/ColorableAgeableListModel.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/client/model/ColorableAgeableListModel - METHOD setColor (I)V - ARG 1 color diff --git a/data/net/minecraft/client/model/ColorableHierarchicalModel.mapping b/data/net/minecraft/client/model/ColorableHierarchicalModel.mapping deleted file mode 100644 index f4f273a78..000000000 --- a/data/net/minecraft/client/model/ColorableHierarchicalModel.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/client/model/ColorableHierarchicalModel - METHOD setColor (I)V - ARG 1 color diff --git a/data/net/minecraft/client/model/CreakingModel.mapping b/data/net/minecraft/client/model/CreakingModel.mapping new file mode 100644 index 000000000..7e414b541 --- /dev/null +++ b/data/net/minecraft/client/model/CreakingModel.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/client/model/CreakingModel + METHOD getHeadModelParts (Lnet/minecraft/client/renderer/entity/state/CreakingRenderState;)Ljava/util/List; + ARG 1 renderState diff --git a/data/net/minecraft/client/model/CreeperModel.mapping b/data/net/minecraft/client/model/CreeperModel.mapping index 9676d0f0a..2db96c050 100644 --- a/data/net/minecraft/client/model/CreeperModel.mapping +++ b/data/net/minecraft/client/model/CreeperModel.mapping @@ -3,11 +3,3 @@ CLASS net/minecraft/client/model/CreeperModel ARG 1 root METHOD createBodyLayer (Lnet/minecraft/client/model/geom/builders/CubeDeformation;)Lnet/minecraft/client/model/geom/builders/LayerDefinition; ARG 0 cubeDeformation - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/DolphinModel.mapping b/data/net/minecraft/client/model/DolphinModel.mapping index 39b60a3a8..981e45b3d 100644 --- a/data/net/minecraft/client/model/DolphinModel.mapping +++ b/data/net/minecraft/client/model/DolphinModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/DolphinModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/DonkeyModel.mapping b/data/net/minecraft/client/model/DonkeyModel.mapping new file mode 100644 index 000000000..4ae33545b --- /dev/null +++ b/data/net/minecraft/client/model/DonkeyModel.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/client/model/DonkeyModel + METHOD modifyMesh (Lnet/minecraft/client/model/geom/builders/PartDefinition;)V + ARG 0 partDefinition diff --git a/data/net/minecraft/client/model/DrownedModel.mapping b/data/net/minecraft/client/model/DrownedModel.mapping index f3dd1327b..b055c1bb7 100644 --- a/data/net/minecraft/client/model/DrownedModel.mapping +++ b/data/net/minecraft/client/model/DrownedModel.mapping @@ -1,16 +1,3 @@ CLASS net/minecraft/client/model/DrownedModel METHOD createBodyLayer (Lnet/minecraft/client/model/geom/builders/CubeDeformation;)Lnet/minecraft/client/model/geom/builders/LayerDefinition; ARG 0 cubeDeformation - METHOD prepareMobModel (Lnet/minecraft/world/entity/monster/Zombie;FFF)V - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 partialTick - METHOD setupAnim (Lnet/minecraft/world/entity/monster/Zombie;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/ElytraModel.mapping b/data/net/minecraft/client/model/ElytraModel.mapping index 973e2c617..cd1f10d7c 100644 --- a/data/net/minecraft/client/model/ElytraModel.mapping +++ b/data/net/minecraft/client/model/ElytraModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/ElytraModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD setupAnim (Lnet/minecraft/world/entity/LivingEntity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/EndCrystalModel.mapping b/data/net/minecraft/client/model/EndCrystalModel.mapping new file mode 100644 index 000000000..6c4b11895 --- /dev/null +++ b/data/net/minecraft/client/model/EndCrystalModel.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/client/model/EndCrystalModel + METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V + ARG 1 root diff --git a/data/net/minecraft/client/model/EndermanModel.mapping b/data/net/minecraft/client/model/EndermanModel.mapping deleted file mode 100644 index e7cc79bcc..000000000 --- a/data/net/minecraft/client/model/EndermanModel.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/client/model/EndermanModel - METHOD setupAnim (Lnet/minecraft/world/entity/LivingEntity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/EndermiteModel.mapping b/data/net/minecraft/client/model/EndermiteModel.mapping index 9b0ddd3f3..d282b70c9 100644 --- a/data/net/minecraft/client/model/EndermiteModel.mapping +++ b/data/net/minecraft/client/model/EndermiteModel.mapping @@ -3,11 +3,3 @@ CLASS net/minecraft/client/model/EndermiteModel ARG 1 root METHOD createSegmentName (I)Ljava/lang/String; ARG 0 index - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/EntityModel.mapping b/data/net/minecraft/client/model/EntityModel.mapping index d1c217a2a..776e40296 100644 --- a/data/net/minecraft/client/model/EntityModel.mapping +++ b/data/net/minecraft/client/model/EntityModel.mapping @@ -1,16 +1,5 @@ CLASS net/minecraft/client/model/EntityModel - METHOD copyPropertiesTo (Lnet/minecraft/client/model/EntityModel;)V - ARG 1 otherModel - METHOD prepareMobModel (Lnet/minecraft/world/entity/Entity;FFF)V - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 partialTick - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch + METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V + ARG 1 root + METHOD setupAnim (Lnet/minecraft/client/renderer/entity/state/EntityRenderState;)V + ARG 1 renderState diff --git a/data/net/minecraft/client/model/EvokerFangsModel.mapping b/data/net/minecraft/client/model/EvokerFangsModel.mapping index a63306aec..e8e9bc1b1 100644 --- a/data/net/minecraft/client/model/EvokerFangsModel.mapping +++ b/data/net/minecraft/client/model/EvokerFangsModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/EvokerFangsModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/FelineModel.mapping b/data/net/minecraft/client/model/FelineModel.mapping new file mode 100644 index 000000000..8df879e29 --- /dev/null +++ b/data/net/minecraft/client/model/FelineModel.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/client/model/FelineModel + METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V + ARG 1 root + METHOD createBodyMesh (Lnet/minecraft/client/model/geom/builders/CubeDeformation;)Lnet/minecraft/client/model/geom/builders/MeshDefinition; + ARG 0 cubeDeformation diff --git a/data/net/minecraft/client/model/FoxModel.mapping b/data/net/minecraft/client/model/FoxModel.mapping index 7d735c358..294801687 100644 --- a/data/net/minecraft/client/model/FoxModel.mapping +++ b/data/net/minecraft/client/model/FoxModel.mapping @@ -1,16 +1,3 @@ CLASS net/minecraft/client/model/FoxModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD prepareMobModel (Lnet/minecraft/world/entity/animal/Fox;FFF)V - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 partialTick - METHOD setupAnim (Lnet/minecraft/world/entity/animal/Fox;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/GhastModel.mapping b/data/net/minecraft/client/model/GhastModel.mapping index 576d7f2e7..0dc9b0e42 100644 --- a/data/net/minecraft/client/model/GhastModel.mapping +++ b/data/net/minecraft/client/model/GhastModel.mapping @@ -3,11 +3,3 @@ CLASS net/minecraft/client/model/GhastModel ARG 1 root METHOD createTentacleName (I)Ljava/lang/String; ARG 0 index - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/GiantZombieModel.mapping b/data/net/minecraft/client/model/GiantZombieModel.mapping deleted file mode 100644 index 23008a43e..000000000 --- a/data/net/minecraft/client/model/GiantZombieModel.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/client/model/GiantZombieModel - METHOD isAggressive (Lnet/minecraft/world/entity/monster/Giant;)Z - ARG 1 entity diff --git a/data/net/minecraft/client/model/GuardianModel.mapping b/data/net/minecraft/client/model/GuardianModel.mapping index e6f47e023..594301959 100644 --- a/data/net/minecraft/client/model/GuardianModel.mapping +++ b/data/net/minecraft/client/model/GuardianModel.mapping @@ -6,22 +6,19 @@ CLASS net/minecraft/client/model/GuardianModel METHOD getSpikeOffset (IFF)F ARG 0 index ARG 1 ageInTicks + ARG 2 spikeAnimation METHOD getSpikeX (IFF)F ARG 0 index ARG 1 ageInTicks + ARG 2 spikeAnimation METHOD getSpikeY (IFF)F ARG 0 index ARG 1 ageInTicks + ARG 2 spikeAnimation METHOD getSpikeZ (IFF)F ARG 0 index ARG 1 ageInTicks - METHOD setupAnim (Lnet/minecraft/world/entity/monster/Guardian;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch + ARG 2 spikeAnimation METHOD setupSpikes (FF)V ARG 1 ageInTicks + ARG 2 spikeAnimation diff --git a/data/net/minecraft/client/model/HierarchicalModel.mapping b/data/net/minecraft/client/model/HierarchicalModel.mapping deleted file mode 100644 index f4ae1ca0a..000000000 --- a/data/net/minecraft/client/model/HierarchicalModel.mapping +++ /dev/null @@ -1,20 +0,0 @@ -CLASS net/minecraft/client/model/HierarchicalModel - METHOD animate (Lnet/minecraft/world/entity/AnimationState;Lnet/minecraft/client/animation/AnimationDefinition;F)V - ARG 1 animationState - ARG 2 animationDefinition - ARG 3 ageInTicks - METHOD animate (Lnet/minecraft/world/entity/AnimationState;Lnet/minecraft/client/animation/AnimationDefinition;FF)V - ARG 1 animationState - ARG 2 animationDefinition - ARG 3 ageInTicks - ARG 4 speed - METHOD animateWalk (Lnet/minecraft/client/animation/AnimationDefinition;FFFF)V - ARG 1 animationDefinition - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 maxAnimationSpeed - ARG 5 animationScaleFactor - METHOD applyStatic (Lnet/minecraft/client/animation/AnimationDefinition;)V - ARG 1 animationDefinition - METHOD getAnyDescendantWithName (Ljava/lang/String;)Ljava/util/Optional; - ARG 1 name diff --git a/data/net/minecraft/client/model/HoglinModel.mapping b/data/net/minecraft/client/model/HoglinModel.mapping index d8e2a180f..ae743e184 100644 --- a/data/net/minecraft/client/model/HoglinModel.mapping +++ b/data/net/minecraft/client/model/HoglinModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/HoglinModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD setupAnim (Lnet/minecraft/world/entity/Mob;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/HorseModel.mapping b/data/net/minecraft/client/model/HorseModel.mapping index 9897a5fc2..3c1a3ccb5 100644 --- a/data/net/minecraft/client/model/HorseModel.mapping +++ b/data/net/minecraft/client/model/HorseModel.mapping @@ -1,18 +1,3 @@ CLASS net/minecraft/client/model/HorseModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD createBodyMesh (Lnet/minecraft/client/model/geom/builders/CubeDeformation;)Lnet/minecraft/client/model/geom/builders/MeshDefinition; - ARG 0 cubeDeformation - METHOD prepareMobModel (Lnet/minecraft/world/entity/animal/horse/AbstractHorse;FFF)V - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 partialTick - METHOD setupAnim (Lnet/minecraft/world/entity/animal/horse/AbstractHorse;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/HumanoidModel.mapping b/data/net/minecraft/client/model/HumanoidModel.mapping index 02e2fa5ad..3d59d0845 100644 --- a/data/net/minecraft/client/model/HumanoidModel.mapping +++ b/data/net/minecraft/client/model/HumanoidModel.mapping @@ -21,38 +21,24 @@ CLASS net/minecraft/client/model/HumanoidModel ARG 1 yOffset METHOD getArm (Lnet/minecraft/world/entity/HumanoidArm;)Lnet/minecraft/client/model/geom/ModelPart; ARG 1 side - METHOD getAttackArm (Lnet/minecraft/world/entity/LivingEntity;)Lnet/minecraft/world/entity/HumanoidArm; - ARG 1 entity + METHOD getArmPose (Lnet/minecraft/client/renderer/entity/state/HumanoidRenderState;Lnet/minecraft/world/entity/HumanoidArm;)Lnet/minecraft/client/model/HumanoidModel$ArmPose; + ARG 1 renderState + ARG 2 arm METHOD poseBlockingArm (Lnet/minecraft/client/model/geom/ModelPart;Z)V ARG 1 arm ARG 2 isRightArm - METHOD poseLeftArm (Lnet/minecraft/world/entity/LivingEntity;)V - ARG 1 livingEntity - METHOD poseRightArm (Lnet/minecraft/world/entity/LivingEntity;)V - ARG 1 livingEntity - METHOD prepareMobModel (Lnet/minecraft/world/entity/LivingEntity;FFF)V - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 partialTick + METHOD poseLeftArm (Lnet/minecraft/client/renderer/entity/state/HumanoidRenderState;Lnet/minecraft/client/model/HumanoidModel$ArmPose;)V + ARG 1 renderState + ARG 2 pose + METHOD poseRightArm (Lnet/minecraft/client/renderer/entity/state/HumanoidRenderState;Lnet/minecraft/client/model/HumanoidModel$ArmPose;)V + ARG 1 renderState + ARG 2 pose METHOD quadraticArmUpdate (F)F ARG 1 limbSwing - METHOD rotlerpRad (FFF)F - ARG 1 angle - ARG 2 maxAngle - ARG 3 mul METHOD setAllVisible (Z)V ARG 1 visible - METHOD setupAnim (Lnet/minecraft/world/entity/LivingEntity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch - METHOD setupAttackAnimation (Lnet/minecraft/world/entity/LivingEntity;F)V - ARG 1 livingEntity + METHOD setupAttackAnimation (Lnet/minecraft/client/renderer/entity/state/HumanoidRenderState;F)V + ARG 1 renderState ARG 2 ageInTicks METHOD translateToHand (Lnet/minecraft/world/entity/HumanoidArm;Lcom/mojang/blaze3d/vertex/PoseStack;)V ARG 1 side diff --git a/data/net/minecraft/client/model/IllagerModel.mapping b/data/net/minecraft/client/model/IllagerModel.mapping index 3727c85b4..48198907d 100644 --- a/data/net/minecraft/client/model/IllagerModel.mapping +++ b/data/net/minecraft/client/model/IllagerModel.mapping @@ -3,14 +3,6 @@ CLASS net/minecraft/client/model/IllagerModel ARG 1 root METHOD getArm (Lnet/minecraft/world/entity/HumanoidArm;)Lnet/minecraft/client/model/geom/ModelPart; ARG 1 arm - METHOD setupAnim (Lnet/minecraft/world/entity/monster/AbstractIllager;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch METHOD translateToHand (Lnet/minecraft/world/entity/HumanoidArm;Lcom/mojang/blaze3d/vertex/PoseStack;)V ARG 1 side ARG 2 poseStack diff --git a/data/net/minecraft/client/model/IronGolemModel.mapping b/data/net/minecraft/client/model/IronGolemModel.mapping index 9ad3a34de..d400c6da8 100644 --- a/data/net/minecraft/client/model/IronGolemModel.mapping +++ b/data/net/minecraft/client/model/IronGolemModel.mapping @@ -1,16 +1,3 @@ CLASS net/minecraft/client/model/IronGolemModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD prepareMobModel (Lnet/minecraft/world/entity/animal/IronGolem;FFF)V - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 partialTick - METHOD setupAnim (Lnet/minecraft/world/entity/animal/IronGolem;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/LavaSlimeModel.mapping b/data/net/minecraft/client/model/LavaSlimeModel.mapping index eff3fe515..1d6195ddc 100644 --- a/data/net/minecraft/client/model/LavaSlimeModel.mapping +++ b/data/net/minecraft/client/model/LavaSlimeModel.mapping @@ -5,16 +5,3 @@ CLASS net/minecraft/client/model/LavaSlimeModel ARG 0 index METHOD lambda$new$0 (Lnet/minecraft/client/model/geom/ModelPart;I)Lnet/minecraft/client/model/geom/ModelPart; ARG 1 index - METHOD prepareMobModel (Lnet/minecraft/world/entity/monster/Slime;FFF)V - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 partialTick - METHOD setupAnim (Lnet/minecraft/world/entity/monster/Slime;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/LeashKnotModel.mapping b/data/net/minecraft/client/model/LeashKnotModel.mapping index bb31a9436..78616f5df 100644 --- a/data/net/minecraft/client/model/LeashKnotModel.mapping +++ b/data/net/minecraft/client/model/LeashKnotModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/LeashKnotModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/LlamaModel.mapping b/data/net/minecraft/client/model/LlamaModel.mapping index b88db6ed6..836e1ecef 100644 --- a/data/net/minecraft/client/model/LlamaModel.mapping +++ b/data/net/minecraft/client/model/LlamaModel.mapping @@ -3,11 +3,5 @@ CLASS net/minecraft/client/model/LlamaModel ARG 1 root METHOD createBodyLayer (Lnet/minecraft/client/model/geom/builders/CubeDeformation;)Lnet/minecraft/client/model/geom/builders/LayerDefinition; ARG 0 cubeDeformation - METHOD setupAnim (Lnet/minecraft/world/entity/animal/horse/AbstractChestedHorse;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch + METHOD transformToBaby (Lnet/minecraft/client/model/geom/builders/MeshDefinition;)Lnet/minecraft/client/model/geom/builders/MeshDefinition; + ARG 0 mesh diff --git a/data/net/minecraft/client/model/LlamaSpitModel.mapping b/data/net/minecraft/client/model/LlamaSpitModel.mapping index 477a5d94b..eb4d7210c 100644 --- a/data/net/minecraft/client/model/LlamaSpitModel.mapping +++ b/data/net/minecraft/client/model/LlamaSpitModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/LlamaSpitModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/MinecartModel.mapping b/data/net/minecraft/client/model/MinecartModel.mapping index 12179d05b..f9bae38e3 100644 --- a/data/net/minecraft/client/model/MinecartModel.mapping +++ b/data/net/minecraft/client/model/MinecartModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/MinecartModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/Model.mapping b/data/net/minecraft/client/model/Model.mapping index 4e6d8100f..56e1484ab 100644 --- a/data/net/minecraft/client/model/Model.mapping +++ b/data/net/minecraft/client/model/Model.mapping @@ -1,9 +1,29 @@ CLASS net/minecraft/client/model/Model - METHOD (Ljava/util/function/Function;)V - ARG 1 renderType + METHOD (Lnet/minecraft/client/model/geom/ModelPart;Ljava/util/function/Function;)V + ARG 1 root + ARG 2 renderType + METHOD animate (Lnet/minecraft/world/entity/AnimationState;Lnet/minecraft/client/animation/AnimationDefinition;F)V + ARG 1 state + ARG 2 definition + ARG 3 ageInTicks + METHOD animate (Lnet/minecraft/world/entity/AnimationState;Lnet/minecraft/client/animation/AnimationDefinition;FF)V + ARG 1 state + ARG 2 definition + ARG 3 ageInTicks + ARG 4 speed + METHOD animateWalk (Lnet/minecraft/client/animation/AnimationDefinition;FFFF)V + ARG 1 definition + ARG 2 walkAnimationPos + ARG 3 walkAnimationSpeed + ARG 4 timeMultiplier + ARG 5 speedMultiplier + METHOD applyStatic (Lnet/minecraft/client/animation/AnimationDefinition;)V + ARG 1 animationDefinition + METHOD getAnyDescendantWithName (Ljava/lang/String;)Ljava/util/Optional; + ARG 1 name METHOD renderToBuffer (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;II)V ARG 1 poseStack - ARG 2 vertexConsumer + ARG 2 buffer ARG 3 packedLight ARG 4 packedOverlay METHOD renderToBuffer (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;III)V @@ -14,3 +34,7 @@ CLASS net/minecraft/client/model/Model ARG 5 color METHOD renderType (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; ARG 1 location + CLASS Simple + METHOD (Lnet/minecraft/client/model/geom/ModelPart;Ljava/util/function/Function;)V + ARG 1 root + ARG 2 renderType diff --git a/data/net/minecraft/client/model/ModelUtils.mapping b/data/net/minecraft/client/model/ModelUtils.mapping deleted file mode 100644 index 2c4726eca..000000000 --- a/data/net/minecraft/client/model/ModelUtils.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/client/model/ModelUtils - METHOD rotlerpRad (FFF)F - ARG 0 min - ARG 1 max - ARG 2 delta diff --git a/data/net/minecraft/client/model/OcelotModel.mapping b/data/net/minecraft/client/model/OcelotModel.mapping index c41cf2070..5785957c3 100644 --- a/data/net/minecraft/client/model/OcelotModel.mapping +++ b/data/net/minecraft/client/model/OcelotModel.mapping @@ -1,18 +1,3 @@ CLASS net/minecraft/client/model/OcelotModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD createBodyMesh (Lnet/minecraft/client/model/geom/builders/CubeDeformation;)Lnet/minecraft/client/model/geom/builders/MeshDefinition; - ARG 0 cubeDeformation - METHOD prepareMobModel (Lnet/minecraft/world/entity/Entity;FFF)V - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 partialTick - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/PandaModel.mapping b/data/net/minecraft/client/model/PandaModel.mapping index 5e0048605..0698b78e7 100644 --- a/data/net/minecraft/client/model/PandaModel.mapping +++ b/data/net/minecraft/client/model/PandaModel.mapping @@ -1,16 +1,3 @@ CLASS net/minecraft/client/model/PandaModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD prepareMobModel (Lnet/minecraft/world/entity/animal/Panda;FFF)V - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 partialTick - METHOD setupAnim (Lnet/minecraft/world/entity/animal/Panda;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/ParrotModel.mapping b/data/net/minecraft/client/model/ParrotModel.mapping index d743d0b2a..a3ab19dfa 100644 --- a/data/net/minecraft/client/model/ParrotModel.mapping +++ b/data/net/minecraft/client/model/ParrotModel.mapping @@ -1,38 +1,7 @@ CLASS net/minecraft/client/model/ParrotModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD getState (Lnet/minecraft/world/entity/animal/Parrot;)Lnet/minecraft/client/model/ParrotModel$State; + METHOD getPose (Lnet/minecraft/world/entity/animal/Parrot;)Lnet/minecraft/client/model/ParrotModel$Pose; ARG 0 parrot - METHOD prepare (Lnet/minecraft/client/model/ParrotModel$State;)V - ARG 1 state - METHOD prepareMobModel (Lnet/minecraft/world/entity/animal/Parrot;FFF)V - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 partialTick - METHOD renderOnShoulder (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;IIFFFFI)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 packedOverlay - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 netHeadYaw - ARG 8 headPitch - ARG 9 tickCount - METHOD setupAnim (Lnet/minecraft/client/model/ParrotModel$State;IFFFFF)V - ARG 1 state - ARG 2 tickCount - ARG 3 limbSwing - ARG 4 limbSwingAmount - ARG 5 ageInTicks - ARG 6 netHeadYaw - ARG 7 headPitch - METHOD setupAnim (Lnet/minecraft/world/entity/animal/Parrot;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch + METHOD prepare (Lnet/minecraft/client/model/ParrotModel$Pose;)V + ARG 1 pose diff --git a/data/net/minecraft/client/model/PiglinModel.mapping b/data/net/minecraft/client/model/PiglinModel.mapping index 1c201e13f..3217ba4c9 100644 --- a/data/net/minecraft/client/model/PiglinModel.mapping +++ b/data/net/minecraft/client/model/PiglinModel.mapping @@ -1,16 +1,3 @@ CLASS net/minecraft/client/model/PiglinModel - METHOD addHead (Lnet/minecraft/client/model/geom/builders/CubeDeformation;Lnet/minecraft/client/model/geom/builders/MeshDefinition;)V - ARG 0 cubeDeformation - ARG 1 mesh - METHOD createMesh (Lnet/minecraft/client/model/geom/builders/CubeDeformation;)Lnet/minecraft/client/model/geom/builders/MeshDefinition; - ARG 0 cubeDeformation - METHOD holdWeaponHigh (Lnet/minecraft/world/entity/Mob;)V - ARG 1 mob - METHOD setupAnim (Lnet/minecraft/world/entity/Mob;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch + METHOD holdWeaponHigh (Lnet/minecraft/client/renderer/entity/state/PiglinRenderState;)V + ARG 1 renderState diff --git a/data/net/minecraft/client/model/PlayerModel.mapping b/data/net/minecraft/client/model/PlayerModel.mapping index 0d06a4a32..47b41a7bc 100644 --- a/data/net/minecraft/client/model/PlayerModel.mapping +++ b/data/net/minecraft/client/model/PlayerModel.mapping @@ -5,30 +5,10 @@ CLASS net/minecraft/client/model/PlayerModel METHOD createMesh (Lnet/minecraft/client/model/geom/builders/CubeDeformation;Z)Lnet/minecraft/client/model/geom/builders/MeshDefinition; ARG 0 cubeDeformation ARG 1 slim - METHOD getRandomModelPart (Lnet/minecraft/util/RandomSource;)Lnet/minecraft/client/model/geom/ModelPart; + METHOD getRandomBodyPart (Lnet/minecraft/util/RandomSource;)Lnet/minecraft/client/model/geom/ModelPart; ARG 1 random - METHOD lambda$new$0 (Lnet/minecraft/client/model/geom/ModelPart;)Z - ARG 0 part - METHOD renderCloak (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;II)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 packedOverlay - METHOD renderEars (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;II)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 packedOverlay METHOD setAllVisible (Z)V ARG 1 visible - METHOD setupAnim (Lnet/minecraft/world/entity/LivingEntity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch METHOD translateToHand (Lnet/minecraft/world/entity/HumanoidArm;Lcom/mojang/blaze3d/vertex/PoseStack;)V ARG 1 side ARG 2 poseStack diff --git a/data/net/minecraft/client/model/PolarBearModel.mapping b/data/net/minecraft/client/model/PolarBearModel.mapping index 4ed53774b..15c21e4b3 100644 --- a/data/net/minecraft/client/model/PolarBearModel.mapping +++ b/data/net/minecraft/client/model/PolarBearModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/PolarBearModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD setupAnim (Lnet/minecraft/world/entity/animal/PolarBear;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/PufferfishBigModel.mapping b/data/net/minecraft/client/model/PufferfishBigModel.mapping index ca6294188..cb946651e 100644 --- a/data/net/minecraft/client/model/PufferfishBigModel.mapping +++ b/data/net/minecraft/client/model/PufferfishBigModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/PufferfishBigModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/PufferfishMidModel.mapping b/data/net/minecraft/client/model/PufferfishMidModel.mapping index 796957697..d69bba0ef 100644 --- a/data/net/minecraft/client/model/PufferfishMidModel.mapping +++ b/data/net/minecraft/client/model/PufferfishMidModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/PufferfishMidModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/PufferfishSmallModel.mapping b/data/net/minecraft/client/model/PufferfishSmallModel.mapping index 4145b81fb..b3894c613 100644 --- a/data/net/minecraft/client/model/PufferfishSmallModel.mapping +++ b/data/net/minecraft/client/model/PufferfishSmallModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/PufferfishSmallModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/QuadrupedModel.mapping b/data/net/minecraft/client/model/QuadrupedModel.mapping index d93755425..660c22451 100644 --- a/data/net/minecraft/client/model/QuadrupedModel.mapping +++ b/data/net/minecraft/client/model/QuadrupedModel.mapping @@ -1,20 +1,6 @@ CLASS net/minecraft/client/model/QuadrupedModel - METHOD (Lnet/minecraft/client/model/geom/ModelPart;ZFFFFI)V + METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - ARG 2 scaleHead - ARG 3 babyYHeadOffset - ARG 4 babyZHeadOffset - ARG 5 babyHeadScale - ARG 6 babyBodyScale - ARG 7 bodyYOffset METHOD createBodyMesh (ILnet/minecraft/client/model/geom/builders/CubeDeformation;)Lnet/minecraft/client/model/geom/builders/MeshDefinition; ARG 0 yOffset ARG 1 cubeDeformation - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/RabbitModel.mapping b/data/net/minecraft/client/model/RabbitModel.mapping index 88607a5cc..b8c7e8624 100644 --- a/data/net/minecraft/client/model/RabbitModel.mapping +++ b/data/net/minecraft/client/model/RabbitModel.mapping @@ -1,24 +1,9 @@ CLASS net/minecraft/client/model/RabbitModel - FIELD body Lnet/minecraft/client/model/geom/ModelPart; - COMMENT The Rabbit's Body FIELD head Lnet/minecraft/client/model/geom/ModelPart; COMMENT The Rabbit's Head FIELD nose Lnet/minecraft/client/model/geom/ModelPart; COMMENT The Rabbit's Nose - FIELD tail Lnet/minecraft/client/model/geom/ModelPart; - COMMENT The Rabbit's Tail METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD prepareMobModel (Lnet/minecraft/world/entity/animal/Rabbit;FFF)V - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 partialTick - METHOD setupAnim (Lnet/minecraft/world/entity/animal/Rabbit;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch + METHOD createBodyLayer (Z)Lnet/minecraft/client/model/geom/builders/LayerDefinition; + ARG 0 baby diff --git a/data/net/minecraft/client/model/RaftModel.mapping b/data/net/minecraft/client/model/RaftModel.mapping index fdfeec51e..2fe258d77 100644 --- a/data/net/minecraft/client/model/RaftModel.mapping +++ b/data/net/minecraft/client/model/RaftModel.mapping @@ -1,12 +1,5 @@ CLASS net/minecraft/client/model/RaftModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD animatePaddle (Lnet/minecraft/world/entity/vehicle/Boat;ILnet/minecraft/client/model/geom/ModelPart;F)V - ARG 0 boat - ARG 1 side - ARG 2 paddle - ARG 3 limbSwing - METHOD createChildren (Lnet/minecraft/client/model/geom/builders/PartDefinition;)V - ARG 0 root - METHOD createPartsBuilder (Lnet/minecraft/client/model/geom/ModelPart;)Lcom/google/common/collect/ImmutableList$Builder; - ARG 1 root + METHOD addCommonParts (Lnet/minecraft/client/model/geom/builders/PartDefinition;)V + ARG 0 partDefinition diff --git a/data/net/minecraft/client/model/RavagerModel.mapping b/data/net/minecraft/client/model/RavagerModel.mapping index 7882f2080..402422288 100644 --- a/data/net/minecraft/client/model/RavagerModel.mapping +++ b/data/net/minecraft/client/model/RavagerModel.mapping @@ -1,16 +1,3 @@ CLASS net/minecraft/client/model/RavagerModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD prepareMobModel (Lnet/minecraft/world/entity/monster/Ravager;FFF)V - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 partialTick - METHOD setupAnim (Lnet/minecraft/world/entity/monster/Ravager;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/SalmonModel.mapping b/data/net/minecraft/client/model/SalmonModel.mapping index 2995a0ed8..630bb8529 100644 --- a/data/net/minecraft/client/model/SalmonModel.mapping +++ b/data/net/minecraft/client/model/SalmonModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/SalmonModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/SheepFurModel.mapping b/data/net/minecraft/client/model/SheepFurModel.mapping index 3d1393451..5498db5e5 100644 --- a/data/net/minecraft/client/model/SheepFurModel.mapping +++ b/data/net/minecraft/client/model/SheepFurModel.mapping @@ -1,16 +1,3 @@ CLASS net/minecraft/client/model/SheepFurModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD prepareMobModel (Lnet/minecraft/world/entity/animal/Sheep;FFF)V - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 partialTick - METHOD setupAnim (Lnet/minecraft/world/entity/animal/Sheep;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/SheepModel.mapping b/data/net/minecraft/client/model/SheepModel.mapping index 345358b9a..88402f3a7 100644 --- a/data/net/minecraft/client/model/SheepModel.mapping +++ b/data/net/minecraft/client/model/SheepModel.mapping @@ -1,16 +1,3 @@ CLASS net/minecraft/client/model/SheepModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD prepareMobModel (Lnet/minecraft/world/entity/animal/Sheep;FFF)V - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 partialTick - METHOD setupAnim (Lnet/minecraft/world/entity/animal/Sheep;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/ShulkerBulletModel.mapping b/data/net/minecraft/client/model/ShulkerBulletModel.mapping index 49e5a37fa..d47c891c5 100644 --- a/data/net/minecraft/client/model/ShulkerBulletModel.mapping +++ b/data/net/minecraft/client/model/ShulkerBulletModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/ShulkerBulletModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/ShulkerModel.mapping b/data/net/minecraft/client/model/ShulkerModel.mapping index a692d54cb..34d71ec95 100644 --- a/data/net/minecraft/client/model/ShulkerModel.mapping +++ b/data/net/minecraft/client/model/ShulkerModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/ShulkerModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD setupAnim (Lnet/minecraft/world/entity/monster/Shulker;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/SilverfishModel.mapping b/data/net/minecraft/client/model/SilverfishModel.mapping index a08db663b..ad3c75b30 100644 --- a/data/net/minecraft/client/model/SilverfishModel.mapping +++ b/data/net/minecraft/client/model/SilverfishModel.mapping @@ -9,11 +9,3 @@ CLASS net/minecraft/client/model/SilverfishModel ARG 1 index METHOD lambda$new$1 (Lnet/minecraft/client/model/geom/ModelPart;I)Lnet/minecraft/client/model/geom/ModelPart; ARG 1 index - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/SkeletonModel.mapping b/data/net/minecraft/client/model/SkeletonModel.mapping index 327444610..28a81908f 100644 --- a/data/net/minecraft/client/model/SkeletonModel.mapping +++ b/data/net/minecraft/client/model/SkeletonModel.mapping @@ -1,19 +1,6 @@ CLASS net/minecraft/client/model/SkeletonModel METHOD createDefaultSkeletonMesh (Lnet/minecraft/client/model/geom/builders/PartDefinition;)V ARG 0 partDefinition - METHOD prepareMobModel (Lnet/minecraft/world/entity/Mob;FFF)V - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 partialTick - METHOD setupAnim (Lnet/minecraft/world/entity/Mob;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch METHOD translateToHand (Lnet/minecraft/world/entity/HumanoidArm;Lcom/mojang/blaze3d/vertex/PoseStack;)V ARG 1 side ARG 2 poseStack diff --git a/data/net/minecraft/client/model/SkullModelBase.mapping b/data/net/minecraft/client/model/SkullModelBase.mapping index 5a2b71111..1590dc236 100644 --- a/data/net/minecraft/client/model/SkullModelBase.mapping +++ b/data/net/minecraft/client/model/SkullModelBase.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/client/model/SkullModelBase + METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V + ARG 1 root METHOD setupAnim (FFF)V ARG 1 mouthAnimation ARG 2 yRot diff --git a/data/net/minecraft/client/model/SlimeModel.mapping b/data/net/minecraft/client/model/SlimeModel.mapping index dde30d321..b182809b9 100644 --- a/data/net/minecraft/client/model/SlimeModel.mapping +++ b/data/net/minecraft/client/model/SlimeModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/SlimeModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/SnowGolemModel.mapping b/data/net/minecraft/client/model/SnowGolemModel.mapping index e0cde611c..44b398f2a 100644 --- a/data/net/minecraft/client/model/SnowGolemModel.mapping +++ b/data/net/minecraft/client/model/SnowGolemModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/SnowGolemModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/SpiderModel.mapping b/data/net/minecraft/client/model/SpiderModel.mapping index 2930d3c59..79745c2f1 100644 --- a/data/net/minecraft/client/model/SpiderModel.mapping +++ b/data/net/minecraft/client/model/SpiderModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/SpiderModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/SpinAttackEffectModel.mapping b/data/net/minecraft/client/model/SpinAttackEffectModel.mapping new file mode 100644 index 000000000..46e214bc8 --- /dev/null +++ b/data/net/minecraft/client/model/SpinAttackEffectModel.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/client/model/SpinAttackEffectModel + METHOD boxName (I)Ljava/lang/String; + ARG 0 index diff --git a/data/net/minecraft/client/model/SquidModel.mapping b/data/net/minecraft/client/model/SquidModel.mapping index 0650fee29..1d3f7e342 100644 --- a/data/net/minecraft/client/model/SquidModel.mapping +++ b/data/net/minecraft/client/model/SquidModel.mapping @@ -5,11 +5,3 @@ CLASS net/minecraft/client/model/SquidModel ARG 0 index METHOD lambda$new$0 (Lnet/minecraft/client/model/geom/ModelPart;I)Lnet/minecraft/client/model/geom/ModelPart; ARG 1 index - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/StriderModel.mapping b/data/net/minecraft/client/model/StriderModel.mapping index 9589e7866..5bb337dc9 100644 --- a/data/net/minecraft/client/model/StriderModel.mapping +++ b/data/net/minecraft/client/model/StriderModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/StriderModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD setupAnim (Lnet/minecraft/world/entity/monster/Strider;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/TropicalFishModelA.mapping b/data/net/minecraft/client/model/TropicalFishModelA.mapping index b3666ed09..09e3f31c5 100644 --- a/data/net/minecraft/client/model/TropicalFishModelA.mapping +++ b/data/net/minecraft/client/model/TropicalFishModelA.mapping @@ -3,11 +3,3 @@ CLASS net/minecraft/client/model/TropicalFishModelA ARG 1 root METHOD createBodyLayer (Lnet/minecraft/client/model/geom/builders/CubeDeformation;)Lnet/minecraft/client/model/geom/builders/LayerDefinition; ARG 0 cubeDeformation - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/TropicalFishModelB.mapping b/data/net/minecraft/client/model/TropicalFishModelB.mapping index 995b5b584..2263d786c 100644 --- a/data/net/minecraft/client/model/TropicalFishModelB.mapping +++ b/data/net/minecraft/client/model/TropicalFishModelB.mapping @@ -3,11 +3,3 @@ CLASS net/minecraft/client/model/TropicalFishModelB ARG 1 root METHOD createBodyLayer (Lnet/minecraft/client/model/geom/builders/CubeDeformation;)Lnet/minecraft/client/model/geom/builders/LayerDefinition; ARG 0 cubeDeformation - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/TurtleModel.mapping b/data/net/minecraft/client/model/TurtleModel.mapping index 5e07bff33..847857db3 100644 --- a/data/net/minecraft/client/model/TurtleModel.mapping +++ b/data/net/minecraft/client/model/TurtleModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/TurtleModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD setupAnim (Lnet/minecraft/world/entity/animal/Turtle;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/VexModel.mapping b/data/net/minecraft/client/model/VexModel.mapping index 1325f345f..0e1367735 100644 --- a/data/net/minecraft/client/model/VexModel.mapping +++ b/data/net/minecraft/client/model/VexModel.mapping @@ -4,14 +4,7 @@ CLASS net/minecraft/client/model/VexModel METHOD offsetStackPosition (Lcom/mojang/blaze3d/vertex/PoseStack;Z)V ARG 1 poseStack ARG 2 rightSide - METHOD setArmsCharging (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;F)V - ARG 1 rightHandItem - ARG 2 leftHandItem - METHOD setupAnim (Lnet/minecraft/world/entity/monster/Vex;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch + METHOD setArmsCharging (ZZF)V + ARG 1 rightArm + ARG 2 leftArm + ARG 3 chargeAmount diff --git a/data/net/minecraft/client/model/VillagerModel.mapping b/data/net/minecraft/client/model/VillagerModel.mapping index bbb7af8d5..eb261f174 100644 --- a/data/net/minecraft/client/model/VillagerModel.mapping +++ b/data/net/minecraft/client/model/VillagerModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/VillagerModel METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V ARG 1 root - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/WardenModel.mapping b/data/net/minecraft/client/model/WardenModel.mapping index d7cd97dde..22203765f 100644 --- a/data/net/minecraft/client/model/WardenModel.mapping +++ b/data/net/minecraft/client/model/WardenModel.mapping @@ -6,10 +6,17 @@ CLASS net/minecraft/client/model/WardenModel ARG 2 pitch METHOD animateIdlePose (F)V ARG 1 ageInTicks - METHOD animateTendrils (Lnet/minecraft/world/entity/monster/warden/Warden;FF)V - ARG 1 entity + METHOD animateTendrils (Lnet/minecraft/client/renderer/entity/state/WardenRenderState;F)V + ARG 1 renderState ARG 2 ageInTicks - ARG 3 partialTick METHOD animateWalk (FF)V ARG 1 limbSwing ARG 2 limbSwingAmount + METHOD getBioluminescentLayerModelParts (Lnet/minecraft/client/renderer/entity/state/WardenRenderState;)Ljava/util/List; + ARG 1 renderState + METHOD getHeartLayerModelParts (Lnet/minecraft/client/renderer/entity/state/WardenRenderState;)Ljava/util/List; + ARG 1 renderState + METHOD getPulsatingSpotsLayerModelParts (Lnet/minecraft/client/renderer/entity/state/WardenRenderState;)Ljava/util/List; + ARG 1 renderState + METHOD getTendrilsLayerModelParts (Lnet/minecraft/client/renderer/entity/state/WardenRenderState;)Ljava/util/List; + ARG 1 renderState diff --git a/data/net/minecraft/client/model/WitchModel.mapping b/data/net/minecraft/client/model/WitchModel.mapping index 509f451c3..db51db683 100644 --- a/data/net/minecraft/client/model/WitchModel.mapping +++ b/data/net/minecraft/client/model/WitchModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/WitchModel - METHOD setHoldingItem (Z)V - ARG 1 holdingItem - METHOD setupAnim (Lnet/minecraft/world/entity/Entity;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch + METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V + ARG 1 root diff --git a/data/net/minecraft/client/model/WitherBossModel.mapping b/data/net/minecraft/client/model/WitherBossModel.mapping index 1c758a467..9303b1732 100644 --- a/data/net/minecraft/client/model/WitherBossModel.mapping +++ b/data/net/minecraft/client/model/WitherBossModel.mapping @@ -3,20 +3,7 @@ CLASS net/minecraft/client/model/WitherBossModel ARG 1 root METHOD createBodyLayer (Lnet/minecraft/client/model/geom/builders/CubeDeformation;)Lnet/minecraft/client/model/geom/builders/LayerDefinition; ARG 0 cubeDeformation - METHOD prepareMobModel (Lnet/minecraft/world/entity/boss/wither/WitherBoss;FFF)V - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 partialTick - METHOD setupAnim (Lnet/minecraft/world/entity/boss/wither/WitherBoss;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch - METHOD setupHeadRotation (Lnet/minecraft/world/entity/boss/wither/WitherBoss;Lnet/minecraft/client/model/geom/ModelPart;I)V - ARG 0 wither - ARG 1 part - ARG 2 head + METHOD setupHeadRotation (Lnet/minecraft/client/renderer/entity/state/WitherRenderState;Lnet/minecraft/client/model/geom/ModelPart;I)V + ARG 0 renderState + ARG 1 head + ARG 2 headIndex diff --git a/data/net/minecraft/client/model/WolfModel.mapping b/data/net/minecraft/client/model/WolfModel.mapping index fd4a3d4a0..239f550fb 100644 --- a/data/net/minecraft/client/model/WolfModel.mapping +++ b/data/net/minecraft/client/model/WolfModel.mapping @@ -7,16 +7,3 @@ CLASS net/minecraft/client/model/WolfModel ARG 1 root METHOD createMeshDefinition (Lnet/minecraft/client/model/geom/builders/CubeDeformation;)Lnet/minecraft/client/model/geom/builders/MeshDefinition; ARG 0 cubeDeformation - METHOD prepareMobModel (Lnet/minecraft/world/entity/animal/Wolf;FFF)V - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 partialTick - METHOD setupAnim (Lnet/minecraft/world/entity/animal/Wolf;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/ZombieModel.mapping b/data/net/minecraft/client/model/ZombieModel.mapping deleted file mode 100644 index aa3257142..000000000 --- a/data/net/minecraft/client/model/ZombieModel.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/client/model/ZombieModel - METHOD isAggressive (Lnet/minecraft/world/entity/monster/Zombie;)Z - ARG 1 entity diff --git a/data/net/minecraft/client/model/ZombieVillagerModel.mapping b/data/net/minecraft/client/model/ZombieVillagerModel.mapping index 1d3e6d794..2edc4e245 100644 --- a/data/net/minecraft/client/model/ZombieVillagerModel.mapping +++ b/data/net/minecraft/client/model/ZombieVillagerModel.mapping @@ -1,11 +1,3 @@ CLASS net/minecraft/client/model/ZombieVillagerModel METHOD createArmorLayer (Lnet/minecraft/client/model/geom/builders/CubeDeformation;)Lnet/minecraft/client/model/geom/builders/LayerDefinition; ARG 0 cubeDeformation - METHOD setupAnim (Lnet/minecraft/world/entity/monster/Zombie;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/model/dragon/EnderDragonModel.mapping b/data/net/minecraft/client/model/dragon/EnderDragonModel.mapping new file mode 100644 index 000000000..1dab939e9 --- /dev/null +++ b/data/net/minecraft/client/model/dragon/EnderDragonModel.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/client/model/dragon/EnderDragonModel + METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V + ARG 1 root + METHOD neckName (I)Ljava/lang/String; + ARG 0 index + METHOD poseLimbs (FLnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/client/model/geom/ModelPart;)V + ARG 1 flapAngle + ARG 2 frontLeg + ARG 3 frontLegTip + ARG 4 frontFoot + ARG 5 rearLeg + ARG 6 rearLegTip + ARG 7 rearFoot + METHOD tailName (I)Ljava/lang/String; + ARG 0 index diff --git a/data/net/minecraft/client/model/geom/LayerDefinitions.mapping b/data/net/minecraft/client/model/geom/LayerDefinitions.mapping deleted file mode 100644 index 2f4031938..000000000 --- a/data/net/minecraft/client/model/geom/LayerDefinitions.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/client/model/geom/LayerDefinitions - METHOD lambda$createRoots$0 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/client/model/geom/builders/LayerDefinition;Lnet/minecraft/world/level/block/state/properties/WoodType;)V - ARG 2 woodType - METHOD lambda$createRoots$1 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/client/model/geom/builders/LayerDefinition;Lnet/minecraft/world/level/block/state/properties/WoodType;)V - ARG 2 woodType - METHOD lambda$createRoots$2 (Lcom/google/common/collect/ImmutableMap;Lnet/minecraft/client/model/geom/ModelLayerLocation;)Z - ARG 1 modelLayerPath diff --git a/data/net/minecraft/client/model/geom/ModelLayers.mapping b/data/net/minecraft/client/model/geom/ModelLayers.mapping index 148056c8b..c7873afb0 100644 --- a/data/net/minecraft/client/model/geom/ModelLayers.mapping +++ b/data/net/minecraft/client/model/geom/ModelLayers.mapping @@ -1,18 +1,12 @@ CLASS net/minecraft/client/model/geom/ModelLayers - METHOD createBoatModelName (Lnet/minecraft/world/entity/vehicle/Boat$Type;)Lnet/minecraft/client/model/geom/ModelLayerLocation; - ARG 0 type - METHOD createChestBoatModelName (Lnet/minecraft/world/entity/vehicle/Boat$Type;)Lnet/minecraft/client/model/geom/ModelLayerLocation; - ARG 0 type - METHOD createChestRaftModelName (Lnet/minecraft/world/entity/vehicle/Boat$Type;)Lnet/minecraft/client/model/geom/ModelLayerLocation; - ARG 0 type METHOD createHangingSignModelName (Lnet/minecraft/world/level/block/state/properties/WoodType;)Lnet/minecraft/client/model/geom/ModelLayerLocation; ARG 0 woodType METHOD createLocation (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/client/model/geom/ModelLayerLocation; ARG 0 path ARG 1 model - METHOD createRaftModelName (Lnet/minecraft/world/entity/vehicle/Boat$Type;)Lnet/minecraft/client/model/geom/ModelLayerLocation; - ARG 0 type - METHOD createSignModelName (Lnet/minecraft/world/level/block/state/properties/WoodType;)Lnet/minecraft/client/model/geom/ModelLayerLocation; + METHOD createStandingSignModelName (Lnet/minecraft/world/level/block/state/properties/WoodType;)Lnet/minecraft/client/model/geom/ModelLayerLocation; + ARG 0 woodType + METHOD createWallSignModelName (Lnet/minecraft/world/level/block/state/properties/WoodType;)Lnet/minecraft/client/model/geom/ModelLayerLocation; ARG 0 woodType METHOD register (Ljava/lang/String;)Lnet/minecraft/client/model/geom/ModelLayerLocation; ARG 0 path diff --git a/data/net/minecraft/client/model/geom/ModelPart.mapping b/data/net/minecraft/client/model/geom/ModelPart.mapping index e7d3fc12d..8a971a510 100644 --- a/data/net/minecraft/client/model/geom/ModelPart.mapping +++ b/data/net/minecraft/client/model/geom/ModelPart.mapping @@ -38,6 +38,8 @@ CLASS net/minecraft/client/model/geom/ModelPart ARG 3 packedLight ARG 4 packedOverlay ARG 5 color + METHOD rotateBy (Lorg/joml/Quaternionf;)V + ARG 1 quaternion METHOD setInitialPose (Lnet/minecraft/client/model/geom/PartPose;)V ARG 1 initialPose METHOD setPos (FFF)V diff --git a/data/net/minecraft/client/model/geom/PartPose.mapping b/data/net/minecraft/client/model/geom/PartPose.mapping index e924b8c2d..d81c42383 100644 --- a/data/net/minecraft/client/model/geom/PartPose.mapping +++ b/data/net/minecraft/client/model/geom/PartPose.mapping @@ -1,11 +1,4 @@ CLASS net/minecraft/client/model/geom/PartPose - METHOD (FFFFFF)V - ARG 1 x - ARG 2 y - ARG 3 z - ARG 4 xRot - ARG 5 yRot - ARG 6 zRot METHOD offset (FFF)Lnet/minecraft/client/model/geom/PartPose; ARG 0 x ARG 1 y @@ -21,3 +14,15 @@ CLASS net/minecraft/client/model/geom/PartPose ARG 0 xRot ARG 1 yRot ARG 2 zRot + METHOD scaled (F)Lnet/minecraft/client/model/geom/PartPose; + ARG 1 scale + METHOD scaled (FFF)Lnet/minecraft/client/model/geom/PartPose; + ARG 1 x + ARG 2 y + ARG 3 z + METHOD translated (FFF)Lnet/minecraft/client/model/geom/PartPose; + ARG 1 x + ARG 2 y + ARG 3 z + METHOD withScale (F)Lnet/minecraft/client/model/geom/PartPose; + ARG 1 scale diff --git a/data/net/minecraft/client/model/geom/builders/LayerDefinition.mapping b/data/net/minecraft/client/model/geom/builders/LayerDefinition.mapping index b5461cdca..6b1ac1dbd 100644 --- a/data/net/minecraft/client/model/geom/builders/LayerDefinition.mapping +++ b/data/net/minecraft/client/model/geom/builders/LayerDefinition.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/client/model/geom/builders/LayerDefinition METHOD (Lnet/minecraft/client/model/geom/builders/MeshDefinition;Lnet/minecraft/client/model/geom/builders/MaterialDefinition;)V ARG 1 mesh ARG 2 material + METHOD apply (Lnet/minecraft/client/model/geom/builders/MeshTransformer;)Lnet/minecraft/client/model/geom/builders/LayerDefinition; + ARG 1 transformer METHOD create (Lnet/minecraft/client/model/geom/builders/MeshDefinition;II)Lnet/minecraft/client/model/geom/builders/LayerDefinition; ARG 0 mesh ARG 1 texWidth diff --git a/data/net/minecraft/client/model/geom/builders/MeshDefinition.mapping b/data/net/minecraft/client/model/geom/builders/MeshDefinition.mapping new file mode 100644 index 000000000..0dfc4215e --- /dev/null +++ b/data/net/minecraft/client/model/geom/builders/MeshDefinition.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/client/model/geom/builders/MeshDefinition + METHOD (Lnet/minecraft/client/model/geom/builders/PartDefinition;)V + ARG 1 root + METHOD transformed (Ljava/util/function/UnaryOperator;)Lnet/minecraft/client/model/geom/builders/MeshDefinition; + ARG 1 transformer diff --git a/data/net/minecraft/client/model/geom/builders/MeshTransformer.mapping b/data/net/minecraft/client/model/geom/builders/MeshTransformer.mapping new file mode 100644 index 000000000..cde86e276 --- /dev/null +++ b/data/net/minecraft/client/model/geom/builders/MeshTransformer.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/client/model/geom/builders/MeshTransformer + METHOD apply (Lnet/minecraft/client/model/geom/builders/MeshDefinition;)Lnet/minecraft/client/model/geom/builders/MeshDefinition; + ARG 1 mesh + METHOD scaling (F)Lnet/minecraft/client/model/geom/builders/MeshTransformer; + ARG 0 scale diff --git a/data/net/minecraft/client/model/geom/builders/PartDefinition.mapping b/data/net/minecraft/client/model/geom/builders/PartDefinition.mapping index 55b590463..37ed97a49 100644 --- a/data/net/minecraft/client/model/geom/builders/PartDefinition.mapping +++ b/data/net/minecraft/client/model/geom/builders/PartDefinition.mapping @@ -6,9 +6,14 @@ CLASS net/minecraft/client/model/geom/builders/PartDefinition ARG 1 name ARG 2 cubes ARG 3 partPose + METHOD addOrReplaceChild (Ljava/lang/String;Lnet/minecraft/client/model/geom/builders/PartDefinition;)Lnet/minecraft/client/model/geom/builders/PartDefinition; + ARG 1 name + ARG 2 chuld METHOD bake (II)Lnet/minecraft/client/model/geom/ModelPart; ARG 1 texWidth ARG 2 texHeight + METHOD clearChild (Ljava/lang/String;)Lnet/minecraft/client/model/geom/builders/PartDefinition; + ARG 1 name METHOD getChild (Ljava/lang/String;)Lnet/minecraft/client/model/geom/builders/PartDefinition; ARG 1 name METHOD lambda$bake$0 (IILjava/util/Map$Entry;)Lnet/minecraft/client/model/geom/ModelPart; @@ -18,3 +23,5 @@ CLASS net/minecraft/client/model/geom/builders/PartDefinition ARG 1 modelPart METHOD lambda$bake$2 (IILnet/minecraft/client/model/geom/builders/CubeDefinition;)Lnet/minecraft/client/model/geom/ModelPart$Cube; ARG 2 cube + METHOD transformed (Ljava/util/function/UnaryOperator;)Lnet/minecraft/client/model/geom/builders/PartDefinition; + ARG 1 transformer diff --git a/data/net/minecraft/client/multiplayer/ClientChunkCache.mapping b/data/net/minecraft/client/multiplayer/ClientChunkCache.mapping index 7e7627fda..d79a8ff53 100644 --- a/data/net/minecraft/client/multiplayer/ClientChunkCache.mapping +++ b/data/net/minecraft/client/multiplayer/ClientChunkCache.mapping @@ -33,6 +33,13 @@ CLASS net/minecraft/client/multiplayer/ClientChunkCache CLASS Storage METHOD (Lnet/minecraft/client/multiplayer/ClientChunkCache;I)V ARG 2 chunkRadius + METHOD addEmptySections (Lnet/minecraft/world/level/chunk/LevelChunk;)V + ARG 1 chunk + METHOD drop (ILnet/minecraft/world/level/chunk/LevelChunk;)V + ARG 1 chunkIndex + ARG 2 chunk + METHOD dropEmptySections (Lnet/minecraft/world/level/chunk/LevelChunk;)V + ARG 1 chunk METHOD dumpChunks (Ljava/lang/String;)V ARG 1 filePath METHOD getChunk (I)Lnet/minecraft/world/level/chunk/LevelChunk; @@ -43,10 +50,11 @@ CLASS net/minecraft/client/multiplayer/ClientChunkCache METHOD inRange (II)Z ARG 1 x ARG 2 z + METHOD onSectionEmptinessChanged (IIIZ)V + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 isEmpty METHOD replace (ILnet/minecraft/world/level/chunk/LevelChunk;)V ARG 1 chunkIndex ARG 2 chunk - METHOD replace (ILnet/minecraft/world/level/chunk/LevelChunk;Lnet/minecraft/world/level/chunk/LevelChunk;)Lnet/minecraft/world/level/chunk/LevelChunk; - ARG 1 chunkIndex - ARG 2 chunk - ARG 3 replaceWith diff --git a/data/net/minecraft/client/multiplayer/ClientHandshakePacketListenerImpl.mapping b/data/net/minecraft/client/multiplayer/ClientHandshakePacketListenerImpl.mapping index bdc7699be..f975b87a6 100644 --- a/data/net/minecraft/client/multiplayer/ClientHandshakePacketListenerImpl.mapping +++ b/data/net/minecraft/client/multiplayer/ClientHandshakePacketListenerImpl.mapping @@ -16,8 +16,6 @@ CLASS net/minecraft/client/multiplayer/ClientHandshakePacketListenerImpl ARG 1 packet METHOD handleDisconnect (Lnet/minecraft/network/protocol/login/ClientboundLoginDisconnectPacket;)V ARG 1 packet - METHOD handleGameProfile (Lnet/minecraft/network/protocol/login/ClientboundGameProfilePacket;)V - ARG 1 packet METHOD handleHello (Lnet/minecraft/network/protocol/login/ClientboundHelloPacket;)V ARG 1 packet METHOD lambda$switchState$0 (Lnet/minecraft/client/multiplayer/ClientHandshakePacketListenerImpl$State;Lnet/minecraft/client/multiplayer/ClientHandshakePacketListenerImpl$State;)Lnet/minecraft/client/multiplayer/ClientHandshakePacketListenerImpl$State; diff --git a/data/net/minecraft/client/multiplayer/ClientLevel.mapping b/data/net/minecraft/client/multiplayer/ClientLevel.mapping index 7073275b0..a69bc29fc 100644 --- a/data/net/minecraft/client/multiplayer/ClientLevel.mapping +++ b/data/net/minecraft/client/multiplayer/ClientLevel.mapping @@ -1,15 +1,15 @@ CLASS net/minecraft/client/multiplayer/ClientLevel - METHOD (Lnet/minecraft/client/multiplayer/ClientPacketListener;Lnet/minecraft/client/multiplayer/ClientLevel$ClientLevelData;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/core/Holder;IILjava/util/function/Supplier;Lnet/minecraft/client/renderer/LevelRenderer;ZJ)V + METHOD (Lnet/minecraft/client/multiplayer/ClientPacketListener;Lnet/minecraft/client/multiplayer/ClientLevel$ClientLevelData;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/core/Holder;IILnet/minecraft/client/renderer/LevelRenderer;ZJI)V ARG 1 connection - ARG 2 clientLevelData + ARG 2 levelData ARG 3 dimension - ARG 4 dimensionType + ARG 4 dimensionTypeRegistration ARG 5 viewDistance ARG 6 serverSimulationDistance - ARG 7 profiler - ARG 8 levelRenderer - ARG 9 isDebug - ARG 10 biomeZoomSeed + ARG 7 levelRenderer + ARG 8 isDebug + ARG 9 biomeZoomSeed + ARG 11 seaLevel METHOD addAlwaysVisibleParticle (Lnet/minecraft/core/particles/ParticleOptions;DDDDDD)V ARG 1 particleData ARG 2 x @@ -77,15 +77,15 @@ CLASS net/minecraft/client/multiplayer/ClientLevel ARG 2 colorResolver METHOD getChunkSource ()Lnet/minecraft/client/multiplayer/ClientChunkCache; COMMENT Gets the world's chunk provider - METHOD getCloudColor (F)Lnet/minecraft/world/phys/Vec3; + METHOD getCloudColor (F)I ARG 1 partialTick METHOD getEntity (I)Lnet/minecraft/world/entity/Entity; COMMENT Returns the Entity with the given ID, or null if it doesn't exist in this World. ARG 1 id METHOD getLevelData ()Lnet/minecraft/client/multiplayer/ClientLevel$ClientLevelData; COMMENT Returns the world's WorldInfo object - METHOD getSkyColor (Lnet/minecraft/world/phys/Vec3;F)Lnet/minecraft/world/phys/Vec3; - ARG 1 pos + METHOD getSkyColor (Lnet/minecraft/world/phys/Vec3;F)I + ARG 1 cameraPosition ARG 2 partialTick METHOD getSkyDarken (F)F ARG 1 partialTick @@ -100,12 +100,14 @@ CLASS net/minecraft/client/multiplayer/ClientLevel METHOD hasChunk (II)Z ARG 1 chunkX ARG 2 chunkZ + METHOD isTickingEntity (Lnet/minecraft/world/entity/Entity;)Z + ARG 1 entity METHOD lambda$clearTintCaches$7 (Lnet/minecraft/world/level/ColorResolver;Lnet/minecraft/client/color/block/BlockTintCache;)V ARG 0 resolver ARG 1 cache METHOD lambda$doAnimateTick$8 (Lnet/minecraft/core/BlockPos$MutableBlockPos;Lnet/minecraft/world/level/biome/AmbientParticleSettings;)V ARG 2 particleSettings - METHOD lambda$getSkyColor$12 (Lnet/minecraft/world/level/biome/BiomeManager;III)Lnet/minecraft/world/phys/Vec3; + METHOD lambda$getSkyColor$12 (III)Lnet/minecraft/world/phys/Vec3; ARG 1 x ARG 2 y ARG 3 z @@ -129,6 +131,8 @@ CLASS net/minecraft/client/multiplayer/ClientLevel ARG 4 data METHOD onChunkLoaded (Lnet/minecraft/world/level/ChunkPos;)V ARG 1 chunkPos + METHOD onSectionBecomingNonEmpty (J)V + ARG 1 sectionPos METHOD overrideMapData (Lnet/minecraft/world/level/saveddata/maps/MapId;Lnet/minecraft/world/level/saveddata/maps/MapItemSavedData;)V ARG 1 mapId ARG 2 mapData @@ -168,18 +172,20 @@ CLASS net/minecraft/client/multiplayer/ClientLevel ARG 1 blockPos ARG 2 oldState ARG 3 newState - METHOD setDayTime (J)V - COMMENT Sets the world time. - ARG 1 time METHOD setDefaultSpawnPos (Lnet/minecraft/core/BlockPos;F)V ARG 1 spawnPos ARG 2 spawnAngle - METHOD setGameTime (J)V - ARG 1 time METHOD setSectionDirtyWithNeighbors (III)V ARG 1 sectionX ARG 2 sectionY ARG 3 sectionZ + METHOD setSectionRangeDirty (IIIIII)V + ARG 1 minY + ARG 2 minX + ARG 3 minZ + ARG 4 maxY + ARG 5 maxX + ARG 6 maxZ METHOD setServerSimulationDistance (I)V ARG 1 serverSimulationDistance METHOD setServerVerifiedBlockState (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;I)V @@ -188,6 +194,10 @@ CLASS net/minecraft/client/multiplayer/ClientLevel ARG 3 flags METHOD setSkyFlashTime (I)V ARG 1 timeFlash + METHOD setTimeFromServer (JJZ)V + ARG 1 gameTime + ARG 3 dayTime + ARG 5 tickDayTime METHOD spawnFluidParticle (DDDDDLnet/minecraft/core/particles/ParticleOptions;)V ARG 1 xStart ARG 3 xEnd @@ -226,8 +236,6 @@ CLASS net/minecraft/client/multiplayer/ClientLevel ARG 3 isFlat METHOD getDayTime ()J COMMENT Get current world time - METHOD getGameRules ()Lnet/minecraft/world/level/GameRules; - COMMENT Gets the GameRules class Instance. METHOD getHorizonHeight (Lnet/minecraft/world/level/LevelHeightAccessor;)D ARG 1 level METHOD isHardcore ()Z diff --git a/data/net/minecraft/client/multiplayer/ClientPacketListener.mapping b/data/net/minecraft/client/multiplayer/ClientPacketListener.mapping index c5a3c58f3..ddca0e8ef 100644 --- a/data/net/minecraft/client/multiplayer/ClientPacketListener.mapping +++ b/data/net/minecraft/client/multiplayer/ClientPacketListener.mapping @@ -5,14 +5,17 @@ CLASS net/minecraft/client/multiplayer/ClientPacketListener COMMENT A mapping from player names to their respective GuiPlayerInfo (specifies the clients response time to the server) FIELD random Lnet/minecraft/util/RandomSource; COMMENT Just an ordinary random number generator, used to randomize audio pitch of item/orb pickup and randomize both particlespawn offset and velocity - METHOD applyLightData (IILnet/minecraft/network/protocol/game/ClientboundLightUpdatePacketData;)V + METHOD applyLightData (IILnet/minecraft/network/protocol/game/ClientboundLightUpdatePacketData;Z)V ARG 1 x ARG 2 z ARG 3 data + ARG 4 update METHOD applyPlayerInfoUpdate (Lnet/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket$Action;Lnet/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket$Entry;Lnet/minecraft/client/multiplayer/PlayerInfo;)V ARG 1 action ARG 2 entry ARG 3 playerInfo + METHOD broadcastClientInformation (Lnet/minecraft/server/level/ClientInformation;)V + ARG 1 information METHOD createEntityFromPacket (Lnet/minecraft/network/protocol/game/ClientboundAddEntityPacket;)Lnet/minecraft/world/entity/Entity; ARG 1 packet METHOD determineLevelLoadingReason (ZLnet/minecraft/resources/ResourceKey;Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/client/gui/screens/ReceivingLevelScreen$Reason; @@ -41,8 +44,6 @@ CLASS net/minecraft/client/multiplayer/ClientPacketListener METHOD handleAddObjective (Lnet/minecraft/network/protocol/game/ClientboundSetObjectivePacket;)V COMMENT May create a scoreboard objective, remove an objective from the scoreboard or update an objectives' displayname ARG 1 packet - METHOD handleAddOrRemoveRecipes (Lnet/minecraft/network/protocol/game/ClientboundRecipePacket;)V - ARG 1 packet METHOD handleAnimate (Lnet/minecraft/network/protocol/game/ClientboundAnimatePacket;)V COMMENT Renders a specified animation: Waking up a player, a living entity swinging its currently held item, being hurt or receiving a critical hit by normal or magical means ARG 1 packet @@ -145,9 +146,6 @@ CLASS net/minecraft/client/multiplayer/ClientPacketListener ARG 1 packet METHOD handleSetCamera (Lnet/minecraft/network/protocol/game/ClientboundSetCameraPacket;)V ARG 1 packet - METHOD handleSetCarriedItem (Lnet/minecraft/network/protocol/game/ClientboundSetCarriedItemPacket;)V - COMMENT Updates which hotbar slot of the player is currently selected - ARG 1 packet METHOD handleSetChunkCacheCenter (Lnet/minecraft/network/protocol/game/ClientboundSetChunkCacheCenterPacket;)V ARG 1 packet METHOD handleSetChunkCacheRadius (Lnet/minecraft/network/protocol/game/ClientboundSetChunkCacheRadiusPacket;)V @@ -208,17 +206,15 @@ CLASS net/minecraft/client/multiplayer/ClientPacketListener ARG 2 playerInfo METHOD isFeatureEnabled (Lnet/minecraft/world/flag/FeatureFlagSet;)Z ARG 1 enabledFeatures - METHOD lambda$handleBlockEntityData$5 (Lnet/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket;Lnet/minecraft/world/level/block/entity/BlockEntity;)V + METHOD lambda$handleBlockEntityData$4 (Lnet/minecraft/network/protocol/game/ClientboundBlockEntityDataPacket;Lnet/minecraft/world/level/block/entity/BlockEntity;)V ARG 2 blockEntity - METHOD lambda$handleChunkBlocksUpdate$2 (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V - ARG 1 blockPos - ARG 2 blockState - METHOD lambda$handleLogin$0 (Ljava/util/Optional;)V - ARG 1 keyPair - METHOD lambda$handleRemoveEntities$1 (I)V - ARG 1 entityId - METHOD lambda$handleSetEquipment$6 (Lnet/minecraft/world/entity/LivingEntity;Lcom/mojang/datafixers/util/Pair;)V - ARG 1 slot + METHOD lambda$handleChunkBlocksUpdate$1 (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V + ARG 1 pos + ARG 2 state + METHOD lambda$handleRemoveEntities$0 (I)V + ARG 1 id + METHOD lambda$handleSetPlayerTeamPacket$8 (Lnet/minecraft/world/scores/PlayerTeam;Lnet/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket$Parameters;)V + ARG 1 parameters METHOD markMessageAsProcessed (Lnet/minecraft/network/chat/PlayerChatMessage;Z)V ARG 1 chatMessage ARG 2 acknowledged @@ -228,7 +224,7 @@ CLASS net/minecraft/client/multiplayer/ClientPacketListener ARG 1 entity METHOD queueLightRemoval (Lnet/minecraft/network/protocol/game/ClientboundForgetLevelChunkPacket;)V ARG 1 packet - METHOD readSectionList (IILnet/minecraft/world/level/lighting/LevelLightEngine;Lnet/minecraft/world/level/LightLayer;Ljava/util/BitSet;Ljava/util/BitSet;Ljava/util/Iterator;)V + METHOD readSectionList (IILnet/minecraft/world/level/lighting/LevelLightEngine;Lnet/minecraft/world/level/LightLayer;Ljava/util/BitSet;Ljava/util/BitSet;Ljava/util/Iterator;Z)V ARG 1 x ARG 2 z ARG 3 lightEngine @@ -236,6 +232,9 @@ CLASS net/minecraft/client/multiplayer/ClientPacketListener ARG 5 skyYMask ARG 6 emptySkyYMask ARG 7 skyUpdates + ARG 8 update + METHOD refreshRecipeBook (Lnet/minecraft/client/ClientRecipeBook;)V + ARG 1 recipeBook METHOD sendChat (Ljava/lang/String;)V ARG 1 message METHOD sendCommand (Ljava/lang/String;)V @@ -244,6 +243,11 @@ CLASS net/minecraft/client/multiplayer/ClientPacketListener ARG 1 command METHOD setKeyPair (Lnet/minecraft/world/entity/player/ProfileKeyPair;)V ARG 1 keyPair + METHOD setValuesFromPositionPacket (Lnet/minecraft/world/entity/PositionMoveRotation;Ljava/util/Set;Lnet/minecraft/world/entity/Entity;Z)Z + ARG 0 positionMoveRotation + ARG 1 relatives + ARG 2 entity + ARG 3 lerp METHOD startWaitingForNewLevel (Lnet/minecraft/client/player/LocalPlayer;Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/client/gui/screens/ReceivingLevelScreen$Reason;)V ARG 1 player ARG 2 level @@ -252,3 +256,6 @@ CLASS net/minecraft/client/multiplayer/ClientPacketListener ARG 1 x ARG 2 z ARG 3 data + METHOD updateTags (Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/tags/TagNetworkSerialization$NetworkPayload;)Lnet/minecraft/core/Registry$PendingTags; + ARG 1 registryKey + ARG 2 payload diff --git a/data/net/minecraft/client/multiplayer/ClientRecipeContainer.mapping b/data/net/minecraft/client/multiplayer/ClientRecipeContainer.mapping new file mode 100644 index 000000000..ef4de22d0 --- /dev/null +++ b/data/net/minecraft/client/multiplayer/ClientRecipeContainer.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/client/multiplayer/ClientRecipeContainer + METHOD (Ljava/util/Map;Lnet/minecraft/world/item/crafting/SelectableRecipe$SingleInputSet;)V + ARG 1 itemSets + ARG 2 stonecutterRecipes diff --git a/data/net/minecraft/client/multiplayer/LegacyServerPinger.mapping b/data/net/minecraft/client/multiplayer/LegacyServerPinger.mapping index 3c94856ae..22c4b7d0e 100644 --- a/data/net/minecraft/client/multiplayer/LegacyServerPinger.mapping +++ b/data/net/minecraft/client/multiplayer/LegacyServerPinger.mapping @@ -12,6 +12,7 @@ CLASS net/minecraft/client/multiplayer/LegacyServerPinger ARG 2 exception CLASS Output METHOD handleResponse (ILjava/lang/String;Ljava/lang/String;II)V + ARG 1 protocolVersion ARG 2 version ARG 3 motd ARG 4 players diff --git a/data/net/minecraft/client/multiplayer/MultiPlayerGameMode.mapping b/data/net/minecraft/client/multiplayer/MultiPlayerGameMode.mapping index bf3a9d5b2..462cbdef3 100644 --- a/data/net/minecraft/client/multiplayer/MultiPlayerGameMode.mapping +++ b/data/net/minecraft/client/multiplayer/MultiPlayerGameMode.mapping @@ -45,10 +45,10 @@ CLASS net/minecraft/client/multiplayer/MultiPlayerGameMode ARG 5 player METHOD handlePickItem (I)V ARG 1 index - METHOD handlePlaceRecipe (ILnet/minecraft/world/item/crafting/RecipeHolder;Z)V + METHOD handlePlaceRecipe (ILnet/minecraft/world/item/crafting/display/RecipeDisplayId;Z)V ARG 1 containerId ARG 2 recipe - ARG 3 shiftDown + ARG 3 useMaxItems METHOD handleSlotStateChanged (IIZ)V ARG 1 slotId ARG 2 containerId @@ -80,8 +80,6 @@ CLASS net/minecraft/client/multiplayer/MultiPlayerGameMode ARG 3 sequence METHOD lambda$startDestroyBlock$1 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction;I)Lnet/minecraft/network/protocol/Packet; ARG 4 sequence - METHOD lambda$useItem$5 (Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/entity/player/Player;Lorg/apache/commons/lang3/mutable/MutableObject;I)Lnet/minecraft/network/protocol/Packet; - ARG 4 sequence METHOD lambda$useItemOn$4 (Lorg/apache/commons/lang3/mutable/MutableObject;Lnet/minecraft/client/player/LocalPlayer;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/phys/BlockHitResult;I)Lnet/minecraft/network/protocol/Packet; ARG 5 sequence METHOD performUseItemOn (Lnet/minecraft/client/player/LocalPlayer;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/phys/BlockHitResult;)Lnet/minecraft/world/InteractionResult; diff --git a/data/net/minecraft/client/multiplayer/PlayerInfo.mapping b/data/net/minecraft/client/multiplayer/PlayerInfo.mapping index 8a107e52f..c39ff16b3 100644 --- a/data/net/minecraft/client/multiplayer/PlayerInfo.mapping +++ b/data/net/minecraft/client/multiplayer/PlayerInfo.mapping @@ -22,3 +22,5 @@ CLASS net/minecraft/client/multiplayer/PlayerInfo ARG 1 latency METHOD setTabListDisplayName (Lnet/minecraft/network/chat/Component;)V ARG 1 displayName + METHOD setTabListOrder (I)V + ARG 1 tabListOrder diff --git a/data/net/minecraft/client/multiplayer/RegistryDataCollector.mapping b/data/net/minecraft/client/multiplayer/RegistryDataCollector.mapping index 8fe0fab2a..8e491ab08 100644 --- a/data/net/minecraft/client/multiplayer/RegistryDataCollector.mapping +++ b/data/net/minecraft/client/multiplayer/RegistryDataCollector.mapping @@ -1,17 +1,36 @@ CLASS net/minecraft/client/multiplayer/RegistryDataCollector + METHOD addCrashDetails (Lnet/minecraft/CrashReport;Ljava/util/Map;Ljava/util/List;)V + ARG 0 crashReport + ARG 1 dynamicRegistries + ARG 2 staticRegistries METHOD appendContents (Lnet/minecraft/resources/ResourceKey;Ljava/util/List;)V ARG 1 registryKey ARG 2 registryEntries METHOD appendTags (Ljava/util/Map;)V ARG 1 tags - METHOD collectGameRegistries (Lnet/minecraft/server/packs/resources/ResourceProvider;Lnet/minecraft/core/RegistryAccess;Z)Lnet/minecraft/core/RegistryAccess$Frozen; + METHOD collectGameRegistries (Lnet/minecraft/server/packs/resources/ResourceProvider;Lnet/minecraft/core/RegistryAccess$Frozen;Z)Lnet/minecraft/core/RegistryAccess$Frozen; ARG 1 resourceProvider ARG 2 registryAccess ARG 3 isMemoryConnection + METHOD loadNewElementsAndTags (Lnet/minecraft/server/packs/resources/ResourceProvider;Lnet/minecraft/client/multiplayer/RegistryDataCollector$ContentsCollector;Z)Lnet/minecraft/core/RegistryAccess; + ARG 1 resourceProvider + ARG 2 contentCollector + ARG 3 isMemoryConnection + METHOD loadOnlyTags (Lnet/minecraft/client/multiplayer/RegistryDataCollector$TagCollector;Lnet/minecraft/core/RegistryAccess$Frozen;Z)V + ARG 1 tagCollector + ARG 2 registryAccess + ARG 3 isMemoryConnection + METHOD resolveRegistryTags (Lnet/minecraft/core/RegistryAccess$Frozen;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/tags/TagNetworkSerialization$NetworkPayload;)Lnet/minecraft/core/Registry$PendingTags; + ARG 0 registryAccess + ARG 1 registryKey + ARG 2 payload + CLASS TagCollector + METHOD append (Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/tags/TagNetworkSerialization$NetworkPayload;)V + ARG 1 registryKey + ARG 2 payload + METHOD forEach (Ljava/util/function/BiConsumer;)V + ARG 1 action CLASS ContentsCollector METHOD append (Lnet/minecraft/resources/ResourceKey;Ljava/util/List;)V ARG 1 registryKey ARG 2 entries - METHOD loadRegistries (Lnet/minecraft/server/packs/resources/ResourceProvider;Lnet/minecraft/core/RegistryAccess;)Lnet/minecraft/core/RegistryAccess; - ARG 1 resourceProvider - ARG 2 registryAccess diff --git a/data/net/minecraft/client/multiplayer/SessionSearchTrees.mapping b/data/net/minecraft/client/multiplayer/SessionSearchTrees.mapping index c0eb6322d..e7d51dba4 100644 --- a/data/net/minecraft/client/multiplayer/SessionSearchTrees.mapping +++ b/data/net/minecraft/client/multiplayer/SessionSearchTrees.mapping @@ -3,6 +3,16 @@ CLASS net/minecraft/client/multiplayer/SessionSearchTrees ARG 0 items ARG 1 context ARG 2 tooltipFlag + METHOD lambda$getTooltipLines$0 (Lnet/minecraft/world/item/Item$TooltipContext;Lnet/minecraft/world/item/TooltipFlag;Lnet/minecraft/world/item/ItemStack;)Ljava/util/stream/Stream; + ARG 2 stack + METHOD lambda$getTooltipLines$1 (Lnet/minecraft/network/chat/Component;)Ljava/lang/String; + ARG 0 component + METHOD lambda$updateCreativeTags$10 (Lnet/minecraft/world/item/ItemStack;)Ljava/util/stream/Stream; + ARG 0 stack + METHOD lambda$updateCreativeTooltips$13 (Lnet/minecraft/world/item/Item$TooltipContext;Lnet/minecraft/world/item/TooltipFlag;Lnet/minecraft/world/item/ItemStack;)Ljava/util/stream/Stream; + ARG 2 stack + METHOD lambda$updateRecipes$6 (Lnet/minecraft/core/Registry;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/resources/ResourceLocation; + ARG 1 stack METHOD register (Lnet/minecraft/client/multiplayer/SessionSearchTrees$Key;Ljava/lang/Runnable;)V ARG 1 key ARG 2 reloader @@ -11,6 +21,6 @@ CLASS net/minecraft/client/multiplayer/SessionSearchTrees METHOD updateCreativeTooltips (Lnet/minecraft/core/HolderLookup$Provider;Ljava/util/List;)V ARG 1 registries ARG 2 items - METHOD updateRecipes (Lnet/minecraft/client/ClientRecipeBook;Lnet/minecraft/core/RegistryAccess$Frozen;)V + METHOD updateRecipes (Lnet/minecraft/client/ClientRecipeBook;Lnet/minecraft/world/level/Level;)V ARG 1 recipeBook - ARG 2 registries + ARG 2 level diff --git a/data/net/minecraft/client/multiplayer/TagCollector.mapping b/data/net/minecraft/client/multiplayer/TagCollector.mapping deleted file mode 100644 index 359eb80be..000000000 --- a/data/net/minecraft/client/multiplayer/TagCollector.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS net/minecraft/client/multiplayer/TagCollector - METHOD append (Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/tags/TagNetworkSerialization$NetworkPayload;)V - ARG 1 registryKey - ARG 2 networkPayload - METHOD applyTags (Lnet/minecraft/core/RegistryAccess;Ljava/util/function/Predicate;)V - ARG 1 registryAccess - ARG 2 filter - METHOD updateTags (Lnet/minecraft/core/RegistryAccess;Z)V - ARG 1 registryAccess - ARG 2 isMemoryConnection diff --git a/data/net/minecraft/client/multiplayer/chat/report/ReportReason.mapping b/data/net/minecraft/client/multiplayer/chat/report/ReportReason.mapping index e9817a989..53c75464f 100644 --- a/data/net/minecraft/client/multiplayer/chat/report/ReportReason.mapping +++ b/data/net/minecraft/client/multiplayer/chat/report/ReportReason.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/client/multiplayer/chat/report/ReportReason METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name + METHOD getIncompatibleCategories (Lnet/minecraft/client/multiplayer/chat/report/ReportType;)Ljava/util/List; + ARG 0 reportType diff --git a/data/net/minecraft/client/particle/ParticleEngine.mapping b/data/net/minecraft/client/particle/ParticleEngine.mapping index 4215cfa0b..28f8e93f4 100644 --- a/data/net/minecraft/client/particle/ParticleEngine.mapping +++ b/data/net/minecraft/client/particle/ParticleEngine.mapping @@ -64,8 +64,6 @@ CLASS net/minecraft/client/particle/ParticleEngine ARG 2 resources METHOD lambda$reload$8 (Lnet/minecraft/client/renderer/texture/SpriteLoader$Preparations;Ljava/util/Set;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/client/particle/ParticleEngine$1ParticleDefinition;)V ARG 4 altas - METHOD lambda$reload$9 (Lnet/minecraft/util/profiling/ProfilerFiller;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Ljava/lang/Void;)V - ARG 1 profiler METHOD lambda$tick$10 (Lnet/minecraft/client/particle/ParticleRenderType;Ljava/util/Queue;)V ARG 1 particleType ARG 2 queue @@ -93,13 +91,6 @@ CLASS net/minecraft/client/particle/ParticleEngine METHOD register (Lnet/minecraft/core/particles/ParticleType;Lnet/minecraft/client/particle/ParticleProvider;)V ARG 1 particleType ARG 2 particleFactory - METHOD reload (Lnet/minecraft/server/packs/resources/PreparableReloadListener$PreparationBarrier;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;Lnet/minecraft/util/profiling/ProfilerFiller;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; - ARG 1 stage - ARG 2 resourceManager - ARG 3 preparationsProfiler - ARG 4 reloadProfiler - ARG 5 backgroundExecutor - ARG 6 gameExecutor METHOD render (Lnet/minecraft/client/renderer/LightTexture;Lnet/minecraft/client/Camera;F)V ARG 1 lightTexture ARG 2 camera diff --git a/data/net/minecraft/client/particle/TrailParticle.mapping b/data/net/minecraft/client/particle/TrailParticle.mapping new file mode 100644 index 000000000..1a375a3f2 --- /dev/null +++ b/data/net/minecraft/client/particle/TrailParticle.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/client/particle/TrailParticle + METHOD (Lnet/minecraft/client/multiplayer/ClientLevel;DDDDDDLnet/minecraft/world/phys/Vec3;I)V + ARG 1 level + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 xSpeed + ARG 10 ySpeed + ARG 12 zSpeed + ARG 14 target + ARG 15 color + CLASS Provider + METHOD (Lnet/minecraft/client/particle/SpriteSet;)V + ARG 1 sprite diff --git a/data/net/minecraft/client/player/AbstractClientPlayer.mapping b/data/net/minecraft/client/player/AbstractClientPlayer.mapping index 30689edd3..080541291 100644 --- a/data/net/minecraft/client/player/AbstractClientPlayer.mapping +++ b/data/net/minecraft/client/player/AbstractClientPlayer.mapping @@ -4,5 +4,8 @@ CLASS net/minecraft/client/player/AbstractClientPlayer ARG 2 gameProfile METHOD getDeltaMovementLerped (F)Lnet/minecraft/world/phys/Vec3; ARG 1 patialTick + METHOD getFieldOfViewModifier (ZF)F + ARG 1 isFirstPerson + ARG 2 fovEffectScale METHOD isSpectator ()Z COMMENT Returns {@code true} if the player is in spectator mode. diff --git a/data/net/minecraft/client/player/ClientInput.mapping b/data/net/minecraft/client/player/ClientInput.mapping new file mode 100644 index 000000000..ecaf20435 --- /dev/null +++ b/data/net/minecraft/client/player/ClientInput.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/client/player/ClientInput + METHOD tick (ZF)V + ARG 1 isSneaking + ARG 2 sneakingSpeed diff --git a/data/net/minecraft/client/player/Input.mapping b/data/net/minecraft/client/player/Input.mapping deleted file mode 100644 index f19261cec..000000000 --- a/data/net/minecraft/client/player/Input.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/player/Input - METHOD tick (ZF)V - ARG 1 isSneaking - ARG 2 sneakingSpeedMultiplier diff --git a/data/net/minecraft/client/player/LocalPlayer.mapping b/data/net/minecraft/client/player/LocalPlayer.mapping index 2270fe454..24e99b600 100644 --- a/data/net/minecraft/client/player/LocalPlayer.mapping +++ b/data/net/minecraft/client/player/LocalPlayer.mapping @@ -7,8 +7,6 @@ CLASS net/minecraft/client/player/LocalPlayer COMMENT The last X position which was transmitted to the server, used to determine when the X position changes and needs to be re-transmitted FIELD xRotLast F COMMENT The last pitch value which was transmitted to the server, used to determine when the pitch changes and needs to be re-transmitted - FIELD yLast1 D - COMMENT The last Y position which was transmitted to the server, used to determine when the Y position changes and needs to be re-transmitted FIELD yRotLast F COMMENT The last yaw value which was transmitted to the server, used to determine when the yaw changes and needs to be re-transmitted FIELD zLast D @@ -21,10 +19,6 @@ CLASS net/minecraft/client/player/LocalPlayer ARG 5 recipeBook ARG 6 wasShiftKeyDown ARG 7 wasSprinting - METHOD actuallyHurt (Lnet/minecraft/world/damagesource/DamageSource;F)V - COMMENT Deals damage to the entity. This will take the armor of the entity into consideration before damaging the health bar. - ARG 1 damageSrc - ARG 2 damageAmount METHOD closeContainer ()V COMMENT Sets the current crafting inventory back to the 2x2 square. METHOD crit (Lnet/minecraft/world/entity/Entity;)V @@ -48,10 +42,6 @@ CLASS net/minecraft/client/player/LocalPlayer METHOD heal (F)V COMMENT Heal living entity (param: amount of half-hearts) ARG 1 healAmount - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD hurtTo (F)V COMMENT Updates health locally. ARG 1 health @@ -88,7 +78,7 @@ CLASS net/minecraft/client/player/LocalPlayer ARG 1 sound ARG 2 volume ARG 3 pitch - METHOD removeRecipeHighlight (Lnet/minecraft/world/item/crafting/RecipeHolder;)V + METHOD removeRecipeHighlight (Lnet/minecraft/world/item/crafting/display/RecipeDisplayId;)V ARG 1 recipe METHOD rideTick ()V COMMENT Handles updating while riding another entity diff --git a/data/net/minecraft/client/player/RemotePlayer.mapping b/data/net/minecraft/client/player/RemotePlayer.mapping index 4aaca8e45..2f5b454df 100644 --- a/data/net/minecraft/client/player/RemotePlayer.mapping +++ b/data/net/minecraft/client/player/RemotePlayer.mapping @@ -1,8 +1,4 @@ CLASS net/minecraft/client/player/RemotePlayer - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD shouldRenderAtSqrDistance (D)Z COMMENT Checks if the entity is in range to render. ARG 1 distance diff --git a/data/net/minecraft/client/renderer/CloudRenderer.mapping b/data/net/minecraft/client/renderer/CloudRenderer.mapping new file mode 100644 index 000000000..ba857acc3 --- /dev/null +++ b/data/net/minecraft/client/renderer/CloudRenderer.mapping @@ -0,0 +1,66 @@ +CLASS net/minecraft/client/renderer/CloudRenderer + METHOD buildExtrudedCell (Lnet/minecraft/client/renderer/CloudRenderer$RelativeCameraPos;Lcom/mojang/blaze3d/vertex/BufferBuilder;IIIIIIJ)V + ARG 1 relativeCameraPos + ARG 2 bufferBuilder + ARG 3 bottomColor + ARG 4 topColor + ARG 5 sideColor + ARG 6 frontColor + ARG 7 x + ARG 8 y + ARG 9 cellData + METHOD buildFlatCell (Lcom/mojang/blaze3d/vertex/BufferBuilder;III)V + ARG 1 bufferBuilder + ARG 2 color + ARG 3 x + ARG 4 y + METHOD buildMesh (Lcom/mojang/blaze3d/vertex/Tesselator;IILnet/minecraft/client/CloudStatus;Lnet/minecraft/client/renderer/CloudRenderer$RelativeCameraPos;Lnet/minecraft/client/renderer/RenderType;)Lcom/mojang/blaze3d/vertex/MeshData; + ARG 1 tesselator + ARG 2 cellX + ARG 3 cellZ + ARG 4 cloudStatus + ARG 5 relativeCameraPos + ARG 6 renderType + METHOD buildMesh (Lnet/minecraft/client/renderer/CloudRenderer$RelativeCameraPos;Lcom/mojang/blaze3d/vertex/BufferBuilder;IIIIIIZ)V + ARG 1 relativeCameraPos + ARG 2 bufferBuilder + ARG 3 cellX + ARG 4 cellZ + ARG 5 bottomColor + ARG 6 topColor + ARG 7 sideColor + ARG 8 frontColor + ARG 9 fancyClouds + METHOD drawWithRenderType (Lnet/minecraft/client/renderer/RenderType;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;FFF)V + ARG 1 renderType + ARG 2 frustumMatrix + ARG 3 projectionMatrix + ARG 4 x + ARG 5 y + ARG 6 z + METHOD getColor (J)I + ARG 0 cellData + METHOD isCellEmpty (I)Z + ARG 0 color + METHOD isEastEmpty (J)Z + ARG 0 cellData + METHOD isNorthEmpty (J)Z + ARG 0 cellData + METHOD isSouthEmpty (J)Z + ARG 0 cellData + METHOD isWestEmpty (J)Z + ARG 0 cellData + METHOD packCellData (IZZZZ)J + ARG 0 color + ARG 1 northEmpty + ARG 2 eastEmpty + ARG 3 southEmpty + ARG 4 westEmpty + METHOD render (ILnet/minecraft/client/CloudStatus;FLorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lnet/minecraft/world/phys/Vec3;F)V + ARG 1 height + ARG 2 cloudStatus + ARG 3 color + ARG 4 frustumMatrix + ARG 5 projectionMatrix + ARG 6 cameraPosiiton + ARG 7 ticks diff --git a/data/net/minecraft/client/renderer/CompiledShaderProgram.mapping b/data/net/minecraft/client/renderer/CompiledShaderProgram.mapping new file mode 100644 index 000000000..02473b6c1 --- /dev/null +++ b/data/net/minecraft/client/renderer/CompiledShaderProgram.mapping @@ -0,0 +1,28 @@ +CLASS net/minecraft/client/renderer/CompiledShaderProgram + METHOD (I)V + ARG 1 programId + METHOD bindSampler (Ljava/lang/String;I)V + ARG 1 samplerName + ARG 2 textureId + METHOD getUniform (Ljava/lang/String;)Lcom/mojang/blaze3d/shaders/Uniform; + ARG 1 name + METHOD getUniformConfig (Ljava/lang/String;)Lnet/minecraft/client/renderer/ShaderProgramConfig$Uniform; + ARG 1 name + METHOD link (Lcom/mojang/blaze3d/shaders/CompiledShader;Lcom/mojang/blaze3d/shaders/CompiledShader;Lcom/mojang/blaze3d/vertex/VertexFormat;)Lnet/minecraft/client/renderer/CompiledShaderProgram; + ARG 0 vertexShader + ARG 1 fragmentShader + ARG 2 vertexFormat + METHOD parseUniformNode (Lnet/minecraft/client/renderer/ShaderProgramConfig$Uniform;)Lcom/mojang/blaze3d/shaders/Uniform; + ARG 1 uniform + METHOD registerUniform (Lcom/mojang/blaze3d/shaders/Uniform;)V + ARG 1 uniform + METHOD safeGetUniform (Ljava/lang/String;)Lcom/mojang/blaze3d/shaders/AbstractUniform; + ARG 1 name + METHOD setDefaultUniforms (Lcom/mojang/blaze3d/vertex/VertexFormat$Mode;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lcom/mojang/blaze3d/platform/Window;)V + ARG 1 mode + ARG 2 frustumMatrix + ARG 3 projectionMatrix + ARG 4 window + METHOD setupUniforms (Ljava/util/List;Ljava/util/List;)V + ARG 1 uniforms + ARG 2 samplers diff --git a/data/net/minecraft/client/renderer/CoreShaders.mapping b/data/net/minecraft/client/renderer/CoreShaders.mapping new file mode 100644 index 000000000..cc9686ead --- /dev/null +++ b/data/net/minecraft/client/renderer/CoreShaders.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/client/renderer/CoreShaders + METHOD register (Ljava/lang/String;Lcom/mojang/blaze3d/vertex/VertexFormat;)Lnet/minecraft/client/renderer/ShaderProgram; + ARG 0 name + ARG 1 vertexFormat + METHOD register (Ljava/lang/String;Lcom/mojang/blaze3d/vertex/VertexFormat;Lnet/minecraft/client/renderer/ShaderDefines;)Lnet/minecraft/client/renderer/ShaderProgram; + ARG 0 name + ARG 1 vertexFormat + ARG 2 defines diff --git a/data/net/minecraft/client/renderer/DimensionSpecialEffects.mapping b/data/net/minecraft/client/renderer/DimensionSpecialEffects.mapping index b9d42c386..747905f91 100644 --- a/data/net/minecraft/client/renderer/DimensionSpecialEffects.mapping +++ b/data/net/minecraft/client/renderer/DimensionSpecialEffects.mapping @@ -10,11 +10,12 @@ CLASS net/minecraft/client/renderer/DimensionSpecialEffects METHOD getBrightnessDependentFogColor (Lnet/minecraft/world/phys/Vec3;F)Lnet/minecraft/world/phys/Vec3; ARG 1 fogColor ARG 2 brightness - METHOD getSunriseColor (FF)[F + METHOD getSunriseOrSunsetColor (F)I ARG 1 timeOfDay - ARG 2 partialTicks METHOD isFoggyAt (II)Z ARG 1 x ARG 2 y + METHOD isSunriseOrSunset (F)Z + ARG 1 timeOfDay METHOD lambda$static$0 (Lit/unimi/dsi/fastutil/objects/Object2ObjectArrayMap;)V ARG 0 dimensionEffectMap diff --git a/data/net/minecraft/client/renderer/EffectInstance.mapping b/data/net/minecraft/client/renderer/EffectInstance.mapping deleted file mode 100644 index a9ba91236..000000000 --- a/data/net/minecraft/client/renderer/EffectInstance.mapping +++ /dev/null @@ -1,21 +0,0 @@ -CLASS net/minecraft/client/renderer/EffectInstance - METHOD (Lnet/minecraft/server/packs/resources/ResourceProvider;Ljava/lang/String;)V - ARG 1 resourceProvider - ARG 2 name - METHOD getOrCreate (Lnet/minecraft/server/packs/resources/ResourceProvider;Lcom/mojang/blaze3d/shaders/Program$Type;Ljava/lang/String;)Lcom/mojang/blaze3d/shaders/EffectProgram; - ARG 0 resourceProvider - ARG 1 type - ARG 2 name - METHOD getUniform (Ljava/lang/String;)Lcom/mojang/blaze3d/shaders/Uniform; - ARG 1 name - METHOD parseBlendNode (Lcom/google/gson/JsonObject;)Lcom/mojang/blaze3d/shaders/BlendMode; - ARG 0 json - METHOD parseSamplerNode (Lcom/google/gson/JsonElement;)V - ARG 1 json - METHOD parseUniformNode (Lcom/google/gson/JsonElement;)V - ARG 1 json - METHOD safeGetUniform (Ljava/lang/String;)Lcom/mojang/blaze3d/shaders/AbstractUniform; - ARG 1 name - METHOD setSampler (Ljava/lang/String;Ljava/util/function/IntSupplier;)V - ARG 1 name - ARG 2 textureId diff --git a/data/net/minecraft/client/renderer/FogRenderer.mapping b/data/net/minecraft/client/renderer/FogRenderer.mapping index 1b087656c..2369cd37e 100644 --- a/data/net/minecraft/client/renderer/FogRenderer.mapping +++ b/data/net/minecraft/client/renderer/FogRenderer.mapping @@ -1,25 +1,22 @@ CLASS net/minecraft/client/renderer/FogRenderer + METHOD computeFogColor (Lnet/minecraft/client/Camera;FLnet/minecraft/client/multiplayer/ClientLevel;IF)Lorg/joml/Vector4f; + ARG 0 camera + ARG 1 partialTick + ARG 2 level + ARG 3 renderDistance + ARG 4 darkenWorldAmount METHOD getPriorityFogFunction (Lnet/minecraft/world/entity/Entity;F)Lnet/minecraft/client/renderer/FogRenderer$MobEffectFogFunction; ARG 0 entity ARG 1 partialTick METHOD lambda$getPriorityFogFunction$1 (Lnet/minecraft/world/entity/LivingEntity;FLnet/minecraft/client/renderer/FogRenderer$MobEffectFogFunction;)Z ARG 2 effect - METHOD lambda$setupColor$0 (Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/world/level/biome/BiomeManager;FIII)Lnet/minecraft/world/phys/Vec3; - ARG 3 x - ARG 4 y - ARG 5 z - METHOD setupColor (Lnet/minecraft/client/Camera;FLnet/minecraft/client/multiplayer/ClientLevel;IF)V - ARG 0 activeRenderInfo - ARG 1 partialTicks - ARG 2 level - ARG 3 renderDistanceChunks - ARG 4 bossColorModifier - METHOD setupFog (Lnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/FogRenderer$FogMode;FZF)V + METHOD setupFog (Lnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/FogRenderer$FogMode;Lorg/joml/Vector4f;FZF)Lnet/minecraft/client/renderer/FogParameters; ARG 0 camera ARG 1 fogMode - ARG 2 farPlaneDistance - ARG 3 shouldCreateFog - ARG 4 partialTick + ARG 2 fogColor + ARG 3 renderDistance + ARG 4 isFoggy + ARG 5 partialTick CLASS FogData METHOD (Lnet/minecraft/client/renderer/FogRenderer$FogMode;)V ARG 1 mode @@ -27,11 +24,14 @@ CLASS net/minecraft/client/renderer/FogRenderer METHOD getModifiedVoidDarkness (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/effect/MobEffectInstance;FF)F ARG 1 entity ARG 2 effectInstance + ARG 3 voidDarkness ARG 4 partialTick METHOD isEnabled (Lnet/minecraft/world/entity/LivingEntity;F)Z ARG 1 entity + ARG 2 partialTick METHOD setupFog (Lnet/minecraft/client/renderer/FogRenderer$FogData;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/effect/MobEffectInstance;FF)V ARG 1 fogData ARG 2 entity ARG 3 effectInstance ARG 4 farPlaneDistance + ARG 5 partialTick diff --git a/data/net/minecraft/client/renderer/GameRenderer.mapping b/data/net/minecraft/client/renderer/GameRenderer.mapping index 43f885df0..3e25bfe6f 100644 --- a/data/net/minecraft/client/renderer/GameRenderer.mapping +++ b/data/net/minecraft/client/renderer/GameRenderer.mapping @@ -21,131 +21,15 @@ CLASS net/minecraft/client/renderer/GameRenderer ARG 2 blockInteractionRange METHOD getDarkenWorldAmount (F)F ARG 1 partialTicks - METHOD getFov (Lnet/minecraft/client/Camera;FZ)D - ARG 1 activeRenderInfo - ARG 2 partialTicks - ARG 3 useFOVSetting + METHOD getFov (Lnet/minecraft/client/Camera;FZ)F + ARG 1 camera + ARG 2 partialTick + ARG 3 useFovSetting METHOD getNightVisionScale (Lnet/minecraft/world/entity/LivingEntity;F)F ARG 0 livingEntity ARG 1 nanoTime - METHOD getProjectionMatrix (D)Lorg/joml/Matrix4f; + METHOD getProjectionMatrix (F)Lorg/joml/Matrix4f; ARG 1 fov - METHOD getShader (Ljava/lang/String;)Lnet/minecraft/client/renderer/ShaderInstance; - ARG 1 name - METHOD lambda$reloadShaders$0 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$1 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$10 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$11 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$12 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$13 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$14 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$15 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$16 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$17 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$18 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$19 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$2 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$20 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$21 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$22 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$23 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$24 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$25 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$26 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$27 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$28 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$29 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$3 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$30 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$31 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$32 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$33 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$34 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$35 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$36 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$37 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$38 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$39 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$4 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$40 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$41 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$42 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$43 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$44 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$45 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$46 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$47 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$48 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$49 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$5 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$50 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$51 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$52 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$53 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$54 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$6 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$7 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$8 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD lambda$reloadShaders$9 (Lnet/minecraft/client/renderer/ShaderInstance;)V - ARG 0 shader - METHOD loadBlurEffect (Lnet/minecraft/server/packs/resources/ResourceProvider;)V - ARG 1 resourceProvider - METHOD loadEffect (Lnet/minecraft/resources/ResourceLocation;)V - ARG 1 resourceLocation METHOD pick (F)V COMMENT Gets the block or object that is being moused over. ARG 1 partialTicks @@ -154,22 +38,11 @@ CLASS net/minecraft/client/renderer/GameRenderer ARG 2 blockInteractionRange ARG 4 entityInteractionRange ARG 6 partialTick - METHOD preloadShader (Lnet/minecraft/server/packs/resources/ResourceProvider;Ljava/lang/String;Lcom/mojang/blaze3d/vertex/VertexFormat;)Lnet/minecraft/client/renderer/ShaderInstance; - ARG 1 resourceProvider - ARG 2 name - ARG 3 format METHOD preloadUiShader (Lnet/minecraft/server/packs/resources/ResourceProvider;)V ARG 1 resourceProvider - METHOD processBlurEffect (F)V - ARG 1 partialTick - METHOD reloadShaders (Lnet/minecraft/server/packs/resources/ResourceProvider;)V - ARG 1 resourceProvider METHOD render (Lnet/minecraft/client/DeltaTracker;Z)V ARG 1 deltaTracker ARG 2 renderLevel - METHOD renderConfusionOverlay (Lnet/minecraft/client/gui/GuiGraphics;F)V - ARG 1 guiGraphics - ARG 2 scalar METHOD renderItemActivationAnimation (Lnet/minecraft/client/gui/GuiGraphics;F)V ARG 1 guiGraphics ARG 2 partialTick @@ -183,13 +56,13 @@ CLASS net/minecraft/client/renderer/GameRenderer ARG 1 zoom ARG 2 zoomX ARG 3 zoomY - METHOD resetProjectionMatrix (Lorg/joml/Matrix4f;)V - ARG 1 matrix METHOD resize (II)V ARG 1 width ARG 2 height METHOD setPanoramicMode (Z)V ARG 1 panoramicMode + METHOD setPostEffect (Lnet/minecraft/resources/ResourceLocation;)V + ARG 1 postEffectId METHOD setRenderBlockOutline (Z)V ARG 1 renderBlockOutline METHOD setRenderHand (Z)V diff --git a/data/net/minecraft/client/renderer/ItemBlockRenderTypes.mapping b/data/net/minecraft/client/renderer/ItemBlockRenderTypes.mapping index e4b1e3bd0..3adabe230 100644 --- a/data/net/minecraft/client/renderer/ItemBlockRenderTypes.mapping +++ b/data/net/minecraft/client/renderer/ItemBlockRenderTypes.mapping @@ -5,12 +5,10 @@ CLASS net/minecraft/client/renderer/ItemBlockRenderTypes ARG 0 state METHOD getRenderLayer (Lnet/minecraft/world/level/material/FluidState;)Lnet/minecraft/client/renderer/RenderType; ARG 0 fluidState - METHOD getRenderType (Lnet/minecraft/world/item/ItemStack;Z)Lnet/minecraft/client/renderer/RenderType; + METHOD getRenderType (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/client/renderer/RenderType; ARG 0 stack - ARG 1 cull - METHOD getRenderType (Lnet/minecraft/world/level/block/state/BlockState;Z)Lnet/minecraft/client/renderer/RenderType; + METHOD getRenderType (Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/client/renderer/RenderType; ARG 0 state - ARG 1 cull METHOD lambda$static$0 (Ljava/util/HashMap;)V ARG 0 renderTypeByBlock METHOD lambda$static$1 (Ljava/util/HashMap;)V diff --git a/data/net/minecraft/client/renderer/ItemInHandRenderer.mapping b/data/net/minecraft/client/renderer/ItemInHandRenderer.mapping index d2a8475b3..32cb649d6 100644 --- a/data/net/minecraft/client/renderer/ItemInHandRenderer.mapping +++ b/data/net/minecraft/client/renderer/ItemInHandRenderer.mapping @@ -65,7 +65,7 @@ CLASS net/minecraft/client/renderer/ItemInHandRenderer ARG 4 stack METHOD renderMapHand (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/HumanoidArm;)V ARG 1 poseStack - ARG 2 buffer + ARG 2 bufferSource ARG 3 packedLight ARG 4 side METHOD renderOneHandedMap (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;IFLnet/minecraft/world/entity/HumanoidArm;FLnet/minecraft/world/item/ItemStack;)V diff --git a/data/net/minecraft/client/renderer/ItemModelShaper.mapping b/data/net/minecraft/client/renderer/ItemModelShaper.mapping index 921648e45..8900dbb61 100644 --- a/data/net/minecraft/client/renderer/ItemModelShaper.mapping +++ b/data/net/minecraft/client/renderer/ItemModelShaper.mapping @@ -1,12 +1,9 @@ CLASS net/minecraft/client/renderer/ItemModelShaper METHOD (Lnet/minecraft/client/resources/model/ModelManager;)V ARG 1 modelManager - METHOD getIndex (Lnet/minecraft/world/item/Item;)I - ARG 0 item - METHOD getItemModel (Lnet/minecraft/world/item/Item;)Lnet/minecraft/client/resources/model/BakedModel; - ARG 1 item + METHOD getItemModel (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/resources/model/BakedModel; + ARG 1 name METHOD getItemModel (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/client/resources/model/BakedModel; ARG 1 stack - METHOD register (Lnet/minecraft/world/item/Item;Lnet/minecraft/client/resources/model/ModelResourceLocation;)V - ARG 1 item - ARG 2 modelLocation + METHOD lambda$new$0 (Lnet/minecraft/client/resources/model/ModelManager;Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/resources/model/BakedModel; + ARG 1 location diff --git a/data/net/minecraft/client/renderer/LevelEventHandler.mapping b/data/net/minecraft/client/renderer/LevelEventHandler.mapping new file mode 100644 index 000000000..40d101bb7 --- /dev/null +++ b/data/net/minecraft/client/renderer/LevelEventHandler.mapping @@ -0,0 +1,32 @@ +CLASS net/minecraft/client/renderer/LevelEventHandler + METHOD (Lnet/minecraft/client/Minecraft;Lnet/minecraft/world/level/Level;Lnet/minecraft/client/renderer/LevelRenderer;)V + ARG 1 minecraft + ARG 2 level + ARG 3 levelRenderer + METHOD globalLevelEvent (ILnet/minecraft/core/BlockPos;I)V + COMMENT Handles a global level event. This includes playing sounds that should be heard by any player, regardless of position and dimension, such as the Wither spawning. + ARG 1 type + ARG 2 pos + ARG 3 data + METHOD levelEvent (ILnet/minecraft/core/BlockPos;I)V + ARG 1 type + ARG 2 pos + ARG 3 data + METHOD notifyNearbyEntities (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Z)V + COMMENT Notifies living entities in a 3 block range of the specified {@code pos} that a record is or isn't playing nearby, dependent on the specified {@code playing} parameter. + COMMENT This is used to make parrots start or stop partying. + ARG 1 level + ARG 2 pos + ARG 3 playing + METHOD playJukeboxSong (Lnet/minecraft/core/Holder;Lnet/minecraft/core/BlockPos;)V + ARG 1 song + ARG 2 pos + METHOD shootParticles (ILnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;Lnet/minecraft/core/particles/SimpleParticleType;)V + ARG 1 direction + ARG 2 pos + ARG 3 random + ARG 4 particleType + METHOD stopJukeboxSong (Lnet/minecraft/core/BlockPos;)V + ARG 1 pos + METHOD stopJukeboxSongAndNotifyNearby (Lnet/minecraft/core/BlockPos;)V + ARG 1 pos diff --git a/data/net/minecraft/client/renderer/LevelRenderer.mapping b/data/net/minecraft/client/renderer/LevelRenderer.mapping index c41720509..09db04cdb 100644 --- a/data/net/minecraft/client/renderer/LevelRenderer.mapping +++ b/data/net/minecraft/client/renderer/LevelRenderer.mapping @@ -7,46 +7,30 @@ CLASS net/minecraft/client/renderer/LevelRenderer ARG 2 entityRenderDispatcher ARG 3 blockEntityRenderDispatcher ARG 4 renderBuffers - METHOD addChainedFilledBoxVertices (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;DDDDDDFFFF)V - ARG 0 poseStack - ARG 1 consumer - ARG 2 minX - ARG 4 minY - ARG 6 minZ - ARG 8 maxX - ARG 10 maxY - ARG 12 maxZ - ARG 14 red - ARG 15 green - ARG 16 blue - ARG 17 alpha - METHOD addChainedFilledBoxVertices (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;FFFFFFFFFF)V - ARG 0 poseStack - ARG 1 consumer - ARG 2 minX - ARG 3 minY - ARG 4 minZ - ARG 5 maxX - ARG 6 maxY - ARG 7 maxZ - ARG 8 red - ARG 9 green - ARG 10 blue - ARG 11 alpha - METHOD addFrustumQuad (Lcom/mojang/blaze3d/vertex/VertexConsumer;Lorg/joml/Matrix4f;IIIIIII)V - ARG 1 consumer - ARG 2 matrix - ARG 3 index1 - ARG 4 index2 - ARG 5 index3 - ARG 6 index4 - ARG 7 red - ARG 8 green - ARG 9 blue - METHOD addFrustumVertex (Lcom/mojang/blaze3d/vertex/VertexConsumer;Lorg/joml/Matrix4f;I)V - ARG 1 consumer - ARG 2 matrix - ARG 3 vertexIndex + METHOD addCloudsPass (Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lnet/minecraft/client/CloudStatus;Lnet/minecraft/world/phys/Vec3;FIF)V + ARG 1 frameGraphBuilder + ARG 2 frustumMatrix + ARG 3 projectionMatrix + ARG 4 cloudStatus + ARG 5 cameraPosition + ARG 6 ageInTicks + ARG 7 height + ARG 8 ticks + METHOD addLateDebugPass (Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/client/renderer/FogParameters;)V + ARG 1 frameGraphBuilder + ARG 2 cameraPosition + ARG 3 fog + METHOD addMainPass (Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder;Lnet/minecraft/client/renderer/culling/Frustum;Lnet/minecraft/client/Camera;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lnet/minecraft/client/renderer/FogParameters;ZZLnet/minecraft/client/DeltaTracker;Lnet/minecraft/util/profiling/ProfilerFiller;)V + ARG 1 frameGraphBuilder + ARG 2 frustum + ARG 3 camera + ARG 4 frustumMatrix + ARG 5 projectionMatrix + ARG 6 fogParameters + ARG 7 renderBlockOutline + ARG 8 renderEntityOutline + ARG 9 deltaTracker + ARG 10 profiler METHOD addParticle (Lnet/minecraft/core/particles/ParticleOptions;DDDDDD)V ARG 1 options ARG 2 x @@ -99,8 +83,25 @@ CLASS net/minecraft/client/renderer/LevelRenderer ARG 10 xSpeed ARG 12 ySpeed ARG 14 zSpeed + METHOD addParticlesPass (Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder;Lnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/LightTexture;FLnet/minecraft/client/renderer/FogParameters;)V + ARG 1 frameGraphBuilder + ARG 2 camera + ARG 3 lightTexture + ARG 4 partialTick + ARG 5 fog METHOD addRecentlyCompiledSection (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection;)V ARG 1 renderSection + METHOD addSkyPass (Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder;Lnet/minecraft/client/Camera;FLnet/minecraft/client/renderer/FogParameters;)V + ARG 1 frameGraphBuilder + ARG 2 camera + ARG 3 partialTick + ARG 4 fog + METHOD addWeatherPass (Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder;Lnet/minecraft/client/renderer/LightTexture;Lnet/minecraft/world/phys/Vec3;FLnet/minecraft/client/renderer/FogParameters;)V + ARG 1 frameGraphBuilder + ARG 2 lightTexture + ARG 3 cameraPosition + ARG 4 partialTick + ARG 5 fog METHOD allChanged ()V COMMENT Loads all renderers and sets up the basic options usage. METHOD applyFrustum (Lnet/minecraft/client/renderer/culling/Frustum;)V @@ -111,30 +112,16 @@ CLASS net/minecraft/client/renderer/LevelRenderer ARG 3 oldState ARG 4 newState ARG 5 flags - METHOD buildClouds (Lcom/mojang/blaze3d/vertex/Tesselator;DDDLnet/minecraft/world/phys/Vec3;)Lcom/mojang/blaze3d/vertex/MeshData; - ARG 1 tesselator - ARG 2 x - ARG 4 y - ARG 6 z - ARG 8 cloudColor - METHOD buildSkyDisc (Lcom/mojang/blaze3d/vertex/Tesselator;F)Lcom/mojang/blaze3d/vertex/MeshData; - ARG 0 tesselator - ARG 1 y - METHOD calculateParticleLevel (Z)Lnet/minecraft/client/ParticleStatus; - COMMENT Calculates the level of particles to use based on the {@linkplain net.minecraft.client.Options#particles particles option} and the specified {@code decreased} parameter. This leads to randomly generating more or less particles than the set option. + METHOD calculateParticleLevel (Z)Lnet/minecraft/server/level/ParticleStatus; ARG 1 decreased - COMMENT if {@code true}, and the {@linkplain net.minecraft.client.Options#particles particles option} is set to minimal, has a 1 in 10 chance to return a decreased level and a further 1 in 3 chance to minimise it - METHOD captureFrustum (Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;DDDLnet/minecraft/client/renderer/culling/Frustum;)V - ARG 1 viewMatrix - ARG 2 projectionMatrix - ARG 3 camX - ARG 5 camY - ARG 7 camZ - ARG 9 capturedFrustrum METHOD checkPoseStack (Lcom/mojang/blaze3d/vertex/PoseStack;)V COMMENT Asserts that the specified {@code poseStack} is {@linkplain com.mojang.blaze3d.vertex.PoseStack#clear() clear}. COMMENT @throws java.lang.IllegalStateException if the specified {@code poseStack} is not clear ARG 1 poseStack + METHOD collectVisibleEntities (Lnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/culling/Frustum;Ljava/util/List;)Z + ARG 1 camera + ARG 2 frustum + ARG 3 output METHOD compileSections (Lnet/minecraft/client/Camera;)V ARG 1 camera METHOD destroyBlockProgress (ILnet/minecraft/core/BlockPos;I)V @@ -143,8 +130,6 @@ CLASS net/minecraft/client/renderer/LevelRenderer ARG 3 progress METHOD doesMobEffectBlockSky (Lnet/minecraft/client/Camera;)Z ARG 1 camera - METHOD drawStars (Lcom/mojang/blaze3d/vertex/Tesselator;)Lcom/mojang/blaze3d/vertex/MeshData; - ARG 1 tesselator METHOD getEntityStatistics ()Ljava/lang/String; COMMENT @return entity rendering statistics to display on the {@linkplain net.minecraft.client.gui.components.DebugScreenOverlay debug overlay} METHOD getLightColor (Lnet/minecraft/world/level/BlockAndTintGetter;Lnet/minecraft/core/BlockPos;)I @@ -154,66 +139,48 @@ CLASS net/minecraft/client/renderer/LevelRenderer ARG 0 level ARG 1 state ARG 2 pos - METHOD globalLevelEvent (ILnet/minecraft/core/BlockPos;I)V - COMMENT Handles a global level event. This includes playing sounds that should be heard by any player, regardless of position and dimension, such as the Wither spawning. - ARG 1 type - COMMENT the type of level event to handle. This method only handles {@linkplain net.minecraft.world.level.block.LevelEvent#SOUND_WITHER_BOSS_SPAWN the wither boss spawn sound}, {@linkplain net.minecraft.world.level.block.LevelEvent#SOUND_DRAGON_DEATH the dragon's death sound}, and {@linkplain net.minecraft.world.level.block.LevelEvent#SOUND_END_PORTAL_SPAWN the end portal spawn sound}. - ARG 2 pos - ARG 3 data + METHOD isLightOnInSectionAndNeighbors (Lnet/minecraft/world/level/lighting/LevelLightEngine;J)Z + ARG 0 lightEngine + ARG 1 packedSectionPos METHOD isSectionCompiled (Lnet/minecraft/core/BlockPos;)Z ARG 1 pos - METHOD lambda$initTransparency$0 (Lnet/minecraft/server/packs/PackResources;)Lnet/minecraft/network/chat/MutableComponent; - ARG 0 levelRenderer - METHOD lambda$renderLevel$2 (Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/client/renderer/RenderType;)Lcom/mojang/blaze3d/vertex/VertexConsumer; - ARG 2 lastState - METHOD lambda$renderShape$4 (Lcom/mojang/blaze3d/vertex/VertexConsumer;Lcom/mojang/blaze3d/vertex/PoseStack$Pose;DDDFFFFDDDDDD)V - ARG 12 minX - ARG 14 minY - ARG 16 minZ - ARG 18 maxX - ARG 20 maxY - ARG 22 maxZ - METHOD levelEvent (ILnet/minecraft/core/BlockPos;I)V - ARG 1 type - ARG 2 pos - ARG 3 data - METHOD mixColor (F)Lnet/minecraft/world/phys/Vec3; - ARG 0 hue - METHOD notifyNearbyEntities (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Z)V - COMMENT Notifies living entities in a 3 block range of the specified {@code pos} that a record is or isn't playing nearby, dependent on the specified {@code playing} parameter. - COMMENT This is used to make parrots start or stop partying. - ARG 1 level - ARG 2 pos - ARG 3 playing + METHOD lambda$renderBlockEntities$6 (Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/client/renderer/RenderType;)Lcom/mojang/blaze3d/vertex/VertexConsumer; + ARG 2 renderType METHOD offsetFrustum (Lnet/minecraft/client/renderer/culling/Frustum;)Lnet/minecraft/client/renderer/culling/Frustum; ARG 0 frustum METHOD onChunkLoaded (Lnet/minecraft/world/level/ChunkPos;)V ARG 1 chunkPos METHOD onResourceManagerReload (Lnet/minecraft/server/packs/resources/ResourceManager;)V ARG 1 resourceManager - METHOD playJukeboxSong (Lnet/minecraft/core/Holder;Lnet/minecraft/core/BlockPos;)V - ARG 1 song - ARG 2 pos + METHOD onSectionBecomingNonEmpty (J)V + ARG 1 sectionPos METHOD prepareCullFrustum (Lnet/minecraft/world/phys/Vec3;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V ARG 1 cameraPosition ARG 2 frustumMatrix ARG 3 projectionMatrix METHOD removeProgress (Lnet/minecraft/server/level/BlockDestructionProgress;)V ARG 1 progress - METHOD renderClouds (Lcom/mojang/blaze3d/vertex/PoseStack;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;FDDD)V + METHOD renderBlockDestroyAnimation (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;)V ARG 1 poseStack - ARG 2 frustumMatrix - ARG 3 projectionMatrix - ARG 4 partialTick - ARG 5 camX - ARG 7 camY - ARG 9 camZ - METHOD renderDebug (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/Camera;)V + ARG 2 camera + ARG 3 bufferSource + METHOD renderBlockEntities (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;Lnet/minecraft/client/Camera;F)V ARG 1 poseStack - ARG 2 buffer - ARG 3 camera - METHOD renderEndSky (Lcom/mojang/blaze3d/vertex/PoseStack;)V + ARG 2 bufferSource + ARG 3 crumblingBufferSource + ARG 4 camera + ARG 5 partialTick + METHOD renderBlockOutline (Lnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;Lcom/mojang/blaze3d/vertex/PoseStack;Z)V + ARG 1 camera + ARG 2 bufferSource + ARG 3 poseStack + ARG 4 sort + METHOD renderEntities (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;Lnet/minecraft/client/Camera;Lnet/minecraft/client/DeltaTracker;Ljava/util/List;)V ARG 1 poseStack + ARG 2 bufferSource + ARG 3 camera + ARG 4 deltaTracker + ARG 5 entities METHOD renderEntity (Lnet/minecraft/world/entity/Entity;DDDFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;)V ARG 1 entity ARG 2 camX @@ -222,86 +189,25 @@ CLASS net/minecraft/client/renderer/LevelRenderer ARG 8 partialTick ARG 9 poseStack ARG 10 bufferSource - METHOD renderFace (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/core/Direction;FFFFFFFFFF)V - ARG 0 poseStack - ARG 1 buffer - ARG 2 face - ARG 3 x1 - ARG 4 y1 - ARG 5 z1 - ARG 6 x2 - ARG 7 y2 - ARG 8 z2 - ARG 9 red - ARG 10 green - ARG 11 blue - ARG 12 alpha - METHOD renderHitOutline (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/world/entity/Entity;DDDLnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V + METHOD renderHitOutline (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/world/entity/Entity;DDDLnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;I)V ARG 1 poseStack - ARG 2 consumer + ARG 2 buffer ARG 3 entity ARG 4 camX ARG 6 camY ARG 8 camZ ARG 10 pos ARG 11 state - METHOD renderLevel (Lnet/minecraft/client/DeltaTracker;ZLnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/GameRenderer;Lnet/minecraft/client/renderer/LightTexture;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V - ARG 1 deltaTracker - ARG 2 renderBlockOutline - ARG 3 camera - ARG 4 gameRenderer - ARG 5 lightTexture - ARG 6 frustumMatrix - ARG 7 projectionMatrix - METHOD renderLineBox (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;DDDDDDFFFF)V - ARG 0 poseStack - ARG 1 consumer - ARG 2 minX - ARG 4 minY - ARG 6 minZ - ARG 8 maxX - ARG 10 maxY - ARG 12 maxZ - ARG 14 red - ARG 15 green - ARG 16 blue - ARG 17 alpha - METHOD renderLineBox (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;DDDDDDFFFFFFF)V - ARG 0 poseStack - ARG 1 consumer - ARG 2 minX - ARG 4 minY - ARG 6 minZ - ARG 8 maxX - ARG 10 maxY - ARG 12 maxZ - ARG 14 red - ARG 15 green - ARG 16 blue - ARG 17 alpha - ARG 18 red2 - ARG 19 green2 - ARG 20 blue2 - METHOD renderLineBox (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/world/phys/AABB;FFFF)V - ARG 0 poseStack - ARG 1 buffer - ARG 2 box - ARG 3 red - ARG 4 green - ARG 5 blue - ARG 6 alpha - METHOD renderLineBox (Lcom/mojang/blaze3d/vertex/VertexConsumer;DDDDDDFFFF)V - ARG 0 consumer - ARG 1 minX - ARG 3 minY - ARG 5 minZ - ARG 7 maxX - ARG 9 maxY - ARG 11 maxZ - ARG 13 red - ARG 14 green - ARG 15 blue - ARG 16 alpha + ARG 12 color + METHOD renderLevel (Lcom/mojang/blaze3d/resource/GraphicsResourceAllocator;Lnet/minecraft/client/DeltaTracker;ZLnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/GameRenderer;Lnet/minecraft/client/renderer/LightTexture;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V + ARG 1 graphicsResourceAllocator + ARG 2 deltaTracker + ARG 3 renderBlockOutline + ARG 4 camera + ARG 5 gameRenderer + ARG 6 lightTexture + ARG 7 frustumMatrix + ARG 8 projectionMatrix METHOD renderSectionLayer (Lnet/minecraft/client/renderer/RenderType;DDDLorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V ARG 1 renderType ARG 2 x @@ -309,46 +215,18 @@ CLASS net/minecraft/client/renderer/LevelRenderer ARG 6 z ARG 8 frustrumMatrix ARG 9 projectionMatrix - METHOD renderShape (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/world/phys/shapes/VoxelShape;DDDFFFF)V - ARG 0 poseStack - ARG 1 consumer - ARG 2 shape - ARG 3 x - ARG 5 y - ARG 7 z - ARG 9 red - ARG 10 green - ARG 11 blue - ARG 12 alpha - METHOD renderSky (Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;FLnet/minecraft/client/Camera;ZLjava/lang/Runnable;)V - ARG 1 frustumMatrix - ARG 2 projectionMatrix - ARG 3 partialTick - ARG 4 camera - ARG 5 isFoggy - ARG 6 skyFogSetup - METHOD renderSnowAndRain (Lnet/minecraft/client/renderer/LightTexture;FDDD)V - ARG 1 lightTexture - ARG 2 partialTick - ARG 3 camX - ARG 5 camY - ARG 7 camZ - METHOD renderVoxelShape (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/world/phys/shapes/VoxelShape;DDDFFFFZ)V - ARG 0 poseStack - ARG 1 consumer - ARG 2 shape - ARG 3 x - ARG 5 y - ARG 7 z - ARG 9 red - ARG 10 green - ARG 11 blue - ARG 12 alpha - METHOD renderWorldBorder (Lnet/minecraft/client/Camera;)V - ARG 1 camera METHOD resize (II)V ARG 1 width ARG 2 height + METHOD scheduleResort (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection;Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$TranslucencyPointOfView;Lnet/minecraft/world/phys/Vec3;ZZ)V + ARG 1 section + ARG 2 pointOfView + ARG 3 cameraPosition + ARG 4 force + COMMENT If {@code true}, will schedule a resort even if the point of view hasn't changed + ARG 5 ignoreAxisAlignment + METHOD scheduleTranslucentSectionResort (Lnet/minecraft/world/phys/Vec3;)V + ARG 1 cameraPosition METHOD setBlockDirty (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;)V ARG 1 pos ARG 2 oldState @@ -380,31 +258,22 @@ CLASS net/minecraft/client/renderer/LevelRenderer ARG 1 sectionX ARG 2 sectionY ARG 3 sectionZ + METHOD setSectionRangeDirty (IIIIII)V + ARG 1 minY + ARG 2 minX + ARG 3 minZ + ARG 4 maxY + ARG 5 maxX + ARG 6 maxZ METHOD setupRender (Lnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/culling/Frustum;ZZ)V ARG 1 camera ARG 2 frustum ARG 3 hasCapturedFrustum ARG 4 isSpectator - METHOD shiftHue (FFFF)Lnet/minecraft/world/phys/Vec3; - ARG 0 red - ARG 1 green - ARG 2 blue - ARG 3 hue - METHOD shootParticles (ILnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;Lnet/minecraft/core/particles/SimpleParticleType;)V - ARG 1 direction - ARG 2 pos - ARG 3 random - ARG 4 particleType - METHOD stopJukeboxSong (Lnet/minecraft/core/BlockPos;)V - ARG 1 pos - METHOD stopJukeboxSongAndNotifyNearby (Lnet/minecraft/core/BlockPos;)V - ARG 1 pos - METHOD tickRain (Lnet/minecraft/client/Camera;)V + METHOD shouldRenderDarkDisc (F)Z + ARG 1 partialTick + METHOD tickParticles (Lnet/minecraft/client/Camera;)V ARG 1 camera METHOD updateGlobalBlockEntities (Ljava/util/Collection;Ljava/util/Collection;)V ARG 1 blockEntitiesToRemove ARG 2 blockEntitiesToAdd - CLASS TransparencyShaderException - METHOD (Ljava/lang/String;Ljava/lang/Throwable;)V - ARG 1 message - ARG 2 cause diff --git a/data/net/minecraft/client/renderer/LightTexture.mapping b/data/net/minecraft/client/renderer/LightTexture.mapping index 867ba7f48..c106b4f97 100644 --- a/data/net/minecraft/client/renderer/LightTexture.mapping +++ b/data/net/minecraft/client/renderer/LightTexture.mapping @@ -8,15 +8,17 @@ CLASS net/minecraft/client/renderer/LightTexture ARG 1 entity ARG 2 gamma ARG 3 partialTick - METHOD clampColor (Lorg/joml/Vector3f;)V - ARG 0 color + METHOD getBrightness (FI)F + ARG 0 ambientLight + ARG 1 lightLevel METHOD getBrightness (Lnet/minecraft/world/level/dimension/DimensionType;I)F ARG 0 dimensionType ARG 1 lightLevel METHOD getDarknessGamma (F)F ARG 1 partialTick - METHOD notGamma (F)F - ARG 1 value + METHOD lightCoordsWithEmission (II)I + ARG 0 packedLight + ARG 1 emmision METHOD pack (II)I ARG 0 blockLight ARG 1 skyLight diff --git a/data/net/minecraft/client/renderer/MapRenderer.mapping b/data/net/minecraft/client/renderer/MapRenderer.mapping new file mode 100644 index 000000000..e7582cabe --- /dev/null +++ b/data/net/minecraft/client/renderer/MapRenderer.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/client/renderer/MapRenderer + METHOD (Lnet/minecraft/client/resources/MapDecorationTextureManager;Lnet/minecraft/client/resources/MapTextureManager;)V + ARG 1 decorationTextures + ARG 2 mapTextureManager + METHOD extractDecorationRenderState (Lnet/minecraft/world/level/saveddata/maps/MapDecoration;)Lnet/minecraft/client/renderer/state/MapRenderState$MapDecorationRenderState; + ARG 1 decoration + METHOD extractRenderState (Lnet/minecraft/world/level/saveddata/maps/MapId;Lnet/minecraft/world/level/saveddata/maps/MapItemSavedData;Lnet/minecraft/client/renderer/state/MapRenderState;)V + ARG 1 id + ARG 2 savedData + ARG 3 renderState + METHOD render (Lnet/minecraft/client/renderer/state/MapRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ZI)V + ARG 1 renderState + ARG 2 poseStack + ARG 3 bufferSource + ARG 4 active + ARG 5 packedLight diff --git a/data/net/minecraft/client/renderer/Octree.mapping b/data/net/minecraft/client/renderer/Octree.mapping new file mode 100644 index 000000000..1dd2b2e56 --- /dev/null +++ b/data/net/minecraft/client/renderer/Octree.mapping @@ -0,0 +1,60 @@ +CLASS net/minecraft/client/renderer/Octree + METHOD (Lnet/minecraft/core/SectionPos;III)V + ARG 1 cameraSectionPos + ARG 2 viewDistance + ARG 3 sectionGridSizeY + ARG 4 minY + METHOD add (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection;)Z + ARG 1 section + METHOD isClose (DDDDDDI)Z + ARG 1 minX + ARG 3 minY + ARG 5 minZ + ARG 7 maxX + ARG 9 maxY + ARG 11 maxZ + ARG 13 radius + METHOD visitNodes (Lnet/minecraft/client/renderer/Octree$OctreeVisitor;Lnet/minecraft/client/renderer/culling/Frustum;I)V + ARG 1 visitor + ARG 2 frustum + ARG 3 nearbyRadius + CLASS Leaf + METHOD (Lnet/minecraft/client/renderer/Octree;Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection;)V + ARG 2 section + CLASS Node + METHOD visitNodes (Lnet/minecraft/client/renderer/Octree$OctreeVisitor;ZLnet/minecraft/client/renderer/culling/Frustum;IIZ)V + ARG 1 visitor + ARG 2 isLeafNode + ARG 3 frustum + ARG 4 recursionDepth + ARG 5 nearbyRadius + ARG 6 isNearby + CLASS Branch + METHOD (Lnet/minecraft/client/renderer/Octree;Lnet/minecraft/world/level/levelgen/structure/BoundingBox;)V + ARG 2 boundingBox + METHOD add (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection;)Z + ARG 1 section + METHOD createChildBoundingBox (ZZZ)Lnet/minecraft/world/level/levelgen/structure/BoundingBox; + ARG 1 xDiffNegative + ARG 2 yDiffNegative + ARG 3 zDiffNegative + METHOD getNodeIndex (Lnet/minecraft/client/renderer/Octree$AxisSorting;ZZZ)I + ARG 0 sorting + ARG 1 xDiffNegative + ARG 2 yDiffNegative + ARG 3 zDiffNegative + CLASS AxisSorting + METHOD (Ljava/lang/String;IIII)V + ARG 3 xShift + ARG 4 yShift + ARG 5 zShift + METHOD getAxisSorting (III)Lnet/minecraft/client/renderer/Octree$AxisSorting; + ARG 0 xDiff + ARG 1 yDiff + ARG 2 zDiff + CLASS OctreeVisitor + METHOD visit (Lnet/minecraft/client/renderer/Octree$Node;ZIZ)V + ARG 1 node + ARG 2 isLeafNode + ARG 3 recursionDepth + ARG 4 isNearby diff --git a/data/net/minecraft/client/renderer/PostChain.mapping b/data/net/minecraft/client/renderer/PostChain.mapping index febf3361b..7e3c6f378 100644 --- a/data/net/minecraft/client/renderer/PostChain.mapping +++ b/data/net/minecraft/client/renderer/PostChain.mapping @@ -1,39 +1,36 @@ CLASS net/minecraft/client/renderer/PostChain - METHOD (Lnet/minecraft/client/renderer/texture/TextureManager;Lnet/minecraft/server/packs/resources/ResourceProvider;Lcom/mojang/blaze3d/pipeline/RenderTarget;Lnet/minecraft/resources/ResourceLocation;)V - ARG 1 textureManager - ARG 2 resourceProvider - ARG 3 screenTarget - ARG 4 resourceLocation - METHOD addPass (Ljava/lang/String;Lcom/mojang/blaze3d/pipeline/RenderTarget;Lcom/mojang/blaze3d/pipeline/RenderTarget;Z)Lnet/minecraft/client/renderer/PostPass; - ARG 1 name - ARG 2 inTarget - ARG 3 outTarget - ARG 4 useLinearFilter - METHOD addTempTarget (Ljava/lang/String;II)V - ARG 1 name + METHOD (Ljava/util/List;Ljava/util/Map;Ljava/util/Set;)V + ARG 1 passes + ARG 2 internalTargets + ARG 3 externalTargets + METHOD addToFrame (Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder;IILnet/minecraft/client/renderer/PostChain$TargetBundle;)V + ARG 1 frameGraphBuilder ARG 2 width ARG 3 height - METHOD getRenderTarget (Ljava/lang/String;)Lcom/mojang/blaze3d/pipeline/RenderTarget; - ARG 1 target - METHOD getTempTarget (Ljava/lang/String;)Lcom/mojang/blaze3d/pipeline/RenderTarget; - ARG 1 attributeName - METHOD load (Lnet/minecraft/client/renderer/texture/TextureManager;Lnet/minecraft/resources/ResourceLocation;)V - ARG 1 textureManager - ARG 2 resourceLocation - METHOD parsePassNode (Lnet/minecraft/client/renderer/texture/TextureManager;Lcom/google/gson/JsonElement;)V + ARG 4 targetBundle + METHOD createPass (Lnet/minecraft/client/renderer/texture/TextureManager;Lnet/minecraft/client/renderer/ShaderManager;Lnet/minecraft/client/renderer/PostChainConfig$Pass;)Lnet/minecraft/client/renderer/PostPass; + ARG 0 textureManager + ARG 1 shaderManager + ARG 2 pass + METHOD load (Lnet/minecraft/client/renderer/PostChainConfig;Lnet/minecraft/client/renderer/texture/TextureManager;Lnet/minecraft/client/renderer/ShaderManager;Ljava/util/Set;)Lnet/minecraft/client/renderer/PostChain; + ARG 0 config ARG 1 textureManager - ARG 2 json - METHOD parseTargetNode (Lcom/google/gson/JsonElement;)V - ARG 1 json - METHOD parseUniformNode (Lcom/google/gson/JsonElement;)V - ARG 1 json - METHOD process (F)V - ARG 1 partialTicks - METHOD resize (II)V - ARG 1 width - ARG 2 height - METHOD setFilterMode (I)V - ARG 1 filterMode + ARG 2 shaderManager + ARG 3 externalTargets + METHOD process (Lcom/mojang/blaze3d/pipeline/RenderTarget;Lcom/mojang/blaze3d/resource/GraphicsResourceAllocator;)V + ARG 1 target + ARG 2 graphicsResourceAllocator METHOD setUniform (Ljava/lang/String;F)V ARG 1 name ARG 2 backgroundBlurriness + CLASS TargetBundle + METHOD get (Lnet/minecraft/resources/ResourceLocation;)Lcom/mojang/blaze3d/resource/ResourceHandle; + ARG 1 id + METHOD getOrThrow (Lnet/minecraft/resources/ResourceLocation;)Lcom/mojang/blaze3d/resource/ResourceHandle; + ARG 1 id + METHOD of (Lnet/minecraft/resources/ResourceLocation;Lcom/mojang/blaze3d/resource/ResourceHandle;)Lnet/minecraft/client/renderer/PostChain$TargetBundle; + ARG 0 id + ARG 1 handle + METHOD replace (Lnet/minecraft/resources/ResourceLocation;Lcom/mojang/blaze3d/resource/ResourceHandle;)V + ARG 1 id + ARG 2 handle diff --git a/data/net/minecraft/client/renderer/PostChainConfig.mapping b/data/net/minecraft/client/renderer/PostChainConfig.mapping new file mode 100644 index 000000000..9db3e5c9f --- /dev/null +++ b/data/net/minecraft/client/renderer/PostChainConfig.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/client/renderer/PostChainConfig + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS Pass + METHOD lambda$static$2 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS Uniform + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS TargetInput + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS TextureInput + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS FixedSizedTarget + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/client/renderer/PostPass.mapping b/data/net/minecraft/client/renderer/PostPass.mapping index 49b579c3c..d7609c724 100644 --- a/data/net/minecraft/client/renderer/PostPass.mapping +++ b/data/net/minecraft/client/renderer/PostPass.mapping @@ -1,16 +1,24 @@ CLASS net/minecraft/client/renderer/PostPass - METHOD (Lnet/minecraft/server/packs/resources/ResourceProvider;Ljava/lang/String;Lcom/mojang/blaze3d/pipeline/RenderTarget;Lcom/mojang/blaze3d/pipeline/RenderTarget;Z)V - ARG 1 resourceProvider - ARG 2 name - ARG 3 inTarget - ARG 4 outTarget - ARG 5 useLinearFilter - METHOD addAuxAsset (Ljava/lang/String;Ljava/util/function/IntSupplier;II)V - ARG 1 auxName - ARG 2 auxFramebuffer - ARG 3 width - ARG 4 height - METHOD process (F)V - ARG 1 partialTicks - METHOD setOrthoMatrix (Lorg/joml/Matrix4f;)V - ARG 1 shaderOrthoMatrix + METHOD (Ljava/lang/String;Lnet/minecraft/client/renderer/CompiledShaderProgram;Lnet/minecraft/resources/ResourceLocation;Ljava/util/List;)V + ARG 1 name + ARG 2 shader + ARG 3 outputTargetId + ARG 4 uniforms + METHOD addInput (Lnet/minecraft/client/renderer/PostPass$Input;)V + ARG 1 input + METHOD addToFrame (Lcom/mojang/blaze3d/framegraph/FrameGraphBuilder;Ljava/util/Map;Lorg/joml/Matrix4f;)V + ARG 1 frameGraphBuilder + ARG 2 targets + ARG 3 projectionMatrix + CLASS Input + METHOD addToPass (Lcom/mojang/blaze3d/framegraph/FramePass;Ljava/util/Map;)V + ARG 1 pass + ARG 2 targets + METHOD bindTo (Lnet/minecraft/client/renderer/CompiledShaderProgram;Ljava/util/Map;)V + ARG 1 shaderProgram + ARG 2 targets + METHOD cleanup (Ljava/util/Map;)V + ARG 1 targets + CLASS TargetInput + METHOD getHandle (Ljava/util/Map;)Lcom/mojang/blaze3d/resource/ResourceHandle; + ARG 1 targets diff --git a/data/net/minecraft/client/renderer/RenderBuffers.mapping b/data/net/minecraft/client/renderer/RenderBuffers.mapping index 4ff8a1dec..3bbaf87dd 100644 --- a/data/net/minecraft/client/renderer/RenderBuffers.mapping +++ b/data/net/minecraft/client/renderer/RenderBuffers.mapping @@ -1,10 +1,6 @@ CLASS net/minecraft/client/renderer/RenderBuffers METHOD (I)V ARG 1 bufferCount - METHOD lambda$new$0 (Lit/unimi/dsi/fastutil/objects/Object2ObjectLinkedOpenHashMap;Lnet/minecraft/client/renderer/RenderType;)V - ARG 1 renderType - METHOD lambda$new$1 (Lit/unimi/dsi/fastutil/objects/Object2ObjectLinkedOpenHashMap;)V - ARG 1 fixedBuffersMap METHOD put (Lit/unimi/dsi/fastutil/objects/Object2ObjectLinkedOpenHashMap;Lnet/minecraft/client/renderer/RenderType;)V ARG 0 mapBuilders ARG 1 renderType diff --git a/data/net/minecraft/client/renderer/RenderStateShard.mapping b/data/net/minecraft/client/renderer/RenderStateShard.mapping index f33e42f9a..fb665e24e 100644 --- a/data/net/minecraft/client/renderer/RenderStateShard.mapping +++ b/data/net/minecraft/client/renderer/RenderStateShard.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/client/renderer/RenderStateShard METHOD (Ljava/util/OptionalDouble;)V ARG 1 width CLASS ShaderStateShard - METHOD (Ljava/util/function/Supplier;)V + METHOD (Lnet/minecraft/client/renderer/ShaderProgram;)V ARG 1 shader CLASS BooleanStateShard METHOD (Ljava/lang/String;Ljava/lang/Runnable;Ljava/lang/Runnable;Z)V @@ -24,7 +24,7 @@ CLASS net/minecraft/client/renderer/RenderStateShard METHOD (Z)V ARG 1 useOverlay CLASS TextureStateShard - METHOD (Lnet/minecraft/resources/ResourceLocation;ZZ)V + METHOD (Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/util/TriState;Z)V ARG 1 texture ARG 2 blur ARG 3 mipmap diff --git a/data/net/minecraft/client/renderer/RenderType.mapping b/data/net/minecraft/client/renderer/RenderType.mapping index 90d81e32a..b88b30ea2 100644 --- a/data/net/minecraft/client/renderer/RenderType.mapping +++ b/data/net/minecraft/client/renderer/RenderType.mapping @@ -10,6 +10,8 @@ CLASS net/minecraft/client/renderer/RenderType ARG 8 clearState METHOD armorCutoutNoCull (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; ARG 0 location + METHOD armorTranslucent (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; + ARG 0 id METHOD beaconBeam (Lnet/minecraft/resources/ResourceLocation;Z)Lnet/minecraft/client/renderer/RenderType; ARG 0 location ARG 1 colorFlag @@ -39,8 +41,11 @@ CLASS net/minecraft/client/renderer/RenderType ARG 2 equalDepthTest METHOD createArmorDecalCutoutNoCull (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; ARG 0 id - METHOD createClouds (Z)Lnet/minecraft/client/renderer/RenderType$CompositeRenderType; + METHOD createClouds (ZZ)Lnet/minecraft/client/renderer/RenderType$CompositeRenderType; ARG 0 color + ARG 1 cull + METHOD crosshair (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; + ARG 0 location METHOD crumbling (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; ARG 0 location METHOD debugLineStrip (D)Lnet/minecraft/client/renderer/RenderType; @@ -75,13 +80,13 @@ CLASS net/minecraft/client/renderer/RenderType ARG 0 location METHOD entitySolid (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; ARG 0 location + METHOD entitySolidZOffsetForward (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; + ARG 0 location METHOD entityTranslucent (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; ARG 0 location METHOD entityTranslucent (Lnet/minecraft/resources/ResourceLocation;Z)Lnet/minecraft/client/renderer/RenderType; ARG 0 location ARG 1 outline - METHOD entityTranslucentCull (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; - ARG 0 location METHOD entityTranslucentEmissive (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; ARG 0 location METHOD entityTranslucentEmissive (Lnet/minecraft/resources/ResourceLocation;Z)Lnet/minecraft/client/renderer/RenderType; @@ -89,25 +94,34 @@ CLASS net/minecraft/client/renderer/RenderType ARG 1 outline METHOD eyes (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; ARG 0 location + METHOD guiOpaqueTexturedBackground (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; + ARG 0 location + METHOD guiTextured (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; + ARG 0 location + METHOD guiTexturedOverlay (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; + ARG 0 location METHOD itemEntityTranslucentCull (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; ARG 0 location METHOD lambda$static$0 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; ARG 0 id METHOD lambda$static$1 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; ARG 0 id - METHOD lambda$static$10 (Lnet/minecraft/resources/ResourceLocation;Ljava/lang/Boolean;)Lnet/minecraft/client/renderer/RenderType; + METHOD lambda$static$10 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; ARG 0 id - ARG 1 effectsOutline - METHOD lambda$static$11 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; + METHOD lambda$static$11 (Lnet/minecraft/resources/ResourceLocation;Ljava/lang/Boolean;)Lnet/minecraft/client/renderer/RenderType; ARG 0 id + ARG 1 affectsOutline METHOD lambda$static$12 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; ARG 0 id METHOD lambda$static$13 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; ARG 0 id METHOD lambda$static$14 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; ARG 0 id - METHOD lambda$static$16 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; + METHOD lambda$static$15 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; ARG 0 id + METHOD lambda$static$16 (Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/client/renderer/RenderStateShard$TransparencyStateShard;)Lnet/minecraft/client/renderer/RenderType; + ARG 0 id + ARG 1 transparencyState METHOD lambda$static$17 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; ARG 0 id METHOD lambda$static$18 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; @@ -122,26 +136,38 @@ CLASS net/minecraft/client/renderer/RenderType ARG 0 id METHOD lambda$static$22 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; ARG 0 id - METHOD lambda$static$23 (Ljava/lang/Double;)Lnet/minecraft/client/renderer/RenderType$CompositeRenderType; + METHOD lambda$static$23 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; + ARG 0 id + METHOD lambda$static$24 (Ljava/lang/Double;)Lnet/minecraft/client/renderer/RenderType$CompositeRenderType; ARG 0 width - METHOD lambda$static$3 (Lnet/minecraft/resources/ResourceLocation;Ljava/lang/Boolean;)Lnet/minecraft/client/renderer/RenderType; + METHOD lambda$static$25 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; + ARG 0 texture + METHOD lambda$static$26 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; + ARG 0 texture + METHOD lambda$static$27 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; + ARG 0 texture + METHOD lambda$static$28 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; + ARG 0 texture + METHOD lambda$static$29 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; + ARG 0 texture + METHOD lambda$static$3 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; + ARG 0 id + METHOD lambda$static$4 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; + ARG 0 id + METHOD lambda$static$5 (Lnet/minecraft/resources/ResourceLocation;Ljava/lang/Boolean;)Lnet/minecraft/client/renderer/RenderType; ARG 0 id ARG 1 affectsOutline - METHOD lambda$static$4 (Lnet/minecraft/resources/ResourceLocation;Ljava/lang/Boolean;)Lnet/minecraft/client/renderer/RenderType; + METHOD lambda$static$6 (Lnet/minecraft/resources/ResourceLocation;Ljava/lang/Boolean;)Lnet/minecraft/client/renderer/RenderType; ARG 0 id ARG 1 affectsOutline - METHOD lambda$static$5 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; - ARG 0 id - METHOD lambda$static$6 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; - ARG 0 id - METHOD lambda$static$7 (Lnet/minecraft/resources/ResourceLocation;Ljava/lang/Boolean;)Lnet/minecraft/client/renderer/RenderType; + METHOD lambda$static$7 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; ARG 0 id - ARG 1 affectsOutline METHOD lambda$static$8 (Lnet/minecraft/resources/ResourceLocation;Ljava/lang/Boolean;)Lnet/minecraft/client/renderer/RenderType; ARG 0 id - ARG 1 effectsOutline - METHOD lambda$static$9 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; + ARG 1 affectsOutline + METHOD lambda$static$9 (Lnet/minecraft/resources/ResourceLocation;Ljava/lang/Boolean;)Lnet/minecraft/client/renderer/RenderType; ARG 0 id + ARG 1 affectsOutline METHOD outline (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; ARG 0 location METHOD text (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; @@ -158,6 +184,8 @@ CLASS net/minecraft/client/renderer/RenderType ARG 0 location METHOD translucentState (Lnet/minecraft/client/renderer/RenderStateShard$ShaderStateShard;)Lnet/minecraft/client/renderer/RenderType$CompositeState; ARG 0 state + METHOD vignette (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; + ARG 0 location CLASS CompositeState METHOD (Lnet/minecraft/client/renderer/RenderStateShard$EmptyTextureStateShard;Lnet/minecraft/client/renderer/RenderStateShard$ShaderStateShard;Lnet/minecraft/client/renderer/RenderStateShard$TransparencyStateShard;Lnet/minecraft/client/renderer/RenderStateShard$DepthTestStateShard;Lnet/minecraft/client/renderer/RenderStateShard$CullStateShard;Lnet/minecraft/client/renderer/RenderStateShard$LightmapStateShard;Lnet/minecraft/client/renderer/RenderStateShard$OverlayStateShard;Lnet/minecraft/client/renderer/RenderStateShard$LayeringStateShard;Lnet/minecraft/client/renderer/RenderStateShard$OutputStateShard;Lnet/minecraft/client/renderer/RenderStateShard$TexturingStateShard;Lnet/minecraft/client/renderer/RenderStateShard$WriteMaskStateShard;Lnet/minecraft/client/renderer/RenderStateShard$LineStateShard;Lnet/minecraft/client/renderer/RenderStateShard$ColorLogicStateShard;Lnet/minecraft/client/renderer/RenderType$OutlineProperty;)V ARG 1 textureState diff --git a/data/net/minecraft/client/renderer/SectionOcclusionGraph.mapping b/data/net/minecraft/client/renderer/SectionOcclusionGraph.mapping index 4b85964fc..5bd5bff30 100644 --- a/data/net/minecraft/client/renderer/SectionOcclusionGraph.mapping +++ b/data/net/minecraft/client/renderer/SectionOcclusionGraph.mapping @@ -2,55 +2,57 @@ CLASS net/minecraft/client/renderer/SectionOcclusionGraph METHOD addNeighbors (Lnet/minecraft/client/renderer/SectionOcclusionGraph$GraphEvents;Lnet/minecraft/world/level/ChunkPos;)V ARG 1 graphEvents ARG 2 chunkPos - METHOD addSectionsInFrustum (Lnet/minecraft/client/renderer/culling/Frustum;Ljava/util/List;)V + METHOD addSectionsInFrustum (Lnet/minecraft/client/renderer/culling/Frustum;Ljava/util/List;Ljava/util/List;)V ARG 1 frustum - ARG 2 sections + ARG 2 visibleSections + ARG 3 nearbyVisibleSections METHOD getNode (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection;)Lnet/minecraft/client/renderer/SectionOcclusionGraph$Node; ARG 1 section - METHOD getRelativeFrom (Lnet/minecraft/core/BlockPos;Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection;Lnet/minecraft/core/Direction;)Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection; - ARG 1 pos - ARG 2 section - ARG 3 direction + METHOD getRelativeFrom (JLnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection;Lnet/minecraft/core/Direction;)Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection; + ARG 1 sectionPos + ARG 3 section + ARG 4 direction METHOD initializeQueueForFullUpdate (Lnet/minecraft/client/Camera;Ljava/util/Queue;)V ARG 1 camera ARG 2 nodeQueue - METHOD isInViewDistance (Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Z - ARG 1 pos - ARG 2 origin - METHOD lambda$initializeQueueForFullUpdate$4 (Lnet/minecraft/core/BlockPos;Lnet/minecraft/client/renderer/SectionOcclusionGraph$Node;)D - ARG 1 node - METHOD lambda$runPartialUpdate$3 (Lnet/minecraft/client/renderer/culling/Frustum;Ljava/util/List;Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection;)V - ARG 2 renderSection - METHOD lambda$scheduleFullUpdate$0 (Lnet/minecraft/client/renderer/SectionOcclusionGraph$GraphState;Lnet/minecraft/client/renderer/SectionOcclusionGraph$Node;)V - ARG 1 node - METHOD lambda$scheduleFullUpdate$1 (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection;)V - ARG 0 renderSection + METHOD isInViewDistance (JJ)Z + ARG 1 centerPos + ARG 3 pos + METHOD lambda$addSectionsInFrustum$0 (Ljava/util/List;Ljava/util/List;Lnet/minecraft/client/renderer/Octree$Node;ZIZ)V + ARG 2 node + ARG 3 isLeafNode + ARG 4 recursionDepth + ARG 5 isNearby METHOD onChunkLoaded (Lnet/minecraft/world/level/ChunkPos;)V ARG 1 chunkPos - METHOD onSectionCompiled (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection;)V - ARG 1 section METHOD queueSectionsWithNewNeighbors (Lnet/minecraft/client/renderer/SectionOcclusionGraph$GraphState;)V ARG 1 graphState - METHOD runPartialUpdate (ZLnet/minecraft/client/renderer/culling/Frustum;Ljava/util/List;Lnet/minecraft/world/phys/Vec3;)V + METHOD runPartialUpdate (ZLnet/minecraft/client/renderer/culling/Frustum;Ljava/util/List;Lnet/minecraft/world/phys/Vec3;Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;)V ARG 1 smartCull ARG 2 frustum - ARG 3 sections + ARG 3 visibleSections ARG 4 cameraPosition - METHOD runUpdates (Lnet/minecraft/client/renderer/SectionOcclusionGraph$GraphStorage;Lnet/minecraft/world/phys/Vec3;Ljava/util/Queue;ZLjava/util/function/Consumer;)V - ARG 1 graphStorage + ARG 5 loadedEmptySections + METHOD runUpdates (Lnet/minecraft/client/renderer/SectionOcclusionGraph$GraphStorage;Lnet/minecraft/world/phys/Vec3;Ljava/util/Queue;ZLjava/util/function/Consumer;Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;)V + ARG 1 storage ARG 2 cameraPosition - ARG 3 nodeQueue + ARG 3 queue ARG 4 smartCull - ARG 5 sections - METHOD scheduleFullUpdate (ZLnet/minecraft/client/Camera;Lnet/minecraft/world/phys/Vec3;)V + ARG 5 visibleSectionConsumer + ARG 6 loadedEmptySection + METHOD scheduleFullUpdate (ZLnet/minecraft/client/Camera;Lnet/minecraft/world/phys/Vec3;Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;)V ARG 1 smartCull ARG 2 camera ARG 3 cameraPosition - METHOD update (ZLnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/culling/Frustum;Ljava/util/List;)V + ARG 4 loadedEmptySections + METHOD schedulePropagationFrom (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection;)V + ARG 1 section + METHOD update (ZLnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/culling/Frustum;Ljava/util/List;Lit/unimi/dsi/fastutil/longs/LongOpenHashSet;)V ARG 1 smartCull ARG 2 camera ARG 3 frustum - ARG 4 sections + ARG 4 visibleSections + ARG 5 loadedEmptySections METHOD waitAndReset (Lnet/minecraft/client/renderer/ViewArea;)V ARG 1 viewArea CLASS Node @@ -70,11 +72,11 @@ CLASS net/minecraft/client/renderer/SectionOcclusionGraph ARG 1 currentValue ARG 2 direction CLASS GraphState - METHOD (I)V - ARG 1 size + METHOD (Lnet/minecraft/client/renderer/ViewArea;)V + ARG 1 viewArea CLASS GraphStorage - METHOD (I)V - ARG 1 size + METHOD (Lnet/minecraft/client/renderer/ViewArea;)V + ARG 1 viewArea CLASS SectionToNodeMap METHOD (I)V ARG 1 size diff --git a/data/net/minecraft/client/renderer/ShaderDefines.mapping b/data/net/minecraft/client/renderer/ShaderDefines.mapping new file mode 100644 index 000000000..5d3313044 --- /dev/null +++ b/data/net/minecraft/client/renderer/ShaderDefines.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/client/renderer/ShaderDefines + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD withOverrides (Lnet/minecraft/client/renderer/ShaderDefines;)Lnet/minecraft/client/renderer/ShaderDefines; + ARG 1 defines + CLASS Builder + METHOD define (Ljava/lang/String;)Lnet/minecraft/client/renderer/ShaderDefines$Builder; + ARG 1 flag + METHOD define (Ljava/lang/String;F)Lnet/minecraft/client/renderer/ShaderDefines$Builder; + ARG 1 key + ARG 2 value + METHOD define (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/client/renderer/ShaderDefines$Builder; + ARG 1 key + ARG 2 value + METHOD escapeNewLines (Ljava/lang/String;)Ljava/lang/String; + ARG 0 str diff --git a/data/net/minecraft/client/renderer/ShaderInstance.mapping b/data/net/minecraft/client/renderer/ShaderInstance.mapping deleted file mode 100644 index 7cc53e4ad..000000000 --- a/data/net/minecraft/client/renderer/ShaderInstance.mapping +++ /dev/null @@ -1,25 +0,0 @@ -CLASS net/minecraft/client/renderer/ShaderInstance - METHOD (Lnet/minecraft/server/packs/resources/ResourceProvider;Ljava/lang/String;Lcom/mojang/blaze3d/vertex/VertexFormat;)V - ARG 1 resourceProvider - ARG 2 name - ARG 3 vertexFormat - METHOD getOrCreate (Lnet/minecraft/server/packs/resources/ResourceProvider;Lcom/mojang/blaze3d/shaders/Program$Type;Ljava/lang/String;)Lcom/mojang/blaze3d/shaders/Program; - ARG 0 resourceProvider - ARG 1 programType - ARG 2 name - METHOD getUniform (Ljava/lang/String;)Lcom/mojang/blaze3d/shaders/Uniform; - ARG 1 name - METHOD parseSamplerNode (Lcom/google/gson/JsonElement;)V - ARG 1 json - METHOD parseUniformNode (Lcom/google/gson/JsonElement;)V - ARG 1 json - METHOD safeGetUniform (Ljava/lang/String;)Lcom/mojang/blaze3d/shaders/AbstractUniform; - ARG 1 name - METHOD setDefaultUniforms (Lcom/mojang/blaze3d/vertex/VertexFormat$Mode;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lcom/mojang/blaze3d/platform/Window;)V - ARG 1 mode - ARG 2 frustumMatrix - ARG 3 projectionMatrix - ARG 4 window - METHOD setSampler (Ljava/lang/String;Ljava/lang/Object;)V - ARG 1 name - ARG 2 textureId diff --git a/data/net/minecraft/client/renderer/ShaderManager.mapping b/data/net/minecraft/client/renderer/ShaderManager.mapping new file mode 100644 index 000000000..c30322142 --- /dev/null +++ b/data/net/minecraft/client/renderer/ShaderManager.mapping @@ -0,0 +1,69 @@ +CLASS net/minecraft/client/renderer/ShaderManager + METHOD (Lnet/minecraft/client/renderer/texture/TextureManager;Ljava/util/function/Consumer;)V + ARG 1 textureManager + ARG 2 recoveryHandler + METHOD createPreprocessor (Ljava/util/Map;Lnet/minecraft/resources/ResourceLocation;)Lcom/mojang/blaze3d/preprocessor/GlslPreprocessor; + ARG 0 shaderResources + ARG 1 shaderLocation + METHOD getPostChain (Lnet/minecraft/resources/ResourceLocation;Ljava/util/Set;)Lnet/minecraft/client/renderer/PostChain; + ARG 1 id + ARG 2 externalTargets + METHOD getProgram (Lnet/minecraft/client/renderer/ShaderProgram;)Lnet/minecraft/client/renderer/CompiledShaderProgram; + ARG 1 program + METHOD getProgramForLoading (Lnet/minecraft/client/renderer/ShaderProgram;)Lnet/minecraft/client/renderer/CompiledShaderProgram; + ARG 1 program + METHOD isProgram (Lnet/minecraft/resources/ResourceLocation;)Z + ARG 0 location + METHOD isShader (Lnet/minecraft/resources/ResourceLocation;)Z + ARG 0 location + METHOD linkProgram (Lnet/minecraft/client/renderer/ShaderProgram;Lnet/minecraft/client/renderer/ShaderProgramConfig;Lcom/mojang/blaze3d/shaders/CompiledShader;Lcom/mojang/blaze3d/shaders/CompiledShader;)Lnet/minecraft/client/renderer/CompiledShaderProgram; + ARG 0 program + ARG 1 config + ARG 2 vertexShader + ARG 3 fragmentShader + METHOD loadPostChain (Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/server/packs/resources/Resource;Lcom/google/common/collect/ImmutableMap$Builder;)V + ARG 0 location + ARG 1 postChain + ARG 2 output + METHOD loadProgram (Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/server/packs/resources/Resource;Lcom/google/common/collect/ImmutableMap$Builder;)V + ARG 0 location + ARG 1 resource + ARG 2 output + METHOD loadShader (Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/server/packs/resources/Resource;Lcom/mojang/blaze3d/shaders/CompiledShader$Type;Ljava/util/Map;Lcom/google/common/collect/ImmutableMap$Builder;)V + ARG 0 location + ARG 1 shader + ARG 2 type + ARG 3 shaderResources + ARG 4 output + METHOD preloadForStartup (Lnet/minecraft/server/packs/resources/ResourceProvider;[Lnet/minecraft/client/renderer/ShaderProgram;)V + ARG 1 resourceProvider + ARG 2 programs + METHOD preloadShader (Lnet/minecraft/server/packs/resources/ResourceProvider;Lnet/minecraft/resources/ResourceLocation;Lcom/mojang/blaze3d/shaders/CompiledShader$Type;Lnet/minecraft/client/renderer/ShaderDefines;)Lcom/mojang/blaze3d/shaders/CompiledShader; + ARG 1 resourceProvider + ARG 2 shader + ARG 3 type + ARG 4 defines + CLASS CompilationCache + METHOD (Lnet/minecraft/client/renderer/ShaderManager;Lnet/minecraft/client/renderer/ShaderManager$Configs;)V + ARG 2 configs + METHOD compileProgram (Lnet/minecraft/client/renderer/ShaderProgram;)Lnet/minecraft/client/renderer/CompiledShaderProgram; + ARG 1 program + METHOD compileShader (Lnet/minecraft/client/renderer/ShaderManager$ShaderCompilationKey;)Lcom/mojang/blaze3d/shaders/CompiledShader; + ARG 1 compilationKey + METHOD getOrCompileProgram (Lnet/minecraft/client/renderer/ShaderProgram;)Lnet/minecraft/client/renderer/CompiledShaderProgram; + ARG 1 program + METHOD getOrCompileShader (Lnet/minecraft/resources/ResourceLocation;Lcom/mojang/blaze3d/shaders/CompiledShader$Type;Lnet/minecraft/client/renderer/ShaderDefines;)Lcom/mojang/blaze3d/shaders/CompiledShader; + ARG 1 id + ARG 2 type + ARG 3 defines + METHOD getOrLoadPostChain (Lnet/minecraft/resources/ResourceLocation;Ljava/util/Set;)Lnet/minecraft/client/renderer/PostChain; + ARG 1 name + ARG 2 externalTargets + METHOD lambda$close$0 (Ljava/util/Optional;)V + ARG 0 program + METHOD loadPostChain (Lnet/minecraft/resources/ResourceLocation;Ljava/util/Set;)Lnet/minecraft/client/renderer/PostChain; + ARG 1 name + ARG 2 externalTargets + CLASS CompilationException + METHOD (Ljava/lang/String;)V + ARG 1 message diff --git a/data/net/minecraft/client/renderer/ShaderProgramConfig.mapping b/data/net/minecraft/client/renderer/ShaderProgramConfig.mapping new file mode 100644 index 000000000..c4c4b6770 --- /dev/null +++ b/data/net/minecraft/client/renderer/ShaderProgramConfig.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/client/renderer/ShaderProgramConfig + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS Sampler + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS Uniform + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD validate (Lnet/minecraft/client/renderer/ShaderProgramConfig$Uniform;)Lcom/mojang/serialization/DataResult; + ARG 0 uniform diff --git a/data/net/minecraft/client/renderer/ShapeRenderer.mapping b/data/net/minecraft/client/renderer/ShapeRenderer.mapping new file mode 100644 index 000000000..f1f780b49 --- /dev/null +++ b/data/net/minecraft/client/renderer/ShapeRenderer.mapping @@ -0,0 +1,92 @@ +CLASS net/minecraft/client/renderer/ShapeRenderer + METHOD addChainedFilledBoxVertices (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;DDDDDDFFFF)V + ARG 0 poseStack + ARG 1 buffer + ARG 2 minX + ARG 4 minY + ARG 6 minZ + ARG 8 maxX + ARG 10 maxY + ARG 12 maxZ + ARG 14 red + ARG 15 green + ARG 16 blue + ARG 17 alpha + METHOD addChainedFilledBoxVertices (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;FFFFFFFFFF)V + ARG 0 poseStack + ARG 1 buffer + ARG 2 minX + ARG 3 minY + ARG 4 minZ + ARG 5 maxX + ARG 6 maxY + ARG 7 maxZ + ARG 8 red + ARG 9 green + ARG 10 blue + ARG 11 alpha + METHOD renderFace (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/core/Direction;FFFFFFFFFF)V + ARG 0 poseStack + ARG 1 buffer + ARG 2 face + ARG 3 x1 + ARG 4 y1 + ARG 5 z1 + ARG 6 x2 + ARG 7 y2 + ARG 8 z2 + ARG 9 red + ARG 10 green + ARG 11 blue + ARG 12 alpha + METHOD renderLineBox (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;DDDDDDFFFF)V + ARG 0 poseStack + ARG 1 buffer + ARG 2 minX + ARG 4 minY + ARG 6 minZ + ARG 8 maxX + ARG 10 maxY + ARG 12 maxZ + ARG 14 red + ARG 15 green + ARG 16 blue + ARG 17 alpha + METHOD renderLineBox (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;DDDDDDFFFFFFF)V + ARG 0 poseStack + ARG 1 buffer + ARG 2 minX + ARG 4 minY + ARG 6 minZ + ARG 8 maxX + ARG 10 maxY + ARG 12 maxZ + ARG 14 red + ARG 15 green + ARG 16 blue + ARG 17 alpha + ARG 18 red2 + ARG 19 green2 + ARG 20 blue2 + METHOD renderLineBox (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/world/phys/AABB;FFFF)V + ARG 0 poseStack + ARG 1 buffer + ARG 2 box + ARG 3 red + ARG 4 green + ARG 5 blue + ARG 6 alpha + METHOD renderShape (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/world/phys/shapes/VoxelShape;DDDI)V + ARG 0 poseStack + ARG 1 buffer + ARG 2 shape + ARG 3 x + ARG 5 y + ARG 7 z + ARG 9 color + METHOD renderVector (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lorg/joml/Vector3f;Lnet/minecraft/world/phys/Vec3;I)V + ARG 0 poseStack + ARG 1 buffer + ARG 2 startPos + ARG 3 vector + ARG 4 color diff --git a/data/net/minecraft/client/renderer/SkyRenderer.mapping b/data/net/minecraft/client/renderer/SkyRenderer.mapping new file mode 100644 index 000000000..0b39f3a09 --- /dev/null +++ b/data/net/minecraft/client/renderer/SkyRenderer.mapping @@ -0,0 +1,40 @@ +CLASS net/minecraft/client/renderer/SkyRenderer + METHOD buildSkyDisc (Lcom/mojang/blaze3d/vertex/Tesselator;F)Lcom/mojang/blaze3d/vertex/MeshData; + ARG 1 tesselator + ARG 2 y + METHOD drawStars (Lcom/mojang/blaze3d/vertex/Tesselator;)Lcom/mojang/blaze3d/vertex/MeshData; + ARG 1 tesselator + METHOD renderDarkDisc (Lcom/mojang/blaze3d/vertex/PoseStack;)V + ARG 1 poseStack + METHOD renderEndSky (Lcom/mojang/blaze3d/vertex/PoseStack;)V + ARG 1 poseStack + METHOD renderMoon (IFLcom/mojang/blaze3d/vertex/Tesselator;Lcom/mojang/blaze3d/vertex/PoseStack;)V + ARG 1 phase + ARG 2 alpha + ARG 3 tesselator + ARG 4 poseStack + METHOD renderSkyDisc (FFF)V + ARG 1 red + ARG 2 green + ARG 3 blue + METHOD renderStars (Lnet/minecraft/client/renderer/FogParameters;FLcom/mojang/blaze3d/vertex/PoseStack;)V + ARG 1 fog + ARG 2 starBrightness + ARG 3 poseStack + METHOD renderSun (FLcom/mojang/blaze3d/vertex/Tesselator;Lcom/mojang/blaze3d/vertex/PoseStack;)V + ARG 1 alpha + ARG 2 tesselator + ARG 3 poseStack + METHOD renderSunMoonAndStars (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/Tesselator;FIFFLnet/minecraft/client/renderer/FogParameters;)V + ARG 1 poseStack + ARG 2 tesselator + ARG 3 timeOfDay + ARG 4 moonPhase + ARG 5 rainLevel + ARG 6 starBrightness + ARG 7 fog + METHOD renderSunriseAndSunset (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/Tesselator;FI)V + ARG 1 poseStack + ARG 2 tesselator + ARG 3 sunAngle + ARG 4 color diff --git a/data/net/minecraft/client/renderer/ViewArea.mapping b/data/net/minecraft/client/renderer/ViewArea.mapping index a66e2ab43..aa57a9e2e 100644 --- a/data/net/minecraft/client/renderer/ViewArea.mapping +++ b/data/net/minecraft/client/renderer/ViewArea.mapping @@ -4,17 +4,26 @@ CLASS net/minecraft/client/renderer/ViewArea ARG 2 level ARG 3 viewDistance ARG 4 levelRenderer + METHOD containsSection (III)Z + ARG 1 x + ARG 2 y + ARG 3 z METHOD createSections (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher;)V ARG 1 sectionRenderDispatcher + METHOD getRenderSection (III)Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection; + ARG 1 x + ARG 2 y + ARG 3 z + METHOD getRenderSection (J)Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection; + ARG 1 sectionPos METHOD getRenderSectionAt (Lnet/minecraft/core/BlockPos;)Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection; ARG 1 pos METHOD getSectionIndex (III)I ARG 1 x ARG 2 y ARG 3 z - METHOD repositionCamera (DD)V - ARG 1 viewEntityX - ARG 3 viewEntityZ + METHOD repositionCamera (Lnet/minecraft/core/SectionPos;)V + ARG 1 newSectionPos METHOD setDirty (IIIZ)V ARG 1 sectionX ARG 2 sectionY diff --git a/data/net/minecraft/client/renderer/WeatherEffectRenderer.mapping b/data/net/minecraft/client/renderer/WeatherEffectRenderer.mapping new file mode 100644 index 000000000..2d6edc091 --- /dev/null +++ b/data/net/minecraft/client/renderer/WeatherEffectRenderer.mapping @@ -0,0 +1,55 @@ +CLASS net/minecraft/client/renderer/WeatherEffectRenderer + METHOD collectColumnInstances (Lnet/minecraft/world/level/Level;IFLnet/minecraft/world/phys/Vec3;ILjava/util/List;Ljava/util/List;)V + ARG 1 level + ARG 2 ticks + ARG 3 partialTick + ARG 4 cameraPosition + ARG 5 radius + ARG 6 rainColumnInstances + ARG 7 snowColumnInstances + METHOD createRainColumnInstance (Lnet/minecraft/util/RandomSource;IIIIIIF)Lnet/minecraft/client/renderer/WeatherEffectRenderer$ColumnInstance; + ARG 1 random + ARG 2 ticks + ARG 3 x + ARG 4 bottomY + ARG 5 topY + ARG 6 z + ARG 7 lightCoords + ARG 8 partialTick + METHOD createSnowColumnInstance (Lnet/minecraft/util/RandomSource;IIIIIIF)Lnet/minecraft/client/renderer/WeatherEffectRenderer$ColumnInstance; + ARG 1 random + ARG 2 ticks + ARG 3 x + ARG 4 bottomY + ARG 5 topY + ARG 6 z + ARG 7 lightCoords + ARG 8 partialTick + METHOD getPrecipitationAt (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/biome/Biome$Precipitation; + ARG 1 level + ARG 2 pos + METHOD render (Lnet/minecraft/client/renderer/LightTexture;Lnet/minecraft/world/phys/Vec3;IFLjava/util/List;Ljava/util/List;)V + ARG 1 lightTexture + ARG 2 cameraPosition + ARG 3 radius + ARG 4 rainLevel + ARG 5 rainColumnInstances + ARG 6 snowCoiumnInstances + METHOD render (Lnet/minecraft/world/level/Level;Lnet/minecraft/client/renderer/LightTexture;IFLnet/minecraft/world/phys/Vec3;)V + ARG 1 level + ARG 2 lightTexture + ARG 3 ticks + ARG 4 partialTick + ARG 5 cameraPosition + METHOD renderInstances (Lcom/mojang/blaze3d/vertex/Tesselator;Ljava/util/List;Lnet/minecraft/world/phys/Vec3;FIF)V + ARG 1 tesselator + ARG 2 instances + ARG 3 cameraPosition + ARG 4 amount + ARG 5 radius + ARG 6 rainLevel + METHOD tickRainParticles (Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/client/Camera;ILnet/minecraft/server/level/ParticleStatus;)V + ARG 1 level + ARG 2 camera + ARG 3 ticks + ARG 4 particleStatus diff --git a/data/net/minecraft/client/renderer/WorldBorderRenderer.mapping b/data/net/minecraft/client/renderer/WorldBorderRenderer.mapping new file mode 100644 index 000000000..feeecc4fb --- /dev/null +++ b/data/net/minecraft/client/renderer/WorldBorderRenderer.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/client/renderer/WorldBorderRenderer + METHOD render (Lnet/minecraft/world/level/border/WorldBorder;Lnet/minecraft/world/phys/Vec3;DD)V + ARG 1 worldBorder + ARG 2 cameraPosition + ARG 3 renderDistance + ARG 5 farPlaneDepth diff --git a/data/net/minecraft/client/renderer/block/LiquidBlockRenderer.mapping b/data/net/minecraft/client/renderer/block/LiquidBlockRenderer.mapping index 720d1e111..bf4cae7a1 100644 --- a/data/net/minecraft/client/renderer/block/LiquidBlockRenderer.mapping +++ b/data/net/minecraft/client/renderer/block/LiquidBlockRenderer.mapping @@ -22,33 +22,25 @@ CLASS net/minecraft/client/renderer/block/LiquidBlockRenderer METHOD getLightColor (Lnet/minecraft/world/level/BlockAndTintGetter;Lnet/minecraft/core/BlockPos;)I ARG 1 level ARG 2 pos - METHOD isFaceOccludedByNeighbor (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction;FLnet/minecraft/world/level/block/state/BlockState;)Z - ARG 0 level - ARG 1 pos - ARG 2 side - ARG 3 height - ARG 4 blockState - METHOD isFaceOccludedBySelf (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;)Z - ARG 0 level - ARG 1 pos + METHOD isFaceOccludedByNeighbor (Lnet/minecraft/core/Direction;FLnet/minecraft/world/level/block/state/BlockState;)Z + ARG 0 face + ARG 1 height ARG 2 state - ARG 3 face - METHOD isFaceOccludedByState (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/Direction;FLnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Z - ARG 0 level + METHOD isFaceOccludedBySelf (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;)Z + ARG 0 state ARG 1 face - ARG 2 height - ARG 3 pos - ARG 4 state + METHOD isFaceOccludedByState (Lnet/minecraft/core/Direction;FLnet/minecraft/world/level/block/state/BlockState;)Z + ARG 0 face + ARG 1 height + ARG 2 state METHOD isNeighborSameFluid (Lnet/minecraft/world/level/material/FluidState;Lnet/minecraft/world/level/material/FluidState;)Z ARG 0 firstState ARG 1 secondState - METHOD shouldRenderFace (Lnet/minecraft/world/level/BlockAndTintGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/material/FluidState;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/material/FluidState;)Z - ARG 0 level - ARG 1 pos - ARG 2 fluidState - ARG 3 blockState - ARG 4 side - ARG 5 neighborFluid + METHOD shouldRenderFace (Lnet/minecraft/world/level/material/FluidState;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/material/FluidState;)Z + ARG 0 fluidState + ARG 1 blockState + ARG 2 side + ARG 3 neighborFluid METHOD tesselate (Lnet/minecraft/world/level/BlockAndTintGetter;Lnet/minecraft/core/BlockPos;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/material/FluidState;)V ARG 1 level ARG 2 pos diff --git a/data/net/minecraft/client/renderer/block/model/BakedOverrides.mapping b/data/net/minecraft/client/renderer/block/model/BakedOverrides.mapping new file mode 100644 index 000000000..37b0e6459 --- /dev/null +++ b/data/net/minecraft/client/renderer/block/model/BakedOverrides.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/client/renderer/block/model/BakedOverrides + METHOD (Lnet/minecraft/client/resources/model/ModelBaker;Ljava/util/List;)V + ARG 1 baker + ARG 2 overrides + METHOD findOverride (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/world/entity/LivingEntity;I)Lnet/minecraft/client/resources/model/BakedModel; + ARG 1 stack + ARG 2 level + ARG 3 entity + ARG 4 seed + CLASS BakedOverride + METHOD test ([F)Z + ARG 1 values diff --git a/data/net/minecraft/client/renderer/block/model/BakedQuad.mapping b/data/net/minecraft/client/renderer/block/model/BakedQuad.mapping index 02f91516d..2fd349e32 100644 --- a/data/net/minecraft/client/renderer/block/model/BakedQuad.mapping +++ b/data/net/minecraft/client/renderer/block/model/BakedQuad.mapping @@ -1,9 +1,10 @@ CLASS net/minecraft/client/renderer/block/model/BakedQuad FIELD vertices [I COMMENT Joined 4 vertex records, each stores packed data according to the VertexFormat of the quad. Vanilla minecraft uses DefaultVertexFormats.BLOCK, Forge uses (usually) ITEM, use BakedQuad.getFormat() to get the correct format. - METHOD ([IILnet/minecraft/core/Direction;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;Z)V - ARG 1 vertices + METHOD ([IILnet/minecraft/core/Direction;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;ZI)V + ARG 1 verticies ARG 2 tintIndex ARG 3 direction ARG 4 sprite ARG 5 shade + ARG 6 lightEmission diff --git a/data/net/minecraft/client/renderer/block/model/BlockElement.mapping b/data/net/minecraft/client/renderer/block/model/BlockElement.mapping index c66ed5f9d..773689d7b 100644 --- a/data/net/minecraft/client/renderer/block/model/BlockElement.mapping +++ b/data/net/minecraft/client/renderer/block/model/BlockElement.mapping @@ -1,10 +1,15 @@ CLASS net/minecraft/client/renderer/block/model/BlockElement - METHOD (Lorg/joml/Vector3f;Lorg/joml/Vector3f;Ljava/util/Map;Lnet/minecraft/client/renderer/block/model/BlockElementRotation;Z)V + METHOD (Lorg/joml/Vector3f;Lorg/joml/Vector3f;Ljava/util/Map;)V + ARG 1 from + ARG 2 to + ARG 3 faces + METHOD (Lorg/joml/Vector3f;Lorg/joml/Vector3f;Ljava/util/Map;Lnet/minecraft/client/renderer/block/model/BlockElementRotation;ZI)V ARG 1 from ARG 2 to ARG 3 faces ARG 4 rotation ARG 5 shade + ARG 6 lightEmission METHOD uvsByFace (Lnet/minecraft/core/Direction;)[F ARG 1 face CLASS Deserializer diff --git a/data/net/minecraft/client/renderer/block/model/BlockModel.mapping b/data/net/minecraft/client/renderer/block/model/BlockModel.mapping index bcd40d2df..ff4d96169 100644 --- a/data/net/minecraft/client/renderer/block/model/BlockModel.mapping +++ b/data/net/minecraft/client/renderer/block/model/BlockModel.mapping @@ -7,12 +7,10 @@ CLASS net/minecraft/client/renderer/block/model/BlockModel ARG 5 guiLight ARG 6 transforms ARG 7 overrides - METHOD bake (Lnet/minecraft/client/resources/model/ModelBaker;Lnet/minecraft/client/renderer/block/model/BlockModel;Ljava/util/function/Function;Lnet/minecraft/client/resources/model/ModelState;Z)Lnet/minecraft/client/resources/model/BakedModel; - ARG 1 baker - ARG 2 model - ARG 3 spriteGetter - ARG 4 state - ARG 5 guiLight3d + METHOD bake (Ljava/util/function/Function;Lnet/minecraft/client/resources/model/ModelState;Z)Lnet/minecraft/client/resources/model/BakedModel; + ARG 1 spriteGetter + ARG 2 state + ARG 3 isGui3d METHOD bakeFace (Lnet/minecraft/client/renderer/block/model/BlockElement;Lnet/minecraft/client/renderer/block/model/BlockElementFace;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/core/Direction;Lnet/minecraft/client/resources/model/ModelState;)Lnet/minecraft/client/renderer/block/model/BakedQuad; ARG 0 element ARG 1 face @@ -23,11 +21,6 @@ CLASS net/minecraft/client/renderer/block/model/BlockModel ARG 1 name METHOD fromStream (Ljava/io/Reader;)Lnet/minecraft/client/renderer/block/model/BlockModel; ARG 0 reader - METHOD fromString (Ljava/lang/String;)Lnet/minecraft/client/renderer/block/model/BlockModel; - ARG 0 jsonString - METHOD getItemOverrides (Lnet/minecraft/client/resources/model/ModelBaker;Lnet/minecraft/client/renderer/block/model/BlockModel;)Lnet/minecraft/client/renderer/block/model/ItemOverrides; - ARG 1 baker - ARG 2 model METHOD getMaterial (Ljava/lang/String;)Lnet/minecraft/client/resources/model/Material; ARG 1 name METHOD getTransform (Lnet/minecraft/world/item/ItemDisplayContext;)Lnet/minecraft/client/renderer/block/model/ItemTransform; @@ -36,8 +29,6 @@ CLASS net/minecraft/client/renderer/block/model/BlockModel ARG 1 textureName METHOD isTextureReference (Ljava/lang/String;)Z ARG 0 str - METHOD lambda$resolveParents$0 (Ljava/util/function/Function;Lnet/minecraft/client/renderer/block/model/ItemOverride;)V - ARG 2 override CLASS GuiLight METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name @@ -63,6 +54,3 @@ CLASS net/minecraft/client/renderer/block/model/BlockModel METHOD parseTextureLocationOrReference (Lnet/minecraft/resources/ResourceLocation;Ljava/lang/String;)Lcom/mojang/datafixers/util/Either; ARG 0 location ARG 1 name - CLASS LoopException - METHOD (Ljava/lang/String;)V - ARG 1 message diff --git a/data/net/minecraft/client/renderer/block/model/BlockModelDefinition.mapping b/data/net/minecraft/client/renderer/block/model/BlockModelDefinition.mapping index 4c7f26633..348a32fad 100644 --- a/data/net/minecraft/client/renderer/block/model/BlockModelDefinition.mapping +++ b/data/net/minecraft/client/renderer/block/model/BlockModelDefinition.mapping @@ -1,30 +1,24 @@ CLASS net/minecraft/client/renderer/block/model/BlockModelDefinition - METHOD (Ljava/util/List;)V - ARG 1 modelDefinitions - METHOD (Ljava/util/Map;Lnet/minecraft/client/renderer/block/model/multipart/MultiPart;)V + METHOD (Ljava/util/Map;Lnet/minecraft/client/renderer/block/model/multipart/MultiPart$Definition;)V ARG 1 variants ARG 2 multiPart METHOD equals (Ljava/lang/Object;)Z ARG 1 other - METHOD fromJsonElement (Lnet/minecraft/client/renderer/block/model/BlockModelDefinition$Context;Lcom/google/gson/JsonElement;)Lnet/minecraft/client/renderer/block/model/BlockModelDefinition; - ARG 0 context - ARG 1 json - METHOD fromStream (Lnet/minecraft/client/renderer/block/model/BlockModelDefinition$Context;Ljava/io/Reader;)Lnet/minecraft/client/renderer/block/model/BlockModelDefinition; - ARG 0 context - ARG 1 reader + METHOD fromJsonElement (Lcom/google/gson/JsonElement;)Lnet/minecraft/client/renderer/block/model/BlockModelDefinition; + ARG 0 json + METHOD fromStream (Ljava/io/Reader;)Lnet/minecraft/client/renderer/block/model/BlockModelDefinition; + ARG 0 reader METHOD getVariant (Ljava/lang/String;)Lnet/minecraft/client/renderer/block/model/MultiVariant; ARG 1 key - METHOD hasVariant (Ljava/lang/String;)Z - ARG 1 key - CLASS Context - METHOD setDefinition (Lnet/minecraft/world/level/block/state/StateDefinition;)V - ARG 1 stateContainer + METHOD instantiate (Lnet/minecraft/world/level/block/state/StateDefinition;Ljava/lang/String;)Ljava/util/Map; + ARG 1 stateDefinition + ARG 2 name CLASS Deserializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/client/renderer/block/model/BlockModelDefinition; ARG 1 json ARG 2 type ARG 3 context - METHOD getMultiPart (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;)Lnet/minecraft/client/renderer/block/model/multipart/MultiPart; + METHOD getMultiPart (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;)Lnet/minecraft/client/renderer/block/model/multipart/MultiPart$Definition; ARG 1 context ARG 2 json METHOD getVariants (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;)Ljava/util/Map; diff --git a/data/net/minecraft/client/renderer/block/model/FaceBakery.mapping b/data/net/minecraft/client/renderer/block/model/FaceBakery.mapping index 2ad9a89b2..5f5870592 100644 --- a/data/net/minecraft/client/renderer/block/model/FaceBakery.mapping +++ b/data/net/minecraft/client/renderer/block/model/FaceBakery.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/client/renderer/block/model/FaceBakery METHOD applyModelRotation (Lorg/joml/Vector3f;Lcom/mojang/math/Transformation;)V ARG 1 pos ARG 2 transform - METHOD bakeQuad (Lorg/joml/Vector3f;Lorg/joml/Vector3f;Lnet/minecraft/client/renderer/block/model/BlockElementFace;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/core/Direction;Lnet/minecraft/client/resources/model/ModelState;Lnet/minecraft/client/renderer/block/model/BlockElementRotation;Z)Lnet/minecraft/client/renderer/block/model/BakedQuad; + METHOD bakeQuad (Lorg/joml/Vector3f;Lorg/joml/Vector3f;Lnet/minecraft/client/renderer/block/model/BlockElementFace;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/core/Direction;Lnet/minecraft/client/resources/model/ModelState;Lnet/minecraft/client/renderer/block/model/BlockElementRotation;ZI)Lnet/minecraft/client/renderer/block/model/BakedQuad; ARG 1 posFrom ARG 2 posTo ARG 3 face @@ -14,16 +14,16 @@ CLASS net/minecraft/client/renderer/block/model/FaceBakery ARG 6 transform ARG 7 rotation ARG 8 shade - METHOD bakeVertex ([IILnet/minecraft/core/Direction;Lnet/minecraft/client/renderer/block/model/BlockFaceUV;[FLnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lcom/mojang/math/Transformation;Lnet/minecraft/client/renderer/block/model/BlockElementRotation;Z)V + ARG 9 lightEmission + METHOD bakeVertex ([IILnet/minecraft/core/Direction;Lnet/minecraft/client/renderer/block/model/BlockFaceUV;[FLnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lcom/mojang/math/Transformation;Lnet/minecraft/client/renderer/block/model/BlockElementRotation;)V ARG 1 vertexData ARG 2 vertexIndex ARG 3 facing ARG 4 blockFaceUV ARG 5 posDiv16 ARG 6 sprite - ARG 7 rotation + ARG 7 transformation ARG 8 partRotation - ARG 9 shade METHOD calculateFacing ([I)Lnet/minecraft/core/Direction; ARG 0 faceData METHOD fillVertex ([IILorg/joml/Vector3f;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/client/renderer/block/model/BlockFaceUV;)V @@ -32,14 +32,13 @@ CLASS net/minecraft/client/renderer/block/model/FaceBakery ARG 3 vector ARG 4 sprite ARG 5 blockFaceUV - METHOD makeVertices (Lnet/minecraft/client/renderer/block/model/BlockFaceUV;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/core/Direction;[FLcom/mojang/math/Transformation;Lnet/minecraft/client/renderer/block/model/BlockElementRotation;Z)[I + METHOD makeVertices (Lnet/minecraft/client/renderer/block/model/BlockFaceUV;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/core/Direction;[FLcom/mojang/math/Transformation;Lnet/minecraft/client/renderer/block/model/BlockElementRotation;)[I ARG 1 uvs ARG 2 sprite ARG 3 orientation ARG 4 posDiv16 - ARG 5 rotation + ARG 5 transformation ARG 6 partRotation - ARG 7 shade METHOD recalculateWinding ([ILnet/minecraft/core/Direction;)V ARG 1 vertices ARG 2 direction diff --git a/data/net/minecraft/client/renderer/block/model/ItemOverride.mapping b/data/net/minecraft/client/renderer/block/model/ItemOverride.mapping index c1b488f05..f8a72d0ab 100644 --- a/data/net/minecraft/client/renderer/block/model/ItemOverride.mapping +++ b/data/net/minecraft/client/renderer/block/model/ItemOverride.mapping @@ -2,8 +2,6 @@ CLASS net/minecraft/client/renderer/block/model/ItemOverride METHOD (Lnet/minecraft/resources/ResourceLocation;Ljava/util/List;)V ARG 1 model ARG 2 predicates - METHOD getModel ()Lnet/minecraft/resources/ResourceLocation; - COMMENT @return the location of the target model CLASS Predicate METHOD (Lnet/minecraft/resources/ResourceLocation;F)V ARG 1 property diff --git a/data/net/minecraft/client/renderer/block/model/ItemOverrides.mapping b/data/net/minecraft/client/renderer/block/model/ItemOverrides.mapping deleted file mode 100644 index 70d68c078..000000000 --- a/data/net/minecraft/client/renderer/block/model/ItemOverrides.mapping +++ /dev/null @@ -1,28 +0,0 @@ -CLASS net/minecraft/client/renderer/block/model/ItemOverrides - METHOD (Lnet/minecraft/client/resources/model/ModelBaker;Lnet/minecraft/client/renderer/block/model/BlockModel;Ljava/util/List;)V - ARG 1 baker - ARG 2 model - ARG 3 overrides - METHOD bakeModel (Lnet/minecraft/client/resources/model/ModelBaker;Lnet/minecraft/client/renderer/block/model/BlockModel;Lnet/minecraft/client/renderer/block/model/ItemOverride;)Lnet/minecraft/client/resources/model/BakedModel; - ARG 1 baker - ARG 2 model - ARG 3 override - METHOD lambda$new$1 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/client/renderer/block/model/ItemOverride$Predicate;)Lnet/minecraft/client/renderer/block/model/ItemOverrides$PropertyMatcher; - ARG 0 predicate - ARG 1 override - METHOD resolve (Lnet/minecraft/client/resources/model/BakedModel;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/world/entity/LivingEntity;I)Lnet/minecraft/client/resources/model/BakedModel; - ARG 1 model - ARG 2 stack - ARG 3 level - ARG 4 entity - ARG 5 seed - CLASS BakedOverride - METHOD ([Lnet/minecraft/client/renderer/block/model/ItemOverrides$PropertyMatcher;Lnet/minecraft/client/resources/model/BakedModel;)V - ARG 1 matchers - ARG 2 model - METHOD test ([F)Z - ARG 1 properties - CLASS PropertyMatcher - METHOD (IF)V - ARG 1 index - ARG 2 value diff --git a/data/net/minecraft/client/renderer/block/model/UnbakedBlockStateModel.mapping b/data/net/minecraft/client/renderer/block/model/UnbakedBlockStateModel.mapping new file mode 100644 index 000000000..c189c33ab --- /dev/null +++ b/data/net/minecraft/client/renderer/block/model/UnbakedBlockStateModel.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/client/renderer/block/model/UnbakedBlockStateModel + METHOD visualEqualityGroup (Lnet/minecraft/world/level/block/state/BlockState;)Ljava/lang/Object; + ARG 1 state diff --git a/data/net/minecraft/client/renderer/block/model/VariantSelector.mapping b/data/net/minecraft/client/renderer/block/model/VariantSelector.mapping new file mode 100644 index 000000000..4208ee73b --- /dev/null +++ b/data/net/minecraft/client/renderer/block/model/VariantSelector.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/client/renderer/block/model/VariantSelector + METHOD getValueHelper (Lnet/minecraft/world/level/block/state/properties/Property;Ljava/lang/String;)Ljava/lang/Comparable; + ARG 0 property + ARG 1 value + METHOD predicate (Lnet/minecraft/world/level/block/state/StateDefinition;Ljava/lang/String;)Ljava/util/function/Predicate; + ARG 0 stateDefinition + ARG 1 value diff --git a/data/net/minecraft/client/renderer/block/model/multipart/AndCondition.mapping b/data/net/minecraft/client/renderer/block/model/multipart/AndCondition.mapping index 71f8e604b..a0a1fe1a9 100644 --- a/data/net/minecraft/client/renderer/block/model/multipart/AndCondition.mapping +++ b/data/net/minecraft/client/renderer/block/model/multipart/AndCondition.mapping @@ -3,7 +3,3 @@ CLASS net/minecraft/client/renderer/block/model/multipart/AndCondition ARG 1 conditions METHOD lambda$getPredicate$0 (Lnet/minecraft/world/level/block/state/StateDefinition;Lnet/minecraft/client/renderer/block/model/multipart/Condition;)Ljava/util/function/Predicate; ARG 1 condition - METHOD lambda$getPredicate$1 (Lnet/minecraft/world/level/block/state/BlockState;Ljava/util/function/Predicate;)Z - ARG 1 predicate - METHOD lambda$getPredicate$2 (Ljava/util/List;Lnet/minecraft/world/level/block/state/BlockState;)Z - ARG 1 state diff --git a/data/net/minecraft/client/renderer/block/model/multipart/KeyValueCondition.mapping b/data/net/minecraft/client/renderer/block/model/multipart/KeyValueCondition.mapping index 4a47d07e4..42a595970 100644 --- a/data/net/minecraft/client/renderer/block/model/multipart/KeyValueCondition.mapping +++ b/data/net/minecraft/client/renderer/block/model/multipart/KeyValueCondition.mapping @@ -6,11 +6,5 @@ CLASS net/minecraft/client/renderer/block/model/multipart/KeyValueCondition ARG 1 definition ARG 2 property ARG 3 value - METHOD lambda$getBlockStatePredicate$3 (Lnet/minecraft/world/level/block/state/properties/Property;Ljava/util/Optional;Lnet/minecraft/world/level/block/state/BlockState;)Z - ARG 2 state METHOD lambda$getPredicate$0 (Lnet/minecraft/world/level/block/state/StateDefinition;Lnet/minecraft/world/level/block/state/properties/Property;Ljava/lang/String;)Ljava/util/function/Predicate; ARG 3 value - METHOD lambda$getPredicate$1 (Lnet/minecraft/world/level/block/state/BlockState;Ljava/util/function/Predicate;)Z - ARG 1 predicate - METHOD lambda$getPredicate$2 (Ljava/util/List;Lnet/minecraft/world/level/block/state/BlockState;)Z - ARG 1 state diff --git a/data/net/minecraft/client/renderer/block/model/multipart/MultiPart.mapping b/data/net/minecraft/client/renderer/block/model/multipart/MultiPart.mapping index d94c9dcb0..51f6840c7 100644 --- a/data/net/minecraft/client/renderer/block/model/multipart/MultiPart.mapping +++ b/data/net/minecraft/client/renderer/block/model/multipart/MultiPart.mapping @@ -1,18 +1,13 @@ CLASS net/minecraft/client/renderer/block/model/multipart/MultiPart - METHOD (Lnet/minecraft/world/level/block/state/StateDefinition;Ljava/util/List;)V - ARG 1 definition - ARG 2 selectors - METHOD equals (Ljava/lang/Object;)Z - ARG 1 other - METHOD lambda$getDependencies$0 (Lnet/minecraft/client/renderer/block/model/multipart/Selector;)Ljava/util/stream/Stream; - ARG 0 selector + METHOD (Ljava/util/List;)V + ARG 1 selectors + CLASS 1Key + METHOD (Lnet/minecraft/client/renderer/block/model/multipart/MultiPart;Lit/unimi/dsi/fastutil/ints/IntList;)V + ARG 2 selectors + CLASS Definition + METHOD instantiate (Lnet/minecraft/world/level/block/state/StateDefinition;)Lnet/minecraft/client/renderer/block/model/multipart/MultiPart; + ARG 1 stateDefinition CLASS Deserializer - METHOD (Lnet/minecraft/client/renderer/block/model/BlockModelDefinition$Context;)V - ARG 1 context - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/client/renderer/block/model/multipart/MultiPart; - ARG 1 json - ARG 2 type - ARG 3 jsonContext METHOD getSelectors (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonArray;)Ljava/util/List; ARG 1 jsonContext ARG 2 elements diff --git a/data/net/minecraft/client/renderer/block/model/multipart/OrCondition.mapping b/data/net/minecraft/client/renderer/block/model/multipart/OrCondition.mapping index 9487a91cf..e358471de 100644 --- a/data/net/minecraft/client/renderer/block/model/multipart/OrCondition.mapping +++ b/data/net/minecraft/client/renderer/block/model/multipart/OrCondition.mapping @@ -3,7 +3,3 @@ CLASS net/minecraft/client/renderer/block/model/multipart/OrCondition ARG 1 conditions METHOD lambda$getPredicate$0 (Lnet/minecraft/world/level/block/state/StateDefinition;Lnet/minecraft/client/renderer/block/model/multipart/Condition;)Ljava/util/function/Predicate; ARG 1 condition - METHOD lambda$getPredicate$1 (Lnet/minecraft/world/level/block/state/BlockState;Ljava/util/function/Predicate;)Z - ARG 1 predicate - METHOD lambda$getPredicate$2 (Ljava/util/List;Lnet/minecraft/world/level/block/state/BlockState;)Z - ARG 1 state diff --git a/data/net/minecraft/client/renderer/block/model/multipart/Selector.mapping b/data/net/minecraft/client/renderer/block/model/multipart/Selector.mapping index af4c4cc83..f3a1a1de5 100644 --- a/data/net/minecraft/client/renderer/block/model/multipart/Selector.mapping +++ b/data/net/minecraft/client/renderer/block/model/multipart/Selector.mapping @@ -2,8 +2,6 @@ CLASS net/minecraft/client/renderer/block/model/multipart/Selector METHOD (Lnet/minecraft/client/renderer/block/model/multipart/Condition;Lnet/minecraft/client/renderer/block/model/MultiVariant;)V ARG 1 condition ARG 2 variant - METHOD equals (Ljava/lang/Object;)Z - ARG 1 other METHOD getPredicate (Lnet/minecraft/world/level/block/state/StateDefinition;)Ljava/util/function/Predicate; ARG 1 definition CLASS Deserializer diff --git a/data/net/minecraft/client/renderer/blockentity/BannerRenderer.mapping b/data/net/minecraft/client/renderer/blockentity/BannerRenderer.mapping index 2fd49e63e..b84291a44 100644 --- a/data/net/minecraft/client/renderer/blockentity/BannerRenderer.mapping +++ b/data/net/minecraft/client/renderer/blockentity/BannerRenderer.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/client/renderer/blockentity/BannerRenderer ARG 6 color METHOD renderPatterns (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;IILnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/client/resources/model/Material;ZLnet/minecraft/world/item/DyeColor;Lnet/minecraft/world/level/block/entity/BannerPatternLayers;)V ARG 0 poseStack - ARG 1 buffer + ARG 1 bufferSource ARG 2 packedLight ARG 3 packedOverlay ARG 4 flagPart @@ -20,15 +20,15 @@ CLASS net/minecraft/client/renderer/blockentity/BannerRenderer COMMENT if {@code true}, uses banner material; otherwise if {@code false} uses shield material ARG 7 baseColor ARG 8 patterns - METHOD renderPatterns (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;IILnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/client/resources/model/Material;ZLnet/minecraft/world/item/DyeColor;Lnet/minecraft/world/level/block/entity/BannerPatternLayers;Z)V + METHOD renderPatterns (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;IILnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/client/resources/model/Material;ZLnet/minecraft/world/item/DyeColor;Lnet/minecraft/world/level/block/entity/BannerPatternLayers;ZZ)V ARG 0 poseStack - ARG 1 buffer + ARG 1 bufferSource ARG 2 packedLight ARG 3 packedOverlay ARG 4 flagPart ARG 5 flagMaterial ARG 6 banner - COMMENT if {@code true}, uses banner material; otherwise if {@code false} uses shield material ARG 7 baseColor ARG 8 patterns - ARG 9 glint + ARG 9 withGlint + ARG 10 noEntity diff --git a/data/net/minecraft/client/renderer/blockentity/BedRenderer.mapping b/data/net/minecraft/client/renderer/blockentity/BedRenderer.mapping index a94652a26..35213d419 100644 --- a/data/net/minecraft/client/renderer/blockentity/BedRenderer.mapping +++ b/data/net/minecraft/client/renderer/blockentity/BedRenderer.mapping @@ -4,13 +4,12 @@ CLASS net/minecraft/client/renderer/blockentity/BedRenderer METHOD lambda$render$0 (Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;)Z ARG 0 levelAccessor ARG 1 pos - METHOD renderPiece (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/core/Direction;Lnet/minecraft/client/resources/model/Material;IIZ)V + METHOD renderPiece (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/model/Model;Lnet/minecraft/core/Direction;Lnet/minecraft/client/resources/model/Material;IIZ)V ARG 1 poseStack ARG 2 bufferSource - ARG 3 modelPart + ARG 3 model ARG 4 direction ARG 5 material ARG 6 packedLight ARG 7 packedOverlay - ARG 8 foot - COMMENT {@code true} if piece to render is the foot of the bed, {@code false} otherwise or if being rendered by a {@link net.minecraft.client.renderer.BlockEntityWithoutLevelRenderer} + ARG 8 isFeet diff --git a/data/net/minecraft/client/renderer/blockentity/ChestRenderer.mapping b/data/net/minecraft/client/renderer/blockentity/ChestRenderer.mapping index 3cdb27008..6d643c942 100644 --- a/data/net/minecraft/client/renderer/blockentity/ChestRenderer.mapping +++ b/data/net/minecraft/client/renderer/blockentity/ChestRenderer.mapping @@ -1,12 +1,10 @@ CLASS net/minecraft/client/renderer/blockentity/ChestRenderer METHOD (Lnet/minecraft/client/renderer/blockentity/BlockEntityRendererProvider$Context;)V ARG 1 context - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/client/model/geom/ModelPart;FII)V + METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/client/model/ChestModel;FII)V ARG 1 poseStack - ARG 2 consumer - ARG 3 lidPart - ARG 4 lockPart - ARG 5 bottomPart - ARG 6 lidAngle - ARG 7 packedLight - ARG 8 packedOverlay + ARG 2 buffer + ARG 3 model + ARG 4 openness + ARG 5 packedLight + ARG 6 packedOverlay diff --git a/data/net/minecraft/client/renderer/blockentity/ShulkerBoxRenderer.mapping b/data/net/minecraft/client/renderer/blockentity/ShulkerBoxRenderer.mapping index 0cdd5e210..42614593d 100644 --- a/data/net/minecraft/client/renderer/blockentity/ShulkerBoxRenderer.mapping +++ b/data/net/minecraft/client/renderer/blockentity/ShulkerBoxRenderer.mapping @@ -1,3 +1,9 @@ CLASS net/minecraft/client/renderer/blockentity/ShulkerBoxRenderer METHOD (Lnet/minecraft/client/renderer/blockentity/BlockEntityRendererProvider$Context;)V ARG 1 context + CLASS ShulkerBoxModel + METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V + ARG 1 root + METHOD animate (Lnet/minecraft/world/level/block/entity/ShulkerBoxBlockEntity;F)V + ARG 1 blockEntity + ARG 2 partialTick diff --git a/data/net/minecraft/client/renderer/blockentity/SignRenderer.mapping b/data/net/minecraft/client/renderer/blockentity/SignRenderer.mapping index 2a6fc7e8d..b177018a3 100644 --- a/data/net/minecraft/client/renderer/blockentity/SignRenderer.mapping +++ b/data/net/minecraft/client/renderer/blockentity/SignRenderer.mapping @@ -1,9 +1,12 @@ CLASS net/minecraft/client/renderer/blockentity/SignRenderer METHOD (Lnet/minecraft/client/renderer/blockentity/BlockEntityRendererProvider$Context;)V ARG 1 context - METHOD createSignModel (Lnet/minecraft/client/model/geom/EntityModelSet;Lnet/minecraft/world/level/block/state/properties/WoodType;)Lnet/minecraft/client/renderer/blockentity/SignRenderer$SignModel; - ARG 0 entityModelSet + METHOD createSignLayer (Z)Lnet/minecraft/client/model/geom/builders/LayerDefinition; + ARG 0 standingSign + METHOD createSignModel (Lnet/minecraft/client/model/geom/EntityModelSet;Lnet/minecraft/world/level/block/state/properties/WoodType;Z)Lnet/minecraft/client/model/Model; + ARG 0 modelSet ARG 1 woodType + ARG 2 standingSign METHOD getDarkColor (Lnet/minecraft/world/level/block/entity/SignText;)I ARG 0 signText METHOD getSignMaterial (Lnet/minecraft/world/level/block/state/properties/WoodType;)Lnet/minecraft/client/resources/model/Material; @@ -13,8 +16,6 @@ CLASS net/minecraft/client/renderer/blockentity/SignRenderer ARG 1 textColor METHOD lambda$new$0 (Lnet/minecraft/world/level/block/state/properties/WoodType;)Lnet/minecraft/world/level/block/state/properties/WoodType; ARG 0 woodType - METHOD lambda$new$1 (Lnet/minecraft/client/renderer/blockentity/BlockEntityRendererProvider$Context;Lnet/minecraft/world/level/block/state/properties/WoodType;)Lnet/minecraft/client/renderer/blockentity/SignRenderer$SignModel; - ARG 1 woodType METHOD renderSign (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;IILnet/minecraft/world/level/block/state/properties/WoodType;Lnet/minecraft/client/model/Model;)V ARG 1 poseStack ARG 2 buffer @@ -22,12 +23,6 @@ CLASS net/minecraft/client/renderer/blockentity/SignRenderer ARG 4 packedOverlay ARG 5 woodType ARG 6 model - METHOD renderSignModel (Lcom/mojang/blaze3d/vertex/PoseStack;IILnet/minecraft/client/model/Model;Lcom/mojang/blaze3d/vertex/VertexConsumer;)V - ARG 1 poseStack - ARG 2 packedLight - ARG 3 packedOverlay - ARG 4 model - ARG 5 vertexConsumer METHOD renderSignText (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/entity/SignText;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;IIIZ)V ARG 1 pos ARG 2 text @@ -55,6 +50,3 @@ CLASS net/minecraft/client/renderer/blockentity/SignRenderer ARG 1 poseStack ARG 2 isFrontText ARG 3 offset - CLASS SignModel - METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V - ARG 1 root diff --git a/data/net/minecraft/client/renderer/chunk/CompileTaskDynamicQueue.mapping b/data/net/minecraft/client/renderer/chunk/CompileTaskDynamicQueue.mapping new file mode 100644 index 000000000..042a7ddd0 --- /dev/null +++ b/data/net/minecraft/client/renderer/chunk/CompileTaskDynamicQueue.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/client/renderer/chunk/CompileTaskDynamicQueue + METHOD add (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection$CompileTask;)V + ARG 1 task + METHOD poll (Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection$CompileTask; + ARG 1 cameraPosition + METHOD removeTaskByIndex (I)Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection$CompileTask; + ARG 1 index diff --git a/data/net/minecraft/client/renderer/chunk/SectionRenderDispatcher.mapping b/data/net/minecraft/client/renderer/chunk/SectionRenderDispatcher.mapping index 5263046fc..f178cb396 100644 --- a/data/net/minecraft/client/renderer/chunk/SectionRenderDispatcher.mapping +++ b/data/net/minecraft/client/renderer/chunk/SectionRenderDispatcher.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/client/renderer/chunk/SectionRenderDispatcher - METHOD (Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/client/renderer/LevelRenderer;Ljava/util/concurrent/Executor;Lnet/minecraft/client/renderer/RenderBuffers;Lnet/minecraft/client/renderer/block/BlockRenderDispatcher;Lnet/minecraft/client/renderer/blockentity/BlockEntityRenderDispatcher;)V + METHOD (Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/client/renderer/LevelRenderer;Lnet/minecraft/TracingExecutor;Lnet/minecraft/client/renderer/RenderBuffers;Lnet/minecraft/client/renderer/block/BlockRenderDispatcher;Lnet/minecraft/client/renderer/blockentity/BlockEntityRenderDispatcher;)V ARG 1 level ARG 2 renderer ARG 3 executor - ARG 4 buffers + ARG 4 buffer ARG 5 blockRenderer ARG 6 blockEntityRenderer METHOD rebuildSectionSync (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection;Lnet/minecraft/client/renderer/chunk/RenderRegionCache;)V @@ -22,67 +22,59 @@ CLASS net/minecraft/client/renderer/chunk/SectionRenderDispatcher ARG 1 meshData ARG 2 vertexBuffer CLASS RenderSection - METHOD (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher;IIII)V + METHOD (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher;IJ)V ARG 2 index - ARG 3 originX - ARG 4 originY - ARG 5 originZ + ARG 3 sectionNode METHOD compileSync (Lnet/minecraft/client/renderer/chunk/RenderRegionCache;)V ARG 1 regionCache METHOD createCompileTask (Lnet/minecraft/client/renderer/chunk/RenderRegionCache;)Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection$CompileTask; ARG 1 regionCache - METHOD doesChunkExistAt (Lnet/minecraft/core/BlockPos;)Z + METHOD doesChunkExistAt (J)Z ARG 1 pos METHOD getBuffer (Lnet/minecraft/client/renderer/RenderType;)Lcom/mojang/blaze3d/vertex/VertexBuffer; ARG 1 renderType - METHOD getRelativeOrigin (Lnet/minecraft/core/Direction;)Lnet/minecraft/core/BlockPos; + METHOD getNeighborSectionNode (Lnet/minecraft/core/Direction;)J ARG 1 direction - METHOD isAxisAlignedWith (III)Z - ARG 1 x - ARG 2 y - ARG 3 z METHOD rebuildSectionAsync (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher;Lnet/minecraft/client/renderer/chunk/RenderRegionCache;)V ARG 1 sectionRenderDispatcher ARG 2 regionCache - METHOD resortTransparency (Lnet/minecraft/client/renderer/RenderType;Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher;)Z - ARG 1 renderType - ARG 2 sectionRenderDispatcher + METHOD resortTransparency (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher;)V + ARG 1 dispatcher METHOD setCompiled (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$CompiledSection;)V ARG 1 compiled METHOD setDirty (Z)V ARG 1 playerChanged - METHOD setOrigin (III)V - ARG 1 x - ARG 2 y - ARG 3 z + METHOD setSectionNode (J)V + ARG 1 sectionNode METHOD updateGlobalBlockEntities (Ljava/util/Collection;)V ARG 1 blockEntities CLASS CompileTask - METHOD (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection;DZ)V - ARG 1 renderSection - ARG 2 distAtCreation - ARG 4 isHighPriority - METHOD compareTo (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection$CompileTask;)I - ARG 1 other + METHOD (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection;Z)V + ARG 2 isRecompile METHOD doTask (Lnet/minecraft/client/renderer/SectionBufferBuilderPack;)Ljava/util/concurrent/CompletableFuture; ARG 1 sectionBufferBuilderPack CLASS RebuildTask - METHOD (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection;DLnet/minecraft/client/renderer/chunk/RenderChunkRegion;Z)V - ARG 2 distAtCreation - ARG 4 region - ARG 5 isHighPriority - METHOD lambda$doTask$1 (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$CompiledSection;Ljava/util/List;Ljava/lang/Throwable;)Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$SectionTaskResult; - ARG 3 exception + METHOD (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection;Lnet/minecraft/client/renderer/chunk/RenderChunkRegion;Z)V + ARG 2 region + ARG 3 isRecompile CLASS ResortTransparencyTask - METHOD (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection;DLnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$CompiledSection;)V - ARG 2 distAtCreation - ARG 4 compiledSection - METHOD lambda$doTask$1 (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$SectionTaskResult;Ljava/lang/Throwable;)Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$SectionTaskResult; - ARG 1 result - ARG 2 exception + METHOD (Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection;Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$CompiledSection;)V + ARG 2 compiledSection CLASS CompiledSection METHOD facesCanSeeEachother (Lnet/minecraft/core/Direction;Lnet/minecraft/core/Direction;)Z ARG 1 face1 ARG 2 face2 METHOD isEmpty (Lnet/minecraft/client/renderer/RenderType;)Z ARG 1 renderType + CLASS TranslucencyPointOfView + METHOD equals (Ljava/lang/Object;)Z + ARG 1 other + METHOD getCoordinate (DI)I + ARG 0 cameraCoord + ARG 2 sectionCoord + METHOD of (Lnet/minecraft/world/phys/Vec3;J)Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$TranslucencyPointOfView; + ARG 0 cameraPosition + ARG 1 sectionNode + METHOD set (Lnet/minecraft/world/phys/Vec3;J)Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$TranslucencyPointOfView; + ARG 1 cameraPosition + ARG 2 sectionNode diff --git a/data/net/minecraft/client/renderer/culling/Frustum.mapping b/data/net/minecraft/client/renderer/culling/Frustum.mapping index cea32f45c..a72a19221 100644 --- a/data/net/minecraft/client/renderer/culling/Frustum.mapping +++ b/data/net/minecraft/client/renderer/culling/Frustum.mapping @@ -7,13 +7,15 @@ CLASS net/minecraft/client/renderer/culling/Frustum METHOD calculateFrustum (Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V ARG 1 frustum ARG 2 projection - METHOD cubeInFrustum (DDDDDD)Z + METHOD cubeInFrustum (DDDDDD)I ARG 1 minX ARG 3 minY ARG 5 minZ ARG 7 maxX ARG 9 maxY ARG 11 maxZ + METHOD cubeInFrustum (Lnet/minecraft/world/level/levelgen/structure/BoundingBox;)I + ARG 1 boundingBox METHOD isVisible (Lnet/minecraft/world/phys/AABB;)Z ARG 1 aabb METHOD offsetToFullyIncludeCameraCube (I)Lnet/minecraft/client/renderer/culling/Frustum; diff --git a/data/net/minecraft/client/renderer/debug/ChunkCullingDebugRenderer.mapping b/data/net/minecraft/client/renderer/debug/ChunkCullingDebugRenderer.mapping new file mode 100644 index 000000000..664da4f14 --- /dev/null +++ b/data/net/minecraft/client/renderer/debug/ChunkCullingDebugRenderer.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/client/renderer/debug/ChunkCullingDebugRenderer + METHOD (Lnet/minecraft/client/Minecraft;)V + ARG 1 minecraft + METHOD addFrustumQuad (Lcom/mojang/blaze3d/vertex/VertexConsumer;Lorg/joml/Matrix4f;[Lorg/joml/Vector4f;IIIIIII)V + ARG 1 buffer + ARG 2 pose + ARG 3 frustumPoints + ARG 4 point1 + ARG 5 point2 + ARG 6 point3 + ARG 7 point4 + ARG 8 red + ARG 9 green + ARG 10 blue + METHOD addFrustumVertex (Lcom/mojang/blaze3d/vertex/VertexConsumer;Lorg/joml/Matrix4f;Lorg/joml/Vector4f;)V + ARG 1 buffer + ARG 2 pose + ARG 3 position diff --git a/data/net/minecraft/client/renderer/debug/DebugRenderer.mapping b/data/net/minecraft/client/renderer/debug/DebugRenderer.mapping index 9ca68f5a7..446264a29 100644 --- a/data/net/minecraft/client/renderer/debug/DebugRenderer.mapping +++ b/data/net/minecraft/client/renderer/debug/DebugRenderer.mapping @@ -4,7 +4,16 @@ CLASS net/minecraft/client/renderer/debug/DebugRenderer METHOD getTargetedEntity (Lnet/minecraft/world/entity/Entity;I)Ljava/util/Optional; ARG 0 entity ARG 1 distance - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;DDD)V + METHOD mixColor (F)Lnet/minecraft/world/phys/Vec3; + ARG 0 shift + METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/culling/Frustum;Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;DDD)V + ARG 1 poseStack + ARG 2 frustum + ARG 3 bufferSource + ARG 4 camX + ARG 6 camY + ARG 8 camZ + METHOD renderAfterTranslucents (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;DDD)V ARG 1 poseStack ARG 2 bufferSource ARG 3 camX @@ -83,6 +92,8 @@ CLASS net/minecraft/client/renderer/debug/DebugRenderer ARG 7 z ARG 9 color ARG 10 scale + ARG 11 center + ARG 12 xOffset ARG 13 transparent METHOD renderFloatingText (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;Ljava/lang/String;IIII)V ARG 0 poseStack @@ -92,6 +103,23 @@ CLASS net/minecraft/client/renderer/debug/DebugRenderer ARG 4 y ARG 5 z ARG 6 color + METHOD renderVoxelShape (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/world/phys/shapes/VoxelShape;DDDFFFFZ)V + ARG 0 poseStack + ARG 1 buffer + ARG 2 shape + ARG 3 x + ARG 5 y + ARG 7 z + ARG 9 red + ARG 10 green + ARG 11 blue + ARG 12 alpha + ARG 13 lowerColorVariance + METHOD shiftHue (FFFF)Lnet/minecraft/world/phys/Vec3; + ARG 0 red + ARG 1 green + ARG 2 blue + ARG 3 shift METHOD switchRenderChunkborder ()Z COMMENT Toggles the {@link #renderChunkborder} value, effectively toggling the {@link #chunkBorderRenderer} on or off. COMMENT diff --git a/data/net/minecraft/client/renderer/debug/OctreeDebugRenderer.mapping b/data/net/minecraft/client/renderer/debug/OctreeDebugRenderer.mapping new file mode 100644 index 000000000..3a41a679e --- /dev/null +++ b/data/net/minecraft/client/renderer/debug/OctreeDebugRenderer.mapping @@ -0,0 +1,29 @@ +CLASS net/minecraft/client/renderer/debug/OctreeDebugRenderer + METHOD (Lnet/minecraft/client/Minecraft;)V + ARG 1 minecraft + METHOD getColorComponent (JF)F + ARG 0 value + ARG 2 multiplier + METHOD lambda$render$0 (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;DDDLorg/apache/commons/lang3/mutable/MutableInt;Lnet/minecraft/client/renderer/Octree$Node;ZIZ)V + ARG 10 node + ARG 11 isLeafNode + ARG 12 recursionDepth + ARG 13 isNearby + METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/culling/Frustum;Lnet/minecraft/client/renderer/MultiBufferSource;DDD)V + ARG 1 poseStack + ARG 2 frustum + ARG 3 bufferSource + ARG 4 camX + ARG 6 camY + ARG 8 camZ + METHOD renderNode (Lnet/minecraft/client/renderer/Octree$Node;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;DDDIZLorg/apache/commons/lang3/mutable/MutableInt;Z)V + ARG 1 node + ARG 2 poseStack + ARG 3 bufferSource + ARG 4 camX + ARG 6 camY + ARG 8 camZ + ARG 10 recursionDepth + ARG 11 isLeafNode + ARG 12 nodesRendered + ARG 13 isNearby diff --git a/data/net/minecraft/client/renderer/debug/PathfindingRenderer.mapping b/data/net/minecraft/client/renderer/debug/PathfindingRenderer.mapping index e1fef617a..2a2c74a90 100644 --- a/data/net/minecraft/client/renderer/debug/PathfindingRenderer.mapping +++ b/data/net/minecraft/client/renderer/debug/PathfindingRenderer.mapping @@ -10,8 +10,11 @@ CLASS net/minecraft/client/renderer/debug/PathfindingRenderer ARG 5 z METHOD renderPath (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/world/level/pathfinder/Path;FZZDDD)V ARG 0 poseStack - ARG 1 buffer + ARG 1 bufferSource ARG 2 path + ARG 3 nodeSize + ARG 4 renderDebugNodes + ARG 5 renderDebugInfo ARG 6 x ARG 8 y ARG 10 z diff --git a/data/net/minecraft/client/renderer/debug/RedstoneWireOrientationsRenderer.mapping b/data/net/minecraft/client/renderer/debug/RedstoneWireOrientationsRenderer.mapping new file mode 100644 index 000000000..64adcd6c2 --- /dev/null +++ b/data/net/minecraft/client/renderer/debug/RedstoneWireOrientationsRenderer.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/client/renderer/debug/RedstoneWireOrientationsRenderer + METHOD (Lnet/minecraft/client/Minecraft;)V + ARG 1 minecraft + METHOD addWireOrientations (Lnet/minecraft/network/protocol/common/custom/RedstoneWireOrientationsDebugPayload;)V + ARG 1 payload diff --git a/data/net/minecraft/client/renderer/entity/AbstractBoatRenderer.mapping b/data/net/minecraft/client/renderer/entity/AbstractBoatRenderer.mapping new file mode 100644 index 000000000..1950395a6 --- /dev/null +++ b/data/net/minecraft/client/renderer/entity/AbstractBoatRenderer.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/client/renderer/entity/AbstractBoatRenderer + METHOD renderTypeAdditions (Lnet/minecraft/client/renderer/entity/state/BoatRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V + ARG 1 renderState + ARG 2 poseStack + ARG 3 bufferSource + ARG 4 packedLight diff --git a/data/net/minecraft/client/renderer/entity/AbstractHoglinRenderer.mapping b/data/net/minecraft/client/renderer/entity/AbstractHoglinRenderer.mapping new file mode 100644 index 000000000..e821647db --- /dev/null +++ b/data/net/minecraft/client/renderer/entity/AbstractHoglinRenderer.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/client/renderer/entity/AbstractHoglinRenderer + METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;F)V + ARG 1 context + ARG 2 adultModel + ARG 3 babyModel + ARG 4 shadowRadius diff --git a/data/net/minecraft/client/renderer/entity/AbstractHorseRenderer.mapping b/data/net/minecraft/client/renderer/entity/AbstractHorseRenderer.mapping deleted file mode 100644 index 4fcae2266..000000000 --- a/data/net/minecraft/client/renderer/entity/AbstractHorseRenderer.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/AbstractHorseRenderer - METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/HorseModel;F)V - ARG 1 context - ARG 2 model - ARG 3 scale - METHOD scale (Lnet/minecraft/world/entity/animal/horse/AbstractHorse;Lcom/mojang/blaze3d/vertex/PoseStack;F)V - ARG 1 livingEntity - ARG 2 poseStack - ARG 3 partialTickTime diff --git a/data/net/minecraft/client/renderer/entity/AbstractMinecartRenderer.mapping b/data/net/minecraft/client/renderer/entity/AbstractMinecartRenderer.mapping new file mode 100644 index 000000000..44c655c7d --- /dev/null +++ b/data/net/minecraft/client/renderer/entity/AbstractMinecartRenderer.mapping @@ -0,0 +1,26 @@ +CLASS net/minecraft/client/renderer/entity/AbstractMinecartRenderer + METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/geom/ModelLayerLocation;)V + ARG 1 context + ARG 2 modelLayer + METHOD newExtractState (Lnet/minecraft/world/entity/vehicle/AbstractMinecart;Lnet/minecraft/world/entity/vehicle/NewMinecartBehavior;Lnet/minecraft/client/renderer/entity/state/MinecartRenderState;F)V + ARG 0 minecart + ARG 1 behavior + ARG 2 renderState + ARG 3 partialTick + METHOD newRender (Lnet/minecraft/client/renderer/entity/state/MinecartRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;)V + ARG 0 renderState + ARG 1 poseStack + METHOD oldExtractState (Lnet/minecraft/world/entity/vehicle/AbstractMinecart;Lnet/minecraft/world/entity/vehicle/OldMinecartBehavior;Lnet/minecraft/client/renderer/entity/state/MinecartRenderState;F)V + ARG 0 minecart + ARG 1 behavior + ARG 2 renderState + ARG 3 partialTick + METHOD oldRender (Lnet/minecraft/client/renderer/entity/state/MinecartRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;)V + ARG 0 renderState + ARG 1 poseStack + METHOD renderMinecartContents (Lnet/minecraft/client/renderer/entity/state/MinecartRenderState;Lnet/minecraft/world/level/block/state/BlockState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V + ARG 1 renderState + ARG 2 state + ARG 3 poseStack + ARG 4 bufferSource + ARG 5 packedLight diff --git a/data/net/minecraft/client/renderer/entity/SkeletonRenderer.mapping b/data/net/minecraft/client/renderer/entity/AbstractSkeletonRenderer.mapping similarity index 63% rename from data/net/minecraft/client/renderer/entity/SkeletonRenderer.mapping rename to data/net/minecraft/client/renderer/entity/AbstractSkeletonRenderer.mapping index 715737447..a9abcec0c 100644 --- a/data/net/minecraft/client/renderer/entity/SkeletonRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/AbstractSkeletonRenderer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/client/renderer/entity/SkeletonRenderer +CLASS net/minecraft/client/renderer/entity/AbstractSkeletonRenderer METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/SkeletonModel;)V ARG 1 context ARG 2 skeletonLayer @@ -6,9 +6,6 @@ CLASS net/minecraft/client/renderer/entity/SkeletonRenderer ARG 4 model METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;)V ARG 1 context - ARG 2 skeletonLayer - ARG 3 innerModelLayer - ARG 4 outerModelLayer - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/AbstractSkeleton;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity + ARG 2 modelLayer + ARG 3 skeletonLayer + ARG 4 innerModelLayer diff --git a/data/net/minecraft/client/renderer/entity/AbstractZombieRenderer.mapping b/data/net/minecraft/client/renderer/entity/AbstractZombieRenderer.mapping index 0a06906f2..844768b3c 100644 --- a/data/net/minecraft/client/renderer/entity/AbstractZombieRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/AbstractZombieRenderer.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/client/renderer/entity/AbstractZombieRenderer - METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/ZombieModel;Lnet/minecraft/client/model/ZombieModel;Lnet/minecraft/client/model/ZombieModel;)V + METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/ZombieModel;Lnet/minecraft/client/model/ZombieModel;Lnet/minecraft/client/model/ZombieModel;Lnet/minecraft/client/model/ZombieModel;Lnet/minecraft/client/model/ZombieModel;Lnet/minecraft/client/model/ZombieModel;)V ARG 1 context - ARG 2 model - ARG 3 innerModel - ARG 4 outerModel - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/Zombie;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity + ARG 2 adultModel + ARG 3 babyModel + ARG 4 innerModel + ARG 5 outerModel + ARG 6 innerModelBaby + ARG 7 outerModelBaby diff --git a/data/net/minecraft/client/renderer/entity/AgeableMobRenderer.mapping b/data/net/minecraft/client/renderer/entity/AgeableMobRenderer.mapping new file mode 100644 index 000000000..0dc906e3a --- /dev/null +++ b/data/net/minecraft/client/renderer/entity/AgeableMobRenderer.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/client/renderer/entity/AgeableMobRenderer + METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/EntityModel;Lnet/minecraft/client/model/EntityModel;F)V + ARG 1 context + ARG 2 adultModel + ARG 3 babyModel + ARG 4 scale diff --git a/data/net/minecraft/client/renderer/entity/ArmorStandRenderer.mapping b/data/net/minecraft/client/renderer/entity/ArmorStandRenderer.mapping index 811e18df2..a53b91ed1 100644 --- a/data/net/minecraft/client/renderer/entity/ArmorStandRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/ArmorStandRenderer.mapping @@ -1,8 +1,3 @@ CLASS net/minecraft/client/renderer/entity/ArmorStandRenderer FIELD DEFAULT_SKIN_LOCATION Lnet/minecraft/resources/ResourceLocation; COMMENT A constant instance of the armor stand texture, wrapped inside a ResourceLocation wrapper. - METHOD getTextureLocation (Lnet/minecraft/world/entity/decoration/ArmorStand;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD shouldShowName (Lnet/minecraft/world/entity/decoration/ArmorStand;)Z - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/ArrowRenderer.mapping b/data/net/minecraft/client/renderer/entity/ArrowRenderer.mapping index ded41d52d..a6a558446 100644 --- a/data/net/minecraft/client/renderer/entity/ArrowRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/ArrowRenderer.mapping @@ -1,20 +1,3 @@ CLASS net/minecraft/client/renderer/entity/ArrowRenderer - METHOD render (Lnet/minecraft/world/entity/projectile/AbstractArrow;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight - METHOD vertex (Lcom/mojang/blaze3d/vertex/PoseStack$Pose;Lcom/mojang/blaze3d/vertex/VertexConsumer;IIIFFIIII)V - ARG 1 pose - ARG 2 consumer - ARG 3 x - ARG 4 y - ARG 5 z - ARG 6 u - ARG 7 v - ARG 8 normalX - ARG 9 normalY - ARG 10 normalZ - ARG 11 packedLight + METHOD getTextureLocation (Lnet/minecraft/client/renderer/entity/state/ArrowRenderState;)Lnet/minecraft/resources/ResourceLocation; + ARG 1 renderState diff --git a/data/net/minecraft/client/renderer/entity/BatRenderer.mapping b/data/net/minecraft/client/renderer/entity/BatRenderer.mapping deleted file mode 100644 index c41e6ff96..000000000 --- a/data/net/minecraft/client/renderer/entity/BatRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/BatRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/ambient/Bat;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/BeeRenderer.mapping b/data/net/minecraft/client/renderer/entity/BeeRenderer.mapping deleted file mode 100644 index 85e399659..000000000 --- a/data/net/minecraft/client/renderer/entity/BeeRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/BeeRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/Bee;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/BlazeRenderer.mapping b/data/net/minecraft/client/renderer/entity/BlazeRenderer.mapping index 8e39b53ff..6aef96fae 100644 --- a/data/net/minecraft/client/renderer/entity/BlazeRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/BlazeRenderer.mapping @@ -2,6 +2,3 @@ CLASS net/minecraft/client/renderer/entity/BlazeRenderer METHOD getBlockLightLevel (Lnet/minecraft/world/entity/monster/Blaze;Lnet/minecraft/core/BlockPos;)I ARG 1 entity ARG 2 pos - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/Blaze;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/BoatRenderer.mapping b/data/net/minecraft/client/renderer/entity/BoatRenderer.mapping index 4c899f9f5..1bd606861 100644 --- a/data/net/minecraft/client/renderer/entity/BoatRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/BoatRenderer.mapping @@ -1,21 +1,6 @@ CLASS net/minecraft/client/renderer/entity/BoatRenderer - METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Z)V + METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/geom/ModelLayerLocation;)V ARG 1 context - ARG 2 chestBoat - METHOD createBoatModel (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/world/entity/vehicle/Boat$Type;Z)Lnet/minecraft/client/model/ListModel; - ARG 1 context - ARG 2 type - ARG 3 chestBoat - METHOD getTextureLocation (Lnet/minecraft/world/entity/vehicle/Boat$Type;Z)Lnet/minecraft/resources/ResourceLocation; + ARG 2 modelLayer + METHOD lambda$new$0 (Ljava/lang/String;)Ljava/lang/String; ARG 0 type - ARG 1 chestBoat - METHOD getTextureLocation (Lnet/minecraft/world/entity/vehicle/Boat;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/vehicle/Boat;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight diff --git a/data/net/minecraft/client/renderer/entity/CatRenderer.mapping b/data/net/minecraft/client/renderer/entity/CatRenderer.mapping deleted file mode 100644 index 33b61f06c..000000000 --- a/data/net/minecraft/client/renderer/entity/CatRenderer.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/CatRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/Cat;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD scale (Lnet/minecraft/world/entity/animal/Cat;Lcom/mojang/blaze3d/vertex/PoseStack;F)V - ARG 1 livingEntity - ARG 2 poseStack - ARG 3 partialTickTime diff --git a/data/net/minecraft/client/renderer/entity/CaveSpiderRenderer.mapping b/data/net/minecraft/client/renderer/entity/CaveSpiderRenderer.mapping deleted file mode 100644 index 6076698e5..000000000 --- a/data/net/minecraft/client/renderer/entity/CaveSpiderRenderer.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/CaveSpiderRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/CaveSpider;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD scale (Lnet/minecraft/world/entity/monster/CaveSpider;Lcom/mojang/blaze3d/vertex/PoseStack;F)V - ARG 1 livingEntity - ARG 2 poseStack - ARG 3 partialTickTime diff --git a/data/net/minecraft/client/renderer/entity/ChestedHorseRenderer.mapping b/data/net/minecraft/client/renderer/entity/ChestedHorseRenderer.mapping deleted file mode 100644 index 29df44c72..000000000 --- a/data/net/minecraft/client/renderer/entity/ChestedHorseRenderer.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/ChestedHorseRenderer - METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;FLnet/minecraft/client/model/geom/ModelLayerLocation;)V - ARG 1 context - ARG 2 scale - ARG 3 layer - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/horse/AbstractChestedHorse;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/ChickenRenderer.mapping b/data/net/minecraft/client/renderer/entity/ChickenRenderer.mapping deleted file mode 100644 index 6b61af87b..000000000 --- a/data/net/minecraft/client/renderer/entity/ChickenRenderer.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/ChickenRenderer - METHOD getBob (Lnet/minecraft/world/entity/animal/Chicken;F)F - COMMENT Defines what float the third param in setRotationAngles of ModelBase is - ARG 1 livingBase - ARG 2 partialTicks - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/Chicken;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/CodRenderer.mapping b/data/net/minecraft/client/renderer/entity/CodRenderer.mapping deleted file mode 100644 index 633ae0635..000000000 --- a/data/net/minecraft/client/renderer/entity/CodRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/CodRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/Cod;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/CowRenderer.mapping b/data/net/minecraft/client/renderer/entity/CowRenderer.mapping deleted file mode 100644 index 10e18d67e..000000000 --- a/data/net/minecraft/client/renderer/entity/CowRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/CowRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/Cow;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/CreeperRenderer.mapping b/data/net/minecraft/client/renderer/entity/CreeperRenderer.mapping deleted file mode 100644 index 2afdd3f63..000000000 --- a/data/net/minecraft/client/renderer/entity/CreeperRenderer.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/CreeperRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/Creeper;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD getWhiteOverlayProgress (Lnet/minecraft/world/entity/monster/Creeper;F)F - ARG 1 livingEntity - ARG 2 partialTicks - METHOD scale (Lnet/minecraft/world/entity/monster/Creeper;Lcom/mojang/blaze3d/vertex/PoseStack;F)V - ARG 1 livingEntity - ARG 2 poseStack - ARG 3 partialTickTime diff --git a/data/net/minecraft/client/renderer/entity/DisplayRenderer.mapping b/data/net/minecraft/client/renderer/entity/DisplayRenderer.mapping index e5824df26..2995d632f 100644 --- a/data/net/minecraft/client/renderer/entity/DisplayRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/DisplayRenderer.mapping @@ -1,9 +1,8 @@ CLASS net/minecraft/client/renderer/entity/DisplayRenderer - METHOD calculateOrientation (Lnet/minecraft/world/entity/Display$RenderState;Lnet/minecraft/world/entity/Display;FLorg/joml/Quaternionf;)Lorg/joml/Quaternionf; + METHOD calculateOrientation (Lnet/minecraft/world/entity/Display$RenderState;Lnet/minecraft/client/renderer/entity/state/DisplayEntityRenderState;Lorg/joml/Quaternionf;)Lorg/joml/Quaternionf; ARG 1 renderState - ARG 2 entity - ARG 3 partialTick - ARG 4 quaternion + ARG 2 entityRenderState + ARG 3 quaternion METHOD cameraXRot (Lnet/minecraft/client/Camera;)F ARG 0 camera METHOD cameraYrot (Lnet/minecraft/client/Camera;)F @@ -14,22 +13,14 @@ CLASS net/minecraft/client/renderer/entity/DisplayRenderer METHOD entityYRot (Lnet/minecraft/world/entity/Display;F)F ARG 0 entity ARG 1 partialTick - METHOD getSubState (Lnet/minecraft/world/entity/Display;)Ljava/lang/Object; - ARG 1 textDisplay - METHOD render (Lnet/minecraft/world/entity/Display;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTick - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight - METHOD renderInner (Lnet/minecraft/world/entity/Display;Ljava/lang/Object;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;IF)V - ARG 1 textDisplay - ARG 2 renderState - ARG 3 poseStack - ARG 4 buffer - ARG 5 lightmapUV - ARG 6 partialTick + METHOD getBrightnessOverride (Lnet/minecraft/world/entity/Display;)I + ARG 0 display + METHOD renderInner (Lnet/minecraft/client/renderer/entity/state/DisplayEntityRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;IF)V + ARG 1 renderState + ARG 2 poseStack + ARG 3 bufferSource + ARG 4 packedLight + ARG 5 interpolationProgress CLASS TextDisplayRenderer METHOD splitLines (Lnet/minecraft/network/chat/Component;I)Lnet/minecraft/world/entity/Display$TextDisplay$CachedInfo; ARG 1 text diff --git a/data/net/minecraft/client/renderer/entity/DolphinRenderer.mapping b/data/net/minecraft/client/renderer/entity/DolphinRenderer.mapping deleted file mode 100644 index f5596ca4c..000000000 --- a/data/net/minecraft/client/renderer/entity/DolphinRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/DolphinRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/Dolphin;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/DonkeyRenderer.mapping b/data/net/minecraft/client/renderer/entity/DonkeyRenderer.mapping new file mode 100644 index 000000000..8a7b3e67f --- /dev/null +++ b/data/net/minecraft/client/renderer/entity/DonkeyRenderer.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/client/renderer/entity/DonkeyRenderer + METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;FLnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;Z)V + ARG 1 context + ARG 2 scale + ARG 3 adultModelLayer + ARG 4 babyModelLayer + ARG 5 mule diff --git a/data/net/minecraft/client/renderer/entity/DragonFireballRenderer.mapping b/data/net/minecraft/client/renderer/entity/DragonFireballRenderer.mapping index 3de4e5db9..a28b470b2 100644 --- a/data/net/minecraft/client/renderer/entity/DragonFireballRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/DragonFireballRenderer.mapping @@ -2,16 +2,6 @@ CLASS net/minecraft/client/renderer/entity/DragonFireballRenderer METHOD getBlockLightLevel (Lnet/minecraft/world/entity/projectile/DragonFireball;Lnet/minecraft/core/BlockPos;)I ARG 1 entity ARG 2 pos - METHOD getTextureLocation (Lnet/minecraft/world/entity/projectile/DragonFireball;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/projectile/DragonFireball;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight METHOD vertex (Lcom/mojang/blaze3d/vertex/VertexConsumer;Lcom/mojang/blaze3d/vertex/PoseStack$Pose;IFIII)V ARG 0 consumer ARG 1 pose diff --git a/data/net/minecraft/client/renderer/entity/DrownedRenderer.mapping b/data/net/minecraft/client/renderer/entity/DrownedRenderer.mapping deleted file mode 100644 index d8f3ee8cf..000000000 --- a/data/net/minecraft/client/renderer/entity/DrownedRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/DrownedRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/Zombie;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/ElderGuardianRenderer.mapping b/data/net/minecraft/client/renderer/entity/ElderGuardianRenderer.mapping deleted file mode 100644 index 826ef33c0..000000000 --- a/data/net/minecraft/client/renderer/entity/ElderGuardianRenderer.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/ElderGuardianRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/Guardian;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD scale (Lnet/minecraft/world/entity/monster/Guardian;Lcom/mojang/blaze3d/vertex/PoseStack;F)V - ARG 1 livingEntity - ARG 2 poseStack - ARG 3 partialTickTime diff --git a/data/net/minecraft/client/renderer/entity/EndCrystalRenderer.mapping b/data/net/minecraft/client/renderer/entity/EndCrystalRenderer.mapping index bca473afa..c16a2905b 100644 --- a/data/net/minecraft/client/renderer/entity/EndCrystalRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/EndCrystalRenderer.mapping @@ -1,17 +1,6 @@ CLASS net/minecraft/client/renderer/entity/EndCrystalRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/boss/enderdragon/EndCrystal;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD getY (Lnet/minecraft/world/entity/boss/enderdragon/EndCrystal;F)F - ARG 0 endCrystal - ARG 1 partialTick - METHOD render (Lnet/minecraft/world/entity/boss/enderdragon/EndCrystal;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight + METHOD getY (F)F + ARG 0 ageInTicks METHOD shouldRender (Lnet/minecraft/world/entity/boss/enderdragon/EndCrystal;Lnet/minecraft/client/renderer/culling/Frustum;DDD)Z ARG 1 livingEntity ARG 2 camera diff --git a/data/net/minecraft/client/renderer/entity/EnderDragonRenderer.mapping b/data/net/minecraft/client/renderer/entity/EnderDragonRenderer.mapping index b24c1c952..8052c43f2 100644 --- a/data/net/minecraft/client/renderer/entity/EnderDragonRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/EnderDragonRenderer.mapping @@ -1,54 +1,13 @@ CLASS net/minecraft/client/renderer/entity/EnderDragonRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/boss/enderdragon/EnderDragon;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/boss/enderdragon/EnderDragon;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks + METHOD renderCrystalBeams (FFFFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V + ARG 0 offsetX + ARG 1 offsetY + ARG 2 offsetZ + ARG 3 ageInTicks ARG 4 poseStack - ARG 5 buffer + ARG 5 bufferSource ARG 6 packedLight - METHOD renderCrystalBeams (FFFFILcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 0 x - ARG 1 y - ARG 2 z - ARG 3 partialTick - ARG 4 tickCount - ARG 5 poseStack - ARG 6 bufferSource - ARG 7 packedLight METHOD renderRays (Lcom/mojang/blaze3d/vertex/PoseStack;FLcom/mojang/blaze3d/vertex/VertexConsumer;)V ARG 0 poseStack ARG 1 dragonDeathCompletion ARG 2 buffer - CLASS DragonModel - METHOD (Lnet/minecraft/client/model/geom/ModelPart;)V - ARG 1 root - METHOD prepareMobModel (Lnet/minecraft/world/entity/boss/enderdragon/EnderDragon;FFF)V - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 partialTick - METHOD renderSide (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;IIFLnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/client/model/geom/ModelPart;I)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 packedOverlay - ARG 5 rotation - ARG 6 wing - ARG 7 frontLeg - ARG 8 frontLegTip - ARG 9 frontFoot - ARG 10 rearLeg - ARG 11 rearLegTip - ARG 12 rearFoot - ARG 13 alpha - METHOD setupAnim (Lnet/minecraft/world/entity/boss/enderdragon/EnderDragon;FFFFF)V - COMMENT Sets this entity's model rotation angles - ARG 1 entity - ARG 2 limbSwing - ARG 3 limbSwingAmount - ARG 4 ageInTicks - ARG 5 netHeadYaw - ARG 6 headPitch diff --git a/data/net/minecraft/client/renderer/entity/EndermanRenderer.mapping b/data/net/minecraft/client/renderer/entity/EndermanRenderer.mapping deleted file mode 100644 index c16925d54..000000000 --- a/data/net/minecraft/client/renderer/entity/EndermanRenderer.mapping +++ /dev/null @@ -1,14 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/EndermanRenderer - METHOD getRenderOffset (Lnet/minecraft/world/entity/monster/EnderMan;F)Lnet/minecraft/world/phys/Vec3; - ARG 1 entity - ARG 2 partialTicks - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/EnderMan;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/monster/EnderMan;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight diff --git a/data/net/minecraft/client/renderer/entity/EndermiteRenderer.mapping b/data/net/minecraft/client/renderer/entity/EndermiteRenderer.mapping deleted file mode 100644 index 54593ed60..000000000 --- a/data/net/minecraft/client/renderer/entity/EndermiteRenderer.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/EndermiteRenderer - METHOD getFlipDegrees (Lnet/minecraft/world/entity/monster/Endermite;)F - ARG 1 livingEntity - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/Endermite;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/EntityRenderDispatcher.mapping b/data/net/minecraft/client/renderer/entity/EntityRenderDispatcher.mapping index f7ec2aeb5..d26aeab84 100644 --- a/data/net/minecraft/client/renderer/entity/EntityRenderDispatcher.mapping +++ b/data/net/minecraft/client/renderer/entity/EntityRenderDispatcher.mapping @@ -1,14 +1,16 @@ CLASS net/minecraft/client/renderer/entity/EntityRenderDispatcher FIELD playerRenderers Ljava/util/Map; COMMENT lists the various player skin types with their associated Renderer class instances. - METHOD (Lnet/minecraft/client/Minecraft;Lnet/minecraft/client/renderer/texture/TextureManager;Lnet/minecraft/client/renderer/entity/ItemRenderer;Lnet/minecraft/client/renderer/block/BlockRenderDispatcher;Lnet/minecraft/client/gui/Font;Lnet/minecraft/client/Options;Lnet/minecraft/client/model/geom/EntityModelSet;)V + METHOD (Lnet/minecraft/client/Minecraft;Lnet/minecraft/client/renderer/texture/TextureManager;Lnet/minecraft/client/renderer/entity/ItemRenderer;Lnet/minecraft/client/renderer/MapRenderer;Lnet/minecraft/client/renderer/block/BlockRenderDispatcher;Lnet/minecraft/client/gui/Font;Lnet/minecraft/client/Options;Lnet/minecraft/client/model/geom/EntityModelSet;Lnet/minecraft/client/resources/model/EquipmentModelSet;)V ARG 1 minecraft ARG 2 textureManager ARG 3 itemRenderer - ARG 4 blockRenderDispatcher - ARG 5 font - ARG 6 options - ARG 7 entityModels + ARG 4 mapRenderer + ARG 5 blockRenderDispatcher + ARG 6 font + ARG 7 options + ARG 8 entityModels + ARG 9 equipmentModels METHOD distanceToSqr (DDD)D ARG 1 x ARG 3 y @@ -36,19 +38,28 @@ CLASS net/minecraft/client/renderer/entity/EntityRenderDispatcher ARG 1 level ARG 2 activeRenderInfo ARG 3 entity - METHOD render (Lnet/minecraft/world/entity/Entity;DDDFFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V + METHOD render (Lnet/minecraft/world/entity/Entity;DDDFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V ARG 1 entity - ARG 2 x - ARG 4 y - ARG 6 z - ARG 8 rotationYaw - ARG 9 partialTicks - ARG 10 poseStack - ARG 11 buffer - ARG 12 packedLight + ARG 2 xOffset + ARG 4 yOffset + ARG 6 zOffset + ARG 8 partialTick + ARG 9 poseStack + ARG 10 bufferSource + ARG 11 packedLight + METHOD render (Lnet/minecraft/world/entity/Entity;DDDFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/client/renderer/entity/EntityRenderer;)V + ARG 1 entity + ARG 2 xOffset + ARG 4 yOffset + ARG 6 zOffset + ARG 8 partialTick + ARG 9 poseStack + ARG 10 bufferSource + ARG 11 packedLight + ARG 12 renderer METHOD renderBlockShadow (Lcom/mojang/blaze3d/vertex/PoseStack$Pose;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/world/level/chunk/ChunkAccess;Lnet/minecraft/world/level/LevelReader;Lnet/minecraft/core/BlockPos;DDDFF)V ARG 0 pose - ARG 1 vertexConsumer + ARG 1 buffer ARG 2 chunk ARG 3 level ARG 4 pos @@ -57,10 +68,10 @@ CLASS net/minecraft/client/renderer/entity/EntityRenderDispatcher ARG 9 z ARG 11 size ARG 12 weight - METHOD renderFlame (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/world/entity/Entity;Lorg/joml/Quaternionf;)V + METHOD renderFlame (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/renderer/entity/state/EntityRenderState;Lorg/joml/Quaternionf;)V ARG 1 poseStack - ARG 2 buffer - ARG 3 entity + ARG 2 bufferSource + ARG 3 renderState ARG 4 quaternion METHOD renderHitbox (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/world/entity/Entity;FFFF)V ARG 0 poseStack @@ -74,20 +85,14 @@ CLASS net/minecraft/client/renderer/entity/EntityRenderDispatcher ARG 0 poseStack ARG 1 entity ARG 2 bufferSource - METHOD renderShadow (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/world/entity/Entity;FFLnet/minecraft/world/level/LevelReader;F)V + METHOD renderShadow (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/renderer/entity/state/EntityRenderState;FFLnet/minecraft/world/level/LevelReader;F)V ARG 0 poseStack - ARG 1 buffer - ARG 2 entity - ARG 3 weight - ARG 4 partialTicks + ARG 1 bufferSource + ARG 2 renderState + ARG 3 shadowStrength + ARG 4 partialTick ARG 5 level ARG 6 size - METHOD renderVector (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lorg/joml/Vector3f;Lnet/minecraft/world/phys/Vec3;I)V - ARG 0 poseStack - ARG 1 buffer - ARG 2 startPos - ARG 3 vector - ARG 4 color METHOD setLevel (Lnet/minecraft/world/level/Level;)V COMMENT World sets this RenderManager's worldObj to the world provided ARG 1 level diff --git a/data/net/minecraft/client/renderer/entity/EntityRenderer.mapping b/data/net/minecraft/client/renderer/entity/EntityRenderer.mapping index 8f6f42a2c..dc3454ad6 100644 --- a/data/net/minecraft/client/renderer/entity/EntityRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/EntityRenderer.mapping @@ -17,50 +17,55 @@ CLASS net/minecraft/client/renderer/entity/EntityRenderer ARG 12 dz ARG 13 index ARG 14 reverse + METHOD affectedByCulling (Lnet/minecraft/world/entity/Entity;)Z + ARG 1 display + METHOD createRenderState (Lnet/minecraft/world/entity/Entity;F)Lnet/minecraft/client/renderer/entity/state/EntityRenderState; + ARG 1 entity + ARG 2 partialTick + METHOD extractRenderState (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/client/renderer/entity/state/EntityRenderState;F)V + ARG 1 entity + ARG 2 reusedState + ARG 3 partialTick METHOD getBlockLightLevel (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/core/BlockPos;)I ARG 1 entity ARG 2 pos + METHOD getBoundingBoxForCulling (Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/phys/AABB; + ARG 1 minecraft METHOD getFont ()Lnet/minecraft/client/gui/Font; COMMENT Returns the font renderer from the set render manager - METHOD getPackedLightCoords (Lnet/minecraft/world/entity/Entity;F)I + METHOD getNameTag (Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/network/chat/Component; ARG 1 entity - ARG 2 partialTicks - METHOD getRenderOffset (Lnet/minecraft/world/entity/Entity;F)Lnet/minecraft/world/phys/Vec3; + METHOD getPackedLightCoords (Lnet/minecraft/world/entity/Entity;F)I ARG 1 entity ARG 2 partialTicks - METHOD getShadowRadius (Lnet/minecraft/world/entity/Entity;)F - ARG 1 entity + METHOD getRenderOffset (Lnet/minecraft/client/renderer/entity/state/EntityRenderState;)Lnet/minecraft/world/phys/Vec3; + ARG 1 renderState + METHOD getShadowRadius (Lnet/minecraft/client/renderer/entity/state/EntityRenderState;)F + ARG 1 renderState METHOD getSkyLightLevel (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/core/BlockPos;)I ARG 1 entity ARG 2 pos - METHOD getTextureLocation (Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/Entity;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTick - ARG 4 poseStack - ARG 5 bufferSource - ARG 6 packedLight - METHOD renderLeash (Lnet/minecraft/world/entity/Entity;FLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/world/entity/Entity;)V - ARG 1 entity - ARG 2 partialTick - ARG 3 poseStack - ARG 4 bufferSource - ARG 5 leashHolder - METHOD renderNameTag (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/network/chat/Component;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;IF)V - ARG 1 entity + METHOD render (Lnet/minecraft/client/renderer/entity/state/EntityRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V + ARG 1 renderState + ARG 2 poseStack + ARG 3 bufferSource + ARG 4 packedLight + METHOD renderLeash (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/renderer/entity/state/EntityRenderState$LeashState;)V + ARG 0 poseStack + ARG 1 buffer + ARG 2 leashState + METHOD renderNameTag (Lnet/minecraft/client/renderer/entity/state/EntityRenderState;Lnet/minecraft/network/chat/Component;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V + ARG 1 renderState ARG 2 displayName ARG 3 poseStack ARG 4 bufferSource ARG 5 packedLight - ARG 6 partialTick METHOD shouldRender (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/client/renderer/culling/Frustum;DDD)Z ARG 1 livingEntity ARG 2 camera ARG 3 camX ARG 5 camY ARG 7 camZ - METHOD shouldShowName (Lnet/minecraft/world/entity/Entity;)Z + METHOD shouldShowName (Lnet/minecraft/world/entity/Entity;D)Z ARG 1 entity + ARG 2 distanceToCameraSq diff --git a/data/net/minecraft/client/renderer/entity/EntityRendererProvider.mapping b/data/net/minecraft/client/renderer/entity/EntityRendererProvider.mapping index 23437de84..39cb9095a 100644 --- a/data/net/minecraft/client/renderer/entity/EntityRendererProvider.mapping +++ b/data/net/minecraft/client/renderer/entity/EntityRendererProvider.mapping @@ -2,13 +2,14 @@ CLASS net/minecraft/client/renderer/entity/EntityRendererProvider METHOD create (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;)Lnet/minecraft/client/renderer/entity/EntityRenderer; ARG 1 context CLASS Context - METHOD (Lnet/minecraft/client/renderer/entity/EntityRenderDispatcher;Lnet/minecraft/client/renderer/entity/ItemRenderer;Lnet/minecraft/client/renderer/block/BlockRenderDispatcher;Lnet/minecraft/client/renderer/ItemInHandRenderer;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/client/model/geom/EntityModelSet;Lnet/minecraft/client/gui/Font;)V + METHOD (Lnet/minecraft/client/renderer/entity/EntityRenderDispatcher;Lnet/minecraft/client/renderer/entity/ItemRenderer;Lnet/minecraft/client/renderer/MapRenderer;Lnet/minecraft/client/renderer/block/BlockRenderDispatcher;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/client/model/geom/EntityModelSet;Lnet/minecraft/client/resources/model/EquipmentModelSet;Lnet/minecraft/client/gui/Font;)V ARG 1 entityRenderDispatcher ARG 2 itemRenderer - ARG 3 blockRenderDispatcher - ARG 4 itemInHandRenderer + ARG 3 mapRenderer + ARG 4 blockRenderDispatcher ARG 5 resourceManager ARG 6 modelSet - ARG 7 font + ARG 7 equipmentModels + ARG 8 font METHOD bakeLayer (Lnet/minecraft/client/model/geom/ModelLayerLocation;)Lnet/minecraft/client/model/geom/ModelPart; ARG 1 layer diff --git a/data/net/minecraft/client/renderer/entity/EvokerFangsRenderer.mapping b/data/net/minecraft/client/renderer/entity/EvokerFangsRenderer.mapping deleted file mode 100644 index f37b066a6..000000000 --- a/data/net/minecraft/client/renderer/entity/EvokerFangsRenderer.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/EvokerFangsRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/projectile/EvokerFangs;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/projectile/EvokerFangs;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight diff --git a/data/net/minecraft/client/renderer/entity/EvokerRenderer.mapping b/data/net/minecraft/client/renderer/entity/EvokerRenderer.mapping deleted file mode 100644 index eb491829e..000000000 --- a/data/net/minecraft/client/renderer/entity/EvokerRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/EvokerRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/SpellcasterIllager;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.mapping b/data/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.mapping index 2ac3b2d9b..06f9d4305 100644 --- a/data/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/ExperienceOrbRenderer.mapping @@ -2,16 +2,6 @@ CLASS net/minecraft/client/renderer/entity/ExperienceOrbRenderer METHOD getBlockLightLevel (Lnet/minecraft/world/entity/ExperienceOrb;Lnet/minecraft/core/BlockPos;)I ARG 1 entity ARG 2 pos - METHOD getTextureLocation (Lnet/minecraft/world/entity/ExperienceOrb;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/ExperienceOrb;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight METHOD vertex (Lcom/mojang/blaze3d/vertex/VertexConsumer;Lcom/mojang/blaze3d/vertex/PoseStack$Pose;FFIIIFFI)V ARG 0 consumer ARG 1 pose diff --git a/data/net/minecraft/client/renderer/entity/FallingBlockRenderer.mapping b/data/net/minecraft/client/renderer/entity/FallingBlockRenderer.mapping deleted file mode 100644 index a6cd3476a..000000000 --- a/data/net/minecraft/client/renderer/entity/FallingBlockRenderer.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/FallingBlockRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/item/FallingBlockEntity;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/item/FallingBlockEntity;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight diff --git a/data/net/minecraft/client/renderer/entity/FireworkEntityRenderer.mapping b/data/net/minecraft/client/renderer/entity/FireworkEntityRenderer.mapping deleted file mode 100644 index e3e92c88f..000000000 --- a/data/net/minecraft/client/renderer/entity/FireworkEntityRenderer.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/FireworkEntityRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/projectile/FireworkRocketEntity;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/projectile/FireworkRocketEntity;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight diff --git a/data/net/minecraft/client/renderer/entity/FishingHookRenderer.mapping b/data/net/minecraft/client/renderer/entity/FishingHookRenderer.mapping index a1b260074..a9918108b 100644 --- a/data/net/minecraft/client/renderer/entity/FishingHookRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/FishingHookRenderer.mapping @@ -4,17 +4,8 @@ CLASS net/minecraft/client/renderer/entity/FishingHookRenderer ARG 1 denominator METHOD getPlayerHandPos (Lnet/minecraft/world/entity/player/Player;FF)Lnet/minecraft/world/phys/Vec3; ARG 1 player + ARG 2 handAngle ARG 3 partialTick - METHOD getTextureLocation (Lnet/minecraft/world/entity/projectile/FishingHook;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/projectile/FishingHook;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight METHOD stringVertex (FFFLcom/mojang/blaze3d/vertex/VertexConsumer;Lcom/mojang/blaze3d/vertex/PoseStack$Pose;FF)V ARG 0 x ARG 1 y diff --git a/data/net/minecraft/client/renderer/entity/FoxRenderer.mapping b/data/net/minecraft/client/renderer/entity/FoxRenderer.mapping deleted file mode 100644 index 1297202aa..000000000 --- a/data/net/minecraft/client/renderer/entity/FoxRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/FoxRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/Fox;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/GhastRenderer.mapping b/data/net/minecraft/client/renderer/entity/GhastRenderer.mapping deleted file mode 100644 index abc864c67..000000000 --- a/data/net/minecraft/client/renderer/entity/GhastRenderer.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/GhastRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/Ghast;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD scale (Lnet/minecraft/world/entity/monster/Ghast;Lcom/mojang/blaze3d/vertex/PoseStack;F)V - ARG 1 livingEntity - ARG 2 poseStack - ARG 3 partialTickTime diff --git a/data/net/minecraft/client/renderer/entity/GiantMobRenderer.mapping b/data/net/minecraft/client/renderer/entity/GiantMobRenderer.mapping index 9664c6f3c..d0091f929 100644 --- a/data/net/minecraft/client/renderer/entity/GiantMobRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/GiantMobRenderer.mapping @@ -2,10 +2,3 @@ CLASS net/minecraft/client/renderer/entity/GiantMobRenderer METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;F)V ARG 1 context ARG 2 scale - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/Giant;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD scale (Lnet/minecraft/world/entity/monster/Giant;Lcom/mojang/blaze3d/vertex/PoseStack;F)V - ARG 1 livingEntity - ARG 2 poseStack - ARG 3 partialTickTime diff --git a/data/net/minecraft/client/renderer/entity/GuardianRenderer.mapping b/data/net/minecraft/client/renderer/entity/GuardianRenderer.mapping index 962e6c24e..daa61b12d 100644 --- a/data/net/minecraft/client/renderer/entity/GuardianRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/GuardianRenderer.mapping @@ -3,20 +3,19 @@ CLASS net/minecraft/client/renderer/entity/GuardianRenderer ARG 1 context ARG 2 shadowRadius ARG 3 layer + METHOD getEntityToLookAt (Lnet/minecraft/world/entity/monster/Guardian;)Lnet/minecraft/world/entity/Entity; + ARG 0 guardian METHOD getPosition (Lnet/minecraft/world/entity/LivingEntity;DF)Lnet/minecraft/world/phys/Vec3; ARG 1 livingEntity ARG 2 yOffset ARG 4 partialTick - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/Guardian;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/monster/Guardian;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight + METHOD renderBeam (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/world/phys/Vec3;FFF)V + ARG 0 poseStack + ARG 1 buffer + ARG 2 beamVector + ARG 3 attackTime + ARG 4 scale + ARG 5 animationTime METHOD shouldRender (Lnet/minecraft/world/entity/monster/Guardian;Lnet/minecraft/client/renderer/culling/Frustum;DDD)Z ARG 1 livingEntity ARG 2 camera diff --git a/data/net/minecraft/client/renderer/entity/HoglinRenderer.mapping b/data/net/minecraft/client/renderer/entity/HoglinRenderer.mapping deleted file mode 100644 index 62e4c8778..000000000 --- a/data/net/minecraft/client/renderer/entity/HoglinRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/HoglinRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/hoglin/Hoglin;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/HorseRenderer.mapping b/data/net/minecraft/client/renderer/entity/HorseRenderer.mapping index 2f3ea6a6a..817c137b9 100644 --- a/data/net/minecraft/client/renderer/entity/HorseRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/HorseRenderer.mapping @@ -1,6 +1,3 @@ CLASS net/minecraft/client/renderer/entity/HorseRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/horse/Horse;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity METHOD lambda$static$0 (Ljava/util/EnumMap;)V ARG 0 map diff --git a/data/net/minecraft/client/renderer/entity/HumanoidMobRenderer.mapping b/data/net/minecraft/client/renderer/entity/HumanoidMobRenderer.mapping index 5c938a791..9064557a1 100644 --- a/data/net/minecraft/client/renderer/entity/HumanoidMobRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/HumanoidMobRenderer.mapping @@ -3,10 +3,20 @@ CLASS net/minecraft/client/renderer/entity/HumanoidMobRenderer ARG 1 context ARG 2 model ARG 3 shadowRadius - METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/HumanoidModel;FFFF)V + METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/HumanoidModel;Lnet/minecraft/client/model/HumanoidModel;F)V ARG 1 context - ARG 2 model - ARG 3 shadowRadius - ARG 4 scaleX - ARG 5 scaleY - ARG 6 scaleZ + ARG 2 adultModel + ARG 3 babyModel + ARG 4 shadowRadius + METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/HumanoidModel;Lnet/minecraft/client/model/HumanoidModel;FLnet/minecraft/client/renderer/entity/layers/CustomHeadLayer$Transforms;)V + ARG 1 context + ARG 2 adultModel + ARG 3 babyModel + ARG 4 shadowRadius + ARG 5 transforms + METHOD extractHumanoidRenderState (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/client/renderer/entity/state/HumanoidRenderState;F)V + ARG 0 entity + ARG 1 reusedState + ARG 2 partialTick + METHOD getAttackArm (Lnet/minecraft/world/entity/LivingEntity;)Lnet/minecraft/world/entity/HumanoidArm; + ARG 0 entity diff --git a/data/net/minecraft/client/renderer/entity/HuskRenderer.mapping b/data/net/minecraft/client/renderer/entity/HuskRenderer.mapping deleted file mode 100644 index ab3342f80..000000000 --- a/data/net/minecraft/client/renderer/entity/HuskRenderer.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/HuskRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/Zombie;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD scale (Lnet/minecraft/world/entity/monster/Zombie;Lcom/mojang/blaze3d/vertex/PoseStack;F)V - ARG 1 livingEntity - ARG 2 poseStack - ARG 3 partialTickTime diff --git a/data/net/minecraft/client/renderer/entity/IllagerRenderer.mapping b/data/net/minecraft/client/renderer/entity/IllagerRenderer.mapping index 12a89bdd8..275ea810a 100644 --- a/data/net/minecraft/client/renderer/entity/IllagerRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/IllagerRenderer.mapping @@ -3,7 +3,3 @@ CLASS net/minecraft/client/renderer/entity/IllagerRenderer ARG 1 context ARG 2 model ARG 3 shadowRadius - METHOD scale (Lnet/minecraft/world/entity/monster/AbstractIllager;Lcom/mojang/blaze3d/vertex/PoseStack;F)V - ARG 1 livingEntity - ARG 2 poseStack - ARG 3 partialTickTime diff --git a/data/net/minecraft/client/renderer/entity/IllusionerRenderer.mapping b/data/net/minecraft/client/renderer/entity/IllusionerRenderer.mapping deleted file mode 100644 index 787114bfc..000000000 --- a/data/net/minecraft/client/renderer/entity/IllusionerRenderer.mapping +++ /dev/null @@ -1,13 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/IllusionerRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/Illusioner;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD isBodyVisible (Lnet/minecraft/world/entity/monster/Illusioner;)Z - ARG 1 livingEntity - METHOD render (Lnet/minecraft/world/entity/monster/Illusioner;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight diff --git a/data/net/minecraft/client/renderer/entity/IronGolemRenderer.mapping b/data/net/minecraft/client/renderer/entity/IronGolemRenderer.mapping deleted file mode 100644 index 93fd41b5d..000000000 --- a/data/net/minecraft/client/renderer/entity/IronGolemRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/IronGolemRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/IronGolem;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/ItemEntityRenderer.mapping b/data/net/minecraft/client/renderer/entity/ItemEntityRenderer.mapping index fdba119a3..884e2f53e 100644 --- a/data/net/minecraft/client/renderer/entity/ItemEntityRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/ItemEntityRenderer.mapping @@ -3,16 +3,6 @@ CLASS net/minecraft/client/renderer/entity/ItemEntityRenderer ARG 0 count METHOD getSeedForItemStack (Lnet/minecraft/world/item/ItemStack;)I ARG 0 stack - METHOD getTextureLocation (Lnet/minecraft/world/entity/item/ItemEntity;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/item/ItemEntity;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight METHOD renderMultipleFromCount (Lnet/minecraft/client/renderer/entity/ItemRenderer;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/client/resources/model/BakedModel;ZLnet/minecraft/util/RandomSource;)V ARG 0 itemRenderer ARG 1 poseStack diff --git a/data/net/minecraft/client/renderer/entity/ItemFrameRenderer.mapping b/data/net/minecraft/client/renderer/entity/ItemFrameRenderer.mapping index dd93b830f..b677ecb1d 100644 --- a/data/net/minecraft/client/renderer/entity/ItemFrameRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/ItemFrameRenderer.mapping @@ -1,23 +1,8 @@ CLASS net/minecraft/client/renderer/entity/ItemFrameRenderer - METHOD getFrameModelResourceLoc (Lnet/minecraft/world/entity/decoration/ItemFrame;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/client/resources/model/ModelResourceLocation; - ARG 1 entity - ARG 2 item - METHOD getLightVal (Lnet/minecraft/world/entity/decoration/ItemFrame;II)I - ARG 1 itemFrame - ARG 2 glowLightVal - ARG 3 regularLightVal - METHOD getRenderOffset (Lnet/minecraft/world/entity/decoration/ItemFrame;F)Lnet/minecraft/world/phys/Vec3; - ARG 1 entity - ARG 2 partialTicks - METHOD getTextureLocation (Lnet/minecraft/world/entity/decoration/ItemFrame;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/decoration/ItemFrame;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight - METHOD shouldShowName (Lnet/minecraft/world/entity/decoration/ItemFrame;)Z - ARG 1 entity + METHOD getFrameModelResourceLoc (ZLnet/minecraft/world/item/ItemStack;)Lnet/minecraft/client/resources/model/ModelResourceLocation; + ARG 1 isGlowFrame + ARG 2 stack + METHOD getLightVal (ZII)I + ARG 1 isGlowFrame + ARG 2 glowLightValue + ARG 3 lightValue diff --git a/data/net/minecraft/client/renderer/entity/ItemRenderer.mapping b/data/net/minecraft/client/renderer/entity/ItemRenderer.mapping index 49a3fc029..c000ac05c 100644 --- a/data/net/minecraft/client/renderer/entity/ItemRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/ItemRenderer.mapping @@ -1,10 +1,8 @@ CLASS net/minecraft/client/renderer/entity/ItemRenderer - METHOD (Lnet/minecraft/client/Minecraft;Lnet/minecraft/client/renderer/texture/TextureManager;Lnet/minecraft/client/resources/model/ModelManager;Lnet/minecraft/client/color/item/ItemColors;Lnet/minecraft/client/renderer/BlockEntityWithoutLevelRenderer;)V - ARG 1 minecraft - ARG 2 textureManager - ARG 3 modelManager - ARG 4 itemColors - ARG 5 blockEntityRenderer + METHOD (Lnet/minecraft/client/resources/model/ModelManager;Lnet/minecraft/client/color/item/ItemColors;Lnet/minecraft/client/renderer/BlockEntityWithoutLevelRenderer;)V + ARG 1 modelManager + ARG 2 itemColors + ARG 3 blockEntityRenderer METHOD getArmorFoilBuffer (Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/renderer/RenderType;Z)Lcom/mojang/blaze3d/vertex/VertexConsumer; ARG 0 bufferSource ARG 1 renderType @@ -18,11 +16,6 @@ CLASS net/minecraft/client/renderer/entity/ItemRenderer ARG 1 renderType ARG 2 isItem ARG 3 glint - METHOD getFoilBufferDirect (Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/renderer/RenderType;ZZ)Lcom/mojang/blaze3d/vertex/VertexConsumer; - ARG 0 bufferSource - ARG 1 renderType - ARG 2 noEntity - ARG 3 withGlint METHOD getModel (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;I)Lnet/minecraft/client/resources/model/BakedModel; ARG 1 stack ARG 2 level @@ -38,14 +31,46 @@ CLASS net/minecraft/client/renderer/entity/ItemRenderer ARG 3 leftHand ARG 4 poseStack ARG 5 bufferSource - ARG 6 combinedLight - ARG 7 combinedOverlay + ARG 6 packedLIght + ARG 7 packedOverlay + ARG 8 model + METHOD renderBundleItem (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemDisplayContext;ZLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;IILnet/minecraft/client/resources/model/BakedModel;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;I)V + ARG 1 itemStack + ARG 2 displayContext + ARG 3 leftHand + ARG 4 poseStack + ARG 5 bufferSource + ARG 6 packedLight + ARG 7 packedOverlay ARG 8 model + ARG 9 level + ARG 10 entity + ARG 11 seed + METHOD renderItem (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemDisplayContext;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;IILnet/minecraft/client/resources/model/BakedModel;Z)V + ARG 1 itemStack + ARG 2 displayContext + ARG 3 poseStack + ARG 4 bufferSource + ARG 5 packedLight + ARG 6 packedOverlay + ARG 7 model + ARG 8 renderOpenBundle + METHOD renderItemModelRaw (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemDisplayContext;ZLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;IILnet/minecraft/client/resources/model/BakedModel;ZF)V + ARG 1 itemStack + ARG 2 displayContext + ARG 3 leftHand + ARG 4 poseStack + ARG 5 bufferSource + ARG 6 packedLight + ARG 7 packedOverlay + ARG 8 model + ARG 9 renderOpenBundle + ARG 10 z METHOD renderModelLists (Lnet/minecraft/client/resources/model/BakedModel;Lnet/minecraft/world/item/ItemStack;IILcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;)V ARG 1 model ARG 2 stack - ARG 3 combinedLight - ARG 4 combinedOverlay + ARG 3 packedLight + ARG 4 packedOverlay ARG 5 poseStack ARG 6 buffer METHOD renderQuadList (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;Ljava/util/List;Lnet/minecraft/world/item/ItemStack;II)V @@ -55,6 +80,16 @@ CLASS net/minecraft/client/renderer/entity/ItemRenderer ARG 4 itemStack ARG 5 combinedLight ARG 6 combinedOverlay + METHOD renderSimpleItemModel (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemDisplayContext;ZLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;IILnet/minecraft/client/resources/model/BakedModel;Z)V + ARG 1 itemStack + ARG 2 displayContext + ARG 3 leftHand + ARG 4 poseStack + ARG 5 bufferSource + ARG 6 packedLight + ARG 7 packedOverlay + ARG 8 model + ARG 9 renderOpenBundle METHOD renderStatic (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemDisplayContext;ZLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/world/level/Level;III)V ARG 1 entity ARG 2 itemStack @@ -75,3 +110,15 @@ CLASS net/minecraft/client/renderer/entity/ItemRenderer ARG 6 bufferSource ARG 7 level ARG 8 seed + METHOD resolveItemModel (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemDisplayContext;)Lnet/minecraft/client/resources/model/BakedModel; + ARG 1 stack + ARG 2 entity + ARG 3 displayContext + METHOD resolveModelOverride (Lnet/minecraft/client/resources/model/BakedModel;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;I)Lnet/minecraft/client/resources/model/BakedModel; + ARG 1 model + ARG 2 stack + ARG 3 level + ARG 4 entity + ARG 5 seed + METHOD shouldRenderItemFlat (Lnet/minecraft/world/item/ItemDisplayContext;)Z + ARG 0 displayContent diff --git a/data/net/minecraft/client/renderer/entity/LeashKnotRenderer.mapping b/data/net/minecraft/client/renderer/entity/LeashKnotRenderer.mapping deleted file mode 100644 index 13ecf298c..000000000 --- a/data/net/minecraft/client/renderer/entity/LeashKnotRenderer.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/LeashKnotRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/decoration/LeashFenceKnotEntity;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/decoration/LeashFenceKnotEntity;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight diff --git a/data/net/minecraft/client/renderer/entity/LightningBoltRenderer.mapping b/data/net/minecraft/client/renderer/entity/LightningBoltRenderer.mapping index 2c3991eb5..78d80e36c 100644 --- a/data/net/minecraft/client/renderer/entity/LightningBoltRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/LightningBoltRenderer.mapping @@ -1,22 +1,18 @@ CLASS net/minecraft/client/renderer/entity/LightningBoltRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/LightningBolt;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity METHOD quad (Lorg/joml/Matrix4f;Lcom/mojang/blaze3d/vertex/VertexConsumer;FFIFFFFFFFZZZZ)V - ARG 0 matrix - ARG 1 consumer + ARG 0 pose + ARG 1 buffer ARG 2 x1 ARG 3 z1 - ARG 4 index + ARG 4 sectionY ARG 5 x2 ARG 6 z2 ARG 7 red ARG 8 green ARG 9 blue - METHOD render (Lnet/minecraft/world/entity/LightningBolt;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight + ARG 10 innerThickness + ARG 11 outerThickness + ARG 12 addThicknessLeftSideX + ARG 13 addThicknessLeftSideZ + ARG 14 addThicknessRightSideX + ARG 15 addThicknessRightSideZ diff --git a/data/net/minecraft/client/renderer/entity/LivingEntityRenderer.mapping b/data/net/minecraft/client/renderer/entity/LivingEntityRenderer.mapping index d73556ae1..498ff2734 100644 --- a/data/net/minecraft/client/renderer/entity/LivingEntityRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/LivingEntityRenderer.mapping @@ -5,52 +5,39 @@ CLASS net/minecraft/client/renderer/entity/LivingEntityRenderer ARG 3 shadowRadius METHOD addLayer (Lnet/minecraft/client/renderer/entity/layers/RenderLayer;)Z ARG 1 layer - METHOD getAttackAnim (Lnet/minecraft/world/entity/LivingEntity;F)F - COMMENT Returns where in the swing animation the living entity is (from 0 to 1). Args : entity, partialTickTime - ARG 1 livingBase - ARG 2 partialTickTime - METHOD getBob (Lnet/minecraft/world/entity/LivingEntity;F)F - COMMENT Defines what float the third param in setRotationAngles of ModelBase is - ARG 1 livingBase - ARG 2 partialTick - METHOD getFlipDegrees (Lnet/minecraft/world/entity/LivingEntity;)F - ARG 1 livingEntity - METHOD getOverlayCoords (Lnet/minecraft/world/entity/LivingEntity;F)I - ARG 0 livingEntity - ARG 1 u - METHOD getRenderType (Lnet/minecraft/world/entity/LivingEntity;ZZZ)Lnet/minecraft/client/renderer/RenderType; - ARG 1 livingEntity - ARG 2 bodyVisible - ARG 3 translucent - ARG 4 glowing - METHOD getWhiteOverlayProgress (Lnet/minecraft/world/entity/LivingEntity;F)F - ARG 1 livingEntity - ARG 2 partialTicks - METHOD isBodyVisible (Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 1 livingEntity + METHOD getModelTint (Lnet/minecraft/client/renderer/entity/state/LivingEntityRenderState;)I + ARG 1 renderState + METHOD getOverlayCoords (Lnet/minecraft/client/renderer/entity/state/LivingEntityRenderState;F)I + ARG 0 renderState + ARG 1 overlay + METHOD getRenderType (Lnet/minecraft/client/renderer/entity/state/LivingEntityRenderState;ZZZ)Lnet/minecraft/client/renderer/RenderType; + ARG 1 renderState + ARG 2 isVisible + ARG 3 renderTranslucent + ARG 4 appearsGlowing + METHOD getTextureLocation (Lnet/minecraft/client/renderer/entity/state/LivingEntityRenderState;)Lnet/minecraft/resources/ResourceLocation; + ARG 1 renderState + METHOD getWhiteOverlayProgress (Lnet/minecraft/client/renderer/entity/state/LivingEntityRenderState;)F + ARG 1 renderState + METHOD isBodyVisible (Lnet/minecraft/client/renderer/entity/state/LivingEntityRenderState;)Z + ARG 1 renderState METHOD isEntityUpsideDown (Lnet/minecraft/world/entity/LivingEntity;)Z ARG 0 entity - METHOD isShaking (Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/LivingEntity;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight - METHOD scale (Lnet/minecraft/world/entity/LivingEntity;Lcom/mojang/blaze3d/vertex/PoseStack;F)V - ARG 1 livingEntity + METHOD isShaking (Lnet/minecraft/client/renderer/entity/state/LivingEntityRenderState;)Z + ARG 1 renderState + METHOD scale (Lnet/minecraft/client/renderer/entity/state/LivingEntityRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;)V + ARG 1 renderState ARG 2 poseStack - ARG 3 partialTickTime - METHOD setupRotations (Lnet/minecraft/world/entity/LivingEntity;Lcom/mojang/blaze3d/vertex/PoseStack;FFFF)V - ARG 1 entity + METHOD setupRotations (Lnet/minecraft/client/renderer/entity/state/LivingEntityRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;FF)V + ARG 1 renderState ARG 2 poseStack - ARG 3 bob - ARG 4 yBodyRot - ARG 5 partialTick - ARG 6 scale - METHOD shouldShowName (Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 1 entity + ARG 3 bodyRot + ARG 4 scale + METHOD shouldRenderLayers (Lnet/minecraft/client/renderer/entity/state/LivingEntityRenderState;)Z + ARG 1 renderState METHOD sleepDirectionToRotation (Lnet/minecraft/core/Direction;)F ARG 0 facing + METHOD solveBodyRot (Lnet/minecraft/world/entity/LivingEntity;FF)F + ARG 0 entity + ARG 1 yHeadRot + ARG 2 partialTick diff --git a/data/net/minecraft/client/renderer/entity/LlamaRenderer.mapping b/data/net/minecraft/client/renderer/entity/LlamaRenderer.mapping index 17c56301b..daafa27c1 100644 --- a/data/net/minecraft/client/renderer/entity/LlamaRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/LlamaRenderer.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/client/renderer/entity/LlamaRenderer - METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/geom/ModelLayerLocation;)V + METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;)V ARG 1 context - ARG 2 layer - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/horse/Llama;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity + ARG 2 adultModel + ARG 3 babyModel diff --git a/data/net/minecraft/client/renderer/entity/LlamaSpitRenderer.mapping b/data/net/minecraft/client/renderer/entity/LlamaSpitRenderer.mapping deleted file mode 100644 index 79ec18aff..000000000 --- a/data/net/minecraft/client/renderer/entity/LlamaSpitRenderer.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/LlamaSpitRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/projectile/LlamaSpit;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/projectile/LlamaSpit;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight diff --git a/data/net/minecraft/client/renderer/entity/MagmaCubeRenderer.mapping b/data/net/minecraft/client/renderer/entity/MagmaCubeRenderer.mapping index 803d3893f..099e13865 100644 --- a/data/net/minecraft/client/renderer/entity/MagmaCubeRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/MagmaCubeRenderer.mapping @@ -2,10 +2,3 @@ CLASS net/minecraft/client/renderer/entity/MagmaCubeRenderer METHOD getBlockLightLevel (Lnet/minecraft/world/entity/monster/MagmaCube;Lnet/minecraft/core/BlockPos;)I ARG 1 entity ARG 2 pos - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/MagmaCube;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD scale (Lnet/minecraft/world/entity/monster/MagmaCube;Lcom/mojang/blaze3d/vertex/PoseStack;F)V - ARG 1 livingEntity - ARG 2 poseStack - ARG 3 partialTickTime diff --git a/data/net/minecraft/client/renderer/entity/MinecartRenderer.mapping b/data/net/minecraft/client/renderer/entity/MinecartRenderer.mapping index 77abf29e8..4ee7db0d5 100644 --- a/data/net/minecraft/client/renderer/entity/MinecartRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/MinecartRenderer.mapping @@ -2,20 +2,3 @@ CLASS net/minecraft/client/renderer/entity/MinecartRenderer METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/geom/ModelLayerLocation;)V ARG 1 context ARG 2 layer - METHOD getTextureLocation (Lnet/minecraft/world/entity/vehicle/AbstractMinecart;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/vehicle/AbstractMinecart;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight - METHOD renderMinecartContents (Lnet/minecraft/world/entity/vehicle/AbstractMinecart;FLnet/minecraft/world/level/block/state/BlockState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 partialTicks - ARG 3 state - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight diff --git a/data/net/minecraft/client/renderer/entity/MobRenderer.mapping b/data/net/minecraft/client/renderer/entity/MobRenderer.mapping deleted file mode 100644 index b008bf25f..000000000 --- a/data/net/minecraft/client/renderer/entity/MobRenderer.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/MobRenderer - METHOD shouldShowName (Lnet/minecraft/world/entity/Mob;)Z - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/MushroomCowRenderer.mapping b/data/net/minecraft/client/renderer/entity/MushroomCowRenderer.mapping index 87ef263f4..c8aa09341 100644 --- a/data/net/minecraft/client/renderer/entity/MushroomCowRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/MushroomCowRenderer.mapping @@ -1,6 +1,3 @@ CLASS net/minecraft/client/renderer/entity/MushroomCowRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/MushroomCow;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity METHOD lambda$static$0 (Ljava/util/HashMap;)V ARG 0 map diff --git a/data/net/minecraft/client/renderer/entity/OcelotRenderer.mapping b/data/net/minecraft/client/renderer/entity/OcelotRenderer.mapping deleted file mode 100644 index 59dc0bb03..000000000 --- a/data/net/minecraft/client/renderer/entity/OcelotRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/OcelotRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/Ocelot;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/PaintingRenderer.mapping b/data/net/minecraft/client/renderer/entity/PaintingRenderer.mapping index 9ace4b85f..e55959898 100644 --- a/data/net/minecraft/client/renderer/entity/PaintingRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/PaintingRenderer.mapping @@ -1,21 +1,11 @@ CLASS net/minecraft/client/renderer/entity/PaintingRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/decoration/Painting;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/decoration/Painting;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight - METHOD renderPainting (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;Lnet/minecraft/world/entity/decoration/Painting;IILnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;)V + METHOD renderPainting (Lcom/mojang/blaze3d/vertex/PoseStack;Lcom/mojang/blaze3d/vertex/VertexConsumer;[IIILnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;)V ARG 1 poseStack - ARG 2 consumer - ARG 3 painting + ARG 2 buffer + ARG 3 lightCoords ARG 4 width ARG 5 height - ARG 6 paintingSprite + ARG 6 frontSprite ARG 7 backSprite METHOD vertex (Lcom/mojang/blaze3d/vertex/PoseStack$Pose;Lcom/mojang/blaze3d/vertex/VertexConsumer;FFFFFIIII)V ARG 1 pose diff --git a/data/net/minecraft/client/renderer/entity/PandaRenderer.mapping b/data/net/minecraft/client/renderer/entity/PandaRenderer.mapping index 3050385f7..10f332423 100644 --- a/data/net/minecraft/client/renderer/entity/PandaRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/PandaRenderer.mapping @@ -5,8 +5,5 @@ CLASS net/minecraft/client/renderer/entity/PandaRenderer ARG 3 nextRollCounter ARG 4 partialTick ARG 5 rollEndCount - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/Panda;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity METHOD lambda$static$0 (Ljava/util/EnumMap;)V ARG 0 map diff --git a/data/net/minecraft/client/renderer/entity/ParrotRenderer.mapping b/data/net/minecraft/client/renderer/entity/ParrotRenderer.mapping index 5467f7d65..2d14b0ca7 100644 --- a/data/net/minecraft/client/renderer/entity/ParrotRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/ParrotRenderer.mapping @@ -1,10 +1,3 @@ CLASS net/minecraft/client/renderer/entity/ParrotRenderer - METHOD getBob (Lnet/minecraft/world/entity/animal/Parrot;F)F - COMMENT Defines what float the third param in setRotationAngles of ModelBase is - ARG 1 livingBase - ARG 2 partialTicks - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/Parrot;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity METHOD getVariantTexture (Lnet/minecraft/world/entity/animal/Parrot$Variant;)Lnet/minecraft/resources/ResourceLocation; ARG 0 variant diff --git a/data/net/minecraft/client/renderer/entity/PhantomRenderer.mapping b/data/net/minecraft/client/renderer/entity/PhantomRenderer.mapping deleted file mode 100644 index fc3f477b3..000000000 --- a/data/net/minecraft/client/renderer/entity/PhantomRenderer.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/PhantomRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/Phantom;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD scale (Lnet/minecraft/world/entity/monster/Phantom;Lcom/mojang/blaze3d/vertex/PoseStack;F)V - ARG 1 livingEntity - ARG 2 poseStack - ARG 3 partialTickTime diff --git a/data/net/minecraft/client/renderer/entity/PigRenderer.mapping b/data/net/minecraft/client/renderer/entity/PigRenderer.mapping deleted file mode 100644 index e060b7900..000000000 --- a/data/net/minecraft/client/renderer/entity/PigRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/PigRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/Pig;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/PiglinRenderer.mapping b/data/net/minecraft/client/renderer/entity/PiglinRenderer.mapping index eb31f6ca4..ad511dea5 100644 --- a/data/net/minecraft/client/renderer/entity/PiglinRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/PiglinRenderer.mapping @@ -1,12 +1,9 @@ CLASS net/minecraft/client/renderer/entity/PiglinRenderer - METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;Z)V + METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;)V ARG 1 context - ARG 2 layer - ARG 5 noRightEar - METHOD createModel (Lnet/minecraft/client/model/geom/EntityModelSet;Lnet/minecraft/client/model/geom/ModelLayerLocation;Z)Lnet/minecraft/client/model/PiglinModel; - ARG 0 modelSet - ARG 1 layer - ARG 2 noRightEar - METHOD getTextureLocation (Lnet/minecraft/world/entity/Mob;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity + ARG 2 adultModelLayer + ARG 3 babyModelLayer + ARG 4 innerModel + ARG 5 outerModel + ARG 6 innerModelBaby + ARG 7 outerModelBaby diff --git a/data/net/minecraft/client/renderer/entity/PillagerRenderer.mapping b/data/net/minecraft/client/renderer/entity/PillagerRenderer.mapping deleted file mode 100644 index d9fec4721..000000000 --- a/data/net/minecraft/client/renderer/entity/PillagerRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/PillagerRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/Pillager;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/PolarBearRenderer.mapping b/data/net/minecraft/client/renderer/entity/PolarBearRenderer.mapping deleted file mode 100644 index f19b703f2..000000000 --- a/data/net/minecraft/client/renderer/entity/PolarBearRenderer.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/PolarBearRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/PolarBear;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD scale (Lnet/minecraft/world/entity/animal/PolarBear;Lcom/mojang/blaze3d/vertex/PoseStack;F)V - ARG 1 livingEntity - ARG 2 poseStack - ARG 3 partialTickTime diff --git a/data/net/minecraft/client/renderer/entity/PufferfishRenderer.mapping b/data/net/minecraft/client/renderer/entity/PufferfishRenderer.mapping deleted file mode 100644 index 9e350ff66..000000000 --- a/data/net/minecraft/client/renderer/entity/PufferfishRenderer.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/PufferfishRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/Pufferfish;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/animal/Pufferfish;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight diff --git a/data/net/minecraft/client/renderer/entity/RabbitRenderer.mapping b/data/net/minecraft/client/renderer/entity/RabbitRenderer.mapping deleted file mode 100644 index da02b81dc..000000000 --- a/data/net/minecraft/client/renderer/entity/RabbitRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/RabbitRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/Rabbit;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/CamelRenderer.mapping b/data/net/minecraft/client/renderer/entity/RaftRenderer.mapping similarity index 66% rename from data/net/minecraft/client/renderer/entity/CamelRenderer.mapping rename to data/net/minecraft/client/renderer/entity/RaftRenderer.mapping index 682c43619..7359a1a62 100644 --- a/data/net/minecraft/client/renderer/entity/CamelRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/RaftRenderer.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/client/renderer/entity/CamelRenderer +CLASS net/minecraft/client/renderer/entity/RaftRenderer METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/geom/ModelLayerLocation;)V ARG 1 context - ARG 2 layerLocation + ARG 2 modelLayer diff --git a/data/net/minecraft/client/renderer/entity/RavagerRenderer.mapping b/data/net/minecraft/client/renderer/entity/RavagerRenderer.mapping deleted file mode 100644 index 630514725..000000000 --- a/data/net/minecraft/client/renderer/entity/RavagerRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/RavagerRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/Ravager;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/RenderLayerParent.mapping b/data/net/minecraft/client/renderer/entity/RenderLayerParent.mapping deleted file mode 100644 index 1566f8ed6..000000000 --- a/data/net/minecraft/client/renderer/entity/RenderLayerParent.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/RenderLayerParent - METHOD getTextureLocation (Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/SalmonRenderer.mapping b/data/net/minecraft/client/renderer/entity/SalmonRenderer.mapping deleted file mode 100644 index ea51f8444..000000000 --- a/data/net/minecraft/client/renderer/entity/SalmonRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/SalmonRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/Salmon;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/SheepRenderer.mapping b/data/net/minecraft/client/renderer/entity/SheepRenderer.mapping deleted file mode 100644 index 6a21dadb3..000000000 --- a/data/net/minecraft/client/renderer/entity/SheepRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/SheepRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/Sheep;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/ShulkerBulletRenderer.mapping b/data/net/minecraft/client/renderer/entity/ShulkerBulletRenderer.mapping index 4264f5b59..027209be7 100644 --- a/data/net/minecraft/client/renderer/entity/ShulkerBulletRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/ShulkerBulletRenderer.mapping @@ -2,13 +2,3 @@ CLASS net/minecraft/client/renderer/entity/ShulkerBulletRenderer METHOD getBlockLightLevel (Lnet/minecraft/world/entity/projectile/ShulkerBullet;Lnet/minecraft/core/BlockPos;)I ARG 1 entity ARG 2 pos - METHOD getTextureLocation (Lnet/minecraft/world/entity/projectile/ShulkerBullet;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/projectile/ShulkerBullet;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight diff --git a/data/net/minecraft/client/renderer/entity/ShulkerRenderer.mapping b/data/net/minecraft/client/renderer/entity/ShulkerRenderer.mapping index 144eceff4..1fe45ea4a 100644 --- a/data/net/minecraft/client/renderer/entity/ShulkerRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/ShulkerRenderer.mapping @@ -1,10 +1,4 @@ CLASS net/minecraft/client/renderer/entity/ShulkerRenderer - METHOD getRenderOffset (Lnet/minecraft/world/entity/monster/Shulker;F)Lnet/minecraft/world/phys/Vec3; - ARG 1 entity - ARG 2 partialTicks - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/Shulker;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity METHOD getTextureLocation (Lnet/minecraft/world/item/DyeColor;)Lnet/minecraft/resources/ResourceLocation; ARG 0 color METHOD shouldRender (Lnet/minecraft/world/entity/monster/Shulker;Lnet/minecraft/client/renderer/culling/Frustum;DDD)Z diff --git a/data/net/minecraft/client/renderer/entity/SilverfishRenderer.mapping b/data/net/minecraft/client/renderer/entity/SilverfishRenderer.mapping deleted file mode 100644 index dc7da4089..000000000 --- a/data/net/minecraft/client/renderer/entity/SilverfishRenderer.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/SilverfishRenderer - METHOD getFlipDegrees (Lnet/minecraft/world/entity/monster/Silverfish;)F - ARG 1 livingEntity - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/Silverfish;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/SlimeRenderer.mapping b/data/net/minecraft/client/renderer/entity/SlimeRenderer.mapping deleted file mode 100644 index be3f5687a..000000000 --- a/data/net/minecraft/client/renderer/entity/SlimeRenderer.mapping +++ /dev/null @@ -1,15 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/SlimeRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/Slime;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/monster/Slime;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight - METHOD scale (Lnet/minecraft/world/entity/monster/Slime;Lcom/mojang/blaze3d/vertex/PoseStack;F)V - ARG 1 livingEntity - ARG 2 poseStack - ARG 3 partialTickTime diff --git a/data/net/minecraft/client/renderer/entity/SnowGolemRenderer.mapping b/data/net/minecraft/client/renderer/entity/SnowGolemRenderer.mapping deleted file mode 100644 index 1b3e85478..000000000 --- a/data/net/minecraft/client/renderer/entity/SnowGolemRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/SnowGolemRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/SnowGolem;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/SpectralArrowRenderer.mapping b/data/net/minecraft/client/renderer/entity/SpectralArrowRenderer.mapping deleted file mode 100644 index 4daae4589..000000000 --- a/data/net/minecraft/client/renderer/entity/SpectralArrowRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/SpectralArrowRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/projectile/SpectralArrow;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/SpiderRenderer.mapping b/data/net/minecraft/client/renderer/entity/SpiderRenderer.mapping index 86f85ce8f..15d788df0 100644 --- a/data/net/minecraft/client/renderer/entity/SpiderRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/SpiderRenderer.mapping @@ -2,8 +2,3 @@ CLASS net/minecraft/client/renderer/entity/SpiderRenderer METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/geom/ModelLayerLocation;)V ARG 1 context ARG 2 layer - METHOD getFlipDegrees (Lnet/minecraft/world/entity/monster/Spider;)F - ARG 1 livingEntity - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/Spider;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/SquidRenderer.mapping b/data/net/minecraft/client/renderer/entity/SquidRenderer.mapping index 435acbc02..71fd47a2c 100644 --- a/data/net/minecraft/client/renderer/entity/SquidRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/SquidRenderer.mapping @@ -1,11 +1,5 @@ CLASS net/minecraft/client/renderer/entity/SquidRenderer - METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/SquidModel;)V + METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/SquidModel;Lnet/minecraft/client/model/SquidModel;)V ARG 1 context - ARG 2 model - METHOD getBob (Lnet/minecraft/world/entity/animal/Squid;F)F - COMMENT Defines what float the third param in setRotationAngles of ModelBase is - ARG 1 livingBase - ARG 2 partialTicks - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/Squid;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity + ARG 2 adultModel + ARG 3 babyModel diff --git a/data/net/minecraft/client/renderer/entity/StrayRenderer.mapping b/data/net/minecraft/client/renderer/entity/StrayRenderer.mapping deleted file mode 100644 index 24ee1ed1e..000000000 --- a/data/net/minecraft/client/renderer/entity/StrayRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/StrayRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/Stray;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/StriderRenderer.mapping b/data/net/minecraft/client/renderer/entity/StriderRenderer.mapping deleted file mode 100644 index 496ea9eb6..000000000 --- a/data/net/minecraft/client/renderer/entity/StriderRenderer.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/StriderRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/Strider;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD scale (Lnet/minecraft/world/entity/monster/Strider;Lcom/mojang/blaze3d/vertex/PoseStack;F)V - ARG 1 livingEntity - ARG 2 poseStack - ARG 3 partialTickTime diff --git a/data/net/minecraft/client/renderer/entity/ThrownItemRenderer.mapping b/data/net/minecraft/client/renderer/entity/ThrownItemRenderer.mapping index b06d144f4..754a1fcea 100644 --- a/data/net/minecraft/client/renderer/entity/ThrownItemRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/ThrownItemRenderer.mapping @@ -6,13 +6,3 @@ CLASS net/minecraft/client/renderer/entity/ThrownItemRenderer METHOD getBlockLightLevel (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/core/BlockPos;)I ARG 1 entity ARG 2 pos - METHOD getTextureLocation (Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/Entity;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight diff --git a/data/net/minecraft/client/renderer/entity/ThrownTridentRenderer.mapping b/data/net/minecraft/client/renderer/entity/ThrownTridentRenderer.mapping deleted file mode 100644 index ce4fc21fc..000000000 --- a/data/net/minecraft/client/renderer/entity/ThrownTridentRenderer.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/ThrownTridentRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/projectile/ThrownTrident;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/projectile/ThrownTrident;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight diff --git a/data/net/minecraft/client/renderer/entity/TippableArrowRenderer.mapping b/data/net/minecraft/client/renderer/entity/TippableArrowRenderer.mapping deleted file mode 100644 index d9acdd345..000000000 --- a/data/net/minecraft/client/renderer/entity/TippableArrowRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/TippableArrowRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/projectile/Arrow;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/TntMinecartRenderer.mapping b/data/net/minecraft/client/renderer/entity/TntMinecartRenderer.mapping index 524f4c237..4150ce395 100644 --- a/data/net/minecraft/client/renderer/entity/TntMinecartRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/TntMinecartRenderer.mapping @@ -1,11 +1,4 @@ CLASS net/minecraft/client/renderer/entity/TntMinecartRenderer - METHOD renderMinecartContents (Lnet/minecraft/world/entity/vehicle/MinecartTNT;FLnet/minecraft/world/level/block/state/BlockState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 partialTicks - ARG 3 state - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight METHOD renderWhiteSolidBlock (Lnet/minecraft/client/renderer/block/BlockRenderDispatcher;Lnet/minecraft/world/level/block/state/BlockState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;IZ)V ARG 0 blockRenderDispatcher ARG 1 state diff --git a/data/net/minecraft/client/renderer/entity/TntRenderer.mapping b/data/net/minecraft/client/renderer/entity/TntRenderer.mapping deleted file mode 100644 index 5592fa958..000000000 --- a/data/net/minecraft/client/renderer/entity/TntRenderer.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/TntRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/item/PrimedTnt;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/item/PrimedTnt;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight diff --git a/data/net/minecraft/client/renderer/entity/TropicalFishRenderer.mapping b/data/net/minecraft/client/renderer/entity/TropicalFishRenderer.mapping index eac851401..35e0edfe7 100644 --- a/data/net/minecraft/client/renderer/entity/TropicalFishRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/TropicalFishRenderer.mapping @@ -3,13 +3,3 @@ CLASS net/minecraft/client/renderer/entity/TropicalFishRenderer COMMENT Breaking recompile intentionally since modelA/B incorrectly mapped. FIELD modelB Lnet/minecraft/client/model/ColorableHierarchicalModel; COMMENT Breaking recompile intentionally since modelA/B incorrectly mapped. - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/TropicalFish;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/animal/TropicalFish;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight diff --git a/data/net/minecraft/client/renderer/entity/TurtleRenderer.mapping b/data/net/minecraft/client/renderer/entity/TurtleRenderer.mapping deleted file mode 100644 index f08550ecd..000000000 --- a/data/net/minecraft/client/renderer/entity/TurtleRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/TurtleRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/Turtle;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/UndeadHorseRenderer.mapping b/data/net/minecraft/client/renderer/entity/UndeadHorseRenderer.mapping index 47e214ca7..c13101197 100644 --- a/data/net/minecraft/client/renderer/entity/UndeadHorseRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/UndeadHorseRenderer.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/client/renderer/entity/UndeadHorseRenderer - METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/geom/ModelLayerLocation;)V + METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;Z)V ARG 1 context - ARG 2 layer - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/horse/AbstractHorse;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity + ARG 2 adultModelLayer + ARG 3 babyModelLayer + ARG 4 skeletonHorse diff --git a/data/net/minecraft/client/renderer/entity/VexRenderer.mapping b/data/net/minecraft/client/renderer/entity/VexRenderer.mapping index c17c9a566..f9f066f17 100644 --- a/data/net/minecraft/client/renderer/entity/VexRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/VexRenderer.mapping @@ -2,6 +2,3 @@ CLASS net/minecraft/client/renderer/entity/VexRenderer METHOD getBlockLightLevel (Lnet/minecraft/world/entity/monster/Vex;Lnet/minecraft/core/BlockPos;)I ARG 1 entity ARG 2 pos - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/Vex;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/VillagerRenderer.mapping b/data/net/minecraft/client/renderer/entity/VillagerRenderer.mapping deleted file mode 100644 index d91b1df13..000000000 --- a/data/net/minecraft/client/renderer/entity/VillagerRenderer.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/VillagerRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/npc/Villager;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD scale (Lnet/minecraft/world/entity/npc/Villager;Lcom/mojang/blaze3d/vertex/PoseStack;F)V - ARG 1 livingEntity - ARG 2 poseStack - ARG 3 partialTickTime diff --git a/data/net/minecraft/client/renderer/entity/VindicatorRenderer.mapping b/data/net/minecraft/client/renderer/entity/VindicatorRenderer.mapping deleted file mode 100644 index 0ba767a98..000000000 --- a/data/net/minecraft/client/renderer/entity/VindicatorRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/VindicatorRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/Vindicator;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/WanderingTraderRenderer.mapping b/data/net/minecraft/client/renderer/entity/WanderingTraderRenderer.mapping deleted file mode 100644 index d352c41a0..000000000 --- a/data/net/minecraft/client/renderer/entity/WanderingTraderRenderer.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/WanderingTraderRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/npc/WanderingTrader;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD scale (Lnet/minecraft/world/entity/npc/WanderingTrader;Lcom/mojang/blaze3d/vertex/PoseStack;F)V - ARG 1 livingEntity - ARG 2 poseStack - ARG 3 partialTickTime diff --git a/data/net/minecraft/client/renderer/entity/WardenRenderer.mapping b/data/net/minecraft/client/renderer/entity/WardenRenderer.mapping new file mode 100644 index 000000000..7ff576bca --- /dev/null +++ b/data/net/minecraft/client/renderer/entity/WardenRenderer.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/client/renderer/entity/WardenRenderer + METHOD lambda$new$3 (Lnet/minecraft/client/renderer/entity/state/WardenRenderState;F)F + ARG 0 renderState + METHOD lambda$new$4 (Lnet/minecraft/client/renderer/entity/state/WardenRenderState;F)F + ARG 0 renderState diff --git a/data/net/minecraft/client/renderer/entity/WitchRenderer.mapping b/data/net/minecraft/client/renderer/entity/WitchRenderer.mapping deleted file mode 100644 index fbc5543e0..000000000 --- a/data/net/minecraft/client/renderer/entity/WitchRenderer.mapping +++ /dev/null @@ -1,15 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/WitchRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/Witch;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/monster/Witch;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight - METHOD scale (Lnet/minecraft/world/entity/monster/Witch;Lcom/mojang/blaze3d/vertex/PoseStack;F)V - ARG 1 livingEntity - ARG 2 poseStack - ARG 3 partialTickTime diff --git a/data/net/minecraft/client/renderer/entity/WitherBossRenderer.mapping b/data/net/minecraft/client/renderer/entity/WitherBossRenderer.mapping index 4effd2f4c..ff3cccc29 100644 --- a/data/net/minecraft/client/renderer/entity/WitherBossRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/WitherBossRenderer.mapping @@ -2,10 +2,3 @@ CLASS net/minecraft/client/renderer/entity/WitherBossRenderer METHOD getBlockLightLevel (Lnet/minecraft/world/entity/boss/wither/WitherBoss;Lnet/minecraft/core/BlockPos;)I ARG 1 entity ARG 2 pos - METHOD getTextureLocation (Lnet/minecraft/world/entity/boss/wither/WitherBoss;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD scale (Lnet/minecraft/world/entity/boss/wither/WitherBoss;Lcom/mojang/blaze3d/vertex/PoseStack;F)V - ARG 1 livingEntity - ARG 2 poseStack - ARG 3 partialTickTime diff --git a/data/net/minecraft/client/renderer/entity/WitherSkeletonRenderer.mapping b/data/net/minecraft/client/renderer/entity/WitherSkeletonRenderer.mapping deleted file mode 100644 index 0088085e9..000000000 --- a/data/net/minecraft/client/renderer/entity/WitherSkeletonRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/WitherSkeletonRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/WitherSkeleton;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/WitherSkullRenderer.mapping b/data/net/minecraft/client/renderer/entity/WitherSkullRenderer.mapping index 24bc5ad91..ad4c9254a 100644 --- a/data/net/minecraft/client/renderer/entity/WitherSkullRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/WitherSkullRenderer.mapping @@ -2,13 +2,5 @@ CLASS net/minecraft/client/renderer/entity/WitherSkullRenderer METHOD getBlockLightLevel (Lnet/minecraft/world/entity/projectile/WitherSkull;Lnet/minecraft/core/BlockPos;)I ARG 1 entity ARG 2 pos - METHOD getTextureLocation (Lnet/minecraft/world/entity/projectile/WitherSkull;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/projectile/WitherSkull;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight + METHOD getTextureLocation (Lnet/minecraft/client/renderer/entity/state/WitherSkullRenderState;)Lnet/minecraft/resources/ResourceLocation; + ARG 1 renderState diff --git a/data/net/minecraft/client/renderer/entity/WolfRenderer.mapping b/data/net/minecraft/client/renderer/entity/WolfRenderer.mapping deleted file mode 100644 index 6f8765862..000000000 --- a/data/net/minecraft/client/renderer/entity/WolfRenderer.mapping +++ /dev/null @@ -1,15 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/WolfRenderer - METHOD getBob (Lnet/minecraft/world/entity/animal/Wolf;F)F - COMMENT Defines what float the third param in setRotationAngles of ModelBase is - ARG 1 livingBase - ARG 2 partialTicks - METHOD getTextureLocation (Lnet/minecraft/world/entity/animal/Wolf;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/world/entity/animal/Wolf;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight diff --git a/data/net/minecraft/client/renderer/entity/ZoglinRenderer.mapping b/data/net/minecraft/client/renderer/entity/ZoglinRenderer.mapping deleted file mode 100644 index a9037bc03..000000000 --- a/data/net/minecraft/client/renderer/entity/ZoglinRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/ZoglinRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/Zoglin;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/ZombieRenderer.mapping b/data/net/minecraft/client/renderer/entity/ZombieRenderer.mapping index 89302eb74..b10391d6c 100644 --- a/data/net/minecraft/client/renderer/entity/ZombieRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/ZombieRenderer.mapping @@ -1,6 +1,9 @@ CLASS net/minecraft/client/renderer/entity/ZombieRenderer - METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;)V + METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;)V ARG 1 context - ARG 2 zombieLayer - ARG 3 innerArmor - ARG 4 outerArmor + ARG 2 adultModel + ARG 3 babyModel + ARG 4 innerModel + ARG 5 outerModel + ARG 6 innerModelBaby + ARG 7 outerModelBaby diff --git a/data/net/minecraft/client/renderer/entity/ZombieVillagerRenderer.mapping b/data/net/minecraft/client/renderer/entity/ZombieVillagerRenderer.mapping deleted file mode 100644 index 34009f2b4..000000000 --- a/data/net/minecraft/client/renderer/entity/ZombieVillagerRenderer.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/ZombieVillagerRenderer - METHOD getTextureLocation (Lnet/minecraft/world/entity/monster/ZombieVillager;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity diff --git a/data/net/minecraft/client/renderer/entity/ZombifiedPiglinRenderer.mapping b/data/net/minecraft/client/renderer/entity/ZombifiedPiglinRenderer.mapping new file mode 100644 index 000000000..cf3e15a1d --- /dev/null +++ b/data/net/minecraft/client/renderer/entity/ZombifiedPiglinRenderer.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/client/renderer/entity/ZombifiedPiglinRenderer + METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;Lnet/minecraft/client/model/geom/ModelLayerLocation;)V + ARG 1 context + ARG 2 adultModel + ARG 3 babyModel + ARG 4 innerArmorLayer + ARG 5 outerArmorLayer + ARG 6 innerArmorBaby + ARG 7 outerArmorBaby diff --git a/data/net/minecraft/client/renderer/entity/layers/ArrowLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/ArrowLayer.mapping index db4cba50f..d36aa629d 100644 --- a/data/net/minecraft/client/renderer/entity/layers/ArrowLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/ArrowLayer.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/client/renderer/entity/layers/ArrowLayer - METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Lnet/minecraft/client/renderer/entity/LivingEntityRenderer;)V - ARG 1 context - ARG 2 renderer + METHOD (Lnet/minecraft/client/renderer/entity/LivingEntityRenderer;Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;)V + ARG 1 renderer + ARG 2 context diff --git a/data/net/minecraft/client/renderer/entity/layers/BeeStingerLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/BeeStingerLayer.mapping index b816bbd0e..cf70cf93f 100644 --- a/data/net/minecraft/client/renderer/entity/layers/BeeStingerLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/BeeStingerLayer.mapping @@ -1,9 +1,4 @@ CLASS net/minecraft/client/renderer/entity/layers/BeeStingerLayer - METHOD vertex (Lcom/mojang/blaze3d/vertex/VertexConsumer;Lcom/mojang/blaze3d/vertex/PoseStack$Pose;FIFFI)V - ARG 0 consumer - ARG 1 pose - ARG 2 x - ARG 3 y - ARG 4 u - ARG 5 v - ARG 6 packedLight + METHOD (Lnet/minecraft/client/renderer/entity/LivingEntityRenderer;Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;)V + ARG 1 renderer + ARG 2 context diff --git a/data/net/minecraft/client/renderer/entity/layers/CapeLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/CapeLayer.mapping index 365b60228..20b39ca1c 100644 --- a/data/net/minecraft/client/renderer/entity/layers/CapeLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/CapeLayer.mapping @@ -1,12 +1,8 @@ CLASS net/minecraft/client/renderer/entity/layers/CapeLayer - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/client/player/AbstractClientPlayer;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch + METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/geom/EntityModelSet;Lnet/minecraft/client/resources/model/EquipmentModelSet;)V + ARG 1 renderer + ARG 2 entityModels + ARG 3 equipmentModels + METHOD hasLayer (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/equipment/EquipmentModel$LayerType;)Z + ARG 1 stack + ARG 2 layerType diff --git a/data/net/minecraft/client/renderer/entity/layers/CarriedBlockLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/CarriedBlockLayer.mapping index 2807e2521..396771cc1 100644 --- a/data/net/minecraft/client/renderer/entity/layers/CarriedBlockLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/CarriedBlockLayer.mapping @@ -2,14 +2,3 @@ CLASS net/minecraft/client/renderer/entity/layers/CarriedBlockLayer METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/renderer/block/BlockRenderDispatcher;)V ARG 1 renderer ARG 2 blockRenderer - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/monster/EnderMan;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch diff --git a/data/net/minecraft/client/renderer/entity/layers/CatCollarLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/CatCollarLayer.mapping index b33b3a4ad..f3a123ce9 100644 --- a/data/net/minecraft/client/renderer/entity/layers/CatCollarLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/CatCollarLayer.mapping @@ -2,14 +2,3 @@ CLASS net/minecraft/client/renderer/entity/layers/CatCollarLayer METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/geom/EntityModelSet;)V ARG 1 renderer ARG 2 modelSet - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/animal/Cat;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch diff --git a/data/net/minecraft/client/renderer/entity/layers/CrossedArmsItemLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/CrossedArmsItemLayer.mapping index 6d89e9b1c..b0e7d8e08 100644 --- a/data/net/minecraft/client/renderer/entity/layers/CrossedArmsItemLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/CrossedArmsItemLayer.mapping @@ -1,15 +1,4 @@ CLASS net/minecraft/client/renderer/entity/layers/CrossedArmsItemLayer - METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/renderer/ItemInHandRenderer;)V + METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/renderer/entity/ItemRenderer;)V ARG 1 renderer - ARG 2 itemInHandRenderer - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/LivingEntity;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch + ARG 2 itemRenderer diff --git a/data/net/minecraft/client/renderer/entity/layers/CustomHeadLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/CustomHeadLayer.mapping index 30008bae8..a96a81b0c 100644 --- a/data/net/minecraft/client/renderer/entity/layers/CustomHeadLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/CustomHeadLayer.mapping @@ -1,26 +1,13 @@ CLASS net/minecraft/client/renderer/entity/layers/CustomHeadLayer - METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/geom/EntityModelSet;FFFLnet/minecraft/client/renderer/ItemInHandRenderer;)V + METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/geom/EntityModelSet;Lnet/minecraft/client/renderer/entity/ItemRenderer;)V ARG 1 renderer ARG 2 modelSet - ARG 3 scaleX - ARG 4 scaleY - ARG 5 scaleZ - ARG 6 itemInHandRenderer - METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/geom/EntityModelSet;Lnet/minecraft/client/renderer/ItemInHandRenderer;)V + ARG 3 itemRenderer + METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/geom/EntityModelSet;Lnet/minecraft/client/renderer/entity/layers/CustomHeadLayer$Transforms;Lnet/minecraft/client/renderer/entity/ItemRenderer;)V ARG 1 renderer ARG 2 modelSet - ARG 3 itemInHandRenderer - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/LivingEntity;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch - METHOD translateToHead (Lcom/mojang/blaze3d/vertex/PoseStack;Z)V + ARG 3 transforms + ARG 4 itemRenderer + METHOD translateToHead (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/entity/layers/CustomHeadLayer$Transforms;)V ARG 0 poseStack - ARG 1 isVillager + ARG 1 transforms diff --git a/data/net/minecraft/client/renderer/entity/layers/Deadmau5EarsLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/Deadmau5EarsLayer.mapping index f0faca759..563f45c94 100644 --- a/data/net/minecraft/client/renderer/entity/layers/Deadmau5EarsLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/Deadmau5EarsLayer.mapping @@ -1,12 +1,4 @@ CLASS net/minecraft/client/renderer/entity/layers/Deadmau5EarsLayer - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/client/player/AbstractClientPlayer;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch + METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/geom/EntityModelSet;)V + ARG 1 renderer + ARG 2 modelSet diff --git a/data/net/minecraft/client/renderer/entity/layers/DolphinCarryingItemLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/DolphinCarryingItemLayer.mapping index 44f097fb1..e26cf142f 100644 --- a/data/net/minecraft/client/renderer/entity/layers/DolphinCarryingItemLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/DolphinCarryingItemLayer.mapping @@ -1,15 +1,4 @@ CLASS net/minecraft/client/renderer/entity/layers/DolphinCarryingItemLayer - METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/renderer/ItemInHandRenderer;)V + METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/renderer/entity/ItemRenderer;)V ARG 1 renderer - ARG 2 itemInHandRenderer - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/animal/Dolphin;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch + ARG 2 itemRenderer diff --git a/data/net/minecraft/client/renderer/entity/layers/DrownedOuterLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/DrownedOuterLayer.mapping index 2230a5d3b..ae44b8ccf 100644 --- a/data/net/minecraft/client/renderer/entity/layers/DrownedOuterLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/DrownedOuterLayer.mapping @@ -2,14 +2,3 @@ CLASS net/minecraft/client/renderer/entity/layers/DrownedOuterLayer METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/geom/EntityModelSet;)V ARG 1 renderer ARG 2 modelSet - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/monster/Drowned;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch diff --git a/data/net/minecraft/client/renderer/entity/layers/ElytraLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/ElytraLayer.mapping deleted file mode 100644 index 282657637..000000000 --- a/data/net/minecraft/client/renderer/entity/layers/ElytraLayer.mapping +++ /dev/null @@ -1,15 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/layers/ElytraLayer - METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/geom/EntityModelSet;)V - ARG 1 renderer - ARG 2 modelSet - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/LivingEntity;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch diff --git a/data/net/minecraft/client/renderer/entity/layers/EnergySwirlLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/EnergySwirlLayer.mapping index 018b88e65..92d744dd3 100644 --- a/data/net/minecraft/client/renderer/entity/layers/EnergySwirlLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/EnergySwirlLayer.mapping @@ -1,14 +1,5 @@ CLASS net/minecraft/client/renderer/entity/layers/EnergySwirlLayer - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/Entity;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch + METHOD isPowered (Lnet/minecraft/client/renderer/entity/state/EntityRenderState;)Z + ARG 1 renderState METHOD xOffset (F)F ARG 1 tickCount diff --git a/data/net/minecraft/client/renderer/entity/layers/EquipmentLayerRenderer.mapping b/data/net/minecraft/client/renderer/entity/layers/EquipmentLayerRenderer.mapping new file mode 100644 index 000000000..b8feba45c --- /dev/null +++ b/data/net/minecraft/client/renderer/entity/layers/EquipmentLayerRenderer.mapping @@ -0,0 +1,24 @@ +CLASS net/minecraft/client/renderer/entity/layers/EquipmentLayerRenderer + METHOD (Lnet/minecraft/client/resources/model/EquipmentModelSet;Lnet/minecraft/client/renderer/texture/TextureAtlas;)V + ARG 1 equipmentModels + ARG 2 trimsAtlas + METHOD getColorForLayer (Lnet/minecraft/world/item/equipment/EquipmentModel$Layer;I)I + ARG 0 layer + ARG 1 color + METHOD renderLayers (Lnet/minecraft/world/item/equipment/EquipmentModel$LayerType;Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/client/model/Model;Lnet/minecraft/world/item/ItemStack;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V + ARG 1 layerType + ARG 2 equipmentModel + ARG 3 armorModel + ARG 4 item + ARG 5 poseStack + ARG 6 bufferSource + ARG 7 packedLight + METHOD renderLayers (Lnet/minecraft/world/item/equipment/EquipmentModel$LayerType;Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/client/model/Model;Lnet/minecraft/world/item/ItemStack;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/resources/ResourceLocation;)V + ARG 1 layerType + ARG 2 equipmentModel + ARG 3 armorModel + ARG 4 item + ARG 5 poseStack + ARG 6 bufferSource + ARG 7 packedLight + ARG 8 playerTexture diff --git a/data/net/minecraft/client/renderer/entity/layers/EyesLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/EyesLayer.mapping deleted file mode 100644 index ee40fa593..000000000 --- a/data/net/minecraft/client/renderer/entity/layers/EyesLayer.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/layers/EyesLayer - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/Entity;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch diff --git a/data/net/minecraft/client/renderer/entity/layers/FoxHeldItemLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/FoxHeldItemLayer.mapping index 14dde946c..58a6ad12a 100644 --- a/data/net/minecraft/client/renderer/entity/layers/FoxHeldItemLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/FoxHeldItemLayer.mapping @@ -1,15 +1,4 @@ CLASS net/minecraft/client/renderer/entity/layers/FoxHeldItemLayer - METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/renderer/ItemInHandRenderer;)V + METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/renderer/entity/ItemRenderer;)V ARG 1 renderer - ARG 2 itemInHandRenderer - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/animal/Fox;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch + ARG 2 itemRenderer diff --git a/data/net/minecraft/client/renderer/entity/layers/HorseArmorLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/HorseArmorLayer.mapping index c5d27c822..ff29b3a59 100644 --- a/data/net/minecraft/client/renderer/entity/layers/HorseArmorLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/HorseArmorLayer.mapping @@ -1,15 +1,5 @@ CLASS net/minecraft/client/renderer/entity/layers/HorseArmorLayer - METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/geom/EntityModelSet;)V + METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/geom/EntityModelSet;Lnet/minecraft/client/renderer/entity/layers/EquipmentLayerRenderer;)V ARG 1 renderer - ARG 2 modelSet - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/animal/horse/Horse;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch + ARG 2 entityModels + ARG 3 equipmentRenderer diff --git a/data/net/minecraft/client/renderer/entity/layers/HorseMarkingLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/HorseMarkingLayer.mapping index 04968849e..503b75912 100644 --- a/data/net/minecraft/client/renderer/entity/layers/HorseMarkingLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/HorseMarkingLayer.mapping @@ -1,14 +1,3 @@ CLASS net/minecraft/client/renderer/entity/layers/HorseMarkingLayer METHOD lambda$static$0 (Ljava/util/EnumMap;)V ARG 0 map - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/animal/horse/Horse;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch diff --git a/data/net/minecraft/client/renderer/entity/layers/HumanoidArmorLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/HumanoidArmorLayer.mapping index a07b06010..f41357a36 100644 --- a/data/net/minecraft/client/renderer/entity/layers/HumanoidArmorLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/HumanoidArmorLayer.mapping @@ -1,51 +1,34 @@ CLASS net/minecraft/client/renderer/entity/layers/HumanoidArmorLayer - METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/HumanoidModel;Lnet/minecraft/client/model/HumanoidModel;Lnet/minecraft/client/resources/model/ModelManager;)V + METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/HumanoidModel;Lnet/minecraft/client/model/HumanoidModel;Lnet/minecraft/client/model/HumanoidModel;Lnet/minecraft/client/model/HumanoidModel;Lnet/minecraft/client/renderer/entity/layers/EquipmentLayerRenderer;)V ARG 1 renderer ARG 2 innerModel ARG 3 outerModel - ARG 4 modelManager - METHOD getArmorModel (Lnet/minecraft/world/entity/EquipmentSlot;)Lnet/minecraft/client/model/HumanoidModel; - ARG 1 slot - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/LivingEntity;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch - METHOD renderArmorPiece (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/EquipmentSlot;ILnet/minecraft/client/model/HumanoidModel;)V + ARG 4 innerModelBaby + ARG 5 outerModelBaby + ARG 6 equipmentRenderer + METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/HumanoidModel;Lnet/minecraft/client/model/HumanoidModel;Lnet/minecraft/client/renderer/entity/layers/EquipmentLayerRenderer;)V + ARG 1 renderer + ARG 2 innerModel + ARG 3 outerModel + ARG 4 equipmentRenderer + METHOD getArmorModel (Lnet/minecraft/client/renderer/entity/state/HumanoidRenderState;Lnet/minecraft/world/entity/EquipmentSlot;)Lnet/minecraft/client/model/HumanoidModel; + ARG 1 renderState + ARG 2 slot + METHOD renderArmorPiece (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/EquipmentSlot;ILnet/minecraft/client/model/HumanoidModel;)V ARG 1 poseStack ARG 2 bufferSource - ARG 3 livingEntity + ARG 3 armorItem ARG 4 slot ARG 5 packedLight ARG 6 model - METHOD renderGlint (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/client/model/HumanoidModel;)V - ARG 1 poseStack - ARG 2 bufferSource - ARG 3 packedLight - ARG 4 model - METHOD renderModel (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/client/model/HumanoidModel;ILnet/minecraft/resources/ResourceLocation;)V - ARG 1 poseStack - ARG 2 bufferSource - ARG 3 packedLight - ARG 4 model - ARG 5 dyeColor - ARG 6 textureLocation - METHOD renderTrim (Lnet/minecraft/core/Holder;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/item/armortrim/ArmorTrim;Lnet/minecraft/client/model/HumanoidModel;Z)V - ARG 1 armorMaterial - ARG 2 poseStack - ARG 3 bufferSource - ARG 4 packedLight - ARG 5 trim - ARG 6 model - ARG 7 innerTexture METHOD setPartVisibility (Lnet/minecraft/client/model/HumanoidModel;Lnet/minecraft/world/entity/EquipmentSlot;)V ARG 1 model ARG 2 slot + METHOD shouldRender (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/EquipmentSlot;)Z + ARG 0 stack + ARG 1 slot + METHOD shouldRender (Lnet/minecraft/world/item/equipment/Equippable;Lnet/minecraft/world/entity/EquipmentSlot;)Z + ARG 0 equippable + ARG 1 slot METHOD usesInnerModel (Lnet/minecraft/world/entity/EquipmentSlot;)Z ARG 1 slot diff --git a/data/net/minecraft/client/renderer/entity/layers/IronGolemCrackinessLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/IronGolemCrackinessLayer.mapping deleted file mode 100644 index a84fc1568..000000000 --- a/data/net/minecraft/client/renderer/entity/layers/IronGolemCrackinessLayer.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/layers/IronGolemCrackinessLayer - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/animal/IronGolem;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch diff --git a/data/net/minecraft/client/renderer/entity/layers/IronGolemFlowerLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/IronGolemFlowerLayer.mapping index f9e1f19fb..916fe2eba 100644 --- a/data/net/minecraft/client/renderer/entity/layers/IronGolemFlowerLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/IronGolemFlowerLayer.mapping @@ -2,14 +2,3 @@ CLASS net/minecraft/client/renderer/entity/layers/IronGolemFlowerLayer METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/renderer/block/BlockRenderDispatcher;)V ARG 1 renderer ARG 2 blockRenderer - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/animal/IronGolem;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch diff --git a/data/net/minecraft/client/renderer/entity/layers/ItemInHandLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/ItemInHandLayer.mapping index 307cdbf5b..aa830f81c 100644 --- a/data/net/minecraft/client/renderer/entity/layers/ItemInHandLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/ItemInHandLayer.mapping @@ -1,23 +1,13 @@ CLASS net/minecraft/client/renderer/entity/layers/ItemInHandLayer - METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/renderer/ItemInHandRenderer;)V + METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/renderer/entity/ItemRenderer;)V ARG 1 renderer - ARG 2 itemInHandRenderer - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/LivingEntity;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch - METHOD renderArmWithItem (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemDisplayContext;Lnet/minecraft/world/entity/HumanoidArm;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 livingEntity - ARG 2 itemStack - ARG 3 displayContext - ARG 4 arm - ARG 5 poseStack - ARG 6 buffer - ARG 7 packedLight + ARG 2 itemRenderer + METHOD renderArmWithItem (Lnet/minecraft/client/renderer/entity/state/LivingEntityRenderState;Lnet/minecraft/client/resources/model/BakedModel;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemDisplayContext;Lnet/minecraft/world/entity/HumanoidArm;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V + ARG 1 renderState + ARG 2 itemModel + ARG 3 item + ARG 4 displayContext + ARG 5 arm + ARG 6 poseStack + ARG 7 bufferSource + ARG 8 packedLight diff --git a/data/net/minecraft/client/renderer/entity/layers/LivingEntityEmissiveLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/LivingEntityEmissiveLayer.mapping new file mode 100644 index 000000000..b6259967a --- /dev/null +++ b/data/net/minecraft/client/renderer/entity/layers/LivingEntityEmissiveLayer.mapping @@ -0,0 +1,23 @@ +CLASS net/minecraft/client/renderer/entity/layers/LivingEntityEmissiveLayer + METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/client/renderer/entity/layers/LivingEntityEmissiveLayer$AlphaFunction;Lnet/minecraft/client/renderer/entity/layers/LivingEntityEmissiveLayer$DrawSelector;Ljava/util/function/Function;)V + ARG 1 renderer + ARG 2 texture + ARG 3 alphaFunction + ARG 4 drawSelector + ARG 5 bufferProvider + METHOD lambda$onlyDrawSelectedParts$0 (Lnet/minecraft/client/model/geom/ModelPart;)V + ARG 0 part + METHOD lambda$onlyDrawSelectedParts$1 (Lnet/minecraft/client/model/geom/ModelPart;)V + ARG 0 part + METHOD lambda$resetDrawForAllParts$2 (Lnet/minecraft/client/model/geom/ModelPart;)V + ARG 0 part + METHOD onlyDrawSelectedParts (Lnet/minecraft/client/renderer/entity/state/LivingEntityRenderState;)Z + ARG 1 renderState + CLASS DrawSelector + METHOD getPartsToDraw (Lnet/minecraft/client/model/EntityModel;Lnet/minecraft/client/renderer/entity/state/LivingEntityRenderState;)Ljava/util/List; + ARG 1 model + ARG 2 renderState + CLASS AlphaFunction + METHOD apply (Lnet/minecraft/client/renderer/entity/state/LivingEntityRenderState;F)F + ARG 1 renderState + ARG 2 alpha diff --git a/data/net/minecraft/client/renderer/entity/layers/LlamaDecorLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/LlamaDecorLayer.mapping index 9039d4a74..3b3bf1770 100644 --- a/data/net/minecraft/client/renderer/entity/layers/LlamaDecorLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/LlamaDecorLayer.mapping @@ -1,15 +1,12 @@ CLASS net/minecraft/client/renderer/entity/layers/LlamaDecorLayer - METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/geom/EntityModelSet;)V + METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/geom/EntityModelSet;Lnet/minecraft/client/renderer/entity/layers/EquipmentLayerRenderer;)V ARG 1 renderer - ARG 2 modelSet - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/animal/horse/Llama;FFFFFF)V + ARG 2 models + ARG 3 equipmentRenderer + METHOD renderEquipment (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;Lnet/minecraft/client/renderer/entity/state/LlamaRenderState;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/resources/ResourceLocation;I)V ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch + ARG 2 bufferSource + ARG 3 renderState + ARG 4 item + ARG 5 equipmentModel + ARG 6 packedLight diff --git a/data/net/minecraft/client/renderer/entity/layers/MushroomCowMushroomLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/MushroomCowMushroomLayer.mapping index ac61efdb0..287509414 100644 --- a/data/net/minecraft/client/renderer/entity/layers/MushroomCowMushroomLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/MushroomCowMushroomLayer.mapping @@ -2,17 +2,6 @@ CLASS net/minecraft/client/renderer/entity/layers/MushroomCowMushroomLayer METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/renderer/block/BlockRenderDispatcher;)V ARG 1 renderer ARG 2 blockRenderer - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/animal/MushroomCow;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch METHOD renderMushroomBlock (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;IZLnet/minecraft/world/level/block/state/BlockState;ILnet/minecraft/client/resources/model/BakedModel;)V ARG 1 poseStack ARG 2 buffer diff --git a/data/net/minecraft/client/renderer/entity/layers/PandaHoldsItemLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/PandaHoldsItemLayer.mapping index 13ac0f5da..54736f13a 100644 --- a/data/net/minecraft/client/renderer/entity/layers/PandaHoldsItemLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/PandaHoldsItemLayer.mapping @@ -1,15 +1,4 @@ CLASS net/minecraft/client/renderer/entity/layers/PandaHoldsItemLayer - METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/renderer/ItemInHandRenderer;)V + METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/renderer/entity/ItemRenderer;)V ARG 1 renderer - ARG 2 itemInHandRenderer - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/animal/Panda;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch + ARG 2 itemRenderer diff --git a/data/net/minecraft/client/renderer/entity/layers/ParrotOnShoulderLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/ParrotOnShoulderLayer.mapping index 188a87015..109f083ed 100644 --- a/data/net/minecraft/client/renderer/entity/layers/ParrotOnShoulderLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/ParrotOnShoulderLayer.mapping @@ -2,24 +2,12 @@ CLASS net/minecraft/client/renderer/entity/layers/ParrotOnShoulderLayer METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/geom/EntityModelSet;)V ARG 1 renderer ARG 2 modelSet - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/player/Player;FFFFFF)V + METHOD renderOnShoulder (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/client/renderer/entity/state/PlayerRenderState;Lnet/minecraft/world/entity/animal/Parrot$Variant;FFZ)V ARG 1 poseStack ARG 2 buffer ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/player/Player;FFFFZ)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 netHeadYaw - ARG 8 headPitch - ARG 9 leftShoulder + ARG 4 renderState + ARG 5 variant + ARG 6 yRot + ARG 7 xRot + ARG 8 leftShoulder diff --git a/data/net/minecraft/client/renderer/entity/layers/PlayerItemInHandLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/PlayerItemInHandLayer.mapping index 241f1d13c..2f5ca0b2f 100644 --- a/data/net/minecraft/client/renderer/entity/layers/PlayerItemInHandLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/PlayerItemInHandLayer.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/client/renderer/entity/layers/PlayerItemInHandLayer - METHOD renderArmWithSpyglass (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/HumanoidArm;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 stack + METHOD renderArmWithSpyglass (Lnet/minecraft/client/resources/model/BakedModel;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/HumanoidArm;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V + ARG 1 model + ARG 2 item ARG 3 arm ARG 4 poseStack - ARG 5 buffer - ARG 6 combinedLight + ARG 5 bufferSource + ARG 6 packedLight diff --git a/data/net/minecraft/client/renderer/entity/layers/RenderLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/RenderLayer.mapping index 7fb428b6f..019a6fd40 100644 --- a/data/net/minecraft/client/renderer/entity/layers/RenderLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/RenderLayer.mapping @@ -1,39 +1,26 @@ CLASS net/minecraft/client/renderer/entity/layers/RenderLayer METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;)V ARG 1 renderer - METHOD coloredCutoutModelCopyLayerRender (Lnet/minecraft/client/model/EntityModel;Lnet/minecraft/client/model/EntityModel;Lnet/minecraft/resources/ResourceLocation;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/LivingEntity;FFFFFFI)V - ARG 0 modelParent - ARG 1 model - ARG 2 textureLocation - ARG 3 poseStack - ARG 4 buffer - ARG 5 packedLight - ARG 6 entity - ARG 7 limbSwing - ARG 8 limbSwingAmount - ARG 9 ageInTicks - ARG 10 netHeadYaw - ARG 11 headPitch - ARG 12 partialTick - ARG 13 color - METHOD getTextureLocation (Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/resources/ResourceLocation; - ARG 1 entity - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/Entity;FFFFFF)V + METHOD coloredCutoutModelCopyLayerRender (Lnet/minecraft/client/model/EntityModel;Lnet/minecraft/resources/ResourceLocation;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/client/renderer/entity/state/LivingEntityRenderState;I)V + ARG 0 model + ARG 1 textureLocation + ARG 2 poseStack + ARG 3 bufferSource + ARG 4 packedLight + ARG 5 renderState + ARG 6 color + METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/client/renderer/entity/state/EntityRenderState;FF)V ARG 1 poseStack ARG 2 bufferSource ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTick - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch - METHOD renderColoredCutoutModel (Lnet/minecraft/client/model/EntityModel;Lnet/minecraft/resources/ResourceLocation;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/LivingEntity;I)V + ARG 4 renderState + ARG 5 yRot + ARG 6 xRot + METHOD renderColoredCutoutModel (Lnet/minecraft/client/model/EntityModel;Lnet/minecraft/resources/ResourceLocation;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/client/renderer/entity/state/LivingEntityRenderState;I)V ARG 0 model ARG 1 textureLocation ARG 2 poseStack - ARG 3 buffer + ARG 3 bufferSource ARG 4 packedLight - ARG 5 entity + ARG 5 renderState ARG 6 color diff --git a/data/net/minecraft/client/renderer/entity/layers/SaddleLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/SaddleLayer.mapping index a5c5ed320..8c4c7917a 100644 --- a/data/net/minecraft/client/renderer/entity/layers/SaddleLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/SaddleLayer.mapping @@ -1,16 +1,10 @@ CLASS net/minecraft/client/renderer/entity/layers/SaddleLayer + METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/EntityModel;Lnet/minecraft/client/model/EntityModel;Lnet/minecraft/resources/ResourceLocation;)V + ARG 1 renderer + ARG 2 adultModel + ARG 3 babyModel + ARG 4 textureLocation METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/EntityModel;Lnet/minecraft/resources/ResourceLocation;)V ARG 1 renderer ARG 2 model ARG 3 textureLocation - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/Entity;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch diff --git a/data/net/minecraft/client/renderer/entity/layers/SheepFurLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/SheepFurLayer.mapping deleted file mode 100644 index d4b125a1d..000000000 --- a/data/net/minecraft/client/renderer/entity/layers/SheepFurLayer.mapping +++ /dev/null @@ -1,15 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/layers/SheepFurLayer - METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/geom/EntityModelSet;)V - ARG 1 renderer - ARG 2 modelSet - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/animal/Sheep;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch diff --git a/data/net/minecraft/client/renderer/entity/layers/SheepWoolLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/SheepWoolLayer.mapping new file mode 100644 index 000000000..850f7f4b6 --- /dev/null +++ b/data/net/minecraft/client/renderer/entity/layers/SheepWoolLayer.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/client/renderer/entity/layers/SheepWoolLayer + METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/geom/EntityModelSet;)V + ARG 1 renderer + ARG 2 modelSet diff --git a/data/net/minecraft/client/renderer/entity/layers/ShulkerHeadLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/ShulkerHeadLayer.mapping deleted file mode 100644 index bbea451a9..000000000 --- a/data/net/minecraft/client/renderer/entity/layers/ShulkerHeadLayer.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/layers/ShulkerHeadLayer - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/monster/Shulker;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch diff --git a/data/net/minecraft/client/renderer/entity/layers/SlimeOuterLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/SlimeOuterLayer.mapping index 8929904a2..a804ac93d 100644 --- a/data/net/minecraft/client/renderer/entity/layers/SlimeOuterLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/SlimeOuterLayer.mapping @@ -2,14 +2,3 @@ CLASS net/minecraft/client/renderer/entity/layers/SlimeOuterLayer METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/geom/EntityModelSet;)V ARG 1 renderer ARG 2 modelSet - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/LivingEntity;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch diff --git a/data/net/minecraft/client/renderer/entity/layers/SnowGolemHeadLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/SnowGolemHeadLayer.mapping index de1dca2d6..2778e683c 100644 --- a/data/net/minecraft/client/renderer/entity/layers/SnowGolemHeadLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/SnowGolemHeadLayer.mapping @@ -3,14 +3,3 @@ CLASS net/minecraft/client/renderer/entity/layers/SnowGolemHeadLayer ARG 1 renderer ARG 2 blockRenderer ARG 3 itemRenderer - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/animal/SnowGolem;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch diff --git a/data/net/minecraft/client/renderer/entity/layers/SpinAttackEffectLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/SpinAttackEffectLayer.mapping index 7184b6b53..d5e7dfb9a 100644 --- a/data/net/minecraft/client/renderer/entity/layers/SpinAttackEffectLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/SpinAttackEffectLayer.mapping @@ -2,14 +2,3 @@ CLASS net/minecraft/client/renderer/entity/layers/SpinAttackEffectLayer METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/geom/EntityModelSet;)V ARG 1 renderer ARG 2 modelSet - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/LivingEntity;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch diff --git a/data/net/minecraft/client/renderer/entity/layers/StuckInBodyLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/StuckInBodyLayer.mapping index a35748e66..4148486f4 100644 --- a/data/net/minecraft/client/renderer/entity/layers/StuckInBodyLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/StuckInBodyLayer.mapping @@ -1,25 +1,17 @@ CLASS net/minecraft/client/renderer/entity/layers/StuckInBodyLayer - METHOD (Lnet/minecraft/client/renderer/entity/LivingEntityRenderer;)V + METHOD (Lnet/minecraft/client/renderer/entity/LivingEntityRenderer;Lnet/minecraft/client/model/Model;Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/client/renderer/entity/layers/StuckInBodyLayer$PlacementStyle;)V ARG 1 renderer - METHOD numStuck (Lnet/minecraft/world/entity/LivingEntity;)I - ARG 1 entity - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/LivingEntity;FFFFFF)V + ARG 2 model + ARG 3 texture + ARG 4 placementStyle + METHOD numStuck (Lnet/minecraft/client/renderer/entity/state/PlayerRenderState;)I + ARG 1 renderState + METHOD renderStuckItem (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;IFFF)V ARG 1 poseStack - ARG 2 buffer + ARG 2 bufferSource ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch - METHOD renderStuckItem (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/Entity;FFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 entity - ARG 5 x - ARG 6 y - ARG 7 z - ARG 8 partialTick + ARG 4 x + ARG 5 y + ARG 6 z + METHOD snapToFace (F)F + ARG 0 value diff --git a/data/net/minecraft/client/renderer/entity/layers/TropicalFishPatternLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/TropicalFishPatternLayer.mapping index c20f096b7..3b3961ec3 100644 --- a/data/net/minecraft/client/renderer/entity/layers/TropicalFishPatternLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/TropicalFishPatternLayer.mapping @@ -2,14 +2,3 @@ CLASS net/minecraft/client/renderer/entity/layers/TropicalFishPatternLayer METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/geom/EntityModelSet;)V ARG 1 renderer ARG 2 modelSet - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/animal/TropicalFish;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch diff --git a/data/net/minecraft/client/renderer/entity/layers/VillagerProfessionLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/VillagerProfessionLayer.mapping index b57b0d86f..32a9a24ac 100644 --- a/data/net/minecraft/client/renderer/entity/layers/VillagerProfessionLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/VillagerProfessionLayer.mapping @@ -13,14 +13,3 @@ CLASS net/minecraft/client/renderer/entity/layers/VillagerProfessionLayer ARG 2 location METHOD lambda$static$0 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V ARG 0 map - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/LivingEntity;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch diff --git a/data/net/minecraft/client/renderer/entity/layers/WardenEmissiveLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/WardenEmissiveLayer.mapping deleted file mode 100644 index 443448f12..000000000 --- a/data/net/minecraft/client/renderer/entity/layers/WardenEmissiveLayer.mapping +++ /dev/null @@ -1,14 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/layers/WardenEmissiveLayer - METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/client/renderer/entity/layers/WardenEmissiveLayer$AlphaFunction;Lnet/minecraft/client/renderer/entity/layers/WardenEmissiveLayer$DrawSelector;)V - ARG 1 renderer - ARG 2 texture - ARG 3 alphaFunction - ARG 4 drawSelector - CLASS DrawSelector - METHOD getPartsToDraw (Lnet/minecraft/client/model/EntityModel;)Ljava/util/List; - ARG 1 parentModel - CLASS AlphaFunction - METHOD apply (Lnet/minecraft/world/entity/monster/warden/Warden;FF)F - ARG 1 livingEntity - ARG 2 partialTick - ARG 3 ageInTicks diff --git a/data/net/minecraft/client/renderer/entity/layers/WingsLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/WingsLayer.mapping new file mode 100644 index 000000000..c6a3b2ac5 --- /dev/null +++ b/data/net/minecraft/client/renderer/entity/layers/WingsLayer.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/client/renderer/entity/layers/WingsLayer + METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/geom/EntityModelSet;Lnet/minecraft/client/renderer/entity/layers/EquipmentLayerRenderer;)V + ARG 1 renderer + ARG 2 models + ARG 3 equipmentRenderer + METHOD getPlayerElytraTexture (Lnet/minecraft/client/renderer/entity/state/HumanoidRenderState;)Lnet/minecraft/resources/ResourceLocation; + ARG 0 renderState diff --git a/data/net/minecraft/client/renderer/entity/layers/WitchItemLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/WitchItemLayer.mapping deleted file mode 100644 index 0da518000..000000000 --- a/data/net/minecraft/client/renderer/entity/layers/WitchItemLayer.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/layers/WitchItemLayer - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/LivingEntity;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch diff --git a/data/net/minecraft/client/renderer/entity/layers/WolfArmorLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/WolfArmorLayer.mapping index 77b53ff48..ba0791674 100644 --- a/data/net/minecraft/client/renderer/entity/layers/WolfArmorLayer.mapping +++ b/data/net/minecraft/client/renderer/entity/layers/WolfArmorLayer.mapping @@ -1,15 +1,11 @@ CLASS net/minecraft/client/renderer/entity/layers/WolfArmorLayer - METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/geom/EntityModelSet;)V + METHOD (Lnet/minecraft/client/renderer/entity/RenderLayerParent;Lnet/minecraft/client/model/geom/EntityModelSet;Lnet/minecraft/client/renderer/entity/layers/EquipmentLayerRenderer;)V ARG 1 renderer - ARG 2 models - METHOD maybeRenderColoredLayer (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/AnimalArmorItem;)V + ARG 2 entityModels + ARG 3 equipmentRenderer + METHOD maybeRenderCracks (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/client/model/Model;)V ARG 1 poseStack - ARG 2 buffer + ARG 2 bufferSource ARG 3 packedLight - ARG 4 armorStack - ARG 5 armorItem - METHOD maybeRenderCracks (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/item/ItemStack;)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 armorStack + ARG 4 armorItem + ARG 5 model diff --git a/data/net/minecraft/client/renderer/entity/layers/WolfCollarLayer.mapping b/data/net/minecraft/client/renderer/entity/layers/WolfCollarLayer.mapping deleted file mode 100644 index d683ed746..000000000 --- a/data/net/minecraft/client/renderer/entity/layers/WolfCollarLayer.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS net/minecraft/client/renderer/entity/layers/WolfCollarLayer - METHOD render (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/animal/Wolf;FFFFFF)V - ARG 1 poseStack - ARG 2 buffer - ARG 3 packedLight - ARG 4 livingEntity - ARG 5 limbSwing - ARG 6 limbSwingAmount - ARG 7 partialTicks - ARG 8 ageInTicks - ARG 9 netHeadYaw - ARG 10 headPitch diff --git a/data/net/minecraft/client/renderer/entity/player/PlayerRenderer.mapping b/data/net/minecraft/client/renderer/entity/player/PlayerRenderer.mapping index eb7c0aa12..eef89d035 100644 --- a/data/net/minecraft/client/renderer/entity/player/PlayerRenderer.mapping +++ b/data/net/minecraft/client/renderer/entity/player/PlayerRenderer.mapping @@ -2,42 +2,46 @@ CLASS net/minecraft/client/renderer/entity/player/PlayerRenderer METHOD (Lnet/minecraft/client/renderer/entity/EntityRendererProvider$Context;Z)V ARG 1 context ARG 2 useSlimModel - METHOD getArmPose (Lnet/minecraft/client/player/AbstractClientPlayer;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/client/model/HumanoidModel$ArmPose; + METHOD extractCapeState (Lnet/minecraft/client/player/AbstractClientPlayer;Lnet/minecraft/client/renderer/entity/state/PlayerRenderState;F)V ARG 0 player - ARG 1 hand - METHOD getRenderOffset (Lnet/minecraft/client/player/AbstractClientPlayer;F)Lnet/minecraft/world/phys/Vec3; - ARG 1 entity - ARG 2 partialTicks - METHOD getTextureLocation (Lnet/minecraft/client/player/AbstractClientPlayer;)Lnet/minecraft/resources/ResourceLocation; - COMMENT Returns the location of an entity's texture. - ARG 1 entity - METHOD render (Lnet/minecraft/client/player/AbstractClientPlayer;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V - ARG 1 entity - ARG 2 entityYaw - ARG 3 partialTicks - ARG 4 poseStack - ARG 5 buffer - ARG 6 packedLight - METHOD renderHand (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/client/player/AbstractClientPlayer;Lnet/minecraft/client/model/geom/ModelPart;Lnet/minecraft/client/model/geom/ModelPart;)V + ARG 1 renderState + ARG 2 partialTick + METHOD extractFlightData (Lnet/minecraft/client/player/AbstractClientPlayer;Lnet/minecraft/client/renderer/entity/state/PlayerRenderState;F)V + ARG 0 player + ARG 1 renderState + ARG 2 partialTick + METHOD extractHandState (Lnet/minecraft/client/player/AbstractClientPlayer;Lnet/minecraft/client/renderer/entity/state/PlayerRenderState$HandState;Lnet/minecraft/world/InteractionHand;)V + ARG 1 player + ARG 2 reusedState + ARG 3 hand + METHOD getArmPose (Lnet/minecraft/client/renderer/entity/state/PlayerRenderState;Lnet/minecraft/client/renderer/entity/state/PlayerRenderState$HandState;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/client/model/HumanoidModel$ArmPose; + ARG 0 renderState + ARG 1 handState + ARG 2 hand + METHOD getArmPose (Lnet/minecraft/client/renderer/entity/state/PlayerRenderState;Lnet/minecraft/world/entity/HumanoidArm;)Lnet/minecraft/client/model/HumanoidModel$ArmPose; + ARG 0 renderState + ARG 1 arm + METHOD getParrotOnShoulder (Lnet/minecraft/client/player/AbstractClientPlayer;Z)Lnet/minecraft/world/entity/animal/Parrot$Variant; + ARG 0 player + ARG 1 leftShoulder + METHOD lambda$getParrotOnShoulder$0 (Lnet/minecraft/world/entity/EntityType;)Z + ARG 0 entityType + METHOD renderHand (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/resources/ResourceLocation;Lnet/minecraft/client/model/geom/ModelPart;Z)V ARG 1 poseStack - ARG 2 buffer - ARG 3 combinedLight - ARG 4 player - ARG 5 rendererArm - ARG 6 rendererArmwear - METHOD renderLeftHand (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/client/player/AbstractClientPlayer;)V + ARG 2 bufferSource + ARG 3 packedLight + ARG 4 skinTexture + ARG 5 arm + ARG 6 isSleeveVisible + METHOD renderLeftHand (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/resources/ResourceLocation;Z)V ARG 1 poseStack - ARG 2 buffer - ARG 3 combinedLight - ARG 4 player - METHOD renderRightHand (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/client/player/AbstractClientPlayer;)V + ARG 2 bufferSource + ARG 3 packedLight + ARG 4 skinTexture + ARG 5 isSleeveVisible + METHOD renderRightHand (Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/resources/ResourceLocation;Z)V ARG 1 poseStack - ARG 2 buffer - ARG 3 combinedLight - ARG 4 player - METHOD scale (Lnet/minecraft/client/player/AbstractClientPlayer;Lcom/mojang/blaze3d/vertex/PoseStack;F)V - ARG 1 livingEntity - ARG 2 poseStack - ARG 3 partialTickTime - METHOD setModelProperties (Lnet/minecraft/client/player/AbstractClientPlayer;)V - ARG 1 clientPlayer + ARG 2 bufferSource + ARG 3 packedLight + ARG 4 skinTexture + ARG 5 isSleeveVisible diff --git a/data/net/minecraft/client/renderer/entity/state/EnderDragonRenderState.mapping b/data/net/minecraft/client/renderer/entity/state/EnderDragonRenderState.mapping new file mode 100644 index 000000000..875be63f6 --- /dev/null +++ b/data/net/minecraft/client/renderer/entity/state/EnderDragonRenderState.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/client/renderer/entity/state/EnderDragonRenderState + METHOD getHeadPartYOffset (ILnet/minecraft/world/entity/boss/enderdragon/DragonFlightHistory$Sample;Lnet/minecraft/world/entity/boss/enderdragon/DragonFlightHistory$Sample;)F + ARG 1 part + ARG 2 start + ARG 3 current + METHOD getHistoricalPos (I)Lnet/minecraft/world/entity/boss/enderdragon/DragonFlightHistory$Sample; + ARG 1 index diff --git a/data/net/minecraft/client/renderer/entity/state/LivingEntityRenderState.mapping b/data/net/minecraft/client/renderer/entity/state/LivingEntityRenderState.mapping new file mode 100644 index 000000000..dbb3c3ef7 --- /dev/null +++ b/data/net/minecraft/client/renderer/entity/state/LivingEntityRenderState.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/client/renderer/entity/state/LivingEntityRenderState + METHOD hasPose (Lnet/minecraft/world/entity/Pose;)Z + ARG 1 pose diff --git a/data/net/minecraft/client/renderer/entity/state/WolfRenderState.mapping b/data/net/minecraft/client/renderer/entity/state/WolfRenderState.mapping new file mode 100644 index 000000000..470750140 --- /dev/null +++ b/data/net/minecraft/client/renderer/entity/state/WolfRenderState.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/client/renderer/entity/state/WolfRenderState + METHOD getBodyRollAngle (F)F + ARG 1 angle diff --git a/data/net/minecraft/client/renderer/item/ItemProperties.mapping b/data/net/minecraft/client/renderer/item/ItemProperties.mapping index f11c88426..56b2b1959 100644 --- a/data/net/minecraft/client/renderer/item/ItemProperties.mapping +++ b/data/net/minecraft/client/renderer/item/ItemProperties.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/client/renderer/item/ItemProperties METHOD getProperty (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/item/ItemPropertyFunction; ARG 0 stack ARG 1 location + METHOD honeyLevelProperty (Lnet/minecraft/world/item/ItemStack;)I + ARG 0 stack METHOD lambda$register$2 (Lnet/minecraft/world/item/Item;)Ljava/util/Map; ARG 0 k METHOD lambda$static$0 (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/world/entity/LivingEntity;I)F @@ -19,19 +21,10 @@ CLASS net/minecraft/client/renderer/item/ItemProperties ARG 1 level ARG 2 entity ARG 3 seed - METHOD lambda$static$11 (Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/core/GlobalPos; - ARG 0 level - ARG 1 stack - ARG 2 entity METHOD lambda$static$12 (Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/core/GlobalPos; ARG 0 level ARG 1 stack ARG 2 entity - METHOD lambda$static$13 (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/world/entity/LivingEntity;I)F - ARG 0 stack - ARG 1 level - ARG 2 entity - ARG 3 seed METHOD lambda$static$14 (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/world/entity/LivingEntity;I)F ARG 0 stack ARG 1 level @@ -77,6 +70,16 @@ CLASS net/minecraft/client/renderer/item/ItemProperties ARG 1 level ARG 2 entity ARG 3 seed + METHOD lambda$static$23 (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/world/entity/LivingEntity;I)F + ARG 0 stack + ARG 1 level + ARG 2 entity + ARG 3 seed + METHOD lambda$static$24 (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/world/entity/LivingEntity;I)F + ARG 0 stack + ARG 1 level + ARG 2 entity + ARG 3 seed METHOD lambda$static$3 (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/world/entity/LivingEntity;I)F ARG 0 stack ARG 1 level diff --git a/data/net/minecraft/client/renderer/texture/SpriteContents.mapping b/data/net/minecraft/client/renderer/texture/SpriteContents.mapping index 8f6681da9..8b7c2beb6 100644 --- a/data/net/minecraft/client/renderer/texture/SpriteContents.mapping +++ b/data/net/minecraft/client/renderer/texture/SpriteContents.mapping @@ -62,10 +62,6 @@ CLASS net/minecraft/client/renderer/texture/SpriteContents ARG 3 mipLevel ARG 4 x ARG 5 y - METHOD mix (DII)I - ARG 1 delta - ARG 3 color1 - ARG 4 color2 METHOD uploadInterpolatedFrame (IILnet/minecraft/client/renderer/texture/SpriteContents$Ticker;)V ARG 1 x ARG 2 y diff --git a/data/net/minecraft/client/renderer/texture/TextureManager.mapping b/data/net/minecraft/client/renderer/texture/TextureManager.mapping index b61179263..f958e2a89 100644 --- a/data/net/minecraft/client/renderer/texture/TextureManager.mapping +++ b/data/net/minecraft/client/renderer/texture/TextureManager.mapping @@ -1,12 +1,8 @@ CLASS net/minecraft/client/renderer/texture/TextureManager METHOD (Lnet/minecraft/server/packs/resources/ResourceManager;)V ARG 1 resourceManager - METHOD _bind (Lnet/minecraft/resources/ResourceLocation;)V - ARG 1 path METHOD _dumpAllSheets (Ljava/nio/file/Path;)V ARG 1 path - METHOD bindForSetup (Lnet/minecraft/resources/ResourceLocation;)V - ARG 1 path METHOD dumpAllSheets (Ljava/nio/file/Path;)V ARG 1 path METHOD execute (Ljava/lang/Runnable;)V @@ -16,11 +12,6 @@ CLASS net/minecraft/client/renderer/texture/TextureManager METHOD getTexture (Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/client/renderer/texture/AbstractTexture;)Lnet/minecraft/client/renderer/texture/AbstractTexture; ARG 1 path ARG 2 defaultTexture - METHOD lambda$_dumpAllSheets$8 (Ljava/nio/file/Path;Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/client/renderer/texture/AbstractTexture;)V - ARG 1 path - ARG 2 texture - METHOD lambda$reload$6 (Ljava/lang/Runnable;)V - ARG 0 renderCall METHOD loadTexture (Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/client/renderer/texture/AbstractTexture;)Lnet/minecraft/client/renderer/texture/AbstractTexture; ARG 1 path ARG 2 texture @@ -35,13 +26,6 @@ CLASS net/minecraft/client/renderer/texture/TextureManager ARG 2 texture METHOD release (Lnet/minecraft/resources/ResourceLocation;)V ARG 1 path - METHOD reload (Lnet/minecraft/server/packs/resources/PreparableReloadListener$PreparationBarrier;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;Lnet/minecraft/util/profiling/ProfilerFiller;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; - ARG 1 stage - ARG 2 resourceManager - ARG 3 preparationsProfiler - ARG 4 reloadProfiler - ARG 5 backgroundExecutor - ARG 6 gameExecutor METHOD safeClose (Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/client/renderer/texture/AbstractTexture;)V ARG 1 path ARG 2 texture diff --git a/data/net/minecraft/client/renderer/texture/atlas/sources/PalettedPermutations.mapping b/data/net/minecraft/client/renderer/texture/atlas/sources/PalettedPermutations.mapping index 2988ca7d3..194392789 100644 --- a/data/net/minecraft/client/renderer/texture/atlas/sources/PalettedPermutations.mapping +++ b/data/net/minecraft/client/renderer/texture/atlas/sources/PalettedPermutations.mapping @@ -3,6 +3,9 @@ CLASS net/minecraft/client/renderer/texture/atlas/sources/PalettedPermutations ARG 1 textures ARG 2 paletteKey ARG 3 permutations + METHOD createPaletteMapping ([I[I)Ljava/util/function/IntUnaryOperator; + ARG 0 keys + ARG 1 values METHOD lambda$createPaletteMapping$7 (Lit/unimi/dsi/fastutil/ints/Int2IntMap;I)I ARG 1 color METHOD loadPaletteEntryFromImage (Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/resources/ResourceLocation;)[I diff --git a/data/net/minecraft/client/resources/MapTextureManager.mapping b/data/net/minecraft/client/resources/MapTextureManager.mapping new file mode 100644 index 000000000..d093f26f8 --- /dev/null +++ b/data/net/minecraft/client/resources/MapTextureManager.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/client/resources/MapTextureManager + METHOD (Lnet/minecraft/client/renderer/texture/TextureManager;)V + ARG 1 textureManager + METHOD getOrCreateMapInstance (Lnet/minecraft/world/level/saveddata/maps/MapId;Lnet/minecraft/world/level/saveddata/maps/MapItemSavedData;)Lnet/minecraft/client/resources/MapTextureManager$MapInstance; + ARG 1 id + ARG 2 data + METHOD prepareMapTexture (Lnet/minecraft/world/level/saveddata/maps/MapId;Lnet/minecraft/world/level/saveddata/maps/MapItemSavedData;)Lnet/minecraft/resources/ResourceLocation; + ARG 1 id + ARG 2 data + METHOD update (Lnet/minecraft/world/level/saveddata/maps/MapId;Lnet/minecraft/world/level/saveddata/maps/MapItemSavedData;)V + ARG 1 id + ARG 2 data + CLASS MapInstance + METHOD (Lnet/minecraft/client/resources/MapTextureManager;ILnet/minecraft/world/level/saveddata/maps/MapItemSavedData;)V + ARG 2 id + ARG 3 data + METHOD replaceMapData (Lnet/minecraft/world/level/saveddata/maps/MapItemSavedData;)V + ARG 1 data diff --git a/data/net/minecraft/client/resources/TextureAtlasHolder.mapping b/data/net/minecraft/client/resources/TextureAtlasHolder.mapping index e25bc40e8..5dbafdd75 100644 --- a/data/net/minecraft/client/resources/TextureAtlasHolder.mapping +++ b/data/net/minecraft/client/resources/TextureAtlasHolder.mapping @@ -8,11 +8,8 @@ CLASS net/minecraft/client/resources/TextureAtlasHolder ARG 2 textureAtlasLocation ARG 3 atlasInfoLocation ARG 4 metadataSections - METHOD apply (Lnet/minecraft/client/renderer/texture/SpriteLoader$Preparations;Lnet/minecraft/util/profiling/ProfilerFiller;)V - ARG 1 preparations - ARG 2 profiler + METHOD apply (Lnet/minecraft/client/renderer/texture/SpriteLoader$Preparations;)V + ARG 1 preperations METHOD getSprite (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/texture/TextureAtlasSprite; COMMENT Gets a sprite associated with the passed resource location. ARG 1 location - METHOD lambda$reload$0 (Lnet/minecraft/util/profiling/ProfilerFiller;Lnet/minecraft/client/renderer/texture/SpriteLoader$Preparations;)V - ARG 2 preparations diff --git a/data/net/minecraft/client/resources/metadata/gui/GuiSpriteScaling.mapping b/data/net/minecraft/client/resources/metadata/gui/GuiSpriteScaling.mapping index 43a298844..ceb992119 100644 --- a/data/net/minecraft/client/resources/metadata/gui/GuiSpriteScaling.mapping +++ b/data/net/minecraft/client/resources/metadata/gui/GuiSpriteScaling.mapping @@ -7,6 +7,8 @@ CLASS net/minecraft/client/resources/metadata/gui/GuiSpriteScaling ARG 3 key ARG 4 codec CLASS NineSlice + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD validate (Lnet/minecraft/client/resources/metadata/gui/GuiSpriteScaling$NineSlice;)Lcom/mojang/serialization/DataResult; ARG 0 nineSlice CLASS Border diff --git a/data/net/minecraft/client/resources/model/BlockStateModelLoader.mapping b/data/net/minecraft/client/resources/model/BlockStateModelLoader.mapping index 305be0d50..176ec0dc2 100644 --- a/data/net/minecraft/client/resources/model/BlockStateModelLoader.mapping +++ b/data/net/minecraft/client/resources/model/BlockStateModelLoader.mapping @@ -1,37 +1,7 @@ CLASS net/minecraft/client/resources/model/BlockStateModelLoader - METHOD (Ljava/util/Map;Lnet/minecraft/util/profiling/ProfilerFiller;Lnet/minecraft/client/resources/model/UnbakedModel;Lnet/minecraft/client/color/block/BlockColors;Ljava/util/function/BiConsumer;)V - ARG 1 blockStateResources - ARG 2 profiler - ARG 3 missingModel - ARG 4 blockColors - ARG 5 discoveredModelOutput - METHOD getValueHelper (Lnet/minecraft/world/level/block/state/properties/Property;Ljava/lang/String;)Ljava/lang/Comparable; - ARG 0 property - ARG 1 propertyName - METHOD loadBlockStateDefinitions (Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/world/level/block/state/StateDefinition;)V + METHOD (Lnet/minecraft/client/resources/model/UnbakedModel;)V + ARG 1 missingModel + METHOD loadBlockStateDefinitionStack (Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/world/level/block/state/StateDefinition;Ljava/util/List;)Lnet/minecraft/client/resources/model/BlockStateModelLoader$LoadedModels; ARG 1 blockStateId - ARG 2 stateDefenition - METHOD predicate (Lnet/minecraft/world/level/block/state/StateDefinition;Ljava/lang/String;)Ljava/util/function/Predicate; - ARG 0 stateDefentition - ARG 1 properties - METHOD registerModelGroup (Ljava/lang/Iterable;)V - ARG 1 models - CLASS LoadedJson - METHOD parse (Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/client/renderer/block/model/BlockModelDefinition$Context;)Lnet/minecraft/client/renderer/block/model/BlockModelDefinition; - ARG 1 blockStateId - ARG 2 context - CLASS ModelGroupKey - METHOD create (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/client/renderer/block/model/multipart/MultiPart;Ljava/util/Collection;)Lnet/minecraft/client/resources/model/BlockStateModelLoader$ModelGroupKey; - ARG 0 state - ARG 1 model - ARG 2 properties - METHOD create (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/client/resources/model/UnbakedModel;Ljava/util/Collection;)Lnet/minecraft/client/resources/model/BlockStateModelLoader$ModelGroupKey; - ARG 0 state - ARG 1 model - ARG 2 properties - METHOD getColoringValues (Lnet/minecraft/world/level/block/state/BlockState;Ljava/util/Collection;)Ljava/util/List; - ARG 0 state - ARG 1 properties - CLASS BlockStateDefinitionException - METHOD (Ljava/lang/String;)V - ARG 1 message + ARG 2 stateDefinition + ARG 3 modelDefinitions diff --git a/data/net/minecraft/client/resources/model/BuiltInModel.mapping b/data/net/minecraft/client/resources/model/BuiltInModel.mapping index ad6e34d62..62983cfe2 100644 --- a/data/net/minecraft/client/resources/model/BuiltInModel.mapping +++ b/data/net/minecraft/client/resources/model/BuiltInModel.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/client/resources/model/BuiltInModel - METHOD (Lnet/minecraft/client/renderer/block/model/ItemTransforms;Lnet/minecraft/client/renderer/block/model/ItemOverrides;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;Z)V + METHOD (Lnet/minecraft/client/renderer/block/model/ItemTransforms;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;Z)V ARG 1 itemTransforms - ARG 2 overrides - ARG 3 particleTexture - ARG 4 usesBlockLight + ARG 2 particleTexture + ARG 3 usesBlockLight diff --git a/data/net/minecraft/client/resources/model/DelegateBakedModel.mapping b/data/net/minecraft/client/resources/model/DelegateBakedModel.mapping new file mode 100644 index 000000000..867e0d25d --- /dev/null +++ b/data/net/minecraft/client/resources/model/DelegateBakedModel.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/client/resources/model/DelegateBakedModel + METHOD (Lnet/minecraft/client/resources/model/BakedModel;)V + ARG 1 parent diff --git a/data/net/minecraft/client/resources/model/EquipmentModelSet.mapping b/data/net/minecraft/client/resources/model/EquipmentModelSet.mapping new file mode 100644 index 000000000..2a9afcabf --- /dev/null +++ b/data/net/minecraft/client/resources/model/EquipmentModelSet.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/client/resources/model/EquipmentModelSet + METHOD get (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/world/item/equipment/EquipmentModel; + ARG 1 name diff --git a/data/net/minecraft/client/resources/model/ItemModel.mapping b/data/net/minecraft/client/resources/model/ItemModel.mapping new file mode 100644 index 000000000..b80a7c2b3 --- /dev/null +++ b/data/net/minecraft/client/resources/model/ItemModel.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/client/resources/model/ItemModel + METHOD (Lnet/minecraft/resources/ResourceLocation;)V + ARG 1 id + CLASS BakedModelWithOverrides + METHOD (Lnet/minecraft/client/resources/model/BakedModel;Lnet/minecraft/client/renderer/block/model/BakedOverrides;)V + ARG 1 parent + ARG 2 overrides diff --git a/data/net/minecraft/client/resources/model/Material.mapping b/data/net/minecraft/client/resources/model/Material.mapping index ba08fd705..a0429d1bd 100644 --- a/data/net/minecraft/client/resources/model/Material.mapping +++ b/data/net/minecraft/client/resources/model/Material.mapping @@ -3,12 +3,13 @@ CLASS net/minecraft/client/resources/model/Material ARG 1 atlasLocation ARG 2 texture METHOD buffer (Lnet/minecraft/client/renderer/MultiBufferSource;Ljava/util/function/Function;)Lcom/mojang/blaze3d/vertex/VertexConsumer; - ARG 1 buffer + ARG 1 bufferSource ARG 2 renderTypeGetter - METHOD buffer (Lnet/minecraft/client/renderer/MultiBufferSource;Ljava/util/function/Function;Z)Lcom/mojang/blaze3d/vertex/VertexConsumer; - ARG 1 buffer + METHOD buffer (Lnet/minecraft/client/renderer/MultiBufferSource;Ljava/util/function/Function;ZZ)Lcom/mojang/blaze3d/vertex/VertexConsumer; + ARG 1 bufferSource ARG 2 renderTypeGetter - ARG 3 withGlint + ARG 3 noEntity + ARG 4 withGlint METHOD equals (Ljava/lang/Object;)Z ARG 1 other METHOD renderType (Ljava/util/function/Function;)Lnet/minecraft/client/renderer/RenderType; diff --git a/data/net/minecraft/client/resources/model/ModelBaker.mapping b/data/net/minecraft/client/resources/model/ModelBaker.mapping index 4b0fccaea..0fa9915f2 100644 --- a/data/net/minecraft/client/resources/model/ModelBaker.mapping +++ b/data/net/minecraft/client/resources/model/ModelBaker.mapping @@ -2,5 +2,3 @@ CLASS net/minecraft/client/resources/model/ModelBaker METHOD bake (Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/client/resources/model/ModelState;)Lnet/minecraft/client/resources/model/BakedModel; ARG 1 location ARG 2 transform - METHOD getModel (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/resources/model/UnbakedModel; - ARG 1 location diff --git a/data/net/minecraft/client/resources/model/ModelBakery.mapping b/data/net/minecraft/client/resources/model/ModelBakery.mapping index a790babcb..855c226b3 100644 --- a/data/net/minecraft/client/resources/model/ModelBakery.mapping +++ b/data/net/minecraft/client/resources/model/ModelBakery.mapping @@ -1,27 +1,12 @@ CLASS net/minecraft/client/resources/model/ModelBakery - METHOD (Lnet/minecraft/client/color/block/BlockColors;Lnet/minecraft/util/profiling/ProfilerFiller;Ljava/util/Map;Ljava/util/Map;)V - ARG 1 blockColors - ARG 2 profilerFiller - ARG 3 modelResources - ARG 4 blockStateResources + METHOD (Ljava/util/Map;Ljava/util/Map;Lnet/minecraft/client/resources/model/UnbakedModel;)V + ARG 1 topModels + ARG 2 unbackedModels + ARG 3 missingModel METHOD bakeModels (Lnet/minecraft/client/resources/model/ModelBakery$TextureGetter;)V ARG 1 textureGetter - METHOD getModel (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/resources/model/UnbakedModel; - ARG 1 modelLocation METHOD lambda$static$0 (I)Lnet/minecraft/resources/ResourceLocation; ARG 0 index - METHOD loadBlockModel (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/block/model/BlockModel; - ARG 1 location - METHOD loadItemModelAndDependencies (Lnet/minecraft/resources/ResourceLocation;)V - ARG 1 modelLocation - METHOD loadSpecialItemModelAndDependencies (Lnet/minecraft/client/resources/model/ModelResourceLocation;)V - ARG 1 modelLocation - METHOD registerModel (Lnet/minecraft/client/resources/model/ModelResourceLocation;Lnet/minecraft/client/resources/model/UnbakedModel;)V - ARG 1 modelLocation - ARG 2 model - METHOD registerModelAndLoadDependencies (Lnet/minecraft/client/resources/model/ModelResourceLocation;Lnet/minecraft/client/resources/model/UnbakedModel;)V - ARG 1 modelLocation - ARG 2 model CLASS TextureGetter METHOD get (Lnet/minecraft/client/resources/model/ModelResourceLocation;Lnet/minecraft/client/resources/model/Material;)Lnet/minecraft/client/renderer/texture/TextureAtlasSprite; ARG 1 modelLocation @@ -33,3 +18,5 @@ CLASS net/minecraft/client/resources/model/ModelBakery METHOD bakeUncached (Lnet/minecraft/client/resources/model/UnbakedModel;Lnet/minecraft/client/resources/model/ModelState;)Lnet/minecraft/client/resources/model/BakedModel; ARG 1 model ARG 2 state + METHOD getModel (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/resources/model/UnbakedModel; + ARG 1 name diff --git a/data/net/minecraft/client/resources/model/ModelDiscovery.mapping b/data/net/minecraft/client/resources/model/ModelDiscovery.mapping new file mode 100644 index 000000000..79abac990 --- /dev/null +++ b/data/net/minecraft/client/resources/model/ModelDiscovery.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/client/resources/model/ModelDiscovery + METHOD (Ljava/util/Map;Lnet/minecraft/client/resources/model/UnbakedModel;)V + ARG 1 inputModels + ARG 2 missingModel + METHOD getBlockModel (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/resources/model/UnbakedModel; + ARG 1 modelLocation + METHOD loadBlockModel (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/resources/model/UnbakedModel; + ARG 1 modelLocation + METHOD registerStandardModels (Lnet/minecraft/client/resources/model/BlockStateModelLoader$LoadedModels;)V + ARG 1 loadedModels + METHOD registerTopModel (Lnet/minecraft/client/resources/model/ModelResourceLocation;Lnet/minecraft/client/resources/model/UnbakedModel;)V + ARG 1 id + ARG 2 model diff --git a/data/net/minecraft/client/resources/model/ModelGroupCollector.mapping b/data/net/minecraft/client/resources/model/ModelGroupCollector.mapping new file mode 100644 index 000000000..6715823e6 --- /dev/null +++ b/data/net/minecraft/client/resources/model/ModelGroupCollector.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/client/resources/model/ModelGroupCollector + METHOD build (Lnet/minecraft/client/color/block/BlockColors;Lnet/minecraft/client/resources/model/BlockStateModelLoader$LoadedModels;)Lit/unimi/dsi/fastutil/objects/Object2IntMap; + ARG 0 blockColors + ARG 1 loadedModels + CLASS GroupKey + METHOD create (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/client/resources/model/UnbakedModel;Ljava/util/List;)Lnet/minecraft/client/resources/model/ModelGroupCollector$GroupKey; + ARG 0 state + ARG 1 model + ARG 2 properties + METHOD getColoringValues (Lnet/minecraft/world/level/block/state/BlockState;Ljava/util/List;)Ljava/util/List; + ARG 0 state + ARG 1 properties diff --git a/data/net/minecraft/client/resources/model/ModelManager.mapping b/data/net/minecraft/client/resources/model/ModelManager.mapping index 3051fcf97..87bd2ca57 100644 --- a/data/net/minecraft/client/resources/model/ModelManager.mapping +++ b/data/net/minecraft/client/resources/model/ModelManager.mapping @@ -6,33 +6,29 @@ CLASS net/minecraft/client/resources/model/ModelManager METHOD apply (Lnet/minecraft/client/resources/model/ModelManager$ReloadState;Lnet/minecraft/util/profiling/ProfilerFiller;)V ARG 1 reloadState ARG 2 profiler + METHOD buildModelGroups (Lnet/minecraft/client/color/block/BlockColors;Lnet/minecraft/client/resources/model/BlockStateModelLoader$LoadedModels;)Lit/unimi/dsi/fastutil/objects/Object2IntMap; + ARG 0 blockColors + ARG 1 loadedModels + METHOD discoverModelDependencies (Lnet/minecraft/client/resources/model/UnbakedModel;Ljava/util/Map;Lnet/minecraft/client/resources/model/BlockStateModelLoader$LoadedModels;)Lnet/minecraft/client/resources/model/ModelDiscovery; + ARG 1 missingModel + ARG 2 inputModels + ARG 3 loadedModels METHOD getAtlas (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/renderer/texture/TextureAtlas; ARG 1 location METHOD getModel (Lnet/minecraft/client/resources/model/ModelResourceLocation;)Lnet/minecraft/client/resources/model/BakedModel; ARG 1 modelLocation - METHOD lambda$loadBlockModels$10 (Ljava/util/concurrent/Executor;Ljava/util/Map;)Ljava/util/concurrent/CompletionStage; - ARG 1 modelResources - METHOD lambda$loadBlockModels$9 (Ljava/util/List;)Ljava/util/Map; - ARG 0 modelResourcePairs - METHOD lambda$loadBlockStates$13 (Ljava/util/List;)Ljava/util/Map; - ARG 0 loadedBlockStates - METHOD lambda$loadBlockStates$14 (Ljava/util/concurrent/Executor;Ljava/util/Map;)Ljava/util/concurrent/CompletionStage; - ARG 1 blockStateResources - METHOD lambda$loadModels$18 (Ljava/util/Map;Lnet/minecraft/client/resources/model/BakedModel;Ljava/util/Map;Lnet/minecraft/world/level/block/state/BlockState;)V - ARG 3 possibleState - METHOD lambda$reload$0 (Lnet/minecraft/util/profiling/ProfilerFiller;Ljava/util/Map;Ljava/util/Map;)Lnet/minecraft/client/resources/model/ModelBakery; - ARG 2 modelResources - ARG 3 blockStateResources METHOD loadBlockModels (Lnet/minecraft/server/packs/resources/ResourceManager;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 0 resourceManager ARG 1 executor - METHOD loadBlockStates (Lnet/minecraft/server/packs/resources/ResourceManager;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; - ARG 0 resourceManager - ARG 1 executor - METHOD loadModels (Lnet/minecraft/util/profiling/ProfilerFiller;Ljava/util/Map;Lnet/minecraft/client/resources/model/ModelBakery;)Lnet/minecraft/client/resources/model/ModelManager$ReloadState; - ARG 1 profilerFiller - ARG 2 atlasPreparations + METHOD loadBlockStates (Lnet/minecraft/client/resources/model/BlockStateModelLoader;Lnet/minecraft/server/packs/resources/ResourceManager;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 0 modelLoader + ARG 1 resourceManager + ARG 2 backgroundExecutor + METHOD loadModels (Lnet/minecraft/util/profiling/ProfilerFiller;Ljava/util/Map;Lnet/minecraft/client/resources/model/ModelBakery;Lit/unimi/dsi/fastutil/objects/Object2IntMap;)Lnet/minecraft/client/resources/model/ModelManager$ReloadState; + ARG 1 profiler + ARG 2 stitchResults ARG 3 modelBakery + ARG 4 modelGroups METHOD requiresRender (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 oldState ARG 2 newState diff --git a/data/net/minecraft/client/resources/model/ModelResourceLocation.mapping b/data/net/minecraft/client/resources/model/ModelResourceLocation.mapping index 00cb47d58..8a29229aa 100644 --- a/data/net/minecraft/client/resources/model/ModelResourceLocation.mapping +++ b/data/net/minecraft/client/resources/model/ModelResourceLocation.mapping @@ -6,6 +6,3 @@ CLASS net/minecraft/client/resources/model/ModelResourceLocation ARG 0 id METHOD lowercaseVariant (Ljava/lang/String;)Ljava/lang/String; ARG 0 variant - METHOD vanilla (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/client/resources/model/ModelResourceLocation; - ARG 0 path - ARG 1 variant diff --git a/data/net/minecraft/client/resources/model/MultiPartBakedModel.mapping b/data/net/minecraft/client/resources/model/MultiPartBakedModel.mapping index c502938c6..d196e0208 100644 --- a/data/net/minecraft/client/resources/model/MultiPartBakedModel.mapping +++ b/data/net/minecraft/client/resources/model/MultiPartBakedModel.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/client/resources/model/MultiPartBakedModel METHOD (Ljava/util/List;)V ARG 1 selectors - CLASS Builder - METHOD add (Ljava/util/function/Predicate;Lnet/minecraft/client/resources/model/BakedModel;)V - ARG 1 predicate - ARG 2 model + METHOD getFirstModel (Ljava/util/List;)Lnet/minecraft/client/resources/model/BakedModel; + ARG 0 selectors diff --git a/data/net/minecraft/client/resources/model/SimpleBakedModel.mapping b/data/net/minecraft/client/resources/model/SimpleBakedModel.mapping index a8e0b21fd..a0fd93611 100644 --- a/data/net/minecraft/client/resources/model/SimpleBakedModel.mapping +++ b/data/net/minecraft/client/resources/model/SimpleBakedModel.mapping @@ -1,24 +1,21 @@ CLASS net/minecraft/client/resources/model/SimpleBakedModel - METHOD (Ljava/util/List;Ljava/util/Map;ZZZLnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/client/renderer/block/model/ItemTransforms;Lnet/minecraft/client/renderer/block/model/ItemOverrides;)V + METHOD (Ljava/util/List;Ljava/util/Map;ZZZLnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/client/renderer/block/model/ItemTransforms;)V ARG 1 unculledFaces ARG 2 culledFaces ARG 3 hasAmbientOcclusion - ARG 4 usesBlockLight + ARG 4 useBlockLight ARG 5 isGui3d ARG 6 particleIcon ARG 7 transforms - ARG 8 overrides CLASS Builder - METHOD (Lnet/minecraft/client/renderer/block/model/BlockModel;Lnet/minecraft/client/renderer/block/model/ItemOverrides;Z)V - ARG 1 blockModel - ARG 2 overrides - ARG 3 isGui3d - METHOD (ZZZLnet/minecraft/client/renderer/block/model/ItemTransforms;Lnet/minecraft/client/renderer/block/model/ItemOverrides;)V + METHOD (Lnet/minecraft/client/renderer/block/model/BlockModel;Z)V + ARG 1 model + ARG 2 isGui3d + METHOD (ZZZLnet/minecraft/client/renderer/block/model/ItemTransforms;)V ARG 1 hasAmbientOcclusion - ARG 2 usesBlockLight + ARG 2 useBlockLight ARG 3 isGui3d - ARG 4 transforms - ARG 5 overrides + ARG 4 trnsforms METHOD addCulledFace (Lnet/minecraft/core/Direction;Lnet/minecraft/client/renderer/block/model/BakedQuad;)Lnet/minecraft/client/resources/model/SimpleBakedModel$Builder; ARG 1 facing ARG 2 quad diff --git a/data/net/minecraft/client/resources/model/SpecialModels.mapping b/data/net/minecraft/client/resources/model/SpecialModels.mapping new file mode 100644 index 000000000..2c3b03079 --- /dev/null +++ b/data/net/minecraft/client/resources/model/SpecialModels.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/client/resources/model/SpecialModels + METHOD builtinModelId (Ljava/lang/String;)Lnet/minecraft/resources/ResourceLocation; + ARG 0 name + METHOD createMarker (Ljava/lang/String;Lnet/minecraft/client/renderer/block/model/BlockModel$GuiLight;)Lnet/minecraft/client/resources/model/UnbakedModel; + ARG 0 name + ARG 1 guiLight diff --git a/data/net/minecraft/client/resources/model/UnbakedModel.mapping b/data/net/minecraft/client/resources/model/UnbakedModel.mapping index 2dc61cfdc..bdc72172d 100644 --- a/data/net/minecraft/client/resources/model/UnbakedModel.mapping +++ b/data/net/minecraft/client/resources/model/UnbakedModel.mapping @@ -3,5 +3,8 @@ CLASS net/minecraft/client/resources/model/UnbakedModel ARG 1 baker ARG 2 spriteGetter ARG 3 state - METHOD resolveParents (Ljava/util/function/Function;)V + METHOD resolveDependencies (Lnet/minecraft/client/resources/model/UnbakedModel$Resolver;)V ARG 1 resolver + CLASS Resolver + METHOD resolve (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/resources/model/UnbakedModel; + ARG 1 modelLocation diff --git a/data/net/minecraft/client/resources/model/WeightedBakedModel.mapping b/data/net/minecraft/client/resources/model/WeightedBakedModel.mapping index 2589e0057..ad323102c 100644 --- a/data/net/minecraft/client/resources/model/WeightedBakedModel.mapping +++ b/data/net/minecraft/client/resources/model/WeightedBakedModel.mapping @@ -1,7 +1,3 @@ CLASS net/minecraft/client/resources/model/WeightedBakedModel - METHOD (Ljava/util/List;)V + METHOD (Lnet/minecraft/util/random/SimpleWeightedRandomList;)V ARG 1 list - CLASS Builder - METHOD add (Lnet/minecraft/client/resources/model/BakedModel;I)Lnet/minecraft/client/resources/model/WeightedBakedModel$Builder; - ARG 1 model - ARG 2 weight diff --git a/data/net/minecraft/client/searchtree/SuffixArray.mapping b/data/net/minecraft/client/searchtree/SuffixArray.mapping index b238cbcec..1b5c2f306 100644 --- a/data/net/minecraft/client/searchtree/SuffixArray.mapping +++ b/data/net/minecraft/client/searchtree/SuffixArray.mapping @@ -2,6 +2,11 @@ CLASS net/minecraft/client/searchtree/SuffixArray METHOD add (Ljava/lang/Object;Ljava/lang/String;)V ARG 1 object ARG 2 contents + METHOD compare (Ljava/lang/String;I)I + ARG 1 string + ARG 2 index + METHOD getString (I)Ljava/lang/String; + ARG 1 index METHOD print ()V COMMENT Prints the entire array to the logger, on debug level METHOD search (Ljava/lang/String;)Ljava/util/List; diff --git a/data/net/minecraft/client/telemetry/TelemetryEventSender.mapping b/data/net/minecraft/client/telemetry/TelemetryEventSender.mapping index 53b48f37b..35c3e3b6d 100644 --- a/data/net/minecraft/client/telemetry/TelemetryEventSender.mapping +++ b/data/net/minecraft/client/telemetry/TelemetryEventSender.mapping @@ -1,3 +1,6 @@ CLASS net/minecraft/client/telemetry/TelemetryEventSender + METHOD decorate (Ljava/util/function/Consumer;)Lnet/minecraft/client/telemetry/TelemetryEventSender; + ARG 1 propertyAdder METHOD send (Lnet/minecraft/client/telemetry/TelemetryEventType;Ljava/util/function/Consumer;)V ARG 1 eventType + ARG 2 propertyAdder diff --git a/data/net/minecraft/client/telemetry/TelemetryProperty.mapping b/data/net/minecraft/client/telemetry/TelemetryProperty.mapping index 591a14974..90f67f19a 100644 --- a/data/net/minecraft/client/telemetry/TelemetryProperty.mapping +++ b/data/net/minecraft/client/telemetry/TelemetryProperty.mapping @@ -31,6 +31,8 @@ CLASS net/minecraft/client/telemetry/TelemetryProperty CLASS Exporter METHOD apply (Lcom/mojang/authlib/minecraft/TelemetryPropertyContainer;Ljava/lang/String;Ljava/lang/Object;)V ARG 1 container + ARG 2 exportKey + ARG 3 value CLASS GameMode METHOD (Ljava/lang/String;ILjava/lang/String;I)V ARG 3 key diff --git a/data/net/minecraft/client/tutorial/BundleTutorial.mapping b/data/net/minecraft/client/tutorial/BundleTutorial.mapping deleted file mode 100644 index d520f08dc..000000000 --- a/data/net/minecraft/client/tutorial/BundleTutorial.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/client/tutorial/BundleTutorial - METHOD (Lnet/minecraft/client/tutorial/Tutorial;Lnet/minecraft/client/Options;)V - ARG 1 tutorial - ARG 2 options - METHOD onInventoryAction (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/inventory/ClickAction;)V - ARG 1 carriedStack - ARG 2 slottedStack - ARG 3 action diff --git a/data/net/minecraft/client/tutorial/MovementTutorialStepInstance.mapping b/data/net/minecraft/client/tutorial/MovementTutorialStepInstance.mapping index 5ba3811db..4727c96e6 100644 --- a/data/net/minecraft/client/tutorial/MovementTutorialStepInstance.mapping +++ b/data/net/minecraft/client/tutorial/MovementTutorialStepInstance.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/client/tutorial/MovementTutorialStepInstance METHOD (Lnet/minecraft/client/tutorial/Tutorial;)V ARG 1 tutorial - METHOD onInput (Lnet/minecraft/client/player/Input;)V - COMMENT Handles the player movement - ARG 1 input METHOD onMouse (DD)V ARG 1 velocityX ARG 3 velocityY diff --git a/data/net/minecraft/client/tutorial/Tutorial.mapping b/data/net/minecraft/client/tutorial/Tutorial.mapping index 805f324d1..97eb7cccb 100644 --- a/data/net/minecraft/client/tutorial/Tutorial.mapping +++ b/data/net/minecraft/client/tutorial/Tutorial.mapping @@ -2,13 +2,8 @@ CLASS net/minecraft/client/tutorial/Tutorial METHOD (Lnet/minecraft/client/Minecraft;Lnet/minecraft/client/Options;)V ARG 1 minecraft ARG 2 options - METHOD addTimedToast (Lnet/minecraft/client/gui/components/toasts/TutorialToast;I)V - ARG 1 toast - ARG 2 durationTicks METHOD key (Ljava/lang/String;)Lnet/minecraft/network/chat/Component; ARG 0 keybind - METHOD lambda$removeTimedToast$0 (Lnet/minecraft/client/gui/components/toasts/TutorialToast;Lnet/minecraft/client/tutorial/Tutorial$TimedToast;)Z - ARG 1 timed METHOD onDestroyBlock (Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;F)V ARG 1 level ARG 2 pos @@ -17,7 +12,7 @@ CLASS net/minecraft/client/tutorial/Tutorial METHOD onGetItem (Lnet/minecraft/world/item/ItemStack;)V COMMENT Called when the player pick up an ItemStack ARG 1 stack - METHOD onInput (Lnet/minecraft/client/player/Input;)V + METHOD onInput (Lnet/minecraft/client/player/ClientInput;)V ARG 1 input METHOD onInventoryAction (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/inventory/ClickAction;)V ARG 1 carriedStack @@ -31,14 +26,8 @@ CLASS net/minecraft/client/tutorial/Tutorial ARG 3 velocityY METHOD onOpenInventory ()V COMMENT Called when the player opens his inventory - METHOD removeTimedToast (Lnet/minecraft/client/gui/components/toasts/TutorialToast;)V - ARG 1 toast METHOD setStep (Lnet/minecraft/client/tutorial/TutorialSteps;)V COMMENT Sets a new step to the tutorial ARG 1 step METHOD start ()V COMMENT Reloads the tutorial step from the game settings - CLASS TimedToast - METHOD (Lnet/minecraft/client/gui/components/toasts/TutorialToast;I)V - ARG 1 toast - ARG 2 durationTicks diff --git a/data/net/minecraft/client/tutorial/TutorialStepInstance.mapping b/data/net/minecraft/client/tutorial/TutorialStepInstance.mapping index a13545f39..59a325003 100644 --- a/data/net/minecraft/client/tutorial/TutorialStepInstance.mapping +++ b/data/net/minecraft/client/tutorial/TutorialStepInstance.mapping @@ -8,8 +8,7 @@ CLASS net/minecraft/client/tutorial/TutorialStepInstance METHOD onGetItem (Lnet/minecraft/world/item/ItemStack;)V COMMENT Called when the player pick up an ItemStack ARG 1 stack - METHOD onInput (Lnet/minecraft/client/player/Input;)V - COMMENT Handles the player movement + METHOD onInput (Lnet/minecraft/client/player/ClientInput;)V ARG 1 input METHOD onLookAt (Lnet/minecraft/client/multiplayer/ClientLevel;Lnet/minecraft/world/phys/HitResult;)V COMMENT Handles blocks and entities hovering diff --git a/data/net/minecraft/commands/CommandSourceStack.mapping b/data/net/minecraft/commands/CommandSourceStack.mapping index c96fe47b8..4cadbac03 100644 --- a/data/net/minecraft/commands/CommandSourceStack.mapping +++ b/data/net/minecraft/commands/CommandSourceStack.mapping @@ -33,8 +33,6 @@ CLASS net/minecraft/commands/CommandSourceStack ARG 1 lookPos METHOD hasPermission (I)Z ARG 1 level - METHOD lambda$suggestRegistryElements$0 (Lnet/minecraft/commands/SharedSuggestionProvider$ElementSuggestionType;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/core/Registry;)Ljava/util/concurrent/CompletableFuture; - ARG 3 registry METHOD sendChatMessage (Lnet/minecraft/network/chat/OutgoingChatMessage;ZLnet/minecraft/network/chat/ChatType$Bound;)V ARG 1 message ARG 2 shouldFilter diff --git a/data/net/minecraft/commands/SharedSuggestionProvider.mapping b/data/net/minecraft/commands/SharedSuggestionProvider.mapping index d840759e7..97f4b6eb1 100644 --- a/data/net/minecraft/commands/SharedSuggestionProvider.mapping +++ b/data/net/minecraft/commands/SharedSuggestionProvider.mapping @@ -14,18 +14,6 @@ CLASS net/minecraft/commands/SharedSuggestionProvider ARG 3 resourceConsumer METHOD hasPermission (I)Z ARG 1 permissionLevel - METHOD lambda$suggest$5 (Ljava/lang/String;Ljava/lang/String;)Z - ARG 1 string - METHOD lambda$suggestResource$0 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/resources/ResourceLocation; - ARG 0 resourceLocation - METHOD lambda$suggestResource$1 (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/lang/String;Lnet/minecraft/resources/ResourceLocation;)V - ARG 2 resourceLocation - METHOD lambda$suggestResource$2 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/resources/ResourceLocation; - ARG 0 resourceLocation - METHOD lambda$suggestResource$3 (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Lnet/minecraft/resources/ResourceLocation;)V - ARG 1 resourceLocation - METHOD lambda$suggestResource$4 (Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Function;Ljava/util/function/Function;Ljava/lang/Object;)V - ARG 3 resource METHOD matchesSubStr (Ljava/lang/String;Ljava/lang/String;)Z ARG 0 input ARG 1 substring diff --git a/data/net/minecraft/commands/arguments/ResourceKeyArgument.mapping b/data/net/minecraft/commands/arguments/ResourceKeyArgument.mapping index f82e406dc..ef8b32f27 100644 --- a/data/net/minecraft/commands/arguments/ResourceKeyArgument.mapping +++ b/data/net/minecraft/commands/arguments/ResourceKeyArgument.mapping @@ -1,9 +1,15 @@ CLASS net/minecraft/commands/arguments/ResourceKeyArgument METHOD (Lnet/minecraft/resources/ResourceKey;)V ARG 1 registryKey + METHOD getAdvancement (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/advancements/AdvancementHolder; + ARG 0 context + ARG 1 argument METHOD getConfiguredFeature (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/core/Holder$Reference; ARG 0 context ARG 1 argument + METHOD getRecipe (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/world/item/crafting/RecipeHolder; + ARG 0 context + ARG 1 argument METHOD getRegistry (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/core/Registry; ARG 0 context ARG 1 registryKey @@ -26,6 +32,10 @@ CLASS net/minecraft/commands/arguments/ResourceKeyArgument ARG 0 structureType METHOD lambda$static$2 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 templatePoolType + METHOD lambda$static$3 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 recipe + METHOD lambda$static$4 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 advancement METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder diff --git a/data/net/minecraft/commands/arguments/ResourceLocationArgument.mapping b/data/net/minecraft/commands/arguments/ResourceLocationArgument.mapping index 424609744..4c27a806d 100644 --- a/data/net/minecraft/commands/arguments/ResourceLocationArgument.mapping +++ b/data/net/minecraft/commands/arguments/ResourceLocationArgument.mapping @@ -1,16 +1,6 @@ CLASS net/minecraft/commands/arguments/ResourceLocationArgument - METHOD getAdvancement (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/advancements/AdvancementHolder; - ARG 0 context - ARG 1 name METHOD getId (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/resources/ResourceLocation; ARG 0 context ARG 1 name - METHOD getRecipe (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/world/item/crafting/RecipeHolder; - ARG 0 context - ARG 1 name - METHOD lambda$static$0 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 advancement - METHOD lambda$static$1 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; - ARG 0 recipe METHOD parse (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/resources/ResourceLocation; ARG 1 reader diff --git a/data/net/minecraft/commands/arguments/ScoreHolderArgument.mapping b/data/net/minecraft/commands/arguments/ScoreHolderArgument.mapping index 390c6fc38..d45ff1c6e 100644 --- a/data/net/minecraft/commands/arguments/ScoreHolderArgument.mapping +++ b/data/net/minecraft/commands/arguments/ScoreHolderArgument.mapping @@ -27,6 +27,9 @@ CLASS net/minecraft/commands/arguments/ScoreHolderArgument ARG 1 builder METHOD parse (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/commands/arguments/ScoreHolderArgument$Result; ARG 1 reader + METHOD parse (Lcom/mojang/brigadier/StringReader;Ljava/lang/Object;)Lnet/minecraft/commands/arguments/ScoreHolderArgument$Result; + ARG 1 reader + ARG 2 suggestionProvider METHOD parse (Lcom/mojang/brigadier/StringReader;Z)Lnet/minecraft/commands/arguments/ScoreHolderArgument$Result; ARG 1 reader ARG 2 allowSelectors diff --git a/data/net/minecraft/commands/arguments/coordinates/WorldCoordinates.mapping b/data/net/minecraft/commands/arguments/coordinates/WorldCoordinates.mapping index 1069a241f..875eaa47b 100644 --- a/data/net/minecraft/commands/arguments/coordinates/WorldCoordinates.mapping +++ b/data/net/minecraft/commands/arguments/coordinates/WorldCoordinates.mapping @@ -9,8 +9,6 @@ CLASS net/minecraft/commands/arguments/coordinates/WorldCoordinates ARG 4 z METHOD absolute (Lnet/minecraft/world/phys/Vec2;)Lnet/minecraft/commands/arguments/coordinates/WorldCoordinates; ARG 0 vector - METHOD current ()Lnet/minecraft/commands/arguments/coordinates/WorldCoordinates; - COMMENT A location with a delta of 0 for all values (equivalent to ~ ~ ~ or ~0 ~0 ~0) METHOD equals (Ljava/lang/Object;)Z ARG 1 other METHOD getPosition (Lnet/minecraft/commands/CommandSourceStack;)Lnet/minecraft/world/phys/Vec3; diff --git a/data/net/minecraft/commands/arguments/selector/SelectorPattern.mapping b/data/net/minecraft/commands/arguments/selector/SelectorPattern.mapping new file mode 100644 index 000000000..a34401f72 --- /dev/null +++ b/data/net/minecraft/commands/arguments/selector/SelectorPattern.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/commands/arguments/selector/SelectorPattern + METHOD equals (Ljava/lang/Object;)Z + ARG 1 other + METHOD parse (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 pattern diff --git a/data/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.mapping b/data/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.mapping index 5e34905cf..cbe0be8b7 100644 --- a/data/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.mapping +++ b/data/net/minecraft/commands/arguments/selector/options/EntitySelectorOptions.mapping @@ -65,55 +65,10 @@ CLASS net/minecraft/commands/arguments/selector/options/EntitySelectorOptions ARG 0 parser METHOD lambda$bootStrap$39 (Lnet/minecraft/commands/arguments/selector/EntitySelectorParser;)Z ARG 0 parser - METHOD lambda$bootStrap$40 (Lnet/minecraft/commands/arguments/selector/EntitySelectorParser;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; - ARG 1 builder - ARG 2 consumer - METHOD lambda$bootStrap$41 (Lnet/minecraft/tags/TagKey;ZLnet/minecraft/world/entity/Entity;)Z - ARG 2 entity - METHOD lambda$bootStrap$43 (Lnet/minecraft/world/entity/EntityType;ZLnet/minecraft/world/entity/Entity;)Z - ARG 2 entity - METHOD lambda$bootStrap$44 (Lnet/minecraft/commands/arguments/selector/EntitySelectorParser;)V - ARG 0 parser - METHOD lambda$bootStrap$45 (Lnet/minecraft/commands/arguments/selector/EntitySelectorParser;)Z - ARG 0 parser - METHOD lambda$bootStrap$46 (Ljava/lang/String;ZLnet/minecraft/world/entity/Entity;)Z - ARG 2 entity - METHOD lambda$bootStrap$47 (Lnet/minecraft/commands/arguments/selector/EntitySelectorParser;)V - ARG 0 parser - METHOD lambda$bootStrap$48 (Lnet/minecraft/commands/arguments/selector/EntitySelectorParser;)Z - ARG 0 parser - METHOD lambda$bootStrap$49 (Lnet/minecraft/nbt/CompoundTag;ZLnet/minecraft/world/entity/Entity;)Z - ARG 2 entity METHOD lambda$bootStrap$5 (Ljava/lang/String;ZLnet/minecraft/world/entity/Entity;)Z ARG 2 entity - METHOD lambda$bootStrap$50 (Lnet/minecraft/commands/arguments/selector/EntitySelectorParser;)V - ARG 0 parser - METHOD lambda$bootStrap$51 (Lnet/minecraft/commands/arguments/selector/EntitySelectorParser;)Z - ARG 0 parser - METHOD lambda$bootStrap$52 (Ljava/util/Map;Lnet/minecraft/world/entity/Entity;)Z - ARG 1 entity - METHOD lambda$bootStrap$53 (Lnet/minecraft/commands/arguments/selector/EntitySelectorParser;)V - ARG 0 parser - METHOD lambda$bootStrap$54 (Lnet/minecraft/commands/arguments/selector/EntitySelectorParser;)Z - ARG 0 parser - METHOD lambda$bootStrap$55 (ZLnet/minecraft/advancements/CriterionProgress;)Z - ARG 1 criterionProgress - METHOD lambda$bootStrap$56 (Ljava/util/Map;Lnet/minecraft/advancements/AdvancementProgress;)Z - ARG 1 advancementProgress - METHOD lambda$bootStrap$57 (ZLnet/minecraft/advancements/AdvancementProgress;)Z - ARG 1 advancementProgress - METHOD lambda$bootStrap$58 (Ljava/util/Map;Lnet/minecraft/world/entity/Entity;)Z - ARG 1 entity - METHOD lambda$bootStrap$59 (Lnet/minecraft/commands/arguments/selector/EntitySelectorParser;)V - ARG 0 parser METHOD lambda$bootStrap$6 (Lnet/minecraft/commands/arguments/selector/EntitySelectorParser;)V ARG 0 parser - METHOD lambda$bootStrap$60 (Lnet/minecraft/commands/arguments/selector/EntitySelectorParser;)Z - ARG 0 parser - METHOD lambda$bootStrap$62 (Lnet/minecraft/commands/arguments/selector/EntitySelectorParser;)V - ARG 0 parser - METHOD lambda$bootStrap$63 (Lnet/minecraft/commands/arguments/selector/EntitySelectorParser;)Z - ARG 0 parser METHOD lambda$bootStrap$7 (Lnet/minecraft/commands/arguments/selector/EntitySelectorParser;)Z ARG 0 parser METHOD lambda$bootStrap$8 (Lnet/minecraft/commands/arguments/selector/EntitySelectorParser;)V diff --git a/data/net/minecraft/commands/synchronization/SuggestionProviders.mapping b/data/net/minecraft/commands/synchronization/SuggestionProviders.mapping index 0038ef409..0bd0479e6 100644 --- a/data/net/minecraft/commands/synchronization/SuggestionProviders.mapping +++ b/data/net/minecraft/commands/synchronization/SuggestionProviders.mapping @@ -10,16 +10,6 @@ CLASS net/minecraft/commands/synchronization/SuggestionProviders METHOD lambda$static$1 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 0 context ARG 1 builder - METHOD lambda$static$2 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; - ARG 0 context - ARG 1 builder - METHOD lambda$static$3 (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/world/entity/EntityType;)Z - ARG 1 entityType - METHOD lambda$static$4 (Lnet/minecraft/world/entity/EntityType;)Lcom/mojang/brigadier/Message; - ARG 0 entityType - METHOD lambda$static$5 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; - ARG 0 context - ARG 1 builder METHOD register (Lnet/minecraft/resources/ResourceLocation;Lcom/mojang/brigadier/suggestion/SuggestionProvider;)Lcom/mojang/brigadier/suggestion/SuggestionProvider; ARG 0 name ARG 1 provider diff --git a/data/net/minecraft/core/BlockPos.mapping b/data/net/minecraft/core/BlockPos.mapping index c1acb3295..839aef847 100644 --- a/data/net/minecraft/core/BlockPos.mapping +++ b/data/net/minecraft/core/BlockPos.mapping @@ -29,6 +29,8 @@ CLASS net/minecraft/core/BlockPos METHOD betweenClosed (Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Ljava/lang/Iterable; ARG 0 firstPos ARG 1 secondPos + METHOD betweenClosed (Lnet/minecraft/world/phys/AABB;)Ljava/lang/Iterable; + ARG 0 box METHOD betweenClosedStream (IIIIII)Ljava/util/stream/Stream; ARG 0 minX ARG 1 minY diff --git a/data/net/minecraft/core/Direction.mapping b/data/net/minecraft/core/Direction.mapping index 7327cc921..fe679d20b 100644 --- a/data/net/minecraft/core/Direction.mapping +++ b/data/net/minecraft/core/Direction.mapping @@ -33,10 +33,6 @@ CLASS net/minecraft/core/Direction METHOD fromAxisAndDirection (Lnet/minecraft/core/Direction$Axis;Lnet/minecraft/core/Direction$AxisDirection;)Lnet/minecraft/core/Direction; ARG 0 axis ARG 1 axisDirection - METHOD fromDelta (III)Lnet/minecraft/core/Direction; - ARG 0 x - ARG 1 y - ARG 2 z METHOD fromYRot (D)Lnet/minecraft/core/Direction; COMMENT @return the Direction corresponding to the given angle in degrees (0-360). Out of bounds values are wrapped around. An angle of 0 is SOUTH, an angle of 90 would be WEST. ARG 0 angle @@ -47,6 +43,16 @@ CLASS net/minecraft/core/Direction COMMENT @return the index of this horizontal facing (0-3). The order is S-W-N-E METHOD get3DDataValue ()I COMMENT @return the index of this Direction (0-5). The order is D-U-N-S-W-E + METHOD getApproximateNearest (DDD)Lnet/minecraft/core/Direction; + ARG 0 x + ARG 2 y + ARG 4 z + METHOD getApproximateNearest (FFF)Lnet/minecraft/core/Direction; + ARG 0 x + ARG 1 y + ARG 2 z + METHOD getApproximateNearest (Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/core/Direction; + ARG 0 vector METHOD getClockWise ()Lnet/minecraft/core/Direction; COMMENT Rotate this Direction around the Y axis clockwise (NORTH => EAST => SOUTH => WEST => NORTH) METHOD getClockWise (Lnet/minecraft/core/Direction$Axis;)Lnet/minecraft/core/Direction; @@ -58,18 +64,14 @@ CLASS net/minecraft/core/Direction METHOD getFacingAxis (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/core/Direction$Axis;)Lnet/minecraft/core/Direction; ARG 0 entity ARG 1 axis - METHOD getNearest (DDD)Lnet/minecraft/core/Direction; - ARG 0 x - ARG 2 y - ARG 4 z - METHOD getNearest (FFF)Lnet/minecraft/core/Direction; + METHOD getNearest (IIILnet/minecraft/core/Direction;)Lnet/minecraft/core/Direction; ARG 0 x ARG 1 y ARG 2 z - METHOD getNearest (Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/core/Direction; - ARG 0 ois - METHOD getNormal ()Lnet/minecraft/core/Vec3i; - COMMENT @return the normalized Vector that points in the direction of this Direction. + ARG 3 defaultValue + METHOD getNearest (Lnet/minecraft/core/Vec3i;Lnet/minecraft/core/Direction;)Lnet/minecraft/core/Direction; + ARG 0 vector + ARG 1 defaultValue METHOD getOpposite ()Lnet/minecraft/core/Direction; COMMENT @return the opposite Direction (e.g. DOWN => UP) METHOD getRandom (Lnet/minecraft/util/RandomSource;)Lnet/minecraft/core/Direction; @@ -80,6 +82,8 @@ CLASS net/minecraft/core/Direction COMMENT @return the offset in the y direction METHOD getStepZ ()I COMMENT @return the offset in the z direction + METHOD getYRot (Lnet/minecraft/core/Direction;)F + ARG 0 direction METHOD isFacingAngle (F)Z ARG 1 degrees METHOD makeDirectionArray (Lnet/minecraft/core/Direction;Lnet/minecraft/core/Direction;Lnet/minecraft/core/Direction;)[Lnet/minecraft/core/Direction; diff --git a/data/net/minecraft/core/FrontAndTop.mapping b/data/net/minecraft/core/FrontAndTop.mapping index b48f1a855..59cf3e827 100644 --- a/data/net/minecraft/core/FrontAndTop.mapping +++ b/data/net/minecraft/core/FrontAndTop.mapping @@ -6,8 +6,6 @@ CLASS net/minecraft/core/FrontAndTop METHOD fromFrontAndTop (Lnet/minecraft/core/Direction;Lnet/minecraft/core/Direction;)Lnet/minecraft/core/FrontAndTop; ARG 0 front ARG 1 top - METHOD lambda$static$0 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V - ARG 0 map METHOD lookupKey (Lnet/minecraft/core/Direction;Lnet/minecraft/core/Direction;)I ARG 0 front ARG 1 top diff --git a/data/net/minecraft/core/GlobalPos.mapping b/data/net/minecraft/core/GlobalPos.mapping index 96626ad45..701a6d66f 100644 --- a/data/net/minecraft/core/GlobalPos.mapping +++ b/data/net/minecraft/core/GlobalPos.mapping @@ -4,6 +4,10 @@ CLASS net/minecraft/core/GlobalPos ARG 2 pos METHOD equals (Ljava/lang/Object;)Z ARG 1 other + METHOD isCloseEnough (Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/core/BlockPos;I)Z + ARG 1 dimension + ARG 2 pos + ARG 3 maxDistance METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD of (Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/core/GlobalPos; diff --git a/data/net/minecraft/core/HolderGetter.mapping b/data/net/minecraft/core/HolderGetter.mapping index beab85134..594e85dfb 100644 --- a/data/net/minecraft/core/HolderGetter.mapping +++ b/data/net/minecraft/core/HolderGetter.mapping @@ -8,9 +8,8 @@ CLASS net/minecraft/core/HolderGetter METHOD getOrThrow (Lnet/minecraft/tags/TagKey;)Lnet/minecraft/core/HolderSet$Named; ARG 1 tagKey CLASS Provider - METHOD get (Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/resources/ResourceKey;)Ljava/util/Optional; - ARG 1 registryKey - ARG 2 key + METHOD get (Lnet/minecraft/resources/ResourceKey;)Ljava/util/Optional; + ARG 1 key METHOD lookup (Lnet/minecraft/resources/ResourceKey;)Ljava/util/Optional; ARG 1 registryKey METHOD lookupOrThrow (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/core/HolderGetter; diff --git a/data/net/minecraft/core/HolderLookup.mapping b/data/net/minecraft/core/HolderLookup.mapping index 64ef21822..d69450738 100644 --- a/data/net/minecraft/core/HolderLookup.mapping +++ b/data/net/minecraft/core/HolderLookup.mapping @@ -8,9 +8,6 @@ CLASS net/minecraft/core/HolderLookup ARG 1 registryKey METHOD lookupOrThrow (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/core/HolderLookup$RegistryLookup; ARG 1 registryKey - CLASS 1 - METHOD lambda$lookup$0 (Lnet/minecraft/core/HolderLookup$RegistryLookup;)Lnet/minecraft/core/HolderGetter; - ARG 0 registryLookup CLASS RegistryLookup METHOD filterElements (Ljava/util/function/Predicate;)Lnet/minecraft/core/HolderLookup$RegistryLookup; ARG 1 predicate diff --git a/data/net/minecraft/core/MappedRegistry.mapping b/data/net/minecraft/core/MappedRegistry.mapping index 85b88cc9c..368670ed5 100644 --- a/data/net/minecraft/core/MappedRegistry.mapping +++ b/data/net/minecraft/core/MappedRegistry.mapping @@ -10,13 +10,23 @@ CLASS net/minecraft/core/MappedRegistry ARG 1 key METHOD getOrCreateHolderOrThrow (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/core/Holder$Reference; ARG 1 key + METHOD getOrCreateTagForRegistration (Lnet/minecraft/tags/TagKey;)Lnet/minecraft/core/HolderSet$Named; + ARG 1 key METHOD getValueFromNullable (Lnet/minecraft/core/Holder$Reference;)Ljava/lang/Object; ARG 0 holder METHOD lambda$getOrCreateHolderOrThrow$2 (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/core/Holder$Reference; ARG 1 key - METHOD lambda$getTags$3 (Ljava/util/Map$Entry;)Lcom/mojang/datafixers/util/Pair; - ARG 0 entry METHOD lambda$new$0 (Lit/unimi/dsi/fastutil/objects/Reference2IntOpenHashMap;)V ARG 0 map + METHOD validateAndUnwrapTagElement (Lnet/minecraft/tags/TagKey;Lnet/minecraft/core/Holder;)Lnet/minecraft/core/Holder$Reference; + ARG 1 key + ARG 2 value METHOD validateWrite (Lnet/minecraft/resources/ResourceKey;)V ARG 1 key + CLASS TagSet + METHOD forEach (Ljava/util/function/BiConsumer;)V + ARG 1 action + METHOD fromMap (Ljava/util/Map;)Lnet/minecraft/core/MappedRegistry$TagSet; + ARG 0 map + METHOD get (Lnet/minecraft/tags/TagKey;)Ljava/util/Optional; + ARG 1 key diff --git a/data/net/minecraft/core/Registry.mapping b/data/net/minecraft/core/Registry.mapping index 16176ab46..a7697d977 100644 --- a/data/net/minecraft/core/Registry.mapping +++ b/data/net/minecraft/core/Registry.mapping @@ -1,23 +1,13 @@ CLASS net/minecraft/core/Registry - METHOD bindTags (Ljava/util/Map;)V - ARG 1 tagMap METHOD containsKey (Lnet/minecraft/resources/ResourceKey;)Z ARG 1 key METHOD containsKey (Lnet/minecraft/resources/ResourceLocation;)Z ARG 1 name METHOD createIntrusiveHolder (Ljava/lang/Object;)Lnet/minecraft/core/Holder$Reference; ARG 1 value - METHOD get (Lnet/minecraft/resources/ResourceKey;)Ljava/lang/Object; - ARG 1 key - METHOD get (Lnet/minecraft/resources/ResourceLocation;)Ljava/lang/Object; - ARG 1 name - METHOD getHolder (I)Ljava/util/Optional; - ARG 1 id - METHOD getHolder (Lnet/minecraft/resources/ResourceKey;)Ljava/util/Optional; - ARG 1 key - METHOD getHolder (Lnet/minecraft/resources/ResourceLocation;)Ljava/util/Optional; - ARG 1 location - METHOD getHolderOrThrow (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/core/Holder$Reference; + METHOD get (I)Ljava/util/Optional; + ARG 1 index + METHOD get (Lnet/minecraft/resources/ResourceLocation;)Ljava/util/Optional; ARG 1 key METHOD getKey (Ljava/lang/Object;)Lnet/minecraft/resources/ResourceLocation; COMMENT @return the name used to identify the given object within this registry or {@code null} if the object is not within this registry @@ -26,10 +16,6 @@ CLASS net/minecraft/core/Registry ARG 1 registryKey METHOD getOptional (Lnet/minecraft/resources/ResourceLocation;)Ljava/util/Optional; ARG 1 name - METHOD getOrCreateTag (Lnet/minecraft/tags/TagKey;)Lnet/minecraft/core/HolderSet$Named; - ARG 1 key - METHOD getOrThrow (Lnet/minecraft/resources/ResourceKey;)Ljava/lang/Object; - ARG 1 key METHOD getRandom (Lnet/minecraft/util/RandomSource;)Ljava/util/Optional; ARG 1 random METHOD getRandomElementOf (Lnet/minecraft/tags/TagKey;Lnet/minecraft/util/RandomSource;)Ljava/util/Optional; @@ -37,14 +23,20 @@ CLASS net/minecraft/core/Registry ARG 2 random METHOD getResourceKey (Ljava/lang/Object;)Ljava/util/Optional; ARG 1 value - METHOD getTag (Lnet/minecraft/tags/TagKey;)Ljava/util/Optional; - ARG 1 key METHOD getTagOrEmpty (Lnet/minecraft/tags/TagKey;)Ljava/lang/Iterable; ARG 1 key + METHOD getValue (Lnet/minecraft/resources/ResourceKey;)Ljava/lang/Object; + ARG 1 key + METHOD getValue (Lnet/minecraft/resources/ResourceLocation;)Ljava/lang/Object; + ARG 1 key + METHOD getValueOrThrow (Lnet/minecraft/resources/ResourceKey;)Ljava/lang/Object; + ARG 1 key METHOD keySet ()Ljava/util/Set; COMMENT @return all keys in this registry METHOD keys (Lcom/mojang/serialization/DynamicOps;)Ljava/util/stream/Stream; ARG 1 ops + METHOD prepareTagReload (Lnet/minecraft/tags/TagLoader$LoadResult;)Lnet/minecraft/core/Registry$PendingTags; + ARG 1 loadResult METHOD register (Lnet/minecraft/core/Registry;Ljava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 registry ARG 1 name diff --git a/data/net/minecraft/core/RegistryAccess.mapping b/data/net/minecraft/core/RegistryAccess.mapping index 286e061bf..bfda17ed2 100644 --- a/data/net/minecraft/core/RegistryAccess.mapping +++ b/data/net/minecraft/core/RegistryAccess.mapping @@ -2,15 +2,6 @@ CLASS net/minecraft/core/RegistryAccess COMMENT The root level registry, essentially a registry of registries. It is also an access point, hence the name, for other dynamic registries. METHOD fromRegistryOfRegistries (Lnet/minecraft/core/Registry;)Lnet/minecraft/core/RegistryAccess$Frozen; ARG 0 registryOfRegistries - METHOD lambda$allRegistriesLifecycle$1 (Lnet/minecraft/core/RegistryAccess$RegistryEntry;)Lcom/mojang/serialization/Lifecycle; - ARG 0 registry - METHOD registry (Lnet/minecraft/resources/ResourceKey;)Ljava/util/Optional; - COMMENT Get the registry owned by this registry access by the given key. If it doesn't exist, the default registry of registries is queried instead, which contains static registries such as blocks. - COMMENT The returned registry can not guarantee that it is writable here, so the return type is widened to {@code Registry} instead. - ARG 1 registryKey - METHOD registryOrThrow (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/core/Registry; - COMMENT A variant of {@link #registry(ResourceKey)} that throws if the registry does not exist. - ARG 1 registryKey CLASS 1FrozenAccess METHOD (Lnet/minecraft/core/RegistryAccess;Ljava/util/stream/Stream;)V ARG 2 registries @@ -29,5 +20,3 @@ CLASS net/minecraft/core/RegistryAccess ARG 1 registries METHOD lambda$new$0 (Lnet/minecraft/core/Registry;)Lnet/minecraft/core/Registry; ARG 0 registry - METHOD lambda$registry$1 (Lnet/minecraft/core/Registry;)Lnet/minecraft/core/Registry; - ARG 0 registry diff --git a/data/net/minecraft/core/RegistrySynchronization.mapping b/data/net/minecraft/core/RegistrySynchronization.mapping index 4ff4e22f0..f967ea3f5 100644 --- a/data/net/minecraft/core/RegistrySynchronization.mapping +++ b/data/net/minecraft/core/RegistrySynchronization.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/core/RegistrySynchronization + METHOD isNetworkable (Lnet/minecraft/resources/ResourceKey;)Z + ARG 0 registryKey METHOD lambda$ownedNetworkableRegistries$4 (Lnet/minecraft/core/RegistryAccess$RegistryEntry;)Z ARG 0 registry METHOD lambda$packRegistries$0 (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/core/RegistryAccess;Ljava/util/Set;Ljava/util/function/BiConsumer;Lnet/minecraft/resources/RegistryDataLoader$RegistryData;)V diff --git a/data/net/minecraft/core/Vec3i.mapping b/data/net/minecraft/core/Vec3i.mapping index 8eb9a8cd7..f5be89477 100644 --- a/data/net/minecraft/core/Vec3i.mapping +++ b/data/net/minecraft/core/Vec3i.mapping @@ -26,6 +26,8 @@ CLASS net/minecraft/core/Vec3i METHOD cross (Lnet/minecraft/core/Vec3i;)Lnet/minecraft/core/Vec3i; COMMENT Calculate the cross product of this and the given Vector ARG 1 vector + METHOD distChessboard (Lnet/minecraft/core/Vec3i;)I + ARG 1 vector METHOD distManhattan (Lnet/minecraft/core/Vec3i;)I ARG 1 vector METHOD distSqr (Lnet/minecraft/core/Vec3i;)D diff --git a/data/net/minecraft/core/WritableRegistry.mapping b/data/net/minecraft/core/WritableRegistry.mapping index e441bd7c6..fd5ecc7f2 100644 --- a/data/net/minecraft/core/WritableRegistry.mapping +++ b/data/net/minecraft/core/WritableRegistry.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/core/WritableRegistry + METHOD bindTag (Lnet/minecraft/tags/TagKey;Ljava/util/List;)V + ARG 1 tag + ARG 2 values METHOD register (Lnet/minecraft/resources/ResourceKey;Ljava/lang/Object;Lnet/minecraft/core/RegistrationInfo;)Lnet/minecraft/core/Holder$Reference; ARG 1 key ARG 2 value diff --git a/data/net/minecraft/core/cauldron/CauldronInteraction.mapping b/data/net/minecraft/core/cauldron/CauldronInteraction.mapping index 6641d275a..b2bc10fe5 100644 --- a/data/net/minecraft/core/cauldron/CauldronInteraction.mapping +++ b/data/net/minecraft/core/cauldron/CauldronInteraction.mapping @@ -1,121 +1,75 @@ CLASS net/minecraft/core/cauldron/CauldronInteraction METHOD addDefaultInteractions (Ljava/util/Map;)V ARG 0 interactionsMap - METHOD emptyBucket (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/sounds/SoundEvent;)Lnet/minecraft/world/ItemInteractionResult; - ARG 0 level - ARG 1 pos - ARG 2 player - ARG 3 hand - ARG 4 filledStack - ARG 5 state - ARG 6 emptySound - METHOD fillBucket (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;Ljava/util/function/Predicate;Lnet/minecraft/sounds/SoundEvent;)Lnet/minecraft/world/ItemInteractionResult; - ARG 0 state - ARG 1 level - ARG 2 pos - ARG 3 player - ARG 4 hand - ARG 5 emptyStack - ARG 6 filledStack - ARG 7 statePredicate - ARG 8 fillSound - METHOD interact (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/ItemInteractionResult; - ARG 1 state - ARG 2 level - ARG 3 pos - ARG 4 player - ARG 5 hand - ARG 6 stack - METHOD lambda$bootStrap$1 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/ItemInteractionResult; + METHOD bannerInteraction (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/InteractionResult; ARG 0 state ARG 1 level ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD lambda$bootStrap$3 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/ItemInteractionResult; + METHOD dyedItemIteration (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/InteractionResult; ARG 0 state ARG 1 level ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD lambda$bootStrap$4 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/ItemInteractionResult; - ARG 0 state - ARG 1 level - ARG 2 pos - ARG 3 player - ARG 4 hand - ARG 5 stack - METHOD lambda$bootStrap$5 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/ItemInteractionResult; - ARG 0 state - ARG 1 level - ARG 2 pos - ARG 3 player - ARG 4 hand - ARG 5 stack - METHOD lambda$bootStrap$7 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/ItemInteractionResult; - ARG 0 state - ARG 1 level - ARG 2 pos - ARG 3 player - ARG 4 hand - ARG 5 stack - METHOD lambda$bootStrap$9 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/ItemInteractionResult; - ARG 0 state - ARG 1 level - ARG 2 pos - ARG 3 player - ARG 4 hand - ARG 5 stack - METHOD lambda$newInteractionMap$0 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/ItemInteractionResult; - ARG 0 state - ARG 1 level - ARG 2 pos - ARG 3 player - ARG 4 hand - ARG 5 stack - METHOD lambda$static$10 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/ItemInteractionResult; - ARG 0 state - ARG 1 level - ARG 2 pos - ARG 3 player - ARG 4 hand - ARG 5 stack - METHOD lambda$static$11 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/ItemInteractionResult; + METHOD emptyBucket (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/sounds/SoundEvent;)Lnet/minecraft/world/InteractionResult; + ARG 0 level + ARG 1 pos + ARG 2 player + ARG 3 hand + ARG 4 filledStackl + ARG 5 state + ARG 6 emptySound + METHOD fillBucket (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;Ljava/util/function/Predicate;Lnet/minecraft/sounds/SoundEvent;)Lnet/minecraft/world/InteractionResult; ARG 0 state ARG 1 level ARG 2 pos ARG 3 player ARG 4 hand - ARG 5 stack - METHOD lambda$static$12 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/ItemInteractionResult; + ARG 5 emptyStack + ARG 6 filledStack + ARG 7 statePredicate + ARG 8 fillSound + METHOD fillLavaInteraction (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/InteractionResult; ARG 0 state ARG 1 level ARG 2 pos ARG 3 player ARG 4 hand - ARG 5 stack - METHOD lambda$static$13 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/ItemInteractionResult; + ARG 5 filledStack + METHOD fillPowderSnowInteraction (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/InteractionResult; ARG 0 state ARG 1 level ARG 2 pos ARG 3 player ARG 4 hand - ARG 5 stack - METHOD lambda$static$14 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/ItemInteractionResult; + ARG 5 filledStack + METHOD fillWaterInteraction (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/InteractionResult; ARG 0 state ARG 1 level ARG 2 pos ARG 3 player ARG 4 hand - ARG 5 stack - METHOD lambda$static$15 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/ItemInteractionResult; + ARG 5 filledStack + METHOD interact (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/InteractionResult; + ARG 1 state + ARG 2 level + ARG 3 pos + ARG 4 player + ARG 5 hand + ARG 6 stack + METHOD isUnderWater (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Z + ARG 0 level + ARG 1 pos + METHOD newInteractionMap (Ljava/lang/String;)Lnet/minecraft/core/cauldron/CauldronInteraction$InteractionMap; + ARG 0 name + METHOD shulkerBoxInteraction (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/InteractionResult; ARG 0 state ARG 1 level ARG 2 pos ARG 3 player ARG 4 hand ARG 5 stack - METHOD newInteractionMap (Ljava/lang/String;)Lnet/minecraft/core/cauldron/CauldronInteraction$InteractionMap; - ARG 0 name diff --git a/data/net/minecraft/core/component/DataComponentHolder.mapping b/data/net/minecraft/core/component/DataComponentHolder.mapping index 693835fca..385c416a1 100644 --- a/data/net/minecraft/core/component/DataComponentHolder.mapping +++ b/data/net/minecraft/core/component/DataComponentHolder.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/core/component/DataComponentHolder METHOD get (Lnet/minecraft/core/component/DataComponentType;)Ljava/lang/Object; ARG 1 component + METHOD getAllOfType (Ljava/lang/Class;)Ljava/util/stream/Stream; + ARG 1 type METHOD getOrDefault (Lnet/minecraft/core/component/DataComponentType;Ljava/lang/Object;)Ljava/lang/Object; ARG 1 component ARG 2 defaultValue diff --git a/data/net/minecraft/core/component/DataComponentPredicate.mapping b/data/net/minecraft/core/component/DataComponentPredicate.mapping index 6cbf5405f..4479c03bf 100644 --- a/data/net/minecraft/core/component/DataComponentPredicate.mapping +++ b/data/net/minecraft/core/component/DataComponentPredicate.mapping @@ -5,6 +5,9 @@ CLASS net/minecraft/core/component/DataComponentPredicate ARG 0 expectedComponents METHOD equals (Ljava/lang/Object;)Z ARG 1 other + METHOD someOf (Lnet/minecraft/core/component/DataComponentMap;[Lnet/minecraft/core/component/DataComponentType;)Lnet/minecraft/core/component/DataComponentPredicate; + ARG 0 expectedComponents + ARG 1 types METHOD test (Lnet/minecraft/core/component/DataComponentHolder;)Z ARG 1 components METHOD test (Lnet/minecraft/core/component/DataComponentMap;)Z @@ -13,3 +16,5 @@ CLASS net/minecraft/core/component/DataComponentPredicate METHOD expect (Lnet/minecraft/core/component/DataComponentType;Ljava/lang/Object;)Lnet/minecraft/core/component/DataComponentPredicate$Builder; ARG 1 component ARG 2 value + METHOD expect (Lnet/minecraft/core/component/TypedDataComponent;)Lnet/minecraft/core/component/DataComponentPredicate$Builder; + ARG 1 component diff --git a/data/net/minecraft/core/dispenser/BoatDispenseItemBehavior.mapping b/data/net/minecraft/core/dispenser/BoatDispenseItemBehavior.mapping index 801b75519..eca3b2f6d 100644 --- a/data/net/minecraft/core/dispenser/BoatDispenseItemBehavior.mapping +++ b/data/net/minecraft/core/dispenser/BoatDispenseItemBehavior.mapping @@ -1,6 +1,3 @@ CLASS net/minecraft/core/dispenser/BoatDispenseItemBehavior - METHOD (Lnet/minecraft/world/entity/vehicle/Boat$Type;)V + METHOD (Lnet/minecraft/world/entity/EntityType;)V ARG 1 type - METHOD (Lnet/minecraft/world/entity/vehicle/Boat$Type;Z)V - ARG 1 type - ARG 2 isChestBoat diff --git a/data/net/minecraft/core/dispenser/DispenseItemBehavior.mapping b/data/net/minecraft/core/dispenser/DispenseItemBehavior.mapping index bb4c3fc96..4942f37f7 100644 --- a/data/net/minecraft/core/dispenser/DispenseItemBehavior.mapping +++ b/data/net/minecraft/core/dispenser/DispenseItemBehavior.mapping @@ -5,8 +5,3 @@ CLASS net/minecraft/core/dispenser/DispenseItemBehavior METHOD lambda$static$0 (Lnet/minecraft/core/dispenser/BlockSource;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/ItemStack; ARG 0 blockSource ARG 1 item - CLASS 14 - METHOD takeLiquid (Lnet/minecraft/core/dispenser/BlockSource;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/ItemStack; - ARG 1 source - ARG 2 emptyItem - ARG 3 fullItem diff --git a/data/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.mapping b/data/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.mapping new file mode 100644 index 000000000..242f856be --- /dev/null +++ b/data/net/minecraft/core/dispenser/EquipmentDispenseItemBehavior.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/core/dispenser/EquipmentDispenseItemBehavior + METHOD dispenseEquipment (Lnet/minecraft/core/dispenser/BlockSource;Lnet/minecraft/world/item/ItemStack;)Z + ARG 0 blockSource + ARG 1 item + METHOD lambda$dispenseEquipment$0 (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 1 entity diff --git a/data/net/minecraft/core/dispenser/MinecartDispenseItemBehavior.mapping b/data/net/minecraft/core/dispenser/MinecartDispenseItemBehavior.mapping new file mode 100644 index 000000000..fcd31493f --- /dev/null +++ b/data/net/minecraft/core/dispenser/MinecartDispenseItemBehavior.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/core/dispenser/MinecartDispenseItemBehavior + METHOD (Lnet/minecraft/world/entity/EntityType;)V + ARG 1 entityType + METHOD getRailShape (Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/block/state/properties/RailShape; + ARG 0 state diff --git a/data/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.mapping b/data/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.mapping index 98de6053b..f724c37e7 100644 --- a/data/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.mapping +++ b/data/net/minecraft/core/dispenser/ShearsDispenseItemBehavior.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/core/dispenser/ShearsDispenseItemBehavior METHOD tryShearBeehive (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;)Z ARG 0 level ARG 1 pos - METHOD tryShearLivingEntity (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;)Z + METHOD tryShearLivingEntity (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/item/ItemStack;)Z ARG 0 level ARG 1 pos + ARG 2 stack diff --git a/data/net/minecraft/core/particles/DustColorTransitionOptions.mapping b/data/net/minecraft/core/particles/DustColorTransitionOptions.mapping index 9f8ecfaf6..9656d66c1 100644 --- a/data/net/minecraft/core/particles/DustColorTransitionOptions.mapping +++ b/data/net/minecraft/core/particles/DustColorTransitionOptions.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/core/particles/DustColorTransitionOptions - METHOD (Lorg/joml/Vector3f;Lorg/joml/Vector3f;F)V - ARG 1 color + METHOD (IIF)V + ARG 1 fromColor ARG 2 toColor ARG 3 scale - METHOD lambda$static$0 (Lnet/minecraft/core/particles/DustColorTransitionOptions;)Lorg/joml/Vector3f; - ARG 0 transitionOptions - METHOD lambda$static$1 (Lnet/minecraft/core/particles/DustColorTransitionOptions;)Lorg/joml/Vector3f; - ARG 0 transitionOptions + METHOD lambda$static$2 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/core/particles/DustParticleOptions.mapping b/data/net/minecraft/core/particles/DustParticleOptions.mapping index 34647e586..ffe55ab07 100644 --- a/data/net/minecraft/core/particles/DustParticleOptions.mapping +++ b/data/net/minecraft/core/particles/DustParticleOptions.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/core/particles/DustParticleOptions - METHOD (Lorg/joml/Vector3f;F)V + METHOD (IF)V ARG 1 color ARG 2 scale - METHOD lambda$static$0 (Lnet/minecraft/core/particles/DustParticleOptions;)Lorg/joml/Vector3f; - ARG 0 dustOptions METHOD lambda$static$1 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/data/net/minecraft/core/particles/ScalableParticleOptionsBase.mapping b/data/net/minecraft/core/particles/ScalableParticleOptionsBase.mapping index 77a4df77c..c5417942e 100644 --- a/data/net/minecraft/core/particles/ScalableParticleOptionsBase.mapping +++ b/data/net/minecraft/core/particles/ScalableParticleOptionsBase.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/core/particles/ScalableParticleOptionsBase METHOD (F)V ARG 1 scale + METHOD lambda$static$1 (Ljava/lang/Float;)Lcom/mojang/serialization/DataResult; + ARG 0 scale diff --git a/data/net/minecraft/core/registries/BuiltInRegistries.mapping b/data/net/minecraft/core/registries/BuiltInRegistries.mapping index 32901b749..97a551131 100644 --- a/data/net/minecraft/core/registries/BuiltInRegistries.mapping +++ b/data/net/minecraft/core/registries/BuiltInRegistries.mapping @@ -1,4 +1,8 @@ CLASS net/minecraft/core/registries/BuiltInRegistries + METHOD acquireBootstrapRegistrationLookup (Lnet/minecraft/core/Registry;)Lnet/minecraft/core/HolderGetter; + ARG 0 registry + METHOD bindBootstrappedTagsToEmpty (Lnet/minecraft/core/Registry;)V + ARG 0 registry METHOD internalRegister (Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/core/WritableRegistry;Lnet/minecraft/core/registries/BuiltInRegistries$RegistryBootstrap;)Lnet/minecraft/core/WritableRegistry; ARG 0 key ARG 1 registry diff --git a/data/net/minecraft/data/DataProvider.mapping b/data/net/minecraft/data/DataProvider.mapping index 98786121d..09e5aff3a 100644 --- a/data/net/minecraft/data/DataProvider.mapping +++ b/data/net/minecraft/data/DataProvider.mapping @@ -5,10 +5,26 @@ CLASS net/minecraft/data/DataProvider ARG 0 map METHOD run (Lnet/minecraft/data/CachedOutput;)Ljava/util/concurrent/CompletableFuture; ARG 1 output + METHOD saveAll (Lnet/minecraft/data/CachedOutput;Lcom/mojang/serialization/Codec;Lnet/minecraft/data/PackOutput$PathProvider;Ljava/util/Map;)Ljava/util/concurrent/CompletableFuture; + ARG 0 output + ARG 1 codec + ARG 2 pathProvider + ARG 3 entries METHOD saveStable (Lnet/minecraft/data/CachedOutput;Lcom/google/gson/JsonElement;Ljava/nio/file/Path;)Ljava/util/concurrent/CompletableFuture; ARG 0 output ARG 1 json ARG 2 path + METHOD saveStable (Lnet/minecraft/data/CachedOutput;Lcom/mojang/serialization/Codec;Ljava/lang/Object;Ljava/nio/file/Path;)Ljava/util/concurrent/CompletableFuture; + ARG 0 output + ARG 1 codec + ARG 2 value + ARG 3 path + METHOD saveStable (Lnet/minecraft/data/CachedOutput;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Ljava/lang/Object;Ljava/nio/file/Path;)Ljava/util/concurrent/CompletableFuture; + ARG 0 output + ARG 1 ops + ARG 2 codec + ARG 3 value + ARG 4 path METHOD saveStable (Lnet/minecraft/data/CachedOutput;Lnet/minecraft/core/HolderLookup$Provider;Lcom/mojang/serialization/Codec;Ljava/lang/Object;Ljava/nio/file/Path;)Ljava/util/concurrent/CompletableFuture; ARG 0 output ARG 1 registries diff --git a/data/net/minecraft/data/advancements/packs/VanillaAdventureAdvancements.mapping b/data/net/minecraft/data/advancements/packs/VanillaAdventureAdvancements.mapping index dacf46eb0..80de6e7c7 100644 --- a/data/net/minecraft/data/advancements/packs/VanillaAdventureAdvancements.mapping +++ b/data/net/minecraft/data/advancements/packs/VanillaAdventureAdvancements.mapping @@ -3,9 +3,10 @@ CLASS net/minecraft/data/advancements/packs/VanillaAdventureAdvancements ARG 0 builder ARG 1 levelRegistry ARG 2 biomes - METHOD addMobsToKill (Lnet/minecraft/advancements/Advancement$Builder;Ljava/util/List;)Lnet/minecraft/advancements/Advancement$Builder; + METHOD addMobsToKill (Lnet/minecraft/advancements/Advancement$Builder;Lnet/minecraft/core/HolderGetter;Ljava/util/List;)Lnet/minecraft/advancements/Advancement$Builder; ARG 0 builder - ARG 1 mobs + ARG 1 entityTypeRegistry + ARG 2 mobsToKill METHOD craftingANewLook (Lnet/minecraft/advancements/Advancement$Builder;)Lnet/minecraft/advancements/Advancement$Builder; ARG 0 builder METHOD createAdventuringTime (Lnet/minecraft/core/HolderLookup$Provider;Ljava/util/function/Consumer;Lnet/minecraft/advancements/AdvancementHolder;Lnet/minecraft/world/level/biome/MultiNoiseBiomeSourceParameterList$Preset;)V @@ -13,35 +14,31 @@ CLASS net/minecraft/data/advancements/packs/VanillaAdventureAdvancements ARG 1 writer ARG 2 parent ARG 3 preset - METHOD createMonsterHunterAdvancement (Lnet/minecraft/advancements/AdvancementHolder;Ljava/util/function/Consumer;Ljava/util/List;)Lnet/minecraft/advancements/AdvancementHolder; - ARG 0 advancement + METHOD createMonsterHunterAdvancement (Lnet/minecraft/advancements/AdvancementHolder;Ljava/util/function/Consumer;Lnet/minecraft/core/HolderGetter;Ljava/util/List;)Lnet/minecraft/advancements/AdvancementHolder; + ARG 0 parent ARG 1 output - ARG 2 typesRequired + ARG 2 entityTypeRegistry + ARG 3 typesRequired METHOD fireCountAndBystander (Lnet/minecraft/advancements/critereon/MinMaxBounds$Ints;Ljava/util/Optional;)Lnet/minecraft/advancements/Criterion; ARG 0 fireCount ARG 1 bystander - METHOD lambda$addMobsToKill$8 (Lnet/minecraft/advancements/Advancement$Builder;Lnet/minecraft/world/entity/EntityType;)V - ARG 1 mob - METHOD lambda$craftingANewLook$6 (Lnet/minecraft/advancements/Advancement$Builder;Lnet/minecraft/resources/ResourceLocation;)V - ARG 1 id - METHOD lambda$placedBlockReadByComparator$0 (Lnet/minecraft/core/Direction;)Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder; - ARG 0 direction - METHOD lambda$placedComparatorReadingBlock$2 (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/Direction;)Lnet/minecraft/world/level/storage/loot/predicates/AllOfCondition$Builder; - ARG 1 direction METHOD lambda$respectingTheRemnantsCriterions$7 (Lnet/minecraft/advancements/Advancement$Builder;Lcom/mojang/datafixers/util/Pair;)V ARG 1 pair METHOD lambda$smithingWithStyle$4 (Ljava/util/Set;Lnet/minecraft/data/recipes/packs/VanillaRecipeProvider$TrimTemplate;)Z ARG 1 trimTemplate METHOD lambda$smithingWithStyle$5 (Lnet/minecraft/advancements/Advancement$Builder;Lnet/minecraft/data/recipes/packs/VanillaRecipeProvider$TrimTemplate;)V ARG 1 trimTemplate - METHOD lookAtThroughItem (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/item/Item;)Lnet/minecraft/advancements/Criterion; - ARG 0 entity - ARG 1 item - METHOD placedBlockReadByComparator (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/advancements/Criterion; - ARG 0 block - METHOD placedComparatorReadingBlock (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/advancements/Criterion; - ARG 0 block - METHOD respectingTheRemnantsCriterions (Lnet/minecraft/advancements/Advancement$Builder;)Lnet/minecraft/advancements/Advancement$Builder; + METHOD lookAtThroughItem (Lnet/minecraft/advancements/critereon/EntityPredicate$Builder;Lnet/minecraft/advancements/critereon/ItemPredicate$Builder;)Lnet/minecraft/advancements/Criterion; ARG 0 builder + ARG 1 item + METHOD placedBlockReadByComparator (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/advancements/Criterion; + ARG 0 blockRegistry + ARG 1 block + METHOD placedComparatorReadingBlock (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/advancements/Criterion; + ARG 0 blockRegistry + ARG 1 block + METHOD respectingTheRemnantsCriterions (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/advancements/Advancement$Builder;)Lnet/minecraft/advancements/Advancement$Builder; + ARG 0 itemRegistry + ARG 1 builder METHOD smithingWithStyle (Lnet/minecraft/advancements/Advancement$Builder;)Lnet/minecraft/advancements/Advancement$Builder; ARG 0 builder diff --git a/data/net/minecraft/data/advancements/packs/VanillaHusbandryAdvancements.mapping b/data/net/minecraft/data/advancements/packs/VanillaHusbandryAdvancements.mapping index 0b1e8cfe1..464ccb681 100644 --- a/data/net/minecraft/data/advancements/packs/VanillaHusbandryAdvancements.mapping +++ b/data/net/minecraft/data/advancements/packs/VanillaHusbandryAdvancements.mapping @@ -1,30 +1,30 @@ CLASS net/minecraft/data/advancements/packs/VanillaHusbandryAdvancements - METHOD addBreedable (Lnet/minecraft/advancements/Advancement$Builder;Ljava/util/stream/Stream;Ljava/util/stream/Stream;)Lnet/minecraft/advancements/Advancement$Builder; + METHOD addBreedable (Lnet/minecraft/advancements/Advancement$Builder;Ljava/util/stream/Stream;Lnet/minecraft/core/HolderGetter;Ljava/util/stream/Stream;)Lnet/minecraft/advancements/Advancement$Builder; ARG 0 builder ARG 1 breedableAnimals - ARG 2 indirectlyBreedableAnimals + ARG 2 entityTypeRegistry + ARG 3 indirectlyBreedableAnimals METHOD addCatVariants (Lnet/minecraft/advancements/Advancement$Builder;)Lnet/minecraft/advancements/Advancement$Builder; ARG 0 builder - METHOD addFish (Lnet/minecraft/advancements/Advancement$Builder;)Lnet/minecraft/advancements/Advancement$Builder; - ARG 0 builder - METHOD addFishBuckets (Lnet/minecraft/advancements/Advancement$Builder;)Lnet/minecraft/advancements/Advancement$Builder; + METHOD addFish (Lnet/minecraft/advancements/Advancement$Builder;Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/advancements/Advancement$Builder; ARG 0 builder - METHOD addFood (Lnet/minecraft/advancements/Advancement$Builder;)Lnet/minecraft/advancements/Advancement$Builder; - COMMENT Adds all the items in {@link #EDIBLE_ITEMS} to the given advancement's criteria + ARG 1 itemRegistry + METHOD addFishBuckets (Lnet/minecraft/advancements/Advancement$Builder;Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/advancements/Advancement$Builder; ARG 0 builder - METHOD addLeashedFrogVariants (Lnet/minecraft/advancements/Advancement$Builder;)Lnet/minecraft/advancements/Advancement$Builder; + ARG 1 itemRegistry + METHOD addFood (Lnet/minecraft/advancements/Advancement$Builder;Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/advancements/Advancement$Builder; ARG 0 builder + ARG 1 food + METHOD addLeashedFrogVariants (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/core/HolderGetter;Lnet/minecraft/advancements/Advancement$Builder;)Lnet/minecraft/advancements/Advancement$Builder; + ARG 0 entityTypeRegistry + ARG 1 items + ARG 2 builder METHOD addTamedWolfVariants (Lnet/minecraft/advancements/Advancement$Builder;Lnet/minecraft/core/HolderLookup$Provider;)Lnet/minecraft/advancements/Advancement$Builder; ARG 0 builder ARG 1 registries - METHOD createBreedAllAnimalsAdvancement (Lnet/minecraft/advancements/AdvancementHolder;Ljava/util/function/Consumer;Ljava/util/stream/Stream;Ljava/util/stream/Stream;)Lnet/minecraft/advancements/AdvancementHolder; + METHOD createBreedAllAnimalsAdvancement (Lnet/minecraft/advancements/AdvancementHolder;Ljava/util/function/Consumer;Lnet/minecraft/core/HolderGetter;Ljava/util/stream/Stream;Ljava/util/stream/Stream;)Lnet/minecraft/advancements/AdvancementHolder; ARG 0 parent ARG 1 writer - ARG 2 breedableAnimals - ARG 3 indirectlyBreedableAnimals - METHOD lambda$addBreedable$1 (Lnet/minecraft/advancements/Advancement$Builder;Lnet/minecraft/world/entity/EntityType;)V - ARG 1 animal - METHOD lambda$addBreedable$2 (Lnet/minecraft/advancements/Advancement$Builder;Lnet/minecraft/world/entity/EntityType;)V - ARG 1 animal - METHOD lambda$addLeashedFrogVariants$0 (Lnet/minecraft/advancements/Advancement$Builder;Lnet/minecraft/core/Holder$Reference;)V - ARG 1 holder + ARG 2 entityTypeRegistry + ARG 3 breedableAnimals + ARG 4 indirectlyBreedableAnimals diff --git a/data/net/minecraft/data/advancements/packs/WinterDropAdvancementProvider.mapping b/data/net/minecraft/data/advancements/packs/WinterDropAdvancementProvider.mapping new file mode 100644 index 000000000..ea4a23949 --- /dev/null +++ b/data/net/minecraft/data/advancements/packs/WinterDropAdvancementProvider.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/data/advancements/packs/WinterDropAdvancementProvider + METHOD create (Lnet/minecraft/data/PackOutput;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/data/advancements/AdvancementProvider; + ARG 0 packOutput + ARG 1 registries diff --git a/data/net/minecraft/data/info/DatapackStructureReport.mapping b/data/net/minecraft/data/info/DatapackStructureReport.mapping new file mode 100644 index 000000000..27706f291 --- /dev/null +++ b/data/net/minecraft/data/info/DatapackStructureReport.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/data/info/DatapackStructureReport + METHOD (Lnet/minecraft/data/PackOutput;)V + ARG 1 output + METHOD putIfNotPresent (Ljava/util/Map;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/data/info/DatapackStructureReport$Entry;)V + ARG 1 map + ARG 2 registryKey + ARG 3 entry + CLASS Entry + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS Format + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name + CLASS Report + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS CustomPackEntry + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/data/loot/BlockLootSubProvider.mapping b/data/net/minecraft/data/loot/BlockLootSubProvider.mapping index 7ad4d2683..e8d127fbb 100644 --- a/data/net/minecraft/data/loot/BlockLootSubProvider.mapping +++ b/data/net/minecraft/data/loot/BlockLootSubProvider.mapping @@ -65,6 +65,8 @@ CLASS net/minecraft/data/loot/BlockLootSubProvider ARG 3 chances METHOD createMangroveLeavesDrops (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder; ARG 1 block + METHOD createMossyCarpetBlockDrops (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder; + ARG 1 block METHOD createMultifaceBlockDrops (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder; ARG 1 block ARG 2 builder @@ -99,7 +101,9 @@ CLASS net/minecraft/data/loot/BlockLootSubProvider ARG 1 block ARG 2 builder METHOD createShearsOnlyDrop (Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder; - ARG 0 item + ARG 1 item + METHOD createShearsOrSilkTouchOnlyDrop (Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder; + ARG 1 item METHOD createShulkerBoxDrop (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder; ARG 1 block METHOD createSilkTouchDispatchTable (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/storage/loot/entries/LootPoolEntryContainer$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder; @@ -145,6 +149,14 @@ CLASS net/minecraft/data/loot/BlockLootSubProvider ARG 1 block METHOD dropWhenSilkTouch (Lnet/minecraft/world/level/block/Block;)V ARG 1 block + METHOD lambda$createMultifaceBlockDrops$1 (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/Direction;)Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder; + ARG 1 direction + METHOD lambda$createStemDrops$0 (Lnet/minecraft/world/level/block/Block;Ljava/lang/Integer;)Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction$Builder; + ARG 1 age + METHOD lambda$dropPottedContents$5 (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder; + ARG 1 block + METHOD lambda$generate$4 (Ljava/util/Set;Lnet/minecraft/world/level/block/Block;Ljava/util/function/BiConsumer;Lnet/minecraft/resources/ResourceKey;)V + ARG 4 lootTable METHOD otherWhenSilkTouch (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;)V ARG 1 block ARG 2 other diff --git a/data/net/minecraft/data/loot/EntityLootSubProvider.mapping b/data/net/minecraft/data/loot/EntityLootSubProvider.mapping index edcb47c65..de1b0ee48 100644 --- a/data/net/minecraft/data/loot/EntityLootSubProvider.mapping +++ b/data/net/minecraft/data/loot/EntityLootSubProvider.mapping @@ -13,9 +13,10 @@ CLASS net/minecraft/data/loot/EntityLootSubProvider METHOD add (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/storage/loot/LootTable$Builder;)V ARG 1 entityType ARG 2 builder - METHOD canHaveLootTable (Lnet/minecraft/world/entity/EntityType;)Z - ARG 0 entityType - METHOD createSheepTable (Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder; - ARG 0 woolItem - METHOD killedByFrogVariant (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder; - ARG 1 frogVariant + METHOD createSheepDispatchPool (Ljava/util/Map;)Lnet/minecraft/world/level/storage/loot/LootPool$Builder; + ARG 0 lootTables + METHOD killedByFrog (Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder; + ARG 1 entityTypeRegistry + METHOD killedByFrogVariant (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition$Builder; + ARG 1 entityTypeRegistry + ARG 2 frogVariant diff --git a/data/net/minecraft/data/loot/packs/LootData.mapping b/data/net/minecraft/data/loot/packs/LootData.mapping new file mode 100644 index 000000000..cebdb46b6 --- /dev/null +++ b/data/net/minecraft/data/loot/packs/LootData.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/data/loot/packs/LootData + METHOD lambda$static$0 (Ljava/util/EnumMap;)V + ARG 0 map diff --git a/data/net/minecraft/data/loot/packs/VanillaEquipmentLoot.mapping b/data/net/minecraft/data/loot/packs/VanillaEquipmentLoot.mapping index 0f77418d6..e1c2dea7a 100644 --- a/data/net/minecraft/data/loot/packs/VanillaEquipmentLoot.mapping +++ b/data/net/minecraft/data/loot/packs/VanillaEquipmentLoot.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/data/loot/packs/VanillaEquipmentLoot - METHOD trialChamberEquipment (Lnet/minecraft/world/item/Item;Lnet/minecraft/world/item/Item;Lnet/minecraft/world/item/armortrim/ArmorTrim;Lnet/minecraft/core/HolderLookup$RegistryLookup;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder; - ARG 0 helmet - ARG 1 chestplate + METHOD trialChamberEquipment (Lnet/minecraft/world/item/Item;Lnet/minecraft/world/item/Item;Lnet/minecraft/world/item/equipment/trim/ArmorTrim;Lnet/minecraft/core/HolderLookup$RegistryLookup;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder; + ARG 0 helmetItem + ARG 1 chestplateItem ARG 2 trim - ARG 3 enchantments + ARG 3 enchantmentRegistry diff --git a/data/net/minecraft/data/loot/packs/WinterDropBlockLoot.mapping b/data/net/minecraft/data/loot/packs/WinterDropBlockLoot.mapping new file mode 100644 index 000000000..8829bad97 --- /dev/null +++ b/data/net/minecraft/data/loot/packs/WinterDropBlockLoot.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/data/loot/packs/WinterDropBlockLoot + METHOD (Lnet/minecraft/core/HolderLookup$Provider;)V + ARG 1 registries diff --git a/data/net/minecraft/data/loot/packs/WinterDropLootTableProvider.mapping b/data/net/minecraft/data/loot/packs/WinterDropLootTableProvider.mapping new file mode 100644 index 000000000..89b3b9a96 --- /dev/null +++ b/data/net/minecraft/data/loot/packs/WinterDropLootTableProvider.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/data/loot/packs/WinterDropLootTableProvider + METHOD create (Lnet/minecraft/data/PackOutput;Ljava/util/concurrent/CompletableFuture;)Lnet/minecraft/data/loot/LootTableProvider; + ARG 0 output + ARG 1 registries diff --git a/data/net/minecraft/data/models/BlockModelGenerators.mapping b/data/net/minecraft/data/models/BlockModelGenerators.mapping index f3483960d..162715f6e 100644 --- a/data/net/minecraft/data/models/BlockModelGenerators.mapping +++ b/data/net/minecraft/data/models/BlockModelGenerators.mapping @@ -120,6 +120,8 @@ CLASS net/minecraft/data/models/BlockModelGenerators ARG 1 craftingTableBlock ARG 2 craftingTableMaterialBlock ARG 3 textureMappingGetter + METHOD createCreakingHeart (Lnet/minecraft/world/level/block/Block;)V + ARG 1 block METHOD createCropBlock (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/state/properties/Property;[I)V ARG 1 cropBlock ARG 2 ageProperty @@ -210,6 +212,8 @@ CLASS net/minecraft/data/models/BlockModelGenerators ARG 1 growingPlantBlock ARG 2 plantBlock ARG 3 tintState + METHOD createHangingMoss (Lnet/minecraft/world/level/block/Block;)V + ARG 1 block METHOD createHangingSign (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;)V ARG 1 particleBlock ARG 2 hangingSignBlock @@ -229,6 +233,8 @@ CLASS net/minecraft/data/models/BlockModelGenerators ARG 1 location ARG 2 textureMapping ARG 3 modelOutput + METHOD createMossyCarpet (Lnet/minecraft/world/level/block/Block;)V + ARG 1 block METHOD createMultiface (Lnet/minecraft/world/level/block/Block;)V ARG 1 multifaceBlock METHOD createMushroomBlock (Lnet/minecraft/world/level/block/Block;)V diff --git a/data/net/minecraft/data/models/EquipmentModelProvider.mapping b/data/net/minecraft/data/models/EquipmentModelProvider.mapping new file mode 100644 index 000000000..1e614ea83 --- /dev/null +++ b/data/net/minecraft/data/models/EquipmentModelProvider.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/data/models/EquipmentModelProvider + METHOD (Lnet/minecraft/data/PackOutput;)V + ARG 1 packOutput diff --git a/data/net/minecraft/data/models/ItemModelGenerators.mapping b/data/net/minecraft/data/models/ItemModelGenerators.mapping index 84916b1b6..3cde90d88 100644 --- a/data/net/minecraft/data/models/ItemModelGenerators.mapping +++ b/data/net/minecraft/data/models/ItemModelGenerators.mapping @@ -1,12 +1,15 @@ CLASS net/minecraft/data/models/ItemModelGenerators METHOD (Ljava/util/function/BiConsumer;)V ARG 1 output - METHOD generateArmorTrims (Lnet/minecraft/world/item/ArmorItem;)V - ARG 1 armorItem - METHOD generateBaseArmorTrimTemplate (Lnet/minecraft/resources/ResourceLocation;Ljava/util/Map;Lnet/minecraft/core/Holder;)Lcom/google/gson/JsonObject; + METHOD generateArmorTrims (Lnet/minecraft/world/item/Item;Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/world/item/equipment/EquipmentModel;Lnet/minecraft/world/entity/EquipmentSlot;)V + ARG 1 item + ARG 2 modelId + ARG 3 model + ARG 4 slot + METHOD generateBaseArmorTrimTemplate (Lnet/minecraft/resources/ResourceLocation;Ljava/util/Map;Lnet/minecraft/resources/ResourceLocation;)Lcom/google/gson/JsonObject; ARG 1 modelLocation ARG 2 modelGetter - ARG 3 armorMaterial + ARG 3 name METHOD generateClockItem (Lnet/minecraft/world/item/Item;)V ARG 1 item METHOD generateCompassItem (Lnet/minecraft/world/item/Item;)V @@ -37,5 +40,5 @@ CLASS net/minecraft/data/models/ItemModelGenerators ARG 1 modelLocation ARG 2 trimId CLASS TrimModelData - METHOD name (Lnet/minecraft/core/Holder;)Ljava/lang/String; - ARG 1 armorMaterial + METHOD name (Lnet/minecraft/resources/ResourceLocation;)Ljava/lang/String; + ARG 1 name diff --git a/data/net/minecraft/data/models/model/TextureMapping.mapping b/data/net/minecraft/data/models/model/TextureMapping.mapping index 92c01e3d8..07e642626 100644 --- a/data/net/minecraft/data/models/model/TextureMapping.mapping +++ b/data/net/minecraft/data/models/model/TextureMapping.mapping @@ -134,6 +134,8 @@ CLASS net/minecraft/data/models/model/TextureMapping ARG 0 railBlock METHOD sculkShrieker (Z)Lnet/minecraft/data/models/model/TextureMapping; ARG 0 canSummon + METHOD side (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/data/models/model/TextureMapping; + ARG 0 block METHOD singleSlot (Lnet/minecraft/data/models/model/TextureSlot;Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/data/models/model/TextureMapping; ARG 0 textureSlot ARG 1 textureLocation diff --git a/data/net/minecraft/data/recipes/RecipeBuilder.mapping b/data/net/minecraft/data/recipes/RecipeBuilder.mapping index f3ec3bbf0..85bf8ca81 100644 --- a/data/net/minecraft/data/recipes/RecipeBuilder.mapping +++ b/data/net/minecraft/data/recipes/RecipeBuilder.mapping @@ -10,9 +10,9 @@ CLASS net/minecraft/data/recipes/RecipeBuilder METHOD save (Lnet/minecraft/data/recipes/RecipeOutput;Ljava/lang/String;)V ARG 1 recipeOutput ARG 2 id - METHOD save (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/resources/ResourceLocation;)V - ARG 1 recipeOutput - ARG 2 id + METHOD save (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/resources/ResourceKey;)V + ARG 1 output + ARG 2 resourceKey METHOD unlockedBy (Ljava/lang/String;Lnet/minecraft/advancements/Criterion;)Lnet/minecraft/data/recipes/RecipeBuilder; ARG 1 name ARG 2 criterion diff --git a/data/net/minecraft/data/recipes/RecipeOutput.mapping b/data/net/minecraft/data/recipes/RecipeOutput.mapping index a9a08a087..cd2160e72 100644 --- a/data/net/minecraft/data/recipes/RecipeOutput.mapping +++ b/data/net/minecraft/data/recipes/RecipeOutput.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/data/recipes/RecipeOutput - METHOD accept (Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/world/item/crafting/Recipe;Lnet/minecraft/advancements/AdvancementHolder;)V - ARG 1 location + METHOD accept (Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/world/item/crafting/Recipe;Lnet/minecraft/advancements/AdvancementHolder;)V + ARG 1 key ARG 2 recipe ARG 3 advancement diff --git a/data/net/minecraft/data/recipes/RecipeProvider.mapping b/data/net/minecraft/data/recipes/RecipeProvider.mapping index 326683840..632aa4916 100644 --- a/data/net/minecraft/data/recipes/RecipeProvider.mapping +++ b/data/net/minecraft/data/recipes/RecipeProvider.mapping @@ -1,108 +1,88 @@ CLASS net/minecraft/data/recipes/RecipeProvider - METHOD (Lnet/minecraft/data/PackOutput;Ljava/util/concurrent/CompletableFuture;)V - ARG 1 output - ARG 2 registries - METHOD banner (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + METHOD (Lnet/minecraft/core/HolderLookup$Provider;Lnet/minecraft/data/recipes/RecipeOutput;)V + ARG 1 registries + ARG 2 output + METHOD banner (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 banner ARG 2 material - METHOD bedFromPlanksAndWool (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + METHOD bedFromPlanksAndWool (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 bed ARG 2 wool - METHOD buildAdvancement (Lnet/minecraft/data/CachedOutput;Lnet/minecraft/core/HolderLookup$Provider;Lnet/minecraft/advancements/AdvancementHolder;)Ljava/util/concurrent/CompletableFuture; - ARG 1 output - ARG 2 registries - ARG 3 advancement - METHOD buildRecipes (Lnet/minecraft/data/recipes/RecipeOutput;)V - ARG 1 recipeOutput METHOD buttonBuilder (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/data/recipes/RecipeBuilder; - ARG 0 button - ARG 1 material - METHOD candle (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + ARG 1 button + ARG 2 material + METHOD candle (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 candle ARG 2 dye - METHOD carpet (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + METHOD carpet (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 carpet ARG 2 material - METHOD chestBoat (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + METHOD chestBoat (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 boat ARG 2 material - METHOD chiseled (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + METHOD chiseled (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 category ARG 2 chiseledResult ARG 3 material METHOD chiseledBuilder (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/data/recipes/ShapedRecipeBuilder; - ARG 0 category - ARG 1 chiseledResult - ARG 2 material - METHOD colorBlockWithDye (Lnet/minecraft/data/recipes/RecipeOutput;Ljava/util/List;Ljava/util/List;Ljava/lang/String;)V - ARG 0 recipeOutput + ARG 1 category + ARG 2 chiseledResult + ARG 3 material + METHOD colorBlockWithDye (Ljava/util/List;Ljava/util/List;Ljava/lang/String;)V ARG 1 dyes ARG 2 dyeableItems ARG 3 group - METHOD coloredTerracottaFromTerracottaAndDye (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + METHOD colorWithDye (Ljava/util/List;Ljava/util/List;Lnet/minecraft/world/item/Item;Ljava/lang/String;Lnet/minecraft/data/recipes/RecipeCategory;)V + ARG 1 dyes + ARG 2 dyeableItems + ARG 3 dye + ARG 4 group + ARG 5 category + METHOD coloredTerracottaFromTerracottaAndDye (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 terracotta ARG 2 dye - METHOD concretePowder (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + METHOD concretePowder (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 concretePowder ARG 2 dye - METHOD cookRecipes (Lnet/minecraft/data/recipes/RecipeOutput;Ljava/lang/String;Lnet/minecraft/world/item/crafting/RecipeSerializer;Lnet/minecraft/world/item/crafting/AbstractCookingRecipe$Factory;I)V - ARG 0 recipeOutput + METHOD cookRecipes (Ljava/lang/String;Lnet/minecraft/world/item/crafting/RecipeSerializer;Lnet/minecraft/world/item/crafting/AbstractCookingRecipe$Factory;I)V ARG 1 cookingMethod ARG 2 cookingSerializer ARG 3 recipeFactory ARG 4 cookingTime - METHOD copperBulb (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;)V - ARG 0 recipeOutput + METHOD copperBulb (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;)V ARG 1 bulbBlock ARG 2 material - METHOD copySmithingTemplate (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/tags/TagKey;)V - ARG 0 recipeOutput - ARG 1 template - ARG 2 baseMaterial - METHOD copySmithingTemplate (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/item/crafting/Ingredient;)V - ARG 0 recipeOutput + METHOD copySmithingTemplate (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/item/crafting/Ingredient;)V ARG 1 template ARG 2 baseItem - METHOD copySmithingTemplate (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + METHOD copySmithingTemplate (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 template ARG 2 baseItem - METHOD cut (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + METHOD cut (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 category ARG 2 cutResult ARG 3 material METHOD cutBuilder (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/data/recipes/ShapedRecipeBuilder; - ARG 0 category - ARG 1 cutResult - ARG 2 material + ARG 1 category + ARG 2 cutResult + ARG 3 material METHOD doorBuilder (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/data/recipes/RecipeBuilder; - ARG 0 door - ARG 1 material + ARG 1 door + ARG 2 material METHOD fenceBuilder (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/data/recipes/RecipeBuilder; - ARG 0 fence - ARG 1 material + ARG 1 fence + ARG 2 material METHOD fenceGateBuilder (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/data/recipes/RecipeBuilder; - ARG 0 fenceGate - ARG 1 material - METHOD generateForEnabledBlockFamilies (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/flag/FeatureFlagSet;)V - ARG 0 recipeOutput + ARG 1 fenceGate + ARG 2 material + METHOD generateForEnabledBlockFamilies (Lnet/minecraft/world/flag/FeatureFlagSet;)V ARG 1 enabledFeatures - METHOD generateRecipes (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/data/BlockFamily;Lnet/minecraft/world/flag/FeatureFlagSet;)V - ARG 0 recipeOutput + METHOD generateRecipes (Lnet/minecraft/data/BlockFamily;Lnet/minecraft/world/flag/FeatureFlagSet;)V ARG 1 blockFamily ARG 2 requiredFeatures METHOD getBaseBlock (Lnet/minecraft/data/BlockFamily;Lnet/minecraft/data/BlockFamily$Variant;)Lnet/minecraft/world/level/block/Block; - ARG 0 family - ARG 1 variant + ARG 1 family + ARG 2 variant METHOD getBlastingRecipeName (Lnet/minecraft/world/level/ItemLike;)Ljava/lang/String; ARG 0 itemLike METHOD getConversionRecipeName (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)Ljava/lang/String; @@ -112,51 +92,47 @@ CLASS net/minecraft/data/recipes/RecipeProvider ARG 0 itemLike METHOD getItemName (Lnet/minecraft/world/level/ItemLike;)Ljava/lang/String; ARG 0 itemLike - METHOD getName ()Ljava/lang/String; - COMMENT Gets a name for this provider, to use in logging. METHOD getSimpleRecipeName (Lnet/minecraft/world/level/ItemLike;)Ljava/lang/String; ARG 0 itemLike METHOD getSmeltingRecipeName (Lnet/minecraft/world/level/ItemLike;)Ljava/lang/String; ARG 0 itemLike - METHOD grate (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;)V - ARG 0 recipeOutput + METHOD grate (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;)V ARG 1 grateBlock ARG 2 material - METHOD hangingSign (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + METHOD hangingSign (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 sign ARG 2 material METHOD has (Lnet/minecraft/advancements/critereon/MinMaxBounds$Ints;Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/advancements/Criterion; - ARG 0 count - ARG 1 item + ARG 1 count + ARG 2 item METHOD has (Lnet/minecraft/tags/TagKey;)Lnet/minecraft/advancements/Criterion; - ARG 0 tag + ARG 1 tag METHOD has (Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/advancements/Criterion; - ARG 0 itemLike + ARG 1 itemLike METHOD insideOf (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/advancements/Criterion; ARG 0 block METHOD inventoryTrigger ([Lnet/minecraft/advancements/critereon/ItemPredicate$Builder;)Lnet/minecraft/advancements/Criterion; ARG 0 items METHOD inventoryTrigger ([Lnet/minecraft/advancements/critereon/ItemPredicate;)Lnet/minecraft/advancements/Criterion; ARG 0 predicates - METHOD mosaicBuilder (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + METHOD lambda$colorWithDye$1 (Lnet/minecraft/world/item/Item;Lnet/minecraft/world/item/Item;)Z + ARG 1 item + METHOD lambda$generateForEnabledBlockFamilies$0 (Lnet/minecraft/world/flag/FeatureFlagSet;Lnet/minecraft/data/BlockFamily;)V + ARG 2 blockFamily + METHOD mosaicBuilder (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 category ARG 2 result ARG 3 material - METHOD netheriteSmithing (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/item/Item;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/item/Item;)V - ARG 0 recipeOutput + METHOD netheriteSmithing (Lnet/minecraft/world/item/Item;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/item/Item;)V ARG 1 ingredientItem ARG 2 category ARG 3 resultItem - METHOD nineBlockStorageRecipes (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + METHOD nineBlockStorageRecipes (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;)V ARG 1 unpackedCategory ARG 2 unpacked ARG 3 packedCategory ARG 4 packed - METHOD nineBlockStorageRecipes (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V - ARG 0 recipeOutput + METHOD nineBlockStorageRecipes (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V ARG 1 unpackedCategory ARG 2 unpacked ARG 3 packedCategory @@ -165,43 +141,37 @@ CLASS net/minecraft/data/recipes/RecipeProvider ARG 6 packedGroup ARG 7 unpackedName ARG 8 unpackedGroup - METHOD nineBlockStorageRecipesRecipesWithCustomUnpacking (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Ljava/lang/String;Ljava/lang/String;)V - ARG 0 recipeOutput + METHOD nineBlockStorageRecipesRecipesWithCustomUnpacking (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Ljava/lang/String;Ljava/lang/String;)V ARG 1 unpackedCategory ARG 2 unpacked ARG 3 packedCategory ARG 4 packed ARG 5 unpackedName ARG 6 unpackedGroup - METHOD nineBlockStorageRecipesWithCustomPacking (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Ljava/lang/String;Ljava/lang/String;)V - ARG 0 recipeOutput + METHOD nineBlockStorageRecipesWithCustomPacking (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Ljava/lang/String;Ljava/lang/String;)V ARG 1 unpackedCategory ARG 2 unpacked ARG 3 packedCategory ARG 4 packed ARG 5 packedName ARG 6 packedGroup - METHOD oneToOneConversionRecipe (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;Ljava/lang/String;)V - ARG 0 recipeOutput + METHOD oneToOneConversionRecipe (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;Ljava/lang/String;)V ARG 1 result ARG 2 ingredient ARG 3 group - METHOD oneToOneConversionRecipe (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;Ljava/lang/String;I)V - ARG 0 recipeOutput + METHOD oneToOneConversionRecipe (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;Ljava/lang/String;I)V ARG 1 result ARG 2 ingredient ARG 3 group ARG 4 resultCount - METHOD oreBlasting (Lnet/minecraft/data/recipes/RecipeOutput;Ljava/util/List;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;FILjava/lang/String;)V - ARG 0 recipeOutput + METHOD oreBlasting (Ljava/util/List;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;FILjava/lang/String;)V ARG 1 ingredients ARG 2 category ARG 3 result ARG 4 experience ARG 5 cookingTime ARG 6 group - METHOD oreCooking (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/item/crafting/RecipeSerializer;Lnet/minecraft/world/item/crafting/AbstractCookingRecipe$Factory;Ljava/util/List;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;FILjava/lang/String;Ljava/lang/String;)V - ARG 0 recipeOutput + METHOD oreCooking (Lnet/minecraft/world/item/crafting/RecipeSerializer;Lnet/minecraft/world/item/crafting/AbstractCookingRecipe$Factory;Ljava/util/List;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;FILjava/lang/String;Ljava/lang/String;)V ARG 1 serializer ARG 2 recipeFactory ARG 3 ingredients @@ -211,49 +181,57 @@ CLASS net/minecraft/data/recipes/RecipeProvider ARG 7 cookingTime ARG 8 group ARG 9 suffix - METHOD oreSmelting (Lnet/minecraft/data/recipes/RecipeOutput;Ljava/util/List;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;FILjava/lang/String;)V - ARG 0 recipeOutput + METHOD oreSmelting (Ljava/util/List;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;FILjava/lang/String;)V ARG 1 ingredients ARG 2 category ARG 3 result ARG 4 experience ARG 5 cookingTime ARG 6 group - METHOD planksFromLog (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/tags/TagKey;I)V - ARG 0 recipeOutput + METHOD planksFromLog (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/tags/TagKey;I)V ARG 1 planks ARG 2 logs ARG 3 resultCount - METHOD planksFromLogs (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/tags/TagKey;I)V - ARG 0 recipeOutput + METHOD planksFromLogs (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/tags/TagKey;I)V ARG 1 planks ARG 2 logs ARG 3 result - METHOD polished (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + METHOD polished (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 category ARG 2 result ARG 3 material METHOD polishedBuilder (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/data/recipes/RecipeBuilder; - ARG 0 category - ARG 1 result - ARG 2 material - METHOD pressurePlate (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + ARG 1 category + ARG 2 result + ARG 3 material + METHOD pressurePlate (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 pressurePlate ARG 2 material METHOD pressurePlateBuilder (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/data/recipes/RecipeBuilder; - ARG 0 category - ARG 1 pressurePlate - ARG 2 material - METHOD run (Lnet/minecraft/data/CachedOutput;Lnet/minecraft/core/HolderLookup$Provider;)Ljava/util/concurrent/CompletableFuture; - ARG 1 output - ARG 2 registries + ARG 1 category + ARG 2 pressurePlate + ARG 3 material + METHOD shaped (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/data/recipes/ShapedRecipeBuilder; + ARG 1 category + ARG 2 result + METHOD shaped (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;I)Lnet/minecraft/data/recipes/ShapedRecipeBuilder; + ARG 1 category + ARG 2 result + ARG 3 count + METHOD shapeless (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/data/recipes/ShapelessRecipeBuilder; + ARG 1 category + ARG 2 result + METHOD shapeless (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/data/recipes/ShapelessRecipeBuilder; + ARG 1 category + ARG 2 result + METHOD shapeless (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;I)Lnet/minecraft/data/recipes/ShapelessRecipeBuilder; + ARG 1 category + ARG 2 result + ARG 3 count METHOD signBuilder (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/data/recipes/RecipeBuilder; - ARG 0 sign - ARG 1 material - METHOD simpleCookingRecipe (Lnet/minecraft/data/recipes/RecipeOutput;Ljava/lang/String;Lnet/minecraft/world/item/crafting/RecipeSerializer;Lnet/minecraft/world/item/crafting/AbstractCookingRecipe$Factory;ILnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;F)V - ARG 0 recipeOutput + ARG 1 sign + ARG 2 material + METHOD simpleCookingRecipe (Ljava/lang/String;Lnet/minecraft/world/item/crafting/RecipeSerializer;Lnet/minecraft/world/item/crafting/AbstractCookingRecipe$Factory;ILnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;F)V ARG 1 cookingMethod ARG 2 cookingSerializer ARG 3 recipeFactory @@ -261,85 +239,87 @@ CLASS net/minecraft/data/recipes/RecipeProvider ARG 5 material ARG 6 result ARG 7 experience - METHOD slab (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + METHOD slab (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 category ARG 2 slab ARG 3 material METHOD slabBuilder (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/data/recipes/RecipeBuilder; - ARG 0 category - ARG 1 slab - ARG 2 material - METHOD smeltingResultFromBase (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + ARG 1 category + ARG 2 slab + ARG 3 material + METHOD smeltingResultFromBase (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 result ARG 2 ingredient - METHOD stainedGlassFromGlassAndDye (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + METHOD stainedGlassFromGlassAndDye (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 stainedGlass ARG 2 dye - METHOD stainedGlassPaneFromGlassPaneAndDye (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + METHOD stainedGlassPaneFromGlassPaneAndDye (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 stainedGlassPane ARG 2 dye - METHOD stainedGlassPaneFromStainedGlass (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + METHOD stainedGlassPaneFromStainedGlass (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 stainedGlassPane ARG 2 stainedGlass METHOD stairBuilder (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/data/recipes/RecipeBuilder; - ARG 0 stairs - ARG 1 material - METHOD stonecutterResultFromBase (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + ARG 1 stairs + ARG 2 material + METHOD stonecutterResultFromBase (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 category ARG 2 result ARG 3 material - METHOD stonecutterResultFromBase (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;I)V - ARG 0 recipeOutput + METHOD stonecutterResultFromBase (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;I)V ARG 1 category ARG 2 result ARG 3 material ARG 4 resultCount - METHOD threeByThreePacker (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + METHOD suspiciousStew (Lnet/minecraft/world/item/Item;Lnet/minecraft/world/level/block/SuspiciousEffectHolder;)V + ARG 1 flowerItem + ARG 2 effect + METHOD tag (Lnet/minecraft/tags/TagKey;)Lnet/minecraft/world/item/crafting/Ingredient; + ARG 1 tag + METHOD threeByThreePacker (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 category ARG 2 packed ARG 3 unpacked - METHOD threeByThreePacker (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;Ljava/lang/String;)V - ARG 0 recipeOutput + METHOD threeByThreePacker (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;Ljava/lang/String;)V ARG 1 category ARG 2 packed ARG 3 unpacked ARG 4 criterionName METHOD trapdoorBuilder (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/data/recipes/RecipeBuilder; - ARG 0 trapdoor - ARG 1 material - METHOD trimSmithing (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/item/Item;Lnet/minecraft/resources/ResourceLocation;)V - ARG 0 recipeOutput - ARG 1 ingredientItem - ARG 2 location - METHOD twoByTwoPacker (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + ARG 1 trapdoor + ARG 2 material + METHOD trimSmithing (Lnet/minecraft/world/item/Item;Lnet/minecraft/resources/ResourceKey;)V + ARG 1 templateItem + ARG 2 key + METHOD twoByTwoPacker (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 category ARG 2 packed ARG 3 unpacked - METHOD wall (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + METHOD wall (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 category ARG 2 wall ARG 3 material METHOD wallBuilder (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/data/recipes/RecipeBuilder; - ARG 0 category - ARG 1 wall - ARG 2 material - METHOD waxRecipes (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/flag/FeatureFlagSet;)V - ARG 0 recipeOutput + ARG 1 category + ARG 2 wall + ARG 3 material + METHOD waxRecipes (Lnet/minecraft/world/flag/FeatureFlagSet;)V ARG 1 requiredFeatures - METHOD woodFromLogs (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + METHOD woodFromLogs (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 wood ARG 2 log - METHOD woodenBoat (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V - ARG 0 recipeOutput + METHOD woodenBoat (Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)V ARG 1 boat ARG 2 material + CLASS Runner + METHOD (Lnet/minecraft/data/PackOutput;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 packOutput + ARG 2 registries + METHOD createRecipeProvider (Lnet/minecraft/core/HolderLookup$Provider;Lnet/minecraft/data/recipes/RecipeOutput;)Lnet/minecraft/data/recipes/RecipeProvider; + ARG 1 registries + ARG 2 output + CLASS FamilyRecipeProvider + METHOD create (Lnet/minecraft/data/recipes/RecipeProvider;Lnet/minecraft/world/level/ItemLike;Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/data/recipes/RecipeBuilder; + ARG 1 recipeProvider + ARG 2 ingredient + ARG 3 result diff --git a/data/net/minecraft/data/recipes/ShapedRecipeBuilder.mapping b/data/net/minecraft/data/recipes/ShapedRecipeBuilder.mapping index ab6972d3a..ab88f3394 100644 --- a/data/net/minecraft/data/recipes/ShapedRecipeBuilder.mapping +++ b/data/net/minecraft/data/recipes/ShapedRecipeBuilder.mapping @@ -1,8 +1,9 @@ CLASS net/minecraft/data/recipes/ShapedRecipeBuilder - METHOD (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;I)V - ARG 1 category - ARG 2 result - ARG 3 count + METHOD (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;I)V + ARG 1 items + ARG 2 category + ARG 3 result + ARG 4 count METHOD define (Ljava/lang/Character;Lnet/minecraft/tags/TagKey;)Lnet/minecraft/data/recipes/ShapedRecipeBuilder; COMMENT Adds a key to the recipe pattern. ARG 1 symbol @@ -15,19 +16,19 @@ CLASS net/minecraft/data/recipes/ShapedRecipeBuilder COMMENT Adds a key to the recipe pattern. ARG 1 symbol ARG 2 item - METHOD ensureValid (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/world/item/crafting/ShapedRecipePattern; - ARG 1 loaction + METHOD ensureValid (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/item/crafting/ShapedRecipePattern; + ARG 1 recipe METHOD pattern (Ljava/lang/String;)Lnet/minecraft/data/recipes/ShapedRecipeBuilder; COMMENT Adds a new entry to the patterns for this recipe. ARG 1 pattern - METHOD shaped (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/data/recipes/ShapedRecipeBuilder; - COMMENT Creates a new builder for a shaped recipe. - ARG 0 category - ARG 1 result - METHOD shaped (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;I)Lnet/minecraft/data/recipes/ShapedRecipeBuilder; - COMMENT Creates a new builder for a shaped recipe. - ARG 0 category - ARG 1 result - ARG 2 count + METHOD shaped (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/data/recipes/ShapedRecipeBuilder; + ARG 0 items + ARG 1 category + ARG 2 result + METHOD shaped (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;I)Lnet/minecraft/data/recipes/ShapedRecipeBuilder; + ARG 0 items + ARG 1 category + ARG 2 result + ARG 3 count METHOD showNotification (Z)Lnet/minecraft/data/recipes/ShapedRecipeBuilder; ARG 1 showNotification diff --git a/data/net/minecraft/data/recipes/ShapelessRecipeBuilder.mapping b/data/net/minecraft/data/recipes/ShapelessRecipeBuilder.mapping index d9e3a9986..9946e1c84 100644 --- a/data/net/minecraft/data/recipes/ShapelessRecipeBuilder.mapping +++ b/data/net/minecraft/data/recipes/ShapelessRecipeBuilder.mapping @@ -1,11 +1,10 @@ CLASS net/minecraft/data/recipes/ShapelessRecipeBuilder - METHOD (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;I)V - ARG 1 category - ARG 2 result - ARG 3 count - METHOD ensureValid (Lnet/minecraft/resources/ResourceLocation;)V - COMMENT Makes sure that this recipe is valid and obtainable. - ARG 1 id + METHOD (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/item/ItemStack;)V + ARG 1 items + ARG 2 category + ARG 3 result + METHOD ensureValid (Lnet/minecraft/resources/ResourceKey;)V + ARG 1 recipe METHOD requires (Lnet/minecraft/tags/TagKey;)Lnet/minecraft/data/recipes/ShapelessRecipeBuilder; COMMENT Adds an ingredient that can be any item in the given tag. ARG 1 tag @@ -23,12 +22,16 @@ CLASS net/minecraft/data/recipes/ShapelessRecipeBuilder COMMENT Adds the given ingredient multiple times. ARG 1 item ARG 2 quantity - METHOD shapeless (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/data/recipes/ShapelessRecipeBuilder; - COMMENT Creates a new builder for a shapeless recipe. - ARG 0 category - ARG 1 result - METHOD shapeless (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;I)Lnet/minecraft/data/recipes/ShapelessRecipeBuilder; - COMMENT Creates a new builder for a shapeless recipe. - ARG 0 category - ARG 1 result - ARG 2 count + METHOD shapeless (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/data/recipes/ShapelessRecipeBuilder; + ARG 0 items + ARG 1 category + ARG 2 result + METHOD shapeless (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/data/recipes/ShapelessRecipeBuilder; + ARG 0 items + ARG 1 category + ARG 2 result + METHOD shapeless (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;I)Lnet/minecraft/data/recipes/ShapelessRecipeBuilder; + ARG 0 items + ARG 1 category + ARG 2 result + ARG 3 count diff --git a/data/net/minecraft/data/recipes/SimpleCookingRecipeBuilder.mapping b/data/net/minecraft/data/recipes/SimpleCookingRecipeBuilder.mapping index fcb4365b0..cabad12da 100644 --- a/data/net/minecraft/data/recipes/SimpleCookingRecipeBuilder.mapping +++ b/data/net/minecraft/data/recipes/SimpleCookingRecipeBuilder.mapping @@ -26,9 +26,8 @@ CLASS net/minecraft/data/recipes/SimpleCookingRecipeBuilder ARG 1 result METHOD determineSmeltingRecipeCategory (Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/item/crafting/CookingBookCategory; ARG 0 result - METHOD ensureValid (Lnet/minecraft/resources/ResourceLocation;)V - COMMENT Makes sure that this obtainable. - ARG 1 id + METHOD ensureValid (Lnet/minecraft/resources/ResourceKey;)V + ARG 1 recipe METHOD generic (Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;FILnet/minecraft/world/item/crafting/RecipeSerializer;Lnet/minecraft/world/item/crafting/AbstractCookingRecipe$Factory;)Lnet/minecraft/data/recipes/SimpleCookingRecipeBuilder; ARG 0 ingredient ARG 1 category diff --git a/data/net/minecraft/data/recipes/SingleItemRecipeBuilder.mapping b/data/net/minecraft/data/recipes/SingleItemRecipeBuilder.mapping index 2f7758dbd..30924c75e 100644 --- a/data/net/minecraft/data/recipes/SingleItemRecipeBuilder.mapping +++ b/data/net/minecraft/data/recipes/SingleItemRecipeBuilder.mapping @@ -5,8 +5,8 @@ CLASS net/minecraft/data/recipes/SingleItemRecipeBuilder ARG 3 ingredient ARG 4 result ARG 5 count - METHOD ensureValid (Lnet/minecraft/resources/ResourceLocation;)V - ARG 1 id + METHOD ensureValid (Lnet/minecraft/resources/ResourceKey;)V + ARG 1 recipe METHOD stonecutting (Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/data/recipes/SingleItemRecipeBuilder; ARG 0 ingredient ARG 1 category diff --git a/data/net/minecraft/data/recipes/SmithingTransformRecipeBuilder.mapping b/data/net/minecraft/data/recipes/SmithingTransformRecipeBuilder.mapping index d4a70183a..0825b2db9 100644 --- a/data/net/minecraft/data/recipes/SmithingTransformRecipeBuilder.mapping +++ b/data/net/minecraft/data/recipes/SmithingTransformRecipeBuilder.mapping @@ -5,14 +5,14 @@ CLASS net/minecraft/data/recipes/SmithingTransformRecipeBuilder ARG 3 addition ARG 4 category ARG 5 result - METHOD ensureValid (Lnet/minecraft/resources/ResourceLocation;)V - ARG 1 location + METHOD ensureValid (Lnet/minecraft/resources/ResourceKey;)V + ARG 1 recipe METHOD save (Lnet/minecraft/data/recipes/RecipeOutput;Ljava/lang/String;)V ARG 1 recipeOutput ARG 2 recipeId - METHOD save (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/resources/ResourceLocation;)V - ARG 1 recipeOutput - ARG 2 recipeId + METHOD save (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/resources/ResourceKey;)V + ARG 1 output + ARG 2 resourceKey METHOD smithing (Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/item/Item;)Lnet/minecraft/data/recipes/SmithingTransformRecipeBuilder; ARG 0 template ARG 1 base diff --git a/data/net/minecraft/data/recipes/SmithingTrimRecipeBuilder.mapping b/data/net/minecraft/data/recipes/SmithingTrimRecipeBuilder.mapping index 10452cb9c..6d6826db5 100644 --- a/data/net/minecraft/data/recipes/SmithingTrimRecipeBuilder.mapping +++ b/data/net/minecraft/data/recipes/SmithingTrimRecipeBuilder.mapping @@ -4,11 +4,11 @@ CLASS net/minecraft/data/recipes/SmithingTrimRecipeBuilder ARG 2 template ARG 3 base ARG 4 addition - METHOD ensureValid (Lnet/minecraft/resources/ResourceLocation;)V - ARG 1 location - METHOD save (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/resources/ResourceLocation;)V - ARG 1 recipeOutput - ARG 2 recipeId + METHOD ensureValid (Lnet/minecraft/resources/ResourceKey;)V + ARG 1 recipe + METHOD save (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/resources/ResourceKey;)V + ARG 1 output + ARG 2 resourceKey METHOD smithingTrim (Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/data/recipes/RecipeCategory;)Lnet/minecraft/data/recipes/SmithingTrimRecipeBuilder; ARG 0 template ARG 1 base diff --git a/data/net/minecraft/data/recipes/SpecialRecipeBuilder.mapping b/data/net/minecraft/data/recipes/SpecialRecipeBuilder.mapping index d63dc35ee..835adfb5e 100644 --- a/data/net/minecraft/data/recipes/SpecialRecipeBuilder.mapping +++ b/data/net/minecraft/data/recipes/SpecialRecipeBuilder.mapping @@ -4,8 +4,8 @@ CLASS net/minecraft/data/recipes/SpecialRecipeBuilder METHOD save (Lnet/minecraft/data/recipes/RecipeOutput;Ljava/lang/String;)V ARG 1 recipeOutput ARG 2 recipeId - METHOD save (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/resources/ResourceLocation;)V - ARG 1 recipeOutput - ARG 2 recipeId + METHOD save (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/resources/ResourceKey;)V + ARG 1 output + ARG 2 resourceKey METHOD special (Ljava/util/function/Function;)Lnet/minecraft/data/recipes/SpecialRecipeBuilder; ARG 0 factory diff --git a/data/net/minecraft/data/recipes/TransmuteRecipeBuilder.mapping b/data/net/minecraft/data/recipes/TransmuteRecipeBuilder.mapping new file mode 100644 index 000000000..264d457fa --- /dev/null +++ b/data/net/minecraft/data/recipes/TransmuteRecipeBuilder.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/data/recipes/TransmuteRecipeBuilder + METHOD (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/core/Holder;Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/world/item/crafting/Ingredient;)V + ARG 1 category + ARG 2 result + ARG 3 input + ARG 4 material + METHOD ensureValid (Lnet/minecraft/resources/ResourceKey;)V + ARG 1 recipe + METHOD transmute (Lnet/minecraft/data/recipes/RecipeCategory;Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/world/item/Item;)Lnet/minecraft/data/recipes/TransmuteRecipeBuilder; + ARG 0 category + ARG 1 input + ARG 2 material + ARG 3 result diff --git a/data/net/minecraft/data/recipes/packs/VanillaRecipeProvider.mapping b/data/net/minecraft/data/recipes/packs/VanillaRecipeProvider.mapping deleted file mode 100644 index 15c6d211e..000000000 --- a/data/net/minecraft/data/recipes/packs/VanillaRecipeProvider.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/data/recipes/packs/VanillaRecipeProvider - METHOD lambda$buildRecipes$0 (Lnet/minecraft/data/recipes/RecipeOutput;Lnet/minecraft/data/recipes/packs/VanillaRecipeProvider$TrimTemplate;)V - ARG 1 trim - METHOD lambda$smithingTrims$1 (Lnet/minecraft/world/item/Item;)Lnet/minecraft/data/recipes/packs/VanillaRecipeProvider$TrimTemplate; - ARG 0 template diff --git a/data/net/minecraft/data/registries/WinterDropRegistries.mapping b/data/net/minecraft/data/registries/WinterDropRegistries.mapping new file mode 100644 index 000000000..ec9b54d9a --- /dev/null +++ b/data/net/minecraft/data/registries/WinterDropRegistries.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/data/registries/WinterDropRegistries + METHOD createLookup (Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletableFuture; + ARG 0 registries diff --git a/data/net/minecraft/data/tags/WinterDropBiomeTagsProvider.mapping b/data/net/minecraft/data/tags/WinterDropBiomeTagsProvider.mapping new file mode 100644 index 000000000..881e8df60 --- /dev/null +++ b/data/net/minecraft/data/tags/WinterDropBiomeTagsProvider.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/data/tags/WinterDropBiomeTagsProvider + METHOD (Lnet/minecraft/data/PackOutput;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 lookupProvider + ARG 3 parentProvider diff --git a/data/net/minecraft/data/tags/WinterDropBlockTagsProvider.mapping b/data/net/minecraft/data/tags/WinterDropBlockTagsProvider.mapping new file mode 100644 index 000000000..6325d4414 --- /dev/null +++ b/data/net/minecraft/data/tags/WinterDropBlockTagsProvider.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/data/tags/WinterDropBlockTagsProvider + METHOD (Lnet/minecraft/data/PackOutput;Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 lookupProvider + ARG 3 parentProvider diff --git a/data/net/minecraft/data/tags/WinterDropEntityTypeTagsProvider.mapping b/data/net/minecraft/data/tags/WinterDropEntityTypeTagsProvider.mapping new file mode 100644 index 000000000..08d796799 --- /dev/null +++ b/data/net/minecraft/data/tags/WinterDropEntityTypeTagsProvider.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/data/tags/WinterDropEntityTypeTagsProvider + METHOD (Lnet/minecraft/data/PackOutput;Ljava/util/concurrent/CompletableFuture;)V + ARG 1 output + ARG 2 registries diff --git a/data/net/minecraft/data/worldgen/BiomeDefaultFeatures.mapping b/data/net/minecraft/data/worldgen/BiomeDefaultFeatures.mapping index c3de4a67b..23e9fadc5 100644 --- a/data/net/minecraft/data/worldgen/BiomeDefaultFeatures.mapping +++ b/data/net/minecraft/data/worldgen/BiomeDefaultFeatures.mapping @@ -38,8 +38,6 @@ CLASS net/minecraft/data/worldgen/BiomeDefaultFeatures METHOD addDefaultOres (Lnet/minecraft/world/level/biome/BiomeGenerationSettings$Builder;Z)V ARG 0 builder ARG 1 largeOres - METHOD addDefaultSeagrass (Lnet/minecraft/world/level/biome/BiomeGenerationSettings$Builder;)V - ARG 0 builder METHOD addDefaultSoftDisks (Lnet/minecraft/world/level/biome/BiomeGenerationSettings$Builder;)V ARG 0 builder METHOD addDefaultSprings (Lnet/minecraft/world/level/biome/BiomeGenerationSettings$Builder;)V diff --git a/data/net/minecraft/data/worldgen/Pools.mapping b/data/net/minecraft/data/worldgen/Pools.mapping index 39c5382c8..1d2e3c1df 100644 --- a/data/net/minecraft/data/worldgen/Pools.mapping +++ b/data/net/minecraft/data/worldgen/Pools.mapping @@ -3,6 +3,8 @@ CLASS net/minecraft/data/worldgen/Pools ARG 0 context METHOD createKey (Ljava/lang/String;)Lnet/minecraft/resources/ResourceKey; ARG 0 name + METHOD createKey (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/resources/ResourceKey; + ARG 0 location METHOD parseKey (Ljava/lang/String;)Lnet/minecraft/resources/ResourceKey; ARG 0 key METHOD register (Lnet/minecraft/data/worldgen/BootstrapContext;Ljava/lang/String;Lnet/minecraft/world/level/levelgen/structure/pools/StructureTemplatePool;)V diff --git a/data/net/minecraft/data/worldgen/TerrainProvider.mapping b/data/net/minecraft/data/worldgen/TerrainProvider.mapping index 04aafad52..f574b80fe 100644 --- a/data/net/minecraft/data/worldgen/TerrainProvider.mapping +++ b/data/net/minecraft/data/worldgen/TerrainProvider.mapping @@ -3,21 +3,35 @@ CLASS net/minecraft/data/worldgen/TerrainProvider ARG 0 erosion ARG 1 ridges ARG 2 ridgesFolded + ARG 3 highErosionHighWeirdness + ARG 4 lowErosionHighWeirdness + ARG 5 highErosionMidWeirdness + ARG 6 lowErosionMidWeirdness ARG 7 transform METHOD buildErosionOffsetSpline (Lnet/minecraft/util/ToFloatFunction;Lnet/minecraft/util/ToFloatFunction;FFFFFFZZLnet/minecraft/util/ToFloatFunction;)Lnet/minecraft/util/CubicSpline; ARG 0 erosion ARG 1 ridgesFolded + ARG 5 magnitude + ARG 8 extended + ARG 9 useMaxSlope ARG 10 transform METHOD buildMountainRidgeSplineWithPoints (Lnet/minecraft/util/ToFloatFunction;FZLnet/minecraft/util/ToFloatFunction;)Lnet/minecraft/util/CubicSpline; ARG 0 ridgesFolded + ARG 1 magnitude + ARG 2 useMaxSlope ARG 3 transform METHOD buildRidgeJaggednessSpline (Lnet/minecraft/util/ToFloatFunction;Lnet/minecraft/util/ToFloatFunction;FFLnet/minecraft/util/ToFloatFunction;)Lnet/minecraft/util/CubicSpline; ARG 0 ridges ARG 1 ridgesFolded + ARG 2 highWeirdnessMagnitude + ARG 3 midWeirdnessMagnitude ARG 4 transform METHOD buildWeirdnessJaggednessSpline (Lnet/minecraft/util/ToFloatFunction;FLnet/minecraft/util/ToFloatFunction;)Lnet/minecraft/util/CubicSpline; ARG 0 ridges + ARG 1 magnitude ARG 2 transform + METHOD calculateMountainRidgeZeroContinentalnessPoint (F)F + ARG 0 input METHOD calculateSlope (FFFF)F ARG 0 y1 ARG 1 y2 @@ -27,7 +41,13 @@ CLASS net/minecraft/data/worldgen/TerrainProvider ARG 0 erosion ARG 1 ridges ARG 2 ridgesFolded + ARG 3 value + ARG 4 higherValues ARG 5 transform + METHOD mountainContinentalness (FFF)F + ARG 0 heightFactor + ARG 1 magnitude + ARG 2 cutoffHeight METHOD overworldFactor (Lnet/minecraft/util/ToFloatFunction;Lnet/minecraft/util/ToFloatFunction;Lnet/minecraft/util/ToFloatFunction;Lnet/minecraft/util/ToFloatFunction;Z)Lnet/minecraft/util/CubicSpline; ARG 0 continents ARG 1 erosion diff --git a/data/net/minecraft/data/worldgen/WinterDropBiomes.mapping b/data/net/minecraft/data/worldgen/WinterDropBiomes.mapping new file mode 100644 index 000000000..297312c5f --- /dev/null +++ b/data/net/minecraft/data/worldgen/WinterDropBiomes.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/data/worldgen/WinterDropBiomes + METHOD bootstrap (Lnet/minecraft/data/worldgen/BootstrapContext;)V + ARG 0 context + METHOD createKey (Ljava/lang/String;)Lnet/minecraft/resources/ResourceKey; + ARG 0 name + METHOD register (Lnet/minecraft/data/worldgen/BootstrapContext;Ljava/lang/String;Lnet/minecraft/world/level/biome/Biome;)V + ARG 0 context + ARG 1 name + ARG 2 biome diff --git a/data/net/minecraft/data/worldgen/biome/OverworldBiomes.mapping b/data/net/minecraft/data/worldgen/biome/OverworldBiomes.mapping index b183282ba..ccb597337 100644 --- a/data/net/minecraft/data/worldgen/biome/OverworldBiomes.mapping +++ b/data/net/minecraft/data/worldgen/biome/OverworldBiomes.mapping @@ -52,9 +52,10 @@ CLASS net/minecraft/data/worldgen/biome/OverworldBiomes ARG 0 placedFeatures ARG 1 worldCarvers ARG 2 isDeep - METHOD darkForest (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/world/level/biome/Biome; + METHOD darkForest (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/core/HolderGetter;Z)Lnet/minecraft/world/level/biome/Biome; ARG 0 placedFeatures ARG 1 worldCarvers + ARG 2 isPaleGarden METHOD deepDark (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/world/level/biome/Biome; ARG 0 placedFeatures ARG 1 worldCarvers diff --git a/data/net/minecraft/gametest/framework/GameTestHelper.mapping b/data/net/minecraft/gametest/framework/GameTestHelper.mapping index 9b0367073..a1a332d98 100644 --- a/data/net/minecraft/gametest/framework/GameTestHelper.mapping +++ b/data/net/minecraft/gametest/framework/GameTestHelper.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/gametest/framework/GameTestHelper METHOD (Lnet/minecraft/gametest/framework/GameTestInfo;)V ARG 1 testInfo + METHOD absoluteAABB (Lnet/minecraft/world/phys/AABB;)Lnet/minecraft/world/phys/AABB; + ARG 1 aabb METHOD absolutePos (Lnet/minecraft/core/BlockPos;)Lnet/minecraft/core/BlockPos; ARG 1 pos METHOD absoluteVec (Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/world/phys/Vec3; @@ -71,6 +73,10 @@ CLASS net/minecraft/gametest/framework/GameTestHelper ARG 2 type ARG 3 entityDataGetter ARG 4 testEntityData + METHOD assertEntityData (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/EntityType;Ljava/util/function/Predicate;)V + ARG 1 pos + ARG 2 type + ARG 3 predicate METHOD assertEntityInstancePresent (Lnet/minecraft/world/entity/Entity;III)V ARG 1 entity ARG 2 x @@ -97,10 +103,9 @@ CLASS net/minecraft/gametest/framework/GameTestHelper METHOD assertEntityNotPresent (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/core/BlockPos;)V ARG 1 type ARG 2 pos - METHOD assertEntityNotPresent (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/Vec3;)V + METHOD assertEntityNotPresent (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/phys/AABB;)V ARG 1 type - ARG 2 from - ARG 3 to + ARG 2 box METHOD assertEntityNotTouching (Lnet/minecraft/world/entity/EntityType;DDD)V ARG 1 type ARG 2 x @@ -124,10 +129,9 @@ CLASS net/minecraft/gametest/framework/GameTestHelper ARG 1 type ARG 2 pos ARG 3 expansionAmount - METHOD assertEntityPresent (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/Vec3;)V - ARG 1 entityType - ARG 2 startPos - ARG 3 endPos + METHOD assertEntityPresent (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/phys/AABB;)V + ARG 1 type + ARG 2 box METHOD assertEntityProperty (Lnet/minecraft/world/entity/Entity;Ljava/util/function/Function;Ljava/lang/String;Ljava/lang/Object;)V ARG 1 entity ARG 2 entityPropertyGetter @@ -232,12 +236,32 @@ CLASS net/minecraft/gametest/framework/GameTestHelper ARG 1 heightmapType ARG 2 x ARG 3 z + METHOD hurt (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/damagesource/DamageSource;F)V + ARG 1 entity + ARG 2 damageSource + ARG 3 amount + METHOD kill (Lnet/minecraft/world/entity/Entity;)V + ARG 1 entity METHOD killAllEntitiesOfClass (Ljava/lang/Class;)V ARG 1 entityClass - METHOD lambda$assertBlockProperty$12 (Lnet/minecraft/world/level/block/state/properties/Property;Ljava/util/function/Predicate;Lnet/minecraft/world/level/block/state/BlockState;)Z + METHOD lambda$assertBlock$12 (Ljava/util/function/Predicate;Lnet/minecraft/world/level/block/state/BlockState;)Z + ARG 1 state + METHOD lambda$assertBlockProperty$13 (Lnet/minecraft/world/level/block/state/properties/Property;Ljava/util/function/Predicate;Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 2 state + METHOD lambda$assertEntityInventoryContains$20 (Lnet/minecraft/world/item/Item;Lnet/minecraft/world/item/ItemStack;)Z + ARG 1 stack + METHOD lambda$assertEntityNotTouching$18 (Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/entity/Entity;)Z + ARG 1 entity + METHOD lambda$assertEntityTouching$17 (Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/entity/Entity;)Z + ARG 1 entity + METHOD lambda$findEntities$3 (Lnet/minecraft/world/phys/AABB;Lnet/minecraft/world/entity/Entity;)Z + ARG 1 entity METHOD lambda$killAllEntitiesOfClass$0 (Lnet/minecraft/world/entity/Entity;)Z ARG 0 entity + METHOD lambda$killAllEntitiesOfClass$1 (Lnet/minecraft/world/entity/Entity;)V + ARG 1 entity + METHOD lambda$pressButton$5 (Lnet/minecraft/world/level/block/state/BlockState;)Z + ARG 0 state METHOD makeAboutToDrown (Lnet/minecraft/world/entity/LivingEntity;)Lnet/minecraft/world/entity/LivingEntity; ARG 1 entity METHOD makeMockPlayer (Lnet/minecraft/world/level/GameType;)Lnet/minecraft/world/entity/player/Player; @@ -271,6 +295,8 @@ CLASS net/minecraft/gametest/framework/GameTestHelper ARG 2 delay METHOD randomTick (Lnet/minecraft/core/BlockPos;)V ARG 1 pos + METHOD relativeAABB (Lnet/minecraft/world/phys/AABB;)Lnet/minecraft/world/phys/AABB; + ARG 1 aabb METHOD relativePos (Lnet/minecraft/core/BlockPos;)Lnet/minecraft/core/BlockPos; ARG 1 pos METHOD relativeVec (Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/world/phys/Vec3; diff --git a/data/net/minecraft/gametest/framework/StructureUtils.mapping b/data/net/minecraft/gametest/framework/StructureUtils.mapping index b02f1b7ab..49d961af2 100644 --- a/data/net/minecraft/gametest/framework/StructureUtils.mapping +++ b/data/net/minecraft/gametest/framework/StructureUtils.mapping @@ -58,6 +58,11 @@ CLASS net/minecraft/gametest/framework/StructureUtils ARG 0 rotationSteps METHOD getRotationStepsForRotation (Lnet/minecraft/world/level/block/Rotation;)I ARG 0 rotation + METHOD getStartCorner (Lnet/minecraft/gametest/framework/GameTestInfo;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Rotation;Lnet/minecraft/server/level/ServerLevel;)Lnet/minecraft/core/BlockPos; + ARG 0 gameTestInfo + ARG 1 pos + ARG 2 rotation + ARG 3 level METHOD getStructureBoundingBox (Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Vec3i;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/world/level/levelgen/structure/BoundingBox; ARG 0 pos ARG 1 offset diff --git a/data/net/minecraft/gametest/framework/TestCommand.mapping b/data/net/minecraft/gametest/framework/TestCommand.mapping index 7badee96f..d636bf606 100644 --- a/data/net/minecraft/gametest/framework/TestCommand.mapping +++ b/data/net/minecraft/gametest/framework/TestCommand.mapping @@ -79,6 +79,8 @@ CLASS net/minecraft/gametest/framework/TestCommand ARG 1 context METHOD lambda$runWithRetryOptions$2 (Ljava/util/function/Function;Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context + METHOD lambda$runWithRetryOptions$3 (Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 0 builder METHOD lambda$runWithRetryOptionsAndBuildInfo$4 (Ljava/util/function/Function;Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context METHOD lambda$runWithRetryOptionsAndBuildInfo$5 (Ljava/util/function/Function;Lcom/mojang/brigadier/context/CommandContext;)I diff --git a/data/net/minecraft/locale/DeprecatedTranslationsInfo.mapping b/data/net/minecraft/locale/DeprecatedTranslationsInfo.mapping new file mode 100644 index 000000000..4148d1490 --- /dev/null +++ b/data/net/minecraft/locale/DeprecatedTranslationsInfo.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/locale/DeprecatedTranslationsInfo + METHOD applyToMap (Ljava/util/Map;)V + ARG 1 translations + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD loadFromJson (Ljava/io/InputStream;)Lnet/minecraft/locale/DeprecatedTranslationsInfo; + ARG 0 inputStream + METHOD loadFromResource (Ljava/lang/String;)Lnet/minecraft/locale/DeprecatedTranslationsInfo; + ARG 0 name diff --git a/data/net/minecraft/network/FriendlyByteBuf.mapping b/data/net/minecraft/network/FriendlyByteBuf.mapping index a74156caf..72411ccbf 100644 --- a/data/net/minecraft/network/FriendlyByteBuf.mapping +++ b/data/net/minecraft/network/FriendlyByteBuf.mapping @@ -135,6 +135,9 @@ CLASS net/minecraft/network/FriendlyByteBuf ARG 1 exception METHOD lambda$writeJsonWithCodec$3 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException; ARG 1 exception + METHOD lambda$writeMap$5 (Lnet/minecraft/network/codec/StreamEncoder;Lnet/minecraft/network/codec/StreamEncoder;Ljava/lang/Object;Ljava/lang/Object;)V + ARG 3 key + ARG 4 value METHOD lambda$writeWithCodec$1 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException; ARG 1 exception METHOD limitValue (Ljava/util/function/IntFunction;I)Ljava/util/function/IntFunction; @@ -207,9 +210,13 @@ CLASS net/minecraft/network/FriendlyByteBuf COMMENT Reads a ChunkPos encoded as a long from the buffer. COMMENT COMMENT @see #writeChunkPos + METHOD readChunkPos (Lio/netty/buffer/ByteBuf;)Lnet/minecraft/world/level/ChunkPos; + ARG 0 buffer METHOD readCollection (Ljava/util/function/IntFunction;Lnet/minecraft/network/codec/StreamDecoder;)Ljava/util/Collection; ARG 1 collectionFactory ARG 2 elementReader + METHOD readContainerId (Lio/netty/buffer/ByteBuf;)I + ARG 0 buffer METHOD readDate ()Ljava/util/Date; COMMENT Read a timestamp as milliseconds since the unix epoch. COMMENT @@ -321,6 +328,8 @@ CLASS net/minecraft/network/FriendlyByteBuf COMMENT Reads a compressed long from the buffer. To do so it maximally reads 10 byte-sized chunks whose most significant bit dictates whether another byte should be read. COMMENT COMMENT @see #writeVarLong + METHOD readVec3 (Lio/netty/buffer/ByteBuf;)Lnet/minecraft/world/phys/Vec3; + ARG 0 buffer METHOD readVector3f (Lio/netty/buffer/ByteBuf;)Lorg/joml/Vector3f; ARG 0 buffer METHOD readWithCodec (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Lnet/minecraft/nbt/NbtAccounter;)Ljava/lang/Object; @@ -502,6 +511,9 @@ CLASS net/minecraft/network/FriendlyByteBuf METHOD writeCharSequence (Ljava/lang/CharSequence;Ljava/nio/charset/Charset;)I ARG 1 charSequence ARG 2 charset + METHOD writeChunkPos (Lio/netty/buffer/ByteBuf;Lnet/minecraft/world/level/ChunkPos;)V + ARG 0 buffer + ARG 1 chunkPos METHOD writeChunkPos (Lnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/network/FriendlyByteBuf; COMMENT Writes a ChunkPos encoded as a long to the buffer. COMMENT @@ -510,6 +522,11 @@ CLASS net/minecraft/network/FriendlyByteBuf METHOD writeCollection (Ljava/util/Collection;Lnet/minecraft/network/codec/StreamEncoder;)V ARG 1 collection ARG 2 elementWriter + METHOD writeContainerId (I)V + ARG 1 containerId + METHOD writeContainerId (Lio/netty/buffer/ByteBuf;I)V + ARG 0 buffer + ARG 1 containerId METHOD writeDate (Ljava/util/Date;)Lnet/minecraft/network/FriendlyByteBuf; COMMENT Write a timestamp as milliseconds since the unix epoch. COMMENT @@ -631,6 +648,9 @@ CLASS net/minecraft/network/FriendlyByteBuf METHOD writeVarLong (J)Lnet/minecraft/network/FriendlyByteBuf; COMMENT Writes a compressed long to the buffer. The smallest number of bytes to fit the passed long will be written. Of each such byte only 7 bits will be used to describe the actual value since its most significant bit dictates whether the next byte is part of that same long. Micro-optimization for long values that are usually small. ARG 1 value + METHOD writeVec3 (Lio/netty/buffer/ByteBuf;Lnet/minecraft/world/phys/Vec3;)V + ARG 0 buffer + ARG 1 vec3 METHOD writeVec3 (Lnet/minecraft/world/phys/Vec3;)V ARG 1 vec3 METHOD writeVector3f (Lio/netty/buffer/ByteBuf;Lorg/joml/Vector3f;)V diff --git a/data/net/minecraft/network/chat/Component.mapping b/data/net/minecraft/network/chat/Component.mapping index 855fed0c1..b801768a2 100644 --- a/data/net/minecraft/network/chat/Component.mapping +++ b/data/net/minecraft/network/chat/Component.mapping @@ -28,9 +28,12 @@ CLASS net/minecraft/network/chat/Component METHOD score (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/network/chat/MutableComponent; ARG 0 name ARG 1 objective - METHOD selector (Ljava/lang/String;Ljava/util/Optional;)Lnet/minecraft/network/chat/MutableComponent; - ARG 0 pattern - ARG 1 separator + METHOD score (Lnet/minecraft/commands/arguments/selector/SelectorPattern;Ljava/lang/String;)Lnet/minecraft/network/chat/MutableComponent; + ARG 0 selectorPattern + ARG 1 objective + METHOD selector (Lnet/minecraft/commands/arguments/selector/SelectorPattern;Ljava/util/Optional;)Lnet/minecraft/network/chat/MutableComponent; + ARG 0 selectorPattern + ARG 1 seperator METHOD toFlatList (Lnet/minecraft/network/chat/Style;)Ljava/util/List; ARG 1 style METHOD translatable (Ljava/lang/String;)Lnet/minecraft/network/chat/MutableComponent; diff --git a/data/net/minecraft/network/chat/contents/ScoreContents.mapping b/data/net/minecraft/network/chat/contents/ScoreContents.mapping index a8ccc0eb6..e376645e3 100644 --- a/data/net/minecraft/network/chat/contents/ScoreContents.mapping +++ b/data/net/minecraft/network/chat/contents/ScoreContents.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/network/chat/contents/ScoreContents - METHOD (Ljava/lang/String;Ljava/lang/String;)V - ARG 1 name - ARG 2 objective METHOD equals (Ljava/lang/Object;)Z ARG 1 other METHOD findTargetName (Lnet/minecraft/commands/CommandSourceStack;)Lnet/minecraft/world/scores/ScoreHolder; @@ -11,5 +8,3 @@ CLASS net/minecraft/network/chat/contents/ScoreContents ARG 2 source METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD parseSelector (Ljava/lang/String;)Lnet/minecraft/commands/arguments/selector/EntitySelector; - ARG 0 selector diff --git a/data/net/minecraft/network/chat/contents/SelectorContents.mapping b/data/net/minecraft/network/chat/contents/SelectorContents.mapping index e5ba5252a..bfead2702 100644 --- a/data/net/minecraft/network/chat/contents/SelectorContents.mapping +++ b/data/net/minecraft/network/chat/contents/SelectorContents.mapping @@ -1,10 +1,5 @@ CLASS net/minecraft/network/chat/contents/SelectorContents - METHOD (Ljava/lang/String;Ljava/util/Optional;)V - ARG 1 pattern - ARG 2 separator METHOD equals (Ljava/lang/Object;)Z ARG 1 other METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD parseSelector (Ljava/lang/String;)Lnet/minecraft/commands/arguments/selector/EntitySelector; - ARG 0 selector diff --git a/data/net/minecraft/network/codec/ByteBufCodecs.mapping b/data/net/minecraft/network/codec/ByteBufCodecs.mapping index 2a1da3673..57811c374 100644 --- a/data/net/minecraft/network/codec/ByteBufCodecs.mapping +++ b/data/net/minecraft/network/codec/ByteBufCodecs.mapping @@ -70,21 +70,9 @@ CLASS net/minecraft/network/codec/ByteBufCodecs ARG 0 buffer ARG 1 count ARG 2 maxSize - CLASS 10 - METHOD decode (Lio/netty/buffer/ByteBuf;)[B - ARG 1 buffer - METHOD encode (Lio/netty/buffer/ByteBuf;[B)V - ARG 1 buffer - ARG 2 value CLASS 11 METHOD decode (Lio/netty/buffer/ByteBuf;)[B ARG 1 buffer METHOD encode (Lio/netty/buffer/ByteBuf;[B)V ARG 1 buffer ARG 2 value - CLASS 23 - METHOD getRegistryOrThrow (Lnet/minecraft/network/RegistryFriendlyByteBuf;)Lnet/minecraft/core/IdMap; - ARG 1 buffer - CLASS 24 - METHOD getRegistryOrThrow (Lnet/minecraft/network/RegistryFriendlyByteBuf;)Lnet/minecraft/core/IdMap; - ARG 1 buffer diff --git a/data/net/minecraft/network/codec/StreamCodec.mapping b/data/net/minecraft/network/codec/StreamCodec.mapping index 0763e0be1..687a40082 100644 --- a/data/net/minecraft/network/codec/StreamCodec.mapping +++ b/data/net/minecraft/network/codec/StreamCodec.mapping @@ -55,6 +55,40 @@ CLASS net/minecraft/network/codec/StreamCodec ARG 10 codec6 ARG 11 getter6 ARG 12 factory + METHOD composite (Lnet/minecraft/network/codec/StreamCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/StreamCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/StreamCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/StreamCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/StreamCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/StreamCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/StreamCodec;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function7;)Lnet/minecraft/network/codec/StreamCodec; + ARG 0 codec1 + ARG 1 getter1 + ARG 2 codec2 + ARG 3 getter2 + ARG 4 codec3 + ARG 5 getter3 + ARG 6 codec4 + ARG 7 getter4 + ARG 8 codec5 + ARG 9 getter5 + ARG 10 codec6 + ARG 11 getter6 + ARG 12 codec7 + ARG 13 getter7 + ARG 14 factory + METHOD composite (Lnet/minecraft/network/codec/StreamCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/StreamCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/StreamCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/StreamCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/StreamCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/StreamCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/StreamCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/StreamCodec;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function8;)Lnet/minecraft/network/codec/StreamCodec; + ARG 0 codec1 + ARG 1 getter1 + ARG 2 codec2 + ARG 3 getter2 + ARG 4 codec3 + ARG 5 getter3 + ARG 6 codec4 + ARG 7 getter4 + ARG 8 codec5 + ARG 9 getter5 + ARG 10 codec6 + ARG 11 getter6 + ARG 12 codec7 + ARG 13 getter7 + ARG 14 codec8 + ARG 15 getter8 + ARG 16 factory METHOD dispatch (Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/network/codec/StreamCodec; ARG 1 keyGetter ARG 2 codecGetter diff --git a/data/net/minecraft/network/protocol/game/ClientGamePacketListener.mapping b/data/net/minecraft/network/protocol/game/ClientGamePacketListener.mapping index 2de544d2e..39e3e22ea 100644 --- a/data/net/minecraft/network/protocol/game/ClientGamePacketListener.mapping +++ b/data/net/minecraft/network/protocol/game/ClientGamePacketListener.mapping @@ -9,8 +9,6 @@ CLASS net/minecraft/network/protocol/game/ClientGamePacketListener METHOD handleAddObjective (Lnet/minecraft/network/protocol/game/ClientboundSetObjectivePacket;)V COMMENT May create a scoreboard objective, remove an objective from the scoreboard or update an objectives' displayname ARG 1 packet - METHOD handleAddOrRemoveRecipes (Lnet/minecraft/network/protocol/game/ClientboundRecipePacket;)V - ARG 1 packet METHOD handleAnimate (Lnet/minecraft/network/protocol/game/ClientboundAnimatePacket;)V COMMENT Renders a specified animation: Waking up a player, a living entity swinging its currently held item, being hurt or receiving a critical hit by normal or magical means ARG 1 packet @@ -80,6 +78,8 @@ CLASS net/minecraft/network/protocol/game/ClientGamePacketListener ARG 1 packet METHOD handleEntityLinkPacket (Lnet/minecraft/network/protocol/game/ClientboundSetEntityLinkPacket;)V ARG 1 packet + METHOD handleEntityPositionSync (Lnet/minecraft/network/protocol/game/ClientboundEntityPositionSyncPacket;)V + ARG 1 packet METHOD handleExplosion (Lnet/minecraft/network/protocol/game/ClientboundExplodePacket;)V COMMENT Initiates a new explosion (sound, particles, drop spawn) for the affected blocks indicated by the packet. ARG 1 packet @@ -111,6 +111,8 @@ CLASS net/minecraft/network/protocol/game/ClientGamePacketListener ARG 1 packet METHOD handleMerchantOffers (Lnet/minecraft/network/protocol/game/ClientboundMerchantOffersPacket;)V ARG 1 packet + METHOD handleMinecartAlongTrack (Lnet/minecraft/network/protocol/game/ClientboundMoveMinecartPacket;)V + ARG 1 packet METHOD handleMoveEntity (Lnet/minecraft/network/protocol/game/ClientboundMoveEntityPacket;)V COMMENT Updates the specified entity's position by the specified relative moment and absolute rotation. Note that subclassing of the packet allows for the specification of a subset of this data (e.g. only rel. position, abs. rotation or both). ARG 1 packet @@ -146,6 +148,12 @@ CLASS net/minecraft/network/protocol/game/ClientGamePacketListener ARG 1 packet METHOD handleProjectilePowerPacket (Lnet/minecraft/network/protocol/game/ClientboundProjectilePowerPacket;)V ARG 1 packet + METHOD handleRecipeBookAdd (Lnet/minecraft/network/protocol/game/ClientboundRecipeBookAddPacket;)V + ARG 1 packet + METHOD handleRecipeBookRemove (Lnet/minecraft/network/protocol/game/ClientboundRecipeBookRemovePacket;)V + ARG 1 packet + METHOD handleRecipeBookSettings (Lnet/minecraft/network/protocol/game/ClientboundRecipeBookSettingsPacket;)V + ARG 1 packet METHOD handleRemoveEntities (Lnet/minecraft/network/protocol/game/ClientboundRemoveEntitiesPacket;)V ARG 1 packet METHOD handleRemoveMobEffect (Lnet/minecraft/network/protocol/game/ClientboundRemoveMobEffectPacket;)V @@ -157,6 +165,8 @@ CLASS net/minecraft/network/protocol/game/ClientGamePacketListener METHOD handleRotateMob (Lnet/minecraft/network/protocol/game/ClientboundRotateHeadPacket;)V COMMENT Updates the direction in which the specified entity is looking, normally this head rotation is independent of the rotation of the entity itself ARG 1 packet + METHOD handleRotatePlayer (Lnet/minecraft/network/protocol/game/ClientboundPlayerRotationPacket;)V + ARG 1 packet METHOD handleSelectAdvancementsTab (Lnet/minecraft/network/protocol/game/ClientboundSelectAdvancementsTabPacket;)V ARG 1 packet METHOD handleServerData (Lnet/minecraft/network/protocol/game/ClientboundServerDataPacket;)V @@ -173,13 +183,12 @@ CLASS net/minecraft/network/protocol/game/ClientGamePacketListener ARG 1 packet METHOD handleSetCamera (Lnet/minecraft/network/protocol/game/ClientboundSetCameraPacket;)V ARG 1 packet - METHOD handleSetCarriedItem (Lnet/minecraft/network/protocol/game/ClientboundSetCarriedItemPacket;)V - COMMENT Updates which hotbar slot of the player is currently selected - ARG 1 packet METHOD handleSetChunkCacheCenter (Lnet/minecraft/network/protocol/game/ClientboundSetChunkCacheCenterPacket;)V ARG 1 packet METHOD handleSetChunkCacheRadius (Lnet/minecraft/network/protocol/game/ClientboundSetChunkCacheRadiusPacket;)V ARG 1 packet + METHOD handleSetCursorItem (Lnet/minecraft/network/protocol/game/ClientboundSetCursorItemPacket;)V + ARG 1 packet METHOD handleSetDisplayObjective (Lnet/minecraft/network/protocol/game/ClientboundSetDisplayObjectivePacket;)V COMMENT Removes or sets the ScoreObjective to be displayed at a particular scoreboard position (list, sidebar, below name) ARG 1 packet @@ -197,6 +206,10 @@ CLASS net/minecraft/network/protocol/game/ClientGamePacketListener ARG 1 packet METHOD handleSetHealth (Lnet/minecraft/network/protocol/game/ClientboundSetHealthPacket;)V ARG 1 packet + METHOD handleSetHeldSlot (Lnet/minecraft/network/protocol/game/ClientboundSetHeldSlotPacket;)V + ARG 1 packet + METHOD handleSetPlayerInventory (Lnet/minecraft/network/protocol/game/ClientboundSetPlayerInventoryPacket;)V + ARG 1 packet METHOD handleSetPlayerTeamPacket (Lnet/minecraft/network/protocol/game/ClientboundSetPlayerTeamPacket;)V COMMENT Updates a team managed by the scoreboard: Create/Remove the team registration, Register/Remove the player-team-memberships, Set team displayname/prefix/suffix and/or whether friendly fire is enabled ARG 1 packet diff --git a/data/net/minecraft/network/protocol/game/ClientboundCooldownPacket.mapping b/data/net/minecraft/network/protocol/game/ClientboundCooldownPacket.mapping index 5ba63c924..65f54f98b 100644 --- a/data/net/minecraft/network/protocol/game/ClientboundCooldownPacket.mapping +++ b/data/net/minecraft/network/protocol/game/ClientboundCooldownPacket.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/network/protocol/game/ClientboundCooldownPacket - METHOD (Lnet/minecraft/world/item/Item;I)V - ARG 1 item - ARG 2 duration METHOD handle (Lnet/minecraft/network/protocol/game/ClientGamePacketListener;)V COMMENT Passes this Packet on to the NetHandler for processing. ARG 1 handler diff --git a/data/net/minecraft/network/protocol/game/ClientboundEntityPositionSyncPacket.mapping b/data/net/minecraft/network/protocol/game/ClientboundEntityPositionSyncPacket.mapping new file mode 100644 index 000000000..374c13afb --- /dev/null +++ b/data/net/minecraft/network/protocol/game/ClientboundEntityPositionSyncPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/network/protocol/game/ClientboundEntityPositionSyncPacket + METHOD of (Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/network/protocol/game/ClientboundEntityPositionSyncPacket; + ARG 0 entity diff --git a/data/net/minecraft/network/protocol/game/ClientboundExplodePacket.mapping b/data/net/minecraft/network/protocol/game/ClientboundExplodePacket.mapping index cc73986e1..ce600c67d 100644 --- a/data/net/minecraft/network/protocol/game/ClientboundExplodePacket.mapping +++ b/data/net/minecraft/network/protocol/game/ClientboundExplodePacket.mapping @@ -1,19 +1,4 @@ CLASS net/minecraft/network/protocol/game/ClientboundExplodePacket - METHOD (DDDFLjava/util/List;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/level/Explosion$BlockInteraction;Lnet/minecraft/core/particles/ParticleOptions;Lnet/minecraft/core/particles/ParticleOptions;Lnet/minecraft/core/Holder;)V - ARG 1 x - ARG 3 y - ARG 5 z - ARG 7 power - ARG 8 toBlow - ARG 9 knockback - ARG 10 blockInteraction - ARG 11 smallExplosionParticles - ARG 12 largeExplosionParticles - ARG 13 explosionSound - METHOD (Lnet/minecraft/network/RegistryFriendlyByteBuf;)V - ARG 1 buffer METHOD handle (Lnet/minecraft/network/protocol/game/ClientGamePacketListener;)V COMMENT Passes this Packet on to the NetHandler for processing. ARG 1 handler - METHOD write (Lnet/minecraft/network/RegistryFriendlyByteBuf;)V - ARG 1 buffer diff --git a/data/net/minecraft/network/protocol/game/ClientboundMoveMinecartPacket.mapping b/data/net/minecraft/network/protocol/game/ClientboundMoveMinecartPacket.mapping new file mode 100644 index 000000000..632d57057 --- /dev/null +++ b/data/net/minecraft/network/protocol/game/ClientboundMoveMinecartPacket.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/network/protocol/game/ClientboundMoveMinecartPacket + METHOD getEntity (Lnet/minecraft/world/level/Level;)Lnet/minecraft/world/entity/Entity; + ARG 1 level diff --git a/data/net/minecraft/network/protocol/game/ClientboundPlaceGhostRecipePacket.mapping b/data/net/minecraft/network/protocol/game/ClientboundPlaceGhostRecipePacket.mapping index 946f7a889..9a99e24ad 100644 --- a/data/net/minecraft/network/protocol/game/ClientboundPlaceGhostRecipePacket.mapping +++ b/data/net/minecraft/network/protocol/game/ClientboundPlaceGhostRecipePacket.mapping @@ -1,12 +1,4 @@ CLASS net/minecraft/network/protocol/game/ClientboundPlaceGhostRecipePacket - METHOD (ILnet/minecraft/world/item/crafting/RecipeHolder;)V - ARG 1 containerId - ARG 2 recipe - METHOD (Lnet/minecraft/network/FriendlyByteBuf;)V - ARG 1 buffer METHOD handle (Lnet/minecraft/network/protocol/game/ClientGamePacketListener;)V COMMENT Passes this Packet on to the NetHandler for processing. ARG 1 handler - METHOD write (Lnet/minecraft/network/FriendlyByteBuf;)V - COMMENT Writes the raw packet data to the data stream. - ARG 1 byteBuf diff --git a/data/net/minecraft/network/protocol/game/ClientboundPlayerPositionPacket.mapping b/data/net/minecraft/network/protocol/game/ClientboundPlayerPositionPacket.mapping index ce5f9d916..8b5d3f327 100644 --- a/data/net/minecraft/network/protocol/game/ClientboundPlayerPositionPacket.mapping +++ b/data/net/minecraft/network/protocol/game/ClientboundPlayerPositionPacket.mapping @@ -1,19 +1,8 @@ CLASS net/minecraft/network/protocol/game/ClientboundPlayerPositionPacket - METHOD (DDDFFLjava/util/Set;I)V - ARG 1 x - ARG 3 y - ARG 5 z - ARG 7 yRot - ARG 8 xRot - ARG 9 relativeArguments - ARG 10 id - METHOD (Lnet/minecraft/network/FriendlyByteBuf;)V - ARG 1 buffer - METHOD getRelativeArguments ()Ljava/util/Set; - COMMENT Returns a set of which fields are relative. Items in this set indicate that the value is a relative change applied to the player's position, rather than an exact value. METHOD handle (Lnet/minecraft/network/protocol/game/ClientGamePacketListener;)V COMMENT Passes this Packet on to the NetHandler for processing. ARG 1 handler - METHOD write (Lnet/minecraft/network/FriendlyByteBuf;)V - COMMENT Writes the raw packet data to the data stream. - ARG 1 buffer + METHOD of (ILnet/minecraft/world/entity/PositionMoveRotation;Ljava/util/Set;)Lnet/minecraft/network/protocol/game/ClientboundPlayerPositionPacket; + ARG 0 id + ARG 1 positionMoveRotation + ARG 2 relativeArguments diff --git a/data/net/minecraft/network/protocol/game/ClientboundRecipeBookAddPacket.mapping b/data/net/minecraft/network/protocol/game/ClientboundRecipeBookAddPacket.mapping new file mode 100644 index 000000000..7e351690b --- /dev/null +++ b/data/net/minecraft/network/protocol/game/ClientboundRecipeBookAddPacket.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/network/protocol/game/ClientboundRecipeBookAddPacket + CLASS Entry + METHOD (Lnet/minecraft/world/item/crafting/display/RecipeDisplayEntry;ZZ)V + ARG 1 contents + ARG 2 notification + ARG 3 highlight diff --git a/data/net/minecraft/network/protocol/game/ClientboundRecipePacket.mapping b/data/net/minecraft/network/protocol/game/ClientboundRecipePacket.mapping deleted file mode 100644 index 9414897b4..000000000 --- a/data/net/minecraft/network/protocol/game/ClientboundRecipePacket.mapping +++ /dev/null @@ -1,14 +0,0 @@ -CLASS net/minecraft/network/protocol/game/ClientboundRecipePacket - METHOD (Lnet/minecraft/network/FriendlyByteBuf;)V - ARG 1 buffer - METHOD (Lnet/minecraft/network/protocol/game/ClientboundRecipePacket$State;Ljava/util/Collection;Ljava/util/Collection;Lnet/minecraft/stats/RecipeBookSettings;)V - ARG 1 state - ARG 2 recipes - ARG 3 toHighlight - ARG 4 bookSettings - METHOD handle (Lnet/minecraft/network/protocol/game/ClientGamePacketListener;)V - COMMENT Passes this Packet on to the NetHandler for processing. - ARG 1 handler - METHOD write (Lnet/minecraft/network/FriendlyByteBuf;)V - COMMENT Writes the raw packet data to the data stream. - ARG 1 buffer diff --git a/data/net/minecraft/network/protocol/game/ClientboundSetCarriedItemPacket.mapping b/data/net/minecraft/network/protocol/game/ClientboundSetCarriedItemPacket.mapping deleted file mode 100644 index 676d651e1..000000000 --- a/data/net/minecraft/network/protocol/game/ClientboundSetCarriedItemPacket.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS net/minecraft/network/protocol/game/ClientboundSetCarriedItemPacket - METHOD (I)V - ARG 1 slot - METHOD (Lnet/minecraft/network/FriendlyByteBuf;)V - ARG 1 buffer - METHOD handle (Lnet/minecraft/network/protocol/game/ClientGamePacketListener;)V - COMMENT Passes this Packet on to the NetHandler for processing. - ARG 1 handler - METHOD write (Lnet/minecraft/network/FriendlyByteBuf;)V - COMMENT Writes the raw packet data to the data stream. - ARG 1 buffer diff --git a/data/net/minecraft/network/protocol/game/ClientboundSetHeldSlotPacket.mapping b/data/net/minecraft/network/protocol/game/ClientboundSetHeldSlotPacket.mapping new file mode 100644 index 000000000..93ae66017 --- /dev/null +++ b/data/net/minecraft/network/protocol/game/ClientboundSetHeldSlotPacket.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/network/protocol/game/ClientboundSetHeldSlotPacket + METHOD (I)V + ARG 1 slot + METHOD (Lnet/minecraft/network/FriendlyByteBuf;)V + ARG 1 buffer + METHOD write (Lnet/minecraft/network/FriendlyByteBuf;)V + ARG 1 buffer diff --git a/data/net/minecraft/network/protocol/game/ClientboundSetTimePacket.mapping b/data/net/minecraft/network/protocol/game/ClientboundSetTimePacket.mapping index 0b5d39cf7..61906048f 100644 --- a/data/net/minecraft/network/protocol/game/ClientboundSetTimePacket.mapping +++ b/data/net/minecraft/network/protocol/game/ClientboundSetTimePacket.mapping @@ -2,12 +2,7 @@ CLASS net/minecraft/network/protocol/game/ClientboundSetTimePacket METHOD (JJZ)V ARG 1 gameTime ARG 3 dayTime - ARG 5 daylightCycleEnabled - METHOD (Lnet/minecraft/network/FriendlyByteBuf;)V - ARG 1 buffer + ARG 5 tickDayTime METHOD handle (Lnet/minecraft/network/protocol/game/ClientGamePacketListener;)V COMMENT Passes this Packet on to the NetHandler for processing. ARG 1 handler - METHOD write (Lnet/minecraft/network/FriendlyByteBuf;)V - COMMENT Writes the raw packet data to the data stream. - ARG 1 buffer diff --git a/data/net/minecraft/network/protocol/game/ClientboundTeleportEntityPacket.mapping b/data/net/minecraft/network/protocol/game/ClientboundTeleportEntityPacket.mapping index 480922ff0..977bd8ad9 100644 --- a/data/net/minecraft/network/protocol/game/ClientboundTeleportEntityPacket.mapping +++ b/data/net/minecraft/network/protocol/game/ClientboundTeleportEntityPacket.mapping @@ -1,11 +1,9 @@ CLASS net/minecraft/network/protocol/game/ClientboundTeleportEntityPacket - METHOD (Lnet/minecraft/network/FriendlyByteBuf;)V - ARG 1 buffer - METHOD (Lnet/minecraft/world/entity/Entity;)V - ARG 1 entity METHOD handle (Lnet/minecraft/network/protocol/game/ClientGamePacketListener;)V COMMENT Passes this Packet on to the NetHandler for processing. ARG 1 handler - METHOD write (Lnet/minecraft/network/FriendlyByteBuf;)V - COMMENT Writes the raw packet data to the data stream. - ARG 1 buffer + METHOD teleport (ILnet/minecraft/world/entity/PositionMoveRotation;Ljava/util/Set;Z)Lnet/minecraft/network/protocol/game/ClientboundTeleportEntityPacket; + ARG 0 id + ARG 1 change + ARG 2 relatives + ARG 3 onGround diff --git a/data/net/minecraft/network/protocol/game/ClientboundUpdateRecipesPacket.mapping b/data/net/minecraft/network/protocol/game/ClientboundUpdateRecipesPacket.mapping index a3746c963..6b28c2df3 100644 --- a/data/net/minecraft/network/protocol/game/ClientboundUpdateRecipesPacket.mapping +++ b/data/net/minecraft/network/protocol/game/ClientboundUpdateRecipesPacket.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/network/protocol/game/ClientboundUpdateRecipesPacket - METHOD (Ljava/util/Collection;)V - ARG 1 recipes METHOD handle (Lnet/minecraft/network/protocol/game/ClientGamePacketListener;)V COMMENT Passes this Packet on to the NetHandler for processing. ARG 1 handler diff --git a/data/net/minecraft/network/protocol/game/DebugPackets.mapping b/data/net/minecraft/network/protocol/game/DebugPackets.mapping index c6cd8d1c5..265f2333d 100644 --- a/data/net/minecraft/network/protocol/game/DebugPackets.mapping +++ b/data/net/minecraft/network/protocol/game/DebugPackets.mapping @@ -67,3 +67,6 @@ CLASS net/minecraft/network/protocol/game/DebugPackets METHOD sendVillageSectionsPacket (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;)V ARG 0 level ARG 1 pos + METHOD sendWireUpdates (Lnet/minecraft/world/level/Level;Lnet/minecraft/network/protocol/common/custom/RedstoneWireOrientationsDebugPayload;)V + ARG 0 level + ARG 1 payload diff --git a/data/net/minecraft/network/protocol/game/ServerGamePacketListener.mapping b/data/net/minecraft/network/protocol/game/ServerGamePacketListener.mapping index b805cac65..e7d6f03f2 100644 --- a/data/net/minecraft/network/protocol/game/ServerGamePacketListener.mapping +++ b/data/net/minecraft/network/protocol/game/ServerGamePacketListener.mapping @@ -6,6 +6,8 @@ CLASS net/minecraft/network/protocol/game/ServerGamePacketListener ARG 1 packet METHOD handleBlockEntityTagQuery (Lnet/minecraft/network/protocol/game/ServerboundBlockEntityTagQueryPacket;)V ARG 1 packet + METHOD handleBundleItemSelectedPacket (Lnet/minecraft/network/protocol/game/ServerboundSelectBundleItemPacket;)V + ARG 1 packet METHOD handleChangeDifficulty (Lnet/minecraft/network/protocol/game/ServerboundChangeDifficultyPacket;)V ARG 1 packet METHOD handleChat (Lnet/minecraft/network/protocol/game/ServerboundChatPacket;)V @@ -22,6 +24,8 @@ CLASS net/minecraft/network/protocol/game/ServerGamePacketListener METHOD handleClientCommand (Lnet/minecraft/network/protocol/game/ServerboundClientCommandPacket;)V COMMENT Processes the client status updates: respawn attempt from player, opening statistics or achievements, or acquiring 'open inventory' achievement ARG 1 packet + METHOD handleClientTickEnd (Lnet/minecraft/network/protocol/game/ServerboundClientTickEndPacket;)V + ARG 1 packet METHOD handleConfigurationAcknowledged (Lnet/minecraft/network/protocol/game/ServerboundConfigurationAcknowledgedPacket;)V ARG 1 packet METHOD handleContainerButtonClick (Lnet/minecraft/network/protocol/game/ServerboundContainerButtonClickPacket;)V diff --git a/data/net/minecraft/network/protocol/game/ServerboundMovePlayerPacket.mapping b/data/net/minecraft/network/protocol/game/ServerboundMovePlayerPacket.mapping index 08dddab72..6579fea5f 100644 --- a/data/net/minecraft/network/protocol/game/ServerboundMovePlayerPacket.mapping +++ b/data/net/minecraft/network/protocol/game/ServerboundMovePlayerPacket.mapping @@ -1,13 +1,14 @@ CLASS net/minecraft/network/protocol/game/ServerboundMovePlayerPacket - METHOD (DDDFFZZZ)V + METHOD (DDDFFZZZZ)V ARG 1 x ARG 3 y ARG 5 z ARG 7 yRot ARG 8 xRot ARG 9 onGround - ARG 10 hasPos - ARG 11 hasRot + ARG 10 horizontalCollision + ARG 11 hasPos + ARG 12 hasRot METHOD getX (D)D ARG 1 defaultValue METHOD getXRot (F)F @@ -21,43 +22,54 @@ CLASS net/minecraft/network/protocol/game/ServerboundMovePlayerPacket METHOD handle (Lnet/minecraft/network/protocol/game/ServerGamePacketListener;)V COMMENT Passes this Packet on to the NetHandler for processing. ARG 1 handler + METHOD packFlags (ZZ)I + ARG 0 onGround + ARG 1 horizontalCollision + METHOD unpackHorizontalCollision (I)Z + ARG 0 flags + METHOD unpackOnGround (I)Z + ARG 0 flags CLASS Pos - METHOD (DDDZ)V + METHOD (DDDZZ)V ARG 1 x ARG 3 y ARG 5 z ARG 7 onGround + ARG 8 horizontalCollision METHOD read (Lnet/minecraft/network/FriendlyByteBuf;)Lnet/minecraft/network/protocol/game/ServerboundMovePlayerPacket$Pos; ARG 0 buffer METHOD write (Lnet/minecraft/network/FriendlyByteBuf;)V COMMENT Writes the raw packet data to the data stream. ARG 1 buffer CLASS Rot - METHOD (FFZ)V + METHOD (FFZZ)V ARG 1 yRot ARG 2 xRot ARG 3 onGround + ARG 4 horizontalCollision METHOD read (Lnet/minecraft/network/FriendlyByteBuf;)Lnet/minecraft/network/protocol/game/ServerboundMovePlayerPacket$Rot; ARG 0 buffer METHOD write (Lnet/minecraft/network/FriendlyByteBuf;)V COMMENT Writes the raw packet data to the data stream. ARG 1 buffer CLASS PosRot - METHOD (DDDFFZ)V + METHOD (DDDFFZZ)V ARG 1 x ARG 3 y ARG 5 z ARG 7 yRot ARG 8 xRot ARG 9 onGround + ARG 10 horizontalCollision METHOD read (Lnet/minecraft/network/FriendlyByteBuf;)Lnet/minecraft/network/protocol/game/ServerboundMovePlayerPacket$PosRot; ARG 0 buffer METHOD write (Lnet/minecraft/network/FriendlyByteBuf;)V COMMENT Writes the raw packet data to the data stream. ARG 1 buffer CLASS StatusOnly - METHOD (Z)V + METHOD (ZZ)V ARG 1 onGround + ARG 2 horizontalCollision METHOD read (Lnet/minecraft/network/FriendlyByteBuf;)Lnet/minecraft/network/protocol/game/ServerboundMovePlayerPacket$StatusOnly; ARG 0 buffer METHOD write (Lnet/minecraft/network/FriendlyByteBuf;)V diff --git a/data/net/minecraft/network/protocol/game/ServerboundPlaceRecipePacket.mapping b/data/net/minecraft/network/protocol/game/ServerboundPlaceRecipePacket.mapping index bf5a04c09..edda2cac4 100644 --- a/data/net/minecraft/network/protocol/game/ServerboundPlaceRecipePacket.mapping +++ b/data/net/minecraft/network/protocol/game/ServerboundPlaceRecipePacket.mapping @@ -1,13 +1,4 @@ CLASS net/minecraft/network/protocol/game/ServerboundPlaceRecipePacket - METHOD (ILnet/minecraft/world/item/crafting/RecipeHolder;Z)V - ARG 1 containerId - ARG 2 recipe - ARG 3 shiftDown - METHOD (Lnet/minecraft/network/FriendlyByteBuf;)V - ARG 1 buffer METHOD handle (Lnet/minecraft/network/protocol/game/ServerGamePacketListener;)V COMMENT Passes this Packet on to the NetHandler for processing. ARG 1 handler - METHOD write (Lnet/minecraft/network/FriendlyByteBuf;)V - COMMENT Writes the raw packet data to the data stream. - ARG 1 buffer diff --git a/data/net/minecraft/network/protocol/game/ServerboundPlayerInputPacket.mapping b/data/net/minecraft/network/protocol/game/ServerboundPlayerInputPacket.mapping index e283b1884..0dcc7dc64 100644 --- a/data/net/minecraft/network/protocol/game/ServerboundPlayerInputPacket.mapping +++ b/data/net/minecraft/network/protocol/game/ServerboundPlayerInputPacket.mapping @@ -1,16 +1,4 @@ CLASS net/minecraft/network/protocol/game/ServerboundPlayerInputPacket - FIELD xxa F - COMMENT Positive for left strafe, negative for right - METHOD (FFZZ)V - ARG 1 xxa - ARG 2 zza - ARG 3 isJumping - ARG 4 isShiftKeyDown - METHOD (Lnet/minecraft/network/FriendlyByteBuf;)V - ARG 1 buffer METHOD handle (Lnet/minecraft/network/protocol/game/ServerGamePacketListener;)V COMMENT Passes this Packet on to the NetHandler for processing. ARG 1 handler - METHOD write (Lnet/minecraft/network/FriendlyByteBuf;)V - COMMENT Writes the raw packet data to the data stream. - ARG 1 buffer diff --git a/data/net/minecraft/network/protocol/game/ServerboundRecipeBookSeenRecipePacket.mapping b/data/net/minecraft/network/protocol/game/ServerboundRecipeBookSeenRecipePacket.mapping index 22434eecd..6f7fa2136 100644 --- a/data/net/minecraft/network/protocol/game/ServerboundRecipeBookSeenRecipePacket.mapping +++ b/data/net/minecraft/network/protocol/game/ServerboundRecipeBookSeenRecipePacket.mapping @@ -1,11 +1,4 @@ CLASS net/minecraft/network/protocol/game/ServerboundRecipeBookSeenRecipePacket - METHOD (Lnet/minecraft/network/FriendlyByteBuf;)V - ARG 1 buffer - METHOD (Lnet/minecraft/world/item/crafting/RecipeHolder;)V - ARG 1 recipe METHOD handle (Lnet/minecraft/network/protocol/game/ServerGamePacketListener;)V COMMENT Passes this Packet on to the NetHandler for processing. ARG 1 handler - METHOD write (Lnet/minecraft/network/FriendlyByteBuf;)V - COMMENT Writes the raw packet data to the data stream. - ARG 1 buffer diff --git a/data/net/minecraft/network/protocol/game/ServerboundSelectBundleItemPacket.mapping b/data/net/minecraft/network/protocol/game/ServerboundSelectBundleItemPacket.mapping new file mode 100644 index 000000000..b00481b38 --- /dev/null +++ b/data/net/minecraft/network/protocol/game/ServerboundSelectBundleItemPacket.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/network/protocol/game/ServerboundSelectBundleItemPacket + METHOD (Lnet/minecraft/network/FriendlyByteBuf;)V + ARG 1 buffer + METHOD write (Lnet/minecraft/network/FriendlyByteBuf;)V + ARG 1 buffer diff --git a/data/net/minecraft/network/protocol/login/ClientLoginPacketListener.mapping b/data/net/minecraft/network/protocol/login/ClientLoginPacketListener.mapping index 107beffdb..82ee390ba 100644 --- a/data/net/minecraft/network/protocol/login/ClientLoginPacketListener.mapping +++ b/data/net/minecraft/network/protocol/login/ClientLoginPacketListener.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/network/protocol/login/ClientLoginPacketListener ARG 1 packet METHOD handleDisconnect (Lnet/minecraft/network/protocol/login/ClientboundLoginDisconnectPacket;)V ARG 1 packet - METHOD handleGameProfile (Lnet/minecraft/network/protocol/login/ClientboundGameProfilePacket;)V - ARG 1 packet METHOD handleHello (Lnet/minecraft/network/protocol/login/ClientboundHelloPacket;)V ARG 1 packet + METHOD handleLoginFinished (Lnet/minecraft/network/protocol/login/ClientboundLoginFinishedPacket;)V + ARG 1 packet diff --git a/data/net/minecraft/network/protocol/login/ClientboundGameProfilePacket.mapping b/data/net/minecraft/network/protocol/login/ClientboundGameProfilePacket.mapping deleted file mode 100644 index c5980ef75..000000000 --- a/data/net/minecraft/network/protocol/login/ClientboundGameProfilePacket.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/network/protocol/login/ClientboundGameProfilePacket - METHOD handle (Lnet/minecraft/network/protocol/login/ClientLoginPacketListener;)V - COMMENT Passes this Packet on to the NetHandler for processing. - ARG 1 handler diff --git a/data/net/minecraft/network/syncher/EntityDataSerializer.mapping b/data/net/minecraft/network/syncher/EntityDataSerializer.mapping index d984b7c71..69266de2b 100644 --- a/data/net/minecraft/network/syncher/EntityDataSerializer.mapping +++ b/data/net/minecraft/network/syncher/EntityDataSerializer.mapping @@ -5,3 +5,5 @@ CLASS net/minecraft/network/syncher/EntityDataSerializer ARG 1 value METHOD createAccessor (I)Lnet/minecraft/network/syncher/EntityDataAccessor; ARG 1 id + METHOD forValueType (Lnet/minecraft/network/codec/StreamCodec;)Lnet/minecraft/network/syncher/EntityDataSerializer; + ARG 0 codec diff --git a/data/net/minecraft/realms/RealmsObjectSelectionList.mapping b/data/net/minecraft/realms/RealmsObjectSelectionList.mapping deleted file mode 100644 index 4986c102b..000000000 --- a/data/net/minecraft/realms/RealmsObjectSelectionList.mapping +++ /dev/null @@ -1,14 +0,0 @@ -CLASS net/minecraft/realms/RealmsObjectSelectionList - METHOD (IIII)V - ARG 1 width - ARG 2 height - ARG 3 y - ARG 4 itemHeight - METHOD addEntry (Lnet/minecraft/client/gui/components/ObjectSelectionList$Entry;)I - ARG 1 entry - METHOD replaceEntries (Ljava/util/Collection;)V - ARG 1 entries - METHOD selectItem (I)V - ARG 1 index - METHOD setSelectedItem (I)V - ARG 1 index diff --git a/data/net/minecraft/recipebook/PlaceRecipe.mapping b/data/net/minecraft/recipebook/PlaceRecipe.mapping deleted file mode 100644 index 686912519..000000000 --- a/data/net/minecraft/recipebook/PlaceRecipe.mapping +++ /dev/null @@ -1,14 +0,0 @@ -CLASS net/minecraft/recipebook/PlaceRecipe - METHOD addItemToSlot (Ljava/lang/Object;IIII)V - ARG 1 item - ARG 2 slot - ARG 3 maxAmount - ARG 4 x - ARG 5 y - METHOD placeRecipe (IIILnet/minecraft/world/item/crafting/RecipeHolder;Ljava/util/Iterator;I)V - ARG 1 width - ARG 2 height - ARG 3 outputSlot - ARG 4 recipe - ARG 5 ingredients - ARG 6 maxAmount diff --git a/data/net/minecraft/recipebook/PlaceRecipeHelper.mapping b/data/net/minecraft/recipebook/PlaceRecipeHelper.mapping new file mode 100644 index 000000000..fecc73711 --- /dev/null +++ b/data/net/minecraft/recipebook/PlaceRecipeHelper.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/recipebook/PlaceRecipeHelper + METHOD placeRecipe (IIIILjava/lang/Iterable;Lnet/minecraft/recipebook/PlaceRecipeHelper$Output;)V + ARG 0 gridWidth + ARG 1 gridHeight + ARG 2 width + ARG 3 height + ARG 4 ingredients + ARG 5 output + METHOD placeRecipe (IILnet/minecraft/world/item/crafting/Recipe;Ljava/lang/Iterable;Lnet/minecraft/recipebook/PlaceRecipeHelper$Output;)V + ARG 0 width + ARG 1 height + ARG 2 recipe + ARG 3 ingredients + ARG 4 output + CLASS Output + METHOD addItemToSlot (Ljava/lang/Object;III)V + ARG 1 item + ARG 2 slot + ARG 3 x + ARG 4 y diff --git a/data/net/minecraft/recipebook/ServerPlaceRecipe.mapping b/data/net/minecraft/recipebook/ServerPlaceRecipe.mapping index 623d52ced..4c881d441 100644 --- a/data/net/minecraft/recipebook/ServerPlaceRecipe.mapping +++ b/data/net/minecraft/recipebook/ServerPlaceRecipe.mapping @@ -1,20 +1,39 @@ CLASS net/minecraft/recipebook/ServerPlaceRecipe - METHOD (Lnet/minecraft/world/inventory/RecipeBookMenu;)V + METHOD (Lnet/minecraft/recipebook/ServerPlaceRecipe$CraftingMenuAccess;Lnet/minecraft/world/entity/player/Inventory;ZIILjava/util/List;Ljava/util/List;)V ARG 1 menu - METHOD getStackSize (ZIZ)I - ARG 1 placeAll - ARG 2 maxPossible - ARG 3 recipeMatches - METHOD handleRecipeClicked (Lnet/minecraft/world/item/crafting/RecipeHolder;Z)V - ARG 1 recipe - ARG 2 placeAll - METHOD moveItemToGrid (Lnet/minecraft/world/inventory/Slot;Lnet/minecraft/world/item/ItemStack;I)I + ARG 2 inventory + ARG 3 useMaxItems + ARG 4 gridWidth + ARG 5 gridHeight + ARG 6 inputGridSlots + ARG 7 slotsToClear + METHOD calculateAmountToCraft (IZ)I + ARG 1 max + ARG 2 recipeMatches + METHOD moveItemToGrid (Lnet/minecraft/world/inventory/Slot;Lnet/minecraft/core/Holder;I)I ARG 1 slot - ARG 2 stack - ARG 3 maxAmount - METHOD recipeClicked (Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/world/item/crafting/RecipeHolder;Z)V - ARG 1 player - ARG 2 recipe - ARG 3 placeAll + ARG 2 item + ARG 3 count + METHOD placeRecipe (Lnet/minecraft/recipebook/ServerPlaceRecipe$CraftingMenuAccess;IILjava/util/List;Ljava/util/List;Lnet/minecraft/world/entity/player/Inventory;Lnet/minecraft/world/item/crafting/RecipeHolder;ZZ)Lnet/minecraft/world/inventory/RecipeBookMenu$PostPlaceAction; + ARG 0 menu + ARG 1 gridWidth + ARG 2 gridHeight + ARG 3 inputGridSlots + ARG 4 slotsToClear + ARG 5 inventory + ARG 6 recipe + ARG 7 useMaxItems + ARG 8 isCreative + METHOD placeRecipe (Lnet/minecraft/world/item/crafting/RecipeHolder;Lnet/minecraft/world/entity/player/StackedItemContents;)V + ARG 1 recipe + ARG 2 stackedItemContents METHOD testClearGrid ()Z COMMENT Places the output of the recipe into the player's inventory. + METHOD tryPlaceRecipe (Lnet/minecraft/world/item/crafting/RecipeHolder;Lnet/minecraft/world/entity/player/StackedItemContents;)Lnet/minecraft/world/inventory/RecipeBookMenu$PostPlaceAction; + ARG 1 recipe + ARG 2 stackedItemContents + CLASS CraftingMenuAccess + METHOD fillCraftSlotsStackedContents (Lnet/minecraft/world/entity/player/StackedItemContents;)V + ARG 1 stackedItemContents + METHOD recipeMatches (Lnet/minecraft/world/item/crafting/RecipeHolder;)Z + ARG 1 recipe diff --git a/data/net/minecraft/resources/DependantName.mapping b/data/net/minecraft/resources/DependantName.mapping new file mode 100644 index 000000000..c9794abc9 --- /dev/null +++ b/data/net/minecraft/resources/DependantName.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/resources/DependantName + METHOD fixed (Ljava/lang/Object;)Lnet/minecraft/resources/DependantName; + ARG 0 value + METHOD get (Lnet/minecraft/resources/ResourceKey;)Ljava/lang/Object; + ARG 1 key diff --git a/data/net/minecraft/resources/RegistryDataLoader.mapping b/data/net/minecraft/resources/RegistryDataLoader.mapping index e783b1ed6..b13c6267a 100644 --- a/data/net/minecraft/resources/RegistryDataLoader.mapping +++ b/data/net/minecraft/resources/RegistryDataLoader.mapping @@ -1,11 +1,13 @@ CLASS net/minecraft/resources/RegistryDataLoader - METHOD createContext (Lnet/minecraft/core/RegistryAccess;Ljava/util/List;)Lnet/minecraft/resources/RegistryOps$RegistryInfoLookup; - ARG 0 registryAccess - ARG 1 registryLoaders - METHOD createInfoForContextRegistry (Lnet/minecraft/core/Registry;)Lnet/minecraft/resources/RegistryOps$RegistryInfo; - ARG 0 registry + METHOD createContext (Ljava/util/List;Ljava/util/List;)Lnet/minecraft/resources/RegistryOps$RegistryInfoLookup; + ARG 0 registryLookups + ARG 1 loaders + METHOD createInfoForContextRegistry (Lnet/minecraft/core/HolderLookup$RegistryLookup;)Lnet/minecraft/resources/RegistryOps$RegistryInfo; + ARG 0 registryLookup METHOD createInfoForNewRegistry (Lnet/minecraft/core/WritableRegistry;)Lnet/minecraft/resources/RegistryOps$RegistryInfo; ARG 0 registry + METHOD createReportWithBriefInfo (Ljava/util/Map;)Lnet/minecraft/ReportedException; + ARG 0 errors METHOD lambda$createContext$8 (Ljava/util/Map;Lnet/minecraft/resources/RegistryDataLoader$Loader;)V ARG 1 loader METHOD lambda$load$2 (Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/resources/RegistryDataLoader$Loader;Lnet/minecraft/resources/RegistryOps$RegistryInfoLookup;)V @@ -18,18 +20,18 @@ CLASS net/minecraft/resources/RegistryDataLoader ARG 2 loader METHOD lambda$load$6 (Ljava/util/Map;Lnet/minecraft/resources/RegistryDataLoader$Loader;)V ARG 1 loader - METHOD load (Ljava/util/Map;Lnet/minecraft/server/packs/resources/ResourceProvider;Lnet/minecraft/core/RegistryAccess;Ljava/util/List;)Lnet/minecraft/core/RegistryAccess$Frozen; + METHOD load (Ljava/util/Map;Lnet/minecraft/server/packs/resources/ResourceProvider;Ljava/util/List;Ljava/util/List;)Lnet/minecraft/core/RegistryAccess$Frozen; ARG 0 elements ARG 1 resourceProvider - ARG 2 registryAccess + ARG 2 registryLookups ARG 3 registryData - METHOD load (Lnet/minecraft/resources/RegistryDataLoader$LoadingFunction;Lnet/minecraft/core/RegistryAccess;Ljava/util/List;)Lnet/minecraft/core/RegistryAccess$Frozen; + METHOD load (Lnet/minecraft/resources/RegistryDataLoader$LoadingFunction;Ljava/util/List;Ljava/util/List;)Lnet/minecraft/core/RegistryAccess$Frozen; ARG 0 loadingFunction - ARG 1 registryAccess + ARG 1 registryLookups ARG 2 registryData - METHOD load (Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/core/RegistryAccess;Ljava/util/List;)Lnet/minecraft/core/RegistryAccess$Frozen; + METHOD load (Lnet/minecraft/server/packs/resources/ResourceManager;Ljava/util/List;Ljava/util/List;)Lnet/minecraft/core/RegistryAccess$Frozen; ARG 0 resourceManager - ARG 1 registryAccess + ARG 1 registryLookups ARG 2 registryData METHOD loadContentsFromManager (Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/resources/RegistryOps$RegistryInfoLookup;Lnet/minecraft/core/WritableRegistry;Lcom/mojang/serialization/Decoder;Ljava/util/Map;)V ARG 0 resourceManager @@ -51,7 +53,9 @@ CLASS net/minecraft/resources/RegistryDataLoader ARG 3 resourceKey ARG 4 resource ARG 5 registrationInfo - METHOD logErrors (Ljava/util/Map;)V + METHOD logErrors (Ljava/util/Map;)Lnet/minecraft/ReportedException; + ARG 0 errors + METHOD printFullDetailsToLog (Ljava/util/Map;)V ARG 0 errors CLASS Loader METHOD loadFromNetwork (Ljava/util/Map;Lnet/minecraft/server/packs/resources/ResourceProvider;Lnet/minecraft/resources/RegistryOps$RegistryInfoLookup;)V diff --git a/data/net/minecraft/server/MinecraftServer.mapping b/data/net/minecraft/server/MinecraftServer.mapping index 736c01011..10c75b4c8 100644 --- a/data/net/minecraft/server/MinecraftServer.mapping +++ b/data/net/minecraft/server/MinecraftServer.mapping @@ -152,6 +152,9 @@ CLASS net/minecraft/server/MinecraftServer METHOD reloadResources (Ljava/util/Collection;)Ljava/util/concurrent/CompletableFuture; COMMENT Replaces currently selected list of datapacks, reloads them, and sends new data to players. ARG 1 selectedIds + METHOD reportPacketHandlingException (Ljava/lang/Throwable;Lnet/minecraft/network/protocol/PacketType;)V + ARG 1 throwable + ARG 2 packetType METHOD saveAllChunks (ZZZ)Z ARG 1 suppressLog ARG 2 flush diff --git a/data/net/minecraft/server/ReloadableServerRegistries.mapping b/data/net/minecraft/server/ReloadableServerRegistries.mapping index 852a73dec..f4f725e2e 100644 --- a/data/net/minecraft/server/ReloadableServerRegistries.mapping +++ b/data/net/minecraft/server/ReloadableServerRegistries.mapping @@ -1,30 +1,34 @@ CLASS net/minecraft/server/ReloadableServerRegistries - METHOD apply (Lnet/minecraft/core/LayeredRegistryAccess;Ljava/util/List;)Lnet/minecraft/core/LayeredRegistryAccess; + METHOD concatenateLookups (Lnet/minecraft/core/HolderLookup$Provider;Lnet/minecraft/core/HolderLookup$Provider;)Lnet/minecraft/core/HolderLookup$Provider; + ARG 0 lookup1 + ARG 1 lookup2 + METHOD createAndValidateFullContext (Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/core/HolderLookup$Provider;Ljava/util/List;)Lnet/minecraft/server/ReloadableServerRegistries$LoadResult; ARG 0 registryAccess - ARG 1 registries + ARG 1 provider + ARG 2 registries METHOD createUpdatedRegistries (Lnet/minecraft/core/LayeredRegistryAccess;Ljava/util/List;)Lnet/minecraft/core/LayeredRegistryAccess; ARG 0 registryAccess ARG 1 registries - METHOD reload (Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/server/packs/resources/ResourceManager;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; - ARG 0 registries - ARG 1 resourceManager - ARG 2 backgroundExecutor - METHOD scheduleElementParse (Lnet/minecraft/world/level/storage/loot/LootDataType;Lnet/minecraft/resources/RegistryOps;Lnet/minecraft/server/packs/resources/ResourceManager;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + METHOD reload (Lnet/minecraft/core/LayeredRegistryAccess;Ljava/util/List;Lnet/minecraft/server/packs/resources/ResourceManager;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 0 registryAccess + ARG 1 postponedTags + ARG 2 resourceManager + ARG 3 backgroundExecutor + METHOD scheduleRegistryLoad (Lnet/minecraft/world/level/storage/loot/LootDataType;Lnet/minecraft/resources/RegistryOps;Lnet/minecraft/server/packs/resources/ResourceManager;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 0 lootDataType - ARG 1 registryOps + ARG 1 ops ARG 2 resourceManager ARG 3 backgroundExecutor - METHOD validateRegistry (Lnet/minecraft/world/level/storage/loot/ValidationContext;Lnet/minecraft/world/level/storage/loot/LootDataType;Lnet/minecraft/core/RegistryAccess;)V + METHOD validateLootRegistries (Lnet/minecraft/core/HolderLookup$Provider;)V + ARG 0 registries + METHOD validateRegistry (Lnet/minecraft/world/level/storage/loot/ValidationContext;Lnet/minecraft/world/level/storage/loot/LootDataType;Lnet/minecraft/core/HolderLookup$Provider;)V ARG 0 context ARG 1 lootDataType - ARG 2 registryAccess + ARG 2 registries CLASS Holder - METHOD (Lnet/minecraft/core/RegistryAccess$Frozen;)V + METHOD (Lnet/minecraft/core/HolderLookup$Provider;)V ARG 1 registries METHOD getKeys (Lnet/minecraft/resources/ResourceKey;)Ljava/util/Collection; ARG 1 registryKey METHOD getLootTable (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/level/storage/loot/LootTable; ARG 1 lootTableKey - CLASS EmptyTagLookupWrapper - METHOD (Lnet/minecraft/core/RegistryAccess;)V - ARG 1 registryAccess diff --git a/data/net/minecraft/server/ReloadableServerResources.mapping b/data/net/minecraft/server/ReloadableServerResources.mapping index 11c526e2c..1ba2bfb8c 100644 --- a/data/net/minecraft/server/ReloadableServerResources.mapping +++ b/data/net/minecraft/server/ReloadableServerResources.mapping @@ -1,27 +1,17 @@ CLASS net/minecraft/server/ReloadableServerResources - METHOD (Lnet/minecraft/core/RegistryAccess$Frozen;Lnet/minecraft/world/flag/FeatureFlagSet;Lnet/minecraft/commands/Commands$CommandSelection;I)V + METHOD (Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/core/HolderLookup$Provider;Lnet/minecraft/world/flag/FeatureFlagSet;Lnet/minecraft/commands/Commands$CommandSelection;Ljava/util/List;I)V ARG 1 registryAccess - ARG 2 enabledFeatures - ARG 3 commandSelection - ARG 4 functionCompilationLevel - METHOD lambda$loadResources$0 (Lnet/minecraft/server/ReloadableServerResources;Ljava/lang/Object;Ljava/lang/Throwable;)V - ARG 2 exception - METHOD loadResources (Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/world/flag/FeatureFlagSet;Lnet/minecraft/commands/Commands$CommandSelection;ILjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 2 registries + ARG 3 enabledFeatures + ARG 4 commandSelection + ARG 5 postponedTags + ARG 6 functionCompilationLevel + METHOD loadResources (Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/core/LayeredRegistryAccess;Ljava/util/List;Lnet/minecraft/world/flag/FeatureFlagSet;Lnet/minecraft/commands/Commands$CommandSelection;ILjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 0 resourceManager - ARG 1 registries - ARG 2 enabledFeatures - ARG 3 commandSelection - ARG 4 functionCompilationLevel - ARG 5 backgroundExecutor - ARG 6 gameExecutor - METHOD updateRegistryTags (Lnet/minecraft/core/RegistryAccess;Lnet/minecraft/tags/TagManager$LoadResult;)V - ARG 0 registryAccess - ARG 1 loadResult - CLASS ConfigurableRegistryLookup - METHOD (Lnet/minecraft/core/RegistryAccess;)V - ARG 1 registryAccess - METHOD createDispatchedLookup (Lnet/minecraft/core/HolderLookup$RegistryLookup;Lnet/minecraft/core/HolderLookup$RegistryLookup;)Lnet/minecraft/core/HolderLookup$RegistryLookup; - ARG 1 lookup - ARG 2 tagAddingLookup - METHOD missingTagAccessPolicy (Lnet/minecraft/server/ReloadableServerResources$MissingTagAccessPolicy;)V - ARG 1 missingTagAccessPolicy + ARG 1 registryAccess + ARG 2 postponedTags + ARG 3 enabledFeatures + ARG 4 commandSelection + ARG 5 functionCompilationLevel + ARG 6 backgroundExecutor + ARG 7 gameExecutor diff --git a/data/net/minecraft/server/ServerFunctionLibrary.mapping b/data/net/minecraft/server/ServerFunctionLibrary.mapping index fab353ca5..f7ad81408 100644 --- a/data/net/minecraft/server/ServerFunctionLibrary.mapping +++ b/data/net/minecraft/server/ServerFunctionLibrary.mapping @@ -4,27 +4,7 @@ CLASS net/minecraft/server/ServerFunctionLibrary ARG 2 dispatcher METHOD getFunction (Lnet/minecraft/resources/ResourceLocation;)Ljava/util/Optional; ARG 1 location - METHOD getTag (Lnet/minecraft/resources/ResourceLocation;)Ljava/util/Collection; + METHOD getTag (Lnet/minecraft/resources/ResourceLocation;)Ljava/util/List; ARG 1 location - METHOD lambda$reload$3 (Ljava/util/Map;Ljava/lang/Void;Ljava/lang/Throwable;)Ljava/util/Map; - ARG 1 result - ARG 2 exception - METHOD lambda$reload$4 (Ljava/util/concurrent/Executor;Ljava/util/Map;)Ljava/util/concurrent/CompletionStage; - ARG 2 resources - METHOD lambda$reload$5 (Lnet/minecraft/resources/ResourceLocation;Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/commands/functions/CommandFunction;Ljava/lang/Throwable;)Ljava/lang/Object; - ARG 2 function - ARG 3 exception - METHOD lambda$reload$6 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/resources/ResourceLocation;Ljava/util/concurrent/CompletableFuture;)V - ARG 1 path - ARG 2 future - METHOD lambda$reload$7 (Lcom/mojang/datafixers/util/Pair;)V - ARG 1 pair METHOD readLines (Lnet/minecraft/server/packs/resources/Resource;)Ljava/util/List; ARG 0 resource - METHOD reload (Lnet/minecraft/server/packs/resources/PreparableReloadListener$PreparationBarrier;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;Lnet/minecraft/util/profiling/ProfilerFiller;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; - ARG 1 stage - ARG 2 resourceManager - ARG 3 preparationsProfiler - ARG 4 reloadProfiler - ARG 5 backgroundExecutor - ARG 6 gameExecutor diff --git a/data/net/minecraft/server/ServerFunctionManager.mapping b/data/net/minecraft/server/ServerFunctionManager.mapping index 913c59b81..035f62cfa 100644 --- a/data/net/minecraft/server/ServerFunctionManager.mapping +++ b/data/net/minecraft/server/ServerFunctionManager.mapping @@ -9,9 +9,9 @@ CLASS net/minecraft/server/ServerFunctionManager ARG 1 functionObjects ARG 2 identifier METHOD get (Lnet/minecraft/resources/ResourceLocation;)Ljava/util/Optional; - ARG 1 functionIdentifier - METHOD getTag (Lnet/minecraft/resources/ResourceLocation;)Ljava/util/Collection; - ARG 1 functionTagIdentifier + ARG 1 function + METHOD getTag (Lnet/minecraft/resources/ResourceLocation;)Ljava/util/List; + ARG 1 tag METHOD lambda$execute$1 (Lnet/minecraft/commands/functions/InstantiatedFunction;Lnet/minecraft/commands/CommandSourceStack;Lnet/minecraft/commands/execution/ExecutionContext;)V ARG 2 contextConsumer METHOD postReload (Lnet/minecraft/server/ServerFunctionLibrary;)V diff --git a/data/net/minecraft/server/SuppressedExceptionCollector.mapping b/data/net/minecraft/server/SuppressedExceptionCollector.mapping new file mode 100644 index 000000000..54c6eb4e3 --- /dev/null +++ b/data/net/minecraft/server/SuppressedExceptionCollector.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/server/SuppressedExceptionCollector + METHOD addEntry (Ljava/lang/String;Ljava/lang/Throwable;)V + ARG 1 id + ARG 2 throwable diff --git a/data/net/minecraft/server/WorldLoader.mapping b/data/net/minecraft/server/WorldLoader.mapping index 93e149c3f..0a8830adb 100644 --- a/data/net/minecraft/server/WorldLoader.mapping +++ b/data/net/minecraft/server/WorldLoader.mapping @@ -8,16 +8,6 @@ CLASS net/minecraft/server/WorldLoader ARG 2 resultFactory ARG 3 backgroundExecutor ARG 4 gameExecutor - METHOD loadAndReplaceLayer (Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/server/RegistryLayer;Ljava/util/List;)Lnet/minecraft/core/LayeredRegistryAccess; - ARG 0 resourceManager - ARG 1 registryAccess - ARG 2 registryLayer - ARG 3 registryData - METHOD loadLayer (Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/core/LayeredRegistryAccess;Lnet/minecraft/server/RegistryLayer;Ljava/util/List;)Lnet/minecraft/core/RegistryAccess$Frozen; - ARG 0 resourceManager - ARG 1 registryAccess - ARG 2 registryLayer - ARG 3 registryData CLASS ResultFactory METHOD create (Lnet/minecraft/server/packs/resources/CloseableResourceManager;Lnet/minecraft/server/ReloadableServerResources;Lnet/minecraft/core/LayeredRegistryAccess;Ljava/lang/Object;)Ljava/lang/Object; ARG 1 manager diff --git a/data/net/minecraft/server/commands/AdvancementCommands.mapping b/data/net/minecraft/server/commands/AdvancementCommands.mapping index 943f49e28..25cdd3c68 100644 --- a/data/net/minecraft/server/commands/AdvancementCommands.mapping +++ b/data/net/minecraft/server/commands/AdvancementCommands.mapping @@ -8,11 +8,6 @@ CLASS net/minecraft/server/commands/AdvancementCommands ARG 2 mode METHOD lambda$register$10 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD lambda$register$11 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD lambda$register$12 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; - ARG 0 context - ARG 1 builder METHOD lambda$register$13 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD lambda$register$14 (Lcom/mojang/brigadier/context/CommandContext;)I @@ -21,12 +16,6 @@ CLASS net/minecraft/server/commands/AdvancementCommands ARG 0 context METHOD lambda$register$16 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD lambda$register$17 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD lambda$register$3 (Lnet/minecraft/commands/CommandSourceStack;)Z - ARG 0 stack - METHOD lambda$register$4 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context METHOD lambda$register$6 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD lambda$register$7 (Lcom/mojang/brigadier/context/CommandContext;)I @@ -40,9 +29,6 @@ CLASS net/minecraft/server/commands/AdvancementCommands METHOD lambda$static$1 (Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 criteriaName ARG 1 criterion - METHOD lambda$static$2 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; - ARG 0 context - ARG 1 suggestions METHOD perform (Lnet/minecraft/commands/CommandSourceStack;Ljava/util/Collection;Lnet/minecraft/server/commands/AdvancementCommands$Action;Ljava/util/Collection;)I COMMENT Performs the given action on each advancement in the list, for each player. COMMENT diff --git a/data/net/minecraft/server/commands/GameRuleCommand.mapping b/data/net/minecraft/server/commands/GameRuleCommand.mapping index 244138171..7a19999ac 100644 --- a/data/net/minecraft/server/commands/GameRuleCommand.mapping +++ b/data/net/minecraft/server/commands/GameRuleCommand.mapping @@ -4,8 +4,9 @@ CLASS net/minecraft/server/commands/GameRuleCommand METHOD queryRule (Lnet/minecraft/commands/CommandSourceStack;Lnet/minecraft/world/level/GameRules$Key;)I ARG 0 source ARG 1 gameRule - METHOD register (Lcom/mojang/brigadier/CommandDispatcher;)V + METHOD register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/commands/CommandBuildContext;)V ARG 0 dispatcher + ARG 1 commandBuildContext METHOD setRule (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/world/level/GameRules$Key;)I ARG 0 source ARG 1 gameRule diff --git a/data/net/minecraft/server/commands/LookAt.mapping b/data/net/minecraft/server/commands/LookAt.mapping new file mode 100644 index 000000000..a7e548260 --- /dev/null +++ b/data/net/minecraft/server/commands/LookAt.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/server/commands/LookAt + METHOD perform (Lnet/minecraft/commands/CommandSourceStack;Lnet/minecraft/world/entity/Entity;)V + ARG 1 source + ARG 2 entity diff --git a/data/net/minecraft/server/commands/LootCommand.mapping b/data/net/minecraft/server/commands/LootCommand.mapping index 9f225fb63..d2b9cab05 100644 --- a/data/net/minecraft/server/commands/LootCommand.mapping +++ b/data/net/minecraft/server/commands/LootCommand.mapping @@ -68,10 +68,6 @@ CLASS net/minecraft/server/commands/LootCommand METHOD getSourceHandItem (Lnet/minecraft/commands/CommandSourceStack;Lnet/minecraft/world/entity/EquipmentSlot;)Lnet/minecraft/world/item/ItemStack; ARG 0 source ARG 1 slot - METHOD lambda$addTargets$15 (Lcom/mojang/brigadier/context/CommandContext;Ljava/util/List;Lnet/minecraft/server/commands/LootCommand$Callback;)I - ARG 0 context - ARG 1 items - ARG 2 callback METHOD lambda$addTargets$16 (Lcom/mojang/brigadier/context/CommandContext;Ljava/util/List;Lnet/minecraft/server/commands/LootCommand$Callback;)I ARG 0 context ARG 1 items @@ -96,12 +92,6 @@ CLASS net/minecraft/server/commands/LootCommand ARG 0 context ARG 1 items ARG 2 callback - METHOD lambda$drop$29 (Lnet/minecraft/commands/CommandSourceStack;Ljava/util/List;)V - ARG 1 itemsDropped - METHOD lambda$dropBlockLoot$27 (Lnet/minecraft/commands/CommandSourceStack;Lnet/minecraft/world/level/block/state/BlockState;Ljava/util/List;)V - ARG 2 itemsDropped - METHOD lambda$dropInWorld$22 (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/item/ItemStack;)V - ARG 2 itemStack METHOD lambda$register$10 (Lnet/minecraft/server/commands/LootCommand$DropConsumer;Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context METHOD lambda$register$11 (Lnet/minecraft/server/commands/LootCommand$DropConsumer;Lcom/mojang/brigadier/context/CommandContext;)I @@ -110,13 +100,6 @@ CLASS net/minecraft/server/commands/LootCommand ARG 1 context METHOD lambda$register$13 (Lnet/minecraft/server/commands/LootCommand$DropConsumer;Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context - METHOD lambda$register$14 (Lnet/minecraft/commands/CommandBuildContext;Lcom/mojang/brigadier/builder/ArgumentBuilder;Lnet/minecraft/server/commands/LootCommand$DropConsumer;)Lcom/mojang/brigadier/builder/ArgumentBuilder; - ARG 1 argumentBuilder - ARG 2 dropConsumer - METHOD lambda$register$3 (Lnet/minecraft/commands/CommandSourceStack;)Z - ARG 0 source - METHOD lambda$register$4 (Lnet/minecraft/server/commands/LootCommand$DropConsumer;Lcom/mojang/brigadier/context/CommandContext;)I - ARG 1 context METHOD lambda$register$5 (Lnet/minecraft/server/commands/LootCommand$DropConsumer;Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context METHOD lambda$register$6 (Lnet/minecraft/server/commands/LootCommand$DropConsumer;Lcom/mojang/brigadier/context/CommandContext;)I diff --git a/data/net/minecraft/server/commands/RotateCommand.mapping b/data/net/minecraft/server/commands/RotateCommand.mapping new file mode 100644 index 000000000..b1df8febf --- /dev/null +++ b/data/net/minecraft/server/commands/RotateCommand.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/server/commands/RotateCommand + METHOD lambda$register$1 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD lambda$register$2 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD lambda$register$3 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD register (Lcom/mojang/brigadier/CommandDispatcher;)V + ARG 0 dispatcher + METHOD rotate (Lnet/minecraft/commands/CommandSourceStack;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/commands/arguments/coordinates/Coordinates;)I + ARG 0 source + ARG 1 entity + ARG 2 coordinates + METHOD rotate (Lnet/minecraft/commands/CommandSourceStack;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/server/commands/LookAt;)I + ARG 0 source + ARG 1 entity + ARG 2 lookAt diff --git a/data/net/minecraft/server/commands/ScheduleCommand.mapping b/data/net/minecraft/server/commands/ScheduleCommand.mapping index 22fcb06d3..6fa650ee6 100644 --- a/data/net/minecraft/server/commands/ScheduleCommand.mapping +++ b/data/net/minecraft/server/commands/ScheduleCommand.mapping @@ -9,8 +9,6 @@ CLASS net/minecraft/server/commands/ScheduleCommand ARG 0 context METHOD lambda$register$6 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD lambda$schedule$10 (Lnet/minecraft/resources/ResourceLocation;ZLnet/minecraft/world/level/timers/TimerQueue;JLnet/minecraft/commands/CommandSourceStack;ILjava/util/Collection;)V - ARG 7 functions METHOD lambda$static$0 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 functionName METHOD lambda$static$1 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; diff --git a/data/net/minecraft/server/commands/SpawnArmorTrimsCommand.mapping b/data/net/minecraft/server/commands/SpawnArmorTrimsCommand.mapping index a886a2a49..de506007b 100644 --- a/data/net/minecraft/server/commands/SpawnArmorTrimsCommand.mapping +++ b/data/net/minecraft/server/commands/SpawnArmorTrimsCommand.mapping @@ -1,18 +1,4 @@ CLASS net/minecraft/server/commands/SpawnArmorTrimsCommand - METHOD lambda$register$1 (Lnet/minecraft/commands/CommandSourceStack;)Z - ARG 0 source - METHOD lambda$register$2 (Lcom/mojang/brigadier/context/CommandContext;)I - ARG 0 context - METHOD lambda$spawnArmorTrims$3 (Lnet/minecraft/core/Registry;Lnet/minecraft/world/item/armortrim/TrimPattern;)Ljava/lang/Integer; - ARG 1 trimPattern - METHOD lambda$spawnArmorTrims$4 (Lnet/minecraft/core/Registry;Lnet/minecraft/world/item/armortrim/TrimMaterial;)Ljava/lang/Integer; - ARG 1 trimMaterial - METHOD lambda$spawnArmorTrims$5 (Lnet/minecraft/core/NonNullList;Lnet/minecraft/core/Registry;Lnet/minecraft/core/Registry;Lnet/minecraft/world/item/armortrim/TrimPattern;Lnet/minecraft/world/item/armortrim/TrimMaterial;)V - ARG 4 trimMaterial - METHOD lambda$spawnArmorTrims$6 (Lnet/minecraft/core/Registry;Lnet/minecraft/core/NonNullList;Lnet/minecraft/core/Registry;Lnet/minecraft/world/item/armortrim/TrimPattern;)V - ARG 3 trimPattern - METHOD lambda$static$0 (Ljava/util/HashMap;)V - ARG 0 map METHOD register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher METHOD spawnArmorTrims (Lnet/minecraft/commands/CommandSourceStack;Lnet/minecraft/world/entity/player/Player;)I diff --git a/data/net/minecraft/server/commands/TeleportCommand.mapping b/data/net/minecraft/server/commands/TeleportCommand.mapping index a6d26fcce..903f3255f 100644 --- a/data/net/minecraft/server/commands/TeleportCommand.mapping +++ b/data/net/minecraft/server/commands/TeleportCommand.mapping @@ -1,6 +1,10 @@ CLASS net/minecraft/server/commands/TeleportCommand METHOD formatDouble (D)Ljava/lang/String; ARG 0 value + METHOD getRelatives (Lnet/minecraft/commands/arguments/coordinates/Coordinates;Lnet/minecraft/commands/arguments/coordinates/Coordinates;Z)Ljava/util/Set; + ARG 0 position + ARG 1 rotation + ARG 2 absolute METHOD lambda$register$0 (Lnet/minecraft/commands/CommandSourceStack;)Z ARG 0 source METHOD lambda$register$1 (Lcom/mojang/brigadier/context/CommandContext;)I @@ -21,31 +25,27 @@ CLASS net/minecraft/server/commands/TeleportCommand ARG 0 context METHOD lambda$register$9 (Lnet/minecraft/commands/CommandSourceStack;)Z ARG 0 source - METHOD performTeleport (Lnet/minecraft/commands/CommandSourceStack;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/server/level/ServerLevel;DDDLjava/util/Set;FFLnet/minecraft/server/commands/TeleportCommand$LookAt;)V + METHOD performTeleport (Lnet/minecraft/commands/CommandSourceStack;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/server/level/ServerLevel;DDDLjava/util/Set;FFLnet/minecraft/server/commands/LookAt;)V ARG 0 source - ARG 1 entity + ARG 1 target ARG 2 level ARG 3 x ARG 5 y ARG 7 z - ARG 9 relativeList - ARG 10 yaw - ARG 11 pitch - ARG 12 facing + ARG 9 relatives + ARG 10 yRot + ARG 11 xRot + ARG 12 lookAt METHOD register (Lcom/mojang/brigadier/CommandDispatcher;)V ARG 0 dispatcher METHOD teleportToEntity (Lnet/minecraft/commands/CommandSourceStack;Ljava/util/Collection;Lnet/minecraft/world/entity/Entity;)I ARG 0 source ARG 1 targets ARG 2 destination - METHOD teleportToPos (Lnet/minecraft/commands/CommandSourceStack;Ljava/util/Collection;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/commands/arguments/coordinates/Coordinates;Lnet/minecraft/commands/arguments/coordinates/Coordinates;Lnet/minecraft/server/commands/TeleportCommand$LookAt;)I + METHOD teleportToPos (Lnet/minecraft/commands/CommandSourceStack;Ljava/util/Collection;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/commands/arguments/coordinates/Coordinates;Lnet/minecraft/commands/arguments/coordinates/Coordinates;Lnet/minecraft/server/commands/LookAt;)I ARG 0 source ARG 1 targets ARG 2 level ARG 3 position ARG 4 rotation - ARG 5 facing - CLASS LookAt - METHOD perform (Lnet/minecraft/commands/CommandSourceStack;Lnet/minecraft/world/entity/Entity;)V - ARG 1 source - ARG 2 entity + ARG 5 lookAt diff --git a/data/net/minecraft/server/dedicated/DedicatedServer.mapping b/data/net/minecraft/server/dedicated/DedicatedServer.mapping index f1c2afa50..df1d2a9bb 100644 --- a/data/net/minecraft/server/dedicated/DedicatedServer.mapping +++ b/data/net/minecraft/server/dedicated/DedicatedServer.mapping @@ -31,8 +31,6 @@ CLASS net/minecraft/server/dedicated/DedicatedServer COMMENT Return whether command blocks are enabled. METHOD isEpollEnabled ()Z COMMENT Get if native transport should be used. Native transport means linux server performance improvements and optimized packet sending/receiving on linux - METHOD isHardcore ()Z - COMMENT Defaults to false. METHOD isPublished ()Z COMMENT Returns {@code true} if this integrated server is open to LAN METHOD isSingleplayerOwner (Lcom/mojang/authlib/GameProfile;)Z @@ -56,5 +54,3 @@ CLASS net/minecraft/server/dedicated/DedicatedServer COMMENT Saves all necessary data as preparation for stopping the server. METHOD storeUsingWhiteList (Z)V ARG 1 isStoreUsingWhiteList - METHOD tickChildren (Ljava/util/function/BooleanSupplier;)V - ARG 1 hasTimeLeft diff --git a/data/net/minecraft/server/dedicated/DedicatedServerProperties.mapping b/data/net/minecraft/server/dedicated/DedicatedServerProperties.mapping index c60118071..e59a656bd 100644 --- a/data/net/minecraft/server/dedicated/DedicatedServerProperties.mapping +++ b/data/net/minecraft/server/dedicated/DedicatedServerProperties.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/server/dedicated/DedicatedServerProperties - METHOD createDimensions (Lnet/minecraft/core/RegistryAccess;)Lnet/minecraft/world/level/levelgen/WorldDimensions; - ARG 1 registryAccess + METHOD createDimensions (Lnet/minecraft/core/HolderLookup$Provider;)Lnet/minecraft/world/level/levelgen/WorldDimensions; + ARG 1 registries METHOD fromFile (Ljava/nio/file/Path;)Lnet/minecraft/server/dedicated/DedicatedServerProperties; ARG 0 path METHOD getDatapackConfig (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/world/level/DataPackConfig; @@ -24,7 +24,7 @@ CLASS net/minecraft/server/dedicated/DedicatedServerProperties METHOD parseResourcePackPrompt (Ljava/lang/String;)Lnet/minecraft/network/chat/Component; ARG 0 json CLASS WorldDimensionData - METHOD create (Lnet/minecraft/core/RegistryAccess;)Lnet/minecraft/world/level/levelgen/WorldDimensions; - ARG 1 registryAccess + METHOD create (Lnet/minecraft/core/HolderLookup$Provider;)Lnet/minecraft/world/level/levelgen/WorldDimensions; + ARG 1 registries METHOD lambda$create$2 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/resources/ResourceKey; ARG 0 presetPath diff --git a/data/net/minecraft/server/dedicated/ServerWatchdog.mapping b/data/net/minecraft/server/dedicated/ServerWatchdog.mapping index 48653f148..085fb4c17 100644 --- a/data/net/minecraft/server/dedicated/ServerWatchdog.mapping +++ b/data/net/minecraft/server/dedicated/ServerWatchdog.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/server/dedicated/ServerWatchdog METHOD (Lnet/minecraft/server/dedicated/DedicatedServer;)V ARG 1 server + METHOD createWatchdogCrashReport (Ljava/lang/String;J)Lnet/minecraft/CrashReport; + ARG 0 title + ARG 1 threadId METHOD lambda$run$1 (Lnet/minecraft/server/level/ServerLevel;)Ljava/lang/String; ARG 0 level diff --git a/data/net/minecraft/server/level/ChunkHolder.mapping b/data/net/minecraft/server/level/ChunkHolder.mapping index 0af20f39b..84fcdcb41 100644 --- a/data/net/minecraft/server/level/ChunkHolder.mapping +++ b/data/net/minecraft/server/level/ChunkHolder.mapping @@ -16,7 +16,7 @@ CLASS net/minecraft/server/level/ChunkHolder ARG 1 dependency METHOD addSendDependency (Ljava/util/concurrent/CompletableFuture;)V ARG 1 dependency - METHOD blockChanged (Lnet/minecraft/core/BlockPos;)V + METHOD blockChanged (Lnet/minecraft/core/BlockPos;)Z ARG 1 pos METHOD broadcast (Ljava/util/List;Lnet/minecraft/network/protocol/Packet;)V ARG 1 players @@ -42,9 +42,9 @@ CLASS net/minecraft/server/level/ChunkHolder ARG 2 future ARG 3 executor ARG 4 fullChunkStatus - METHOD sectionLightChanged (Lnet/minecraft/world/level/LightLayer;I)V - ARG 1 type - ARG 2 sectionY + METHOD sectionLightChanged (Lnet/minecraft/world/level/LightLayer;I)Z + ARG 1 lightLayer + ARG 2 y METHOD setQueueLevel (I)V ARG 1 queueLevel METHOD setTicketLevel (I)V diff --git a/data/net/minecraft/server/level/ChunkMap.mapping b/data/net/minecraft/server/level/ChunkMap.mapping index e36594344..6d352710d 100644 --- a/data/net/minecraft/server/level/ChunkMap.mapping +++ b/data/net/minecraft/server/level/ChunkMap.mapping @@ -25,6 +25,8 @@ CLASS net/minecraft/server/level/ChunkMap ARG 1 entity METHOD anyPlayerCloseEnoughForSpawning (Lnet/minecraft/world/level/ChunkPos;)Z ARG 1 chunkPos + METHOD anyPlayerCloseEnoughForSpawningInternal (Lnet/minecraft/world/level/ChunkPos;)Z + ARG 1 chunkPos METHOD applyChunkTrackingView (Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/server/level/ChunkTrackingView;)V ARG 1 player ARG 2 chunkTrackingView @@ -48,6 +50,8 @@ CLASS net/minecraft/server/level/ChunkMap COMMENT Returns the squared distance to the center of the chunk. ARG 0 chunkPos ARG 1 entity + METHOD forEachSpawnCandidateChunk (Ljava/util/function/Consumer;)V + ARG 1 action METHOD getChunkDebugData (Lnet/minecraft/world/level/ChunkPos;)Ljava/lang/String; ARG 1 pos METHOD getChunkQueueLevel (J)Ljava/util/function/IntSupplier; @@ -71,8 +75,6 @@ CLASS net/minecraft/server/level/ChunkMap METHOD handleChunkLoadFailure (Ljava/lang/Throwable;Lnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/world/level/chunk/ChunkAccess; ARG 1 exception ARG 2 chunkPos - METHOD isChunkDataValid (Lnet/minecraft/nbt/CompoundTag;)Z - ARG 0 tag METHOD isChunkOnTrackedBorder (Lnet/minecraft/server/level/ServerPlayer;II)Z COMMENT Checks if a chunk is on the edge of the player's view distance. ARG 1 player @@ -85,6 +87,49 @@ CLASS net/minecraft/server/level/ChunkMap ARG 3 z METHOD isExistingChunkFull (Lnet/minecraft/world/level/ChunkPos;)Z ARG 1 chunkPos + METHOD lambda$applyChunkTrackingView$36 (Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/world/level/ChunkPos;)V + ARG 2 chunkPos + METHOD lambda$debugFuturesAndCreateReportedException$4 (Ljava/lang/StringBuilder;Lnet/minecraft/server/level/ChunkHolder;)V + ARG 1 chunk + METHOD lambda$dumpChunks$31 (Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/Optional; + ARG 0 chunk + METHOD lambda$dumpChunks$32 (Lnet/minecraft/world/level/chunk/LevelChunk;)Ljava/lang/Integer; + ARG 0 chunk + METHOD lambda$dumpChunks$33 (Lnet/minecraft/world/level/chunk/LevelChunk;)Ljava/lang/Integer; + ARG 0 chunk + METHOD lambda$dumpChunks$34 (Lnet/minecraft/world/level/chunk/LevelChunk;)Ljava/lang/Integer; + ARG 0 chunk + METHOD lambda$getChunkRangeFuture$1 (Lnet/minecraft/server/level/ChunkResult;)Lnet/minecraft/server/level/ChunkResult; + ARG 0 chunkResult + METHOD lambda$prepareAccessibleChunk$29 (Lnet/minecraft/server/level/ChunkResult;)Lnet/minecraft/server/level/ChunkResult; + ARG 0 chunkResult + METHOD lambda$prepareEntityTickingChunk$7 (Lnet/minecraft/server/level/ChunkResult;)Lnet/minecraft/server/level/ChunkResult; + ARG 0 chunkResult + METHOD lambda$prepareTickingChunk$26 (Lnet/minecraft/server/level/ChunkHolder;Lnet/minecraft/server/level/ChunkResult;)Lnet/minecraft/server/level/ChunkResult; + ARG 2 chunk + METHOD lambda$prepareTickingChunk$27 (Lnet/minecraft/server/level/ChunkResult;Ljava/lang/Throwable;)Ljava/lang/Object; + ARG 1 chunk + ARG 2 exception + METHOD lambda$resendBiomesForChunks$38 (Lnet/minecraft/server/level/ServerPlayer;)Ljava/util/List; + ARG 0 player + METHOD lambda$resendBiomesForChunks$39 (Lnet/minecraft/server/level/ServerPlayer;Ljava/util/List;)V + ARG 0 player + METHOD lambda$save$30 (Lnet/minecraft/world/level/ChunkPos;Ljava/lang/Void;Ljava/lang/Throwable;)Ljava/lang/Object; + ARG 3 exception + METHOD lambda$saveAllChunks$10 (Lorg/apache/commons/lang3/mutable/MutableBoolean;Lnet/minecraft/world/level/chunk/ChunkAccess;)V + ARG 1 chunk + METHOD lambda$saveAllChunks$8 (Lnet/minecraft/server/level/ChunkHolder;)Lnet/minecraft/world/level/chunk/ChunkAccess; + ARG 1 chunk + METHOD lambda$saveAllChunks$9 (Lnet/minecraft/world/level/chunk/ChunkAccess;)Z + ARG 0 chunk + METHOD lambda$scheduleChunkLoad$14 (Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/level/chunk/storage/SerializableChunkData; + ARG 2 tag + METHOD lambda$scheduleChunkLoad$18 (Lnet/minecraft/world/level/ChunkPos;Ljava/lang/Throwable;)Lnet/minecraft/world/level/chunk/ChunkAccess; + ARG 2 throwable + METHOD lambda$scheduleUnload$13 (Lnet/minecraft/server/level/ChunkHolder;Ljava/lang/Void;Ljava/lang/Throwable;)V + ARG 2 error + METHOD lambda$waitForLightBeforeSending$40 (Lnet/minecraft/world/level/ChunkPos;)V + ARG 1 pos METHOD markChunkPendingToSend (Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/world/level/ChunkPos;)V ARG 1 player ARG 2 chunkPos @@ -98,16 +143,22 @@ CLASS net/minecraft/server/level/ChunkMap ARG 1 chunkPos METHOD move (Lnet/minecraft/server/level/ServerPlayer;)V ARG 1 player - METHOD onChunkReadyToSend (Lnet/minecraft/world/level/chunk/LevelChunk;)V - ARG 1 chunk + METHOD onChunkReadyToSend (Lnet/minecraft/server/level/ChunkHolder;Lnet/minecraft/world/level/chunk/LevelChunk;)V + ARG 1 chunkHolder + ARG 2 chunk METHOD onFullChunkStatusChange (Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/server/level/FullChunkStatus;)V ARG 1 chunkPos ARG 2 fullChunkStatus + METHOD onLevelChange (Lnet/minecraft/world/level/ChunkPos;Ljava/util/function/IntSupplier;ILjava/util/function/IntConsumer;)V + ARG 1 chunkPos + ARG 2 queueLevelGetter + ARG 3 ticketLevel + ARG 4 queueLevelSetter METHOD playerIsCloseEnoughForSpawning (Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/world/level/ChunkPos;)Z ARG 1 player ARG 2 chunkPos METHOD prepareAccessibleChunk (Lnet/minecraft/server/level/ChunkHolder;)Ljava/util/concurrent/CompletableFuture; - ARG 1 holder + ARG 1 chunk METHOD prepareEntityTickingChunk (Lnet/minecraft/server/level/ChunkHolder;)Ljava/util/concurrent/CompletableFuture; ARG 1 chunk METHOD prepareTickingChunk (Lnet/minecraft/server/level/ChunkHolder;)Ljava/util/concurrent/CompletableFuture; @@ -128,13 +179,18 @@ CLASS net/minecraft/server/level/ChunkMap ARG 1 chunk METHOD saveAllChunks (Z)V ARG 1 flush - METHOD saveChunkIfNeeded (Lnet/minecraft/server/level/ChunkHolder;)Z - ARG 1 holder + METHOD saveChunkIfNeeded (Lnet/minecraft/server/level/ChunkHolder;J)Z + ARG 1 chunk + ARG 2 gametime + METHOD saveChunksEagerly (Ljava/util/function/BooleanSupplier;)V + ARG 1 hasMoreTime METHOD scheduleChunkLoad (Lnet/minecraft/world/level/ChunkPos;)Ljava/util/concurrent/CompletableFuture; ARG 1 chunkPos METHOD scheduleUnload (JLnet/minecraft/server/level/ChunkHolder;)V ARG 1 chunkPos ARG 3 chunkHolder + METHOD setChunkUnsaved (Lnet/minecraft/world/level/ChunkPos;)V + ARG 1 chunkPos METHOD setServerViewDistance (I)V ARG 1 viewDistance METHOD skipPlayer (Lnet/minecraft/server/level/ServerPlayer;)Z diff --git a/data/net/minecraft/server/level/ChunkTaskDispatcher.mapping b/data/net/minecraft/server/level/ChunkTaskDispatcher.mapping new file mode 100644 index 000000000..079456dac --- /dev/null +++ b/data/net/minecraft/server/level/ChunkTaskDispatcher.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/server/level/ChunkTaskDispatcher + METHOD (Lnet/minecraft/util/thread/TaskScheduler;Ljava/util/concurrent/Executor;)V + ARG 1 executor + ARG 2 dispatcher + METHOD onRelease (J)V + ARG 1 chunkPos + METHOD release (JLjava/lang/Runnable;Z)V + ARG 1 chunkPos + ARG 3 afterRelease + ARG 4 fullClear + METHOD scheduleForExecution (Lnet/minecraft/server/level/ChunkTaskPriorityQueue$TasksForChunk;)V + ARG 1 tasks + METHOD submit (Ljava/lang/Runnable;JLjava/util/function/IntSupplier;)V + ARG 1 task + ARG 2 chunkPos + ARG 4 queueLevelSupplier diff --git a/data/net/minecraft/server/level/ChunkTaskPriorityQueue.mapping b/data/net/minecraft/server/level/ChunkTaskPriorityQueue.mapping index 0325cb5c0..928d242d1 100644 --- a/data/net/minecraft/server/level/ChunkTaskPriorityQueue.mapping +++ b/data/net/minecraft/server/level/ChunkTaskPriorityQueue.mapping @@ -1,13 +1,6 @@ CLASS net/minecraft/server/level/ChunkTaskPriorityQueue - METHOD (Ljava/lang/String;I)V + METHOD (Ljava/lang/String;)V ARG 1 name - ARG 2 maxTasks - METHOD acquire (J)Ljava/lang/Runnable; - ARG 1 chunkPos - METHOD lambda$pop$6 (JLjava/util/Optional;)Lcom/mojang/datafixers/util/Either; - ARG 3 optional - METHOD lambda$release$3 (Ljava/util/Optional;)Z - ARG 0 queues METHOD lambda$resortChunkTasks$1 (J)Ljava/util/List; ARG 0 chunkPos METHOD lambda$submit$2 (J)Ljava/util/List; @@ -19,7 +12,7 @@ CLASS net/minecraft/server/level/ChunkTaskPriorityQueue ARG 1 queueLevel ARG 2 chunkPos ARG 3 ticketLevel - METHOD submit (Ljava/util/Optional;JI)V + METHOD submit (Ljava/lang/Runnable;JI)V ARG 1 task ARG 2 chunkPos - ARG 4 chunkLevel + ARG 4 queueLevel diff --git a/data/net/minecraft/server/level/ChunkTaskPriorityQueueSorter.mapping b/data/net/minecraft/server/level/ChunkTaskPriorityQueueSorter.mapping deleted file mode 100644 index 26b035f1b..000000000 --- a/data/net/minecraft/server/level/ChunkTaskPriorityQueueSorter.mapping +++ /dev/null @@ -1,56 +0,0 @@ -CLASS net/minecraft/server/level/ChunkTaskPriorityQueueSorter - METHOD (Ljava/util/List;Ljava/util/concurrent/Executor;I)V - ARG 1 queues - ARG 2 task - ARG 3 maxTasks - METHOD getProcessor (Lnet/minecraft/util/thread/ProcessorHandle;Z)Lnet/minecraft/util/thread/ProcessorHandle; - ARG 1 processor - ARG 2 flush - METHOD getQueue (Lnet/minecraft/util/thread/ProcessorHandle;)Lnet/minecraft/server/level/ChunkTaskPriorityQueue; - ARG 1 processor - METHOD getReleaseProcessor (Lnet/minecraft/util/thread/ProcessorHandle;)Lnet/minecraft/util/thread/ProcessorHandle; - ARG 1 processor - METHOD lambda$new$0 (ILnet/minecraft/util/thread/ProcessorHandle;)Lnet/minecraft/server/level/ChunkTaskPriorityQueue; - ARG 1 processorHandle - METHOD message (Ljava/lang/Runnable;JLjava/util/function/IntSupplier;)Lnet/minecraft/server/level/ChunkTaskPriorityQueueSorter$Message; - ARG 0 task - ARG 1 pos - ARG 3 level - METHOD message (Ljava/util/function/Function;JLjava/util/function/IntSupplier;)Lnet/minecraft/server/level/ChunkTaskPriorityQueueSorter$Message; - ARG 0 task - ARG 1 pos - ARG 3 level - METHOD message (Lnet/minecraft/server/level/GenerationChunkHolder;Ljava/lang/Runnable;)Lnet/minecraft/server/level/ChunkTaskPriorityQueueSorter$Message; - ARG 0 chunk - ARG 1 task - METHOD message (Lnet/minecraft/server/level/GenerationChunkHolder;Ljava/util/function/Function;)Lnet/minecraft/server/level/ChunkTaskPriorityQueueSorter$Message; - ARG 0 chunk - ARG 1 task - METHOD pollTask (Lnet/minecraft/server/level/ChunkTaskPriorityQueue;Lnet/minecraft/util/thread/ProcessorHandle;)V - ARG 1 queue - ARG 2 processor - METHOD release (Ljava/lang/Runnable;JZ)Lnet/minecraft/server/level/ChunkTaskPriorityQueueSorter$Release; - ARG 0 task - ARG 1 pos - ARG 3 clearQueue - METHOD release (Lnet/minecraft/util/thread/ProcessorHandle;JLjava/lang/Runnable;Z)V - ARG 1 processor - ARG 2 chunkPos - ARG 4 task - ARG 5 clearQueue - METHOD submit (Lnet/minecraft/util/thread/ProcessorHandle;Ljava/util/function/Function;JLjava/util/function/IntSupplier;Z)V - ARG 1 processor - ARG 2 task - ARG 3 chunkPos - ARG 5 level - ARG 6 flush - CLASS Message - METHOD (Ljava/util/function/Function;JLjava/util/function/IntSupplier;)V - ARG 1 task - ARG 2 pos - ARG 4 level - CLASS Release - METHOD (Ljava/lang/Runnable;JZ)V - ARG 1 task - ARG 2 pos - ARG 4 clearQueue diff --git a/data/net/minecraft/server/level/GenerationChunkHolder.mapping b/data/net/minecraft/server/level/GenerationChunkHolder.mapping index 0112881d0..683da59a2 100644 --- a/data/net/minecraft/server/level/GenerationChunkHolder.mapping +++ b/data/net/minecraft/server/level/GenerationChunkHolder.mapping @@ -3,6 +3,8 @@ CLASS net/minecraft/server/level/GenerationChunkHolder ARG 1 pos METHOD acquireStatusBump (Lnet/minecraft/world/level/chunk/status/ChunkStatus;)Z ARG 1 status + METHOD addSaveDependency (Ljava/util/concurrent/CompletableFuture;)V + ARG 1 saveDependency METHOD applyStep (Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/server/level/GeneratingChunkMap;Lnet/minecraft/util/StaticCache2D;)Ljava/util/concurrent/CompletableFuture; ARG 1 step ARG 2 chunkMap diff --git a/data/net/minecraft/server/level/ParticleStatus.mapping b/data/net/minecraft/server/level/ParticleStatus.mapping new file mode 100644 index 000000000..df0ae8861 --- /dev/null +++ b/data/net/minecraft/server/level/ParticleStatus.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/server/level/ParticleStatus + METHOD (Ljava/lang/String;IILjava/lang/String;)V + ARG 3 id + ARG 4 key + METHOD byId (I)Lnet/minecraft/server/level/ParticleStatus; + ARG 0 id diff --git a/data/net/minecraft/server/level/ServerChunkCache.mapping b/data/net/minecraft/server/level/ServerChunkCache.mapping index 19500d8f9..4ac98a097 100644 --- a/data/net/minecraft/server/level/ServerChunkCache.mapping +++ b/data/net/minecraft/server/level/ServerChunkCache.mapping @@ -27,9 +27,13 @@ CLASS net/minecraft/server/level/ServerChunkCache METHOD broadcastAndSend (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/network/protocol/Packet;)V ARG 1 entity ARG 2 packet + METHOD broadcastChangedChunks (Lnet/minecraft/util/profiling/ProfilerFiller;)V + ARG 1 profiler METHOD chunkAbsent (Lnet/minecraft/server/level/ChunkHolder;I)Z ARG 1 chunkHolder ARG 2 status + METHOD collectTickingChunks (Ljava/util/List;)V + ARG 1 output METHOD gatherStats ()Ljava/lang/String; COMMENT Converts the instance data to a readable string. METHOD getChunkDebugData (Lnet/minecraft/world/level/ChunkPos;)Ljava/lang/String; @@ -58,8 +62,14 @@ CLASS net/minecraft/server/level/ServerChunkCache ARG 2 z METHOD isPositionTicking (J)Z ARG 1 chunkPos + METHOD lambda$collectTickingChunks$3 (Ljava/util/List;Lnet/minecraft/server/level/ChunkHolder;)V + ARG 2 chunk + METHOD lambda$getChunkFuture$2 (Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletionStage; + ARG 0 future METHOD move (Lnet/minecraft/server/level/ServerPlayer;)V ARG 1 player + METHOD onChunkReadyToSend (Lnet/minecraft/server/level/ChunkHolder;)V + ARG 1 chunkHolder METHOD onLightUpdate (Lnet/minecraft/world/level/LightLayer;Lnet/minecraft/core/SectionPos;)V ARG 1 type ARG 2 pos @@ -74,15 +84,16 @@ CLASS net/minecraft/server/level/ServerChunkCache ARG 1 flush METHOD setSimulationDistance (I)V ARG 1 simulationDistance - METHOD setSpawnSettings (ZZ)V - ARG 1 hostile - ARG 2 peaceful METHOD setViewDistance (I)V ARG 1 viewDistance METHOD storeInCache (JLnet/minecraft/world/level/chunk/ChunkAccess;Lnet/minecraft/world/level/chunk/status/ChunkStatus;)V ARG 1 chunkPos ARG 3 chunk ARG 4 chunkStatus + METHOD tickChunks (Lnet/minecraft/util/profiling/ProfilerFiller;JLjava/util/List;)V + ARG 1 profiler + ARG 2 timeInhabited + ARG 4 chunks METHOD updateChunkForced (Lnet/minecraft/world/level/ChunkPos;Z)V ARG 1 pos ARG 2 add diff --git a/data/net/minecraft/server/level/ServerEntity.mapping b/data/net/minecraft/server/level/ServerEntity.mapping index 5f5cd6f9d..a7bf3bf2f 100644 --- a/data/net/minecraft/server/level/ServerEntity.mapping +++ b/data/net/minecraft/server/level/ServerEntity.mapping @@ -9,6 +9,11 @@ CLASS net/minecraft/server/level/ServerEntity ARG 1 player METHOD broadcastAndSend (Lnet/minecraft/network/protocol/Packet;)V ARG 1 packet + METHOD handleMinecartPosRot (Lnet/minecraft/world/entity/vehicle/NewMinecartBehavior;BBZ)V + ARG 1 behavior + ARG 2 yRot + ARG 3 xRot + ARG 4 dirty METHOD lambda$sendChanges$0 (Lnet/minecraft/world/entity/Entity;)V ARG 0 removedPassenger METHOD removePairing (Lnet/minecraft/server/level/ServerPlayer;)V diff --git a/data/net/minecraft/server/level/ServerEntityGetter.mapping b/data/net/minecraft/server/level/ServerEntityGetter.mapping new file mode 100644 index 000000000..d8213db55 --- /dev/null +++ b/data/net/minecraft/server/level/ServerEntityGetter.mapping @@ -0,0 +1,43 @@ +CLASS net/minecraft/server/level/ServerEntityGetter + METHOD getNearbyEntities (Ljava/lang/Class;Lnet/minecraft/world/entity/ai/targeting/TargetingConditions;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/phys/AABB;)Ljava/util/List; + ARG 1 entityClass + ARG 2 targetingConditions + ARG 3 source + ARG 4 area + METHOD getNearbyPlayers (Lnet/minecraft/world/entity/ai/targeting/TargetingConditions;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/phys/AABB;)Ljava/util/List; + ARG 1 targetingConditions + ARG 2 source + ARG 3 area + METHOD getNearestEntity (Ljava/lang/Class;Lnet/minecraft/world/entity/ai/targeting/TargetingConditions;Lnet/minecraft/world/entity/LivingEntity;DDDLnet/minecraft/world/phys/AABB;)Lnet/minecraft/world/entity/LivingEntity; + ARG 1 entityClass + ARG 2 targetingConditions + ARG 3 source + ARG 4 x + ARG 6 y + ARG 8 z + ARG 10 area + METHOD getNearestEntity (Ljava/util/List;Lnet/minecraft/world/entity/ai/targeting/TargetingConditions;Lnet/minecraft/world/entity/LivingEntity;DDD)Lnet/minecraft/world/entity/LivingEntity; + ARG 1 entities + ARG 2 targetingConditions + ARG 3 source + ARG 4 x + ARG 6 y + ARG 8 z + METHOD getNearestPlayer (Lnet/minecraft/world/entity/ai/targeting/TargetingConditions;DDD)Lnet/minecraft/world/entity/player/Player; + ARG 1 targetingConditions + ARG 2 x + ARG 4 y + ARG 6 z + METHOD getNearestPlayer (Lnet/minecraft/world/entity/ai/targeting/TargetingConditions;Lnet/minecraft/world/entity/LivingEntity;)Lnet/minecraft/world/entity/player/Player; + ARG 1 targetingConditions + ARG 2 source + METHOD getNearestPlayer (Lnet/minecraft/world/entity/ai/targeting/TargetingConditions;Lnet/minecraft/world/entity/LivingEntity;DDD)Lnet/minecraft/world/entity/player/Player; + ARG 1 targetingConditions + ARG 2 source + ARG 3 x + ARG 5 y + ARG 7 z + METHOD lambda$getNearbyEntities$1 (Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 0 entity + METHOD lambda$getNearestEntity$0 (Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 0 entity diff --git a/data/net/minecraft/server/level/ServerLevel.mapping b/data/net/minecraft/server/level/ServerLevel.mapping index 71fd597b3..90042110e 100644 --- a/data/net/minecraft/server/level/ServerLevel.mapping +++ b/data/net/minecraft/server/level/ServerLevel.mapping @@ -78,6 +78,8 @@ CLASS net/minecraft/server/level/ServerLevel COMMENT Gets an unmodifiable iterator of all loaded entities in the world. METHOD getChunkSource ()Lnet/minecraft/server/level/ServerChunkCache; COMMENT Gets the world's chunk provider + METHOD getDestroyType (Lnet/minecraft/world/level/GameRules$Key;)Lnet/minecraft/world/level/Explosion$BlockInteraction; + ARG 1 decayGameRule METHOD getEntities (Lnet/minecraft/world/level/entity/EntityTypeTest;Ljava/util/function/Predicate;)Ljava/util/List; ARG 1 typeTest ARG 2 predicate @@ -132,8 +134,6 @@ CLASS net/minecraft/server/level/ServerLevel ARG 1 pos METHOD isVillage (Lnet/minecraft/core/SectionPos;)Z ARG 1 pos - METHOD lambda$clearBlockEvents$15 (Lnet/minecraft/world/level/levelgen/structure/BoundingBox;Lnet/minecraft/world/level/BlockEventData;)Z - ARG 1 event METHOD lambda$findLightningRod$4 (Lnet/minecraft/core/Holder;)Z ARG 0 pointOfInterestType METHOD lambda$findLightningRod$5 (Lnet/minecraft/core/BlockPos;)Z @@ -144,8 +144,6 @@ CLASS net/minecraft/server/level/ServerLevel ARG 1 entity METHOD lambda$getEntities$10 (Ljava/util/function/Predicate;Ljava/util/List;ILnet/minecraft/world/entity/Entity;)Lnet/minecraft/util/AbortableIterationConsumer$Continuation; ARG 3 entity - METHOD lambda$getTypeCount$17 (Lit/unimi/dsi/fastutil/objects/Object2IntMap$Entry;)Ljava/lang/String; - ARG 0 entry METHOD lambda$tick$2 (Lnet/minecraft/world/TickRateManager;Lnet/minecraft/util/profiling/ProfilerFiller;Lnet/minecraft/world/entity/Entity;)V ARG 3 entity METHOD lambda$wakeUpAllPlayers$3 (Lnet/minecraft/server/level/ServerPlayer;)V @@ -179,8 +177,8 @@ CLASS net/minecraft/server/level/ServerLevel ARG 3 skipSave METHOD saveDebugReport (Ljava/nio/file/Path;)V ARG 1 path - METHOD saveLevelData ()V - COMMENT Saves the chunks to disk. + METHOD saveLevelData (Z)V + ARG 1 join METHOD sectionsToVillage (Lnet/minecraft/core/SectionPos;)I ARG 1 pos METHOD sendBlockUpdated (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;I)V @@ -234,8 +232,6 @@ CLASS net/minecraft/server/level/ServerLevel ARG 2 weatherTime ARG 3 isRaining ARG 4 isThundering - METHOD shouldDiscardEntity (Lnet/minecraft/world/entity/Entity;)Z - ARG 1 entity METHOD startTickingChunk (Lnet/minecraft/world/level/chunk/LevelChunk;)V ARG 1 chunk METHOD tick (Ljava/util/function/BooleanSupplier;)V diff --git a/data/net/minecraft/server/level/ServerPlayer.mapping b/data/net/minecraft/server/level/ServerPlayer.mapping index 39802dd05..6301a1c74 100644 --- a/data/net/minecraft/server/level/ServerPlayer.mapping +++ b/data/net/minecraft/server/level/ServerPlayer.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/server/level/ServerPlayer ARG 3 gameProfile ARG 4 clientInformation METHOD acceptsSystemMessages (Z)Z - ARG 1 bypassHiddenChat + ARG 1 overlay METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound METHOD attack (Lnet/minecraft/world/entity/Entity;)V @@ -58,9 +58,15 @@ CLASS net/minecraft/server/level/ServerPlayer ARG 1 player METHOD createCommonSpawnInfo (Lnet/minecraft/server/level/ServerLevel;)Lnet/minecraft/network/protocol/game/CommonPlayerSpawnInfo; ARG 1 level + METHOD createItemStackToDrop (Lnet/minecraft/world/item/ItemStack;ZZ)Lnet/minecraft/world/entity/item/ItemEntity; + ARG 1 droppedItem + ARG 2 dropAround + ARG 3 includeThrowerName METHOD crit (Lnet/minecraft/world/entity/Entity;)V COMMENT Called when the entity is dealt a critical hit. ARG 1 entityHit + METHOD deregisterEnderPearl (Lnet/minecraft/world/entity/projectile/ThrownEnderpearl;)V + ARG 1 enderPearl METHOD didNotMove (DDD)Z ARG 0 dx ARG 2 dy @@ -87,10 +93,10 @@ CLASS net/minecraft/server/level/ServerPlayer ARG 1 pos ARG 2 angle ARG 3 forced - ARG 4 keepInventory - METHOD findRespawnPositionAndUseSpawnBlock (ZLnet/minecraft/world/level/portal/DimensionTransition$PostDimensionTransition;)Lnet/minecraft/world/level/portal/DimensionTransition; - ARG 1 keepInventory - ARG 2 postDimensionTransition + ARG 4 useCharge + METHOD findRespawnPositionAndUseSpawnBlock (ZLnet/minecraft/world/level/portal/TeleportTransition$PostTeleportTransition;)Lnet/minecraft/world/level/portal/TeleportTransition; + ARG 1 useCharge + ARG 2 postTeleportTransition METHOD getCoprime (I)I ARG 1 spawnArea METHOD getIpAddress ()Ljava/lang/String; @@ -104,31 +110,46 @@ CLASS net/minecraft/server/level/ServerPlayer ARG 1 scoreHolder ARG 2 teamMember ARG 3 crtieria - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD initMenu (Lnet/minecraft/world/inventory/AbstractContainerMenu;)V ARG 1 menu - METHOD isInvulnerableTo (Lnet/minecraft/world/damagesource/DamageSource;)Z - COMMENT Returns whether this Entity is invulnerable to the given DamageSource. - ARG 1 source METHOD isPvpAllowed ()Z COMMENT Returns if other players can attack this player METHOD isReachableBedBlock (Lnet/minecraft/core/BlockPos;)Z ARG 1 pos METHOD isSpectator ()Z COMMENT Returns {@code true} if the player is in spectator mode. - METHOD lambda$readAdditionalSaveData$0 (Lnet/minecraft/world/entity/monster/warden/WardenSpawnTracker;)V + METHOD lambda$addAdditionalSaveData$7 (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/nbt/Tag;)V ARG 1 wardenSpawnTracker - METHOD lambda$readAdditionalSaveData$1 (Lnet/minecraft/core/BlockPos;)V + METHOD lambda$addAdditionalSaveData$8 (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/nbt/Tag;)V + ARG 1 spawnDimension + METHOD lambda$addAdditionalSaveData$9 (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/nbt/Tag;)V ARG 1 raidOmenPosition - METHOD lambda$tellNeutralMobsThatIDied$8 (Lnet/minecraft/world/entity/Mob;)Z + METHOD lambda$awardStat$23 (ILnet/minecraft/world/scores/ScoreAccess;)V + ARG 1 score + METHOD lambda$loadAndSpawnEnderpearls$12 (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/entity/Entity; + ARG 1 entity + METHOD lambda$loadAndSpawnEnderpearls$13 (Lnet/minecraft/nbt/Tag;)V + ARG 1 enderPearlTag + METHOD lambda$loadAndSpawnParentVehicle$10 (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/entity/Entity; + ARG 1 entity + METHOD lambda$readAdditionalSaveData$4 (Lnet/minecraft/world/entity/monster/warden/WardenSpawnTracker;)V + ARG 1 wardenSpawnTracker + METHOD lambda$readAdditionalSaveData$5 (Lnet/minecraft/resources/ResourceKey;)Z + ARG 1 key + METHOD lambda$readAdditionalSaveData$6 (Lnet/minecraft/core/BlockPos;)V + ARG 1 pos + METHOD lambda$saveEnderPearls$11 (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/nbt/Tag;)V + ARG 1 enderPearlDimension + METHOD lambda$startSleepInBed$21 (Lnet/minecraft/world/entity/monster/Monster;)Z + ARG 1 monster + METHOD lambda$tellNeutralMobsThatIDied$17 (Lnet/minecraft/world/entity/Mob;)Z ARG 0 mob - METHOD lambda$tellNeutralMobsThatIDied$9 (Lnet/minecraft/world/entity/Mob;)V + METHOD lambda$tellNeutralMobsThatIDied$18 (Lnet/minecraft/world/entity/Mob;)V ARG 1 mob - METHOD lambda$updateScoreForCriteria$5 (ILnet/minecraft/world/scores/ScoreAccess;)V - ARG 1 score + METHOD loadAndSpawnEnderpearls (Ljava/util/Optional;)V + ARG 1 tag + METHOD loadAndSpawnParentVehicle (Ljava/util/Optional;)V + ARG 1 tag METHOD loadGameTypes (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 tag METHOD lookAt (Lnet/minecraft/commands/arguments/EntityAnchorArgument$Anchor;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/commands/arguments/EntityAnchorArgument$Anchor;)V @@ -146,8 +167,9 @@ CLASS net/minecraft/server/level/ServerPlayer ARG 5 z METHOD nextContainerCounter ()V COMMENT Gets the next window id to use. - METHOD onEffectRemoved (Lnet/minecraft/world/effect/MobEffectInstance;)V - ARG 1 effect + METHOD noCollisionNoLiquid (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/phys/AABB;)Z + ARG 1 level + ARG 2 collisionBox METHOD onEnchantmentPerformed (Lnet/minecraft/world/item/ItemStack;I)V ARG 1 enchantedItem ARG 2 cost @@ -167,6 +189,9 @@ CLASS net/minecraft/server/level/ServerPlayer METHOD openItemGui (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/InteractionHand;)V ARG 1 stack ARG 2 hand + METHOD placeEnderPearlTicket (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/ChunkPos;)J + ARG 0 level + ARG 1 pos METHOD processPortalCooldown ()V COMMENT Decrements the counter for the remaining time until the entity may use a portal again. METHOD readAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V @@ -175,6 +200,10 @@ CLASS net/minecraft/server/level/ServerPlayer METHOD readPlayerMode (Lnet/minecraft/nbt/CompoundTag;Ljava/lang/String;)Lnet/minecraft/world/level/GameType; ARG 0 tag ARG 1 key + METHOD registerAndUpdateEnderPearlTicket (Lnet/minecraft/world/entity/projectile/ThrownEnderpearl;)J + ARG 1 enderPearl + METHOD registerEnderPearl (Lnet/minecraft/world/entity/projectile/ThrownEnderpearl;)V + ARG 1 enderPearl METHOD resetSentInfo ()V COMMENT This function is called when a player's inventory is sent to him, {@code lastHealth} is updated on any dimension transitions, then reset. METHOD resetStat (Lnet/minecraft/stats/Stat;)V @@ -182,6 +211,10 @@ CLASS net/minecraft/server/level/ServerPlayer METHOD restoreFrom (Lnet/minecraft/server/level/ServerPlayer;Z)V ARG 1 that ARG 2 keepEverything + METHOD saveEnderPearls (Lnet/minecraft/nbt/CompoundTag;)V + ARG 1 tag + METHOD saveParentVehicle (Lnet/minecraft/nbt/CompoundTag;)V + ARG 1 tag METHOD sendChatMessage (Lnet/minecraft/network/chat/OutgoingChatMessage;ZLnet/minecraft/network/chat/ChatType$Bound;)V ARG 1 message ARG 2 filtered @@ -193,9 +226,11 @@ CLASS net/minecraft/server/level/ServerPlayer ARG 4 xp METHOD sendServerStatus (Lnet/minecraft/network/protocol/status/ServerStatus;)V ARG 1 serverStatus + METHOD sendSystemMessage (Lnet/minecraft/network/chat/Component;)V + ARG 1 mesage METHOD sendSystemMessage (Lnet/minecraft/network/chat/Component;Z)V - ARG 1 component - ARG 2 bypassHiddenChat + ARG 1 message + ARG 2 overlay METHOD setCamera (Lnet/minecraft/world/entity/Entity;)V ARG 1 entityToSpectate METHOD setChatSession (Lnet/minecraft/network/chat/RemoteChatSession;)V @@ -210,13 +245,10 @@ CLASS net/minecraft/server/level/ServerPlayer ARG 1 gameMode METHOD setKnownMovement (Lnet/minecraft/world/phys/Vec3;)V ARG 1 knownMovement + METHOD setLastClientInput (Lnet/minecraft/world/entity/player/Input;)V + ARG 1 lastClientInput METHOD setLastSectionPos (Lnet/minecraft/core/SectionPos;)V ARG 1 sectionPos - METHOD setPlayerInput (FFZZ)V - ARG 1 strafe - ARG 2 forward - ARG 3 jumping - ARG 4 sneaking METHOD setRaidOmenPosition (Lnet/minecraft/core/BlockPos;)V ARG 1 raidOmenPosition METHOD setRespawnPosition (Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/core/BlockPos;FZZ)V @@ -239,6 +271,8 @@ CLASS net/minecraft/server/level/ServerPlayer ARG 1 tag METHOD swing (Lnet/minecraft/world/InteractionHand;)V ARG 1 hand + METHOD synchronizeSpecialItemUpdates (Lnet/minecraft/world/item/ItemStack;)V + ARG 1 stack METHOD take (Lnet/minecraft/world/entity/Entity;I)V COMMENT Called when the entity picks up an item. ARG 1 entity @@ -248,13 +282,6 @@ CLASS net/minecraft/server/level/ServerPlayer ARG 1 x ARG 3 y ARG 5 z - METHOD teleportTo (Lnet/minecraft/server/level/ServerLevel;DDDFF)V - ARG 1 newLevel - ARG 2 x - ARG 4 y - ARG 6 z - ARG 8 yaw - ARG 9 pitch METHOD tick ()V COMMENT Called to update the entity's position/logic. METHOD triggerDimensionChangeTriggers (Lnet/minecraft/server/level/ServerLevel;)V diff --git a/data/net/minecraft/server/level/ThreadedLevelLightEngine.mapping b/data/net/minecraft/server/level/ThreadedLevelLightEngine.mapping index 76f48ccc3..126dac547 100644 --- a/data/net/minecraft/server/level/ThreadedLevelLightEngine.mapping +++ b/data/net/minecraft/server/level/ThreadedLevelLightEngine.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/server/level/ThreadedLevelLightEngine - METHOD (Lnet/minecraft/world/level/chunk/LightChunkGetter;Lnet/minecraft/server/level/ChunkMap;ZLnet/minecraft/util/thread/ProcessorMailbox;Lnet/minecraft/util/thread/ProcessorHandle;)V - ARG 1 lightChunk + METHOD (Lnet/minecraft/world/level/chunk/LightChunkGetter;Lnet/minecraft/server/level/ChunkMap;ZLnet/minecraft/util/thread/ConsecutiveExecutor;Lnet/minecraft/server/level/ChunkTaskDispatcher;)V + ARG 1 lightChunkGetter ARG 2 chunkMap ARG 3 skyLight - ARG 4 taskMailbox - ARG 5 sorterMailbox + ARG 4 consecutiveExecutor + ARG 5 taskDispatcher METHOD addTask (IILjava/util/function/IntSupplier;Lnet/minecraft/server/level/ThreadedLevelLightEngine$TaskType;Ljava/lang/Runnable;)V ARG 1 chunkX ARG 2 chunkZ diff --git a/data/net/minecraft/server/level/ThrottlingChunkTaskDispatcher.mapping b/data/net/minecraft/server/level/ThrottlingChunkTaskDispatcher.mapping new file mode 100644 index 000000000..044d0913e --- /dev/null +++ b/data/net/minecraft/server/level/ThrottlingChunkTaskDispatcher.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/server/level/ThrottlingChunkTaskDispatcher + METHOD (Lnet/minecraft/util/thread/TaskScheduler;Ljava/util/concurrent/Executor;I)V + ARG 1 executor + ARG 2 dispatcher + ARG 3 maxChunksInExecution diff --git a/data/net/minecraft/server/network/LegacyTextFilter.mapping b/data/net/minecraft/server/network/LegacyTextFilter.mapping new file mode 100644 index 000000000..bfc09f192 --- /dev/null +++ b/data/net/minecraft/server/network/LegacyTextFilter.mapping @@ -0,0 +1,24 @@ +CLASS net/minecraft/server/network/LegacyTextFilter + METHOD (Ljava/net/URL;Lnet/minecraft/server/network/ServerTextFilter$MessageEncoder;Ljava/net/URL;Lnet/minecraft/server/network/LegacyTextFilter$JoinOrLeaveEncoder;Ljava/net/URL;Lnet/minecraft/server/network/LegacyTextFilter$JoinOrLeaveEncoder;Ljava/lang/String;Lnet/minecraft/server/network/ServerTextFilter$IgnoreStrategy;Ljava/util/concurrent/ExecutorService;)V + ARG 1 chatEndpoint + ARG 2 chatEncoder + ARG 3 joinEndpoint + ARG 4 joinEncoder + ARG 5 leaveEndpoint + ARG 6 leaveEncoder + ARG 7 authKey + ARG 8 chatIgnoreStrategy + ARG 9 workerPool + METHOD createTextFilterFromConfig (Ljava/lang/String;)Lnet/minecraft/server/network/ServerTextFilter; + ARG 0 config + METHOD processJoinOrLeave (Lcom/mojang/authlib/GameProfile;Ljava/net/URL;Lnet/minecraft/server/network/LegacyTextFilter$JoinOrLeaveEncoder;Ljava/util/concurrent/Executor;)V + ARG 1 profile + ARG 2 endpoint + ARG 3 encoder + ARG 4 streamExecutor + METHOD processRequest (Lcom/google/gson/JsonObject;Ljava/net/URL;)V + ARG 1 request + ARG 2 endpoint + CLASS JoinOrLeaveEncoder + METHOD encode (Lcom/mojang/authlib/GameProfile;)Lcom/google/gson/JsonObject; + ARG 1 profile diff --git a/data/net/minecraft/server/network/PlayerSafetyServiceTextFilter.mapping b/data/net/minecraft/server/network/PlayerSafetyServiceTextFilter.mapping new file mode 100644 index 000000000..f3ea786b8 --- /dev/null +++ b/data/net/minecraft/server/network/PlayerSafetyServiceTextFilter.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/server/network/PlayerSafetyServiceTextFilter + METHOD (Ljava/net/URL;Lnet/minecraft/server/network/ServerTextFilter$MessageEncoder;Lnet/minecraft/server/network/ServerTextFilter$IgnoreStrategy;Ljava/util/concurrent/ExecutorService;Lcom/microsoft/aad/msal4j/ConfidentialClientApplication;Lcom/microsoft/aad/msal4j/ClientCredentialParameters;Ljava/util/Set;I)V + ARG 1 chatEndpoint + ARG 2 chatEncoder + ARG 3 chatIgnoreStrategy + ARG 4 workerPool + ARG 5 client + ARG 6 clientParameters + ARG 7 fullyFilteredEvents + ARG 8 connectionReadTimeoutMs + METHOD createTextFilterFromConfig (Ljava/lang/String;)Lnet/minecraft/server/network/ServerTextFilter; + ARG 0 config diff --git a/data/net/minecraft/server/network/ServerGamePacketListenerImpl.mapping b/data/net/minecraft/server/network/ServerGamePacketListenerImpl.mapping index 110694b91..4fac2bb00 100644 --- a/data/net/minecraft/server/network/ServerGamePacketListenerImpl.mapping +++ b/data/net/minecraft/server/network/ServerGamePacketListenerImpl.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/server/network/ServerGamePacketListenerImpl FIELD aboveGroundTickCount I COMMENT Used to keep track of how the player is floating while gamerules should prevent that. Surpassing 80 ticks means kick - FIELD chatSpamTickCount I - COMMENT Incremented by 20 each time a user sends a chat message, decreased by one every tick. Non-ops kicked when over 200 METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/network/Connection;Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/server/network/CommonListenerCookie;)V ARG 1 server ARG 2 connection @@ -100,6 +98,8 @@ CLASS net/minecraft/server/network/ServerGamePacketListenerImpl METHOD handlePlayerInput (Lnet/minecraft/network/protocol/game/ServerboundPlayerInputPacket;)V COMMENT Processes player movement input. Includes walking, strafing, jumping, and sneaking. Excludes riding and toggling flying/sprinting. ARG 1 packet + METHOD handlePlayerKnownMovement (Lnet/minecraft/world/phys/Vec3;)V + ARG 1 movement METHOD handleRecipeBookSeenRecipePacket (Lnet/minecraft/network/protocol/game/ServerboundRecipeBookSeenRecipePacket;)V ARG 1 packet METHOD handleRenameItem (Lnet/minecraft/network/protocol/game/ServerboundRenameItemPacket;)V @@ -141,16 +141,18 @@ CLASS net/minecraft/server/network/ServerGamePacketListenerImpl ARG 7 z METHOD lambda$filterTextPacket$0 (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 result + METHOD lambda$handleChat$5 (Lnet/minecraft/network/chat/PlayerChatMessage;Lnet/minecraft/network/chat/Component;Lnet/minecraft/server/network/FilteredText;)V + ARG 3 filteredText METHOD lambda$handleCustomCommandSuggestions$1 (Lnet/minecraft/network/protocol/game/ServerboundCommandSuggestionPacket;Lcom/mojang/brigadier/suggestion/Suggestions;)V ARG 2 suggestions METHOD lambda$handleEditBook$2 (ILjava/util/List;)V ARG 2 texts METHOD lambda$handleEditBook$3 (ILjava/util/List;)V ARG 2 texts - METHOD lambda$handlePlaceRecipe$10 (Lnet/minecraft/network/protocol/game/ServerboundPlaceRecipePacket;Lnet/minecraft/world/item/crafting/RecipeHolder;)V - ARG 2 recipeHolder - METHOD lambda$handleSignUpdate$11 (Lnet/minecraft/network/protocol/game/ServerboundSignUpdatePacket;Ljava/util/List;)V - ARG 2 texts + METHOD lambda$performSignedChatCommand$9 (Lnet/minecraft/commands/CommandSigningContext;Lnet/minecraft/commands/CommandSourceStack;)Lnet/minecraft/commands/CommandSourceStack; + ARG 2 source + METHOD lambda$signBook$4 (Lnet/minecraft/server/network/FilteredText;)Lnet/minecraft/server/network/Filterable; + ARG 1 filteredText METHOD noBlocksAround (Lnet/minecraft/world/entity/Entity;)Z ARG 1 entity METHOD parseCommand (Ljava/lang/String;)Lcom/mojang/brigadier/ParseResults; @@ -168,6 +170,8 @@ CLASS net/minecraft/server/network/ServerGamePacketListenerImpl METHOD sendPlayerChatMessage (Lnet/minecraft/network/chat/PlayerChatMessage;Lnet/minecraft/network/chat/ChatType$Bound;)V ARG 1 chatMessage ARG 2 boundType + METHOD shouldCheckPlayerMovement (Z)Z + ARG 1 isElytraMovement METHOD signBook (Lnet/minecraft/server/network/FilteredText;Ljava/util/List;I)V ARG 1 title ARG 2 pages @@ -178,14 +182,9 @@ CLASS net/minecraft/server/network/ServerGamePacketListenerImpl ARG 5 z ARG 7 yaw ARG 8 pitch - METHOD teleport (DDDFFLjava/util/Set;)V - COMMENT Teleports the player position to the (relative) values specified, and syncs to the client - ARG 1 x - ARG 3 y - ARG 5 z - ARG 7 yaw - ARG 8 pitch - ARG 9 relativeSet + METHOD teleport (Lnet/minecraft/world/entity/PositionMoveRotation;Ljava/util/Set;)V + ARG 1 posMoveRotation + ARG 2 relatives METHOD tryHandleChat (Ljava/lang/String;Ljava/lang/Runnable;)V ARG 1 message ARG 2 handler diff --git a/data/net/minecraft/server/network/ServerTextFilter.mapping b/data/net/minecraft/server/network/ServerTextFilter.mapping new file mode 100644 index 000000000..dc4de86b1 --- /dev/null +++ b/data/net/minecraft/server/network/ServerTextFilter.mapping @@ -0,0 +1,64 @@ +CLASS net/minecraft/server/network/ServerTextFilter + METHOD (Ljava/net/URL;Lnet/minecraft/server/network/ServerTextFilter$MessageEncoder;Lnet/minecraft/server/network/ServerTextFilter$IgnoreStrategy;Ljava/util/concurrent/ExecutorService;)V + ARG 1 chatEndpoint + ARG 2 chatEncoder + ARG 3 chatIgnoreStrategy + ARG 4 workerPool + METHOD createContext (Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/server/network/TextFilter; + ARG 1 profile + METHOD createFromConfig (Lnet/minecraft/server/dedicated/DedicatedServerProperties;)Lnet/minecraft/server/network/ServerTextFilter; + ARG 0 config + METHOD createWorkerPool (I)Ljava/util/concurrent/ExecutorService; + ARG 0 size + METHOD drainStream (Ljava/io/InputStream;)V + ARG 1 stream + METHOD filterText (Ljava/lang/String;Lnet/minecraft/server/network/ServerTextFilter$IgnoreStrategy;Lcom/google/gson/JsonObject;)Lnet/minecraft/server/network/FilteredText; + ARG 1 text + ARG 2 ignoreStrategy + ARG 3 response + METHOD getEndpoint (Ljava/net/URI;Lcom/google/gson/JsonObject;Ljava/lang/String;Ljava/lang/String;)Ljava/net/URL; + ARG 0 apiServer + ARG 1 json + ARG 2 key + ARG 3 fallback + METHOD getEndpointFromConfig (Lcom/google/gson/JsonObject;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 0 json + ARG 1 key + ARG 2 fallback + METHOD getURLConnection (Ljava/net/URL;)Ljava/net/HttpURLConnection; + ARG 1 url + METHOD makeRequest (Lcom/google/gson/JsonObject;Ljava/net/URL;)Ljava/net/HttpURLConnection; + ARG 1 request + ARG 2 endpoint + METHOD parseMask (Ljava/lang/String;Lcom/google/gson/JsonArray;Lnet/minecraft/server/network/ServerTextFilter$IgnoreStrategy;)Lnet/minecraft/network/chat/FilterMask; + ARG 1 text + ARG 2 hashes + ARG 3 ignoreStrategy + METHOD processRequestResponse (Lcom/google/gson/JsonObject;Ljava/net/URL;)Lcom/google/gson/JsonObject; + ARG 1 request + ARG 2 endpoint + METHOD requestMessageProcessing (Lcom/mojang/authlib/GameProfile;Ljava/lang/String;Lnet/minecraft/server/network/ServerTextFilter$IgnoreStrategy;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 profile + ARG 2 filter + ARG 3 chatIgnoreStrategy + ARG 4 streamExecutor + METHOD setAuthorizationProperty (Ljava/net/HttpURLConnection;)V + ARG 1 connection + CLASS PlayerContext + METHOD (Lnet/minecraft/server/network/ServerTextFilter;Lcom/mojang/authlib/GameProfile;)V + ARG 2 profile + CLASS IgnoreStrategy + METHOD ignoreOverThreshold (I)Lnet/minecraft/server/network/ServerTextFilter$IgnoreStrategy; + ARG 0 theshold + METHOD select (I)Lnet/minecraft/server/network/ServerTextFilter$IgnoreStrategy; + ARG 0 threshold + METHOD shouldIgnore (Ljava/lang/String;I)Z + ARG 1 text + ARG 2 numHashes + CLASS MessageEncoder + METHOD encode (Lcom/mojang/authlib/GameProfile;Ljava/lang/String;)Lcom/google/gson/JsonObject; + ARG 1 profile + ARG 2 message + CLASS RequestFailedException + METHOD (Ljava/lang/String;)V + ARG 1 message diff --git a/data/net/minecraft/server/network/TextFilterClient.mapping b/data/net/minecraft/server/network/TextFilterClient.mapping deleted file mode 100644 index 9d73c5735..000000000 --- a/data/net/minecraft/server/network/TextFilterClient.mapping +++ /dev/null @@ -1,89 +0,0 @@ -CLASS net/minecraft/server/network/TextFilterClient - METHOD (Ljava/net/URL;Lnet/minecraft/server/network/TextFilterClient$MessageEncoder;Ljava/net/URL;Lnet/minecraft/server/network/TextFilterClient$JoinOrLeaveEncoder;Ljava/net/URL;Lnet/minecraft/server/network/TextFilterClient$JoinOrLeaveEncoder;Ljava/lang/String;Lnet/minecraft/server/network/TextFilterClient$IgnoreStrategy;I)V - ARG 1 chatEndpoint - ARG 2 chatEncoder - ARG 3 joinEndpoint - ARG 4 joinEncoder - ARG 5 leaveEndpoint - ARG 6 leaveEncoder - ARG 7 authKey - ARG 8 chatIgnoreStrategy - ARG 9 workerThreadCount - METHOD createContext (Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/server/network/TextFilter; - ARG 1 profile - METHOD createFromConfig (Ljava/lang/String;)Lnet/minecraft/server/network/TextFilterClient; - ARG 0 config - METHOD drainStream (Ljava/io/InputStream;)V - ARG 1 stream - METHOD getEndpoint (Ljava/net/URI;Lcom/google/gson/JsonObject;Ljava/lang/String;Ljava/lang/String;)Ljava/net/URL; - ARG 0 uri - ARG 1 json - ARG 2 memberName - ARG 3 fallback - METHOD getEndpointFromConfig (Lcom/google/gson/JsonObject;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; - ARG 0 json - ARG 1 memberName - ARG 2 fallback - METHOD lambda$createFromConfig$1 (Ljava/lang/String;Ljava/lang/String;Lcom/mojang/authlib/GameProfile;)Lcom/google/gson/JsonObject; - ARG 2 profile - METHOD lambda$createFromConfig$2 (ILjava/lang/String;Ljava/lang/String;Lcom/mojang/authlib/GameProfile;Ljava/lang/String;)Lcom/google/gson/JsonObject; - ARG 3 profile - ARG 4 text - METHOD lambda$createFromConfig$3 (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/mojang/authlib/GameProfile;Ljava/lang/String;)Lcom/google/gson/JsonObject; - ARG 3 profile - ARG 4 text - METHOD lambda$static$0 (Ljava/lang/Runnable;)Ljava/lang/Thread; - ARG 0 task - METHOD makeRequest (Lcom/google/gson/JsonObject;Ljava/net/URL;)Ljava/net/HttpURLConnection; - ARG 1 json - ARG 2 requestUrl - METHOD parseMask (Ljava/lang/String;Lcom/google/gson/JsonArray;Lnet/minecraft/server/network/TextFilterClient$IgnoreStrategy;)Lnet/minecraft/network/chat/FilterMask; - ARG 1 text - ARG 2 hashes - ARG 3 ignoreStrategy - METHOD processJoinOrLeave (Lcom/mojang/authlib/GameProfile;Ljava/net/URL;Lnet/minecraft/server/network/TextFilterClient$JoinOrLeaveEncoder;Ljava/util/concurrent/Executor;)V - ARG 1 profile - ARG 2 url - ARG 3 encoder - ARG 4 executor - METHOD processRequest (Lcom/google/gson/JsonObject;Ljava/net/URL;)V - ARG 1 json - ARG 2 requestUrl - METHOD processRequestResponse (Lcom/google/gson/JsonObject;Ljava/net/URL;)Lcom/google/gson/JsonObject; - ARG 1 json - ARG 2 requestUrl - METHOD requestMessageProcessing (Lcom/mojang/authlib/GameProfile;Ljava/lang/String;Lnet/minecraft/server/network/TextFilterClient$IgnoreStrategy;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; - ARG 1 profile - ARG 2 text - ARG 3 ignoreStrategy - ARG 4 executor - CLASS PlayerContext - METHOD (Lnet/minecraft/server/network/TextFilterClient;Lcom/mojang/authlib/GameProfile;)V - ARG 2 profile - CLASS IgnoreStrategy - METHOD ignoreOverThreshold (I)Lnet/minecraft/server/network/TextFilterClient$IgnoreStrategy; - ARG 0 threshold - METHOD lambda$ignoreOverThreshold$2 (ILjava/lang/String;I)Z - ARG 1 text - ARG 2 threshold - METHOD lambda$static$0 (Ljava/lang/String;I)Z - ARG 0 text - ARG 1 threshold - METHOD lambda$static$1 (Ljava/lang/String;I)Z - ARG 0 text - ARG 1 threshold - METHOD select (I)Lnet/minecraft/server/network/TextFilterClient$IgnoreStrategy; - ARG 0 threshold - METHOD shouldIgnore (Ljava/lang/String;I)Z - ARG 1 text - ARG 2 threshold - CLASS MessageEncoder - METHOD encode (Lcom/mojang/authlib/GameProfile;Ljava/lang/String;)Lcom/google/gson/JsonObject; - ARG 1 profile - ARG 2 text - CLASS JoinOrLeaveEncoder - METHOD encode (Lcom/mojang/authlib/GameProfile;)Lcom/google/gson/JsonObject; - ARG 1 profile - CLASS RequestFailedException - METHOD (Ljava/lang/String;)V - ARG 1 message diff --git a/data/net/minecraft/server/packs/resources/PreparableReloadListener.mapping b/data/net/minecraft/server/packs/resources/PreparableReloadListener.mapping index ab931b50c..478aa89bd 100644 --- a/data/net/minecraft/server/packs/resources/PreparableReloadListener.mapping +++ b/data/net/minecraft/server/packs/resources/PreparableReloadListener.mapping @@ -1,11 +1,9 @@ CLASS net/minecraft/server/packs/resources/PreparableReloadListener - METHOD reload (Lnet/minecraft/server/packs/resources/PreparableReloadListener$PreparationBarrier;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;Lnet/minecraft/util/profiling/ProfilerFiller;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; - ARG 1 preparationBarrier - ARG 2 resourceManager - ARG 3 preparationsProfiler - ARG 4 reloadProfiler - ARG 5 backgroundExecutor - ARG 6 gameExecutor + METHOD reload (Lnet/minecraft/server/packs/resources/PreparableReloadListener$PreparationBarrier;Lnet/minecraft/server/packs/resources/ResourceManager;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + ARG 1 barrier + ARG 2 manager + ARG 3 backgroundExecutor + ARG 4 gameExecutor CLASS PreparationBarrier METHOD wait (Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture; ARG 1 backgroundResult diff --git a/data/net/minecraft/server/packs/resources/ProfiledReloadInstance.mapping b/data/net/minecraft/server/packs/resources/ProfiledReloadInstance.mapping index 6d8179846..ebb10191c 100644 --- a/data/net/minecraft/server/packs/resources/ProfiledReloadInstance.mapping +++ b/data/net/minecraft/server/packs/resources/ProfiledReloadInstance.mapping @@ -7,22 +7,10 @@ CLASS net/minecraft/server/packs/resources/ProfiledReloadInstance ARG 5 alsoWaitedFor METHOD finish (Ljava/util/List;)Ljava/util/List; ARG 1 datapoints - METHOD lambda$new$3 (Ljava/util/concurrent/Executor;Ljava/util/concurrent/atomic/AtomicLong;Ljava/lang/Runnable;)V - ARG 2 task - METHOD lambda$new$5 (Ljava/util/concurrent/Executor;Ljava/util/concurrent/atomic/AtomicLong;Ljava/lang/Runnable;)V - ARG 2 task - METHOD lambda$new$6 (Lnet/minecraft/server/packs/resources/PreparableReloadListener;Lnet/minecraft/util/profiling/ActiveProfiler;Lnet/minecraft/util/profiling/ActiveProfiler;Ljava/util/concurrent/atomic/AtomicLong;Ljava/util/concurrent/atomic/AtomicLong;Ljava/lang/Void;)Lnet/minecraft/server/packs/resources/ProfiledReloadInstance$State; - ARG 5 result - METHOD lambda$new$7 (Ljava/util/concurrent/Executor;Lnet/minecraft/server/packs/resources/PreparableReloadListener$PreparationBarrier;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/server/packs/resources/PreparableReloadListener;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; + METHOD lambda$new$1 (Ljava/util/concurrent/Executor;Lnet/minecraft/server/packs/resources/PreparableReloadListener$PreparationBarrier;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/server/packs/resources/PreparableReloadListener;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 1 barrier - ARG 2 resourceManager - ARG 3 listener - ARG 4 backgroundExecutor - ARG 5 gameExecutor - CLASS State - METHOD (Ljava/lang/String;Lnet/minecraft/util/profiling/ProfileResults;Lnet/minecraft/util/profiling/ProfileResults;Ljava/util/concurrent/atomic/AtomicLong;Ljava/util/concurrent/atomic/AtomicLong;)V - ARG 1 name - ARG 2 preperationResult - ARG 3 reloadResult - ARG 4 preperationNanos - ARG 5 reloadNanos + ARG 2 manager + METHOD profiledExecutor (Ljava/util/concurrent/Executor;Ljava/util/concurrent/atomic/AtomicLong;Ljava/lang/String;)Ljava/util/concurrent/Executor; + ARG 0 executor + ARG 1 timeTaken + ARG 2 name diff --git a/data/net/minecraft/server/packs/resources/ResourceManagerReloadListener.mapping b/data/net/minecraft/server/packs/resources/ResourceManagerReloadListener.mapping index fdcdc44fb..e78e24b24 100644 --- a/data/net/minecraft/server/packs/resources/ResourceManagerReloadListener.mapping +++ b/data/net/minecraft/server/packs/resources/ResourceManagerReloadListener.mapping @@ -1,10 +1,3 @@ CLASS net/minecraft/server/packs/resources/ResourceManagerReloadListener METHOD onResourceManagerReload (Lnet/minecraft/server/packs/resources/ResourceManager;)V ARG 1 resourceManager - METHOD reload (Lnet/minecraft/server/packs/resources/PreparableReloadListener$PreparationBarrier;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;Lnet/minecraft/util/profiling/ProfilerFiller;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; - ARG 1 stage - ARG 2 resourceManager - ARG 3 preparationsProfiler - ARG 4 reloadProfiler - ARG 5 backgroundExecutor - ARG 6 gameExecutor diff --git a/data/net/minecraft/server/packs/resources/SimpleJsonResourceReloadListener.mapping b/data/net/minecraft/server/packs/resources/SimpleJsonResourceReloadListener.mapping index 95452e8ac..ef1751841 100644 --- a/data/net/minecraft/server/packs/resources/SimpleJsonResourceReloadListener.mapping +++ b/data/net/minecraft/server/packs/resources/SimpleJsonResourceReloadListener.mapping @@ -1,13 +1,22 @@ CLASS net/minecraft/server/packs/resources/SimpleJsonResourceReloadListener - METHOD (Lcom/google/gson/Gson;Ljava/lang/String;)V - ARG 1 gson + METHOD (Lcom/mojang/serialization/Codec;Ljava/lang/String;)V + ARG 1 codec ARG 2 directory + METHOD (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Ljava/lang/String;)V + ARG 1 ops + ARG 2 codec + ARG 3 directory + METHOD (Lnet/minecraft/core/HolderLookup$Provider;Lcom/mojang/serialization/Codec;Ljava/lang/String;)V + ARG 1 registries + ARG 2 codec + ARG 3 directory METHOD prepare (Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;)Ljava/util/Map; COMMENT Performs any reloading that can be done off-thread, such as file IO ARG 1 resourceManager ARG 2 profiler - METHOD scanDirectory (Lnet/minecraft/server/packs/resources/ResourceManager;Ljava/lang/String;Lcom/google/gson/Gson;Ljava/util/Map;)V + METHOD scanDirectory (Lnet/minecraft/server/packs/resources/ResourceManager;Ljava/lang/String;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Ljava/util/Map;)V ARG 0 resourceManager - ARG 1 name - ARG 2 gson - ARG 3 output + ARG 1 directory + ARG 2 ops + ARG 3 codec + ARG 4 results diff --git a/data/net/minecraft/server/packs/resources/SimplePreparableReloadListener.mapping b/data/net/minecraft/server/packs/resources/SimplePreparableReloadListener.mapping index bfa8deaf1..f43e1ea68 100644 --- a/data/net/minecraft/server/packs/resources/SimplePreparableReloadListener.mapping +++ b/data/net/minecraft/server/packs/resources/SimplePreparableReloadListener.mapping @@ -3,16 +3,7 @@ CLASS net/minecraft/server/packs/resources/SimplePreparableReloadListener ARG 1 object ARG 2 resourceManager ARG 3 profiler - METHOD lambda$reload$1 (Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;Ljava/lang/Object;)V - ARG 3 object METHOD prepare (Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;)Ljava/lang/Object; COMMENT Performs any reloading that can be done off-thread, such as file IO ARG 1 resourceManager ARG 2 profiler - METHOD reload (Lnet/minecraft/server/packs/resources/PreparableReloadListener$PreparationBarrier;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;Lnet/minecraft/util/profiling/ProfilerFiller;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; - ARG 1 stage - ARG 2 resourceManager - ARG 3 preparationsProfiler - ARG 4 reloadProfiler - ARG 5 backgroundExecutor - ARG 6 gameExecutor diff --git a/data/net/minecraft/sounds/SoundEvent.mapping b/data/net/minecraft/sounds/SoundEvent.mapping index c212e54af..f381ede56 100644 --- a/data/net/minecraft/sounds/SoundEvent.mapping +++ b/data/net/minecraft/sounds/SoundEvent.mapping @@ -1,8 +1,4 @@ CLASS net/minecraft/sounds/SoundEvent - METHOD (Lnet/minecraft/resources/ResourceLocation;FZ)V - ARG 1 location - ARG 2 range - ARG 3 newSystem METHOD create (Lnet/minecraft/resources/ResourceLocation;Ljava/util/Optional;)Lnet/minecraft/sounds/SoundEvent; ARG 0 location ARG 1 range diff --git a/data/net/minecraft/stats/RecipeBook.mapping b/data/net/minecraft/stats/RecipeBook.mapping index 2bf7516f4..3934b19c2 100644 --- a/data/net/minecraft/stats/RecipeBook.mapping +++ b/data/net/minecraft/stats/RecipeBook.mapping @@ -1,30 +1,8 @@ CLASS net/minecraft/stats/RecipeBook - METHOD add (Lnet/minecraft/resources/ResourceLocation;)V - ARG 1 recipeId - METHOD add (Lnet/minecraft/world/item/crafting/RecipeHolder;)V - ARG 1 recipe - METHOD addHighlight (Lnet/minecraft/resources/ResourceLocation;)V - ARG 1 recipeId - METHOD addHighlight (Lnet/minecraft/world/item/crafting/RecipeHolder;)V - ARG 1 recipe - METHOD contains (Lnet/minecraft/resources/ResourceLocation;)Z - ARG 1 recipeId - METHOD contains (Lnet/minecraft/world/item/crafting/RecipeHolder;)Z - ARG 1 recipe - METHOD copyOverData (Lnet/minecraft/stats/RecipeBook;)V - ARG 1 other - METHOD isFiltering (Lnet/minecraft/world/inventory/RecipeBookMenu;)Z - ARG 1 bookMenu METHOD isFiltering (Lnet/minecraft/world/inventory/RecipeBookType;)Z ARG 1 bookType METHOD isOpen (Lnet/minecraft/world/inventory/RecipeBookType;)Z ARG 1 bookType - METHOD remove (Lnet/minecraft/resources/ResourceLocation;)V - ARG 1 recipeId - METHOD remove (Lnet/minecraft/world/item/crafting/RecipeHolder;)V - ARG 1 recipe - METHOD removeHighlight (Lnet/minecraft/world/item/crafting/RecipeHolder;)V - ARG 1 recipe METHOD setBookSetting (Lnet/minecraft/world/inventory/RecipeBookType;ZZ)V ARG 1 bookType ARG 2 open @@ -37,5 +15,3 @@ CLASS net/minecraft/stats/RecipeBook METHOD setOpen (Lnet/minecraft/world/inventory/RecipeBookType;Z)V ARG 1 bookType ARG 2 open - METHOD willHighlight (Lnet/minecraft/world/item/crafting/RecipeHolder;)Z - ARG 1 recipe diff --git a/data/net/minecraft/stats/RecipeBookSettings.mapping b/data/net/minecraft/stats/RecipeBookSettings.mapping index 15ece092b..26cbbe251 100644 --- a/data/net/minecraft/stats/RecipeBookSettings.mapping +++ b/data/net/minecraft/stats/RecipeBookSettings.mapping @@ -3,18 +3,22 @@ CLASS net/minecraft/stats/RecipeBookSettings ARG 1 states METHOD equals (Ljava/lang/Object;)Z ARG 1 other + METHOD getSettings (Lnet/minecraft/world/inventory/RecipeBookType;)Lnet/minecraft/stats/RecipeBookSettings$TypeSettings; + ARG 1 type METHOD isFiltering (Lnet/minecraft/world/inventory/RecipeBookType;)Z ARG 1 bookType METHOD isOpen (Lnet/minecraft/world/inventory/RecipeBookType;)Z ARG 1 bookType - METHOD lambda$new$0 (Ljava/util/EnumMap;)V - ARG 0 states - METHOD lambda$read$1 (Lnet/minecraft/nbt/CompoundTag;Ljava/util/Map;Lnet/minecraft/world/inventory/RecipeBookType;Lcom/mojang/datafixers/util/Pair;)V - ARG 2 bookType - ARG 3 fieldKeys - METHOD lambda$write$2 (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/world/inventory/RecipeBookType;Lcom/mojang/datafixers/util/Pair;)V - ARG 2 bookType - ARG 3 fieldKeys + METHOD lambda$read$3 (Lnet/minecraft/nbt/CompoundTag;Ljava/util/Map;Lnet/minecraft/world/inventory/RecipeBookType;Lcom/mojang/datafixers/util/Pair;)V + ARG 2 type + ARG 3 settings + METHOD lambda$setFiltering$2 (ZLnet/minecraft/stats/RecipeBookSettings$TypeSettings;)Lnet/minecraft/stats/RecipeBookSettings$TypeSettings; + ARG 1 settings + METHOD lambda$setOpen$1 (ZLnet/minecraft/stats/RecipeBookSettings$TypeSettings;)Lnet/minecraft/stats/RecipeBookSettings$TypeSettings; + ARG 1 settings + METHOD lambda$write$4 (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/world/inventory/RecipeBookType;Lcom/mojang/datafixers/util/Pair;)V + ARG 2 type + ARG 3 settings METHOD read (Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/stats/RecipeBookSettings; ARG 0 tag METHOD read (Lnet/minecraft/network/FriendlyByteBuf;)Lnet/minecraft/stats/RecipeBookSettings; @@ -27,6 +31,9 @@ CLASS net/minecraft/stats/RecipeBookSettings METHOD setOpen (Lnet/minecraft/world/inventory/RecipeBookType;Z)V ARG 1 bookType ARG 2 open + METHOD updateSettings (Lnet/minecraft/world/inventory/RecipeBookType;Ljava/util/function/UnaryOperator;)V + ARG 1 type + ARG 2 updater METHOD write (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 tag METHOD write (Lnet/minecraft/network/FriendlyByteBuf;)V @@ -37,3 +44,7 @@ CLASS net/minecraft/stats/RecipeBookSettings ARG 2 filtering METHOD equals (Ljava/lang/Object;)Z ARG 1 other + METHOD setFiltering (Z)Lnet/minecraft/stats/RecipeBookSettings$TypeSettings; + ARG 1 filtering + METHOD setOpen (Z)Lnet/minecraft/stats/RecipeBookSettings$TypeSettings; + ARG 1 open diff --git a/data/net/minecraft/stats/ServerRecipeBook.mapping b/data/net/minecraft/stats/ServerRecipeBook.mapping index 78677857c..79665441d 100644 --- a/data/net/minecraft/stats/ServerRecipeBook.mapping +++ b/data/net/minecraft/stats/ServerRecipeBook.mapping @@ -1,20 +1,40 @@ CLASS net/minecraft/stats/ServerRecipeBook + METHOD (Lnet/minecraft/stats/ServerRecipeBook$DisplayResolver;)V + ARG 1 displayResolver + METHOD add (Lnet/minecraft/resources/ResourceKey;)V + ARG 1 recipe + METHOD addHighlight (Lnet/minecraft/resources/ResourceKey;)V + ARG 1 recipe METHOD addRecipes (Ljava/util/Collection;Lnet/minecraft/server/level/ServerPlayer;)I ARG 1 recipes ARG 2 player - METHOD fromNbt (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/world/item/crafting/RecipeManager;)V + METHOD contains (Lnet/minecraft/resources/ResourceKey;)Z + ARG 1 recipe + METHOD copyOverData (Lnet/minecraft/stats/ServerRecipeBook;)V + ARG 1 other + METHOD fromNbt (Lnet/minecraft/nbt/CompoundTag;Ljava/util/function/Predicate;)V ARG 1 tag - ARG 2 recipeManager - METHOD loadRecipes (Lnet/minecraft/nbt/ListTag;Ljava/util/function/Consumer;Lnet/minecraft/world/item/crafting/RecipeManager;)V - ARG 1 tags - ARG 2 recipeConsumer - ARG 3 recipeManager + ARG 2 isRecognized + METHOD lambda$addRecipes$0 (Ljava/util/List;Lnet/minecraft/world/item/crafting/RecipeHolder;Lnet/minecraft/world/item/crafting/display/RecipeDisplayEntry;)V + ARG 2 entry + METHOD lambda$removeRecipes$1 (Ljava/util/List;Lnet/minecraft/world/item/crafting/display/RecipeDisplayEntry;)V + ARG 1 entry + METHOD lambda$sendInitialRecipeBook$2 (Ljava/util/List;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/world/item/crafting/display/RecipeDisplayEntry;)V + ARG 3 entry + METHOD loadRecipes (Lnet/minecraft/nbt/ListTag;Ljava/util/function/Consumer;Ljava/util/function/Predicate;)V + ARG 1 tag + ARG 2 output + ARG 3 isRecognized + METHOD remove (Lnet/minecraft/resources/ResourceKey;)V + ARG 1 recipe + METHOD removeHighlight (Lnet/minecraft/resources/ResourceKey;)V + ARG 1 recipe METHOD removeRecipes (Ljava/util/Collection;Lnet/minecraft/server/level/ServerPlayer;)I ARG 1 recipes ARG 2 player METHOD sendInitialRecipeBook (Lnet/minecraft/server/level/ServerPlayer;)V ARG 1 player - METHOD sendRecipes (Lnet/minecraft/network/protocol/game/ClientboundRecipePacket$State;Lnet/minecraft/server/level/ServerPlayer;Ljava/util/List;)V - ARG 1 state - ARG 2 player - ARG 3 recipes + CLASS DisplayResolver + METHOD displaysForRecipe (Lnet/minecraft/resources/ResourceKey;Ljava/util/function/Consumer;)V + ARG 1 recipe + ARG 2 output diff --git a/data/net/minecraft/tags/TagEntry.mapping b/data/net/minecraft/tags/TagEntry.mapping index 6e1e7e472..9ed9aadd1 100644 --- a/data/net/minecraft/tags/TagEntry.mapping +++ b/data/net/minecraft/tags/TagEntry.mapping @@ -37,7 +37,8 @@ CLASS net/minecraft/tags/TagEntry METHOD visitRequiredDependencies (Ljava/util/function/Consumer;)V ARG 1 visitor CLASS Lookup - METHOD element (Lnet/minecraft/resources/ResourceLocation;)Ljava/lang/Object; - ARG 1 elementLocation + METHOD element (Lnet/minecraft/resources/ResourceLocation;Z)Ljava/lang/Object; + ARG 1 id + ARG 2 required METHOD tag (Lnet/minecraft/resources/ResourceLocation;)Ljava/util/Collection; - ARG 1 tagLocation + ARG 1 id diff --git a/data/net/minecraft/tags/TagKey.mapping b/data/net/minecraft/tags/TagKey.mapping index ee42db951..8e0fe25ce 100644 --- a/data/net/minecraft/tags/TagKey.mapping +++ b/data/net/minecraft/tags/TagKey.mapping @@ -21,3 +21,7 @@ CLASS net/minecraft/tags/TagKey ARG 1 location METHOD lambda$hashedCodec$4 (Lnet/minecraft/tags/TagKey;)Ljava/lang/String; ARG 0 tagKey + METHOD lambda$streamCodec$5 (Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/tags/TagKey; + ARG 1 location + METHOD streamCodec (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/network/codec/StreamCodec; + ARG 0 registry diff --git a/data/net/minecraft/tags/TagLoader.mapping b/data/net/minecraft/tags/TagLoader.mapping index 5f1d030ce..0091a6ecb 100644 --- a/data/net/minecraft/tags/TagLoader.mapping +++ b/data/net/minecraft/tags/TagLoader.mapping @@ -1,19 +1,18 @@ CLASS net/minecraft/tags/TagLoader - METHOD (Ljava/util/function/Function;Ljava/lang/String;)V - ARG 1 idToValue + METHOD (Lnet/minecraft/tags/TagLoader$ElementLookup;Ljava/lang/String;)V + ARG 1 elementLookup ARG 2 directory METHOD build (Ljava/util/Map;)Ljava/util/Map; ARG 1 builders - METHOD build (Lnet/minecraft/tags/TagEntry$Lookup;Ljava/util/List;)Lcom/mojang/datafixers/util/Either; - ARG 1 lookup - ARG 2 entries + METHOD buildUpdatedLookups (Lnet/minecraft/core/RegistryAccess$Frozen;Ljava/util/List;)Ljava/util/List; + ARG 0 registry + ARG 1 tags + METHOD findTagsForRegistry (Ljava/util/List;Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/core/Registry$PendingTags; + ARG 0 tags + ARG 1 registryKey METHOD lambda$build$2 (Lnet/minecraft/util/DependencySorter;Lnet/minecraft/resources/ResourceLocation;Ljava/util/List;)V ARG 1 path ARG 2 entries - METHOD lambda$build$3 (Lnet/minecraft/resources/ResourceLocation;Ljava/util/Collection;)V - ARG 1 entries - METHOD lambda$build$4 (Ljava/util/Map;Lnet/minecraft/resources/ResourceLocation;Ljava/util/Collection;)V - ARG 2 element METHOD lambda$build$5 (Lnet/minecraft/tags/TagEntry$Lookup;Ljava/util/Map;Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/tags/TagLoader$SortingEntry;)V ARG 3 path ARG 4 sortingEntry @@ -23,10 +22,34 @@ CLASS net/minecraft/tags/TagLoader ARG 2 entry METHOD load (Lnet/minecraft/server/packs/resources/ResourceManager;)Ljava/util/Map; ARG 1 resourceManager - METHOD loadAndBuild (Lnet/minecraft/server/packs/resources/ResourceManager;)Ljava/util/Map; - ARG 1 resourceManager + METHOD loadPendingTags (Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/core/Registry;)Ljava/util/Optional; + ARG 0 resourceManager + ARG 1 registry + METHOD loadTagsForExistingRegistries (Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/core/RegistryAccess;)Ljava/util/List; + ARG 0 resourceManager + ARG 1 registryAccess + METHOD loadTagsForRegistry (Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/core/WritableRegistry;)V + ARG 0 resourceManager + ARG 1 registry + METHOD loadTagsFromNetwork (Lnet/minecraft/tags/TagNetworkSerialization$NetworkPayload;Lnet/minecraft/core/WritableRegistry;)V + ARG 0 payload + ARG 1 registry + METHOD tryBuildTag (Lnet/minecraft/tags/TagEntry$Lookup;Ljava/util/List;)Lcom/mojang/datafixers/util/Either; + ARG 1 lookup + ARG 2 entries + METHOD wrapTags (Lnet/minecraft/resources/ResourceKey;Ljava/util/Map;)Ljava/util/Map; + ARG 0 registryKey + ARG 1 tags CLASS SortingEntry METHOD lambda$visitOptionalDependencies$1 (Ljava/util/function/Consumer;Lnet/minecraft/tags/TagLoader$EntryWithSource;)V ARG 1 entry METHOD lambda$visitRequiredDependencies$0 (Ljava/util/function/Consumer;Lnet/minecraft/tags/TagLoader$EntryWithSource;)V ARG 1 entry + CLASS ElementLookup + METHOD fromFrozenRegistry (Lnet/minecraft/core/Registry;)Lnet/minecraft/tags/TagLoader$ElementLookup; + ARG 0 registry + METHOD fromWritableRegistry (Lnet/minecraft/core/WritableRegistry;)Lnet/minecraft/tags/TagLoader$ElementLookup; + ARG 0 registry + METHOD get (Lnet/minecraft/resources/ResourceLocation;Z)Ljava/util/Optional; + ARG 1 id + ARG 2 required diff --git a/data/net/minecraft/tags/TagManager.mapping b/data/net/minecraft/tags/TagManager.mapping deleted file mode 100644 index 4a53bfa57..000000000 --- a/data/net/minecraft/tags/TagManager.mapping +++ /dev/null @@ -1,18 +0,0 @@ -CLASS net/minecraft/tags/TagManager - METHOD (Lnet/minecraft/core/RegistryAccess;)V - ARG 1 registryAccess - METHOD createLoader (Lnet/minecraft/server/packs/resources/ResourceManager;Ljava/util/concurrent/Executor;Lnet/minecraft/core/RegistryAccess$RegistryEntry;)Ljava/util/concurrent/CompletableFuture; - ARG 1 resourceManager - ARG 2 backgroundExecutor - ARG 3 entry - METHOD lambda$reload$0 (Lnet/minecraft/server/packs/resources/ResourceManager;Ljava/util/concurrent/Executor;Lnet/minecraft/core/RegistryAccess$RegistryEntry;)Ljava/util/concurrent/CompletableFuture; - ARG 3 regustry - METHOD lambda$reload$2 (Ljava/util/List;Ljava/lang/Void;)V - ARG 2 result - METHOD reload (Lnet/minecraft/server/packs/resources/PreparableReloadListener$PreparationBarrier;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;Lnet/minecraft/util/profiling/ProfilerFiller;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; - ARG 1 stage - ARG 2 resourceManager - ARG 3 preparationsProfiler - ARG 4 reloadProfiler - ARG 5 backgroundExecutor - ARG 6 gameExecutor diff --git a/data/net/minecraft/tags/TagNetworkSerialization.mapping b/data/net/minecraft/tags/TagNetworkSerialization.mapping index e267a33c9..165d834ec 100644 --- a/data/net/minecraft/tags/TagNetworkSerialization.mapping +++ b/data/net/minecraft/tags/TagNetworkSerialization.mapping @@ -1,32 +1,21 @@ CLASS net/minecraft/tags/TagNetworkSerialization - METHOD deserializeTagsFromNetwork (Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/core/Registry;Lnet/minecraft/tags/TagNetworkSerialization$NetworkPayload;Lnet/minecraft/tags/TagNetworkSerialization$TagOutput;)V - ARG 0 registryKey - ARG 1 registry - ARG 2 networkPayload - ARG 3 output - METHOD lambda$deserializeTagsFromNetwork$3 (Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/core/Registry;Lnet/minecraft/tags/TagNetworkSerialization$TagOutput;Lnet/minecraft/resources/ResourceLocation;Lit/unimi/dsi/fastutil/ints/IntList;)V - ARG 3 path - ARG 4 ints + METHOD deserializeTagsFromNetwork (Lnet/minecraft/core/Registry;Lnet/minecraft/tags/TagNetworkSerialization$NetworkPayload;)Lnet/minecraft/tags/TagLoader$LoadResult; + ARG 0 registry + ARG 1 payload METHOD lambda$serializeTagsToNetwork$0 (Lnet/minecraft/core/RegistryAccess$RegistryEntry;)Lcom/mojang/datafixers/util/Pair; ARG 0 registry METHOD lambda$serializeTagsToNetwork$1 (Lcom/mojang/datafixers/util/Pair;)Z ARG 0 pair - METHOD lambda$serializeToNetwork$2 (Lnet/minecraft/core/Registry;Ljava/util/Map;Lcom/mojang/datafixers/util/Pair;)V - ARG 2 tag METHOD serializeTagsToNetwork (Lnet/minecraft/core/LayeredRegistryAccess;)Ljava/util/Map; ARG 0 registryAccess METHOD serializeToNetwork (Lnet/minecraft/core/Registry;)Lnet/minecraft/tags/TagNetworkSerialization$NetworkPayload; ARG 0 registry - CLASS TagOutput - METHOD accept (Lnet/minecraft/tags/TagKey;Ljava/util/List;)V - ARG 1 key - ARG 2 values CLASS NetworkPayload METHOD (Ljava/util/Map;)V ARG 1 tags - METHOD applyToRegistry (Lnet/minecraft/core/Registry;)V - ARG 1 registry METHOD read (Lnet/minecraft/network/FriendlyByteBuf;)Lnet/minecraft/tags/TagNetworkSerialization$NetworkPayload; ARG 0 buffer + METHOD resolve (Lnet/minecraft/core/Registry;)Lnet/minecraft/tags/TagLoader$LoadResult; + ARG 1 registry METHOD write (Lnet/minecraft/network/FriendlyByteBuf;)V ARG 1 buffer diff --git a/data/net/minecraft/util/ARGB.mapping b/data/net/minecraft/util/ARGB.mapping new file mode 100644 index 000000000..5432a4ffb --- /dev/null +++ b/data/net/minecraft/util/ARGB.mapping @@ -0,0 +1,67 @@ +CLASS net/minecraft/util/ARGB + METHOD alpha (I)I + ARG 0 color + METHOD as8BitChannel (F)I + ARG 0 value + METHOD average (II)I + ARG 0 color1 + ARG 1 color2 + METHOD blue (I)I + ARG 0 color + METHOD color (II)I + ARG 0 alpha + ARG 1 color + METHOD color (III)I + ARG 0 red + ARG 1 green + ARG 2 blue + METHOD color (IIII)I + ARG 0 alpha + ARG 1 red + ARG 2 green + ARG 3 blue + METHOD color (Lnet/minecraft/world/phys/Vec3;)I + ARG 0 color + METHOD colorFromFloat (FFFF)I + ARG 0 alpha + ARG 1 red + ARG 2 green + ARG 3 blue + METHOD from8BitChannel (I)F + ARG 0 value + METHOD fromABGR (I)I + ARG 0 color + METHOD green (I)I + ARG 0 color + METHOD greyscale (I)I + ARG 0 color + METHOD lerp (FII)I + ARG 0 delta + ARG 1 color1 + ARG 2 color2 + METHOD multiply (II)I + ARG 0 color1 + ARG 1 color2 + METHOD opaque (I)I + ARG 0 color + METHOD red (I)I + ARG 0 color + METHOD scaleRGB (IF)I + ARG 0 color + ARG 1 scale + METHOD scaleRGB (IFFF)I + ARG 0 color + ARG 1 redScale + ARG 2 greenScale + ARG 3 blueScale + METHOD scaleRGB (II)I + ARG 0 color + ARG 1 scale + METHOD toABGR (I)I + ARG 0 color + METHOD transparent (I)I + ARG 0 color + METHOD vector3fFromRGB24 (I)Lorg/joml/Vector3f; + ARG 0 color + METHOD white (F)I + ARG 0 alpha diff --git a/data/net/minecraft/util/BinaryAnimator.mapping b/data/net/minecraft/util/BinaryAnimator.mapping new file mode 100644 index 000000000..c0b502901 --- /dev/null +++ b/data/net/minecraft/util/BinaryAnimator.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/util/BinaryAnimator + METHOD (I)V + ARG 1 animationLength + METHOD (ILnet/minecraft/util/BinaryAnimator$EasingFunction;)V + ARG 1 animationLength + ARG 2 easingFunction + METHOD getFactor (F)F + ARG 1 partialTick + METHOD tick (Z)V + ARG 1 condition + CLASS EasingFunction + METHOD apply (F)F + ARG 1 ticks diff --git a/data/net/minecraft/util/ColorRGBA.mapping b/data/net/minecraft/util/ColorRGBA.mapping new file mode 100644 index 000000000..11b6d3dbc --- /dev/null +++ b/data/net/minecraft/util/ColorRGBA.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/util/ColorRGBA + METHOD lambda$static$2 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 color diff --git a/data/net/minecraft/util/CubicSpline.mapping b/data/net/minecraft/util/CubicSpline.mapping index ec829dde0..a681f2168 100644 --- a/data/net/minecraft/util/CubicSpline.mapping +++ b/data/net/minecraft/util/CubicSpline.mapping @@ -4,8 +4,14 @@ CLASS net/minecraft/util/CubicSpline METHOD builder (Lnet/minecraft/util/ToFloatFunction;Lnet/minecraft/util/ToFloatFunction;)Lnet/minecraft/util/CubicSpline$Builder; ARG 0 coordinate ARG 1 valueTransformer + METHOD codec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + ARG 0 codec METHOD constant (F)Lnet/minecraft/util/CubicSpline; ARG 0 value + METHOD lambda$codec$0 (FLnet/minecraft/util/CubicSpline;F)Lnet/minecraft/util/CubicSpline$1Point; + ARG 0 location + ARG 1 value + ARG 2 derivative METHOD lambda$codec$1 (Lorg/apache/commons/lang3/mutable/MutableObject;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 1 instance METHOD lambda$codec$4 (Lnet/minecraft/util/ToFloatFunction;Ljava/util/List;)Lnet/minecraft/util/CubicSpline$Multipoint; diff --git a/data/net/minecraft/util/ExtraCodecs.mapping b/data/net/minecraft/util/ExtraCodecs.mapping index 1fddf54e3..de36e867c 100644 --- a/data/net/minecraft/util/ExtraCodecs.mapping +++ b/data/net/minecraft/util/ExtraCodecs.mapping @@ -6,6 +6,8 @@ CLASS net/minecraft/util/ExtraCodecs METHOD converter (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Codec; ARG 0 ops METHOD dispatchOptionalValue (Ljava/lang/String;Ljava/lang/String;Lcom/mojang/serialization/Codec;Ljava/util/function/Function;Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec; + ARG 0 key1 + ARG 1 key2 ARG 2 codec ARG 3 keyGetter ARG 4 codecGetter @@ -15,6 +17,10 @@ CLASS net/minecraft/util/ExtraCodecs ARG 0 min ARG 1 max ARG 2 errorMessage + METHOD floatRangeMinInclusiveWithMessage (FFLjava/util/function/Function;)Lcom/mojang/serialization/Codec; + ARG 0 min + ARG 1 max + ARG 2 errorMessage METHOD idResolverCodec (Ljava/util/function/ToIntFunction;Ljava/util/function/IntFunction;I)Lcom/mojang/serialization/Codec; ARG 0 encoder ARG 1 decoder @@ -33,20 +39,6 @@ CLASS net/minecraft/util/ExtraCodecs ARG 3 factory ARG 4 minGetter ARG 5 maxGetter - METHOD lambda$ensureHomogenous$47 (Ljava/util/function/Function;Ljava/util/Collection;)Lcom/mojang/serialization/DataResult; - ARG 1 value - METHOD lambda$floatRangeMinExclusiveWithMessage$40 (FFLjava/util/function/Function;Ljava/lang/Float;)Lcom/mojang/serialization/DataResult; - ARG 3 value - METHOD lambda$intRange$38 (IILjava/lang/Integer;)Ljava/lang/String; - ARG 2 value - METHOD lambda$intRangeWithMessage$35 (IILjava/util/function/Function;Ljava/lang/Integer;)Lcom/mojang/serialization/DataResult; - ARG 3 value - METHOD lambda$nonEmptyHolderSet$45 (Lnet/minecraft/core/HolderSet;)Lcom/mojang/serialization/DataResult; - ARG 0 value - METHOD lambda$nonEmptyList$43 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; - ARG 0 value - METHOD lambda$sizeLimitedMap$81 (ILjava/util/Map;)Lcom/mojang/serialization/DataResult; - ARG 1 value METHOD lambda$static$10 (Lorg/joml/Quaternionf;)Ljava/util/List; ARG 0 quaternion METHOD lambda$static$11 (Lorg/joml/AxisAngle4f;)Ljava/lang/Float; @@ -61,85 +53,56 @@ CLASS net/minecraft/util/ExtraCodecs ARG 0 list METHOD lambda$static$16 (Lorg/joml/Matrix4f;)Ljava/util/List; ARG 0 matrix - METHOD lambda$static$17 (Lorg/joml/Vector4f;)Ljava/lang/Integer; + METHOD lambda$static$17 (Lorg/joml/Vector3f;)Ljava/lang/Integer; + ARG 0 color + METHOD lambda$static$18 (Lorg/joml/Vector4f;)Ljava/lang/Integer; ARG 0 color - METHOD lambda$static$19 (Ljava/lang/Integer;)Lcom/mojang/serialization/DataResult; - ARG 0 value METHOD lambda$static$2 (Ljava/util/List;)Lorg/joml/Vector3f; ARG 0 values + METHOD lambda$static$20 (Ljava/lang/Integer;)Lcom/mojang/serialization/DataResult; + ARG 0 value METHOD lambda$static$3 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; ARG 0 list - METHOD lambda$static$36 (Ljava/lang/Integer;)Ljava/lang/String; - ARG 0 value METHOD lambda$static$37 (Ljava/lang/Integer;)Ljava/lang/String; ARG 0 value + METHOD lambda$static$38 (Ljava/lang/Integer;)Ljava/lang/String; + ARG 0 value METHOD lambda$static$4 (Lorg/joml/Vector3f;)Ljava/util/List; ARG 0 vector - METHOD lambda$static$41 (Ljava/lang/Float;)Ljava/lang/String; + METHOD lambda$static$44 (Ljava/lang/Float;)Ljava/lang/String; + ARG 0 value + METHOD lambda$static$45 (Ljava/lang/Float;)Ljava/lang/String; ARG 0 value - METHOD lambda$static$49 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; - ARG 0 pattern METHOD lambda$static$5 (Ljava/util/List;)Lorg/joml/Vector4f; ARG 0 values - METHOD lambda$static$52 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; - ARG 0 string - METHOD lambda$static$53 ([B)Ljava/lang/String; - ARG 0 value - METHOD lambda$static$54 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + METHOD lambda$static$55 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 pattern + METHOD lambda$static$58 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 data + METHOD lambda$static$6 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 0 list + METHOD lambda$static$60 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; ARG 0 value - METHOD lambda$static$55 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/util/ExtraCodecs$TagOrElementLocation; + METHOD lambda$static$61 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/util/ExtraCodecs$TagOrElementLocation; ARG 0 location - METHOD lambda$static$56 (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/util/ExtraCodecs$TagOrElementLocation; - ARG 0 location - METHOD lambda$static$57 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; - ARG 0 value - METHOD lambda$static$58 (Ljava/util/Optional;)Ljava/util/OptionalLong; + METHOD lambda$static$63 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; ARG 0 value - METHOD lambda$static$59 (Ljava/util/OptionalLong;)Ljava/util/Optional; - ARG 0 value - METHOD lambda$static$6 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; - ARG 0 list - METHOD lambda$static$60 (Ljava/util/stream/LongStream;)Ljava/util/BitSet; - ARG 0 longs - METHOD lambda$static$61 (Ljava/util/BitSet;)Ljava/util/stream/LongStream; - ARG 0 bitSet - METHOD lambda$static$62 (Lcom/mojang/authlib/properties/Property;)Ljava/util/Optional; - ARG 0 property - METHOD lambda$static$63 (Ljava/lang/String;Ljava/lang/String;Ljava/util/Optional;)Lcom/mojang/authlib/properties/Property; - ARG 0 name - ARG 1 value - ARG 2 signature - METHOD lambda$static$64 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD lambda$static$68 (Lcom/mojang/datafixers/util/Either;)Lcom/mojang/authlib/properties/PropertyMap; - ARG 0 either METHOD lambda$static$7 (Lorg/joml/Vector4f;)Ljava/util/List; ARG 0 vector - METHOD lambda$static$71 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; - ARG 0 value - METHOD lambda$static$72 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD lambda$static$74 (Lcom/mojang/authlib/GameProfile;Lcom/mojang/authlib/properties/PropertyMap;)Lcom/mojang/authlib/GameProfile; - ARG 0 gameProfile - ARG 1 properties - METHOD lambda$static$75 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance METHOD lambda$static$77 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; ARG 0 value - METHOD lambda$static$79 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; - ARG 0 value METHOD lambda$static$8 (Ljava/util/List;)Lorg/joml/Quaternionf; ARG 0 values METHOD lambda$static$83 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; ARG 0 value METHOD lambda$static$9 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; ARG 0 list - METHOD lambda$temporalCodec$50 (Ljava/time/format/DateTimeFormatter;Ljava/lang/String;)Lcom/mojang/serialization/DataResult; - ARG 1 value METHOD nonEmptyHolderSet (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; ARG 0 codec METHOD nonEmptyList (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; ARG 0 codec + METHOD nonEmptyMap (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + ARG 0 mapCodec METHOD object2BooleanMap (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; ARG 0 codec METHOD optionalEmptyMap (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; @@ -157,6 +120,8 @@ CLASS net/minecraft/util/ExtraCodecs ARG 1 lifecycleGetter METHOD overrideLifecycle (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; ARG 0 codec + ARG 1 applyLifecycle + ARG 2 coApplyLifecycle METHOD retrieveContext (Ljava/util/function/Function;)Lcom/mojang/serialization/MapCodec; ARG 0 retriever METHOD sizeLimitedMap (Lcom/mojang/serialization/Codec;I)Lcom/mojang/serialization/Codec; diff --git a/data/net/minecraft/util/FastColor.mapping b/data/net/minecraft/util/FastColor.mapping deleted file mode 100644 index c2d9d65e9..000000000 --- a/data/net/minecraft/util/FastColor.mapping +++ /dev/null @@ -1,64 +0,0 @@ -CLASS net/minecraft/util/FastColor - METHOD as8BitChannel (F)I - ARG 0 value - CLASS ABGR32 - METHOD alpha (I)I - ARG 0 packedColor - METHOD blue (I)I - ARG 0 packedColor - METHOD color (II)I - ARG 0 alpha - ARG 1 packedColor - METHOD color (IIII)I - ARG 0 alpha - ARG 1 blue - ARG 2 green - ARG 3 red - METHOD fromArgb32 (I)I - ARG 0 color - METHOD green (I)I - ARG 0 packedColor - METHOD opaque (I)I - ARG 0 packedColor - METHOD red (I)I - ARG 0 packedColor - METHOD transparent (I)I - ARG 0 packedColor - CLASS ARGB32 - METHOD alpha (I)I - ARG 0 packedColor - METHOD average (II)I - ARG 0 color1 - ARG 1 color2 - METHOD blue (I)I - ARG 0 packedColor - METHOD color (II)I - ARG 0 alpha - ARG 1 color - METHOD color (III)I - ARG 0 red - ARG 1 green - ARG 2 blue - METHOD color (IIII)I - ARG 0 alpha - ARG 1 red - ARG 2 green - ARG 3 blue - METHOD colorFromFloat (FFFF)I - ARG 0 alpha - ARG 1 red - ARG 2 green - ARG 3 blue - METHOD green (I)I - ARG 0 packedColor - METHOD lerp (FII)I - ARG 0 delta - ARG 1 min - ARG 2 max - METHOD multiply (II)I - ARG 0 packedColourOne - ARG 1 packedColorTwo - METHOD opaque (I)I - ARG 0 color - METHOD red (I)I - ARG 0 packedColor diff --git a/data/net/minecraft/util/Mth.mapping b/data/net/minecraft/util/Mth.mapping index c3d4f41b7..f879c91fe 100644 --- a/data/net/minecraft/util/Mth.mapping +++ b/data/net/minecraft/util/Mth.mapping @@ -99,11 +99,6 @@ CLASS net/minecraft/util/Mth ARG 2 inputMax ARG 3 outputMin ARG 4 outputMax - METHOD color (FFF)I - COMMENT Makes an integer color from the given red, green, and blue float values - ARG 0 r - ARG 1 g - ARG 2 b METHOD cos (F)F COMMENT cos looked up in the sin table with the appropriate offset ARG 0 value @@ -119,6 +114,8 @@ CLASS net/minecraft/util/Mth COMMENT {@return the absolute of the difference between two angles in degrees} ARG 0 start ARG 1 end + METHOD easeInOutSine (F)F + ARG 0 value METHOD equal (DD)Z ARG 0 x ARG 2 y @@ -188,6 +185,9 @@ CLASS net/minecraft/util/Mth ARG 0 xDistance ARG 2 yDistance ARG 4 zDistance + METHOD length (FF)F + ARG 0 xDistance + ARG 1 yDistance METHOD lengthSquared (DD)D ARG 0 xDistance ARG 2 yDistance @@ -207,6 +207,10 @@ CLASS net/minecraft/util/Mth COMMENT Start value for the lerp ARG 4 end COMMENT End value for the lerp + METHOD lerp (DLnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/world/phys/Vec3; + ARG 0 delta + ARG 2 start + ARG 3 end METHOD lerp (FFF)F COMMENT Method for linear interpolation of floats ARG 0 delta @@ -291,6 +295,8 @@ CLASS net/minecraft/util/Mth ARG 1 lowerBound ARG 2 upperBound ARG 3 steps + METHOD packDegrees (F)B + ARG 0 degrees METHOD positiveCeilDiv (II)I COMMENT Returns the smallest (closest to negative infinity) int value that is greater than or equal to the algebraic quotient. COMMENT @see java.lang.Math#floorDiv(int, int) @@ -331,6 +337,10 @@ CLASS net/minecraft/util/Mth COMMENT A value between 0 and 1 that indicates the percentage of the lerp. (0 will give the start value and 1 will give the end value) ARG 1 start ARG 2 end + METHOD rotLerpRad (FFF)F + ARG 0 delta + ARG 1 start + ARG 2 end METHOD rotateIfNecessary (FFF)F COMMENT Takes a rotation and compares it to another rotation. COMMENT If the difference is greater than a given maximum, clamps the original rotation between to have at most the given difference to the actual rotation. @@ -373,6 +383,8 @@ CLASS net/minecraft/util/Mth METHOD triangleWave (FF)F ARG 0 input ARG 1 period + METHOD unpackDegrees (B)F + ARG 0 degrees METHOD wobble (D)D ARG 0 input METHOD wrapDegrees (D)D @@ -384,3 +396,5 @@ CLASS net/minecraft/util/Mth METHOD wrapDegrees (I)I COMMENT Adjust the angle so that its value is in the range [-180;180) ARG 0 angle + METHOD wrapDegrees (J)F + ARG 0 angle diff --git a/data/net/minecraft/util/RandomSource.mapping b/data/net/minecraft/util/RandomSource.mapping index 22b98ba05..f980285da 100644 --- a/data/net/minecraft/util/RandomSource.mapping +++ b/data/net/minecraft/util/RandomSource.mapping @@ -21,3 +21,6 @@ CLASS net/minecraft/util/RandomSource METHOD triangle (DD)D ARG 1 center ARG 3 maxDeviation + METHOD triangle (FF)F + ARG 1 center + ARG 2 maxDeviation diff --git a/data/net/minecraft/util/SmoothDouble.mapping b/data/net/minecraft/util/SmoothDouble.mapping new file mode 100644 index 000000000..f9748d09c --- /dev/null +++ b/data/net/minecraft/util/SmoothDouble.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/util/SmoothDouble + METHOD getNewDeltaValue (DD)D + ARG 1 input + ARG 3 multiplier diff --git a/data/net/minecraft/util/SpawnUtil.mapping b/data/net/minecraft/util/SpawnUtil.mapping index eb4016caf..134d53030 100644 --- a/data/net/minecraft/util/SpawnUtil.mapping +++ b/data/net/minecraft/util/SpawnUtil.mapping @@ -4,13 +4,13 @@ CLASS net/minecraft/util/SpawnUtil ARG 1 yOffset ARG 2 pos ARG 3 strategy - METHOD trySpawnMob (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;IIILnet/minecraft/util/SpawnUtil$Strategy;)Ljava/util/Optional; + METHOD trySpawnMob (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;IIILnet/minecraft/util/SpawnUtil$Strategy;)Ljava/util/Optional; ARG 0 entityType - ARG 1 spawnType + ARG 1 spawnReason ARG 2 level ARG 3 pos ARG 4 attempts - ARG 5 spread + ARG 5 range ARG 6 yOffset ARG 7 strategy CLASS Strategy diff --git a/data/net/minecraft/util/StringRepresentable.mapping b/data/net/minecraft/util/StringRepresentable.mapping index 9af885450..b2fa5bd4c 100644 --- a/data/net/minecraft/util/StringRepresentable.mapping +++ b/data/net/minecraft/util/StringRepresentable.mapping @@ -23,6 +23,9 @@ CLASS net/minecraft/util/StringRepresentable METHOD byName (Ljava/lang/String;Ljava/lang/Enum;)Ljava/lang/Enum; ARG 1 name ARG 2 defaultValue + METHOD byName (Ljava/lang/String;Ljava/util/function/Supplier;)Ljava/lang/Enum; + ARG 1 name + ARG 2 defaultValue CLASS StringRepresentableCodec METHOD ([Lnet/minecraft/util/StringRepresentable;Ljava/util/function/Function;Ljava/util/function/ToIntFunction;)V ARG 1 values diff --git a/data/net/minecraft/util/TickThrottler.mapping b/data/net/minecraft/util/TickThrottler.mapping new file mode 100644 index 000000000..f0ea12300 --- /dev/null +++ b/data/net/minecraft/util/TickThrottler.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/util/TickThrottler + METHOD (II)V + ARG 1 incrementStep + ARG 2 threshold diff --git a/data/net/minecraft/util/TriState.mapping b/data/net/minecraft/util/TriState.mapping new file mode 100644 index 000000000..0314308a4 --- /dev/null +++ b/data/net/minecraft/util/TriState.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/util/TriState + METHOD toBoolean (Z)Z + ARG 1 defaultValue diff --git a/data/net/minecraft/util/context/ContextKey.mapping b/data/net/minecraft/util/context/ContextKey.mapping new file mode 100644 index 000000000..a96f9b123 --- /dev/null +++ b/data/net/minecraft/util/context/ContextKey.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/util/context/ContextKey + METHOD (Lnet/minecraft/resources/ResourceLocation;)V + ARG 1 name + METHOD vanilla (Ljava/lang/String;)Lnet/minecraft/util/context/ContextKey; + ARG 0 name diff --git a/data/net/minecraft/util/context/ContextKeySet.mapping b/data/net/minecraft/util/context/ContextKeySet.mapping new file mode 100644 index 000000000..93e6f7b09 --- /dev/null +++ b/data/net/minecraft/util/context/ContextKeySet.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/util/context/ContextKeySet + METHOD (Ljava/util/Set;Ljava/util/Set;)V + ARG 1 required + ARG 2 allowed + METHOD lambda$toString$0 (Lnet/minecraft/util/context/ContextKey;)Ljava/lang/String; + ARG 1 key + CLASS Builder + METHOD optional (Lnet/minecraft/util/context/ContextKey;)Lnet/minecraft/util/context/ContextKeySet$Builder; + ARG 1 key + METHOD required (Lnet/minecraft/util/context/ContextKey;)Lnet/minecraft/util/context/ContextKeySet$Builder; + ARG 1 key diff --git a/data/net/minecraft/util/context/ContextMap.mapping b/data/net/minecraft/util/context/ContextMap.mapping new file mode 100644 index 000000000..531dd409c --- /dev/null +++ b/data/net/minecraft/util/context/ContextMap.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/util/context/ContextMap + METHOD (Ljava/util/Map;)V + ARG 1 params + METHOD getOptional (Lnet/minecraft/util/context/ContextKey;)Ljava/lang/Object; + ARG 1 key + METHOD getOrDefault (Lnet/minecraft/util/context/ContextKey;Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 key + ARG 2 defaultValue + METHOD getOrThrow (Lnet/minecraft/util/context/ContextKey;)Ljava/lang/Object; + ARG 1 key + METHOD has (Lnet/minecraft/util/context/ContextKey;)Z + ARG 1 key + CLASS Builder + METHOD create (Lnet/minecraft/util/context/ContextKeySet;)Lnet/minecraft/util/context/ContextMap; + ARG 1 contextKeySet + METHOD getOptionalParameter (Lnet/minecraft/util/context/ContextKey;)Ljava/lang/Object; + ARG 1 key + METHOD getParameter (Lnet/minecraft/util/context/ContextKey;)Ljava/lang/Object; + ARG 1 key + METHOD withOptionalParameter (Lnet/minecraft/util/context/ContextKey;Ljava/lang/Object;)Lnet/minecraft/util/context/ContextMap$Builder; + ARG 1 key + ARG 2 value + METHOD withParameter (Lnet/minecraft/util/context/ContextKey;Ljava/lang/Object;)Lnet/minecraft/util/context/ContextMap$Builder; + ARG 1 key + ARG 2 value diff --git a/data/net/minecraft/util/datafix/ExtraDataFixUtils.mapping b/data/net/minecraft/util/datafix/ExtraDataFixUtils.mapping index cd5b86364..14766f674 100644 --- a/data/net/minecraft/util/datafix/ExtraDataFixUtils.mapping +++ b/data/net/minecraft/util/datafix/ExtraDataFixUtils.mapping @@ -1,4 +1,9 @@ CLASS net/minecraft/util/datafix/ExtraDataFixUtils + METHOD blockState (Ljava/lang/String;)Lcom/mojang/serialization/Dynamic; + ARG 0 blockId + METHOD blockState (Ljava/lang/String;Ljava/util/Map;)Lcom/mojang/serialization/Dynamic; + ARG 0 blockId + ARG 1 properties METHOD cast (Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; ARG 0 type ARG 1 data @@ -6,3 +11,14 @@ CLASS net/minecraft/util/datafix/ExtraDataFixUtils ARG 0 filters METHOD fixBlockPos (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 0 data + METHOD fixStringField (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Ljava/util/function/UnaryOperator;)Lcom/mojang/serialization/Dynamic; + ARG 0 data + ARG 1 fieldName + ARG 2 fixer + METHOD patchSubType (Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/Type;)Lcom/mojang/datafixers/types/Type; + ARG 0 type + ARG 1 oldSubType + ARG 2 newSubType + METHOD typePatcher (Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/Type;)Lcom/mojang/datafixers/TypeRewriteRule; + ARG 0 oldType + ARG 1 newType diff --git a/data/net/minecraft/util/datafix/fixes/AttributeIdPrefixFix.mapping b/data/net/minecraft/util/datafix/fixes/AttributeIdPrefixFix.mapping new file mode 100644 index 000000000..27c124b9a --- /dev/null +++ b/data/net/minecraft/util/datafix/fixes/AttributeIdPrefixFix.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/util/datafix/fixes/AttributeIdPrefixFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD replaceId (Ljava/lang/String;)Ljava/lang/String; + ARG 0 id diff --git a/data/net/minecraft/util/datafix/fixes/AttributesRenameFix.mapping b/data/net/minecraft/util/datafix/fixes/AttributesRenameFix.mapping new file mode 100644 index 000000000..9b18ddd34 --- /dev/null +++ b/data/net/minecraft/util/datafix/fixes/AttributesRenameFix.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/util/datafix/fixes/AttributesRenameFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/function/UnaryOperator;)V + ARG 1 outputSchema + ARG 2 name + ARG 3 renames + METHOD fixDataComponents (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 1 dataComponents + METHOD fixEntity (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 1 data + METHOD fixIdField (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 data + METHOD fixTypeField (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 data diff --git a/data/net/minecraft/util/datafix/fixes/AttributesRename.mapping b/data/net/minecraft/util/datafix/fixes/AttributesRenameLegacy.mapping similarity index 78% rename from data/net/minecraft/util/datafix/fixes/AttributesRename.mapping rename to data/net/minecraft/util/datafix/fixes/AttributesRenameLegacy.mapping index c30aba5e0..7936f7692 100644 --- a/data/net/minecraft/util/datafix/fixes/AttributesRename.mapping +++ b/data/net/minecraft/util/datafix/fixes/AttributesRenameLegacy.mapping @@ -1,11 +1,11 @@ -CLASS net/minecraft/util/datafix/fixes/AttributesRename +CLASS net/minecraft/util/datafix/fixes/AttributesRenameLegacy METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/util/function/UnaryOperator;)V ARG 1 outputSchema ARG 2 name ARG 3 renames METHOD fixEntity (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; - ARG 1 data + ARG 1 entityTag METHOD fixItemStackTag (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; - ARG 1 data + ARG 1 itemStackTag METHOD fixName (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; - ARG 1 data + ARG 1 name diff --git a/data/net/minecraft/util/datafix/fixes/BitStorageAlignFix.mapping b/data/net/minecraft/util/datafix/fixes/BitStorageAlignFix.mapping index c8712d04a..4435bbe6e 100644 --- a/data/net/minecraft/util/datafix/fixes/BitStorageAlignFix.mapping +++ b/data/net/minecraft/util/datafix/fixes/BitStorageAlignFix.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/util/datafix/fixes/BitStorageAlignFix METHOD updateHeightmaps (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; ARG 1 data METHOD updateSections (Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/OpticFinder;Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; - ARG 0 sections - ARG 2 palette + ARG 0 sectionsFinder + ARG 1 sectionElementFinder + ARG 2 paletteFinder ARG 3 data diff --git a/data/net/minecraft/util/datafix/fixes/BoatSplitFix.mapping b/data/net/minecraft/util/datafix/fixes/BoatSplitFix.mapping new file mode 100644 index 000000000..b831f900a --- /dev/null +++ b/data/net/minecraft/util/datafix/fixes/BoatSplitFix.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/util/datafix/fixes/BoatSplitFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD isAnyBoat (Ljava/lang/String;)Z + ARG 0 id + METHOD isChestBoat (Ljava/lang/String;)Z + ARG 0 id + METHOD isNormalBoat (Ljava/lang/String;)Z + ARG 0 id + METHOD lambda$makeRule$0 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 data + METHOD mapVariantToChestBoat (Ljava/lang/String;)Ljava/lang/String; + ARG 0 variant + METHOD mapVariantToNormalBoat (Ljava/lang/String;)Ljava/lang/String; + ARG 0 variant diff --git a/data/net/minecraft/util/datafix/fixes/CarvingStepRemoveFix.mapping b/data/net/minecraft/util/datafix/fixes/CarvingStepRemoveFix.mapping new file mode 100644 index 000000000..30981a3bb --- /dev/null +++ b/data/net/minecraft/util/datafix/fixes/CarvingStepRemoveFix.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/util/datafix/fixes/CarvingStepRemoveFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD fixChunk (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 0 chunkTag diff --git a/data/net/minecraft/util/datafix/fixes/ChunkPalettedStorageFix.mapping b/data/net/minecraft/util/datafix/fixes/ChunkPalettedStorageFix.mapping index 14e7fa238..cf79cf597 100644 --- a/data/net/minecraft/util/datafix/fixes/ChunkPalettedStorageFix.mapping +++ b/data/net/minecraft/util/datafix/fixes/ChunkPalettedStorageFix.mapping @@ -2,14 +2,6 @@ CLASS net/minecraft/util/datafix/fixes/ChunkPalettedStorageFix METHOD (Lcom/mojang/datafixers/schemas/Schema;Z)V ARG 1 outputSchema ARG 2 changesType - METHOD addBanners (Ljava/util/Map;ILjava/lang/String;)V - ARG 0 map - ARG 1 id - ARG 2 bannerColor - METHOD addBeds (Ljava/util/Map;ILjava/lang/String;)V - ARG 0 map - ARG 1 id - ARG 2 bedColor METHOD fix (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 1 dynamic METHOD getName (Lcom/mojang/serialization/Dynamic;)Ljava/lang/String; @@ -25,40 +17,30 @@ CLASS net/minecraft/util/datafix/fixes/ChunkPalettedStorageFix METHOD idFor (Lnet/minecraft/util/CrudeIncrementalIntIdentityHashBiMap;Lcom/mojang/serialization/Dynamic;)I ARG 0 palette ARG 1 data - METHOD lambda$static$0 (Ljava/util/HashMap;)V - ARG 0 map - METHOD lambda$static$1 (Ljava/util/HashMap;)V - ARG 0 map - METHOD lambda$static$2 (Ljava/util/HashMap;)V - ARG 0 map - METHOD lambda$static$3 (Ljava/util/HashMap;)V - ARG 0 map - METHOD lambda$static$4 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V - ARG 0 map - METHOD lambda$static$5 (Ljava/util/HashMap;)V - ARG 0 map - METHOD lambda$static$6 (Ljava/util/HashMap;)V - ARG 0 map - METHOD mapDoor (Ljava/util/Map;Ljava/lang/String;I)V - ARG 0 map - ARG 1 doorId - ARG 2 id - METHOD mapSkull (Ljava/util/Map;ILjava/lang/String;Ljava/lang/String;)V - ARG 0 map - ARG 1 id - ARG 2 skullType - ARG 3 suffix CLASS Section METHOD (Lcom/mojang/serialization/Dynamic;)V ARG 1 section + METHOD addFix (II)V + ARG 1 index + ARG 2 value METHOD getBlock (I)Lcom/mojang/serialization/Dynamic; - ARG 1 id + ARG 1 index METHOD setBlock (ILcom/mojang/serialization/Dynamic;)V ARG 1 index - ARG 2 data + ARG 2 block + METHOD upgrade (I)I + ARG 1 sides CLASS DataLayer METHOD ([B)V ARG 1 data + METHOD get (III)I + ARG 1 x + ARG 2 y + ARG 3 z + METHOD getPosition (I)I + ARG 1 packedPos + METHOD isFirst (I)Z + ARG 1 packedPos CLASS Direction METHOD (Ljava/lang/String;ILnet/minecraft/util/datafix/fixes/ChunkPalettedStorageFix$Direction$AxisDirection;Lnet/minecraft/util/datafix/fixes/ChunkPalettedStorageFix$Direction$Axis;)V ARG 3 axisDirection @@ -69,11 +51,36 @@ CLASS net/minecraft/util/datafix/fixes/ChunkPalettedStorageFix CLASS UpgradeChunk METHOD (Lcom/mojang/serialization/Dynamic;)V ARG 1 level + METHOD getBlock (I)Lcom/mojang/serialization/Dynamic; + ARG 1 index METHOD getBlockEntity (I)Lcom/mojang/serialization/Dynamic; ARG 1 index + METHOD getSection (I)Lnet/minecraft/util/datafix/fixes/ChunkPalettedStorageFix$Section; + ARG 1 index METHOD relative (ILnet/minecraft/util/datafix/fixes/ChunkPalettedStorageFix$Direction;)I + ARG 0 data ARG 1 direction METHOD removeBlockEntity (I)Lcom/mojang/serialization/Dynamic; ARG 1 index METHOD setBlock (ILcom/mojang/serialization/Dynamic;)V - ARG 2 dynamic + ARG 1 index + ARG 2 block + CLASS MappingConstants + METHOD addBanners (Ljava/util/Map;ILjava/lang/String;)V + ARG 0 map + ARG 1 id + ARG 2 bannerColor + METHOD addBeds (Ljava/util/Map;ILjava/lang/String;)V + ARG 0 map + ARG 1 id + ARG 2 bedColor + METHOD lambda$static$0 (Ljava/util/HashMap;)V + ARG 0 map + METHOD mapDoor (Ljava/util/Map;Ljava/lang/String;)V + ARG 0 map + ARG 1 doorId + METHOD mapSkull (Ljava/util/Map;ILjava/lang/String;Ljava/lang/String;)V + ARG 0 map + ARG 1 id + ARG 2 skullType + ARG 3 suffix diff --git a/data/net/minecraft/util/datafix/fixes/ContainerBlockEntityLockPredicateFix.mapping b/data/net/minecraft/util/datafix/fixes/ContainerBlockEntityLockPredicateFix.mapping new file mode 100644 index 000000000..2dc77f9bd --- /dev/null +++ b/data/net/minecraft/util/datafix/fixes/ContainerBlockEntityLockPredicateFix.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/util/datafix/fixes/ContainerBlockEntityLockPredicateFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD fixBlockEntity (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; + ARG 0 data + METHOD lambda$fixBlockEntity$0 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 tag diff --git a/data/net/minecraft/util/datafix/fixes/EntitySalmonSizeFix.mapping b/data/net/minecraft/util/datafix/fixes/EntitySalmonSizeFix.mapping new file mode 100644 index 000000000..2596c44aa --- /dev/null +++ b/data/net/minecraft/util/datafix/fixes/EntitySalmonSizeFix.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/util/datafix/fixes/EntitySalmonSizeFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD lambda$fix$0 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 data diff --git a/data/net/minecraft/util/datafix/fixes/FireResistantToDamageResistantComponentFix.mapping b/data/net/minecraft/util/datafix/fixes/FireResistantToDamageResistantComponentFix.mapping new file mode 100644 index 000000000..86abf4e79 --- /dev/null +++ b/data/net/minecraft/util/datafix/fixes/FireResistantToDamageResistantComponentFix.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/util/datafix/fixes/FireResistantToDamageResistantComponentFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema diff --git a/data/net/minecraft/util/datafix/fixes/FoodToConsumableFix.mapping b/data/net/minecraft/util/datafix/fixes/FoodToConsumableFix.mapping new file mode 100644 index 000000000..5a029a493 --- /dev/null +++ b/data/net/minecraft/util/datafix/fixes/FoodToConsumableFix.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/util/datafix/fixes/FoodToConsumableFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema diff --git a/data/net/minecraft/util/datafix/fixes/LockComponentPredicateFix.mapping b/data/net/minecraft/util/datafix/fixes/LockComponentPredicateFix.mapping new file mode 100644 index 000000000..5214a29c9 --- /dev/null +++ b/data/net/minecraft/util/datafix/fixes/LockComponentPredicateFix.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/util/datafix/fixes/LockComponentPredicateFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD fixLock (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 tag diff --git a/data/net/minecraft/util/datafix/fixes/NamedEntityWriteReadFix.mapping b/data/net/minecraft/util/datafix/fixes/NamedEntityWriteReadFix.mapping index 4410f5313..df5dd2cc1 100644 --- a/data/net/minecraft/util/datafix/fixes/NamedEntityWriteReadFix.mapping +++ b/data/net/minecraft/util/datafix/fixes/NamedEntityWriteReadFix.mapping @@ -13,6 +13,3 @@ CLASS net/minecraft/util/datafix/fixes/NamedEntityWriteReadFix ARG 5 newType METHOD fix (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 1 tag - METHOD typePatcher (Lcom/mojang/datafixers/types/Type;Lcom/mojang/datafixers/types/Type;)Lcom/mojang/datafixers/TypeRewriteRule; - ARG 0 type - ARG 1 newType diff --git a/data/net/minecraft/util/datafix/fixes/OminousBannerRarityFix.mapping b/data/net/minecraft/util/datafix/fixes/OminousBannerRarityFix.mapping new file mode 100644 index 000000000..503b31303 --- /dev/null +++ b/data/net/minecraft/util/datafix/fixes/OminousBannerRarityFix.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/util/datafix/fixes/OminousBannerRarityFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD fix (Lcom/mojang/datafixers/Typed;Lcom/mojang/datafixers/OpticFinder;)Lcom/mojang/datafixers/Typed; + ARG 1 data + ARG 2 componentField diff --git a/data/net/minecraft/util/datafix/fixes/StructuresBecomeConfiguredFix.mapping b/data/net/minecraft/util/datafix/fixes/StructuresBecomeConfiguredFix.mapping index 97cce1b08..507cb1769 100644 --- a/data/net/minecraft/util/datafix/fixes/StructuresBecomeConfiguredFix.mapping +++ b/data/net/minecraft/util/datafix/fixes/StructuresBecomeConfiguredFix.mapping @@ -2,12 +2,19 @@ CLASS net/minecraft/util/datafix/fixes/StructuresBecomeConfiguredFix METHOD (Lcom/mojang/datafixers/schemas/Schema;)V ARG 1 outputSchema METHOD findUpdatedStructureType (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 structureName ARG 2 data METHOD fix (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 1 data METHOD guessConfiguration (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/util/datafix/fixes/StructuresBecomeConfiguredFix$Conversion;)Ljava/util/Optional; ARG 1 data ARG 2 conversion + METHOD lambda$fix$0 (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 2 starts + METHOD lambda$fix$1 (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 2 references + METHOD lambda$fix$2 (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 2 structures METHOD updateReferences (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 1 references ARG 2 data diff --git a/data/net/minecraft/util/datafix/fixes/TrialSpawnerConfigInRegistryFix.mapping b/data/net/minecraft/util/datafix/fixes/TrialSpawnerConfigInRegistryFix.mapping new file mode 100644 index 000000000..68f2eb0f2 --- /dev/null +++ b/data/net/minecraft/util/datafix/fixes/TrialSpawnerConfigInRegistryFix.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/util/datafix/fixes/TrialSpawnerConfigInRegistryFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD fixTag (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 tag + CLASS VanillaTrialChambers + METHOD asDynamic (Lnet/minecraft/nbt/CompoundTag;)Lcom/mojang/serialization/Dynamic; + ARG 0 tag + METHOD parse (Ljava/lang/String;)Lnet/minecraft/nbt/CompoundTag; + ARG 0 config + METHOD register (Lnet/minecraft/resources/ResourceLocation;Ljava/lang/String;Ljava/lang/String;)V + ARG 0 name + ARG 1 normal + ARG 2 ominous + METHOD removeDefaults (Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/nbt/CompoundTag; + ARG 0 tag diff --git a/data/net/minecraft/util/datafix/fixes/VillagerSetCanPickUpLootFix.mapping b/data/net/minecraft/util/datafix/fixes/VillagerSetCanPickUpLootFix.mapping new file mode 100644 index 000000000..c953ad62e --- /dev/null +++ b/data/net/minecraft/util/datafix/fixes/VillagerSetCanPickUpLootFix.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/util/datafix/fixes/VillagerSetCanPickUpLootFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD fixValue (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 tag diff --git a/data/net/minecraft/util/datafix/fixes/WorldGenSettingsFix.mapping b/data/net/minecraft/util/datafix/fixes/WorldGenSettingsFix.mapping index 94c46625b..bb8e93b3e 100644 --- a/data/net/minecraft/util/datafix/fixes/WorldGenSettingsFix.mapping +++ b/data/net/minecraft/util/datafix/fixes/WorldGenSettingsFix.mapping @@ -22,7 +22,10 @@ CLASS net/minecraft/util/datafix/fixes/WorldGenSettingsFix ARG 3 settings ARG 4 biomeNoise METHOD setSpacing (Ljava/util/Map;Ljava/lang/String;Ljava/lang/String;I)V + ARG 0 map + ARG 1 structure ARG 2 spacing + ARG 3 minValue METHOD vanillaBiomeSource (Lcom/mojang/serialization/Dynamic;JZZ)Lcom/mojang/serialization/Dynamic; ARG 0 data ARG 1 seed @@ -31,6 +34,7 @@ CLASS net/minecraft/util/datafix/fixes/WorldGenSettingsFix METHOD vanillaLevels (Lcom/mojang/serialization/Dynamic;JLcom/mojang/serialization/Dynamic;Z)Ljava/lang/Object; ARG 0 data ARG 1 seed + ARG 3 generator ARG 4 caves CLASS StructureFeatureConfiguration METHOD (III)V diff --git a/data/net/minecraft/util/datafix/schemas/V3818_3.mapping b/data/net/minecraft/util/datafix/schemas/V3818_3.mapping index e3f126d29..943664f4a 100644 --- a/data/net/minecraft/util/datafix/schemas/V3818_3.mapping +++ b/data/net/minecraft/util/datafix/schemas/V3818_3.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/util/datafix/schemas/V3818_3 + METHOD components (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/SequencedMap; + ARG 0 schema METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V ARG 1 schema ARG 2 entityTypes diff --git a/data/net/minecraft/util/datafix/schemas/V4059.mapping b/data/net/minecraft/util/datafix/schemas/V4059.mapping new file mode 100644 index 000000000..e8c653514 --- /dev/null +++ b/data/net/minecraft/util/datafix/schemas/V4059.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/util/datafix/schemas/V4059 + METHOD components (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/SequencedMap; + ARG 0 schema + METHOD registerTypes (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/util/Map;)V + ARG 1 schema + ARG 2 entityTypes + ARG 3 blockEntityTypes diff --git a/data/net/minecraft/util/datafix/schemas/V4067.mapping b/data/net/minecraft/util/datafix/schemas/V4067.mapping new file mode 100644 index 000000000..915fd227f --- /dev/null +++ b/data/net/minecraft/util/datafix/schemas/V4067.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/util/datafix/schemas/V4067 + METHOD registerChestBoat (Ljava/util/Map;Ljava/lang/String;)V + ARG 1 map + ARG 2 name + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/data/net/minecraft/util/datafix/schemas/V4070.mapping b/data/net/minecraft/util/datafix/schemas/V4070.mapping new file mode 100644 index 000000000..a2bec7c3d --- /dev/null +++ b/data/net/minecraft/util/datafix/schemas/V4070.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/util/datafix/schemas/V4070 + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/data/net/minecraft/util/datafix/schemas/V4071.mapping b/data/net/minecraft/util/datafix/schemas/V4071.mapping new file mode 100644 index 000000000..3446400eb --- /dev/null +++ b/data/net/minecraft/util/datafix/schemas/V4071.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/util/datafix/schemas/V4071 + METHOD registerBlockEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema + METHOD registerEntities (Lcom/mojang/datafixers/schemas/Schema;)Ljava/util/Map; + ARG 1 schema diff --git a/data/net/minecraft/util/profiling/Profiler.mapping b/data/net/minecraft/util/profiling/Profiler.mapping new file mode 100644 index 000000000..f88a6f37a --- /dev/null +++ b/data/net/minecraft/util/profiling/Profiler.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/util/profiling/Profiler + METHOD decorateFiller (Lnet/minecraft/util/profiling/ProfilerFiller;)Lnet/minecraft/util/profiling/ProfilerFiller; + ARG 0 filler + METHOD startUsing (Lnet/minecraft/util/profiling/ProfilerFiller;)V + ARG 0 profiler + METHOD use (Lnet/minecraft/util/profiling/ProfilerFiller;)Lnet/minecraft/util/profiling/Profiler$Scope; + ARG 0 profiler diff --git a/data/net/minecraft/util/profiling/ProfilerFiller.mapping b/data/net/minecraft/util/profiling/ProfilerFiller.mapping index 47ab8b4fe..dbbafeb92 100644 --- a/data/net/minecraft/util/profiling/ProfilerFiller.mapping +++ b/data/net/minecraft/util/profiling/ProfilerFiller.mapping @@ -1,4 +1,11 @@ CLASS net/minecraft/util/profiling/ProfilerFiller + METHOD addZoneText (Ljava/lang/String;)V + ARG 1 text + METHOD addZoneValue (J)V + ARG 1 value + METHOD combine (Lnet/minecraft/util/profiling/ProfilerFiller;Lnet/minecraft/util/profiling/ProfilerFiller;)Lnet/minecraft/util/profiling/ProfilerFiller; + ARG 0 first + ARG 1 second METHOD incrementCounter (Ljava/lang/String;)V ARG 1 entryId METHOD incrementCounter (Ljava/lang/String;I)V @@ -22,6 +29,13 @@ CLASS net/minecraft/util/profiling/ProfilerFiller ARG 1 name METHOD push (Ljava/util/function/Supplier;)V ARG 1 nameSupplier - METHOD tee (Lnet/minecraft/util/profiling/ProfilerFiller;Lnet/minecraft/util/profiling/ProfilerFiller;)Lnet/minecraft/util/profiling/ProfilerFiller; - ARG 0 first - ARG 1 second + METHOD setZoneColor (I)V + ARG 1 color + METHOD zone (Ljava/lang/String;)Lnet/minecraft/util/profiling/Zone; + ARG 1 name + METHOD zone (Ljava/util/function/Supplier;)Lnet/minecraft/util/profiling/Zone; + ARG 1 name + CLASS CombinedProfileFiller + METHOD (Lnet/minecraft/util/profiling/ProfilerFiller;Lnet/minecraft/util/profiling/ProfilerFiller;)V + ARG 1 first + ARG 2 second diff --git a/data/net/minecraft/util/profiling/TracyZoneFiller.mapping b/data/net/minecraft/util/profiling/TracyZoneFiller.mapping new file mode 100644 index 000000000..51d76b830 --- /dev/null +++ b/data/net/minecraft/util/profiling/TracyZoneFiller.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/util/profiling/TracyZoneFiller + CLASS PlotAndValue + METHOD (Ljava/lang/String;)V + ARG 1 name + METHOD add (I)V + ARG 1 value + METHOD set (I)V + ARG 1 value diff --git a/data/net/minecraft/util/profiling/Zone.mapping b/data/net/minecraft/util/profiling/Zone.mapping new file mode 100644 index 000000000..98cebff61 --- /dev/null +++ b/data/net/minecraft/util/profiling/Zone.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/util/profiling/Zone + METHOD (Lnet/minecraft/util/profiling/ProfilerFiller;)V + ARG 1 profiler + METHOD addText (Ljava/lang/String;)Lnet/minecraft/util/profiling/Zone; + ARG 1 text + METHOD addText (Ljava/util/function/Supplier;)Lnet/minecraft/util/profiling/Zone; + ARG 1 text + METHOD addValue (J)Lnet/minecraft/util/profiling/Zone; + ARG 1 value + METHOD setColor (I)Lnet/minecraft/util/profiling/Zone; + ARG 1 color diff --git a/data/net/minecraft/util/thread/AbstractConsecutiveExecutor.mapping b/data/net/minecraft/util/thread/AbstractConsecutiveExecutor.mapping new file mode 100644 index 000000000..7a85fbf80 --- /dev/null +++ b/data/net/minecraft/util/thread/AbstractConsecutiveExecutor.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/util/thread/AbstractConsecutiveExecutor + METHOD (Lnet/minecraft/util/thread/StrictQueue;Ljava/util/concurrent/Executor;Ljava/lang/String;)V + ARG 1 queue + ARG 2 executor + ARG 3 name diff --git a/data/net/minecraft/util/thread/BlockableEventLoop.mapping b/data/net/minecraft/util/thread/BlockableEventLoop.mapping index b21c935b3..b781d4c3f 100644 --- a/data/net/minecraft/util/thread/BlockableEventLoop.mapping +++ b/data/net/minecraft/util/thread/BlockableEventLoop.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/util/thread/BlockableEventLoop ARG 1 task METHOD executeIfPossible (Ljava/lang/Runnable;)V ARG 1 task + METHOD isNonRecoverable (Ljava/lang/Throwable;)Z + ARG 0 error METHOD managedBlock (Ljava/util/function/BooleanSupplier;)V COMMENT Drive the executor until the given BooleanSupplier returns true ARG 1 isDone @@ -20,7 +22,3 @@ CLASS net/minecraft/util/thread/BlockableEventLoop ARG 1 supplier METHOD submitAsync (Ljava/lang/Runnable;)Ljava/util/concurrent/CompletableFuture; ARG 1 task - METHOD tell (Ljava/lang/Runnable;)V - ARG 1 task - METHOD wrapRunnable (Ljava/lang/Runnable;)Ljava/lang/Runnable; - ARG 1 runnable diff --git a/data/net/minecraft/util/thread/ConsecutiveExecutor.mapping b/data/net/minecraft/util/thread/ConsecutiveExecutor.mapping new file mode 100644 index 000000000..bddff8c4b --- /dev/null +++ b/data/net/minecraft/util/thread/ConsecutiveExecutor.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/util/thread/ConsecutiveExecutor + METHOD (Ljava/util/concurrent/Executor;Ljava/lang/String;)V + ARG 1 executor + ARG 2 name diff --git a/data/net/minecraft/util/thread/PriorityConsecutiveExecutor.mapping b/data/net/minecraft/util/thread/PriorityConsecutiveExecutor.mapping new file mode 100644 index 000000000..d1a7fa789 --- /dev/null +++ b/data/net/minecraft/util/thread/PriorityConsecutiveExecutor.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/util/thread/PriorityConsecutiveExecutor + METHOD (ILjava/util/concurrent/Executor;Ljava/lang/String;)V + ARG 1 size + ARG 2 executor + ARG 3 name + METHOD scheduleWithResult (ILjava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; + ARG 1 priority + ARG 2 resultConsumer diff --git a/data/net/minecraft/util/thread/ProcessorHandle.mapping b/data/net/minecraft/util/thread/ProcessorHandle.mapping deleted file mode 100644 index 16762bec3..000000000 --- a/data/net/minecraft/util/thread/ProcessorHandle.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS net/minecraft/util/thread/ProcessorHandle - METHOD ask (Ljava/util/function/Function;)Ljava/util/concurrent/CompletableFuture; - ARG 1 task - METHOD askEither (Ljava/util/function/Function;)Ljava/util/concurrent/CompletableFuture; - ARG 1 task - METHOD of (Ljava/lang/String;Ljava/util/function/Consumer;)Lnet/minecraft/util/thread/ProcessorHandle; - ARG 0 name - ARG 1 task - METHOD tell (Ljava/lang/Object;)V - ARG 1 task diff --git a/data/net/minecraft/util/thread/ProcessorMailbox.mapping b/data/net/minecraft/util/thread/ProcessorMailbox.mapping deleted file mode 100644 index 825240237..000000000 --- a/data/net/minecraft/util/thread/ProcessorMailbox.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS net/minecraft/util/thread/ProcessorMailbox - METHOD (Lnet/minecraft/util/thread/StrictQueue;Ljava/util/concurrent/Executor;Ljava/lang/String;)V - ARG 1 queue - ARG 2 dispatcher - ARG 3 name - METHOD create (Ljava/util/concurrent/Executor;Ljava/lang/String;)Lnet/minecraft/util/thread/ProcessorMailbox; - ARG 0 dispatcher - ARG 1 name - METHOD pollUntil (Lit/unimi/dsi/fastutil/ints/Int2BooleanFunction;)I - ARG 1 continuePolling - METHOD tell (Ljava/lang/Object;)V - ARG 1 task diff --git a/data/net/minecraft/util/thread/StrictQueue.mapping b/data/net/minecraft/util/thread/StrictQueue.mapping index b887a6d11..f9554f3eb 100644 --- a/data/net/minecraft/util/thread/StrictQueue.mapping +++ b/data/net/minecraft/util/thread/StrictQueue.mapping @@ -1,17 +1,9 @@ CLASS net/minecraft/util/thread/StrictQueue - METHOD push (Ljava/lang/Object;)Z - ARG 1 value - CLASS IntRunnable - METHOD (ILjava/lang/Runnable;)V - ARG 1 priority - ARG 2 task + METHOD push (Ljava/lang/Runnable;)Z + ARG 1 task CLASS QueueStrictQueue METHOD (Ljava/util/Queue;)V ARG 1 queue - METHOD push (Ljava/lang/Object;)Z - ARG 1 value CLASS FixedPriorityQueue METHOD (I)V ARG 1 size - METHOD push (Lnet/minecraft/util/thread/StrictQueue$IntRunnable;)Z - ARG 1 value diff --git a/data/net/minecraft/util/thread/TaskScheduler.mapping b/data/net/minecraft/util/thread/TaskScheduler.mapping new file mode 100644 index 000000000..3eeb588a2 --- /dev/null +++ b/data/net/minecraft/util/thread/TaskScheduler.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/util/thread/TaskScheduler + METHOD schedule (Ljava/lang/Runnable;)V + ARG 1 task + METHOD scheduleWithResult (Ljava/util/function/Consumer;)Ljava/util/concurrent/CompletableFuture; + ARG 1 resultConsumer + METHOD wrapExecutor (Ljava/lang/String;Ljava/util/concurrent/Executor;)Lnet/minecraft/util/thread/TaskScheduler; + ARG 0 name + ARG 1 executor + METHOD wrapRunnable (Ljava/lang/Runnable;)Ljava/lang/Runnable; + ARG 1 runnable diff --git a/data/net/minecraft/util/worldupdate/WorldUpgrader.mapping b/data/net/minecraft/util/worldupdate/WorldUpgrader.mapping index ed7c730bf..bbe93e524 100644 --- a/data/net/minecraft/util/worldupdate/WorldUpgrader.mapping +++ b/data/net/minecraft/util/worldupdate/WorldUpgrader.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/util/worldupdate/WorldUpgrader METHOD resolveRecreateDirectory (Ljava/nio/file/Path;)Ljava/nio/file/Path; ARG 0 path CLASS AbstractUpgrader - METHOD (Lnet/minecraft/util/worldupdate/WorldUpgrader;Lnet/minecraft/util/datafix/DataFixTypes;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/network/chat/MutableComponent;Lnet/minecraft/network/chat/MutableComponent;)V + METHOD (Lnet/minecraft/util/worldupdate/WorldUpgrader;Lnet/minecraft/util/datafix/DataFixTypes;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;)V ARG 2 dataFixType ARG 3 type ARG 4 folderName @@ -39,7 +39,7 @@ CLASS net/minecraft/util/worldupdate/WorldUpgrader ARG 2 chunkPos ARG 3 dimension CLASS SimpleRegionStorageUpgrader - METHOD (Lnet/minecraft/util/worldupdate/WorldUpgrader;Lnet/minecraft/util/datafix/DataFixTypes;Ljava/lang/String;Lnet/minecraft/network/chat/MutableComponent;Lnet/minecraft/network/chat/MutableComponent;)V + METHOD (Lnet/minecraft/util/worldupdate/WorldUpgrader;Lnet/minecraft/util/datafix/DataFixTypes;Ljava/lang/String;Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;)V ARG 2 dataFixType ARG 3 type ARG 4 upgradingStatus diff --git a/data/net/minecraft/world/InteractionResult.mapping b/data/net/minecraft/world/InteractionResult.mapping index c08125864..ab5b64a0c 100644 --- a/data/net/minecraft/world/InteractionResult.mapping +++ b/data/net/minecraft/world/InteractionResult.mapping @@ -1,3 +1,4 @@ CLASS net/minecraft/world/InteractionResult - METHOD sidedSuccess (Z)Lnet/minecraft/world/InteractionResult; - ARG 0 isClientSide + CLASS Success + METHOD heldItemTransformedTo (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/InteractionResult$Success; + ARG 1 stack diff --git a/data/net/minecraft/world/InteractionResultHolder.mapping b/data/net/minecraft/world/InteractionResultHolder.mapping deleted file mode 100644 index 1b10fa99b..000000000 --- a/data/net/minecraft/world/InteractionResultHolder.mapping +++ /dev/null @@ -1,15 +0,0 @@ -CLASS net/minecraft/world/InteractionResultHolder - METHOD (Lnet/minecraft/world/InteractionResult;Ljava/lang/Object;)V - ARG 1 result - ARG 2 object - METHOD consume (Ljava/lang/Object;)Lnet/minecraft/world/InteractionResultHolder; - ARG 0 type - METHOD fail (Ljava/lang/Object;)Lnet/minecraft/world/InteractionResultHolder; - ARG 0 type - METHOD pass (Ljava/lang/Object;)Lnet/minecraft/world/InteractionResultHolder; - ARG 0 type - METHOD sidedSuccess (Ljava/lang/Object;Z)Lnet/minecraft/world/InteractionResultHolder; - ARG 0 object - ARG 1 isClientSide - METHOD success (Ljava/lang/Object;)Lnet/minecraft/world/InteractionResultHolder; - ARG 0 type diff --git a/data/net/minecraft/world/ItemInteractionResult.mapping b/data/net/minecraft/world/ItemInteractionResult.mapping deleted file mode 100644 index 939ec7034..000000000 --- a/data/net/minecraft/world/ItemInteractionResult.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/world/ItemInteractionResult - METHOD sidedSuccess (Z)Lnet/minecraft/world/ItemInteractionResult; - ARG 0 clientSide diff --git a/data/net/minecraft/world/LockCode.mapping b/data/net/minecraft/world/LockCode.mapping index 43599ebba..4569283c2 100644 --- a/data/net/minecraft/world/LockCode.mapping +++ b/data/net/minecraft/world/LockCode.mapping @@ -1,9 +1,11 @@ CLASS net/minecraft/world/LockCode - METHOD (Ljava/lang/String;)V - ARG 1 key - METHOD addToTag (Lnet/minecraft/nbt/CompoundTag;)V - ARG 1 nbt - METHOD fromTag (Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/LockCode; - ARG 0 nbt + METHOD addToTag (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/core/HolderLookup$Provider;)V + ARG 1 tag + ARG 2 registries + METHOD fromTag (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/core/HolderLookup$Provider;)Lnet/minecraft/world/LockCode; + ARG 0 tag + ARG 1 registries + METHOD lambda$addToTag$0 (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/nbt/Tag;)V + ARG 1 lock METHOD unlocksWith (Lnet/minecraft/world/item/ItemStack;)Z ARG 1 stack diff --git a/data/net/minecraft/world/SimpleContainer.mapping b/data/net/minecraft/world/SimpleContainer.mapping index 4d7a9ef43..562811630 100644 --- a/data/net/minecraft/world/SimpleContainer.mapping +++ b/data/net/minecraft/world/SimpleContainer.mapping @@ -12,8 +12,6 @@ CLASS net/minecraft/world/SimpleContainer ARG 1 stack METHOD createTag (Lnet/minecraft/core/HolderLookup$Provider;)Lnet/minecraft/nbt/ListTag; ARG 1 levelRegistry - METHOD fillStackedContents (Lnet/minecraft/world/entity/player/StackedContents;)V - ARG 1 helper METHOD fromTag (Lnet/minecraft/nbt/ListTag;Lnet/minecraft/core/HolderLookup$Provider;)V ARG 1 tag ARG 2 levelRegistry diff --git a/data/net/minecraft/world/damagesource/DamageSources.mapping b/data/net/minecraft/world/damagesource/DamageSources.mapping index 720fa13c2..8201d4773 100644 --- a/data/net/minecraft/world/damagesource/DamageSources.mapping +++ b/data/net/minecraft/world/damagesource/DamageSources.mapping @@ -26,6 +26,8 @@ CLASS net/minecraft/world/damagesource/DamageSources METHOD indirectMagic (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/damagesource/DamageSource; ARG 1 causingEntity ARG 2 directEntity + METHOD mace (Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/damagesource/DamageSource; + ARG 1 entity METHOD mobAttack (Lnet/minecraft/world/entity/LivingEntity;)Lnet/minecraft/world/damagesource/DamageSource; ARG 1 mob METHOD mobProjectile (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/entity/LivingEntity;)Lnet/minecraft/world/damagesource/DamageSource; diff --git a/data/net/minecraft/world/effect/InfestedMobEffect.mapping b/data/net/minecraft/world/effect/InfestedMobEffect.mapping index 6f17ed52f..c56447e9e 100644 --- a/data/net/minecraft/world/effect/InfestedMobEffect.mapping +++ b/data/net/minecraft/world/effect/InfestedMobEffect.mapping @@ -4,7 +4,7 @@ CLASS net/minecraft/world/effect/InfestedMobEffect ARG 2 color ARG 3 chanceToSpawn ARG 4 spawnedCount - METHOD spawnSilverfish (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;DDD)V + METHOD spawnSilverfish (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;DDD)V ARG 1 level ARG 2 entity ARG 3 x diff --git a/data/net/minecraft/world/effect/MobEffect.mapping b/data/net/minecraft/world/effect/MobEffect.mapping index f287d3c5d..fe6096a5b 100644 --- a/data/net/minecraft/world/effect/MobEffect.mapping +++ b/data/net/minecraft/world/effect/MobEffect.mapping @@ -16,15 +16,17 @@ CLASS net/minecraft/world/effect/MobEffect METHOD addAttributeModifiers (Lnet/minecraft/world/entity/ai/attributes/AttributeMap;I)V ARG 1 attributeMap ARG 2 amplifier - METHOD applyEffectTick (Lnet/minecraft/world/entity/LivingEntity;I)Z - ARG 1 livingEntity - ARG 2 amplifier - METHOD applyInstantenousEffect (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/entity/LivingEntity;ID)V - ARG 1 source - ARG 2 indirectSource - ARG 3 livingEntity - ARG 4 amplifier - ARG 5 health + METHOD applyEffectTick (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;I)Z + ARG 1 level + ARG 2 entity + ARG 3 amplifier + METHOD applyInstantenousEffect (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/entity/LivingEntity;ID)V + ARG 1 level + ARG 2 source + ARG 3 indirectSource + ARG 4 entity + ARG 5 amplifier + ARG 6 health METHOD createModifiers (ILjava/util/function/BiConsumer;)V ARG 1 amplifier ARG 2 output @@ -38,21 +40,29 @@ CLASS net/minecraft/world/effect/MobEffect COMMENT Get if the potion is beneficial to the player. Beneficial potions are shown on the first row of the HUD METHOD isInstantenous ()Z COMMENT Returns {@code true} if the potion has an instant effect instead of a continuous one (e.g. Harming) + METHOD lambda$new$0 (ILnet/minecraft/world/effect/MobEffectInstance;)Lnet/minecraft/core/particles/ParticleOptions; + ARG 1 effect + METHOD lambda$new$1 (Lnet/minecraft/core/particles/ParticleOptions;Lnet/minecraft/world/effect/MobEffectInstance;)Lnet/minecraft/core/particles/ParticleOptions; + ARG 1 effect + METHOD lambda$onEffectAdded$2 (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/sounds/SoundEvent;)V + ARG 1 sound METHOD onEffectAdded (Lnet/minecraft/world/entity/LivingEntity;I)V - ARG 1 livingEntity + ARG 1 entity ARG 2 amplifier METHOD onEffectStarted (Lnet/minecraft/world/entity/LivingEntity;I)V - ARG 1 livingEntity - ARG 2 amplifier - METHOD onMobHurt (Lnet/minecraft/world/entity/LivingEntity;ILnet/minecraft/world/damagesource/DamageSource;F)V - ARG 1 livingEntity - ARG 2 amplifier - ARG 3 damageSource - ARG 4 amount - METHOD onMobRemoved (Lnet/minecraft/world/entity/LivingEntity;ILnet/minecraft/world/entity/Entity$RemovalReason;)V - ARG 1 livingEntity + ARG 1 entity ARG 2 amplifier - ARG 3 reason + METHOD onMobHurt (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;ILnet/minecraft/world/damagesource/DamageSource;F)V + ARG 1 level + ARG 2 entity + ARG 3 amplifier + ARG 4 damageSource + ARG 5 amount + METHOD onMobRemoved (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;ILnet/minecraft/world/entity/Entity$RemovalReason;)V + ARG 1 level + ARG 2 entity + ARG 3 amplifier + ARG 4 reason METHOD removeAttributeModifiers (Lnet/minecraft/world/entity/ai/attributes/AttributeMap;)V ARG 1 attributeMap METHOD requiredFeatures ([Lnet/minecraft/world/flag/FeatureFlag;)Lnet/minecraft/world/effect/MobEffect; diff --git a/data/net/minecraft/world/effect/MobEffectInstance.mapping b/data/net/minecraft/world/effect/MobEffectInstance.mapping index cee8c2e86..10b261c21 100644 --- a/data/net/minecraft/world/effect/MobEffectInstance.mapping +++ b/data/net/minecraft/world/effect/MobEffectInstance.mapping @@ -66,13 +66,15 @@ CLASS net/minecraft/world/effect/MobEffectInstance ARG 1 livingEntity METHOD onEffectStarted (Lnet/minecraft/world/entity/LivingEntity;)V ARG 1 entity - METHOD onMobHurt (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/damagesource/DamageSource;F)V - ARG 1 livingEntity - ARG 2 damageSource - ARG 3 amount - METHOD onMobRemoved (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/Entity$RemovalReason;)V - ARG 1 livingEntity - ARG 2 reason + METHOD onMobHurt (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/damagesource/DamageSource;F)V + ARG 1 level + ARG 2 entity + ARG 3 damageSource + ARG 4 amount + METHOD onMobRemoved (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/Entity$RemovalReason;)V + ARG 1 level + ARG 2 entity + ARG 3 reason METHOD setDetailsFrom (Lnet/minecraft/world/effect/MobEffectInstance;)V ARG 1 effectInstance METHOD tick (Lnet/minecraft/world/entity/LivingEntity;Ljava/lang/Runnable;)Z @@ -88,8 +90,14 @@ CLASS net/minecraft/world/effect/MobEffectInstance ARG 3 showParticles ARG 4 showIcon ARG 5 hiddenEffect + METHOD lambda$static$0 (Lnet/minecraft/world/effect/MobEffectInstance$Details;)Ljava/util/Optional; + ARG 0 details METHOD lambda$static$1 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 1 instance + METHOD lambda$static$2 (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/MapCodec; + ARG 0 codec + METHOD lambda$static$3 (Lnet/minecraft/network/codec/StreamCodec;)Lnet/minecraft/network/codec/StreamCodec; + ARG 0 codec CLASS BlendState METHOD computeTarget (Lnet/minecraft/world/effect/MobEffectInstance;)F ARG 0 effect diff --git a/data/net/minecraft/world/effect/WeavingMobEffect.mapping b/data/net/minecraft/world/effect/WeavingMobEffect.mapping index 3a4b96efa..15d5de52d 100644 --- a/data/net/minecraft/world/effect/WeavingMobEffect.mapping +++ b/data/net/minecraft/world/effect/WeavingMobEffect.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/world/effect/WeavingMobEffect ARG 1 category ARG 2 color ARG 3 maxCobwebs - METHOD spawnCobwebsRandomlyAround (Lnet/minecraft/world/level/Level;Lnet/minecraft/util/RandomSource;Lnet/minecraft/core/BlockPos;)V + METHOD spawnCobwebsRandomlyAround (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/util/RandomSource;Lnet/minecraft/core/BlockPos;)V ARG 1 level ARG 2 random ARG 3 pos diff --git a/data/net/minecraft/world/entity/AnimationState.mapping b/data/net/minecraft/world/entity/AnimationState.mapping index 5b45346d3..cfa431d14 100644 --- a/data/net/minecraft/world/entity/AnimationState.mapping +++ b/data/net/minecraft/world/entity/AnimationState.mapping @@ -2,15 +2,16 @@ CLASS net/minecraft/world/entity/AnimationState METHOD animateWhen (ZI)V ARG 1 condition ARG 2 tickCount + METHOD copyFrom (Lnet/minecraft/world/entity/AnimationState;)V + ARG 1 other METHOD fastForward (IF)V ARG 1 duration ARG 2 speed + METHOD getTimeInMillis (F)J + ARG 1 gmaetime METHOD ifStarted (Ljava/util/function/Consumer;)V ARG 1 action METHOD start (I)V ARG 1 tickCount METHOD startIfStopped (I)V ARG 1 tickCount - METHOD updateTime (FF)V - ARG 1 ageInTicks - ARG 2 speed diff --git a/data/net/minecraft/world/entity/AreaEffectCloud.mapping b/data/net/minecraft/world/entity/AreaEffectCloud.mapping index 5aded58a2..5f2f5e1f2 100644 --- a/data/net/minecraft/world/entity/AreaEffectCloud.mapping +++ b/data/net/minecraft/world/entity/AreaEffectCloud.mapping @@ -12,13 +12,17 @@ CLASS net/minecraft/world/entity/AreaEffectCloud ARG 1 pose METHOD isWaiting ()Z COMMENT Returns {@code true} if the cloud is waiting. While waiting, the radius is ignored and the cloud shows fewer particles in its area. - METHOD lambda$tick$0 (Ljava/util/Map$Entry;)Z + METHOD lambda$serverTick$0 (Ljava/util/Map$Entry;)Z ARG 1 victim + METHOD lambda$serverTick$1 (I)I + ARG 0 duration METHOD onSyncedDataUpdated (Lnet/minecraft/network/syncher/EntityDataAccessor;)V ARG 1 key METHOD readAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V COMMENT (abstract) Protected helper method to read subclass entity data from NBT. ARG 1 compound + METHOD serverTick (Lnet/minecraft/server/level/ServerLevel;)V + ARG 1 level METHOD setDuration (I)V ARG 1 duration METHOD setDurationOnUse (I)V diff --git a/data/net/minecraft/world/entity/ConversionParams.mapping b/data/net/minecraft/world/entity/ConversionParams.mapping new file mode 100644 index 000000000..29545ee61 --- /dev/null +++ b/data/net/minecraft/world/entity/ConversionParams.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/world/entity/ConversionParams + METHOD single (Lnet/minecraft/world/entity/Mob;ZZ)Lnet/minecraft/world/entity/ConversionParams; + ARG 0 mob + ARG 1 keepEquipment + ARG 2 preserveCanPickUpLoot + CLASS AfterConversion + METHOD finalizeConversion (Lnet/minecraft/world/entity/Mob;)V + ARG 1 mob diff --git a/data/net/minecraft/world/entity/ConversionType.mapping b/data/net/minecraft/world/entity/ConversionType.mapping new file mode 100644 index 000000000..cece232f5 --- /dev/null +++ b/data/net/minecraft/world/entity/ConversionType.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/world/entity/ConversionType + METHOD (Ljava/lang/String;IZ)V + ARG 3 discardAfterConversion + METHOD convert (Lnet/minecraft/world/entity/Mob;Lnet/minecraft/world/entity/Mob;Lnet/minecraft/world/entity/ConversionParams;)V + ARG 1 oldMob + ARG 2 newMob + ARG 3 conversionParams + METHOD convertCommon (Lnet/minecraft/world/entity/Mob;Lnet/minecraft/world/entity/Mob;Lnet/minecraft/world/entity/ConversionParams;)V + ARG 1 oldMob + ARG 2 newMob + ARG 3 conversionParams diff --git a/data/net/minecraft/world/entity/ElytraAnimationState.mapping b/data/net/minecraft/world/entity/ElytraAnimationState.mapping new file mode 100644 index 000000000..ae684b0ae --- /dev/null +++ b/data/net/minecraft/world/entity/ElytraAnimationState.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/world/entity/ElytraAnimationState + METHOD (Lnet/minecraft/world/entity/LivingEntity;)V + ARG 1 entity + METHOD getRotX (F)F + ARG 1 partialTick + METHOD getRotY (F)F + ARG 1 partialTick + METHOD getRotZ (F)F + ARG 1 partialTick diff --git a/data/net/minecraft/world/entity/Entity.mapping b/data/net/minecraft/world/entity/Entity.mapping index 972b36d47..a54d07bfd 100644 --- a/data/net/minecraft/world/entity/Entity.mapping +++ b/data/net/minecraft/world/entity/Entity.mapping @@ -17,7 +17,7 @@ CLASS net/minecraft/world/entity/Entity ARG 1 yRot ARG 2 xRot METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V - ARG 1 compound + ARG 1 tag METHOD addDeltaMovement (Lnet/minecraft/world/phys/Vec3;)V ARG 1 addend METHOD addPassenger (Lnet/minecraft/world/entity/Entity;)V @@ -29,6 +29,14 @@ CLASS net/minecraft/world/entity/Entity ARG 2 pos METHOD animateHurt (F)V ARG 1 yaw + METHOD applyEffectsFromBlocks (Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/Vec3;)V + ARG 1 oldPosition + ARG 2 position + METHOD applyMovementEmissionAndPlaySound (Lnet/minecraft/world/entity/Entity$MovementEmission;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V + ARG 1 movementEmission + ARG 2 movement + ARG 3 pos + ARG 4 state METHOD applyPistonMovementRestriction (Lnet/minecraft/core/Direction$Axis;D)D ARG 1 axis ARG 2 distance @@ -40,6 +48,9 @@ CLASS net/minecraft/world/entity/Entity COMMENT Gets called every tick from main Entity class METHOD broadcastToPlayer (Lnet/minecraft/server/level/ServerPlayer;)Z ARG 1 player + METHOD calculatePassengerTransition (Lnet/minecraft/world/level/portal/TeleportTransition;Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/level/portal/TeleportTransition; + ARG 1 teleportTransition + ARG 2 entity METHOD calculateUpVector (FF)Lnet/minecraft/world/phys/Vec3; ARG 1 xRot ARG 2 yRot @@ -49,21 +60,19 @@ CLASS net/minecraft/world/entity/Entity ARG 2 yRot METHOD canAddPassenger (Lnet/minecraft/world/entity/Entity;)Z ARG 1 passenger - METHOD canChangeDimensions (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/level/Level;)Z - ARG 1 oldLevel - ARG 2 newLevel METHOD canCollideWith (Lnet/minecraft/world/entity/Entity;)Z ARG 1 entity METHOD canRide (Lnet/minecraft/world/entity/Entity;)Z ARG 1 vehicle + METHOD canTeleport (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/level/Level;)Z + ARG 1 fromLevel + ARG 2 toLevel METHOD canUsePortal (Z)Z ARG 1 allowPassengers METHOD causeFallDamage (FFLnet/minecraft/world/damagesource/DamageSource;)Z ARG 1 fallDistance ARG 2 multiplier ARG 3 source - METHOD changeDimension (Lnet/minecraft/world/level/portal/DimensionTransition;)Lnet/minecraft/world/entity/Entity; - ARG 1 transition METHOD checkDespawn ()V COMMENT Makes the entity despawn if requirements are reached METHOD checkFallDamage (DZLnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;)V @@ -71,6 +80,9 @@ CLASS net/minecraft/world/entity/Entity ARG 3 onGround ARG 4 state ARG 5 pos + METHOD checkInsideBlocks (Ljava/util/List;Ljava/util/Set;)V + ARG 1 movements + ARG 2 blocksInside METHOD checkSupportingBlock (ZLnet/minecraft/world/phys/Vec3;)V ARG 1 onGround ARG 2 movement @@ -106,9 +118,18 @@ CLASS net/minecraft/world/entity/Entity ARG 0 deltaMovement ARG 1 entityBB ARG 2 shapes + METHOD collidedWithShapeMovingFrom (Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/phys/shapes/VoxelShape;)Z + ARG 1 oldPosition + ARG 2 position + ARG 3 pos + ARG 4 shape + METHOD considersEntityAsAlly (Lnet/minecraft/world/entity/Entity;)Z + ARG 1 entity METHOD copyPosition (Lnet/minecraft/world/entity/Entity;)V COMMENT Sets this entity's location and angles to the location and angles of the passed in entity. ARG 1 entity + METHOD createCommandSourceStackForNameResolution (Lnet/minecraft/server/level/ServerLevel;)Lnet/minecraft/commands/CommandSourceStack; + ARG 1 level METHOD defineSynchedData (Lnet/minecraft/network/syncher/SynchedEntityData$Builder;)V ARG 1 builder METHOD deflection (Lnet/minecraft/world/entity/projectile/Projectile;)Lnet/minecraft/world/entity/projectile/ProjectileDeflection; @@ -140,6 +161,9 @@ CLASS net/minecraft/world/entity/Entity ARG 1 object METHOD fillCrashReportCategory (Lnet/minecraft/CrashReportCategory;)V ARG 1 category + METHOD forceSetRotation (FF)V + ARG 1 yRot + ARG 2 xRot METHOD fudgePositionAfterSizeChange (Lnet/minecraft/world/entity/EntityDimensions;)Z ARG 1 dimensions METHOD gameEvent (Lnet/minecraft/core/Holder;)V @@ -157,8 +181,6 @@ CLASS net/minecraft/world/entity/Entity ARG 4 blockState ARG 5 fluidState ARG 6 explosionPower - METHOD getBoundingBoxForCulling ()Lnet/minecraft/world/phys/AABB; - COMMENT Gets the bounding box of this Entity, adjusted to take auxiliary entities into account (e.g. the tile contained by a minecart, such as a command block). METHOD getCollisionHorizontalEscapeVector (DDF)Lnet/minecraft/world/phys/Vec3; ARG 0 vehicleWidth ARG 2 passengerWidth @@ -182,7 +204,7 @@ CLASS net/minecraft/world/entity/Entity METHOD getEyeHeight (Lnet/minecraft/world/entity/Pose;)F ARG 1 pose METHOD getEyePosition (F)Lnet/minecraft/world/phys/Vec3; - ARG 1 partialTicks + ARG 1 partialTick METHOD getFluidHeight (Lnet/minecraft/tags/TagKey;)D ARG 1 fluidTag METHOD getHandHoldingItemAngle (Lnet/minecraft/world/item/Item;)Lnet/minecraft/world/phys/Vec3; @@ -236,7 +258,7 @@ CLASS net/minecraft/world/entity/Entity METHOD getSlot (I)Lnet/minecraft/world/entity/SlotAccess; ARG 1 slot METHOD getUpVector (F)Lnet/minecraft/world/phys/Vec3; - ARG 1 partialTicks + ARG 1 partialTick METHOD getVehicle ()Lnet/minecraft/world/entity/Entity; COMMENT Get entity this is riding METHOD getVehicleAttachmentPoint (Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/phys/Vec3; @@ -252,12 +274,14 @@ CLASS net/minecraft/world/entity/Entity ARG 1 partialTick METHOD getX (D)D ARG 1 scale - METHOD getXRot ()F + METHOD getXRot (F)F COMMENT Gets the rotation of this entity around the x-axis (the pitch) in degrees. + ARG 1 partialTick METHOD getY (D)D ARG 1 scale - METHOD getYRot ()F + METHOD getYRot (F)F COMMENT Gets the rotation of this entity around the y-axis (the yaw) in degrees. + ARG 1 partialTick METHOD getZ (D)D ARG 1 scale METHOD handleDamageEvent (Lnet/minecraft/world/damagesource/DamageSource;)V @@ -271,14 +295,20 @@ CLASS net/minecraft/world/entity/Entity ARG 1 predicate METHOD hasPassenger (Lnet/minecraft/world/entity/Entity;)Z ARG 1 entity - METHOD hasPermissions (I)Z - ARG 1 level METHOD hasPose (Lnet/minecraft/world/entity/Pose;)Z ARG 1 pose - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source + METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)V + ARG 1 damageSource ARG 2 amount + METHOD hurtClient (Lnet/minecraft/world/damagesource/DamageSource;)Z + ARG 1 damageSource + METHOD hurtOrSimulate (Lnet/minecraft/world/damagesource/DamageSource;F)Z + ARG 1 damageSource + ARG 2 amount + METHOD hurtServer (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/damagesource/DamageSource;F)Z + ARG 1 level + ARG 2 damageSource + ARG 3 amount METHOD igniteForSeconds (F)V ARG 1 seconds METHOD igniteForTicks (I)V @@ -334,9 +364,8 @@ CLASS net/minecraft/world/entity/Entity COMMENT Determines if an entity is visible or not to a specific player, if the entity is normally invisible. COMMENT For EntityLivingBase subclasses, returning false when invisible will render the entity semi-transparent. ARG 1 player - METHOD isInvulnerableTo (Lnet/minecraft/world/damagesource/DamageSource;)Z - COMMENT Returns whether this Entity is invulnerable to the given DamageSource. - ARG 1 source + METHOD isInvulnerableToBase (Lnet/minecraft/world/damagesource/DamageSource;)Z + ARG 1 damageSource METHOD isOnFire ()Z COMMENT Returns {@code true} if the entity is on fire. Used by render to add the fire effect on rendering. METHOD isPassengerOfSameVehicle (Lnet/minecraft/world/entity/Entity;)Z @@ -357,15 +386,27 @@ CLASS net/minecraft/world/entity/Entity ARG 1 pos METHOD isVehicle ()Z COMMENT If at least 1 entity is riding this one - METHOD kill ()V - COMMENT Called by the /kill command. + METHOD kill (Lnet/minecraft/server/level/ServerLevel;)V + ARG 1 level METHOD killedEntity (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;)Z ARG 1 level ARG 2 entity + METHOD lambda$applyEffectsFromBlocks$0 (Lnet/minecraft/world/level/block/state/BlockState;)Z + ARG 0 state + METHOD lambda$checkFallDamage$1 (Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; + ARG 1 supportingPos METHOD lambda$countPlayerPassengers$13 (Lnet/minecraft/world/entity/Entity;)Z ARG 0 entity - METHOD lambda$move$0 (Lnet/minecraft/world/level/block/state/BlockState;)Z - ARG 0 loadedState + METHOD lambda$getDisplayName$10 (Lnet/minecraft/network/chat/Style;)Lnet/minecraft/network/chat/Style; + ARG 1 style + METHOD lambda$isInWall$2 (Lnet/minecraft/world/phys/AABB;Lnet/minecraft/core/BlockPos;)Z + ARG 2 pos + METHOD lambda$removePassenger$5 (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/entity/Entity;)Z + ARG 1 entity + METHOD lambda$startRiding$3 (Lnet/minecraft/world/entity/Entity;)Z + ARG 0 entity + METHOD lambda$startRiding$4 (Lnet/minecraft/world/entity/Entity;)V + ARG 0 entity METHOD lambda$teleportPassengers$11 (Lnet/minecraft/world/entity/Entity;)V ARG 0 entity METHOD lavaHurt ()V @@ -405,7 +446,7 @@ CLASS net/minecraft/world/entity/Entity ARG 2 motionMultiplier METHOD markHurt ()V COMMENT Marks this entity's velocity as changed, so that it can be re-synced with the client later - METHOD mayInteract (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Z + METHOD mayInteract (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;)Z ARG 1 level ARG 2 pos METHOD maybeBackOffFromEdge (Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/entity/MoverType;)Lnet/minecraft/world/phys/Vec3; @@ -416,7 +457,7 @@ CLASS net/minecraft/world/entity/Entity ARG 1 transformMirror METHOD move (Lnet/minecraft/world/entity/MoverType;Lnet/minecraft/world/phys/Vec3;)V ARG 1 type - ARG 2 pos + ARG 2 movement METHOD moveRelative (FLnet/minecraft/world/phys/Vec3;)V ARG 1 amount ARG 2 relative @@ -462,6 +503,8 @@ CLASS net/minecraft/world/entity/Entity METHOD onPassengerTurned (Lnet/minecraft/world/entity/Entity;)V COMMENT Applies this entity's orientation to another entity. Used to update passenger orientation. ARG 1 entityToUpdate + METHOD onRemoval (Lnet/minecraft/world/entity/Entity$RemovalReason;)V + ARG 1 reason METHOD onSyncedDataUpdated (Ljava/util/List;)V ARG 1 dataValues METHOD onSyncedDataUpdated (Lnet/minecraft/network/syncher/EntityDataAccessor;)V @@ -512,9 +555,12 @@ CLASS net/minecraft/world/entity/Entity ARG 1 vector METHOD readAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V COMMENT (abstract) Protected helper method to read subclass entity data from NBT. - ARG 1 compound + ARG 1 tag METHOD reapplyPosition ()V COMMENT Recomputes this entity's bounding box so that it is positioned at this entity's X/Y/Z. + METHOD recordMovementThroughBlocks (Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/Vec3;)V + ARG 1 oldPosition + ARG 2 position METHOD recreateFromPacket (Lnet/minecraft/network/protocol/game/ClientboundAddEntityPacket;)V ARG 1 packet METHOD remove (Lnet/minecraft/world/entity/Entity$RemovalReason;)V @@ -549,6 +595,8 @@ CLASS net/minecraft/world/entity/Entity METHOD saveWithoutId (Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/nbt/CompoundTag; COMMENT Writes this entity, including passengers, to NBT, regardless as to whether it is removed or a passenger. Does not include the entity's type ID, so the NBT is insufficient to recreate the entity using {@link AnvilChunkLoader#readWorldEntity}. Use {@link #writeUnlessPassenger} for that purpose. ARG 1 compound + METHOD sendTeleportTransitionToRidingPlayers (Lnet/minecraft/world/level/portal/TeleportTransition;)V + ARG 1 teleportTransition METHOD setAirSupply (I)V ARG 1 air METHOD setAsInsidePortal (Lnet/minecraft/world/level/block/Portal;Lnet/minecraft/core/BlockPos;)V @@ -581,11 +629,21 @@ CLASS net/minecraft/world/entity/Entity ARG 1 level METHOD setNoGravity (Z)V ARG 1 noGravity + METHOD setOldPos (Lnet/minecraft/world/phys/Vec3;)V + ARG 1 pos + METHOD setOldPosAndRot (Lnet/minecraft/world/phys/Vec3;FF)V + ARG 1 pos + ARG 2 yRot + ARG 3 xRot + METHOD setOldRot (FF)V + ARG 1 yRot + ARG 2 xRot METHOD setOnGround (Z)V ARG 1 onGround - METHOD setOnGroundWithMovement (ZLnet/minecraft/world/phys/Vec3;)V + METHOD setOnGroundWithMovement (ZZLnet/minecraft/world/phys/Vec3;)V ARG 1 onGround - ARG 2 movement + ARG 2 horizontalCollision + ARG 3 movement METHOD setPortalCooldown (I)V ARG 1 portalCooldown METHOD setPos (DDD)V @@ -660,17 +718,20 @@ CLASS net/minecraft/world/entity/Entity METHOD skipAttackInteraction (Lnet/minecraft/world/entity/Entity;)Z COMMENT Called when a player attacks an entity. If this returns true the attack will not happen. ARG 1 entity - METHOD spawnAtLocation (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/entity/item/ItemEntity; - ARG 1 stack - METHOD spawnAtLocation (Lnet/minecraft/world/item/ItemStack;F)Lnet/minecraft/world/entity/item/ItemEntity; - COMMENT Drops an item at the position of the entity. - ARG 1 stack - ARG 2 offsetY - METHOD spawnAtLocation (Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/entity/item/ItemEntity; - ARG 1 item - METHOD spawnAtLocation (Lnet/minecraft/world/level/ItemLike;I)Lnet/minecraft/world/entity/item/ItemEntity; - ARG 1 item - ARG 2 offsetY + METHOD spawnAtLocation (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/entity/item/ItemEntity; + ARG 1 level + ARG 2 stack + METHOD spawnAtLocation (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/ItemStack;F)Lnet/minecraft/world/entity/item/ItemEntity; + ARG 1 level + ARG 2 stack + ARG 3 yOffset + METHOD spawnAtLocation (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/entity/item/ItemEntity; + ARG 1 level + ARG 2 item + METHOD spawnAtLocation (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/ItemLike;I)Lnet/minecraft/world/entity/item/ItemEntity; + ARG 1 level + ARG 2 item + ARG 3 yOffset METHOD startRiding (Lnet/minecraft/world/entity/Entity;)Z ARG 1 vehicle METHOD startRiding (Lnet/minecraft/world/entity/Entity;Z)Z @@ -688,23 +749,35 @@ CLASS net/minecraft/world/entity/Entity ARG 1 x ARG 3 y ARG 5 z + METHOD teleport (Lnet/minecraft/world/level/portal/TeleportTransition;)Lnet/minecraft/world/entity/Entity; + ARG 1 teleportTransition + METHOD teleportCrossDimension (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/portal/TeleportTransition;)Lnet/minecraft/world/entity/Entity; + ARG 1 level + ARG 2 teleportTransition METHOD teleportRelative (DDD)V ARG 1 dx ARG 3 dy ARG 5 dz + METHOD teleportSameDimension (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/portal/TeleportTransition;)Lnet/minecraft/world/entity/Entity; + ARG 1 level + ARG 2 teleportTransition + METHOD teleportSetPosition (Lnet/minecraft/world/entity/PositionMoveRotation;Ljava/util/Set;)V + ARG 1 positionMovementRotation + ARG 2 relatives METHOD teleportTo (DDD)V COMMENT Sets the position of the entity and updates the 'last' variables ARG 1 x ARG 3 y ARG 5 z - METHOD teleportTo (Lnet/minecraft/server/level/ServerLevel;DDDLjava/util/Set;FF)Z + METHOD teleportTo (Lnet/minecraft/server/level/ServerLevel;DDDLjava/util/Set;FFZ)Z ARG 1 level ARG 2 x ARG 4 y ARG 6 z ARG 8 relativeMovements - ARG 9 yRot - ARG 10 xRot + ARG 9 yaw + ARG 10 pitch + ARG 11 setCamera METHOD thunderHit (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LightningBolt;)V ARG 1 level ARG 2 lightning diff --git a/data/net/minecraft/world/entity/EntitySelector.mapping b/data/net/minecraft/world/entity/EntitySelector.mapping index eab8289a2..72318630e 100644 --- a/data/net/minecraft/world/entity/EntitySelector.mapping +++ b/data/net/minecraft/world/entity/EntitySelector.mapping @@ -38,8 +38,3 @@ CLASS net/minecraft/world/entity/EntitySelector ARG 2 y ARG 4 z ARG 6 range - CLASS MobCanWearArmorEntitySelector - METHOD (Lnet/minecraft/world/item/ItemStack;)V - ARG 1 stack - METHOD test (Lnet/minecraft/world/entity/Entity;)Z - ARG 1 entity diff --git a/data/net/minecraft/world/entity/EntitySpawnReason.mapping b/data/net/minecraft/world/entity/EntitySpawnReason.mapping new file mode 100644 index 000000000..7d986ed23 --- /dev/null +++ b/data/net/minecraft/world/entity/EntitySpawnReason.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/world/entity/EntitySpawnReason + METHOD ignoresLightRequirements (Lnet/minecraft/world/entity/EntitySpawnReason;)Z + ARG 0 reason + METHOD isSpawner (Lnet/minecraft/world/entity/EntitySpawnReason;)Z + ARG 0 reason diff --git a/data/net/minecraft/world/entity/EntityType.mapping b/data/net/minecraft/world/entity/EntityType.mapping index ffa1ae000..7341fc416 100644 --- a/data/net/minecraft/world/entity/EntityType.mapping +++ b/data/net/minecraft/world/entity/EntityType.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/world/entity/EntityType - METHOD (Lnet/minecraft/world/entity/EntityType$EntityFactory;Lnet/minecraft/world/entity/MobCategory;ZZZZLcom/google/common/collect/ImmutableSet;Lnet/minecraft/world/entity/EntityDimensions;FIILnet/minecraft/world/flag/FeatureFlagSet;)V + METHOD (Lnet/minecraft/world/entity/EntityType$EntityFactory;Lnet/minecraft/world/entity/MobCategory;ZZZZLcom/google/common/collect/ImmutableSet;Lnet/minecraft/world/entity/EntityDimensions;FIILjava/lang/String;Ljava/util/Optional;Lnet/minecraft/world/flag/FeatureFlagSet;)V ARG 1 factory ARG 2 category ARG 3 serialize @@ -11,40 +11,50 @@ CLASS net/minecraft/world/entity/EntityType ARG 9 spawnDimensionsScale ARG 10 clientTrackingRange ARG 11 updateInterval - ARG 12 requiredFeatures - METHOD appendCustomEntityStackConfig (Ljava/util/function/Consumer;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/player/Player;)Ljava/util/function/Consumer; + ARG 12 descriptionId + ARG 13 lootTable + ARG 14 requiredFeatures + METHOD appendCustomEntityStackConfig (Ljava/util/function/Consumer;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/player/Player;)Ljava/util/function/Consumer; ARG 0 consumer ARG 1 level - ARG 2 stack + ARG 2 spawnedFrom ARG 3 player METHOD appendCustomNameConfig (Ljava/util/function/Consumer;Lnet/minecraft/world/item/ItemStack;)Ljava/util/function/Consumer; ARG 0 consumer ARG 1 stack - METHOD appendDefaultStackConfig (Ljava/util/function/Consumer;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/player/Player;)Ljava/util/function/Consumer; + METHOD appendDefaultStackConfig (Ljava/util/function/Consumer;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/player/Player;)Ljava/util/function/Consumer; ARG 0 consumer - ARG 1 serverLevel - ARG 2 stack + ARG 1 level + ARG 2 spawnedFrom ARG 3 player + METHOD boatFactory (Ljava/util/function/Supplier;)Lnet/minecraft/world/entity/EntityType$EntityFactory; + ARG 0 boatItemGetter METHOD by (Lnet/minecraft/nbt/CompoundTag;)Ljava/util/Optional; - ARG 0 compound + ARG 0 tag METHOD byString (Ljava/lang/String;)Ljava/util/Optional; COMMENT Tries to get the entity type associated by the key. ARG 0 key - METHOD create (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/world/level/Level;)Ljava/util/Optional; + METHOD chestBoatFactory (Ljava/util/function/Supplier;)Lnet/minecraft/world/entity/EntityType$EntityFactory; + ARG 0 boatItemGetter + METHOD chestRaftFactory (Ljava/util/function/Supplier;)Lnet/minecraft/world/entity/EntityType$EntityFactory; + ARG 0 raftItemGetter + METHOD create (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/EntitySpawnReason;)Ljava/util/Optional; ARG 0 tag ARG 1 level - METHOD create (Lnet/minecraft/server/level/ServerLevel;Ljava/util/function/Consumer;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/MobSpawnType;ZZ)Lnet/minecraft/world/entity/Entity; + ARG 2 spawnReason + METHOD create (Lnet/minecraft/server/level/ServerLevel;Ljava/util/function/Consumer;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/EntitySpawnReason;ZZ)Lnet/minecraft/world/entity/Entity; ARG 1 level ARG 2 consumer ARG 3 pos - ARG 4 spawnType - ARG 5 shouldOffsetY + ARG 4 reason + ARG 5 shoulOffsetY ARG 6 shouldOffsetYMore - METHOD create (Lnet/minecraft/world/level/Level;)Lnet/minecraft/world/entity/Entity; + METHOD create (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/EntitySpawnReason;)Lnet/minecraft/world/entity/Entity; ARG 1 level - METHOD createDefaultStackConfig (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/player/Player;)Ljava/util/function/Consumer; - ARG 0 serverLevel - ARG 1 stack + ARG 2 spawnReason + METHOD createDefaultStackConfig (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/player/Player;)Ljava/util/function/Consumer; + ARG 0 level + ARG 1 spawnedFrom ARG 2 player METHOD getKey (Lnet/minecraft/world/entity/EntityType;)Lnet/minecraft/resources/ResourceLocation; ARG 0 entityType @@ -64,40 +74,44 @@ CLASS net/minecraft/world/entity/EntityType ARG 1 tag METHOD isBlockDangerous (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 state - METHOD lambda$create$4 (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/EntityType;)Lnet/minecraft/world/entity/Entity; - ARG 1 entityType - METHOD lambda$create$5 (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/world/entity/Entity;)V - ARG 1 entity - METHOD loadEntitiesRecursive (Ljava/util/List;Lnet/minecraft/world/level/Level;)Ljava/util/stream/Stream; - ARG 0 tags + METHOD loadEntitiesRecursive (Ljava/util/List;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/EntitySpawnReason;)Ljava/util/stream/Stream; + ARG 0 entityTags ARG 1 level - METHOD loadEntityRecursive (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/world/level/Level;Ljava/util/function/Function;)Lnet/minecraft/world/entity/Entity; - ARG 0 compound + ARG 2 spawnReason + METHOD loadEntityRecursive (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/EntitySpawnReason;Ljava/util/function/Function;)Lnet/minecraft/world/entity/Entity; + ARG 0 entityTag ARG 1 level - ARG 2 entityFunction - METHOD loadStaticEntity (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/world/level/Level;)Ljava/util/Optional; - ARG 0 compound + ARG 2 spawnReason + ARG 3 adapter + METHOD loadStaticEntity (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/EntitySpawnReason;)Ljava/util/Optional; + ARG 0 entityTag ARG 1 level + ARG 2 spawnReason + METHOD raftFactory (Ljava/util/function/Supplier;)Lnet/minecraft/world/entity/EntityType$EntityFactory; + ARG 0 raftItemGetter METHOD register (Ljava/lang/String;Lnet/minecraft/world/entity/EntityType$Builder;)Lnet/minecraft/world/entity/EntityType; ARG 0 key ARG 1 builder - METHOD spawn (Lnet/minecraft/server/level/ServerLevel;Ljava/util/function/Consumer;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/MobSpawnType;ZZ)Lnet/minecraft/world/entity/Entity; + METHOD register (Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/world/entity/EntityType$Builder;)Lnet/minecraft/world/entity/EntityType; + ARG 0 key + ARG 1 builder + METHOD spawn (Lnet/minecraft/server/level/ServerLevel;Ljava/util/function/Consumer;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/EntitySpawnReason;ZZ)Lnet/minecraft/world/entity/Entity; ARG 1 level ARG 2 consumer ARG 3 pos - ARG 4 spawnType + ARG 4 reason ARG 5 shouldOffsetY ARG 6 shouldOffsetYMore - METHOD spawn (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/MobSpawnType;)Lnet/minecraft/world/entity/Entity; + METHOD spawn (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/EntitySpawnReason;)Lnet/minecraft/world/entity/Entity; ARG 1 level ARG 2 pos - ARG 3 spawnType - METHOD spawn (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/MobSpawnType;ZZ)Lnet/minecraft/world/entity/Entity; - ARG 1 serverLevel - ARG 2 stack + ARG 3 reason + METHOD spawn (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/EntitySpawnReason;ZZ)Lnet/minecraft/world/entity/Entity; + ARG 1 level + ARG 2 spawnedFrom ARG 3 player ARG 4 pos - ARG 5 spawnType + ARG 5 reason ARG 6 shouldOffsetY ARG 7 shouldOffsetYMore METHOD updateCustomEntityTag (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/item/component/CustomData;)V @@ -105,6 +119,8 @@ CLASS net/minecraft/world/entity/EntityType ARG 1 player ARG 2 entity ARG 3 customData + METHOD vanillaEntityId (Ljava/lang/String;)Lnet/minecraft/resources/ResourceKey; + ARG 0 name CLASS 1 METHOD tryAdvance (Ljava/util/function/Consumer;)Z ARG 1 consumer @@ -120,8 +136,8 @@ CLASS net/minecraft/world/entity/EntityType METHOD attach (Lnet/minecraft/world/entity/EntityAttachment;Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/world/entity/EntityType$Builder; ARG 1 attachment ARG 2 pos - METHOD build (Ljava/lang/String;)Lnet/minecraft/world/entity/EntityType; - ARG 1 key + METHOD build (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/entity/EntityType; + ARG 1 entityType METHOD clientTrackingRange (I)Lnet/minecraft/world/entity/EntityType$Builder; ARG 1 clientTrackingRange METHOD createNothing (Lnet/minecraft/world/entity/MobCategory;)Lnet/minecraft/world/entity/EntityType$Builder; @@ -130,7 +146,7 @@ CLASS net/minecraft/world/entity/EntityType ARG 1 eyeHeight METHOD immuneTo ([Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/world/entity/EntityType$Builder; ARG 1 blocks - METHOD lambda$createNothing$0 (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/Level;)Lnet/minecraft/world/entity/Entity; + METHOD lambda$createNothing$2 (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/Level;)Lnet/minecraft/world/entity/Entity; ARG 0 entityType ARG 1 level METHOD nameTagOffset (F)Lnet/minecraft/world/entity/EntityType$Builder; diff --git a/data/net/minecraft/world/entity/EquipmentSlot.mapping b/data/net/minecraft/world/entity/EquipmentSlot.mapping index fb72d12a9..f7f7401ec 100644 --- a/data/net/minecraft/world/entity/EquipmentSlot.mapping +++ b/data/net/minecraft/world/entity/EquipmentSlot.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/world/entity/EquipmentSlot ARG 3 type ARG 4 index ARG 5 countLimit - ARG 6 filterFlag + ARG 6 id ARG 7 name METHOD (Ljava/lang/String;ILnet/minecraft/world/entity/EquipmentSlot$Type;IILjava/lang/String;)V ARG 3 type @@ -12,8 +12,8 @@ CLASS net/minecraft/world/entity/EquipmentSlot ARG 6 name METHOD byName (Ljava/lang/String;)Lnet/minecraft/world/entity/EquipmentSlot; ARG 0 targetName - METHOD getFilterFlag ()I - COMMENT Gets the actual slot index. + METHOD getFilterBit (I)I + ARG 1 offset METHOD getIndex (I)I ARG 1 baseIndex METHOD limit (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/ItemStack; diff --git a/data/net/minecraft/world/entity/EquipmentTable.mapping b/data/net/minecraft/world/entity/EquipmentTable.mapping index 68112aa56..6749a039c 100644 --- a/data/net/minecraft/world/entity/EquipmentTable.mapping +++ b/data/net/minecraft/world/entity/EquipmentTable.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/world/entity/EquipmentTable + METHOD (Lnet/minecraft/resources/ResourceKey;F)V + ARG 1 lootTable + ARG 2 dropChance METHOD createForAllSlots (F)Ljava/util/Map; ARG 0 dropChance METHOD createForAllSlots (Ljava/util/List;F)Ljava/util/Map; diff --git a/data/net/minecraft/world/entity/ExperienceOrb.mapping b/data/net/minecraft/world/entity/ExperienceOrb.mapping index df4a53f3e..292213968 100644 --- a/data/net/minecraft/world/entity/ExperienceOrb.mapping +++ b/data/net/minecraft/world/entity/ExperienceOrb.mapping @@ -26,10 +26,6 @@ CLASS net/minecraft/world/entity/ExperienceOrb COMMENT Returns a number from 1 to 10 based on how much XP this orb is worth. This is used by RenderXPOrb to determine what texture to use. METHOD getValue ()I COMMENT Returns the XP value of this XP orb. - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD isAttackable ()Z COMMENT Returns {@code true} if it's possible to attack this entity with an item. METHOD lambda$tryMergeToExisting$0 (IILnet/minecraft/world/entity/ExperienceOrb;)Z diff --git a/data/net/minecraft/world/entity/GlowSquid.mapping b/data/net/minecraft/world/entity/GlowSquid.mapping index 72977d59a..895bbb0ea 100644 --- a/data/net/minecraft/world/entity/GlowSquid.mapping +++ b/data/net/minecraft/world/entity/GlowSquid.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/world/entity/GlowSquid - METHOD checkGlowSquidSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 glowSquid + METHOD checkGlowSquidSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD setDarkTicks (I)V diff --git a/data/net/minecraft/world/entity/Leashable.mapping b/data/net/minecraft/world/entity/Leashable.mapping index f4ac3746c..a73c8841e 100644 --- a/data/net/minecraft/world/entity/Leashable.mapping +++ b/data/net/minecraft/world/entity/Leashable.mapping @@ -16,6 +16,8 @@ CLASS net/minecraft/world/entity/Leashable METHOD handleLeashAtDistance (Lnet/minecraft/world/entity/Entity;F)Z ARG 1 leashHolder ARG 2 distance + METHOD lambda$writeLeashData$0 (Ljava/util/UUID;)Lnet/minecraft/nbt/Tag; + ARG 0 uuid METHOD legacyElasticRangeLeashBehaviour (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/entity/Entity;F)V ARG 0 entity ARG 1 leashHolder @@ -36,8 +38,9 @@ CLASS net/minecraft/world/entity/Leashable METHOD setLeashedTo (Lnet/minecraft/world/entity/Entity;Z)V ARG 1 leashHolder ARG 2 broadcastPacket - METHOD tickLeash (Lnet/minecraft/world/entity/Entity;)V - ARG 0 entity + METHOD tickLeash (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;)V + ARG 0 level + ARG 1 entity METHOD writeLeashData (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/world/entity/Leashable$LeashData;)V ARG 1 tag ARG 2 leashData diff --git a/data/net/minecraft/world/entity/LivingEntity.mapping b/data/net/minecraft/world/entity/LivingEntity.mapping index 70cf99519..e99e8fc43 100644 --- a/data/net/minecraft/world/entity/LivingEntity.mapping +++ b/data/net/minecraft/world/entity/LivingEntity.mapping @@ -4,14 +4,14 @@ CLASS net/minecraft/world/entity/LivingEntity COMMENT Damage taken in the last hit. Mobs are resistant to damage less than this for a short time after taking damage. FIELD lastHurtMobTimestamp I COMMENT Holds the value of ticksExisted when setLastAttacker was last called. - METHOD actuallyHurt (Lnet/minecraft/world/damagesource/DamageSource;F)V - COMMENT Deals damage to the entity. This will take the armor of the entity into consideration before damaging the health bar. - ARG 1 damageSource - ARG 2 damageAmount + METHOD activeLocationDependentEnchantments (Lnet/minecraft/world/entity/EquipmentSlot;)Ljava/util/Map; + ARG 1 slot + METHOD actuallyHurt (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/damagesource/DamageSource;F)V + ARG 1 level + ARG 2 damageSource + ARG 3 amount METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound - METHOD addEatEffect (Lnet/minecraft/world/food/FoodProperties;)V - ARG 1 foodProperties METHOD addEffect (Lnet/minecraft/world/effect/MobEffectInstance;)Z ARG 1 effectInstance METHOD addEffect (Lnet/minecraft/world/effect/MobEffectInstance;Lnet/minecraft/world/entity/Entity;)Z @@ -38,17 +38,19 @@ CLASS net/minecraft/world/entity/LivingEntity ARG 2 damageMultiplier METHOD canAttack (Lnet/minecraft/world/entity/LivingEntity;)Z ARG 1 target - METHOD canAttack (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/ai/targeting/TargetingConditions;)Z - ARG 1 livingentity - ARG 2 condition METHOD canAttackType (Lnet/minecraft/world/entity/EntityType;)Z ARG 1 entityType METHOD canBeAffected (Lnet/minecraft/world/effect/MobEffectInstance;)Z ARG 1 effectInstance + METHOD canDispenserEquipIntoSlot (Lnet/minecraft/world/entity/EquipmentSlot;)Z + ARG 1 slot + METHOD canEquipWithDispenser (Lnet/minecraft/world/item/ItemStack;)Z + ARG 1 stack + METHOD canGlideUsing (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/EquipmentSlot;)Z + ARG 0 stack + ARG 1 slot METHOD canStandOnFluid (Lnet/minecraft/world/level/material/FluidState;)Z ARG 1 fluidState - METHOD canTakeItem (Lnet/minecraft/world/item/ItemStack;)Z - ARG 1 stack METHOD canUseSlot (Lnet/minecraft/world/entity/EquipmentSlot;)Z ARG 1 slot METHOD checkAutoSpinAttack (Lnet/minecraft/world/phys/AABB;Lnet/minecraft/world/phys/AABB;)V @@ -82,8 +84,9 @@ CLASS net/minecraft/world/entity/LivingEntity ARG 1 damageSource ARG 2 damageAmount ARG 3 slots - METHOD doHurtTarget (Lnet/minecraft/world/entity/Entity;)Z - ARG 1 target + METHOD doHurtTarget (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;)Z + ARG 1 level + ARG 2 source METHOD doPush (Lnet/minecraft/world/entity/Entity;)V ARG 1 entity METHOD doesEmitEquipEvent (Lnet/minecraft/world/entity/EquipmentSlot;)Z @@ -95,18 +98,29 @@ CLASS net/minecraft/world/entity/LivingEntity ARG 1 level ARG 2 damageSource ARG 3 recentlyHit - METHOD dropExperience (Lnet/minecraft/world/entity/Entity;)V - ARG 1 entity - METHOD dropFromLootTable (Lnet/minecraft/world/damagesource/DamageSource;Z)V - ARG 1 damageSource - ARG 2 hitByPlayer - METHOD eat (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/ItemStack; + METHOD dropEquipment (Lnet/minecraft/server/level/ServerLevel;)V + ARG 1 level + METHOD dropExperience (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;)V + ARG 1 level + ARG 2 entity + METHOD dropFromGiftLootTable (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/resources/ResourceKey;Ljava/util/function/BiConsumer;)Z + ARG 1 level + ARG 2 lootTable + ARG 3 dropConsumer + METHOD dropFromLootTable (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/resources/ResourceKey;Ljava/util/function/Function;Ljava/util/function/BiConsumer;)Z + ARG 1 level + ARG 2 lootTable + ARG 3 paramsBuilder + ARG 4 dropConsumer + METHOD dropFromLootTable (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/damagesource/DamageSource;Z)V ARG 1 level - ARG 2 food - METHOD eat (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/food/FoodProperties;)Lnet/minecraft/world/item/ItemStack; + ARG 2 damageSource + ARG 3 playerKill + METHOD dropFromShearingLootTable (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/world/item/ItemStack;Ljava/util/function/BiConsumer;)V ARG 1 level - ARG 2 food - ARG 3 foodProperties + ARG 2 lootTable + ARG 3 shears + ARG 4 dropConsumer METHOD entityEventForEquipmentBreak (Lnet/minecraft/world/entity/EquipmentSlot;)B ARG 0 slot METHOD equipmentHasChanged (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;)Z @@ -130,10 +144,10 @@ CLASS net/minecraft/world/entity/LivingEntity ARG 1 attribute METHOD getAttributeValue (Lnet/minecraft/core/Holder;)D ARG 1 attribute + METHOD getBaseExperienceReward (Lnet/minecraft/server/level/ServerLevel;)I + ARG 1 level METHOD getBedOrientation ()Lnet/minecraft/core/Direction; COMMENT Gets the {@link net.minecraft.core.Direction} for the camera if this entity is sleeping. - METHOD getBoundingBoxForCulling ()Lnet/minecraft/world/phys/AABB; - COMMENT Gets the bounding box of this Entity, adjusted to take auxiliary entities into account (e.g. the tile contained by a minecart, such as a command block). METHOD getCombatTracker ()Lnet/minecraft/world/damagesource/CombatTracker; COMMENT 1.8.9 METHOD getComfortableFallDistance (F)I @@ -152,10 +166,6 @@ CLASS net/minecraft/world/entity/LivingEntity ARG 1 pose METHOD getDimensions (Lnet/minecraft/world/entity/Pose;)Lnet/minecraft/world/entity/EntityDimensions; ARG 1 pose - METHOD getDrinkingSound (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/sounds/SoundEvent; - ARG 1 stack - METHOD getEatingSound (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/sounds/SoundEvent; - ARG 1 stack METHOD getEffect (Lnet/minecraft/core/Holder;)Lnet/minecraft/world/effect/MobEffectInstance; ARG 1 effect METHOD getEquipmentSlot (I)Lnet/minecraft/world/entity/EquipmentSlot; @@ -177,6 +187,8 @@ CLASS net/minecraft/world/entity/LivingEntity ARG 1 damageSource METHOD getItemBySlot (Lnet/minecraft/world/entity/EquipmentSlot;)Lnet/minecraft/world/item/ItemStack; ARG 1 slot + METHOD getItemHeldByArm (Lnet/minecraft/world/entity/HumanoidArm;)Lnet/minecraft/world/item/ItemStack; + ARG 1 arm METHOD getItemInHand (Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/item/ItemStack; ARG 1 hand METHOD getJumpPower (F)F @@ -220,6 +232,11 @@ CLASS net/minecraft/world/entity/LivingEntity ARG 1 id METHOD handleEquipmentChanges (Ljava/util/Map;)V ARG 1 equipments + METHOD handleExtraItemsCreatedOnUse (Lnet/minecraft/world/item/ItemStack;)V + ARG 1 stack + METHOD handleFallFlyingCollisions (DD)V + ARG 1 oldSpeed + ARG 3 newSpeed METHOD handleHandSwap (Ljava/util/Map;)V ARG 1 hands METHOD handleOnClimbable (Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/world/phys/Vec3; @@ -233,13 +250,14 @@ CLASS net/minecraft/world/entity/LivingEntity ARG 1 slot METHOD hasLineOfSight (Lnet/minecraft/world/entity/Entity;)Z ARG 1 entity + METHOD hasLineOfSight (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/level/ClipContext$Block;Lnet/minecraft/world/level/ClipContext$Fluid;Ljava/util/function/DoubleSupplier;)Z + ARG 1 entity + ARG 2 blockClipContext + ARG 3 fluidClipContext + ARG 4 eyeY METHOD heal (F)V COMMENT Heal living entity (param: amount of half-hearts) ARG 1 healAmount - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD hurtArmor (Lnet/minecraft/world/damagesource/DamageSource;F)V ARG 1 damageSource ARG 2 damageAmount @@ -266,6 +284,9 @@ CLASS net/minecraft/world/entity/LivingEntity METHOD isDamageSourceBlocked (Lnet/minecraft/world/damagesource/DamageSource;)Z COMMENT Determines whether the entity can block the damage source based on the damage source's location, whether the damage source is blockable, and whether the entity is blocking. ARG 1 damageSource + METHOD isEquippableInSlot (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/EquipmentSlot;)Z + ARG 1 stack + ARG 2 slot METHOD isHolding (Ljava/util/function/Predicate;)Z ARG 1 predicate METHOD isHolding (Lnet/minecraft/world/item/Item;)Z @@ -276,6 +297,16 @@ CLASS net/minecraft/world/entity/LivingEntity COMMENT Checks if this entity is inside an opaque block. METHOD isInvertedHealAndHarm ()Z COMMENT Returns {@code true} if this entity is undead. + METHOD isInvulnerableTo (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/damagesource/DamageSource;)Z + ARG 1 level + ARG 2 damageSource + METHOD isLookingAtMe (Lnet/minecraft/world/entity/LivingEntity;DZZLjava/util/function/Predicate;[Ljava/util/function/DoubleSupplier;)Z + ARG 1 entity + ARG 2 tolerance + ARG 4 scaleByDistance + ARG 5 visual + ARG 6 filter + ARG 7 yValues METHOD isPickable ()Z COMMENT Returns {@code true} if other Entities should be prevented from moving through this Entity. METHOD isPushable ()Z @@ -286,20 +317,33 @@ CLASS net/minecraft/world/entity/LivingEntity COMMENT Causes this entity to do an upwards motion (jumping). METHOD jumpInLiquid (Lnet/minecraft/tags/TagKey;)V ARG 1 fluidTag - METHOD kill ()V - COMMENT Called by the /kill command. METHOD knockback (DDD)V ARG 1 strength ARG 3 x ARG 5 z - METHOD lambda$addAdditionalSaveData$0 (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/core/BlockPos;)V - ARG 1 pos - METHOD lambda$checkBedExists$7 (Lnet/minecraft/core/BlockPos;)Ljava/lang/Boolean; + METHOD lambda$addAdditionalSaveData$1 (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/core/BlockPos;)V ARG 1 pos - METHOD lambda$createEquipmentSlotAccess$10 (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/EquipmentSlot;Lnet/minecraft/world/item/ItemStack;)Z + METHOD lambda$addAdditionalSaveData$2 (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/nbt/Tag;)V + ARG 1 brain + METHOD lambda$collectEquipmentChanges$11 (Lnet/minecraft/core/Holder;Lnet/minecraft/world/entity/ai/attributes/AttributeModifier;)V + ARG 1 attribute + ARG 2 modifier + METHOD lambda$dropFromGiftLootTable$5 (Lnet/minecraft/world/level/storage/loot/LootParams$Builder;)Lnet/minecraft/world/level/storage/loot/LootParams; + ARG 1 builder + METHOD lambda$dropFromLootTable$4 (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/ItemStack;)V ARG 2 stack - METHOD lambda$stopSleeping$9 (Lnet/minecraft/core/BlockPos;)V - ARG 1 pos + METHOD lambda$dropFromLootTable$7 (Ljava/util/function/BiConsumer;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/ItemStack;)V + ARG 2 stack + METHOD lambda$dropFromShearingLootTable$6 (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/storage/loot/LootParams$Builder;)Lnet/minecraft/world/level/storage/loot/LootParams; + ARG 2 builder + METHOD lambda$handleEquipmentChanges$12 (Ljava/util/List;Lnet/minecraft/world/entity/EquipmentSlot;Lnet/minecraft/world/item/ItemStack;)V + ARG 2 slot + ARG 3 stack + METHOD lambda$static$0 (Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 0 entity + METHOD lambda$stopLocationBasedEffects$17 (Lnet/minecraft/world/entity/ai/attributes/AttributeMap;Lnet/minecraft/core/Holder;Lnet/minecraft/world/entity/ai/attributes/AttributeModifier;)V + ARG 1 attribute + ARG 2 modifier METHOD lerpHeadRotationStep (ID)V ARG 1 lerpHeadSteps ARG 2 lerpYHeadRot @@ -323,12 +367,12 @@ CLASS net/minecraft/world/entity/LivingEntity METHOD onEffectAdded (Lnet/minecraft/world/effect/MobEffectInstance;Lnet/minecraft/world/entity/Entity;)V ARG 1 effectInstance ARG 2 entity - METHOD onEffectRemoved (Lnet/minecraft/world/effect/MobEffectInstance;)V - ARG 1 effectInstance METHOD onEffectUpdated (Lnet/minecraft/world/effect/MobEffectInstance;ZLnet/minecraft/world/entity/Entity;)V ARG 1 effectInstance ARG 2 forced ARG 3 entity + METHOD onEffectsRemoved (Ljava/util/Collection;)V + ARG 1 effects METHOD onEnterCombat ()V COMMENT Sends an ENTER_COMBAT packet to the client METHOD onEquipItem (Lnet/minecraft/world/entity/EquipmentSlot;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;)V @@ -442,6 +486,10 @@ CLASS net/minecraft/world/entity/LivingEntity ARG 1 pos METHOD startUsingItem (Lnet/minecraft/world/InteractionHand;)V ARG 1 hand + METHOD stopLocationBasedEffects (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/EquipmentSlot;Lnet/minecraft/world/entity/ai/attributes/AttributeMap;)V + ARG 1 stack + ARG 2 slot + ARG 3 attributeMap METHOD stopRiding ()V COMMENT Dismounts this entity from the entity it is riding. METHOD swing (Lnet/minecraft/world/InteractionHand;)V @@ -468,16 +516,20 @@ CLASS net/minecraft/world/entity/LivingEntity ARG 2 state METHOD travel (Lnet/minecraft/world/phys/Vec3;)V ARG 1 travelVector + METHOD travelInAir (Lnet/minecraft/world/phys/Vec3;)V + ARG 1 travelVector + METHOD travelInFluid (Lnet/minecraft/world/phys/Vec3;)V + ARG 1 travelVector METHOD travelRidden (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/phys/Vec3;)V ARG 1 player ARG 2 travelVector - METHOD triggerItemUseEffects (Lnet/minecraft/world/item/ItemStack;I)V - ARG 1 stack - ARG 2 amount - METHOD triggerOnDeathMobEffects (Lnet/minecraft/world/entity/Entity$RemovalReason;)V - ARG 1 removalReason + METHOD triggerOnDeathMobEffects (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity$RemovalReason;)V + ARG 1 level + ARG 2 removalReason METHOD updateFallFlying ()V COMMENT Called each tick. Updates state for the elytra. + METHOD updateFallFlyingMovement (Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/world/phys/Vec3; + ARG 1 deltaMovement METHOD updateInvisibilityStatus ()V COMMENT Clears potion metadata values if the entity has no potion effects. Otherwise, updates potion effect color, ambience, and invisibility metadata values METHOD updateSwingTime ()V diff --git a/data/net/minecraft/world/entity/Mob.mapping b/data/net/minecraft/world/entity/Mob.mapping index 76d90b91a..3bdc12c00 100644 --- a/data/net/minecraft/world/entity/Mob.mapping +++ b/data/net/minecraft/world/entity/Mob.mapping @@ -11,48 +11,53 @@ CLASS net/minecraft/world/entity/Mob ARG 1 projectileWeapon METHOD canHoldItem (Lnet/minecraft/world/item/ItemStack;)Z ARG 1 stack - METHOD canReplaceCurrentItem (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;)Z - ARG 1 candidate - ARG 2 existing + METHOD canReplaceCurrentItem (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/EquipmentSlot;)Z + ARG 1 newItem + ARG 2 currentItem + ARG 3 slot METHOD canReplaceEqualItem (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;)Z ARG 1 candidate ARG 2 existing - METHOD canTakeItem (Lnet/minecraft/world/item/ItemStack;)Z - ARG 1 itemstack METHOD checkAndHandleImportantInteractions (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult; ARG 1 player ARG 2 hand METHOD checkDespawn ()V COMMENT Makes the entity despawn if requirements are reached - METHOD checkMobSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 type + METHOD checkMobSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD checkSpawnObstruction (Lnet/minecraft/world/level/LevelReader;)Z ARG 1 level - METHOD checkSpawnRules (Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;)Z + METHOD checkSpawnRules (Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;)Z ARG 1 level - ARG 2 reason - METHOD convertTo (Lnet/minecraft/world/entity/EntityType;Z)Lnet/minecraft/world/entity/Mob; + ARG 2 spawnReason + METHOD convertTo (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/entity/ConversionParams;Lnet/minecraft/world/entity/ConversionParams$AfterConversion;)Lnet/minecraft/world/entity/Mob; ARG 1 entityType - ARG 2 transferInventory + ARG 2 coversionParams + ARG 3 afterConversion + METHOD convertTo (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/entity/ConversionParams;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/ConversionParams$AfterConversion;)Lnet/minecraft/world/entity/Mob; + ARG 1 entityType + ARG 2 conversionParams + ARG 3 spawnReason + ARG 4 afterConversion METHOD createEquipmentParams (Lnet/minecraft/server/level/ServerLevel;)Lnet/minecraft/world/level/storage/loot/LootParams; ARG 1 level METHOD createNavigation (Lnet/minecraft/world/level/Level;)Lnet/minecraft/world/entity/ai/navigation/PathNavigation; ARG 1 level - METHOD doHurtTarget (Lnet/minecraft/world/entity/Entity;)Z - ARG 1 entity - METHOD dropFromLootTable (Lnet/minecraft/world/damagesource/DamageSource;Z)V - ARG 1 damageSource - ARG 2 attackedRecently + METHOD customServerAiStep (Lnet/minecraft/server/level/ServerLevel;)V + ARG 1 level METHOD dropLeash (ZZ)V COMMENT Removes the leash from this entity ARG 1 broadcastPacket ARG 2 dropLeash - METHOD dropPreservedEquipment (Ljava/util/function/Predicate;)Ljava/util/Set; - ARG 1 predicate + METHOD dropPreservedEquipment (Lnet/minecraft/server/level/ServerLevel;)V + ARG 1 level + METHOD dropPreservedEquipment (Lnet/minecraft/server/level/ServerLevel;Ljava/util/function/Predicate;)Ljava/util/Set; + ARG 1 level + ARG 2 filter METHOD enchantSpawnedArmor (Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/util/RandomSource;Lnet/minecraft/world/entity/EquipmentSlot;Lnet/minecraft/world/DifficultyInstance;)V ARG 1 level ARG 2 random @@ -73,17 +78,20 @@ CLASS net/minecraft/world/entity/Mob ARG 2 slotDropChances METHOD equip (Lnet/minecraft/world/entity/EquipmentTable;)V ARG 1 equipmentTable - METHOD equipItemIfPossible (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/ItemStack; - ARG 1 stack - METHOD finalizeSpawn (Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData; + METHOD equipItemIfPossible (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/ItemStack; + ARG 1 level + ARG 2 stack + METHOD finalizeSpawn (Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData; ARG 1 level ARG 2 difficulty - ARG 3 spawnType + ARG 3 spawnReason ARG 4 spawnGroupData METHOD getAmbientSoundInterval ()I COMMENT Get number of ticks, at least during which the living entity will be silent. - METHOD getApproximateAttackDamageWithItem (Lnet/minecraft/world/item/ItemStack;)D - ARG 1 itemStack + METHOD getApproximateAttributeWith (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/core/Holder;Lnet/minecraft/world/entity/EquipmentSlot;)D + ARG 1 item + ARG 2 attribute + ARG 3 slot METHOD getEquipmentDropChance (Lnet/minecraft/world/entity/EquipmentSlot;)F ARG 1 slot METHOD getEquipmentForSlot (Lnet/minecraft/world/entity/EquipmentSlot;I)Lnet/minecraft/world/item/Item; @@ -106,8 +114,6 @@ CLASS net/minecraft/world/entity/Mob METHOD interact (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult; ARG 1 player ARG 2 hand - METHOD isBodyArmorItem (Lnet/minecraft/world/item/ItemStack;)Z - ARG 1 stack METHOD isEffectiveAi ()Z COMMENT Returns whether the entity is in a server world METHOD isMaxGroupSizeReached (I)Z @@ -120,6 +126,14 @@ CLASS net/minecraft/world/entity/Mob ARG 1 entity METHOD isWithinRestriction (Lnet/minecraft/core/BlockPos;)Z ARG 1 pos + METHOD lambda$checkAndHandleImportantInteractions$1 (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/entity/Mob;)V + ARG 2 mob + METHOD lambda$dropPreservedEquipment$0 (Lnet/minecraft/world/item/ItemStack;)Z + ARG 0 stack + METHOD lambda$removeAfterChangingDimensions$3 (Lnet/minecraft/world/item/ItemStack;)V + ARG 0 stack + METHOD lambda$removeFreeWill$2 (Lnet/minecraft/world/entity/ai/goal/Goal;)Z + ARG 0 goal METHOD lookAt (Lnet/minecraft/world/entity/Entity;FF)V COMMENT Changes the X and Y rotation so that this entity is facing the given entity. ARG 1 entity @@ -131,9 +145,9 @@ CLASS net/minecraft/world/entity/Mob METHOD onOffspringSpawnedFromEgg (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/entity/Mob;)V ARG 1 player ARG 2 child - METHOD pickUpItem (Lnet/minecraft/world/entity/item/ItemEntity;)V - COMMENT Tests if this entity should pick up a weapon or an armor piece. Entity drops current weapon or armor if the new one is better. - ARG 1 itemEntity + METHOD pickUpItem (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/item/ItemEntity;)V + ARG 1 level + ARG 2 entity METHOD playAmbientSound ()V COMMENT Plays living's sound at its position METHOD playHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)V @@ -211,5 +225,6 @@ CLASS net/minecraft/world/entity/Mob COMMENT Called to update the entity's position/logic. METHOD updateControlFlags ()V COMMENT Sets MOVE, JUMP, LOOK Goal.Flags depending if entity is riding or been controlled - METHOD wantsToPickUp (Lnet/minecraft/world/item/ItemStack;)Z - ARG 1 stack + METHOD wantsToPickUp (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/ItemStack;)Z + ARG 1 level + ARG 2 stack diff --git a/data/net/minecraft/world/entity/MobSpawnType.mapping b/data/net/minecraft/world/entity/MobSpawnType.mapping deleted file mode 100644 index 9d2f8d6f1..000000000 --- a/data/net/minecraft/world/entity/MobSpawnType.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/world/entity/MobSpawnType - METHOD ignoresLightRequirements (Lnet/minecraft/world/entity/MobSpawnType;)Z - ARG 0 spawnType - METHOD isSpawner (Lnet/minecraft/world/entity/MobSpawnType;)Z - ARG 0 spawnType diff --git a/data/net/minecraft/world/entity/NeutralMob.mapping b/data/net/minecraft/world/entity/NeutralMob.mapping index 874234634..7f92f58b1 100644 --- a/data/net/minecraft/world/entity/NeutralMob.mapping +++ b/data/net/minecraft/world/entity/NeutralMob.mapping @@ -5,12 +5,14 @@ CLASS net/minecraft/world/entity/NeutralMob ARG 1 entity METHOD getTarget ()Lnet/minecraft/world/entity/LivingEntity; COMMENT Gets the active target the Task system uses for tracking - METHOD isAngryAt (Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 1 target - METHOD isAngryAtAllPlayers (Lnet/minecraft/world/level/Level;)Z + METHOD isAngryAt (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/server/level/ServerLevel;)Z + ARG 1 entity + ARG 2 level + METHOD isAngryAtAllPlayers (Lnet/minecraft/server/level/ServerLevel;)Z ARG 1 level - METHOD playerDied (Lnet/minecraft/world/entity/player/Player;)V - ARG 1 player + METHOD playerDied (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/player/Player;)V + ARG 1 level + ARG 2 player METHOD readPersistentAngerSaveData (Lnet/minecraft/world/level/Level;Lnet/minecraft/nbt/CompoundTag;)V ARG 1 level ARG 2 tag diff --git a/data/net/minecraft/world/entity/OminousItemSpawner.mapping b/data/net/minecraft/world/entity/OminousItemSpawner.mapping index cc9d0b622..ebd39d79f 100644 --- a/data/net/minecraft/world/entity/OminousItemSpawner.mapping +++ b/data/net/minecraft/world/entity/OminousItemSpawner.mapping @@ -4,3 +4,9 @@ CLASS net/minecraft/world/entity/OminousItemSpawner ARG 1 item METHOD setItem (Lnet/minecraft/world/item/ItemStack;)V ARG 1 item + METHOD spawnProjectile (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/ProjectileItem;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/entity/Entity; + ARG 1 level + ARG 2 projectileItem + ARG 3 stack + METHOD tickServer (Lnet/minecraft/server/level/ServerLevel;)V + ARG 1 level diff --git a/data/net/minecraft/world/entity/PathfinderMob.mapping b/data/net/minecraft/world/entity/PathfinderMob.mapping index 3fbcfb13a..340cf1a88 100644 --- a/data/net/minecraft/world/entity/PathfinderMob.mapping +++ b/data/net/minecraft/world/entity/PathfinderMob.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/world/entity/PathfinderMob - METHOD checkSpawnRules (Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;)Z - ARG 1 level - ARG 2 spawnReason METHOD getWalkTargetValue (Lnet/minecraft/core/BlockPos;)F ARG 1 pos METHOD getWalkTargetValue (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/LevelReader;)F diff --git a/data/net/minecraft/world/entity/PortalProcessor.mapping b/data/net/minecraft/world/entity/PortalProcessor.mapping index 588d616fb..2b2c03ddf 100644 --- a/data/net/minecraft/world/entity/PortalProcessor.mapping +++ b/data/net/minecraft/world/entity/PortalProcessor.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/world/entity/PortalProcessor METHOD (Lnet/minecraft/world/level/block/Portal;Lnet/minecraft/core/BlockPos;)V ARG 1 portal ARG 2 entryPosition - METHOD getPortalDestination (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/level/portal/DimensionTransition; + METHOD getPortalDestination (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/level/portal/TeleportTransition; ARG 1 level ARG 2 entity METHOD isSamePortal (Lnet/minecraft/world/level/block/Portal;)Z diff --git a/data/net/minecraft/world/entity/PositionMoveRotation.mapping b/data/net/minecraft/world/entity/PositionMoveRotation.mapping new file mode 100644 index 000000000..dbc5cbc18 --- /dev/null +++ b/data/net/minecraft/world/entity/PositionMoveRotation.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/world/entity/PositionMoveRotation + METHOD calculateAbsolute (Lnet/minecraft/world/entity/PositionMoveRotation;Lnet/minecraft/world/entity/PositionMoveRotation;Ljava/util/Set;)Lnet/minecraft/world/entity/PositionMoveRotation; + ARG 0 current + ARG 1 after + ARG 2 relatives + METHOD calculateDelta (DDLjava/util/Set;Lnet/minecraft/world/entity/Relative;)D + ARG 0 position + ARG 2 deltaMovement + ARG 4 relatives + ARG 5 deltaRelative + METHOD of (Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/entity/PositionMoveRotation; + ARG 0 entity + METHOD of (Lnet/minecraft/world/level/portal/TeleportTransition;)Lnet/minecraft/world/entity/PositionMoveRotation; + ARG 0 teleportTransition + METHOD ofEntityUsingLerpTarget (Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/entity/PositionMoveRotation; + ARG 0 entity diff --git a/data/net/minecraft/world/entity/Relative.mapping b/data/net/minecraft/world/entity/Relative.mapping new file mode 100644 index 000000000..bd186d939 --- /dev/null +++ b/data/net/minecraft/world/entity/Relative.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/world/entity/Relative + METHOD (Ljava/lang/String;II)V + ARG 3 bit + METHOD isSet (I)Z + ARG 1 data + METHOD pack (Ljava/util/Set;)I + ARG 0 relatives + METHOD union ([Ljava/util/Set;)Ljava/util/Set; + ARG 0 sets + METHOD unpack (I)Ljava/util/Set; + ARG 0 data diff --git a/data/net/minecraft/world/entity/RelativeMovement.mapping b/data/net/minecraft/world/entity/RelativeMovement.mapping deleted file mode 100644 index 9063a7c93..000000000 --- a/data/net/minecraft/world/entity/RelativeMovement.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/world/entity/RelativeMovement - METHOD (Ljava/lang/String;II)V - ARG 3 bit - METHOD isSet (I)Z - ARG 1 packedMovements - METHOD pack (Ljava/util/Set;)I - ARG 0 movements - METHOD unpack (I)Ljava/util/Set; - ARG 0 packedMovements diff --git a/data/net/minecraft/world/entity/Shearable.mapping b/data/net/minecraft/world/entity/Shearable.mapping index f0742ccec..b22a47bcd 100644 --- a/data/net/minecraft/world/entity/Shearable.mapping +++ b/data/net/minecraft/world/entity/Shearable.mapping @@ -1,3 +1,5 @@ CLASS net/minecraft/world/entity/Shearable - METHOD shear (Lnet/minecraft/sounds/SoundSource;)V - ARG 1 source + METHOD shear (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/sounds/SoundSource;Lnet/minecraft/world/item/ItemStack;)V + ARG 1 level + ARG 2 soundSource + ARG 3 shears diff --git a/data/net/minecraft/world/entity/SpawnPlacements.mapping b/data/net/minecraft/world/entity/SpawnPlacements.mapping index 932f5add7..8e428966d 100644 --- a/data/net/minecraft/world/entity/SpawnPlacements.mapping +++ b/data/net/minecraft/world/entity/SpawnPlacements.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/world/entity/SpawnPlacements - METHOD checkSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + METHOD checkSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z ARG 0 entityType - ARG 1 serverLevel - ARG 2 spawnType + ARG 1 level + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD getHeightmapType (Lnet/minecraft/world/entity/EntityType;)Lnet/minecraft/world/level/levelgen/Heightmap$Types; @@ -19,9 +19,9 @@ CLASS net/minecraft/world/entity/SpawnPlacements ARG 2 heightmapType ARG 3 predicate CLASS SpawnPredicate - METHOD test (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + METHOD test (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z ARG 1 entityType - ARG 2 serverLevel - ARG 3 spawnType + ARG 2 level + ARG 3 spawnReason ARG 4 pos ARG 5 random diff --git a/data/net/minecraft/world/entity/TamableAnimal.mapping b/data/net/minecraft/world/entity/TamableAnimal.mapping index d4e37a987..e7ed28aa5 100644 --- a/data/net/minecraft/world/entity/TamableAnimal.mapping +++ b/data/net/minecraft/world/entity/TamableAnimal.mapping @@ -8,9 +8,6 @@ CLASS net/minecraft/world/entity/TamableAnimal METHOD die (Lnet/minecraft/world/damagesource/DamageSource;)V COMMENT Called when the mob's health reaches 0. ARG 1 cause - METHOD isAlliedTo (Lnet/minecraft/world/entity/Entity;)Z - COMMENT Returns whether this Entity is on the same team as the given Entity. - ARG 1 entity METHOD isOwnedBy (Lnet/minecraft/world/entity/LivingEntity;)Z ARG 1 entity METHOD maybeTeleportTo (III)Z diff --git a/data/net/minecraft/world/entity/WalkAnimationState.mapping b/data/net/minecraft/world/entity/WalkAnimationState.mapping index 585419533..4b838607a 100644 --- a/data/net/minecraft/world/entity/WalkAnimationState.mapping +++ b/data/net/minecraft/world/entity/WalkAnimationState.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/world/entity/WalkAnimationState ARG 1 speed METHOD speed (F)F ARG 1 partialTick - METHOD update (FF)V - ARG 1 newSpeed - ARG 2 partialTick + METHOD update (FFF)V + ARG 1 movementSpeed + ARG 2 multiplier + ARG 3 positionScale diff --git a/data/net/minecraft/world/entity/ai/attributes/AttributeInstance.mapping b/data/net/minecraft/world/entity/ai/attributes/AttributeInstance.mapping index e367c17e7..43f219bba 100644 --- a/data/net/minecraft/world/entity/ai/attributes/AttributeInstance.mapping +++ b/data/net/minecraft/world/entity/ai/attributes/AttributeInstance.mapping @@ -12,6 +12,8 @@ CLASS net/minecraft/world/entity/ai/attributes/AttributeInstance ARG 1 modifier METHOD addPermanentModifier (Lnet/minecraft/world/entity/ai/attributes/AttributeModifier;)V ARG 1 modifier + METHOD addPermanentModifiers (Ljava/util/Collection;)V + ARG 1 modifiers METHOD addTransientModifier (Lnet/minecraft/world/entity/ai/attributes/AttributeModifier;)V ARG 1 modifier METHOD getModifier (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/world/entity/ai/attributes/AttributeModifier; diff --git a/data/net/minecraft/world/entity/ai/attributes/AttributeMap.mapping b/data/net/minecraft/world/entity/ai/attributes/AttributeMap.mapping index 8f1496875..c4f7bbc03 100644 --- a/data/net/minecraft/world/entity/ai/attributes/AttributeMap.mapping +++ b/data/net/minecraft/world/entity/ai/attributes/AttributeMap.mapping @@ -7,6 +7,8 @@ CLASS net/minecraft/world/entity/ai/attributes/AttributeMap ARG 1 map METHOD assignBaseValues (Lnet/minecraft/world/entity/ai/attributes/AttributeMap;)V ARG 1 map + METHOD assignPermanentModifiers (Lnet/minecraft/world/entity/ai/attributes/AttributeMap;)V + ARG 1 map METHOD getBaseValue (Lnet/minecraft/core/Holder;)D ARG 1 attribute METHOD getInstance (Lnet/minecraft/core/Holder;)Lnet/minecraft/world/entity/ai/attributes/AttributeInstance; diff --git a/data/net/minecraft/world/entity/ai/behavior/GiveGiftToHero.mapping b/data/net/minecraft/world/entity/ai/behavior/GiveGiftToHero.mapping index 35aa5df7c..ae229bc61 100644 --- a/data/net/minecraft/world/entity/ai/behavior/GiveGiftToHero.mapping +++ b/data/net/minecraft/world/entity/ai/behavior/GiveGiftToHero.mapping @@ -10,8 +10,8 @@ CLASS net/minecraft/world/entity/ai/behavior/GiveGiftToHero METHOD checkExtraStartConditions (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/npc/Villager;)Z ARG 1 level ARG 2 owner - METHOD getItemToThrow (Lnet/minecraft/world/entity/npc/Villager;)Ljava/util/List; - ARG 1 villager + METHOD getLootTableToThrow (Lnet/minecraft/world/entity/npc/Villager;)Lnet/minecraft/resources/ResourceKey; + ARG 0 villager METHOD getNearestTargetableHero (Lnet/minecraft/world/entity/npc/Villager;)Ljava/util/Optional; ARG 1 villager METHOD isHero (Lnet/minecraft/world/entity/player/Player;)Z @@ -21,8 +21,6 @@ CLASS net/minecraft/world/entity/ai/behavior/GiveGiftToHero METHOD isWithinThrowingDistance (Lnet/minecraft/world/entity/npc/Villager;Lnet/minecraft/world/entity/player/Player;)Z ARG 1 villager ARG 2 hero - METHOD lambda$static$0 (Ljava/util/HashMap;)V - ARG 0 map METHOD start (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/npc/Villager;J)V ARG 1 level ARG 2 entity @@ -31,9 +29,10 @@ CLASS net/minecraft/world/entity/ai/behavior/GiveGiftToHero ARG 1 level ARG 2 entity ARG 3 gameTime - METHOD throwGift (Lnet/minecraft/world/entity/npc/Villager;Lnet/minecraft/world/entity/LivingEntity;)V - ARG 1 villager - ARG 2 hero + METHOD throwGift (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/npc/Villager;Lnet/minecraft/world/entity/LivingEntity;)V + ARG 1 level + ARG 2 villager + ARG 3 target METHOD tick (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/npc/Villager;J)V ARG 1 level ARG 2 owner diff --git a/data/net/minecraft/world/entity/ai/behavior/MeleeAttack.mapping b/data/net/minecraft/world/entity/ai/behavior/MeleeAttack.mapping index fcef40911..54075f139 100644 --- a/data/net/minecraft/world/entity/ai/behavior/MeleeAttack.mapping +++ b/data/net/minecraft/world/entity/ai/behavior/MeleeAttack.mapping @@ -1,18 +1,10 @@ CLASS net/minecraft/world/entity/ai/behavior/MeleeAttack METHOD create (I)Lnet/minecraft/world/entity/ai/behavior/OneShot; - ARG 0 cooldownBetweenAttacks + ARG 0 attackCooldown + METHOD create (Ljava/util/function/Predicate;I)Lnet/minecraft/world/entity/ai/behavior/OneShot; + ARG 0 canAttack + ARG 1 attackCooldown METHOD isHoldingUsableProjectileWeapon (Lnet/minecraft/world/entity/Mob;)Z ARG 0 mob - METHOD lambda$create$0 (Lnet/minecraft/world/entity/ai/behavior/declarative/BehaviorBuilder$Instance;Lnet/minecraft/world/entity/ai/behavior/declarative/MemoryAccessor;Lnet/minecraft/world/entity/ai/behavior/declarative/MemoryAccessor;Lnet/minecraft/world/entity/ai/behavior/declarative/MemoryAccessor;Lnet/minecraft/world/entity/ai/behavior/declarative/MemoryAccessor;ILnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Mob;J)Z - ARG 6 level - ARG 7 mob - ARG 8 gameTime - METHOD lambda$create$1 (Lnet/minecraft/world/entity/ai/behavior/declarative/BehaviorBuilder$Instance;ILnet/minecraft/world/entity/ai/behavior/declarative/MemoryAccessor;Lnet/minecraft/world/entity/ai/behavior/declarative/MemoryAccessor;Lnet/minecraft/world/entity/ai/behavior/declarative/MemoryAccessor;Lnet/minecraft/world/entity/ai/behavior/declarative/MemoryAccessor;)Lnet/minecraft/world/entity/ai/behavior/declarative/Trigger; - ARG 2 lookTarget - ARG 3 attackTarget - ARG 4 attackCoolingDown - ARG 5 nearestVisibleLivingEntities - METHOD lambda$create$2 (ILnet/minecraft/world/entity/ai/behavior/declarative/BehaviorBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 1 instance - METHOD lambda$isHoldingUsableProjectileWeapon$3 (Lnet/minecraft/world/entity/Mob;Lnet/minecraft/world/item/ItemStack;)Z - ARG 1 stack + METHOD lambda$create$3 (Ljava/util/function/Predicate;ILnet/minecraft/world/entity/ai/behavior/declarative/BehaviorBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 2 instance diff --git a/data/net/minecraft/world/entity/ai/behavior/PrepareRamNearestTarget.mapping b/data/net/minecraft/world/entity/ai/behavior/PrepareRamNearestTarget.mapping index 67d3b952b..53a4b3b5e 100644 --- a/data/net/minecraft/world/entity/ai/behavior/PrepareRamNearestTarget.mapping +++ b/data/net/minecraft/world/entity/ai/behavior/PrepareRamNearestTarget.mapping @@ -21,10 +21,6 @@ CLASS net/minecraft/world/entity/ai/behavior/PrepareRamNearestTarget ARG 2 pos METHOD lambda$calculateRammingStartPosition$3 (Lnet/minecraft/world/entity/ai/navigation/PathNavigation;Lnet/minecraft/core/BlockPos;)Z ARG 1 pos - METHOD lambda$start$0 (Lnet/minecraft/world/entity/PathfinderMob;Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 2 entity - METHOD lambda$start$1 (Lnet/minecraft/world/entity/PathfinderMob;Lnet/minecraft/world/entity/ai/memory/NearestVisibleLivingEntities;)Ljava/util/Optional; - ARG 2 memory METHOD lambda$start$2 (Lnet/minecraft/world/entity/PathfinderMob;Lnet/minecraft/world/entity/LivingEntity;)V ARG 2 entity CLASS RamCandidate diff --git a/data/net/minecraft/world/entity/ai/behavior/StartAttacking.mapping b/data/net/minecraft/world/entity/ai/behavior/StartAttacking.mapping index 013a5a7dc..2db6d082f 100644 --- a/data/net/minecraft/world/entity/ai/behavior/StartAttacking.mapping +++ b/data/net/minecraft/world/entity/ai/behavior/StartAttacking.mapping @@ -1,17 +1,19 @@ CLASS net/minecraft/world/entity/ai/behavior/StartAttacking - METHOD create (Ljava/util/function/Function;)Lnet/minecraft/world/entity/ai/behavior/BehaviorControl; - ARG 0 targetFinder - METHOD create (Ljava/util/function/Predicate;Ljava/util/function/Function;)Lnet/minecraft/world/entity/ai/behavior/BehaviorControl; - ARG 0 canAttack + METHOD create (Lnet/minecraft/world/entity/ai/behavior/StartAttacking$StartAttackingCondition;Lnet/minecraft/world/entity/ai/behavior/StartAttacking$TargetFinder;)Lnet/minecraft/world/entity/ai/behavior/BehaviorControl; + ARG 0 condition ARG 1 targetFinder - METHOD lambda$create$0 (Lnet/minecraft/world/entity/Mob;)Z - ARG 0 entity - METHOD lambda$create$1 (Ljava/util/function/Predicate;Ljava/util/function/Function;Lnet/minecraft/world/entity/ai/behavior/declarative/MemoryAccessor;Lnet/minecraft/world/entity/ai/behavior/declarative/MemoryAccessor;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Mob;J)Z - ARG 4 level - ARG 5 mob - ARG 6 gameTime - METHOD lambda$create$2 (Ljava/util/function/Predicate;Ljava/util/function/Function;Lnet/minecraft/world/entity/ai/behavior/declarative/MemoryAccessor;Lnet/minecraft/world/entity/ai/behavior/declarative/MemoryAccessor;)Lnet/minecraft/world/entity/ai/behavior/declarative/Trigger; - ARG 2 attackTarget - ARG 3 cantReachWalkTargetSince - METHOD lambda$create$3 (Ljava/util/function/Predicate;Ljava/util/function/Function;Lnet/minecraft/world/entity/ai/behavior/declarative/BehaviorBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + METHOD create (Lnet/minecraft/world/entity/ai/behavior/StartAttacking$TargetFinder;)Lnet/minecraft/world/entity/ai/behavior/BehaviorControl; + ARG 0 targetFinder + METHOD lambda$create$0 (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Mob;)Z + ARG 0 level + ARG 1 mob + METHOD lambda$create$3 (Lnet/minecraft/world/entity/ai/behavior/StartAttacking$StartAttackingCondition;Lnet/minecraft/world/entity/ai/behavior/StartAttacking$TargetFinder;Lnet/minecraft/world/entity/ai/behavior/declarative/BehaviorBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 2 instance + CLASS TargetFinder + METHOD get (Lnet/minecraft/server/level/ServerLevel;Ljava/lang/Object;)Ljava/util/Optional; + ARG 1 level + ARG 2 mob + CLASS StartAttackingCondition + METHOD test (Lnet/minecraft/server/level/ServerLevel;Ljava/lang/Object;)Z + ARG 1 level + ARG 2 mob diff --git a/data/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.mapping b/data/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.mapping index 4af202c3b..00af30015 100644 --- a/data/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.mapping +++ b/data/net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid.mapping @@ -1,31 +1,40 @@ CLASS net/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid - METHOD create (Ljava/util/function/BiConsumer;)Lnet/minecraft/world/entity/ai/behavior/BehaviorControl; - ARG 0 onStopAttacking - METHOD create (Ljava/util/function/Predicate;)Lnet/minecraft/world/entity/ai/behavior/BehaviorControl; + METHOD create (Lnet/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid$StopAttackCondition;)Lnet/minecraft/world/entity/ai/behavior/BehaviorControl; ARG 0 canStopAttacking - METHOD create (Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;Z)Lnet/minecraft/world/entity/ai/behavior/BehaviorControl; + METHOD create (Lnet/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid$StopAttackCondition;Lnet/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid$TargetErasedCallback;Z)Lnet/minecraft/world/entity/ai/behavior/BehaviorControl; ARG 0 canStopAttacking ARG 1 onStopAttacking ARG 2 canGrowTiredOfTryingToReachTarget + METHOD create (Lnet/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid$TargetErasedCallback;)Lnet/minecraft/world/entity/ai/behavior/BehaviorControl; + ARG 0 onStopAttacking METHOD isTiredOfTryingToReachTarget (Lnet/minecraft/world/entity/LivingEntity;Ljava/util/Optional;)Z ARG 0 entity ARG 1 timeSinceInvalidTarget - METHOD lambda$create$0 (Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 0 entity - METHOD lambda$create$1 (Lnet/minecraft/world/entity/Mob;Lnet/minecraft/world/entity/LivingEntity;)V - ARG 0 entity - ARG 1 target - METHOD lambda$create$2 (Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 0 entity - METHOD lambda$create$3 (Lnet/minecraft/world/entity/Mob;Lnet/minecraft/world/entity/LivingEntity;)V - ARG 0 entity - ARG 1 target - METHOD lambda$create$4 (Lnet/minecraft/world/entity/ai/behavior/declarative/BehaviorBuilder$Instance;Lnet/minecraft/world/entity/ai/behavior/declarative/MemoryAccessor;ZLnet/minecraft/world/entity/ai/behavior/declarative/MemoryAccessor;Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Mob;J)Z + METHOD lambda$create$0 (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 0 level + ARG 1 entity + METHOD lambda$create$1 (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Mob;Lnet/minecraft/world/entity/LivingEntity;)V + ARG 0 level + ARG 1 entity + ARG 2 target + METHOD lambda$create$2 (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 0 level + ARG 1 entity + METHOD lambda$create$3 (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Mob;Lnet/minecraft/world/entity/LivingEntity;)V + ARG 0 level + ARG 1 entity + ARG 2 target + METHOD lambda$create$4 (Lnet/minecraft/world/entity/ai/behavior/declarative/BehaviorBuilder$Instance;Lnet/minecraft/world/entity/ai/behavior/declarative/MemoryAccessor;ZLnet/minecraft/world/entity/ai/behavior/declarative/MemoryAccessor;Lnet/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid$StopAttackCondition;Lnet/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid$TargetErasedCallback;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Mob;J)Z ARG 6 level - ARG 7 mob - ARG 8 gameTime - METHOD lambda$create$5 (Lnet/minecraft/world/entity/ai/behavior/declarative/BehaviorBuilder$Instance;ZLjava/util/function/Predicate;Ljava/util/function/BiConsumer;Lnet/minecraft/world/entity/ai/behavior/declarative/MemoryAccessor;Lnet/minecraft/world/entity/ai/behavior/declarative/MemoryAccessor;)Lnet/minecraft/world/entity/ai/behavior/declarative/Trigger; - ARG 4 attackTarget - ARG 5 cantReachWalkTargetSince - METHOD lambda$create$6 (ZLjava/util/function/Predicate;Ljava/util/function/BiConsumer;Lnet/minecraft/world/entity/ai/behavior/declarative/BehaviorBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 7 entity + METHOD lambda$create$6 (ZLnet/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid$StopAttackCondition;Lnet/minecraft/world/entity/ai/behavior/StopAttackingIfTargetInvalid$TargetErasedCallback;Lnet/minecraft/world/entity/ai/behavior/declarative/BehaviorBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 3 instance + CLASS StopAttackCondition + METHOD test (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 1 level + ARG 2 entity + CLASS TargetErasedCallback + METHOD accept (Lnet/minecraft/server/level/ServerLevel;Ljava/lang/Object;Lnet/minecraft/world/entity/LivingEntity;)V + ARG 1 level + ARG 2 entity + ARG 3 target diff --git a/data/net/minecraft/world/entity/ai/behavior/WorkAtComposter.mapping b/data/net/minecraft/world/entity/ai/behavior/WorkAtComposter.mapping index 5489d5097..7d2b79052 100644 --- a/data/net/minecraft/world/entity/ai/behavior/WorkAtComposter.mapping +++ b/data/net/minecraft/world/entity/ai/behavior/WorkAtComposter.mapping @@ -4,8 +4,9 @@ CLASS net/minecraft/world/entity/ai/behavior/WorkAtComposter ARG 2 villager ARG 3 global ARG 4 state - METHOD makeBread (Lnet/minecraft/world/entity/npc/Villager;)V - ARG 1 villager + METHOD makeBread (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/npc/Villager;)V + ARG 1 level + ARG 2 villager METHOD spawnComposterFillEffects (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V ARG 1 level ARG 2 preState diff --git a/data/net/minecraft/world/entity/ai/control/Control.mapping b/data/net/minecraft/world/entity/ai/control/Control.mapping new file mode 100644 index 000000000..aa03b2393 --- /dev/null +++ b/data/net/minecraft/world/entity/ai/control/Control.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/world/entity/ai/control/Control + METHOD rotateTowards (FFF)F + ARG 1 current + ARG 2 wanted + ARG 3 maxSpeed diff --git a/data/net/minecraft/world/entity/ai/control/LookControl.mapping b/data/net/minecraft/world/entity/ai/control/LookControl.mapping index a5274400c..5923cad52 100644 --- a/data/net/minecraft/world/entity/ai/control/LookControl.mapping +++ b/data/net/minecraft/world/entity/ai/control/LookControl.mapping @@ -5,11 +5,6 @@ CLASS net/minecraft/world/entity/ai/control/LookControl ARG 0 entity METHOD lambda$tick$0 (Ljava/lang/Float;)V ARG 1 rotationWanted - METHOD rotateTowards (FFF)F - COMMENT Rotate as much as possible from {@code from} to {@code to} within the bounds of {@code maxDelta} - ARG 1 from - ARG 2 to - ARG 3 maxDelta METHOD setLookAt (DDD)V ARG 1 x ARG 3 y diff --git a/data/net/minecraft/world/entity/ai/goal/AvoidEntityGoal.mapping b/data/net/minecraft/world/entity/ai/goal/AvoidEntityGoal.mapping index 6523b8671..9079e5326 100644 --- a/data/net/minecraft/world/entity/ai/goal/AvoidEntityGoal.mapping +++ b/data/net/minecraft/world/entity/ai/goal/AvoidEntityGoal.mapping @@ -29,8 +29,6 @@ CLASS net/minecraft/world/entity/ai/goal/AvoidEntityGoal COMMENT Returns whether execution should begin. You can also read and cache any state necessary for execution in this method as well. METHOD lambda$new$0 (Lnet/minecraft/world/entity/LivingEntity;)Z ARG 0 entity - METHOD lambda$new$1 (Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 0 entity METHOD start ()V COMMENT Execute a one shot task or start executing a continuous task METHOD stop ()V diff --git a/data/net/minecraft/world/entity/ai/goal/Goal.mapping b/data/net/minecraft/world/entity/ai/goal/Goal.mapping index 54ff4d67b..ca3759966 100644 --- a/data/net/minecraft/world/entity/ai/goal/Goal.mapping +++ b/data/net/minecraft/world/entity/ai/goal/Goal.mapping @@ -5,6 +5,10 @@ CLASS net/minecraft/world/entity/ai/goal/Goal COMMENT @return whether the goal should continue executing METHOD canUse ()Z COMMENT Returns whether execution should begin. You can also read and cache any state necessary for execution in this method as well. + METHOD getServerLevel (Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/server/level/ServerLevel; + ARG 0 entity + METHOD getServerLevel (Lnet/minecraft/world/level/Level;)Lnet/minecraft/server/level/ServerLevel; + ARG 0 level METHOD reducedTickDelay (I)I ARG 0 reduction METHOD setFlags (Ljava/util/EnumSet;)V diff --git a/data/net/minecraft/world/entity/ai/goal/GoalSelector.mapping b/data/net/minecraft/world/entity/ai/goal/GoalSelector.mapping index 3170f3b60..09eca1d9c 100644 --- a/data/net/minecraft/world/entity/ai/goal/GoalSelector.mapping +++ b/data/net/minecraft/world/entity/ai/goal/GoalSelector.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/world/entity/ai/goal/GoalSelector FIELD lockedFlags Ljava/util/Map; COMMENT Goals currently using a particular flag - METHOD (Ljava/util/function/Supplier;)V - ARG 1 profiler METHOD addGoal (ILnet/minecraft/world/entity/ai/goal/Goal;)V COMMENT Add a goal to the GoalSelector with a certain priority. Lower numbers are higher priority. ARG 1 priority diff --git a/data/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.mapping b/data/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.mapping index c639be79e..097bebefb 100644 --- a/data/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.mapping +++ b/data/net/minecraft/world/entity/ai/goal/LookAtPlayerGoal.mapping @@ -18,8 +18,6 @@ CLASS net/minecraft/world/entity/ai/goal/LookAtPlayerGoal COMMENT Returns whether an in-progress EntityAIBase should continue executing METHOD canUse ()Z COMMENT Returns whether execution should begin. You can also read and cache any state necessary for execution in this method as well. - METHOD lambda$new$0 (Lnet/minecraft/world/entity/Mob;Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 1 entity METHOD start ()V COMMENT Execute a one shot task or start executing a continuous task METHOD stop ()V diff --git a/data/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.mapping b/data/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.mapping index 9ee6f6504..c7310d0cf 100644 --- a/data/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.mapping +++ b/data/net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal.mapping @@ -1,22 +1,22 @@ CLASS net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal FIELD targetConditions Lnet/minecraft/world/entity/ai/targeting/TargetingConditions; COMMENT This filter is applied to the Entity search. Only matching entities will be targeted. - METHOD (Lnet/minecraft/world/entity/Mob;Ljava/lang/Class;IZZLjava/util/function/Predicate;)V + METHOD (Lnet/minecraft/world/entity/Mob;Ljava/lang/Class;IZZLnet/minecraft/world/entity/ai/targeting/TargetingConditions$Selector;)V ARG 1 mob ARG 2 targetType - ARG 3 randomInterval + ARG 3 interval ARG 4 mustSee ARG 5 mustReach - ARG 6 targetPredicate + ARG 6 selector METHOD (Lnet/minecraft/world/entity/Mob;Ljava/lang/Class;Z)V ARG 1 mob ARG 2 targetType ARG 3 mustSee - METHOD (Lnet/minecraft/world/entity/Mob;Ljava/lang/Class;ZLjava/util/function/Predicate;)V + METHOD (Lnet/minecraft/world/entity/Mob;Ljava/lang/Class;ZLnet/minecraft/world/entity/ai/targeting/TargetingConditions$Selector;)V ARG 1 mob ARG 2 targetType ARG 3 mustSee - ARG 4 targetPredicate + ARG 4 selector METHOD (Lnet/minecraft/world/entity/Mob;Ljava/lang/Class;ZZ)V ARG 1 mob ARG 2 targetType @@ -26,6 +26,8 @@ CLASS net/minecraft/world/entity/ai/goal/target/NearestAttackableTargetGoal COMMENT Returns whether execution should begin. You can also read and cache any state necessary for execution in this method as well. METHOD getTargetSearchArea (D)Lnet/minecraft/world/phys/AABB; ARG 1 targetDistance + METHOD lambda$findTarget$0 (Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 0 entity METHOD setTarget (Lnet/minecraft/world/entity/LivingEntity;)V ARG 1 target METHOD start ()V diff --git a/data/net/minecraft/world/entity/ai/goal/target/NearestAttackableWitchTargetGoal.mapping b/data/net/minecraft/world/entity/ai/goal/target/NearestAttackableWitchTargetGoal.mapping index 8a458e716..b4885efb0 100644 --- a/data/net/minecraft/world/entity/ai/goal/target/NearestAttackableWitchTargetGoal.mapping +++ b/data/net/minecraft/world/entity/ai/goal/target/NearestAttackableWitchTargetGoal.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/world/entity/ai/goal/target/NearestAttackableWitchTargetGoal - METHOD (Lnet/minecraft/world/entity/raid/Raider;Ljava/lang/Class;IZZLjava/util/function/Predicate;)V - ARG 1 mob + METHOD (Lnet/minecraft/world/entity/raid/Raider;Ljava/lang/Class;IZZLnet/minecraft/world/entity/ai/targeting/TargetingConditions$Selector;)V + ARG 1 raider ARG 2 targetType - ARG 3 randomInterval + ARG 3 interval ARG 4 mustSee ARG 5 mustReach - ARG 6 targetPredicate + ARG 6 selector METHOD canUse ()Z COMMENT Returns whether execution should begin. You can also read and cache any state necessary for execution in this method as well. METHOD setCanAttack (Z)V - ARG 1 active + ARG 1 canAttack diff --git a/data/net/minecraft/world/entity/ai/goal/target/NearestHealableRaiderTargetGoal.mapping b/data/net/minecraft/world/entity/ai/goal/target/NearestHealableRaiderTargetGoal.mapping index 1608df102..513ce9bf3 100644 --- a/data/net/minecraft/world/entity/ai/goal/target/NearestHealableRaiderTargetGoal.mapping +++ b/data/net/minecraft/world/entity/ai/goal/target/NearestHealableRaiderTargetGoal.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/world/entity/ai/goal/target/NearestHealableRaiderTargetGoal - METHOD (Lnet/minecraft/world/entity/raid/Raider;Ljava/lang/Class;ZLjava/util/function/Predicate;)V - ARG 1 mob + METHOD (Lnet/minecraft/world/entity/raid/Raider;Ljava/lang/Class;ZLnet/minecraft/world/entity/ai/targeting/TargetingConditions$Selector;)V + ARG 1 raider ARG 2 targetType ARG 3 mustSee - ARG 4 targetPredicate + ARG 4 selector METHOD canUse ()Z COMMENT Returns whether execution should begin. You can also read and cache any state necessary for execution in this method as well. METHOD start ()V diff --git a/data/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.mapping b/data/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.mapping index c961f04d6..94c3e326d 100644 --- a/data/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.mapping +++ b/data/net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/world/entity/ai/goal/target/NonTameRandomTargetGoal - METHOD (Lnet/minecraft/world/entity/TamableAnimal;Ljava/lang/Class;ZLjava/util/function/Predicate;)V + METHOD (Lnet/minecraft/world/entity/TamableAnimal;Ljava/lang/Class;ZLnet/minecraft/world/entity/ai/targeting/TargetingConditions$Selector;)V ARG 1 tamableMob ARG 2 targetType ARG 3 mustSee - ARG 4 targetPredicate + ARG 4 selector METHOD canContinueToUse ()Z COMMENT Returns whether an in-progress EntityAIBase should continue executing METHOD canUse ()Z diff --git a/data/net/minecraft/world/entity/ai/memory/NearestVisibleLivingEntities.mapping b/data/net/minecraft/world/entity/ai/memory/NearestVisibleLivingEntities.mapping index 6af1f4735..3800a80db 100644 --- a/data/net/minecraft/world/entity/ai/memory/NearestVisibleLivingEntities.mapping +++ b/data/net/minecraft/world/entity/ai/memory/NearestVisibleLivingEntities.mapping @@ -1,7 +1,8 @@ CLASS net/minecraft/world/entity/ai/memory/NearestVisibleLivingEntities - METHOD (Lnet/minecraft/world/entity/LivingEntity;Ljava/util/List;)V - ARG 1 livingEntity - ARG 2 nearbyLivingEntities + METHOD (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;Ljava/util/List;)V + ARG 1 level + ARG 2 entity + ARG 3 nearbyEntities METHOD contains (Ljava/util/function/Predicate;)Z ARG 1 predicate METHOD contains (Lnet/minecraft/world/entity/LivingEntity;)Z @@ -18,7 +19,7 @@ CLASS net/minecraft/world/entity/ai/memory/NearestVisibleLivingEntities ARG 2 target METHOD lambda$new$0 (Lnet/minecraft/world/entity/LivingEntity;)Z ARG 0 entity - METHOD lambda$new$1 (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 1 target + METHOD lambda$new$1 (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 2 target METHOD lambda$new$2 (Lit/unimi/dsi/fastutil/objects/Object2BooleanOpenHashMap;Ljava/util/function/Predicate;Lnet/minecraft/world/entity/LivingEntity;)Z ARG 2 target diff --git a/data/net/minecraft/world/entity/ai/navigation/PathNavigation.mapping b/data/net/minecraft/world/entity/ai/navigation/PathNavigation.mapping index f052cae81..318a1d2b7 100644 --- a/data/net/minecraft/world/entity/ai/navigation/PathNavigation.mapping +++ b/data/net/minecraft/world/entity/ai/navigation/PathNavigation.mapping @@ -93,6 +93,8 @@ CLASS net/minecraft/world/entity/ai/navigation/PathNavigation ARG 1 canSwim METHOD setMaxVisitedNodesMultiplier (F)V ARG 1 multiplier + METHOD setRequiredPathLength (F)V + ARG 1 requiredPathLength METHOD setSpeedModifier (D)V COMMENT Sets the speed ARG 1 speed diff --git a/data/net/minecraft/world/entity/ai/sensing/AxolotlAttackablesSensor.mapping b/data/net/minecraft/world/entity/ai/sensing/AxolotlAttackablesSensor.mapping index 3392c126f..e05963032 100644 --- a/data/net/minecraft/world/entity/ai/sensing/AxolotlAttackablesSensor.mapping +++ b/data/net/minecraft/world/entity/ai/sensing/AxolotlAttackablesSensor.mapping @@ -7,5 +7,3 @@ CLASS net/minecraft/world/entity/ai/sensing/AxolotlAttackablesSensor METHOD isHuntTarget (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z ARG 1 attacker ARG 2 target - METHOD isMatchingEntity (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z - COMMENT @return if the second entity is hostile to the axolotl or is huntable by it diff --git a/data/net/minecraft/world/entity/ai/sensing/NearestItemSensor.mapping b/data/net/minecraft/world/entity/ai/sensing/NearestItemSensor.mapping index 05164cada..bbaeb1bfe 100644 --- a/data/net/minecraft/world/entity/ai/sensing/NearestItemSensor.mapping +++ b/data/net/minecraft/world/entity/ai/sensing/NearestItemSensor.mapping @@ -4,7 +4,5 @@ CLASS net/minecraft/world/entity/ai/sensing/NearestItemSensor ARG 2 entity METHOD lambda$doTick$0 (Lnet/minecraft/world/entity/item/ItemEntity;)Z ARG 0 itemEntity - METHOD lambda$doTick$1 (Lnet/minecraft/world/entity/Mob;Lnet/minecraft/world/entity/item/ItemEntity;)Z - ARG 1 itemEntity METHOD lambda$doTick$2 (Lnet/minecraft/world/entity/Mob;Lnet/minecraft/world/entity/item/ItemEntity;)Z ARG 1 itemEntity diff --git a/data/net/minecraft/world/entity/ai/sensing/NearestVisibleLivingEntitySensor.mapping b/data/net/minecraft/world/entity/ai/sensing/NearestVisibleLivingEntitySensor.mapping index fb666ec3d..6f0fb8d3b 100644 --- a/data/net/minecraft/world/entity/ai/sensing/NearestVisibleLivingEntitySensor.mapping +++ b/data/net/minecraft/world/entity/ai/sensing/NearestVisibleLivingEntitySensor.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/world/entity/ai/sensing/NearestVisibleLivingEntitySensor - METHOD getNearestEntity (Lnet/minecraft/world/entity/LivingEntity;)Ljava/util/Optional; - ARG 1 entity + METHOD getNearestEntity (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;)Ljava/util/Optional; + ARG 1 level + ARG 2 enttiy METHOD getVisibleEntities (Lnet/minecraft/world/entity/LivingEntity;)Ljava/util/Optional; ARG 1 entity - METHOD isMatchingEntity (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 1 attacker - ARG 2 target - METHOD lambda$getNearestEntity$0 (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 2 otherEntity - METHOD lambda$getNearestEntity$1 (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/ai/memory/NearestVisibleLivingEntities;)Ljava/util/Optional; - ARG 2 visible + METHOD isMatchingEntity (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 1 level + ARG 2 entity + ARG 3 target + METHOD lambda$getNearestEntity$0 (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 3 target diff --git a/data/net/minecraft/world/entity/ai/sensing/PlayerSensor.mapping b/data/net/minecraft/world/entity/ai/sensing/PlayerSensor.mapping index b9e2a9b7f..c31996ada 100644 --- a/data/net/minecraft/world/entity/ai/sensing/PlayerSensor.mapping +++ b/data/net/minecraft/world/entity/ai/sensing/PlayerSensor.mapping @@ -2,9 +2,7 @@ CLASS net/minecraft/world/entity/ai/sensing/PlayerSensor METHOD doTick (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;)V ARG 1 level ARG 2 entity + METHOD getFollowDistance (Lnet/minecraft/world/entity/LivingEntity;)D + ARG 1 entity METHOD lambda$doTick$0 (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/server/level/ServerPlayer;)Z ARG 1 player - METHOD lambda$doTick$1 (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/player/Player;)Z - ARG 1 player - METHOD lambda$doTick$2 (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/player/Player;)Z - ARG 1 player diff --git a/data/net/minecraft/world/entity/ai/sensing/Sensor.mapping b/data/net/minecraft/world/entity/ai/sensing/Sensor.mapping index 93d1f6b68..93cdaef1e 100644 --- a/data/net/minecraft/world/entity/ai/sensing/Sensor.mapping +++ b/data/net/minecraft/world/entity/ai/sensing/Sensor.mapping @@ -4,17 +4,29 @@ CLASS net/minecraft/world/entity/ai/sensing/Sensor METHOD doTick (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;)V ARG 1 level ARG 2 entity - METHOD isEntityAttackable (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z - COMMENT @return if entity is remembered as an attack target and is valid to attack - ARG 0 attacker - ARG 1 target - METHOD isEntityAttackableIgnoringLineOfSight (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 0 attacker - ARG 1 target - METHOD isEntityTargetable (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z - COMMENT @return if the entity is remembered as a target and then tests the condition - ARG 0 livingEntity - ARG 1 target + METHOD isEntityAttackable (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 0 level + ARG 1 entity + ARG 2 target + METHOD isEntityAttackableIgnoringLineOfSight (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 0 level + ARG 1 entity + ARG 2 target + METHOD isEntityTargetable (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 0 level + ARG 1 entity + ARG 2 target + METHOD lambda$wasEntityAttackableLastNTicks$0 (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 1 level + ARG 2 target + METHOD rememberPositives (ILjava/util/function/BiPredicate;)Ljava/util/function/BiPredicate; + ARG 0 ticks + ARG 1 predicate METHOD tick (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;)V ARG 1 level ARG 2 entity + METHOD updateTargetingConditionRanges (Lnet/minecraft/world/entity/LivingEntity;)V + ARG 1 entity + METHOD wasEntityAttackableLastNTicks (Lnet/minecraft/world/entity/LivingEntity;I)Ljava/util/function/BiPredicate; + ARG 0 entity + ARG 1 ticks diff --git a/data/net/minecraft/world/entity/ai/sensing/TemptingSensor.mapping b/data/net/minecraft/world/entity/ai/sensing/TemptingSensor.mapping index b7d057511..a89197729 100644 --- a/data/net/minecraft/world/entity/ai/sensing/TemptingSensor.mapping +++ b/data/net/minecraft/world/entity/ai/sensing/TemptingSensor.mapping @@ -3,7 +3,5 @@ CLASS net/minecraft/world/entity/ai/sensing/TemptingSensor ARG 1 temptations METHOD isTemptation (Lnet/minecraft/world/item/ItemStack;)Z ARG 1 stack - METHOD lambda$doTick$0 (Lnet/minecraft/world/entity/PathfinderMob;Lnet/minecraft/server/level/ServerPlayer;)Z - ARG 1 player METHOD playerHoldingTemptation (Lnet/minecraft/world/entity/player/Player;)Z ARG 1 player diff --git a/data/net/minecraft/world/entity/ai/targeting/TargetingConditions.mapping b/data/net/minecraft/world/entity/ai/targeting/TargetingConditions.mapping index 86784df46..eff70d59c 100644 --- a/data/net/minecraft/world/entity/ai/targeting/TargetingConditions.mapping +++ b/data/net/minecraft/world/entity/ai/targeting/TargetingConditions.mapping @@ -3,8 +3,13 @@ CLASS net/minecraft/world/entity/ai/targeting/TargetingConditions ARG 1 isCombat METHOD range (D)Lnet/minecraft/world/entity/ai/targeting/TargetingConditions; ARG 1 distance - METHOD selector (Ljava/util/function/Predicate;)Lnet/minecraft/world/entity/ai/targeting/TargetingConditions; - ARG 1 customPredicate - METHOD test (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 1 attacker - ARG 2 target + METHOD selector (Lnet/minecraft/world/entity/ai/targeting/TargetingConditions$Selector;)Lnet/minecraft/world/entity/ai/targeting/TargetingConditions; + ARG 1 selector + METHOD test (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 1 level + ARG 2 entity + ARG 3 target + CLASS Selector + METHOD test (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/server/level/ServerLevel;)Z + ARG 1 entity + ARG 2 level diff --git a/data/net/minecraft/world/entity/ai/village/poi/PoiRecord.mapping b/data/net/minecraft/world/entity/ai/village/poi/PoiRecord.mapping index ce305fe92..1524fa0b4 100644 --- a/data/net/minecraft/world/entity/ai/village/poi/PoiRecord.mapping +++ b/data/net/minecraft/world/entity/ai/village/poi/PoiRecord.mapping @@ -8,13 +8,10 @@ CLASS net/minecraft/world/entity/ai/village/poi/PoiRecord ARG 1 pod ARG 2 poiType ARG 3 setDirty - METHOD codec (Ljava/lang/Runnable;)Lcom/mojang/serialization/Codec; - ARG 0 executable METHOD equals (Ljava/lang/Object;)Z ARG 1 other - METHOD lambda$codec$0 (Lnet/minecraft/world/entity/ai/village/poi/PoiRecord;)Lnet/minecraft/core/BlockPos; - ARG 0 getter - METHOD lambda$codec$2 (Lnet/minecraft/world/entity/ai/village/poi/PoiRecord;)Ljava/lang/Integer; - ARG 0 getter - METHOD lambda$codec$3 (Ljava/lang/Runnable;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 1 instance + CLASS Packed + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD unpack (Ljava/lang/Runnable;)Lnet/minecraft/world/entity/ai/village/poi/PoiRecord; + ARG 1 setDirty diff --git a/data/net/minecraft/world/entity/ai/village/poi/PoiSection.mapping b/data/net/minecraft/world/entity/ai/village/poi/PoiSection.mapping index e034e5017..a9771ec74 100644 --- a/data/net/minecraft/world/entity/ai/village/poi/PoiSection.mapping +++ b/data/net/minecraft/world/entity/ai/village/poi/PoiSection.mapping @@ -10,8 +10,6 @@ CLASS net/minecraft/world/entity/ai/village/poi/PoiSection ARG 2 type METHOD add (Lnet/minecraft/world/entity/ai/village/poi/PoiRecord;)Z ARG 1 record - METHOD codec (Ljava/lang/Runnable;)Lcom/mojang/serialization/Codec; - ARG 0 executable METHOD exists (Lnet/minecraft/core/BlockPos;Ljava/util/function/Predicate;)Z ARG 1 pos ARG 2 typePredicate @@ -24,19 +22,14 @@ CLASS net/minecraft/world/entity/ai/village/poi/PoiSection ARG 2 status METHOD getType (Lnet/minecraft/core/BlockPos;)Ljava/util/Optional; ARG 1 pos - METHOD lambda$codec$0 (Lnet/minecraft/world/entity/ai/village/poi/PoiSection;)Ljava/lang/Boolean; - ARG 0 getter - METHOD lambda$codec$1 (Lnet/minecraft/world/entity/ai/village/poi/PoiSection;)Ljava/util/List; - ARG 0 getter - METHOD lambda$codec$2 (Ljava/lang/Runnable;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 1 instance - METHOD lambda$getRecords$4 (Ljava/util/function/Predicate;Ljava/util/Map$Entry;)Z - ARG 1 type - METHOD lambda$getRecords$5 (Ljava/util/Map$Entry;)Ljava/util/stream/Stream; - ARG 0 type METHOD refresh (Ljava/util/function/Consumer;)V ARG 1 posToTypeConsumer METHOD release (Lnet/minecraft/core/BlockPos;)Z ARG 1 pos METHOD remove (Lnet/minecraft/core/BlockPos;)V ARG 1 pos + CLASS Packed + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD unpack (Ljava/lang/Runnable;)Lnet/minecraft/world/entity/ai/village/poi/PoiSection; + ARG 1 setDirty diff --git a/data/net/minecraft/world/entity/ambient/Bat.mapping b/data/net/minecraft/world/entity/ambient/Bat.mapping index 868b8300d..a883c0f68 100644 --- a/data/net/minecraft/world/entity/ambient/Bat.mapping +++ b/data/net/minecraft/world/entity/ambient/Bat.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/world/entity/ambient/Bat METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound - METHOD checkBatSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 bat + METHOD checkBatSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos - ARG 4 random + ARG 4 randomSource METHOD checkFallDamage (DZLnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;)V ARG 1 y ARG 3 onGround @@ -20,10 +20,6 @@ CLASS net/minecraft/world/entity/ambient/Bat COMMENT Returns the volume for the sounds this mob makes. METHOD getVoicePitch ()F COMMENT Gets the pitch of living sounds in living entities. - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD isIgnoringBlockTriggers ()Z COMMENT Return whether this entity should NOT trigger a pressure plate or a tripwire. METHOD isPushable ()Z diff --git a/data/net/minecraft/world/entity/animal/AgeableWaterCreature.mapping b/data/net/minecraft/world/entity/animal/AgeableWaterCreature.mapping new file mode 100644 index 000000000..497075c99 --- /dev/null +++ b/data/net/minecraft/world/entity/animal/AgeableWaterCreature.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/world/entity/animal/AgeableWaterCreature + METHOD checkSurfaceAgeableWaterCreatureSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType + ARG 1 level + ARG 2 spawnReason + ARG 3 pos + ARG 4 random + METHOD handleAirSupply (I)V + ARG 1 airSupply diff --git a/data/net/minecraft/world/entity/animal/Animal.mapping b/data/net/minecraft/world/entity/animal/Animal.mapping index 2c62b0ad6..84250fc72 100644 --- a/data/net/minecraft/world/entity/animal/Animal.mapping +++ b/data/net/minecraft/world/entity/animal/Animal.mapping @@ -4,10 +4,10 @@ CLASS net/minecraft/world/entity/animal/Animal METHOD canMate (Lnet/minecraft/world/entity/animal/Animal;)Z COMMENT Returns {@code true} if the mob is currently able to mate with the specified mob. ARG 1 otherAnimal - METHOD checkAnimalSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 animal + METHOD checkAnimalSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD finalizeSpawnChildFromBreeding (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/animal/Animal;Lnet/minecraft/world/entity/AgeableMob;)V diff --git a/data/net/minecraft/world/entity/animal/Bee.mapping b/data/net/minecraft/world/entity/animal/Bee.mapping index 8b01b2344..40cac50fc 100644 --- a/data/net/minecraft/world/entity/animal/Bee.mapping +++ b/data/net/minecraft/world/entity/animal/Bee.mapping @@ -13,8 +13,6 @@ CLASS net/minecraft/world/entity/animal/Bee ARG 2 distance METHOD createNavigation (Lnet/minecraft/world/level/Level;)Lnet/minecraft/world/entity/ai/navigation/PathNavigation; ARG 1 level - METHOD doHurtTarget (Lnet/minecraft/world/entity/Entity;)Z - ARG 1 entity METHOD doesHiveHaveSpace (Lnet/minecraft/core/BlockPos;)Z ARG 1 hivePos METHOD getFlag (I)Z @@ -28,15 +26,11 @@ CLASS net/minecraft/world/entity/animal/Bee METHOD getWalkTargetValue (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/LevelReader;)F ARG 1 pos ARG 2 level - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount - METHOD isFlowerValid (Lnet/minecraft/core/BlockPos;)Z - ARG 1 pos METHOD isFood (Lnet/minecraft/world/item/ItemStack;)Z COMMENT Checks if the parameter is an item which this animal can be fed to breed it (wheat, carrots or seeds depending on the animal type) ARG 1 stack + METHOD isNightOrRaining (Lnet/minecraft/world/level/Level;)Z + ARG 0 level METHOD isTooFarAway (Lnet/minecraft/core/BlockPos;)Z ARG 1 pos METHOD jumpInLiquid (Lnet/minecraft/tags/TagKey;)V @@ -126,9 +120,6 @@ CLASS net/minecraft/world/entity/animal/Bee METHOD start ()V COMMENT Execute a one shot task or start executing a continuous task CLASS BeePollinateGoal - METHOD findNearestBlock (Ljava/util/function/Predicate;D)Ljava/util/Optional; - ARG 1 predicate - ARG 2 distance METHOD lambda$new$0 (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 0 state METHOD start ()V @@ -150,6 +141,9 @@ CLASS net/minecraft/world/entity/animal/Bee ARG 2 target METHOD canContinueToUse ()Z COMMENT Returns whether an in-progress EntityAIBase should continue executing + CLASS ValidateFlowerGoal + METHOD isFlower (Lnet/minecraft/core/BlockPos;)Z + ARG 1 pos CLASS BeeGoToKnownFlowerGoal METHOD start ()V COMMENT Execute a one shot task or start executing a continuous task diff --git a/data/net/minecraft/world/entity/animal/Dolphin.mapping b/data/net/minecraft/world/entity/animal/Dolphin.mapping index 8e3f559b8..8674ef042 100644 --- a/data/net/minecraft/world/entity/animal/Dolphin.mapping +++ b/data/net/minecraft/world/entity/animal/Dolphin.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/world/entity/animal/Dolphin ARG 1 particleOption METHOD canRide (Lnet/minecraft/world/entity/Entity;)Z ARG 1 entity - METHOD canTakeItem (Lnet/minecraft/world/item/ItemStack;)Z - ARG 1 itemstack METHOD createNavigation (Lnet/minecraft/world/level/Level;)Lnet/minecraft/world/entity/ai/navigation/PathNavigation; ARG 1 level METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; @@ -18,9 +16,6 @@ CLASS net/minecraft/world/entity/animal/Dolphin METHOD mobInteract (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult; ARG 1 player ARG 2 hand - METHOD pickUpItem (Lnet/minecraft/world/entity/item/ItemEntity;)V - COMMENT Tests if this entity should pick up a weapon or an armor piece. Entity drops current weapon or armor if the new one is better. - ARG 1 itemEntity METHOD readAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V COMMENT (abstract) Protected helper method to read subclass entity data from NBT. ARG 1 compound diff --git a/data/net/minecraft/world/entity/animal/Fox.mapping b/data/net/minecraft/world/entity/animal/Fox.mapping index 9b06e34bc..bd3e67a84 100644 --- a/data/net/minecraft/world/entity/animal/Fox.mapping +++ b/data/net/minecraft/world/entity/animal/Fox.mapping @@ -7,20 +7,16 @@ CLASS net/minecraft/world/entity/animal/Fox ARG 1 stack METHOD canHoldItem (Lnet/minecraft/world/item/ItemStack;)Z ARG 1 stack - METHOD canTakeItem (Lnet/minecraft/world/item/ItemStack;)Z - ARG 1 itemstack - METHOD checkFoxSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 fox + METHOD checkFoxSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD dropItemStack (Lnet/minecraft/world/item/ItemStack;)V ARG 1 stack METHOD getCrouchAmount (F)F ARG 1 partialTick - METHOD getEatingSound (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/sounds/SoundEvent; - ARG 1 itemStack METHOD getFlag (I)Z ARG 1 flagId METHOD getHeadRollAngle (F)F @@ -37,14 +33,21 @@ CLASS net/minecraft/world/entity/animal/Fox ARG 1 livingEntity METHOD isSleeping ()Z COMMENT Returns whether player is sleeping or not - METHOD lambda$registerGoals$4 (Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 0 livingEntity - METHOD lambda$registerGoals$5 (Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 0 livingEntity + METHOD lambda$registerGoals$4 (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/server/level/ServerLevel;)Z + ARG 0 entity + ARG 1 level + METHOD lambda$registerGoals$5 (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/server/level/ServerLevel;)Z + ARG 0 entity + ARG 1 level + METHOD lambda$registerGoals$6 (Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 1 entity METHOD lambda$registerGoals$7 (Lnet/minecraft/world/entity/LivingEntity;)Z ARG 1 livingEntity METHOD lambda$registerGoals$8 (Lnet/minecraft/world/entity/LivingEntity;)Z ARG 1 livingEntity + METHOD lambda$registerGoals$9 (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/server/level/ServerLevel;)Z + ARG 1 entity + ARG 2 level METHOD lambda$static$0 (Lnet/minecraft/world/entity/item/ItemEntity;)Z ARG 0 item METHOD lambda$static$1 (Lnet/minecraft/world/entity/Entity;)Z @@ -56,9 +59,6 @@ CLASS net/minecraft/world/entity/animal/Fox METHOD onOffspringSpawnedFromEgg (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/entity/Mob;)V ARG 1 player ARG 2 child - METHOD pickUpItem (Lnet/minecraft/world/entity/item/ItemEntity;)V - COMMENT Tests if this entity should pick up a weapon or an armor piece. Entity drops current weapon or armor if the new one is better. - ARG 1 itemEntity METHOD playAmbientSound ()V COMMENT Plays living's sound at its position METHOD readAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V @@ -90,15 +90,15 @@ CLASS net/minecraft/world/entity/animal/Fox COMMENT Called to update the entity's position/logic. METHOD trusts (Ljava/util/UUID;)Z ARG 1 uuid - CLASS Type + CLASS Variant METHOD (Ljava/lang/String;IILjava/lang/String;)V ARG 3 id ARG 4 name - METHOD byBiome (Lnet/minecraft/core/Holder;)Lnet/minecraft/world/entity/animal/Fox$Type; + METHOD byBiome (Lnet/minecraft/core/Holder;)Lnet/minecraft/world/entity/animal/Fox$Variant; ARG 0 biome - METHOD byId (I)Lnet/minecraft/world/entity/animal/Fox$Type; - ARG 0 index - METHOD byName (Ljava/lang/String;)Lnet/minecraft/world/entity/animal/Fox$Type; + METHOD byId (I)Lnet/minecraft/world/entity/animal/Fox$Variant; + ARG 0 id + METHOD byName (Ljava/lang/String;)Lnet/minecraft/world/entity/animal/Fox$Variant; ARG 0 name CLASS SleepGoal METHOD canContinueToUse ()Z @@ -122,8 +122,8 @@ CLASS net/minecraft/world/entity/animal/Fox METHOD start ()V COMMENT Execute a one shot task or start executing a continuous task CLASS FoxGroupData - METHOD (Lnet/minecraft/world/entity/animal/Fox$Type;)V - ARG 1 type + METHOD (Lnet/minecraft/world/entity/animal/Fox$Variant;)V + ARG 1 variant CLASS FoxPanicGoal METHOD (Lnet/minecraft/world/entity/animal/Fox;D)V ARG 2 speedModifier @@ -233,11 +233,11 @@ CLASS net/minecraft/world/entity/animal/Fox METHOD tick ()V COMMENT Keep ticking a continuous task that has already been started CLASS DefendTrustedTargetGoal - METHOD (Lnet/minecraft/world/entity/animal/Fox;Ljava/lang/Class;ZZLjava/util/function/Predicate;)V + METHOD (Lnet/minecraft/world/entity/animal/Fox;Ljava/lang/Class;ZZLnet/minecraft/world/entity/ai/targeting/TargetingConditions$Selector;)V ARG 2 targetType ARG 3 mustSee ARG 4 mustReach - ARG 5 predicate + ARG 5 selector METHOD canUse ()Z COMMENT Returns whether execution should begin. You can also read and cache any state necessary for execution in this method as well. METHOD start ()V @@ -252,6 +252,3 @@ CLASS net/minecraft/world/entity/animal/Fox COMMENT Returns whether execution should begin. You can also read and cache any state necessary for execution in this method as well. METHOD start ()V COMMENT Execute a one shot task or start executing a continuous task - CLASS FoxAlertableEntitiesSelector - METHOD test (Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 1 entity diff --git a/data/net/minecraft/world/entity/animal/IronGolem.mapping b/data/net/minecraft/world/entity/animal/IronGolem.mapping index 5dea6ed79..f03e322d7 100644 --- a/data/net/minecraft/world/entity/animal/IronGolem.mapping +++ b/data/net/minecraft/world/entity/animal/IronGolem.mapping @@ -11,18 +11,10 @@ CLASS net/minecraft/world/entity/animal/IronGolem METHOD die (Lnet/minecraft/world/damagesource/DamageSource;)V COMMENT Called when the mob's health reaches 0. ARG 1 cause - METHOD doHurtTarget (Lnet/minecraft/world/entity/Entity;)Z - ARG 1 entity METHOD doPush (Lnet/minecraft/world/entity/Entity;)V ARG 1 entity METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; ARG 1 damageSource - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount - METHOD lambda$registerGoals$0 (Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 0 entity METHOD mobInteract (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult; ARG 1 player ARG 2 hand diff --git a/data/net/minecraft/world/entity/animal/MushroomCow.mapping b/data/net/minecraft/world/entity/animal/MushroomCow.mapping index 918b4d2b6..4a3c28b95 100644 --- a/data/net/minecraft/world/entity/animal/MushroomCow.mapping +++ b/data/net/minecraft/world/entity/animal/MushroomCow.mapping @@ -3,16 +3,16 @@ CLASS net/minecraft/world/entity/animal/MushroomCow COMMENT Stores the UUID of the most recent lightning bolt to strike METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound - METHOD checkMushroomSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 mushroomCow + METHOD checkMushroomSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos - ARG 4 randomSource + ARG 4 random METHOD getEffectsFromItemStack (Lnet/minecraft/world/item/ItemStack;)Ljava/util/Optional; ARG 1 stack - METHOD getOffspringType (Lnet/minecraft/world/entity/animal/MushroomCow;)Lnet/minecraft/world/entity/animal/MushroomCow$MushroomType; - ARG 1 mate + METHOD getOffspringVariant (Lnet/minecraft/world/entity/animal/MushroomCow;)Lnet/minecraft/world/entity/animal/MushroomCow$Variant; + ARG 1 partner METHOD getWalkTargetValue (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/LevelReader;)F ARG 1 pos ARG 2 level @@ -22,16 +22,12 @@ CLASS net/minecraft/world/entity/animal/MushroomCow METHOD readAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V COMMENT (abstract) Protected helper method to read subclass entity data from NBT. ARG 1 compound - METHOD shear (Lnet/minecraft/sounds/SoundSource;)V - ARG 1 category METHOD thunderHit (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LightningBolt;)V ARG 1 level ARG 2 lightning - CLASS MushroomType + CLASS Variant METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/world/level/block/state/BlockState;)V ARG 3 type ARG 4 blockState - METHOD byType (Ljava/lang/String;)Lnet/minecraft/world/entity/animal/MushroomCow$MushroomType; + METHOD byName (Ljava/lang/String;)Lnet/minecraft/world/entity/animal/MushroomCow$Variant; ARG 0 name - METHOD getBlockState ()Lnet/minecraft/world/level/block/state/BlockState; - COMMENT A block state that is rendered on the back of the mooshroom. diff --git a/data/net/minecraft/world/entity/animal/Ocelot.mapping b/data/net/minecraft/world/entity/animal/Ocelot.mapping index 5020a022f..4682acded 100644 --- a/data/net/minecraft/world/entity/animal/Ocelot.mapping +++ b/data/net/minecraft/world/entity/animal/Ocelot.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/world/entity/animal/Ocelot METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound - METHOD checkOcelotSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 ocelot + METHOD checkOcelotSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD checkSpawnObstruction (Lnet/minecraft/world/level/LevelReader;)Z diff --git a/data/net/minecraft/world/entity/animal/Panda.mapping b/data/net/minecraft/world/entity/animal/Panda.mapping index 75507bfcc..f2981e873 100644 --- a/data/net/minecraft/world/entity/animal/Panda.mapping +++ b/data/net/minecraft/world/entity/animal/Panda.mapping @@ -1,10 +1,8 @@ CLASS net/minecraft/world/entity/animal/Panda METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound - METHOD canTakeItem (Lnet/minecraft/world/item/ItemStack;)Z - ARG 1 itemstack - METHOD doHurtTarget (Lnet/minecraft/world/entity/Entity;)Z - ARG 1 entity + METHOD canPickUpAndEat (Lnet/minecraft/world/entity/item/ItemEntity;)Z + ARG 0 itemEntity METHOD eat (Z)V ARG 1 eating METHOD getFlag (I)Z @@ -17,21 +15,14 @@ CLASS net/minecraft/world/entity/animal/Panda ARG 1 partialTick METHOD getSitAmount (F)F ARG 1 partialTick - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD isFood (Lnet/minecraft/world/item/ItemStack;)Z COMMENT Checks if the parameter is an item which this animal can be fed to breed it (wheat, carrots or seeds depending on the animal type) ARG 1 stack - METHOD isFoodOrCake (Lnet/minecraft/world/item/ItemStack;)Z - ARG 1 stack + METHOD lambda$registerGoals$0 (Lnet/minecraft/world/item/ItemStack;)Z + ARG 0 stack METHOD mobInteract (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult; ARG 1 player ARG 2 hand - METHOD pickUpItem (Lnet/minecraft/world/entity/item/ItemEntity;)V - COMMENT Tests if this entity should pick up a weapon or an armor piece. Entity drops current weapon or armor if the new one is better. - ARG 1 itemEntity METHOD playStepSound (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V ARG 1 pos ARG 2 block @@ -167,6 +158,8 @@ CLASS net/minecraft/world/entity/animal/Panda COMMENT Returns whether an in-progress EntityAIBase should continue executing METHOD canUse ()Z COMMENT Returns whether execution should begin. You can also read and cache any state necessary for execution in this method as well. + METHOD lambda$canUse$0 (Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 0 entity METHOD setTarget (Lnet/minecraft/world/entity/LivingEntity;)V ARG 1 lookAt METHOD tick ()V diff --git a/data/net/minecraft/world/entity/animal/Parrot.mapping b/data/net/minecraft/world/entity/animal/Parrot.mapping index 4def456ed..36745e842 100644 --- a/data/net/minecraft/world/entity/animal/Parrot.mapping +++ b/data/net/minecraft/world/entity/animal/Parrot.mapping @@ -9,10 +9,10 @@ CLASS net/minecraft/world/entity/animal/Parrot ARG 3 onGround ARG 4 state ARG 5 pos - METHOD checkParrotSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 parrot + METHOD checkParrotSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD createNavigation (Lnet/minecraft/world/level/Level;)Lnet/minecraft/world/entity/ai/navigation/PathNavigation; @@ -30,10 +30,6 @@ CLASS net/minecraft/world/entity/animal/Parrot ARG 0 random METHOD getVoicePitch ()F COMMENT Gets the pitch of living sounds in living entities. - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD imitateNearbyMobs (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/Entity;)Z ARG 0 level ARG 1 parrot diff --git a/data/net/minecraft/world/entity/animal/PolarBear.mapping b/data/net/minecraft/world/entity/animal/PolarBear.mapping index 64f0b8028..1aaca1caf 100644 --- a/data/net/minecraft/world/entity/animal/PolarBear.mapping +++ b/data/net/minecraft/world/entity/animal/PolarBear.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/world/entity/animal/PolarBear METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound - METHOD checkPolarBearSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 polarBear + METHOD checkPolarBearSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; @@ -14,6 +14,8 @@ CLASS net/minecraft/world/entity/animal/PolarBear METHOD isFood (Lnet/minecraft/world/item/ItemStack;)Z COMMENT Checks if the parameter is an item which this animal can be fed to breed it (wheat, carrots or seeds depending on the animal type) ARG 1 stack + METHOD lambda$registerGoals$0 (Lnet/minecraft/world/entity/PathfinderMob;)Lnet/minecraft/tags/TagKey; + ARG 0 mob METHOD playStepSound (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V ARG 1 pos ARG 2 block diff --git a/data/net/minecraft/world/entity/animal/Pufferfish.mapping b/data/net/minecraft/world/entity/animal/Pufferfish.mapping index 5c78c3704..1cd9011bf 100644 --- a/data/net/minecraft/world/entity/animal/Pufferfish.mapping +++ b/data/net/minecraft/world/entity/animal/Pufferfish.mapping @@ -5,10 +5,11 @@ CLASS net/minecraft/world/entity/animal/Pufferfish ARG 1 damageSource METHOD getScale (I)F ARG 0 puffState - METHOD lambda$aiStep$1 (Lnet/minecraft/world/entity/Mob;)Z - ARG 1 entity - METHOD lambda$static$0 (Lnet/minecraft/world/entity/LivingEntity;)Z + METHOD lambda$aiStep$1 (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Mob;)Z + ARG 2 mob + METHOD lambda$static$0 (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/server/level/ServerLevel;)Z ARG 0 entity + ARG 1 level METHOD onSyncedDataUpdated (Lnet/minecraft/network/syncher/EntityDataAccessor;)V ARG 1 key METHOD playerTouch (Lnet/minecraft/world/entity/player/Player;)V @@ -21,13 +22,16 @@ CLASS net/minecraft/world/entity/animal/Pufferfish ARG 1 puffState METHOD tick ()V COMMENT Called to update the entity's position/logic. - METHOD touch (Lnet/minecraft/world/entity/Mob;)V - ARG 1 mob + METHOD touch (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Mob;)V + ARG 1 level + ARG 2 mob CLASS PufferfishPuffGoal METHOD (Lnet/minecraft/world/entity/animal/Pufferfish;)V ARG 1 fish METHOD canUse ()Z COMMENT Returns whether execution should begin. You can also read and cache any state necessary for execution in this method as well. + METHOD lambda$canUse$0 (Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 1 entity METHOD start ()V COMMENT Execute a one shot task or start executing a continuous task METHOD stop ()V diff --git a/data/net/minecraft/world/entity/animal/Rabbit.mapping b/data/net/minecraft/world/entity/animal/Rabbit.mapping index 0764a860d..4611a5b89 100644 --- a/data/net/minecraft/world/entity/animal/Rabbit.mapping +++ b/data/net/minecraft/world/entity/animal/Rabbit.mapping @@ -3,10 +3,10 @@ CLASS net/minecraft/world/entity/animal/Rabbit ARG 1 compound METHOD aiStep ()V COMMENT Called frequently, so the entity can update its state every tick as required. For example, zombies and skeletons use this to react to sunlight and start to burn. - METHOD checkRabbitSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 rabbit + METHOD checkRabbitSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD facePoint (DD)V diff --git a/data/net/minecraft/world/entity/animal/Salmon.mapping b/data/net/minecraft/world/entity/animal/Salmon.mapping index d46ca513d..464b412fd 100644 --- a/data/net/minecraft/world/entity/animal/Salmon.mapping +++ b/data/net/minecraft/world/entity/animal/Salmon.mapping @@ -1,3 +1,9 @@ CLASS net/minecraft/world/entity/animal/Salmon METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; ARG 1 damageSource + CLASS Variant + METHOD (Ljava/lang/String;ILjava/lang/String;F)V + ARG 3 type + ARG 4 boundingBoxScale + METHOD byName (Ljava/lang/String;)Lnet/minecraft/world/entity/animal/Salmon$Variant; + ARG 0 name diff --git a/data/net/minecraft/world/entity/animal/Sheep.mapping b/data/net/minecraft/world/entity/animal/Sheep.mapping index f42a4643a..d09deebc9 100644 --- a/data/net/minecraft/world/entity/animal/Sheep.mapping +++ b/data/net/minecraft/world/entity/animal/Sheep.mapping @@ -15,18 +15,16 @@ CLASS net/minecraft/world/entity/animal/Sheep ARG 1 partialTick METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; ARG 1 damageSource - METHOD getOffspringColor (Lnet/minecraft/world/entity/animal/Animal;Lnet/minecraft/world/entity/animal/Animal;)Lnet/minecraft/world/item/DyeColor; - COMMENT Attempts to mix both parent sheep to come up with a mixed dye color. - ARG 1 father - ARG 2 mother + METHOD getOffspringColor (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/animal/Sheep;Lnet/minecraft/world/entity/animal/Sheep;)Lnet/minecraft/world/item/DyeColor; + ARG 1 level + ARG 2 father + ARG 3 mother METHOD getRandomSheepColor (Lnet/minecraft/util/RandomSource;)Lnet/minecraft/world/item/DyeColor; ARG 0 random METHOD isSheared ()Z COMMENT Returns {@code true} if a sheep's wool has been sheared. - METHOD lambda$static$0 (Ljava/util/EnumMap;)V - ARG 0 map - METHOD lambda$static$1 (Lnet/minecraft/world/item/DyeColor;)Lnet/minecraft/world/item/DyeColor; - ARG 0 color + METHOD lambda$registerGoals$1 (Lnet/minecraft/world/item/ItemStack;)Z + ARG 0 stack METHOD makeCraftInput (Lnet/minecraft/world/item/DyeColor;Lnet/minecraft/world/item/DyeColor;)Lnet/minecraft/world/item/crafting/CraftingInput; ARG 0 color1 ARG 1 color2 @@ -45,5 +43,3 @@ CLASS net/minecraft/world/entity/animal/Sheep METHOD setSheared (Z)V COMMENT Makes a sheep sheared if set to {@code true}. ARG 1 sheared - METHOD shear (Lnet/minecraft/sounds/SoundSource;)V - ARG 1 category diff --git a/data/net/minecraft/world/entity/animal/SnowGolem.mapping b/data/net/minecraft/world/entity/animal/SnowGolem.mapping index 0eee5d1b3..4b12176bc 100644 --- a/data/net/minecraft/world/entity/animal/SnowGolem.mapping +++ b/data/net/minecraft/world/entity/animal/SnowGolem.mapping @@ -3,8 +3,6 @@ CLASS net/minecraft/world/entity/animal/SnowGolem ARG 1 compound METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; ARG 1 damageSource - METHOD lambda$registerGoals$0 (Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 0 entity METHOD mobInteract (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult; ARG 1 player ARG 2 hand @@ -17,5 +15,3 @@ CLASS net/minecraft/world/entity/animal/SnowGolem ARG 1 compound METHOD setPumpkin (Z)V ARG 1 pumpkinEquipped - METHOD shear (Lnet/minecraft/sounds/SoundSource;)V - ARG 1 category diff --git a/data/net/minecraft/world/entity/animal/Squid.mapping b/data/net/minecraft/world/entity/animal/Squid.mapping index 76d434615..ab95345b4 100644 --- a/data/net/minecraft/world/entity/animal/Squid.mapping +++ b/data/net/minecraft/world/entity/animal/Squid.mapping @@ -3,16 +3,8 @@ CLASS net/minecraft/world/entity/animal/Squid ARG 1 damageSource METHOD getSoundVolume ()F COMMENT Returns the volume for the sounds this mob makes. - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD rotateVector (Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/world/phys/Vec3; ARG 1 vector - METHOD setMovementVector (FFF)V - ARG 1 tx - ARG 2 ty - ARG 3 tz METHOD travel (Lnet/minecraft/world/phys/Vec3;)V ARG 1 travelVector CLASS SquidFleeGoal diff --git a/data/net/minecraft/world/entity/animal/TropicalFish.mapping b/data/net/minecraft/world/entity/animal/TropicalFish.mapping index 1bc418cbe..a3c7bf883 100644 --- a/data/net/minecraft/world/entity/animal/TropicalFish.mapping +++ b/data/net/minecraft/world/entity/animal/TropicalFish.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/world/entity/animal/TropicalFish METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound - METHOD checkTropicalFishSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 tropicalFish + METHOD checkTropicalFishSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD getBaseColor (I)Lnet/minecraft/world/item/DyeColor; diff --git a/data/net/minecraft/world/entity/animal/Turtle.mapping b/data/net/minecraft/world/entity/animal/Turtle.mapping index 0984a22b7..98f0117b0 100644 --- a/data/net/minecraft/world/entity/animal/Turtle.mapping +++ b/data/net/minecraft/world/entity/animal/Turtle.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/world/entity/animal/Turtle METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound - METHOD checkTurtleSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 turtle + METHOD checkTurtleSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD createNavigation (Lnet/minecraft/world/level/Level;)Lnet/minecraft/world/entity/ai/navigation/PathNavigation; diff --git a/data/net/minecraft/world/entity/animal/WaterAnimal.mapping b/data/net/minecraft/world/entity/animal/WaterAnimal.mapping index 4bd67d5f6..2f2e5db47 100644 --- a/data/net/minecraft/world/entity/animal/WaterAnimal.mapping +++ b/data/net/minecraft/world/entity/animal/WaterAnimal.mapping @@ -3,10 +3,10 @@ CLASS net/minecraft/world/entity/animal/WaterAnimal COMMENT Gets called every tick from main Entity class METHOD checkSpawnObstruction (Lnet/minecraft/world/level/LevelReader;)Z ARG 1 level - METHOD checkSurfaceWaterAnimalSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 waterAnimal + METHOD checkSurfaceWaterAnimalSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD getAmbientSoundInterval ()I diff --git a/data/net/minecraft/world/entity/animal/Wolf.mapping b/data/net/minecraft/world/entity/animal/Wolf.mapping index 633614843..2f29fc541 100644 --- a/data/net/minecraft/world/entity/animal/Wolf.mapping +++ b/data/net/minecraft/world/entity/animal/Wolf.mapping @@ -6,42 +6,33 @@ CLASS net/minecraft/world/entity/animal/Wolf METHOD canMate (Lnet/minecraft/world/entity/animal/Animal;)Z COMMENT Returns {@code true} if the mob is currently able to mate with the specified mob. ARG 1 otherAnimal - METHOD checkWolfSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 wolf + METHOD checkWolfSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD die (Lnet/minecraft/world/damagesource/DamageSource;)V COMMENT Called when the mob's health reaches 0. ARG 1 cause - METHOD getBodyRollAngle (FF)F - ARG 1 partialTicks - ARG 2 offset METHOD getHeadRollAngle (F)F - ARG 1 partialTicks + ARG 1 partialTick METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; ARG 1 damageSource METHOD getMaxHeadXRot ()I COMMENT The speed it takes to move the entity's rotationPitch through the faceEntity method. This is only currently use in wolves. METHOD getMaxSpawnClusterSize ()I COMMENT Will return how many at most can spawn in a chunk at once. + METHOD getShakeAnim (F)F + ARG 1 partialTick METHOD getSoundVolume ()F COMMENT Returns the volume for the sounds this mob makes. METHOD getWetShade (F)F COMMENT Used when calculating the amount of shading to apply while the wolf is wet. - ARG 1 partialTicks - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount + ARG 1 partialTick METHOD isFood (Lnet/minecraft/world/item/ItemStack;)Z COMMENT Checks if the parameter is an item which this animal can be fed to breed it (wheat, carrots or seeds depending on the animal type) ARG 1 stack - METHOD isWet ()Z - COMMENT True if the wolf is wet - METHOD lambda$static$0 (Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 0 entity METHOD mobInteract (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult; ARG 1 player ARG 2 hand diff --git a/data/net/minecraft/world/entity/animal/allay/Allay.mapping b/data/net/minecraft/world/entity/animal/allay/Allay.mapping index 2e4db40eb..1d4b1aff8 100644 --- a/data/net/minecraft/world/entity/animal/allay/Allay.mapping +++ b/data/net/minecraft/world/entity/animal/allay/Allay.mapping @@ -9,8 +9,6 @@ CLASS net/minecraft/world/entity/animal/allay/Allay METHOD hasNonMatchingPotion (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;)Z ARG 1 first ARG 2 second - METHOD isDuplicationItem (Lnet/minecraft/world/item/ItemStack;)Z - ARG 1 stack METHOD removeInteractionItem (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/item/ItemStack;)V ARG 1 player ARG 2 stack diff --git a/data/net/minecraft/world/entity/animal/armadillo/Armadillo.mapping b/data/net/minecraft/world/entity/animal/armadillo/Armadillo.mapping index 2b90b0663..b7ca83b05 100644 --- a/data/net/minecraft/world/entity/animal/armadillo/Armadillo.mapping +++ b/data/net/minecraft/world/entity/animal/armadillo/Armadillo.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/world/entity/animal/armadillo/Armadillo - METHOD checkArmadilloSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + METHOD checkArmadilloSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD isScaredBy (Lnet/minecraft/world/entity/LivingEntity;)Z diff --git a/data/net/minecraft/world/entity/animal/axolotl/Axolotl.mapping b/data/net/minecraft/world/entity/animal/axolotl/Axolotl.mapping index d92dcc44f..3688b9dcc 100644 --- a/data/net/minecraft/world/entity/animal/axolotl/Axolotl.mapping +++ b/data/net/minecraft/world/entity/animal/axolotl/Axolotl.mapping @@ -1,17 +1,20 @@ CLASS net/minecraft/world/entity/animal/axolotl/Axolotl METHOD applySupportingEffects (Lnet/minecraft/world/entity/player/Player;)V ARG 1 player - METHOD checkAxolotlSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 axolotl + METHOD checkAxolotlSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD handleAirSupply (I)V ARG 1 airSupply - METHOD onStopAttacking (Lnet/minecraft/world/entity/animal/axolotl/Axolotl;Lnet/minecraft/world/entity/LivingEntity;)V - ARG 0 axolotl - ARG 1 target + METHOD lambda$saveToBucketTag$0 (Lnet/minecraft/nbt/CompoundTag;)V + ARG 1 tag + METHOD onStopAttacking (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/animal/axolotl/Axolotl;Lnet/minecraft/world/entity/LivingEntity;)V + ARG 0 level + ARG 1 axolotl + ARG 2 target METHOD setPlayingDead (Z)V ARG 1 playingDead METHOD setVariant (Lnet/minecraft/world/entity/animal/axolotl/Axolotl$Variant;)V @@ -32,6 +35,8 @@ CLASS net/minecraft/world/entity/animal/axolotl/Axolotl METHOD getSpawnVariant (Lnet/minecraft/util/RandomSource;Z)Lnet/minecraft/world/entity/animal/axolotl/Axolotl$Variant; ARG 0 random ARG 1 common + METHOD lambda$getSpawnVariant$0 (ZLnet/minecraft/world/entity/animal/axolotl/Axolotl$Variant;)Z + ARG 1 variant CLASS AxolotlGroupData METHOD ([Lnet/minecraft/world/entity/animal/axolotl/Axolotl$Variant;)V ARG 1 types diff --git a/data/net/minecraft/world/entity/animal/axolotl/AxolotlAi.mapping b/data/net/minecraft/world/entity/animal/axolotl/AxolotlAi.mapping index ab802337b..8c3072fef 100644 --- a/data/net/minecraft/world/entity/animal/axolotl/AxolotlAi.mapping +++ b/data/net/minecraft/world/entity/animal/axolotl/AxolotlAi.mapping @@ -1,8 +1,9 @@ CLASS net/minecraft/world/entity/animal/axolotl/AxolotlAi METHOD canSetWalkTargetFromLookTarget (Lnet/minecraft/world/entity/LivingEntity;)Z ARG 0 entity - METHOD findNearestValidAttackTarget (Lnet/minecraft/world/entity/animal/axolotl/Axolotl;)Ljava/util/Optional; - ARG 0 axolotl + METHOD findNearestValidAttackTarget (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/animal/axolotl/Axolotl;)Ljava/util/Optional; + ARG 0 level + ARG 1 axolotl METHOD getSpeedModifier (Lnet/minecraft/world/entity/LivingEntity;)F ARG 0 entity METHOD getSpeedModifierChasing (Lnet/minecraft/world/entity/LivingEntity;)F @@ -17,6 +18,8 @@ CLASS net/minecraft/world/entity/animal/axolotl/AxolotlAi ARG 0 brain METHOD initPlayDeadActivity (Lnet/minecraft/world/entity/ai/Brain;)V ARG 0 brain + METHOD lambda$getTemptations$0 (Lnet/minecraft/world/item/ItemStack;)Z + ARG 0 stack METHOD makeBrain (Lnet/minecraft/world/entity/ai/Brain;)Lnet/minecraft/world/entity/ai/Brain; ARG 0 brain METHOD updateActivity (Lnet/minecraft/world/entity/animal/axolotl/Axolotl;)V diff --git a/data/net/minecraft/world/entity/animal/frog/Frog.mapping b/data/net/minecraft/world/entity/animal/frog/Frog.mapping index 37af7ba76..7eb0773ba 100644 --- a/data/net/minecraft/world/entity/animal/frog/Frog.mapping +++ b/data/net/minecraft/world/entity/animal/frog/Frog.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/world/entity/animal/frog/Frog METHOD canEat (Lnet/minecraft/world/entity/LivingEntity;)Z ARG 0 entity - METHOD checkFrogSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 animal + METHOD checkFrogSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD setTongueTarget (Lnet/minecraft/world/entity/Entity;)V diff --git a/data/net/minecraft/world/entity/animal/goat/Goat.mapping b/data/net/minecraft/world/entity/animal/goat/Goat.mapping index 169cc1a1e..c59222500 100644 --- a/data/net/minecraft/world/entity/animal/goat/Goat.mapping +++ b/data/net/minecraft/world/entity/animal/goat/Goat.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/world/entity/animal/goat/Goat - METHOD checkGoatSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 goat + METHOD checkGoatSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD setScreamingGoat (Z)V diff --git a/data/net/minecraft/world/entity/animal/horse/AbstractHorse.mapping b/data/net/minecraft/world/entity/animal/horse/AbstractHorse.mapping index f7c015bf6..1886ea068 100644 --- a/data/net/minecraft/world/entity/animal/horse/AbstractHorse.mapping +++ b/data/net/minecraft/world/entity/animal/horse/AbstractHorse.mapping @@ -30,6 +30,8 @@ CLASS net/minecraft/world/entity/animal/horse/AbstractHorse METHOD fedFood (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/InteractionResult; ARG 1 player ARG 2 stack + METHOD followMommy (Lnet/minecraft/server/level/ServerLevel;)V + ARG 1 level METHOD generateJumpStrength (Ljava/util/function/DoubleSupplier;)D ARG 0 supplier METHOD generateMaxHealth (Ljava/util/function/IntUnaryOperator;)F @@ -77,6 +79,11 @@ CLASS net/minecraft/world/entity/animal/horse/AbstractHorse COMMENT Returns {@code true} if this entity should push and be pushed by other entities when colliding. METHOD isWoodSoundType (Lnet/minecraft/world/level/block/SoundType;)Z ARG 1 soundType + METHOD lambda$addBehaviourGoals$7 (Lnet/minecraft/world/item/ItemStack;)Z + ARG 0 stack + METHOD lambda$static$6 (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/server/level/ServerLevel;)Z + ARG 0 entity + ARG 1 level METHOD modifyTemper (I)I ARG 1 addedTemper METHOD onClimbable ()Z diff --git a/data/net/minecraft/world/entity/animal/horse/Horse.mapping b/data/net/minecraft/world/entity/animal/horse/Horse.mapping index 55832d178..1a6e5786c 100644 --- a/data/net/minecraft/world/entity/animal/horse/Horse.mapping +++ b/data/net/minecraft/world/entity/animal/horse/Horse.mapping @@ -4,9 +4,6 @@ CLASS net/minecraft/world/entity/animal/horse/Horse METHOD canMate (Lnet/minecraft/world/entity/animal/Animal;)Z COMMENT Returns {@code true} if the mob is currently able to mate with the specified mob. ARG 1 otherAnimal - METHOD containerChanged (Lnet/minecraft/world/Container;)V - COMMENT Called by {@code InventoryBasic.onInventoryChanged()} on an array that is never filled. - ARG 1 invBasic METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; ARG 1 damageSource METHOD mobInteract (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult; diff --git a/data/net/minecraft/world/entity/animal/horse/Llama.mapping b/data/net/minecraft/world/entity/animal/horse/Llama.mapping index 3c8ddc046..138a3ddb1 100644 --- a/data/net/minecraft/world/entity/animal/horse/Llama.mapping +++ b/data/net/minecraft/world/entity/animal/horse/Llama.mapping @@ -4,8 +4,6 @@ CLASS net/minecraft/world/entity/animal/horse/Llama METHOD canMate (Lnet/minecraft/world/entity/animal/Animal;)Z COMMENT Returns {@code true} if the mob is currently able to mate with the specified mob. ARG 1 otherAnimal - METHOD getDyeColor (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/DyeColor; - ARG 0 stack METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; ARG 1 damageSource METHOD handleEating (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/item/ItemStack;)Z @@ -48,8 +46,6 @@ CLASS net/minecraft/world/entity/animal/horse/Llama CLASS LlamaAttackWolfGoal METHOD (Lnet/minecraft/world/entity/animal/horse/Llama;)V ARG 1 llama - METHOD lambda$new$0 (Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 0 entity CLASS LlamaHurtByTargetGoal METHOD (Lnet/minecraft/world/entity/animal/horse/Llama;)V ARG 1 llama diff --git a/data/net/minecraft/world/entity/animal/horse/SkeletonHorse.mapping b/data/net/minecraft/world/entity/animal/horse/SkeletonHorse.mapping index 85067d852..d78409689 100644 --- a/data/net/minecraft/world/entity/animal/horse/SkeletonHorse.mapping +++ b/data/net/minecraft/world/entity/animal/horse/SkeletonHorse.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/world/entity/animal/horse/SkeletonHorse METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound - METHOD checkSkeletonHorseSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 animal + METHOD checkSkeletonHorseSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; diff --git a/data/net/minecraft/world/entity/animal/horse/ZombieHorse.mapping b/data/net/minecraft/world/entity/animal/horse/ZombieHorse.mapping index f5867e92d..d9b9b337d 100644 --- a/data/net/minecraft/world/entity/animal/horse/ZombieHorse.mapping +++ b/data/net/minecraft/world/entity/animal/horse/ZombieHorse.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/world/entity/animal/horse/ZombieHorse - METHOD checkZombieHorseSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 animal + METHOD checkZombieHorseSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; diff --git a/data/net/minecraft/world/entity/boss/EnderDragonPart.mapping b/data/net/minecraft/world/entity/boss/EnderDragonPart.mapping index 5c921d8d9..753a0ab52 100644 --- a/data/net/minecraft/world/entity/boss/EnderDragonPart.mapping +++ b/data/net/minecraft/world/entity/boss/EnderDragonPart.mapping @@ -8,10 +8,6 @@ CLASS net/minecraft/world/entity/boss/EnderDragonPart ARG 1 compound METHOD getDimensions (Lnet/minecraft/world/entity/Pose;)Lnet/minecraft/world/entity/EntityDimensions; ARG 1 pose - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD is (Lnet/minecraft/world/entity/Entity;)Z COMMENT Returns {@code true} if Entity argument is equal to this Entity ARG 1 entity diff --git a/data/net/minecraft/world/entity/boss/enderdragon/DragonFlightHistory.mapping b/data/net/minecraft/world/entity/boss/enderdragon/DragonFlightHistory.mapping new file mode 100644 index 000000000..6c2d8f45f --- /dev/null +++ b/data/net/minecraft/world/entity/boss/enderdragon/DragonFlightHistory.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/world/entity/boss/enderdragon/DragonFlightHistory + METHOD copyFrom (Lnet/minecraft/world/entity/boss/enderdragon/DragonFlightHistory;)V + ARG 1 other + METHOD get (I)Lnet/minecraft/world/entity/boss/enderdragon/DragonFlightHistory$Sample; + ARG 1 index + METHOD get (IF)Lnet/minecraft/world/entity/boss/enderdragon/DragonFlightHistory$Sample; + ARG 1 index + ARG 2 partialTick + METHOD record (DF)V + ARG 1 y + ARG 3 yRot diff --git a/data/net/minecraft/world/entity/boss/enderdragon/EndCrystal.mapping b/data/net/minecraft/world/entity/boss/enderdragon/EndCrystal.mapping index 92107d115..87bc454e6 100644 --- a/data/net/minecraft/world/entity/boss/enderdragon/EndCrystal.mapping +++ b/data/net/minecraft/world/entity/boss/enderdragon/EndCrystal.mapping @@ -6,16 +6,11 @@ CLASS net/minecraft/world/entity/boss/enderdragon/EndCrystal ARG 6 z METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD isPickable ()Z COMMENT Returns {@code true} if other Entities should be prevented from moving through this Entity. - METHOD kill ()V - COMMENT Called by the /kill command. - METHOD onDestroyedBy (Lnet/minecraft/world/damagesource/DamageSource;)V - ARG 1 source + METHOD onDestroyedBy (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/damagesource/DamageSource;)V + ARG 1 level + ARG 2 damageSource METHOD readAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V COMMENT (abstract) Protected helper method to read subclass entity data from NBT. ARG 1 compound diff --git a/data/net/minecraft/world/entity/boss/enderdragon/EnderDragon.mapping b/data/net/minecraft/world/entity/boss/enderdragon/EnderDragon.mapping index 428bd916f..13cb4be2e 100644 --- a/data/net/minecraft/world/entity/boss/enderdragon/EnderDragon.mapping +++ b/data/net/minecraft/world/entity/boss/enderdragon/EnderDragon.mapping @@ -7,9 +7,9 @@ CLASS net/minecraft/world/entity/boss/enderdragon/EnderDragon COMMENT Updates the state of the dragon's current endercrystal. METHOD checkDespawn ()V COMMENT Makes the entity despawn if requirements are reached - METHOD checkWalls (Lnet/minecraft/world/phys/AABB;)Z - COMMENT Destroys all blocks that aren't associated with 'The End' inside the given bounding box. - ARG 1 area + METHOD checkWalls (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/phys/AABB;)Z + ARG 1 level + ARG 2 box METHOD findClosestNode ()I COMMENT Generates values for the fields pathPoints, and neighbors, and then returns the nearest pathPoint to the specified position. METHOD findClosestNode (DDD)I @@ -26,49 +26,37 @@ CLASS net/minecraft/world/entity/boss/enderdragon/EnderDragon ARG 3 andThen METHOD getHeadLookVector (F)Lnet/minecraft/world/phys/Vec3; ARG 1 partialTicks - METHOD getHeadPartYOffset (I[D[D)F - ARG 1 partIndex - ARG 2 spineEndOffsets - ARG 3 headPartOffsets METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; ARG 1 damageSource - METHOD getLatencyPos (IF)[D - COMMENT Returns a double[3] array with movement offsets, used to calculate trailing tail/neck positions. [0] = yaw offset, [1] = y offset, [2] = unused, always 0. Parameters: buffer index offset, partial ticks. - ARG 1 bufferIndexOffset - ARG 2 partialTicks METHOD getSoundVolume ()F COMMENT Returns the volume for the sounds this mob makes. - METHOD hurt (Ljava/util/List;)V - COMMENT Attacks all entities inside this list, dealing 5 hearts of damage. - ARG 1 entities - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount - METHOD hurt (Lnet/minecraft/world/entity/boss/EnderDragonPart;Lnet/minecraft/world/damagesource/DamageSource;F)Z - ARG 1 part - ARG 2 source - ARG 3 damage + METHOD hurt (Lnet/minecraft/server/level/ServerLevel;Ljava/util/List;)V + ARG 1 level + ARG 2 entities + METHOD hurt (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/boss/EnderDragonPart;Lnet/minecraft/world/damagesource/DamageSource;F)Z + ARG 1 level + ARG 2 part + ARG 3 damageSource + ARG 4 amount METHOD isPickable ()Z COMMENT Returns {@code true} if other Entities should be prevented from moving through this Entity. - METHOD kill ()V - COMMENT Called by the /kill command. METHOD knockBack (Lnet/minecraft/server/level/ServerLevel;Ljava/util/List;)V ARG 1 level ARG 2 targets - METHOD onCrystalDestroyed (Lnet/minecraft/world/entity/boss/enderdragon/EndCrystal;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/damagesource/DamageSource;)V - ARG 1 crystal - ARG 2 pos - ARG 3 damageSource + METHOD onCrystalDestroyed (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/boss/enderdragon/EndCrystal;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/damagesource/DamageSource;)V + ARG 1 level + ARG 2 crystal + ARG 3 pos + ARG 4 damageSource METHOD onSyncedDataUpdated (Lnet/minecraft/network/syncher/EntityDataAccessor;)V ARG 1 key METHOD readAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V COMMENT (abstract) Protected helper method to read subclass entity data from NBT. ARG 1 compound - METHOD reallyHurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Provides a way to cause damage to an ender dragon. - ARG 1 damageSource - ARG 2 amount + METHOD reallyHurt (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/damagesource/DamageSource;F)V + ARG 1 level + ARG 2 damageSource + ARG 3 amount METHOD reconstructPath (Lnet/minecraft/world/level/pathfinder/Node;Lnet/minecraft/world/level/pathfinder/Node;)Lnet/minecraft/world/level/pathfinder/Path; COMMENT Create and return a new PathEntity defining a path from the start to the finish, using the connections already made by the caller, findPath. ARG 1 start diff --git a/data/net/minecraft/world/entity/boss/enderdragon/phases/AbstractDragonPhaseInstance.mapping b/data/net/minecraft/world/entity/boss/enderdragon/phases/AbstractDragonPhaseInstance.mapping index 91d5a1b59..ad84b7ae3 100644 --- a/data/net/minecraft/world/entity/boss/enderdragon/phases/AbstractDragonPhaseInstance.mapping +++ b/data/net/minecraft/world/entity/boss/enderdragon/phases/AbstractDragonPhaseInstance.mapping @@ -6,9 +6,6 @@ CLASS net/minecraft/world/entity/boss/enderdragon/phases/AbstractDragonPhaseInst METHOD doClientTick ()V COMMENT Generates particle effects appropriate to the phase (or sometimes sounds). COMMENT Called by dragon's onLivingUpdate. Only used when worldObj.isRemote. - METHOD doServerTick ()V - COMMENT Gives the phase a chance to update its status. - COMMENT Called by dragon's onLivingUpdate. Only used when !worldObj.isRemote. METHOD getFlySpeed ()F COMMENT Returns the maximum amount dragon may rise or fall during this phase METHOD getFlyTargetLocation ()Lnet/minecraft/world/phys/Vec3; diff --git a/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonChargePlayerPhase.mapping b/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonChargePlayerPhase.mapping index 33a065939..ae210be9f 100644 --- a/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonChargePlayerPhase.mapping +++ b/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonChargePlayerPhase.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/world/entity/boss/enderdragon/phases/DragonChargePlayerPhase METHOD begin ()V COMMENT Called when this phase is set to active - METHOD doServerTick ()V - COMMENT Gives the phase a chance to update its status. - COMMENT Called by dragon's onLivingUpdate. Only used when !worldObj.isRemote. METHOD getFlySpeed ()F COMMENT Returns the maximum amount dragon may rise or fall during this phase METHOD getFlyTargetLocation ()Lnet/minecraft/world/phys/Vec3; diff --git a/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonDeathPhase.mapping b/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonDeathPhase.mapping index 00cf14b7b..c8af702e6 100644 --- a/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonDeathPhase.mapping +++ b/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonDeathPhase.mapping @@ -4,9 +4,6 @@ CLASS net/minecraft/world/entity/boss/enderdragon/phases/DragonDeathPhase METHOD doClientTick ()V COMMENT Generates particle effects appropriate to the phase (or sometimes sounds). COMMENT Called by dragon's onLivingUpdate. Only used when worldObj.isRemote. - METHOD doServerTick ()V - COMMENT Gives the phase a chance to update its status. - COMMENT Called by dragon's onLivingUpdate. Only used when !worldObj.isRemote. METHOD getFlySpeed ()F COMMENT Returns the maximum amount dragon may rise or fall during this phase METHOD getFlyTargetLocation ()Lnet/minecraft/world/phys/Vec3; diff --git a/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonHoldingPatternPhase.mapping b/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonHoldingPatternPhase.mapping index 534175250..dac974b99 100644 --- a/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonHoldingPatternPhase.mapping +++ b/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonHoldingPatternPhase.mapping @@ -1,9 +1,8 @@ CLASS net/minecraft/world/entity/boss/enderdragon/phases/DragonHoldingPatternPhase METHOD begin ()V COMMENT Called when this phase is set to active - METHOD doServerTick ()V - COMMENT Gives the phase a chance to update its status. - COMMENT Called by dragon's onLivingUpdate. Only used when !worldObj.isRemote. + METHOD findNewTarget (Lnet/minecraft/server/level/ServerLevel;)V + ARG 1 level METHOD getFlyTargetLocation ()Lnet/minecraft/world/phys/Vec3; COMMENT Returns the location the dragon is flying toward METHOD onCrystalDestroyed (Lnet/minecraft/world/entity/boss/enderdragon/EndCrystal;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/damagesource/DamageSource;Lnet/minecraft/world/entity/player/Player;)V diff --git a/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonHoverPhase.mapping b/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonHoverPhase.mapping index 55c17d766..518ec6551 100644 --- a/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonHoverPhase.mapping +++ b/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonHoverPhase.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/world/entity/boss/enderdragon/phases/DragonHoverPhase METHOD begin ()V COMMENT Called when this phase is set to active - METHOD doServerTick ()V - COMMENT Gives the phase a chance to update its status. - COMMENT Called by dragon's onLivingUpdate. Only used when !worldObj.isRemote. METHOD getFlySpeed ()F COMMENT Returns the maximum amount dragon may rise or fall during this phase METHOD getFlyTargetLocation ()Lnet/minecraft/world/phys/Vec3; diff --git a/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingApproachPhase.mapping b/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingApproachPhase.mapping index 3459255df..8ce6ce5f2 100644 --- a/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingApproachPhase.mapping +++ b/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingApproachPhase.mapping @@ -1,8 +1,7 @@ CLASS net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingApproachPhase METHOD begin ()V COMMENT Called when this phase is set to active - METHOD doServerTick ()V - COMMENT Gives the phase a chance to update its status. - COMMENT Called by dragon's onLivingUpdate. Only used when !worldObj.isRemote. + METHOD findNewTarget (Lnet/minecraft/server/level/ServerLevel;)V + ARG 1 level METHOD getFlyTargetLocation ()Lnet/minecraft/world/phys/Vec3; COMMENT Returns the location the dragon is flying toward diff --git a/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingPhase.mapping b/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingPhase.mapping index be3aa83ae..b1ae470d9 100644 --- a/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingPhase.mapping +++ b/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingPhase.mapping @@ -4,9 +4,6 @@ CLASS net/minecraft/world/entity/boss/enderdragon/phases/DragonLandingPhase METHOD doClientTick ()V COMMENT Generates particle effects appropriate to the phase (or sometimes sounds). COMMENT Called by dragon's onLivingUpdate. Only used when worldObj.isRemote. - METHOD doServerTick ()V - COMMENT Gives the phase a chance to update its status. - COMMENT Called by dragon's onLivingUpdate. Only used when !worldObj.isRemote. METHOD getFlySpeed ()F COMMENT Returns the maximum amount dragon may rise or fall during this phase METHOD getFlyTargetLocation ()Lnet/minecraft/world/phys/Vec3; diff --git a/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonPhaseInstance.mapping b/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonPhaseInstance.mapping index af9fbbd32..3fd44dcb4 100644 --- a/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonPhaseInstance.mapping +++ b/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonPhaseInstance.mapping @@ -4,9 +4,8 @@ CLASS net/minecraft/world/entity/boss/enderdragon/phases/DragonPhaseInstance METHOD doClientTick ()V COMMENT Generates particle effects appropriate to the phase (or sometimes sounds). COMMENT Called by dragon's onLivingUpdate. Only used when worldObj.isRemote. - METHOD doServerTick ()V - COMMENT Gives the phase a chance to update its status. - COMMENT Called by dragon's onLivingUpdate. Only used when !worldObj.isRemote. + METHOD doServerTick (Lnet/minecraft/server/level/ServerLevel;)V + ARG 1 level METHOD getFlySpeed ()F COMMENT Returns the maximum amount dragon may rise or fall during this phase METHOD getFlyTargetLocation ()Lnet/minecraft/world/phys/Vec3; diff --git a/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingAttackingPhase.mapping b/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingAttackingPhase.mapping index 86222253b..ef77561ff 100644 --- a/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingAttackingPhase.mapping +++ b/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingAttackingPhase.mapping @@ -4,6 +4,3 @@ CLASS net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingAttackingP METHOD doClientTick ()V COMMENT Generates particle effects appropriate to the phase (or sometimes sounds). COMMENT Called by dragon's onLivingUpdate. Only used when worldObj.isRemote. - METHOD doServerTick ()V - COMMENT Gives the phase a chance to update its status. - COMMENT Called by dragon's onLivingUpdate. Only used when !worldObj.isRemote. diff --git a/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPhase.mapping b/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPhase.mapping index a294d2d40..89f20e2e1 100644 --- a/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPhase.mapping +++ b/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPhase.mapping @@ -4,6 +4,3 @@ CLASS net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingFlamingPha METHOD doClientTick ()V COMMENT Generates particle effects appropriate to the phase (or sometimes sounds). COMMENT Called by dragon's onLivingUpdate. Only used when worldObj.isRemote. - METHOD doServerTick ()V - COMMENT Gives the phase a chance to update its status. - COMMENT Called by dragon's onLivingUpdate. Only used when !worldObj.isRemote. diff --git a/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingScanningPhase.mapping b/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingScanningPhase.mapping index 77e0a0a26..db79bccdd 100644 --- a/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingScanningPhase.mapping +++ b/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingScanningPhase.mapping @@ -1,6 +1,3 @@ CLASS net/minecraft/world/entity/boss/enderdragon/phases/DragonSittingScanningPhase METHOD begin ()V COMMENT Called when this phase is set to active - METHOD doServerTick ()V - COMMENT Gives the phase a chance to update its status. - COMMENT Called by dragon's onLivingUpdate. Only used when !worldObj.isRemote. diff --git a/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.mapping b/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.mapping index 698933a39..8505aaa9d 100644 --- a/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.mapping +++ b/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/world/entity/boss/enderdragon/phases/DragonStrafePlayerPhase METHOD begin ()V COMMENT Called when this phase is set to active - METHOD doServerTick ()V - COMMENT Gives the phase a chance to update its status. - COMMENT Called by dragon's onLivingUpdate. Only used when !worldObj.isRemote. METHOD getFlyTargetLocation ()Lnet/minecraft/world/phys/Vec3; COMMENT Returns the location the dragon is flying toward METHOD setTarget (Lnet/minecraft/world/entity/LivingEntity;)V diff --git a/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonTakeoffPhase.mapping b/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonTakeoffPhase.mapping index 14b200864..3c200c32c 100644 --- a/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonTakeoffPhase.mapping +++ b/data/net/minecraft/world/entity/boss/enderdragon/phases/DragonTakeoffPhase.mapping @@ -1,8 +1,5 @@ CLASS net/minecraft/world/entity/boss/enderdragon/phases/DragonTakeoffPhase METHOD begin ()V COMMENT Called when this phase is set to active - METHOD doServerTick ()V - COMMENT Gives the phase a chance to update its status. - COMMENT Called by dragon's onLivingUpdate. Only used when !worldObj.isRemote. METHOD getFlyTargetLocation ()Lnet/minecraft/world/phys/Vec3; COMMENT Returns the location the dragon is flying toward diff --git a/data/net/minecraft/world/entity/boss/wither/WitherBoss.mapping b/data/net/minecraft/world/entity/boss/wither/WitherBoss.mapping index ba2be94e0..5729ab5f4 100644 --- a/data/net/minecraft/world/entity/boss/wither/WitherBoss.mapping +++ b/data/net/minecraft/world/entity/boss/wither/WitherBoss.mapping @@ -15,22 +15,12 @@ CLASS net/minecraft/world/entity/boss/wither/WitherBoss COMMENT The target offset, should be from 0-2 METHOD getHeadX (I)D ARG 1 head - METHOD getHeadXRot (I)F - ARG 1 head METHOD getHeadY (I)D ARG 1 head - METHOD getHeadYRot (I)F - ARG 1 head METHOD getHeadZ (I)D ARG 1 head METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; ARG 1 damageSource - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount - METHOD lambda$static$0 (Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 0 entity METHOD makeInvulnerable ()V COMMENT Initializes this Wither's explosion sequence and makes it invulnerable. Called immediately after spawning. METHOD makeStuckInBlock (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/phys/Vec3;)V diff --git a/data/net/minecraft/world/entity/decoration/ArmorStand.mapping b/data/net/minecraft/world/entity/decoration/ArmorStand.mapping index 0cd0a5d97..e078d877e 100644 --- a/data/net/minecraft/world/entity/decoration/ArmorStand.mapping +++ b/data/net/minecraft/world/entity/decoration/ArmorStand.mapping @@ -14,8 +14,6 @@ CLASS net/minecraft/world/entity/decoration/ArmorStand METHOD brokenByPlayer (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/damagesource/DamageSource;)V ARG 1 level ARG 2 damageSource - METHOD canTakeItem (Lnet/minecraft/world/item/ItemStack;)Z - ARG 1 itemstack METHOD causeDamage (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/damagesource/DamageSource;F)V ARG 1 level ARG 2 damageSource @@ -32,10 +30,6 @@ CLASS net/minecraft/world/entity/decoration/ArmorStand ARG 1 slot METHOD getLightProbePosition (F)Lnet/minecraft/world/phys/Vec3; ARG 1 partialTicks - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD interactAt (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult; COMMENT Applies the given player interaction to this Entity. ARG 1 player @@ -55,8 +49,6 @@ CLASS net/minecraft/world/entity/decoration/ArmorStand COMMENT Returns {@code true} if other Entities should be prevented from moving through this Entity. METHOD isPushable ()Z COMMENT Returns {@code true} if this entity should push and be pushed by other entities when colliding. - METHOD kill ()V - COMMENT Called by the /kill command. METHOD lambda$static$0 (Lnet/minecraft/world/entity/Entity;)Z ARG 0 entity METHOD onSyncedDataUpdated (Lnet/minecraft/network/syncher/EntityDataAccessor;)V diff --git a/data/net/minecraft/world/entity/decoration/BlockAttachedEntity.mapping b/data/net/minecraft/world/entity/decoration/BlockAttachedEntity.mapping index 3e26e39ec..bc9406a44 100644 --- a/data/net/minecraft/world/entity/decoration/BlockAttachedEntity.mapping +++ b/data/net/minecraft/world/entity/decoration/BlockAttachedEntity.mapping @@ -3,5 +3,6 @@ CLASS net/minecraft/world/entity/decoration/BlockAttachedEntity ARG 1 entityType ARG 2 level ARG 3 pos - METHOD dropItem (Lnet/minecraft/world/entity/Entity;)V - ARG 1 entity + METHOD dropItem (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;)V + ARG 1 level + ARG 2 entity diff --git a/data/net/minecraft/world/entity/decoration/HangingEntity.mapping b/data/net/minecraft/world/entity/decoration/HangingEntity.mapping index a72a16808..c1102c05c 100644 --- a/data/net/minecraft/world/entity/decoration/HangingEntity.mapping +++ b/data/net/minecraft/world/entity/decoration/HangingEntity.mapping @@ -23,9 +23,5 @@ CLASS net/minecraft/world/entity/decoration/HangingEntity METHOD setDirection (Lnet/minecraft/core/Direction;)V COMMENT Updates facing and bounding box based on it ARG 1 facingDirection - METHOD spawnAtLocation (Lnet/minecraft/world/item/ItemStack;F)Lnet/minecraft/world/entity/item/ItemEntity; - COMMENT Drops an item at the position of the entity. - ARG 1 stack - ARG 2 offsetY METHOD survives ()Z COMMENT Checks to make sure the {@code HangingEntity} can be placed there. diff --git a/data/net/minecraft/world/entity/decoration/ItemFrame.mapping b/data/net/minecraft/world/entity/decoration/ItemFrame.mapping index 05e1f4848..5abbd88b6 100644 --- a/data/net/minecraft/world/entity/decoration/ItemFrame.mapping +++ b/data/net/minecraft/world/entity/decoration/ItemFrame.mapping @@ -10,25 +10,19 @@ CLASS net/minecraft/world/entity/decoration/ItemFrame ARG 3 facingDirection METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound - METHOD dropItem (Lnet/minecraft/world/entity/Entity;)V - COMMENT Called when this entity is broken. Entity parameter may be null. - ARG 1 brokenEntity - METHOD dropItem (Lnet/minecraft/world/entity/Entity;Z)V - ARG 1 entity - ARG 2 dropSelf + METHOD canHurtWhenFixed (Lnet/minecraft/world/damagesource/DamageSource;)Z + ARG 0 damageSource + METHOD dropItem (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;Z)V + ARG 1 level + ARG 2 entity + ARG 3 dropItem METHOD getFramedMapId (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/level/saveddata/maps/MapId; ARG 1 stack METHOD getRotation ()I COMMENT Return the rotation of the item currently on this frame. - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD interact (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult; ARG 1 player ARG 2 hand - METHOD kill ()V - COMMENT Called by the /kill command. METHOD move (Lnet/minecraft/world/entity/MoverType;Lnet/minecraft/world/phys/Vec3;)V ARG 1 type ARG 2 pos @@ -60,6 +54,8 @@ CLASS net/minecraft/world/entity/decoration/ItemFrame METHOD setRotation (IZ)V ARG 1 rotation ARG 2 updateNeighbours + METHOD shouldDamageDropItem (Lnet/minecraft/world/damagesource/DamageSource;)Z + ARG 1 damageSource METHOD shouldRenderAtSqrDistance (D)Z COMMENT Checks if the entity is in range to render. ARG 1 distance diff --git a/data/net/minecraft/world/entity/decoration/LeashFenceKnotEntity.mapping b/data/net/minecraft/world/entity/decoration/LeashFenceKnotEntity.mapping index fed3be0ab..87324f412 100644 --- a/data/net/minecraft/world/entity/decoration/LeashFenceKnotEntity.mapping +++ b/data/net/minecraft/world/entity/decoration/LeashFenceKnotEntity.mapping @@ -4,9 +4,6 @@ CLASS net/minecraft/world/entity/decoration/LeashFenceKnotEntity ARG 2 pos METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound - METHOD dropItem (Lnet/minecraft/world/entity/Entity;)V - COMMENT Called when this entity is broken. Entity parameter may be null. - ARG 1 brokenEntity METHOD getOrCreateKnot (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/entity/decoration/LeashFenceKnotEntity; ARG 0 level ARG 1 pos diff --git a/data/net/minecraft/world/entity/decoration/Painting.mapping b/data/net/minecraft/world/entity/decoration/Painting.mapping index c95dee284..48026298f 100644 --- a/data/net/minecraft/world/entity/decoration/Painting.mapping +++ b/data/net/minecraft/world/entity/decoration/Painting.mapping @@ -13,9 +13,6 @@ CLASS net/minecraft/world/entity/decoration/Painting ARG 0 level ARG 1 pos ARG 2 direction - METHOD dropItem (Lnet/minecraft/world/entity/Entity;)V - COMMENT Called when this entity is broken. Entity parameter may be null. - ARG 1 brokenEntity METHOD moveTo (DDDFF)V COMMENT Sets the location and rotation of the entity in the world. ARG 1 x diff --git a/data/net/minecraft/world/entity/decoration/PaintingVariants.mapping b/data/net/minecraft/world/entity/decoration/PaintingVariants.mapping index 917f1b0db..fd15aa0cc 100644 --- a/data/net/minecraft/world/entity/decoration/PaintingVariants.mapping +++ b/data/net/minecraft/world/entity/decoration/PaintingVariants.mapping @@ -8,3 +8,9 @@ CLASS net/minecraft/world/entity/decoration/PaintingVariants ARG 1 key ARG 2 width ARG 3 height + METHOD register (Lnet/minecraft/data/worldgen/BootstrapContext;Lnet/minecraft/resources/ResourceKey;IIZ)V + ARG 0 context + ARG 1 key + ARG 2 width + ARG 3 height + ARG 4 hasAuthor diff --git a/data/net/minecraft/world/entity/item/ItemEntity.mapping b/data/net/minecraft/world/entity/item/ItemEntity.mapping index 61c35b5b6..052908542 100644 --- a/data/net/minecraft/world/entity/item/ItemEntity.mapping +++ b/data/net/minecraft/world/entity/item/ItemEntity.mapping @@ -23,12 +23,9 @@ CLASS net/minecraft/world/entity/item/ItemEntity ARG 1 originStack METHOD getItem ()Lnet/minecraft/world/item/ItemStack; COMMENT Gets the item that this entity represents. - METHOD getSpin (F)F - ARG 1 partialTicks - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount + METHOD getSpin (FF)F + ARG 0 age + ARG 1 bobOffset METHOD isAttackable ()Z COMMENT Returns {@code true} if it's possible to attack this entity with an item. METHOD lambda$mergeWithNeighbours$0 (Lnet/minecraft/world/entity/item/ItemEntity;)Z @@ -56,6 +53,8 @@ CLASS net/minecraft/world/entity/item/ItemEntity METHOD readAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V COMMENT (abstract) Protected helper method to read subclass entity data from NBT. ARG 1 compound + METHOD setFluidMovement (D)V + ARG 1 multiplier METHOD setItem (Lnet/minecraft/world/item/ItemStack;)V COMMENT Sets the item that this entity represents. ARG 1 stack diff --git a/data/net/minecraft/world/entity/monster/Bogged.mapping b/data/net/minecraft/world/entity/monster/Bogged.mapping index 5589921da..a2aa510fc 100644 --- a/data/net/minecraft/world/entity/monster/Bogged.mapping +++ b/data/net/minecraft/world/entity/monster/Bogged.mapping @@ -1,3 +1,6 @@ CLASS net/minecraft/world/entity/monster/Bogged METHOD setSheared (Z)V ARG 1 sheared + METHOD spawnShearedMushrooms (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/ItemStack;)V + ARG 1 level + ARG 2 stack diff --git a/data/net/minecraft/world/entity/monster/CaveSpider.mapping b/data/net/minecraft/world/entity/monster/CaveSpider.mapping deleted file mode 100644 index 3ee21f2ac..000000000 --- a/data/net/minecraft/world/entity/monster/CaveSpider.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/world/entity/monster/CaveSpider - METHOD doHurtTarget (Lnet/minecraft/world/entity/Entity;)Z - ARG 1 entity diff --git a/data/net/minecraft/world/entity/monster/Creeper.mapping b/data/net/minecraft/world/entity/monster/Creeper.mapping index d0aea0e53..fd89184d4 100644 --- a/data/net/minecraft/world/entity/monster/Creeper.mapping +++ b/data/net/minecraft/world/entity/monster/Creeper.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/world/entity/monster/Creeper COMMENT Returns {@code true} if an entity is able to drop its skull due to being blown up by this creeper. COMMENT COMMENT Does not test if this creeper is charged, the caller must do that. However, does test the doMobLoot gamerule. - METHOD doHurtTarget (Lnet/minecraft/world/entity/Entity;)Z - ARG 1 entity METHOD explodeCreeper ()V COMMENT Creates an explosion as determined by this creeper's power and explosion radius. METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; diff --git a/data/net/minecraft/world/entity/monster/Drowned.mapping b/data/net/minecraft/world/entity/monster/Drowned.mapping index 3394fbff6..99ba84358 100644 --- a/data/net/minecraft/world/entity/monster/Drowned.mapping +++ b/data/net/minecraft/world/entity/monster/Drowned.mapping @@ -1,11 +1,8 @@ CLASS net/minecraft/world/entity/monster/Drowned - METHOD canReplaceCurrentItem (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;)Z - ARG 1 candidate - ARG 2 existing - METHOD checkDrownedSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 drowned - ARG 1 serverLevel - ARG 2 mobSpawnType + METHOD checkDrownedSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType + ARG 1 level + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD checkSpawnObstruction (Lnet/minecraft/world/level/LevelReader;)Z diff --git a/data/net/minecraft/world/entity/monster/EnderMan.mapping b/data/net/minecraft/world/entity/monster/EnderMan.mapping index ecdd6bf82..da6f1a726 100644 --- a/data/net/minecraft/world/entity/monster/EnderMan.mapping +++ b/data/net/minecraft/world/entity/monster/EnderMan.mapping @@ -3,16 +3,12 @@ CLASS net/minecraft/world/entity/monster/EnderMan ARG 1 compound METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; ARG 1 damageSource - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount - METHOD hurtWithCleanWater (Lnet/minecraft/world/damagesource/DamageSource;Lnet/minecraft/world/entity/projectile/ThrownPotion;F)Z - ARG 1 source - ARG 2 potion - ARG 3 amount - METHOD isLookingAtMe (Lnet/minecraft/world/entity/player/Player;)Z - COMMENT Checks to see if this enderman should be attacking this player + METHOD hurtWithCleanWater (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/damagesource/DamageSource;Lnet/minecraft/world/entity/projectile/ThrownPotion;F)Z + ARG 1 level + ARG 2 damageSource + ARG 3 potion + ARG 4 amount + METHOD isBeingStaredBy (Lnet/minecraft/world/entity/player/Player;)Z ARG 1 player METHOD onSyncedDataUpdated (Lnet/minecraft/network/syncher/EntityDataAccessor;)V ARG 1 key @@ -62,15 +58,16 @@ CLASS net/minecraft/world/entity/monster/EnderMan CLASS EndermanLookForPlayerGoal FIELD pendingTarget Lnet/minecraft/world/entity/player/Player; COMMENT The player - METHOD (Lnet/minecraft/world/entity/monster/EnderMan;Ljava/util/function/Predicate;)V + METHOD (Lnet/minecraft/world/entity/monster/EnderMan;Lnet/minecraft/world/entity/ai/targeting/TargetingConditions$Selector;)V ARG 1 enderman - ARG 2 selectionPredicate + ARG 2 selector METHOD canContinueToUse ()Z COMMENT Returns whether an in-progress EntityAIBase should continue executing METHOD canUse ()Z COMMENT Returns whether execution should begin. You can also read and cache any state necessary for execution in this method as well. - METHOD lambda$new$0 (Lnet/minecraft/world/entity/monster/EnderMan;Lnet/minecraft/world/entity/LivingEntity;)Z + METHOD lambda$new$0 (Lnet/minecraft/world/entity/monster/EnderMan;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/server/level/ServerLevel;)Z ARG 1 entity + ARG 2 level METHOD start ()V COMMENT Execute a one shot task or start executing a continuous task METHOD stop ()V diff --git a/data/net/minecraft/world/entity/monster/Endermite.mapping b/data/net/minecraft/world/entity/monster/Endermite.mapping index a92b85569..38923f67f 100644 --- a/data/net/minecraft/world/entity/monster/Endermite.mapping +++ b/data/net/minecraft/world/entity/monster/Endermite.mapping @@ -3,10 +3,10 @@ CLASS net/minecraft/world/entity/monster/Endermite ARG 1 compound METHOD aiStep ()V COMMENT Called frequently, so the entity can update its state every tick as required. For example, zombies and skeletons use this to react to sunlight and start to burn. - METHOD checkEndermiteSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 endermite - ARG 1 serverLevel - ARG 2 spawnType + METHOD checkEndermiteSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType + ARG 1 level + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; diff --git a/data/net/minecraft/world/entity/monster/Evoker.mapping b/data/net/minecraft/world/entity/monster/Evoker.mapping index d41b9cb35..eb760da7e 100644 --- a/data/net/minecraft/world/entity/monster/Evoker.mapping +++ b/data/net/minecraft/world/entity/monster/Evoker.mapping @@ -3,9 +3,6 @@ CLASS net/minecraft/world/entity/monster/Evoker ARG 1 compound METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; ARG 1 damageSource - METHOD isAlliedTo (Lnet/minecraft/world/entity/Entity;)Z - COMMENT Returns whether this Entity is on the same team as the given Entity. - ARG 1 entity METHOD readAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V COMMENT (abstract) Protected helper method to read subclass entity data from NBT. ARG 1 compound @@ -27,8 +24,6 @@ CLASS net/minecraft/world/entity/monster/Evoker COMMENT Returns whether an in-progress EntityAIBase should continue executing METHOD canUse ()Z COMMENT Returns whether execution should begin. You can also read and cache any state necessary for execution in this method as well. - METHOD lambda$new$0 (Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 0 entity METHOD stop ()V COMMENT Reset the task's internal state. Called when this task is interrupted by another one CLASS EvokerCastingSpellGoal diff --git a/data/net/minecraft/world/entity/monster/Ghast.mapping b/data/net/minecraft/world/entity/monster/Ghast.mapping index 001589499..73d1c937b 100644 --- a/data/net/minecraft/world/entity/monster/Ghast.mapping +++ b/data/net/minecraft/world/entity/monster/Ghast.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/world/entity/monster/Ghast METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound - METHOD checkGhastSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 ghast + METHOD checkGhastSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; @@ -13,10 +13,6 @@ CLASS net/minecraft/world/entity/monster/Ghast COMMENT Will return how many at most can spawn in a chunk at once. METHOD getSoundVolume ()F COMMENT Returns the volume for the sounds this mob makes. - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD isReflectedFireball (Lnet/minecraft/world/damagesource/DamageSource;)Z ARG 0 damageSource METHOD readAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V diff --git a/data/net/minecraft/world/entity/monster/Guardian.mapping b/data/net/minecraft/world/entity/monster/Guardian.mapping index 2fea4a234..a6c67a7e7 100644 --- a/data/net/minecraft/world/entity/monster/Guardian.mapping +++ b/data/net/minecraft/world/entity/monster/Guardian.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/world/entity/monster/Guardian METHOD aiStep ()V COMMENT Called frequently, so the entity can update its state every tick as required. For example, zombies and skeletons use this to react to sunlight and start to burn. - METHOD checkGuardianSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 guardian + METHOD checkGuardianSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD checkSpawnObstruction (Lnet/minecraft/world/level/LevelReader;)Z @@ -26,10 +26,6 @@ CLASS net/minecraft/world/entity/monster/Guardian METHOD getWalkTargetValue (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/LevelReader;)F ARG 1 pos ARG 2 level - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD onSyncedDataUpdated (Lnet/minecraft/network/syncher/EntityDataAccessor;)V ARG 1 key METHOD setActiveAttackTarget (I)V @@ -57,5 +53,3 @@ CLASS net/minecraft/world/entity/monster/Guardian CLASS GuardianAttackSelector METHOD (Lnet/minecraft/world/entity/monster/Guardian;)V ARG 1 guardian - METHOD test (Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 1 entity diff --git a/data/net/minecraft/world/entity/monster/Husk.mapping b/data/net/minecraft/world/entity/monster/Husk.mapping index 7809a3c16..557df9188 100644 --- a/data/net/minecraft/world/entity/monster/Husk.mapping +++ b/data/net/minecraft/world/entity/monster/Husk.mapping @@ -1,11 +1,9 @@ CLASS net/minecraft/world/entity/monster/Husk - METHOD checkHuskSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 husk + METHOD checkHuskSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random - METHOD doHurtTarget (Lnet/minecraft/world/entity/Entity;)Z - ARG 1 entity METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; ARG 1 damageSource diff --git a/data/net/minecraft/world/entity/monster/Illusioner.mapping b/data/net/minecraft/world/entity/monster/Illusioner.mapping index 5fac03eae..0876f5114 100644 --- a/data/net/minecraft/world/entity/monster/Illusioner.mapping +++ b/data/net/minecraft/world/entity/monster/Illusioner.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/world/entity/monster/Illusioner - METHOD getBoundingBoxForCulling ()Lnet/minecraft/world/phys/AABB; - COMMENT Gets the bounding box of this Entity, adjusted to take auxiliary entities into account (e.g. the tile contained by a minecart, such as a command block). METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; ARG 1 damageSource METHOD getIllusionOffsets (F)[Lnet/minecraft/world/phys/Vec3; diff --git a/data/net/minecraft/world/entity/monster/MagmaCube.mapping b/data/net/minecraft/world/entity/monster/MagmaCube.mapping index 532899be4..988132bf7 100644 --- a/data/net/minecraft/world/entity/monster/MagmaCube.mapping +++ b/data/net/minecraft/world/entity/monster/MagmaCube.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/world/entity/monster/MagmaCube - METHOD checkMagmaCubeSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 magmaCube + METHOD checkMagmaCubeSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; diff --git a/data/net/minecraft/world/entity/monster/Monster.mapping b/data/net/minecraft/world/entity/monster/Monster.mapping index 700da922d..6a7805ca5 100644 --- a/data/net/minecraft/world/entity/monster/Monster.mapping +++ b/data/net/minecraft/world/entity/monster/Monster.mapping @@ -1,16 +1,14 @@ CLASS net/minecraft/world/entity/monster/Monster - METHOD checkAnyLightMonsterSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - COMMENT Static predicate for determining whether a monster can spawn at the provided location. - ARG 0 type + METHOD checkAnyLightMonsterSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random - METHOD checkMonsterSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - COMMENT Static predicate for determining whether a monster can spawn at the provided location, incorporating a check of the current light level at the location. - ARG 0 type + METHOD checkMonsterSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; @@ -25,7 +23,8 @@ CLASS net/minecraft/world/entity/monster/Monster ARG 0 level ARG 1 pos ARG 2 random - METHOD isPreventingPlayerRest (Lnet/minecraft/world/entity/player/Player;)Z - ARG 1 player + METHOD isPreventingPlayerRest (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/player/Player;)Z + ARG 1 level + ARG 2 player METHOD shouldDropExperience ()Z COMMENT Entity won't drop items or experience points if this returns false diff --git a/data/net/minecraft/world/entity/monster/PatrollingMonster.mapping b/data/net/minecraft/world/entity/monster/PatrollingMonster.mapping index fe60d6eb6..3b83e38ef 100644 --- a/data/net/minecraft/world/entity/monster/PatrollingMonster.mapping +++ b/data/net/minecraft/world/entity/monster/PatrollingMonster.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/world/entity/monster/PatrollingMonster METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound - METHOD checkPatrollingMonsterSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 patrollingMonster + METHOD checkPatrollingMonsterSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos - ARG 4 random + ARG 4 randomSource METHOD readAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V COMMENT (abstract) Protected helper method to read subclass entity data from NBT. ARG 1 compound diff --git a/data/net/minecraft/world/entity/monster/Phantom.mapping b/data/net/minecraft/world/entity/monster/Phantom.mapping index edb5dde95..05799aaa8 100644 --- a/data/net/minecraft/world/entity/monster/Phantom.mapping +++ b/data/net/minecraft/world/entity/monster/Phantom.mapping @@ -1,6 +1,10 @@ CLASS net/minecraft/world/entity/monster/Phantom METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound + METHOD canAttack (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/ai/targeting/TargetingConditions;)Z + ARG 1 level + ARG 2 entity + ARG 3 targetingConditions METHOD canAttackType (Lnet/minecraft/world/entity/EntityType;)Z ARG 1 type METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; diff --git a/data/net/minecraft/world/entity/monster/Pillager.mapping b/data/net/minecraft/world/entity/monster/Pillager.mapping index 60ab02833..bb4efb3d0 100644 --- a/data/net/minecraft/world/entity/monster/Pillager.mapping +++ b/data/net/minecraft/world/entity/monster/Pillager.mapping @@ -12,9 +12,6 @@ CLASS net/minecraft/world/entity/monster/Pillager COMMENT Attack the specified entity using a ranged attack. ARG 1 target ARG 2 distanceFactor - METHOD pickUpItem (Lnet/minecraft/world/entity/item/ItemEntity;)V - COMMENT Tests if this entity should pick up a weapon or an armor piece. Entity drops current weapon or armor if the new one is better. - ARG 1 itemEntity METHOD readAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V COMMENT (abstract) Protected helper method to read subclass entity data from NBT. ARG 1 compound diff --git a/data/net/minecraft/world/entity/monster/Ravager.mapping b/data/net/minecraft/world/entity/monster/Ravager.mapping index 0ac9843b2..bdc3d85b1 100644 --- a/data/net/minecraft/world/entity/monster/Ravager.mapping +++ b/data/net/minecraft/world/entity/monster/Ravager.mapping @@ -5,14 +5,10 @@ CLASS net/minecraft/world/entity/monster/Ravager ARG 1 entity METHOD checkSpawnObstruction (Lnet/minecraft/world/level/LevelReader;)Z ARG 1 level - METHOD doHurtTarget (Lnet/minecraft/world/entity/Entity;)Z - ARG 1 entity METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; ARG 1 damageSource METHOD isImmobile ()Z COMMENT Dead and sleeping entities cannot move - METHOD lambda$registerGoals$1 (Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 0 entity METHOD lambda$static$0 (Lnet/minecraft/world/entity/Entity;)Z ARG 0 entity METHOD playStepSound (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V diff --git a/data/net/minecraft/world/entity/monster/Shulker.mapping b/data/net/minecraft/world/entity/monster/Shulker.mapping index 5c23c5ebd..98fe2770c 100644 --- a/data/net/minecraft/world/entity/monster/Shulker.mapping +++ b/data/net/minecraft/world/entity/monster/Shulker.mapping @@ -23,12 +23,8 @@ CLASS net/minecraft/world/entity/monster/Shulker ARG 1 expansionDirection ARG 2 currentPeek ARG 3 oldPeek - METHOD getRenderPosition (F)Ljava/util/Optional; - ARG 1 partial - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount + METHOD getRenderPosition (F)Lnet/minecraft/world/phys/Vec3; + ARG 1 partialTick METHOD isPositionBlocked (Lnet/minecraft/core/BlockPos;)Z ARG 1 pos METHOD lambda$setVariant$2 (Lnet/minecraft/world/item/DyeColor;)Ljava/lang/Byte; @@ -88,8 +84,6 @@ CLASS net/minecraft/world/entity/monster/Shulker COMMENT Returns whether execution should begin. You can also read and cache any state necessary for execution in this method as well. METHOD getTargetSearchArea (D)Lnet/minecraft/world/phys/AABB; ARG 1 targetDistance - METHOD lambda$new$0 (Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 0 entity CLASS ShulkerNearestAttackGoal METHOD (Lnet/minecraft/world/entity/monster/Shulker;Lnet/minecraft/world/entity/monster/Shulker;)V ARG 2 shulker diff --git a/data/net/minecraft/world/entity/monster/Silverfish.mapping b/data/net/minecraft/world/entity/monster/Silverfish.mapping index 25e11a6ba..da33d18d0 100644 --- a/data/net/minecraft/world/entity/monster/Silverfish.mapping +++ b/data/net/minecraft/world/entity/monster/Silverfish.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/world/entity/monster/Silverfish - METHOD checkSilverfishSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 silverfish + METHOD checkSilverfishSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; @@ -10,10 +10,6 @@ CLASS net/minecraft/world/entity/monster/Silverfish METHOD getWalkTargetValue (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/LevelReader;)F ARG 1 pos ARG 2 level - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD playStepSound (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V ARG 1 pos ARG 2 block diff --git a/data/net/minecraft/world/entity/monster/Slime.mapping b/data/net/minecraft/world/entity/monster/Slime.mapping index 043cbe8a5..03c3df01d 100644 --- a/data/net/minecraft/world/entity/monster/Slime.mapping +++ b/data/net/minecraft/world/entity/monster/Slime.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/world/entity/monster/Slime METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound - METHOD checkSlimeSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 slime + METHOD checkSlimeSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD dealDamage (Lnet/minecraft/world/entity/LivingEntity;)V diff --git a/data/net/minecraft/world/entity/monster/Stray.mapping b/data/net/minecraft/world/entity/monster/Stray.mapping index 6b6e00d56..463edb13e 100644 --- a/data/net/minecraft/world/entity/monster/Stray.mapping +++ b/data/net/minecraft/world/entity/monster/Stray.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/world/entity/monster/Stray - METHOD checkStraySpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 stray + METHOD checkStraySpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; diff --git a/data/net/minecraft/world/entity/monster/Strider.mapping b/data/net/minecraft/world/entity/monster/Strider.mapping index 8d7941b6a..2912d7784 100644 --- a/data/net/minecraft/world/entity/monster/Strider.mapping +++ b/data/net/minecraft/world/entity/monster/Strider.mapping @@ -10,10 +10,10 @@ CLASS net/minecraft/world/entity/monster/Strider ARG 5 pos METHOD checkSpawnObstruction (Lnet/minecraft/world/level/LevelReader;)Z ARG 1 level - METHOD checkStriderSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 strider + METHOD checkStriderSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD createNavigation (Lnet/minecraft/world/level/Level;)Lnet/minecraft/world/entity/ai/navigation/PathNavigation; diff --git a/data/net/minecraft/world/entity/monster/Vex.mapping b/data/net/minecraft/world/entity/monster/Vex.mapping index d5ccb1e96..418841738 100644 --- a/data/net/minecraft/world/entity/monster/Vex.mapping +++ b/data/net/minecraft/world/entity/monster/Vex.mapping @@ -5,9 +5,6 @@ CLASS net/minecraft/world/entity/monster/Vex ARG 1 damageSource METHOD getVexFlag (I)Z ARG 1 mask - METHOD move (Lnet/minecraft/world/entity/MoverType;Lnet/minecraft/world/phys/Vec3;)V - ARG 1 type - ARG 2 pos METHOD readAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V COMMENT (abstract) Protected helper method to read subclass entity data from NBT. ARG 1 compound diff --git a/data/net/minecraft/world/entity/monster/WitherSkeleton.mapping b/data/net/minecraft/world/entity/monster/WitherSkeleton.mapping index 9e1c2d6f3..6f9087464 100644 --- a/data/net/minecraft/world/entity/monster/WitherSkeleton.mapping +++ b/data/net/minecraft/world/entity/monster/WitherSkeleton.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/world/entity/monster/WitherSkeleton METHOD canBeAffected (Lnet/minecraft/world/effect/MobEffectInstance;)Z ARG 1 potioneffect - METHOD doHurtTarget (Lnet/minecraft/world/entity/Entity;)Z - ARG 1 entity METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; ARG 1 damageSource diff --git a/data/net/minecraft/world/entity/monster/Zoglin.mapping b/data/net/minecraft/world/entity/monster/Zoglin.mapping index 9280ce0c3..4bb3c7b2f 100644 --- a/data/net/minecraft/world/entity/monster/Zoglin.mapping +++ b/data/net/minecraft/world/entity/monster/Zoglin.mapping @@ -3,14 +3,10 @@ CLASS net/minecraft/world/entity/monster/Zoglin ARG 1 compound METHOD blockedByShield (Lnet/minecraft/world/entity/LivingEntity;)V ARG 1 entity - METHOD doHurtTarget (Lnet/minecraft/world/entity/Entity;)Z - ARG 1 entity + METHOD findNearestValidAttackTarget (Lnet/minecraft/server/level/ServerLevel;)Ljava/util/Optional; + ARG 1 level METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; ARG 1 damageSource - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD initCoreActivity (Lnet/minecraft/world/entity/ai/Brain;)V ARG 0 brain METHOD initFightActivity (Lnet/minecraft/world/entity/ai/Brain;)V @@ -19,8 +15,14 @@ CLASS net/minecraft/world/entity/monster/Zoglin ARG 0 brain METHOD isBaby ()Z COMMENT If Animal, checks if the age timer is negative - METHOD isTargetable (Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 1 livingEntity + METHOD isTargetable (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 1 level + ARG 2 entity + METHOD lambda$findNearestValidAttackTarget$1 (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 2 entity + METHOD lambda$initIdleActivity$0 (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/Zoglin;)Ljava/util/Optional; + ARG 0 level + ARG 1 zoglin METHOD makeBrain (Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/world/entity/ai/Brain; ARG 1 dynamic METHOD onSyncedDataUpdated (Lnet/minecraft/network/syncher/EntityDataAccessor;)V diff --git a/data/net/minecraft/world/entity/monster/Zombie.mapping b/data/net/minecraft/world/entity/monster/Zombie.mapping index e1ee21a19..6ae9e7775 100644 --- a/data/net/minecraft/world/entity/monster/Zombie.mapping +++ b/data/net/minecraft/world/entity/monster/Zombie.mapping @@ -7,20 +7,19 @@ CLASS net/minecraft/world/entity/monster/Zombie ARG 1 stack METHOD convertToZombieType (Lnet/minecraft/world/entity/EntityType;)V ARG 1 entityType - METHOD doHurtTarget (Lnet/minecraft/world/entity/Entity;)Z - ARG 1 entity + METHOD convertVillagerToZombieVillager (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/npc/Villager;)Z + ARG 1 level + ARG 2 villager METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; ARG 1 damageSource METHOD getSpawnAsBabyOdds (Lnet/minecraft/util/RandomSource;)Z ARG 0 random METHOD handleAttributes (F)V ARG 1 difficulty - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD isBaby ()Z COMMENT If Animal, checks if the age timer is negative + METHOD lambda$convertToZombieType$1 (Lnet/minecraft/world/entity/monster/Zombie;)V + ARG 0 zombie METHOD lambda$static$0 (Lnet/minecraft/world/Difficulty;)Z ARG 0 difficulty METHOD onSyncedDataUpdated (Lnet/minecraft/network/syncher/EntityDataAccessor;)V @@ -37,6 +36,10 @@ CLASS net/minecraft/world/entity/monster/Zombie METHOD setCanBreakDoors (Z)V COMMENT Sets or removes EntityAIBreakDoor task ARG 1 canBreakDoors + METHOD setConversionTime (I)V + ARG 1 conversionTime + METHOD setInWaterTime (I)V + ARG 1 inWaterTime METHOD startUnderWaterConversion (I)V ARG 1 conversionTime METHOD tick ()V diff --git a/data/net/minecraft/world/entity/monster/ZombieVillager.mapping b/data/net/minecraft/world/entity/monster/ZombieVillager.mapping index 3d6f0d08f..7440fcc52 100644 --- a/data/net/minecraft/world/entity/monster/ZombieVillager.mapping +++ b/data/net/minecraft/world/entity/monster/ZombieVillager.mapping @@ -9,6 +9,8 @@ CLASS net/minecraft/world/entity/monster/ZombieVillager COMMENT Gets the pitch of living sounds in living entities. METHOD isConverting ()Z COMMENT Returns whether this zombie is in the process of converting to a villager + METHOD lambda$finishConversion$4 (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/npc/Villager;)V + ARG 2 villager METHOD lambda$new$0 (Lnet/minecraft/core/Holder$Reference;)V ARG 1 profession METHOD lambda$readAdditionalSaveData$2 (Lnet/minecraft/world/item/trading/MerchantOffers;)V @@ -25,6 +27,8 @@ CLASS net/minecraft/world/entity/monster/ZombieVillager ARG 1 gossips METHOD setTradeOffers (Lnet/minecraft/world/item/trading/MerchantOffers;)V ARG 1 tradeOffers + METHOD setVillagerConversionTime (I)V + ARG 1 villagerConversionTime METHOD setVillagerXp (I)V ARG 1 villagerXp METHOD startConverting (Ljava/util/UUID;I)V diff --git a/data/net/minecraft/world/entity/monster/ZombifiedPiglin.mapping b/data/net/minecraft/world/entity/monster/ZombifiedPiglin.mapping index ed26f7233..a61de7849 100644 --- a/data/net/minecraft/world/entity/monster/ZombifiedPiglin.mapping +++ b/data/net/minecraft/world/entity/monster/ZombifiedPiglin.mapping @@ -3,10 +3,10 @@ CLASS net/minecraft/world/entity/monster/ZombifiedPiglin ARG 1 compound METHOD checkSpawnObstruction (Lnet/minecraft/world/level/LevelReader;)Z ARG 1 level - METHOD checkZombifiedPiglinSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 zombifiedPiglin + METHOD checkZombifiedPiglinSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; diff --git a/data/net/minecraft/world/entity/monster/breeze/BreezeUtil.mapping b/data/net/minecraft/world/entity/monster/breeze/BreezeUtil.mapping index f922848b5..dea101906 100644 --- a/data/net/minecraft/world/entity/monster/breeze/BreezeUtil.mapping +++ b/data/net/minecraft/world/entity/monster/breeze/BreezeUtil.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/world/entity/monster/breeze/BreezeUtil + METHOD getMaxLineOfSightTestRange (Lnet/minecraft/world/entity/monster/breeze/Breeze;)D + ARG 0 breeze METHOD hasLineOfSight (Lnet/minecraft/world/entity/monster/breeze/Breeze;Lnet/minecraft/world/phys/Vec3;)Z ARG 0 breeze ARG 1 pos diff --git a/data/net/minecraft/world/entity/monster/breeze/Shoot.mapping b/data/net/minecraft/world/entity/monster/breeze/Shoot.mapping index 6f4447ff2..b3e753a65 100644 --- a/data/net/minecraft/world/entity/monster/breeze/Shoot.mapping +++ b/data/net/minecraft/world/entity/monster/breeze/Shoot.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/world/entity/monster/breeze/Shoot - METHOD isFacingTarget (Lnet/minecraft/world/entity/monster/breeze/Breeze;Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 0 breeze - ARG 1 target METHOD isTargetWithinRange (Lnet/minecraft/world/entity/monster/breeze/Breeze;Lnet/minecraft/world/entity/LivingEntity;)Z ARG 0 breeze ARG 1 target diff --git a/data/net/minecraft/world/entity/monster/creaking/Creaking.mapping b/data/net/minecraft/world/entity/monster/creaking/Creaking.mapping new file mode 100644 index 000000000..b9c4bea02 --- /dev/null +++ b/data/net/minecraft/world/entity/monster/creaking/Creaking.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/world/entity/monster/creaking/Creaking + METHOD setIsActive (Z)V + ARG 1 isActive + CLASS CreakingJumpControl + METHOD (Lnet/minecraft/world/entity/monster/creaking/Creaking;Lnet/minecraft/world/entity/monster/creaking/Creaking;)V + ARG 2 creaking + CLASS CreakingLookControl + METHOD (Lnet/minecraft/world/entity/monster/creaking/Creaking;Lnet/minecraft/world/entity/monster/creaking/Creaking;)V + ARG 2 creaking + CLASS CreakingMoveControl + METHOD (Lnet/minecraft/world/entity/monster/creaking/Creaking;Lnet/minecraft/world/entity/monster/creaking/Creaking;)V + ARG 2 creaking + CLASS CreakingBodyRotationControl + METHOD (Lnet/minecraft/world/entity/monster/creaking/Creaking;Lnet/minecraft/world/entity/monster/creaking/Creaking;)V + ARG 2 creaking diff --git a/data/net/minecraft/world/entity/monster/creaking/CreakingAi.mapping b/data/net/minecraft/world/entity/monster/creaking/CreakingAi.mapping new file mode 100644 index 000000000..bc3f36142 --- /dev/null +++ b/data/net/minecraft/world/entity/monster/creaking/CreakingAi.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/world/entity/monster/creaking/CreakingAi + METHOD initCoreActivity (Lnet/minecraft/world/entity/ai/Brain;)V + ARG 0 brain + METHOD initFightActivity (Lnet/minecraft/world/entity/ai/Brain;)V + ARG 0 brain + METHOD initIdleActivity (Lnet/minecraft/world/entity/ai/Brain;)V + ARG 0 brain + METHOD lambda$initIdleActivity$0 (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/creaking/Creaking;)Z + ARG 0 level + ARG 1 creaking + METHOD lambda$initIdleActivity$1 (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/creaking/Creaking;)Ljava/util/Optional; + ARG 0 level + ARG 1 creaking + METHOD makeBrain (Lnet/minecraft/world/entity/ai/Brain;)Lnet/minecraft/world/entity/ai/Brain; + ARG 0 brain + METHOD updateActivity (Lnet/minecraft/world/entity/monster/creaking/Creaking;)V + ARG 0 creaking diff --git a/data/net/minecraft/world/entity/monster/creaking/CreakingTransient.mapping b/data/net/minecraft/world/entity/monster/creaking/CreakingTransient.mapping new file mode 100644 index 000000000..e75181273 --- /dev/null +++ b/data/net/minecraft/world/entity/monster/creaking/CreakingTransient.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/world/entity/monster/creaking/CreakingTransient + METHOD bindToCreakingHeart (Lnet/minecraft/core/BlockPos;)V + ARG 1 homePos + METHOD tearDown (Lnet/minecraft/world/damagesource/DamageSource;)V + ARG 1 damageSource + CLASS CreakingPathNavigation + METHOD (Lnet/minecraft/world/entity/monster/creaking/CreakingTransient;Lnet/minecraft/world/entity/monster/creaking/Creaking;Lnet/minecraft/world/level/Level;)V + ARG 2 creaking + ARG 3 level diff --git a/data/net/minecraft/world/entity/monster/hoglin/Hoglin.mapping b/data/net/minecraft/world/entity/monster/hoglin/Hoglin.mapping index ec739f0cf..d3b56748c 100644 --- a/data/net/minecraft/world/entity/monster/hoglin/Hoglin.mapping +++ b/data/net/minecraft/world/entity/monster/hoglin/Hoglin.mapping @@ -3,25 +3,17 @@ CLASS net/minecraft/world/entity/monster/hoglin/Hoglin ARG 1 compound METHOD blockedByShield (Lnet/minecraft/world/entity/LivingEntity;)V ARG 1 entity - METHOD checkHoglinSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 hoglin + METHOD checkHoglinSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random - METHOD doHurtTarget (Lnet/minecraft/world/entity/Entity;)Z - ARG 1 entity - METHOD finishConversion (Lnet/minecraft/server/level/ServerLevel;)V - ARG 1 serverLevel METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; ARG 1 damageSource METHOD getWalkTargetValue (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/LevelReader;)F ARG 1 pos ARG 2 level - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD isFood (Lnet/minecraft/world/item/ItemStack;)Z COMMENT Checks if the parameter is an item which this animal can be fed to breed it (wheat, carrots or seeds depending on the animal type) ARG 1 stack @@ -42,5 +34,7 @@ CLASS net/minecraft/world/entity/monster/hoglin/Hoglin ARG 1 cannotBeHunted METHOD setImmuneToZombification (Z)V ARG 1 immuneToZombification + METHOD setTimeInOverworld (I)V + ARG 1 timeInOverworld METHOD shouldDropExperience ()Z COMMENT Entity won't drop items or experience points if this returns false diff --git a/data/net/minecraft/world/entity/monster/hoglin/HoglinAi.mapping b/data/net/minecraft/world/entity/monster/hoglin/HoglinAi.mapping index f2811249f..7e939e062 100644 --- a/data/net/minecraft/world/entity/monster/hoglin/HoglinAi.mapping +++ b/data/net/minecraft/world/entity/monster/hoglin/HoglinAi.mapping @@ -5,8 +5,9 @@ CLASS net/minecraft/world/entity/monster/hoglin/HoglinAi METHOD broadcastRetreat (Lnet/minecraft/world/entity/monster/hoglin/Hoglin;Lnet/minecraft/world/entity/LivingEntity;)V ARG 0 hoglin ARG 1 target - METHOD findNearestValidAttackTarget (Lnet/minecraft/world/entity/monster/hoglin/Hoglin;)Ljava/util/Optional; - ARG 0 hoglin + METHOD findNearestValidAttackTarget (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/hoglin/Hoglin;)Ljava/util/Optional; + ARG 0 level + ARG 1 hoglin METHOD getSoundForActivity (Lnet/minecraft/world/entity/monster/hoglin/Hoglin;Lnet/minecraft/world/entity/schedule/Activity;)Lnet/minecraft/sounds/SoundEvent; ARG 0 hoglin ARG 1 activity @@ -39,9 +40,10 @@ CLASS net/minecraft/world/entity/monster/hoglin/HoglinAi ARG 1 activity METHOD makeBrain (Lnet/minecraft/world/entity/ai/Brain;)Lnet/minecraft/world/entity/ai/Brain; ARG 0 brain - METHOD maybeRetaliate (Lnet/minecraft/world/entity/monster/hoglin/Hoglin;Lnet/minecraft/world/entity/LivingEntity;)V - ARG 0 hoglin - ARG 1 livingEntity + METHOD maybeRetaliate (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/hoglin/Hoglin;Lnet/minecraft/world/entity/LivingEntity;)V + ARG 0 level + ARG 1 hoglin + ARG 2 entity METHOD onHitTarget (Lnet/minecraft/world/entity/monster/hoglin/Hoglin;Lnet/minecraft/world/entity/LivingEntity;)V ARG 0 hoglin ARG 1 target @@ -63,6 +65,7 @@ CLASS net/minecraft/world/entity/monster/hoglin/HoglinAi ARG 0 hoglin METHOD wantsToStopFleeing (Lnet/minecraft/world/entity/monster/hoglin/Hoglin;)Z ARG 0 hoglin - METHOD wasHurtBy (Lnet/minecraft/world/entity/monster/hoglin/Hoglin;Lnet/minecraft/world/entity/LivingEntity;)V - ARG 0 hoglin - ARG 1 livingEntity + METHOD wasHurtBy (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/hoglin/Hoglin;Lnet/minecraft/world/entity/LivingEntity;)V + ARG 0 level + ARG 1 hoglin + ARG 2 entity diff --git a/data/net/minecraft/world/entity/monster/hoglin/HoglinBase.mapping b/data/net/minecraft/world/entity/monster/hoglin/HoglinBase.mapping index 114c484eb..1e91c2e26 100644 --- a/data/net/minecraft/world/entity/monster/hoglin/HoglinBase.mapping +++ b/data/net/minecraft/world/entity/monster/hoglin/HoglinBase.mapping @@ -1,7 +1,8 @@ CLASS net/minecraft/world/entity/monster/hoglin/HoglinBase - METHOD hurtAndThrowTarget (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 0 hoglin - ARG 1 target + METHOD hurtAndThrowTarget (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 0 level + ARG 1 entity + ARG 2 target METHOD throwTarget (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)V ARG 0 hoglin ARG 1 target diff --git a/data/net/minecraft/world/entity/monster/piglin/AbstractPiglin.mapping b/data/net/minecraft/world/entity/monster/piglin/AbstractPiglin.mapping index 2e2b6a1de..46a267e8f 100644 --- a/data/net/minecraft/world/entity/monster/piglin/AbstractPiglin.mapping +++ b/data/net/minecraft/world/entity/monster/piglin/AbstractPiglin.mapping @@ -12,3 +12,5 @@ CLASS net/minecraft/world/entity/monster/piglin/AbstractPiglin ARG 1 compound METHOD setImmuneToZombification (Z)V ARG 1 immuneToZombification + METHOD setTimeInOverworld (I)V + ARG 1 timeInOverworld diff --git a/data/net/minecraft/world/entity/monster/piglin/Piglin.mapping b/data/net/minecraft/world/entity/monster/piglin/Piglin.mapping index 60b0ba0f6..575185f3f 100644 --- a/data/net/minecraft/world/entity/monster/piglin/Piglin.mapping +++ b/data/net/minecraft/world/entity/monster/piglin/Piglin.mapping @@ -7,13 +7,10 @@ CLASS net/minecraft/world/entity/monster/piglin/Piglin ARG 1 stack METHOD canReplaceCurrentItem (Lnet/minecraft/world/item/ItemStack;)Z ARG 1 candidate - METHOD canReplaceCurrentItem (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;)Z - ARG 1 candidate - ARG 2 existing - METHOD checkPiglinSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z - ARG 0 piglin + METHOD checkPiglinSpawnRules (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)Z + ARG 0 entityType ARG 1 level - ARG 2 spawnType + ARG 2 spawnReason ARG 3 pos ARG 4 random METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; @@ -25,10 +22,6 @@ CLASS net/minecraft/world/entity/monster/piglin/Piglin ARG 1 stack METHOD holdInOffHand (Lnet/minecraft/world/item/ItemStack;)V ARG 1 stack - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD isBaby ()Z COMMENT If Animal, checks if the age timer is negative METHOD makeBrain (Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/world/entity/ai/Brain; @@ -46,9 +39,6 @@ CLASS net/minecraft/world/entity/monster/piglin/Piglin COMMENT Attack the specified entity using a ranged attack. ARG 1 target ARG 2 distanceFactor - METHOD pickUpItem (Lnet/minecraft/world/entity/item/ItemEntity;)V - COMMENT Tests if this entity should pick up a weapon or an armor piece. Entity drops current weapon or armor if the new one is better. - ARG 1 itemEntity METHOD playStepSound (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V ARG 1 pos ARG 2 block diff --git a/data/net/minecraft/world/entity/monster/piglin/PiglinAi.mapping b/data/net/minecraft/world/entity/monster/piglin/PiglinAi.mapping index 095813102..ed88d8fe5 100644 --- a/data/net/minecraft/world/entity/monster/piglin/PiglinAi.mapping +++ b/data/net/minecraft/world/entity/monster/piglin/PiglinAi.mapping @@ -1,30 +1,35 @@ CLASS net/minecraft/world/entity/monster/piglin/PiglinAi METHOD admireGoldItem (Lnet/minecraft/world/entity/LivingEntity;)V ARG 0 piglin - METHOD angerNearbyPiglins (Lnet/minecraft/world/entity/player/Player;Z)V - ARG 0 player - ARG 1 angerOnlyIfCanSee - METHOD broadcastAngerTarget (Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;Lnet/minecraft/world/entity/LivingEntity;)V - ARG 0 piglin - ARG 1 target + METHOD angerNearbyPiglins (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/player/Player;Z)V + ARG 0 level + ARG 1 player + ARG 2 requireLineOfSight + METHOD broadcastAngerTarget (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;Lnet/minecraft/world/entity/LivingEntity;)V + ARG 0 level + ARG 1 piglin + ARG 2 angerTarget METHOD broadcastRetreat (Lnet/minecraft/world/entity/monster/piglin/Piglin;Lnet/minecraft/world/entity/LivingEntity;)V ARG 0 piglin ARG 1 target - METHOD broadcastUniversalAnger (Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;)V - ARG 0 piglin + METHOD broadcastUniversalAnger (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;)V + ARG 0 level + ARG 1 piglin METHOD canAdmire (Lnet/minecraft/world/entity/monster/piglin/Piglin;Lnet/minecraft/world/item/ItemStack;)Z ARG 0 piglin ARG 1 stack - METHOD cancelAdmiring (Lnet/minecraft/world/entity/monster/piglin/Piglin;)V - ARG 0 piglin + METHOD cancelAdmiring (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/piglin/Piglin;)V + ARG 0 level + ARG 1 piglin METHOD doesntSeeAnyPlayerHoldingLovedItem (Lnet/minecraft/world/entity/LivingEntity;)Z ARG 0 piglin METHOD dontKillAnyMoreHoglinsForAWhile (Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;)V ARG 0 piglin METHOD eat (Lnet/minecraft/world/entity/monster/piglin/Piglin;)V ARG 0 piglin - METHOD findNearestValidAttackTarget (Lnet/minecraft/world/entity/monster/piglin/Piglin;)Ljava/util/Optional; - ARG 0 piglin + METHOD findNearestValidAttackTarget (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/piglin/Piglin;)Ljava/util/Optional; + ARG 0 level + ARG 1 piglin METHOD getAdultPiglins (Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;)Ljava/util/List; ARG 0 piglin METHOD getAngerTarget (Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;)Ljava/util/Optional; @@ -50,9 +55,10 @@ CLASS net/minecraft/world/entity/monster/piglin/PiglinAi ARG 0 piglin METHOD hoglinsOutnumberPiglins (Lnet/minecraft/world/entity/monster/piglin/Piglin;)Z ARG 0 piglin - METHOD holdInOffhand (Lnet/minecraft/world/entity/monster/piglin/Piglin;Lnet/minecraft/world/item/ItemStack;)V - ARG 0 piglin - ARG 1 stack + METHOD holdInOffhand (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/piglin/Piglin;Lnet/minecraft/world/item/ItemStack;)V + ARG 0 level + ARG 1 piglin + ARG 2 stack METHOD initAdmireItemActivity (Lnet/minecraft/world/entity/ai/Brain;)V ARG 0 brain METHOD initCelebrateActivity (Lnet/minecraft/world/entity/ai/Brain;)V @@ -93,54 +99,57 @@ CLASS net/minecraft/world/entity/monster/piglin/PiglinAi ARG 0 piglin METHOD isNearZombified (Lnet/minecraft/world/entity/monster/piglin/Piglin;)Z ARG 0 piglin - METHOD isNearestValidAttackTarget (Lnet/minecraft/world/entity/monster/piglin/Piglin;Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 0 piglin - ARG 1 target + METHOD isNearestValidAttackTarget (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/piglin/Piglin;Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 0 level + ARG 1 piglin + ARG 2 target METHOD isNotHoldingLovedItemInOffHand (Lnet/minecraft/world/entity/monster/piglin/Piglin;)Z ARG 0 piglin METHOD isPlayerHoldingLovedItem (Lnet/minecraft/world/entity/LivingEntity;)Z ARG 0 player - METHOD isWearingGold (Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 0 livingEntity + METHOD isWearingSafeArmor (Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 0 entity METHOD isZombified (Lnet/minecraft/world/entity/EntityType;)Z ARG 0 entityType - METHOD lambda$angerNearbyPiglins$4 (ZLnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/entity/monster/piglin/Piglin;)Z + METHOD lambda$angerNearbyPiglins$6 (ZLnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/entity/monster/piglin/Piglin;)Z ARG 2 piglin - METHOD lambda$angerNearbyPiglins$5 (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/entity/monster/piglin/Piglin;)V - ARG 1 piglin - METHOD lambda$broadcastAngerTarget$9 (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;)V - ARG 1 adultPiglin - METHOD lambda$broadcastRetreat$12 (Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;)Z - ARG 0 adultPiglin - METHOD lambda$broadcastRetreat$13 (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;)V - ARG 1 adultPiglin - METHOD lambda$broadcastUniversalAnger$10 (Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;Lnet/minecraft/world/entity/player/Player;)V - ARG 1 player - METHOD lambda$broadcastUniversalAnger$11 (Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;)V - ARG 0 adultPiglin - METHOD lambda$getSoundForCurrentActivity$7 (Lnet/minecraft/world/entity/monster/piglin/Piglin;Lnet/minecraft/world/entity/schedule/Activity;)Lnet/minecraft/sounds/SoundEvent; - ARG 1 activity - METHOD lambda$initCelebrateActivity$1 (Lnet/minecraft/world/entity/monster/piglin/Piglin;)Z - ARG 0 piglin - METHOD lambda$initFightActivity$0 (Lnet/minecraft/world/entity/monster/piglin/Piglin;Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 1 entity - METHOD lambda$isNearestValidAttackTarget$3 (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z + METHOD lambda$angerNearbyPiglins$7 (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/entity/monster/piglin/Piglin;)V + ARG 2 piglin + METHOD lambda$babySometimesRideBabyHoglin$10 (Lnet/minecraft/world/entity/ai/behavior/SetEntityLookTargetSometimes$Ticker;Lnet/minecraft/world/entity/LivingEntity;)Z ARG 1 entity - METHOD lambda$wasHurtBy$6 (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/ai/Brain;Lnet/minecraft/world/entity/LivingEntity;)V + METHOD lambda$getSoundForCurrentActivity$9 (Lnet/minecraft/world/entity/monster/piglin/Piglin;Lnet/minecraft/world/entity/schedule/Activity;)Lnet/minecraft/sounds/SoundEvent; + ARG 1 activity + METHOD lambda$initCelebrateActivity$2 (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/piglin/Piglin;)Z + ARG 0 level + ARG 1 piglin + METHOD lambda$initCelebrateActivity$3 (Lnet/minecraft/world/entity/monster/piglin/Piglin;)Z + ARG 0 level + METHOD lambda$initFightActivity$1 (Lnet/minecraft/world/entity/monster/piglin/Piglin;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 1 level ARG 2 entity + METHOD lambda$initIdleActivity$0 (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/piglin/Piglin;)Z + ARG 0 level + ARG 1 piglin + METHOD lambda$initRideHoglinActivity$4 (Lnet/minecraft/world/entity/monster/piglin/Piglin;)Z + ARG 0 piglin + METHOD lambda$wasHurtBy$8 (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/ai/Brain;Lnet/minecraft/world/entity/LivingEntity;)V + ARG 2 avoidTarget METHOD makeBrain (Lnet/minecraft/world/entity/monster/piglin/Piglin;Lnet/minecraft/world/entity/ai/Brain;)Lnet/minecraft/world/entity/ai/Brain; ARG 0 piglin ARG 1 brain - METHOD maybeRetaliate (Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;Lnet/minecraft/world/entity/LivingEntity;)V - ARG 0 piglin - ARG 1 target - METHOD mobInteract (Lnet/minecraft/world/entity/monster/piglin/Piglin;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult; - ARG 0 piglin - ARG 1 player - ARG 2 hand - METHOD pickUpItem (Lnet/minecraft/world/entity/monster/piglin/Piglin;Lnet/minecraft/world/entity/item/ItemEntity;)V - ARG 0 piglin - ARG 1 itemEntity + METHOD maybeRetaliate (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;Lnet/minecraft/world/entity/LivingEntity;)V + ARG 0 level + ARG 1 piglin + ARG 2 entity + METHOD mobInteract (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/piglin/Piglin;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult; + ARG 0 level + ARG 1 piglin + ARG 2 player + ARG 3 hand + METHOD pickUpItem (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/piglin/Piglin;Lnet/minecraft/world/entity/item/ItemEntity;)V + ARG 0 level + ARG 1 piglin + ARG 2 itemEntity METHOD piglinsEqualOrOutnumberHoglins (Lnet/minecraft/world/entity/monster/piglin/Piglin;)Z ARG 0 piglin METHOD putInInventory (Lnet/minecraft/world/entity/monster/piglin/Piglin;Lnet/minecraft/world/item/ItemStack;)V @@ -153,21 +162,25 @@ CLASS net/minecraft/world/entity/monster/piglin/PiglinAi ARG 1 target METHOD seesPlayerHoldingLovedItem (Lnet/minecraft/world/entity/LivingEntity;)Z ARG 0 piglin - METHOD setAngerTarget (Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;Lnet/minecraft/world/entity/LivingEntity;)V - ARG 0 piglin - ARG 1 target - METHOD setAngerTargetIfCloserThanCurrent (Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;Lnet/minecraft/world/entity/LivingEntity;)V - ARG 0 piglin - ARG 1 currentTarget - METHOD setAngerTargetToNearestTargetablePlayerIfFound (Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;Lnet/minecraft/world/entity/LivingEntity;)V - ARG 0 piglin - ARG 1 currentTarget + METHOD setAngerTarget (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;Lnet/minecraft/world/entity/LivingEntity;)V + ARG 0 level + ARG 1 piglin + ARG 2 angerTarget + METHOD setAngerTargetIfCloserThanCurrent (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;Lnet/minecraft/world/entity/LivingEntity;)V + ARG 0 level + ARG 1 piglin + ARG 2 angerTarget + METHOD setAngerTargetToNearestTargetablePlayerIfFound (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;Lnet/minecraft/world/entity/LivingEntity;)V + ARG 0 level + ARG 1 piglin + ARG 2 entity METHOD setAvoidTargetAndDontHuntForAWhile (Lnet/minecraft/world/entity/monster/piglin/Piglin;Lnet/minecraft/world/entity/LivingEntity;)V ARG 0 piglin ARG 1 target - METHOD stopHoldingOffHandItem (Lnet/minecraft/world/entity/monster/piglin/Piglin;Z)V - ARG 0 piglin - ARG 1 shouldBarter + METHOD stopHoldingOffHandItem (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/piglin/Piglin;Z)V + ARG 0 level + ARG 1 piglin + ARG 2 barter METHOD stopWalking (Lnet/minecraft/world/entity/monster/piglin/Piglin;)V ARG 0 piglin METHOD throwItems (Lnet/minecraft/world/entity/monster/piglin/Piglin;Ljava/util/List;)V @@ -197,8 +210,9 @@ CLASS net/minecraft/world/entity/monster/piglin/PiglinAi METHOD wantsToStopRiding (Lnet/minecraft/world/entity/monster/piglin/Piglin;Lnet/minecraft/world/entity/Entity;)Z ARG 0 piglin ARG 1 vehicle - METHOD wasHurtBy (Lnet/minecraft/world/entity/monster/piglin/Piglin;Lnet/minecraft/world/entity/LivingEntity;)V - ARG 0 piglin - ARG 1 target + METHOD wasHurtBy (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/piglin/Piglin;Lnet/minecraft/world/entity/LivingEntity;)V + ARG 0 level + ARG 1 piglin + ARG 2 entity METHOD wasHurtRecently (Lnet/minecraft/world/entity/LivingEntity;)Z ARG 0 piglin diff --git a/data/net/minecraft/world/entity/monster/piglin/PiglinBrute.mapping b/data/net/minecraft/world/entity/monster/piglin/PiglinBrute.mapping index c040616e4..f0fee49b7 100644 --- a/data/net/minecraft/world/entity/monster/piglin/PiglinBrute.mapping +++ b/data/net/minecraft/world/entity/monster/piglin/PiglinBrute.mapping @@ -1,10 +1,6 @@ CLASS net/minecraft/world/entity/monster/piglin/PiglinBrute METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; ARG 1 damageSource - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD makeBrain (Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/world/entity/ai/Brain; ARG 1 dynamic METHOD playStepSound (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V diff --git a/data/net/minecraft/world/entity/monster/piglin/PiglinBruteAi.mapping b/data/net/minecraft/world/entity/monster/piglin/PiglinBruteAi.mapping index 87ac88dee..7e66452b9 100644 --- a/data/net/minecraft/world/entity/monster/piglin/PiglinBruteAi.mapping +++ b/data/net/minecraft/world/entity/monster/piglin/PiglinBruteAi.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/world/entity/monster/piglin/PiglinBruteAi - METHOD findNearestValidAttackTarget (Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;)Ljava/util/Optional; - ARG 0 piglinBrute - METHOD getTargetIfWithinRange (Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;Lnet/minecraft/world/entity/ai/memory/MemoryModuleType;)Ljava/util/Optional; - ARG 0 piglinBrute - ARG 1 memoryType + METHOD findNearestValidAttackTarget (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;)Ljava/util/Optional; + ARG 0 level + ARG 1 piglin METHOD initCoreActivity (Lnet/minecraft/world/entity/monster/piglin/PiglinBrute;Lnet/minecraft/world/entity/ai/Brain;)V ARG 0 piglinBrute ARG 1 brain @@ -15,16 +13,16 @@ CLASS net/minecraft/world/entity/monster/piglin/PiglinBruteAi ARG 1 brain METHOD initMemories (Lnet/minecraft/world/entity/monster/piglin/PiglinBrute;)V ARG 0 piglinBrute - METHOD isNearestValidAttackTarget (Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 0 piglinBrute - ARG 1 target - METHOD lambda$getTargetIfWithinRange$2 (Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 1 entity - METHOD lambda$initFightActivity$0 (Lnet/minecraft/world/entity/monster/piglin/PiglinBrute;Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 1 target + METHOD isNearestValidAttackTarget (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/piglin/AbstractPiglin;Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 0 level + ARG 1 piglin + ARG 2 entity + METHOD lambda$initFightActivity$0 (Lnet/minecraft/world/entity/monster/piglin/PiglinBrute;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 1 level + ARG 2 entity METHOD lambda$isNearestValidAttackTarget$1 (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z ARG 1 entity - METHOD lambda$playActivitySound$3 (Lnet/minecraft/world/entity/monster/piglin/PiglinBrute;Lnet/minecraft/world/entity/schedule/Activity;)V + METHOD lambda$playActivitySound$2 (Lnet/minecraft/world/entity/monster/piglin/PiglinBrute;Lnet/minecraft/world/entity/schedule/Activity;)V ARG 1 activity METHOD makeBrain (Lnet/minecraft/world/entity/monster/piglin/PiglinBrute;Lnet/minecraft/world/entity/ai/Brain;)Lnet/minecraft/world/entity/ai/Brain; ARG 0 piglinBrute @@ -38,6 +36,7 @@ CLASS net/minecraft/world/entity/monster/piglin/PiglinBruteAi ARG 1 angerTarget METHOD updateActivity (Lnet/minecraft/world/entity/monster/piglin/PiglinBrute;)V ARG 0 piglinBrute - METHOD wasHurtBy (Lnet/minecraft/world/entity/monster/piglin/PiglinBrute;Lnet/minecraft/world/entity/LivingEntity;)V - ARG 0 piglinBrute - ARG 1 target + METHOD wasHurtBy (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/piglin/PiglinBrute;Lnet/minecraft/world/entity/LivingEntity;)V + ARG 0 level + ARG 1 piglinBrute + ARG 2 entity diff --git a/data/net/minecraft/world/entity/monster/warden/AngerManagement.mapping b/data/net/minecraft/world/entity/monster/warden/AngerManagement.mapping index ebc32712d..57b472b2d 100644 --- a/data/net/minecraft/world/entity/monster/warden/AngerManagement.mapping +++ b/data/net/minecraft/world/entity/monster/warden/AngerManagement.mapping @@ -15,6 +15,8 @@ CLASS net/minecraft/world/entity/monster/warden/AngerManagement ARG 2 offset METHOD lambda$codec$2 (Ljava/util/function/Predicate;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 1 instance + METHOD lambda$getActiveEntity$7 (Lnet/minecraft/world/entity/Entity;)Z + ARG 0 entity METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD tick (Lnet/minecraft/server/level/ServerLevel;Ljava/util/function/Predicate;)V diff --git a/data/net/minecraft/world/entity/monster/warden/WardenAi.mapping b/data/net/minecraft/world/entity/monster/warden/WardenAi.mapping index e7b5e8f84..a70a4b377 100644 --- a/data/net/minecraft/world/entity/monster/warden/WardenAi.mapping +++ b/data/net/minecraft/world/entity/monster/warden/WardenAi.mapping @@ -19,12 +19,22 @@ CLASS net/minecraft/world/entity/monster/warden/WardenAi METHOD isTarget (Lnet/minecraft/world/entity/monster/warden/Warden;Lnet/minecraft/world/entity/LivingEntity;)Z ARG 0 warden ARG 1 entity + METHOD lambda$initFightActivity$3 (Lnet/minecraft/world/entity/monster/warden/Warden;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 1 level + ARG 2 entity + METHOD lambda$initFightActivity$4 (Lnet/minecraft/world/entity/monster/warden/Warden;Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 1 entity + METHOD lambda$isTarget$5 (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 1 attackTarget + METHOD lambda$static$2 (Lnet/minecraft/world/entity/ai/behavior/declarative/BehaviorBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD makeBrain (Lnet/minecraft/world/entity/monster/warden/Warden;Lcom/mojang/serialization/Dynamic;)Lnet/minecraft/world/entity/ai/Brain; ARG 0 warden ARG 1 ops - METHOD onTargetInvalid (Lnet/minecraft/world/entity/monster/warden/Warden;Lnet/minecraft/world/entity/LivingEntity;)V - ARG 0 warden - ARG 1 target + METHOD onTargetInvalid (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/monster/warden/Warden;Lnet/minecraft/world/entity/LivingEntity;)V + ARG 0 level + ARG 1 warden + ARG 2 target METHOD setDigCooldown (Lnet/minecraft/world/entity/LivingEntity;)V ARG 0 entity METHOD setDisturbanceLocation (Lnet/minecraft/world/entity/monster/warden/Warden;Lnet/minecraft/core/BlockPos;)V diff --git a/data/net/minecraft/world/entity/npc/InventoryCarrier.mapping b/data/net/minecraft/world/entity/npc/InventoryCarrier.mapping index c22629780..5899b0f7a 100644 --- a/data/net/minecraft/world/entity/npc/InventoryCarrier.mapping +++ b/data/net/minecraft/world/entity/npc/InventoryCarrier.mapping @@ -1,8 +1,9 @@ CLASS net/minecraft/world/entity/npc/InventoryCarrier - METHOD pickUpItem (Lnet/minecraft/world/entity/Mob;Lnet/minecraft/world/entity/npc/InventoryCarrier;Lnet/minecraft/world/entity/item/ItemEntity;)V - ARG 0 mob - ARG 1 carrier - ARG 2 itemEntity + METHOD pickUpItem (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Mob;Lnet/minecraft/world/entity/npc/InventoryCarrier;Lnet/minecraft/world/entity/item/ItemEntity;)V + ARG 0 level + ARG 1 mob + ARG 2 carrier + ARG 3 itemEntity METHOD readInventoryFromTag (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/core/HolderLookup$Provider;)V ARG 1 tag ARG 2 levelRegistry diff --git a/data/net/minecraft/world/entity/npc/Villager.mapping b/data/net/minecraft/world/entity/npc/Villager.mapping index 18611e62d..e116e0832 100644 --- a/data/net/minecraft/world/entity/npc/Villager.mapping +++ b/data/net/minecraft/world/entity/npc/Villager.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/world/entity/npc/Villager FIELD FOOD_POINTS Ljava/util/Map; COMMENT Mapping between valid food items and their respective efficiency values. - FIELD WANTED_ITEMS Ljava/util/Set; - COMMENT Defaults items a villager regardless of its profession can pick up. METHOD (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/npc/VillagerType;)V ARG 1 entityType ARG 2 level @@ -38,9 +36,6 @@ CLASS net/minecraft/world/entity/npc/Villager METHOD onReputationEventFrom (Lnet/minecraft/world/entity/ai/village/ReputationEventType;Lnet/minecraft/world/entity/Entity;)V ARG 1 type ARG 2 target - METHOD pickUpItem (Lnet/minecraft/world/entity/item/ItemEntity;)V - COMMENT Tests if this entity should pick up a weapon or an armor piece. Entity drops current weapon or armor if the new one is better. - ARG 1 itemEntity METHOD readAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V COMMENT (abstract) Protected helper method to read subclass entity data from NBT. ARG 1 compound @@ -54,8 +49,6 @@ CLASS net/minecraft/world/entity/npc/Villager ARG 1 distanceToClosestPlayer METHOD rewardTradeXp (Lnet/minecraft/world/item/trading/MerchantOffer;)V ARG 1 offer - METHOD setChasing (Z)V - ARG 1 chasing METHOD setGossips (Lnet/minecraft/nbt/Tag;)V ARG 1 gossip METHOD setLastHurtByMob (Lnet/minecraft/world/entity/LivingEntity;)V diff --git a/data/net/minecraft/world/entity/npc/WanderingTrader.mapping b/data/net/minecraft/world/entity/npc/WanderingTrader.mapping index 0345b1ab7..a24f10226 100644 --- a/data/net/minecraft/world/entity/npc/WanderingTrader.mapping +++ b/data/net/minecraft/world/entity/npc/WanderingTrader.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/world/entity/npc/WanderingTrader METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound - METHOD getDrinkingSound (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/sounds/SoundEvent; - ARG 1 stack METHOD getHurtSound (Lnet/minecraft/world/damagesource/DamageSource;)Lnet/minecraft/sounds/SoundEvent; ARG 1 damageSource METHOD getTradeUpdatedSound (Z)Lnet/minecraft/sounds/SoundEvent; diff --git a/data/net/minecraft/world/entity/player/Inventory.mapping b/data/net/minecraft/world/entity/player/Inventory.mapping index 00640a32d..9e179b466 100644 --- a/data/net/minecraft/world/entity/player/Inventory.mapping +++ b/data/net/minecraft/world/entity/player/Inventory.mapping @@ -25,15 +25,17 @@ CLASS net/minecraft/world/entity/player/Inventory METHOD contains (Lnet/minecraft/world/item/ItemStack;)Z COMMENT Returns {@code true} if the specified {@link net.minecraft.world.item.ItemStack} exists in the inventory. ARG 1 stack + METHOD createInventoryUpdatePacket (I)Lnet/minecraft/network/protocol/game/ClientboundSetPlayerInventoryPacket; + ARG 1 slot METHOD dropAll ()V COMMENT Drop all armor and main inventory items. - METHOD fillStackedContents (Lnet/minecraft/world/entity/player/StackedContents;)V - ARG 1 stackedContent + METHOD fillStackedContents (Lnet/minecraft/world/entity/player/StackedItemContents;)V + ARG 1 contents + METHOD findSlotMatchingCraftingIngredient (Lnet/minecraft/core/Holder;)I + ARG 1 ingredient METHOD findSlotMatchingItem (Lnet/minecraft/world/item/ItemStack;)I COMMENT Finds the stack or an equivalent one in the main inventory ARG 1 stack - METHOD findSlotMatchingUnusedItem (Lnet/minecraft/world/item/ItemStack;)I - ARG 1 stack METHOD getArmor (I)Lnet/minecraft/world/item/ItemStack; COMMENT @return a player armor item (as an {@code ItemStack}) contained in specified armor slot ARG 1 slot @@ -58,6 +60,8 @@ CLASS net/minecraft/world/entity/player/Inventory ARG 2 origin METHOD isHotbarSlot (I)Z ARG 0 index + METHOD isUsableForCrafting (Lnet/minecraft/world/item/ItemStack;)Z + ARG 0 stack METHOD load (Lnet/minecraft/nbt/ListTag;)V COMMENT Reads from the given tag list and fills the slots in the inventory with the correct items. ARG 1 listTag @@ -94,11 +98,10 @@ CLASS net/minecraft/world/entity/player/Inventory ARG 2 stack METHOD setPickedItem (Lnet/minecraft/world/item/ItemStack;)V ARG 1 stack + METHOD setSelectedHotbarSlot (I)V + ARG 1 selectedHotbarSlot METHOD stillValid (Lnet/minecraft/world/entity/player/Player;)Z COMMENT Don't rename this method to canInteractWith due to conflicts with Container ARG 1 player - METHOD swapPaint (D)V - COMMENT Change the selected item in the hotbar after a mouse scroll. Select the slot to the left if {@code direction} is positive, or to the right if negative. - ARG 1 direction METHOD tick ()V COMMENT Ticks every item in inventory. Used for animations. Is called on client and server. diff --git a/data/net/minecraft/world/entity/player/Player.mapping b/data/net/minecraft/world/entity/player/Player.mapping index 4c35cb219..ab817fe03 100644 --- a/data/net/minecraft/world/entity/player/Player.mapping +++ b/data/net/minecraft/world/entity/player/Player.mapping @@ -6,10 +6,6 @@ CLASS net/minecraft/world/entity/player/Player ARG 2 pos ARG 3 yRot ARG 4 gameProfile - METHOD actuallyHurt (Lnet/minecraft/world/damagesource/DamageSource;F)V - COMMENT Deals damage to the entity. This will take the armor of the entity into consideration before damaging the health bar. - ARG 1 damageSrc - ARG 2 damageAmount METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound METHOD addItem (Lnet/minecraft/world/item/ItemStack;)Z @@ -58,8 +54,6 @@ CLASS net/minecraft/world/entity/player/Player ARG 2 distance METHOD canPlayerFitWithinBlocksAndEntitiesWhen (Lnet/minecraft/world/entity/Pose;)Z ARG 1 pose - METHOD canTakeItem (Lnet/minecraft/world/item/ItemStack;)Z - ARG 1 itemstack METHOD causeFoodExhaustion (F)V COMMENT Increases exhaustion level by the supplied amount. ARG 1 exhaustion @@ -73,6 +67,8 @@ CLASS net/minecraft/world/entity/player/Player METHOD die (Lnet/minecraft/world/damagesource/DamageSource;)V COMMENT Called when the mob's health reaches 0. ARG 1 cause + METHOD disableShield (Lnet/minecraft/world/item/ItemStack;)V + ARG 1 stack METHOD displayClientMessage (Lnet/minecraft/network/chat/Component;Z)V ARG 1 chatComponent ARG 2 actionBar @@ -127,12 +123,12 @@ CLASS net/minecraft/world/entity/player/Player ARG 1 levels METHOD giveExperiencePoints (I)V ARG 1 xpPoints + METHOD handleCreativeModeItemDrop (Lnet/minecraft/world/item/ItemStack;)V + ARG 1 stack METHOD hasCorrectToolForDrops (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 state - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount + METHOD hasPermissions (I)Z + ARG 1 permissionLevel METHOD hurtArmor (Lnet/minecraft/world/damagesource/DamageSource;F)V ARG 1 damageSource ARG 2 damage @@ -148,13 +144,12 @@ CLASS net/minecraft/world/entity/player/Player ARG 1 maxUpStep METHOD isAlwaysExperienceDropper ()Z COMMENT Only use is to identify if class is an instance of player for experience dropping + METHOD isEquipped (Lnet/minecraft/world/item/Item;)Z + ARG 1 item METHOD isHurt ()Z COMMENT Checks if the player's health is not full and not zero. METHOD isImmobile ()Z COMMENT Dead and sleeping entities cannot move - METHOD isInvulnerableTo (Lnet/minecraft/world/damagesource/DamageSource;)Z - COMMENT Returns whether this Entity is invulnerable to the given DamageSource. - ARG 1 source METHOD isLocalPlayer ()Z COMMENT Returns whether this is a {@link net.minecraft.client.player.LocalPlayer}. METHOD isModelPartShown (Lnet/minecraft/world/entity/player/PlayerModelPart;)Z @@ -165,12 +160,18 @@ CLASS net/minecraft/world/entity/player/Player COMMENT Returns whether the player is asleep and the screen has fully faded. METHOD isSpectator ()Z COMMENT Returns {@code true} if the player is in spectator mode. - METHOD jumpFromGround ()V - COMMENT Causes this entity to do an upwards motion (jumping). + METHOD lambda$addAdditionalSaveData$3 (Lnet/minecraft/core/GlobalPos;)Ljava/util/Optional; + ARG 0 pos + METHOD lambda$decorateDisplayNameComponent$6 (Ljava/lang/String;Lnet/minecraft/network/chat/Style;)Lnet/minecraft/network/chat/Style; + ARG 2 style METHOD lambda$playShoulderEntityAmbientSound$0 (Lnet/minecraft/world/entity/EntityType;)Z ARG 0 entityType + METHOD lambda$playShoulderEntityAmbientSound$1 (Lnet/minecraft/world/entity/EntityType;)V + ARG 1 entityType METHOD lambda$readAdditionalSaveData$2 (Lnet/minecraft/world/phys/Vec3;)V ARG 1 currentImpulseImpactPos + METHOD lambda$respawnEntityOnShoulder$5 (Lnet/minecraft/world/entity/Entity;)V + ARG 1 entity METHOD magicCrit (Lnet/minecraft/world/entity/Entity;)V COMMENT Called when the entity hit is dealt extra melee damage due to an enchantment. ARG 1 entityHit diff --git a/data/net/minecraft/world/entity/player/StackedContents.mapping b/data/net/minecraft/world/entity/player/StackedContents.mapping index c7329c139..28de311d9 100644 --- a/data/net/minecraft/world/entity/player/StackedContents.mapping +++ b/data/net/minecraft/world/entity/player/StackedContents.mapping @@ -1,76 +1,86 @@ CLASS net/minecraft/world/entity/player/StackedContents - METHOD accountSimpleStack (Lnet/minecraft/world/item/ItemStack;)V - ARG 1 stack - METHOD accountStack (Lnet/minecraft/world/item/ItemStack;)V - ARG 1 stack - METHOD accountStack (Lnet/minecraft/world/item/ItemStack;I)V - ARG 1 stack + METHOD account (Ljava/lang/Object;I)V + ARG 1 item ARG 2 amount - METHOD canCraft (Lnet/minecraft/world/item/crafting/Recipe;Lit/unimi/dsi/fastutil/ints/IntList;)Z - ARG 1 recipe - ARG 2 stackingIndexList - METHOD canCraft (Lnet/minecraft/world/item/crafting/Recipe;Lit/unimi/dsi/fastutil/ints/IntList;I)Z - ARG 1 recipe - ARG 2 stackingIndexList - ARG 3 amount - METHOD fromStackingIndex (I)Lnet/minecraft/world/item/ItemStack; - ARG 0 stackingIndex - METHOD getBiggestCraftableStack (Lnet/minecraft/world/item/crafting/RecipeHolder;ILit/unimi/dsi/fastutil/ints/IntList;)I - ARG 1 recipe + METHOD hasAnyAmount (Ljava/lang/Object;)Z + ARG 1 item + METHOD hasAtLeast (Ljava/lang/Object;I)Z + ARG 1 item ARG 2 amount - ARG 3 stackingIndexList - METHOD getBiggestCraftableStack (Lnet/minecraft/world/item/crafting/RecipeHolder;Lit/unimi/dsi/fastutil/ints/IntList;)I - ARG 1 recipe - ARG 2 stackingIndexList - METHOD getStackingIndex (Lnet/minecraft/world/item/ItemStack;)I - ARG 0 stack - METHOD has (I)Z - ARG 1 stackingIndex - METHOD put (II)V - ARG 1 stackingIndex - ARG 2 increment - METHOD take (II)I - ARG 1 stackingIndex + METHOD put (Ljava/lang/Object;I)V + ARG 1 item ARG 2 amount + METHOD take (Ljava/lang/Object;I)V + ARG 1 item + ARG 2 amount + METHOD tryPick (Ljava/util/List;ILnet/minecraft/world/entity/player/StackedContents$Output;)Z + ARG 1 ingredients + ARG 2 amount + ARG 3 output + METHOD tryPickAll (Ljava/util/List;ILnet/minecraft/world/entity/player/StackedContents$Output;)I + ARG 1 ingredients + ARG 2 amount + ARG 3 output + CLASS Output + METHOD accept (Ljava/lang/Object;)V + ARG 1 item CLASS RecipePicker - METHOD (Lnet/minecraft/world/entity/player/StackedContents;Lnet/minecraft/world/item/crafting/Recipe;)V - ARG 2 recipe - METHOD dfs (I)Z + METHOD (Lnet/minecraft/world/entity/player/StackedContents;Ljava/util/List;)V + ARG 2 ingredients + METHOD assign (II)V + ARG 1 itemIndex + ARG 2 ingredientIndex + METHOD clearRange (II)V + ARG 1 offset + ARG 2 count + METHOD findNewItemAssignmentPath (I)Lit/unimi/dsi/fastutil/ints/IntList; ARG 1 amount - METHOD getIndex (ZII)I - ARG 1 isIngredientPath - ARG 2 stackingIndex - ARG 3 pathIndex + METHOD getConnectionIndex (II)I + ARG 1 itemIndex + ARG 2 ingredientIndex + METHOD getResidualIndex (II)I + ARG 1 itemIndex + ARG 2 ingredientIndex METHOD getSatisfiedIndex (I)I ARG 1 stackingIndex - METHOD getVisitedIndex (ZI)I - ARG 1 isIngredientPath - ARG 2 pathIndex - METHOD hasConnection (ZII)Z - ARG 1 isIngredientPath - ARG 2 stackingIndex - ARG 3 pathIndex - METHOD hasResidual (ZII)Z - ARG 1 isIngredientPath - ARG 2 stackingIndex - ARG 3 pathIndex - METHOD hasVisited (ZI)Z - ARG 1 isIngredientPath - ARG 2 pathIndex + METHOD getVisitedIngredientIndex (I)I + ARG 1 ingredientIndex + METHOD getVisitiedItemIndex (I)I + ARG 1 itemIndex + METHOD hasConnection (II)Z + ARG 1 itemIndex + ARG 2 ingredientIndex + METHOD hasVisitedIngredient (I)Z + ARG 1 ingredientIndex + METHOD hasVisitedItem (I)Z + ARG 1 itemIndex + METHOD isAssigned (II)Z + ARG 1 itemIndex + ARG 2 ingredientIndex + METHOD isPathIndexItem (I)Z + ARG 0 index METHOD isSatisfied (I)Z ARG 1 stackingIndex + METHOD setConnection (II)V + ARG 1 itemIndex + ARG 2 ingredientIndex METHOD setSatisfied (I)V ARG 1 stackingIndex - METHOD toggleResidual (ZII)V - ARG 1 isIngredientPath - ARG 2 stackingIndex - ARG 3 pathIndex - METHOD tryPick (ILit/unimi/dsi/fastutil/ints/IntList;)Z + METHOD tryAssigningNewItem (I)Lit/unimi/dsi/fastutil/ints/IntList; + ARG 1 amount + METHOD tryPick (ILnet/minecraft/world/entity/player/StackedContents$Output;)Z ARG 1 amount - ARG 2 stackingIndexList - METHOD tryPickAll (ILit/unimi/dsi/fastutil/ints/IntList;)I + ARG 2 output + METHOD tryPickAll (ILnet/minecraft/world/entity/player/StackedContents$Output;)I ARG 1 amount - ARG 2 stackingIndexList - METHOD visit (ZI)V - ARG 1 isIngredientPath - ARG 2 pathIndex + ARG 2 output + METHOD unassign (II)V + ARG 1 itemIndex + ARG 2 ingredientIndex + METHOD visitIngredient (I)V + ARG 1 ingredientIndex + METHOD visitItem (I)V + ARG 1 itemIndex + CLASS IngredientInfo + METHOD (Ljava/util/List;)V + ARG 1 allowedItems diff --git a/data/net/minecraft/world/entity/player/StackedItemContents.mapping b/data/net/minecraft/world/entity/player/StackedItemContents.mapping new file mode 100644 index 000000000..4a7df15b5 --- /dev/null +++ b/data/net/minecraft/world/entity/player/StackedItemContents.mapping @@ -0,0 +1,31 @@ +CLASS net/minecraft/world/entity/player/StackedItemContents + METHOD accountSimpleStack (Lnet/minecraft/world/item/ItemStack;)V + ARG 1 stack + METHOD accountStack (Lnet/minecraft/world/item/ItemStack;)V + ARG 1 stack + METHOD accountStack (Lnet/minecraft/world/item/ItemStack;I)V + ARG 1 stack + ARG 2 maxStackSize + METHOD canCraft (Ljava/util/List;ILnet/minecraft/world/entity/player/StackedContents$Output;)Z + ARG 1 ingredients + ARG 2 maxCount + ARG 3 output + METHOD canCraft (Ljava/util/List;Lnet/minecraft/world/entity/player/StackedContents$Output;)Z + ARG 1 ingredients + ARG 2 output + METHOD canCraft (Lnet/minecraft/world/item/crafting/Recipe;ILnet/minecraft/world/entity/player/StackedContents$Output;)Z + ARG 1 recipe + ARG 2 maxCount + ARG 3 output + METHOD canCraft (Lnet/minecraft/world/item/crafting/Recipe;Lnet/minecraft/world/entity/player/StackedContents$Output;)Z + ARG 1 recipe + ARG 2 output + METHOD convertIngredientContents (Ljava/util/stream/Stream;)Lnet/minecraft/world/entity/player/StackedContents$IngredientInfo; + ARG 0 items + METHOD getBiggestCraftableStack (Lnet/minecraft/world/item/crafting/Recipe;ILnet/minecraft/world/entity/player/StackedContents$Output;)I + ARG 1 recipe + ARG 2 maxCount + ARG 3 output + METHOD getBiggestCraftableStack (Lnet/minecraft/world/item/crafting/Recipe;Lnet/minecraft/world/entity/player/StackedContents$Output;)I + ARG 1 recipe + ARG 2 output diff --git a/data/net/minecraft/world/entity/projectile/AbstractArrow.mapping b/data/net/minecraft/world/entity/projectile/AbstractArrow.mapping index 908fa5dff..bafa70e65 100644 --- a/data/net/minecraft/world/entity/projectile/AbstractArrow.mapping +++ b/data/net/minecraft/world/entity/projectile/AbstractArrow.mapping @@ -15,6 +15,8 @@ CLASS net/minecraft/world/entity/projectile/AbstractArrow ARG 5 firedFromWeapon METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound + METHOD addBubbleParticles (Lnet/minecraft/world/phys/Vec3;)V + ARG 1 pos METHOD doKnockback (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/damagesource/DamageSource;)V ARG 1 entity ARG 2 damageSource @@ -36,6 +38,8 @@ CLASS net/minecraft/world/entity/projectile/AbstractArrow COMMENT Whether the arrow has a stream of critical hit particles flying behind it. METHOD isNoPhysics ()Z COMMENT Whether the arrow can noClip + METHOD lambda$hitBlockEnchantmentEffects$0 (Lnet/minecraft/world/item/Item;)V + ARG 1 item METHOD lerpMotion (DDD)V COMMENT Updates the entity motion clientside, called by packets from the server ARG 1 x @@ -63,6 +67,8 @@ CLASS net/minecraft/world/entity/projectile/AbstractArrow METHOD setFlag (IZ)V ARG 1 id ARG 2 value + METHOD setInGround (Z)V + ARG 1 inGround METHOD setNoPhysics (Z)V COMMENT Sets if this arrow can noClip ARG 1 noPhysics @@ -81,11 +87,11 @@ CLASS net/minecraft/world/entity/projectile/AbstractArrow ARG 5 z ARG 7 velocity ARG 8 inaccuracy - METHOD shotFromCrossbow ()Z - COMMENT Whether the arrow was shot from a crossbow. METHOD shouldRenderAtSqrDistance (D)Z COMMENT Checks if the entity is in range to render. ARG 1 distance + METHOD stepMoveAndHit (Lnet/minecraft/world/phys/BlockHitResult;)V + ARG 1 hitResult METHOD tick ()V COMMENT Called to update the entity's position/logic. METHOD tryPickup (Lnet/minecraft/world/entity/player/Player;)Z diff --git a/data/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.mapping b/data/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.mapping index 8a7c1e4b2..f82a0cc76 100644 --- a/data/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.mapping +++ b/data/net/minecraft/world/entity/projectile/AbstractHurtingProjectile.mapping @@ -24,10 +24,6 @@ CLASS net/minecraft/world/entity/projectile/AbstractHurtingProjectile ARG 2 accelerationPower METHOD getInertia ()F COMMENT Return the motion factor for this projectile. The factor is multiplied by the original motion. - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD readAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V COMMENT (abstract) Protected helper method to read subclass entity data from NBT. ARG 1 compound diff --git a/data/net/minecraft/world/entity/projectile/DragonFireball.mapping b/data/net/minecraft/world/entity/projectile/DragonFireball.mapping index 131b698a4..40c94f0ae 100644 --- a/data/net/minecraft/world/entity/projectile/DragonFireball.mapping +++ b/data/net/minecraft/world/entity/projectile/DragonFireball.mapping @@ -3,10 +3,6 @@ CLASS net/minecraft/world/entity/projectile/DragonFireball ARG 1 level ARG 2 owner ARG 3 movement - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD onHit (Lnet/minecraft/world/phys/HitResult;)V COMMENT Called when this EntityFireball hits a block or entity. ARG 1 result diff --git a/data/net/minecraft/world/entity/projectile/FireworkRocketEntity.mapping b/data/net/minecraft/world/entity/projectile/FireworkRocketEntity.mapping index d5af919a3..509938cdd 100644 --- a/data/net/minecraft/world/entity/projectile/FireworkRocketEntity.mapping +++ b/data/net/minecraft/world/entity/projectile/FireworkRocketEntity.mapping @@ -33,6 +33,10 @@ CLASS net/minecraft/world/entity/projectile/FireworkRocketEntity ARG 3 shooter METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound + METHOD dealExplosionDamage (Lnet/minecraft/server/level/ServerLevel;)V + ARG 1 level + METHOD explode (Lnet/minecraft/server/level/ServerLevel;)V + ARG 1 level METHOD isAttackable ()Z COMMENT Returns {@code true} if it's possible to attack this entity with an item. METHOD lambda$tick$0 (I)V diff --git a/data/net/minecraft/world/entity/projectile/FishingHook.mapping b/data/net/minecraft/world/entity/projectile/FishingHook.mapping index 5685b3eb4..b93400ebc 100644 --- a/data/net/minecraft/world/entity/projectile/FishingHook.mapping +++ b/data/net/minecraft/world/entity/projectile/FishingHook.mapping @@ -4,11 +4,12 @@ CLASS net/minecraft/world/entity/projectile/FishingHook ARG 2 level ARG 3 luck ARG 4 lureSpeed - METHOD (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/level/Level;II)V + METHOD (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/level/Level;IILnet/minecraft/world/item/ItemStack;)V ARG 1 player ARG 2 level ARG 3 luck ARG 4 lureSpeed + ARG 5 spawnedFrom METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound METHOD calculateOpenWater (Lnet/minecraft/core/BlockPos;)Z diff --git a/data/net/minecraft/world/entity/projectile/Projectile.mapping b/data/net/minecraft/world/entity/projectile/Projectile.mapping index 18fd308e7..e153869e9 100644 --- a/data/net/minecraft/world/entity/projectile/Projectile.mapping +++ b/data/net/minecraft/world/entity/projectile/Projectile.mapping @@ -1,6 +1,9 @@ CLASS net/minecraft/world/entity/projectile/Projectile METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound + METHOD applyOnProjectileSpawned (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/ItemStack;)V + ARG 1 level + ARG 2 spawnedFrom METHOD calculateHorizontalHurtKnockbackDirection (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/damagesource/DamageSource;)Lit/unimi/dsi/fastutil/doubles/DoubleDoubleImmutablePair; ARG 1 entity ARG 2 damageSource @@ -11,6 +14,8 @@ CLASS net/minecraft/world/entity/projectile/Projectile ARG 2 entity ARG 3 owner ARG 4 deflectedByPlayer + METHOD findOwner (Ljava/util/UUID;)Lnet/minecraft/world/entity/Entity; + ARG 1 entityUuid METHOD getMovementToShoot (DDDFF)Lnet/minecraft/world/phys/Vec3; ARG 1 x ARG 3 y @@ -19,8 +24,14 @@ CLASS net/minecraft/world/entity/projectile/Projectile ARG 8 inaccuracy METHOD hitTargetOrDeflectSelf (Lnet/minecraft/world/phys/HitResult;)Lnet/minecraft/world/entity/projectile/ProjectileDeflection; ARG 1 hitResult - METHOD lambda$checkLeftOwner$0 (Lnet/minecraft/world/entity/Entity;)Z - ARG 0 entity + METHOD lambda$applyOnProjectileSpawned$5 (Lnet/minecraft/world/item/Item;)V + ARG 0 item + METHOD lambda$checkLeftOwner$0 (Lnet/minecraft/world/phys/AABB;Lnet/minecraft/world/entity/Entity;)Z + ARG 1 entity + METHOD lambda$spawnProjectileFromRotation$1 (Lnet/minecraft/world/entity/LivingEntity;FFFLnet/minecraft/world/entity/projectile/Projectile;)V + ARG 4 projectlie + METHOD lambda$spawnProjectileUsingShoot$2 (DDDFFLnet/minecraft/world/entity/projectile/Projectile;)V + ARG 8 projectile METHOD lerpMotion (DDD)V COMMENT Updates the entity motion clientside, called by packets from the server ARG 1 x @@ -29,7 +40,7 @@ CLASS net/minecraft/world/entity/projectile/Projectile METHOD lerpRotation (FF)F ARG 0 currentRotation ARG 1 targetRotation - METHOD mayBreak (Lnet/minecraft/world/level/Level;)Z + METHOD mayBreak (Lnet/minecraft/server/level/ServerLevel;)Z ARG 1 level METHOD onDeflection (Lnet/minecraft/world/entity/Entity;Z)V ARG 1 entity @@ -42,6 +53,8 @@ CLASS net/minecraft/world/entity/projectile/Projectile METHOD onHitEntity (Lnet/minecraft/world/phys/EntityHitResult;)V COMMENT Called when the arrow hits an entity ARG 1 result + METHOD onItemBreak (Lnet/minecraft/world/item/Item;)V + ARG 1 item METHOD ownedBy (Lnet/minecraft/world/entity/Entity;)Z ARG 1 entity METHOD readAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V @@ -49,6 +62,8 @@ CLASS net/minecraft/world/entity/projectile/Projectile ARG 1 compound METHOD setOwner (Lnet/minecraft/world/entity/Entity;)V ARG 1 owner + METHOD setOwnerThroughUUID (Ljava/util/UUID;)V + ARG 1 uuid METHOD shoot (DDDFF)V COMMENT Similar to setArrowHeading, it's point the throwable entity to a x, y, z direction. ARG 1 x @@ -63,5 +78,46 @@ CLASS net/minecraft/world/entity/projectile/Projectile ARG 4 z ARG 5 velocity ARG 6 inaccuracy + METHOD spawnProjectile (Lnet/minecraft/world/entity/projectile/Projectile;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/entity/projectile/Projectile; + ARG 0 projectile + ARG 1 level + ARG 2 spawnedFrom + METHOD spawnProjectile (Lnet/minecraft/world/entity/projectile/Projectile;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/ItemStack;Ljava/util/function/Consumer;)Lnet/minecraft/world/entity/projectile/Projectile; + ARG 0 projectile + ARG 1 level + ARG 2 stack + ARG 3 adapter + METHOD spawnProjectileFromRotation (Lnet/minecraft/world/entity/projectile/Projectile$ProjectileFactory;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/LivingEntity;FFF)Lnet/minecraft/world/entity/projectile/Projectile; + ARG 0 factory + ARG 1 level + ARG 2 spawnedFrom + ARG 3 owner + ARG 4 z + ARG 5 velocity + ARG 6 innaccuracy + METHOD spawnProjectileUsingShoot (Lnet/minecraft/world/entity/projectile/Projectile$ProjectileFactory;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/LivingEntity;DDDFF)Lnet/minecraft/world/entity/projectile/Projectile; + ARG 0 factory + ARG 1 level + ARG 2 spawnedFrom + ARG 3 owner + ARG 4 x + ARG 6 y + ARG 8 z + ARG 10 velocity + ARG 11 inaccuracy + METHOD spawnProjectileUsingShoot (Lnet/minecraft/world/entity/projectile/Projectile;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/ItemStack;DDDFF)Lnet/minecraft/world/entity/projectile/Projectile; + ARG 0 projectile + ARG 1 level + ARG 2 spawnedFrom + ARG 3 x + ARG 5 y + ARG 7 z + ARG 9 velocity + ARG 10 inaccuracy METHOD tick ()V COMMENT Called to update the entity's position/logic. + CLASS ProjectileFactory + METHOD create (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/entity/projectile/Projectile; + ARG 1 level + ARG 2 owner + ARG 3 spawnedFrom diff --git a/data/net/minecraft/world/entity/projectile/ShulkerBullet.mapping b/data/net/minecraft/world/entity/projectile/ShulkerBullet.mapping index 5ef7642b9..9fafb6fc5 100644 --- a/data/net/minecraft/world/entity/projectile/ShulkerBullet.mapping +++ b/data/net/minecraft/world/entity/projectile/ShulkerBullet.mapping @@ -8,10 +8,6 @@ CLASS net/minecraft/world/entity/projectile/ShulkerBullet ARG 1 compound METHOD checkDespawn ()V COMMENT Makes the entity despawn if requirements are reached - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD isOnFire ()Z COMMENT Returns {@code true} if the entity is on fire. Used by render to add the fire effect on rendering. METHOD isPickable ()Z diff --git a/data/net/minecraft/world/entity/projectile/SmallFireball.mapping b/data/net/minecraft/world/entity/projectile/SmallFireball.mapping index c1ad731e4..49de692ce 100644 --- a/data/net/minecraft/world/entity/projectile/SmallFireball.mapping +++ b/data/net/minecraft/world/entity/projectile/SmallFireball.mapping @@ -9,10 +9,6 @@ CLASS net/minecraft/world/entity/projectile/SmallFireball ARG 1 level ARG 2 owner ARG 3 movement - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD onHit (Lnet/minecraft/world/phys/HitResult;)V COMMENT Called when this EntityFireball hits a block or entity. ARG 1 result diff --git a/data/net/minecraft/world/entity/projectile/Snowball.mapping b/data/net/minecraft/world/entity/projectile/Snowball.mapping index a3a9fe6fd..f7594995f 100644 --- a/data/net/minecraft/world/entity/projectile/Snowball.mapping +++ b/data/net/minecraft/world/entity/projectile/Snowball.mapping @@ -1,12 +1,14 @@ CLASS net/minecraft/world/entity/projectile/Snowball - METHOD (Lnet/minecraft/world/level/Level;DDD)V + METHOD (Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/item/ItemStack;)V ARG 1 level ARG 2 x ARG 4 y ARG 6 z - METHOD (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;)V + ARG 8 item + METHOD (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;)V ARG 1 level - ARG 2 shooter + ARG 2 owner + ARG 3 item METHOD onHit (Lnet/minecraft/world/phys/HitResult;)V COMMENT Called when this EntityFireball hits a block or entity. ARG 1 result diff --git a/data/net/minecraft/world/entity/projectile/ThrowableItemProjectile.mapping b/data/net/minecraft/world/entity/projectile/ThrowableItemProjectile.mapping index d112303a6..831722500 100644 --- a/data/net/minecraft/world/entity/projectile/ThrowableItemProjectile.mapping +++ b/data/net/minecraft/world/entity/projectile/ThrowableItemProjectile.mapping @@ -1,4 +1,16 @@ CLASS net/minecraft/world/entity/projectile/ThrowableItemProjectile + METHOD (Lnet/minecraft/world/entity/EntityType;DDDLnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;)V + ARG 1 entityType + ARG 2 x + ARG 4 y + ARG 6 z + ARG 8 level + ARG 9 item + METHOD (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;)V + ARG 1 entityType + ARG 2 owner + ARG 3 level + ARG 4 item METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound METHOD readAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V diff --git a/data/net/minecraft/world/entity/projectile/ThrowableProjectile.mapping b/data/net/minecraft/world/entity/projectile/ThrowableProjectile.mapping index 78c8513e0..e300f1891 100644 --- a/data/net/minecraft/world/entity/projectile/ThrowableProjectile.mapping +++ b/data/net/minecraft/world/entity/projectile/ThrowableProjectile.mapping @@ -5,10 +5,6 @@ CLASS net/minecraft/world/entity/projectile/ThrowableProjectile ARG 4 y ARG 6 z ARG 8 level - METHOD (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/level/Level;)V - ARG 1 entityType - ARG 2 shooter - ARG 3 level METHOD shouldRenderAtSqrDistance (D)Z COMMENT Checks if the entity is in range to render. ARG 1 distance diff --git a/data/net/minecraft/world/entity/projectile/ThrownEgg.mapping b/data/net/minecraft/world/entity/projectile/ThrownEgg.mapping index e9f4451e3..22f8fd069 100644 --- a/data/net/minecraft/world/entity/projectile/ThrownEgg.mapping +++ b/data/net/minecraft/world/entity/projectile/ThrownEgg.mapping @@ -1,12 +1,14 @@ CLASS net/minecraft/world/entity/projectile/ThrownEgg - METHOD (Lnet/minecraft/world/level/Level;DDD)V + METHOD (Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/item/ItemStack;)V ARG 1 level ARG 2 x ARG 4 y ARG 6 z - METHOD (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;)V + ARG 8 item + METHOD (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;)V ARG 1 level - ARG 2 shooter + ARG 2 owner + ARG 3 item METHOD onHit (Lnet/minecraft/world/phys/HitResult;)V COMMENT Called when this EntityFireball hits a block or entity. ARG 1 result diff --git a/data/net/minecraft/world/entity/projectile/ThrownEnderpearl.mapping b/data/net/minecraft/world/entity/projectile/ThrownEnderpearl.mapping index d24644545..813db9d7e 100644 --- a/data/net/minecraft/world/entity/projectile/ThrownEnderpearl.mapping +++ b/data/net/minecraft/world/entity/projectile/ThrownEnderpearl.mapping @@ -1,7 +1,8 @@ CLASS net/minecraft/world/entity/projectile/ThrownEnderpearl - METHOD (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;)V + METHOD (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;)V ARG 1 level - ARG 2 shooter + ARG 2 owner + ARG 3 item METHOD isAllowedToTeleportOwner (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/level/Level;)Z ARG 0 entity ARG 1 level diff --git a/data/net/minecraft/world/entity/projectile/ThrownExperienceBottle.mapping b/data/net/minecraft/world/entity/projectile/ThrownExperienceBottle.mapping index b397a855e..19efdb099 100644 --- a/data/net/minecraft/world/entity/projectile/ThrownExperienceBottle.mapping +++ b/data/net/minecraft/world/entity/projectile/ThrownExperienceBottle.mapping @@ -1,12 +1,14 @@ CLASS net/minecraft/world/entity/projectile/ThrownExperienceBottle - METHOD (Lnet/minecraft/world/level/Level;DDD)V + METHOD (Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/item/ItemStack;)V ARG 1 level ARG 2 x ARG 4 y ARG 6 z - METHOD (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;)V + ARG 8 item + METHOD (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;)V ARG 1 level - ARG 2 shooter + ARG 2 owner + ARG 3 item METHOD onHit (Lnet/minecraft/world/phys/HitResult;)V COMMENT Called when this EntityFireball hits a block or entity. ARG 1 result diff --git a/data/net/minecraft/world/entity/projectile/ThrownPotion.mapping b/data/net/minecraft/world/entity/projectile/ThrownPotion.mapping index 71a603ec7..e0b18501b 100644 --- a/data/net/minecraft/world/entity/projectile/ThrownPotion.mapping +++ b/data/net/minecraft/world/entity/projectile/ThrownPotion.mapping @@ -1,17 +1,24 @@ CLASS net/minecraft/world/entity/projectile/ThrownPotion - METHOD (Lnet/minecraft/world/level/Level;DDD)V + METHOD (Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/item/ItemStack;)V ARG 1 level ARG 2 x ARG 4 y ARG 6 z - METHOD (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;)V + ARG 8 item + METHOD (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;)V + ARG 1 level + ARG 2 owner + ARG 3 item + METHOD applySplash (Lnet/minecraft/server/level/ServerLevel;Ljava/lang/Iterable;Lnet/minecraft/world/entity/Entity;)V + ARG 1 level + ARG 2 effects + ARG 3 entity + METHOD applyWater (Lnet/minecraft/server/level/ServerLevel;)V ARG 1 level - ARG 2 shooter - METHOD applySplash (Ljava/lang/Iterable;Lnet/minecraft/world/entity/Entity;)V - ARG 1 effects - ARG 2 entity METHOD dowseFire (Lnet/minecraft/core/BlockPos;)V ARG 1 pos + METHOD lambda$static$0 (Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 0 entity METHOD makeAreaOfEffectCloud (Lnet/minecraft/world/item/alchemy/PotionContents;)V ARG 1 potionContents METHOD onHit (Lnet/minecraft/world/phys/HitResult;)V diff --git a/data/net/minecraft/world/entity/projectile/WitherSkull.mapping b/data/net/minecraft/world/entity/projectile/WitherSkull.mapping index 4c71dda8f..ff3cbad01 100644 --- a/data/net/minecraft/world/entity/projectile/WitherSkull.mapping +++ b/data/net/minecraft/world/entity/projectile/WitherSkull.mapping @@ -13,10 +13,6 @@ CLASS net/minecraft/world/entity/projectile/WitherSkull ARG 6 explosionPower METHOD getInertia ()F COMMENT Return the motion factor for this projectile. The factor is multiplied by the original motion. - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD isDangerous ()Z COMMENT Return whether this skull comes from an invulnerable (aura) wither boss. METHOD isOnFire ()Z diff --git a/data/net/minecraft/world/entity/raid/Raid.mapping b/data/net/minecraft/world/entity/raid/Raid.mapping index 5fef33db2..136f168a8 100644 --- a/data/net/minecraft/world/entity/raid/Raid.mapping +++ b/data/net/minecraft/world/entity/raid/Raid.mapping @@ -17,36 +17,29 @@ CLASS net/minecraft/world/entity/raid/Raid ARG 1 wave ARG 2 raider ARG 3 isRecruited - METHOD findRandomSpawnPos (II)Lnet/minecraft/core/BlockPos; - ARG 1 offsetMultiplier - ARG 2 maxTry + METHOD findRandomSpawnPos (I)Lnet/minecraft/core/BlockPos; + ARG 1 attempts METHOD getDefaultNumSpawns (Lnet/minecraft/world/entity/raid/Raid$RaiderType;IZ)I ARG 1 raiderType ARG 2 wave ARG 3 shouldSpawnBonusGroup METHOD getLeader (I)Lnet/minecraft/world/entity/raid/Raider; ARG 1 wave - METHOD getLeaderBannerInstance (Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/world/item/ItemStack; - ARG 0 patternRegistry METHOD getNumGroups (Lnet/minecraft/world/Difficulty;)I ARG 1 difficulty + METHOD getOminousBannerInstance (Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/world/item/ItemStack; + ARG 0 patternRegistry METHOD getPotentialBonusSpawns (Lnet/minecraft/world/entity/raid/Raid$RaiderType;Lnet/minecraft/util/RandomSource;ILnet/minecraft/world/DifficultyInstance;Z)I ARG 1 raiderType ARG 2 random ARG 3 wave ARG 4 difficulty ARG 5 shouldSpawnBonusGroup - METHOD getValidSpawnPos (I)Ljava/util/Optional; - ARG 1 offsetMultiplier METHOD joinRaid (ILnet/minecraft/world/entity/raid/Raider;Lnet/minecraft/core/BlockPos;Z)V ARG 1 wave ARG 2 raider ARG 3 pos ARG 4 isRecruited - METHOD lambda$addWaveMob$2 (Ljava/lang/Integer;)Ljava/util/Set; - ARG 0 value - METHOD lambda$moveRaidCenterToNearbyVillageSection$1 (Lnet/minecraft/core/BlockPos;)D - ARG 1 pos METHOD lambda$validPlayer$0 (Lnet/minecraft/server/level/ServerPlayer;)Z ARG 1 player METHOD playSound (Lnet/minecraft/core/BlockPos;)V diff --git a/data/net/minecraft/world/entity/raid/Raider.mapping b/data/net/minecraft/world/entity/raid/Raider.mapping index f37f95b05..ad282acb8 100644 --- a/data/net/minecraft/world/entity/raid/Raider.mapping +++ b/data/net/minecraft/world/entity/raid/Raider.mapping @@ -8,15 +8,8 @@ CLASS net/minecraft/world/entity/raid/Raider METHOD die (Lnet/minecraft/world/damagesource/DamageSource;)V COMMENT Called when the mob's health reaches 0. ARG 1 cause - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD lambda$static$0 (Lnet/minecraft/world/entity/item/ItemEntity;)Z ARG 0 item - METHOD pickUpItem (Lnet/minecraft/world/entity/item/ItemEntity;)V - COMMENT Tests if this entity should pick up a weapon or an armor piece. Entity drops current weapon or armor if the new one is better. - ARG 1 itemEntity METHOD readAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V COMMENT (abstract) Protected helper method to read subclass entity data from NBT. ARG 1 compound diff --git a/data/net/minecraft/world/entity/vehicle/AbstractBoat.mapping b/data/net/minecraft/world/entity/vehicle/AbstractBoat.mapping new file mode 100644 index 000000000..10e214190 --- /dev/null +++ b/data/net/minecraft/world/entity/vehicle/AbstractBoat.mapping @@ -0,0 +1,37 @@ +CLASS net/minecraft/world/entity/vehicle/AbstractBoat + METHOD (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/Level;Ljava/util/function/Supplier;)V + ARG 1 entityType + ARG 2 level + ARG 3 dropItem + METHOD canVehicleCollide (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/entity/Entity;)Z + ARG 0 first + ARG 1 second + METHOD clampRotation (Lnet/minecraft/world/entity/Entity;)V + ARG 1 entity + METHOD getBubbleAngle (F)F + ARG 1 partialTick + METHOD getPaddleState (I)Z + ARG 1 side + METHOD getRowingTime (IF)F + ARG 1 side + ARG 2 partialTick + METHOD hasEnoughSpaceFor (Lnet/minecraft/world/entity/Entity;)Z + ARG 1 entity + METHOD lambda$tickBubbleColumn$0 (Lnet/minecraft/world/entity/Entity;)Z + ARG 0 entity + METHOD rideHeight (Lnet/minecraft/world/entity/EntityDimensions;)D + ARG 1 dimensions + METHOD setBubbleTime (I)V + ARG 1 bubbleTime + METHOD setInitialPos (DDD)V + ARG 1 x + ARG 3 y + ARG 5 z + METHOD setInput (ZZZZ)V + ARG 1 left + ARG 2 right + ARG 3 up + ARG 4 down + METHOD setPaddleState (ZZ)V + ARG 1 left + ARG 2 right diff --git a/data/net/minecraft/world/entity/vehicle/ChestBoat.mapping b/data/net/minecraft/world/entity/vehicle/AbstractChestBoat.mapping similarity index 59% rename from data/net/minecraft/world/entity/vehicle/ChestBoat.mapping rename to data/net/minecraft/world/entity/vehicle/AbstractChestBoat.mapping index 7cd0c9073..555779268 100644 --- a/data/net/minecraft/world/entity/vehicle/ChestBoat.mapping +++ b/data/net/minecraft/world/entity/vehicle/AbstractChestBoat.mapping @@ -1,3 +1,3 @@ -CLASS net/minecraft/world/entity/vehicle/ChestBoat +CLASS net/minecraft/world/entity/vehicle/AbstractChestBoat METHOD unpackLootTable (Lnet/minecraft/world/entity/player/Player;)V ARG 1 player diff --git a/data/net/minecraft/world/entity/vehicle/AbstractMinecart.mapping b/data/net/minecraft/world/entity/vehicle/AbstractMinecart.mapping index 19779d0cc..1fb2c37a0 100644 --- a/data/net/minecraft/world/entity/vehicle/AbstractMinecart.mapping +++ b/data/net/minecraft/world/entity/vehicle/AbstractMinecart.mapping @@ -13,37 +13,31 @@ CLASS net/minecraft/world/entity/vehicle/AbstractMinecart ARG 4 powered METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound + METHOD applyNaturalSlowdown (Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/world/phys/Vec3; + ARG 1 speed METHOD canCollideWith (Lnet/minecraft/world/entity/Entity;)Z ARG 1 entity - METHOD comeOffTrack ()V - COMMENT Moves a minecart that is not attached to a rail - METHOD createMinecart (Lnet/minecraft/server/level/ServerLevel;DDDLnet/minecraft/world/entity/vehicle/AbstractMinecart$Type;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/player/Player;)Lnet/minecraft/world/entity/vehicle/AbstractMinecart; + METHOD comeOffTrack (Lnet/minecraft/server/level/ServerLevel;)V + ARG 1 level + METHOD createMinecart (Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/player/Player;)Lnet/minecraft/world/entity/vehicle/AbstractMinecart; ARG 0 level ARG 1 x ARG 3 y ARG 5 z ARG 7 type - ARG 8 stack - ARG 9 player + ARG 8 spawnReason + ARG 9 spawnedFrom + ARG 10 player METHOD exits (Lnet/minecraft/world/level/block/state/properties/RailShape;)Lcom/mojang/datafixers/util/Pair; ARG 0 shape - METHOD getBoundingBoxForCulling ()Lnet/minecraft/world/phys/AABB; - COMMENT Gets the bounding box of this Entity, adjusted to take auxiliary entities into account (e.g. the tile contained by a minecart, such as a command block). METHOD getDismountLocationForPassenger (Lnet/minecraft/world/entity/LivingEntity;)Lnet/minecraft/world/phys/Vec3; ARG 1 livingEntity - METHOD getMaxSpeed ()D - COMMENT Gets the maximum speed for a minecart + METHOD getMaxSpeed (Lnet/minecraft/server/level/ServerLevel;)D + ARG 1 level METHOD getMotionDirection ()Lnet/minecraft/core/Direction; COMMENT Gets the horizontal facing direction of this Entity, adjusted to take specially-treated entity types into account. - METHOD getPos (DDD)Lnet/minecraft/world/phys/Vec3; - ARG 1 x - ARG 3 y - ARG 5 z - METHOD getPosOffs (DDDD)Lnet/minecraft/world/phys/Vec3; - ARG 1 x - ARG 3 y - ARG 5 z - ARG 7 offset + METHOD getRedstoneDirection (Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/phys/Vec3; + ARG 1 pos METHOD isPickable ()Z COMMENT Returns {@code true} if other Entities should be prevented from moving through this Entity. METHOD isPushable ()Z @@ -59,12 +53,19 @@ CLASS net/minecraft/world/entity/vehicle/AbstractMinecart ARG 1 x ARG 3 y ARG 5 z - METHOD moveAlongTrack (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V + METHOD makeStepAlongTrack (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/properties/RailShape;D)D ARG 1 pos - ARG 2 state + ARG 2 railShape + ARG 3 speed + METHOD moveAlongTrack (Lnet/minecraft/server/level/ServerLevel;)V + ARG 1 level METHOD push (Lnet/minecraft/world/entity/Entity;)V COMMENT Applies a velocity to the entities, to push them away from each other. ARG 1 entity + METHOD pushOtherMinecart (Lnet/minecraft/world/entity/vehicle/AbstractMinecart;DD)V + ARG 1 otherMinecart + ARG 2 deltaX + ARG 4 deltaZ METHOD readAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V COMMENT (abstract) Protected helper method to read subclass entity data from NBT. ARG 1 compound @@ -74,5 +75,15 @@ CLASS net/minecraft/world/entity/vehicle/AbstractMinecart ARG 1 displayState METHOD setDisplayOffset (I)V ARG 1 displayOffset + METHOD setFlipped (Z)V + ARG 1 flipped + METHOD setInitialPos (DDD)V + ARG 1 x + ARG 3 y + ARG 5 z + METHOD setOnRails (Z)V + ARG 1 onRails METHOD tick ()V COMMENT Called to update the entity's position/logic. + METHOD useExperimentalMovement (Lnet/minecraft/world/level/Level;)Z + ARG 0 level diff --git a/data/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.mapping b/data/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.mapping index 7f39cb3b6..e1cce14ac 100644 --- a/data/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.mapping +++ b/data/net/minecraft/world/entity/vehicle/AbstractMinecartContainer.mapping @@ -1,17 +1,9 @@ CLASS net/minecraft/world/entity/vehicle/AbstractMinecartContainer - METHOD (Lnet/minecraft/world/entity/EntityType;DDDLnet/minecraft/world/level/Level;)V - ARG 1 entityType - ARG 2 x - ARG 4 y - ARG 6 z - ARG 8 level METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound METHOD createMenu (ILnet/minecraft/world/entity/player/Inventory;)Lnet/minecraft/world/inventory/AbstractContainerMenu; ARG 1 containerId ARG 2 playerInventory - METHOD destroy (Lnet/minecraft/world/damagesource/DamageSource;)V - ARG 1 source METHOD getItem (I)Lnet/minecraft/world/item/ItemStack; COMMENT Returns the stack in the given slot. ARG 1 index diff --git a/data/net/minecraft/world/entity/vehicle/Boat.mapping b/data/net/minecraft/world/entity/vehicle/Boat.mapping deleted file mode 100644 index 084ad54cd..000000000 --- a/data/net/minecraft/world/entity/vehicle/Boat.mapping +++ /dev/null @@ -1,85 +0,0 @@ -CLASS net/minecraft/world/entity/vehicle/Boat - METHOD (Lnet/minecraft/world/level/Level;DDD)V - ARG 1 level - ARG 2 x - ARG 4 y - ARG 6 z - METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V - ARG 1 compound - METHOD canAddPassenger (Lnet/minecraft/world/entity/Entity;)Z - ARG 1 passenger - METHOD canCollideWith (Lnet/minecraft/world/entity/Entity;)Z - ARG 1 entity - METHOD canVehicleCollide (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/entity/Entity;)Z - ARG 0 vehicle - ARG 1 entity - METHOD checkFallDamage (DZLnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;)V - ARG 1 y - ARG 3 onGround - ARG 4 state - ARG 5 pos - METHOD clampRotation (Lnet/minecraft/world/entity/Entity;)V - COMMENT Applies this boat's yaw to the given entity. Used to update the orientation of its passenger. - ARG 1 entityToUpdate - METHOD floatBoat ()V - COMMENT Update the boat's speed, based on momentum. - METHOD getBubbleAngle (F)F - ARG 1 partialTicks - METHOD getDismountLocationForPassenger (Lnet/minecraft/world/entity/LivingEntity;)Lnet/minecraft/world/phys/Vec3; - ARG 1 livingEntity - METHOD getGroundFriction ()F - COMMENT Decides how much the boat should be gliding on the land (based on any slippery blocks) - METHOD getMotionDirection ()Lnet/minecraft/core/Direction; - COMMENT Gets the horizontal facing direction of this Entity, adjusted to take specially-treated entity types into account. - METHOD getPaddleState (I)Z - ARG 1 side - METHOD getRowingTime (IF)F - ARG 1 side - ARG 2 limbSwing - METHOD getStatus ()Lnet/minecraft/world/entity/vehicle/Boat$Status; - COMMENT Determines whether the boat is in water, gliding on land, or in air - METHOD hasEnoughSpaceFor (Lnet/minecraft/world/entity/Entity;)Z - ARG 1 entity - METHOD interact (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult; - ARG 1 player - ARG 2 hand - METHOD isPickable ()Z - COMMENT Returns {@code true} if other Entities should be prevented from moving through this Entity. - METHOD isPushable ()Z - COMMENT Returns {@code true} if this entity should push and be pushed by other entities when colliding. - METHOD isUnderwater ()Lnet/minecraft/world/entity/vehicle/Boat$Status; - COMMENT Decides whether the boat is currently underwater. - METHOD lambda$tickBubbleColumn$0 (Lnet/minecraft/world/entity/Entity;)Z - ARG 0 entity - METHOD onAboveBubbleCol (Z)V - ARG 1 downwards - METHOD onPassengerTurned (Lnet/minecraft/world/entity/Entity;)V - COMMENT Applies this entity's orientation (pitch/yaw) to another entity. Used to update passenger orientation. - ARG 1 entityToUpdate - METHOD push (Lnet/minecraft/world/entity/Entity;)V - COMMENT Applies a velocity to the entities, to push them away from each other. - ARG 1 entity - METHOD readAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V - COMMENT (abstract) Protected helper method to read subclass entity data from NBT. - ARG 1 compound - METHOD setBubbleTime (I)V - ARG 1 bubbleTime - METHOD setInput (ZZZZ)V - ARG 1 inputLeft - ARG 2 inputRight - ARG 3 inputUp - ARG 4 inputDown - METHOD setPaddleState (ZZ)V - ARG 1 left - ARG 2 right - METHOD tick ()V - COMMENT Called to update the entity's position/logic. - CLASS Type - METHOD (Ljava/lang/String;ILnet/minecraft/world/level/block/Block;Ljava/lang/String;)V - ARG 3 planks - ARG 4 name - METHOD byId (I)Lnet/minecraft/world/entity/vehicle/Boat$Type; - COMMENT Get a boat type by its enum ordinal - ARG 0 id - METHOD byName (Ljava/lang/String;)Lnet/minecraft/world/entity/vehicle/Boat$Type; - ARG 0 name diff --git a/data/net/minecraft/world/entity/vehicle/ContainerEntity.mapping b/data/net/minecraft/world/entity/vehicle/ContainerEntity.mapping index b175e9a37..f209bb739 100644 --- a/data/net/minecraft/world/entity/vehicle/ContainerEntity.mapping +++ b/data/net/minecraft/world/entity/vehicle/ContainerEntity.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/world/entity/vehicle/ContainerEntity METHOD addChestVehicleSaveData (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/core/HolderLookup$Provider;)V ARG 1 tag ARG 2 levelRegistry - METHOD chestVehicleDestroyed (Lnet/minecraft/world/damagesource/DamageSource;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/Entity;)V + METHOD chestVehicleDestroyed (Lnet/minecraft/world/damagesource/DamageSource;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;)V ARG 1 damageSource ARG 2 level ARG 3 entity @@ -25,9 +25,9 @@ CLASS net/minecraft/world/entity/vehicle/ContainerEntity METHOD setChestVehicleItem (ILnet/minecraft/world/item/ItemStack;)V ARG 1 slot ARG 2 stack - METHOD setLootTable (Lnet/minecraft/resources/ResourceKey;)V + METHOD setContainerLootTable (Lnet/minecraft/resources/ResourceKey;)V ARG 1 lootTable - METHOD setLootTableSeed (J)V + METHOD setContainerLootTableSeed (J)V ARG 1 lootTableSeed METHOD unpackChestVehicleLootTable (Lnet/minecraft/world/entity/player/Player;)V ARG 1 player diff --git a/data/net/minecraft/world/entity/vehicle/Minecart.mapping b/data/net/minecraft/world/entity/vehicle/Minecart.mapping index 13f05c2eb..c4c7e0ab7 100644 --- a/data/net/minecraft/world/entity/vehicle/Minecart.mapping +++ b/data/net/minecraft/world/entity/vehicle/Minecart.mapping @@ -1,9 +1,4 @@ CLASS net/minecraft/world/entity/vehicle/Minecart - METHOD (Lnet/minecraft/world/level/Level;DDD)V - ARG 1 level - ARG 2 x - ARG 4 y - ARG 6 z METHOD activateMinecart (IIIZ)V COMMENT Called every tick the minecart is on an activator rail. ARG 1 x diff --git a/data/net/minecraft/world/entity/vehicle/MinecartBehavior.mapping b/data/net/minecraft/world/entity/vehicle/MinecartBehavior.mapping new file mode 100644 index 000000000..c3ebcb66b --- /dev/null +++ b/data/net/minecraft/world/entity/vehicle/MinecartBehavior.mapping @@ -0,0 +1,40 @@ +CLASS net/minecraft/world/entity/vehicle/MinecartBehavior + METHOD (Lnet/minecraft/world/entity/vehicle/AbstractMinecart;)V + ARG 1 minecart + METHOD getKnownMovement (Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/world/phys/Vec3; + ARG 1 movement + METHOD getMaxSpeed (Lnet/minecraft/server/level/ServerLevel;)D + ARG 1 level + METHOD lerpMotion (DDD)V + ARG 1 x + ARG 3 y + ARG 5 z + METHOD lerpTo (DDDFFI)V + ARG 1 x + ARG 3 y + ARG 5 z + ARG 7 yRot + ARG 8 xRot + ARG 9 steps + METHOD moveAlongTrack (Lnet/minecraft/server/level/ServerLevel;)V + ARG 1 level + METHOD setDeltaMovement (DDD)V + ARG 1 x + ARG 3 y + ARG 5 z + METHOD setDeltaMovement (Lnet/minecraft/world/phys/Vec3;)V + ARG 1 deltaMovement + METHOD setPos (DDD)V + ARG 1 x + ARG 3 y + ARG 5 z + METHOD setPos (Lnet/minecraft/world/phys/Vec3;)V + ARG 1 pos + METHOD setXRot (F)V + ARG 1 xRot + METHOD setYRot (F)V + ARG 1 yRot + METHOD stepAlongTrack (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/properties/RailShape;D)D + ARG 1 pos + ARG 2 railShape + ARG 3 speed diff --git a/data/net/minecraft/world/entity/vehicle/MinecartChest.mapping b/data/net/minecraft/world/entity/vehicle/MinecartChest.mapping index 6c5fd3ff5..6e8d11778 100644 --- a/data/net/minecraft/world/entity/vehicle/MinecartChest.mapping +++ b/data/net/minecraft/world/entity/vehicle/MinecartChest.mapping @@ -1,9 +1,4 @@ CLASS net/minecraft/world/entity/vehicle/MinecartChest - METHOD (Lnet/minecraft/world/level/Level;DDD)V - ARG 1 level - ARG 2 x - ARG 4 y - ARG 6 z METHOD createMenu (ILnet/minecraft/world/entity/player/Inventory;)Lnet/minecraft/world/inventory/AbstractContainerMenu; ARG 1 id ARG 2 playerInventory diff --git a/data/net/minecraft/world/entity/vehicle/MinecartCommandBlock.mapping b/data/net/minecraft/world/entity/vehicle/MinecartCommandBlock.mapping index 53f032fa4..7f8bb8409 100644 --- a/data/net/minecraft/world/entity/vehicle/MinecartCommandBlock.mapping +++ b/data/net/minecraft/world/entity/vehicle/MinecartCommandBlock.mapping @@ -1,11 +1,6 @@ CLASS net/minecraft/world/entity/vehicle/MinecartCommandBlock FIELD lastActivated I COMMENT Cooldown before command block logic runs again in ticks - METHOD (Lnet/minecraft/world/level/Level;DDD)V - ARG 1 level - ARG 2 x - ARG 4 y - ARG 6 z METHOD activateMinecart (IIIZ)V COMMENT Called every tick the minecart is on an activator rail. ARG 1 x diff --git a/data/net/minecraft/world/entity/vehicle/MinecartFurnace.mapping b/data/net/minecraft/world/entity/vehicle/MinecartFurnace.mapping index cad924e79..509724dba 100644 --- a/data/net/minecraft/world/entity/vehicle/MinecartFurnace.mapping +++ b/data/net/minecraft/world/entity/vehicle/MinecartFurnace.mapping @@ -1,21 +1,11 @@ CLASS net/minecraft/world/entity/vehicle/MinecartFurnace - FIELD INGREDIENT Lnet/minecraft/world/item/crafting/Ingredient; - COMMENT The fuel item used to make the minecart move. - METHOD (Lnet/minecraft/world/level/Level;DDD)V - ARG 1 level - ARG 2 x - ARG 4 y - ARG 6 z METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound - METHOD getMaxSpeed ()D - COMMENT Gets the maximum speed for a minecart + METHOD calculateNewPushAlong (Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/world/phys/Vec3; + ARG 1 speed METHOD interact (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult; ARG 1 player ARG 2 hand - METHOD moveAlongTrack (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V - ARG 1 pos - ARG 2 state METHOD readAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V COMMENT (abstract) Protected helper method to read subclass entity data from NBT. ARG 1 compound diff --git a/data/net/minecraft/world/entity/vehicle/MinecartHopper.mapping b/data/net/minecraft/world/entity/vehicle/MinecartHopper.mapping index 80ee074d2..eb8a66117 100644 --- a/data/net/minecraft/world/entity/vehicle/MinecartHopper.mapping +++ b/data/net/minecraft/world/entity/vehicle/MinecartHopper.mapping @@ -1,9 +1,4 @@ CLASS net/minecraft/world/entity/vehicle/MinecartHopper - METHOD (Lnet/minecraft/world/level/Level;DDD)V - ARG 1 level - ARG 2 x - ARG 4 y - ARG 6 z METHOD activateMinecart (IIIZ)V COMMENT Called every tick the minecart is on an activator rail. ARG 1 x diff --git a/data/net/minecraft/world/entity/vehicle/MinecartSpawner.mapping b/data/net/minecraft/world/entity/vehicle/MinecartSpawner.mapping index 2dfdd7242..70ddada5c 100644 --- a/data/net/minecraft/world/entity/vehicle/MinecartSpawner.mapping +++ b/data/net/minecraft/world/entity/vehicle/MinecartSpawner.mapping @@ -1,9 +1,4 @@ CLASS net/minecraft/world/entity/vehicle/MinecartSpawner - METHOD (Lnet/minecraft/world/level/Level;DDD)V - ARG 1 level - ARG 2 x - ARG 4 y - ARG 6 z METHOD addAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 compound METHOD createTicker (Lnet/minecraft/world/level/Level;)Ljava/lang/Runnable; diff --git a/data/net/minecraft/world/entity/vehicle/MinecartTNT.mapping b/data/net/minecraft/world/entity/vehicle/MinecartTNT.mapping index e87fd71c0..ab1bfa705 100644 --- a/data/net/minecraft/world/entity/vehicle/MinecartTNT.mapping +++ b/data/net/minecraft/world/entity/vehicle/MinecartTNT.mapping @@ -1,9 +1,4 @@ CLASS net/minecraft/world/entity/vehicle/MinecartTNT - METHOD (Lnet/minecraft/world/level/Level;DDD)V - ARG 1 level - ARG 2 x - ARG 4 y - ARG 6 z METHOD activateMinecart (IIIZ)V COMMENT Called every tick the minecart is on an activator rail. ARG 1 x @@ -14,8 +9,6 @@ CLASS net/minecraft/world/entity/vehicle/MinecartTNT ARG 1 compound METHOD damageSourceIgnitesTnt (Lnet/minecraft/world/damagesource/DamageSource;)Z ARG 0 source - METHOD destroy (Lnet/minecraft/world/damagesource/DamageSource;)V - ARG 1 source METHOD explode (D)V COMMENT Makes the minecart explode. ARG 1 radiusModifier @@ -32,10 +25,6 @@ CLASS net/minecraft/world/entity/vehicle/MinecartTNT ARG 6 explosionPower METHOD getFuse ()I COMMENT Gets the remaining fuse time in ticks. - METHOD hurt (Lnet/minecraft/world/damagesource/DamageSource;F)Z - COMMENT Called when the entity is attacked. - ARG 1 source - ARG 2 amount METHOD isPrimed ()Z COMMENT Returns {@code true} if the TNT minecart is ignited. METHOD primeFuse ()V diff --git a/data/net/minecraft/world/entity/vehicle/NewMinecartBehavior.mapping b/data/net/minecraft/world/entity/vehicle/NewMinecartBehavior.mapping new file mode 100644 index 000000000..eb492203b --- /dev/null +++ b/data/net/minecraft/world/entity/vehicle/NewMinecartBehavior.mapping @@ -0,0 +1,47 @@ +CLASS net/minecraft/world/entity/vehicle/NewMinecartBehavior + METHOD adjustToRails (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Z)V + ARG 1 pos + ARG 2 state + ARG 3 snapToStart + METHOD calculateBoostTrackSpeed (Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/phys/Vec3; + ARG 1 speed + ARG 2 pos + ARG 3 state + METHOD calculateHaltTrackSpeed (Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/phys/Vec3; + ARG 1 speed + ARG 2 state + METHOD calculatePlayerInputSpeed (Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/world/phys/Vec3; + ARG 1 speed + METHOD calculateSlopeSpeed (Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/level/block/state/properties/RailShape;)Lnet/minecraft/world/phys/Vec3; + ARG 1 speed + ARG 2 railShape + METHOD calculateTrackSpeed (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/entity/vehicle/NewMinecartBehavior$TrackIteration;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/properties/RailShape;)Lnet/minecraft/world/phys/Vec3; + ARG 1 level + ARG 2 speed + ARG 3 trackIteration + ARG 4 pos + ARG 5 state + ARG 6 railShape + METHOD getCartLerpMovements (F)Lnet/minecraft/world/phys/Vec3; + ARG 1 partialTick + METHOD getCartLerpPosition (F)Lnet/minecraft/world/phys/Vec3; + ARG 1 partialTick + METHOD getCartLerpXRot (F)F + ARG 1 partialTick + METHOD getCartLerpYRot (F)F + ARG 1 partialTick + METHOD getCurrentLerpStep (F)Lnet/minecraft/world/entity/vehicle/NewMinecartBehavior$StepPartialTicks; + ARG 1 partialTick + METHOD isDecending (Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/level/block/state/properties/RailShape;)Z + ARG 1 speed + ARG 2 railShape + METHOD pickupEntities (Lnet/minecraft/world/phys/AABB;)Z + ARG 1 box + METHOD pushEntities (Lnet/minecraft/world/phys/AABB;)Z + ARG 1 box + METHOD restAtVShape (Lnet/minecraft/world/level/block/state/properties/RailShape;Lnet/minecraft/world/level/block/state/properties/RailShape;)Z + ARG 1 shape1 + ARG 2 shape2 + METHOD setRotation (FF)V + ARG 1 yRot + ARG 2 xRot diff --git a/data/net/minecraft/world/entity/vehicle/OldMinecartBehavior.mapping b/data/net/minecraft/world/entity/vehicle/OldMinecartBehavior.mapping new file mode 100644 index 000000000..06ded898c --- /dev/null +++ b/data/net/minecraft/world/entity/vehicle/OldMinecartBehavior.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/world/entity/vehicle/OldMinecartBehavior + METHOD getPos (DDD)Lnet/minecraft/world/phys/Vec3; + ARG 1 x + ARG 3 y + ARG 5 z + METHOD getPosOffs (DDDD)Lnet/minecraft/world/phys/Vec3; + ARG 1 x + ARG 3 y + ARG 5 z + ARG 7 scale diff --git a/data/net/minecraft/world/entity/vehicle/VehicleEntity.mapping b/data/net/minecraft/world/entity/vehicle/VehicleEntity.mapping index 2b0df074a..5e7d65b75 100644 --- a/data/net/minecraft/world/entity/vehicle/VehicleEntity.mapping +++ b/data/net/minecraft/world/entity/vehicle/VehicleEntity.mapping @@ -1,8 +1,10 @@ CLASS net/minecraft/world/entity/vehicle/VehicleEntity - METHOD destroy (Lnet/minecraft/world/damagesource/DamageSource;)V - ARG 1 source - METHOD destroy (Lnet/minecraft/world/item/Item;)V - ARG 1 dropItem + METHOD destroy (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/damagesource/DamageSource;)V + ARG 1 level + ARG 2 damageSource + METHOD destroy (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/Item;)V + ARG 1 level + ARG 2 dropItem METHOD setDamage (F)V ARG 1 damage METHOD setHurtDir (I)V diff --git a/data/net/minecraft/world/food/FoodData.mapping b/data/net/minecraft/world/food/FoodData.mapping index 584e0fa17..1f76f50d1 100644 --- a/data/net/minecraft/world/food/FoodData.mapping +++ b/data/net/minecraft/world/food/FoodData.mapping @@ -23,12 +23,9 @@ CLASS net/minecraft/world/food/FoodData METHOD readAdditionalSaveData (Lnet/minecraft/nbt/CompoundTag;)V COMMENT Reads the food data for the player. ARG 1 compoundTag - METHOD setExhaustion (F)V - ARG 1 exhaustionLevel METHOD setFoodLevel (I)V ARG 1 foodLevel METHOD setSaturation (F)V ARG 1 saturationLevel - METHOD tick (Lnet/minecraft/world/entity/player/Player;)V - COMMENT Handles the food game logic. + METHOD tick (Lnet/minecraft/server/level/ServerPlayer;)V ARG 1 player diff --git a/data/net/minecraft/world/food/FoodProperties.mapping b/data/net/minecraft/world/food/FoodProperties.mapping index 7bbab2888..54e063785 100644 --- a/data/net/minecraft/world/food/FoodProperties.mapping +++ b/data/net/minecraft/world/food/FoodProperties.mapping @@ -2,15 +2,7 @@ CLASS net/minecraft/world/food/FoodProperties METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance CLASS Builder - METHOD effect (Lnet/minecraft/world/effect/MobEffectInstance;F)Lnet/minecraft/world/food/FoodProperties$Builder; - ARG 1 effect - ARG 2 probability METHOD nutrition (I)Lnet/minecraft/world/food/FoodProperties$Builder; ARG 1 nutrition METHOD saturationModifier (F)Lnet/minecraft/world/food/FoodProperties$Builder; ARG 1 saturationModifier - METHOD usingConvertsTo (Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/food/FoodProperties$Builder; - ARG 1 item - CLASS PossibleEffect - METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance diff --git a/data/net/minecraft/world/inventory/AbstractContainerMenu.mapping b/data/net/minecraft/world/inventory/AbstractContainerMenu.mapping index 92b9836af..be121c030 100644 --- a/data/net/minecraft/world/inventory/AbstractContainerMenu.mapping +++ b/data/net/minecraft/world/inventory/AbstractContainerMenu.mapping @@ -6,11 +6,23 @@ CLASS net/minecraft/world/inventory/AbstractContainerMenu ARG 1 intValue METHOD addDataSlots (Lnet/minecraft/world/inventory/ContainerData;)V ARG 1 array + METHOD addInventoryExtendedSlots (Lnet/minecraft/world/Container;II)V + ARG 1 container + ARG 2 x + ARG 3 y + METHOD addInventoryHotbarSlots (Lnet/minecraft/world/Container;II)V + ARG 1 container + ARG 2 x + ARG 3 y METHOD addSlot (Lnet/minecraft/world/inventory/Slot;)Lnet/minecraft/world/inventory/Slot; COMMENT Adds an item slot to this container ARG 1 slot METHOD addSlotListener (Lnet/minecraft/world/inventory/ContainerListener;)V ARG 1 listener + METHOD addStandardInventorySlots (Lnet/minecraft/world/Container;II)V + ARG 1 container + ARG 2 x + ARG 3 y METHOD broadcastChanges ()V COMMENT Looks for changes made in the container, sends them to every listener. METHOD canDragTo (Lnet/minecraft/world/inventory/Slot;)Z @@ -48,6 +60,9 @@ CLASS net/minecraft/world/inventory/AbstractContainerMenu ARG 2 button ARG 3 clickType ARG 4 player + METHOD dropOrPlaceInInventory (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/item/ItemStack;)V + ARG 0 player + ARG 1 stack METHOD findSlot (Lnet/minecraft/world/Container;I)Ljava/util/OptionalInt; ARG 1 container ARG 2 slotIndex @@ -125,6 +140,9 @@ CLASS net/minecraft/world/inventory/AbstractContainerMenu METHOD setRemoteSlotNoCopy (ILnet/minecraft/world/item/ItemStack;)V ARG 1 slot ARG 2 stack + METHOD setSelectedBundleItemIndex (II)V + ARG 1 slotIndex + ARG 2 bundleItemIndex METHOD setSynchronizer (Lnet/minecraft/world/inventory/ContainerSynchronizer;)V ARG 1 synchronizer METHOD slotsChanged (Lnet/minecraft/world/Container;)V diff --git a/data/net/minecraft/world/inventory/AbstractCraftingMenu.mapping b/data/net/minecraft/world/inventory/AbstractCraftingMenu.mapping new file mode 100644 index 000000000..5620f78cc --- /dev/null +++ b/data/net/minecraft/world/inventory/AbstractCraftingMenu.mapping @@ -0,0 +1,16 @@ +CLASS net/minecraft/world/inventory/AbstractCraftingMenu + METHOD (Lnet/minecraft/world/inventory/MenuType;III)V + ARG 1 menuType + ARG 2 containerId + ARG 3 width + ARG 4 height + METHOD addCraftingGridSlots (II)V + ARG 1 x + ARG 2 y + METHOD addResultSlot (Lnet/minecraft/world/entity/player/Player;II)Lnet/minecraft/world/inventory/Slot; + ARG 1 player + ARG 2 x + ARG 3 y + METHOD finishPlacingRecipe (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/crafting/RecipeHolder;)V + ARG 1 level + ARG 2 recipe diff --git a/data/net/minecraft/world/inventory/AbstractFurnaceMenu.mapping b/data/net/minecraft/world/inventory/AbstractFurnaceMenu.mapping index 67635521b..dac38d2c8 100644 --- a/data/net/minecraft/world/inventory/AbstractFurnaceMenu.mapping +++ b/data/net/minecraft/world/inventory/AbstractFurnaceMenu.mapping @@ -1,22 +1,22 @@ CLASS net/minecraft/world/inventory/AbstractFurnaceMenu - METHOD (Lnet/minecraft/world/inventory/MenuType;Lnet/minecraft/world/item/crafting/RecipeType;Lnet/minecraft/world/inventory/RecipeBookType;ILnet/minecraft/world/entity/player/Inventory;)V + METHOD (Lnet/minecraft/world/inventory/MenuType;Lnet/minecraft/world/item/crafting/RecipeType;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/world/inventory/RecipeBookType;ILnet/minecraft/world/entity/player/Inventory;)V ARG 1 menuType ARG 2 recipeType - ARG 3 recipeBookType - ARG 4 containerId - ARG 5 playerInventory - METHOD (Lnet/minecraft/world/inventory/MenuType;Lnet/minecraft/world/item/crafting/RecipeType;Lnet/minecraft/world/inventory/RecipeBookType;ILnet/minecraft/world/entity/player/Inventory;Lnet/minecraft/world/Container;Lnet/minecraft/world/inventory/ContainerData;)V + ARG 3 acceptedInputs + ARG 4 recipeBookType + ARG 5 containerId + ARG 6 inventory + METHOD (Lnet/minecraft/world/inventory/MenuType;Lnet/minecraft/world/item/crafting/RecipeType;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/world/inventory/RecipeBookType;ILnet/minecraft/world/entity/player/Inventory;Lnet/minecraft/world/Container;Lnet/minecraft/world/inventory/ContainerData;)V ARG 1 menuType ARG 2 recipeType - ARG 3 recipeBookType - ARG 4 containerId - ARG 5 playerInventory - ARG 6 container - ARG 7 data + ARG 3 acceptedInputs + ARG 4 recipeBookType + ARG 5 containerId + ARG 6 inventory + ARG 7 container + ARG 8 data METHOD canSmelt (Lnet/minecraft/world/item/ItemStack;)Z ARG 1 stack - METHOD fillCraftSlotsStackedContents (Lnet/minecraft/world/entity/player/StackedContents;)V - ARG 1 itemHelper METHOD isFuel (Lnet/minecraft/world/item/ItemStack;)Z ARG 1 stack METHOD quickMoveStack (Lnet/minecraft/world/entity/player/Player;I)Lnet/minecraft/world/item/ItemStack; @@ -26,3 +26,6 @@ CLASS net/minecraft/world/inventory/AbstractFurnaceMenu METHOD stillValid (Lnet/minecraft/world/entity/player/Player;)Z COMMENT Determines whether supplied player can use this container ARG 1 player + CLASS 1 + METHOD lambda$clearCraftingContent$0 (Lnet/minecraft/world/inventory/Slot;)V + ARG 0 slot diff --git a/data/net/minecraft/world/inventory/ChestMenu.mapping b/data/net/minecraft/world/inventory/ChestMenu.mapping index fe020e0b5..cbb7e750d 100644 --- a/data/net/minecraft/world/inventory/ChestMenu.mapping +++ b/data/net/minecraft/world/inventory/ChestMenu.mapping @@ -10,6 +10,10 @@ CLASS net/minecraft/world/inventory/ChestMenu ARG 3 playerInventory ARG 4 container ARG 5 rows + METHOD addChestGrid (Lnet/minecraft/world/Container;II)V + ARG 1 container + ARG 2 x + ARG 3 y METHOD fiveRows (ILnet/minecraft/world/entity/player/Inventory;)Lnet/minecraft/world/inventory/ChestMenu; ARG 0 containerId ARG 1 playerInventory diff --git a/data/net/minecraft/world/inventory/CraftingMenu.mapping b/data/net/minecraft/world/inventory/CraftingMenu.mapping index 2fb4b50bb..f6d8e651f 100644 --- a/data/net/minecraft/world/inventory/CraftingMenu.mapping +++ b/data/net/minecraft/world/inventory/CraftingMenu.mapping @@ -10,8 +10,12 @@ CLASS net/minecraft/world/inventory/CraftingMenu COMMENT Called to determine if the current slot is valid for the stack merging (double-click) code. The stack passed in is null for the initial slot that was double-clicked. ARG 1 stack ARG 2 slot - METHOD fillCraftSlotsStackedContents (Lnet/minecraft/world/entity/player/StackedContents;)V - ARG 1 itemHelper + METHOD lambda$quickMoveStack$2 (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)V + ARG 2 level + ARG 3 pos + METHOD lambda$removed$1 (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)V + ARG 2 level + ARG 3 pos METHOD lambda$slotsChanged$0 (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)V ARG 1 level ARG 2 blockPos @@ -22,7 +26,7 @@ CLASS net/minecraft/world/inventory/CraftingMenu METHOD removed (Lnet/minecraft/world/entity/player/Player;)V COMMENT Called when the container is closed. ARG 1 player - METHOD slotChangedCraftingGrid (Lnet/minecraft/world/inventory/AbstractContainerMenu;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/inventory/CraftingContainer;Lnet/minecraft/world/inventory/ResultContainer;Lnet/minecraft/world/item/crafting/RecipeHolder;)V + METHOD slotChangedCraftingGrid (Lnet/minecraft/world/inventory/AbstractContainerMenu;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/inventory/CraftingContainer;Lnet/minecraft/world/inventory/ResultContainer;Lnet/minecraft/world/item/crafting/RecipeHolder;)V ARG 0 menu ARG 1 level ARG 2 player diff --git a/data/net/minecraft/world/inventory/DispenserMenu.mapping b/data/net/minecraft/world/inventory/DispenserMenu.mapping index 21deaaf7b..6d2427d41 100644 --- a/data/net/minecraft/world/inventory/DispenserMenu.mapping +++ b/data/net/minecraft/world/inventory/DispenserMenu.mapping @@ -6,6 +6,10 @@ CLASS net/minecraft/world/inventory/DispenserMenu ARG 1 containerId ARG 2 playerInventory ARG 3 container + METHOD add3x3GridSlots (Lnet/minecraft/world/Container;II)V + ARG 1 container + ARG 2 x + ARG 3 y METHOD quickMoveStack (Lnet/minecraft/world/entity/player/Player;I)Lnet/minecraft/world/item/ItemStack; COMMENT Handle when the stack in slot {@code index} is shift-clicked. Normally this moves the stack between the player inventory and the other inventory(s). ARG 1 player diff --git a/data/net/minecraft/world/inventory/InventoryMenu.mapping b/data/net/minecraft/world/inventory/InventoryMenu.mapping index 69ff91df2..c6ecc303a 100644 --- a/data/net/minecraft/world/inventory/InventoryMenu.mapping +++ b/data/net/minecraft/world/inventory/InventoryMenu.mapping @@ -7,8 +7,6 @@ CLASS net/minecraft/world/inventory/InventoryMenu COMMENT Called to determine if the current slot is valid for the stack merging (double-click) code. The stack passed in is null for the initial slot that was double-clicked. ARG 1 stack ARG 2 slot - METHOD fillCraftSlotsStackedContents (Lnet/minecraft/world/entity/player/StackedContents;)V - ARG 1 itemHelper METHOD isHotbarSlot (I)Z ARG 0 index METHOD quickMoveStack (Lnet/minecraft/world/entity/player/Player;I)Lnet/minecraft/world/item/ItemStack; diff --git a/data/net/minecraft/world/inventory/ItemCombinerMenu.mapping b/data/net/minecraft/world/inventory/ItemCombinerMenu.mapping index 3c36b71f0..f31525e16 100644 --- a/data/net/minecraft/world/inventory/ItemCombinerMenu.mapping +++ b/data/net/minecraft/world/inventory/ItemCombinerMenu.mapping @@ -1,23 +1,20 @@ CLASS net/minecraft/world/inventory/ItemCombinerMenu - METHOD (Lnet/minecraft/world/inventory/MenuType;ILnet/minecraft/world/entity/player/Inventory;Lnet/minecraft/world/inventory/ContainerLevelAccess;)V - ARG 1 type + METHOD (Lnet/minecraft/world/inventory/MenuType;ILnet/minecraft/world/entity/player/Inventory;Lnet/minecraft/world/inventory/ContainerLevelAccess;Lnet/minecraft/world/inventory/ItemCombinerMenuSlotDefinition;)V + ARG 1 menuType ARG 2 containerId - ARG 3 playerInventory + ARG 3 inventory ARG 4 access + ARG 5 slotDefinition METHOD canMoveIntoInputSlots (Lnet/minecraft/world/item/ItemStack;)Z ARG 1 stack METHOD createContainer (I)Lnet/minecraft/world/SimpleContainer; ARG 1 size METHOD createInputSlots (Lnet/minecraft/world/inventory/ItemCombinerMenuSlotDefinition;)V ARG 1 slotDefinition - METHOD createInventorySlots (Lnet/minecraft/world/entity/player/Inventory;)V - ARG 1 inventory METHOD createResult ()V COMMENT Called when the Anvil Input Slot changes, calculates the new result and puts it in the output slot. METHOD createResultSlot (Lnet/minecraft/world/inventory/ItemCombinerMenuSlotDefinition;)V ARG 1 slotDefinition - METHOD getSlotToQuickMoveTo (Lnet/minecraft/world/item/ItemStack;)I - ARG 1 stack METHOD isValidBlock (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 state METHOD lambda$removed$0 (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)V diff --git a/data/net/minecraft/world/inventory/ItemCombinerMenuSlotDefinition.mapping b/data/net/minecraft/world/inventory/ItemCombinerMenuSlotDefinition.mapping index 630bbd065..d15898ace 100644 --- a/data/net/minecraft/world/inventory/ItemCombinerMenuSlotDefinition.mapping +++ b/data/net/minecraft/world/inventory/ItemCombinerMenuSlotDefinition.mapping @@ -4,8 +4,6 @@ CLASS net/minecraft/world/inventory/ItemCombinerMenuSlotDefinition ARG 2 resultSlot METHOD getSlot (I)Lnet/minecraft/world/inventory/ItemCombinerMenuSlotDefinition$SlotDefinition; ARG 1 slot - METHOD hasSlot (I)Z - ARG 1 slot CLASS Builder METHOD lambda$withResultSlot$0 (Lnet/minecraft/world/item/ItemStack;)Z ARG 0 stack diff --git a/data/net/minecraft/world/inventory/RecipeBookMenu.mapping b/data/net/minecraft/world/inventory/RecipeBookMenu.mapping index de054bd8f..233977a1c 100644 --- a/data/net/minecraft/world/inventory/RecipeBookMenu.mapping +++ b/data/net/minecraft/world/inventory/RecipeBookMenu.mapping @@ -1,13 +1,9 @@ CLASS net/minecraft/world/inventory/RecipeBookMenu - METHOD fillCraftSlotsStackedContents (Lnet/minecraft/world/entity/player/StackedContents;)V - ARG 1 itemHelper - METHOD finishPlacingRecipe (Lnet/minecraft/world/item/crafting/RecipeHolder;)V - ARG 1 recipe - METHOD handlePlacement (ZLnet/minecraft/world/item/crafting/RecipeHolder;Lnet/minecraft/server/level/ServerPlayer;)V - ARG 1 placeAll - ARG 2 recipe - ARG 3 player - METHOD recipeMatches (Lnet/minecraft/world/item/crafting/RecipeHolder;)Z - ARG 1 recipe - METHOD shouldMoveToInventory (I)Z - ARG 1 slotIndex + METHOD fillCraftSlotsStackedContents (Lnet/minecraft/world/entity/player/StackedItemContents;)V + ARG 1 stackedItemContents + METHOD handlePlacement (ZZLnet/minecraft/world/item/crafting/RecipeHolder;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/player/Inventory;)Lnet/minecraft/world/inventory/RecipeBookMenu$PostPlaceAction; + ARG 1 useMaxItems + ARG 2 isCreative + ARG 3 recipe + ARG 4 level + ARG 5 playerInventory diff --git a/data/net/minecraft/world/inventory/RecipeCraftingHolder.mapping b/data/net/minecraft/world/inventory/RecipeCraftingHolder.mapping index de50711c6..3272ae7e6 100644 --- a/data/net/minecraft/world/inventory/RecipeCraftingHolder.mapping +++ b/data/net/minecraft/world/inventory/RecipeCraftingHolder.mapping @@ -2,9 +2,8 @@ CLASS net/minecraft/world/inventory/RecipeCraftingHolder METHOD awardUsedRecipes (Lnet/minecraft/world/entity/player/Player;Ljava/util/List;)V ARG 1 player ARG 2 items + METHOD setRecipeUsed (Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/world/item/crafting/RecipeHolder;)Z + ARG 1 player + ARG 2 recipe METHOD setRecipeUsed (Lnet/minecraft/world/item/crafting/RecipeHolder;)V ARG 1 recipe - METHOD setRecipeUsed (Lnet/minecraft/world/level/Level;Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/world/item/crafting/RecipeHolder;)Z - ARG 1 level - ARG 2 players - ARG 3 recipe diff --git a/data/net/minecraft/world/inventory/ResultSlot.mapping b/data/net/minecraft/world/inventory/ResultSlot.mapping index 3ca874962..268a2a13d 100644 --- a/data/net/minecraft/world/inventory/ResultSlot.mapping +++ b/data/net/minecraft/world/inventory/ResultSlot.mapping @@ -9,6 +9,13 @@ CLASS net/minecraft/world/inventory/ResultSlot METHOD checkTakeAchievements (Lnet/minecraft/world/item/ItemStack;)V ARG 1 stack COMMENT the output - ie, iron ingots, and pickaxes, not ore and wood. + METHOD copyAllInputItems (Lnet/minecraft/world/item/crafting/CraftingInput;)Lnet/minecraft/core/NonNullList; + ARG 0 input + METHOD getRemainingItems (Lnet/minecraft/world/item/crafting/CraftingInput;Lnet/minecraft/world/level/Level;)Lnet/minecraft/core/NonNullList; + ARG 1 input + ARG 2 level + METHOD lambda$getRemainingItems$0 (Lnet/minecraft/world/item/crafting/CraftingInput;Lnet/minecraft/world/item/crafting/RecipeHolder;)Lnet/minecraft/core/NonNullList; + ARG 1 recipe METHOD mayPlace (Lnet/minecraft/world/item/ItemStack;)Z COMMENT Check if the stack is allowed to be placed in this slot, used for armor slots as well as furnace fuel. ARG 1 stack diff --git a/data/net/minecraft/world/inventory/SmithingMenu.mapping b/data/net/minecraft/world/inventory/SmithingMenu.mapping index 0f81310db..de7d27e53 100644 --- a/data/net/minecraft/world/inventory/SmithingMenu.mapping +++ b/data/net/minecraft/world/inventory/SmithingMenu.mapping @@ -6,16 +6,23 @@ CLASS net/minecraft/world/inventory/SmithingMenu ARG 1 containerId ARG 2 playerInventory ARG 3 access + METHOD (ILnet/minecraft/world/entity/player/Inventory;Lnet/minecraft/world/inventory/ContainerLevelAccess;Lnet/minecraft/world/level/Level;)V + ARG 1 containerId + ARG 2 playerInventory + ARG 3 access + ARG 4 level METHOD canTakeItemForPickAll (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/inventory/Slot;)Z COMMENT Called to determine if the current slot is valid for the stack merging (double-click) code. The stack passed in is null for the initial slot that was double-clicked. ARG 1 stack ARG 2 slot + METHOD createInputSlotDefinitions (Lnet/minecraft/world/item/crafting/RecipeAccess;)Lnet/minecraft/world/inventory/ItemCombinerMenuSlotDefinition; + ARG 0 access METHOD createResult ()V COMMENT Called when the Smithing Input Slot changes, calculates the new result and puts it in the output slot. - METHOD findSlotMatchingIngredient (Lnet/minecraft/world/item/crafting/SmithingRecipe;Lnet/minecraft/world/item/ItemStack;)Ljava/util/OptionalInt; - ARG 0 recipe - ARG 1 stack - METHOD findSlotToQuickMoveTo (Lnet/minecraft/world/item/ItemStack;)Ljava/util/OptionalInt; - ARG 1 stack + METHOD lambda$createResult$1 (Lnet/minecraft/world/item/crafting/SmithingRecipeInput;Lnet/minecraft/world/item/crafting/RecipeHolder;)V + ARG 2 recipe + METHOD lambda$onTake$0 (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)V + ARG 0 level + ARG 1 pos METHOD shrinkStackInSlot (I)V ARG 1 index diff --git a/data/net/minecraft/world/inventory/StackedContentsCompatible.mapping b/data/net/minecraft/world/inventory/StackedContentsCompatible.mapping index ca597fab2..231b66465 100644 --- a/data/net/minecraft/world/inventory/StackedContentsCompatible.mapping +++ b/data/net/minecraft/world/inventory/StackedContentsCompatible.mapping @@ -1,3 +1,3 @@ CLASS net/minecraft/world/inventory/StackedContentsCompatible - METHOD fillStackedContents (Lnet/minecraft/world/entity/player/StackedContents;)V - ARG 1 contents + METHOD fillStackedContents (Lnet/minecraft/world/entity/player/StackedItemContents;)V + ARG 1 stackedContents diff --git a/data/net/minecraft/world/inventory/StonecutterMenu.mapping b/data/net/minecraft/world/inventory/StonecutterMenu.mapping index c553a01f1..f401289c2 100644 --- a/data/net/minecraft/world/inventory/StonecutterMenu.mapping +++ b/data/net/minecraft/world/inventory/StonecutterMenu.mapping @@ -21,18 +21,18 @@ CLASS net/minecraft/world/inventory/StonecutterMenu ARG 1 stack ARG 2 slot METHOD clickMenuButton (Lnet/minecraft/world/entity/player/Player;I)Z - COMMENT Handles the given Button-click on the server, currently only used by enchanting. Name is for legacy. + COMMENT Handles the given Button-click on the server. ARG 1 player ARG 2 id - METHOD createRecipeInput (Lnet/minecraft/world/Container;)Lnet/minecraft/world/item/crafting/SingleRecipeInput; - ARG 0 container METHOD getSelectedRecipeIndex ()I COMMENT Returns the index of the selected recipe. METHOD isValidRecipeIndex (I)Z ARG 1 recipeIndex - METHOD lambda$removed$1 (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)V + METHOD lambda$removed$3 (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)V ARG 2 level - ARG 3 blockPos + ARG 3 pos + METHOD lambda$setupResultSlot$1 (Lnet/minecraft/world/item/crafting/RecipeHolder;)V + ARG 1 recipe METHOD quickMoveStack (Lnet/minecraft/world/entity/player/Player;I)Lnet/minecraft/world/item/ItemStack; COMMENT Handle when the stack in slot {@code index} is shift-clicked. Normally this moves the stack between the player inventory and the other inventory(s). ARG 1 player @@ -42,12 +42,17 @@ CLASS net/minecraft/world/inventory/StonecutterMenu METHOD removed (Lnet/minecraft/world/entity/player/Player;)V COMMENT Called when the container is closed. ARG 1 player - METHOD setupRecipeList (Lnet/minecraft/world/Container;Lnet/minecraft/world/item/ItemStack;)V - ARG 1 container - ARG 2 stack + METHOD setupRecipeList (Lnet/minecraft/world/item/ItemStack;)V + ARG 1 stack + METHOD setupResultSlot (I)V + ARG 1 id METHOD slotsChanged (Lnet/minecraft/world/Container;)V COMMENT Callback for when the crafting matrix is changed. ARG 1 inventory METHOD stillValid (Lnet/minecraft/world/entity/player/Player;)Z COMMENT Determines whether supplied player can use this container ARG 1 player + CLASS 2 + METHOD lambda$onTake$0 (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)V + ARG 1 level + ARG 2 pos diff --git a/data/net/minecraft/world/item/AdventureModePredicate.mapping b/data/net/minecraft/world/item/AdventureModePredicate.mapping index d01a4cba8..6b43170dc 100644 --- a/data/net/minecraft/world/item/AdventureModePredicate.mapping +++ b/data/net/minecraft/world/item/AdventureModePredicate.mapping @@ -2,10 +2,6 @@ CLASS net/minecraft/world/item/AdventureModePredicate METHOD (Ljava/util/List;Z)V ARG 1 predicates ARG 2 showInTooltip - METHOD (Ljava/util/List;ZLjava/util/List;)V - ARG 1 predicates - ARG 2 showInTooltip - ARG 3 tooltip METHOD addToTooltip (Ljava/util/function/Consumer;)V ARG 1 tooltipAdder METHOD areSameBlocks (Lnet/minecraft/world/level/block/state/pattern/BlockInWorld;Lnet/minecraft/world/level/block/state/pattern/BlockInWorld;Z)Z diff --git a/data/net/minecraft/world/item/AirItem.mapping b/data/net/minecraft/world/item/AirItem.mapping index 613847bc7..471be484d 100644 --- a/data/net/minecraft/world/item/AirItem.mapping +++ b/data/net/minecraft/world/item/AirItem.mapping @@ -2,5 +2,3 @@ CLASS net/minecraft/world/item/AirItem METHOD (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/item/Item$Properties;)V ARG 1 block ARG 2 properties - METHOD getDescriptionId ()Ljava/lang/String; - COMMENT Returns the unlocalized name of this item. diff --git a/data/net/minecraft/world/item/AnimalArmorItem.mapping b/data/net/minecraft/world/item/AnimalArmorItem.mapping index f692e98a3..bf5d589c1 100644 --- a/data/net/minecraft/world/item/AnimalArmorItem.mapping +++ b/data/net/minecraft/world/item/AnimalArmorItem.mapping @@ -1,10 +1,15 @@ CLASS net/minecraft/world/item/AnimalArmorItem - METHOD (Lnet/minecraft/core/Holder;Lnet/minecraft/world/item/AnimalArmorItem$BodyType;ZLnet/minecraft/world/item/Item$Properties;)V - ARG 1 armorMaterial + METHOD (Lnet/minecraft/world/item/equipment/ArmorMaterial;Lnet/minecraft/world/item/AnimalArmorItem$BodyType;Lnet/minecraft/core/Holder;ZLnet/minecraft/world/item/Item$Properties;)V + ARG 1 material ARG 2 bodyType - ARG 3 hasOverlay - ARG 4 properties + ARG 3 equipSound + ARG 4 damageOnHurt + ARG 5 properties + METHOD (Lnet/minecraft/world/item/equipment/ArmorMaterial;Lnet/minecraft/world/item/AnimalArmorItem$BodyType;Lnet/minecraft/world/item/Item$Properties;)V + ARG 1 material + ARG 2 bodyType + ARG 3 properties CLASS BodyType - METHOD (Ljava/lang/String;ILjava/util/function/Function;Lnet/minecraft/sounds/SoundEvent;)V - ARG 3 textureLocator - ARG 4 breakingSound + METHOD (Ljava/lang/String;ILnet/minecraft/sounds/SoundEvent;[Lnet/minecraft/world/entity/EntityType;)V + ARG 3 breakingSound + ARG 4 allowedEntities diff --git a/data/net/minecraft/world/item/ArmorItem.mapping b/data/net/minecraft/world/item/ArmorItem.mapping index b97850ed5..efc2ca7ed 100644 --- a/data/net/minecraft/world/item/ArmorItem.mapping +++ b/data/net/minecraft/world/item/ArmorItem.mapping @@ -1,26 +1,5 @@ CLASS net/minecraft/world/item/ArmorItem - METHOD (Lnet/minecraft/core/Holder;Lnet/minecraft/world/item/ArmorItem$Type;Lnet/minecraft/world/item/Item$Properties;)V + METHOD (Lnet/minecraft/world/item/equipment/ArmorMaterial;Lnet/minecraft/world/item/equipment/ArmorType;Lnet/minecraft/world/item/Item$Properties;)V ARG 1 material - ARG 2 type + ARG 2 armorType ARG 3 properties - METHOD dispenseArmor (Lnet/minecraft/core/dispenser/BlockSource;Lnet/minecraft/world/item/ItemStack;)Z - ARG 0 blockSource - ARG 1 armorItem - METHOD getEnchantmentValue ()I - COMMENT Return the enchantability factor of the item, most of the time is based on material. - METHOD isValidRepairItem (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;)Z - COMMENT Return whether this item is repairable in an anvil. - ARG 1 toRepair - ARG 2 repair - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand - CLASS Type - METHOD (Ljava/lang/String;ILnet/minecraft/world/entity/EquipmentSlot;ILjava/lang/String;)V - ARG 3 slot - ARG 4 durability - ARG 5 name - METHOD getDurability (I)I - ARG 1 durabilityFactor diff --git a/data/net/minecraft/world/item/ArmorMaterial.mapping b/data/net/minecraft/world/item/ArmorMaterial.mapping deleted file mode 100644 index 324baf33d..000000000 --- a/data/net/minecraft/world/item/ArmorMaterial.mapping +++ /dev/null @@ -1,14 +0,0 @@ -CLASS net/minecraft/world/item/ArmorMaterial - METHOD getDefense (Lnet/minecraft/world/item/ArmorItem$Type;)I - ARG 1 type - CLASS Layer - METHOD (Lnet/minecraft/resources/ResourceLocation;)V - ARG 1 assetName - METHOD (Lnet/minecraft/resources/ResourceLocation;Ljava/lang/String;Z)V - ARG 1 assetName - ARG 2 suffix - ARG 3 dyeable - METHOD resolveTexture (Z)Lnet/minecraft/resources/ResourceLocation; - ARG 1 innerTexture - METHOD texture (Z)Lnet/minecraft/resources/ResourceLocation; - ARG 1 innerTexture diff --git a/data/net/minecraft/world/item/ArmorMaterials.mapping b/data/net/minecraft/world/item/ArmorMaterials.mapping deleted file mode 100644 index 88b825381..000000000 --- a/data/net/minecraft/world/item/ArmorMaterials.mapping +++ /dev/null @@ -1,36 +0,0 @@ -CLASS net/minecraft/world/item/ArmorMaterials - METHOD bootstrap (Lnet/minecraft/core/Registry;)Lnet/minecraft/core/Holder; - ARG 0 registry - METHOD lambda$static$0 (Ljava/util/EnumMap;)V - ARG 0 map - METHOD lambda$static$10 (Ljava/util/EnumMap;)V - ARG 0 map - METHOD lambda$static$12 (Ljava/util/EnumMap;)V - ARG 0 map - METHOD lambda$static$14 (Ljava/util/EnumMap;)V - ARG 0 map - METHOD lambda$static$2 (Ljava/util/EnumMap;)V - ARG 0 map - METHOD lambda$static$4 (Ljava/util/EnumMap;)V - ARG 0 map - METHOD lambda$static$6 (Ljava/util/EnumMap;)V - ARG 0 map - METHOD lambda$static$8 (Ljava/util/EnumMap;)V - ARG 0 map - METHOD register (Ljava/lang/String;Ljava/util/EnumMap;ILnet/minecraft/core/Holder;FFLjava/util/function/Supplier;)Lnet/minecraft/core/Holder; - ARG 0 name - ARG 1 defense - ARG 2 enchantmentValue - ARG 3 equipSound - ARG 4 toughness - ARG 5 knockbackResistance - ARG 6 repairIngredient - METHOD register (Ljava/lang/String;Ljava/util/EnumMap;ILnet/minecraft/core/Holder;FFLjava/util/function/Supplier;Ljava/util/List;)Lnet/minecraft/core/Holder; - ARG 0 name - ARG 1 defense - ARG 2 enchantmentValue - ARG 3 equipSound - ARG 4 toughness - ARG 5 knockbackResistance - ARG 6 repairIngridient - ARG 7 layers diff --git a/data/net/minecraft/world/item/AxeItem.mapping b/data/net/minecraft/world/item/AxeItem.mapping index 010226a74..dfb6bd00b 100644 --- a/data/net/minecraft/world/item/AxeItem.mapping +++ b/data/net/minecraft/world/item/AxeItem.mapping @@ -1,4 +1,9 @@ CLASS net/minecraft/world/item/AxeItem + METHOD (Lnet/minecraft/world/item/ToolMaterial;FFLnet/minecraft/world/item/Item$Properties;)V + ARG 1 material + ARG 2 attackDamage + ARG 3 attackSpeed + ARG 4 properties METHOD evaluateNewBlockState (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/level/block/state/BlockState;)Ljava/util/Optional; ARG 1 level ARG 2 pos diff --git a/data/net/minecraft/world/item/BlockItem.mapping b/data/net/minecraft/world/item/BlockItem.mapping index 6af6e0839..74ccd624a 100644 --- a/data/net/minecraft/world/item/BlockItem.mapping +++ b/data/net/minecraft/world/item/BlockItem.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/world/item/BlockItem METHOD canPlace (Lnet/minecraft/world/item/context/BlockPlaceContext;Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 context ARG 2 state - METHOD getDescriptionId ()Ljava/lang/String; - COMMENT Returns the unlocalized name of this item. METHOD getPlaceSound (Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/sounds/SoundEvent; ARG 1 state METHOD getPlacementState (Lnet/minecraft/world/item/context/BlockPlaceContext;)Lnet/minecraft/world/level/block/state/BlockState; diff --git a/data/net/minecraft/world/item/BoatItem.mapping b/data/net/minecraft/world/item/BoatItem.mapping index a069ab178..134dd70c0 100644 --- a/data/net/minecraft/world/item/BoatItem.mapping +++ b/data/net/minecraft/world/item/BoatItem.mapping @@ -1,15 +1,9 @@ CLASS net/minecraft/world/item/BoatItem - METHOD (ZLnet/minecraft/world/entity/vehicle/Boat$Type;Lnet/minecraft/world/item/Item$Properties;)V - ARG 1 hasChest - ARG 2 type - ARG 3 properties - METHOD getBoat (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/phys/HitResult;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/player/Player;)Lnet/minecraft/world/entity/vehicle/Boat; + METHOD (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/item/Item$Properties;)V + ARG 1 entityType + ARG 2 properties + METHOD getBoat (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/phys/HitResult;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/player/Player;)Lnet/minecraft/world/entity/vehicle/AbstractBoat; ARG 1 level ARG 2 hitResult ARG 3 stack ARG 4 player - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand diff --git a/data/net/minecraft/world/item/BookItem.mapping b/data/net/minecraft/world/item/BookItem.mapping deleted file mode 100644 index 0d87f7b4f..000000000 --- a/data/net/minecraft/world/item/BookItem.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/world/item/BookItem - METHOD getEnchantmentValue ()I - COMMENT Return the enchantability factor of the item, most of the time is based on material. - METHOD isEnchantable (Lnet/minecraft/world/item/ItemStack;)Z - COMMENT Checks isDamagable and if it cannot be stacked - ARG 1 stack diff --git a/data/net/minecraft/world/item/BottleItem.mapping b/data/net/minecraft/world/item/BottleItem.mapping index f57362105..f567e81dd 100644 --- a/data/net/minecraft/world/item/BottleItem.mapping +++ b/data/net/minecraft/world/item/BottleItem.mapping @@ -3,8 +3,3 @@ CLASS net/minecraft/world/item/BottleItem ARG 1 bottleStack ARG 2 player ARG 3 filledBottleStack - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand diff --git a/data/net/minecraft/world/item/BowItem.mapping b/data/net/minecraft/world/item/BowItem.mapping index edd332dba..4f0909e41 100644 --- a/data/net/minecraft/world/item/BowItem.mapping +++ b/data/net/minecraft/world/item/BowItem.mapping @@ -4,17 +4,3 @@ CLASS net/minecraft/world/item/BowItem METHOD getPowerForTime (I)F COMMENT Gets the velocity of the arrow entity from the bow's charge ARG 0 charge - METHOD getUseAnimation (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/UseAnim; - COMMENT Returns the action that specifies what animation to play when the item is being used. - ARG 1 stack - METHOD releaseUsing (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;I)V - COMMENT Called when the player stops using an Item (stops holding the right mouse button). - ARG 1 stack - ARG 2 level - ARG 3 entityLiving - ARG 4 timeLeft - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand diff --git a/data/net/minecraft/world/item/BucketItem.mapping b/data/net/minecraft/world/item/BucketItem.mapping index 929c1303a..78a4218c5 100644 --- a/data/net/minecraft/world/item/BucketItem.mapping +++ b/data/net/minecraft/world/item/BucketItem.mapping @@ -11,8 +11,3 @@ CLASS net/minecraft/world/item/BucketItem ARG 1 player ARG 2 level ARG 3 pos - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand diff --git a/data/net/minecraft/world/item/BundleItem.mapping b/data/net/minecraft/world/item/BundleItem.mapping index c4e60b291..250b0b83e 100644 --- a/data/net/minecraft/world/item/BundleItem.mapping +++ b/data/net/minecraft/world/item/BundleItem.mapping @@ -1,12 +1,44 @@ CLASS net/minecraft/world/item/BundleItem - METHOD dropContents (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/player/Player;)Z - ARG 0 stack + METHOD (Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/world/item/Item$Properties;)V + ARG 1 openFrontModel + ARG 2 openBackModel + ARG 3 properties + METHOD broadcastChangesOnContainerMenu (Lnet/minecraft/world/entity/player/Player;)V ARG 1 player + METHOD dropContent (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/player/Player;)Z + ARG 1 stack + ARG 2 player + METHOD dropContent (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/item/ItemStack;)V + ARG 1 level + ARG 2 player + ARG 3 stack + METHOD getByColor (Lnet/minecraft/world/item/DyeColor;)Lnet/minecraft/world/item/Item; + ARG 0 color METHOD getFullnessDisplay (Lnet/minecraft/world/item/ItemStack;)F ARG 0 stack - METHOD playDropContentsSound (Lnet/minecraft/world/entity/Entity;)V + METHOD getNumberOfItemsToShow (Lnet/minecraft/world/item/ItemStack;)I + ARG 0 bundle + METHOD getSelectedItem (Lnet/minecraft/world/item/ItemStack;)I + ARG 0 bundle + METHOD getSelectedItemStack (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/ItemStack; + ARG 0 bundle + METHOD hasSelectedItem (Lnet/minecraft/world/item/ItemStack;)Z + ARG 0 bundle + METHOD lambda$getAllBundleItemColors$0 (Lnet/minecraft/world/item/Item;)Lnet/minecraft/world/item/BundleItem; + ARG 0 item + METHOD playDropContentsSound (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/Entity;)V + ARG 0 level ARG 1 entity + METHOD playInsertFailSound (Lnet/minecraft/world/entity/Entity;)V + ARG 0 entity METHOD playInsertSound (Lnet/minecraft/world/entity/Entity;)V - ARG 1 entity + ARG 0 entity METHOD playRemoveOneSound (Lnet/minecraft/world/entity/Entity;)V - ARG 1 entity + ARG 0 entity + METHOD removeOneItemFromBundle (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/item/component/BundleContents;)Ljava/util/Optional; + ARG 0 stack + ARG 1 player + ARG 2 bundleContents + METHOD toggleSelectedItem (Lnet/minecraft/world/item/ItemStack;I)V + ARG 0 bundle + ARG 1 selectedItem diff --git a/data/net/minecraft/world/item/ChorusFruitItem.mapping b/data/net/minecraft/world/item/ChorusFruitItem.mapping deleted file mode 100644 index 6fd2bc5cd..000000000 --- a/data/net/minecraft/world/item/ChorusFruitItem.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/world/item/ChorusFruitItem - METHOD finishUsingItem (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;)Lnet/minecraft/world/item/ItemStack; - COMMENT Called when the player finishes using this Item (E.g. finishes eating.). Not called when the player stops using the Item before the action is complete. - ARG 1 stack - ARG 2 level - ARG 3 entityLiving diff --git a/data/net/minecraft/world/item/CompassItem.mapping b/data/net/minecraft/world/item/CompassItem.mapping index 1b23514dd..6fe3ebf10 100644 --- a/data/net/minecraft/world/item/CompassItem.mapping +++ b/data/net/minecraft/world/item/CompassItem.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/world/item/CompassItem - METHOD getDescriptionId (Lnet/minecraft/world/item/ItemStack;)Ljava/lang/String; - COMMENT Returns the unlocalized name of this item. This version accepts an ItemStack so different stacks can have different names based on their damage or NBT. - ARG 1 stack METHOD getSpawnPosition (Lnet/minecraft/world/level/Level;)Lnet/minecraft/core/GlobalPos; ARG 0 level METHOD inventoryTick (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/Entity;IZ)V diff --git a/data/net/minecraft/world/item/ComplexItem.mapping b/data/net/minecraft/world/item/ComplexItem.mapping deleted file mode 100644 index b0453e828..000000000 --- a/data/net/minecraft/world/item/ComplexItem.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/world/item/ComplexItem - METHOD getUpdatePacket (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;)Lnet/minecraft/network/protocol/Packet; - ARG 1 stack - ARG 2 level - ARG 3 player - METHOD isComplex ()Z - COMMENT Returns {@code true} if this is a complex item. diff --git a/data/net/minecraft/world/item/CreativeModeTabs.mapping b/data/net/minecraft/world/item/CreativeModeTabs.mapping index dbcac4890..01fd6c19d 100644 --- a/data/net/minecraft/world/item/CreativeModeTabs.mapping +++ b/data/net/minecraft/world/item/CreativeModeTabs.mapping @@ -22,7 +22,7 @@ CLASS net/minecraft/world/item/CreativeModeTabs ARG 2 item ARG 3 instrument ARG 4 tabVisibility - METHOD generateOminousVials (Lnet/minecraft/world/item/CreativeModeTab$Output;Lnet/minecraft/world/item/CreativeModeTab$TabVisibility;)V + METHOD generateOminousBottles (Lnet/minecraft/world/item/CreativeModeTab$Output;Lnet/minecraft/world/item/CreativeModeTab$TabVisibility;)V ARG 0 output ARG 1 tabVisibility METHOD generatePotionEffectTypes (Lnet/minecraft/world/item/CreativeModeTab$Output;Lnet/minecraft/core/HolderLookup;Lnet/minecraft/world/item/Item;Lnet/minecraft/world/item/CreativeModeTab$TabVisibility;Lnet/minecraft/world/flag/FeatureFlagSet;)V diff --git a/data/net/minecraft/world/item/CrossbowItem.mapping b/data/net/minecraft/world/item/CrossbowItem.mapping index d5bb0b081..1d18d82e3 100644 --- a/data/net/minecraft/world/item/CrossbowItem.mapping +++ b/data/net/minecraft/world/item/CrossbowItem.mapping @@ -26,9 +26,6 @@ CLASS net/minecraft/world/item/CrossbowItem METHOD getShotPitch (Lnet/minecraft/util/RandomSource;I)F ARG 0 random ARG 1 index - METHOD getUseAnimation (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/UseAnim; - COMMENT Returns the action that specifies what animation to play when the item is being used. - ARG 1 stack METHOD isCharged (Lnet/minecraft/world/item/ItemStack;)Z ARG 0 crossbowStack METHOD lambda$onUseTick$1 (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/core/Holder;)V @@ -51,20 +48,9 @@ CLASS net/minecraft/world/item/CrossbowItem ARG 5 velocity ARG 6 inaccuracy ARG 7 target - METHOD releaseUsing (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;I)V - COMMENT Called when the player stops using an Item (stops holding the right mouse button). - ARG 1 stack - ARG 2 level - ARG 3 entityLiving - ARG 4 timeLeft METHOD tryLoadProjectiles (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;)Z ARG 0 shooter ARG 1 crossbowStack - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand CLASS ChargingSounds METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/data/net/minecraft/world/item/DiggerItem.mapping b/data/net/minecraft/world/item/DiggerItem.mapping index c06b5cf6f..ec33b50d9 100644 --- a/data/net/minecraft/world/item/DiggerItem.mapping +++ b/data/net/minecraft/world/item/DiggerItem.mapping @@ -1,12 +1,10 @@ CLASS net/minecraft/world/item/DiggerItem - METHOD (Lnet/minecraft/world/item/Tier;Lnet/minecraft/tags/TagKey;Lnet/minecraft/world/item/Item$Properties;)V - ARG 1 tier - ARG 2 blocks - ARG 3 properties - METHOD createAttributes (Lnet/minecraft/world/item/Tier;FF)Lnet/minecraft/world/item/component/ItemAttributeModifiers; - ARG 0 tier - ARG 1 attackDamage - ARG 2 attackSpeed + METHOD (Lnet/minecraft/world/item/ToolMaterial;Lnet/minecraft/tags/TagKey;FFLnet/minecraft/world/item/Item$Properties;)V + ARG 1 material + ARG 2 mineableBlocks + ARG 3 attackDamage + ARG 4 attackSpeed + ARG 5 properties METHOD hurtEnemy (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z COMMENT Current implementations of this method in child classes do not use the entry argument beside ev. They just raise the damage on the stack. ARG 1 stack diff --git a/data/net/minecraft/world/item/EggItem.mapping b/data/net/minecraft/world/item/EggItem.mapping deleted file mode 100644 index 6eb75d5bd..000000000 --- a/data/net/minecraft/world/item/EggItem.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/world/item/EggItem - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand diff --git a/data/net/minecraft/world/item/ElytraItem.mapping b/data/net/minecraft/world/item/ElytraItem.mapping deleted file mode 100644 index dca38a636..000000000 --- a/data/net/minecraft/world/item/ElytraItem.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS net/minecraft/world/item/ElytraItem - METHOD isFlyEnabled (Lnet/minecraft/world/item/ItemStack;)Z - ARG 0 elytraStack - METHOD isValidRepairItem (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;)Z - COMMENT Return whether this item is repairable in an anvil. - ARG 1 toRepair - ARG 2 repair - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand diff --git a/data/net/minecraft/world/item/EmptyMapItem.mapping b/data/net/minecraft/world/item/EmptyMapItem.mapping deleted file mode 100644 index 91c23e61d..000000000 --- a/data/net/minecraft/world/item/EmptyMapItem.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/world/item/EmptyMapItem - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand diff --git a/data/net/minecraft/world/item/EnchantedBookItem.mapping b/data/net/minecraft/world/item/EnchantedBookItem.mapping deleted file mode 100644 index bc45185b0..000000000 --- a/data/net/minecraft/world/item/EnchantedBookItem.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/world/item/EnchantedBookItem - METHOD createForEnchantment (Lnet/minecraft/world/item/enchantment/EnchantmentInstance;)Lnet/minecraft/world/item/ItemStack; - COMMENT Returns the ItemStack of an enchanted version of this item. - ARG 0 instance - METHOD isEnchantable (Lnet/minecraft/world/item/ItemStack;)Z - COMMENT Checks isDamagable and if it cannot be stacked - ARG 1 stack diff --git a/data/net/minecraft/world/item/EnderEyeItem.mapping b/data/net/minecraft/world/item/EnderEyeItem.mapping index c14c32548..57c18d10d 100644 --- a/data/net/minecraft/world/item/EnderEyeItem.mapping +++ b/data/net/minecraft/world/item/EnderEyeItem.mapping @@ -1,9 +1,4 @@ CLASS net/minecraft/world/item/EnderEyeItem - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand METHOD useOn (Lnet/minecraft/world/item/context/UseOnContext;)Lnet/minecraft/world/InteractionResult; COMMENT Called when this item is used when targeting a Block ARG 1 context diff --git a/data/net/minecraft/world/item/EnderpearlItem.mapping b/data/net/minecraft/world/item/EnderpearlItem.mapping deleted file mode 100644 index 14e4bca6e..000000000 --- a/data/net/minecraft/world/item/EnderpearlItem.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/world/item/EnderpearlItem - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand diff --git a/data/net/minecraft/world/item/Equipable.mapping b/data/net/minecraft/world/item/Equipable.mapping deleted file mode 100644 index fa6ad7dcb..000000000 --- a/data/net/minecraft/world/item/Equipable.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/world/item/Equipable - METHOD get (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/Equipable; - ARG 0 stack - METHOD swapWithEquipmentSlot (Lnet/minecraft/world/item/Item;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - ARG 1 item - ARG 2 level - ARG 3 player - ARG 4 hand diff --git a/data/net/minecraft/world/item/ExperienceBottleItem.mapping b/data/net/minecraft/world/item/ExperienceBottleItem.mapping deleted file mode 100644 index 0888665f4..000000000 --- a/data/net/minecraft/world/item/ExperienceBottleItem.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/world/item/ExperienceBottleItem - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand diff --git a/data/net/minecraft/world/item/FireworkRocketItem.mapping b/data/net/minecraft/world/item/FireworkRocketItem.mapping index 2f7fc6ef9..4a736b801 100644 --- a/data/net/minecraft/world/item/FireworkRocketItem.mapping +++ b/data/net/minecraft/world/item/FireworkRocketItem.mapping @@ -1,12 +1,7 @@ CLASS net/minecraft/world/item/FireworkRocketItem - METHOD getEntityPokingOutOfBlockPos (Lnet/minecraft/core/dispenser/BlockSource;Lnet/minecraft/core/Direction;)Lnet/minecraft/world/phys/Vec3; - ARG 0 source + METHOD getEntityJustOutsideOfBlockPos (Lnet/minecraft/core/dispenser/BlockSource;Lnet/minecraft/core/Direction;)Lnet/minecraft/world/phys/Vec3; + ARG 0 blockSource ARG 1 direction - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand METHOD useOn (Lnet/minecraft/world/item/context/UseOnContext;)Lnet/minecraft/world/InteractionResult; COMMENT Called when this item is used when targeting a Block ARG 1 context diff --git a/data/net/minecraft/world/item/FishingRodItem.mapping b/data/net/minecraft/world/item/FishingRodItem.mapping deleted file mode 100644 index 1b69523ee..000000000 --- a/data/net/minecraft/world/item/FishingRodItem.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/world/item/FishingRodItem - METHOD getEnchantmentValue ()I - COMMENT Return the enchantability factor of the item, most of the time is based on material. - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand diff --git a/data/net/minecraft/world/item/FoodOnAStickItem.mapping b/data/net/minecraft/world/item/FoodOnAStickItem.mapping index 27121af07..064ded19a 100644 --- a/data/net/minecraft/world/item/FoodOnAStickItem.mapping +++ b/data/net/minecraft/world/item/FoodOnAStickItem.mapping @@ -1,10 +1,5 @@ CLASS net/minecraft/world/item/FoodOnAStickItem - METHOD (Lnet/minecraft/world/item/Item$Properties;Lnet/minecraft/world/entity/EntityType;I)V - ARG 1 properties - ARG 2 canInteractWith - ARG 3 consumeItemDamage - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand + METHOD (Lnet/minecraft/world/entity/EntityType;ILnet/minecraft/world/item/Item$Properties;)V + ARG 1 canInteractWith + ARG 2 consumeItemDamage + ARG 3 properties diff --git a/data/net/minecraft/world/item/HoeItem.mapping b/data/net/minecraft/world/item/HoeItem.mapping index 0ed9c14c3..fed029a63 100644 --- a/data/net/minecraft/world/item/HoeItem.mapping +++ b/data/net/minecraft/world/item/HoeItem.mapping @@ -1,4 +1,9 @@ CLASS net/minecraft/world/item/HoeItem + METHOD (Lnet/minecraft/world/item/ToolMaterial;FFLnet/minecraft/world/item/Item$Properties;)V + ARG 1 material + ARG 2 attackDamage + ARG 3 attackSpeed + ARG 4 properties METHOD changeIntoState (Lnet/minecraft/world/level/block/state/BlockState;)Ljava/util/function/Consumer; ARG 0 state METHOD changeIntoStateAndDropItem (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/ItemLike;)Ljava/util/function/Consumer; diff --git a/data/net/minecraft/world/item/HoneyBottleItem.mapping b/data/net/minecraft/world/item/HoneyBottleItem.mapping deleted file mode 100644 index 9772314c4..000000000 --- a/data/net/minecraft/world/item/HoneyBottleItem.mapping +++ /dev/null @@ -1,14 +0,0 @@ -CLASS net/minecraft/world/item/HoneyBottleItem - METHOD finishUsingItem (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;)Lnet/minecraft/world/item/ItemStack; - COMMENT Called when the player finishes using this Item (E.g. finishes eating.). Not called when the player stops using the Item before the action is complete. - ARG 1 stack - ARG 2 level - ARG 3 entityLiving - METHOD getUseAnimation (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/UseAnim; - COMMENT Returns the action that specifies what animation to play when the item is being used. - ARG 1 stack - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand diff --git a/data/net/minecraft/world/item/InstrumentItem.mapping b/data/net/minecraft/world/item/InstrumentItem.mapping index 6f90d4b5b..cbe3938db 100644 --- a/data/net/minecraft/world/item/InstrumentItem.mapping +++ b/data/net/minecraft/world/item/InstrumentItem.mapping @@ -1,17 +1,14 @@ CLASS net/minecraft/world/item/InstrumentItem - METHOD (Lnet/minecraft/world/item/Item$Properties;Lnet/minecraft/tags/TagKey;)V - ARG 1 properties - ARG 2 instruments + METHOD (Lnet/minecraft/tags/TagKey;Lnet/minecraft/world/item/Item$Properties;)V + ARG 1 instruments + ARG 2 properties METHOD create (Lnet/minecraft/world/item/Item;Lnet/minecraft/core/Holder;)Lnet/minecraft/world/item/ItemStack; ARG 0 item ARG 1 instrument - METHOD getInstrument (Lnet/minecraft/world/item/ItemStack;)Ljava/util/Optional; + METHOD getInstrument (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/core/HolderLookup$Provider;)Ljava/util/Optional; ARG 1 stack + ARG 2 registries METHOD play (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/item/Instrument;)V ARG 0 level ARG 1 player ARG 2 instrument - METHOD setRandom (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/tags/TagKey;Lnet/minecraft/util/RandomSource;)V - ARG 0 stack - ARG 1 instrumentTag - ARG 2 random diff --git a/data/net/minecraft/world/item/Instruments.mapping b/data/net/minecraft/world/item/Instruments.mapping index 5b7aee27b..3dbbfdaa3 100644 --- a/data/net/minecraft/world/item/Instruments.mapping +++ b/data/net/minecraft/world/item/Instruments.mapping @@ -1,5 +1,11 @@ CLASS net/minecraft/world/item/Instruments - METHOD bootstrap (Lnet/minecraft/core/Registry;)Lnet/minecraft/world/item/Instrument; - ARG 0 registry + METHOD bootstrap (Lnet/minecraft/data/worldgen/BootstrapContext;)V + ARG 0 context METHOD create (Ljava/lang/String;)Lnet/minecraft/resources/ResourceKey; ARG 0 name + METHOD register (Lnet/minecraft/data/worldgen/BootstrapContext;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/core/Holder;FF)V + ARG 0 context + ARG 1 key + ARG 2 soundEvent + ARG 3 useDuration + ARG 4 range diff --git a/data/net/minecraft/world/item/Item.mapping b/data/net/minecraft/world/item/Item.mapping index aec358eb6..183ee9f38 100644 --- a/data/net/minecraft/world/item/Item.mapping +++ b/data/net/minecraft/world/item/Item.mapping @@ -28,16 +28,13 @@ CLASS net/minecraft/world/item/Item ARG 1 stack METHOD getBarWidth (Lnet/minecraft/world/item/ItemStack;)I ARG 1 stack + METHOD getDamageSource (Lnet/minecraft/world/entity/LivingEntity;)Lnet/minecraft/world/damagesource/DamageSource; + ARG 1 entity METHOD getDescriptionId ()Ljava/lang/String; COMMENT Returns the unlocalized name of this item. - METHOD getDescriptionId (Lnet/minecraft/world/item/ItemStack;)Ljava/lang/String; - COMMENT Returns the unlocalized name of this item. This version accepts an ItemStack so different stacks can have different names based on their damage or NBT. - ARG 1 stack METHOD getDestroySpeed (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/block/state/BlockState;)F ARG 1 stack ARG 2 state - METHOD getEnchantmentValue ()I - COMMENT Return the enchantability factor of the item, most of the time is based on material. METHOD getId (Lnet/minecraft/world/item/Item;)I ARG 0 item METHOD getName (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/network/chat/Component; @@ -48,14 +45,11 @@ CLASS net/minecraft/world/item/Item ARG 2 fluidMode METHOD getTooltipImage (Lnet/minecraft/world/item/ItemStack;)Ljava/util/Optional; ARG 1 stack - METHOD getUseAnimation (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/UseAnim; - COMMENT Returns the action that specifies what animation to play when the item is being used. + METHOD getUseAnimation (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/ItemUseAnimation; ARG 1 stack METHOD getUseDuration (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/LivingEntity;)I ARG 1 stack ARG 2 entity - METHOD hasCraftingRemainingItem ()Z - COMMENT True if this Item has a container item (a.k.a. crafting result) METHOD hurtEnemy (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z COMMENT Current implementations of this method in child classes do not use the entry argument beside ev. They just raise the damage on the stack. ARG 1 stack @@ -76,23 +70,14 @@ CLASS net/minecraft/world/item/Item ARG 5 isSelected METHOD isBarVisible (Lnet/minecraft/world/item/ItemStack;)Z ARG 1 stack - METHOD isComplex ()Z - COMMENT Returns {@code true} if this is a complex item. METHOD isCorrectToolForDrops (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 stack ARG 2 state - METHOD isEnchantable (Lnet/minecraft/world/item/ItemStack;)Z - COMMENT Checks isDamagable and if it cannot be stacked - ARG 1 stack METHOD isFoil (Lnet/minecraft/world/item/ItemStack;)Z COMMENT Returns {@code true} if this item has an enchantment glint. By default, this returns {@code stack.isEnchanted()}, but other items can override it (for instance, written books always return true). COMMENT COMMENT Note that if you override this method, you generally want to also call the super version (on {@link Item}) to get the glint for enchanted items. Of course, that is unnecessary if the overwritten version always returns true. ARG 1 stack - METHOD isValidRepairItem (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;)Z - COMMENT Return whether this item is repairable in an anvil. - ARG 1 stack - ARG 2 repairCandidate METHOD mineBlock (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/LivingEntity;)Z COMMENT Called when a {@link net.minecraft.world.level.block.Block} is destroyed using this Item. Return {@code true} to trigger the "Use Item" statistic. ARG 1 stack @@ -132,17 +117,15 @@ CLASS net/minecraft/world/item/Item ARG 1 stack ARG 2 target ARG 3 attacker - METHOD releaseUsing (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;I)V - COMMENT Called when the player stops using an Item (stops holding the right mouse button). + METHOD releaseUsing (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;I)Z ARG 1 stack ARG 2 level - ARG 3 livingEntity - ARG 4 timeCharged - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link net.minecraft.world.item.Item#useOn(net.minecraft.world.item.context.UseOnContext)}. + ARG 3 entity + ARG 4 timeLeft + METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult; ARG 1 level ARG 2 player - ARG 3 usedHand + ARG 3 hand METHOD useOn (Lnet/minecraft/world/item/context/UseOnContext;)Lnet/minecraft/world/InteractionResult; COMMENT Called when this item is used when targeting a Block ARG 1 context @@ -154,6 +137,9 @@ CLASS net/minecraft/world/item/Item CLASS Properties METHOD attributes (Lnet/minecraft/world/item/component/ItemAttributeModifiers;)Lnet/minecraft/world/item/Item$Properties; ARG 1 attributes + METHOD buildAndValidateComponents (Lnet/minecraft/network/chat/Component;Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/core/component/DataComponentMap; + ARG 1 itemName + ARG 2 itemModel METHOD component (Lnet/minecraft/core/component/DataComponentType;Ljava/lang/Object;)Lnet/minecraft/world/item/Item$Properties; ARG 1 component ARG 2 value @@ -161,16 +147,39 @@ CLASS net/minecraft/world/item/Item ARG 1 craftingRemainingItem METHOD durability (I)Lnet/minecraft/world/item/Item$Properties; ARG 1 maxDamage + METHOD enchantable (I)Lnet/minecraft/world/item/Item$Properties; + ARG 1 enchantmentValue + METHOD equippable (Lnet/minecraft/world/entity/EquipmentSlot;)Lnet/minecraft/world/item/Item$Properties; + ARG 1 slot + METHOD equippableUnswappable (Lnet/minecraft/world/entity/EquipmentSlot;)Lnet/minecraft/world/item/Item$Properties; + ARG 1 slot METHOD food (Lnet/minecraft/world/food/FoodProperties;)Lnet/minecraft/world/item/Item$Properties; ARG 1 food + METHOD food (Lnet/minecraft/world/food/FoodProperties;Lnet/minecraft/world/item/component/Consumable;)Lnet/minecraft/world/item/Item$Properties; + ARG 1 food + ARG 2 consumable METHOD jukeboxPlayable (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/item/Item$Properties; ARG 1 song + METHOD overrideDescription (Ljava/lang/String;)Lnet/minecraft/world/item/Item$Properties; + ARG 1 description + METHOD overrideModel (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/world/item/Item$Properties; + ARG 1 model METHOD rarity (Lnet/minecraft/world/item/Rarity;)Lnet/minecraft/world/item/Item$Properties; ARG 1 rarity + METHOD repairable (Lnet/minecraft/tags/TagKey;)Lnet/minecraft/world/item/Item$Properties; + ARG 1 repairItems + METHOD repairable (Lnet/minecraft/world/item/Item;)Lnet/minecraft/world/item/Item$Properties; + ARG 1 repairItem METHOD requiredFeatures ([Lnet/minecraft/world/flag/FeatureFlag;)Lnet/minecraft/world/item/Item$Properties; ARG 1 requiredFeatures + METHOD setId (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/item/Item$Properties; + ARG 1 id METHOD stacksTo (I)Lnet/minecraft/world/item/Item$Properties; ARG 1 maxStackSize + METHOD useCooldown (F)Lnet/minecraft/world/item/Item$Properties; + ARG 1 useCooldown + METHOD usingConvertsTo (Lnet/minecraft/world/item/Item;)Lnet/minecraft/world/item/Item$Properties; + ARG 1 usingConvertsTo CLASS TooltipContext METHOD mapData (Lnet/minecraft/world/level/saveddata/maps/MapId;)Lnet/minecraft/world/level/saveddata/maps/MapItemSavedData; ARG 1 mapId diff --git a/data/net/minecraft/world/item/ItemCooldowns.mapping b/data/net/minecraft/world/item/ItemCooldowns.mapping index 1c1e1cebc..55d422f25 100644 --- a/data/net/minecraft/world/item/ItemCooldowns.mapping +++ b/data/net/minecraft/world/item/ItemCooldowns.mapping @@ -1,19 +1,24 @@ CLASS net/minecraft/world/item/ItemCooldowns - METHOD addCooldown (Lnet/minecraft/world/item/Item;I)V - ARG 1 item - ARG 2 ticks - METHOD getCooldownPercent (Lnet/minecraft/world/item/Item;F)F - ARG 1 item - ARG 2 partialTicks - METHOD isOnCooldown (Lnet/minecraft/world/item/Item;)Z - ARG 1 item - METHOD onCooldownEnded (Lnet/minecraft/world/item/Item;)V - ARG 1 item - METHOD onCooldownStarted (Lnet/minecraft/world/item/Item;I)V - ARG 1 item - ARG 2 ticks - METHOD removeCooldown (Lnet/minecraft/world/item/Item;)V - ARG 1 item + METHOD addCooldown (Lnet/minecraft/resources/ResourceLocation;I)V + ARG 1 group + ARG 2 cooldown + METHOD addCooldown (Lnet/minecraft/world/item/ItemStack;I)V + ARG 1 stack + ARG 2 cooldown + METHOD getCooldownGroup (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/resources/ResourceLocation; + ARG 1 stack + METHOD getCooldownPercent (Lnet/minecraft/world/item/ItemStack;F)F + ARG 1 stack + ARG 2 partialTick + METHOD isOnCooldown (Lnet/minecraft/world/item/ItemStack;)Z + ARG 1 stack + METHOD onCooldownEnded (Lnet/minecraft/resources/ResourceLocation;)V + ARG 1 group + METHOD onCooldownStarted (Lnet/minecraft/resources/ResourceLocation;I)V + ARG 1 group + ARG 2 cooldown + METHOD removeCooldown (Lnet/minecraft/resources/ResourceLocation;)V + ARG 1 group CLASS CooldownInstance METHOD (II)V ARG 1 startTime diff --git a/data/net/minecraft/world/item/ItemNameBlockItem.mapping b/data/net/minecraft/world/item/ItemNameBlockItem.mapping deleted file mode 100644 index ab9671d87..000000000 --- a/data/net/minecraft/world/item/ItemNameBlockItem.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/world/item/ItemNameBlockItem - METHOD getDescriptionId ()Ljava/lang/String; - COMMENT Returns the unlocalized name of this item. diff --git a/data/net/minecraft/world/item/ItemStack.mapping b/data/net/minecraft/world/item/ItemStack.mapping index a1b6c1829..3922e6867 100644 --- a/data/net/minecraft/world/item/ItemStack.mapping +++ b/data/net/minecraft/world/item/ItemStack.mapping @@ -34,12 +34,19 @@ CLASS net/minecraft/world/item/ItemStack ARG 2 context ARG 3 tooltipAdder ARG 4 tooltipFlag + METHOD applyAfterUseComponentSideEffects (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/ItemStack; + ARG 1 entity + ARG 2 stack METHOD applyComponents (Lnet/minecraft/core/component/DataComponentMap;)V ARG 1 components METHOD applyComponents (Lnet/minecraft/core/component/DataComponentPatch;)V ARG 1 components METHOD applyComponentsAndValidate (Lnet/minecraft/core/component/DataComponentPatch;)V ARG 1 components + METHOD applyDamage (ILnet/minecraft/server/level/ServerPlayer;Ljava/util/function/Consumer;)V + ARG 1 damage + ARG 2 player + ARG 3 onBreak METHOD canBeHurtBy (Lnet/minecraft/world/damagesource/DamageSource;)Z ARG 1 damageSource METHOD canBreakBlockInAdventureMode (Lnet/minecraft/world/level/block/state/pattern/BlockInWorld;)Z @@ -109,9 +116,12 @@ CLASS net/minecraft/world/item/ItemStack ARG 2 item ARG 3 entity ARG 4 slot - METHOD hurtEnemy (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/player/Player;)Z - ARG 1 target + METHOD hurtEnemy (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 1 enemy ARG 2 attacker + METHOD hurtWithoutBreaking (ILnet/minecraft/world/entity/player/Player;)V + ARG 1 damage + ARG 2 player METHOD interactLivingEntity (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult; ARG 1 player ARG 2 entity @@ -155,15 +165,8 @@ CLASS net/minecraft/world/item/ItemStack ARG 1 other METHOD isStackable ()Z COMMENT Returns {@code true} if the {@code ItemStack} can hold 2 or more units of the item. - METHOD lambda$static$1 (Lnet/minecraft/core/Holder;)Lcom/mojang/serialization/DataResult; - ARG 0 item - METHOD lambda$static$3 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD lambda$static$6 (Lnet/minecraft/core/Holder;Lnet/minecraft/core/component/DataComponentPatch;)Lnet/minecraft/world/item/ItemStack; - ARG 0 item - ARG 1 components - METHOD lambda$static$7 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance + METHOD isValidRepairItem (Lnet/minecraft/world/item/ItemStack;)Z + ARG 1 item METHOD lenientOptionalFieldOf (Ljava/lang/String;)Lcom/mojang/serialization/MapCodec; ARG 0 fieldName METHOD limitSize (I)V @@ -193,7 +196,7 @@ CLASS net/minecraft/world/item/ItemStack COMMENT Called as the stack is being used by an entity. ARG 1 level ARG 2 livingEntity - ARG 3 count + ARG 3 remainingUseDuration METHOD overrideOtherStackedOnMe (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/inventory/Slot;Lnet/minecraft/world/inventory/ClickAction;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/entity/SlotAccess;)Z ARG 1 stack ARG 2 slot @@ -210,9 +213,13 @@ CLASS net/minecraft/world/item/ItemStack METHOD parseOptional (Lnet/minecraft/core/HolderLookup$Provider;Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/item/ItemStack; ARG 0 lookupProvider ARG 1 tag - METHOD postHurtEnemy (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/player/Player;)V - ARG 1 target + METHOD postHurtEnemy (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)V + ARG 1 enemy ARG 2 attacker + METHOD processDurabilityChange (ILnet/minecraft/server/level/ServerLevel;Lnet/minecraft/server/level/ServerPlayer;)I + ARG 1 damage + ARG 2 level + ARG 3 player METHOD releaseUsing (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;I)V COMMENT Called when the player releases the use item button. ARG 1 level @@ -260,11 +267,10 @@ CLASS net/minecraft/world/item/ItemStack ARG 1 component ARG 2 defaultValue ARG 3 updater - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called when the {@code ItemStack} is equipped and right-clicked. Replaces the {@code ItemStack} with the return value. + METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult; ARG 1 level ARG 2 player - ARG 3 usedHand + ARG 3 hand METHOD useOn (Lnet/minecraft/world/item/context/UseOnContext;)Lnet/minecraft/world/InteractionResult; ARG 1 context METHOD validateComponents (Lnet/minecraft/core/component/DataComponentMap;)Lcom/mojang/serialization/DataResult; diff --git a/data/net/minecraft/world/item/ItemUseAnimation.mapping b/data/net/minecraft/world/item/ItemUseAnimation.mapping new file mode 100644 index 000000000..885b3ed56 --- /dev/null +++ b/data/net/minecraft/world/item/ItemUseAnimation.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/world/item/ItemUseAnimation + METHOD (Ljava/lang/String;IILjava/lang/String;)V + ARG 3 id + ARG 4 name diff --git a/data/net/minecraft/world/item/ItemUtils.mapping b/data/net/minecraft/world/item/ItemUtils.mapping index 6703b12dc..3703b5a39 100644 --- a/data/net/minecraft/world/item/ItemUtils.mapping +++ b/data/net/minecraft/world/item/ItemUtils.mapping @@ -11,7 +11,7 @@ CLASS net/minecraft/world/item/ItemUtils METHOD onContainerDestroyed (Lnet/minecraft/world/entity/item/ItemEntity;Ljava/lang/Iterable;)V ARG 0 container ARG 1 contents - METHOD startUsingInstantly (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; + METHOD startUsingInstantly (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult; ARG 0 level ARG 1 player ARG 2 hand diff --git a/data/net/minecraft/world/item/Items.mapping b/data/net/minecraft/world/item/Items.mapping index 98370b5d1..b7ca4b203 100644 --- a/data/net/minecraft/world/item/Items.mapping +++ b/data/net/minecraft/world/item/Items.mapping @@ -1,23 +1,44 @@ CLASS net/minecraft/world/item/Items - METHOD registerBlock (Lnet/minecraft/world/item/BlockItem;)Lnet/minecraft/world/item/Item; - ARG 0 item + METHOD blockIdToItemId (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/resources/ResourceKey; + ARG 0 blockId + METHOD createBlockItemWithCustomItemName (Lnet/minecraft/world/level/block/Block;)Ljava/util/function/Function; + ARG 0 block METHOD registerBlock (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/world/item/Item; ARG 0 block + METHOD registerBlock (Lnet/minecraft/world/level/block/Block;Ljava/util/function/BiFunction;)Lnet/minecraft/world/item/Item; + ARG 0 block + ARG 1 factory + METHOD registerBlock (Lnet/minecraft/world/level/block/Block;Ljava/util/function/BiFunction;Lnet/minecraft/world/item/Item$Properties;)Lnet/minecraft/world/item/Item; + ARG 0 block + ARG 1 factory + ARG 2 properties METHOD registerBlock (Lnet/minecraft/world/level/block/Block;Ljava/util/function/UnaryOperator;)Lnet/minecraft/world/item/Item; ARG 0 block ARG 1 propertiesModifier - METHOD registerBlock (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/item/Item;)Lnet/minecraft/world/item/Item; + METHOD registerBlock (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/item/Item$Properties;)Lnet/minecraft/world/item/Item; ARG 0 block - ARG 1 item + ARG 1 properties METHOD registerBlock (Lnet/minecraft/world/level/block/Block;[Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/world/item/Item; ARG 0 block ARG 1 others - METHOD registerItem (Ljava/lang/String;Lnet/minecraft/world/item/Item;)Lnet/minecraft/world/item/Item; - ARG 0 key - ARG 1 item - METHOD registerItem (Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/world/item/Item;)Lnet/minecraft/world/item/Item; + METHOD registerItem (Ljava/lang/String;)Lnet/minecraft/world/item/Item; + ARG 0 name + METHOD registerItem (Ljava/lang/String;Ljava/util/function/Function;)Lnet/minecraft/world/item/Item; + ARG 0 name + ARG 1 factory + METHOD registerItem (Ljava/lang/String;Ljava/util/function/Function;Lnet/minecraft/world/item/Item$Properties;)Lnet/minecraft/world/item/Item; + ARG 0 name + ARG 1 factory + ARG 2 properties + METHOD registerItem (Ljava/lang/String;Lnet/minecraft/world/item/Item$Properties;)Lnet/minecraft/world/item/Item; + ARG 0 name + ARG 1 properties + METHOD registerItem (Lnet/minecraft/resources/ResourceKey;Ljava/util/function/Function;)Lnet/minecraft/world/item/Item; ARG 0 key - ARG 1 item - METHOD registerItem (Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/world/item/Item;)Lnet/minecraft/world/item/Item; + ARG 1 factory + METHOD registerItem (Lnet/minecraft/resources/ResourceKey;Ljava/util/function/Function;Lnet/minecraft/world/item/Item$Properties;)Lnet/minecraft/world/item/Item; ARG 0 key - ARG 1 item + ARG 1 factory + ARG 2 properties + METHOD vanillaItemId (Ljava/lang/String;)Lnet/minecraft/resources/ResourceKey; + ARG 0 name diff --git a/data/net/minecraft/world/item/JukeboxPlayable.mapping b/data/net/minecraft/world/item/JukeboxPlayable.mapping index 266df8dfc..54657f558 100644 --- a/data/net/minecraft/world/item/JukeboxPlayable.mapping +++ b/data/net/minecraft/world/item/JukeboxPlayable.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/world/item/JukeboxPlayable ARG 1 song METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD tryInsertIntoJukebox (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/player/Player;)Lnet/minecraft/world/ItemInteractionResult; + METHOD tryInsertIntoJukebox (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/player/Player;)Lnet/minecraft/world/InteractionResult; ARG 0 level ARG 1 pos ARG 2 stack diff --git a/data/net/minecraft/world/item/KnowledgeBookItem.mapping b/data/net/minecraft/world/item/KnowledgeBookItem.mapping deleted file mode 100644 index 804c43805..000000000 --- a/data/net/minecraft/world/item/KnowledgeBookItem.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/world/item/KnowledgeBookItem - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand diff --git a/data/net/minecraft/world/item/LingeringPotionItem.mapping b/data/net/minecraft/world/item/LingeringPotionItem.mapping deleted file mode 100644 index 1067686cf..000000000 --- a/data/net/minecraft/world/item/LingeringPotionItem.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/world/item/LingeringPotionItem - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand diff --git a/data/net/minecraft/world/item/MaceItem.mapping b/data/net/minecraft/world/item/MaceItem.mapping index 75a61ed3d..1a65cff67 100644 --- a/data/net/minecraft/world/item/MaceItem.mapping +++ b/data/net/minecraft/world/item/MaceItem.mapping @@ -1,14 +1,16 @@ CLASS net/minecraft/world/item/MaceItem + METHOD calculateImpactPosition (Lnet/minecraft/server/level/ServerPlayer;)Lnet/minecraft/world/phys/Vec3; + ARG 1 player METHOD canSmashAttack (Lnet/minecraft/world/entity/LivingEntity;)Z ARG 0 entity - METHOD getKnockbackPower (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/phys/Vec3;)D - ARG 0 player + METHOD getKnockbackPower (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/phys/Vec3;)D + ARG 0 attacker ARG 1 entity - ARG 2 entityPos - METHOD knockback (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/entity/Entity;)V + ARG 2 offset + METHOD knockback (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/entity/Entity;)V ARG 0 level - ARG 1 player - ARG 2 entity - METHOD knockbackPredicate (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/entity/Entity;)Ljava/util/function/Predicate; - ARG 0 player - ARG 1 entity + ARG 1 attacker + ARG 2 target + METHOD knockbackPredicate (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/entity/Entity;)Ljava/util/function/Predicate; + ARG 0 attacker + ARG 1 target diff --git a/data/net/minecraft/world/item/MapItem.mapping b/data/net/minecraft/world/item/MapItem.mapping index 1dbe48db9..fb38daf8b 100644 --- a/data/net/minecraft/world/item/MapItem.mapping +++ b/data/net/minecraft/world/item/MapItem.mapping @@ -26,10 +26,6 @@ CLASS net/minecraft/world/item/MapItem ARG 1 level METHOD getTooltipForId (Lnet/minecraft/world/level/saveddata/maps/MapId;)Lnet/minecraft/network/chat/Component; ARG 0 mapId - METHOD getUpdatePacket (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;)Lnet/minecraft/network/protocol/Packet; - ARG 1 stack - ARG 2 level - ARG 3 player METHOD inventoryTick (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/Entity;IZ)V COMMENT Called each tick as long the item is in a player's inventory. Used by maps to check if it's in a player's hand and update its contents. ARG 1 stack diff --git a/data/net/minecraft/world/item/MilkBucketItem.mapping b/data/net/minecraft/world/item/MilkBucketItem.mapping deleted file mode 100644 index c800dcde9..000000000 --- a/data/net/minecraft/world/item/MilkBucketItem.mapping +++ /dev/null @@ -1,14 +0,0 @@ -CLASS net/minecraft/world/item/MilkBucketItem - METHOD finishUsingItem (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;)Lnet/minecraft/world/item/ItemStack; - COMMENT Called when the player finishes using this Item (E.g. finishes eating.). Not called when the player stops using the Item before the action is complete. - ARG 1 stack - ARG 2 level - ARG 3 entityLiving - METHOD getUseAnimation (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/UseAnim; - COMMENT Returns the action that specifies what animation to play when the item is being used. - ARG 1 stack - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand diff --git a/data/net/minecraft/world/item/MinecartItem.mapping b/data/net/minecraft/world/item/MinecartItem.mapping index ed710e45b..4c0ec6e85 100644 --- a/data/net/minecraft/world/item/MinecartItem.mapping +++ b/data/net/minecraft/world/item/MinecartItem.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/world/item/MinecartItem - METHOD (Lnet/minecraft/world/entity/vehicle/AbstractMinecart$Type;Lnet/minecraft/world/item/Item$Properties;)V + METHOD (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/item/Item$Properties;)V ARG 1 type ARG 2 properties METHOD useOn (Lnet/minecraft/world/item/context/UseOnContext;)Lnet/minecraft/world/InteractionResult; diff --git a/data/net/minecraft/world/item/PickaxeItem.mapping b/data/net/minecraft/world/item/PickaxeItem.mapping new file mode 100644 index 000000000..392e55144 --- /dev/null +++ b/data/net/minecraft/world/item/PickaxeItem.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/world/item/PickaxeItem + METHOD (Lnet/minecraft/world/item/ToolMaterial;FFLnet/minecraft/world/item/Item$Properties;)V + ARG 1 material + ARG 2 attackDamage + ARG 3 attackSpeed + ARG 4 properties diff --git a/data/net/minecraft/world/item/PotionItem.mapping b/data/net/minecraft/world/item/PotionItem.mapping deleted file mode 100644 index 0c1d8569c..000000000 --- a/data/net/minecraft/world/item/PotionItem.mapping +++ /dev/null @@ -1,17 +0,0 @@ -CLASS net/minecraft/world/item/PotionItem - METHOD finishUsingItem (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;)Lnet/minecraft/world/item/ItemStack; - COMMENT Called when the player finishes using this Item (E.g. finishes eating.). Not called when the player stops using the Item before the action is complete. - ARG 1 stack - ARG 2 level - ARG 3 entityLiving - METHOD getDescriptionId (Lnet/minecraft/world/item/ItemStack;)Ljava/lang/String; - COMMENT Returns the unlocalized name of this item. This version accepts an ItemStack so different stacks can have different names based on their damage or NBT. - ARG 1 stack - METHOD getUseAnimation (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/UseAnim; - COMMENT Returns the action that specifies what animation to play when the item is being used. - ARG 1 stack - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand diff --git a/data/net/minecraft/world/item/ProjectileWeaponItem.mapping b/data/net/minecraft/world/item/ProjectileWeaponItem.mapping index 7c5e7d29c..f2ddd66de 100644 --- a/data/net/minecraft/world/item/ProjectileWeaponItem.mapping +++ b/data/net/minecraft/world/item/ProjectileWeaponItem.mapping @@ -13,8 +13,6 @@ CLASS net/minecraft/world/item/ProjectileWeaponItem COMMENT Get the predicate to match ammunition when searching the player's inventory, not their main/offhand METHOD getDurabilityUse (Lnet/minecraft/world/item/ItemStack;)I ARG 1 stack - METHOD getEnchantmentValue ()I - COMMENT Return the enchantability factor of the item, most of the time is based on material. METHOD getHeldProjectile (Lnet/minecraft/world/entity/LivingEntity;Ljava/util/function/Predicate;)Lnet/minecraft/world/item/ItemStack; ARG 0 shooter ARG 1 isAmmo diff --git a/data/net/minecraft/world/item/ServerItemCooldowns.mapping b/data/net/minecraft/world/item/ServerItemCooldowns.mapping index a253a6e72..766e3280a 100644 --- a/data/net/minecraft/world/item/ServerItemCooldowns.mapping +++ b/data/net/minecraft/world/item/ServerItemCooldowns.mapping @@ -1,8 +1,3 @@ CLASS net/minecraft/world/item/ServerItemCooldowns METHOD (Lnet/minecraft/server/level/ServerPlayer;)V ARG 1 player - METHOD onCooldownEnded (Lnet/minecraft/world/item/Item;)V - ARG 1 item - METHOD onCooldownStarted (Lnet/minecraft/world/item/Item;I)V - ARG 1 item - ARG 2 ticks diff --git a/data/net/minecraft/world/item/ShieldItem.mapping b/data/net/minecraft/world/item/ShieldItem.mapping deleted file mode 100644 index a094f4a72..000000000 --- a/data/net/minecraft/world/item/ShieldItem.mapping +++ /dev/null @@ -1,16 +0,0 @@ -CLASS net/minecraft/world/item/ShieldItem - METHOD getDescriptionId (Lnet/minecraft/world/item/ItemStack;)Ljava/lang/String; - COMMENT Returns the unlocalized name of this item. This version accepts an ItemStack so different stacks can have different names based on their damage or NBT. - ARG 1 stack - METHOD getUseAnimation (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/UseAnim; - COMMENT Returns the action that specifies what animation to play when the item is being used. - ARG 1 stack - METHOD isValidRepairItem (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;)Z - COMMENT Return whether this item is repairable in an anvil. - ARG 1 toRepair - ARG 2 repair - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand diff --git a/data/net/minecraft/world/item/ShovelItem.mapping b/data/net/minecraft/world/item/ShovelItem.mapping index de67f55d4..3e01038c2 100644 --- a/data/net/minecraft/world/item/ShovelItem.mapping +++ b/data/net/minecraft/world/item/ShovelItem.mapping @@ -1,6 +1,11 @@ CLASS net/minecraft/world/item/ShovelItem FIELD FLATTENABLES Ljava/util/Map; COMMENT Map used to lookup shovel right click interactions + METHOD (Lnet/minecraft/world/item/ToolMaterial;FFLnet/minecraft/world/item/Item$Properties;)V + ARG 1 material + ARG 2 attackDamage + ARG 3 attackSpeed + ARG 4 properties METHOD useOn (Lnet/minecraft/world/item/context/UseOnContext;)Lnet/minecraft/world/InteractionResult; COMMENT Called when this item is used when targeting a Block ARG 1 context diff --git a/data/net/minecraft/world/item/SignItem.mapping b/data/net/minecraft/world/item/SignItem.mapping index ecfb23361..2af09103f 100644 --- a/data/net/minecraft/world/item/SignItem.mapping +++ b/data/net/minecraft/world/item/SignItem.mapping @@ -1,13 +1,13 @@ CLASS net/minecraft/world/item/SignItem - METHOD (Lnet/minecraft/world/item/Item$Properties;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;)V - ARG 1 properties - ARG 2 standingBlock - ARG 3 wallBlock METHOD (Lnet/minecraft/world/item/Item$Properties;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/Direction;)V ARG 1 properties ARG 2 standingBlock ARG 3 wallBlock ARG 4 attachmentDirection + METHOD (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/item/Item$Properties;)V + ARG 1 standingBlock + ARG 2 wallBlock + ARG 3 properties METHOD updateCustomBlockEntityTag (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 pos ARG 2 level diff --git a/data/net/minecraft/world/item/SmithingTemplateItem.mapping b/data/net/minecraft/world/item/SmithingTemplateItem.mapping index fbea87f61..1c6967243 100644 --- a/data/net/minecraft/world/item/SmithingTemplateItem.mapping +++ b/data/net/minecraft/world/item/SmithingTemplateItem.mapping @@ -1,16 +1,13 @@ CLASS net/minecraft/world/item/SmithingTemplateItem - METHOD (Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;Ljava/util/List;Ljava/util/List;[Lnet/minecraft/world/flag/FeatureFlag;)V + METHOD (Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;Ljava/util/List;Ljava/util/List;Lnet/minecraft/world/item/Item$Properties;)V ARG 1 appliesTo ARG 2 ingredients - ARG 3 upgradeDescription - ARG 4 baseSlotDescription - ARG 5 additionsSlotDescription - ARG 6 baseSlotEmptyIcons - ARG 7 additionalSlotEmptyIcons - ARG 8 requiredFeatures - METHOD createArmorTrimTemplate (Lnet/minecraft/resources/ResourceKey;[Lnet/minecraft/world/flag/FeatureFlag;)Lnet/minecraft/world/item/SmithingTemplateItem; - ARG 0 key - ARG 1 requiredFeatures - METHOD createArmorTrimTemplate (Lnet/minecraft/resources/ResourceLocation;[Lnet/minecraft/world/flag/FeatureFlag;)Lnet/minecraft/world/item/SmithingTemplateItem; - ARG 0 name - ARG 1 requiredFeatures + ARG 3 baseSlotDescription + ARG 4 additionsSlotDescription + ARG 5 baseSlotEmptyIcons + ARG 6 additionalSlotEmptyIcons + ARG 7 properties + METHOD createArmorTrimTemplate (Lnet/minecraft/world/item/Item$Properties;)Lnet/minecraft/world/item/SmithingTemplateItem; + ARG 0 properties + METHOD createNetheriteUpgradeTemplate (Lnet/minecraft/world/item/Item$Properties;)Lnet/minecraft/world/item/SmithingTemplateItem; + ARG 0 properties diff --git a/data/net/minecraft/world/item/SnowballItem.mapping b/data/net/minecraft/world/item/SnowballItem.mapping deleted file mode 100644 index 8967d70d5..000000000 --- a/data/net/minecraft/world/item/SnowballItem.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/world/item/SnowballItem - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand diff --git a/data/net/minecraft/world/item/SpawnEggItem.mapping b/data/net/minecraft/world/item/SpawnEggItem.mapping index 7b68c93cf..c5699bcf0 100644 --- a/data/net/minecraft/world/item/SpawnEggItem.mapping +++ b/data/net/minecraft/world/item/SpawnEggItem.mapping @@ -20,11 +20,6 @@ CLASS net/minecraft/world/item/SpawnEggItem METHOD spawnsEntity (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/EntityType;)Z ARG 1 stack ARG 2 entityType - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand METHOD useOn (Lnet/minecraft/world/item/context/UseOnContext;)Lnet/minecraft/world/InteractionResult; COMMENT Called when this item is used when targeting a Block ARG 1 context diff --git a/data/net/minecraft/world/item/SplashPotionItem.mapping b/data/net/minecraft/world/item/SplashPotionItem.mapping deleted file mode 100644 index 4d07ce1e2..000000000 --- a/data/net/minecraft/world/item/SplashPotionItem.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/world/item/SplashPotionItem - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand diff --git a/data/net/minecraft/world/item/StandingAndWallBlockItem.mapping b/data/net/minecraft/world/item/StandingAndWallBlockItem.mapping index 134f698a6..ecaed7fcb 100644 --- a/data/net/minecraft/world/item/StandingAndWallBlockItem.mapping +++ b/data/net/minecraft/world/item/StandingAndWallBlockItem.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/world/item/StandingAndWallBlockItem - METHOD (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/item/Item$Properties;Lnet/minecraft/core/Direction;)V + METHOD (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/Direction;Lnet/minecraft/world/item/Item$Properties;)V ARG 1 block ARG 2 wallBlock - ARG 3 properties - ARG 4 attachmentDirection + ARG 3 attachmentDirection + ARG 4 properties METHOD canPlace (Lnet/minecraft/world/level/LevelReader;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;)Z ARG 1 level ARG 2 state diff --git a/data/net/minecraft/world/item/SuspiciousStewItem.mapping b/data/net/minecraft/world/item/SuspiciousStewItem.mapping deleted file mode 100644 index 17379d2c0..000000000 --- a/data/net/minecraft/world/item/SuspiciousStewItem.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/world/item/SuspiciousStewItem - METHOD finishUsingItem (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;)Lnet/minecraft/world/item/ItemStack; - COMMENT Called when the player finishes using this Item (E.g. finishes eating.). Not called when the player stops using the Item before the action is complete. - ARG 1 stack - ARG 2 level - ARG 3 entityLiving diff --git a/data/net/minecraft/world/item/SwordItem.mapping b/data/net/minecraft/world/item/SwordItem.mapping index 21a593bdc..0eb25ff03 100644 --- a/data/net/minecraft/world/item/SwordItem.mapping +++ b/data/net/minecraft/world/item/SwordItem.mapping @@ -1,13 +1,14 @@ CLASS net/minecraft/world/item/SwordItem + METHOD (Lnet/minecraft/world/item/ToolMaterial;FFLnet/minecraft/world/item/Item$Properties;)V + ARG 1 material + ARG 2 attackDamage + ARG 3 attackSpeed + ARG 4 properties METHOD canAttackBlock (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;)Z ARG 1 state ARG 2 level ARG 3 pos ARG 4 player - METHOD createAttributes (Lnet/minecraft/world/item/Tier;IF)Lnet/minecraft/world/item/component/ItemAttributeModifiers; - ARG 0 tier - ARG 1 attackDamage - ARG 2 attackSpeed METHOD hurtEnemy (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z COMMENT Current implementations of this method in child classes do not use the entry argument beside ev. They just raise the damage on the stack. ARG 1 stack diff --git a/data/net/minecraft/world/item/ThrowablePotionItem.mapping b/data/net/minecraft/world/item/ThrowablePotionItem.mapping deleted file mode 100644 index 5061c94d1..000000000 --- a/data/net/minecraft/world/item/ThrowablePotionItem.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/world/item/ThrowablePotionItem - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand diff --git a/data/net/minecraft/world/item/Tier.mapping b/data/net/minecraft/world/item/Tier.mapping deleted file mode 100644 index 38b495498..000000000 --- a/data/net/minecraft/world/item/Tier.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/world/item/Tier - METHOD createToolProperties (Lnet/minecraft/tags/TagKey;)Lnet/minecraft/world/item/component/Tool; - ARG 1 block diff --git a/data/net/minecraft/world/item/TieredItem.mapping b/data/net/minecraft/world/item/TieredItem.mapping deleted file mode 100644 index d37c66978..000000000 --- a/data/net/minecraft/world/item/TieredItem.mapping +++ /dev/null @@ -1,10 +0,0 @@ -CLASS net/minecraft/world/item/TieredItem - METHOD (Lnet/minecraft/world/item/Tier;Lnet/minecraft/world/item/Item$Properties;)V - ARG 1 tier - ARG 2 properties - METHOD getEnchantmentValue ()I - COMMENT Return the enchantability factor of the item, most of the time is based on material. - METHOD isValidRepairItem (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;)Z - COMMENT Return whether this item is repairable in an anvil. - ARG 1 toRepair - ARG 2 repair diff --git a/data/net/minecraft/world/item/Tiers.mapping b/data/net/minecraft/world/item/Tiers.mapping deleted file mode 100644 index ee4e27cfa..000000000 --- a/data/net/minecraft/world/item/Tiers.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/world/item/Tiers - METHOD (Ljava/lang/String;ILnet/minecraft/tags/TagKey;IFFILjava/util/function/Supplier;)V - ARG 3 incorrectBlockForDrops - ARG 4 uses - ARG 5 speed - ARG 6 damage - ARG 7 enchantmentValue - ARG 8 repairIngredient diff --git a/data/net/minecraft/world/item/TippedArrowItem.mapping b/data/net/minecraft/world/item/TippedArrowItem.mapping deleted file mode 100644 index 52cea26a1..000000000 --- a/data/net/minecraft/world/item/TippedArrowItem.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/world/item/TippedArrowItem - METHOD getDescriptionId (Lnet/minecraft/world/item/ItemStack;)Ljava/lang/String; - COMMENT Returns the unlocalized name of this item. This version accepts an ItemStack so different stacks can have different names based on their damage or NBT. - ARG 1 stack diff --git a/data/net/minecraft/world/item/ToolMaterial.mapping b/data/net/minecraft/world/item/ToolMaterial.mapping new file mode 100644 index 000000000..3b7f165a8 --- /dev/null +++ b/data/net/minecraft/world/item/ToolMaterial.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/world/item/ToolMaterial + METHOD applyCommonProperties (Lnet/minecraft/world/item/Item$Properties;)Lnet/minecraft/world/item/Item$Properties; + ARG 1 properties + METHOD applySwordProperties (Lnet/minecraft/world/item/Item$Properties;FF)Lnet/minecraft/world/item/Item$Properties; + ARG 1 properties + ARG 2 attackDamage + ARG 3 attackSpeed + METHOD applyToolProperties (Lnet/minecraft/world/item/Item$Properties;Lnet/minecraft/tags/TagKey;FF)Lnet/minecraft/world/item/Item$Properties; + ARG 1 properties + ARG 2 mineableBlocks + ARG 3 attackDamage + ARG 4 attackSpeed + METHOD createSwordAttributes (FF)Lnet/minecraft/world/item/component/ItemAttributeModifiers; + ARG 1 attackDamage + ARG 2 attackSpeed + METHOD createToolAttributes (FF)Lnet/minecraft/world/item/component/ItemAttributeModifiers; + ARG 1 attackDamage + ARG 2 attackSpeed diff --git a/data/net/minecraft/world/item/TridentItem.mapping b/data/net/minecraft/world/item/TridentItem.mapping index 2d6e0355c..728763434 100644 --- a/data/net/minecraft/world/item/TridentItem.mapping +++ b/data/net/minecraft/world/item/TridentItem.mapping @@ -4,26 +4,8 @@ CLASS net/minecraft/world/item/TridentItem ARG 2 level ARG 3 pos ARG 4 player - METHOD getEnchantmentValue ()I - COMMENT Return the enchantability factor of the item, most of the time is based on material. - METHOD getUseAnimation (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/UseAnim; - COMMENT Returns the action that specifies what animation to play when the item is being used. - ARG 1 stack METHOD hurtEnemy (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/entity/LivingEntity;)Z COMMENT Current implementations of this method in child classes do not use the entry argument beside ev. They just raise the damage on the stack. ARG 1 stack ARG 2 target ARG 3 attacker - METHOD isTooDamagedToUse (Lnet/minecraft/world/item/ItemStack;)Z - ARG 0 stack - METHOD releaseUsing (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;I)V - COMMENT Called when the player stops using an Item (stops holding the right mouse button). - ARG 1 stack - ARG 2 level - ARG 3 entityLiving - ARG 4 timeLeft - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand diff --git a/data/net/minecraft/world/item/WritableBookItem.mapping b/data/net/minecraft/world/item/WritableBookItem.mapping deleted file mode 100644 index 946a2bfd3..000000000 --- a/data/net/minecraft/world/item/WritableBookItem.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/world/item/WritableBookItem - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand diff --git a/data/net/minecraft/world/item/WrittenBookItem.mapping b/data/net/minecraft/world/item/WrittenBookItem.mapping index d76a3510e..ac9cd908b 100644 --- a/data/net/minecraft/world/item/WrittenBookItem.mapping +++ b/data/net/minecraft/world/item/WrittenBookItem.mapping @@ -1,13 +1,5 @@ CLASS net/minecraft/world/item/WrittenBookItem - METHOD getName (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/network/chat/Component; - COMMENT Gets the title name of the book - ARG 1 stack METHOD resolveBookComponents (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/commands/CommandSourceStack;Lnet/minecraft/world/entity/player/Player;)Z ARG 0 bookStack ARG 1 resolvingSource ARG 2 resolvingPlayer - METHOD use (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResultHolder; - COMMENT Called to trigger the item's "innate" right click behavior. To handle when this item is used on a Block, see {@link #onItemUse}. - ARG 1 level - ARG 2 player - ARG 3 hand diff --git a/data/net/minecraft/world/item/alchemy/Potion.mapping b/data/net/minecraft/world/item/alchemy/Potion.mapping index c9b0994a4..21fc6860c 100644 --- a/data/net/minecraft/world/item/alchemy/Potion.mapping +++ b/data/net/minecraft/world/item/alchemy/Potion.mapping @@ -5,14 +5,9 @@ CLASS net/minecraft/world/item/alchemy/Potion METHOD (Ljava/lang/String;[Lnet/minecraft/world/effect/MobEffectInstance;)V ARG 1 name ARG 2 effects - METHOD ([Lnet/minecraft/world/effect/MobEffectInstance;)V - ARG 1 effects METHOD getEffects ()Ljava/util/List; COMMENT Gets the base effects applied by the potion. COMMENT @return The effects applied by the potion. - METHOD getName (Ljava/util/Optional;Ljava/lang/String;)Ljava/lang/String; - ARG 0 potion - ARG 1 descriptionId METHOD hasInstantEffects ()Z COMMENT Checks if the potion contains any instant effects such as instant health or instant damage. COMMENT @return Whether the potion contained an instant effect. diff --git a/data/net/minecraft/world/item/alchemy/PotionContents.mapping b/data/net/minecraft/world/item/alchemy/PotionContents.mapping index 296b2a766..372d4ed6f 100644 --- a/data/net/minecraft/world/item/alchemy/PotionContents.mapping +++ b/data/net/minecraft/world/item/alchemy/PotionContents.mapping @@ -10,6 +10,8 @@ CLASS net/minecraft/world/item/alchemy/PotionContents ARG 1 tooltipAdder ARG 2 durationFactor ARG 3 ticksPerSecond + METHOD applyToLivingEntity (Lnet/minecraft/world/entity/LivingEntity;)V + ARG 1 entity METHOD createItemStack (Lnet/minecraft/world/item/Item;Lnet/minecraft/core/Holder;)Lnet/minecraft/world/item/ItemStack; ARG 0 item ARG 1 potion @@ -21,8 +23,15 @@ CLASS net/minecraft/world/item/alchemy/PotionContents ARG 0 potion METHOD getColorOptional (Ljava/lang/Iterable;)Ljava/util/OptionalInt; ARG 0 effects + METHOD getName (Ljava/lang/String;)Lnet/minecraft/network/chat/Component; + ARG 1 name METHOD is (Lnet/minecraft/core/Holder;)Z ARG 1 potion + METHOD lambda$addPotionTooltip$4 (Ljava/util/List;Lnet/minecraft/core/Holder;Lnet/minecraft/world/entity/ai/attributes/AttributeModifier;)V + ARG 1 attribute + ARG 2 modifier + METHOD lambda$getName$1 (Lnet/minecraft/core/Holder;)Ljava/lang/String; + ARG 0 potion METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD withEffectAdded (Lnet/minecraft/world/effect/MobEffectInstance;)Lnet/minecraft/world/item/alchemy/PotionContents; diff --git a/data/net/minecraft/world/item/armortrim/ArmorTrim.mapping b/data/net/minecraft/world/item/armortrim/ArmorTrim.mapping deleted file mode 100644 index d3d8948fd..000000000 --- a/data/net/minecraft/world/item/armortrim/ArmorTrim.mapping +++ /dev/null @@ -1,28 +0,0 @@ -CLASS net/minecraft/world/item/armortrim/ArmorTrim - METHOD (Lnet/minecraft/core/Holder;Lnet/minecraft/core/Holder;)V - ARG 1 material - ARG 2 pattern - METHOD (Lnet/minecraft/core/Holder;Lnet/minecraft/core/Holder;Z)V - ARG 1 material - ARG 2 pattern - ARG 3 showInTooltip - METHOD (Lnet/minecraft/core/Holder;Lnet/minecraft/core/Holder;ZLjava/util/function/Function;Ljava/util/function/Function;)V - ARG 1 material - ARG 2 pattern - ARG 3 showInTooltip - ARG 4 innerTexture - ARG 5 outerTexture - METHOD equals (Ljava/lang/Object;)Z - ARG 1 other - METHOD getColorPaletteSuffix (Lnet/minecraft/core/Holder;Lnet/minecraft/core/Holder;)Ljava/lang/String; - ARG 0 trimMaterial - ARG 1 armorMaterial - METHOD hasPatternAndMaterial (Lnet/minecraft/core/Holder;Lnet/minecraft/core/Holder;)Z - ARG 1 pattern - ARG 2 material - METHOD innerTexture (Lnet/minecraft/core/Holder;)Lnet/minecraft/resources/ResourceLocation; - ARG 1 armorMaterial - METHOD outerTexture (Lnet/minecraft/core/Holder;)Lnet/minecraft/resources/ResourceLocation; - ARG 1 armorMaterial - METHOD withTooltip (Z)Lnet/minecraft/world/item/armortrim/ArmorTrim; - ARG 1 showInTooltip diff --git a/data/net/minecraft/world/item/component/BundleContents.mapping b/data/net/minecraft/world/item/component/BundleContents.mapping index a81328f5c..962da45de 100644 --- a/data/net/minecraft/world/item/component/BundleContents.mapping +++ b/data/net/minecraft/world/item/component/BundleContents.mapping @@ -1,9 +1,14 @@ CLASS net/minecraft/world/item/component/BundleContents METHOD (Ljava/util/List;)V ARG 1 items - METHOD (Ljava/util/List;Lorg/apache/commons/lang3/math/Fraction;)V + METHOD (Ljava/util/List;Lorg/apache/commons/lang3/math/Fraction;I)V ARG 1 items ARG 2 weight + ARG 3 selectedItem + METHOD canItemBeInBundle (Lnet/minecraft/world/item/ItemStack;)Z + ARG 0 stack + METHOD checkAndCreate (Ljava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 0 items METHOD computeContentWeight (Ljava/util/List;)Lorg/apache/commons/lang3/math/Fraction; ARG 0 content METHOD equals (Ljava/lang/Object;)Z @@ -12,6 +17,8 @@ CLASS net/minecraft/world/item/component/BundleContents ARG 1 index METHOD getWeight (Lnet/minecraft/world/item/ItemStack;)Lorg/apache/commons/lang3/math/Fraction; ARG 0 stack + METHOD lambda$static$1 (Lnet/minecraft/world/item/component/BundleContents;)Ljava/util/List; + ARG 0 contents CLASS Mutable METHOD (Lnet/minecraft/world/item/component/BundleContents;)V ARG 1 contents @@ -19,6 +26,8 @@ CLASS net/minecraft/world/item/component/BundleContents ARG 1 stack METHOD getMaxAmountToAdd (Lnet/minecraft/world/item/ItemStack;)I ARG 1 stack + METHOD toggleSelectedItem (I)V + ARG 1 selectedItem METHOD tryInsert (Lnet/minecraft/world/item/ItemStack;)I ARG 1 stack METHOD tryTransfer (Lnet/minecraft/world/inventory/Slot;Lnet/minecraft/world/entity/player/Player;)I diff --git a/data/net/minecraft/world/item/component/Consumable.mapping b/data/net/minecraft/world/item/component/Consumable.mapping new file mode 100644 index 000000000..72e318686 --- /dev/null +++ b/data/net/minecraft/world/item/component/Consumable.mapping @@ -0,0 +1,37 @@ +CLASS net/minecraft/world/item/component/Consumable + METHOD canConsume (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;)Z + ARG 1 entity + ARG 2 stack + METHOD emitParticlesAndSounds (Lnet/minecraft/util/RandomSource;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;I)V + ARG 1 random + ARG 2 entity + ARG 3 stack + ARG 4 amount + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD onConsume (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/ItemStack; + ARG 1 level + ARG 2 entity + ARG 3 stack + METHOD shouldEmitParticlesAndSounds (I)Z + ARG 1 remainingUseDuration + METHOD startConsuming (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/InteractionHand;)Lnet/minecraft/world/InteractionResult; + ARG 1 entity + ARG 2 stack + ARG 3 hand + CLASS Builder + METHOD animation (Lnet/minecraft/world/item/ItemUseAnimation;)Lnet/minecraft/world/item/component/Consumable$Builder; + ARG 1 animation + METHOD consumeSeconds (F)Lnet/minecraft/world/item/component/Consumable$Builder; + ARG 1 consumeSounds + METHOD hasConsumeParticles (Z)Lnet/minecraft/world/item/component/Consumable$Builder; + ARG 1 hasConsumeParticles + METHOD onConsume (Lnet/minecraft/world/item/consume_effects/ConsumeEffect;)Lnet/minecraft/world/item/component/Consumable$Builder; + ARG 1 effect + METHOD sound (Lnet/minecraft/core/Holder;)Lnet/minecraft/world/item/component/Consumable$Builder; + ARG 1 sound + METHOD soundAfterConsume (Lnet/minecraft/core/Holder;)Lnet/minecraft/world/item/component/Consumable$Builder; + ARG 1 consumptionSound + CLASS OverrideConsumeSound + METHOD getConsumeSound (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/sounds/SoundEvent; + ARG 1 stack diff --git a/data/net/minecraft/world/item/component/ConsumableListener.mapping b/data/net/minecraft/world/item/component/ConsumableListener.mapping new file mode 100644 index 000000000..d58a8f2cf --- /dev/null +++ b/data/net/minecraft/world/item/component/ConsumableListener.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/world/item/component/ConsumableListener + METHOD onConsume (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/component/Consumable;)V + ARG 1 level + ARG 2 entity + ARG 3 stack + ARG 4 consumable diff --git a/data/net/minecraft/world/item/component/DamageResistant.mapping b/data/net/minecraft/world/item/component/DamageResistant.mapping new file mode 100644 index 000000000..92617d525 --- /dev/null +++ b/data/net/minecraft/world/item/component/DamageResistant.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/world/item/component/DamageResistant + METHOD isResistantTo (Lnet/minecraft/world/damagesource/DamageSource;)Z + ARG 1 damageSource + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/item/component/DeathProtection.mapping b/data/net/minecraft/world/item/component/DeathProtection.mapping new file mode 100644 index 000000000..67daa1af1 --- /dev/null +++ b/data/net/minecraft/world/item/component/DeathProtection.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/world/item/component/DeathProtection + METHOD applyEffects (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/LivingEntity;)V + ARG 1 stack + ARG 2 entity + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/item/component/Tool.mapping b/data/net/minecraft/world/item/component/Tool.mapping index 5b139beb6..79ef9a72e 100644 --- a/data/net/minecraft/world/item/component/Tool.mapping +++ b/data/net/minecraft/world/item/component/Tool.mapping @@ -6,27 +6,13 @@ CLASS net/minecraft/world/item/component/Tool METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance CLASS Rule - METHOD deniesDrops (Lnet/minecraft/tags/TagKey;)Lnet/minecraft/world/item/component/Tool$Rule; + METHOD deniesDrops (Lnet/minecraft/core/HolderSet;)Lnet/minecraft/world/item/component/Tool$Rule; ARG 0 blocks - METHOD forBlocks (Ljava/util/List;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/world/item/component/Tool$Rule; - ARG 0 blocks - ARG 1 speed - ARG 2 correctForDrops - METHOD forTag (Lnet/minecraft/tags/TagKey;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/world/item/component/Tool$Rule; - ARG 0 tag - ARG 1 speed - ARG 2 correctForDrops METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD minesAndDrops (Ljava/util/List;F)Lnet/minecraft/world/item/component/Tool$Rule; - ARG 0 blocks - ARG 1 speed - METHOD minesAndDrops (Lnet/minecraft/tags/TagKey;F)Lnet/minecraft/world/item/component/Tool$Rule; - ARG 0 blocks - ARG 1 speed - METHOD overrideSpeed (Ljava/util/List;F)Lnet/minecraft/world/item/component/Tool$Rule; + METHOD minesAndDrops (Lnet/minecraft/core/HolderSet;F)Lnet/minecraft/world/item/component/Tool$Rule; ARG 0 blocks ARG 1 speed - METHOD overrideSpeed (Lnet/minecraft/tags/TagKey;F)Lnet/minecraft/world/item/component/Tool$Rule; + METHOD overrideSpeed (Lnet/minecraft/core/HolderSet;F)Lnet/minecraft/world/item/component/Tool$Rule; ARG 0 blocks ARG 1 speed diff --git a/data/net/minecraft/world/item/component/UseCooldown.mapping b/data/net/minecraft/world/item/component/UseCooldown.mapping new file mode 100644 index 000000000..df390720f --- /dev/null +++ b/data/net/minecraft/world/item/component/UseCooldown.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/world/item/component/UseCooldown + METHOD (F)V + ARG 1 seconds + METHOD apply (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/LivingEntity;)V + ARG 1 stack + ARG 2 entity + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/item/component/UseRemainder.mapping b/data/net/minecraft/world/item/component/UseRemainder.mapping new file mode 100644 index 000000000..51c3811c0 --- /dev/null +++ b/data/net/minecraft/world/item/component/UseRemainder.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/world/item/component/UseRemainder + METHOD convertIntoRemainder (Lnet/minecraft/world/item/ItemStack;IZLnet/minecraft/world/item/component/UseRemainder$OnExtraCreatedRemainder;)Lnet/minecraft/world/item/ItemStack; + ARG 1 stack + ARG 2 count + ARG 3 hasInfiniteMaterials + ARG 4 onExtraCreated + METHOD equals (Ljava/lang/Object;)Z + ARG 1 other + CLASS OnExtraCreatedRemainder + METHOD apply (Lnet/minecraft/world/item/ItemStack;)V + ARG 1 stack diff --git a/data/net/minecraft/world/item/consume_effects/ApplyStatusEffectsConsumeEffect.mapping b/data/net/minecraft/world/item/consume_effects/ApplyStatusEffectsConsumeEffect.mapping new file mode 100644 index 000000000..1961df344 --- /dev/null +++ b/data/net/minecraft/world/item/consume_effects/ApplyStatusEffectsConsumeEffect.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/world/item/consume_effects/ApplyStatusEffectsConsumeEffect + METHOD (Ljava/util/List;)V + ARG 1 effects + METHOD (Lnet/minecraft/world/effect/MobEffectInstance;)V + ARG 1 effect + METHOD (Lnet/minecraft/world/effect/MobEffectInstance;F)V + ARG 1 effect + ARG 2 probability + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/item/consume_effects/ConsumeEffect.mapping b/data/net/minecraft/world/item/consume_effects/ConsumeEffect.mapping new file mode 100644 index 000000000..efe0ccd88 --- /dev/null +++ b/data/net/minecraft/world/item/consume_effects/ConsumeEffect.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/world/item/consume_effects/ConsumeEffect + METHOD apply (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/LivingEntity;)Z + ARG 1 level + ARG 2 stack + ARG 3 entity + CLASS Type + METHOD register (Ljava/lang/String;Lcom/mojang/serialization/MapCodec;Lnet/minecraft/network/codec/StreamCodec;)Lnet/minecraft/world/item/consume_effects/ConsumeEffect$Type; + ARG 0 name + ARG 1 codec + ARG 2 streamCodec diff --git a/data/net/minecraft/world/item/consume_effects/PlaySoundConsumeEffect.mapping b/data/net/minecraft/world/item/consume_effects/PlaySoundConsumeEffect.mapping new file mode 100644 index 000000000..33f1c537f --- /dev/null +++ b/data/net/minecraft/world/item/consume_effects/PlaySoundConsumeEffect.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/world/item/consume_effects/PlaySoundConsumeEffect + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/item/consume_effects/RemoveStatusEffectsConsumeEffect.mapping b/data/net/minecraft/world/item/consume_effects/RemoveStatusEffectsConsumeEffect.mapping new file mode 100644 index 000000000..4d54743ea --- /dev/null +++ b/data/net/minecraft/world/item/consume_effects/RemoveStatusEffectsConsumeEffect.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/world/item/consume_effects/RemoveStatusEffectsConsumeEffect + METHOD (Lnet/minecraft/core/Holder;)V + ARG 1 effects diff --git a/data/net/minecraft/world/item/consume_effects/TeleportRandomlyConsumeEffect.mapping b/data/net/minecraft/world/item/consume_effects/TeleportRandomlyConsumeEffect.mapping new file mode 100644 index 000000000..b2c4dfaa4 --- /dev/null +++ b/data/net/minecraft/world/item/consume_effects/TeleportRandomlyConsumeEffect.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/world/item/consume_effects/TeleportRandomlyConsumeEffect + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/item/crafting/AbstractCookingRecipe.mapping b/data/net/minecraft/world/item/crafting/AbstractCookingRecipe.mapping index 77ed1db15..1e3305c14 100644 --- a/data/net/minecraft/world/item/crafting/AbstractCookingRecipe.mapping +++ b/data/net/minecraft/world/item/crafting/AbstractCookingRecipe.mapping @@ -1,22 +1,11 @@ CLASS net/minecraft/world/item/crafting/AbstractCookingRecipe - METHOD (Lnet/minecraft/world/item/crafting/RecipeType;Ljava/lang/String;Lnet/minecraft/world/item/crafting/CookingBookCategory;Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/world/item/ItemStack;FI)V - ARG 1 type - ARG 2 group - ARG 3 category - ARG 4 ingredient - ARG 5 result - ARG 6 experience - ARG 7 cookingTime - METHOD canCraftInDimensions (II)Z - COMMENT Used to determine if this recipe can fit in a grid of the given width/height - ARG 1 width - ARG 2 height - METHOD getCookingTime ()I - COMMENT Gets the cook time in ticks - METHOD getExperience ()F - COMMENT Gets the experience of this recipe - METHOD getGroup ()Ljava/lang/String; - COMMENT Recipes with equal group are combined into one button in the recipe book + METHOD (Ljava/lang/String;Lnet/minecraft/world/item/crafting/CookingBookCategory;Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/world/item/ItemStack;FI)V + ARG 1 group + ARG 2 category + ARG 3 input + ARG 4 result + ARG 5 experience + ARG 6 cookingTime CLASS Factory METHOD create (Ljava/lang/String;Lnet/minecraft/world/item/crafting/CookingBookCategory;Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/world/item/ItemStack;FI)Lnet/minecraft/world/item/crafting/AbstractCookingRecipe; ARG 1 group @@ -25,3 +14,9 @@ CLASS net/minecraft/world/item/crafting/AbstractCookingRecipe ARG 4 result ARG 5 experience ARG 6 cookingTime + CLASS Serializer + METHOD (Lnet/minecraft/world/item/crafting/AbstractCookingRecipe$Factory;I)V + ARG 1 factory + ARG 2 defaultCookingTime + METHOD lambda$new$0 (ILnet/minecraft/world/item/crafting/AbstractCookingRecipe$Factory;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 2 instance diff --git a/data/net/minecraft/world/item/crafting/ArmorDyeRecipe.mapping b/data/net/minecraft/world/item/crafting/ArmorDyeRecipe.mapping deleted file mode 100644 index 7d7ce3ede..000000000 --- a/data/net/minecraft/world/item/crafting/ArmorDyeRecipe.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/world/item/crafting/ArmorDyeRecipe - METHOD canCraftInDimensions (II)Z - COMMENT Used to determine if this recipe can fit in a grid of the given width/height - ARG 1 width - ARG 2 height diff --git a/data/net/minecraft/world/item/crafting/BannerDuplicateRecipe.mapping b/data/net/minecraft/world/item/crafting/BannerDuplicateRecipe.mapping deleted file mode 100644 index 98339ec18..000000000 --- a/data/net/minecraft/world/item/crafting/BannerDuplicateRecipe.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/world/item/crafting/BannerDuplicateRecipe - METHOD canCraftInDimensions (II)Z - COMMENT Used to determine if this recipe can fit in a grid of the given width/height - ARG 1 width - ARG 2 height diff --git a/data/net/minecraft/world/item/crafting/BookCloningRecipe.mapping b/data/net/minecraft/world/item/crafting/BookCloningRecipe.mapping deleted file mode 100644 index 1aa1c0d4c..000000000 --- a/data/net/minecraft/world/item/crafting/BookCloningRecipe.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/world/item/crafting/BookCloningRecipe - METHOD canCraftInDimensions (II)Z - COMMENT Used to determine if this recipe can fit in a grid of the given width/height - ARG 1 width - ARG 2 height diff --git a/data/net/minecraft/world/item/crafting/CookingBookCategory.mapping b/data/net/minecraft/world/item/crafting/CookingBookCategory.mapping index e7be5f1ba..f45acc9d3 100644 --- a/data/net/minecraft/world/item/crafting/CookingBookCategory.mapping +++ b/data/net/minecraft/world/item/crafting/CookingBookCategory.mapping @@ -1,3 +1,8 @@ CLASS net/minecraft/world/item/crafting/CookingBookCategory - METHOD (Ljava/lang/String;ILjava/lang/String;)V - ARG 3 name + METHOD (Ljava/lang/String;IILjava/lang/String;)V + ARG 3 id + ARG 4 name + METHOD lambda$static$0 (Lnet/minecraft/world/item/crafting/CookingBookCategory;)I + ARG 0 category + METHOD lambda$static$1 (Lnet/minecraft/world/item/crafting/CookingBookCategory;)I + ARG 0 category diff --git a/data/net/minecraft/world/item/crafting/CraftingRecipe.mapping b/data/net/minecraft/world/item/crafting/CraftingRecipe.mapping new file mode 100644 index 000000000..8cd3acea3 --- /dev/null +++ b/data/net/minecraft/world/item/crafting/CraftingRecipe.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/world/item/crafting/CraftingRecipe + METHOD defaultCraftingReminder (Lnet/minecraft/world/item/crafting/CraftingInput;)Lnet/minecraft/core/NonNullList; + ARG 0 input + METHOD getRemainingItems (Lnet/minecraft/world/item/crafting/CraftingInput;)Lnet/minecraft/core/NonNullList; + ARG 1 input diff --git a/data/net/minecraft/world/item/crafting/CustomRecipe.mapping b/data/net/minecraft/world/item/crafting/CustomRecipe.mapping index 1c036997f..a327e623c 100644 --- a/data/net/minecraft/world/item/crafting/CustomRecipe.mapping +++ b/data/net/minecraft/world/item/crafting/CustomRecipe.mapping @@ -3,3 +3,11 @@ CLASS net/minecraft/world/item/crafting/CustomRecipe ARG 1 category METHOD isSpecial ()Z COMMENT If true, this recipe does not appear in the recipe book and does not respect recipe unlocking (and the doLimitedCrafting gamerule) + CLASS Serializer + METHOD (Lnet/minecraft/world/item/crafting/CustomRecipe$Serializer$Factory;)V + ARG 1 factory + METHOD lambda$new$0 (Lnet/minecraft/world/item/crafting/CustomRecipe$Serializer$Factory;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 1 instance + CLASS Factory + METHOD create (Lnet/minecraft/world/item/crafting/CraftingBookCategory;)Lnet/minecraft/world/item/crafting/CraftingRecipe; + ARG 1 category diff --git a/data/net/minecraft/world/item/crafting/DecoratedPotRecipe.mapping b/data/net/minecraft/world/item/crafting/DecoratedPotRecipe.mapping new file mode 100644 index 000000000..562a2c90b --- /dev/null +++ b/data/net/minecraft/world/item/crafting/DecoratedPotRecipe.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/world/item/crafting/DecoratedPotRecipe + METHOD back (Lnet/minecraft/world/item/crafting/CraftingInput;)Lnet/minecraft/world/item/ItemStack; + ARG 0 input + METHOD front (Lnet/minecraft/world/item/crafting/CraftingInput;)Lnet/minecraft/world/item/ItemStack; + ARG 0 input + METHOD left (Lnet/minecraft/world/item/crafting/CraftingInput;)Lnet/minecraft/world/item/ItemStack; + ARG 0 input + METHOD right (Lnet/minecraft/world/item/crafting/CraftingInput;)Lnet/minecraft/world/item/ItemStack; + ARG 0 input diff --git a/data/net/minecraft/world/item/crafting/FireworkRocketRecipe.mapping b/data/net/minecraft/world/item/crafting/FireworkRocketRecipe.mapping deleted file mode 100644 index 070010941..000000000 --- a/data/net/minecraft/world/item/crafting/FireworkRocketRecipe.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/world/item/crafting/FireworkRocketRecipe - METHOD canCraftInDimensions (II)Z - COMMENT Used to determine if this recipe can fit in a grid of the given width/height - ARG 1 width - ARG 2 height diff --git a/data/net/minecraft/world/item/crafting/FireworkStarFadeRecipe.mapping b/data/net/minecraft/world/item/crafting/FireworkStarFadeRecipe.mapping deleted file mode 100644 index bb651a9cb..000000000 --- a/data/net/minecraft/world/item/crafting/FireworkStarFadeRecipe.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/world/item/crafting/FireworkStarFadeRecipe - METHOD canCraftInDimensions (II)Z - COMMENT Used to determine if this recipe can fit in a grid of the given width/height - ARG 1 width - ARG 2 height diff --git a/data/net/minecraft/world/item/crafting/FireworkStarRecipe.mapping b/data/net/minecraft/world/item/crafting/FireworkStarRecipe.mapping deleted file mode 100644 index d70f96107..000000000 --- a/data/net/minecraft/world/item/crafting/FireworkStarRecipe.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/world/item/crafting/FireworkStarRecipe - METHOD canCraftInDimensions (II)Z - COMMENT Used to determine if this recipe can fit in a grid of the given width/height - ARG 1 width - ARG 2 height - METHOD lambda$static$0 (Ljava/util/HashMap;)V - ARG 0 shapeMap diff --git a/data/net/minecraft/world/item/crafting/Ingredient.mapping b/data/net/minecraft/world/item/crafting/Ingredient.mapping index a45221412..35e7c53f7 100644 --- a/data/net/minecraft/world/item/crafting/Ingredient.mapping +++ b/data/net/minecraft/world/item/crafting/Ingredient.mapping @@ -1,31 +1,28 @@ CLASS net/minecraft/world/item/crafting/Ingredient - METHOD (Ljava/util/stream/Stream;)V + METHOD (Lnet/minecraft/core/HolderSet;)V ARG 1 values - METHOD ([Lnet/minecraft/world/item/crafting/Ingredient$Value;)V - ARG 1 values - METHOD codec (Z)Lcom/mojang/serialization/Codec; - ARG 0 allowEmpty + METHOD displayForSingleItem (Lnet/minecraft/core/Holder;)Lnet/minecraft/world/item/crafting/display/SlotDisplay; + ARG 0 item METHOD equals (Ljava/lang/Object;)Z ARG 1 other - METHOD fromValues (Ljava/util/stream/Stream;)Lnet/minecraft/world/item/crafting/Ingredient; - ARG 0 stream + METHOD lambda$of$7 (Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/core/Holder$Reference; + ARG 0 item + METHOD lambda$static$1 (Lnet/minecraft/core/HolderSet;)Ljava/util/Optional; + ARG 0 items + METHOD lambda$static$2 (Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/core/HolderSet; + ARG 0 ingredient METHOD of (Ljava/util/stream/Stream;)Lnet/minecraft/world/item/crafting/Ingredient; - ARG 0 stacks - METHOD of (Lnet/minecraft/tags/TagKey;)Lnet/minecraft/world/item/crafting/Ingredient; - ARG 0 tag - METHOD of ([Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/crafting/Ingredient; - ARG 0 stacks + ARG 0 items + METHOD of (Lnet/minecraft/core/HolderSet;)Lnet/minecraft/world/item/crafting/Ingredient; + ARG 0 items + METHOD of (Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/item/crafting/Ingredient; + ARG 0 item METHOD of ([Lnet/minecraft/world/level/ItemLike;)Lnet/minecraft/world/item/crafting/Ingredient; ARG 0 items + METHOD optionalIngredientToDisplay (Ljava/util/Optional;)Lnet/minecraft/world/item/crafting/display/SlotDisplay; + ARG 0 ingredient METHOD test (Lnet/minecraft/world/item/ItemStack;)Z ARG 1 stack - CLASS TagValue - METHOD (Lnet/minecraft/tags/TagKey;)V - ARG 1 tag - METHOD equals (Ljava/lang/Object;)Z - ARG 1 other - CLASS ItemValue - METHOD (Lnet/minecraft/world/item/ItemStack;)V - ARG 1 item - METHOD equals (Ljava/lang/Object;)Z - ARG 1 other + METHOD testOptionalIngredient (Ljava/util/Optional;Lnet/minecraft/world/item/ItemStack;)Z + ARG 0 ingredient + ARG 1 stack diff --git a/data/net/minecraft/world/item/crafting/MapCloningRecipe.mapping b/data/net/minecraft/world/item/crafting/MapCloningRecipe.mapping deleted file mode 100644 index 0062998ad..000000000 --- a/data/net/minecraft/world/item/crafting/MapCloningRecipe.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/world/item/crafting/MapCloningRecipe - METHOD canCraftInDimensions (II)Z - COMMENT Used to determine if this recipe can fit in a grid of the given width/height - ARG 1 width - ARG 2 height diff --git a/data/net/minecraft/world/item/crafting/PlacementInfo.mapping b/data/net/minecraft/world/item/crafting/PlacementInfo.mapping new file mode 100644 index 000000000..8b45634c3 --- /dev/null +++ b/data/net/minecraft/world/item/crafting/PlacementInfo.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/world/item/crafting/PlacementInfo + METHOD (Ljava/util/List;Ljava/util/List;Ljava/util/List;)V + ARG 1 ingredients + ARG 2 unpackedIngredients + ARG 3 slotInfo + METHOD create (Ljava/util/List;)Lnet/minecraft/world/item/crafting/PlacementInfo; + ARG 0 ingredients + METHOD create (Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/world/item/crafting/PlacementInfo; + ARG 0 ingredient + METHOD createFromOptionals (Ljava/util/List;)Lnet/minecraft/world/item/crafting/PlacementInfo; + ARG 0 optionals + METHOD ingredientToContents (Lnet/minecraft/world/item/crafting/Ingredient;)Lnet/minecraft/world/entity/player/StackedContents$IngredientInfo; + ARG 0 ingredient diff --git a/data/net/minecraft/world/item/crafting/Recipe.mapping b/data/net/minecraft/world/item/crafting/Recipe.mapping index c529e27a3..1e8411beb 100644 --- a/data/net/minecraft/world/item/crafting/Recipe.mapping +++ b/data/net/minecraft/world/item/crafting/Recipe.mapping @@ -2,20 +2,8 @@ CLASS net/minecraft/world/item/crafting/Recipe METHOD assemble (Lnet/minecraft/world/item/crafting/RecipeInput;Lnet/minecraft/core/HolderLookup$Provider;)Lnet/minecraft/world/item/ItemStack; ARG 1 input ARG 2 registries - METHOD canCraftInDimensions (II)Z - COMMENT Used to determine if this recipe can fit in a grid of the given width/height - ARG 1 width - ARG 2 height - METHOD getGroup ()Ljava/lang/String; - COMMENT Recipes with equal group are combined into one button in the recipe book - METHOD getRemainingItems (Lnet/minecraft/world/item/crafting/RecipeInput;)Lnet/minecraft/core/NonNullList; - ARG 1 input - METHOD getResultItem (Lnet/minecraft/core/HolderLookup$Provider;)Lnet/minecraft/world/item/ItemStack; - ARG 1 registries METHOD isSpecial ()Z COMMENT If true, this recipe does not appear in the recipe book and does not respect recipe unlocking (and the doLimitedCrafting gamerule) - METHOD lambda$isIncomplete$0 (Lnet/minecraft/world/item/crafting/Ingredient;)Z - ARG 0 ingredient METHOD matches (Lnet/minecraft/world/item/crafting/RecipeInput;Lnet/minecraft/world/level/Level;)Z ARG 1 input ARG 2 level diff --git a/data/net/minecraft/world/item/crafting/RecipeAccess.mapping b/data/net/minecraft/world/item/crafting/RecipeAccess.mapping new file mode 100644 index 000000000..70526b4a0 --- /dev/null +++ b/data/net/minecraft/world/item/crafting/RecipeAccess.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/world/item/crafting/RecipeAccess + METHOD propertySet (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/item/crafting/RecipePropertySet; + ARG 1 propertySet diff --git a/data/net/minecraft/world/item/crafting/RecipeBookCategories.mapping b/data/net/minecraft/world/item/crafting/RecipeBookCategories.mapping new file mode 100644 index 000000000..01f3cdb0c --- /dev/null +++ b/data/net/minecraft/world/item/crafting/RecipeBookCategories.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/world/item/crafting/RecipeBookCategories + METHOD bootstrap (Lnet/minecraft/core/Registry;)Lnet/minecraft/world/item/crafting/RecipeBookCategory; + ARG 0 registry + METHOD register (Ljava/lang/String;)Lnet/minecraft/world/item/crafting/RecipeBookCategory; + ARG 0 name diff --git a/data/net/minecraft/world/item/crafting/RecipeCache.mapping b/data/net/minecraft/world/item/crafting/RecipeCache.mapping index a936af185..673a7467c 100644 --- a/data/net/minecraft/world/item/crafting/RecipeCache.mapping +++ b/data/net/minecraft/world/item/crafting/RecipeCache.mapping @@ -1,18 +1,18 @@ CLASS net/minecraft/world/item/crafting/RecipeCache METHOD (I)V ARG 1 size - METHOD compute (Lnet/minecraft/world/item/crafting/CraftingInput;Lnet/minecraft/world/level/Level;)Ljava/util/Optional; - ARG 1 input + METHOD compute (Lnet/minecraft/world/item/crafting/CraftingInput;Lnet/minecraft/server/level/ServerLevel;)Ljava/util/Optional; + ARG 1 craftingInput ARG 2 level - METHOD get (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/crafting/CraftingInput;)Ljava/util/Optional; + METHOD get (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/crafting/CraftingInput;)Ljava/util/Optional; ARG 1 level - ARG 2 input + ARG 2 craftingInput METHOD insert (Lnet/minecraft/world/item/crafting/CraftingInput;Lnet/minecraft/world/item/crafting/RecipeHolder;)V ARG 1 input ARG 2 recipe METHOD moveEntryToFront (I)V ARG 1 index - METHOD validateRecipeManager (Lnet/minecraft/world/level/Level;)V + METHOD validateRecipeManager (Lnet/minecraft/server/level/ServerLevel;)V ARG 1 level CLASS Entry METHOD matches (Lnet/minecraft/world/item/crafting/CraftingInput;)Z diff --git a/data/net/minecraft/world/item/crafting/RecipeManager.mapping b/data/net/minecraft/world/item/crafting/RecipeManager.mapping index 59ca4aef4..ef0aca69a 100644 --- a/data/net/minecraft/world/item/crafting/RecipeManager.mapping +++ b/data/net/minecraft/world/item/crafting/RecipeManager.mapping @@ -1,50 +1,90 @@ CLASS net/minecraft/world/item/crafting/RecipeManager METHOD (Lnet/minecraft/core/HolderLookup$Provider;)V ARG 1 registries - METHOD apply (Ljava/util/Map;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;)V - ARG 1 object - ARG 2 resourceManager - ARG 3 profiler - METHOD byKey (Lnet/minecraft/resources/ResourceLocation;)Ljava/util/Optional; - ARG 1 recipeId - METHOD byKeyTyped (Lnet/minecraft/world/item/crafting/RecipeType;Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/world/item/crafting/RecipeHolder; - ARG 1 type - ARG 2 name - METHOD byType (Lnet/minecraft/world/item/crafting/RecipeType;)Ljava/util/Collection; + METHOD byKey (Lnet/minecraft/resources/ResourceKey;)Ljava/util/Optional; + ARG 1 key + METHOD byKeyTyped (Lnet/minecraft/world/item/crafting/RecipeType;Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/item/crafting/RecipeHolder; ARG 1 type + ARG 2 key METHOD createCheck (Lnet/minecraft/world/item/crafting/RecipeType;)Lnet/minecraft/world/item/crafting/RecipeManager$CachedCheck; ARG 0 recipeType - METHOD fromJson (Lnet/minecraft/resources/ResourceLocation;Lcom/google/gson/JsonObject;Lnet/minecraft/core/HolderLookup$Provider;)Lnet/minecraft/world/item/crafting/RecipeHolder; - ARG 0 recipeId + METHOD filterDisabled (Lnet/minecraft/world/flag/FeatureFlagSet;Ljava/util/List;)Ljava/util/List; + ARG 0 enabledFeatures + ARG 1 ingredients + METHOD finalizeRecipeLoading (Lnet/minecraft/world/flag/FeatureFlagSet;)V + ARG 1 enabledFeatures + METHOD forSingleInput (Lnet/minecraft/world/item/crafting/RecipeType;)Lnet/minecraft/world/item/crafting/RecipeManager$IngredientExtractor; + ARG 0 recipeType + METHOD fromJson (Lnet/minecraft/resources/ResourceKey;Lcom/google/gson/JsonObject;Lnet/minecraft/core/HolderLookup$Provider;)Lnet/minecraft/world/item/crafting/RecipeHolder; + ARG 0 recipe ARG 1 json ARG 2 registries - METHOD getAllRecipesFor (Lnet/minecraft/world/item/crafting/RecipeType;)Ljava/util/List; - ARG 1 recipeType METHOD getRecipeFor (Lnet/minecraft/world/item/crafting/RecipeType;Lnet/minecraft/world/item/crafting/RecipeInput;Lnet/minecraft/world/level/Level;)Ljava/util/Optional; ARG 1 recipeType ARG 2 input ARG 3 level - METHOD getRecipeFor (Lnet/minecraft/world/item/crafting/RecipeType;Lnet/minecraft/world/item/crafting/RecipeInput;Lnet/minecraft/world/level/Level;Lnet/minecraft/resources/ResourceLocation;)Ljava/util/Optional; + METHOD getRecipeFor (Lnet/minecraft/world/item/crafting/RecipeType;Lnet/minecraft/world/item/crafting/RecipeInput;Lnet/minecraft/world/level/Level;Lnet/minecraft/resources/ResourceKey;)Ljava/util/Optional; ARG 1 recipeType ARG 2 input ARG 3 level - ARG 4 lastRecipe + ARG 4 recipe METHOD getRecipeFor (Lnet/minecraft/world/item/crafting/RecipeType;Lnet/minecraft/world/item/crafting/RecipeInput;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/crafting/RecipeHolder;)Ljava/util/Optional; ARG 1 recipeType ARG 2 input ARG 3 level ARG 4 lastRecipe - METHOD getRecipesFor (Lnet/minecraft/world/item/crafting/RecipeType;Lnet/minecraft/world/item/crafting/RecipeInput;Lnet/minecraft/world/level/Level;)Ljava/util/List; - ARG 1 recipeType - ARG 2 input - ARG 3 level - METHOD getRemainingItemsFor (Lnet/minecraft/world/item/crafting/RecipeType;Lnet/minecraft/world/item/crafting/RecipeInput;Lnet/minecraft/world/level/Level;)Lnet/minecraft/core/NonNullList; - ARG 1 recipeType - ARG 2 input - ARG 3 lvel - METHOD replaceRecipes (Ljava/lang/Iterable;)V - ARG 1 recipes + METHOD getRecipeFromDisplay (Lnet/minecraft/world/item/crafting/display/RecipeDisplayId;)Lnet/minecraft/world/item/crafting/RecipeManager$ServerDisplayInfo; + ARG 1 display + METHOD isIngredientEnabled (Lnet/minecraft/world/flag/FeatureFlagSet;Lnet/minecraft/world/item/crafting/Ingredient;)Z + ARG 0 enabledFeatures + ARG 1 ingredient + METHOD lambda$filterDisabled$10 (Lnet/minecraft/world/flag/FeatureFlagSet;Lnet/minecraft/world/item/crafting/Ingredient;)Z + ARG 1 ingredient + METHOD lambda$finalizeRecipeLoading$4 (Ljava/util/Map$Entry;)Lnet/minecraft/world/item/crafting/RecipeManager$IngredientCollector; + ARG 0 entry + METHOD lambda$finalizeRecipeLoading$5 (Lnet/minecraft/world/item/crafting/Recipe;Lnet/minecraft/world/item/crafting/RecipeManager$IngredientCollector;)V + ARG 1 collector + METHOD lambda$finalizeRecipeLoading$6 (Ljava/util/List;Lnet/minecraft/world/flag/FeatureFlagSet;Ljava/util/List;Lnet/minecraft/world/item/crafting/RecipeHolder;)V + ARG 3 recipe + METHOD lambda$finalizeRecipeLoading$7 (Lnet/minecraft/world/item/crafting/RecipeManager$IngredientCollector;)Lnet/minecraft/resources/ResourceKey; + ARG 0 collector + METHOD lambda$finalizeRecipeLoading$8 (Lnet/minecraft/world/flag/FeatureFlagSet;Lnet/minecraft/world/item/crafting/RecipeManager$IngredientCollector;)Lnet/minecraft/world/item/crafting/RecipePropertySet; + ARG 1 collector + METHOD lambda$finalizeRecipeLoading$9 (Lnet/minecraft/world/item/crafting/RecipeManager$ServerDisplayInfo;)Lnet/minecraft/resources/ResourceKey; + ARG 0 displayInfo + METHOD lambda$forSingleInput$14 (Lnet/minecraft/world/item/crafting/RecipeType;Lnet/minecraft/world/item/crafting/Recipe;)Ljava/util/Optional; + ARG 1 recipe + METHOD lambda$isIngredientEnabled$11 (Lnet/minecraft/world/flag/FeatureFlagSet;Lnet/minecraft/core/Holder;)Z + ARG 1 item + METHOD lambda$listDisplaysForRecipe$12 (Ljava/util/function/Consumer;Lnet/minecraft/world/item/crafting/RecipeManager$ServerDisplayInfo;)V + ARG 1 displayInfo + METHOD lambda$prepare$3 (Ljava/util/List;Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/world/item/crafting/Recipe;)V + ARG 1 location + ARG 2 recipe + METHOD lambda$static$0 (Lnet/minecraft/world/item/crafting/Recipe;)Ljava/util/Optional; + ARG 0 recipe + METHOD lambda$static$1 (Lnet/minecraft/world/item/crafting/Recipe;)Ljava/util/Optional; + ARG 0 recipe + METHOD lambda$static$2 (Lnet/minecraft/world/item/crafting/Recipe;)Ljava/util/Optional; + ARG 0 recipe + METHOD listDisplaysForRecipe (Lnet/minecraft/resources/ResourceKey;Ljava/util/function/Consumer;)V + ARG 1 recipe + ARG 2 output + METHOD unpackRecipeInfo (Ljava/lang/Iterable;Lnet/minecraft/world/flag/FeatureFlagSet;)Ljava/util/List; + ARG 0 recipes + ARG 1 enabledFeatures CLASS CachedCheck - METHOD getRecipeFor (Lnet/minecraft/world/item/crafting/RecipeInput;Lnet/minecraft/world/level/Level;)Ljava/util/Optional; + METHOD getRecipeFor (Lnet/minecraft/world/item/crafting/RecipeInput;Lnet/minecraft/server/level/ServerLevel;)Ljava/util/Optional; ARG 1 input ARG 2 level + CLASS IngredientCollector + METHOD (Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/world/item/crafting/RecipeManager$IngredientExtractor;)V + ARG 1 key + ARG 2 extractor + METHOD accept (Lnet/minecraft/world/item/crafting/Recipe;)V + ARG 1 recipe + METHOD asPropertySet (Lnet/minecraft/world/flag/FeatureFlagSet;)Lnet/minecraft/world/item/crafting/RecipePropertySet; + ARG 1 enabledFeatures + CLASS IngredientExtractor + METHOD apply (Lnet/minecraft/world/item/crafting/Recipe;)Ljava/util/Optional; + ARG 1 recipe diff --git a/data/net/minecraft/world/item/crafting/RecipeMap.mapping b/data/net/minecraft/world/item/crafting/RecipeMap.mapping new file mode 100644 index 000000000..4a819607b --- /dev/null +++ b/data/net/minecraft/world/item/crafting/RecipeMap.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/world/item/crafting/RecipeMap + METHOD (Lcom/google/common/collect/Multimap;Ljava/util/Map;)V + ARG 1 byType + ARG 2 byKey + METHOD byKey (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/item/crafting/RecipeHolder; + ARG 1 key + METHOD byType (Lnet/minecraft/world/item/crafting/RecipeType;)Ljava/util/Collection; + ARG 1 type + METHOD create (Ljava/lang/Iterable;)Lnet/minecraft/world/item/crafting/RecipeMap; + ARG 0 recipes + METHOD getRecipesFor (Lnet/minecraft/world/item/crafting/RecipeType;Lnet/minecraft/world/item/crafting/RecipeInput;Lnet/minecraft/world/level/Level;)Ljava/util/stream/Stream; + ARG 1 type + ARG 2 input + ARG 3 level diff --git a/data/net/minecraft/world/item/crafting/RecipePropertySet.mapping b/data/net/minecraft/world/item/crafting/RecipePropertySet.mapping new file mode 100644 index 000000000..12019a4fa --- /dev/null +++ b/data/net/minecraft/world/item/crafting/RecipePropertySet.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/world/item/crafting/RecipePropertySet + METHOD (Ljava/util/Set;)V + ARG 1 items + METHOD create (Ljava/util/Collection;)Lnet/minecraft/world/item/crafting/RecipePropertySet; + ARG 0 ingredients + METHOD lambda$create$2 (Lnet/minecraft/world/item/crafting/Ingredient;)Ljava/util/stream/Stream; + ARG 0 ingredient + METHOD registerVanilla (Ljava/lang/String;)Lnet/minecraft/resources/ResourceKey; + ARG 0 name + METHOD test (Lnet/minecraft/world/item/ItemStack;)Z + ARG 1 stack diff --git a/data/net/minecraft/world/item/crafting/RepairItemRecipe.mapping b/data/net/minecraft/world/item/crafting/RepairItemRecipe.mapping index f1a730701..4c3051c39 100644 --- a/data/net/minecraft/world/item/crafting/RepairItemRecipe.mapping +++ b/data/net/minecraft/world/item/crafting/RepairItemRecipe.mapping @@ -2,9 +2,11 @@ CLASS net/minecraft/world/item/crafting/RepairItemRecipe METHOD canCombine (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;)Z ARG 0 stack1 ARG 1 stack2 - METHOD canCraftInDimensions (II)Z - COMMENT Used to determine if this recipe can fit in a grid of the given width/height - ARG 1 width - ARG 2 height METHOD getItemsToCombine (Lnet/minecraft/world/item/crafting/CraftingInput;)Lcom/mojang/datafixers/util/Pair; - ARG 1 input + ARG 0 input + METHOD lambda$assemble$0 (Lnet/minecraft/core/Holder$Reference;)Z + ARG 0 enchantment + METHOD lambda$assemble$1 (Lnet/minecraft/world/item/enchantment/ItemEnchantments;Lnet/minecraft/world/item/enchantment/ItemEnchantments;Lnet/minecraft/world/item/enchantment/ItemEnchantments$Mutable;Lnet/minecraft/core/Holder$Reference;)V + ARG 3 enchantment + METHOD lambda$assemble$2 (Lnet/minecraft/core/HolderLookup$Provider;Lnet/minecraft/world/item/enchantment/ItemEnchantments;Lnet/minecraft/world/item/enchantment/ItemEnchantments;Lnet/minecraft/world/item/enchantment/ItemEnchantments$Mutable;)V + ARG 3 enchantments diff --git a/data/net/minecraft/world/item/crafting/SelectableRecipe.mapping b/data/net/minecraft/world/item/crafting/SelectableRecipe.mapping new file mode 100644 index 000000000..2bbd0c798 --- /dev/null +++ b/data/net/minecraft/world/item/crafting/SelectableRecipe.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/world/item/crafting/SelectableRecipe + METHOD lambda$noRecipeCodec$0 (Lnet/minecraft/world/item/crafting/display/SlotDisplay;)Lnet/minecraft/world/item/crafting/SelectableRecipe; + ARG 0 display + CLASS SingleInputSet + METHOD acceptsInput (Lnet/minecraft/world/item/ItemStack;)Z + ARG 1 stack + METHOD lambda$acceptsInput$0 (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/crafting/SelectableRecipe$SingleInputEntry;)Z + ARG 1 entry + METHOD lambda$selectByInput$1 (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/crafting/SelectableRecipe$SingleInputEntry;)Z + ARG 1 entry + METHOD selectByInput (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/crafting/SelectableRecipe$SingleInputSet; + ARG 1 stack diff --git a/data/net/minecraft/world/item/crafting/ShapedRecipe.mapping b/data/net/minecraft/world/item/crafting/ShapedRecipe.mapping index d7d8d12fc..9209ff8fd 100644 --- a/data/net/minecraft/world/item/crafting/ShapedRecipe.mapping +++ b/data/net/minecraft/world/item/crafting/ShapedRecipe.mapping @@ -10,16 +10,6 @@ CLASS net/minecraft/world/item/crafting/ShapedRecipe ARG 3 pattern ARG 4 result ARG 5 showNotification - METHOD canCraftInDimensions (II)Z - COMMENT Used to determine if this recipe can fit in a grid of the given width/height - ARG 1 width - ARG 2 height - METHOD getGroup ()Ljava/lang/String; - COMMENT Recipes with equal group are combined into one button in the recipe book - METHOD lambda$isIncomplete$0 (Lnet/minecraft/world/item/crafting/Ingredient;)Z - ARG 0 ingredient - METHOD lambda$isIncomplete$1 (Lnet/minecraft/world/item/crafting/Ingredient;)Z - ARG 0 filteredIngredients CLASS Serializer METHOD fromNetwork (Lnet/minecraft/network/RegistryFriendlyByteBuf;)Lnet/minecraft/world/item/crafting/ShapedRecipe; ARG 0 buffer diff --git a/data/net/minecraft/world/item/crafting/ShapedRecipePattern.mapping b/data/net/minecraft/world/item/crafting/ShapedRecipePattern.mapping index a7b7e8ebc..385b7a845 100644 --- a/data/net/minecraft/world/item/crafting/ShapedRecipePattern.mapping +++ b/data/net/minecraft/world/item/crafting/ShapedRecipePattern.mapping @@ -1,16 +1,18 @@ CLASS net/minecraft/world/item/crafting/ShapedRecipePattern - METHOD (IILnet/minecraft/core/NonNullList;Ljava/util/Optional;)V + METHOD (IILjava/util/List;Ljava/util/Optional;)V ARG 1 width ARG 2 height ARG 3 ingredients ARG 4 data - METHOD firstNonSpace (Ljava/lang/String;)I + METHOD createFromNetwork (Ljava/lang/Integer;Ljava/lang/Integer;Ljava/util/List;)Lnet/minecraft/world/item/crafting/ShapedRecipePattern; + ARG 0 width + ARG 1 height + ARG 2 ingredients + METHOD firstNonEmpty (Ljava/lang/String;)I ARG 0 row - METHOD fromNetwork (Lnet/minecraft/network/RegistryFriendlyByteBuf;)Lnet/minecraft/world/item/crafting/ShapedRecipePattern; - ARG 0 buffer METHOD lambda$static$2 (Lnet/minecraft/world/item/crafting/ShapedRecipePattern;)Lcom/mojang/serialization/DataResult; ARG 0 pattern - METHOD lastNonSpace (Ljava/lang/String;)I + METHOD lastNonEmpty (Ljava/lang/String;)I ARG 0 row METHOD matches (Lnet/minecraft/world/item/crafting/CraftingInput;)Z ARG 1 input @@ -25,8 +27,6 @@ CLASS net/minecraft/world/item/crafting/ShapedRecipePattern ARG 1 pattern METHOD shrink (Ljava/util/List;)[Ljava/lang/String; ARG 0 pattern - METHOD toNetwork (Lnet/minecraft/network/RegistryFriendlyByteBuf;)V - ARG 1 buffer METHOD unpack (Lnet/minecraft/world/item/crafting/ShapedRecipePattern$Data;)Lcom/mojang/serialization/DataResult; ARG 0 data CLASS Data diff --git a/data/net/minecraft/world/item/crafting/ShapelessRecipe.mapping b/data/net/minecraft/world/item/crafting/ShapelessRecipe.mapping index ce60b0a10..28749ec17 100644 --- a/data/net/minecraft/world/item/crafting/ShapelessRecipe.mapping +++ b/data/net/minecraft/world/item/crafting/ShapelessRecipe.mapping @@ -1,18 +1,25 @@ CLASS net/minecraft/world/item/crafting/ShapelessRecipe - METHOD (Ljava/lang/String;Lnet/minecraft/world/item/crafting/CraftingBookCategory;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/core/NonNullList;)V + METHOD (Ljava/lang/String;Lnet/minecraft/world/item/crafting/CraftingBookCategory;Lnet/minecraft/world/item/ItemStack;Ljava/util/List;)V ARG 1 group ARG 2 category ARG 3 result ARG 4 ingredients - METHOD canCraftInDimensions (II)Z - COMMENT Used to determine if this recipe can fit in a grid of the given width/height - ARG 1 width - ARG 2 height - METHOD getGroup ()Ljava/lang/String; - COMMENT Recipes with equal group are combined into one button in the recipe book CLASS Serializer - METHOD fromNetwork (Lnet/minecraft/network/RegistryFriendlyByteBuf;)Lnet/minecraft/world/item/crafting/ShapelessRecipe; - ARG 0 buffer - METHOD toNetwork (Lnet/minecraft/network/RegistryFriendlyByteBuf;Lnet/minecraft/world/item/crafting/ShapelessRecipe;)V - ARG 0 buffer - ARG 1 recipe + METHOD lambda$static$0 (Lnet/minecraft/world/item/crafting/ShapelessRecipe;)Ljava/lang/String; + ARG 0 recipe + METHOD lambda$static$1 (Lnet/minecraft/world/item/crafting/ShapelessRecipe;)Lnet/minecraft/world/item/crafting/CraftingBookCategory; + ARG 0 recipe + METHOD lambda$static$2 (Lnet/minecraft/world/item/crafting/ShapelessRecipe;)Lnet/minecraft/world/item/ItemStack; + ARG 0 recipe + METHOD lambda$static$3 (Lnet/minecraft/world/item/crafting/ShapelessRecipe;)Ljava/util/List; + ARG 0 recipe + METHOD lambda$static$4 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD lambda$static$5 (Lnet/minecraft/world/item/crafting/ShapelessRecipe;)Ljava/lang/String; + ARG 0 recipe + METHOD lambda$static$6 (Lnet/minecraft/world/item/crafting/ShapelessRecipe;)Lnet/minecraft/world/item/crafting/CraftingBookCategory; + ARG 0 recipe + METHOD lambda$static$7 (Lnet/minecraft/world/item/crafting/ShapelessRecipe;)Lnet/minecraft/world/item/ItemStack; + ARG 0 recipe + METHOD lambda$static$8 (Lnet/minecraft/world/item/crafting/ShapelessRecipe;)Ljava/util/List; + ARG 0 recipe diff --git a/data/net/minecraft/world/item/crafting/ShieldDecorationRecipe.mapping b/data/net/minecraft/world/item/crafting/ShieldDecorationRecipe.mapping deleted file mode 100644 index 0b95cf471..000000000 --- a/data/net/minecraft/world/item/crafting/ShieldDecorationRecipe.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/world/item/crafting/ShieldDecorationRecipe - METHOD canCraftInDimensions (II)Z - COMMENT Used to determine if this recipe can fit in a grid of the given width/height - ARG 1 width - ARG 2 height diff --git a/data/net/minecraft/world/item/crafting/ShulkerBoxColoring.mapping b/data/net/minecraft/world/item/crafting/ShulkerBoxColoring.mapping deleted file mode 100644 index b8760c9e1..000000000 --- a/data/net/minecraft/world/item/crafting/ShulkerBoxColoring.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/world/item/crafting/ShulkerBoxColoring - METHOD canCraftInDimensions (II)Z - COMMENT Used to determine if this recipe can fit in a grid of the given width/height - ARG 1 width - ARG 2 height diff --git a/data/net/minecraft/world/item/crafting/SimpleCookingSerializer.mapping b/data/net/minecraft/world/item/crafting/SimpleCookingSerializer.mapping deleted file mode 100644 index 07c8375fa..000000000 --- a/data/net/minecraft/world/item/crafting/SimpleCookingSerializer.mapping +++ /dev/null @@ -1,16 +0,0 @@ -CLASS net/minecraft/world/item/crafting/SimpleCookingSerializer - METHOD (Lnet/minecraft/world/item/crafting/AbstractCookingRecipe$Factory;I)V - ARG 1 factory - ARG 2 cookingTime - METHOD create (Ljava/lang/String;Lnet/minecraft/world/item/crafting/CookingBookCategory;Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/world/item/ItemStack;FI)Lnet/minecraft/world/item/crafting/AbstractCookingRecipe; - ARG 1 group - ARG 2 category - ARG 3 ingredient - ARG 4 result - ARG 5 experience - ARG 6 cookingTime - METHOD fromNetwork (Lnet/minecraft/network/RegistryFriendlyByteBuf;)Lnet/minecraft/world/item/crafting/AbstractCookingRecipe; - ARG 1 buffer - METHOD toNetwork (Lnet/minecraft/network/RegistryFriendlyByteBuf;Lnet/minecraft/world/item/crafting/AbstractCookingRecipe;)V - ARG 1 buffer - ARG 2 recipe diff --git a/data/net/minecraft/world/item/crafting/SimpleCraftingRecipeSerializer.mapping b/data/net/minecraft/world/item/crafting/SimpleCraftingRecipeSerializer.mapping deleted file mode 100644 index 041f3cddc..000000000 --- a/data/net/minecraft/world/item/crafting/SimpleCraftingRecipeSerializer.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/world/item/crafting/SimpleCraftingRecipeSerializer - METHOD (Lnet/minecraft/world/item/crafting/SimpleCraftingRecipeSerializer$Factory;)V - ARG 1 constructor - CLASS Factory - METHOD create (Lnet/minecraft/world/item/crafting/CraftingBookCategory;)Lnet/minecraft/world/item/crafting/CraftingRecipe; - ARG 1 category diff --git a/data/net/minecraft/world/item/crafting/SingleItemRecipe.mapping b/data/net/minecraft/world/item/crafting/SingleItemRecipe.mapping index 736fb61e1..2f1fcdfa7 100644 --- a/data/net/minecraft/world/item/crafting/SingleItemRecipe.mapping +++ b/data/net/minecraft/world/item/crafting/SingleItemRecipe.mapping @@ -1,16 +1,8 @@ CLASS net/minecraft/world/item/crafting/SingleItemRecipe - METHOD (Lnet/minecraft/world/item/crafting/RecipeType;Lnet/minecraft/world/item/crafting/RecipeSerializer;Ljava/lang/String;Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/world/item/ItemStack;)V - ARG 1 type - ARG 2 serializer - ARG 3 group - ARG 4 ingredient - ARG 5 result - METHOD canCraftInDimensions (II)Z - COMMENT Used to determine if this recipe can fit in a grid of the given width/height - ARG 1 width - ARG 2 height - METHOD getGroup ()Ljava/lang/String; - COMMENT Recipes with equal group are combined into one button in the recipe book + METHOD (Ljava/lang/String;Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/world/item/ItemStack;)V + ARG 1 group + ARG 2 input + ARG 3 result CLASS Factory METHOD create (Ljava/lang/String;Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/crafting/SingleItemRecipe; ARG 1 group diff --git a/data/net/minecraft/world/item/crafting/SmithingRecipe.mapping b/data/net/minecraft/world/item/crafting/SmithingRecipe.mapping deleted file mode 100644 index 3bddd1683..000000000 --- a/data/net/minecraft/world/item/crafting/SmithingRecipe.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/world/item/crafting/SmithingRecipe - METHOD isAdditionIngredient (Lnet/minecraft/world/item/ItemStack;)Z - ARG 1 stack - METHOD isBaseIngredient (Lnet/minecraft/world/item/ItemStack;)Z - ARG 1 stack - METHOD isTemplateIngredient (Lnet/minecraft/world/item/ItemStack;)Z - ARG 1 stack diff --git a/data/net/minecraft/world/item/crafting/SmithingTransformRecipe.mapping b/data/net/minecraft/world/item/crafting/SmithingTransformRecipe.mapping index 0ff238ed1..1f6caa798 100644 --- a/data/net/minecraft/world/item/crafting/SmithingTransformRecipe.mapping +++ b/data/net/minecraft/world/item/crafting/SmithingTransformRecipe.mapping @@ -1,12 +1,25 @@ CLASS net/minecraft/world/item/crafting/SmithingTransformRecipe - METHOD (Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/world/item/ItemStack;)V + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/world/item/ItemStack;)V ARG 1 template ARG 2 base ARG 3 addition ARG 4 result CLASS Serializer - METHOD fromNetwork (Lnet/minecraft/network/RegistryFriendlyByteBuf;)Lnet/minecraft/world/item/crafting/SmithingTransformRecipe; - ARG 0 buffer - METHOD toNetwork (Lnet/minecraft/network/RegistryFriendlyByteBuf;Lnet/minecraft/world/item/crafting/SmithingTransformRecipe;)V - ARG 0 buffer - ARG 1 recipe + METHOD lambda$static$0 (Lnet/minecraft/world/item/crafting/SmithingTransformRecipe;)Ljava/util/Optional; + ARG 0 recipe + METHOD lambda$static$1 (Lnet/minecraft/world/item/crafting/SmithingTransformRecipe;)Ljava/util/Optional; + ARG 0 recipe + METHOD lambda$static$2 (Lnet/minecraft/world/item/crafting/SmithingTransformRecipe;)Ljava/util/Optional; + ARG 0 recipe + METHOD lambda$static$3 (Lnet/minecraft/world/item/crafting/SmithingTransformRecipe;)Lnet/minecraft/world/item/ItemStack; + ARG 0 recipe + METHOD lambda$static$4 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD lambda$static$5 (Lnet/minecraft/world/item/crafting/SmithingTransformRecipe;)Ljava/util/Optional; + ARG 0 recipe + METHOD lambda$static$6 (Lnet/minecraft/world/item/crafting/SmithingTransformRecipe;)Ljava/util/Optional; + ARG 0 recipe + METHOD lambda$static$7 (Lnet/minecraft/world/item/crafting/SmithingTransformRecipe;)Ljava/util/Optional; + ARG 0 recipe + METHOD lambda$static$8 (Lnet/minecraft/world/item/crafting/SmithingTransformRecipe;)Lnet/minecraft/world/item/ItemStack; + ARG 0 recipe diff --git a/data/net/minecraft/world/item/crafting/SmithingTrimRecipe.mapping b/data/net/minecraft/world/item/crafting/SmithingTrimRecipe.mapping index 7b2a2fd1b..b9927635c 100644 --- a/data/net/minecraft/world/item/crafting/SmithingTrimRecipe.mapping +++ b/data/net/minecraft/world/item/crafting/SmithingTrimRecipe.mapping @@ -1,11 +1,25 @@ CLASS net/minecraft/world/item/crafting/SmithingTrimRecipe - METHOD (Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/world/item/crafting/Ingredient;)V + METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 template ARG 2 base ARG 3 addition + METHOD applyTrim (Lnet/minecraft/core/HolderLookup$Provider;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/ItemStack; + ARG 0 registries + ARG 1 base + ARG 2 addition + ARG 3 template CLASS Serializer - METHOD fromNetwork (Lnet/minecraft/network/RegistryFriendlyByteBuf;)Lnet/minecraft/world/item/crafting/SmithingTrimRecipe; - ARG 0 buffer - METHOD toNetwork (Lnet/minecraft/network/RegistryFriendlyByteBuf;Lnet/minecraft/world/item/crafting/SmithingTrimRecipe;)V - ARG 0 buffer - ARG 1 recipe + METHOD lambda$static$0 (Lnet/minecraft/world/item/crafting/SmithingTrimRecipe;)Ljava/util/Optional; + ARG 0 recipe + METHOD lambda$static$1 (Lnet/minecraft/world/item/crafting/SmithingTrimRecipe;)Ljava/util/Optional; + ARG 0 recipe + METHOD lambda$static$2 (Lnet/minecraft/world/item/crafting/SmithingTrimRecipe;)Ljava/util/Optional; + ARG 0 recipe + METHOD lambda$static$3 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD lambda$static$4 (Lnet/minecraft/world/item/crafting/SmithingTrimRecipe;)Ljava/util/Optional; + ARG 0 recipe + METHOD lambda$static$5 (Lnet/minecraft/world/item/crafting/SmithingTrimRecipe;)Ljava/util/Optional; + ARG 0 recipe + METHOD lambda$static$6 (Lnet/minecraft/world/item/crafting/SmithingTrimRecipe;)Ljava/util/Optional; + ARG 0 recipe diff --git a/data/net/minecraft/world/item/crafting/SuspiciousStewRecipe.mapping b/data/net/minecraft/world/item/crafting/SuspiciousStewRecipe.mapping deleted file mode 100644 index 003b0f468..000000000 --- a/data/net/minecraft/world/item/crafting/SuspiciousStewRecipe.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/world/item/crafting/SuspiciousStewRecipe - METHOD canCraftInDimensions (II)Z - COMMENT Used to determine if this recipe can fit in a grid of the given width/height - ARG 1 width - ARG 2 height diff --git a/data/net/minecraft/world/item/crafting/TippedArrowRecipe.mapping b/data/net/minecraft/world/item/crafting/TippedArrowRecipe.mapping deleted file mode 100644 index bf6ac6487..000000000 --- a/data/net/minecraft/world/item/crafting/TippedArrowRecipe.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/world/item/crafting/TippedArrowRecipe - METHOD canCraftInDimensions (II)Z - COMMENT Used to determine if this recipe can fit in a grid of the given width/height - ARG 1 width - ARG 2 height diff --git a/data/net/minecraft/world/item/crafting/TransmuteRecipe.mapping b/data/net/minecraft/world/item/crafting/TransmuteRecipe.mapping new file mode 100644 index 000000000..1076ab47e --- /dev/null +++ b/data/net/minecraft/world/item/crafting/TransmuteRecipe.mapping @@ -0,0 +1,30 @@ +CLASS net/minecraft/world/item/crafting/TransmuteRecipe + METHOD (Ljava/lang/String;Lnet/minecraft/world/item/crafting/CraftingBookCategory;Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/world/item/crafting/Ingredient;Lnet/minecraft/core/Holder;)V + ARG 1 group + ARG 2 category + ARG 3 input + ARG 4 material + ARG 5 result + CLASS Serializer + METHOD lambda$static$0 (Lnet/minecraft/world/item/crafting/TransmuteRecipe;)Ljava/lang/String; + ARG 0 recipe + METHOD lambda$static$1 (Lnet/minecraft/world/item/crafting/TransmuteRecipe;)Lnet/minecraft/world/item/crafting/CraftingBookCategory; + ARG 0 recipe + METHOD lambda$static$10 (Lnet/minecraft/world/item/crafting/TransmuteRecipe;)Lnet/minecraft/core/Holder; + ARG 0 recipe + METHOD lambda$static$2 (Lnet/minecraft/world/item/crafting/TransmuteRecipe;)Lnet/minecraft/world/item/crafting/Ingredient; + ARG 0 recipe + METHOD lambda$static$3 (Lnet/minecraft/world/item/crafting/TransmuteRecipe;)Lnet/minecraft/world/item/crafting/Ingredient; + ARG 0 recipe + METHOD lambda$static$4 (Lnet/minecraft/world/item/crafting/TransmuteRecipe;)Lnet/minecraft/core/Holder; + ARG 0 recipe + METHOD lambda$static$5 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD lambda$static$6 (Lnet/minecraft/world/item/crafting/TransmuteRecipe;)Ljava/lang/String; + ARG 0 recipe + METHOD lambda$static$7 (Lnet/minecraft/world/item/crafting/TransmuteRecipe;)Lnet/minecraft/world/item/crafting/CraftingBookCategory; + ARG 0 recipe + METHOD lambda$static$8 (Lnet/minecraft/world/item/crafting/TransmuteRecipe;)Lnet/minecraft/world/item/crafting/Ingredient; + ARG 0 recipe + METHOD lambda$static$9 (Lnet/minecraft/world/item/crafting/TransmuteRecipe;)Lnet/minecraft/world/item/crafting/Ingredient; + ARG 0 recipe diff --git a/data/net/minecraft/world/item/crafting/display/DisplayContentsFactory.mapping b/data/net/minecraft/world/item/crafting/display/DisplayContentsFactory.mapping new file mode 100644 index 000000000..115653212 --- /dev/null +++ b/data/net/minecraft/world/item/crafting/display/DisplayContentsFactory.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/world/item/crafting/display/DisplayContentsFactory + CLASS ForStacks + METHOD forStack (Lnet/minecraft/core/Holder;)Ljava/lang/Object; + ARG 1 item + METHOD forStack (Lnet/minecraft/world/item/Item;)Ljava/lang/Object; + ARG 1 item + METHOD forStack (Lnet/minecraft/world/item/ItemStack;)Ljava/lang/Object; + ARG 1 stack + CLASS ForRemainders + METHOD addRemainder (Ljava/lang/Object;Ljava/util/List;)Ljava/lang/Object; + ARG 1 remainder + ARG 2 remainderItems diff --git a/data/net/minecraft/world/item/crafting/display/FurnaceRecipeDisplay.mapping b/data/net/minecraft/world/item/crafting/display/FurnaceRecipeDisplay.mapping new file mode 100644 index 000000000..45db3091c --- /dev/null +++ b/data/net/minecraft/world/item/crafting/display/FurnaceRecipeDisplay.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/world/item/crafting/display/FurnaceRecipeDisplay + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/item/crafting/display/RecipeDisplay.mapping b/data/net/minecraft/world/item/crafting/display/RecipeDisplay.mapping new file mode 100644 index 000000000..ac70b2359 --- /dev/null +++ b/data/net/minecraft/world/item/crafting/display/RecipeDisplay.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/world/item/crafting/display/RecipeDisplay + METHOD isEnabled (Lnet/minecraft/world/flag/FeatureFlagSet;)Z + ARG 1 enabledFeatures diff --git a/data/net/minecraft/world/item/crafting/display/RecipeDisplayEntry.mapping b/data/net/minecraft/world/item/crafting/display/RecipeDisplayEntry.mapping new file mode 100644 index 000000000..a15aeec09 --- /dev/null +++ b/data/net/minecraft/world/item/crafting/display/RecipeDisplayEntry.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/world/item/crafting/display/RecipeDisplayEntry + METHOD canCraft (Lnet/minecraft/world/entity/player/StackedItemContents;)Z + ARG 1 stackedItemContents + METHOD resultItems (Lnet/minecraft/util/context/ContextMap;)Ljava/util/List; + ARG 1 context diff --git a/data/net/minecraft/world/item/crafting/display/RecipeDisplays.mapping b/data/net/minecraft/world/item/crafting/display/RecipeDisplays.mapping new file mode 100644 index 000000000..4bb9147b3 --- /dev/null +++ b/data/net/minecraft/world/item/crafting/display/RecipeDisplays.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/world/item/crafting/display/RecipeDisplays + METHOD bootstrap (Lnet/minecraft/core/Registry;)Lnet/minecraft/world/item/crafting/display/RecipeDisplay$Type; + ARG 0 registry diff --git a/data/net/minecraft/world/item/crafting/display/ShapedCraftingRecipeDisplay.mapping b/data/net/minecraft/world/item/crafting/display/ShapedCraftingRecipeDisplay.mapping new file mode 100644 index 000000000..88e7bac84 --- /dev/null +++ b/data/net/minecraft/world/item/crafting/display/ShapedCraftingRecipeDisplay.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/world/item/crafting/display/ShapedCraftingRecipeDisplay + METHOD (IILjava/util/List;Lnet/minecraft/world/item/crafting/display/SlotDisplay;Lnet/minecraft/world/item/crafting/display/SlotDisplay;)V + ARG 1 width + ARG 2 height + ARG 3 ingredients + ARG 4 result + ARG 5 craftingStation + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/item/crafting/display/ShapelessCraftingRecipeDisplay.mapping b/data/net/minecraft/world/item/crafting/display/ShapelessCraftingRecipeDisplay.mapping new file mode 100644 index 000000000..60a2953a9 --- /dev/null +++ b/data/net/minecraft/world/item/crafting/display/ShapelessCraftingRecipeDisplay.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/world/item/crafting/display/ShapelessCraftingRecipeDisplay + METHOD lambda$isEnabled$1 (Lnet/minecraft/world/flag/FeatureFlagSet;Lnet/minecraft/world/item/crafting/display/SlotDisplay;)Z + ARG 1 display + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/item/crafting/display/SlotDisplay.mapping b/data/net/minecraft/world/item/crafting/display/SlotDisplay.mapping new file mode 100644 index 000000000..f08053e3b --- /dev/null +++ b/data/net/minecraft/world/item/crafting/display/SlotDisplay.mapping @@ -0,0 +1,38 @@ +CLASS net/minecraft/world/item/crafting/display/SlotDisplay + METHOD isEnabled (Lnet/minecraft/world/flag/FeatureFlagSet;)Z + ARG 1 enabledFeatures + METHOD resolve (Lnet/minecraft/util/context/ContextMap;Lnet/minecraft/world/item/crafting/display/DisplayContentsFactory;)Ljava/util/stream/Stream; + ARG 1 context + ARG 2 output + METHOD resolveForFirstStack (Lnet/minecraft/util/context/ContextMap;)Lnet/minecraft/world/item/ItemStack; + ARG 1 context + METHOD resolveForStacks (Lnet/minecraft/util/context/ContextMap;)Ljava/util/List; + ARG 1 context + CLASS Composite + METHOD lambda$isEnabled$2 (Lnet/minecraft/world/flag/FeatureFlagSet;Lnet/minecraft/world/item/crafting/display/SlotDisplay;)Z + ARG 1 display + METHOD lambda$resolve$1 (Lnet/minecraft/util/context/ContextMap;Lnet/minecraft/world/item/crafting/display/DisplayContentsFactory;Lnet/minecraft/world/item/crafting/display/SlotDisplay;)Ljava/util/stream/Stream; + ARG 2 slotDisplay + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS WithRemainder + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS TagSlotDisplay + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS ItemSlotDisplay + METHOD (Lnet/minecraft/world/item/Item;)V + ARG 1 item + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS ItemStackSlotDisplay + METHOD equals (Ljava/lang/Object;)Z + ARG 1 other + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS SmithingTrimDemoSlotDisplay + METHOD lambda$resolve$2 (Lnet/minecraft/world/item/ItemStack;)Z + ARG 0 stack + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/item/crafting/display/SlotDisplayContext.mapping b/data/net/minecraft/world/item/crafting/display/SlotDisplayContext.mapping new file mode 100644 index 000000000..ab534b7c6 --- /dev/null +++ b/data/net/minecraft/world/item/crafting/display/SlotDisplayContext.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/world/item/crafting/display/SlotDisplayContext + METHOD fromLevel (Lnet/minecraft/world/level/Level;)Lnet/minecraft/util/context/ContextMap; + ARG 0 level diff --git a/data/net/minecraft/world/item/crafting/display/SlotDisplays.mapping b/data/net/minecraft/world/item/crafting/display/SlotDisplays.mapping new file mode 100644 index 000000000..b6d33fa2e --- /dev/null +++ b/data/net/minecraft/world/item/crafting/display/SlotDisplays.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/world/item/crafting/display/SlotDisplays + METHOD bootstrap (Lnet/minecraft/core/Registry;)Lnet/minecraft/world/item/crafting/display/SlotDisplay$Type; + ARG 0 registry diff --git a/data/net/minecraft/world/item/enchantment/ConditionalEffect.mapping b/data/net/minecraft/world/item/enchantment/ConditionalEffect.mapping index 4bba01b42..e4d553fba 100644 --- a/data/net/minecraft/world/item/enchantment/ConditionalEffect.mapping +++ b/data/net/minecraft/world/item/enchantment/ConditionalEffect.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/world/item/enchantment/ConditionalEffect - METHOD codec (Lcom/mojang/serialization/Codec;Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet;)Lcom/mojang/serialization/Codec; + METHOD codec (Lcom/mojang/serialization/Codec;Lnet/minecraft/util/context/ContextKeySet;)Lcom/mojang/serialization/Codec; ARG 0 codec - ARG 1 params - METHOD conditionCodec (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet;)Lcom/mojang/serialization/Codec; - ARG 0 params - METHOD lambda$codec$4 (Lcom/mojang/serialization/Codec;Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 1 contextKeySet + METHOD conditionCodec (Lnet/minecraft/util/context/ContextKeySet;)Lcom/mojang/serialization/Codec; + ARG 0 contextKeySet + METHOD lambda$codec$4 (Lcom/mojang/serialization/Codec;Lnet/minecraft/util/context/ContextKeySet;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 2 instance - METHOD lambda$conditionCodec$3 (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet;Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition;)Lcom/mojang/serialization/DataResult; + METHOD lambda$conditionCodec$3 (Lnet/minecraft/util/context/ContextKeySet;Lnet/minecraft/world/level/storage/loot/predicates/LootItemCondition;)Lcom/mojang/serialization/DataResult; ARG 1 condition METHOD matches (Lnet/minecraft/world/level/storage/loot/LootContext;)Z ARG 1 context diff --git a/data/net/minecraft/world/item/enchantment/Enchantable.mapping b/data/net/minecraft/world/item/enchantment/Enchantable.mapping new file mode 100644 index 000000000..000922347 --- /dev/null +++ b/data/net/minecraft/world/item/enchantment/Enchantable.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/world/item/enchantment/Enchantable + METHOD (I)V + ARG 1 value + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/item/enchantment/EnchantmentHelper.mapping b/data/net/minecraft/world/item/enchantment/EnchantmentHelper.mapping index a3931db7f..1cc1b76d2 100644 --- a/data/net/minecraft/world/item/enchantment/EnchantmentHelper.mapping +++ b/data/net/minecraft/world/item/enchantment/EnchantmentHelper.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/world/item/enchantment/EnchantmentHelper METHOD canStoreEnchantments (Lnet/minecraft/world/item/ItemStack;)Z ARG 0 stack + METHOD createBook (Lnet/minecraft/world/item/enchantment/EnchantmentInstance;)Lnet/minecraft/world/item/ItemStack; + ARG 0 enchantmant METHOD doPostAttackEffects (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/damagesource/DamageSource;)V ARG 0 level ARG 1 entity @@ -10,6 +12,12 @@ CLASS net/minecraft/world/item/enchantment/EnchantmentHelper ARG 1 entity ARG 2 damageSource ARG 3 itemSource + METHOD doPostAttackEffectsWithItemSourceOnBreak (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/damagesource/DamageSource;Lnet/minecraft/world/item/ItemStack;Ljava/util/function/Consumer;)V + ARG 0 level + ARG 1 entity + ARG 2 damageSource + ARG 3 itemSource + ARG 4 onBreak METHOD enchantItem (Lnet/minecraft/util/RandomSource;Lnet/minecraft/world/item/ItemStack;ILjava/util/stream/Stream;)Lnet/minecraft/world/item/ItemStack; ARG 0 random ARG 1 stack @@ -103,6 +111,9 @@ CLASS net/minecraft/world/item/enchantment/EnchantmentHelper ARG 0 level ARG 1 entity ARG 2 damageSource + METHOD lambda$processDurabilityChange$0 (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/ItemStack;Lorg/apache/commons/lang3/mutable/MutableFloat;Lnet/minecraft/core/Holder;I)V + ARG 3 enchantment + ARG 4 enchantmentLevel METHOD modifyArmorEffectiveness (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/damagesource/DamageSource;F)F ARG 0 level ARG 1 tool @@ -144,10 +155,10 @@ CLASS net/minecraft/world/item/enchantment/EnchantmentHelper ARG 5 pos ARG 6 state ARG 7 onBreak - METHOD onProjectileSpawned (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/projectile/AbstractArrow;Ljava/util/function/Consumer;)V + METHOD onProjectileSpawned (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/projectile/Projectile;Ljava/util/function/Consumer;)V ARG 0 level - ARG 1 firedFromWeapon - ARG 2 arrow + ARG 1 firedFiredFromWeapon + ARG 2 projectile ARG 3 onBreak METHOD pickHighestLevel (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/core/component/DataComponentType;)Ljava/util/Optional; ARG 0 stack diff --git a/data/net/minecraft/world/item/enchantment/Repairable.mapping b/data/net/minecraft/world/item/enchantment/Repairable.mapping new file mode 100644 index 000000000..e9cf00f35 --- /dev/null +++ b/data/net/minecraft/world/item/enchantment/Repairable.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/world/item/enchantment/Repairable + METHOD isValidRepairItem (Lnet/minecraft/world/item/ItemStack;)Z + ARG 1 stack + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/item/enchantment/TargetedConditionalEffect.mapping b/data/net/minecraft/world/item/enchantment/TargetedConditionalEffect.mapping index bae7ed799..7cdf6962e 100644 --- a/data/net/minecraft/world/item/enchantment/TargetedConditionalEffect.mapping +++ b/data/net/minecraft/world/item/enchantment/TargetedConditionalEffect.mapping @@ -1,11 +1,11 @@ CLASS net/minecraft/world/item/enchantment/TargetedConditionalEffect - METHOD codec (Lcom/mojang/serialization/Codec;Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet;)Lcom/mojang/serialization/Codec; + METHOD codec (Lcom/mojang/serialization/Codec;Lnet/minecraft/util/context/ContextKeySet;)Lcom/mojang/serialization/Codec; ARG 0 codec - ARG 1 params - METHOD equipmentDropsCodec (Lcom/mojang/serialization/Codec;Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet;)Lcom/mojang/serialization/Codec; + ARG 1 contextKeySet + METHOD equipmentDropsCodec (Lcom/mojang/serialization/Codec;Lnet/minecraft/util/context/ContextKeySet;)Lcom/mojang/serialization/Codec; ARG 0 codec - ARG 1 params - METHOD lambda$codec$0 (Lcom/mojang/serialization/Codec;Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 1 contextKeySet + METHOD lambda$codec$0 (Lcom/mojang/serialization/Codec;Lnet/minecraft/util/context/ContextKeySet;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 2 instance METHOD lambda$equipmentDropsCodec$2 (Lnet/minecraft/world/item/enchantment/EnchantmentTarget;)Lcom/mojang/serialization/DataResult; ARG 0 target @@ -13,7 +13,7 @@ CLASS net/minecraft/world/item/enchantment/TargetedConditionalEffect ARG 0 enchanted ARG 1 effect ARG 2 requirements - METHOD lambda$equipmentDropsCodec$4 (Lcom/mojang/serialization/Codec;Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + METHOD lambda$equipmentDropsCodec$4 (Lcom/mojang/serialization/Codec;Lnet/minecraft/util/context/ContextKeySet;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 2 instance METHOD matches (Lnet/minecraft/world/level/storage/loot/LootContext;)Z ARG 1 context diff --git a/data/net/minecraft/world/item/enchantment/effects/DamageItem.mapping b/data/net/minecraft/world/item/enchantment/effects/DamageItem.mapping deleted file mode 100644 index d2df7d887..000000000 --- a/data/net/minecraft/world/item/enchantment/effects/DamageItem.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/world/item/enchantment/effects/DamageItem - METHOD lambda$static$0 (Lnet/minecraft/world/item/enchantment/effects/DamageItem;)Lnet/minecraft/world/item/enchantment/LevelBasedValue; - ARG 0 damageItem - METHOD lambda$static$1 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance diff --git a/data/net/minecraft/world/item/equipment/ArmorMaterial.mapping b/data/net/minecraft/world/item/equipment/ArmorMaterial.mapping new file mode 100644 index 000000000..9d585b4a9 --- /dev/null +++ b/data/net/minecraft/world/item/equipment/ArmorMaterial.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/world/item/equipment/ArmorMaterial + METHOD animalProperties (Lnet/minecraft/world/item/Item$Properties;Lnet/minecraft/core/Holder;ZLnet/minecraft/core/HolderSet;)Lnet/minecraft/world/item/Item$Properties; + ARG 1 properties + ARG 2 equipSound + ARG 3 damageOnHurt + ARG 4 allowedEntities + METHOD animalProperties (Lnet/minecraft/world/item/Item$Properties;Lnet/minecraft/core/HolderSet;)Lnet/minecraft/world/item/Item$Properties; + ARG 1 properties + ARG 2 allowedEntities + METHOD createAttributes (Lnet/minecraft/world/item/equipment/ArmorType;)Lnet/minecraft/world/item/component/ItemAttributeModifiers; + ARG 1 armorType + METHOD humanoidProperties (Lnet/minecraft/world/item/Item$Properties;Lnet/minecraft/world/item/equipment/ArmorType;)Lnet/minecraft/world/item/Item$Properties; + ARG 1 properties + ARG 2 armorType diff --git a/data/net/minecraft/world/item/equipment/ArmorMaterials.mapping b/data/net/minecraft/world/item/equipment/ArmorMaterials.mapping new file mode 100644 index 000000000..95caa34fe --- /dev/null +++ b/data/net/minecraft/world/item/equipment/ArmorMaterials.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/world/item/equipment/ArmorMaterials + METHOD lambda$static$0 (Ljava/util/EnumMap;)V + ARG 0 map + METHOD lambda$static$1 (Ljava/util/EnumMap;)V + ARG 0 map + METHOD lambda$static$2 (Ljava/util/EnumMap;)V + ARG 0 map + METHOD lambda$static$3 (Ljava/util/EnumMap;)V + ARG 0 map + METHOD lambda$static$4 (Ljava/util/EnumMap;)V + ARG 0 map + METHOD lambda$static$5 (Ljava/util/EnumMap;)V + ARG 0 map + METHOD lambda$static$6 (Ljava/util/EnumMap;)V + ARG 0 map + METHOD lambda$static$7 (Ljava/util/EnumMap;)V + ARG 0 map diff --git a/data/net/minecraft/world/item/equipment/ArmorType.mapping b/data/net/minecraft/world/item/equipment/ArmorType.mapping new file mode 100644 index 000000000..dd3eaaf88 --- /dev/null +++ b/data/net/minecraft/world/item/equipment/ArmorType.mapping @@ -0,0 +1,7 @@ +CLASS net/minecraft/world/item/equipment/ArmorType + METHOD (Ljava/lang/String;ILnet/minecraft/world/entity/EquipmentSlot;ILjava/lang/String;)V + ARG 3 slot + ARG 4 unitDurability + ARG 5 name + METHOD getDurability (I)I + ARG 1 durabilityMultiplier diff --git a/data/net/minecraft/world/item/equipment/EquipmentModel.mapping b/data/net/minecraft/world/item/equipment/EquipmentModel.mapping new file mode 100644 index 000000000..eee7448f8 --- /dev/null +++ b/data/net/minecraft/world/item/equipment/EquipmentModel.mapping @@ -0,0 +1,33 @@ +CLASS net/minecraft/world/item/equipment/EquipmentModel + METHOD getLayers (Lnet/minecraft/world/item/equipment/EquipmentModel$LayerType;)Ljava/util/List; + ARG 1 layerType + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS Layer + METHOD (Lnet/minecraft/resources/ResourceLocation;)V + ARG 1 textureId + METHOD getTextureLocation (Lnet/minecraft/world/item/equipment/EquipmentModel$LayerType;)Lnet/minecraft/resources/ResourceLocation; + ARG 1 layerType + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD leatherDyeable (Lnet/minecraft/resources/ResourceLocation;Z)Lnet/minecraft/world/item/equipment/EquipmentModel$Layer; + ARG 0 textureId + ARG 1 isDyeable + METHOD onlyIfDyed (Lnet/minecraft/resources/ResourceLocation;Z)Lnet/minecraft/world/item/equipment/EquipmentModel$Layer; + ARG 0 textureId + ARG 1 isDyeable + CLASS Builder + METHOD addHumanoidLayers (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/world/item/equipment/EquipmentModel$Builder; + ARG 1 textureId + METHOD addHumanoidLayers (Lnet/minecraft/resources/ResourceLocation;Z)Lnet/minecraft/world/item/equipment/EquipmentModel$Builder; + ARG 1 textureId + ARG 2 isDyeable + METHOD addLayers (Lnet/minecraft/world/item/equipment/EquipmentModel$LayerType;[Lnet/minecraft/world/item/equipment/EquipmentModel$Layer;)Lnet/minecraft/world/item/equipment/EquipmentModel$Builder; + ARG 1 layerType + ARG 2 layers + METHOD addMainHumanoidLayer (Lnet/minecraft/resources/ResourceLocation;Z)Lnet/minecraft/world/item/equipment/EquipmentModel$Builder; + ARG 1 textureId + ARG 2 isDyeable + CLASS LayerType + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 id diff --git a/data/net/minecraft/world/item/equipment/EquipmentModels.mapping b/data/net/minecraft/world/item/equipment/EquipmentModels.mapping new file mode 100644 index 000000000..d8e840a5a --- /dev/null +++ b/data/net/minecraft/world/item/equipment/EquipmentModels.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/world/item/equipment/EquipmentModels + METHOD bootstrap (Ljava/util/function/BiConsumer;)V + ARG 0 output + METHOD humanoidAndHorse (Ljava/lang/String;)Lnet/minecraft/world/item/equipment/EquipmentModel; + ARG 0 name + METHOD lambda$static$0 (Lnet/minecraft/world/item/DyeColor;)Lnet/minecraft/resources/ResourceLocation; + ARG 0 color + METHOD onlyHumanoid (Ljava/lang/String;)Lnet/minecraft/world/item/equipment/EquipmentModel; + ARG 0 name diff --git a/data/net/minecraft/world/item/equipment/Equippable.mapping b/data/net/minecraft/world/item/equipment/Equippable.mapping new file mode 100644 index 000000000..5da957ca9 --- /dev/null +++ b/data/net/minecraft/world/item/equipment/Equippable.mapping @@ -0,0 +1,31 @@ +CLASS net/minecraft/world/item/equipment/Equippable + METHOD builder (Lnet/minecraft/world/entity/EquipmentSlot;)Lnet/minecraft/world/item/equipment/Equippable$Builder; + ARG 0 slot + METHOD canBeEquippedBy (Lnet/minecraft/world/entity/EntityType;)Z + ARG 1 entityType + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD llamaSwag (Lnet/minecraft/world/item/DyeColor;)Lnet/minecraft/world/item/equipment/Equippable; + ARG 0 color + METHOD swapWithEquipmentSlot (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/player/Player;)Lnet/minecraft/world/InteractionResult; + ARG 1 stack + ARG 2 player + CLASS Builder + METHOD (Lnet/minecraft/world/entity/EquipmentSlot;)V + ARG 1 slot + METHOD setAllowedEntities (Lnet/minecraft/core/HolderSet;)Lnet/minecraft/world/item/equipment/Equippable$Builder; + ARG 1 allowedEntities + METHOD setAllowedEntities ([Lnet/minecraft/world/entity/EntityType;)Lnet/minecraft/world/item/equipment/Equippable$Builder; + ARG 1 allowedEntities + METHOD setCameraOverlay (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/world/item/equipment/Equippable$Builder; + ARG 1 cameraOverlay + METHOD setDamageOnHurt (Z)Lnet/minecraft/world/item/equipment/Equippable$Builder; + ARG 1 damageOnHurt + METHOD setDispensable (Z)Lnet/minecraft/world/item/equipment/Equippable$Builder; + ARG 1 dispensable + METHOD setEquipSound (Lnet/minecraft/core/Holder;)Lnet/minecraft/world/item/equipment/Equippable$Builder; + ARG 1 equipSound + METHOD setModel (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/world/item/equipment/Equippable$Builder; + ARG 1 model + METHOD setSwappable (Z)Lnet/minecraft/world/item/equipment/Equippable$Builder; + ARG 1 swappable diff --git a/data/net/minecraft/world/item/equipment/trim/ArmorTrim.mapping b/data/net/minecraft/world/item/equipment/trim/ArmorTrim.mapping new file mode 100644 index 000000000..2cc3d9a5d --- /dev/null +++ b/data/net/minecraft/world/item/equipment/trim/ArmorTrim.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/world/item/equipment/trim/ArmorTrim + METHOD (Lnet/minecraft/core/Holder;Lnet/minecraft/core/Holder;)V + ARG 1 material + ARG 2 pattern + METHOD getColorPaletteSuffix (Lnet/minecraft/core/Holder;Lnet/minecraft/resources/ResourceLocation;)Ljava/lang/String; + ARG 0 material + ARG 1 equipmentModelId + METHOD getTexture (Lnet/minecraft/world/item/equipment/EquipmentModel$LayerType;Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/resources/ResourceLocation; + ARG 1 layerType + ARG 2 equipmentModelId + METHOD hasPatternAndMaterial (Lnet/minecraft/core/Holder;Lnet/minecraft/core/Holder;)Z + ARG 1 pattern + ARG 2 material + METHOD lambda$static$0 (Lnet/minecraft/world/item/equipment/trim/ArmorTrim;)Ljava/lang/Boolean; + ARG 0 trim + METHOD lambda$static$1 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD withTooltip (Z)Lnet/minecraft/world/item/equipment/trim/ArmorTrim; + ARG 1 showInTooltip diff --git a/data/net/minecraft/world/item/armortrim/TrimMaterial.mapping b/data/net/minecraft/world/item/equipment/trim/TrimMaterial.mapping similarity index 78% rename from data/net/minecraft/world/item/armortrim/TrimMaterial.mapping rename to data/net/minecraft/world/item/equipment/trim/TrimMaterial.mapping index a6c04e87f..e9147c12e 100644 --- a/data/net/minecraft/world/item/armortrim/TrimMaterial.mapping +++ b/data/net/minecraft/world/item/equipment/trim/TrimMaterial.mapping @@ -1,5 +1,5 @@ -CLASS net/minecraft/world/item/armortrim/TrimMaterial - METHOD create (Ljava/lang/String;Lnet/minecraft/world/item/Item;FLnet/minecraft/network/chat/Component;Ljava/util/Map;)Lnet/minecraft/world/item/armortrim/TrimMaterial; +CLASS net/minecraft/world/item/equipment/trim/TrimMaterial + METHOD create (Ljava/lang/String;Lnet/minecraft/world/item/Item;FLnet/minecraft/network/chat/Component;Ljava/util/Map;)Lnet/minecraft/world/item/equipment/trim/TrimMaterial; ARG 0 assetName ARG 1 ingredient ARG 2 itemModelIndex diff --git a/data/net/minecraft/world/item/armortrim/TrimMaterials.mapping b/data/net/minecraft/world/item/equipment/trim/TrimMaterials.mapping similarity index 86% rename from data/net/minecraft/world/item/armortrim/TrimMaterials.mapping rename to data/net/minecraft/world/item/equipment/trim/TrimMaterials.mapping index c0ef9f813..b56eb9504 100644 --- a/data/net/minecraft/world/item/armortrim/TrimMaterials.mapping +++ b/data/net/minecraft/world/item/equipment/trim/TrimMaterials.mapping @@ -1,21 +1,21 @@ -CLASS net/minecraft/world/item/armortrim/TrimMaterials +CLASS net/minecraft/world/item/equipment/trim/TrimMaterials METHOD bootstrap (Lnet/minecraft/data/worldgen/BootstrapContext;)V ARG 0 context METHOD getFromIngredient (Lnet/minecraft/core/HolderLookup$Provider;Lnet/minecraft/world/item/ItemStack;)Ljava/util/Optional; - ARG 0 regustries + ARG 0 registries ARG 1 ingredient METHOD register (Lnet/minecraft/data/worldgen/BootstrapContext;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/world/item/Item;Lnet/minecraft/network/chat/Style;F)V ARG 0 context - ARG 1 materialKey + ARG 1 key ARG 2 ingredient ARG 3 style ARG 4 itemModelIndex METHOD register (Lnet/minecraft/data/worldgen/BootstrapContext;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/world/item/Item;Lnet/minecraft/network/chat/Style;FLjava/util/Map;)V ARG 0 context - ARG 1 materialKey + ARG 1 key ARG 2 ingredient ARG 3 style ARG 4 itemModelIndex ARG 5 overrideArmorMaterials METHOD registryKey (Ljava/lang/String;)Lnet/minecraft/resources/ResourceKey; - ARG 0 key + ARG 0 name diff --git a/data/net/minecraft/world/item/armortrim/TrimPattern.mapping b/data/net/minecraft/world/item/equipment/trim/TrimPattern.mapping similarity index 75% rename from data/net/minecraft/world/item/armortrim/TrimPattern.mapping rename to data/net/minecraft/world/item/equipment/trim/TrimPattern.mapping index 06705307d..7677f794f 100644 --- a/data/net/minecraft/world/item/armortrim/TrimPattern.mapping +++ b/data/net/minecraft/world/item/equipment/trim/TrimPattern.mapping @@ -1,5 +1,5 @@ -CLASS net/minecraft/world/item/armortrim/TrimPattern +CLASS net/minecraft/world/item/equipment/trim/TrimPattern METHOD copyWithStyle (Lnet/minecraft/core/Holder;)Lnet/minecraft/network/chat/Component; - ARG 1 trimMaterial + ARG 1 material METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/data/net/minecraft/world/item/armortrim/TrimPatterns.mapping b/data/net/minecraft/world/item/equipment/trim/TrimPatterns.mapping similarity index 78% rename from data/net/minecraft/world/item/armortrim/TrimPatterns.mapping rename to data/net/minecraft/world/item/equipment/trim/TrimPatterns.mapping index 814b9f74b..ed488bb31 100644 --- a/data/net/minecraft/world/item/armortrim/TrimPatterns.mapping +++ b/data/net/minecraft/world/item/equipment/trim/TrimPatterns.mapping @@ -1,12 +1,12 @@ -CLASS net/minecraft/world/item/armortrim/TrimPatterns +CLASS net/minecraft/world/item/equipment/trim/TrimPatterns METHOD bootstrap (Lnet/minecraft/data/worldgen/BootstrapContext;)V ARG 0 context METHOD getFromTemplate (Lnet/minecraft/core/HolderLookup$Provider;Lnet/minecraft/world/item/ItemStack;)Ljava/util/Optional; ARG 0 registries - ARG 1 template + ARG 1 stack METHOD register (Lnet/minecraft/data/worldgen/BootstrapContext;Lnet/minecraft/world/item/Item;Lnet/minecraft/resources/ResourceKey;)V ARG 0 context - ARG 1 templateItem - ARG 2 trimPatternKey + ARG 1 item + ARG 2 key METHOD registryKey (Ljava/lang/String;)Lnet/minecraft/resources/ResourceKey; - ARG 0 key + ARG 0 name diff --git a/data/net/minecraft/world/level/BlockCollisions.mapping b/data/net/minecraft/world/level/BlockCollisions.mapping index ca93d414c..3d089c4e3 100644 --- a/data/net/minecraft/world/level/BlockCollisions.mapping +++ b/data/net/minecraft/world/level/BlockCollisions.mapping @@ -5,6 +5,12 @@ CLASS net/minecraft/world/level/BlockCollisions ARG 3 box ARG 4 onlySuffocatingBlocks ARG 5 resultProvider + METHOD (Lnet/minecraft/world/level/CollisionGetter;Lnet/minecraft/world/phys/shapes/CollisionContext;Lnet/minecraft/world/phys/AABB;ZLjava/util/function/BiFunction;)V + ARG 1 collisionGetter + ARG 2 context + ARG 3 box + ARG 4 onlySuffocatingBlocks + ARG 5 resultProvider METHOD getChunk (II)Lnet/minecraft/world/level/BlockGetter; ARG 1 x ARG 2 z diff --git a/data/net/minecraft/world/level/BlockGetter.mapping b/data/net/minecraft/world/level/BlockGetter.mapping index 85194fb83..63a07f3fc 100644 --- a/data/net/minecraft/world/level/BlockGetter.mapping +++ b/data/net/minecraft/world/level/BlockGetter.mapping @@ -1,4 +1,13 @@ CLASS net/minecraft/world/level/BlockGetter + METHOD addCollisionsAlongTravel (Ljava/util/Set;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/AABB;)V + ARG 0 output + ARG 1 start + ARG 2 end + ARG 3 boundingBox + METHOD boxTraverseBlocks (Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/AABB;)Ljava/lang/Iterable; + ARG 0 oldPosition + ARG 1 position + ARG 2 boundingBox METHOD clip (Lnet/minecraft/world/level/ClipContext;)Lnet/minecraft/world/phys/BlockHitResult; COMMENT Checks if there's block between {@code from} and {@code to} of context. COMMENT This uses the collision shape of provided block. diff --git a/data/net/minecraft/world/level/ChunkPos.mapping b/data/net/minecraft/world/level/ChunkPos.mapping index d48377e58..ee4338eee 100644 --- a/data/net/minecraft/world/level/ChunkPos.mapping +++ b/data/net/minecraft/world/level/ChunkPos.mapping @@ -73,6 +73,3 @@ CLASS net/minecraft/world/level/ChunkPos METHOD rangeClosed (Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/world/level/ChunkPos;)Ljava/util/stream/Stream; ARG 0 start ARG 1 end - CLASS 1 - METHOD tryAdvance (Ljava/util/function/Consumer;)Z - ARG 1 consumer diff --git a/data/net/minecraft/world/level/CollisionGetter.mapping b/data/net/minecraft/world/level/CollisionGetter.mapping index 950a660b7..bc4f6263c 100644 --- a/data/net/minecraft/world/level/CollisionGetter.mapping +++ b/data/net/minecraft/world/level/CollisionGetter.mapping @@ -2,6 +2,8 @@ CLASS net/minecraft/world/level/CollisionGetter METHOD borderCollision (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/AABB;)Lnet/minecraft/world/phys/shapes/VoxelShape; ARG 1 entity ARG 2 box + METHOD clipIncludingBorder (Lnet/minecraft/world/level/ClipContext;)Lnet/minecraft/world/phys/BlockHitResult; + ARG 1 clipContext METHOD collidesWithSuffocatingBlock (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/AABB;)Z ARG 1 entity ARG 2 box @@ -15,6 +17,9 @@ CLASS net/minecraft/world/level/CollisionGetter METHOD findSupportingBlock (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/AABB;)Ljava/util/Optional; ARG 1 entity ARG 2 box + METHOD getBlockAndLiquidCollisions (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/AABB;)Ljava/lang/Iterable; + ARG 1 entity + ARG 2 collisionBox METHOD getBlockCollisions (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/AABB;)Ljava/lang/Iterable; ARG 1 entity ARG 2 collisionBox @@ -36,6 +41,8 @@ CLASS net/minecraft/world/level/CollisionGetter ARG 1 state ARG 2 pos ARG 3 context + METHOD lambda$findFreePosition$8 (DDDLnet/minecraft/world/phys/AABB;)Lnet/minecraft/world/phys/AABB; + ARG 6 box METHOD noBlockCollision (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/AABB;)Z ARG 1 entity ARG 2 boundingBox @@ -44,5 +51,9 @@ CLASS net/minecraft/world/level/CollisionGetter METHOD noCollision (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/AABB;)Z ARG 1 entity ARG 2 collisionBox + METHOD noCollision (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/AABB;Z)Z + ARG 1 entity + ARG 2 collisionBox + ARG 3 checkLiquid METHOD noCollision (Lnet/minecraft/world/phys/AABB;)Z ARG 1 collisionBox diff --git a/data/net/minecraft/world/level/EntityGetter.mapping b/data/net/minecraft/world/level/EntityGetter.mapping index ba6fb12ba..0ef026d81 100644 --- a/data/net/minecraft/world/level/EntityGetter.mapping +++ b/data/net/minecraft/world/level/EntityGetter.mapping @@ -16,36 +16,12 @@ CLASS net/minecraft/world/level/EntityGetter ARG 1 entityClass ARG 2 area METHOD getEntitiesOfClass (Ljava/lang/Class;Lnet/minecraft/world/phys/AABB;Ljava/util/function/Predicate;)Ljava/util/List; - ARG 1 clazz + ARG 1 entityClass ARG 2 area ARG 3 filter METHOD getEntityCollisions (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/AABB;)Ljava/util/List; ARG 1 entity ARG 2 collisionBox - METHOD getNearbyEntities (Ljava/lang/Class;Lnet/minecraft/world/entity/ai/targeting/TargetingConditions;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/phys/AABB;)Ljava/util/List; - ARG 1 entityClazz - ARG 2 entityPredicate - ARG 3 entity - ARG 4 area - METHOD getNearbyPlayers (Lnet/minecraft/world/entity/ai/targeting/TargetingConditions;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/phys/AABB;)Ljava/util/List; - ARG 1 predicate - ARG 2 target - ARG 3 area - METHOD getNearestEntity (Ljava/lang/Class;Lnet/minecraft/world/entity/ai/targeting/TargetingConditions;Lnet/minecraft/world/entity/LivingEntity;DDDLnet/minecraft/world/phys/AABB;)Lnet/minecraft/world/entity/LivingEntity; - ARG 1 entityClazz - ARG 2 conditions - ARG 3 target - ARG 4 x - ARG 6 y - ARG 8 z - ARG 10 boundingBox - METHOD getNearestEntity (Ljava/util/List;Lnet/minecraft/world/entity/ai/targeting/TargetingConditions;Lnet/minecraft/world/entity/LivingEntity;DDD)Lnet/minecraft/world/entity/LivingEntity; - ARG 1 entities - ARG 2 predicate - ARG 3 target - ARG 4 x - ARG 6 y - ARG 8 z METHOD getNearestPlayer (DDDDLjava/util/function/Predicate;)Lnet/minecraft/world/entity/player/Player; ARG 1 x ARG 3 y @@ -61,20 +37,6 @@ CLASS net/minecraft/world/level/EntityGetter METHOD getNearestPlayer (Lnet/minecraft/world/entity/Entity;D)Lnet/minecraft/world/entity/player/Player; ARG 1 entity ARG 2 distance - METHOD getNearestPlayer (Lnet/minecraft/world/entity/ai/targeting/TargetingConditions;DDD)Lnet/minecraft/world/entity/player/Player; - ARG 1 predicate - ARG 2 x - ARG 4 y - ARG 6 z - METHOD getNearestPlayer (Lnet/minecraft/world/entity/ai/targeting/TargetingConditions;Lnet/minecraft/world/entity/LivingEntity;)Lnet/minecraft/world/entity/player/Player; - ARG 1 predicate - ARG 2 target - METHOD getNearestPlayer (Lnet/minecraft/world/entity/ai/targeting/TargetingConditions;Lnet/minecraft/world/entity/LivingEntity;DDD)Lnet/minecraft/world/entity/player/Player; - ARG 1 predicate - ARG 2 target - ARG 3 x - ARG 5 y - ARG 7 z METHOD getPlayerByUUID (Ljava/util/UUID;)Lnet/minecraft/world/entity/player/Player; ARG 1 uniqueId METHOD hasNearbyAlivePlayer (DDDD)Z @@ -85,7 +47,3 @@ CLASS net/minecraft/world/level/EntityGetter METHOD isUnobstructed (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/shapes/VoxelShape;)Z ARG 1 entity ARG 2 shape - METHOD lambda$getNearbyEntities$1 (Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 0 entity - METHOD lambda$getNearestEntity$0 (Lnet/minecraft/world/entity/LivingEntity;)Z - ARG 0 entity diff --git a/data/net/minecraft/world/level/Explosion.mapping b/data/net/minecraft/world/level/Explosion.mapping index a9821d47c..da0b8cc49 100644 --- a/data/net/minecraft/world/level/Explosion.mapping +++ b/data/net/minecraft/world/level/Explosion.mapping @@ -1,67 +1,11 @@ CLASS net/minecraft/world/level/Explosion - METHOD (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/Entity;DDDFLjava/util/List;Lnet/minecraft/world/level/Explosion$BlockInteraction;Lnet/minecraft/core/particles/ParticleOptions;Lnet/minecraft/core/particles/ParticleOptions;Lnet/minecraft/core/Holder;)V - ARG 1 level - ARG 2 source - ARG 3 x - ARG 5 y - ARG 7 z - ARG 9 radius - ARG 10 toBlow - ARG 11 blockInteraction - ARG 12 smallExplosionParticles - ARG 13 largeExplosionParticles - ARG 14 explosionSound - METHOD (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/Entity;DDDFZLnet/minecraft/world/level/Explosion$BlockInteraction;)V - ARG 1 level - ARG 2 source - ARG 3 x - ARG 5 y - ARG 7 z - ARG 9 radius - ARG 10 fire - ARG 11 blockInteraction - METHOD (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/Entity;DDDFZLnet/minecraft/world/level/Explosion$BlockInteraction;Ljava/util/List;)V - ARG 1 level - ARG 2 source - ARG 3 x - ARG 5 y - ARG 7 z - ARG 9 radius - ARG 10 fire - ARG 11 blockInteraction - ARG 12 positions - METHOD (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/damagesource/DamageSource;Lnet/minecraft/world/level/ExplosionDamageCalculator;DDDFZLnet/minecraft/world/level/Explosion$BlockInteraction;Lnet/minecraft/core/particles/ParticleOptions;Lnet/minecraft/core/particles/ParticleOptions;Lnet/minecraft/core/Holder;)V - ARG 1 level - ARG 2 source - ARG 3 damageSource - ARG 4 damageCalculator - ARG 5 x - ARG 7 y - ARG 9 z - ARG 11 radius - ARG 12 fire - ARG 13 blockInteraction - ARG 14 smallExplosionParticles - ARG 15 largeExplosionParticles - ARG 16 explosionSound - METHOD addOrAppendStack (Ljava/util/List;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/core/BlockPos;)V - ARG 0 drops - ARG 1 stack - ARG 2 pos - METHOD explode ()V - COMMENT Does the first part of the explosion (destroy blocks) - METHOD finalizeExplosion (Z)V - COMMENT Does the second part of the explosion (sound, particles, drop spawn) - ARG 1 spawnParticles METHOD getDefaultDamageSource (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/damagesource/DamageSource; ARG 0 level ARG 1 source METHOD getDirectSourceEntity ()Lnet/minecraft/world/entity/Entity; COMMENT Returns either the entity that placed the explosive block, the entity that caused the explosion or null. - METHOD getIndirectSourceEntityInternal (Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/entity/LivingEntity; + METHOD getIndirectSourceEntity (Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/entity/LivingEntity; ARG 0 source - METHOD getSeenPercent (Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/entity/Entity;)F - ARG 0 explosionVector - ARG 1 entity - METHOD makeDamageCalculator (Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/level/ExplosionDamageCalculator; - ARG 1 entity + CLASS BlockInteraction + METHOD (Ljava/lang/String;IZ)V + ARG 3 shouldAffectBlocklikeEntities diff --git a/data/net/minecraft/world/level/ExplosionDamageCalculator.mapping b/data/net/minecraft/world/level/ExplosionDamageCalculator.mapping index 6d03d26d6..c7f9757fa 100644 --- a/data/net/minecraft/world/level/ExplosionDamageCalculator.mapping +++ b/data/net/minecraft/world/level/ExplosionDamageCalculator.mapping @@ -5,9 +5,10 @@ CLASS net/minecraft/world/level/ExplosionDamageCalculator ARG 3 pos ARG 4 state ARG 5 fluid - METHOD getEntityDamageAmount (Lnet/minecraft/world/level/Explosion;Lnet/minecraft/world/entity/Entity;)F + METHOD getEntityDamageAmount (Lnet/minecraft/world/level/Explosion;Lnet/minecraft/world/entity/Entity;F)F ARG 1 explosion ARG 2 entity + ARG 3 seenPercent METHOD getKnockbackMultiplier (Lnet/minecraft/world/entity/Entity;)F ARG 1 entity METHOD shouldBlockExplode (Lnet/minecraft/world/level/Explosion;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;F)Z diff --git a/data/net/minecraft/world/level/GameRules.mapping b/data/net/minecraft/world/level/GameRules.mapping index 8551c91b9..63bd84f12 100644 --- a/data/net/minecraft/world/level/GameRules.mapping +++ b/data/net/minecraft/world/level/GameRules.mapping @@ -1,8 +1,12 @@ CLASS net/minecraft/world/level/GameRules - METHOD (Lcom/mojang/serialization/DynamicLike;)V - ARG 1 tag - METHOD (Ljava/util/Map;)V + METHOD (Ljava/util/Map;Lnet/minecraft/world/flag/FeatureFlagSet;)V ARG 1 rules + ARG 2 enabledFeatures + METHOD (Lnet/minecraft/world/flag/FeatureFlagSet;)V + ARG 1 enabledFeatures + METHOD (Lnet/minecraft/world/flag/FeatureFlagSet;Lcom/mojang/serialization/DynamicLike;)V + ARG 1 enabledFeatures + ARG 2 tag METHOD assignCap (Lnet/minecraft/world/level/GameRules$Key;Lnet/minecraft/world/level/GameRules;Lnet/minecraft/server/MinecraftServer;)V ARG 1 key ARG 2 rules @@ -10,10 +14,14 @@ CLASS net/minecraft/world/level/GameRules METHOD assignFrom (Lnet/minecraft/world/level/GameRules;Lnet/minecraft/server/MinecraftServer;)V ARG 1 rules ARG 2 server + METHOD availableRules (Lnet/minecraft/world/flag/FeatureFlagSet;)Ljava/util/stream/Stream; + ARG 0 enabledFeatures METHOD callVisitorCap (Lnet/minecraft/world/level/GameRules$GameRuleTypeVisitor;Lnet/minecraft/world/level/GameRules$Key;Lnet/minecraft/world/level/GameRules$Type;)V - ARG 0 visitor - ARG 1 key - ARG 2 type + ARG 1 visitor + ARG 2 key + ARG 3 type + METHOD copy (Lnet/minecraft/world/flag/FeatureFlagSet;)Lnet/minecraft/world/level/GameRules; + ARG 1 enabledFeatures METHOD createTag ()Lnet/minecraft/nbt/CompoundTag; COMMENT Return the defined game rules as NBT. METHOD getBoolean (Lnet/minecraft/world/level/GameRules$Key;)Z @@ -30,6 +38,15 @@ CLASS net/minecraft/world/level/GameRules METHOD lambda$static$2 (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/world/level/GameRules$BooleanValue;)V ARG 0 server ARG 1 value + METHOD lambda$static$3 (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/world/level/GameRules$BooleanValue;)V + ARG 0 server + ARG 1 value + METHOD lambda$static$4 (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/world/level/GameRules$IntegerValue;)V + ARG 0 server + ARG 1 value + METHOD lambda$static$5 (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/world/level/GameRules$IntegerValue;)V + ARG 0 server + ARG 1 value METHOD loadFromTag (Lcom/mojang/serialization/DynamicLike;)V ARG 1 dynamic METHOD register (Ljava/lang/String;Lnet/minecraft/world/level/GameRules$Category;Lnet/minecraft/world/level/GameRules$Type;)Lnet/minecraft/world/level/GameRules$Key; @@ -37,7 +54,7 @@ CLASS net/minecraft/world/level/GameRules ARG 1 category ARG 2 type METHOD visitGameRuleTypes (Lnet/minecraft/world/level/GameRules$GameRuleTypeVisitor;)V - ARG 0 visitor + ARG 1 visitor CLASS Key METHOD (Ljava/lang/String;Lnet/minecraft/world/level/GameRules$Category;)V ARG 1 id @@ -45,11 +62,12 @@ CLASS net/minecraft/world/level/GameRules METHOD equals (Ljava/lang/Object;)Z ARG 1 other CLASS Type - METHOD (Ljava/util/function/Supplier;Ljava/util/function/Function;Ljava/util/function/BiConsumer;Lnet/minecraft/world/level/GameRules$VisitorCaller;)V + METHOD (Ljava/util/function/Supplier;Ljava/util/function/Function;Ljava/util/function/BiConsumer;Lnet/minecraft/world/level/GameRules$VisitorCaller;Lnet/minecraft/world/flag/FeatureFlagSet;)V ARG 1 argument ARG 2 constructor ARG 3 callback ARG 4 visitorCaller + ARG 5 requiredFeature METHOD callVisitor (Lnet/minecraft/world/level/GameRules$GameRuleTypeVisitor;Lnet/minecraft/world/level/GameRules$Key;)V ARG 1 visitor ARG 2 key @@ -105,11 +123,12 @@ CLASS net/minecraft/world/level/GameRules ARG 2 value METHOD create (I)Lnet/minecraft/world/level/GameRules$Type; ARG 0 defaultValue - METHOD create (IIILjava/util/function/BiConsumer;)Lnet/minecraft/world/level/GameRules$Type; + METHOD create (IIILnet/minecraft/world/flag/FeatureFlagSet;Ljava/util/function/BiConsumer;)Lnet/minecraft/world/level/GameRules$Type; ARG 0 defaultValue ARG 1 min ARG 2 max - ARG 3 changeListener + ARG 3 requiredFeatures + ARG 4 changeListener METHOD create (ILjava/util/function/BiConsumer;)Lnet/minecraft/world/level/GameRules$Type; ARG 0 defaultValue ARG 1 changeListener diff --git a/data/net/minecraft/world/level/GameType.mapping b/data/net/minecraft/world/level/GameType.mapping index 257bba2af..b7da54607 100644 --- a/data/net/minecraft/world/level/GameType.mapping +++ b/data/net/minecraft/world/level/GameType.mapping @@ -25,6 +25,10 @@ CLASS net/minecraft/world/level/GameType COMMENT Returns {@code true} if this is the CREATIVE game type METHOD isSurvival ()Z COMMENT Returns {@code true} if this is the SURVIVAL or ADVENTURE game type + METHOD isValidId (I)Z + ARG 0 id + METHOD lambda$isValidId$0 (ILnet/minecraft/world/level/GameType;)Z + ARG 1 gameType METHOD updatePlayerAbilities (Lnet/minecraft/world/entity/player/Abilities;)V COMMENT Configures the player abilities based on the game type ARG 1 abilities diff --git a/data/net/minecraft/world/level/Level.mapping b/data/net/minecraft/world/level/Level.mapping index d17515baa..8a9299ae5 100644 --- a/data/net/minecraft/world/level/Level.mapping +++ b/data/net/minecraft/world/level/Level.mapping @@ -1,16 +1,15 @@ CLASS net/minecraft/world/level/Level FIELD randValue I COMMENT Contains the current Linear Congruential Generator seed for block updates. Used with an A value of 3 and a C value of 0x3c6ef35f, producing a highly planar series of values ill-suited for choosing random blocks in a 16x128x16 field. - METHOD (Lnet/minecraft/world/level/storage/WritableLevelData;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/core/RegistryAccess;Lnet/minecraft/core/Holder;Ljava/util/function/Supplier;ZZJI)V + METHOD (Lnet/minecraft/world/level/storage/WritableLevelData;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/core/RegistryAccess;Lnet/minecraft/core/Holder;ZZJI)V ARG 1 levelData ARG 2 dimension ARG 3 registryAccess ARG 4 dimensionTypeRegistration - ARG 5 profiler - ARG 6 isClientSide - ARG 7 isDebug - ARG 8 biomeZoomSeed - ARG 10 maxChainedNeighborUpdates + ARG 5 isClientSide + ARG 6 isDebug + ARG 7 biomeZoomSeed + ARG 9 maxChainedNeighborUpdates METHOD addAlwaysVisibleParticle (Lnet/minecraft/core/particles/ParticleOptions;DDDDDD)V ARG 1 particleData ARG 2 x @@ -83,14 +82,14 @@ CLASS net/minecraft/world/level/Level ARG 3 progress METHOD disconnect ()V COMMENT If on MP, sends a quitting packet. - METHOD explode (Lnet/minecraft/world/entity/Entity;DDDFLnet/minecraft/world/level/Level$ExplosionInteraction;)Lnet/minecraft/world/level/Explosion; + METHOD explode (Lnet/minecraft/world/entity/Entity;DDDFLnet/minecraft/world/level/Level$ExplosionInteraction;)V ARG 1 source ARG 2 x ARG 4 y ARG 6 z ARG 8 radius ARG 9 explosionInteraction - METHOD explode (Lnet/minecraft/world/entity/Entity;DDDFZLnet/minecraft/world/level/Level$ExplosionInteraction;)Lnet/minecraft/world/level/Explosion; + METHOD explode (Lnet/minecraft/world/entity/Entity;DDDFZLnet/minecraft/world/level/Level$ExplosionInteraction;)V ARG 1 source ARG 2 x ARG 4 y @@ -98,7 +97,7 @@ CLASS net/minecraft/world/level/Level ARG 8 radius ARG 9 fire ARG 10 explosionInteraction - METHOD explode (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/damagesource/DamageSource;Lnet/minecraft/world/level/ExplosionDamageCalculator;DDDFZLnet/minecraft/world/level/Level$ExplosionInteraction;)Lnet/minecraft/world/level/Explosion; + METHOD explode (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/damagesource/DamageSource;Lnet/minecraft/world/level/ExplosionDamageCalculator;DDDFZLnet/minecraft/world/level/Level$ExplosionInteraction;)V ARG 1 source ARG 2 damageSource ARG 3 damageCalculator @@ -108,7 +107,7 @@ CLASS net/minecraft/world/level/Level ARG 10 radius ARG 11 fire ARG 12 explosionInteraction - METHOD explode (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/damagesource/DamageSource;Lnet/minecraft/world/level/ExplosionDamageCalculator;DDDFZLnet/minecraft/world/level/Level$ExplosionInteraction;Lnet/minecraft/core/particles/ParticleOptions;Lnet/minecraft/core/particles/ParticleOptions;Lnet/minecraft/core/Holder;)Lnet/minecraft/world/level/Explosion; + METHOD explode (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/damagesource/DamageSource;Lnet/minecraft/world/level/ExplosionDamageCalculator;DDDFZLnet/minecraft/world/level/Level$ExplosionInteraction;Lnet/minecraft/core/particles/ParticleOptions;Lnet/minecraft/core/particles/ParticleOptions;Lnet/minecraft/core/Holder;)V ARG 1 source ARG 2 damageSource ARG 3 damageCalculator @@ -121,21 +120,7 @@ CLASS net/minecraft/world/level/Level ARG 13 smallExplosionParticles ARG 14 largeExplosionParticles ARG 15 explosionSound - METHOD explode (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/damagesource/DamageSource;Lnet/minecraft/world/level/ExplosionDamageCalculator;DDDFZLnet/minecraft/world/level/Level$ExplosionInteraction;ZLnet/minecraft/core/particles/ParticleOptions;Lnet/minecraft/core/particles/ParticleOptions;Lnet/minecraft/core/Holder;)Lnet/minecraft/world/level/Explosion; - ARG 1 source - ARG 2 damageSource - ARG 3 damageCalculator - ARG 4 x - ARG 6 y - ARG 8 z - ARG 10 radius - ARG 11 fire - ARG 12 explosionInteraction - ARG 13 spawnParticles - ARG 14 smallExplosionParticles - ARG 15 largeExplosionParticles - ARG 16 explosionSound - METHOD explode (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/damagesource/DamageSource;Lnet/minecraft/world/level/ExplosionDamageCalculator;Lnet/minecraft/world/phys/Vec3;FZLnet/minecraft/world/level/Level$ExplosionInteraction;)Lnet/minecraft/world/level/Explosion; + METHOD explode (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/damagesource/DamageSource;Lnet/minecraft/world/level/ExplosionDamageCalculator;Lnet/minecraft/world/phys/Vec3;FZLnet/minecraft/world/level/Level$ExplosionInteraction;)V ARG 1 source ARG 2 damageSource ARG 3 damageCalculator @@ -167,8 +152,6 @@ CLASS net/minecraft/world/level/Level ARG 2 chunkZ METHOD getCurrentDifficultyAt (Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/DifficultyInstance; ARG 1 pos - METHOD getDestroyType (Lnet/minecraft/world/level/GameRules$Key;)Lnet/minecraft/world/level/Explosion$BlockInteraction; - ARG 1 gameRule METHOD getEntities (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/AABB;Ljava/util/function/Predicate;)Ljava/util/List; COMMENT Gets all entities within the specified AABB excluding the one passed into it. ARG 1 entity @@ -190,8 +173,6 @@ CLASS net/minecraft/world/level/Level ARG 1 id METHOD getFluidState (Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/material/FluidState; ARG 1 pos - METHOD getGameRules ()Lnet/minecraft/world/level/GameRules; - COMMENT Gets the GameRules instance. METHOD getHeight (Lnet/minecraft/world/level/levelgen/Heightmap$Types;II)I ARG 1 heightmapType ARG 2 x @@ -202,12 +183,12 @@ CLASS net/minecraft/world/level/Level ARG 1 mapId METHOD getRainLevel (F)F COMMENT Returns rain strength. - ARG 1 delta + ARG 1 partialTick METHOD getSunAngle (F)F COMMENT Return getCelestialAngle()*2*PI ARG 1 partialTicks METHOD getThunderLevel (F)F - ARG 1 delta + ARG 1 partialTick METHOD globalLevelEvent (ILnet/minecraft/core/BlockPos;I)V ARG 1 id ARG 2 pos @@ -248,16 +229,16 @@ CLASS net/minecraft/world/level/Level METHOD mayInteract (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/core/BlockPos;)Z ARG 1 player ARG 2 pos - METHOD neighborChanged (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;)V + METHOD neighborChanged (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/redstone/Orientation;)V ARG 1 pos ARG 2 block - ARG 3 fromPos - METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V + ARG 3 orientation + METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/redstone/Orientation;Z)V ARG 1 state ARG 2 pos ARG 3 block - ARG 4 fromPos - ARG 5 isMoving + ARG 4 orientation + ARG 5 movedByPiston METHOD onBlockStateChange (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;)V ARG 1 pos ARG 2 blockState @@ -410,10 +391,8 @@ CLASS net/minecraft/world/level/Level ARG 1 strength METHOD setSkyFlashTime (I)V ARG 1 timeFlash - METHOD setSpawnSettings (ZZ)V - COMMENT First boolean for hostile mobs and second for peaceful mobs - ARG 1 hostile - ARG 2 peaceful + METHOD setSpawnSettings (Z)V + ARG 1 spawnSettings METHOD setThunderLevel (F)V COMMENT Sets the strength of the thunder. ARG 1 strength @@ -426,10 +405,15 @@ CLASS net/minecraft/world/level/Level METHOD updateNeighborsAt (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;)V ARG 1 pos ARG 2 block - METHOD updateNeighborsAtExceptFromFacing (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/Direction;)V + METHOD updateNeighborsAt (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/redstone/Orientation;)V ARG 1 pos - ARG 2 blockType - ARG 3 skipSide + ARG 2 block + ARG 3 orientation + METHOD updateNeighborsAtExceptFromFacing (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/redstone/Orientation;)V + ARG 1 pos + ARG 2 block + ARG 3 facing + ARG 4 orientation METHOD updateNeighbourForOutputSignal (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;)V ARG 1 pos ARG 2 block diff --git a/data/net/minecraft/world/level/LevelAccessor.mapping b/data/net/minecraft/world/level/LevelAccessor.mapping index a79049039..60e97093e 100644 --- a/data/net/minecraft/world/level/LevelAccessor.mapping +++ b/data/net/minecraft/world/level/LevelAccessor.mapping @@ -57,16 +57,13 @@ CLASS net/minecraft/world/level/LevelAccessor ARG 2 type ARG 3 pos ARG 4 data - METHOD neighborShapeChanged (Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;II)V + METHOD neighborShapeChanged (Lnet/minecraft/core/Direction;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;II)V ARG 1 direction - ARG 2 queried - COMMENT The block state of the current block - ARG 3 pos - COMMENT The position of the neighbor block - ARG 4 offsetPos - COMMENT The position of the current block + ARG 2 pos + ARG 3 neighborPos + ARG 4 neighborState ARG 5 flags - ARG 6 recursionLevel + ARG 6 recursionLeft METHOD playSound (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/core/BlockPos;Lnet/minecraft/sounds/SoundEvent;Lnet/minecraft/sounds/SoundSource;)V ARG 1 player ARG 2 pos @@ -80,21 +77,3 @@ CLASS net/minecraft/world/level/LevelAccessor ARG 4 source ARG 5 volume ARG 6 pitch - METHOD scheduleTick (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;I)V - ARG 1 pos - ARG 2 block - ARG 3 delay - METHOD scheduleTick (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;ILnet/minecraft/world/ticks/TickPriority;)V - ARG 1 pos - ARG 2 block - ARG 3 delay - ARG 4 priority - METHOD scheduleTick (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/material/Fluid;I)V - ARG 1 pos - ARG 2 fluid - ARG 3 delay - METHOD scheduleTick (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/material/Fluid;ILnet/minecraft/world/ticks/TickPriority;)V - ARG 1 pos - ARG 2 fluid - ARG 3 delay - ARG 4 priority diff --git a/data/net/minecraft/world/level/LevelHeightAccessor.mapping b/data/net/minecraft/world/level/LevelHeightAccessor.mapping index 55dba183c..bdba988f9 100644 --- a/data/net/minecraft/world/level/LevelHeightAccessor.mapping +++ b/data/net/minecraft/world/level/LevelHeightAccessor.mapping @@ -8,6 +8,8 @@ CLASS net/minecraft/world/level/LevelHeightAccessor ARG 1 sectionIndex METHOD getSectionYFromSectionIndex (I)I ARG 1 sectionIndex + METHOD isInsideBuildHeight (I)Z + ARG 1 y METHOD isOutsideBuildHeight (I)Z ARG 1 y METHOD isOutsideBuildHeight (Lnet/minecraft/core/BlockPos;)Z diff --git a/data/net/minecraft/world/level/NaturalSpawner.mapping b/data/net/minecraft/world/level/NaturalSpawner.mapping index 3b4bce2e5..7d7355e38 100644 --- a/data/net/minecraft/world/level/NaturalSpawner.mapping +++ b/data/net/minecraft/world/level/NaturalSpawner.mapping @@ -11,6 +11,11 @@ CLASS net/minecraft/world/level/NaturalSpawner ARG 1 entities ARG 2 chunkGetter ARG 3 calculator + METHOD getFilteredSpawningCategories (Lnet/minecraft/world/level/NaturalSpawner$SpawnState;ZZZ)Ljava/util/List; + ARG 0 spawnState + ARG 1 spawnFriendlies + ARG 2 spawnEnemies + ARG 3 spawnPassives METHOD getMobForSpawn (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/EntityType;)Lnet/minecraft/world/entity/Mob; ARG 0 level ARG 1 entityType @@ -95,13 +100,11 @@ CLASS net/minecraft/world/level/NaturalSpawner ARG 3 pos ARG 4 filter ARG 5 callback - METHOD spawnForChunk (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/chunk/LevelChunk;Lnet/minecraft/world/level/NaturalSpawner$SpawnState;ZZZ)V + METHOD spawnForChunk (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/chunk/LevelChunk;Lnet/minecraft/world/level/NaturalSpawner$SpawnState;Ljava/util/List;)V ARG 0 level ARG 1 chunk ARG 2 spawnState - ARG 3 spawnFriendlies - ARG 4 spawnMonsters - ARG 5 forcedDespawn + ARG 3 categories METHOD spawnMobsForChunkGeneration (Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/core/Holder;Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/util/RandomSource;)V ARG 0 levelAccessor ARG 1 biome @@ -120,9 +123,11 @@ CLASS net/minecraft/world/level/NaturalSpawner ARG 1 entityType ARG 2 pos ARG 3 chunk - METHOD canSpawnForCategory (Lnet/minecraft/world/entity/MobCategory;Lnet/minecraft/world/level/ChunkPos;)Z + METHOD canSpawnForCategoryGlobal (Lnet/minecraft/world/entity/MobCategory;)Z ARG 1 category - ARG 2 pos + METHOD canSpawnForCategoryLocal (Lnet/minecraft/world/entity/MobCategory;Lnet/minecraft/world/level/ChunkPos;)Z + ARG 1 category + ARG 2 chunkPos CLASS ChunkGetter METHOD query (JLjava/util/function/Consumer;)V ARG 1 chunkPos diff --git a/data/net/minecraft/world/level/ScheduledTickAccess.mapping b/data/net/minecraft/world/level/ScheduledTickAccess.mapping new file mode 100644 index 000000000..dede5901f --- /dev/null +++ b/data/net/minecraft/world/level/ScheduledTickAccess.mapping @@ -0,0 +1,28 @@ +CLASS net/minecraft/world/level/ScheduledTickAccess + METHOD createTick (Lnet/minecraft/core/BlockPos;Ljava/lang/Object;I)Lnet/minecraft/world/ticks/ScheduledTick; + ARG 1 pos + ARG 2 type + ARG 3 delay + METHOD createTick (Lnet/minecraft/core/BlockPos;Ljava/lang/Object;ILnet/minecraft/world/ticks/TickPriority;)Lnet/minecraft/world/ticks/ScheduledTick; + ARG 1 pos + ARG 2 type + ARG 3 delay + ARG 4 priority + METHOD scheduleTick (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;I)V + ARG 1 pos + ARG 2 block + ARG 3 delay + METHOD scheduleTick (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;ILnet/minecraft/world/ticks/TickPriority;)V + ARG 1 pos + ARG 2 block + ARG 3 delay + ARG 4 priority + METHOD scheduleTick (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/material/Fluid;I)V + ARG 1 pos + ARG 2 fluid + ARG 3 delay + METHOD scheduleTick (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/material/Fluid;ILnet/minecraft/world/ticks/TickPriority;)V + ARG 1 pos + ARG 2 fluid + ARG 3 delay + ARG 4 priority diff --git a/data/net/minecraft/world/level/ServerExplosion.mapping b/data/net/minecraft/world/level/ServerExplosion.mapping new file mode 100644 index 000000000..7f99fe858 --- /dev/null +++ b/data/net/minecraft/world/level/ServerExplosion.mapping @@ -0,0 +1,29 @@ +CLASS net/minecraft/world/level/ServerExplosion + METHOD (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/damagesource/DamageSource;Lnet/minecraft/world/level/ExplosionDamageCalculator;Lnet/minecraft/world/phys/Vec3;FZLnet/minecraft/world/level/Explosion$BlockInteraction;)V + ARG 1 level + ARG 2 source + ARG 3 damageSource + ARG 4 damageCalculator + ARG 5 center + ARG 6 radius + ARG 7 fire + ARG 8 blockInteraction + METHOD addOrAppendStack (Ljava/util/List;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/core/BlockPos;)V + ARG 0 stackCollectors + ARG 1 stack + ARG 2 pos + METHOD createFire (Ljava/util/List;)V + ARG 1 blocks + METHOD getSeenPercent (Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/entity/Entity;)F + ARG 0 explosionVector + ARG 1 entity + METHOD interactWithBlocks (Ljava/util/List;)V + ARG 1 blocks + METHOD makeDamageCalculator (Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/level/ExplosionDamageCalculator; + ARG 1 entity + CLASS StackCollector + METHOD (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/item/ItemStack;)V + ARG 1 pos + ARG 2 stack + METHOD tryMerge (Lnet/minecraft/world/item/ItemStack;)V + ARG 1 stack diff --git a/data/net/minecraft/world/level/biome/Biome.mapping b/data/net/minecraft/world/level/biome/Biome.mapping index 642b504a8..d011562c0 100644 --- a/data/net/minecraft/world/level/biome/Biome.mapping +++ b/data/net/minecraft/world/level/biome/Biome.mapping @@ -4,17 +4,21 @@ CLASS net/minecraft/world/level/biome/Biome ARG 2 specialEffects ARG 3 generationSettings ARG 4 mobSettings - METHOD coldEnoughToSnow (Lnet/minecraft/core/BlockPos;)Z + METHOD coldEnoughToSnow (Lnet/minecraft/core/BlockPos;I)Z ARG 1 pos + ARG 2 seaLevel METHOD getGrassColor (DD)I ARG 1 posX ARG 3 posZ - METHOD getHeightAdjustedTemperature (Lnet/minecraft/core/BlockPos;)F + METHOD getHeightAdjustedTemperature (Lnet/minecraft/core/BlockPos;I)F ARG 1 pos - METHOD getPrecipitationAt (Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/biome/Biome$Precipitation; + ARG 2 seaLevel + METHOD getPrecipitationAt (Lnet/minecraft/core/BlockPos;I)Lnet/minecraft/world/level/biome/Biome$Precipitation; ARG 1 pos - METHOD getTemperature (Lnet/minecraft/core/BlockPos;)F + ARG 2 seaLevel + METHOD getTemperature (Lnet/minecraft/core/BlockPos;I)F ARG 1 pos + ARG 2 seaLevel METHOD lambda$static$0 (Lnet/minecraft/world/level/biome/Biome;)Lnet/minecraft/world/level/biome/Biome$ClimateSettings; ARG 0 biome METHOD lambda$static$1 (Lnet/minecraft/world/level/biome/Biome;)Lnet/minecraft/world/level/biome/BiomeSpecialEffects; @@ -41,13 +45,15 @@ CLASS net/minecraft/world/level/biome/Biome ARG 1 level ARG 2 water ARG 3 mustBeAtEdge - METHOD shouldMeltFrozenOceanIcebergSlightly (Lnet/minecraft/core/BlockPos;)Z + METHOD shouldMeltFrozenOceanIcebergSlightly (Lnet/minecraft/core/BlockPos;I)Z ARG 1 pos + ARG 2 seaLevel METHOD shouldSnow (Lnet/minecraft/world/level/LevelReader;Lnet/minecraft/core/BlockPos;)Z ARG 1 level ARG 2 pos - METHOD warmEnoughToRain (Lnet/minecraft/core/BlockPos;)Z + METHOD warmEnoughToRain (Lnet/minecraft/core/BlockPos;I)Z ARG 1 pos + ARG 2 seaLevel CLASS 1 METHOD rehash (I)V ARG 1 newSize diff --git a/data/net/minecraft/world/level/biome/BiomeGenerationSettings.mapping b/data/net/minecraft/world/level/biome/BiomeGenerationSettings.mapping index 61df60257..144caa381 100644 --- a/data/net/minecraft/world/level/biome/BiomeGenerationSettings.mapping +++ b/data/net/minecraft/world/level/biome/BiomeGenerationSettings.mapping @@ -1,15 +1,11 @@ CLASS net/minecraft/world/level/biome/BiomeGenerationSettings - METHOD (Ljava/util/Map;Ljava/util/List;)V + METHOD (Lnet/minecraft/core/HolderSet;Ljava/util/List;)V ARG 1 carvers ARG 2 features - METHOD getCarvers (Lnet/minecraft/world/level/levelgen/GenerationStep$Carving;)Ljava/lang/Iterable; - ARG 1 step METHOD hasFeature (Lnet/minecraft/world/level/levelgen/placement/PlacedFeature;)Z ARG 1 feature METHOD lambda$new$3 (Lnet/minecraft/world/level/levelgen/feature/ConfiguredFeature;)Z ARG 0 features - METHOD lambda$static$0 (Lnet/minecraft/world/level/biome/BiomeGenerationSettings;)Ljava/util/Map; - ARG 0 settings METHOD lambda$static$1 (Lnet/minecraft/world/level/biome/BiomeGenerationSettings;)Ljava/util/List; ARG 0 settings METHOD lambda$static$2 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; @@ -18,16 +14,14 @@ CLASS net/minecraft/world/level/biome/BiomeGenerationSettings METHOD (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/core/HolderGetter;)V ARG 1 placedFeatures ARG 2 worldCarvers - METHOD addCarver (Lnet/minecraft/world/level/levelgen/GenerationStep$Carving;Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/level/biome/BiomeGenerationSettings$Builder; - ARG 1 carving - ARG 2 carver + METHOD addCarver (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/level/biome/BiomeGenerationSettings$Builder; + ARG 1 carver METHOD addFeature (Lnet/minecraft/world/level/levelgen/GenerationStep$Decoration;Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/level/biome/BiomeGenerationSettings$Builder; ARG 1 decoration ARG 2 feature CLASS PlainBuilder - METHOD addCarver (Lnet/minecraft/world/level/levelgen/GenerationStep$Carving;Lnet/minecraft/core/Holder;)Lnet/minecraft/world/level/biome/BiomeGenerationSettings$PlainBuilder; - ARG 1 carving - ARG 2 carver + METHOD addCarver (Lnet/minecraft/core/Holder;)Lnet/minecraft/world/level/biome/BiomeGenerationSettings$PlainBuilder; + ARG 1 carver METHOD addFeature (ILnet/minecraft/core/Holder;)Lnet/minecraft/world/level/biome/BiomeGenerationSettings$PlainBuilder; ARG 1 step ARG 2 feature @@ -36,7 +30,3 @@ CLASS net/minecraft/world/level/biome/BiomeGenerationSettings ARG 2 feature METHOD addFeatureStepsUpTo (I)V ARG 1 step - METHOD lambda$addCarver$0 (Lnet/minecraft/world/level/levelgen/GenerationStep$Carving;)Ljava/util/List; - ARG 0 key - METHOD lambda$build$1 (Ljava/util/Map$Entry;)Lnet/minecraft/core/HolderSet; - ARG 0 carvers diff --git a/data/net/minecraft/world/level/biome/MultiNoiseBiomeSourceParameterList.mapping b/data/net/minecraft/world/level/biome/MultiNoiseBiomeSourceParameterList.mapping index c3dfc2cde..c9ece396f 100644 --- a/data/net/minecraft/world/level/biome/MultiNoiseBiomeSourceParameterList.mapping +++ b/data/net/minecraft/world/level/biome/MultiNoiseBiomeSourceParameterList.mapping @@ -13,8 +13,9 @@ CLASS net/minecraft/world/level/biome/MultiNoiseBiomeSourceParameterList METHOD lambda$static$1 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance CLASS Preset - METHOD generateOverworldBiomes (Ljava/util/function/Function;)Lnet/minecraft/world/level/biome/Climate$ParameterList; + METHOD generateOverworldBiomes (Ljava/util/function/Function;Lnet/minecraft/world/level/biome/OverworldBiomeBuilder$Modifier;)Lnet/minecraft/world/level/biome/Climate$ParameterList; ARG 0 valueGetter + ARG 1 modifier METHOD lambda$generateOverworldBiomes$5 (Lcom/google/common/collect/ImmutableList$Builder;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Pair;)V ARG 2 pair METHOD lambda$static$0 (Lnet/minecraft/world/level/biome/MultiNoiseBiomeSourceParameterList$Preset;)Lnet/minecraft/world/level/biome/MultiNoiseBiomeSourceParameterList$Preset; diff --git a/data/net/minecraft/world/level/biome/MultiNoiseBiomeSourceParameterLists.mapping b/data/net/minecraft/world/level/biome/MultiNoiseBiomeSourceParameterLists.mapping index 04b91bca1..e711b707a 100644 --- a/data/net/minecraft/world/level/biome/MultiNoiseBiomeSourceParameterLists.mapping +++ b/data/net/minecraft/world/level/biome/MultiNoiseBiomeSourceParameterLists.mapping @@ -3,3 +3,5 @@ CLASS net/minecraft/world/level/biome/MultiNoiseBiomeSourceParameterLists ARG 0 context METHOD register (Ljava/lang/String;)Lnet/minecraft/resources/ResourceKey; ARG 0 name + METHOD winterDrop (Lnet/minecraft/data/worldgen/BootstrapContext;)V + ARG 0 context diff --git a/data/net/minecraft/world/level/biome/OverworldBiomeBuilder.mapping b/data/net/minecraft/world/level/biome/OverworldBiomeBuilder.mapping index 98f64c8e5..52818a5fb 100644 --- a/data/net/minecraft/world/level/biome/OverworldBiomeBuilder.mapping +++ b/data/net/minecraft/world/level/biome/OverworldBiomeBuilder.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/world/level/biome/OverworldBiomeBuilder + METHOD (Lnet/minecraft/world/level/biome/OverworldBiomeBuilder$Modifier;)V + ARG 1 modifier METHOD addBiomes (Ljava/util/function/Consumer;)V ARG 1 key METHOD addBottomBiome (Ljava/util/function/Consumer;Lnet/minecraft/world/level/biome/Climate$Parameter;Lnet/minecraft/world/level/biome/Climate$Parameter;Lnet/minecraft/world/level/biome/Climate$Parameter;Lnet/minecraft/world/level/biome/Climate$Parameter;Lnet/minecraft/world/level/biome/Climate$Parameter;FLnet/minecraft/resources/ResourceKey;)V diff --git a/data/net/minecraft/world/level/block/AmethystClusterBlock.mapping b/data/net/minecraft/world/level/block/AmethystClusterBlock.mapping index 21237e05d..20025cfbe 100644 --- a/data/net/minecraft/world/level/block/AmethystClusterBlock.mapping +++ b/data/net/minecraft/world/level/block/AmethystClusterBlock.mapping @@ -3,3 +3,5 @@ CLASS net/minecraft/world/level/block/AmethystClusterBlock ARG 1 height ARG 2 aabbOffset ARG 3 properties + METHOD lambda$static$2 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/level/block/AttachedStemBlock.mapping b/data/net/minecraft/world/level/block/AttachedStemBlock.mapping index e2f71d3b9..bc767fc46 100644 --- a/data/net/minecraft/world/level/block/AttachedStemBlock.mapping +++ b/data/net/minecraft/world/level/block/AttachedStemBlock.mapping @@ -21,10 +21,3 @@ CLASS net/minecraft/world/level/block/AttachedStemBlock METHOD rotate (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 rot - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/BambooSaplingBlock.mapping b/data/net/minecraft/world/level/block/BambooSaplingBlock.mapping index 313e56e7e..058060903 100644 --- a/data/net/minecraft/world/level/block/BambooSaplingBlock.mapping +++ b/data/net/minecraft/world/level/block/BambooSaplingBlock.mapping @@ -16,10 +16,3 @@ CLASS net/minecraft/world/level/block/BambooSaplingBlock METHOD growBamboo (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)V ARG 1 level ARG 2 state - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/BannerBlock.mapping b/data/net/minecraft/world/level/block/BannerBlock.mapping index 68d2d3b2e..6b58b4e7e 100644 --- a/data/net/minecraft/world/level/block/BannerBlock.mapping +++ b/data/net/minecraft/world/level/block/BannerBlock.mapping @@ -20,10 +20,3 @@ CLASS net/minecraft/world/level/block/BannerBlock METHOD rotate (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 rotation - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/BarrierBlock.mapping b/data/net/minecraft/world/level/block/BarrierBlock.mapping index 714cb7ba4..366c1021c 100644 --- a/data/net/minecraft/world/level/block/BarrierBlock.mapping +++ b/data/net/minecraft/world/level/block/BarrierBlock.mapping @@ -5,7 +5,3 @@ CLASS net/minecraft/world/level/block/BarrierBlock ARG 1 state ARG 2 level ARG 3 pos - METHOD propagatesSkylightDown (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z - ARG 1 state - ARG 2 reader - ARG 3 pos diff --git a/data/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.mapping b/data/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.mapping index 91fead91c..5ebf23f51 100644 --- a/data/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.mapping +++ b/data/net/minecraft/world/level/block/BaseCoralPlantTypeBlock.mapping @@ -18,14 +18,9 @@ CLASS net/minecraft/world/level/block/BaseCoralPlantTypeBlock ARG 0 state ARG 1 level ARG 2 pos - METHOD tryScheduleDieTick (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;)V + METHOD tryScheduleDieTick (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/world/level/ScheduledTickAccess;Lnet/minecraft/util/RandomSource;Lnet/minecraft/core/BlockPos;)V ARG 1 state ARG 2 level - ARG 3 pos - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos + ARG 3 scheduledTickAccess + ARG 4 random + ARG 5 pos diff --git a/data/net/minecraft/world/level/block/BaseCoralWallFanBlock.mapping b/data/net/minecraft/world/level/block/BaseCoralWallFanBlock.mapping index c45557a88..32e6280b6 100644 --- a/data/net/minecraft/world/level/block/BaseCoralWallFanBlock.mapping +++ b/data/net/minecraft/world/level/block/BaseCoralWallFanBlock.mapping @@ -18,10 +18,3 @@ CLASS net/minecraft/world/level/block/BaseCoralWallFanBlock METHOD rotate (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 rotation - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/BasePressurePlateBlock.mapping b/data/net/minecraft/world/level/block/BasePressurePlateBlock.mapping index 5292b8209..686e597cc 100644 --- a/data/net/minecraft/world/level/block/BasePressurePlateBlock.mapping +++ b/data/net/minecraft/world/level/block/BasePressurePlateBlock.mapping @@ -61,10 +61,3 @@ CLASS net/minecraft/world/level/block/BasePressurePlateBlock COMMENT Notify block and block below of changes ARG 1 level ARG 2 pos - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/BaseRailBlock.mapping b/data/net/minecraft/world/level/block/BaseRailBlock.mapping index da1ba3868..426286c7d 100644 --- a/data/net/minecraft/world/level/block/BaseRailBlock.mapping +++ b/data/net/minecraft/world/level/block/BaseRailBlock.mapping @@ -18,13 +18,6 @@ CLASS net/minecraft/world/level/block/BaseRailBlock ARG 1 pos METHOD isRail (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 0 state - METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V - ARG 1 state - ARG 2 level - ARG 3 pos - ARG 4 block - ARG 5 fromPos - ARG 6 isMoving METHOD onPlace (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Z)V ARG 1 state ARG 2 level diff --git a/data/net/minecraft/world/level/block/BedBlock.mapping b/data/net/minecraft/world/level/block/BedBlock.mapping index 34248966e..943244997 100644 --- a/data/net/minecraft/world/level/block/BedBlock.mapping +++ b/data/net/minecraft/world/level/block/BedBlock.mapping @@ -63,19 +63,11 @@ CLASS net/minecraft/world/level/block/BedBlock METHOD kickVillagerOutOfBed (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Z ARG 1 level ARG 2 pos + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD setPlacedBy (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;)V ARG 1 level ARG 2 pos ARG 3 state ARG 4 placer ARG 5 stack - METHOD updateEntityAfterFallOn (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/world/entity/Entity;)V - ARG 1 level - ARG 2 entity - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/BeehiveBlock.mapping b/data/net/minecraft/world/level/block/BeehiveBlock.mapping index 2df000c95..e3675509e 100644 --- a/data/net/minecraft/world/level/block/BeehiveBlock.mapping +++ b/data/net/minecraft/world/level/block/BeehiveBlock.mapping @@ -53,10 +53,3 @@ CLASS net/minecraft/world/level/block/BeehiveBlock ARG 1 level ARG 2 pos ARG 3 state - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/BellBlock.mapping b/data/net/minecraft/world/level/block/BellBlock.mapping index c037f9fd3..f1d2f338d 100644 --- a/data/net/minecraft/world/level/block/BellBlock.mapping +++ b/data/net/minecraft/world/level/block/BellBlock.mapping @@ -37,13 +37,6 @@ CLASS net/minecraft/world/level/block/BellBlock ARG 1 pos ARG 2 direction ARG 3 distanceY - METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V - ARG 1 state - ARG 2 level - ARG 3 pos - ARG 4 block - ARG 5 fromPos - ARG 6 isMoving METHOD onHit (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/phys/BlockHitResult;Lnet/minecraft/world/entity/player/Player;Z)Z ARG 1 level ARG 2 state @@ -55,10 +48,3 @@ CLASS net/minecraft/world/level/block/BellBlock ARG 2 state ARG 3 hit ARG 4 projectile - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/Block.mapping b/data/net/minecraft/world/level/block/Block.mapping index c77c5ab72..c7995ffa7 100644 --- a/data/net/minecraft/world/level/block/Block.mapping +++ b/data/net/minecraft/world/level/block/Block.mapping @@ -70,8 +70,6 @@ CLASS net/minecraft/world/level/block/Block ARG 1 level ARG 2 pos ARG 3 state - METHOD getDescriptionId ()Ljava/lang/String; - COMMENT @return the description ID of this block, for use with language files. METHOD getDrops (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/entity/BlockEntity;)Ljava/util/List; ARG 0 state ARG 1 level @@ -159,12 +157,10 @@ CLASS net/minecraft/world/level/block/Block ARG 3 state ARG 4 placer ARG 5 stack - METHOD shouldRenderFace (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction;Lnet/minecraft/core/BlockPos;)Z - ARG 0 state - ARG 1 level - ARG 2 offset - ARG 3 face - ARG 4 pos + METHOD shouldRenderFace (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;)Z + ARG 0 currentFace + ARG 1 neighboringFace + ARG 2 face METHOD spawnDestroyParticles (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V ARG 1 level ARG 2 player @@ -182,9 +178,7 @@ CLASS net/minecraft/world/level/block/Block ARG 2 pos ARG 3 heldItem ARG 4 amount - METHOD updateEntityAfterFallOn (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/world/entity/Entity;)V - COMMENT Called when an Entity lands on this Block. - COMMENT This method is responsible for doing any modification on the motion of the entity that should result from the landing. + METHOD updateEntityMovementAfterFallOn (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/world/entity/Entity;)V ARG 1 level ARG 2 entity METHOD updateFromNeighbourShapes (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; @@ -206,8 +200,7 @@ CLASS net/minecraft/world/level/block/Block ARG 3 pos ARG 4 flags ARG 5 recursionLeft - METHOD wasExploded (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/Explosion;)V - COMMENT Called when this Block is destroyed by an Explosion + METHOD wasExploded (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/Explosion;)V ARG 1 level ARG 2 pos ARG 3 explosion @@ -219,10 +212,6 @@ CLASS net/minecraft/world/level/block/Block CLASS 2 METHOD rehash (I)V ARG 1 newN - CLASS BlockStatePairKey - METHOD (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;)V - ARG 1 first - ARG 2 second - ARG 3 direction + CLASS ShapePairKey METHOD equals (Ljava/lang/Object;)Z ARG 1 other diff --git a/data/net/minecraft/world/level/block/Blocks.mapping b/data/net/minecraft/world/level/block/Blocks.mapping index 55f7e614c..258b3b894 100644 --- a/data/net/minecraft/world/level/block/Blocks.mapping +++ b/data/net/minecraft/world/level/block/Blocks.mapping @@ -5,116 +5,317 @@ CLASS net/minecraft/world/level/block/Blocks ARG 2 pos METHOD always (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/EntityType;)Ljava/lang/Boolean; ARG 0 state - ARG 1 blockGetter + ARG 1 level ARG 2 pos ARG 3 entity - METHOD bed (Lnet/minecraft/world/item/DyeColor;)Lnet/minecraft/world/level/block/Block; - ARG 0 color - METHOD candle (Lnet/minecraft/world/level/material/MapColor;)Lnet/minecraft/world/level/block/Block; + METHOD candleProperties (Lnet/minecraft/world/level/material/MapColor;)Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties; ARG 0 mapColor - METHOD flowerPot (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/world/level/block/Block; - ARG 0 potted - METHOD lambda$static$10 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$11 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$12 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$17 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$18 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$19 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$20 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$25 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$26 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$27 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$28 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$29 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$30 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$31 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$37 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$39 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$40 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$41 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$42 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$43 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$44 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$45 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$46 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$49 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$50 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$52 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$8 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD lambda$static$9 (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 0 state - METHOD leaves (Lnet/minecraft/world/level/block/SoundType;)Lnet/minecraft/world/level/block/Block; - ARG 0 soundType - METHOD legacyStair (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/world/level/block/Block; - ARG 0 baseBlock + METHOD lambda$litBlockEmission$2 (ILnet/minecraft/world/level/block/state/BlockState;)I + ARG 1 state + METHOD lambda$logProperties$6 (Lnet/minecraft/world/level/material/MapColor;Lnet/minecraft/world/level/material/MapColor;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/material/MapColor; + ARG 2 state + METHOD lambda$registerBed$4 (Lnet/minecraft/world/item/DyeColor;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 1 properties + METHOD lambda$static$318 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$319 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$320 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$321 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$322 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$323 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$324 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$325 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$326 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$327 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$328 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$329 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$330 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$331 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$332 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$333 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$334 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$335 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$336 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$337 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$338 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$339 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$340 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$341 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$342 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$343 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$344 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$345 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$346 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$347 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$348 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$349 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$350 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$351 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$352 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$353 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$356 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$359 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$360 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$361 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$362 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$364 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$367 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$370 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$371 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$372 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$373 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$375 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$376 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$377 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$380 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$381 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$382 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$383 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$384 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$385 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$386 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$387 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$388 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$391 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$392 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$393 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$394 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$395 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$396 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$397 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$398 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$399 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$400 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$401 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$402 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$403 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$405 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$407 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$409 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$411 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$412 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$413 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$418 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$420 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$422 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$423 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$424 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$428 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$429 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$430 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$431 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$432 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$433 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$434 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$435 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$436 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$437 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$438 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$439 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$440 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$441 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$442 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$443 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$444 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$445 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$446 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$447 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$448 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$449 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$450 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$451 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$452 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$453 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$454 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$455 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$456 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$457 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$458 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$459 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$460 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$461 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$462 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$463 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$464 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$static$465 (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 properties + METHOD lambda$waterloggedMapColor$3 (Lnet/minecraft/world/level/material/MapColor;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/material/MapColor; + ARG 1 state + METHOD leavesProperties (Lnet/minecraft/world/level/block/SoundType;)Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties; + ARG 0 sound METHOD litBlockEmission (I)Ljava/util/function/ToIntFunction; ARG 0 lightValue - METHOD log (Lnet/minecraft/world/level/material/MapColor;Lnet/minecraft/world/level/material/MapColor;)Lnet/minecraft/world/level/block/Block; - ARG 0 topMapColor - ARG 1 sideMapColor - METHOD log (Lnet/minecraft/world/level/material/MapColor;Lnet/minecraft/world/level/material/MapColor;Lnet/minecraft/world/level/block/SoundType;)Lnet/minecraft/world/level/block/Block; - ARG 0 topMapColor - ARG 1 sideMapColor - ARG 2 soundType - METHOD netherStem (Lnet/minecraft/world/level/material/MapColor;)Lnet/minecraft/world/level/block/Block; - ARG 0 mapColor + METHOD logProperties (Lnet/minecraft/world/level/material/MapColor;Lnet/minecraft/world/level/material/MapColor;Lnet/minecraft/world/level/block/SoundType;)Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties; + ARG 0 sideColor + ARG 1 topColor + ARG 2 sound + METHOD netherStemProperties (Lnet/minecraft/world/level/material/MapColor;)Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties; + ARG 0 color METHOD never (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z ARG 0 state ARG 1 blockGetter ARG 2 pos METHOD never (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/EntityType;)Ljava/lang/Boolean; ARG 0 state - ARG 1 blockGetter + ARG 1 level ARG 2 pos ARG 3 entity METHOD ocelotOrParrot (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/EntityType;)Ljava/lang/Boolean; ARG 0 state - ARG 1 blockGetter + ARG 1 level ARG 2 pos ARG 3 entity - METHOD pistonBase (Z)Lnet/minecraft/world/level/block/Block; - ARG 0 isSticky - METHOD register (Ljava/lang/String;Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/world/level/block/Block; - ARG 0 key - ARG 1 block - METHOD register (Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/world/level/block/Block; + METHOD register (Ljava/lang/String;Ljava/util/function/Function;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 name + ARG 1 factory + ARG 2 properties + METHOD register (Ljava/lang/String;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 name + ARG 1 properties + METHOD register (Lnet/minecraft/resources/ResourceKey;Ljava/util/function/Function;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; ARG 0 resourceKey - ARG 1 block - METHOD shulkerBox (Lnet/minecraft/world/item/DyeColor;Lnet/minecraft/world/level/material/MapColor;)Lnet/minecraft/world/level/block/Block; - ARG 0 color - ARG 1 mapColor - METHOD stainedGlass (Lnet/minecraft/world/item/DyeColor;)Lnet/minecraft/world/level/block/Block; - ARG 0 color - METHOD stair (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/world/level/block/Block; + ARG 1 factory + ARG 2 properties + METHOD register (Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)Lnet/minecraft/world/level/block/Block; + ARG 0 resourceKey + ARG 1 properties + METHOD registerBed (Ljava/lang/String;Lnet/minecraft/world/item/DyeColor;)Lnet/minecraft/world/level/block/Block; + ARG 0 name + ARG 1 color + METHOD registerLegacyStair (Ljava/lang/String;Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/world/level/block/Block; + ARG 0 name + ARG 1 baseBlock + METHOD registerStainedGlass (Ljava/lang/String;Lnet/minecraft/world/item/DyeColor;)Lnet/minecraft/world/level/block/Block; + ARG 0 name + ARG 1 color + METHOD registerStair (Ljava/lang/String;Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/world/level/block/Block; + ARG 0 name + ARG 1 baseBlock + METHOD shulkerBoxProperties (Lnet/minecraft/world/level/material/MapColor;)Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties; + ARG 0 mapColor + METHOD vanillaBlockId (Ljava/lang/String;)Lnet/minecraft/resources/ResourceKey; + ARG 0 name + METHOD wallVariant (Lnet/minecraft/world/level/block/Block;Z)Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties; ARG 0 baseBlock + ARG 1 overrideDescription METHOD waterloggedMapColor (Lnet/minecraft/world/level/material/MapColor;)Ljava/util/function/Function; ARG 0 unwaterloggedMapColor - METHOD woodenButton (Lnet/minecraft/world/level/block/state/properties/BlockSetType;)Lnet/minecraft/world/level/block/Block; - ARG 0 type diff --git a/data/net/minecraft/world/level/block/BonemealableFeaturePlacerBlock.mapping b/data/net/minecraft/world/level/block/BonemealableFeaturePlacerBlock.mapping new file mode 100644 index 000000000..5865c8d3e --- /dev/null +++ b/data/net/minecraft/world/level/block/BonemealableFeaturePlacerBlock.mapping @@ -0,0 +1,10 @@ +CLASS net/minecraft/world/level/block/BonemealableFeaturePlacerBlock + METHOD (Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V + ARG 1 feature + ARG 2 properties + METHOD lambda$performBonemeal$2 (Lnet/minecraft/core/Registry;)Ljava/util/Optional; + ARG 1 registry + METHOD lambda$static$0 (Lnet/minecraft/world/level/block/BonemealableFeaturePlacerBlock;)Lnet/minecraft/resources/ResourceKey; + ARG 0 block + METHOD lambda$static$1 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/level/block/BubbleColumnBlock.mapping b/data/net/minecraft/world/level/block/BubbleColumnBlock.mapping index 520ed67db..84d772741 100644 --- a/data/net/minecraft/world/level/block/BubbleColumnBlock.mapping +++ b/data/net/minecraft/world/level/block/BubbleColumnBlock.mapping @@ -32,10 +32,3 @@ CLASS net/minecraft/world/level/block/BubbleColumnBlock ARG 1 pos ARG 2 fluid ARG 3 state - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/BushBlock.mapping b/data/net/minecraft/world/level/block/BushBlock.mapping index 5e20e66e4..5bf85b422 100644 --- a/data/net/minecraft/world/level/block/BushBlock.mapping +++ b/data/net/minecraft/world/level/block/BushBlock.mapping @@ -7,14 +7,3 @@ CLASS net/minecraft/world/level/block/BushBlock ARG 1 state ARG 2 level ARG 3 pos - METHOD propagatesSkylightDown (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z - ARG 1 state - ARG 2 reader - ARG 3 pos - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/CactusBlock.mapping b/data/net/minecraft/world/level/block/CactusBlock.mapping index ff5d0d6ce..d3d17a6d8 100644 --- a/data/net/minecraft/world/level/block/CactusBlock.mapping +++ b/data/net/minecraft/world/level/block/CactusBlock.mapping @@ -20,10 +20,3 @@ CLASS net/minecraft/world/level/block/CactusBlock ARG 2 level ARG 3 pos ARG 4 context - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/CakeBlock.mapping b/data/net/minecraft/world/level/block/CakeBlock.mapping index 8f6943af5..9a39fbf03 100644 --- a/data/net/minecraft/world/level/block/CakeBlock.mapping +++ b/data/net/minecraft/world/level/block/CakeBlock.mapping @@ -23,10 +23,3 @@ CLASS net/minecraft/world/level/block/CakeBlock ARG 4 context METHOD hasAnalogOutputSignal (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 state - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/CampfireBlock.mapping b/data/net/minecraft/world/level/block/CampfireBlock.mapping index 8052942a4..70f241672 100644 --- a/data/net/minecraft/world/level/block/CampfireBlock.mapping +++ b/data/net/minecraft/world/level/block/CampfireBlock.mapping @@ -38,6 +38,8 @@ CLASS net/minecraft/world/level/block/CampfireBlock METHOD isSmokeyPos (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Z ARG 0 level ARG 1 pos + METHOD lambda$static$2 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD makeParticles (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;ZZ)V ARG 0 level ARG 1 pos @@ -65,10 +67,3 @@ CLASS net/minecraft/world/level/block/CampfireBlock METHOD rotate (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 rot - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/CandleCakeBlock.mapping b/data/net/minecraft/world/level/block/CandleCakeBlock.mapping index 7c1fb4056..ab0456b45 100644 --- a/data/net/minecraft/world/level/block/CandleCakeBlock.mapping +++ b/data/net/minecraft/world/level/block/CandleCakeBlock.mapping @@ -8,3 +8,5 @@ CLASS net/minecraft/world/level/block/CandleCakeBlock ARG 0 state METHOD candleHit (Lnet/minecraft/world/phys/BlockHitResult;)Z ARG 0 hit + METHOD lambda$static$1 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/level/block/ChainBlock.mapping b/data/net/minecraft/world/level/block/ChainBlock.mapping index b5a18e1b3..f54a09e70 100644 --- a/data/net/minecraft/world/level/block/ChainBlock.mapping +++ b/data/net/minecraft/world/level/block/ChainBlock.mapping @@ -10,10 +10,3 @@ CLASS net/minecraft/world/level/block/ChainBlock ARG 4 context METHOD getStateForPlacement (Lnet/minecraft/world/item/context/BlockPlaceContext;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 context - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/ChestBlock.mapping b/data/net/minecraft/world/level/block/ChestBlock.mapping index 310acdf30..3948a907c 100644 --- a/data/net/minecraft/world/level/block/ChestBlock.mapping +++ b/data/net/minecraft/world/level/block/ChestBlock.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/world/level/block/ChestBlock + METHOD (Ljava/util/function/Supplier;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V + ARG 1 blockEntityType + ARG 2 properties METHOD candidatePartnerFacing (Lnet/minecraft/world/item/context/BlockPlaceContext;Lnet/minecraft/core/Direction;)Lnet/minecraft/core/Direction; ARG 1 context ARG 2 direction @@ -66,16 +69,6 @@ CLASS net/minecraft/world/level/block/ChestBlock METHOD rotate (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 rotation - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - COMMENT Update the provided state given the provided neighbor facing and neighbor state, returning a new state. - COMMENT For example, fences make their connections to the passed in state if possible, and wet concrete powder immediately returns its solidified counterpart. - COMMENT Note that this method should ideally consider only the specific face passed in. - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos CLASS 3 METHOD lambda$acceptDouble$0 (Lnet/minecraft/world/level/block/entity/ChestBlockEntity;Lnet/minecraft/world/level/block/entity/ChestBlockEntity;F)F ARG 2 partialTicks diff --git a/data/net/minecraft/world/level/block/ChorusFlowerBlock.mapping b/data/net/minecraft/world/level/block/ChorusFlowerBlock.mapping index a27f1fc97..d04313c48 100644 --- a/data/net/minecraft/world/level/block/ChorusFlowerBlock.mapping +++ b/data/net/minecraft/world/level/block/ChorusFlowerBlock.mapping @@ -39,10 +39,3 @@ CLASS net/minecraft/world/level/block/ChorusFlowerBlock ARG 1 level ARG 2 pos ARG 3 age - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/ChorusPlantBlock.mapping b/data/net/minecraft/world/level/block/ChorusPlantBlock.mapping index 1f2707735..5b63b2fa6 100644 --- a/data/net/minecraft/world/level/block/ChorusPlantBlock.mapping +++ b/data/net/minecraft/world/level/block/ChorusPlantBlock.mapping @@ -11,10 +11,3 @@ CLASS net/minecraft/world/level/block/ChorusPlantBlock ARG 0 level ARG 1 pos ARG 2 state - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/CocoaBlock.mapping b/data/net/minecraft/world/level/block/CocoaBlock.mapping index 30f9cee53..5c4fe3c6d 100644 --- a/data/net/minecraft/world/level/block/CocoaBlock.mapping +++ b/data/net/minecraft/world/level/block/CocoaBlock.mapping @@ -14,10 +14,3 @@ CLASS net/minecraft/world/level/block/CocoaBlock ARG 1 context METHOD isRandomlyTicking (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 state - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/CommandBlock.mapping b/data/net/minecraft/world/level/block/CommandBlock.mapping index 788c58577..fbb111d0c 100644 --- a/data/net/minecraft/world/level/block/CommandBlock.mapping +++ b/data/net/minecraft/world/level/block/CommandBlock.mapping @@ -4,13 +4,13 @@ CLASS net/minecraft/world/level/block/CommandBlock ARG 2 properties METHOD createBlockStateDefinition (Lnet/minecraft/world/level/block/state/StateDefinition$Builder;)V ARG 1 builder - METHOD execute (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/BaseCommandBlock;Z)V + METHOD execute (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/BaseCommandBlock;Z)V ARG 1 state ARG 2 level ARG 3 pos ARG 4 logic ARG 5 canTrigger - METHOD executeChain (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction;)V + METHOD executeChain (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction;)V ARG 0 level ARG 1 pos ARG 2 direction @@ -24,16 +24,11 @@ CLASS net/minecraft/world/level/block/CommandBlock ARG 1 context METHOD hasAnalogOutputSignal (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 state + METHOD lambda$static$1 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD mirror (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Mirror;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 mirror - METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V - ARG 1 state - ARG 2 level - ARG 3 pos - ARG 4 block - ARG 5 fromPos - ARG 6 isMoving METHOD rotate (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 rotation @@ -43,3 +38,8 @@ CLASS net/minecraft/world/level/block/CommandBlock ARG 3 state ARG 4 placer ARG 5 stack + METHOD setPoweredAndUpdate (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/entity/CommandBlockEntity;Z)V + ARG 1 level + ARG 2 pos + ARG 3 blockEntity + ARG 4 powered diff --git a/data/net/minecraft/world/level/block/ConcretePowderBlock.mapping b/data/net/minecraft/world/level/block/ConcretePowderBlock.mapping index fb881fa7a..a28da35ff 100644 --- a/data/net/minecraft/world/level/block/ConcretePowderBlock.mapping +++ b/data/net/minecraft/world/level/block/ConcretePowderBlock.mapping @@ -10,6 +10,8 @@ CLASS net/minecraft/world/level/block/ConcretePowderBlock ARG 3 pos METHOD getStateForPlacement (Lnet/minecraft/world/item/context/BlockPlaceContext;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 context + METHOD lambda$static$1 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD shouldSolidify (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 0 level ARG 1 pos @@ -17,10 +19,3 @@ CLASS net/minecraft/world/level/block/ConcretePowderBlock METHOD touchesLiquid (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z ARG 0 level ARG 1 pos - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/ConduitBlock.mapping b/data/net/minecraft/world/level/block/ConduitBlock.mapping index f48d9ab76..0bbcae5bf 100644 --- a/data/net/minecraft/world/level/block/ConduitBlock.mapping +++ b/data/net/minecraft/world/level/block/ConduitBlock.mapping @@ -12,10 +12,3 @@ CLASS net/minecraft/world/level/block/ConduitBlock ARG 4 context METHOD getStateForPlacement (Lnet/minecraft/world/item/context/BlockPlaceContext;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 context - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/CoralBlock.mapping b/data/net/minecraft/world/level/block/CoralBlock.mapping index f81eb2b4f..33d631a72 100644 --- a/data/net/minecraft/world/level/block/CoralBlock.mapping +++ b/data/net/minecraft/world/level/block/CoralBlock.mapping @@ -7,10 +7,3 @@ CLASS net/minecraft/world/level/block/CoralBlock METHOD scanForWater (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z ARG 1 level ARG 2 pos - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/CoralFanBlock.mapping b/data/net/minecraft/world/level/block/CoralFanBlock.mapping index 2b4833e13..641a8819a 100644 --- a/data/net/minecraft/world/level/block/CoralFanBlock.mapping +++ b/data/net/minecraft/world/level/block/CoralFanBlock.mapping @@ -8,10 +8,3 @@ CLASS net/minecraft/world/level/block/CoralFanBlock ARG 3 pos ARG 4 oldState ARG 5 isMoving - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/CoralPlantBlock.mapping b/data/net/minecraft/world/level/block/CoralPlantBlock.mapping index d38970081..06adc0891 100644 --- a/data/net/minecraft/world/level/block/CoralPlantBlock.mapping +++ b/data/net/minecraft/world/level/block/CoralPlantBlock.mapping @@ -13,10 +13,3 @@ CLASS net/minecraft/world/level/block/CoralPlantBlock ARG 3 pos ARG 4 oldState ARG 5 isMoving - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/CoralWallFanBlock.mapping b/data/net/minecraft/world/level/block/CoralWallFanBlock.mapping index 7279f48f0..ff92bbb6a 100644 --- a/data/net/minecraft/world/level/block/CoralWallFanBlock.mapping +++ b/data/net/minecraft/world/level/block/CoralWallFanBlock.mapping @@ -2,16 +2,11 @@ CLASS net/minecraft/world/level/block/CoralWallFanBlock METHOD (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V ARG 1 deadBlock ARG 2 properties + METHOD lambda$static$1 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD onPlace (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Z)V ARG 1 state ARG 2 level ARG 3 pos ARG 4 oldState ARG 5 isMoving - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/CrafterBlock.mapping b/data/net/minecraft/world/level/block/CrafterBlock.mapping index ed24031ef..44204ab1f 100644 --- a/data/net/minecraft/world/level/block/CrafterBlock.mapping +++ b/data/net/minecraft/world/level/block/CrafterBlock.mapping @@ -10,9 +10,11 @@ CLASS net/minecraft/world/level/block/CrafterBlock ARG 4 stack ARG 5 state ARG 6 recipe - METHOD getPotentialResults (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/crafting/CraftingInput;)Ljava/util/Optional; + METHOD getPotentialResults (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/crafting/CraftingInput;)Ljava/util/Optional; ARG 0 level - ARG 1 input + ARG 1 craftingInput + METHOD lambda$dispenseFrom$0 (Lnet/minecraft/world/item/ItemStack;)V + ARG 0 stack METHOD setBlockEntityTriggered (Lnet/minecraft/world/level/block/entity/BlockEntity;Z)V ARG 1 blockEntity ARG 2 triggered diff --git a/data/net/minecraft/world/level/block/CreakingHeartBlock.mapping b/data/net/minecraft/world/level/block/CreakingHeartBlock.mapping new file mode 100644 index 000000000..f6f9ead2c --- /dev/null +++ b/data/net/minecraft/world/level/block/CreakingHeartBlock.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/world/level/block/CreakingHeartBlock + METHOD canSummonCreaking (Lnet/minecraft/world/level/Level;)Z + ARG 0 level + METHOD hasRequiredLogs (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelReader;Lnet/minecraft/core/BlockPos;)Z + ARG 0 state + ARG 1 level + ARG 2 pos + METHOD isSurroundedByLogs (Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;)Z + ARG 0 level + ARG 1 pos + METHOD updateState (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelReader;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; + ARG 0 state + ARG 1 level + ARG 2 pos + CLASS CreakingHeartState + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name diff --git a/data/net/minecraft/world/level/block/CrossCollisionBlock.mapping b/data/net/minecraft/world/level/block/CrossCollisionBlock.mapping index 0ef19f7f3..f4263322d 100644 --- a/data/net/minecraft/world/level/block/CrossCollisionBlock.mapping +++ b/data/net/minecraft/world/level/block/CrossCollisionBlock.mapping @@ -35,10 +35,6 @@ CLASS net/minecraft/world/level/block/CrossCollisionBlock METHOD mirror (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Mirror;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 mirror - METHOD propagatesSkylightDown (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z - ARG 1 state - ARG 2 reader - ARG 3 pos METHOD rotate (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 rot diff --git a/data/net/minecraft/world/level/block/DiodeBlock.mapping b/data/net/minecraft/world/level/block/DiodeBlock.mapping index 8455a96f6..f325a0708 100644 --- a/data/net/minecraft/world/level/block/DiodeBlock.mapping +++ b/data/net/minecraft/world/level/block/DiodeBlock.mapping @@ -52,13 +52,6 @@ CLASS net/minecraft/world/level/block/DiodeBlock ARG 3 state METHOD isSignalSource (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 state - METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V - ARG 1 state - ARG 2 level - ARG 3 pos - ARG 4 block - ARG 5 fromPos - ARG 6 isMoving METHOD onPlace (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Z)V ARG 1 state ARG 2 level diff --git a/data/net/minecraft/world/level/block/DispenserBlock.mapping b/data/net/minecraft/world/level/block/DispenserBlock.mapping index f36689fcf..32f284b5d 100644 --- a/data/net/minecraft/world/level/block/DispenserBlock.mapping +++ b/data/net/minecraft/world/level/block/DispenserBlock.mapping @@ -11,6 +11,8 @@ CLASS net/minecraft/world/level/block/DispenserBlock ARG 1 blockState ARG 2 level ARG 3 pos + METHOD getDefaultDispenseMethod (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/core/dispenser/DispenseItemBehavior; + ARG 0 stack METHOD getDispenseMethod (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/core/dispenser/DispenseItemBehavior; ARG 1 level ARG 2 item @@ -26,18 +28,9 @@ CLASS net/minecraft/world/level/block/DispenserBlock ARG 1 context METHOD hasAnalogOutputSignal (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 state - METHOD lambda$static$0 (Lit/unimi/dsi/fastutil/objects/Object2ObjectOpenHashMap;)V - ARG 0 map METHOD mirror (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Mirror;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 mirror - METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V - ARG 1 state - ARG 2 level - ARG 3 pos - ARG 4 block - ARG 5 fromPos - ARG 6 isMoving METHOD onRemove (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Z)V ARG 1 state ARG 2 level diff --git a/data/net/minecraft/world/level/block/DoorBlock.mapping b/data/net/minecraft/world/level/block/DoorBlock.mapping index 04a255f83..102949a64 100644 --- a/data/net/minecraft/world/level/block/DoorBlock.mapping +++ b/data/net/minecraft/world/level/block/DoorBlock.mapping @@ -27,16 +27,11 @@ CLASS net/minecraft/world/level/block/DoorBlock ARG 1 pos METHOD isWoodenDoor (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 0 state + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD mirror (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Mirror;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 mirror - METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V - ARG 1 state - ARG 2 level - ARG 3 pos - ARG 4 block - ARG 5 fromPos - ARG 6 isMoving METHOD playSound (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Z)V ARG 1 source ARG 2 level @@ -57,10 +52,3 @@ CLASS net/minecraft/world/level/block/DoorBlock ARG 3 state ARG 4 placer ARG 5 stack - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/DoubleBlockCombiner.mapping b/data/net/minecraft/world/level/block/DoubleBlockCombiner.mapping index 655190e0b..32fe60a84 100644 --- a/data/net/minecraft/world/level/block/DoubleBlockCombiner.mapping +++ b/data/net/minecraft/world/level/block/DoubleBlockCombiner.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/world/level/block/DoubleBlockCombiner - METHOD combineWithNeigbour (Lnet/minecraft/world/level/block/entity/BlockEntityType;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/world/level/block/state/properties/DirectionProperty;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Ljava/util/function/BiPredicate;)Lnet/minecraft/world/level/block/DoubleBlockCombiner$NeighborCombineResult; + METHOD combineWithNeigbour (Lnet/minecraft/world/level/block/entity/BlockEntityType;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/world/level/block/state/properties/Property;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Ljava/util/function/BiPredicate;)Lnet/minecraft/world/level/block/DoubleBlockCombiner$NeighborCombineResult; ARG 0 blockEntityType ARG 1 doubleBlockTypeGetter ARG 2 directionGetter diff --git a/data/net/minecraft/world/level/block/DoublePlantBlock.mapping b/data/net/minecraft/world/level/block/DoublePlantBlock.mapping index 9c708b97d..56bc7b899 100644 --- a/data/net/minecraft/world/level/block/DoublePlantBlock.mapping +++ b/data/net/minecraft/world/level/block/DoublePlantBlock.mapping @@ -37,10 +37,3 @@ CLASS net/minecraft/world/level/block/DoublePlantBlock ARG 3 state ARG 4 placer ARG 5 stack - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/DropExperienceBlock.mapping b/data/net/minecraft/world/level/block/DropExperienceBlock.mapping index 3e6112c02..5fae5494c 100644 --- a/data/net/minecraft/world/level/block/DropExperienceBlock.mapping +++ b/data/net/minecraft/world/level/block/DropExperienceBlock.mapping @@ -2,3 +2,5 @@ CLASS net/minecraft/world/level/block/DropExperienceBlock METHOD (Lnet/minecraft/util/valueproviders/IntProvider;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V ARG 1 xpRange ARG 2 properties + METHOD lambda$static$1 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/level/block/EndGatewayBlock.mapping b/data/net/minecraft/world/level/block/EndGatewayBlock.mapping index 73be9e72c..6bb2e7eaf 100644 --- a/data/net/minecraft/world/level/block/EndGatewayBlock.mapping +++ b/data/net/minecraft/world/level/block/EndGatewayBlock.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/world/level/block/EndGatewayBlock - METHOD calculateExitMovement (Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/phys/Vec3; - ARG 0 entity METHOD canBeReplaced (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/material/Fluid;)Z ARG 1 state ARG 2 fluid diff --git a/data/net/minecraft/world/level/block/EnderChestBlock.mapping b/data/net/minecraft/world/level/block/EnderChestBlock.mapping index b4e47ff4f..ecf55989e 100644 --- a/data/net/minecraft/world/level/block/EnderChestBlock.mapping +++ b/data/net/minecraft/world/level/block/EnderChestBlock.mapping @@ -23,10 +23,3 @@ CLASS net/minecraft/world/level/block/EnderChestBlock METHOD rotate (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 rot - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/FaceAttachedHorizontalDirectionalBlock.mapping b/data/net/minecraft/world/level/block/FaceAttachedHorizontalDirectionalBlock.mapping index c03975de3..41c14bd5a 100644 --- a/data/net/minecraft/world/level/block/FaceAttachedHorizontalDirectionalBlock.mapping +++ b/data/net/minecraft/world/level/block/FaceAttachedHorizontalDirectionalBlock.mapping @@ -11,10 +11,3 @@ CLASS net/minecraft/world/level/block/FaceAttachedHorizontalDirectionalBlock ARG 0 state METHOD getStateForPlacement (Lnet/minecraft/world/item/context/BlockPlaceContext;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 context - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/FallingBlock.mapping b/data/net/minecraft/world/level/block/FallingBlock.mapping index b69b406f8..b9df1313e 100644 --- a/data/net/minecraft/world/level/block/FallingBlock.mapping +++ b/data/net/minecraft/world/level/block/FallingBlock.mapping @@ -13,10 +13,3 @@ CLASS net/minecraft/world/level/block/FallingBlock ARG 3 pos ARG 4 oldState ARG 5 isMoving - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/FarmBlock.mapping b/data/net/minecraft/world/level/block/FarmBlock.mapping index 0fee6c05a..3389eee4e 100644 --- a/data/net/minecraft/world/level/block/FarmBlock.mapping +++ b/data/net/minecraft/world/level/block/FarmBlock.mapping @@ -23,12 +23,5 @@ CLASS net/minecraft/world/level/block/FarmBlock ARG 1 state ARG 2 level ARG 3 pos - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos METHOD useShapeForLightOcclusion (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 state diff --git a/data/net/minecraft/world/level/block/FenceBlock.mapping b/data/net/minecraft/world/level/block/FenceBlock.mapping index 87638812b..53d7f7390 100644 --- a/data/net/minecraft/world/level/block/FenceBlock.mapping +++ b/data/net/minecraft/world/level/block/FenceBlock.mapping @@ -5,10 +5,6 @@ CLASS net/minecraft/world/level/block/FenceBlock ARG 3 direction METHOD createBlockStateDefinition (Lnet/minecraft/world/level/block/state/StateDefinition$Builder;)V ARG 1 builder - METHOD getOcclusionShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/phys/shapes/VoxelShape; - ARG 1 state - ARG 2 level - ARG 3 pos METHOD getStateForPlacement (Lnet/minecraft/world/item/context/BlockPlaceContext;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 context METHOD getVisualShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/phys/shapes/CollisionContext;)Lnet/minecraft/world/phys/shapes/VoxelShape; @@ -18,10 +14,3 @@ CLASS net/minecraft/world/level/block/FenceBlock ARG 4 context METHOD isSameFence (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 state - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/FenceGateBlock.mapping b/data/net/minecraft/world/level/block/FenceGateBlock.mapping index 19a5916d9..e2c3713f4 100644 --- a/data/net/minecraft/world/level/block/FenceGateBlock.mapping +++ b/data/net/minecraft/world/level/block/FenceGateBlock.mapping @@ -12,10 +12,6 @@ CLASS net/minecraft/world/level/block/FenceGateBlock ARG 2 level ARG 3 pos ARG 4 context - METHOD getOcclusionShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/phys/shapes/VoxelShape; - ARG 1 state - ARG 2 level - ARG 3 pos METHOD getShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/phys/shapes/CollisionContext;)Lnet/minecraft/world/phys/shapes/VoxelShape; ARG 1 state ARG 2 level @@ -25,17 +21,3 @@ CLASS net/minecraft/world/level/block/FenceGateBlock ARG 1 context METHOD isWall (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 state - METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V - ARG 1 state - ARG 2 level - ARG 3 pos - ARG 4 block - ARG 5 fromPos - ARG 6 isMoving - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/FireBlock.mapping b/data/net/minecraft/world/level/block/FireBlock.mapping index da67c278f..f18faf56f 100644 --- a/data/net/minecraft/world/level/block/FireBlock.mapping +++ b/data/net/minecraft/world/level/block/FireBlock.mapping @@ -35,7 +35,7 @@ CLASS net/minecraft/world/level/block/FireBlock METHOD getStateForPlacement (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 level ARG 2 pos - METHOD getStateWithAge (Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;I)Lnet/minecraft/world/level/block/state/BlockState; + METHOD getStateWithAge (Lnet/minecraft/world/level/LevelReader;Lnet/minecraft/core/BlockPos;I)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 level ARG 2 pos ARG 3 age @@ -59,10 +59,3 @@ CLASS net/minecraft/world/level/block/FireBlock ARG 1 block ARG 2 encouragement ARG 3 flammability - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/FlowerPotBlock.mapping b/data/net/minecraft/world/level/block/FlowerPotBlock.mapping index 8056e41db..174909ca1 100644 --- a/data/net/minecraft/world/level/block/FlowerPotBlock.mapping +++ b/data/net/minecraft/world/level/block/FlowerPotBlock.mapping @@ -7,10 +7,5 @@ CLASS net/minecraft/world/level/block/FlowerPotBlock ARG 2 level ARG 3 pos ARG 4 context - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos + METHOD lambda$static$1 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/level/block/FrostedIceBlock.mapping b/data/net/minecraft/world/level/block/FrostedIceBlock.mapping index 858053974..71b8d600e 100644 --- a/data/net/minecraft/world/level/block/FrostedIceBlock.mapping +++ b/data/net/minecraft/world/level/block/FrostedIceBlock.mapping @@ -5,13 +5,6 @@ CLASS net/minecraft/world/level/block/FrostedIceBlock ARG 1 level ARG 2 pos ARG 3 neighborsRequired - METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V - ARG 1 state - ARG 2 level - ARG 3 pos - ARG 4 block - ARG 5 fromPos - ARG 6 isMoving METHOD slightlyMelt (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Z ARG 1 state ARG 2 level diff --git a/data/net/minecraft/world/level/block/FungusBlock.mapping b/data/net/minecraft/world/level/block/FungusBlock.mapping index 05f5baa5a..8c678510d 100644 --- a/data/net/minecraft/world/level/block/FungusBlock.mapping +++ b/data/net/minecraft/world/level/block/FungusBlock.mapping @@ -10,6 +10,8 @@ CLASS net/minecraft/world/level/block/FungusBlock ARG 2 level ARG 3 pos ARG 4 context + METHOD lambda$static$2 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD mayPlaceOn (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z ARG 1 state ARG 2 level diff --git a/data/net/minecraft/world/level/block/GrowingPlantBlock.mapping b/data/net/minecraft/world/level/block/GrowingPlantBlock.mapping index 04ef02286..b04fd2fd4 100644 --- a/data/net/minecraft/world/level/block/GrowingPlantBlock.mapping +++ b/data/net/minecraft/world/level/block/GrowingPlantBlock.mapping @@ -15,7 +15,7 @@ CLASS net/minecraft/world/level/block/GrowingPlantBlock ARG 2 level ARG 3 pos ARG 4 context + METHOD getStateForPlacement (Lnet/minecraft/util/RandomSource;)Lnet/minecraft/world/level/block/state/BlockState; + ARG 1 random METHOD getStateForPlacement (Lnet/minecraft/world/item/context/BlockPlaceContext;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 context - METHOD getStateForPlacement (Lnet/minecraft/world/level/LevelAccessor;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 level diff --git a/data/net/minecraft/world/level/block/GrowingPlantBodyBlock.mapping b/data/net/minecraft/world/level/block/GrowingPlantBodyBlock.mapping index c93189b24..01a9824df 100644 --- a/data/net/minecraft/world/level/block/GrowingPlantBodyBlock.mapping +++ b/data/net/minecraft/world/level/block/GrowingPlantBodyBlock.mapping @@ -9,10 +9,3 @@ CLASS net/minecraft/world/level/block/GrowingPlantBodyBlock METHOD updateHeadAfterConvertedFromBody (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 head ARG 2 body - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/GrowingPlantHeadBlock.mapping b/data/net/minecraft/world/level/block/GrowingPlantHeadBlock.mapping index a99e3bff0..ea16af658 100644 --- a/data/net/minecraft/world/level/block/GrowingPlantHeadBlock.mapping +++ b/data/net/minecraft/world/level/block/GrowingPlantHeadBlock.mapping @@ -16,8 +16,6 @@ CLASS net/minecraft/world/level/block/GrowingPlantHeadBlock ARG 2 random METHOD getMaxAgeState (Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state - METHOD getStateForPlacement (Lnet/minecraft/world/level/LevelAccessor;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 level METHOD isMaxAge (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 state METHOD isRandomlyTicking (Lnet/minecraft/world/level/block/state/BlockState;)Z @@ -25,10 +23,3 @@ CLASS net/minecraft/world/level/block/GrowingPlantHeadBlock METHOD updateBodyAfterConvertedFromHead (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 head ARG 2 body - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/HangingMossBlock.mapping b/data/net/minecraft/world/level/block/HangingMossBlock.mapping new file mode 100644 index 000000000..91d7ceb31 --- /dev/null +++ b/data/net/minecraft/world/level/block/HangingMossBlock.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/world/level/block/HangingMossBlock + METHOD canGrowInto (Lnet/minecraft/world/level/block/state/BlockState;)Z + ARG 1 state + METHOD canStayAtPosition (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z + ARG 1 level + ARG 2 pos + METHOD getTip (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/core/BlockPos; + ARG 1 level + ARG 2 pos diff --git a/data/net/minecraft/world/level/block/HoneyBlock.mapping b/data/net/minecraft/world/level/block/HoneyBlock.mapping index 8fdc78335..d96a17294 100644 --- a/data/net/minecraft/world/level/block/HoneyBlock.mapping +++ b/data/net/minecraft/world/level/block/HoneyBlock.mapping @@ -13,6 +13,10 @@ CLASS net/minecraft/world/level/block/HoneyBlock ARG 2 level ARG 3 pos ARG 4 context + METHOD getNewDeltaY (D)D + ARG 0 deltaY + METHOD getOldDeltaY (D)D + ARG 0 deltaY METHOD isSlidingDown (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/Entity;)Z ARG 1 pos ARG 2 entity diff --git a/data/net/minecraft/world/level/block/HopperBlock.mapping b/data/net/minecraft/world/level/block/HopperBlock.mapping index b4475aec7..b4e3d73f2 100644 --- a/data/net/minecraft/world/level/block/HopperBlock.mapping +++ b/data/net/minecraft/world/level/block/HopperBlock.mapping @@ -32,13 +32,6 @@ CLASS net/minecraft/world/level/block/HopperBlock METHOD mirror (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Mirror;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 mirror - METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V - ARG 1 state - ARG 2 level - ARG 3 pos - ARG 4 block - ARG 5 fromPos - ARG 6 isMoving METHOD onPlace (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Z)V ARG 1 state ARG 2 level diff --git a/data/net/minecraft/world/level/block/HugeMushroomBlock.mapping b/data/net/minecraft/world/level/block/HugeMushroomBlock.mapping index cb282d5fd..af0844aac 100644 --- a/data/net/minecraft/world/level/block/HugeMushroomBlock.mapping +++ b/data/net/minecraft/world/level/block/HugeMushroomBlock.mapping @@ -9,10 +9,3 @@ CLASS net/minecraft/world/level/block/HugeMushroomBlock METHOD rotate (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 rot - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/InfestedRotatedPillarBlock.mapping b/data/net/minecraft/world/level/block/InfestedRotatedPillarBlock.mapping new file mode 100644 index 000000000..5118124ed --- /dev/null +++ b/data/net/minecraft/world/level/block/InfestedRotatedPillarBlock.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/world/level/block/InfestedRotatedPillarBlock + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/level/block/IronBarsBlock.mapping b/data/net/minecraft/world/level/block/IronBarsBlock.mapping index 375732f2d..41aaf4152 100644 --- a/data/net/minecraft/world/level/block/IronBarsBlock.mapping +++ b/data/net/minecraft/world/level/block/IronBarsBlock.mapping @@ -15,10 +15,3 @@ CLASS net/minecraft/world/level/block/IronBarsBlock ARG 1 state ARG 2 adjacentBlockState ARG 3 side - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/JigsawBlock.mapping b/data/net/minecraft/world/level/block/JigsawBlock.mapping index 0a50c5751..2e81ccc08 100644 --- a/data/net/minecraft/world/level/block/JigsawBlock.mapping +++ b/data/net/minecraft/world/level/block/JigsawBlock.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/world/level/block/JigsawBlock - METHOD canAttach (Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate$StructureBlockInfo;Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate$StructureBlockInfo;)Z - ARG 0 info - ARG 1 info2 + METHOD canAttach (Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate$JigsawBlockInfo;Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate$JigsawBlockInfo;)Z + ARG 0 parent + ARG 1 child METHOD createBlockStateDefinition (Lnet/minecraft/world/level/block/state/StateDefinition$Builder;)V ARG 1 builder METHOD getFrontFacing (Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/core/Direction; diff --git a/data/net/minecraft/world/level/block/LadderBlock.mapping b/data/net/minecraft/world/level/block/LadderBlock.mapping index a2de47037..e4bee80d8 100644 --- a/data/net/minecraft/world/level/block/LadderBlock.mapping +++ b/data/net/minecraft/world/level/block/LadderBlock.mapping @@ -24,10 +24,3 @@ CLASS net/minecraft/world/level/block/LadderBlock METHOD rotate (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 rotation - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/LeavesBlock.mapping b/data/net/minecraft/world/level/block/LeavesBlock.mapping index 128623dce..1075c8cbd 100644 --- a/data/net/minecraft/world/level/block/LeavesBlock.mapping +++ b/data/net/minecraft/world/level/block/LeavesBlock.mapping @@ -9,10 +9,6 @@ CLASS net/minecraft/world/level/block/LeavesBlock ARG 3 pos METHOD getDistanceAt (Lnet/minecraft/world/level/block/state/BlockState;)I ARG 0 neighbor - METHOD getLightBlock (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I - ARG 1 state - ARG 2 level - ARG 3 pos METHOD getOptionalDistanceAt (Lnet/minecraft/world/level/block/state/BlockState;)Ljava/util/OptionalInt; ARG 0 state METHOD getStateForPlacement (Lnet/minecraft/world/item/context/BlockPlaceContext;)Lnet/minecraft/world/level/block/state/BlockState; @@ -23,10 +19,3 @@ CLASS net/minecraft/world/level/block/LeavesBlock ARG 0 state ARG 1 level ARG 2 pos - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/LecternBlock.mapping b/data/net/minecraft/world/level/block/LecternBlock.mapping index fd82be6c1..940af4657 100644 --- a/data/net/minecraft/world/level/block/LecternBlock.mapping +++ b/data/net/minecraft/world/level/block/LecternBlock.mapping @@ -24,10 +24,6 @@ CLASS net/minecraft/world/level/block/LecternBlock ARG 1 state ARG 2 level ARG 3 pos - METHOD getOcclusionShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/phys/shapes/VoxelShape; - ARG 1 state - ARG 2 level - ARG 3 pos METHOD getRenderShape (Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/block/RenderShape; ARG 1 state METHOD getShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/phys/shapes/CollisionContext;)Lnet/minecraft/world/phys/shapes/VoxelShape; diff --git a/data/net/minecraft/world/level/block/LiquidBlock.mapping b/data/net/minecraft/world/level/block/LiquidBlock.mapping index 4fe10a827..6476c1aa7 100644 --- a/data/net/minecraft/world/level/block/LiquidBlock.mapping +++ b/data/net/minecraft/world/level/block/LiquidBlock.mapping @@ -23,23 +23,12 @@ CLASS net/minecraft/world/level/block/LiquidBlock ARG 4 context METHOD isRandomlyTicking (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 state - METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V - ARG 1 state - ARG 2 level - ARG 3 pos - ARG 4 block - ARG 5 fromPos - ARG 6 isMoving METHOD onPlace (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Z)V ARG 1 state ARG 2 level ARG 3 pos ARG 4 oldState ARG 5 isMoving - METHOD propagatesSkylightDown (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z - ARG 1 state - ARG 2 reader - ARG 3 pos METHOD shouldSpreadLiquid (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 level ARG 2 pos @@ -48,10 +37,3 @@ CLASS net/minecraft/world/level/block/LiquidBlock ARG 1 state ARG 2 adjacentBlockState ARG 3 side - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/MagmaBlock.mapping b/data/net/minecraft/world/level/block/MagmaBlock.mapping index 038907e71..539df51f5 100644 --- a/data/net/minecraft/world/level/block/MagmaBlock.mapping +++ b/data/net/minecraft/world/level/block/MagmaBlock.mapping @@ -5,10 +5,3 @@ CLASS net/minecraft/world/level/block/MagmaBlock ARG 3 pos ARG 4 oldState ARG 5 isMoving - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/MossBlock.mapping b/data/net/minecraft/world/level/block/MossBlock.mapping deleted file mode 100644 index 8015efc05..000000000 --- a/data/net/minecraft/world/level/block/MossBlock.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/world/level/block/MossBlock - METHOD lambda$performBonemeal$0 (Lnet/minecraft/core/Registry;)Ljava/util/Optional; - ARG 0 registry - METHOD lambda$performBonemeal$1 (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/util/RandomSource;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Holder$Reference;)V - ARG 3 configuredFeature diff --git a/data/net/minecraft/world/level/block/MossyCarpetBlock.mapping b/data/net/minecraft/world/level/block/MossyCarpetBlock.mapping new file mode 100644 index 000000000..263b2f556 --- /dev/null +++ b/data/net/minecraft/world/level/block/MossyCarpetBlock.mapping @@ -0,0 +1,27 @@ +CLASS net/minecraft/world/level/block/MossyCarpetBlock + METHOD calculateShape (Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/phys/shapes/VoxelShape; + ARG 0 state + METHOD canSupportAtFace (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction;)Z + ARG 0 level + ARG 1 pos + ARG 2 direction + METHOD createTopperWithSideChance (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Ljava/util/function/BooleanSupplier;)Lnet/minecraft/world/level/block/state/BlockState; + ARG 0 level + ARG 1 pos + ARG 2 placeSide + METHOD getPropertyForFace (Lnet/minecraft/core/Direction;)Lnet/minecraft/world/level/block/state/properties/EnumProperty; + ARG 0 direction + METHOD getUpdatedState (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Z)Lnet/minecraft/world/level/block/state/BlockState; + ARG 0 state + ARG 1 level + ARG 2 pos + ARG 3 tip + METHOD hasFaces (Lnet/minecraft/world/level/block/state/BlockState;)Z + ARG 0 state + METHOD lambda$static$0 (Ljava/util/EnumMap;)V + ARG 0 map + METHOD placeAt (Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;I)V + ARG 0 level + ARG 1 pos + ARG 2 random + ARG 3 flags diff --git a/data/net/minecraft/world/level/block/MultifaceBlock.mapping b/data/net/minecraft/world/level/block/MultifaceBlock.mapping index a6a6b5000..647f7bb8c 100644 --- a/data/net/minecraft/world/level/block/MultifaceBlock.mapping +++ b/data/net/minecraft/world/level/block/MultifaceBlock.mapping @@ -33,10 +33,6 @@ CLASS net/minecraft/world/level/block/MultifaceBlock ARG 4 direction METHOD lambda$getStateForPlacement$1 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction;)Lnet/minecraft/world/level/block/state/BlockState; ARG 4 lookingDirection - METHOD lambda$hasAnyFace$2 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;)Z - ARG 1 direction - METHOD lambda$hasAnyVacantFace$3 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;)Z - ARG 1 direction METHOD lambda$static$0 (Ljava/util/EnumMap;)V ARG 0 map METHOD mapDirections (Lnet/minecraft/world/level/block/state/BlockState;Ljava/util/function/Function;)Lnet/minecraft/world/level/block/state/BlockState; diff --git a/data/net/minecraft/world/level/block/NetherPortalBlock.mapping b/data/net/minecraft/world/level/block/NetherPortalBlock.mapping index eaa202a50..576acc6e3 100644 --- a/data/net/minecraft/world/level/block/NetherPortalBlock.mapping +++ b/data/net/minecraft/world/level/block/NetherPortalBlock.mapping @@ -1,28 +1,25 @@ CLASS net/minecraft/world/level/block/NetherPortalBlock METHOD createBlockStateDefinition (Lnet/minecraft/world/level/block/state/StateDefinition$Builder;)V ARG 1 builder - METHOD createDimensionTransition (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/BlockUtil$FoundRectangle;Lnet/minecraft/core/Direction$Axis;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/Vec3;FFLnet/minecraft/world/level/portal/DimensionTransition$PostDimensionTransition;)Lnet/minecraft/world/level/portal/DimensionTransition; + METHOD createDimensionTransition (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/BlockUtil$FoundRectangle;Lnet/minecraft/core/Direction$Axis;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/level/portal/TeleportTransition$PostTeleportTransition;)Lnet/minecraft/world/level/portal/TeleportTransition; ARG 0 level ARG 1 rectangle ARG 2 axis ARG 3 offset ARG 4 entity - ARG 5 speed - ARG 6 yRot - ARG 7 xRot - ARG 8 postDimensionTransition + ARG 5 postTeleportTransition METHOD entityInside (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/Entity;)V ARG 1 state ARG 2 level ARG 3 pos ARG 4 entity - METHOD getDimensionTransitionFromExit (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/core/BlockPos;Lnet/minecraft/BlockUtil$FoundRectangle;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/portal/DimensionTransition$PostDimensionTransition;)Lnet/minecraft/world/level/portal/DimensionTransition; + METHOD getDimensionTransitionFromExit (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/core/BlockPos;Lnet/minecraft/BlockUtil$FoundRectangle;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/portal/TeleportTransition$PostTeleportTransition;)Lnet/minecraft/world/level/portal/TeleportTransition; ARG 0 entity ARG 1 pos ARG 2 rectangle ARG 3 level - ARG 4 postDimensionTransition - METHOD getExitPortal (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;ZLnet/minecraft/world/level/border/WorldBorder;)Lnet/minecraft/world/level/portal/DimensionTransition; + ARG 4 postTeleportTransition + METHOD getExitPortal (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;ZLnet/minecraft/world/level/border/WorldBorder;)Lnet/minecraft/world/level/portal/TeleportTransition; ARG 1 level ARG 2 entity ARG 3 pos @@ -37,10 +34,3 @@ CLASS net/minecraft/world/level/block/NetherPortalBlock METHOD rotate (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 rot - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/NoteBlock.mapping b/data/net/minecraft/world/level/block/NoteBlock.mapping index 4e6791c06..abeb2615c 100644 --- a/data/net/minecraft/world/level/block/NoteBlock.mapping +++ b/data/net/minecraft/world/level/block/NoteBlock.mapping @@ -13,19 +13,12 @@ CLASS net/minecraft/world/level/block/NoteBlock ARG 0 note METHOD getStateForPlacement (Lnet/minecraft/world/item/context/BlockPlaceContext;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 context - METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V - ARG 1 state - ARG 2 level - ARG 3 pos - ARG 4 block - ARG 5 fromPos - ARG 6 isMoving METHOD playNote (Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)V ARG 1 entity ARG 2 state ARG 3 level ARG 4 pos - METHOD setInstrument (Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/block/state/BlockState; + METHOD setInstrument (Lnet/minecraft/world/level/LevelReader;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 level ARG 2 pos ARG 3 state @@ -35,10 +28,3 @@ CLASS net/minecraft/world/level/block/NoteBlock ARG 3 pos ARG 4 id ARG 5 param - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/ObserverBlock.mapping b/data/net/minecraft/world/level/block/ObserverBlock.mapping index ce8c6297f..86de63139 100644 --- a/data/net/minecraft/world/level/block/ObserverBlock.mapping +++ b/data/net/minecraft/world/level/block/ObserverBlock.mapping @@ -33,17 +33,11 @@ CLASS net/minecraft/world/level/block/ObserverBlock METHOD rotate (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 rot - METHOD startSignal (Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;)V + METHOD startSignal (Lnet/minecraft/world/level/LevelReader;Lnet/minecraft/world/level/ScheduledTickAccess;Lnet/minecraft/core/BlockPos;)V ARG 1 level - ARG 2 pos + ARG 2 scheduledTickAccess + ARG 3 pos METHOD updateNeighborsInFront (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V ARG 1 level ARG 2 pos ARG 3 state - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/PipeBlock.mapping b/data/net/minecraft/world/level/block/PipeBlock.mapping index 27d838a46..17f99eaec 100644 --- a/data/net/minecraft/world/level/block/PipeBlock.mapping +++ b/data/net/minecraft/world/level/block/PipeBlock.mapping @@ -13,7 +13,3 @@ CLASS net/minecraft/world/level/block/PipeBlock ARG 0 map METHOD makeShapes (F)[Lnet/minecraft/world/phys/shapes/VoxelShape; ARG 1 apothem - METHOD propagatesSkylightDown (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z - ARG 1 state - ARG 2 reader - ARG 3 pos diff --git a/data/net/minecraft/world/level/block/Portal.mapping b/data/net/minecraft/world/level/block/Portal.mapping index 7a050c39b..c1fb23901 100644 --- a/data/net/minecraft/world/level/block/Portal.mapping +++ b/data/net/minecraft/world/level/block/Portal.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/world/level/block/Portal - METHOD getPortalDestination (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/portal/DimensionTransition; + METHOD getPortalDestination (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/portal/TeleportTransition; ARG 1 level ARG 2 entity ARG 3 pos diff --git a/data/net/minecraft/world/level/block/RedStoneWireBlock.mapping b/data/net/minecraft/world/level/block/RedStoneWireBlock.mapping index 29eb70658..7e3cb177c 100644 --- a/data/net/minecraft/world/level/block/RedStoneWireBlock.mapping +++ b/data/net/minecraft/world/level/block/RedStoneWireBlock.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/world/level/block/RedStoneWireBlock METHOD calculateShape (Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/phys/shapes/VoxelShape; ARG 1 state - METHOD calculateTargetStrength (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)I - ARG 1 level - ARG 2 pos METHOD canSurvive (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelReader;Lnet/minecraft/core/BlockPos;)Z ARG 1 state ARG 2 level @@ -18,6 +15,9 @@ CLASS net/minecraft/world/level/block/RedStoneWireBlock ARG 2 pos METHOD createBlockStateDefinition (Lnet/minecraft/world/level/block/state/StateDefinition$Builder;)V ARG 1 builder + METHOD getBlockSignal (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)I + ARG 1 level + ARG 2 pos METHOD getColorForPower (I)I ARG 0 power METHOD getConnectingSide (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction;)Lnet/minecraft/world/level/block/state/properties/RedstoneSide; @@ -54,26 +54,15 @@ CLASS net/minecraft/world/level/block/RedStoneWireBlock ARG 4 side METHOD getStateForPlacement (Lnet/minecraft/world/item/context/BlockPlaceContext;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 context - METHOD getWireSignal (Lnet/minecraft/world/level/block/state/BlockState;)I - ARG 1 state METHOD isCross (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 0 state METHOD isDot (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 0 state METHOD isSignalSource (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 state - METHOD lambda$static$0 ([Lnet/minecraft/world/phys/Vec3;)V - ARG 0 array METHOD mirror (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Mirror;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 mirror - METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V - ARG 1 state - ARG 2 level - ARG 3 pos - ARG 4 block - ARG 5 fromPos - ARG 6 isMoving METHOD onPlace (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Z)V ARG 1 state ARG 2 level @@ -94,15 +83,15 @@ CLASS net/minecraft/world/level/block/RedStoneWireBlock METHOD shouldConnectTo (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;)Z ARG 0 state ARG 1 direction - METHOD spawnParticlesAlongLine (Lnet/minecraft/world/level/Level;Lnet/minecraft/util/RandomSource;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/core/Direction;Lnet/minecraft/core/Direction;FF)V - ARG 1 level - ARG 2 random - ARG 3 pos - ARG 4 particleVec - ARG 5 xDirection - ARG 6 zDirection - ARG 7 min - ARG 8 max + METHOD spawnParticlesAlongLine (Lnet/minecraft/world/level/Level;Lnet/minecraft/util/RandomSource;Lnet/minecraft/core/BlockPos;ILnet/minecraft/core/Direction;Lnet/minecraft/core/Direction;FF)V + ARG 0 level + ARG 1 random + ARG 2 pos + ARG 3 color + ARG 4 direction + ARG 5 perpendicularDirection + ARG 6 start + ARG 7 end METHOD updateIndirectNeighbourShapes (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;II)V ARG 1 state ARG 2 level @@ -112,19 +101,16 @@ CLASS net/minecraft/world/level/block/RedStoneWireBlock METHOD updateNeighborsOfNeighboringWires (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)V ARG 1 level ARG 2 pos - METHOD updatePowerStrength (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V + METHOD updatePowerStrength (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/redstone/Orientation;Z)V ARG 1 level ARG 2 pos ARG 3 state - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos + ARG 4 orientation + ARG 5 updateShape METHOD updatesOnShapeChange (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;)V ARG 1 level ARG 2 pos ARG 3 oldState ARG 4 newState + METHOD useExperimentalEvaluator (Lnet/minecraft/world/level/Level;)Z + ARG 0 level diff --git a/data/net/minecraft/world/level/block/RedstoneLampBlock.mapping b/data/net/minecraft/world/level/block/RedstoneLampBlock.mapping index 12810ce54..5b51d96b8 100644 --- a/data/net/minecraft/world/level/block/RedstoneLampBlock.mapping +++ b/data/net/minecraft/world/level/block/RedstoneLampBlock.mapping @@ -3,10 +3,3 @@ CLASS net/minecraft/world/level/block/RedstoneLampBlock ARG 1 builder METHOD getStateForPlacement (Lnet/minecraft/world/item/context/BlockPlaceContext;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 context - METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V - ARG 1 state - ARG 2 level - ARG 3 pos - ARG 4 block - ARG 5 fromPos - ARG 6 isMoving diff --git a/data/net/minecraft/world/level/block/RedstoneTorchBlock.mapping b/data/net/minecraft/world/level/block/RedstoneTorchBlock.mapping index eb76484a9..646a75f79 100644 --- a/data/net/minecraft/world/level/block/RedstoneTorchBlock.mapping +++ b/data/net/minecraft/world/level/block/RedstoneTorchBlock.mapping @@ -23,13 +23,10 @@ CLASS net/minecraft/world/level/block/RedstoneTorchBlock ARG 2 logToggle METHOD lambda$isToggledTooFrequently$0 (Lnet/minecraft/world/level/BlockGetter;)Ljava/util/List; ARG 0 toggles - METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V - ARG 1 state - ARG 2 level - ARG 3 pos - ARG 4 block - ARG 5 fromPos - ARG 6 isMoving + METHOD notifyNeighbors (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V + ARG 1 level + ARG 2 pos + ARG 3 state METHOD onPlace (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Z)V ARG 1 state ARG 2 level @@ -42,6 +39,9 @@ CLASS net/minecraft/world/level/block/RedstoneTorchBlock ARG 3 pos ARG 4 newState ARG 5 isMoving + METHOD randomOrientation (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/redstone/Orientation; + ARG 1 level + ARG 2 state CLASS Toggle METHOD (Lnet/minecraft/core/BlockPos;J)V ARG 1 pos diff --git a/data/net/minecraft/world/level/block/RedstoneWallTorchBlock.mapping b/data/net/minecraft/world/level/block/RedstoneWallTorchBlock.mapping index 3cf5ebf2a..f717a6875 100644 --- a/data/net/minecraft/world/level/block/RedstoneWallTorchBlock.mapping +++ b/data/net/minecraft/world/level/block/RedstoneWallTorchBlock.mapping @@ -5,8 +5,6 @@ CLASS net/minecraft/world/level/block/RedstoneWallTorchBlock ARG 3 pos METHOD createBlockStateDefinition (Lnet/minecraft/world/level/block/state/StateDefinition$Builder;)V ARG 1 builder - METHOD getDescriptionId ()Ljava/lang/String; - COMMENT Returns the unlocalized name of the block with "tile." appended to the front. METHOD getShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/phys/shapes/CollisionContext;)Lnet/minecraft/world/phys/shapes/VoxelShape; ARG 1 state ARG 2 level @@ -29,10 +27,3 @@ CLASS net/minecraft/world/level/block/RedstoneWallTorchBlock METHOD rotate (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 rotation - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/RepeaterBlock.mapping b/data/net/minecraft/world/level/block/RepeaterBlock.mapping index d6b67e473..3f7cb9007 100644 --- a/data/net/minecraft/world/level/block/RepeaterBlock.mapping +++ b/data/net/minecraft/world/level/block/RepeaterBlock.mapping @@ -9,10 +9,3 @@ CLASS net/minecraft/world/level/block/RepeaterBlock ARG 1 level ARG 2 pos ARG 3 state - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/ScaffoldingBlock.mapping b/data/net/minecraft/world/level/block/ScaffoldingBlock.mapping index 25b6c5b3d..0196743f1 100644 --- a/data/net/minecraft/world/level/block/ScaffoldingBlock.mapping +++ b/data/net/minecraft/world/level/block/ScaffoldingBlock.mapping @@ -39,10 +39,3 @@ CLASS net/minecraft/world/level/block/ScaffoldingBlock ARG 3 pos ARG 4 oldState ARG 5 isMoving - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/SculkSpreader.mapping b/data/net/minecraft/world/level/block/SculkSpreader.mapping index 30ab9d070..55ec55a96 100644 --- a/data/net/minecraft/world/level/block/SculkSpreader.mapping +++ b/data/net/minecraft/world/level/block/SculkSpreader.mapping @@ -47,6 +47,8 @@ CLASS net/minecraft/world/level/block/SculkSpreader ARG 0 level ARG 1 fromPos ARG 2 toPos + METHOD isPosUnreasonable (Lnet/minecraft/core/BlockPos;)Z + ARG 1 pos METHOD isUnobstructed (Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction;)Z ARG 0 level ARG 1 pos diff --git a/data/net/minecraft/world/level/block/SeaPickleBlock.mapping b/data/net/minecraft/world/level/block/SeaPickleBlock.mapping index bcdaf0b30..770614344 100644 --- a/data/net/minecraft/world/level/block/SeaPickleBlock.mapping +++ b/data/net/minecraft/world/level/block/SeaPickleBlock.mapping @@ -23,10 +23,3 @@ CLASS net/minecraft/world/level/block/SeaPickleBlock ARG 1 state ARG 2 level ARG 3 pos - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/ShulkerBoxBlock.mapping b/data/net/minecraft/world/level/block/ShulkerBoxBlock.mapping index d106befdc..fe6db09cc 100644 --- a/data/net/minecraft/world/level/block/ShulkerBoxBlock.mapping +++ b/data/net/minecraft/world/level/block/ShulkerBoxBlock.mapping @@ -32,6 +32,8 @@ CLASS net/minecraft/world/level/block/ShulkerBoxBlock ARG 1 context METHOD hasAnalogOutputSignal (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 state + METHOD lambda$static$3 (Ljava/util/EnumMap;)V + ARG 0 map METHOD mirror (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Mirror;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 mirror diff --git a/data/net/minecraft/world/level/block/SignBlock.mapping b/data/net/minecraft/world/level/block/SignBlock.mapping index ce6cf8a0f..b389aaee2 100644 --- a/data/net/minecraft/world/level/block/SignBlock.mapping +++ b/data/net/minecraft/world/level/block/SignBlock.mapping @@ -28,10 +28,3 @@ CLASS net/minecraft/world/level/block/SignBlock METHOD otherPlayerIsEditingSign (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/level/block/entity/SignBlockEntity;)Z ARG 1 player ARG 2 signEntity - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/SkullBlock.mapping b/data/net/minecraft/world/level/block/SkullBlock.mapping index 776f73e05..65ec73dfa 100644 --- a/data/net/minecraft/world/level/block/SkullBlock.mapping +++ b/data/net/minecraft/world/level/block/SkullBlock.mapping @@ -1,10 +1,6 @@ CLASS net/minecraft/world/level/block/SkullBlock METHOD createBlockStateDefinition (Lnet/minecraft/world/level/block/state/StateDefinition$Builder;)V ARG 1 builder - METHOD getOcclusionShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/phys/shapes/VoxelShape; - ARG 1 state - ARG 2 level - ARG 3 pos METHOD getShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/phys/shapes/CollisionContext;)Lnet/minecraft/world/phys/shapes/VoxelShape; ARG 1 state ARG 2 level diff --git a/data/net/minecraft/world/level/block/SlabBlock.mapping b/data/net/minecraft/world/level/block/SlabBlock.mapping index b119b6637..3f1b49dbf 100644 --- a/data/net/minecraft/world/level/block/SlabBlock.mapping +++ b/data/net/minecraft/world/level/block/SlabBlock.mapping @@ -18,12 +18,5 @@ CLASS net/minecraft/world/level/block/SlabBlock ARG 2 pos ARG 3 state ARG 4 fluidState - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos METHOD useShapeForLightOcclusion (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 state diff --git a/data/net/minecraft/world/level/block/SlimeBlock.mapping b/data/net/minecraft/world/level/block/SlimeBlock.mapping index bb830f714..0c4fb7f90 100644 --- a/data/net/minecraft/world/level/block/SlimeBlock.mapping +++ b/data/net/minecraft/world/level/block/SlimeBlock.mapping @@ -1,6 +1,3 @@ CLASS net/minecraft/world/level/block/SlimeBlock METHOD bounceUp (Lnet/minecraft/world/entity/Entity;)V ARG 1 entity - METHOD updateEntityAfterFallOn (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/world/entity/Entity;)V - ARG 1 level - ARG 2 entity diff --git a/data/net/minecraft/world/level/block/SnowLayerBlock.mapping b/data/net/minecraft/world/level/block/SnowLayerBlock.mapping index ac9b179be..8ff992c53 100644 --- a/data/net/minecraft/world/level/block/SnowLayerBlock.mapping +++ b/data/net/minecraft/world/level/block/SnowLayerBlock.mapping @@ -29,12 +29,5 @@ CLASS net/minecraft/world/level/block/SnowLayerBlock ARG 2 reader ARG 3 pos ARG 4 context - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos METHOD useShapeForLightOcclusion (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 state diff --git a/data/net/minecraft/world/level/block/SnowyDirtBlock.mapping b/data/net/minecraft/world/level/block/SnowyDirtBlock.mapping index 468b3a73f..dbc2df202 100644 --- a/data/net/minecraft/world/level/block/SnowyDirtBlock.mapping +++ b/data/net/minecraft/world/level/block/SnowyDirtBlock.mapping @@ -5,10 +5,3 @@ CLASS net/minecraft/world/level/block/SnowyDirtBlock ARG 1 context METHOD isSnowySetting (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 0 state - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/SoulFireBlock.mapping b/data/net/minecraft/world/level/block/SoulFireBlock.mapping index 7301812a5..8f63e5a02 100644 --- a/data/net/minecraft/world/level/block/SoulFireBlock.mapping +++ b/data/net/minecraft/world/level/block/SoulFireBlock.mapping @@ -7,10 +7,3 @@ CLASS net/minecraft/world/level/block/SoulFireBlock ARG 3 pos METHOD canSurviveOnBlock (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 0 state - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/SoulSandBlock.mapping b/data/net/minecraft/world/level/block/SoulSandBlock.mapping index d89ad35d7..b1c10291f 100644 --- a/data/net/minecraft/world/level/block/SoulSandBlock.mapping +++ b/data/net/minecraft/world/level/block/SoulSandBlock.mapping @@ -19,10 +19,3 @@ CLASS net/minecraft/world/level/block/SoulSandBlock ARG 3 pos ARG 4 oldState ARG 5 isMoving - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/SpongeBlock.mapping b/data/net/minecraft/world/level/block/SpongeBlock.mapping index a0766e811..8fe7f422f 100644 --- a/data/net/minecraft/world/level/block/SpongeBlock.mapping +++ b/data/net/minecraft/world/level/block/SpongeBlock.mapping @@ -4,13 +4,6 @@ CLASS net/minecraft/world/level/block/SpongeBlock ARG 1 queueAdder METHOD lambda$removeWaterBreadthFirstSearch$1 (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Z ARG 2 currentPos - METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V - ARG 1 state - ARG 2 level - ARG 3 pos - ARG 4 block - ARG 5 fromPos - ARG 6 isMoving METHOD onPlace (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Z)V ARG 1 state ARG 2 level diff --git a/data/net/minecraft/world/level/block/StainedGlassBlock.mapping b/data/net/minecraft/world/level/block/StainedGlassBlock.mapping index 41dfbca52..6fdbad9eb 100644 --- a/data/net/minecraft/world/level/block/StainedGlassBlock.mapping +++ b/data/net/minecraft/world/level/block/StainedGlassBlock.mapping @@ -1,4 +1,4 @@ CLASS net/minecraft/world/level/block/StainedGlassBlock METHOD (Lnet/minecraft/world/item/DyeColor;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V - ARG 1 dyeColor + ARG 1 color ARG 2 properties diff --git a/data/net/minecraft/world/level/block/StairBlock.mapping b/data/net/minecraft/world/level/block/StairBlock.mapping index 50fd6e86d..9b79005a8 100644 --- a/data/net/minecraft/world/level/block/StairBlock.mapping +++ b/data/net/minecraft/world/level/block/StairBlock.mapping @@ -27,6 +27,8 @@ CLASS net/minecraft/world/level/block/StairBlock ARG 1 context METHOD isStairs (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 0 state + METHOD lambda$static$1 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD makeShapes (Lnet/minecraft/world/phys/shapes/VoxelShape;Lnet/minecraft/world/phys/shapes/VoxelShape;Lnet/minecraft/world/phys/shapes/VoxelShape;Lnet/minecraft/world/phys/shapes/VoxelShape;Lnet/minecraft/world/phys/shapes/VoxelShape;)[Lnet/minecraft/world/phys/shapes/VoxelShape; ARG 0 slabShape ARG 1 nwCorner @@ -47,12 +49,5 @@ CLASS net/minecraft/world/level/block/StairBlock METHOD rotate (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 rot - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos METHOD useShapeForLightOcclusion (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 state diff --git a/data/net/minecraft/world/level/block/StandingSignBlock.mapping b/data/net/minecraft/world/level/block/StandingSignBlock.mapping index dde5e9c31..2f4644d70 100644 --- a/data/net/minecraft/world/level/block/StandingSignBlock.mapping +++ b/data/net/minecraft/world/level/block/StandingSignBlock.mapping @@ -13,10 +13,3 @@ CLASS net/minecraft/world/level/block/StandingSignBlock METHOD rotate (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 rot - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/StructureBlock.mapping b/data/net/minecraft/world/level/block/StructureBlock.mapping index cafb9e60d..190bc6361 100644 --- a/data/net/minecraft/world/level/block/StructureBlock.mapping +++ b/data/net/minecraft/world/level/block/StructureBlock.mapping @@ -3,13 +3,6 @@ CLASS net/minecraft/world/level/block/StructureBlock ARG 1 builder METHOD getRenderShape (Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/block/RenderShape; ARG 1 state - METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V - ARG 1 state - ARG 2 level - ARG 3 pos - ARG 4 block - ARG 5 fromPos - ARG 6 isMoving METHOD setPlacedBy (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;)V ARG 1 level ARG 2 pos diff --git a/data/net/minecraft/world/level/block/SugarCaneBlock.mapping b/data/net/minecraft/world/level/block/SugarCaneBlock.mapping index 38e6e49af..e944dae1a 100644 --- a/data/net/minecraft/world/level/block/SugarCaneBlock.mapping +++ b/data/net/minecraft/world/level/block/SugarCaneBlock.mapping @@ -10,10 +10,3 @@ CLASS net/minecraft/world/level/block/SugarCaneBlock ARG 2 level ARG 3 pos ARG 4 context - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/TallGrassBlock.mapping b/data/net/minecraft/world/level/block/TallGrassBlock.mapping index fce18664b..8faa56355 100644 --- a/data/net/minecraft/world/level/block/TallGrassBlock.mapping +++ b/data/net/minecraft/world/level/block/TallGrassBlock.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/world/level/block/TallGrassBlock + METHOD getGrownBlock (Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/block/DoublePlantBlock; + ARG 0 state METHOD getShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/phys/shapes/CollisionContext;)Lnet/minecraft/world/phys/shapes/VoxelShape; ARG 1 state ARG 2 level diff --git a/data/net/minecraft/world/level/block/TntBlock.mapping b/data/net/minecraft/world/level/block/TntBlock.mapping index 7a100e3e8..3046c5f06 100644 --- a/data/net/minecraft/world/level/block/TntBlock.mapping +++ b/data/net/minecraft/world/level/block/TntBlock.mapping @@ -10,13 +10,6 @@ CLASS net/minecraft/world/level/block/TntBlock ARG 0 level ARG 1 pos ARG 2 entity - METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V - ARG 1 state - ARG 2 level - ARG 3 pos - ARG 4 block - ARG 5 fromPos - ARG 6 isMoving METHOD onPlace (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Z)V ARG 1 state ARG 2 level @@ -28,7 +21,3 @@ CLASS net/minecraft/world/level/block/TntBlock ARG 2 state ARG 3 hit ARG 4 projectile - METHOD wasExploded (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/Explosion;)V - ARG 1 level - ARG 2 pos - ARG 3 explosion diff --git a/data/net/minecraft/world/level/block/TrapDoorBlock.mapping b/data/net/minecraft/world/level/block/TrapDoorBlock.mapping index 804f59da2..752cc63fc 100644 --- a/data/net/minecraft/world/level/block/TrapDoorBlock.mapping +++ b/data/net/minecraft/world/level/block/TrapDoorBlock.mapping @@ -13,13 +13,8 @@ CLASS net/minecraft/world/level/block/TrapDoorBlock ARG 4 context METHOD getStateForPlacement (Lnet/minecraft/world/item/context/BlockPlaceContext;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 context - METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V - ARG 1 state - ARG 2 level - ARG 3 pos - ARG 4 block - ARG 5 fromPos - ARG 6 isMoving + METHOD lambda$static$1 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD playSound (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Z)V ARG 1 player ARG 2 level @@ -30,10 +25,3 @@ CLASS net/minecraft/world/level/block/TrapDoorBlock ARG 2 level ARG 3 pos ARG 4 player - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/TripWireBlock.mapping b/data/net/minecraft/world/level/block/TripWireBlock.mapping index 8bcb1534f..b119e6b79 100644 --- a/data/net/minecraft/world/level/block/TripWireBlock.mapping +++ b/data/net/minecraft/world/level/block/TripWireBlock.mapping @@ -5,6 +5,10 @@ CLASS net/minecraft/world/level/block/TripWireBlock METHOD checkPressed (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)V ARG 1 level ARG 2 pos + METHOD checkPressed (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Ljava/util/List;)V + ARG 1 level + ARG 2 pos + ARG 3 entities METHOD createBlockStateDefinition (Lnet/minecraft/world/level/block/state/StateDefinition$Builder;)V ARG 1 builder METHOD entityInside (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/Entity;)V @@ -19,6 +23,10 @@ CLASS net/minecraft/world/level/block/TripWireBlock ARG 4 context METHOD getStateForPlacement (Lnet/minecraft/world/item/context/BlockPlaceContext;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 context + METHOD lambda$static$0 (Lnet/minecraft/world/level/block/TripWireBlock;)Lnet/minecraft/world/level/block/Block; + ARG 0 tripwire + METHOD lambda$static$1 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD mirror (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Mirror;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 mirror @@ -40,13 +48,6 @@ CLASS net/minecraft/world/level/block/TripWireBlock METHOD shouldConnectTo (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;)Z ARG 1 state ARG 2 direction - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos METHOD updateSource (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V ARG 1 level ARG 2 pos diff --git a/data/net/minecraft/world/level/block/TripWireHookBlock.mapping b/data/net/minecraft/world/level/block/TripWireHookBlock.mapping index a443bd720..c0d9b141a 100644 --- a/data/net/minecraft/world/level/block/TripWireHookBlock.mapping +++ b/data/net/minecraft/world/level/block/TripWireHookBlock.mapping @@ -62,10 +62,3 @@ CLASS net/minecraft/world/level/block/TripWireHookBlock ARG 3 state ARG 4 placer ARG 5 stack - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/TurtleEggBlock.mapping b/data/net/minecraft/world/level/block/TurtleEggBlock.mapping index 3105a4c44..590897093 100644 --- a/data/net/minecraft/world/level/block/TurtleEggBlock.mapping +++ b/data/net/minecraft/world/level/block/TurtleEggBlock.mapping @@ -2,7 +2,7 @@ CLASS net/minecraft/world/level/block/TurtleEggBlock METHOD canBeReplaced (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/item/context/BlockPlaceContext;)Z ARG 1 state ARG 2 useContext - METHOD canDestroyEgg (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/Entity;)Z + METHOD canDestroyEgg (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;)Z ARG 1 level ARG 2 entity METHOD createBlockStateDefinition (Lnet/minecraft/world/level/block/state/StateDefinition$Builder;)V diff --git a/data/net/minecraft/world/level/block/VineBlock.mapping b/data/net/minecraft/world/level/block/VineBlock.mapping index 01234dbe1..e2db59867 100644 --- a/data/net/minecraft/world/level/block/VineBlock.mapping +++ b/data/net/minecraft/world/level/block/VineBlock.mapping @@ -52,10 +52,3 @@ CLASS net/minecraft/world/level/block/VineBlock METHOD rotate (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 rotate - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/WallBannerBlock.mapping b/data/net/minecraft/world/level/block/WallBannerBlock.mapping index 4a70485a7..0549628bd 100644 --- a/data/net/minecraft/world/level/block/WallBannerBlock.mapping +++ b/data/net/minecraft/world/level/block/WallBannerBlock.mapping @@ -18,10 +18,3 @@ CLASS net/minecraft/world/level/block/WallBannerBlock METHOD rotate (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 rotation - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/WallBlock.mapping b/data/net/minecraft/world/level/block/WallBlock.mapping index 0a4391335..4e070e6fd 100644 --- a/data/net/minecraft/world/level/block/WallBlock.mapping +++ b/data/net/minecraft/world/level/block/WallBlock.mapping @@ -44,10 +44,6 @@ CLASS net/minecraft/world/level/block/WallBlock METHOD mirror (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Mirror;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 mirror - METHOD propagatesSkylightDown (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z - ARG 1 state - ARG 2 reader - ARG 3 pos METHOD rotate (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 rotation @@ -76,13 +72,6 @@ CLASS net/minecraft/world/level/block/WallBlock ARG 6 eastConnection ARG 7 southConnection ARG 8 westConnection - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos METHOD updateSides (Lnet/minecraft/world/level/block/state/BlockState;ZZZZLnet/minecraft/world/phys/shapes/VoxelShape;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 northConnection diff --git a/data/net/minecraft/world/level/block/WallSignBlock.mapping b/data/net/minecraft/world/level/block/WallSignBlock.mapping index 0cf85f556..395264fed 100644 --- a/data/net/minecraft/world/level/block/WallSignBlock.mapping +++ b/data/net/minecraft/world/level/block/WallSignBlock.mapping @@ -12,16 +12,11 @@ CLASS net/minecraft/world/level/block/WallSignBlock ARG 4 context METHOD getStateForPlacement (Lnet/minecraft/world/item/context/BlockPlaceContext;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 context + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD mirror (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Mirror;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 mirror METHOD rotate (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 rotation - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/WallTorchBlock.mapping b/data/net/minecraft/world/level/block/WallTorchBlock.mapping index 74c2ad36f..982cd20e7 100644 --- a/data/net/minecraft/world/level/block/WallTorchBlock.mapping +++ b/data/net/minecraft/world/level/block/WallTorchBlock.mapping @@ -24,10 +24,3 @@ CLASS net/minecraft/world/level/block/WallTorchBlock METHOD rotate (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 rotation - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos diff --git a/data/net/minecraft/world/level/block/WeatheringCopperBulbBlock.mapping b/data/net/minecraft/world/level/block/WeatheringCopperBulbBlock.mapping index 6bac3d762..ca61d8a56 100644 --- a/data/net/minecraft/world/level/block/WeatheringCopperBulbBlock.mapping +++ b/data/net/minecraft/world/level/block/WeatheringCopperBulbBlock.mapping @@ -2,3 +2,5 @@ CLASS net/minecraft/world/level/block/WeatheringCopperBulbBlock METHOD (Lnet/minecraft/world/level/block/WeatheringCopper$WeatherState;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V ARG 1 weatherState ARG 2 properties + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/level/block/WeatheringCopperDoorBlock.mapping b/data/net/minecraft/world/level/block/WeatheringCopperDoorBlock.mapping index 2ce68db00..a4f5cbcb1 100644 --- a/data/net/minecraft/world/level/block/WeatheringCopperDoorBlock.mapping +++ b/data/net/minecraft/world/level/block/WeatheringCopperDoorBlock.mapping @@ -3,3 +3,5 @@ CLASS net/minecraft/world/level/block/WeatheringCopperDoorBlock ARG 1 type ARG 2 weatherState ARG 3 properties + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/level/block/WeatheringCopperFullBlock.mapping b/data/net/minecraft/world/level/block/WeatheringCopperFullBlock.mapping index 26fa43662..6cc7302f2 100644 --- a/data/net/minecraft/world/level/block/WeatheringCopperFullBlock.mapping +++ b/data/net/minecraft/world/level/block/WeatheringCopperFullBlock.mapping @@ -2,3 +2,5 @@ CLASS net/minecraft/world/level/block/WeatheringCopperFullBlock METHOD (Lnet/minecraft/world/level/block/WeatheringCopper$WeatherState;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V ARG 1 weatherState ARG 2 properties + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/level/block/WeatheringCopperSlabBlock.mapping b/data/net/minecraft/world/level/block/WeatheringCopperSlabBlock.mapping index cea11fbc8..a00b30d47 100644 --- a/data/net/minecraft/world/level/block/WeatheringCopperSlabBlock.mapping +++ b/data/net/minecraft/world/level/block/WeatheringCopperSlabBlock.mapping @@ -2,3 +2,5 @@ CLASS net/minecraft/world/level/block/WeatheringCopperSlabBlock METHOD (Lnet/minecraft/world/level/block/WeatheringCopper$WeatherState;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V ARG 1 weatherState ARG 2 properties + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/level/block/WeatheringCopperStairBlock.mapping b/data/net/minecraft/world/level/block/WeatheringCopperStairBlock.mapping index 33bb9d92e..f9e299bc7 100644 --- a/data/net/minecraft/world/level/block/WeatheringCopperStairBlock.mapping +++ b/data/net/minecraft/world/level/block/WeatheringCopperStairBlock.mapping @@ -3,3 +3,5 @@ CLASS net/minecraft/world/level/block/WeatheringCopperStairBlock ARG 1 weatherState ARG 2 baseState ARG 3 properties + METHOD lambda$static$1 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/level/block/WeatheringCopperTrapDoorBlock.mapping b/data/net/minecraft/world/level/block/WeatheringCopperTrapDoorBlock.mapping index 03b4a6ccb..6160d2cef 100644 --- a/data/net/minecraft/world/level/block/WeatheringCopperTrapDoorBlock.mapping +++ b/data/net/minecraft/world/level/block/WeatheringCopperTrapDoorBlock.mapping @@ -3,3 +3,5 @@ CLASS net/minecraft/world/level/block/WeatheringCopperTrapDoorBlock ARG 1 type ARG 2 weatherState ARG 3 properties + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.mapping b/data/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.mapping index b201d60c1..367b0e2e4 100644 --- a/data/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.mapping +++ b/data/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.mapping @@ -4,26 +4,20 @@ CLASS net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity ARG 2 pos ARG 3 blockState ARG 4 recipeType - METHOD add (Ljava/util/Map;Lnet/minecraft/tags/TagKey;I)V - ARG 0 map - ARG 1 itemTag - ARG 2 burnTime - METHOD add (Ljava/util/Map;Lnet/minecraft/world/level/ItemLike;I)V - ARG 0 map - ARG 1 item - ARG 2 burnTime METHOD awardUsedRecipesAndPopExperience (Lnet/minecraft/server/level/ServerPlayer;)V ARG 1 player - METHOD burn (Lnet/minecraft/core/RegistryAccess;Lnet/minecraft/world/item/crafting/RecipeHolder;Lnet/minecraft/core/NonNullList;I)Z + METHOD burn (Lnet/minecraft/core/RegistryAccess;Lnet/minecraft/world/item/crafting/RecipeHolder;Lnet/minecraft/world/item/crafting/SingleRecipeInput;Lnet/minecraft/core/NonNullList;I)Z ARG 0 registryAccess ARG 1 recipe - ARG 2 inventory - ARG 3 maxStackSize - METHOD canBurn (Lnet/minecraft/core/RegistryAccess;Lnet/minecraft/world/item/crafting/RecipeHolder;Lnet/minecraft/core/NonNullList;I)Z + ARG 2 recipeInput + ARG 3 items + ARG 4 maxStackSize + METHOD canBurn (Lnet/minecraft/core/RegistryAccess;Lnet/minecraft/world/item/crafting/RecipeHolder;Lnet/minecraft/world/item/crafting/SingleRecipeInput;Lnet/minecraft/core/NonNullList;I)Z ARG 0 registryAccess ARG 1 recipe - ARG 2 inventory - ARG 3 maxStackSize + ARG 2 recipeInput + ARG 3 items + ARG 4 maxStackSize METHOD canPlaceItem (ILnet/minecraft/world/item/ItemStack;)Z ARG 1 index ARG 2 stack @@ -40,30 +34,29 @@ CLASS net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity ARG 1 popVec ARG 2 recipeIndex ARG 3 experience - METHOD fillStackedContents (Lnet/minecraft/world/entity/player/StackedContents;)V - ARG 1 helper - METHOD getBurnDuration (Lnet/minecraft/world/item/ItemStack;)I - ARG 1 fuel + METHOD getBurnDuration (Lnet/minecraft/world/level/block/entity/FuelValues;Lnet/minecraft/world/item/ItemStack;)I + ARG 1 fuelValues + ARG 2 stack METHOD getRecipesToAwardAndPopExperience (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/phys/Vec3;)Ljava/util/List; ARG 1 level ARG 2 popVec METHOD getSlotsForFace (Lnet/minecraft/core/Direction;)[I ARG 1 side - METHOD getTotalCookTime (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity;)I + METHOD getTotalCookTime (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity;)I ARG 0 level - ARG 1 blockEntity - METHOD isFuel (Lnet/minecraft/world/item/ItemStack;)Z - ARG 0 stack - METHOD isNeverAFurnaceFuel (Lnet/minecraft/world/item/Item;)Z - ARG 0 item - METHOD lambda$saveAdditional$0 (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/resources/ResourceLocation;Ljava/lang/Integer;)V - ARG 1 id - ARG 2 index - METHOD serverTick (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity;)V + ARG 1 furnace + METHOD lambda$getRecipesToAwardAndPopExperience$2 (Ljava/util/List;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/phys/Vec3;Lit/unimi/dsi/fastutil/objects/Reference2IntMap$Entry;Lnet/minecraft/world/item/crafting/RecipeHolder;)V + ARG 4 recipe + METHOD lambda$getTotalCookTime$1 (Lnet/minecraft/world/item/crafting/RecipeHolder;)Ljava/lang/Integer; + ARG 0 recipe + METHOD lambda$saveAdditional$0 (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/resources/ResourceKey;Ljava/lang/Integer;)V + ARG 1 recipe + ARG 2 count + METHOD serverTick (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity;)V ARG 0 level ARG 1 pos ARG 2 state - ARG 3 blockEntity + ARG 3 furnace METHOD setItem (ILnet/minecraft/world/item/ItemStack;)V ARG 1 index ARG 2 stack diff --git a/data/net/minecraft/world/level/block/entity/BlastFurnaceBlockEntity.mapping b/data/net/minecraft/world/level/block/entity/BlastFurnaceBlockEntity.mapping index ec3f41158..e769c356a 100644 --- a/data/net/minecraft/world/level/block/entity/BlastFurnaceBlockEntity.mapping +++ b/data/net/minecraft/world/level/block/entity/BlastFurnaceBlockEntity.mapping @@ -5,5 +5,3 @@ CLASS net/minecraft/world/level/block/entity/BlastFurnaceBlockEntity METHOD createMenu (ILnet/minecraft/world/entity/player/Inventory;)Lnet/minecraft/world/inventory/AbstractContainerMenu; ARG 1 id ARG 2 player - METHOD getBurnDuration (Lnet/minecraft/world/item/ItemStack;)I - ARG 1 fuel diff --git a/data/net/minecraft/world/level/block/entity/BlockEntity.mapping b/data/net/minecraft/world/level/block/entity/BlockEntity.mapping index bb4164cea..09fb98801 100644 --- a/data/net/minecraft/world/level/block/entity/BlockEntity.mapping +++ b/data/net/minecraft/world/level/block/entity/BlockEntity.mapping @@ -25,6 +25,8 @@ CLASS net/minecraft/world/level/block/entity/BlockEntity ARG 1 registries METHOD hasLevel ()Z COMMENT @return whether this BlockEntity's level has been set + METHOD isValidBlockState (Lnet/minecraft/world/level/block/state/BlockState;)Z + ARG 1 state METHOD lambda$loadWithComponents$1 (Lnet/minecraft/core/component/DataComponentMap;)V ARG 1 components METHOD loadAdditional (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/core/HolderLookup$Provider;)V @@ -81,6 +83,8 @@ CLASS net/minecraft/world/level/block/entity/BlockEntity METHOD triggerEvent (II)Z ARG 1 id ARG 2 type + METHOD validateBlockState (Lnet/minecraft/world/level/block/state/BlockState;)V + ARG 1 state CLASS DataComponentInput METHOD get (Lnet/minecraft/core/component/DataComponentType;)Ljava/lang/Object; ARG 1 component diff --git a/data/net/minecraft/world/level/block/entity/BlockEntityType.mapping b/data/net/minecraft/world/level/block/entity/BlockEntityType.mapping index 058a47660..079c5591e 100644 --- a/data/net/minecraft/world/level/block/entity/BlockEntityType.mapping +++ b/data/net/minecraft/world/level/block/entity/BlockEntityType.mapping @@ -1,8 +1,7 @@ CLASS net/minecraft/world/level/block/entity/BlockEntityType - METHOD (Lnet/minecraft/world/level/block/entity/BlockEntityType$BlockEntitySupplier;Ljava/util/Set;Lcom/mojang/datafixers/types/Type;)V + METHOD (Lnet/minecraft/world/level/block/entity/BlockEntityType$BlockEntitySupplier;Ljava/util/Set;)V ARG 1 factory ARG 2 validBlocks - ARG 3 dataType METHOD create (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/block/entity/BlockEntity; ARG 1 pos ARG 2 state @@ -13,18 +12,10 @@ CLASS net/minecraft/world/level/block/entity/BlockEntityType ARG 0 blockEntityType METHOD isValid (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 state - METHOD register (Ljava/lang/String;Lnet/minecraft/world/level/block/entity/BlockEntityType$Builder;)Lnet/minecraft/world/level/block/entity/BlockEntityType; - ARG 0 key - ARG 1 builder - CLASS Builder - METHOD (Lnet/minecraft/world/level/block/entity/BlockEntityType$BlockEntitySupplier;Ljava/util/Set;)V - ARG 1 factory - ARG 2 validBlocks - METHOD build (Lcom/mojang/datafixers/types/Type;)Lnet/minecraft/world/level/block/entity/BlockEntityType; - ARG 1 dataType - METHOD of (Lnet/minecraft/world/level/block/entity/BlockEntityType$BlockEntitySupplier;[Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/world/level/block/entity/BlockEntityType$Builder; - ARG 0 factory - ARG 1 validBlocks + METHOD register (Ljava/lang/String;Lnet/minecraft/world/level/block/entity/BlockEntityType$BlockEntitySupplier;[Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/world/level/block/entity/BlockEntityType; + ARG 0 name + ARG 1 factory + ARG 2 validBlocks CLASS BlockEntitySupplier METHOD create (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/block/entity/BlockEntity; ARG 1 pos diff --git a/data/net/minecraft/world/level/block/entity/BrushableBlockEntity.mapping b/data/net/minecraft/world/level/block/entity/BrushableBlockEntity.mapping index 050acca0f..2550a4f97 100644 --- a/data/net/minecraft/world/level/block/entity/BrushableBlockEntity.mapping +++ b/data/net/minecraft/world/level/block/entity/BrushableBlockEntity.mapping @@ -2,14 +2,22 @@ CLASS net/minecraft/world/level/block/entity/BrushableBlockEntity METHOD (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V ARG 1 pos ARG 2 blockState - METHOD brush (JLnet/minecraft/world/entity/player/Player;Lnet/minecraft/core/Direction;)Z + METHOD brush (JLnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/core/Direction;Lnet/minecraft/world/item/ItemStack;)Z ARG 1 startTick - ARG 3 player - ARG 4 hitDirection - METHOD brushingCompleted (Lnet/minecraft/world/entity/player/Player;)V - ARG 1 player - METHOD dropContent (Lnet/minecraft/world/entity/player/Player;)V - ARG 1 player + ARG 3 level + ARG 4 player + ARG 5 hitDirection + ARG 6 stack + METHOD brushingCompleted (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/item/ItemStack;)V + ARG 1 level + ARG 2 player + ARG 3 stack + METHOD checkReset (Lnet/minecraft/server/level/ServerLevel;)V + ARG 1 level + METHOD dropContent (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/item/ItemStack;)V + ARG 1 level + ARG 2 player + ARG 3 stack METHOD setLootTable (Lnet/minecraft/resources/ResourceKey;J)V ARG 1 lootTable ARG 2 seed @@ -17,5 +25,7 @@ CLASS net/minecraft/world/level/block/entity/BrushableBlockEntity ARG 1 tag METHOD trySaveLootTable (Lnet/minecraft/nbt/CompoundTag;)Z ARG 1 tag - METHOD unpackLootTable (Lnet/minecraft/world/entity/player/Player;)V - ARG 1 player + METHOD unpackLootTable (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/item/ItemStack;)V + ARG 1 level + ARG 2 player + ARG 3 stack diff --git a/data/net/minecraft/world/level/block/entity/CampfireBlockEntity.mapping b/data/net/minecraft/world/level/block/entity/CampfireBlockEntity.mapping index e826cd5bd..9f31b6a9c 100644 --- a/data/net/minecraft/world/level/block/entity/CampfireBlockEntity.mapping +++ b/data/net/minecraft/world/level/block/entity/CampfireBlockEntity.mapping @@ -2,26 +2,27 @@ CLASS net/minecraft/world/level/block/entity/CampfireBlockEntity METHOD (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V ARG 1 pos ARG 2 blockState - METHOD cookTick (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/entity/CampfireBlockEntity;)V + METHOD cookTick (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/entity/CampfireBlockEntity;Lnet/minecraft/world/item/crafting/RecipeManager$CachedCheck;)V ARG 0 level ARG 1 pos ARG 2 state - ARG 3 blockEntity + ARG 3 campfire + ARG 4 check METHOD cooldownTick (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/entity/CampfireBlockEntity;)V ARG 0 level ARG 1 pos ARG 2 state ARG 3 blockEntity - METHOD getCookableRecipe (Lnet/minecraft/world/item/ItemStack;)Ljava/util/Optional; - ARG 1 stack METHOD getItems ()Lnet/minecraft/core/NonNullList; COMMENT @return the items currently held in this campfire + METHOD lambda$cookTick$0 (Lnet/minecraft/world/item/crafting/SingleRecipeInput;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/item/crafting/RecipeHolder;)Lnet/minecraft/world/item/ItemStack; + ARG 2 recipe METHOD particleTick (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/entity/CampfireBlockEntity;)V ARG 0 level ARG 1 pos ARG 2 state ARG 3 blockEntity - METHOD placeFood (Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;I)Z - ARG 1 entity - ARG 2 food - ARG 3 cookTime + METHOD placeFood (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;)Z + ARG 1 level + ARG 2 entity + ARG 3 stack diff --git a/data/net/minecraft/world/level/block/entity/CreakingHeartBlockEntity.mapping b/data/net/minecraft/world/level/block/entity/CreakingHeartBlockEntity.mapping new file mode 100644 index 000000000..ca9b72cdb --- /dev/null +++ b/data/net/minecraft/world/level/block/entity/CreakingHeartBlockEntity.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/world/level/block/entity/CreakingHeartBlockEntity + METHOD (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V + ARG 1 pos + ARG 2 state + METHOD emitParticles (Lnet/minecraft/server/level/ServerLevel;IZ)V + ARG 1 level + ARG 2 count + ARG 3 reverseDirection + METHOD isProtector (Lnet/minecraft/world/entity/monster/creaking/Creaking;)Z + ARG 1 creaking + METHOD removeProtector (Lnet/minecraft/world/damagesource/DamageSource;)V + ARG 1 damageSource + METHOD serverTick (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/entity/CreakingHeartBlockEntity;)V + ARG 0 level + ARG 1 pos + ARG 2 state + ARG 3 creakingHeart + METHOD spawnProtector (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/block/entity/CreakingHeartBlockEntity;)Lnet/minecraft/world/entity/monster/creaking/CreakingTransient; + ARG 0 level + ARG 1 creakingHeart diff --git a/data/net/minecraft/world/level/block/entity/FuelValues.mapping b/data/net/minecraft/world/level/block/entity/FuelValues.mapping new file mode 100644 index 000000000..7cee49c28 --- /dev/null +++ b/data/net/minecraft/world/level/block/entity/FuelValues.mapping @@ -0,0 +1,29 @@ +CLASS net/minecraft/world/level/block/entity/FuelValues + METHOD (Lit/unimi/dsi/fastutil/objects/Object2IntSortedMap;)V + ARG 1 values + METHOD burnDuration (Lnet/minecraft/world/item/ItemStack;)I + ARG 1 stack + METHOD isFuel (Lnet/minecraft/world/item/ItemStack;)Z + ARG 1 stack + METHOD vanillaBurnTimes (Lnet/minecraft/core/HolderLookup$Provider;Lnet/minecraft/world/flag/FeatureFlagSet;)Lnet/minecraft/world/level/block/entity/FuelValues; + ARG 0 registries + ARG 1 enabledFeatures + METHOD vanillaBurnTimes (Lnet/minecraft/core/HolderLookup$Provider;Lnet/minecraft/world/flag/FeatureFlagSet;I)Lnet/minecraft/world/level/block/entity/FuelValues; + ARG 0 registries + ARG 1 enabledFeatures + ARG 2 smeltingTime + CLASS Builder + METHOD (Lnet/minecraft/core/HolderLookup$Provider;Lnet/minecraft/world/flag/FeatureFlagSet;)V + ARG 1 registries + ARG 2 enabledFeatures + METHOD add (Lnet/minecraft/tags/TagKey;I)Lnet/minecraft/world/level/block/entity/FuelValues$Builder; + ARG 1 tag + ARG 2 value + METHOD add (Lnet/minecraft/world/level/ItemLike;I)Lnet/minecraft/world/level/block/entity/FuelValues$Builder; + ARG 1 item + ARG 2 value + METHOD putInternal (ILnet/minecraft/world/item/Item;)V + ARG 1 value + ARG 2 item + METHOD remove (Lnet/minecraft/tags/TagKey;)Lnet/minecraft/world/level/block/entity/FuelValues$Builder; + ARG 1 tag diff --git a/data/net/minecraft/world/level/block/entity/JigsawBlockEntity.mapping b/data/net/minecraft/world/level/block/entity/JigsawBlockEntity.mapping index 9588ce19f..8767e54ba 100644 --- a/data/net/minecraft/world/level/block/entity/JigsawBlockEntity.mapping +++ b/data/net/minecraft/world/level/block/entity/JigsawBlockEntity.mapping @@ -23,7 +23,3 @@ CLASS net/minecraft/world/level/block/entity/JigsawBlockEntity CLASS JointType METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name - METHOD byName (Ljava/lang/String;)Ljava/util/Optional; - ARG 0 name - METHOD lambda$byName$0 (Ljava/lang/String;Lnet/minecraft/world/level/block/entity/JigsawBlockEntity$JointType;)Z - ARG 1 jointType diff --git a/data/net/minecraft/world/level/block/entity/LecternBlockEntity.mapping b/data/net/minecraft/world/level/block/entity/LecternBlockEntity.mapping index 10c802f21..ebb1ac95b 100644 --- a/data/net/minecraft/world/level/block/entity/LecternBlockEntity.mapping +++ b/data/net/minecraft/world/level/block/entity/LecternBlockEntity.mapping @@ -2,9 +2,9 @@ CLASS net/minecraft/world/level/block/entity/LecternBlockEntity METHOD (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V ARG 1 pos ARG 2 blockState - METHOD createCommandSourceStack (Lnet/minecraft/world/entity/player/Player;)Lnet/minecraft/commands/CommandSourceStack; - COMMENT Creates a CommandSourceStack for resolving the contents of a book. If the player is null, a CommandSourceStack with the generic name {@code "Lectern"} is used. + METHOD createCommandSourceStack (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/server/level/ServerLevel;)Lnet/minecraft/commands/CommandSourceStack; ARG 1 player + ARG 2 level METHOD getPageCount (Lnet/minecraft/world/item/ItemStack;)I ARG 0 stack METHOD hasBook ()Z diff --git a/data/net/minecraft/world/level/block/entity/SmokerBlockEntity.mapping b/data/net/minecraft/world/level/block/entity/SmokerBlockEntity.mapping index 48a98fc89..80beefb7f 100644 --- a/data/net/minecraft/world/level/block/entity/SmokerBlockEntity.mapping +++ b/data/net/minecraft/world/level/block/entity/SmokerBlockEntity.mapping @@ -5,5 +5,3 @@ CLASS net/minecraft/world/level/block/entity/SmokerBlockEntity METHOD createMenu (ILnet/minecraft/world/entity/player/Inventory;)Lnet/minecraft/world/inventory/AbstractContainerMenu; ARG 1 id ARG 2 player - METHOD getBurnDuration (Lnet/minecraft/world/item/ItemStack;)I - ARG 1 fuel diff --git a/data/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.mapping b/data/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.mapping index b477c3c75..56aa49bd0 100644 --- a/data/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.mapping +++ b/data/net/minecraft/world/level/block/entity/trialspawner/TrialSpawner.mapping @@ -1,9 +1,5 @@ CLASS net/minecraft/world/level/block/entity/trialspawner/TrialSpawner - METHOD (Lnet/minecraft/world/level/block/entity/trialspawner/TrialSpawner$StateAccessor;Lnet/minecraft/world/level/block/entity/trialspawner/PlayerDetector;Lnet/minecraft/world/level/block/entity/trialspawner/PlayerDetector$EntitySelector;)V - ARG 1 stateAccessor - ARG 2 playerDetector - ARG 3 entitySelector - METHOD (Lnet/minecraft/world/level/block/entity/trialspawner/TrialSpawnerConfig;Lnet/minecraft/world/level/block/entity/trialspawner/TrialSpawnerConfig;Lnet/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData;IILnet/minecraft/world/level/block/entity/trialspawner/TrialSpawner$StateAccessor;Lnet/minecraft/world/level/block/entity/trialspawner/PlayerDetector;Lnet/minecraft/world/level/block/entity/trialspawner/PlayerDetector$EntitySelector;)V + METHOD (Lnet/minecraft/core/Holder;Lnet/minecraft/core/Holder;Lnet/minecraft/world/level/block/entity/trialspawner/TrialSpawnerData;IILnet/minecraft/world/level/block/entity/trialspawner/TrialSpawner$StateAccessor;Lnet/minecraft/world/level/block/entity/trialspawner/PlayerDetector;Lnet/minecraft/world/level/block/entity/trialspawner/PlayerDetector$EntitySelector;)V ARG 1 normalConfig ARG 2 ominousConfig ARG 3 data @@ -12,6 +8,10 @@ CLASS net/minecraft/world/level/block/entity/trialspawner/TrialSpawner ARG 6 stateAccessor ARG 7 playerDetector ARG 8 entitySelector + METHOD (Lnet/minecraft/world/level/block/entity/trialspawner/TrialSpawner$StateAccessor;Lnet/minecraft/world/level/block/entity/trialspawner/PlayerDetector;Lnet/minecraft/world/level/block/entity/trialspawner/PlayerDetector$EntitySelector;)V + ARG 1 stateAccessor + ARG 2 playerDetector + ARG 3 entitySelector METHOD addBecomeOminousParticles (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)V ARG 0 level ARG 1 pos @@ -34,7 +34,7 @@ CLASS net/minecraft/world/level/block/entity/trialspawner/TrialSpawner METHOD applyOminous (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;)V ARG 1 level ARG 2 pos - METHOD canSpawnInLevel (Lnet/minecraft/world/level/Level;)Z + METHOD canSpawnInLevel (Lnet/minecraft/server/level/ServerLevel;)Z ARG 1 level METHOD ejectReward (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/resources/ResourceKey;)V ARG 1 level @@ -44,12 +44,10 @@ CLASS net/minecraft/world/level/block/entity/trialspawner/TrialSpawner ARG 0 level ARG 1 spawnerPos ARG 2 mobPos - METHOD lambda$codec$1 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + METHOD lambda$codec$3 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 1 instance - METHOD lambda$spawnMob$2 (DDDLnet/minecraft/util/RandomSource;Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/entity/Entity; - ARG 7 entity - METHOD lambda$tickServer$3 (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Ljava/util/UUID;)Z - ARG 2 mob + METHOD lambda$tickServer$5 (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Ljava/util/UUID;)Z + ARG 2 uuid METHOD removeOminous (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;)V ARG 1 level ARG 2 pos diff --git a/data/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerConfig.mapping b/data/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerConfig.mapping index f54fde7ed..bd3f9b2b3 100644 --- a/data/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerConfig.mapping +++ b/data/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerConfig.mapping @@ -5,3 +5,22 @@ CLASS net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerConfig ARG 1 players METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + CLASS Builder + METHOD itemsToDropWhenOminous (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/level/block/entity/trialspawner/TrialSpawnerConfig$Builder; + ARG 1 itemsToDropWhenOminous + METHOD lootTablesToEject (Lnet/minecraft/util/random/SimpleWeightedRandomList;)Lnet/minecraft/world/level/block/entity/trialspawner/TrialSpawnerConfig$Builder; + ARG 1 lootTablesToEject + METHOD simultaneousMobs (F)Lnet/minecraft/world/level/block/entity/trialspawner/TrialSpawnerConfig$Builder; + ARG 1 simultaneousMobs + METHOD simultaneousMobsAddedPerPlayer (F)Lnet/minecraft/world/level/block/entity/trialspawner/TrialSpawnerConfig$Builder; + ARG 1 simultaneousMobsAddedPerPlayer + METHOD spawnPotentialsDefinition (Lnet/minecraft/util/random/SimpleWeightedRandomList;)Lnet/minecraft/world/level/block/entity/trialspawner/TrialSpawnerConfig$Builder; + ARG 1 spawnPotentialsDefinition + METHOD spawnRange (I)Lnet/minecraft/world/level/block/entity/trialspawner/TrialSpawnerConfig$Builder; + ARG 1 spawnRange + METHOD ticksBetweenSpawn (I)Lnet/minecraft/world/level/block/entity/trialspawner/TrialSpawnerConfig$Builder; + ARG 1 ticksBetweenSpawn + METHOD totalMobs (F)Lnet/minecraft/world/level/block/entity/trialspawner/TrialSpawnerConfig$Builder; + ARG 1 totalMobs + METHOD totalMobsAddedPerPlayer (F)Lnet/minecraft/world/level/block/entity/trialspawner/TrialSpawnerConfig$Builder; + ARG 1 totalMobsAddedPerPlayer diff --git a/data/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerConfigs.mapping b/data/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerConfigs.mapping new file mode 100644 index 000000000..ff6955c21 --- /dev/null +++ b/data/net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerConfigs.mapping @@ -0,0 +1,25 @@ +CLASS net/minecraft/world/level/block/entity/trialspawner/TrialSpawnerConfigs + METHOD bootstrap (Lnet/minecraft/data/worldgen/BootstrapContext;)V + ARG 0 context + METHOD customSpawnData (Lnet/minecraft/world/entity/EntityType;Ljava/util/function/Consumer;)Lnet/minecraft/world/level/SpawnData; + ARG 0 entityType + ARG 1 tagConsumer + METHOD customSpawnDataWithEquipment (Lnet/minecraft/world/entity/EntityType;Ljava/util/function/Consumer;Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/level/SpawnData; + ARG 0 entityType + ARG 1 tagConsumer + ARG 2 lootTableKey + METHOD register (Lnet/minecraft/data/worldgen/BootstrapContext;Lnet/minecraft/world/level/block/entity/trialspawner/TrialSpawnerConfigs$Keys;Lnet/minecraft/world/level/block/entity/trialspawner/TrialSpawnerConfig;Lnet/minecraft/world/level/block/entity/trialspawner/TrialSpawnerConfig;)V + ARG 0 context + ARG 1 keys + ARG 2 normal + ARG 3 ominous + METHOD registryKey (Ljava/lang/String;)Lnet/minecraft/resources/ResourceKey; + ARG 0 name + METHOD spawnData (Lnet/minecraft/world/entity/EntityType;)Lnet/minecraft/world/level/SpawnData; + ARG 0 entityType + METHOD spawnDataWithEquipment (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/level/SpawnData; + ARG 0 entityType + ARG 1 lootTableKey + CLASS Keys + METHOD of (Ljava/lang/String;)Lnet/minecraft/world/level/block/entity/trialspawner/TrialSpawnerConfigs$Keys; + ARG 0 key diff --git a/data/net/minecraft/world/level/block/entity/vault/VaultBlockEntity.mapping b/data/net/minecraft/world/level/block/entity/vault/VaultBlockEntity.mapping index e4c262bee..04680fcca 100644 --- a/data/net/minecraft/world/level/block/entity/vault/VaultBlockEntity.mapping +++ b/data/net/minecraft/world/level/block/entity/vault/VaultBlockEntity.mapping @@ -6,6 +6,10 @@ CLASS net/minecraft/world/level/block/entity/vault/VaultBlockEntity ARG 0 codec ARG 1 value ARG 2 levelRegistry + METHOD lambda$getUpdateTag$0 (Lnet/minecraft/core/HolderLookup$Provider;Lnet/minecraft/nbt/CompoundTag;)V + ARG 2 tag + METHOD lambda$loadAdditional$1 (Lnet/minecraft/world/level/block/entity/vault/VaultConfig;)V + ARG 1 config METHOD setConfig (Lnet/minecraft/world/level/block/entity/vault/VaultConfig;)V ARG 1 config CLASS Client @@ -80,11 +84,12 @@ CLASS net/minecraft/world/level/block/entity/vault/VaultBlockEntity ARG 1 serverData ARG 2 pos ARG 3 sound - METHOD resolveItemsToEject (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/block/entity/vault/VaultConfig;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;)Ljava/util/List; + METHOD resolveItemsToEject (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/block/entity/vault/VaultConfig;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/item/ItemStack;)Ljava/util/List; ARG 0 level ARG 1 config ARG 2 pos ARG 3 player + ARG 4 key METHOD setVaultState (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/entity/vault/VaultConfig;Lnet/minecraft/world/level/block/entity/vault/VaultSharedData;)V ARG 0 level ARG 1 pos diff --git a/data/net/minecraft/world/level/block/piston/PistonBaseBlock.mapping b/data/net/minecraft/world/level/block/piston/PistonBaseBlock.mapping index 7f22cfa82..f6ec4b35a 100644 --- a/data/net/minecraft/world/level/block/piston/PistonBaseBlock.mapping +++ b/data/net/minecraft/world/level/block/piston/PistonBaseBlock.mapping @@ -37,13 +37,6 @@ CLASS net/minecraft/world/level/block/piston/PistonBaseBlock ARG 2 pos ARG 3 facing ARG 4 extending - METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V - ARG 1 state - ARG 2 level - ARG 3 pos - ARG 4 block - ARG 5 fromPos - ARG 6 isMoving METHOD onPlace (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Z)V ARG 1 state ARG 2 level diff --git a/data/net/minecraft/world/level/block/piston/PistonHeadBlock.mapping b/data/net/minecraft/world/level/block/piston/PistonHeadBlock.mapping index 0eed936ed..4634cab19 100644 --- a/data/net/minecraft/world/level/block/piston/PistonHeadBlock.mapping +++ b/data/net/minecraft/world/level/block/piston/PistonHeadBlock.mapping @@ -25,13 +25,6 @@ CLASS net/minecraft/world/level/block/piston/PistonHeadBlock METHOD mirror (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Mirror;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 mirror - METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V - ARG 1 state - ARG 2 level - ARG 3 pos - ARG 4 block - ARG 5 fromPos - ARG 6 isMoving METHOD onRemove (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Z)V ARG 1 state ARG 2 level @@ -41,12 +34,5 @@ CLASS net/minecraft/world/level/block/piston/PistonHeadBlock METHOD rotate (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 state ARG 2 rot - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 state - ARG 2 facing - ARG 3 facingState - ARG 4 level - ARG 5 currentPos - ARG 6 facingPos METHOD useShapeForLightOcclusion (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 state diff --git a/data/net/minecraft/world/level/block/state/BlockBehaviour.mapping b/data/net/minecraft/world/level/block/state/BlockBehaviour.mapping index 34af326b9..c979a4a42 100644 --- a/data/net/minecraft/world/level/block/state/BlockBehaviour.mapping +++ b/data/net/minecraft/world/level/block/state/BlockBehaviour.mapping @@ -27,7 +27,6 @@ CLASS net/minecraft/world/level/block/state/BlockBehaviour ARG 4 entity METHOD getAnalogOutputSignal (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)I COMMENT Returns the analog signal this block emits. This is the signal a comparator can read from it. - COMMENT ARG 1 state ARG 2 level ARG 3 pos @@ -52,7 +51,6 @@ CLASS net/minecraft/world/level/block/state/BlockBehaviour COMMENT

COMMENT NOTE: directions in redstone signal related methods are backwards, so this method COMMENT checks for the signal emitted in the opposite direction of the one given. - COMMENT ARG 1 state ARG 2 level ARG 3 pos @@ -60,24 +58,24 @@ CLASS net/minecraft/world/level/block/state/BlockBehaviour METHOD getDrops (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/storage/loot/LootParams$Builder;)Ljava/util/List; ARG 1 state ARG 2 params + METHOD getEntityInsideCollisionShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/phys/shapes/VoxelShape; + ARG 1 state + ARG 2 level + ARG 3 pos METHOD getFluidState (Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/material/FluidState; ARG 1 state METHOD getInteractionShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/phys/shapes/VoxelShape; ARG 1 state ARG 2 level ARG 3 pos - METHOD getLightBlock (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I + METHOD getLightBlock (Lnet/minecraft/world/level/block/state/BlockState;)I ARG 1 state - ARG 2 level - ARG 3 pos METHOD getMenuProvider (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/MenuProvider; ARG 1 state ARG 2 level ARG 3 pos - METHOD getOcclusionShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/phys/shapes/VoxelShape; + METHOD getOcclusionShape (Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/phys/shapes/VoxelShape; ARG 1 state - ARG 2 level - ARG 3 pos METHOD getRenderShape (Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/block/RenderShape; COMMENT The type of render function called. MODEL for mixed tesr and static model, MODELBLOCK_ANIMATED for TESR-only, LIQUID for vanilla liquids, INVISIBLE to skip all rendering ARG 1 state @@ -100,7 +98,6 @@ CLASS net/minecraft/world/level/block/state/BlockBehaviour COMMENT

COMMENT NOTE: directions in redstone signal related methods are backwards, so this method COMMENT checks for the signal emitted in the opposite direction of the one given. - COMMENT ARG 1 state ARG 2 level ARG 3 pos @@ -118,10 +115,6 @@ CLASS net/minecraft/world/level/block/state/BlockBehaviour ARG 1 state ARG 2 level ARG 3 pos - METHOD isOcclusionShapeFullBlock (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z - ARG 1 state - ARG 2 level - ARG 3 pos METHOD isPathfindable (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/pathfinder/PathComputationType;)Z ARG 1 state ARG 2 pathComputationType @@ -129,20 +122,23 @@ CLASS net/minecraft/world/level/block/state/BlockBehaviour ARG 1 state METHOD isSignalSource (Lnet/minecraft/world/level/block/state/BlockState;)Z COMMENT Returns whether this block is capable of emitting redstone signals. - COMMENT ARG 1 state + METHOD lambda$onExplosionHit$1 (Ljava/util/function/BiConsumer;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/item/ItemStack;)V + ARG 2 stack + METHOD lambda$simpleCodec$0 (Ljava/util/function/Function;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 1 instance METHOD mirror (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/Mirror;)Lnet/minecraft/world/level/block/state/BlockState; COMMENT Returns the blockstate with the given mirror of the passed blockstate. If inapplicable, returns the passed blockstate. ARG 1 state ARG 2 mirror - METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V + METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/redstone/Orientation;Z)V ARG 1 state ARG 2 level ARG 3 pos ARG 4 neighborBlock - ARG 5 neighborPos + ARG 5 orientation ARG 6 movedByPiston - METHOD onExplosionHit (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/Explosion;Ljava/util/function/BiConsumer;)V + METHOD onExplosionHit (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/Explosion;Ljava/util/function/BiConsumer;)V ARG 1 state ARG 2 level ARG 3 pos @@ -165,10 +161,8 @@ CLASS net/minecraft/world/level/block/state/BlockBehaviour ARG 3 pos ARG 4 newState ARG 5 movedByPiston - METHOD propagatesSkylightDown (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z + METHOD propagatesSkylightDown (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 state - ARG 2 level - ARG 3 pos METHOD randomTick (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)V COMMENT Performs a random tick on a block. ARG 1 state @@ -218,17 +212,16 @@ CLASS net/minecraft/world/level/block/state/BlockBehaviour ARG 3 pos ARG 4 flags ARG 5 recursionLeft - METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - COMMENT Update the provided state given the provided neighbor direction and neighbor state, returning a new state. - COMMENT For example, fences make their connections to the passed in state if possible, and wet concrete powder immediately returns its solidified counterpart. - COMMENT Note that this method should ideally consider only the specific direction passed in. - ARG 1 state - ARG 2 direction - ARG 3 neighborState - ARG 4 level - ARG 5 pos + METHOD updateShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelReader;Lnet/minecraft/world/level/ScheduledTickAccess;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/util/RandomSource;)Lnet/minecraft/world/level/block/state/BlockState; + ARG 1 state + ARG 2 level + ARG 3 scheduledTickAccess + ARG 4 pos + ARG 5 direction ARG 6 neighborPos - METHOD useItemOn (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/phys/BlockHitResult;)Lnet/minecraft/world/ItemInteractionResult; + ARG 7 neighborState + ARG 8 random + METHOD useItemOn (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/phys/BlockHitResult;)Lnet/minecraft/world/InteractionResult; ARG 1 stack ARG 2 state ARG 3 level @@ -251,8 +244,6 @@ CLASS net/minecraft/world/level/block/state/BlockBehaviour COMMENT If it blocks vision on the client side. METHOD destroyTime (F)Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties; ARG 1 destroyTime - METHOD dropsLike (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties; - ARG 1 block METHOD emissiveRendering (Lnet/minecraft/world/level/block/state/BlockBehaviour$StatePredicate;)Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties; ARG 1 emissiveRendering METHOD explosionResistance (F)Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties; @@ -274,15 +265,34 @@ CLASS net/minecraft/world/level/block/state/BlockBehaviour ARG 1 isViewBlocking METHOD jumpFactor (F)Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties; ARG 1 jumpFactor - METHOD lambda$new$4 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z + METHOD lambda$mapColor$10 (Lnet/minecraft/world/item/DyeColor;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/material/MapColor; + ARG 1 state + METHOD lambda$mapColor$11 (Lnet/minecraft/world/level/material/MapColor;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/material/MapColor; + ARG 1 state + METHOD lambda$new$1 (Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/material/MapColor; + ARG 0 state + METHOD lambda$new$3 (Lnet/minecraft/resources/ResourceKey;)Ljava/util/Optional; + ARG 0 key + METHOD lambda$new$4 (Lnet/minecraft/resources/ResourceKey;)Ljava/lang/String; + ARG 0 key + METHOD lambda$new$5 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/EntityType;)Z ARG 0 state ARG 1 level ARG 2 pos - METHOD lambda$new$5 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z + ARG 3 random + METHOD lambda$new$6 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z ARG 0 state ARG 1 level ARG 2 pos - METHOD lambda$new$6 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z + METHOD lambda$new$7 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z + ARG 0 state + ARG 1 level + ARG 2 pos + METHOD lambda$new$8 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z + ARG 0 state + ARG 1 level + ARG 2 pos + METHOD lambda$new$9 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z ARG 0 state ARG 1 level ARG 2 pos @@ -300,10 +310,16 @@ CLASS net/minecraft/world/level/block/state/BlockBehaviour ARG 0 blockBehaviour METHOD offsetType (Lnet/minecraft/world/level/block/state/BlockBehaviour$OffsetType;)Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties; ARG 1 offsetType + METHOD overrideDescription (Ljava/lang/String;)Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties; + ARG 1 description + METHOD overrideLootTable (Ljava/util/Optional;)Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties; + ARG 1 lootTable METHOD pushReaction (Lnet/minecraft/world/level/material/PushReaction;)Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties; ARG 1 pushReaction METHOD requiredFeatures ([Lnet/minecraft/world/flag/FeatureFlag;)Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties; ARG 1 requiredFeatures + METHOD setId (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties; + ARG 1 id METHOD sound (Lnet/minecraft/world/level/block/SoundType;)Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties; ARG 1 soundType METHOD speedFactor (F)Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties; @@ -372,28 +388,22 @@ CLASS net/minecraft/world/level/block/state/BlockBehaviour ARG 3 direction METHOD getDrops (Lnet/minecraft/world/level/storage/loot/LootParams$Builder;)Ljava/util/List; ARG 1 lootParams - METHOD getFaceOcclusionShape (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction;)Lnet/minecraft/world/phys/shapes/VoxelShape; + METHOD getEntityInsideCollisionShape (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/phys/shapes/VoxelShape; ARG 1 level ARG 2 pos - ARG 3 direction + METHOD getFaceOcclusionShape (Lnet/minecraft/core/Direction;)Lnet/minecraft/world/phys/shapes/VoxelShape; + ARG 1 face METHOD getInteractionShape (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/phys/shapes/VoxelShape; ARG 1 level ARG 2 pos - METHOD getLightBlock (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)I - ARG 1 level - ARG 2 pos METHOD getMapColor (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/material/MapColor; ARG 1 level ARG 2 pos METHOD getMenuProvider (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/MenuProvider; ARG 1 level ARG 2 pos - METHOD getOcclusionShape (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/phys/shapes/VoxelShape; - ARG 1 level - ARG 2 pos - METHOD getOffset (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/phys/Vec3; - ARG 1 level - ARG 2 pos + METHOD getOffset (Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/phys/Vec3; + ARG 1 pos METHOD getSeed (Lnet/minecraft/core/BlockPos;)J ARG 1 pos METHOD getShadeBrightness (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)F @@ -417,12 +427,12 @@ CLASS net/minecraft/world/level/block/state/BlockBehaviour ARG 1 level ARG 2 pos ARG 3 context - METHOD handleNeighborChanged (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V + METHOD handleNeighborChanged (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/redstone/Orientation;Z)V ARG 1 level ARG 2 pos - ARG 3 block - ARG 4 fromPos - ARG 5 isMoving + ARG 3 neighborBlock + ARG 4 orientation + ARG 5 movedByPiston METHOD hasPostProcess (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z ARG 1 level ARG 2 pos @@ -451,12 +461,11 @@ CLASS net/minecraft/world/level/block/state/BlockBehaviour ARG 2 pos ARG 3 face ARG 4 supportType + METHOD isPathfindable (Lnet/minecraft/world/level/pathfinder/PathComputationType;)Z + ARG 1 type METHOD isRedstoneConductor (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z ARG 1 level ARG 2 pos - METHOD isSolidRender (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z - ARG 1 level - ARG 2 pos METHOD isSuffocating (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z ARG 1 level ARG 2 pos @@ -467,10 +476,14 @@ CLASS net/minecraft/world/level/block/state/BlockBehaviour METHOD isViewBlocking (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z ARG 1 level ARG 2 pos + METHOD lambda$static$0 ([Lnet/minecraft/world/phys/shapes/VoxelShape;)V + ARG 0 shape + METHOD lambda$static$1 ([Lnet/minecraft/world/phys/shapes/VoxelShape;)V + ARG 0 shape METHOD mirror (Lnet/minecraft/world/level/block/Mirror;)Lnet/minecraft/world/level/block/state/BlockState; COMMENT @return the blockstate mirrored in the given way. If inapplicable, returns itself. ARG 1 mirror - METHOD onExplosionHit (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/Explosion;Ljava/util/function/BiConsumer;)V + METHOD onExplosionHit (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/Explosion;Ljava/util/function/BiConsumer;)V ARG 1 level ARG 2 pos ARG 3 explosion @@ -490,9 +503,6 @@ CLASS net/minecraft/world/level/block/state/BlockBehaviour ARG 2 pos ARG 3 newState ARG 4 movedByPiston - METHOD propagatesSkylightDown (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z - ARG 1 level - ARG 2 pos METHOD randomTick (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)V ARG 1 level ARG 2 pos @@ -535,13 +545,15 @@ CLASS net/minecraft/world/level/block/state/BlockBehaviour ARG 2 pos ARG 3 flags ARG 4 recursionLeft - METHOD updateShape (Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; - ARG 1 direction - ARG 2 neighborState - ARG 3 level - ARG 4 pos + METHOD updateShape (Lnet/minecraft/world/level/LevelReader;Lnet/minecraft/world/level/ScheduledTickAccess;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/util/RandomSource;)Lnet/minecraft/world/level/block/state/BlockState; + ARG 1 level + ARG 2 scheduledTickAccess + ARG 3 pos + ARG 4 direction ARG 5 neighborPos - METHOD useItemOn (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/phys/BlockHitResult;)Lnet/minecraft/world/ItemInteractionResult; + ARG 6 neighborState + ARG 7 random + METHOD useItemOn (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/Level;Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/phys/BlockHitResult;)Lnet/minecraft/world/InteractionResult; ARG 1 stack ARG 2 level ARG 3 player @@ -563,10 +575,9 @@ CLASS net/minecraft/world/level/block/state/BlockBehaviour METHOD lambda$new$0 (Lnet/minecraft/core/Direction$Axis;)Z ARG 1 dir CLASS OffsetFunction - METHOD evaluate (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/phys/Vec3; + METHOD evaluate (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/phys/Vec3; ARG 1 state - ARG 2 level - ARG 3 pos + ARG 2 pos CLASS StatePredicate METHOD test (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z ARG 1 state diff --git a/data/net/minecraft/world/level/block/state/StateHolder.mapping b/data/net/minecraft/world/level/block/state/StateHolder.mapping index a4b3a7954..6739d17ab 100644 --- a/data/net/minecraft/world/level/block/state/StateHolder.mapping +++ b/data/net/minecraft/world/level/block/state/StateHolder.mapping @@ -8,9 +8,11 @@ CLASS net/minecraft/world/level/block/state/StateHolder ARG 1 holderFunction METHOD cycle (Lnet/minecraft/world/level/block/state/properties/Property;)Ljava/lang/Object; ARG 1 property - METHOD findNextInCollection (Ljava/util/Collection;Ljava/lang/Object;)Ljava/lang/Object; - ARG 0 collection - ARG 1 value + METHOD findNextInCollection (Ljava/util/List;Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 possibleValues + ARG 1 currentValue + METHOD getNullableValue (Lnet/minecraft/world/level/block/state/properties/Property;)Ljava/lang/Comparable; + ARG 1 property METHOD getOptionalValue (Lnet/minecraft/world/level/block/state/properties/Property;)Ljava/util/Optional; ARG 1 property METHOD getProperties ()Ljava/util/Collection; @@ -18,12 +20,11 @@ CLASS net/minecraft/world/level/block/state/StateHolder METHOD getValue (Lnet/minecraft/world/level/block/state/properties/Property;)Ljava/lang/Comparable; COMMENT @return the value of the given Property for this state ARG 1 property + METHOD getValueOrElse (Lnet/minecraft/world/level/block/state/properties/Property;Ljava/lang/Comparable;)Ljava/lang/Comparable; + ARG 1 property + ARG 2 defaultValue METHOD hasProperty (Lnet/minecraft/world/level/block/state/properties/Property;)Z ARG 1 property - METHOD lambda$codec$0 (Lnet/minecraft/world/level/block/state/StateHolder;)Ljava/lang/Object; - ARG 0 type - METHOD lambda$codec$1 (Lnet/minecraft/world/level/block/state/StateHolder;Ljava/util/Optional;)Lnet/minecraft/world/level/block/state/StateHolder; - ARG 1 result METHOD makeNeighbourValues (Lnet/minecraft/world/level/block/state/properties/Property;Ljava/lang/Comparable;)Ljava/util/Map; ARG 1 property ARG 2 value @@ -32,6 +33,10 @@ CLASS net/minecraft/world/level/block/state/StateHolder METHOD setValue (Lnet/minecraft/world/level/block/state/properties/Property;Ljava/lang/Comparable;)Ljava/lang/Object; ARG 1 property ARG 2 value + METHOD setValueInternal (Lnet/minecraft/world/level/block/state/properties/Property;Ljava/lang/Comparable;Ljava/lang/Comparable;)Ljava/lang/Object; + ARG 1 property + ARG 2 value + ARG 3 comparable METHOD trySetValue (Lnet/minecraft/world/level/block/state/properties/Property;Ljava/lang/Comparable;)Ljava/lang/Object; ARG 1 property ARG 2 value diff --git a/data/net/minecraft/world/level/block/state/properties/DirectionProperty.mapping b/data/net/minecraft/world/level/block/state/properties/DirectionProperty.mapping deleted file mode 100644 index 64a9418e7..000000000 --- a/data/net/minecraft/world/level/block/state/properties/DirectionProperty.mapping +++ /dev/null @@ -1,19 +0,0 @@ -CLASS net/minecraft/world/level/block/state/properties/DirectionProperty - METHOD (Ljava/lang/String;Ljava/util/Collection;)V - ARG 1 name - ARG 2 values - METHOD create (Ljava/lang/String;)Lnet/minecraft/world/level/block/state/properties/DirectionProperty; - ARG 0 name - METHOD create (Ljava/lang/String;Ljava/util/Collection;)Lnet/minecraft/world/level/block/state/properties/DirectionProperty; - COMMENT Create a new DirectionProperty for the given direction values - ARG 0 name - ARG 1 values - METHOD create (Ljava/lang/String;Ljava/util/function/Predicate;)Lnet/minecraft/world/level/block/state/properties/DirectionProperty; - COMMENT Create a new DirectionProperty with all directions that match the given Predicate - ARG 0 name - ARG 1 filter - METHOD create (Ljava/lang/String;[Lnet/minecraft/core/Direction;)Lnet/minecraft/world/level/block/state/properties/DirectionProperty; - ARG 0 name - ARG 1 values - METHOD lambda$create$0 (Lnet/minecraft/core/Direction;)Z - ARG 0 dir diff --git a/data/net/minecraft/world/level/block/state/properties/EnumProperty.mapping b/data/net/minecraft/world/level/block/state/properties/EnumProperty.mapping index 8949140e8..75abf7240 100644 --- a/data/net/minecraft/world/level/block/state/properties/EnumProperty.mapping +++ b/data/net/minecraft/world/level/block/state/properties/EnumProperty.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/world/level/block/state/properties/EnumProperty FIELD names Ljava/util/Map; COMMENT Map of names to Enum values - METHOD (Ljava/lang/String;Ljava/lang/Class;Ljava/util/Collection;)V + METHOD (Ljava/lang/String;Ljava/lang/Class;Ljava/util/List;)V ARG 1 name ARG 2 clazz ARG 3 values @@ -9,8 +9,7 @@ CLASS net/minecraft/world/level/block/state/properties/EnumProperty COMMENT Create a new EnumProperty with all Enum constants of the given class. ARG 0 name ARG 1 clazz - METHOD create (Ljava/lang/String;Ljava/lang/Class;Ljava/util/Collection;)Lnet/minecraft/world/level/block/state/properties/EnumProperty; - COMMENT Create a new EnumProperty with the specified values + METHOD create (Ljava/lang/String;Ljava/lang/Class;Ljava/util/List;)Lnet/minecraft/world/level/block/state/properties/EnumProperty; ARG 0 name ARG 1 clazz ARG 2 values diff --git a/data/net/minecraft/world/level/block/state/properties/Property.mapping b/data/net/minecraft/world/level/block/state/properties/Property.mapping index 59ee2898e..86f805e19 100644 --- a/data/net/minecraft/world/level/block/state/properties/Property.mapping +++ b/data/net/minecraft/world/level/block/state/properties/Property.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/world/level/block/state/properties/Property ARG 2 clazz METHOD equals (Ljava/lang/Object;)Z ARG 1 other + METHOD getInternalIndex (Ljava/lang/Comparable;)I + ARG 1 value METHOD getName (Ljava/lang/Comparable;)Ljava/lang/String; COMMENT @return the name for the given value. ARG 1 value diff --git a/data/net/minecraft/world/level/border/WorldBorder.mapping b/data/net/minecraft/world/level/border/WorldBorder.mapping index 99e8b360e..c1e674aaa 100644 --- a/data/net/minecraft/world/level/border/WorldBorder.mapping +++ b/data/net/minecraft/world/level/border/WorldBorder.mapping @@ -11,6 +11,12 @@ CLASS net/minecraft/world/level/border/WorldBorder ARG 1 pos METHOD clampToBounds (Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/core/BlockPos; ARG 1 pos + METHOD clampVec3ToBound (DDD)Lnet/minecraft/world/phys/Vec3; + ARG 1 x + ARG 3 y + ARG 5 z + METHOD clampVec3ToBound (Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/world/phys/Vec3; + ARG 1 vec3 METHOD getDistanceToBorder (DD)D ARG 1 x ARG 3 z diff --git a/data/net/minecraft/world/level/chunk/ChunkAccess.mapping b/data/net/minecraft/world/level/chunk/ChunkAccess.mapping index 2a40c51f5..190823a5c 100644 --- a/data/net/minecraft/world/level/chunk/ChunkAccess.mapping +++ b/data/net/minecraft/world/level/chunk/ChunkAccess.mapping @@ -9,8 +9,8 @@ CLASS net/minecraft/world/level/chunk/ChunkAccess ARG 8 blendingData METHOD addEntity (Lnet/minecraft/world/entity/Entity;)V ARG 1 entity - METHOD addPackedPostProcess (SI)V - ARG 1 packedPosition + METHOD addPackedPostProcess (Lit/unimi/dsi/fastutil/shorts/ShortList;I)V + ARG 1 offsets ARG 2 index METHOD carverBiome (Ljava/util/function/Supplier;)Lnet/minecraft/world/level/biome/BiomeGenerationSettings; ARG 1 caverBiomeSettingsSupplier @@ -40,6 +40,8 @@ CLASS net/minecraft/world/level/chunk/ChunkAccess ARG 1 index METHOD getSection (I)Lnet/minecraft/world/level/chunk/LevelChunkSection; ARG 1 index + METHOD getTicksForSerialization (J)Lnet/minecraft/world/level/chunk/ChunkAccess$PackedTicks; + ARG 1 gametime METHOD hasPrimedHeightmap (Lnet/minecraft/world/level/levelgen/Heightmap$Types;)Z ARG 1 type METHOD incrementInhabitedTime (J)V @@ -64,8 +66,6 @@ CLASS net/minecraft/world/level/chunk/ChunkAccess ARG 1 sections METHOD setAllStarts (Ljava/util/Map;)V ARG 1 structureStarts - METHOD setBlendingData (Lnet/minecraft/world/level/levelgen/blending/BlendingData;)V - ARG 1 blendingData METHOD setBlockEntity (Lnet/minecraft/world/level/block/entity/BlockEntity;)V ARG 1 blockEntity METHOD setBlockEntityNbt (Lnet/minecraft/nbt/CompoundTag;)V @@ -81,5 +81,3 @@ CLASS net/minecraft/world/level/chunk/ChunkAccess ARG 1 inhabitedTime METHOD setLightCorrect (Z)V ARG 1 lightCorrect - METHOD setUnsaved (Z)V - ARG 1 unsaved diff --git a/data/net/minecraft/world/level/chunk/ChunkGenerator.mapping b/data/net/minecraft/world/level/chunk/ChunkGenerator.mapping index c518f47f0..e8dbcae1e 100644 --- a/data/net/minecraft/world/level/chunk/ChunkGenerator.mapping +++ b/data/net/minecraft/world/level/chunk/ChunkGenerator.mapping @@ -12,14 +12,13 @@ CLASS net/minecraft/world/level/chunk/ChunkGenerator ARG 1 level ARG 2 chunk ARG 3 structureManager - METHOD applyCarvers (Lnet/minecraft/server/level/WorldGenRegion;JLnet/minecraft/world/level/levelgen/RandomState;Lnet/minecraft/world/level/biome/BiomeManager;Lnet/minecraft/world/level/StructureManager;Lnet/minecraft/world/level/chunk/ChunkAccess;Lnet/minecraft/world/level/levelgen/GenerationStep$Carving;)V + METHOD applyCarvers (Lnet/minecraft/server/level/WorldGenRegion;JLnet/minecraft/world/level/levelgen/RandomState;Lnet/minecraft/world/level/biome/BiomeManager;Lnet/minecraft/world/level/StructureManager;Lnet/minecraft/world/level/chunk/ChunkAccess;)V ARG 1 level ARG 2 seed ARG 4 random ARG 5 biomeManager ARG 6 structureManager ARG 7 chunk - ARG 8 step METHOD buildSurface (Lnet/minecraft/server/level/WorldGenRegion;Lnet/minecraft/world/level/StructureManager;Lnet/minecraft/world/level/levelgen/RandomState;Lnet/minecraft/world/level/chunk/ChunkAccess;)V ARG 1 level ARG 2 structureManager diff --git a/data/net/minecraft/world/level/chunk/ChunkSource.mapping b/data/net/minecraft/world/level/chunk/ChunkSource.mapping index 9a32534e6..b11ffd0ba 100644 --- a/data/net/minecraft/world/level/chunk/ChunkSource.mapping +++ b/data/net/minecraft/world/level/chunk/ChunkSource.mapping @@ -17,9 +17,13 @@ CLASS net/minecraft/world/level/chunk/ChunkSource COMMENT @return {@code true} if a chunk is loaded at the provided position, without forcing a chunk load. ARG 1 chunkX ARG 2 chunkZ - METHOD setSpawnSettings (ZZ)V - ARG 1 hostile - ARG 2 peaceful + METHOD onSectionEmptinessChanged (IIIZ)V + ARG 1 x + ARG 2 y + ARG 3 z + ARG 4 isEmpty + METHOD setSpawnSettings (Z)V + ARG 1 spawnSettings METHOD tick (Ljava/util/function/BooleanSupplier;Z)V ARG 1 hasTimeLeft ARG 2 tickChunks diff --git a/data/net/minecraft/world/level/chunk/LevelChunk.mapping b/data/net/minecraft/world/level/chunk/LevelChunk.mapping index a9c31ee86..6385c2b71 100644 --- a/data/net/minecraft/world/level/chunk/LevelChunk.mapping +++ b/data/net/minecraft/world/level/chunk/LevelChunk.mapping @@ -35,19 +35,17 @@ CLASS net/minecraft/world/level/chunk/LevelChunk ARG 3 z METHOD isTicking (Lnet/minecraft/core/BlockPos;)Z ARG 1 pos - METHOD lambda$clearAllBlockEntities$4 (Lnet/minecraft/world/level/chunk/LevelChunk$RebindableTickingBlockEntityWrapper;)V - ARG 0 blockEntityWrapper - METHOD lambda$getListenerRegistry$0 (Lnet/minecraft/server/level/ServerLevel;II)Lnet/minecraft/world/level/gameevent/GameEventListenerRegistry; - ARG 3 key - METHOD lambda$registerAllBlockEntitiesAfterLevelLoad$5 (Lnet/minecraft/world/level/block/entity/BlockEntity;)V + METHOD lambda$clearAllBlockEntities$5 (Lnet/minecraft/world/level/chunk/LevelChunk$RebindableTickingBlockEntityWrapper;)V + ARG 0 ticker + METHOD lambda$new$0 (Lnet/minecraft/world/level/ChunkPos;)V + ARG 0 chunkPos + METHOD lambda$registerAllBlockEntitiesAfterLevelLoad$6 (Lnet/minecraft/world/level/block/entity/BlockEntity;)V ARG 1 blockEntity - METHOD lambda$replaceWithPacketData$3 (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/entity/BlockEntityType;Lnet/minecraft/nbt/CompoundTag;)V - ARG 1 pos - ARG 2 type - ARG 3 tag - METHOD lambda$updateBlockEntityTicker$6 (Lnet/minecraft/world/level/block/entity/BlockEntity;Lnet/minecraft/world/level/block/entity/BlockEntityTicker;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/chunk/LevelChunk$RebindableTickingBlockEntityWrapper;)Lnet/minecraft/world/level/chunk/LevelChunk$RebindableTickingBlockEntityWrapper; - ARG 3 keyBlockPos - ARG 4 blockEntityWrapper + METHOD lambda$updateBlockEntityTicker$7 (Lnet/minecraft/world/level/block/entity/BlockEntity;Lnet/minecraft/world/level/block/entity/BlockEntityTicker;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/chunk/LevelChunk$RebindableTickingBlockEntityWrapper;)Lnet/minecraft/world/level/chunk/LevelChunk$RebindableTickingBlockEntityWrapper; + ARG 3 pos + ARG 4 ticker + METHOD postProcessGeneration (Lnet/minecraft/server/level/ServerLevel;)V + ARG 1 level METHOD promotePendingBlockEntity (Lnet/minecraft/core/BlockPos;Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/level/block/entity/BlockEntity; ARG 1 pos ARG 2 tag @@ -70,12 +68,17 @@ CLASS net/minecraft/world/level/chunk/LevelChunk ARG 1 fullStatus METHOD setLoaded (Z)V ARG 1 loaded + METHOD setUnsavedListener (Lnet/minecraft/world/level/chunk/LevelChunk$UnsavedListener;)V + ARG 1 unsavedListener METHOD unpackTicks (J)V ARG 1 pos METHOD unregisterTickContainerFromLevel (Lnet/minecraft/server/level/ServerLevel;)V ARG 1 level METHOD updateBlockEntityTicker (Lnet/minecraft/world/level/block/entity/BlockEntity;)V ARG 1 blockEntity + CLASS UnsavedListener + METHOD setUnsaved (Lnet/minecraft/world/level/ChunkPos;)V + ARG 1 chunkPos CLASS PostLoadProcessor METHOD run (Lnet/minecraft/world/level/chunk/LevelChunk;)V ARG 1 chunk diff --git a/data/net/minecraft/world/level/chunk/LevelChunkSection.mapping b/data/net/minecraft/world/level/chunk/LevelChunkSection.mapping index fd4dfffd5..5a6f04dd4 100644 --- a/data/net/minecraft/world/level/chunk/LevelChunkSection.mapping +++ b/data/net/minecraft/world/level/chunk/LevelChunkSection.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/world/level/chunk/LevelChunkSection METHOD (Lnet/minecraft/core/Registry;)V ARG 1 biomeRegistry + METHOD (Lnet/minecraft/world/level/chunk/LevelChunkSection;)V + ARG 1 section METHOD (Lnet/minecraft/world/level/chunk/PalettedContainer;Lnet/minecraft/world/level/chunk/PalettedContainerRO;)V ARG 1 states ARG 2 biomes diff --git a/data/net/minecraft/world/level/chunk/Palette.mapping b/data/net/minecraft/world/level/chunk/Palette.mapping index 505490c7f..86e1640c6 100644 --- a/data/net/minecraft/world/level/chunk/Palette.mapping +++ b/data/net/minecraft/world/level/chunk/Palette.mapping @@ -1,4 +1,6 @@ CLASS net/minecraft/world/level/chunk/Palette + METHOD copy (Lnet/minecraft/world/level/chunk/PaletteResize;)Lnet/minecraft/world/level/chunk/Palette; + ARG 1 resizeHandler METHOD idFor (Ljava/lang/Object;)I ARG 1 state METHOD maybeHas (Ljava/util/function/Predicate;)Z diff --git a/data/net/minecraft/world/level/chunk/PalettedContainer.mapping b/data/net/minecraft/world/level/chunk/PalettedContainer.mapping index 31b1b4ae5..e59e4dbe0 100644 --- a/data/net/minecraft/world/level/chunk/PalettedContainer.mapping +++ b/data/net/minecraft/world/level/chunk/PalettedContainer.mapping @@ -13,6 +13,8 @@ CLASS net/minecraft/world/level/chunk/PalettedContainer ARG 1 registry ARG 2 strategy ARG 3 data + METHOD (Lnet/minecraft/world/level/chunk/PalettedContainer;)V + ARG 1 other METHOD codec (Lnet/minecraft/core/IdMap;Lcom/mojang/serialization/Codec;Lnet/minecraft/world/level/chunk/PalettedContainer$Strategy;Ljava/lang/Object;Lnet/minecraft/world/level/chunk/PalettedContainerRO$Unpacker;)Lcom/mojang/serialization/Codec; ARG 0 registry ARG 1 codec @@ -97,6 +99,8 @@ CLASS net/minecraft/world/level/chunk/PalettedContainer METHOD write (Lnet/minecraft/network/FriendlyByteBuf;)V ARG 1 buffer CLASS Data + METHOD copy (Lnet/minecraft/world/level/chunk/PaletteResize;)Lnet/minecraft/world/level/chunk/PalettedContainer$Data; + ARG 1 resizeHandler METHOD copyFrom (Lnet/minecraft/world/level/chunk/Palette;Lnet/minecraft/util/BitStorage;)V ARG 1 palette ARG 2 bitStorage diff --git a/data/net/minecraft/world/level/chunk/ProtoChunk.mapping b/data/net/minecraft/world/level/chunk/ProtoChunk.mapping index c30d8d8bf..702bcc078 100644 --- a/data/net/minecraft/world/level/chunk/ProtoChunk.mapping +++ b/data/net/minecraft/world/level/chunk/ProtoChunk.mapping @@ -16,19 +16,12 @@ CLASS net/minecraft/world/level/chunk/ProtoChunk ARG 8 blendingData METHOD addEntity (Lnet/minecraft/nbt/CompoundTag;)V ARG 1 tag - METHOD getCarvingMask (Lnet/minecraft/world/level/levelgen/GenerationStep$Carving;)Lnet/minecraft/world/level/chunk/CarvingMask; - ARG 1 step - METHOD getOrCreateCarvingMask (Lnet/minecraft/world/level/levelgen/GenerationStep$Carving;)Lnet/minecraft/world/level/chunk/CarvingMask; - ARG 1 step - METHOD lambda$getOrCreateCarvingMask$0 (Lnet/minecraft/world/level/levelgen/GenerationStep$Carving;)Lnet/minecraft/world/level/chunk/CarvingMask; - ARG 1 key METHOD packOffsetCoordinates (Lnet/minecraft/core/BlockPos;)S ARG 0 pos METHOD setBelowZeroRetrogen (Lnet/minecraft/world/level/levelgen/BelowZeroRetrogen;)V ARG 1 belowZeroRetrogen - METHOD setCarvingMask (Lnet/minecraft/world/level/levelgen/GenerationStep$Carving;Lnet/minecraft/world/level/chunk/CarvingMask;)V - ARG 1 step - ARG 2 carvingMask + METHOD setCarvingMask (Lnet/minecraft/world/level/chunk/CarvingMask;)V + ARG 1 carvingMask METHOD setLightEngine (Lnet/minecraft/world/level/lighting/LevelLightEngine;)V ARG 1 lightEngine METHOD setPersistedStatus (Lnet/minecraft/world/level/chunk/status/ChunkStatus;)V diff --git a/data/net/minecraft/world/level/chunk/UpgradeData.mapping b/data/net/minecraft/world/level/chunk/UpgradeData.mapping index 53f0f7ae7..14b02a1c6 100644 --- a/data/net/minecraft/world/level/chunk/UpgradeData.mapping +++ b/data/net/minecraft/world/level/chunk/UpgradeData.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/world/level/chunk/UpgradeData ARG 2 level METHOD (Lnet/minecraft/world/level/LevelHeightAccessor;)V ARG 1 level + METHOD (Lnet/minecraft/world/level/chunk/UpgradeData;)V + ARG 1 other METHOD lambda$new$1 (Ljava/lang/String;)Ljava/util/Optional; ARG 0 id METHOD lambda$new$3 (Ljava/lang/String;)Ljava/util/Optional; diff --git a/data/net/minecraft/world/level/chunk/storage/ChunkSerializer.mapping b/data/net/minecraft/world/level/chunk/storage/ChunkSerializer.mapping deleted file mode 100644 index 8067d6f8f..000000000 --- a/data/net/minecraft/world/level/chunk/storage/ChunkSerializer.mapping +++ /dev/null @@ -1,70 +0,0 @@ -CLASS net/minecraft/world/level/chunk/storage/ChunkSerializer - METHOD getChunkTypeFromTag (Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/level/chunk/status/ChunkType; - ARG 0 tag - METHOD getListOfCompoundsOrNull (Lnet/minecraft/nbt/CompoundTag;Ljava/lang/String;)Lnet/minecraft/nbt/ListTag; - ARG 0 tag - ARG 1 key - METHOD lambda$postLoadChunk$10 (Lnet/minecraft/nbt/ListTag;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/nbt/ListTag;Lnet/minecraft/world/level/chunk/LevelChunk;)V - ARG 3 chunk - METHOD lambda$read$0 (Lnet/minecraft/world/level/ChunkPos;ILjava/lang/String;)V - ARG 2 errorMessage - METHOD lambda$read$1 (Lnet/minecraft/world/level/ChunkPos;ILjava/lang/String;)V - ARG 2 errorMessage - METHOD lambda$read$2 (Ljava/lang/String;)Ljava/util/Optional; - ARG 0 id - METHOD lambda$read$3 (Ljava/lang/String;)Ljava/util/Optional; - ARG 0 id - METHOD lambda$read$4 (Ljava/lang/String;)Ljava/util/Optional; - ARG 0 id - METHOD lambda$read$5 (Ljava/lang/String;)Ljava/util/Optional; - ARG 0 id - METHOD lambda$saveTicks$8 (Lnet/minecraft/world/level/block/Block;)Ljava/lang/String; - ARG 0 block - METHOD lambda$saveTicks$9 (Lnet/minecraft/world/level/material/Fluid;)Ljava/lang/String; - ARG 0 fluid - METHOD lambda$unpackStructureReferences$11 (Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/resources/ResourceLocation;J)Z - ARG 2 longPosition - METHOD lambda$write$6 (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/nbt/Tag;)V - ARG 1 data - METHOD lambda$write$7 (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/nbt/Tag;)V - ARG 1 belowZeroRetrogen - METHOD logErrors (Lnet/minecraft/world/level/ChunkPos;ILjava/lang/String;)V - ARG 0 chunkPos - ARG 1 chunkSectionY - ARG 2 errorMessage - METHOD makeBiomeCodec (Lnet/minecraft/core/Registry;)Lcom/mojang/serialization/Codec; - ARG 0 biomeRegistry - METHOD packOffsets ([Lit/unimi/dsi/fastutil/shorts/ShortList;)Lnet/minecraft/nbt/ListTag; - ARG 0 list - METHOD packStructureData (Lnet/minecraft/world/level/levelgen/structure/pieces/StructurePieceSerializationContext;Lnet/minecraft/world/level/ChunkPos;Ljava/util/Map;Ljava/util/Map;)Lnet/minecraft/nbt/CompoundTag; - ARG 0 context - ARG 1 pos - ARG 2 structureMap - ARG 3 referenceMap - METHOD postLoadChunk (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/level/chunk/LevelChunk$PostLoadProcessor; - ARG 0 level - ARG 1 tag - METHOD read (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/ai/village/poi/PoiManager;Lnet/minecraft/world/level/chunk/storage/RegionStorageInfo;Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/level/chunk/ProtoChunk; - ARG 0 level - ARG 1 poiManager - ARG 2 regionStorageInfo - ARG 3 pos - ARG 4 tag - METHOD saveTicks (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/world/level/chunk/ChunkAccess$TicksToSave;)V - ARG 0 level - ARG 1 tag - ARG 2 ticksToSave - METHOD unpackStructureReferences (Lnet/minecraft/core/RegistryAccess;Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/nbt/CompoundTag;)Ljava/util/Map; - ARG 0 registryAccess - ARG 1 pos - ARG 2 tag - METHOD unpackStructureStart (Lnet/minecraft/world/level/levelgen/structure/pieces/StructurePieceSerializationContext;Lnet/minecraft/nbt/CompoundTag;J)Ljava/util/Map; - ARG 0 context - ARG 1 tag - ARG 2 seed - METHOD write (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/chunk/ChunkAccess;)Lnet/minecraft/nbt/CompoundTag; - ARG 0 level - ARG 1 chunk - CLASS ChunkReadException - METHOD (Ljava/lang/String;)V - ARG 1 message diff --git a/data/net/minecraft/world/level/chunk/storage/ChunkStorage.mapping b/data/net/minecraft/world/level/chunk/storage/ChunkStorage.mapping index ddde3877a..9ed93cf9e 100644 --- a/data/net/minecraft/world/level/chunk/storage/ChunkStorage.mapping +++ b/data/net/minecraft/world/level/chunk/storage/ChunkStorage.mapping @@ -29,6 +29,6 @@ CLASS net/minecraft/world/level/chunk/storage/ChunkStorage ARG 2 storage ARG 3 chunkData ARG 4 chunkGeneratorKey - METHOD write (Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/nbt/CompoundTag;)Ljava/util/concurrent/CompletableFuture; - ARG 1 chunkPos - ARG 2 data + METHOD write (Lnet/minecraft/world/level/ChunkPos;Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture; + ARG 1 pos + ARG 2 tagSupplier diff --git a/data/net/minecraft/world/level/chunk/storage/IOWorker.mapping b/data/net/minecraft/world/level/chunk/storage/IOWorker.mapping index 9fb7f7884..2a645931d 100644 --- a/data/net/minecraft/world/level/chunk/storage/IOWorker.mapping +++ b/data/net/minecraft/world/level/chunk/storage/IOWorker.mapping @@ -14,32 +14,23 @@ CLASS net/minecraft/world/level/chunk/storage/IOWorker METHOD isOldChunkAround (Lnet/minecraft/world/level/ChunkPos;I)Z ARG 1 chunkPos ARG 2 radius - METHOD lambda$close$16 (Lnet/minecraft/util/thread/ProcessorHandle;)Lnet/minecraft/util/thread/StrictQueue$IntRunnable; - ARG 0 handle METHOD lambda$createOldDataForRegion$0 (Ljava/util/BitSet;Lnet/minecraft/world/level/ChunkPos;)V ARG 2 currentChunk - METHOD lambda$store$2 (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/world/level/chunk/storage/IOWorker$PendingStore; - ARG 1 key - METHOD lambda$submitTask$14 (Ljava/util/function/Supplier;Lnet/minecraft/util/thread/ProcessorHandle;)Lnet/minecraft/util/thread/StrictQueue$IntRunnable; - ARG 2 handle - METHOD lambda$synchronize$11 (Ljava/lang/Void;)Ljava/util/concurrent/CompletionStage; - ARG 1 ignored - METHOD lambda$synchronize$5 (Lnet/minecraft/world/level/chunk/storage/IOWorker$PendingStore;)Ljava/util/concurrent/CompletableFuture; - ARG 0 pendingStore - METHOD lambda$synchronize$6 (I)[Ljava/util/concurrent/CompletableFuture; - ARG 0 size - METHOD lambda$synchronize$9 (Ljava/lang/Void;)Ljava/util/concurrent/CompletionStage; - ARG 1 executor METHOD loadAsync (Lnet/minecraft/world/level/ChunkPos;)Ljava/util/concurrent/CompletableFuture; ARG 1 chunkPos METHOD runStore (Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/world/level/chunk/storage/IOWorker$PendingStore;)V ARG 1 chunkPos ARG 2 pendingStore + METHOD store (Lnet/minecraft/world/level/ChunkPos;Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture; + ARG 1 chunkPos + ARG 2 dataSupplier METHOD store (Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/nbt/CompoundTag;)Ljava/util/concurrent/CompletableFuture; ARG 1 chunkPos ARG 2 chunkData METHOD submitTask (Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture; ARG 1 task + METHOD submitThrowingTask (Lnet/minecraft/world/level/chunk/storage/IOWorker$ThrowingSupplier;)Ljava/util/concurrent/CompletableFuture; + ARG 1 task METHOD synchronize (Z)Ljava/util/concurrent/CompletableFuture; ARG 1 flushStorage CLASS PendingStore diff --git a/data/net/minecraft/world/level/chunk/storage/SectionStorage.mapping b/data/net/minecraft/world/level/chunk/storage/SectionStorage.mapping index 8d12d8a6d..76f1c13a7 100644 --- a/data/net/minecraft/world/level/chunk/storage/SectionStorage.mapping +++ b/data/net/minecraft/world/level/chunk/storage/SectionStorage.mapping @@ -1,11 +1,13 @@ CLASS net/minecraft/world/level/chunk/storage/SectionStorage - METHOD (Lnet/minecraft/world/level/chunk/storage/SimpleRegionStorage;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraft/core/RegistryAccess;Lnet/minecraft/world/level/chunk/storage/ChunkIOErrorReporter;Lnet/minecraft/world/level/LevelHeightAccessor;)V + METHOD (Lnet/minecraft/world/level/chunk/storage/SimpleRegionStorage;Lcom/mojang/serialization/Codec;Ljava/util/function/Function;Ljava/util/function/BiFunction;Ljava/util/function/Function;Lnet/minecraft/core/RegistryAccess;Lnet/minecraft/world/level/chunk/storage/ChunkIOErrorReporter;Lnet/minecraft/world/level/LevelHeightAccessor;)V ARG 1 simpleRegionStorage ARG 2 codec - ARG 3 factory - ARG 4 registryAccess - ARG 5 errorReporter - ARG 6 levelHeightAccessor + ARG 3 packer + ARG 4 unpacker + ARG 5 factory + ARG 6 registryAccess + ARG 7 errorReporter + ARG 8 levelHeightAccessor METHOD flush (Lnet/minecraft/world/level/ChunkPos;)V ARG 1 chunkPos METHOD get (J)Ljava/util/Optional; @@ -19,30 +21,32 @@ CLASS net/minecraft/world/level/chunk/storage/SectionStorage ARG 1 sectionKey METHOD getVersion (Lcom/mojang/serialization/Dynamic;)I ARG 0 columnData - METHOD lambda$readColumn$3 (JLcom/mojang/serialization/Dynamic;)Ljava/util/Optional; - ARG 3 sectionDynamic - METHOD lambda$readColumn$4 (JZLjava/lang/Object;)V - ARG 4 parsedValue - METHOD lambda$tryRead$1 (Lnet/minecraft/world/level/ChunkPos;Ljava/lang/Throwable;)Ljava/util/Optional; - ARG 1 throwable METHOD onSectionLoad (J)V ARG 1 sectionKey METHOD outsideStoredRange (J)Z ARG 1 sectionKey - METHOD readColumn (Lnet/minecraft/world/level/ChunkPos;)V - ARG 1 chunkPos - METHOD readColumn (Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/resources/RegistryOps;Lnet/minecraft/nbt/CompoundTag;)V - ARG 1 chunkPos - ARG 2 ops - ARG 3 tag + METHOD prefetch (Lnet/minecraft/world/level/ChunkPos;)Ljava/util/concurrent/CompletableFuture; + ARG 1 pos METHOD setDirty (J)V ARG 1 sectionPos METHOD tick (Ljava/util/function/BooleanSupplier;)V ARG 1 aheadOfTime METHOD tryRead (Lnet/minecraft/world/level/ChunkPos;)Ljava/util/concurrent/CompletableFuture; ARG 1 chunkPos - METHOD writeColumn (Lnet/minecraft/world/level/ChunkPos;)V - ARG 1 chunkPos - METHOD writeColumn (Lnet/minecraft/world/level/ChunkPos;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Dynamic; - ARG 1 chunkPos + METHOD unpackChunk (Lnet/minecraft/world/level/ChunkPos;)V + ARG 1 pos + METHOD unpackChunk (Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/world/level/chunk/storage/SectionStorage$PackedChunk;)V + ARG 1 pos + ARG 2 packedChunk + METHOD writeChunk (Lnet/minecraft/world/level/ChunkPos;)V + ARG 1 pos + METHOD writeChunk (Lnet/minecraft/world/level/ChunkPos;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Dynamic; + ARG 1 pos ARG 2 ops + CLASS PackedChunk + METHOD parse (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/nbt/Tag;Lnet/minecraft/world/level/chunk/storage/SimpleRegionStorage;Lnet/minecraft/world/level/LevelHeightAccessor;)Lnet/minecraft/world/level/chunk/storage/SectionStorage$PackedChunk; + ARG 0 codec + ARG 1 ops + ARG 2 value + ARG 3 simpleRegionStorage + ARG 4 levelHeightAccessor diff --git a/data/net/minecraft/world/level/chunk/storage/SerializableChunkData.mapping b/data/net/minecraft/world/level/chunk/storage/SerializableChunkData.mapping new file mode 100644 index 000000000..f3c5e88a4 --- /dev/null +++ b/data/net/minecraft/world/level/chunk/storage/SerializableChunkData.mapping @@ -0,0 +1,43 @@ +CLASS net/minecraft/world/level/chunk/storage/SerializableChunkData + METHOD copyOf (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/chunk/ChunkAccess;)Lnet/minecraft/world/level/chunk/storage/SerializableChunkData; + ARG 0 level + ARG 1 chunk + METHOD getChunkTypeFromTag (Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/level/chunk/status/ChunkType; + ARG 0 tag + METHOD logErrors (Lnet/minecraft/world/level/ChunkPos;ILjava/lang/String;)V + ARG 0 chunkPos + ARG 1 sectionY + ARG 2 error + METHOD makeBiomeCodec (Lnet/minecraft/core/Registry;)Lcom/mojang/serialization/Codec; + ARG 0 biomeRegistry + METHOD packOffsets ([Lit/unimi/dsi/fastutil/shorts/ShortList;)Lnet/minecraft/nbt/ListTag; + ARG 0 offsets + METHOD packStructureData (Lnet/minecraft/world/level/levelgen/structure/pieces/StructurePieceSerializationContext;Lnet/minecraft/world/level/ChunkPos;Ljava/util/Map;Ljava/util/Map;)Lnet/minecraft/nbt/CompoundTag; + ARG 0 context + ARG 1 pos + ARG 2 structureStarts + ARG 3 references + METHOD parse (Lnet/minecraft/world/level/LevelHeightAccessor;Lnet/minecraft/core/RegistryAccess;Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/level/chunk/storage/SerializableChunkData; + ARG 0 levelHeightAccessor + ARG 1 registries + ARG 2 tag + METHOD postLoadChunk (Lnet/minecraft/server/level/ServerLevel;Ljava/util/List;Ljava/util/List;)Lnet/minecraft/world/level/chunk/LevelChunk$PostLoadProcessor; + ARG 0 level + ARG 1 entities + ARG 2 blockEntities + METHOD read (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/ai/village/poi/PoiManager;Lnet/minecraft/world/level/chunk/storage/RegionStorageInfo;Lnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/world/level/chunk/ProtoChunk; + ARG 1 level + ARG 2 poiManager + ARG 3 regionStorageInfo + ARG 4 pos + METHOD saveTicks (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/world/level/chunk/ChunkAccess$PackedTicks;)V + ARG 0 tag + ARG 1 ticks + METHOD unpackStructureReferences (Lnet/minecraft/core/RegistryAccess;Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/nbt/CompoundTag;)Ljava/util/Map; + ARG 0 registries + ARG 1 pos + ARG 2 tag + METHOD unpackStructureStart (Lnet/minecraft/world/level/levelgen/structure/pieces/StructurePieceSerializationContext;Lnet/minecraft/nbt/CompoundTag;J)Ljava/util/Map; + ARG 0 context + ARG 1 tag + ARG 2 seed diff --git a/data/net/minecraft/world/level/levelgen/GenerationStep.mapping b/data/net/minecraft/world/level/levelgen/GenerationStep.mapping index fba06dbdc..bcbfa41dd 100644 --- a/data/net/minecraft/world/level/levelgen/GenerationStep.mapping +++ b/data/net/minecraft/world/level/levelgen/GenerationStep.mapping @@ -1,8 +1,5 @@ CLASS net/minecraft/world/level/levelgen/GenerationStep COMMENT Represents individual steps that the features and carvers chunk status go through, respectively. - CLASS Carving - METHOD (Ljava/lang/String;ILjava/lang/String;)V - ARG 3 name CLASS Decoration METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name diff --git a/data/net/minecraft/world/level/levelgen/NoiseRouterData.mapping b/data/net/minecraft/world/level/levelgen/NoiseRouterData.mapping index bae1a3cf4..b612e04ef 100644 --- a/data/net/minecraft/world/level/levelgen/NoiseRouterData.mapping +++ b/data/net/minecraft/world/level/levelgen/NoiseRouterData.mapping @@ -9,20 +9,25 @@ CLASS net/minecraft/world/level/levelgen/NoiseRouterData METHOD end (Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/world/level/levelgen/NoiseRouter; ARG 0 densityFunctions METHOD entrances (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/world/level/levelgen/DensityFunction; - ARG 0 densityFunction + ARG 0 densityFunctionRegistry ARG 1 noiseParameters METHOD floatingIslands (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/world/level/levelgen/NoiseRouter; ARG 0 densityFunction ARG 1 noiseParameters METHOD getFunction (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/level/levelgen/DensityFunction; - ARG 0 densityFunctions + ARG 0 densityFunctionRegistry ARG 1 key + METHOD lambda$overworld$0 (Lnet/minecraft/world/level/levelgen/OreVeinifier$VeinType;)I + ARG 0 veinType + METHOD lambda$overworld$1 (Lnet/minecraft/world/level/levelgen/OreVeinifier$VeinType;)I + ARG 0 veinType METHOD nether (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/world/level/levelgen/NoiseRouter; ARG 0 densityFunctions ARG 1 noiseParameters METHOD noNewCaves (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/core/HolderGetter;Lnet/minecraft/world/level/levelgen/DensityFunction;)Lnet/minecraft/world/level/levelgen/NoiseRouter; ARG 0 densityFunctions ARG 1 noiseParameters + ARG 2 postProccessor METHOD noiseGradientDensity (Lnet/minecraft/world/level/levelgen/DensityFunction;Lnet/minecraft/world/level/levelgen/DensityFunction;)Lnet/minecraft/world/level/levelgen/DensityFunction; ARG 0 minFunction ARG 1 maxFunction @@ -30,7 +35,7 @@ CLASS net/minecraft/world/level/levelgen/NoiseRouterData ARG 0 densityFunctions ARG 1 noiseParameters METHOD overworld (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/core/HolderGetter;ZZ)Lnet/minecraft/world/level/levelgen/NoiseRouter; - ARG 0 densityFunctions + ARG 0 densityFunctionRegistry ARG 1 noiseParameters ARG 2 large ARG 3 amplified @@ -48,7 +53,7 @@ CLASS net/minecraft/world/level/levelgen/NoiseRouterData ARG 2 value METHOD registerTerrainNoises (Lnet/minecraft/data/worldgen/BootstrapContext;Lnet/minecraft/core/HolderGetter;Lnet/minecraft/world/level/levelgen/DensityFunction;Lnet/minecraft/core/Holder;Lnet/minecraft/core/Holder;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/resources/ResourceKey;Z)V ARG 0 context - ARG 1 densityFunctionGetter + ARG 1 densityFunctionRegistry ARG 2 jaggedNoise ARG 3 continentalness ARG 4 erosion @@ -61,22 +66,28 @@ CLASS net/minecraft/world/level/levelgen/NoiseRouterData METHOD slide (Lnet/minecraft/world/level/levelgen/DensityFunction;IIIIDIID)Lnet/minecraft/world/level/levelgen/DensityFunction; ARG 0 input ARG 1 minY - ARG 2 maxY + ARG 2 height + ARG 3 topStartOffset + ARG 4 topEndOffset + ARG 5 topDelta + ARG 7 bottomStartOffset + ARG 8 bottomEndOffset + ARG 9 bottomDelta METHOD slideEnd (Lnet/minecraft/world/level/levelgen/DensityFunction;)Lnet/minecraft/world/level/levelgen/DensityFunction; ARG 0 densityFunction METHOD slideEndLike (Lnet/minecraft/world/level/levelgen/DensityFunction;II)Lnet/minecraft/world/level/levelgen/DensityFunction; ARG 0 densityFunction ARG 1 minY - ARG 2 maxY + ARG 2 height METHOD slideNetherLike (Lnet/minecraft/core/HolderGetter;II)Lnet/minecraft/world/level/levelgen/DensityFunction; ARG 0 densityFunctions ARG 1 minY - ARG 2 maxY + ARG 2 height METHOD slideOverworld (ZLnet/minecraft/world/level/levelgen/DensityFunction;)Lnet/minecraft/world/level/levelgen/DensityFunction; ARG 0 amplified ARG 1 densityFunction METHOD spaghetti2D (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/world/level/levelgen/DensityFunction; - ARG 0 densityFunctions + ARG 0 densityFunctionRegistry ARG 1 noiseParameters METHOD spaghettiRoughnessFunction (Lnet/minecraft/core/HolderGetter;)Lnet/minecraft/world/level/levelgen/DensityFunction; ARG 0 noiseParameters @@ -84,8 +95,9 @@ CLASS net/minecraft/world/level/levelgen/NoiseRouterData ARG 0 minFunction ARG 1 maxFunction METHOD underground (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/core/HolderGetter;Lnet/minecraft/world/level/levelgen/DensityFunction;)Lnet/minecraft/world/level/levelgen/DensityFunction; - ARG 0 densityFunctions + ARG 0 densityFunctionRegistry ARG 1 noiseParameters + ARG 2 slopedCheese METHOD yLimitedInterpolatable (Lnet/minecraft/world/level/levelgen/DensityFunction;Lnet/minecraft/world/level/levelgen/DensityFunction;III)Lnet/minecraft/world/level/levelgen/DensityFunction; ARG 0 input ARG 1 whenInRange diff --git a/data/net/minecraft/world/level/levelgen/SurfaceRules.mapping b/data/net/minecraft/world/level/levelgen/SurfaceRules.mapping index 9a5210d29..331b7b093 100644 --- a/data/net/minecraft/world/level/levelgen/SurfaceRules.mapping +++ b/data/net/minecraft/world/level/levelgen/SurfaceRules.mapping @@ -61,6 +61,7 @@ CLASS net/minecraft/world/level/levelgen/SurfaceRules ARG 3 chunk ARG 4 noiseChunk ARG 5 biomeGetter + ARG 6 biomeRegistry ARG 7 context METHOD blockCoordToSurfaceCell (I)I ARG 0 blockCoord diff --git a/data/net/minecraft/world/level/levelgen/WorldDimensions.mapping b/data/net/minecraft/world/level/levelgen/WorldDimensions.mapping index 50fcdc805..df4a36c84 100644 --- a/data/net/minecraft/world/level/levelgen/WorldDimensions.mapping +++ b/data/net/minecraft/world/level/levelgen/WorldDimensions.mapping @@ -23,8 +23,8 @@ CLASS net/minecraft/world/level/levelgen/WorldDimensions ARG 0 stemKeys METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD replaceOverworldGenerator (Lnet/minecraft/core/RegistryAccess;Lnet/minecraft/world/level/chunk/ChunkGenerator;)Lnet/minecraft/world/level/levelgen/WorldDimensions; - ARG 1 registryAccess + METHOD replaceOverworldGenerator (Lnet/minecraft/core/HolderLookup$Provider;Lnet/minecraft/world/level/chunk/ChunkGenerator;)Lnet/minecraft/world/level/levelgen/WorldDimensions; + ARG 1 registries ARG 2 chunkGenerator METHOD specialWorldProperty (Lnet/minecraft/core/Registry;)Lnet/minecraft/world/level/storage/PrimaryLevelData$SpecialWorldProperty; ARG 0 stemRegistry @@ -32,7 +32,7 @@ CLASS net/minecraft/world/level/levelgen/WorldDimensions ARG 0 stemMap ARG 1 dimensionType ARG 2 chunkGenerator - METHOD withOverworld (Lnet/minecraft/core/Registry;Ljava/util/Map;Lnet/minecraft/world/level/chunk/ChunkGenerator;)Ljava/util/Map; + METHOD withOverworld (Lnet/minecraft/core/HolderLookup;Ljava/util/Map;Lnet/minecraft/world/level/chunk/ChunkGenerator;)Ljava/util/Map; ARG 0 dimensionTypeRegistry - ARG 1 stemMap + ARG 1 dimensions ARG 2 chunkGenerator diff --git a/data/net/minecraft/world/level/levelgen/blending/BlendingData.mapping b/data/net/minecraft/world/level/levelgen/blending/BlendingData.mapping index 329f692e7..482661430 100644 --- a/data/net/minecraft/world/level/levelgen/blending/BlendingData.mapping +++ b/data/net/minecraft/world/level/levelgen/blending/BlendingData.mapping @@ -80,10 +80,15 @@ CLASS net/minecraft/world/level/levelgen/blending/BlendingData ARG 1 chunkX ARG 2 chunkZ ARG 3 oldNoiseGeneration - METHOD validateArraySize (Lnet/minecraft/world/level/levelgen/blending/BlendingData;)Lcom/mojang/serialization/DataResult; - ARG 0 blendingData + METHOD unpack (Lnet/minecraft/world/level/levelgen/blending/BlendingData$Packed;)Lnet/minecraft/world/level/levelgen/blending/BlendingData; + ARG 0 packed METHOD zeroIfNegative (I)I ARG 0 value + CLASS Packed + METHOD lambda$static$0 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD validateArraySize (Lnet/minecraft/world/level/levelgen/blending/BlendingData$Packed;)Lcom/mojang/serialization/DataResult; + ARG 0 packed CLASS BiomeConsumer METHOD consume (IILnet/minecraft/core/Holder;)V ARG 1 x diff --git a/data/net/minecraft/world/level/levelgen/feature/AbstractHugeMushroomFeature.mapping b/data/net/minecraft/world/level/levelgen/feature/AbstractHugeMushroomFeature.mapping index f3989b6e3..8268eef73 100644 --- a/data/net/minecraft/world/level/levelgen/feature/AbstractHugeMushroomFeature.mapping +++ b/data/net/minecraft/world/level/levelgen/feature/AbstractHugeMushroomFeature.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/world/level/levelgen/feature/AbstractHugeMushroomFeature METHOD getTreeHeight (Lnet/minecraft/util/RandomSource;)I ARG 1 random METHOD getTreeRadiusForHeight (IIII)I + ARG 1 unused ARG 2 height ARG 3 foliageRadius ARG 4 y diff --git a/data/net/minecraft/world/level/levelgen/feature/treedecorators/CreakingHeartDecorator.mapping b/data/net/minecraft/world/level/levelgen/feature/treedecorators/CreakingHeartDecorator.mapping new file mode 100644 index 000000000..3ca48e42e --- /dev/null +++ b/data/net/minecraft/world/level/levelgen/feature/treedecorators/CreakingHeartDecorator.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/world/level/levelgen/feature/treedecorators/CreakingHeartDecorator + METHOD (F)V + ARG 1 probability + METHOD lambda$place$2 (Lnet/minecraft/world/level/levelgen/feature/treedecorators/TreeDecorator$Context;Lnet/minecraft/core/BlockPos;)Z + ARG 1 pos diff --git a/data/net/minecraft/world/level/levelgen/feature/treedecorators/PaleMossDecorator.mapping b/data/net/minecraft/world/level/levelgen/feature/treedecorators/PaleMossDecorator.mapping new file mode 100644 index 000000000..6963fdadc --- /dev/null +++ b/data/net/minecraft/world/level/levelgen/feature/treedecorators/PaleMossDecorator.mapping @@ -0,0 +1,24 @@ +CLASS net/minecraft/world/level/levelgen/feature/treedecorators/PaleMossDecorator + METHOD (FFF)V + ARG 1 leavesProbability + ARG 2 trunkProbability + ARG 3 groundProbability + METHOD addMossHanger (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/levelgen/feature/treedecorators/TreeDecorator$Context;)V + ARG 0 pos + ARG 1 context + METHOD lambda$place$4 (Lorg/apache/commons/lang3/mutable/Mutable;Lnet/minecraft/core/BlockPos;)V + ARG 1 pos + METHOD lambda$place$5 (Lnet/minecraft/core/Registry;)Ljava/util/Optional; + ARG 0 registry + METHOD lambda$place$7 (Lnet/minecraft/util/RandomSource;Lnet/minecraft/world/level/levelgen/feature/treedecorators/TreeDecorator$Context;Lnet/minecraft/core/BlockPos;)V + ARG 3 pos + METHOD lambda$place$8 (Lnet/minecraft/util/RandomSource;Lnet/minecraft/world/level/levelgen/feature/treedecorators/TreeDecorator$Context;Lnet/minecraft/core/BlockPos;)V + ARG 3 pos + METHOD lambda$static$0 (Lnet/minecraft/world/level/levelgen/feature/treedecorators/PaleMossDecorator;)Ljava/lang/Float; + ARG 0 decorator + METHOD lambda$static$1 (Lnet/minecraft/world/level/levelgen/feature/treedecorators/PaleMossDecorator;)Ljava/lang/Float; + ARG 0 decorator + METHOD lambda$static$2 (Lnet/minecraft/world/level/levelgen/feature/treedecorators/PaleMossDecorator;)Ljava/lang/Float; + ARG 0 decorator + METHOD lambda$static$3 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/data/net/minecraft/world/level/levelgen/feature/treedecorators/TreeDecorator.mapping b/data/net/minecraft/world/level/levelgen/feature/treedecorators/TreeDecorator.mapping index 598320ef6..3a50e5295 100644 --- a/data/net/minecraft/world/level/levelgen/feature/treedecorators/TreeDecorator.mapping +++ b/data/net/minecraft/world/level/levelgen/feature/treedecorators/TreeDecorator.mapping @@ -9,6 +9,9 @@ CLASS net/minecraft/world/level/levelgen/feature/treedecorators/TreeDecorator ARG 4 logs ARG 5 leaves ARG 6 roots + METHOD checkBlock (Lnet/minecraft/core/BlockPos;Ljava/util/function/Predicate;)Z + ARG 1 pos + ARG 2 predicate METHOD isAir (Lnet/minecraft/core/BlockPos;)Z ARG 1 pos METHOD placeVine (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/properties/BooleanProperty;)V diff --git a/data/net/minecraft/world/level/levelgen/placement/CarvingMaskPlacement.mapping b/data/net/minecraft/world/level/levelgen/placement/CarvingMaskPlacement.mapping deleted file mode 100644 index 3aa2469bf..000000000 --- a/data/net/minecraft/world/level/levelgen/placement/CarvingMaskPlacement.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS net/minecraft/world/level/levelgen/placement/CarvingMaskPlacement - METHOD (Lnet/minecraft/world/level/levelgen/GenerationStep$Carving;)V - ARG 1 step - METHOD forStep (Lnet/minecraft/world/level/levelgen/GenerationStep$Carving;)Lnet/minecraft/world/level/levelgen/placement/CarvingMaskPlacement; - ARG 0 step - METHOD lambda$static$0 (Lnet/minecraft/world/level/levelgen/placement/CarvingMaskPlacement;)Lnet/minecraft/world/level/levelgen/GenerationStep$Carving; - ARG 0 placement diff --git a/data/net/minecraft/world/level/levelgen/placement/PlacementContext.mapping b/data/net/minecraft/world/level/levelgen/placement/PlacementContext.mapping index 69f7c24c8..b248c5d31 100644 --- a/data/net/minecraft/world/level/levelgen/placement/PlacementContext.mapping +++ b/data/net/minecraft/world/level/levelgen/placement/PlacementContext.mapping @@ -5,9 +5,8 @@ CLASS net/minecraft/world/level/levelgen/placement/PlacementContext ARG 3 topFeature METHOD getBlockState (Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 pos - METHOD getCarvingMask (Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/world/level/levelgen/GenerationStep$Carving;)Lnet/minecraft/world/level/chunk/CarvingMask; + METHOD getCarvingMask (Lnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/world/level/chunk/CarvingMask; ARG 1 chunkPos - ARG 2 step METHOD getHeight (Lnet/minecraft/world/level/levelgen/Heightmap$Types;II)I ARG 1 heightmapType ARG 2 x diff --git a/data/net/minecraft/world/level/levelgen/presets/WorldPresets.mapping b/data/net/minecraft/world/level/levelgen/presets/WorldPresets.mapping index 92d3e1a9a..255465e93 100644 --- a/data/net/minecraft/world/level/levelgen/presets/WorldPresets.mapping +++ b/data/net/minecraft/world/level/levelgen/presets/WorldPresets.mapping @@ -1,12 +1,14 @@ CLASS net/minecraft/world/level/levelgen/presets/WorldPresets METHOD bootstrap (Lnet/minecraft/data/worldgen/BootstrapContext;)V ARG 0 context - METHOD createNormalWorldDimensions (Lnet/minecraft/core/RegistryAccess;)Lnet/minecraft/world/level/levelgen/WorldDimensions; - ARG 0 registry + METHOD createFlatWorldDimensions (Lnet/minecraft/core/HolderLookup$Provider;)Lnet/minecraft/world/level/levelgen/WorldDimensions; + ARG 0 registries + METHOD createNormalWorldDimensions (Lnet/minecraft/core/HolderLookup$Provider;)Lnet/minecraft/world/level/levelgen/WorldDimensions; + ARG 0 registries METHOD fromSettings (Lnet/minecraft/world/level/levelgen/WorldDimensions;)Ljava/util/Optional; ARG 0 worldDimensions - METHOD getNormalOverworld (Lnet/minecraft/core/RegistryAccess;)Lnet/minecraft/world/level/dimension/LevelStem; - ARG 0 registry + METHOD getNormalOverworld (Lnet/minecraft/core/HolderLookup$Provider;)Lnet/minecraft/world/level/dimension/LevelStem; + ARG 0 registries METHOD register (Ljava/lang/String;)Lnet/minecraft/resources/ResourceKey; ARG 0 name CLASS Bootstrap diff --git a/data/net/minecraft/world/level/levelgen/structure/pools/JigsawPlacement.mapping b/data/net/minecraft/world/level/levelgen/structure/pools/JigsawPlacement.mapping index 26590ff71..1064c85ff 100644 --- a/data/net/minecraft/world/level/levelgen/structure/pools/JigsawPlacement.mapping +++ b/data/net/minecraft/world/level/levelgen/structure/pools/JigsawPlacement.mapping @@ -39,6 +39,10 @@ CLASS net/minecraft/world/level/levelgen/structure/pools/JigsawPlacement ARG 3 rotation ARG 4 structureTemplateManager ARG 5 random + METHOD lambda$addPieces$0 (Lnet/minecraft/core/Registry;Lnet/minecraft/world/level/levelgen/structure/pools/alias/PoolAliasLookup;Lnet/minecraft/resources/ResourceKey;)Ljava/util/Optional; + ARG 2 key + METHOD lambda$addPieces$2 (Lnet/minecraft/world/level/levelgen/structure/PoolElementStructurePiece;IIIILnet/minecraft/world/level/LevelHeightAccessor;Lnet/minecraft/world/level/levelgen/structure/pools/DimensionPadding;ILnet/minecraft/world/level/levelgen/structure/BoundingBox;Lnet/minecraft/world/level/levelgen/structure/Structure$GenerationContext;ZLnet/minecraft/world/level/chunk/ChunkGenerator;Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplateManager;Lnet/minecraft/world/level/levelgen/WorldgenRandom;Lnet/minecraft/core/Registry;Lnet/minecraft/world/level/levelgen/structure/pools/alias/PoolAliasLookup;Lnet/minecraft/world/level/levelgen/structure/templatesystem/LiquidSettings;Lnet/minecraft/world/level/levelgen/structure/pieces/StructurePiecesBuilder;)V + ARG 17 builder CLASS Placer METHOD (Lnet/minecraft/core/Registry;ILnet/minecraft/world/level/chunk/ChunkGenerator;Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplateManager;Ljava/util/List;Lnet/minecraft/util/RandomSource;)V ARG 1 pools @@ -47,8 +51,12 @@ CLASS net/minecraft/world/level/levelgen/structure/pools/JigsawPlacement ARG 4 structureTemplateManager ARG 5 pieces ARG 6 random - METHOD readPoolKey (Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate$StructureBlockInfo;Lnet/minecraft/world/level/levelgen/structure/pools/alias/PoolAliasLookup;)Lnet/minecraft/resources/ResourceKey; - ARG 0 blockInfo + METHOD lambda$tryPlacingChildren$0 (Lnet/minecraft/resources/ResourceKey;)Ljava/lang/String; + ARG 0 key + METHOD lambda$tryPlacingChildren$4 (Lnet/minecraft/world/level/levelgen/structure/BoundingBox;Lnet/minecraft/world/level/levelgen/structure/pools/alias/PoolAliasLookup;Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate$JigsawBlockInfo;)I + ARG 3 info + METHOD readPoolKey (Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate$JigsawBlockInfo;Lnet/minecraft/world/level/levelgen/structure/pools/alias/PoolAliasLookup;)Lnet/minecraft/resources/ResourceKey; + ARG 0 jigsawBlockInfo ARG 1 aliasLookup METHOD tryPlacingChildren (Lnet/minecraft/world/level/levelgen/structure/PoolElementStructurePiece;Lorg/apache/commons/lang3/mutable/MutableObject;IZLnet/minecraft/world/level/LevelHeightAccessor;Lnet/minecraft/world/level/levelgen/RandomState;Lnet/minecraft/world/level/levelgen/structure/pools/alias/PoolAliasLookup;Lnet/minecraft/world/level/levelgen/structure/templatesystem/LiquidSettings;)V ARG 1 piece diff --git a/data/net/minecraft/world/level/levelgen/structure/structures/RuinedPortalStructure.mapping b/data/net/minecraft/world/level/levelgen/structure/structures/RuinedPortalStructure.mapping index f9aaa30f1..9cb26682b 100644 --- a/data/net/minecraft/world/level/levelgen/structure/structures/RuinedPortalStructure.mapping +++ b/data/net/minecraft/world/level/levelgen/structure/structures/RuinedPortalStructure.mapping @@ -19,11 +19,10 @@ CLASS net/minecraft/world/level/levelgen/structure/structures/RuinedPortalStruct ARG 0 random ARG 1 min ARG 2 max - METHOD isCold (Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Holder;)Z + METHOD isCold (Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Holder;I)Z ARG 0 pos ARG 1 biome - METHOD lambda$findGenerationPoint$2 (Lnet/minecraft/world/level/levelgen/structure/structures/RuinedPortalStructure$Setup;Lnet/minecraft/world/level/levelgen/structure/structures/RuinedPortalPiece$Properties;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/levelgen/structure/Structure$GenerationContext;Lnet/minecraft/world/level/levelgen/RandomState;Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate;Lnet/minecraft/world/level/block/Rotation;Lnet/minecraft/world/level/block/Mirror;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/levelgen/structure/pieces/StructurePiecesBuilder;)V - ARG 10 builder + ARG 2 seaLevel METHOD lambda$findSuitableY$3 (Lnet/minecraft/world/level/chunk/ChunkGenerator;Lnet/minecraft/world/level/LevelHeightAccessor;Lnet/minecraft/world/level/levelgen/RandomState;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/NoiseColumn; ARG 3 pos METHOD lambda$static$0 (Lnet/minecraft/world/level/levelgen/structure/structures/RuinedPortalStructure;)Ljava/util/List; diff --git a/data/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.mapping b/data/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.mapping index e7d10e477..a98c3894c 100644 --- a/data/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.mapping +++ b/data/net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate.mapping @@ -52,6 +52,12 @@ CLASS net/minecraft/world/level/levelgen/structure/templatesystem/StructureTempl METHOD getBoundingBox (Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructurePlaceSettings;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/levelgen/structure/BoundingBox; ARG 1 settings ARG 2 startPos + METHOD getJigsaws (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Rotation;)Ljava/util/List; + ARG 1 pos + ARG 2 rotation + METHOD getJointType (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/block/entity/JigsawBlockEntity$JointType; + ARG 0 tag + ARG 1 state METHOD getSize (Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/core/Vec3i; ARG 1 rotation METHOD getZeroPositionWithTransform (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Mirror;Lnet/minecraft/world/level/block/Rotation;)Lnet/minecraft/core/BlockPos; @@ -64,8 +70,21 @@ CLASS net/minecraft/world/level/levelgen/structure/templatesystem/StructureTempl ARG 2 rotation ARG 3 sizeX ARG 4 sizeZ + METHOD lambda$buildInfoList$0 (Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate$StructureBlockInfo;)I + ARG 0 structureBlockInfo + METHOD lambda$buildInfoList$1 (Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate$StructureBlockInfo;)I + ARG 0 structureBlockInfo + METHOD lambda$buildInfoList$2 (Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate$StructureBlockInfo;)I + ARG 0 structureBlockInfo METHOD lambda$fillEntityList$3 (Lnet/minecraft/world/entity/Entity;)Z ARG 0 entity + METHOD lambda$placeEntities$5 (Lnet/minecraft/world/level/block/Rotation;Lnet/minecraft/world/level/block/Mirror;Lnet/minecraft/world/phys/Vec3;ZLnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/entity/Entity;)V + ARG 5 entity + METHOD lambda$updateShapeAtEdge$4 (Lnet/minecraft/core/BlockPos$MutableBlockPos;IIILnet/minecraft/core/BlockPos$MutableBlockPos;Lnet/minecraft/world/level/LevelAccessor;ILnet/minecraft/core/Direction;III)V + ARG 7 direction + ARG 8 faceX + ARG 9 faceY + ARG 10 faceZ METHOD load (Lnet/minecraft/core/HolderGetter;Lnet/minecraft/nbt/CompoundTag;)V ARG 1 blockGetter ARG 2 tag @@ -129,6 +148,8 @@ CLASS net/minecraft/world/level/levelgen/structure/templatesystem/StructureTempl ARG 1 blocks METHOD blocks (Lnet/minecraft/world/level/block/Block;)Ljava/util/List; ARG 1 block + METHOD lambda$blocks$0 (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate$StructureBlockInfo;)Z + ARG 1 structureBlockInfo CLASS SimplePalette METHOD addMapping (Lnet/minecraft/world/level/block/state/BlockState;I)V ARG 1 state @@ -137,6 +158,11 @@ CLASS net/minecraft/world/level/levelgen/structure/templatesystem/StructureTempl ARG 1 state METHOD stateFor (I)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 id + CLASS JigsawBlockInfo + METHOD of (Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate$StructureBlockInfo;)Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate$JigsawBlockInfo; + ARG 0 structureBlockInfo + METHOD withInfo (Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate$StructureBlockInfo;)Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate$JigsawBlockInfo; + ARG 1 info CLASS StructureBlockInfo METHOD (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/nbt/CompoundTag;)V ARG 1 pos diff --git a/data/net/minecraft/world/level/lighting/ChunkSkyLightSources.mapping b/data/net/minecraft/world/level/lighting/ChunkSkyLightSources.mapping index dd7996b38..694adbcdd 100644 --- a/data/net/minecraft/world/level/lighting/ChunkSkyLightSources.mapping +++ b/data/net/minecraft/world/level/lighting/ChunkSkyLightSources.mapping @@ -24,12 +24,9 @@ CLASS net/minecraft/world/level/lighting/ChunkSkyLightSources METHOD index (II)I ARG 0 x ARG 1 z - METHOD isEdgeOccluded (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Z - ARG 0 level - ARG 1 pos1 - ARG 2 state1 - ARG 3 pos2 - ARG 4 state2 + METHOD isEdgeOccluded (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;)Z + ARG 0 state1 + ARG 1 state2 METHOD set (II)V ARG 1 index ARG 2 value diff --git a/data/net/minecraft/world/level/lighting/LayerLightSectionStorage.mapping b/data/net/minecraft/world/level/lighting/LayerLightSectionStorage.mapping index 4ffa6d4fd..d96524895 100644 --- a/data/net/minecraft/world/level/lighting/LayerLightSectionStorage.mapping +++ b/data/net/minecraft/world/level/lighting/LayerLightSectionStorage.mapping @@ -27,6 +27,8 @@ CLASS net/minecraft/world/level/lighting/LayerLightSectionStorage ARG 1 levelPos METHOD initializeSection (J)V ARG 1 sectionPos + METHOD lightOnInColumn (J)Z + ARG 1 columnPos METHOD lightOnInSection (J)Z ARG 1 sectionPos METHOD markNewInconsistencies (Lnet/minecraft/world/level/lighting/LightEngine;)V diff --git a/data/net/minecraft/world/level/lighting/LevelLightEngine.mapping b/data/net/minecraft/world/level/lighting/LevelLightEngine.mapping index 208fe7fc2..66406e0df 100644 --- a/data/net/minecraft/world/level/lighting/LevelLightEngine.mapping +++ b/data/net/minecraft/world/level/lighting/LevelLightEngine.mapping @@ -14,8 +14,8 @@ CLASS net/minecraft/world/level/lighting/LevelLightEngine METHOD getRawBrightness (Lnet/minecraft/core/BlockPos;I)I ARG 1 blockPos ARG 2 amount - METHOD lightOnInSection (Lnet/minecraft/core/SectionPos;)Z - ARG 1 sectionPos + METHOD lightOnInColumn (J)Z + ARG 1 columnPos METHOD queueSectionData (Lnet/minecraft/world/level/LightLayer;Lnet/minecraft/core/SectionPos;Lnet/minecraft/world/level/chunk/DataLayer;)V ARG 1 lightLayer ARG 2 sectionPos diff --git a/data/net/minecraft/world/level/lighting/LightEngine.mapping b/data/net/minecraft/world/level/lighting/LightEngine.mapping index 246d37f2c..2c3e61b90 100644 --- a/data/net/minecraft/world/level/lighting/LightEngine.mapping +++ b/data/net/minecraft/world/level/lighting/LightEngine.mapping @@ -17,33 +17,21 @@ CLASS net/minecraft/world/level/lighting/LightEngine ARG 1 sectionPos METHOD getDebugSectionType (J)Lnet/minecraft/world/level/lighting/LayerLightSectionStorage$SectionType; ARG 1 sectionPos - METHOD getLightBlockInto (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction;I)I - ARG 0 level - ARG 1 state1 - ARG 2 pos1 - ARG 3 state2 - ARG 4 pos2 - ARG 5 direction - ARG 6 defaultReturnValue - METHOD getOcclusionShape (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;)Lnet/minecraft/world/phys/shapes/VoxelShape; - ARG 0 level - ARG 1 pos - ARG 2 state - ARG 3 direction - METHOD getOcclusionShape (Lnet/minecraft/world/level/block/state/BlockState;JLnet/minecraft/core/Direction;)Lnet/minecraft/world/phys/shapes/VoxelShape; - ARG 1 state - ARG 2 pos - ARG 4 direction - METHOD getOpacity (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;)I + METHOD getLightBlockInto (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;I)I + ARG 0 state1 + ARG 1 state2 + ARG 2 direction + ARG 3 defaultReturnValue + METHOD getOcclusionShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;)Lnet/minecraft/world/phys/shapes/VoxelShape; + ARG 0 state + ARG 1 direction + METHOD getOpacity (Lnet/minecraft/world/level/block/state/BlockState;)I ARG 1 state - ARG 2 pos METHOD getState (Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; ARG 1 pos - METHOD hasDifferentLightProperties (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;)Z - ARG 0 level - ARG 1 pos - ARG 2 state1 - ARG 3 state2 + METHOD hasDifferentLightProperties (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;)Z + ARG 0 state1 + ARG 1 state2 METHOD isEmptyShape (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 0 state METHOD propagateDecrease (JJ)V @@ -59,12 +47,10 @@ CLASS net/minecraft/world/level/lighting/LightEngine METHOD retainData (Lnet/minecraft/world/level/ChunkPos;Z)V ARG 1 chunkPos ARG 2 retainData - METHOD shapeOccludes (JLnet/minecraft/world/level/block/state/BlockState;JLnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;)Z - ARG 1 packedPos1 - ARG 3 state1 - ARG 4 packedPos2 - ARG 6 state2 - ARG 7 direction + METHOD shapeOccludes (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;)Z + ARG 1 state1 + ARG 2 state2 + ARG 3 direction CLASS QueueEntry METHOD decreaseAllDirections (I)J ARG 0 level diff --git a/data/net/minecraft/world/level/material/FlowingFluid.mapping b/data/net/minecraft/world/level/material/FlowingFluid.mapping index 702a2d656..2994badc2 100644 --- a/data/net/minecraft/world/level/material/FlowingFluid.mapping +++ b/data/net/minecraft/world/level/material/FlowingFluid.mapping @@ -5,13 +5,28 @@ CLASS net/minecraft/world/level/material/FlowingFluid ARG 1 level ARG 2 pos ARG 3 state - METHOD canConvertToSource (Lnet/minecraft/world/level/Level;)Z + METHOD canConvertToSource (Lnet/minecraft/server/level/ServerLevel;)Z ARG 1 level + METHOD canHoldAnyFluid (Lnet/minecraft/world/level/block/state/BlockState;)Z + ARG 0 state METHOD canHoldFluid (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/material/Fluid;)Z + ARG 0 level + ARG 1 pos + ARG 2 state + ARG 3 fluid + METHOD canHoldSpecificFluid (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/material/Fluid;)Z + ARG 0 level + ARG 1 pos + ARG 2 state + ARG 3 fluid + METHOD canMaybePassThrough (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/material/FluidState;)Z ARG 1 level ARG 2 pos ARG 3 state - ARG 4 fluid + ARG 4 direction + ARG 5 spreadPos + ARG 6 spreadState + ARG 7 fluidState METHOD canPassThrough (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/world/level/material/Fluid;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/material/FluidState;)Z ARG 1 level ARG 2 fluid @@ -22,26 +37,14 @@ CLASS net/minecraft/world/level/material/FlowingFluid ARG 7 spreadState ARG 8 fluidState METHOD canPassThroughWall (Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Z - ARG 1 direction - ARG 2 level - ARG 3 pos - ARG 4 state - ARG 5 spreadPos - ARG 6 spreadState - METHOD canSpreadTo (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/material/FluidState;Lnet/minecraft/world/level/material/Fluid;)Z + ARG 0 direction ARG 1 level - ARG 2 fromPos - ARG 3 fromBlockState - ARG 4 direction - ARG 5 toPos - ARG 6 toBlockState - ARG 7 toFluidState - ARG 8 fluid + ARG 2 pos + ARG 3 state + ARG 4 spreadPos + ARG 5 spreadState METHOD createFluidStateDefinition (Lnet/minecraft/world/level/block/state/StateDefinition$Builder;)V ARG 1 builder - METHOD getCacheKey (Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;)S - ARG 0 sourcePos - ARG 1 spreadPos METHOD getDropOff (Lnet/minecraft/world/level/LevelReader;)I ARG 1 level METHOD getFlow (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/material/FluidState;)Lnet/minecraft/world/phys/Vec3; @@ -53,24 +56,22 @@ CLASS net/minecraft/world/level/material/FlowingFluid ARG 2 falling METHOD getLegacyLevel (Lnet/minecraft/world/level/material/FluidState;)I ARG 0 state - METHOD getNewLiquid (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/material/FluidState; + METHOD getNewLiquid (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/material/FluidState; ARG 1 level ARG 2 pos - ARG 3 blockState - METHOD getSlopeDistance (Lnet/minecraft/world/level/LevelReader;Lnet/minecraft/core/BlockPos;ILnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Lit/unimi/dsi/fastutil/shorts/Short2ObjectMap;Lit/unimi/dsi/fastutil/shorts/Short2BooleanMap;)I + ARG 3 state + METHOD getSlopeDistance (Lnet/minecraft/world/level/LevelReader;Lnet/minecraft/core/BlockPos;ILnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/material/FlowingFluid$SpreadContext;)I ARG 1 level - ARG 2 spreadPos - ARG 3 distance + ARG 2 pos + ARG 3 depth ARG 4 direction - ARG 5 currentSpreadState - ARG 6 sourcePos - ARG 7 stateCache - ARG 8 waterHoleCache + ARG 5 state + ARG 6 spreadContext METHOD getSlopeFindDistance (Lnet/minecraft/world/level/LevelReader;)I ARG 1 level METHOD getSource (Z)Lnet/minecraft/world/level/material/FluidState; ARG 1 falling - METHOD getSpread (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Ljava/util/Map; + METHOD getSpread (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Ljava/util/Map; ARG 1 level ARG 2 pos ARG 3 state @@ -89,46 +90,45 @@ CLASS net/minecraft/world/level/material/FlowingFluid ARG 3 side METHOD isSourceBlockOfThisType (Lnet/minecraft/world/level/material/FluidState;)Z ARG 1 state - METHOD isWaterHole (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/world/level/material/Fluid;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Z + METHOD isWaterHole (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 1 level - ARG 2 fluid - ARG 3 pos - ARG 4 state - ARG 5 spreadPos - ARG 6 spreadState - METHOD lambda$getShape$5 (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/material/FluidState;)Lnet/minecraft/world/phys/shapes/VoxelShape; - ARG 2 stateKey - METHOD lambda$getSlopeDistance$1 (Lnet/minecraft/world/level/LevelReader;Lnet/minecraft/core/BlockPos;S)Lcom/mojang/datafixers/util/Pair; - ARG 2 key - METHOD lambda$getSlopeDistance$2 (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/LevelReader;Lnet/minecraft/world/level/block/state/BlockState;S)Z - ARG 4 key - METHOD lambda$getSpread$3 (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;S)Lcom/mojang/datafixers/util/Pair; - ARG 2 key - METHOD lambda$getSpread$4 (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;S)Z - ARG 5 key + ARG 2 pos + ARG 3 state + ARG 4 belowPos + ARG 5 belowState METHOD sourceNeighborCount (Lnet/minecraft/world/level/LevelReader;Lnet/minecraft/core/BlockPos;)I COMMENT Returns the number of immediately adjacent source blocks of the same fluid that lie on the horizontal plane. ARG 1 level ARG 2 pos - METHOD spread (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/material/FluidState;)V + METHOD spread (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/material/FluidState;)V ARG 1 level ARG 2 pos - ARG 3 state + ARG 3 blockState + ARG 4 fluidState METHOD spreadTo (Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/material/FluidState;)V ARG 1 level ARG 2 pos ARG 3 blockState ARG 4 direction ARG 5 fluidState - METHOD spreadToSides (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/material/FluidState;Lnet/minecraft/world/level/block/state/BlockState;)V + METHOD spreadToSides (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/material/FluidState;Lnet/minecraft/world/level/block/state/BlockState;)V ARG 1 level ARG 2 pos ARG 3 fluidState ARG 4 blockState - METHOD tick (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/material/FluidState;)V - ARG 1 level - ARG 2 pos - ARG 3 state CLASS 1 METHOD rehash (I)V ARG 1 newSize + CLASS SpreadContext + METHOD (Lnet/minecraft/world/level/material/FlowingFluid;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)V + ARG 2 level + ARG 3 origin + METHOD getBlockState (Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState; + ARG 1 pos + METHOD getBlockState (Lnet/minecraft/core/BlockPos;S)Lnet/minecraft/world/level/block/state/BlockState; + ARG 1 pos + ARG 2 cacheKey + METHOD getCacheKey (Lnet/minecraft/core/BlockPos;)S + ARG 1 pos + METHOD isHole (Lnet/minecraft/core/BlockPos;)Z + ARG 1 pos diff --git a/data/net/minecraft/world/level/material/Fluid.mapping b/data/net/minecraft/world/level/material/Fluid.mapping index 370a304b3..29476dd99 100644 --- a/data/net/minecraft/world/level/material/Fluid.mapping +++ b/data/net/minecraft/world/level/material/Fluid.mapping @@ -38,14 +38,15 @@ CLASS net/minecraft/world/level/material/Fluid ARG 1 fluid METHOD isSource (Lnet/minecraft/world/level/material/FluidState;)Z ARG 1 state - METHOD randomTick (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/material/FluidState;Lnet/minecraft/util/RandomSource;)V + METHOD randomTick (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/material/FluidState;Lnet/minecraft/util/RandomSource;)V ARG 1 level ARG 2 pos ARG 3 state ARG 4 random METHOD registerDefaultState (Lnet/minecraft/world/level/material/FluidState;)V ARG 1 state - METHOD tick (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/material/FluidState;)V + METHOD tick (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/material/FluidState;)V ARG 1 level ARG 2 pos - ARG 3 state + ARG 3 blockState + ARG 4 fluidState diff --git a/data/net/minecraft/world/level/material/FluidState.mapping b/data/net/minecraft/world/level/material/FluidState.mapping index b1eef83d2..370f2f6da 100644 --- a/data/net/minecraft/world/level/material/FluidState.mapping +++ b/data/net/minecraft/world/level/material/FluidState.mapping @@ -29,13 +29,14 @@ CLASS net/minecraft/world/level/material/FluidState ARG 1 fluid METHOD isSourceOfType (Lnet/minecraft/world/level/material/Fluid;)Z ARG 1 fluid - METHOD randomTick (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)V + METHOD randomTick (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/util/RandomSource;)V ARG 1 level ARG 2 pos ARG 3 random METHOD shouldRenderBackwardUpFace (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)Z ARG 1 level ARG 2 pos - METHOD tick (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)V + METHOD tick (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)V ARG 1 level ARG 2 pos + ARG 3 state diff --git a/data/net/minecraft/world/level/material/MapColor.mapping b/data/net/minecraft/world/level/material/MapColor.mapping index d12de6cfa..7683e8f66 100644 --- a/data/net/minecraft/world/level/material/MapColor.mapping +++ b/data/net/minecraft/world/level/material/MapColor.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/world/level/material/MapColor ARG 0 id METHOD byIdUnsafe (I)Lnet/minecraft/world/level/material/MapColor; ARG 0 id - METHOD calculateRGBColor (Lnet/minecraft/world/level/material/MapColor$Brightness;)I + METHOD calculateARGBColor (Lnet/minecraft/world/level/material/MapColor$Brightness;)I ARG 1 brightness METHOD getColorFromPackedId (I)I ARG 0 packedId diff --git a/data/net/minecraft/world/level/pathfinder/PathFinder.mapping b/data/net/minecraft/world/level/pathfinder/PathFinder.mapping index 762642e3d..e0b4b7827 100644 --- a/data/net/minecraft/world/level/pathfinder/PathFinder.mapping +++ b/data/net/minecraft/world/level/pathfinder/PathFinder.mapping @@ -5,13 +5,6 @@ CLASS net/minecraft/world/level/pathfinder/PathFinder METHOD distance (Lnet/minecraft/world/level/pathfinder/Node;Lnet/minecraft/world/level/pathfinder/Node;)F ARG 1 first ARG 2 second - METHOD findPath (Lnet/minecraft/util/profiling/ProfilerFiller;Lnet/minecraft/world/level/pathfinder/Node;Ljava/util/Map;FIF)Lnet/minecraft/world/level/pathfinder/Path; - ARG 1 profiler - ARG 2 node - ARG 3 targetPos - ARG 4 maxRange - ARG 5 accuracy - ARG 6 searchDepthMultiplier METHOD findPath (Lnet/minecraft/world/level/PathNavigationRegion;Lnet/minecraft/world/entity/Mob;Ljava/util/Set;FIF)Lnet/minecraft/world/level/pathfinder/Path; COMMENT Finds a path to one of the specified positions and post-processes it or returns null if no path could be found within given accuracy ARG 1 region @@ -20,6 +13,13 @@ CLASS net/minecraft/world/level/pathfinder/PathFinder ARG 4 maxRange ARG 5 accuracy ARG 6 searchDepthMultiplier + METHOD findPath (Lnet/minecraft/world/level/pathfinder/Node;Ljava/util/Map;FIF)Lnet/minecraft/world/level/pathfinder/Path; + COMMENT Finds a path to one of the specified positions and post-processes it or returns null if no path could be found within given accuracy + ARG 1 node + ARG 2 targetPositions + ARG 3 maxRange + ARG 4 accuracy + ARG 5 searchDepthMultiplier METHOD getBestH (Lnet/minecraft/world/level/pathfinder/Node;Ljava/util/Set;)F ARG 1 node ARG 2 targets @@ -34,3 +34,5 @@ CLASS net/minecraft/world/level/pathfinder/PathFinder ARG 1 point ARG 2 targetPos ARG 3 reachesTarget + METHOD setMaxVisitedNodes (I)V + ARG 1 maxVisitedNodes diff --git a/data/net/minecraft/world/level/portal/DimensionTransition.mapping b/data/net/minecraft/world/level/portal/DimensionTransition.mapping deleted file mode 100644 index 42068c7f9..000000000 --- a/data/net/minecraft/world/level/portal/DimensionTransition.mapping +++ /dev/null @@ -1,28 +0,0 @@ -CLASS net/minecraft/world/level/portal/DimensionTransition - METHOD (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/level/portal/DimensionTransition$PostDimensionTransition;)V - ARG 1 newLevel - ARG 2 entity - ARG 3 postDimensionTransition - METHOD (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/Vec3;FFLnet/minecraft/world/level/portal/DimensionTransition$PostDimensionTransition;)V - ARG 1 newLevel - ARG 2 pos - ARG 3 speed - ARG 4 yRot - ARG 5 xRot - ARG 6 postDimensionTransition - METHOD findAdjustedSharedSpawnPos (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/phys/Vec3; - ARG 0 newLevel - ARG 1 entity - METHOD missingRespawnBlock (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/level/portal/DimensionTransition$PostDimensionTransition;)Lnet/minecraft/world/level/portal/DimensionTransition; - ARG 0 level - ARG 1 entity - ARG 2 postDimensionTransition - METHOD placePortalTicket (Lnet/minecraft/world/entity/Entity;)V - ARG 0 entity - METHOD playPortalSound (Lnet/minecraft/world/entity/Entity;)V - ARG 0 entity - CLASS PostDimensionTransition - METHOD onTransition (Lnet/minecraft/world/entity/Entity;)V - ARG 1 entity - METHOD then (Lnet/minecraft/world/level/portal/DimensionTransition$PostDimensionTransition;)Lnet/minecraft/world/level/portal/DimensionTransition$PostDimensionTransition; - ARG 1 transition diff --git a/data/net/minecraft/world/level/portal/PortalShape.mapping b/data/net/minecraft/world/level/portal/PortalShape.mapping index 62592343a..a2a900bb9 100644 --- a/data/net/minecraft/world/level/portal/PortalShape.mapping +++ b/data/net/minecraft/world/level/portal/PortalShape.mapping @@ -1,10 +1,31 @@ CLASS net/minecraft/world/level/portal/PortalShape - METHOD (Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction$Axis;)V - ARG 1 level - ARG 2 bottomLeft - ARG 3 axis - METHOD calculateBottomLeft (Lnet/minecraft/core/BlockPos;)Lnet/minecraft/core/BlockPos; + METHOD (Lnet/minecraft/core/Direction$Axis;ILnet/minecraft/core/Direction;Lnet/minecraft/core/BlockPos;II)V + ARG 1 axis + ARG 2 numPortalBlocks + ARG 3 rightDir + ARG 4 bottomLeft + ARG 5 width + ARG 6 height + METHOD calculateBottomLeft (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/Direction;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/core/BlockPos; + ARG 0 level + ARG 1 direction + ARG 2 pos + METHOD calculateHeight (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction;ILorg/apache/commons/lang3/mutable/MutableInt;)I + ARG 0 level ARG 1 pos + ARG 2 direction + ARG 3 width + ARG 4 portalBlocks + METHOD calculateWidth (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction;)I + ARG 0 level + ARG 1 bottomLeft + ARG 2 direction + METHOD createPortalBlocks (Lnet/minecraft/world/level/LevelAccessor;)V + ARG 1 level + METHOD findAnyShape (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction$Axis;)Lnet/minecraft/world/level/portal/PortalShape; + ARG 0 level + ARG 1 bottomLeft + ARG 2 axis METHOD findCollisionFreePosition (Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/entity/EntityDimensions;)Lnet/minecraft/world/phys/Vec3; ARG 0 pos ARG 1 level @@ -19,22 +40,32 @@ CLASS net/minecraft/world/level/portal/PortalShape ARG 1 bottomLeft ARG 2 predicate ARG 3 axis - METHOD getDistanceUntilEdgeAboveFrame (Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction;)I + METHOD getDistanceUntilEdgeAboveFrame (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction;)I + ARG 0 level ARG 1 pos ARG 2 direction - METHOD getDistanceUntilTop (Lnet/minecraft/core/BlockPos$MutableBlockPos;)I + METHOD getDistanceUntilTop (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction;Lnet/minecraft/core/BlockPos$MutableBlockPos;ILorg/apache/commons/lang3/mutable/MutableInt;)I + ARG 0 level ARG 1 pos + ARG 2 direction + ARG 3 checkPos + ARG 4 width + ARG 5 portalBlocks METHOD getRelativePosition (Lnet/minecraft/BlockUtil$FoundRectangle;Lnet/minecraft/core/Direction$Axis;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/entity/EntityDimensions;)Lnet/minecraft/world/phys/Vec3; ARG 0 foundRectangle ARG 1 axis ARG 2 pos ARG 3 entityDimensions - METHOD hasTopFrame (Lnet/minecraft/core/BlockPos$MutableBlockPos;I)Z + METHOD hasTopFrame (Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/Direction;Lnet/minecraft/core/BlockPos$MutableBlockPos;II)Z + ARG 0 level ARG 1 pos - ARG 2 distanceToTop + ARG 2 direction + ARG 3 checkPos + ARG 4 width + ARG 5 distanceUntilTop METHOD isEmpty (Lnet/minecraft/world/level/block/state/BlockState;)Z ARG 0 state - METHOD lambda$createPortalBlocks$2 (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;)V + METHOD lambda$createPortalBlocks$2 (Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;)V ARG 2 pos METHOD lambda$findCollisionFreePosition$3 (DLnet/minecraft/world/phys/Vec3;)Lnet/minecraft/world/phys/Vec3; ARG 2 freePos diff --git a/data/net/minecraft/world/level/portal/TeleportTransition.mapping b/data/net/minecraft/world/level/portal/TeleportTransition.mapping new file mode 100644 index 000000000..76db40db4 --- /dev/null +++ b/data/net/minecraft/world/level/portal/TeleportTransition.mapping @@ -0,0 +1,45 @@ +CLASS net/minecraft/world/level/portal/TeleportTransition + METHOD (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/level/portal/TeleportTransition$PostTeleportTransition;)V + ARG 1 level + ARG 2 entity + ARG 3 postTeleportTransition + METHOD (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/Vec3;FFLjava/util/Set;Lnet/minecraft/world/level/portal/TeleportTransition$PostTeleportTransition;)V + ARG 1 newLevel + ARG 2 position + ARG 3 deltaMovement + ARG 4 yRot + ARG 5 xRot + ARG 6 relatives + ARG 7 postTeleportTransition + METHOD (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/Vec3;FFLnet/minecraft/world/level/portal/TeleportTransition$PostTeleportTransition;)V + ARG 1 newLevel + ARG 2 position + ARG 3 deltaMovement + ARG 4 yRot + ARG 5 xRot + ARG 6 postTeleportTransition + METHOD findAdjustedSharedSpawnPos (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/phys/Vec3; + ARG 0 level + ARG 1 entity + METHOD lambda$static$0 (Lnet/minecraft/world/entity/Entity;)V + ARG 0 entity + METHOD missingRespawnBlock (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/level/portal/TeleportTransition$PostTeleportTransition;)Lnet/minecraft/world/level/portal/TeleportTransition; + ARG 0 level + ARG 1 entity + ARG 2 postTeleportTransition + METHOD placePortalTicket (Lnet/minecraft/world/entity/Entity;)V + ARG 0 entity + METHOD playPortalSound (Lnet/minecraft/world/entity/Entity;)V + ARG 0 entity + METHOD withPosition (Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/world/level/portal/TeleportTransition; + ARG 1 position + METHOD withRotation (FF)Lnet/minecraft/world/level/portal/TeleportTransition; + ARG 1 yRot + ARG 2 xRot + CLASS PostTeleportTransition + METHOD lambda$then$0 (Lnet/minecraft/world/level/portal/TeleportTransition$PostTeleportTransition;Lnet/minecraft/world/entity/Entity;)V + ARG 2 entity + METHOD onTransition (Lnet/minecraft/world/entity/Entity;)V + ARG 1 entity + METHOD then (Lnet/minecraft/world/level/portal/TeleportTransition$PostTeleportTransition;)Lnet/minecraft/world/level/portal/TeleportTransition$PostTeleportTransition; + ARG 1 postTeleportTransition diff --git a/data/net/minecraft/world/level/redstone/CollectingNeighborUpdater.mapping b/data/net/minecraft/world/level/redstone/CollectingNeighborUpdater.mapping index 8d5a66536..45844152f 100644 --- a/data/net/minecraft/world/level/redstone/CollectingNeighborUpdater.mapping +++ b/data/net/minecraft/world/level/redstone/CollectingNeighborUpdater.mapping @@ -9,7 +9,8 @@ CLASS net/minecraft/world/level/redstone/CollectingNeighborUpdater METHOD runNext (Lnet/minecraft/world/level/Level;)Z ARG 1 level CLASS MultiNeighborUpdate - METHOD (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/Direction;)V + METHOD (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/redstone/Orientation;Lnet/minecraft/core/Direction;)V ARG 1 sourcePos ARG 2 sourceBlock - ARG 3 skipDirection + ARG 3 orientation + ARG 4 skipDirection diff --git a/data/net/minecraft/world/level/redstone/DefaultRedstoneWireEvaluator.mapping b/data/net/minecraft/world/level/redstone/DefaultRedstoneWireEvaluator.mapping new file mode 100644 index 000000000..ce43da4a0 --- /dev/null +++ b/data/net/minecraft/world/level/redstone/DefaultRedstoneWireEvaluator.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/world/level/redstone/DefaultRedstoneWireEvaluator + METHOD calculateTargetStrength (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)I + ARG 1 level + ARG 2 pos diff --git a/data/net/minecraft/world/level/redstone/ExperimentalRedstoneUtils.mapping b/data/net/minecraft/world/level/redstone/ExperimentalRedstoneUtils.mapping new file mode 100644 index 000000000..53ed4faf0 --- /dev/null +++ b/data/net/minecraft/world/level/redstone/ExperimentalRedstoneUtils.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/world/level/redstone/ExperimentalRedstoneUtils + METHOD initialOrientation (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/Direction;Lnet/minecraft/core/Direction;)Lnet/minecraft/world/level/redstone/Orientation; + ARG 0 level + ARG 1 front + ARG 2 up + METHOD withFront (Lnet/minecraft/world/level/redstone/Orientation;Lnet/minecraft/core/Direction;)Lnet/minecraft/world/level/redstone/Orientation; + ARG 0 orientation + ARG 1 direction diff --git a/data/net/minecraft/world/level/redstone/ExperimentalRedstoneWireEvaluator.mapping b/data/net/minecraft/world/level/redstone/ExperimentalRedstoneWireEvaluator.mapping new file mode 100644 index 000000000..2d0a3a55a --- /dev/null +++ b/data/net/minecraft/world/level/redstone/ExperimentalRedstoneWireEvaluator.mapping @@ -0,0 +1,36 @@ +CLASS net/minecraft/world/level/redstone/ExperimentalRedstoneWireEvaluator + METHOD calculateCurrentChanges (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/redstone/Orientation;)V + ARG 1 level + ARG 2 pos + ARG 3 orientation + METHOD causeNeighborUpdates (Lnet/minecraft/world/level/Level;)V + ARG 1 level + METHOD enqueueNeighborWire (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;ILnet/minecraft/world/level/redstone/Orientation;Z)V + ARG 1 level + ARG 2 pos + ARG 3 power + ARG 4 orientation + ARG 5 canTurnOff + METHOD getInitialOrientation (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/level/redstone/Orientation;)Lnet/minecraft/world/level/redstone/Orientation; + ARG 0 level + ARG 1 orientation + METHOD isConnected (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/Direction;)Z + ARG 0 state + ARG 1 direction + METHOD packOrientationAndPower (Lnet/minecraft/world/level/redstone/Orientation;I)I + ARG 0 orientation + ARG 1 power + METHOD propagateChangeToNeighbors (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;ILnet/minecraft/world/level/redstone/Orientation;Z)V + ARG 1 level + ARG 2 pos + ARG 3 power + ARG 4 orientation + ARG 5 canTurnOff + METHOD setPower (Lnet/minecraft/core/BlockPos;ILnet/minecraft/world/level/redstone/Orientation;)V + ARG 1 pos + ARG 2 power + ARG 3 orientation + METHOD unpackOrientation (I)Lnet/minecraft/world/level/redstone/Orientation; + ARG 0 data + METHOD unpackPower (I)I + ARG 0 data diff --git a/data/net/minecraft/world/level/redstone/NeighborUpdater.mapping b/data/net/minecraft/world/level/redstone/NeighborUpdater.mapping index 903daeb53..6bb801bfd 100644 --- a/data/net/minecraft/world/level/redstone/NeighborUpdater.mapping +++ b/data/net/minecraft/world/level/redstone/NeighborUpdater.mapping @@ -1,28 +1,28 @@ CLASS net/minecraft/world/level/redstone/NeighborUpdater - METHOD executeShapeUpdate (Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;II)V + METHOD executeShapeUpdate (Lnet/minecraft/world/level/LevelAccessor;Lnet/minecraft/core/Direction;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;II)V ARG 0 level ARG 1 direction - ARG 2 state - ARG 3 pos - ARG 4 neighborPos + ARG 2 pos + ARG 3 neighborPos + ARG 4 neighborState ARG 5 flags - ARG 6 recursionLevel - METHOD executeUpdate (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V + ARG 6 recursionLeft + METHOD executeUpdate (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/redstone/Orientation;Z)V ARG 0 level ARG 1 state ARG 2 pos ARG 3 neighborBlock - ARG 4 neighborPos + ARG 4 orientation ARG 5 movedByPiston - METHOD neighborChanged (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;)V + METHOD neighborChanged (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/redstone/Orientation;)V ARG 1 pos ARG 2 neighborBlock - ARG 3 neighborPos - METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/BlockPos;Z)V + ARG 3 orientation + METHOD neighborChanged (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/redstone/Orientation;Z)V ARG 1 state ARG 2 pos ARG 3 neighborBlock - ARG 4 neighborPos + ARG 4 orientation ARG 5 movedByPiston METHOD shapeUpdate (Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/BlockPos;II)V ARG 1 direction @@ -31,7 +31,8 @@ CLASS net/minecraft/world/level/redstone/NeighborUpdater ARG 4 neighborPos ARG 5 flags ARG 6 recursionLevel - METHOD updateNeighborsAtExceptFromFacing (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/Direction;)V + METHOD updateNeighborsAtExceptFromFacing (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/Block;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/redstone/Orientation;)V ARG 1 pos ARG 2 block ARG 3 facing + ARG 4 orientation diff --git a/data/net/minecraft/world/level/redstone/Orientation.mapping b/data/net/minecraft/world/level/redstone/Orientation.mapping new file mode 100644 index 000000000..89f195f01 --- /dev/null +++ b/data/net/minecraft/world/level/redstone/Orientation.mapping @@ -0,0 +1,33 @@ +CLASS net/minecraft/world/level/redstone/Orientation + METHOD (Lnet/minecraft/core/Direction;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/redstone/Orientation$SideBias;)V + ARG 1 up + ARG 2 front + ARG 3 sideBias + METHOD fromIndex (I)Lnet/minecraft/world/level/redstone/Orientation; + ARG 0 index + METHOD generateContext (Lnet/minecraft/world/level/redstone/Orientation;[Lnet/minecraft/world/level/redstone/Orientation;)Lnet/minecraft/world/level/redstone/Orientation; + ARG 0 start + ARG 1 output + METHOD generateIndex (Lnet/minecraft/core/Direction;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/redstone/Orientation$SideBias;)I + ARG 0 up + ARG 1 front + ARG 2 sideBias + METHOD of (Lnet/minecraft/core/Direction;Lnet/minecraft/core/Direction;Lnet/minecraft/world/level/redstone/Orientation$SideBias;)Lnet/minecraft/world/level/redstone/Orientation; + ARG 0 up + ARG 1 front + ARG 2 sideBias + METHOD random (Lnet/minecraft/util/RandomSource;)Lnet/minecraft/world/level/redstone/Orientation; + ARG 0 random + METHOD withFront (Lnet/minecraft/core/Direction;)Lnet/minecraft/world/level/redstone/Orientation; + ARG 1 front + METHOD withFrontAdjustSideBias (Lnet/minecraft/core/Direction;)Lnet/minecraft/world/level/redstone/Orientation; + ARG 1 front + METHOD withFrontPreserveUp (Lnet/minecraft/core/Direction;)Lnet/minecraft/world/level/redstone/Orientation; + ARG 1 front + METHOD withSideBias (Lnet/minecraft/world/level/redstone/Orientation$SideBias;)Lnet/minecraft/world/level/redstone/Orientation; + ARG 1 sideBias + METHOD withUp (Lnet/minecraft/core/Direction;)Lnet/minecraft/world/level/redstone/Orientation; + ARG 1 up + CLASS SideBias + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name diff --git a/data/net/minecraft/world/level/redstone/RedstoneWireEvaluator.mapping b/data/net/minecraft/world/level/redstone/RedstoneWireEvaluator.mapping new file mode 100644 index 000000000..78c2d1333 --- /dev/null +++ b/data/net/minecraft/world/level/redstone/RedstoneWireEvaluator.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/world/level/redstone/RedstoneWireEvaluator + METHOD (Lnet/minecraft/world/level/block/RedStoneWireBlock;)V + ARG 1 wireBlock + METHOD getBlockSignal (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)I + ARG 1 level + ARG 2 pos + METHOD getIncomingWireSignal (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;)I + ARG 1 level + ARG 2 pos + METHOD getWireSignal (Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)I + ARG 1 pos + ARG 2 state + METHOD updatePowerStrength (Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/redstone/Orientation;Z)V + ARG 1 level + ARG 2 pos + ARG 3 state + ARG 4 orientation + ARG 5 updateShape diff --git a/data/net/minecraft/world/level/saveddata/SavedData.mapping b/data/net/minecraft/world/level/saveddata/SavedData.mapping index 7d0a50e35..f7a4900f6 100644 --- a/data/net/minecraft/world/level/saveddata/SavedData.mapping +++ b/data/net/minecraft/world/level/saveddata/SavedData.mapping @@ -1,9 +1,8 @@ CLASS net/minecraft/world/level/saveddata/SavedData METHOD isDirty ()Z COMMENT Whether this {@code SavedData} needs saving to disk. - METHOD save (Ljava/io/File;Lnet/minecraft/core/HolderLookup$Provider;)V - ARG 1 file - ARG 2 registries + METHOD save (Lnet/minecraft/core/HolderLookup$Provider;)Lnet/minecraft/nbt/CompoundTag; + ARG 1 registries METHOD save (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/core/HolderLookup$Provider;)Lnet/minecraft/nbt/CompoundTag; ARG 1 tag ARG 2 registries diff --git a/data/net/minecraft/world/level/saveddata/maps/MapItemSavedData.mapping b/data/net/minecraft/world/level/saveddata/maps/MapItemSavedData.mapping index fbcbe3e4f..f374a4c4b 100644 --- a/data/net/minecraft/world/level/saveddata/maps/MapItemSavedData.mapping +++ b/data/net/minecraft/world/level/saveddata/maps/MapItemSavedData.mapping @@ -22,10 +22,21 @@ CLASS net/minecraft/world/level/saveddata/maps/MapItemSavedData ARG 1 pos ARG 2 type ARG 3 mapDecorationType + METHOD calculateDecorationLocationAndType (Lnet/minecraft/core/Holder;Lnet/minecraft/world/level/LevelAccessor;DFF)Lnet/minecraft/world/level/saveddata/maps/MapItemSavedData$MapDecorationLocation; + ARG 1 decorationType + ARG 2 level + ARG 3 yRot + ARG 5 x + ARG 6 z + METHOD calculateRotation (Lnet/minecraft/world/level/LevelAccessor;D)B + ARG 1 level + ARG 2 yRot METHOD checkBanners (Lnet/minecraft/world/level/BlockGetter;II)V ARG 1 reader ARG 2 x ARG 3 z + METHOD clampMapCoordinate (F)B + ARG 0 coord METHOD createForClient (BZLnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/level/saveddata/maps/MapItemSavedData; ARG 0 scale ARG 1 locked @@ -37,6 +48,9 @@ CLASS net/minecraft/world/level/saveddata/maps/MapItemSavedData ARG 5 trackingPosition ARG 6 unlimitedTracking ARG 7 dimension + METHOD decorationTypeForPlayerOutsideMap (FF)Lnet/minecraft/core/Holder; + ARG 1 x + ARG 2 z METHOD getFrameKey (I)Ljava/lang/String; ARG 0 entityId METHOD getHoldingPlayer (Lnet/minecraft/world/entity/player/Player;)Lnet/minecraft/world/level/saveddata/maps/MapItemSavedData$HoldingPlayer; @@ -44,13 +58,28 @@ CLASS net/minecraft/world/level/saveddata/maps/MapItemSavedData METHOD getUpdatePacket (Lnet/minecraft/world/level/saveddata/maps/MapId;Lnet/minecraft/world/entity/player/Player;)Lnet/minecraft/network/protocol/Packet; ARG 1 mapId ARG 2 player + METHOD hasMapInvisibilityItemEquipped (Lnet/minecraft/world/entity/player/Player;)Z + ARG 0 player + METHOD isInsideMap (FF)Z + ARG 0 x + ARG 1 z METHOD isTrackedCountOverLimit (I)Z ARG 1 trackedCount + METHOD lambda$addTargetDecoration$6 (Ljava/lang/String;Lnet/minecraft/world/item/component/MapDecorations$Entry;Lnet/minecraft/world/item/component/MapDecorations;)Lnet/minecraft/world/item/component/MapDecorations; + ARG 2 decorations + METHOD lambda$save$3 (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/nbt/Tag;)V + ARG 1 dimension METHOD load (Lnet/minecraft/nbt/CompoundTag;Lnet/minecraft/core/HolderLookup$Provider;)Lnet/minecraft/world/level/saveddata/maps/MapItemSavedData; ARG 0 tag ARG 1 levelRegistry METHOD mapMatcher (Lnet/minecraft/world/item/ItemStack;)Ljava/util/function/Predicate; ARG 0 stack + METHOD playerDecorationTypeAndRotation (Lnet/minecraft/core/Holder;Lnet/minecraft/world/level/LevelAccessor;DFF)Lcom/mojang/datafixers/util/Pair; + ARG 1 decorationType + ARG 2 level + ARG 3 yRot + ARG 5 x + ARG 6 z METHOD removeDecoration (Ljava/lang/String;)V ARG 1 identifier METHOD removedFromFrame (Lnet/minecraft/core/BlockPos;I)V diff --git a/data/net/minecraft/world/level/storage/DimensionDataStorage.mapping b/data/net/minecraft/world/level/storage/DimensionDataStorage.mapping index 29c7ecb3f..9616583b0 100644 --- a/data/net/minecraft/world/level/storage/DimensionDataStorage.mapping +++ b/data/net/minecraft/world/level/storage/DimensionDataStorage.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/world/level/storage/DimensionDataStorage - METHOD (Ljava/io/File;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/core/HolderLookup$Provider;)V + METHOD (Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/core/HolderLookup$Provider;)V ARG 1 dataFolder ARG 2 fixerUpper ARG 3 registries @@ -9,13 +9,10 @@ CLASS net/minecraft/world/level/storage/DimensionDataStorage METHOD get (Lnet/minecraft/world/level/saveddata/SavedData$Factory;Ljava/lang/String;)Lnet/minecraft/world/level/saveddata/SavedData; ARG 1 factory ARG 2 name - METHOD getDataFile (Ljava/lang/String;)Ljava/io/File; - ARG 1 name + METHOD getDataFile (Ljava/lang/String;)Ljava/nio/file/Path; + ARG 1 filename METHOD isGzip (Ljava/io/PushbackInputStream;)Z ARG 1 inputStream - METHOD lambda$save$0 (Ljava/lang/String;Lnet/minecraft/world/level/saveddata/SavedData;)V - ARG 1 name - ARG 2 savedData METHOD readSavedData (Ljava/util/function/BiFunction;Lnet/minecraft/util/datafix/DataFixTypes;Ljava/lang/String;)Lnet/minecraft/world/level/saveddata/SavedData; ARG 1 reader ARG 2 dataFixType @@ -27,3 +24,6 @@ CLASS net/minecraft/world/level/storage/DimensionDataStorage METHOD set (Ljava/lang/String;Lnet/minecraft/world/level/saveddata/SavedData;)V ARG 1 name ARG 2 savedData + METHOD tryWriteAsync (Ljava/nio/file/Path;Lnet/minecraft/nbt/CompoundTag;)Ljava/util/concurrent/CompletableFuture; + ARG 0 path + ARG 1 tag diff --git a/data/net/minecraft/world/level/storage/LevelData.mapping b/data/net/minecraft/world/level/storage/LevelData.mapping index 0ec3a3be1..22c08f047 100644 --- a/data/net/minecraft/world/level/storage/LevelData.mapping +++ b/data/net/minecraft/world/level/storage/LevelData.mapping @@ -4,8 +4,6 @@ CLASS net/minecraft/world/level/storage/LevelData ARG 2 level METHOD getDayTime ()J COMMENT Get current world time - METHOD getGameRules ()Lnet/minecraft/world/level/GameRules; - COMMENT Gets the GameRules class Instance. METHOD isHardcore ()Z COMMENT Returns {@code true} if hardcore mode is enabled, otherwise {@code false}. METHOD isRaining ()Z diff --git a/data/net/minecraft/world/level/storage/LevelStorageSource.mapping b/data/net/minecraft/world/level/storage/LevelStorageSource.mapping index a3e405b80..0a7249b04 100644 --- a/data/net/minecraft/world/level/storage/LevelStorageSource.mapping +++ b/data/net/minecraft/world/level/storage/LevelStorageSource.mapping @@ -14,11 +14,11 @@ CLASS net/minecraft/world/level/storage/LevelStorageSource ARG 0 dataFilePath METHOD getFileModificationTime (Lnet/minecraft/world/level/storage/LevelStorageSource$LevelDirectory;)J ARG 0 levelDirectory - METHOD getLevelDataAndDimensions (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/world/level/WorldDataConfiguration;Lnet/minecraft/core/Registry;Lnet/minecraft/core/RegistryAccess$Frozen;)Lnet/minecraft/world/level/storage/LevelDataAndDimensions; - ARG 0 dynamic + METHOD getLevelDataAndDimensions (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/world/level/WorldDataConfiguration;Lnet/minecraft/core/Registry;Lnet/minecraft/core/HolderLookup$Provider;)Lnet/minecraft/world/level/storage/LevelDataAndDimensions; + ARG 0 levelData ARG 1 dataConfiguration ARG 2 levelStemRegistry - ARG 3 registry + ARG 3 registries METHOD getLevelPath (Ljava/lang/String;)Ljava/nio/file/Path; ARG 1 saveName METHOD getPackConfig (Lcom/mojang/serialization/Dynamic;Lnet/minecraft/server/packs/repository/PackRepository;Z)Lnet/minecraft/server/WorldLoader$PackConfig; diff --git a/data/net/minecraft/world/level/storage/loot/BuiltInLootTables.mapping b/data/net/minecraft/world/level/storage/loot/BuiltInLootTables.mapping index f777d0cd4..89833e451 100644 --- a/data/net/minecraft/world/level/storage/loot/BuiltInLootTables.mapping +++ b/data/net/minecraft/world/level/storage/loot/BuiltInLootTables.mapping @@ -1,5 +1,8 @@ CLASS net/minecraft/world/level/storage/loot/BuiltInLootTables COMMENT Stores IDs for built in loot tables, i.e. loot tables which are not based directly on a block or entity ID. + METHOD makeDyeKeyMap (Ljava/util/EnumMap;Ljava/lang/String;)V + ARG 0 output + ARG 1 name METHOD register (Ljava/lang/String;)Lnet/minecraft/resources/ResourceKey; ARG 0 name METHOD register (Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/resources/ResourceKey; diff --git a/data/net/minecraft/world/level/storage/loot/LootContext.mapping b/data/net/minecraft/world/level/storage/loot/LootContext.mapping index 75f9be651..989e87716 100644 --- a/data/net/minecraft/world/level/storage/loot/LootContext.mapping +++ b/data/net/minecraft/world/level/storage/loot/LootContext.mapping @@ -21,16 +21,11 @@ CLASS net/minecraft/world/level/storage/loot/LootContext METHOD getLuck ()F COMMENT The luck value for this loot context. This is usually just the player's {@linkplain Attributes#LUCK luck value}, however it may be modified depending on the context of the looting. COMMENT When fishing for example it is increased based on the Luck of the Sea enchantment. - METHOD getParam (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParam;)Ljava/lang/Object; - COMMENT Get the value of the given parameter. - COMMENT - COMMENT @throws NoSuchElementException if the parameter is not present in this context - ARG 1 param - METHOD getParamOrNull (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParam;)Ljava/lang/Object; - COMMENT Get the value of the given parameter if it is present in this context, null otherwise. + METHOD getOptionalParameter (Lnet/minecraft/util/context/ContextKey;)Ljava/lang/Object; + ARG 1 parameter + METHOD getParameter (Lnet/minecraft/util/context/ContextKey;)Ljava/lang/Object; ARG 1 parameter - METHOD hasParam (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParam;)Z - COMMENT Check whether the given parameter is present in this context. + METHOD hasParameter (Lnet/minecraft/util/context/ContextKey;)Z ARG 1 parameter METHOD hasVisitedElement (Lnet/minecraft/world/level/storage/loot/LootContext$VisitedEntry;)Z ARG 1 element @@ -51,7 +46,7 @@ CLASS net/minecraft/world/level/storage/loot/LootContext COMMENT Represents a type of entity that can be looked up in a {@link LootContext} using a {@link LootContextParam}. FIELD THIS Lnet/minecraft/world/level/storage/loot/LootContext$EntityTarget; COMMENT Looks up {@link LootContextParams#THIS_ENTITY}. - METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/world/level/storage/loot/parameters/LootContextParam;)V + METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/util/context/ContextKey;)V ARG 3 name ARG 4 param METHOD getByName (Ljava/lang/String;)Lnet/minecraft/world/level/storage/loot/LootContext$EntityTarget; diff --git a/data/net/minecraft/world/level/storage/loot/LootDataType.mapping b/data/net/minecraft/world/level/storage/loot/LootDataType.mapping index e705d1c8d..0c06664bf 100644 --- a/data/net/minecraft/world/level/storage/loot/LootDataType.mapping +++ b/data/net/minecraft/world/level/storage/loot/LootDataType.mapping @@ -1,8 +1,12 @@ CLASS net/minecraft/world/level/storage/loot/LootDataType - METHOD deserialize (Lnet/minecraft/resources/ResourceLocation;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Ljava/util/Optional; - ARG 1 resourceLocation - ARG 2 ops - ARG 3 value + METHOD lambda$createLootTableValidator$1 (Lnet/minecraft/world/level/storage/loot/ValidationContext;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/world/level/storage/loot/LootTable;)V + ARG 0 context + ARG 1 key + ARG 2 value + METHOD lambda$createSimpleValidator$0 (Lnet/minecraft/world/level/storage/loot/ValidationContext;Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/world/level/storage/loot/LootContextUser;)V + ARG 0 context + ARG 1 key + ARG 2 value METHOD runValidation (Lnet/minecraft/world/level/storage/loot/ValidationContext;Lnet/minecraft/resources/ResourceKey;Ljava/lang/Object;)V ARG 1 context ARG 2 key diff --git a/data/net/minecraft/world/level/storage/loot/LootParams.mapping b/data/net/minecraft/world/level/storage/loot/LootParams.mapping index 12ba5ad73..4f2658c39 100644 --- a/data/net/minecraft/world/level/storage/loot/LootParams.mapping +++ b/data/net/minecraft/world/level/storage/loot/LootParams.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/world/level/storage/loot/LootParams - METHOD (Lnet/minecraft/server/level/ServerLevel;Ljava/util/Map;Ljava/util/Map;F)V + METHOD (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/util/context/ContextMap;Ljava/util/Map;F)V ARG 1 level ARG 2 params ARG 3 dynamicDrops @@ -7,33 +7,25 @@ CLASS net/minecraft/world/level/storage/loot/LootParams METHOD addDynamicDrops (Lnet/minecraft/resources/ResourceLocation;Ljava/util/function/Consumer;)V ARG 1 location ARG 2 consumer - METHOD getOptionalParameter (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParam;)Ljava/lang/Object; - ARG 1 param - METHOD getParamOrNull (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParam;)Ljava/lang/Object; - ARG 1 param - METHOD getParameter (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParam;)Ljava/lang/Object; - ARG 1 param - METHOD hasParam (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParam;)Z - ARG 1 param CLASS Builder METHOD (Lnet/minecraft/server/level/ServerLevel;)V ARG 1 level - METHOD create (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet;)Lnet/minecraft/world/level/storage/loot/LootParams; - ARG 1 params - METHOD getOptionalParameter (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParam;)Ljava/lang/Object; + METHOD create (Lnet/minecraft/util/context/ContextKeySet;)Lnet/minecraft/world/level/storage/loot/LootParams; + ARG 1 contextKeySet + METHOD getOptionalParameter (Lnet/minecraft/util/context/ContextKey;)Ljava/lang/Object; ARG 1 parameter - METHOD getParameter (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParam;)Ljava/lang/Object; + METHOD getParameter (Lnet/minecraft/util/context/ContextKey;)Ljava/lang/Object; ARG 1 parameter METHOD withDynamicDrop (Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/world/level/storage/loot/LootParams$DynamicDrop;)Lnet/minecraft/world/level/storage/loot/LootParams$Builder; ARG 1 name ARG 2 dynamicDrop METHOD withLuck (F)Lnet/minecraft/world/level/storage/loot/LootParams$Builder; ARG 1 luck - METHOD withOptionalParameter (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParam;Ljava/lang/Object;)Lnet/minecraft/world/level/storage/loot/LootParams$Builder; + METHOD withOptionalParameter (Lnet/minecraft/util/context/ContextKey;Ljava/lang/Object;)Lnet/minecraft/world/level/storage/loot/LootParams$Builder; ARG 1 parameter ARG 2 value - METHOD withParameter (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParam;Ljava/lang/Object;)Lnet/minecraft/world/level/storage/loot/LootParams$Builder; - ARG 1 parameter + METHOD withParameter (Lnet/minecraft/util/context/ContextKey;Ljava/lang/Object;)Lnet/minecraft/world/level/storage/loot/LootParams$Builder; + ARG 1 paramater ARG 2 value CLASS DynamicDrop METHOD add (Ljava/util/function/Consumer;)V diff --git a/data/net/minecraft/world/level/storage/loot/LootTable.mapping b/data/net/minecraft/world/level/storage/loot/LootTable.mapping index 10c87ef04..8050a5c41 100644 --- a/data/net/minecraft/world/level/storage/loot/LootTable.mapping +++ b/data/net/minecraft/world/level/storage/loot/LootTable.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/world/level/storage/loot/LootTable - METHOD (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet;Ljava/util/Optional;Ljava/util/List;Ljava/util/List;)V + METHOD (Lnet/minecraft/util/context/ContextKeySet;Ljava/util/Optional;Ljava/util/List;Ljava/util/List;)V ARG 1 paramSet ARG 2 randomSequence ARG 3 pools @@ -14,8 +14,6 @@ CLASS net/minecraft/world/level/storage/loot/LootTable METHOD getAvailableSlots (Lnet/minecraft/world/Container;Lnet/minecraft/util/RandomSource;)Ljava/util/List; ARG 1 inventory ARG 2 random - METHOD getParamSet ()Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet; - COMMENT Get the parameter set for this LootTable. METHOD getRandomItems (Lnet/minecraft/world/level/storage/loot/LootContext;)Lit/unimi/dsi/fastutil/objects/ObjectArrayList; COMMENT Generate random items to a List. ARG 1 context @@ -56,8 +54,8 @@ CLASS net/minecraft/world/level/storage/loot/LootTable COMMENT Validate this LootTable using the given ValidationContext. ARG 1 validator CLASS Builder - METHOD setParamSet (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder; - ARG 1 parameterSet + METHOD setParamSet (Lnet/minecraft/util/context/ContextKeySet;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder; + ARG 1 paramSet METHOD setRandomSequence (Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder; ARG 1 randomSequence METHOD withPool (Lnet/minecraft/world/level/storage/loot/LootPool$Builder;)Lnet/minecraft/world/level/storage/loot/LootTable$Builder; diff --git a/data/net/minecraft/world/level/storage/loot/ValidationContext.mapping b/data/net/minecraft/world/level/storage/loot/ValidationContext.mapping index 0bd9aeda6..f8495f71b 100644 --- a/data/net/minecraft/world/level/storage/loot/ValidationContext.mapping +++ b/data/net/minecraft/world/level/storage/loot/ValidationContext.mapping @@ -1,16 +1,16 @@ CLASS net/minecraft/world/level/storage/loot/ValidationContext COMMENT Context for validating loot tables. Loot tables are validated recursively by checking that all functions, conditions, etc. (implementing {@link LootContextUser}) are valid according to their LootTable's {@link LootContextParamSet}. - METHOD (Lnet/minecraft/util/ProblemReporter;Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet;)V + METHOD (Lnet/minecraft/util/ProblemReporter;Lnet/minecraft/util/context/ContextKeySet;)V ARG 1 reporter - ARG 2 params - METHOD (Lnet/minecraft/util/ProblemReporter;Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet;Ljava/util/Optional;Ljava/util/Set;)V + ARG 2 contextKeySet + METHOD (Lnet/minecraft/util/ProblemReporter;Lnet/minecraft/util/context/ContextKeySet;Ljava/util/Optional;Ljava/util/Set;)V ARG 1 reporter - ARG 2 params + ARG 2 contextKeySet ARG 3 resolver ARG 4 visitedElements - METHOD (Lnet/minecraft/util/ProblemReporter;Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet;Lnet/minecraft/core/HolderGetter$Provider;)V + METHOD (Lnet/minecraft/util/ProblemReporter;Lnet/minecraft/util/context/ContextKeySet;Lnet/minecraft/core/HolderGetter$Provider;)V ARG 1 reporter - ARG 2 params + ARG 2 contextKeySet ARG 3 resolver METHOD enterElement (Ljava/lang/String;Lnet/minecraft/resources/ResourceKey;)Lnet/minecraft/world/level/storage/loot/ValidationContext; ARG 1 name @@ -23,9 +23,7 @@ CLASS net/minecraft/world/level/storage/loot/ValidationContext METHOD reportProblem (Ljava/lang/String;)V COMMENT Report a problem to this ValidationContext. ARG 1 problem - METHOD setParams (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet;)Lnet/minecraft/world/level/storage/loot/ValidationContext; - COMMENT Create a new ValidationContext with the given LootContextParamSet. - ARG 1 params - METHOD validateUser (Lnet/minecraft/world/level/storage/loot/LootContextUser;)V - COMMENT Validate the given LootContextUser. - ARG 1 lootContextUser + METHOD setContextKeySet (Lnet/minecraft/util/context/ContextKeySet;)Lnet/minecraft/world/level/storage/loot/ValidationContext; + ARG 1 contextKeySet + METHOD validateContextUsage (Lnet/minecraft/world/level/storage/loot/LootContextUser;)V + ARG 1 user diff --git a/data/net/minecraft/world/level/storage/loot/functions/CopyNameFunction.mapping b/data/net/minecraft/world/level/storage/loot/functions/CopyNameFunction.mapping index 84de0e0c1..f7199cd06 100644 --- a/data/net/minecraft/world/level/storage/loot/functions/CopyNameFunction.mapping +++ b/data/net/minecraft/world/level/storage/loot/functions/CopyNameFunction.mapping @@ -5,10 +5,14 @@ CLASS net/minecraft/world/level/storage/loot/functions/CopyNameFunction ARG 2 source METHOD copyName (Lnet/minecraft/world/level/storage/loot/functions/CopyNameFunction$NameSource;)Lnet/minecraft/world/level/storage/loot/functions/LootItemConditionalFunction$Builder; ARG 0 source + METHOD lambda$copyName$2 (Lnet/minecraft/world/level/storage/loot/functions/CopyNameFunction$NameSource;Ljava/util/List;)Lnet/minecraft/world/level/storage/loot/functions/LootItemFunction; + ARG 1 conditions + METHOD lambda$static$1 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance METHOD run (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/level/storage/loot/LootContext;)Lnet/minecraft/world/item/ItemStack; ARG 1 stack ARG 2 context CLASS NameSource - METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/world/level/storage/loot/parameters/LootContextParam;)V + METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/util/context/ContextKey;)V ARG 3 name ARG 4 param diff --git a/data/net/minecraft/world/level/storage/loot/parameters/LootContextParam.mapping b/data/net/minecraft/world/level/storage/loot/parameters/LootContextParam.mapping deleted file mode 100644 index 58a3a82b3..000000000 --- a/data/net/minecraft/world/level/storage/loot/parameters/LootContextParam.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/world/level/storage/loot/parameters/LootContextParam - COMMENT A parameter of a {@link LootContext}. - COMMENT - COMMENT @see LootContextParams - METHOD (Lnet/minecraft/resources/ResourceLocation;)V - ARG 1 name diff --git a/data/net/minecraft/world/level/storage/loot/parameters/LootContextParamSet.mapping b/data/net/minecraft/world/level/storage/loot/parameters/LootContextParamSet.mapping deleted file mode 100644 index 7ec90fada..000000000 --- a/data/net/minecraft/world/level/storage/loot/parameters/LootContextParamSet.mapping +++ /dev/null @@ -1,30 +0,0 @@ -CLASS net/minecraft/world/level/storage/loot/parameters/LootContextParamSet - COMMENT A LootContextParamSet defines a set of required and optional {@link LootContextParam}s. - COMMENT This is used to validate that conditions, functions and other {@link LootContextUser}s only use those parameters that are present for the given loot table. - COMMENT - COMMENT @see LootContextParamSets - COMMENT @see ValidationContext - METHOD (Ljava/util/Set;Ljava/util/Set;)V - ARG 1 required - ARG 2 optional - METHOD getAllowed ()Ljava/util/Set; - COMMENT Gets the required and optional parameters - METHOD getRequired ()Ljava/util/Set; - COMMENT Gets only the required parameters - METHOD isAllowed (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParam;)Z - COMMENT Whether the given parameter is allowed in this set. - ARG 1 param - METHOD lambda$toString$0 (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParam;)Ljava/lang/String; - ARG 1 parameter - METHOD validateUser (Lnet/minecraft/util/ProblemReporter;Lnet/minecraft/world/level/storage/loot/LootContextUser;)V - ARG 1 problemReporter - ARG 2 lootContextUser - METHOD validateUser (Lnet/minecraft/world/level/storage/loot/ValidationContext;Lnet/minecraft/world/level/storage/loot/LootContextUser;)V - COMMENT Validate that all parameters referenced by the given LootContextUser are present in this set. - ARG 1 validationContext - ARG 2 lootContextUser - CLASS Builder - METHOD optional (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParam;)Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet$Builder; - ARG 1 parameter - METHOD required (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParam;)Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet$Builder; - ARG 1 parameter diff --git a/data/net/minecraft/world/level/storage/loot/parameters/LootContextParamSets.mapping b/data/net/minecraft/world/level/storage/loot/parameters/LootContextParamSets.mapping index c87ed89c9..bbd7c595a 100644 --- a/data/net/minecraft/world/level/storage/loot/parameters/LootContextParamSets.mapping +++ b/data/net/minecraft/world/level/storage/loot/parameters/LootContextParamSets.mapping @@ -1,27 +1,51 @@ CLASS net/minecraft/world/level/storage/loot/parameters/LootContextParamSets COMMENT Registry for {@link LootContextParamSet}s. - METHOD lambda$static$10 (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet$Builder;)V + METHOD lambda$static$10 (Lnet/minecraft/util/context/ContextKeySet$Builder;)V ARG 0 builder - METHOD lambda$static$11 (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet$Builder;)V + METHOD lambda$static$11 (Lnet/minecraft/util/context/ContextKeySet$Builder;)V ARG 0 builder - METHOD lambda$static$12 (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet$Builder;)V + METHOD lambda$static$12 (Lnet/minecraft/util/context/ContextKeySet$Builder;)V ARG 0 builder - METHOD lambda$static$13 (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet$Builder;)V + METHOD lambda$static$13 (Lnet/minecraft/util/context/ContextKeySet$Builder;)V ARG 0 builder - METHOD lambda$static$3 (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet$Builder;)V + METHOD lambda$static$14 (Lnet/minecraft/util/context/ContextKeySet$Builder;)V ARG 0 builder - METHOD lambda$static$4 (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet$Builder;)V + METHOD lambda$static$15 (Lnet/minecraft/util/context/ContextKeySet$Builder;)V ARG 0 builder - METHOD lambda$static$5 (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet$Builder;)V + METHOD lambda$static$16 (Lnet/minecraft/util/context/ContextKeySet$Builder;)V ARG 0 builder - METHOD lambda$static$6 (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet$Builder;)V + METHOD lambda$static$17 (Lnet/minecraft/util/context/ContextKeySet$Builder;)V ARG 0 builder - METHOD lambda$static$7 (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet$Builder;)V + METHOD lambda$static$18 (Lnet/minecraft/util/context/ContextKeySet$Builder;)V ARG 0 builder - METHOD lambda$static$8 (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet$Builder;)V + METHOD lambda$static$19 (Lnet/minecraft/util/context/ContextKeySet$Builder;)V ARG 0 builder - METHOD lambda$static$9 (Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet$Builder;)V + METHOD lambda$static$20 (Lnet/minecraft/util/context/ContextKeySet$Builder;)V ARG 0 builder - METHOD register (Ljava/lang/String;Ljava/util/function/Consumer;)Lnet/minecraft/world/level/storage/loot/parameters/LootContextParamSet; - ARG 0 registryName - ARG 1 builderConsumer + METHOD lambda$static$21 (Lnet/minecraft/util/context/ContextKeySet$Builder;)V + ARG 0 builder + METHOD lambda$static$22 (Lnet/minecraft/util/context/ContextKeySet$Builder;)V + ARG 0 builder + METHOD lambda$static$23 (Lnet/minecraft/util/context/ContextKeySet$Builder;)V + ARG 0 builder + METHOD lambda$static$24 (Lnet/minecraft/util/context/ContextKeySet$Builder;)V + ARG 0 builder + METHOD lambda$static$25 (Lnet/minecraft/util/context/ContextKeySet$Builder;)V + ARG 0 builder + METHOD lambda$static$3 (Lnet/minecraft/util/context/ContextKeySet$Builder;)V + ARG 0 builder + METHOD lambda$static$4 (Lnet/minecraft/util/context/ContextKeySet$Builder;)V + ARG 0 builder + METHOD lambda$static$5 (Lnet/minecraft/util/context/ContextKeySet$Builder;)V + ARG 0 builder + METHOD lambda$static$6 (Lnet/minecraft/util/context/ContextKeySet$Builder;)V + ARG 0 builder + METHOD lambda$static$7 (Lnet/minecraft/util/context/ContextKeySet$Builder;)V + ARG 0 builder + METHOD lambda$static$8 (Lnet/minecraft/util/context/ContextKeySet$Builder;)V + ARG 0 builder + METHOD lambda$static$9 (Lnet/minecraft/util/context/ContextKeySet$Builder;)V + ARG 0 builder + METHOD register (Ljava/lang/String;Ljava/util/function/Consumer;)Lnet/minecraft/util/context/ContextKeySet; + ARG 0 name + ARG 1 constructor diff --git a/data/net/minecraft/world/level/storage/loot/parameters/LootContextParams.mapping b/data/net/minecraft/world/level/storage/loot/parameters/LootContextParams.mapping index ff3da728c..05e67709f 100644 --- a/data/net/minecraft/world/level/storage/loot/parameters/LootContextParams.mapping +++ b/data/net/minecraft/world/level/storage/loot/parameters/LootContextParams.mapping @@ -1,4 +1,2 @@ CLASS net/minecraft/world/level/storage/loot/parameters/LootContextParams COMMENT Holds all known LootContextParams. - METHOD create (Ljava/lang/String;)Lnet/minecraft/world/level/storage/loot/parameters/LootContextParam; - ARG 0 id diff --git a/data/net/minecraft/world/phys/AABB.mapping b/data/net/minecraft/world/phys/AABB.mapping index 9bfb2684a..f1fa21723 100644 --- a/data/net/minecraft/world/phys/AABB.mapping +++ b/data/net/minecraft/world/phys/AABB.mapping @@ -11,6 +11,15 @@ CLASS net/minecraft/world/phys/AABB METHOD (Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/Vec3;)V ARG 1 start ARG 2 end + METHOD clip (DDDDDDLnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/Vec3;)Ljava/util/Optional; + ARG 0 minX + ARG 2 minY + ARG 4 minZ + ARG 6 maxX + ARG 8 maxY + ARG 10 maxZ + ARG 12 from + ARG 13 to METHOD clip (Ljava/lang/Iterable;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/phys/BlockHitResult; ARG 0 boxes ARG 1 start @@ -34,6 +43,9 @@ CLASS net/minecraft/world/phys/AABB ARG 19 startSide ARG 21 startOtherA ARG 23 startOtherB + METHOD collidedAlongVector (Lnet/minecraft/world/phys/Vec3;Ljava/util/List;)Z + ARG 1 vector + ARG 2 boxes METHOD contains (DDD)Z ARG 1 x ARG 3 y @@ -42,17 +54,17 @@ CLASS net/minecraft/world/phys/AABB COMMENT Returns if the supplied Vec3D is completely inside the bounding box ARG 1 vec METHOD contract (DDD)Lnet/minecraft/world/phys/AABB; - COMMENT Creates a new {@link AxisAlignedBB} that has been contracted by the given amount, with positive changes decreasing max values and negative changes increasing min values. + COMMENT Creates a new {@link AABB} that has been contracted by the given amount, with positive changes decreasing max values and negative changes increasing min values. COMMENT
COMMENT If the amount to contract by is larger than the length of a side, then the side will wrap (still creating a valid AABB - see last sample). COMMENT COMMENT

Samples:

COMMENT COMMENT - COMMENT - COMMENT - COMMENT - COMMENT + COMMENT + COMMENT + COMMENT + COMMENT COMMENT
InputResult
new AxisAlignedBB(0, 0, 0, 4, 4, 4).contract(2, 2, 2)
box[0.0, 0.0, 0.0 -> 2.0, 2.0, 2.0]
new AxisAlignedBB(0, 0, 0, 4, 4, 4).contract(-2, -2, -2)
box[2.0, 2.0, 2.0 -> 4.0, 4.0, 4.0]
new AxisAlignedBB(5, 5, 5, 7, 7, 7).contract(0, 1, -1)
box[5.0, 5.0, 6.0 -> 7.0, 6.0, 7.0]
new AxisAlignedBB(-2, -2, -2, 2, 2, 2).contract(4, -4, 0)
box[-8.0, 2.0, -2.0 -> -2.0, 8.0, 2.0]
new AABB(0, 0, 0, 4, 4, 4).contract(2, 2, 2)
box[0.0, 0.0, 0.0 -> 2.0, 2.0, 2.0]
new AABB(0, 0, 0, 4, 4, 4).contract(-2, -2, -2)
box[2.0, 2.0, 2.0 -> 4.0, 4.0, 4.0]
new AABB(5, 5, 5, 7, 7, 7).contract(0, 1, -1)
box[5.0, 5.0, 6.0 -> 7.0, 6.0, 7.0]
new AABB(-2, -2, -2, 2, 2, 2).contract(4, -4, 0)
box[-8.0, 2.0, -2.0 -> -2.0, 8.0, 2.0]
COMMENT COMMENT

See Also:

@@ -67,7 +79,7 @@ CLASS net/minecraft/world/phys/AABB ARG 3 y ARG 5 z METHOD deflate (D)Lnet/minecraft/world/phys/AABB; - COMMENT Creates a new {@link AxisAlignedBB} that is expanded by the given value in all directions. Equivalent to {@link #grow(double)} with value set to the negative of the value provided here. Passing a negative value to this method values will grow the AABB. + COMMENT Creates a new {@link AABB} that is expanded by the given value in all directions. Equivalent to {@link #grow(double)} with value set to the negative of the value provided here. Passing a negative value to this method values will grow the AABB. COMMENT
COMMENT Side lengths will be decreased by 2 times the value of the parameter, since both min and max are changed. COMMENT
@@ -87,14 +99,14 @@ CLASS net/minecraft/world/phys/AABB METHOD equals (Ljava/lang/Object;)Z ARG 1 other METHOD expandTowards (DDD)Lnet/minecraft/world/phys/AABB; - COMMENT Creates a new {@link AxisAlignedBB} that has been expanded by the given amount, with positive changes increasing max values and negative changes decreasing min values. + COMMENT Creates a new {@link AABB} that has been expanded by the given amount, with positive changes increasing max values and negative changes decreasing min values. COMMENT COMMENT

Samples:

COMMENT COMMENT - COMMENT
InputResult
new AxisAlignedBB(0, 0, 0, 1, 1, 1).expand(2, 2, 2)
box[0, 0, 0 -> 3, 3, 3]
 - COMMENT 
new AxisAlignedBB(0, 0, 0, 1, 1, 1).expand(-2, -2, -2)
box[-2, -2, -2 -> 1, 1, 1]
 - COMMENT 
new AxisAlignedBB(5, 5, 5, 7, 7, 7).expand(0, 1, -1)
box[5, 5, 4, 7, 8, 7]
 + COMMENT 
new AABB(0, 0, 0, 1, 1, 1).expand(2, 2, 2)
box[0, 0, 0 -> 3, 3, 3]
 + COMMENT 
new AABB(0, 0, 0, 1, 1, 1).expand(-2, -2, -2)
box[-2, -2, -2 -> 1, 1, 1]
 + COMMENT 
new AABB(5, 5, 5, 7, 7, 7).expand(0, 1, -1)
box[5, 5, 4, 7, 8, 7]
 COMMENT
COMMENT COMMENT

See Also:

@@ -110,6 +122,19 @@ CLASS net/minecraft/world/phys/AABB ARG 5 z METHOD expandTowards (Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/world/phys/AABB; ARG 1 vector + METHOD getDirection (DDDDDDLnet/minecraft/world/phys/Vec3;[DLnet/minecraft/core/Direction;DDD)Lnet/minecraft/core/Direction; + ARG 0 minX + ARG 2 minY + ARG 4 minZ + ARG 6 maxX + ARG 8 maxY + ARG 10 maxZ + ARG 12 start + ARG 13 mineDistance + ARG 14 facing + ARG 15 deltaX + ARG 17 deltaY + ARG 19 deltaZ METHOD getDirection (Lnet/minecraft/world/phys/AABB;Lnet/minecraft/world/phys/Vec3;[DLnet/minecraft/core/Direction;DDD)Lnet/minecraft/core/Direction; ARG 0 aabb ARG 1 start @@ -121,7 +146,7 @@ CLASS net/minecraft/world/phys/AABB METHOD getSize ()D COMMENT Returns the average length of the edges of the bounding box. METHOD inflate (D)Lnet/minecraft/world/phys/AABB; - COMMENT Creates a new {@link AxisAlignedBB} that is expanded by the given value in all directions. Equivalent to {@link #grow(double, double, double)} with the given value for all 3 params. Negative values will shrink the AABB. + COMMENT Creates a new {@link AABB} that is expanded by the given value in all directions. Equivalent to {@link #grow(double, double, double)} with the given value for all 3 params. Negative values will shrink the AABB. COMMENT
COMMENT Side lengths will be increased by 2 times the value of the parameter, since both min and max are changed. COMMENT
@@ -130,7 +155,7 @@ CLASS net/minecraft/world/phys/AABB COMMENT @return A modified AABB. ARG 1 value METHOD inflate (DDD)Lnet/minecraft/world/phys/AABB; - COMMENT Creates a new {@link AxisAlignedBB} that has been contracted by the given amount in both directions. Negative values will shrink the AABB instead of expanding it. + COMMENT Creates a new {@link AABB} that has been contracted by the given amount in both directions. Negative values will shrink the AABB instead of expanding it. COMMENT
COMMENT Side lengths will be increased by 2 times the value of the parameters, since both min and max are changed. COMMENT
@@ -139,10 +164,10 @@ CLASS net/minecraft/world/phys/AABB COMMENT

Samples:

COMMENT COMMENT - COMMENT - COMMENT - COMMENT - COMMENT + COMMENT + COMMENT + COMMENT + COMMENT COMMENT
InputResult
new AxisAlignedBB(0, 0, 0, 1, 1, 1).grow(2, 2, 2)
box[-2.0, -2.0, -2.0 -> 3.0, 3.0, 3.0]
new AxisAlignedBB(0, 0, 0, 6, 6, 6).grow(-2, -2, -2)
box[2.0, 2.0, 2.0 -> 4.0, 4.0, 4.0]
new AxisAlignedBB(5, 5, 5, 7, 7, 7).grow(0, 1, -1)
box[5.0, 4.0, 6.0 -> 7.0, 8.0, 6.0]
new AxisAlignedBB(1, 1, 1, 3, 3, 3).grow(-4, -2, -3)
box[-1.0, 1.0, 0.0 -> 5.0, 3.0, 4.0]
new AABB(0, 0, 0, 1, 1, 1).grow(2, 2, 2)
box[-2.0, -2.0, -2.0 -> 3.0, 3.0, 3.0]
new AABB(0, 0, 0, 6, 6, 6).grow(-2, -2, -2)
box[2.0, 2.0, 2.0 -> 4.0, 4.0, 4.0]
new AABB(5, 5, 5, 7, 7, 7).grow(0, 1, -1)
box[5.0, 4.0, 6.0 -> 7.0, 8.0, 6.0]
new AABB(1, 1, 1, 3, 3, 3).grow(-4, -2, -3)
box[-1.0, 1.0, 0.0 -> 5.0, 3.0, 4.0]
COMMENT COMMENT

See Also:

diff --git a/data/net/minecraft/world/phys/BlockHitResult.mapping b/data/net/minecraft/world/phys/BlockHitResult.mapping index bc4226e77..d9b6690a4 100644 --- a/data/net/minecraft/world/phys/BlockHitResult.mapping +++ b/data/net/minecraft/world/phys/BlockHitResult.mapping @@ -4,12 +4,19 @@ CLASS net/minecraft/world/phys/BlockHitResult ARG 2 direction ARG 3 blockPos ARG 4 inside - METHOD (ZLnet/minecraft/world/phys/Vec3;Lnet/minecraft/core/Direction;Lnet/minecraft/core/BlockPos;Z)V + METHOD (Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/core/Direction;Lnet/minecraft/core/BlockPos;ZZ)V + ARG 1 location + ARG 2 direction + ARG 3 blockPos + ARG 4 inside + ARG 5 worldBorderHit + METHOD (ZLnet/minecraft/world/phys/Vec3;Lnet/minecraft/core/Direction;Lnet/minecraft/core/BlockPos;ZZ)V ARG 1 miss ARG 2 location ARG 3 direction ARG 4 blockPos ARG 5 inside + ARG 6 worldBorderHit METHOD getDirection ()Lnet/minecraft/core/Direction; COMMENT Gets the face of the block that was clicked METHOD isInside ()Z @@ -18,7 +25,7 @@ CLASS net/minecraft/world/phys/BlockHitResult COMMENT Creates a new BlockRayTraceResult marked as a miss. ARG 0 location ARG 1 direction - ARG 2 pos + ARG 2 blockPos METHOD withDirection (Lnet/minecraft/core/Direction;)Lnet/minecraft/world/phys/BlockHitResult; COMMENT Creates a new BlockRayTraceResult, with the clicked face replaced with the given one ARG 1 newFace diff --git a/data/net/minecraft/world/phys/Vec3.mapping b/data/net/minecraft/world/phys/Vec3.mapping index fa0fe8254..7f430e33c 100644 --- a/data/net/minecraft/world/phys/Vec3.mapping +++ b/data/net/minecraft/world/phys/Vec3.mapping @@ -3,8 +3,12 @@ CLASS net/minecraft/world/phys/Vec3 ARG 1 x ARG 3 y ARG 5 z + METHOD (Lnet/minecraft/core/Vec3i;)V + ARG 1 vector METHOD (Lorg/joml/Vector3f;)V ARG 1 vector + METHOD add (D)Lnet/minecraft/world/phys/Vec3; + ARG 1 amount METHOD add (DDD)Lnet/minecraft/world/phys/Vec3; COMMENT Adds the specified x,y,z vector components to this vector and returns the resulting vector. Does not change this vector. ARG 1 x @@ -64,6 +68,8 @@ CLASS net/minecraft/world/phys/Vec3 ARG 0 packed METHOD get (Lnet/minecraft/core/Direction$Axis;)D ARG 1 axis + METHOD lambda$static$1 (Ljava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 0 list METHOD length ()D COMMENT Returns the length of the vector. METHOD lerp (Lnet/minecraft/world/phys/Vec3;D)Lnet/minecraft/world/phys/Vec3; @@ -82,11 +88,15 @@ CLASS net/minecraft/world/phys/Vec3 METHOD offsetRandom (Lnet/minecraft/util/RandomSource;F)Lnet/minecraft/world/phys/Vec3; ARG 1 random ARG 2 factor + METHOD projectedOn (Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/world/phys/Vec3; + ARG 1 vector METHOD relative (Lnet/minecraft/core/Direction;D)Lnet/minecraft/world/phys/Vec3; ARG 1 direction ARG 2 length METHOD scale (D)Lnet/minecraft/world/phys/Vec3; ARG 1 factor + METHOD subtract (D)Lnet/minecraft/world/phys/Vec3; + ARG 1 amount METHOD subtract (DDD)Lnet/minecraft/world/phys/Vec3; ARG 1 x ARG 3 y diff --git a/data/net/minecraft/world/phys/shapes/CollisionContext.mapping b/data/net/minecraft/world/phys/shapes/CollisionContext.mapping index 541e4000a..e7495b55f 100644 --- a/data/net/minecraft/world/phys/shapes/CollisionContext.mapping +++ b/data/net/minecraft/world/phys/shapes/CollisionContext.mapping @@ -2,6 +2,10 @@ CLASS net/minecraft/world/phys/shapes/CollisionContext METHOD canStandOnFluid (Lnet/minecraft/world/level/material/FluidState;Lnet/minecraft/world/level/material/FluidState;)Z ARG 1 fluid1 ARG 2 fluid2 + METHOD getCollisionShape (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/CollisionGetter;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/phys/shapes/VoxelShape; + ARG 1 state + ARG 2 collisionGetter + ARG 3 pos METHOD isAbove (Lnet/minecraft/world/phys/shapes/VoxelShape;Lnet/minecraft/core/BlockPos;Z)Z ARG 1 shape ARG 2 pos @@ -10,3 +14,6 @@ CLASS net/minecraft/world/phys/shapes/CollisionContext ARG 1 item METHOD of (Lnet/minecraft/world/entity/Entity;)Lnet/minecraft/world/phys/shapes/CollisionContext; ARG 0 entity + METHOD of (Lnet/minecraft/world/entity/Entity;Z)Lnet/minecraft/world/phys/shapes/CollisionContext; + ARG 0 entity + ARG 1 canStandOnFluid diff --git a/data/net/minecraft/world/phys/shapes/EntityCollisionContext.mapping b/data/net/minecraft/world/phys/shapes/EntityCollisionContext.mapping index 2e0fa552a..bb35d1f25 100644 --- a/data/net/minecraft/world/phys/shapes/EntityCollisionContext.mapping +++ b/data/net/minecraft/world/phys/shapes/EntityCollisionContext.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/world/phys/shapes/EntityCollisionContext - METHOD (Lnet/minecraft/world/entity/Entity;)V + METHOD (Lnet/minecraft/world/entity/Entity;Z)V ARG 1 entity + ARG 2 canStandOnFluid METHOD (ZDLnet/minecraft/world/item/ItemStack;Ljava/util/function/Predicate;Lnet/minecraft/world/entity/Entity;)V ARG 1 descending ARG 2 entityBottom diff --git a/data/net/minecraft/world/phys/shapes/MinecartCollisionContext.mapping b/data/net/minecraft/world/phys/shapes/MinecartCollisionContext.mapping new file mode 100644 index 000000000..bd1d46733 --- /dev/null +++ b/data/net/minecraft/world/phys/shapes/MinecartCollisionContext.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/world/phys/shapes/MinecartCollisionContext + METHOD (Lnet/minecraft/world/entity/vehicle/AbstractMinecart;Z)V + ARG 1 minecart + ARG 2 canStandOnFluid + METHOD setupContext (Lnet/minecraft/world/entity/vehicle/AbstractMinecart;)V + ARG 1 minecart diff --git a/data/net/minecraft/world/phys/shapes/Shapes.mapping b/data/net/minecraft/world/phys/shapes/Shapes.mapping index 37013c287..c3f0a6703 100644 --- a/data/net/minecraft/world/phys/shapes/Shapes.mapping +++ b/data/net/minecraft/world/phys/shapes/Shapes.mapping @@ -36,9 +36,6 @@ CLASS net/minecraft/world/phys/shapes/Shapes METHOD findBits (DD)I ARG 0 minBits ARG 2 maxBits - METHOD getFaceShape (Lnet/minecraft/world/phys/shapes/VoxelShape;Lnet/minecraft/core/Direction;)Lnet/minecraft/world/phys/shapes/VoxelShape; - ARG 0 voxelShape - ARG 1 direction METHOD join (Lnet/minecraft/world/phys/shapes/VoxelShape;Lnet/minecraft/world/phys/shapes/VoxelShape;Lnet/minecraft/world/phys/shapes/BooleanOp;)Lnet/minecraft/world/phys/shapes/VoxelShape; ARG 0 shape1 ARG 1 shape2 diff --git a/data/net/minecraft/world/phys/shapes/VoxelShape.mapping b/data/net/minecraft/world/phys/shapes/VoxelShape.mapping index 68cebc4eb..ecdac0001 100644 --- a/data/net/minecraft/world/phys/shapes/VoxelShape.mapping +++ b/data/net/minecraft/world/phys/shapes/VoxelShape.mapping @@ -32,6 +32,8 @@ CLASS net/minecraft/world/phys/shapes/VoxelShape METHOD getFaceShape (Lnet/minecraft/core/Direction;)Lnet/minecraft/world/phys/shapes/VoxelShape; COMMENT Projects this shape onto the given side. For each box in the shape, if it does not touch the given side, it is eliminated. Otherwise, the box is extended in the given axis to cover the entire range [0, 1]. ARG 1 side + METHOD isCubeLikeAlong (Lnet/minecraft/core/Direction$Axis;)Z + ARG 1 axis METHOD lambda$closestPointTo$5 (Lnet/minecraft/world/phys/Vec3;[Lnet/minecraft/world/phys/Vec3;DDDDDD)V ARG 2 x1 ARG 4 y1 @@ -85,3 +87,5 @@ CLASS net/minecraft/world/phys/shapes/VoxelShape ARG 1 xOffset ARG 3 yOffset ARG 5 zOffset + METHOD move (Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/world/phys/shapes/VoxelShape; + ARG 1 offset diff --git a/data/net/minecraft/world/ticks/LevelChunkTicks.mapping b/data/net/minecraft/world/ticks/LevelChunkTicks.mapping index ee0f34aec..7013fd29d 100644 --- a/data/net/minecraft/world/ticks/LevelChunkTicks.mapping +++ b/data/net/minecraft/world/ticks/LevelChunkTicks.mapping @@ -7,6 +7,9 @@ CLASS net/minecraft/world/ticks/LevelChunkTicks ARG 2 pos METHOD removeIf (Ljava/util/function/Predicate;)V ARG 1 predicate + METHOD save (JLjava/util/function/Function;)Lnet/minecraft/nbt/ListTag; + ARG 1 gametime + ARG 3 idGetter METHOD scheduleUnchecked (Lnet/minecraft/world/ticks/ScheduledTick;)V ARG 1 tick METHOD setOnTickAdded (Ljava/util/function/BiConsumer;)V diff --git a/data/net/minecraft/world/ticks/LevelTicks.mapping b/data/net/minecraft/world/ticks/LevelTicks.mapping index 94784867f..0cd1d51de 100644 --- a/data/net/minecraft/world/ticks/LevelTicks.mapping +++ b/data/net/minecraft/world/ticks/LevelTicks.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/world/ticks/LevelTicks - METHOD (Ljava/util/function/LongPredicate;Ljava/util/function/Supplier;)V + METHOD (Ljava/util/function/LongPredicate;)V ARG 1 tickCheck - ARG 2 profiler METHOD addContainer (Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/world/ticks/LevelChunkTicks;)V ARG 1 chunkPos ARG 2 chunkTicks diff --git a/data/net/minecraft/world/ticks/ProtoChunkTicks.mapping b/data/net/minecraft/world/ticks/ProtoChunkTicks.mapping index 9fc3ac965..694f6599f 100644 --- a/data/net/minecraft/world/ticks/ProtoChunkTicks.mapping +++ b/data/net/minecraft/world/ticks/ProtoChunkTicks.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/world/ticks/ProtoChunkTicks - METHOD load (Lnet/minecraft/nbt/ListTag;Ljava/util/function/Function;Lnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/world/ticks/ProtoChunkTicks; - ARG 0 tag - ARG 1 idParser - ARG 2 chunkPos + METHOD load (Ljava/util/List;)Lnet/minecraft/world/ticks/ProtoChunkTicks; + ARG 0 ticks METHOD schedule (Lnet/minecraft/world/ticks/SavedTick;)V ARG 1 tick diff --git a/data/net/minecraft/world/ticks/SavedTick.mapping b/data/net/minecraft/world/ticks/SavedTick.mapping index 68daa3672..33960d68a 100644 --- a/data/net/minecraft/world/ticks/SavedTick.mapping +++ b/data/net/minecraft/world/ticks/SavedTick.mapping @@ -2,11 +2,10 @@ CLASS net/minecraft/world/ticks/SavedTick METHOD loadTick (Lnet/minecraft/nbt/CompoundTag;Ljava/util/function/Function;)Ljava/util/Optional; ARG 0 tag ARG 1 idParser - METHOD loadTickList (Lnet/minecraft/nbt/ListTag;Ljava/util/function/Function;Lnet/minecraft/world/level/ChunkPos;Ljava/util/function/Consumer;)V - ARG 0 tag + METHOD loadTickList (Lnet/minecraft/nbt/ListTag;Ljava/util/function/Function;Lnet/minecraft/world/level/ChunkPos;)Ljava/util/List; + ARG 0 tickList ARG 1 idParser ARG 2 chunkPos - ARG 3 output METHOD probe (Ljava/lang/Object;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/ticks/SavedTick; ARG 0 type ARG 1 pos @@ -17,10 +16,6 @@ CLASS net/minecraft/world/ticks/SavedTick ARG 1 pos ARG 2 delay ARG 3 priority - METHOD saveTick (Lnet/minecraft/world/ticks/ScheduledTick;Ljava/util/function/Function;J)Lnet/minecraft/nbt/CompoundTag; - ARG 0 tick - ARG 1 idGetter - ARG 2 gameTime METHOD unpack (JJ)Lnet/minecraft/world/ticks/ScheduledTick; ARG 1 gameTime ARG 3 subTickOrder diff --git a/data/net/minecraft/world/ticks/ScheduledTick.mapping b/data/net/minecraft/world/ticks/ScheduledTick.mapping index d3c3026ec..f0a7eb800 100644 --- a/data/net/minecraft/world/ticks/ScheduledTick.mapping +++ b/data/net/minecraft/world/ticks/ScheduledTick.mapping @@ -13,6 +13,8 @@ CLASS net/minecraft/world/ticks/ScheduledTick METHOD probe (Ljava/lang/Object;Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/ticks/ScheduledTick; ARG 0 type ARG 1 pos + METHOD toSavedTick (J)Lnet/minecraft/world/ticks/SavedTick; + ARG 1 gametime CLASS 1 METHOD equals (Lnet/minecraft/world/ticks/ScheduledTick;Lnet/minecraft/world/ticks/ScheduledTick;)Z ARG 1 first diff --git a/data/net/minecraft/world/ticks/SerializableTickContainer.mapping b/data/net/minecraft/world/ticks/SerializableTickContainer.mapping index 537ef9116..73068f57d 100644 --- a/data/net/minecraft/world/ticks/SerializableTickContainer.mapping +++ b/data/net/minecraft/world/ticks/SerializableTickContainer.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/world/ticks/SerializableTickContainer - METHOD save (JLjava/util/function/Function;)Lnet/minecraft/nbt/Tag; - ARG 1 gameTime - ARG 3 idGetter + METHOD pack (J)Ljava/util/List; + ARG 1 gametime