Merge branch '25w06a' into gradle-cleanup+mojmap-download

supersaiyansubtlety · Feb 10, 2025 · 7e5e6c1 · 7e5e6c1 · github-actions · Feb 10, 2025
2 parents b29cd76 + fe1d067
commit 7e5e6c1
Show file tree

Hide file tree

Showing 162 changed files with 120 additions and 937 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Build artifacts
         if: ${{ matrix.java == 21 }}
         continue-on-error: true
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Artifacts
           path: build/libs/
diff --git a/.github/workflows/generate-diff.yml b/.github/workflows/generate-diff.yml
@@ -37,7 +37,7 @@ jobs:
           target-src-exists: ${{ steps.can-create-diff.outputs.files_exists }}
       - name: Upload diff
         if: hashFiles('target.diff') != ''
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Diff
           path: target.diff
diff --git a/build.gradle b/build.gradle
@@ -90,6 +90,9 @@ dependencies {
 	javadocClasspath(libs.jetbrains.annotations)
 	// for some other jsr annotations
 	javadocClasspath(libs.jsr305)
+	// for an annotation
+	javadocClasspath(libs.checkerframework)
+
 	hashed "org.quiltmc:hashed:${MINECRAFT_VERSION}${USE_SNAPSHOT_HASHES ? "-SNAPSHOT" : ""}"
 	intermediary "net.fabricmc:intermediary:${MINECRAFT_VERSION}:v2"
 }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-minecraft = "25w03a"
+minecraft = "25w06a"
 
 commons_io = "2.11.0"
 guava = "33.2.1-jre"
@@ -16,6 +16,7 @@ javadoc_draftsman = "1.2.3"
 quilt_loader = "0.26.1"
 jetbrains_annotations = "23.0.0"
 jsr305 = "3.0.2"
+checkerframework = "3.42.0"
 
 dictionary = "f9c2abb8ad2df8bf64df06ae2f6ede86704b82c7"
 
@@ -50,6 +51,7 @@ javadoc_draftsman = { module = "org.quiltmc:javadoc-draftsman", version.ref = "j
 quilt_loader = { module = "org.quiltmc:quilt-loader", version.ref = "quilt_loader" }
 jetbrains_annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains_annotations" }
 jsr305 = { module = "com.google.code.findbugs:jsr305", version.ref = "jsr305" }
+checkerframework = { module = "org.checkerframework:checker-qual", version.ref = "checkerframework"}
 
 # TODO this should probably be published to quilt maven, see #442
 dictionary = { module = "ix0rai:qm-base-allowed-wordlist", version.ref = "dictionary"}

diff --git a/mappings/com/mojang/blaze3d/vertex/BufferRenderer.mapping b/mappings/com/mojang/blaze3d/vertex/BufferRenderer.mapping
diff --git a/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterionTrigger.mapping b/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterionTrigger.mapping
@@ -11,14 +11,12 @@ CLASS net/minecraft/unmapped/C_vteznemu net/minecraft/advancement/criterion/Enti
 		FIELD f_xvxndxmn damage Ljava/util/Optional;
 		METHOD <init> (Ljava/util/Optional;Ljava/util/Optional;)V
 			ARG 1 playerPredicate
-		METHOD m_ckqvihhp create (Lnet/minecraft/unmapped/C_mzdoirue$C_fpwftvxm;)Lnet/minecraft/unmapped/C_rzypsigz;
-			ARG 0 damage
+		METHOD m_ckqvihhp create (Lnet/minecraft/unmapped/C_ddarctcj$C_fpwftvxm;)Lnet/minecraft/unmapped/C_rzypsigz;
 		METHOD m_gztunifz matches (Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_sbxfkpyv;FFZ)Z
 			ARG 1 player
 			ARG 2 source
 			ARG 3 dealt
 			ARG 4 taken
 			ARG 5 blocked
-		METHOD m_tunbavbi create (Lnet/minecraft/unmapped/C_mzdoirue;)Lnet/minecraft/unmapped/C_rzypsigz;
-			ARG 0 damage
+		METHOD m_tunbavbi create (Lnet/minecraft/unmapped/C_ddarctcj;)Lnet/minecraft/unmapped/C_rzypsigz;
 		METHOD m_wrrkjjlx create ()Lnet/minecraft/unmapped/C_rzypsigz;
diff --git a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterionTrigger.mapping b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterionTrigger.mapping
@@ -28,8 +28,6 @@ CLASS net/minecraft/unmapped/C_cufgrabk net/minecraft/advancement/criterion/Play
 			ARG 0 damage
 			ARG 1 entity
 		METHOD m_rfnemosy create ()Lnet/minecraft/unmapped/C_rzypsigz;
-		METHOD m_vqupybid create (Lnet/minecraft/unmapped/C_mzdoirue$C_fpwftvxm;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_rzypsigz;
-			ARG 0 damage
+		METHOD m_vqupybid create (Lnet/minecraft/unmapped/C_ddarctcj$C_fpwftvxm;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_rzypsigz;
 			ARG 1 entity
-		METHOD m_yfqhvjuf createDamage (Lnet/minecraft/unmapped/C_mzdoirue$C_fpwftvxm;)Lnet/minecraft/unmapped/C_rzypsigz;
-			ARG 0 damage
+		METHOD m_yfqhvjuf createDamage (Lnet/minecraft/unmapped/C_ddarctcj$C_fpwftvxm;)Lnet/minecraft/unmapped/C_rzypsigz;
diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping
@@ -60,7 +60,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
 		ARG 4 context
 	METHOD m_fsimvkxt getCullingShape (Lnet/minecraft/unmapped/C_txtbiemp;)Lnet/minecraft/unmapped/C_zscvhwbd;
 		ARG 1 state
-	METHOD m_fwpxnldx getInsideCollisionShape (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zscvhwbd;
+	METHOD m_fwpxnldx getInsideCollisionShape (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_zscvhwbd;
 	METHOD m_gzvkqagj createScreenHandlerFactory (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_soxpxdhu;
 		ARG 1 state
 		ARG 2 world
@@ -334,7 +334,7 @@ CLASS net/minecraft/unmapped/C_triydqro net/minecraft/block/AbstractBlock
 			ARG 1 block
 				COMMENT the block instance to match
 		METHOD m_geunkiif hasModelOffset ()Z
-		METHOD m_hhjvgbvf getInsideCollisionShape (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_zscvhwbd;
+		METHOD m_hhjvgbvf getInsideCollisionShape (Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_zscvhwbd;
 		METHOD m_hndkckmc spawnsDustParticles ()Z
 		METHOD m_hnwtgjio streamTags ()Ljava/util/stream/Stream;
 			COMMENT {@return a stream of tag keys this block is in}

diff --git a/mappings/net/minecraft/block/AbstractPlantBlock.mapping b/mappings/net/minecraft/block/AbstractPlantBlock.mapping
@@ -1,5 +1 @@
 CLASS net/minecraft/unmapped/C_bgdokvym net/minecraft/block/AbstractPlantBlock
-	METHOD m_hjbkfomn canPlantOnTop (Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Z
-		ARG 1 floor
-		ARG 2 world
-		ARG 3 pos
diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping
@@ -250,11 +250,6 @@ CLASS net/minecraft/unmapped/C_mmxmpdoq net/minecraft/block/Block
 	METHOD m_xaxtaifj isFaceFullSquare (Lnet/minecraft/unmapped/C_zscvhwbd;Lnet/minecraft/unmapped/C_xpuuihxf;)Z
 		ARG 0 shape
 		ARG 1 side
-	METHOD m_xfcybcsi appendTooltip (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_vorddnax$C_rdhfmrgz;Ljava/util/List;Lnet/minecraft/unmapped/C_taebrtdw;)V
-		ARG 1 stack
-		ARG 2 tooltipContext
-		ARG 3 tooltip
-		ARG 4 options
 	METHOD m_yobbjtvm getJumpVelocityMultiplier ()F
 	METHOD m_yujtcnah appendProperties (Lnet/minecraft/unmapped/C_ezfeikaq$C_mfnsmxhw;)V
 		ARG 1 builder

diff --git a/mappings/net/minecraft/block/DeadBushBlock.mapping b/mappings/net/minecraft/block/DeadBushBlock.mapping
diff --git a/mappings/net/minecraft/block/LeavesBlock.mapping b/mappings/net/minecraft/block/LeavesBlock.mapping
@@ -2,7 +2,6 @@ CLASS net/minecraft/unmapped/C_vpbrfrld net/minecraft/block/LeavesBlock
 	FIELD f_idpcqsbq DISTANCE Lnet/minecraft/unmapped/C_vltzvhxi;
 	FIELD f_kefxatay PERSISTENT Lnet/minecraft/unmapped/C_xhwijdsd;
 	FIELD f_rjjksefw TICK_DELAY I
-	FIELD f_skqokyhb CODEC Lcom/mojang/serialization/MapCodec;
 	FIELD f_vpbxbcme WATERLOGGED Lnet/minecraft/unmapped/C_xhwijdsd;
 	FIELD f_wlukwelu MAX_DISTANCE I
 	METHOD m_gpxzhkzd getDistanceFromLog (Lnet/minecraft/unmapped/C_txtbiemp;)I

diff --git a/mappings/net/minecraft/block/ShulkerBoxBlock.mapping b/mappings/net/minecraft/block/ShulkerBoxBlock.mapping
@@ -1,6 +1,5 @@
 CLASS net/minecraft/unmapped/C_buvdtidq net/minecraft/block/ShulkerBoxBlock
 	FIELD f_apudlvny CONTENTS_DYNAMIC_DROP_ID Lnet/minecraft/unmapped/C_ncpywfca;
-	FIELD f_ihshplar UNKNOWN_CONTENTS_TEXT Lnet/minecraft/unmapped/C_rdaqiwdt;
 	FIELD f_lkgtjife CODEC Lcom/mojang/serialization/MapCodec;
 	FIELD f_tdgqhkue color Lnet/minecraft/unmapped/C_arllgqae;
 	FIELD f_wkcidmzm FACING Lnet/minecraft/unmapped/C_cgckxfsw;

diff --git a/mappings/net/minecraft/block/TrialSpawnerData.mapping b/mappings/net/minecraft/block/TrialSpawnerData.mapping
@@ -21,8 +21,6 @@ CLASS net/minecraft/unmapped/C_kxkfzuix net/minecraft/block/TrialSpawnerData
 		ARG 1 playerUuids
 	METHOD m_gutsddek (Lnet/minecraft/unmapped/C_kxkfzuix;)Ljava/util/Optional;
 		ARG 0 data
-	METHOD m_hczcnors (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_edcjbljn;)V
-		ARG 1 nbt
 	METHOD m_hqnuaozt detectPlayers (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_jelkcvqk;)V
 		ARG 3 logic
 	METHOD m_jyshkmfh (Lnet/minecraft/unmapped/C_kxkfzuix;)Ljava/util/Set;

diff --git a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping
@@ -13,8 +13,4 @@ CLASS net/minecraft/unmapped/C_mwamopji net/minecraft/block/entity/BannerBlockEn
 		ARG 3 baseColor
 	METHOD m_bxugddgd getPickStack ()Lnet/minecraft/unmapped/C_sddaxwyk;
 	METHOD m_kmayejyb getPatterns ()Lnet/minecraft/unmapped/C_wwbphpbp;
-	METHOD m_kveaxwty (Lnet/minecraft/unmapped/C_wwbphpbp;)V
-		ARG 1 patterns
-	METHOD m_ribbgpxv (Ljava/lang/String;)V
-		ARG 0 message
 	METHOD m_wstxdupp getColorForState ()Lnet/minecraft/unmapped/C_arllgqae;
diff --git a/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping
@@ -31,15 +31,11 @@ CLASS net/minecraft/unmapped/C_cyniebsl net/minecraft/block/entity/BeehiveBlockE
 	METHOD m_camfdiec isFullOfBees ()Z
 	METHOD m_czgkogzg addBee (Lnet/minecraft/unmapped/C_cyniebsl$C_cakykluc;)V
 		ARG 1 occupant
-	METHOD m_izudhcbb (Ljava/lang/String;)V
-		ARG 0 message
 	METHOD m_jbfwnhjx angerBees (Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cyniebsl$C_ajqcctan;)V
 		ARG 1 player
 		ARG 2 state
 		ARG 3 beeState
 	METHOD m_kxlqccck getBeeCount ()I
-	METHOD m_onkqbfmj (Ljava/util/List;)V
-		ARG 1 bees
 	METHOD m_oypeqdjf tryEnterHive (Lnet/minecraft/unmapped/C_hgfgxpql;)V
 	METHOD m_qwlovmrg getOccupants ()Ljava/util/List;
 	METHOD m_qxxpjewr hasNoBees ()Z

diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping
@@ -24,8 +24,6 @@ CLASS net/minecraft/unmapped/C_kvegafmh net/minecraft/block/entity/BlockEntity
 		ARG 2 state
 	METHOD m_culdahst readBlockPosFromNbt (Lnet/minecraft/unmapped/C_hhlwcnih;)Lnet/minecraft/unmapped/C_hynzadkk;
 		ARG 0 nbt
-	METHOD m_dcspzwcg (Ljava/lang/String;)V
-		ARG 0 message
 	METHOD m_dzrbmfhv toNbtWithId (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_hhlwcnih;
 		ARG 1 lookupProvider
 	METHOD m_efaugnfj getComponents ()Lnet/minecraft/unmapped/C_kouhnfig;
@@ -68,12 +66,6 @@ CLASS net/minecraft/unmapped/C_kvegafmh net/minecraft/block/entity/BlockEntity
 		COMMENT <p>
 		COMMENT The NBT will be passed to (TODO: restore link) on the client.
 	METHOD m_ntnawmxi supportsState (Lnet/minecraft/unmapped/C_txtbiemp;)Z
-	METHOD m_nywzerda (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Ljava/lang/String;Lnet/minecraft/unmapped/C_wgqvodus;)Lnet/minecraft/unmapped/C_kvegafmh;
-		ARG 3 type
-	METHOD m_obrnqsbc (Lnet/minecraft/unmapped/C_kouhnfig;)V
-		ARG 1 components
-	METHOD m_ohoktjws (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_oivssbvb;)V
-		ARG 1 nbt
 	METHOD m_pcgjfrqh removeComponentData (Lnet/minecraft/unmapped/C_hhlwcnih;)V
 		ARG 1 nbt
 	METHOD m_phlhitmt markDirty ()V
@@ -90,8 +82,6 @@ CLASS net/minecraft/unmapped/C_kvegafmh net/minecraft/block/entity/BlockEntity
 	METHOD m_qrmwzmws onSyncedBlockEvent (II)Z
 		ARG 1 type
 		ARG 2 data
-	METHOD m_qtbhshck (Ljava/lang/String;)V
-		ARG 0 message
 	METHOD m_rjyhuhsi read (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V
 		ARG 1 nbt
 		ARG 2 lookupProvider
@@ -100,8 +90,6 @@ CLASS net/minecraft/unmapped/C_kvegafmh net/minecraft/block/entity/BlockEntity
 	METHOD m_trzmaydr readNbtImpl (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V
 		ARG 1 nbt
 		ARG 2 lookupProvider
-	METHOD m_viatlzso (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;Ljava/lang/String;Lnet/minecraft/unmapped/C_kvegafmh;)Lnet/minecraft/unmapped/C_kvegafmh;
-		ARG 3 blockEntity
 	METHOD m_xokvytvt toNbtWithIdAndPos (Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_hhlwcnih;
 		ARG 1 lookupProvider
 	METHOD m_yymkkcjv populateCrashReport (Lnet/minecraft/unmapped/C_qympisds;)V

diff --git a/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping b/mappings/net/minecraft/block/entity/CampfireBlockEntity.mapping
@@ -19,7 +19,6 @@ CLASS net/minecraft/unmapped/C_wmubauif net/minecraft/block/entity/CampfireBlock
 		ARG 1 pos
 		ARG 2 state
 		ARG 3 campfire
-	METHOD m_tfnetakm spawnItemsBeingCooked ()V
 	METHOD m_xuujaryq (Lnet/minecraft/unmapped/C_hsoxiypb;Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_dscbrwbj;)Lnet/minecraft/unmapped/C_sddaxwyk;
 		ARG 2 recipe
 	METHOD m_yfgcktbg litServerTick (Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_wmubauif;Lnet/minecraft/unmapped/C_hjseusrb$C_bvtkxdyi;)V

diff --git a/mappings/net/minecraft/block/entity/SculkSensorBlockEntity.mapping b/mappings/net/minecraft/block/entity/SculkSensorBlockEntity.mapping
@@ -1,24 +1,15 @@
 CLASS net/minecraft/unmapped/C_pqjuvriw net/minecraft/block/entity/SculkSensorBlockEntity
 	FIELD f_atiuulsx vibrationCallback Lnet/minecraft/unmapped/C_ddxrijfx$C_vnbbhkol;
 	FIELD f_gbzdibtr vibrationData Lnet/minecraft/unmapped/C_ddxrijfx$C_qhpiojal;
-	FIELD f_innqgvgr LOGGER Lorg/slf4j/Logger;
 	FIELD f_ssyorzpw lastVibrationFrequency I
 	FIELD f_vttirlon listener Lnet/minecraft/unmapped/C_ddxrijfx$C_bbtmyknw;
 	METHOD <init> (Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V
 		ARG 1 pos
 		ARG 2 state
-	METHOD m_aaljqkbr (Ljava/lang/String;)V
-		ARG 0 message
-	METHOD m_dzqvjlvg (Lnet/minecraft/unmapped/C_ddxrijfx$C_qhpiojal;)V
-		ARG 1 data
-	METHOD m_eeszhasr (Ljava/lang/String;)V
-		ARG 0 message
 	METHOD m_izybyyix getLastVibrationFrequency ()I
 	METHOD m_owqrlhog setLastVibrationFrequency (I)V
 		ARG 1 lastVibrationFrequency
 	METHOD m_vbxiedfr createVibrationCallback ()Lnet/minecraft/unmapped/C_ddxrijfx$C_vnbbhkol;
-	METHOD m_xsqegbsd (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_oivssbvb;)V
-		ARG 1 element
 	CLASS C_gitysepb VibrationCallback
 		FIELD f_ahwyivvb pos Lnet/minecraft/unmapped/C_hynzadkk;
 		FIELD f_eltojvsi RANGE I

diff --git a/mappings/net/minecraft/block/entity/SculkShriekerBlockEntity.mapping b/mappings/net/minecraft/block/entity/SculkShriekerBlockEntity.mapping
@@ -2,7 +2,6 @@ CLASS net/minecraft/unmapped/C_pnalulqo net/minecraft/block/entity/SculkShrieker
 	FIELD f_agtboayy vibrationListener Lnet/minecraft/unmapped/C_ddxrijfx$C_bbtmyknw;
 	FIELD f_dohdlyye vibrationData Lnet/minecraft/unmapped/C_ddxrijfx$C_qhpiojal;
 	FIELD f_fjvcgmly WARNING_SOUNDS Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
-	FIELD f_kblolahs LOGGER Lorg/slf4j/Logger;
 	FIELD f_krxnjfnn SHRIEKING_TICKS I
 	FIELD f_otkrddol warningLevel I
 	FIELD f_oxhcskzs vibrationCallback Lnet/minecraft/unmapped/C_ddxrijfx$C_vnbbhkol;

diff --git a/mappings/net/minecraft/block/entity/Sherds.mapping b/mappings/net/minecraft/block/entity/Sherds.mapping
@@ -1,12 +1,8 @@
 CLASS net/minecraft/unmapped/C_cpmlbyix net/minecraft/block/entity/Sherds
 	FIELD f_gautzvog DEFAULT Lnet/minecraft/unmapped/C_cpmlbyix;
-	METHOD m_aivswlnd fromNbt (Lnet/minecraft/unmapped/C_hhlwcnih;)Lnet/minecraft/unmapped/C_cpmlbyix;
-		ARG 0 nbt
 	METHOD m_bzxeuray (Ljava/util/Optional;)Lnet/minecraft/unmapped/C_vorddnax;
 		ARG 0 optionalSherd
 	METHOD m_icoizewj getSherd (Ljava/util/List;I)Ljava/util/Optional;
 		ARG 0 sherds
 		ARG 1 index
-	METHOD m_ktzuujya toNbt (Lnet/minecraft/unmapped/C_hhlwcnih;)Lnet/minecraft/unmapped/C_hhlwcnih;
-		ARG 1 nbt
 	METHOD m_nbxpfcaq ordered ()Ljava/util/List;
diff --git a/mappings/net/minecraft/block/entity/SignBlockEntity.mapping b/mappings/net/minecraft/block/entity/SignBlockEntity.mapping
@@ -35,10 +35,6 @@ CLASS net/minecraft/unmapped/C_axouvzlg net/minecraft/block/entity/SignBlockEnti
 		ARG 1 operator
 		ARG 2 front
 	METHOD m_mpmzlwzj isWaxed ()Z
-	METHOD m_nfzjwvwo (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_oivssbvb;)V
-		ARG 1 element
-	METHOD m_nluapjgr (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_oivssbvb;)V
-		ARG 1 element
 	METHOD m_ouxwfbez updateListeners ()V
 	METHOD m_pggyiare tryUpdateText (Lnet/minecraft/unmapped/C_jzrpycqo;ZLjava/util/List;)V
 		ARG 1 player
@@ -62,8 +58,6 @@ CLASS net/minecraft/unmapped/C_axouvzlg net/minecraft/block/entity/SignBlockEnti
 		ARG 4 fromFront
 	METHOD m_wlczwenn setEditor (Ljava/util/UUID;)V
 		ARG 1 editor
-	METHOD m_wyshytgr (Lnet/minecraft/unmapped/C_jzrpycqo;Ljava/util/List;Lnet/minecraft/unmapped/C_ralzcant;)Lnet/minecraft/unmapped/C_ralzcant;
-		ARG 3 text
 	METHOD m_yesfjplu tryClearInvalidEditor (Lnet/minecraft/unmapped/C_axouvzlg;Lnet/minecraft/unmapped/C_cdctfzbn;Ljava/util/UUID;)V
 		ARG 1 blockEntity
 	METHOD m_ykxtknwa getTextLineHeight ()I

diff --git a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping
@@ -26,8 +26,6 @@ CLASS net/minecraft/unmapped/C_vrhaavsg net/minecraft/block/entity/SkullBlockEnt
 	METHOD m_haxxxigt (Ljava/util/Optional;)Ljava/util/concurrent/CompletionStage;
 		ARG 0 profile
 	METHOD m_klbqrovy resetServices ()V
-	METHOD m_krzwiyyt (Ljava/lang/String;)V
-		ARG 0 message
 	METHOD m_nirpgzsb setOwner (Lnet/minecraft/unmapped/C_iqgmrwok;)V
 		ARG 1 owner
 	METHOD m_oshflqna fetchProfile (Ljava/util/UUID;Lnet/minecraft/unmapped/C_vmxvaoqe;Ljava/util/function/BooleanSupplier;)Ljava/util/concurrent/CompletableFuture;
@@ -40,8 +38,6 @@ CLASS net/minecraft/unmapped/C_vrhaavsg net/minecraft/block/entity/SkullBlockEnt
 		ARG 3 skull
 	METHOD m_uqvkmqng getProfile (Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture;
 		ARG 0 username
-	METHOD m_yjswcdkm (Lnet/minecraft/unmapped/C_iqgmrwok;)V
-		ARG 1 owner
 	METHOD m_yqomcdhv fetchProfile (Ljava/lang/String;Lnet/minecraft/unmapped/C_vmxvaoqe;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 services
 	METHOD m_yrfbflxq loadOwnerProperties ()V
diff --git a/mappings/net/minecraft/block/entity/Spawner.mapping b/mappings/net/minecraft/block/entity/Spawner.mapping
@@ -2,9 +2,8 @@ CLASS net/minecraft/unmapped/C_xheeywhc net/minecraft/block/entity/Spawner
 	METHOD m_aohplshh setEntityType (Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_rlomrsco;)V
 	METHOD m_jdhkawxq (Lnet/minecraft/unmapped/C_ogavsvbr;)Lnet/minecraft/unmapped/C_npqneive;
 		ARG 0 entityType
-	METHOD m_mfyyxczo getEntityTypeText (Lnet/minecraft/unmapped/C_sddaxwyk;Ljava/lang/String;)Lnet/minecraft/unmapped/C_rdaqiwdt;
+	METHOD m_mfyyxczo getEntityTypeText (Lnet/minecraft/unmapped/C_incrreuu;Ljava/lang/String;)Lnet/minecraft/unmapped/C_rdaqiwdt;
 	METHOD m_sldhtymu tryReadEntityTypeId (Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/lang/String;)Lnet/minecraft/unmapped/C_ncpywfca;
 		ARG 0 nbt
 		ARG 1 key
-	METHOD m_vysbdnfp appendTooltip (Lnet/minecraft/unmapped/C_sddaxwyk;Ljava/util/List;Ljava/lang/String;)V
-		ARG 1 tooltip
+	METHOD m_vysbdnfp appendTooltip (Lnet/minecraft/unmapped/C_incrreuu;Ljava/util/function/Consumer;Ljava/lang/String;)V
diff --git a/mappings/net/minecraft/block/entity/TrialSpawnerBlockEntity.mapping b/mappings/net/minecraft/block/entity/TrialSpawnerBlockEntity.mapping
@@ -1,9 +1,3 @@
 CLASS net/minecraft/unmapped/C_ndgqjckh net/minecraft/block/entity/TrialSpawnerBlockEntity
 	FIELD f_fhtosxqw spawnerLogic Lnet/minecraft/unmapped/C_jelkcvqk;
-	METHOD m_dojuvztk (Lnet/minecraft/unmapped/C_jelkcvqk;)V
-		ARG 1 logic
-	METHOD m_jadbdmyt (Lcom/mojang/serialization/DataResult$Error;)V
-		ARG 0 error
 	METHOD m_wvhkrgdu getSpawnerLogic ()Lnet/minecraft/unmapped/C_jelkcvqk;
-	METHOD m_ziickmtk (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_oivssbvb;)V
-		ARG 1 logicNbt
diff --git a/mappings/net/minecraft/block/entity/vault/VaultBlockEntity.mapping b/mappings/net/minecraft/block/entity/vault/VaultBlockEntity.mapping
@@ -7,9 +7,6 @@ CLASS net/minecraft/unmapped/C_xclnoluc net/minecraft/block/entity/vault/VaultBl
 		ARG 2 nbt
 	METHOD m_bmrroywl getServerData ()Lnet/minecraft/unmapped/C_nsbycoiv;
 	METHOD m_ksmzflqf getSharedData ()Lnet/minecraft/unmapped/C_czyoqmgb;
-	METHOD m_pdkrtrkx toNbt (Lcom/mojang/serialization/Codec;Ljava/lang/Object;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_oivssbvb;
-		ARG 1 object
-		ARG 2 provider
 	METHOD m_sxksvmgb getConfig ()Lnet/minecraft/unmapped/C_cudfnjix;
 	METHOD m_xqjhnghf setConfig (Lnet/minecraft/unmapped/C_cudfnjix;)V
 		ARG 1 config

diff --git a/mappings/net/minecraft/block/sculk/SculkBehavior.mapping b/mappings/net/minecraft/block/sculk/SculkBehavior.mapping
@@ -1,5 +1,4 @@
 CLASS net/minecraft/unmapped/C_eprlufrn net/minecraft/block/sculk/SculkBehavior
-	FIELD f_ehabkjla LOGGER Lorg/slf4j/Logger;
 	FIELD f_fozckfxo SHRIEKER_PLACEMENT_RATE I
 	FIELD f_gzgdwxbc additionalDecayRate I
 	FIELD f_jlcibacz MAX_CURSORS I
@@ -34,8 +33,6 @@ CLASS net/minecraft/unmapped/C_eprlufrn net/minecraft/block/sculk/SculkBehavior
 		ARG 1 nbt
 	METHOD m_uclrpgkw createBehavior ()Lnet/minecraft/unmapped/C_eprlufrn;
 	METHOD m_ujfthohn getAdditionalDecayRate ()I
-	METHOD m_ukawoyfs (Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_oivssbvb;)V
-		ARG 1 cursor
 	METHOD m_uvpxfkrm getNoGrowthRadius ()I
 	METHOD m_wkyhdfdi addCursor (Lnet/minecraft/unmapped/C_eprlufrn$C_gzpsastu;)V
 		ARG 1 cursor