diff --git a/build.gradle b/build.gradle index 13063306d7..3a383936fc 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "25w07a" +def minecraft_version = "25w08a" filament { minecraftVersion = minecraft_version diff --git a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping index a97b473770..acc5a46520 100644 --- a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping +++ b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping @@ -41,12 +41,6 @@ CLASS com/mojang/blaze3d/platform/GlStateManager ARG 0 pname METHOD _getString (I)Ljava/lang/String; ARG 0 name - METHOD _getTexImage (IIIIJ)V - ARG 0 target - ARG 1 level - ARG 2 format - ARG 3 type - ARG 4 pixels METHOD _getTexLevelParameter (III)I ARG 0 target ARG 1 level @@ -94,12 +88,6 @@ CLASS com/mojang/blaze3d/platform/GlStateManager ARG 0 sync METHOD _glDeleteVertexArrays (I)V ARG 0 array - METHOD _glDrawPixels (IIIIJ)V - ARG 0 width - ARG 1 height - ARG 2 format - ARG 3 type - ARG 4 pixels METHOD _glFenceSync (II)J ARG 0 condition ARG 1 flags @@ -163,14 +151,6 @@ CLASS com/mojang/blaze3d/platform/GlStateManager ARG 4 format ARG 5 type ARG 6 pixels - METHOD _readPixels (IIIIIILjava/nio/ByteBuffer;)V - ARG 0 x - ARG 1 y - ARG 2 width - ARG 3 height - ARG 4 format - ARG 5 type - ARG 6 pixels METHOD _scissorBox (IIII)V ARG 0 x ARG 1 y diff --git a/mappings/com/mojang/blaze3d/platform/TextureUtil.mapping b/mappings/com/mojang/blaze3d/platform/TextureUtil.mapping index 2cd5bcd129..31e8caeb40 100644 --- a/mappings/com/mojang/blaze3d/platform/TextureUtil.mapping +++ b/mappings/com/mojang/blaze3d/platform/TextureUtil.mapping @@ -1,6 +1,4 @@ CLASS com/mojang/blaze3d/platform/TextureUtil - METHOD bind (I)V - ARG 0 id METHOD getDebugTexturePath (Ljava/nio/file/Path;)Ljava/nio/file/Path; ARG 0 path METHOD readResource (Ljava/io/InputStream;)Ljava/nio/ByteBuffer; @@ -8,18 +6,7 @@ CLASS com/mojang/blaze3d/platform/TextureUtil METHOD readResource (Ljava/nio/channels/ReadableByteChannel;I)Ljava/nio/ByteBuffer; ARG 0 channel ARG 1 bufSize - METHOD writeAsPNG (Ljava/nio/file/Path;Ljava/lang/String;IIII)V + METHOD writeAsPNG (Ljava/nio/file/Path;Ljava/lang/String;Lnet/minecraft/class_10792;ILjava/util/function/IntUnaryOperator;)V ARG 0 directory ARG 1 prefix - ARG 2 textureId ARG 3 scales - ARG 4 width - ARG 5 height - METHOD writeAsPNG (Ljava/nio/file/Path;Ljava/lang/String;IIIILjava/util/function/IntUnaryOperator;)V - ARG 0 directory - ARG 1 prefix - ARG 2 textureId - ARG 3 scales - ARG 4 width - ARG 5 height - ARG 6 operator diff --git a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping index 2cbe00f0aa..62da678eed 100644 --- a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping +++ b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping @@ -78,23 +78,12 @@ CLASS com/mojang/blaze3d/systems/RenderSystem ARG 0 width METHOD logicOp (Lcom/mojang/blaze3d/platform/GlStateManager$class_1030;)V ARG 0 op - METHOD pixelStore (II)V - ARG 0 pname - ARG 1 param METHOD polygonMode (II)V ARG 0 face ARG 1 mode METHOD polygonOffset (FF)V ARG 0 factor ARG 1 units - METHOD readPixels (IIIIIILjava/nio/ByteBuffer;)V - ARG 0 x - ARG 1 y - ARG 2 width - ARG 3 height - ARG 4 format - ARG 5 type - ARG 6 pixels METHOD setErrorCallback (Lorg/lwjgl/glfw/GLFWErrorCallbackI;)V ARG 0 callback METHOD setProjectionMatrix (Lorg/joml/Matrix4f;Lnet/minecraft/class_10366;)V diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 2064e4e07e..b2aeaf7f3d 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -382,21 +382,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 1 directory ARG 2 width ARG 3 height - METHOD method_35699 takeHugeScreenshot (Ljava/io/File;IIII)Lnet/minecraft/class_2561; - COMMENT Takes a huge screenshot in the tga file format. - COMMENT - COMMENT
The {@code unitWidth} and {@code unitHeight} controls the size of the
- COMMENT partial image rendered; it does not affect the screenshot outcome, but may
- COMMENT affect the screenshot performance.
- COMMENT
- COMMENT @return a user-oriented piece of text for screenshot result
- ARG 1 gameDirectory
- ARG 2 unitWidth
- ARG 3 unitHeight
- ARG 4 width
- ARG 5 height
- METHOD method_35700 (Ljava/io/File;Lnet/minecraft/class_2583;)Lnet/minecraft/class_2583;
- ARG 1 style
METHOD method_35701 (Lnet/minecraft/class_2561;)V
ARG 0 message
METHOD method_35703 getWorldGenerationProgressTracker ()Lnet/minecraft/class_3953;
diff --git a/mappings/net/minecraft/client/color/block/BlockColors.mapping b/mappings/net/minecraft/client/color/block/BlockColors.mapping
index 51e3b82d0f..a372b77666 100644
--- a/mappings/net/minecraft/client/color/block/BlockColors.mapping
+++ b/mappings/net/minecraft/client/color/block/BlockColors.mapping
@@ -51,11 +51,6 @@ CLASS net/minecraft/class_324 net/minecraft/client/color/block/BlockColors
ARG 1 world
ARG 2 pos
ARG 3 tintIndex
- METHOD method_1694 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;I)I
- ARG 0 state
- ARG 1 world
- ARG 2 pos
- ARG 3 tintIndex
METHOD method_1695 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;I)I
ARG 0 state
ARG 1 world
diff --git a/mappings/net/minecraft/client/color/world/BiomeColors.mapping b/mappings/net/minecraft/client/color/world/BiomeColors.mapping
index dae0c899d0..41dac484e5 100644
--- a/mappings/net/minecraft/client/color/world/BiomeColors.mapping
+++ b/mappings/net/minecraft/client/color/world/BiomeColors.mapping
@@ -2,10 +2,6 @@ CLASS net/minecraft/class_1163 net/minecraft/client/color/world/BiomeColors
FIELD field_5664 FOLIAGE_COLOR Lnet/minecraft/class_6539;
FIELD field_5665 GRASS_COLOR Lnet/minecraft/class_6539;
FIELD field_5666 WATER_COLOR Lnet/minecraft/class_6539;
- METHOD method_23790 (Lnet/minecraft/class_1959;DD)I
- ARG 0 biome
- ARG 1 x
- ARG 3 z
METHOD method_23791 (Lnet/minecraft/class_1959;DD)I
ARG 0 biome
ARG 1 x
diff --git a/mappings/net/minecraft/client/data/ItemModelGenerator.mapping b/mappings/net/minecraft/client/data/ItemModelGenerator.mapping
index 38ce3b6fba..58ff863498 100644
--- a/mappings/net/minecraft/client/data/ItemModelGenerator.mapping
+++ b/mappings/net/minecraft/client/data/ItemModelGenerator.mapping
@@ -27,10 +27,6 @@ CLASS net/minecraft/class_4915 net/minecraft/client/data/ItemModelGenerator
METHOD method_65427 registerDyeable (Lnet/minecraft/class_1792;I)V
ARG 1 item
ARG 2 defaultColor
- METHOD method_65428 registerSpawnEgg (Lnet/minecraft/class_1792;II)V
- ARG 1 item
- ARG 2 shellColor
- ARG 3 spotsColor
METHOD method_65429 registerArmor (Lnet/minecraft/class_1792;Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;Z)V
ARG 1 item
ARG 2 equipmentKey
diff --git a/mappings/net/minecraft/client/font/FontStorage.mapping b/mappings/net/minecraft/client/font/FontStorage.mapping
index 313f100ae8..8e13193368 100644
--- a/mappings/net/minecraft/client/font/FontStorage.mapping
+++ b/mappings/net/minecraft/client/font/FontStorage.mapping
@@ -20,7 +20,6 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage
METHOD method_2004 setFonts (Ljava/util/List;Ljava/util/Set;)V
ARG 1 allFonts
ARG 2 activeFilters
- METHOD method_2010 closeGlyphAtlases ()V
METHOD method_2011 getGlyph (IZ)Lnet/minecraft/class_379;
COMMENT {@return the glyph of {@code codePoint}}
COMMENT
diff --git a/mappings/net/minecraft/client/render/model/Geometry.mapping b/mappings/net/minecraft/client/render/model/Geometry.mapping
index a349245010..c99a9de4fc 100644
--- a/mappings/net/minecraft/client/render/model/Geometry.mapping
+++ b/mappings/net/minecraft/client/render/model/Geometry.mapping
@@ -1,6 +1,6 @@
CLASS net/minecraft/class_10820 net/minecraft/client/render/model/Geometry
FIELD field_57025 EMPTY Lnet/minecraft/class_10820;
- METHOD bake bake (Lnet/minecraft/class_10419;Lnet/minecraft/class_7775;Lnet/minecraft/class_3665;Lnet/minecraft/class_10813;)Lnet/minecraft/class_10817;
+ METHOD bake (Lnet/minecraft/class_10419;Lnet/minecraft/class_7775;Lnet/minecraft/class_3665;Lnet/minecraft/class_10813;)Lnet/minecraft/class_10817;
ARG 1 textures
ARG 2 baker
ARG 3 settings
diff --git a/mappings/net/minecraft/client/render/model/UnbakedModel.mapping b/mappings/net/minecraft/client/render/model/UnbakedModel.mapping
index 5e902a57e8..86bf3869da 100644
--- a/mappings/net/minecraft/client/render/model/UnbakedModel.mapping
+++ b/mappings/net/minecraft/client/render/model/UnbakedModel.mapping
@@ -1,5 +1,6 @@
CLASS net/minecraft/class_1100 net/minecraft/client/render/model/UnbakedModel
FIELD field_57026 PARTICLE_TEXTURE Ljava/lang/String;
+ METHOD comp_3740 guiLight ()Lnet/minecraft/class_1100$class_4751;
METHOD comp_3742 transformations ()Lnet/minecraft/class_809;
METHOD comp_3743 textures ()Lnet/minecraft/class_10419$class_10420;
METHOD comp_3744 parentId ()Lnet/minecraft/class_2960;
diff --git a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping
index 8e4c3900d2..eb5826fe04 100644
--- a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping
+++ b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping
@@ -2,6 +2,7 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked
FIELD comp_3740 guiLight Lnet/minecraft/class_1100$class_4751;
FIELD comp_3742 transformations Lnet/minecraft/class_809;
FIELD comp_3743 textures Lnet/minecraft/class_10419$class_10420;
+ FIELD comp_3744 parentId Lnet/minecraft/class_2960;
FIELD field_4254 GSON Lcom/google/gson/Gson;
METHOD method_3437 deserialize (Ljava/io/Reader;)Lnet/minecraft/class_793;
ARG 0 input
diff --git a/mappings/net/minecraft/client/texture/AbstractTexture.mapping b/mappings/net/minecraft/client/texture/AbstractTexture.mapping
index f0e8c3a3bb..efbdeb6f8c 100644
--- a/mappings/net/minecraft/client/texture/AbstractTexture.mapping
+++ b/mappings/net/minecraft/client/texture/AbstractTexture.mapping
@@ -4,8 +4,6 @@ CLASS net/minecraft/class_1044 net/minecraft/client/texture/AbstractTexture
METHOD method_4527 setFilter (ZZ)V
ARG 1 bilinear
ARG 2 mipmap
- METHOD method_4528 clearGlId ()V
- METHOD method_4624 getGlId ()I
METHOD method_65923 setFilter (Lnet/minecraft/class_9851;Z)V
ARG 1 bilinear
ARG 2 mipmap
diff --git a/mappings/net/minecraft/client/texture/NativeImage.mapping b/mappings/net/minecraft/client/texture/NativeImage.mapping
index 4f745da28a..fbadb06adb 100644
--- a/mappings/net/minecraft/client/texture/NativeImage.mapping
+++ b/mappings/net/minecraft/client/texture/NativeImage.mapping
@@ -25,11 +25,6 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage
ARG 5 pointer
METHOD method_24032 write (Ljava/nio/channels/WritableByteChannel;)Z
ARG 1 channel
- METHOD method_35620 readDepthComponent (F)V
- ARG 1 unused
- METHOD method_35627 drawPixels ()V
- COMMENT Use {@code upload} to upload this image to GL so it can be used later. This
- COMMENT method is not used in vanilla, and its side effects are not yet known.
METHOD method_36559 isOutOfBounds (II)Z
ARG 1 x
ARG 2 y
@@ -90,7 +85,6 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage
METHOD method_4317 copyFrom (Lnet/minecraft/class_1011;)V
ARG 1 image
METHOD method_4318 getFormat ()Lnet/minecraft/class_1011$class_1012;
- METHOD method_4319 mirrorVertically ()V
METHOD method_4320 checkAllocated ()V
METHOD method_4322 makePixelArray ()[I
METHOD method_4323 getHeight ()I
@@ -104,9 +98,6 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage
ARG 3 width
ARG 4 height
ARG 5 color
- METHOD method_4327 loadFromTextureImage (IZ)V
- ARG 1 level
- ARG 2 removeAlpha
METHOD method_47594 copyRect (Lnet/minecraft/class_1011;IIIIIIZZ)V
ARG 1 image
ARG 2 x
@@ -122,8 +113,6 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage
METHOD method_48463 copyPixelsAbgr ()[I
METHOD method_49277 read ([B)Lnet/minecraft/class_1011;
ARG 0 bytes
- METHOD method_51596 apply (Ljava/util/function/IntUnaryOperator;)V
- ARG 1 operator
METHOD method_61940 getColorArgb (II)I
ARG 1 x
ARG 2 y
@@ -198,8 +187,6 @@ CLASS net/minecraft/class_1011 net/minecraft/client/texture/NativeImage
ARG 0 glFormat
METHOD method_4337 hasOpacityChannel ()Z
METHOD method_4338 isWriteable ()Z
- METHOD method_4339 setPackAlignment ()V
- METHOD method_4340 setUnpackAlignment ()V
CLASS class_1014 WriteCallback
FIELD field_5018 channel Ljava/nio/channels/WritableByteChannel;
FIELD field_5019 exception Ljava/io/IOException;
diff --git a/mappings/net/minecraft/client/texture/TextureType.mapping b/mappings/net/minecraft/client/texture/TextureType.mapping
index 89e5377310..179acfdcd0 100644
--- a/mappings/net/minecraft/client/texture/TextureType.mapping
+++ b/mappings/net/minecraft/client/texture/TextureType.mapping
@@ -2,7 +2,7 @@ CLASS net/minecraft/class_10793 net/minecraft/client/texture/TextureType
FIELD field_56776 glId I
FIELD field_56777 formatId I
FIELD field_56778 glType I
- METHOD