1.21.3 port

gradle/libs.versions.toml

@@ -4,8 +4,8 @@ download_task = "4.1.1"
 guava = "33.2.1-jre"
 jackson_xml = "2.14.1"
 launchermeta_parser = "1.0.0"
-enigma = "2.5.0"
-enigma_plugin = "2.2.3"
+enigma = "2.5.3"
+enigma_plugin = "2.3.1"
 tiny_remapper = "0.7.2"
 stitch = "0.6.1"
 unpick = "3.0.10"

mappings/com/mojang/blaze3d/platform/GlStateManager.mapping

@@ -15,9 +15,6 @@ CLASS com/mojang/blaze3d/platform/GlStateManager
 		ARG 3 dstFactorAlpha
 	METHOD _clear (I)V
 		ARG 0 red
-		ARG 1 green
-		ARG 2 blue
-		ARG 3 alpha
 	METHOD _clearDepth (D)V
 		ARG 0 depth
 	METHOD _clearStencil (I)V

mappings/net/minecraft/client/gui/screen/realms/RealmsMainScreen.mapping

@@ -162,7 +162,6 @@ CLASS net/minecraft/unmapped/C_uncfwjlr net/minecraft/client/gui/screen/realms/R
 		ARG 1 serverData
 	METHOD m_veeacmfr isSelfOwnedServer (Lnet/minecraft/unmapped/C_pwmwypfb;)Z
 		ARG 0 server
-		ARG 1 serverData
 	METHOD m_vicixlmg (Lnet/minecraft/unmapped/C_yyprjalz;Lnet/minecraft/unmapped/C_gpedgsfu;)V
 		ARG 2 news
 	METHOD m_vjqotsrp (Lnet/minecraft/unmapped/C_buwziidm;)V

mappings/net/minecraft/client/gui/widget/button/realms/RealmsWorldSlotButtonWidget.mapping

@@ -31,8 +31,6 @@ CLASS net/minecraft/unmapped/C_grgwuykf net/minecraft/client/gui/widget/button/r
 		FIELD f_nkhlnupr SWITCH_SLOT Lnet/minecraft/unmapped/C_grgwuykf$C_gjvrelnr;
 		FIELD f_qwzlunbp JOIN Lnet/minecraft/unmapped/C_grgwuykf$C_gjvrelnr;
 		FIELD f_tuhmikau NOTHING Lnet/minecraft/unmapped/C_grgwuykf$C_gjvrelnr;
-		METHOD valueOf (Ljava/lang/String;)Lnet/minecraft/unmapped/C_grgwuykf$C_gjvrelnr;
-			ARG 0 name
 	CLASS C_tappwwnu State
 		FIELD f_ecnehyea slotName Ljava/lang/String;
 		FIELD f_hztumzcl compatibilityType Lnet/minecraft/unmapped/C_pwmwypfb$C_aqtnhegu;

mappings/net/minecraft/client/particle/ParticleManager.mapping

@@ -133,4 +133,3 @@ CLASS net/minecraft/unmapped/C_ttbvlsde net/minecraft/client/particle/ParticleMa
 		FIELD f_qnhlefgc sprites Ljava/util/List;
 		METHOD m_gtnfbdlg setSprites (Ljava/util/List;)V
 			ARG 1 sprites
-	CLASS C_nolcweyw SpriteList

mappings/net/minecraft/client/realms/Ping.mapping

@@ -19,5 +19,3 @@ CLASS net/minecraft/unmapped/C_dntcatdy net/minecraft/client/realms/Ping
 		METHOD <init> (Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)V
 			ARG 3 name
 			ARG 4 endpoint
-		METHOD valueOf (Ljava/lang/String;)Lnet/minecraft/unmapped/C_dntcatdy$C_fikftvwf;
-			ARG 0 name

mappings/net/minecraft/client/realms/RealmsClient.mapping

@@ -160,11 +160,7 @@ CLASS net/minecraft/unmapped/C_ivysvyzf net/minecraft/client/realms/RealmsClient
 			ARG 4 protocol
 		METHOD m_hxuqzeid getEnvironment (Ljava/lang/String;)Ljava/util/Optional;
 			ARG 0 environment
-		METHOD valueOf (Ljava/lang/String;)Lnet/minecraft/unmapped/C_ivysvyzf$C_eyrdsmnc;
-			ARG 0 name
 	CLASS C_ovclqquk CompatibleVersionResponse
 		FIELD f_iqzuxysv OUTDATED Lnet/minecraft/unmapped/C_ivysvyzf$C_ovclqquk;
 		FIELD f_pqsdpxgb COMPATIBLE Lnet/minecraft/unmapped/C_ivysvyzf$C_ovclqquk;
 		FIELD f_rnvoecvo OTHER Lnet/minecraft/unmapped/C_ivysvyzf$C_ovclqquk;
-		METHOD valueOf (Ljava/lang/String;)Lnet/minecraft/unmapped/C_ivysvyzf$C_ovclqquk;
-			ARG 0 name

mappings/net/minecraft/client/realms/SizeUnit.mapping

@@ -11,5 +11,3 @@ CLASS net/minecraft/unmapped/C_mraldbcz net/minecraft/client/realms/SizeUnit
 		ARG 0 bytes
 	METHOD m_yoiqmmrp getLargestUnit (J)Lnet/minecraft/unmapped/C_mraldbcz;
 		ARG 0 bytes
-	METHOD valueOf (Ljava/lang/String;)Lnet/minecraft/unmapped/C_mraldbcz;
-		ARG 0 name

mappings/net/minecraft/client/realms/dto/RealmsServer.mapping

@@ -78,11 +78,7 @@ CLASS net/minecraft/unmapped/C_pwmwypfb net/minecraft/client/realms/dto/RealmsSe
 		FIELD f_mrhfhdqd ADVENTUREMAP Lnet/minecraft/unmapped/C_pwmwypfb$C_ngehrxat;
 		FIELD f_qudtllht INSPIRATION Lnet/minecraft/unmapped/C_pwmwypfb$C_ngehrxat;
 		FIELD f_tovkvrbi EXPERIENCE Lnet/minecraft/unmapped/C_pwmwypfb$C_ngehrxat;
-		METHOD valueOf (Ljava/lang/String;)Lnet/minecraft/unmapped/C_pwmwypfb$C_ngehrxat;
-			ARG 0 name
 	CLASS C_vdhscjrl State
 		FIELD f_chrtawdh CLOSED Lnet/minecraft/unmapped/C_pwmwypfb$C_vdhscjrl;
 		FIELD f_futnjjdz OPEN Lnet/minecraft/unmapped/C_pwmwypfb$C_vdhscjrl;
 		FIELD f_oceimsxo UNINITIALIZED Lnet/minecraft/unmapped/C_pwmwypfb$C_vdhscjrl;
-		METHOD valueOf (Ljava/lang/String;)Lnet/minecraft/unmapped/C_pwmwypfb$C_vdhscjrl;
-			ARG 0 name

mappings/net/minecraft/client/realms/dto/Subscription.mapping

@@ -8,5 +8,3 @@ CLASS net/minecraft/unmapped/C_guwepadk net/minecraft/client/realms/dto/Subscrip
 	METHOD m_qcbsaqlc parse (Ljava/lang/String;)Lnet/minecraft/unmapped/C_guwepadk;
 		ARG 0 json
 	CLASS C_eeqsqtcu SubscriptionType
-		METHOD valueOf (Ljava/lang/String;)Lnet/minecraft/unmapped/C_guwepadk$C_eeqsqtcu;
-			ARG 0 name

mappings/net/minecraft/client/realms/dto/WorldTemplate.mapping

@@ -17,5 +17,3 @@ CLASS net/minecraft/unmapped/C_bunsefgd net/minecraft/client/realms/dto/WorldTem
 		FIELD f_mmoxcoiv ADVENTUREMAP Lnet/minecraft/unmapped/C_bunsefgd$C_ynizeclk;
 		FIELD f_vblfznux EXPERIENCE Lnet/minecraft/unmapped/C_bunsefgd$C_ynizeclk;
 		FIELD f_zaubithj INSPIRATION Lnet/minecraft/unmapped/C_bunsefgd$C_ynizeclk;
-		METHOD valueOf (Ljava/lang/String;)Lnet/minecraft/unmapped/C_bunsefgd$C_ynizeclk;
-			ARG 0 name

mappings/net/minecraft/datafixer/fix/StatsCounterFix.mapping

@@ -12,6 +12,5 @@ CLASS net/minecraft/unmapped/C_kbydvftx net/minecraft/datafixer/fix/StatsCounter
 		ARG 1 outputSchema
 		ARG 2 changesType
 	METHOD m_dxoflidq getItem (Ljava/lang/String;)Ljava/lang/String;
-		ARG 1 oldName
 	METHOD m_gzadlllc getBlock (Ljava/lang/String;)Ljava/lang/String;
-		ARG 1 oldName
+	METHOD makeRule makeRule ()Lcom/mojang/datafixers/TypeRewriteRule;

mappings/net/minecraft/entity/LivingEntity.mapping

@@ -204,7 +204,7 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
 	METHOD m_emvhacmb isSeenBy (Lnet/minecraft/unmapped/C_usxaxydn;DZZLjava/util/function/Predicate;[Ljava/util/function/DoubleSupplier;)Z
 		COMMENT @return {@code true} if the passed {@code entity} sees this entity and
 		COMMENT isn't {@code filter}ed, or {@code false} otherwise
-		ARG 1
+		ARG 1 entity
 			COMMENT the entity to check
 		ARG 2 tolerance
 			COMMENT the maximum allowable angle between the passed {@code entity}'s

mappings/net/minecraft/entity/ai/brain/task/PlayWithVillagerBabiesTask.mapping

@@ -16,10 +16,8 @@ CLASS net/minecraft/unmapped/C_pknbcifi net/minecraft/entity/ai/brain/task/PlayW
 	METHOD m_nkurvpyl isInteractionTargetOf (Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_usxaxydn;)Z
 		ARG 0 target
 		ARG 1 entity
-		ARG 2 other
 	METHOD m_oeslmduv getInteractionTarget (Lnet/minecraft/unmapped/C_usxaxydn;)Lnet/minecraft/unmapped/C_usxaxydn;
 		ARG 0 entity
-		ARG 1 entity
 	METHOD m_omsojhze (Lnet/minecraft/unmapped/C_rcqaryar$C_loqvwuht;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
 	METHOD m_qlzbkmup getLeastPopularBabyInteractionTarget (Ljava/util/List;)Ljava/util/Optional;
@@ -28,4 +26,3 @@ CLASS net/minecraft/unmapped/C_pknbcifi net/minecraft/entity/ai/brain/task/PlayW
 		ARG 1 checkedEntity
 	METHOD m_ssifeeyh hasInteractionTarget (Lnet/minecraft/unmapped/C_usxaxydn;)Z
 		ARG 0 entity
-		ARG 1 entity

mappings/net/minecraft/entity/passive/TameableEntity.mapping

@@ -44,4 +44,3 @@ CLASS net/minecraft/unmapped/C_sjwjnzbw net/minecraft/entity/passive/TameableEnt
 	CLASS C_zxvudoic TameablePanicGoal
 		METHOD <init> (Lnet/minecraft/unmapped/C_sjwjnzbw;DLnet/minecraft/unmapped/C_ednuhnnn;)V
 			ARG 3 speed
-			ARG 5 dangerousDamageTypes

mappings/net/minecraft/fluid/FlowableFluid.mapping

@@ -76,7 +76,6 @@ CLASS net/minecraft/unmapped/C_vneqepda net/minecraft/fluid/FlowableFluid
 	METHOD m_qipgcscg isInfinite (Lnet/minecraft/unmapped/C_bdwnwhiu;)Z
 	METHOD m_rjtwfflw canFill (Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_rxhyurmy;)Z
 		ARG 3 fluid
-		ARG 4 fluid
 	METHOD m_rvnlkcqm getStill (Z)Lnet/minecraft/unmapped/C_xqketiuf;
 		ARG 1 falling
 	METHOD m_vbpauywo isFluidAboveEqual (Lnet/minecraft/unmapped/C_xqketiuf;Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_hynzadkk;)Z

mappings/net/minecraft/item/BundleItem.mapping

@@ -1,9 +1,7 @@
 CLASS net/minecraft/unmapped/C_elzpwcpo net/minecraft/item/BundleItem
 	FIELD f_iabcagke ITEM_BAR_COLOR I
 	METHOD m_hovrsjet playRemoveOneSound (Lnet/minecraft/unmapped/C_astfners;)V
-		ARG 1 entity
 	METHOD m_imyryhnq playDropContentsSound (Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_astfners;)V
 	METHOD m_tqvwwmtg getAmountFilled (Lnet/minecraft/unmapped/C_sddaxwyk;)F
 		ARG 0 stack
 	METHOD m_ybktmnyl playInsertSound (Lnet/minecraft/unmapped/C_astfners;)V
-		ARG 1 entity

mappings/net/minecraft/network/LegacyQueryHandler.mapping

@@ -18,4 +18,3 @@ CLASS net/minecraft/unmapped/C_avdfsszh net/minecraft/network/LegacyQueryHandler
 	METHOD m_wzruoctl reply (Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;)V
 		ARG 0 handlerContext
 		ARG 1 ctx
-		ARG 2 buf

mappings/net/minecraft/predicate/entity/LocationPredicate.mapping

@@ -9,7 +9,11 @@ CLASS net/minecraft/unmapped/C_ypvebgnl net/minecraft/predicate/entity/LocationP
 		ARG 2 x
 		ARG 4 y
 		ARG 6 z
+	METHOD m_yciuynsr (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+		ARG 0 instance
 	CLASS C_gcijxrat PositionRange
+		METHOD m_bhbuulsr (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
+			ARG 0 instance
 		METHOD m_gjufjxkq z ()Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;
 		METHOD m_msjfphrw test (DDD)Z
 			ARG 1 x
@@ -22,16 +26,21 @@ CLASS net/minecraft/unmapped/C_ypvebgnl net/minecraft/predicate/entity/LocationP
 			ARG 2 z
 		METHOD m_zitylnny x ()Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;
 	CLASS C_okutxubz Builder
+		FIELD f_botkjajr structures Ljava/util/Optional;
 		FIELD f_dnpxvyqk fluid Ljava/util/Optional;
 		FIELD f_dsialmis block Ljava/util/Optional;
 		FIELD f_fhwlhfkz z Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;
+		FIELD f_hgqqelqt biomes Ljava/util/Optional;
 		FIELD f_hyqkkafq x Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;
+		FIELD f_pdhpiijj canSeeSky Ljava/util/Optional;
 		FIELD f_qasujtxj dimension Ljava/util/Optional;
 		FIELD f_vgpejppz y Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;
 		FIELD f_xezgeelf light Ljava/util/Optional;
 		FIELD f_yijrvruc smokey Ljava/util/Optional;
 		METHOD m_diuvndpc light (Lnet/minecraft/unmapped/C_ammgthmo$C_kadjxsdu;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
 			ARG 1 builder
+		METHOD m_dkdenbmq structures (Lnet/minecraft/unmapped/C_odfnijdo;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
+			ARG 1 structures
 		METHOD m_dsbslmxh z (Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
 			ARG 1 z
 		METHOD m_dxvijcur fluid (Lnet/minecraft/unmapped/C_fjarvlro$C_ahtnwewe;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
@@ -43,9 +52,17 @@ CLASS net/minecraft/unmapped/C_ypvebgnl net/minecraft/predicate/entity/LocationP
 		METHOD m_hibprzfm block (Lnet/minecraft/unmapped/C_uuwlfkxz$C_nlqurblw;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
 			ARG 1 builder
 		METHOD m_idydmjlz create ()Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
+		METHOD m_jklecett structure (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
+			ARG 0 structure
+		METHOD m_lsutwusu biome (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
+			ARG 0 biome
+		METHOD m_mkgxbhcm canSeeSky (Z)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
+			ARG 1 canSeeSky
 		METHOD m_onghaezr dimension (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
 			ARG 1 dimension
 		METHOD m_qkyrpclg createWithY (Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
+		METHOD m_sizzovtm biomes (Lnet/minecraft/unmapped/C_odfnijdo;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
+			ARG 1 biomes
 		METHOD m_umdksspn x (Lnet/minecraft/unmapped/C_nihhkamy$C_qatgyzfn;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;
 			ARG 1 x
 		METHOD m_xrknskqs createWithWorld (Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_ypvebgnl$C_okutxubz;

mappings/net/minecraft/world/BlockView.mapping

@@ -1,6 +1,6 @@
 CLASS net/minecraft/unmapped/C_peaveboq net/minecraft/world/BlockView
 	COMMENT Represents a scoped, read-only view of block states, fluid states and block entities.
-	FIELD f_evjnqixv MAX_COLLISION_COLLECTION_BLOCK_ITERATIONS
+	FIELD f_evjnqixv MAX_COLLISION_COLLECTION_BLOCK_ITERATIONS I
 	METHOD m_bwuplpck (Lnet/minecraft/unmapped/C_rvvvywqd;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_jdakttms;
 		ARG 1 context
 		ARG 2 pos

mappings/net/minecraft/world/chunk/ChunkNibbleArray.mapping

@@ -15,7 +15,6 @@ CLASS net/minecraft/unmapped/C_cneaxdxg net/minecraft/world/chunk/ChunkNibbleArr
 		ARG 1 value
 	METHOD m_ckjjmpve getByteArrayIndex (I)I
 		ARG 0 i
-		ARG 1 n
 	METHOD m_gweyudot get (III)I
 		ARG 1 x
 		ARG 2 y

mappings/net/minecraft/world/gen/surfacebuilder/SurfaceRules.mapping

@@ -142,7 +142,6 @@ CLASS net/minecraft/unmapped/C_flergppe net/minecraft/world/gen/surfacebuilder/S
 			ARG 1 biomes
 		METHOD apply (Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 context
-		CLASS C_xdycyvdb BiomeCondition
 	CLASS C_eegrxyov LazyHorizontalCondition
 	CLASS C_hubqzhng ConditionMaterialRule
 		FIELD f_kejiyqxr thenRun Lnet/minecraft/unmapped/C_flergppe$C_dggoeuwn;
@@ -177,7 +176,6 @@ CLASS net/minecraft/unmapped/C_flergppe net/minecraft/world/gen/surfacebuilder/S
 		METHOD m_kdepohzk (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 			ARG 0 instance
 		METHOD m_yeogfdtl noise ()Lnet/minecraft/unmapped/C_xhhleach;
-		CLASS C_ctlzxohx NoiseThresholdCondition
 	CLASS C_jpwlenlu LazyVerticalCondition
 	CLASS C_mecsxqth MaterialCondition
 		FIELD f_zouagsrp CODEC Lcom/mojang/serialization/Codec;
@@ -203,7 +201,6 @@ CLASS net/minecraft/unmapped/C_flergppe net/minecraft/world/gen/surfacebuilder/S
 			ARG 0 instance
 		METHOD m_lsohmaoj anchor ()Lnet/minecraft/unmapped/C_blhyfywp;
 		METHOD m_uyongael surfaceDepthMultiplier ()I
-		CLASS C_kwqajwnr AboveYCondition
 	CLASS C_nchgwouc VerticalGradientMaterialCondition
 		FIELD f_ahmhmcgf falseAtAndAbove Lnet/minecraft/unmapped/C_blhyfywp;
 		FIELD f_cjtkntbc trueAtAndBelow Lnet/minecraft/unmapped/C_blhyfywp;
@@ -222,7 +219,6 @@ CLASS net/minecraft/unmapped/C_flergppe net/minecraft/world/gen/surfacebuilder/S
 		METHOD m_gprminfy falseAtAndAbove ()Lnet/minecraft/unmapped/C_blhyfywp;
 		METHOD m_rbmugglq trueAtAndBelow ()Lnet/minecraft/unmapped/C_blhyfywp;
 		METHOD m_yxfmnhur randomName ()Lnet/minecraft/unmapped/C_ncpywfca;
-		CLASS C_abtfplmw VerticalGradientCondition
 	CLASS C_nrlkjchz SequenceRule
 		FIELD f_frybhfgn rules Ljava/util/List;
 		METHOD <init> (Ljava/util/List;)V
@@ -277,7 +273,6 @@ CLASS net/minecraft/unmapped/C_flergppe net/minecraft/world/gen/surfacebuilder/S
 		METHOD m_vtnozyeb offset ()I
 		METHOD m_yeyjefjy surfaceDepthMultiplier ()I
 		METHOD m_zydjlyyq addStoneDepth ()Z
-		CLASS C_szlimtus WaterCondition
 	CLASS C_uliifzhh TemperatureMaterialCondition
 		FIELD f_dwwitttx CONDITION_CODEC Lnet/minecraft/unmapped/C_ircwepir;
 		METHOD apply (Ljava/lang/Object;)Ljava/lang/Object;
@@ -305,7 +300,6 @@ CLASS net/minecraft/unmapped/C_flergppe net/minecraft/world/gen/surfacebuilder/S
 			ARG 0 instance
 		METHOD m_lpqrdghs offset ()I
 		METHOD m_tvdzjwlj secondaryDepthRange ()I
-		CLASS C_gfyzssyy StoneDepthCondition
 	CLASS C_xfulhrba NotMaterialCondition
 		FIELD f_fiuxfcfj CONDITION_CODEC Lnet/minecraft/unmapped/C_ircwepir;
 		FIELD f_pedwxzeo target Lnet/minecraft/unmapped/C_flergppe$C_mecsxqth;