Merge branch '1.21.2-pre5' into loot-restoration

QuiltMC · Oct 17, 2024 · a47907e · a47907e
2 parents 1d89c7e + 0e9f003
commit a47907e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 49 deletions.
diff --git a/buildSrc/src/main/java/quilt/internal/Constants.java b/buildSrc/src/main/java/quilt/internal/Constants.java
@@ -1,7 +1,7 @@
 package quilt.internal;
 
 public class Constants {
-    public static final String MINECRAFT_VERSION = "1.21.2-pre3";
+    public static final String MINECRAFT_VERSION = "1.21.2-pre5";
 
     public static final String MAPPINGS_NAME = "quilt-mappings";
 

diff --git a/mappings/net/minecraft/client/font/TextRenderer.mapping b/mappings/net/minecraft/client/font/TextRenderer.mapping
@@ -75,16 +75,6 @@ CLASS net/minecraft/unmapped/C_mavozmpp net/minecraft/client/font/TextRenderer
 		COMMENT @see TextHandler#trimToWidth(StringVisitable, int, Style)
 		ARG 1 text
 		ARG 2 width
-	METHOD m_mihgbohs drawLayer (Lnet/minecraft/unmapped/C_apvkgwyi;FFIZLorg/joml/Matrix4f;Lnet/minecraft/unmapped/C_igrgeffe;Lnet/minecraft/unmapped/C_mavozmpp$C_ocdaignk;II)F
-		ARG 1 text
-		ARG 2 x
-		ARG 3 y
-		ARG 4 color
-		ARG 5 shadow
-		ARG 6 matrix
-		ARG 8 layerType
-		ARG 9 backgroundColor
-		ARG 10 light
 	METHOD m_mvkafkhm trimToWidth (Ljava/lang/String;IZ)Ljava/lang/String;
 		COMMENT Trims a string to be at most {@code maxWidth} wide.
 		COMMENT
@@ -105,16 +95,6 @@ CLASS net/minecraft/unmapped/C_mavozmpp net/minecraft/client/font/TextRenderer
 	METHOD m_ujfpnqcd getWrappedHeight (Ljava/lang/String;I)I
 		ARG 1 string
 		ARG 2 width
-	METHOD m_uwucvsbx drawLayer (Ljava/lang/String;FFIZLorg/joml/Matrix4f;Lnet/minecraft/unmapped/C_igrgeffe;Lnet/minecraft/unmapped/C_mavozmpp$C_ocdaignk;II)F
-		ARG 1 string
-		ARG 2 x
-		ARG 3 y
-		ARG 4 color
-		ARG 5 shadow
-		ARG 6 matrix
-		ARG 8 layerType
-		ARG 9 backgroundColor
-		ARG 10 light
 	METHOD m_vafykqut (ILnet/minecraft/unmapped/C_cpwnhism;)F
 		ARG 1 codePoint
 		ARG 2 style
@@ -149,27 +129,6 @@ CLASS net/minecraft/unmapped/C_mavozmpp net/minecraft/client/font/TextRenderer
 		ARG 8 layerType
 		ARG 9 backgroundColor
 		ARG 10 light
-	METHOD m_xtzlxpas draw (Ljava/lang/String;FFIZLorg/joml/Matrix4f;Lnet/minecraft/unmapped/C_igrgeffe;Lnet/minecraft/unmapped/C_mavozmpp$C_ocdaignk;IIZ)I
-		ARG 1 string
-		ARG 2 x
-		ARG 3 y
-		ARG 4 color
-		ARG 5 shadow
-		ARG 6 matrix
-		ARG 8 layerType
-		ARG 9 backgroundColor
-		ARG 10 light
-		ARG 11 mirror
-	METHOD m_ybkkobbj drawOrderedText (Lnet/minecraft/unmapped/C_apvkgwyi;FFIZLorg/joml/Matrix4f;Lnet/minecraft/unmapped/C_igrgeffe;Lnet/minecraft/unmapped/C_mavozmpp$C_ocdaignk;II)I
-		ARG 1 text
-		ARG 2 x
-		ARG 3 y
-		ARG 4 color
-		ARG 5 shadow
-		ARG 6 matrix
-		ARG 8 layerType
-		ARG 9 backgroundColor
-		ARG 10 light
 	CLASS C_ocdaignk TextLayerType
 	CLASS C_uyopinqv Drawer
 		FIELD f_cplmjaow brightnessMultiplier F

diff --git a/mappings/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.mapping b/mappings/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.mapping
@@ -27,10 +27,10 @@ CLASS net/minecraft/unmapped/C_xaybmvwz net/minecraft/client/gui/widget/recipe_b
 	METHOD m_eanvxfyf slotClicked (Lnet/minecraft/unmapped/C_nhvqfffd;)V
 		ARG 1 slot
 	METHOD m_eopkovui isOpen ()Z
-	METHOD m_frjhvoth (Lit/unimi/dsi/fastutil/objects/ObjectSet;Lnet/minecraft/unmapped/C_ymmazfhq;)Z
-		ARG 1 resultCollection
-	METHOD m_ixkmzxex (Lnet/minecraft/unmapped/C_ymmazfhq;)Z
+	METHOD m_frjhvoth (Lnet/minecraft/unmapped/C_ymmazfhq;)Z
 		ARG 0 resultCollection
+	METHOD m_ixkmzxex (Lit/unimi/dsi/fastutil/objects/ObjectSet;Lnet/minecraft/unmapped/C_ymmazfhq;)Z
+		ARG 1 resultCollection
 	METHOD m_jzxxgocn initialize (IILnet/minecraft/unmapped/C_ayfeobid;Z)V
 		ARG 1 parentWidth
 		ARG 2 parentHeight
@@ -56,8 +56,6 @@ CLASS net/minecraft/unmapped/C_xaybmvwz net/minecraft/client/gui/widget/recipe_b
 		ARG 1 search
 	METHOD m_qeglizvq refreshSearchResults ()V
 	METHOD m_rggebjdu toggleOpen ()V
-	METHOD m_sarshcma (Lnet/minecraft/unmapped/C_ymmazfhq;)Z
-		ARG 0 resultCollection
 	METHOD m_suoowudj refreshTabButtons (Z)V
 	METHOD m_tookqomy isWide ()Z
 	METHOD m_topijjtk findLeftEdge (II)I

diff --git a/mappings/net/minecraft/util/math/BlockPos.mapping b/mappings/net/minecraft/util/math/BlockPos.mapping
@@ -6,12 +6,10 @@ CLASS net/minecraft/unmapped/C_hynzadkk net/minecraft/util/math/BlockPos
 	COMMENT A block position may be mutable; hence, when using block positions
 	COMMENT obtained from other places as map keys, etc., you should call {@link
 	COMMENT #toImmutable()} to obtain an immutable block position.
-	FIELD f_aoehwwsf SIZE_BITS_X I
 	FIELD f_bxvvupqt BITS_X J
 	FIELD f_hsekmekl LOGGER Lorg/slf4j/Logger;
 	FIELD f_kjunxshk BITS_Y J
 	FIELD f_ktlgsitz SIZE_BITS_Y I
-	FIELD f_lxmqztxq SIZE_BITS_Z I
 	FIELD f_mcthbtbh PACKET_CODEC Lnet/minecraft/unmapped/C_qsrmwluu;
 	FIELD f_rkdfzepm BITS_Z J
 	FIELD f_tudfxhtp BIT_SHIFT_Z I