22w14a

build.gradle

@@ -27,7 +27,7 @@ plugins {
 	id 'net.fabricmc.filament' version '0.3.0'
 }
 
-def minecraft_version = "22w13a"
+def minecraft_version = "22w14a"
 
 def ENV = System.getenv()
 // Fetch build number from Github Actions

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

@@ -27,7 +27,5 @@ CLASS com/mojang/blaze3d/platform/TextureUtil
 		ARG 4 height
 	METHOD readResource (Ljava/io/InputStream;)Ljava/nio/ByteBuffer;
 		ARG 0 inputStream
-	METHOD readResourceAsString (Ljava/io/InputStream;)Ljava/lang/String;
-		ARG 0 inputStream
 	METHOD releaseTextureId (I)V
 		ARG 0 id

mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping

@@ -1,7 +1,4 @@
 CLASS net/minecraft/class_195 net/minecraft/advancement/criterion/AbstractCriterionConditions
 	FIELD field_1270 id Lnet/minecraft/class_2960;
 	FIELD field_24381 playerPredicate Lnet/minecraft/class_2048$class_5258;
-	METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_2048$class_5258;)V
-		ARG 1 id
-		ARG 2 playerPredicate
 	METHOD method_27790 getPlayerPredicate ()Lnet/minecraft/class_2048$class_5258;

mappings/net/minecraft/advancement/criterion/Criteria.mapping

@@ -13,7 +13,7 @@ CLASS net/minecraft/class_174 net/minecraft/advancement/criterion/Criteria
 	FIELD field_1191 PLACED_BLOCK Lnet/minecraft/class_2111;
 	FIELD field_1192 PLAYER_KILLED_ENTITY Lnet/minecraft/class_2080;
 	FIELD field_1193 EFFECTS_CHANGED Lnet/minecraft/class_2027;
-	FIELD field_1194 LOCATION Lnet/minecraft/class_2092;
+	FIELD field_1194 LOCATION Lnet/minecraft/class_2135;
 	FIELD field_1195 INVENTORY_CHANGED Lnet/minecraft/class_2066;
 	FIELD field_1196 SHOT_CROSSBOW Lnet/minecraft/class_2123;
 	FIELD field_1197 KILLED_BY_CROSSBOW Lnet/minecraft/class_2076;
@@ -31,10 +31,10 @@ CLASS net/minecraft/class_174 net/minecraft/advancement/criterion/Criteria
 	FIELD field_1209 ENTITY_HURT_PLAYER Lnet/minecraft/class_2044;
 	FIELD field_1210 CURED_ZOMBIE_VILLAGER Lnet/minecraft/class_2014;
 	FIELD field_1211 NETHER_TRAVEL Lnet/minecraft/class_2108;
-	FIELD field_1212 SLEPT_IN_BED Lnet/minecraft/class_2092;
+	FIELD field_1212 SLEPT_IN_BED Lnet/minecraft/class_2135;
 	FIELD field_1213 BREWED_POTION Lnet/minecraft/class_1996;
-	FIELD field_19250 HERO_OF_THE_VILLAGE Lnet/minecraft/class_2092;
+	FIELD field_19250 HERO_OF_THE_VILLAGE Lnet/minecraft/class_2135;
-	FIELD field_19251 VOLUNTARY_EXILE Lnet/minecraft/class_2092;
+	FIELD field_19251 VOLUNTARY_EXILE Lnet/minecraft/class_2135;
 	FIELD field_21628 SLIDE_DOWN_BLOCK Lnet/minecraft/class_4713;
 	FIELD field_21629 BEE_NEST_DESTROYED Lnet/minecraft/class_4708;
 	FIELD field_22450 TARGET_HIT Lnet/minecraft/class_4851;

mappings/net/minecraft/advancement/criterion/ItemUsedOnBlockCriterion.mapping

@@ -9,10 +9,6 @@ CLASS net/minecraft/class_4711 net/minecraft/advancement/criterion/ItemUsedOnBlo
 	CLASS class_4712 Conditions
 		FIELD field_21579 item Lnet/minecraft/class_2073;
 		FIELD field_24495 location Lnet/minecraft/class_2090;
-		METHOD <init> (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2090;Lnet/minecraft/class_2073;)V
-			ARG 1 player
-			ARG 2 location
-			ARG 3 item
 		METHOD method_23892 test (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)Z
 			ARG 1 state
 			ARG 2 world

mappings/net/minecraft/advancement/criterion/LocationArrivalCriterion.mapping

@@ -1,28 +0,0 @@
-CLASS net/minecraft/class_2092 net/minecraft/advancement/criterion/LocationArrivalCriterion
-	FIELD field_9694 id Lnet/minecraft/class_2960;
-	METHOD <init> (Lnet/minecraft/class_2960;)V
-		ARG 1 id
-	METHOD method_22485 (Lnet/minecraft/class_3222;Lnet/minecraft/class_2092$class_2094;)Z
-		ARG 1 conditions
-	METHOD method_9027 trigger (Lnet/minecraft/class_3222;)V
-		ARG 1 player
-	CLASS class_2094 Conditions
-		FIELD field_9698 location Lnet/minecraft/class_2090;
-		METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2090;)V
-			ARG 1 id
-			ARG 2 player
-			ARG 3 location
-		METHOD method_20400 createHeroOfTheVillage ()Lnet/minecraft/class_2092$class_2094;
-		METHOD method_37245 create (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2092$class_2094;
-			ARG 0 entity
-		METHOD method_37246 createSteppingOnWithBoots (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;)Lnet/minecraft/class_2092$class_2094;
-			ARG 0 block
-			ARG 1 boots
-		METHOD method_9032 createSleptInBed ()Lnet/minecraft/class_2092$class_2094;
-		METHOD method_9033 matches (Lnet/minecraft/class_3218;DDD)Z
-			ARG 1 world
-			ARG 2 x
-			ARG 4 y
-			ARG 6 z
-		METHOD method_9034 create (Lnet/minecraft/class_2090;)Lnet/minecraft/class_2092$class_2094;
-			ARG 0 location

mappings/net/minecraft/advancement/criterion/TickCriterion.mapping

@@ -5,5 +5,3 @@ CLASS net/minecraft/class_2135 net/minecraft/advancement/criterion/TickCriterion
 	METHOD method_9141 trigger (Lnet/minecraft/class_3222;)V
 		ARG 1 player
 	CLASS class_2137 Conditions
-		METHOD <init> (Lnet/minecraft/class_2048$class_5258;)V
-			ARG 1 player

mappings/net/minecraft/block/AbstractBlock.mapping

@@ -77,12 +77,11 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 	METHOD method_9506 emitsRedstonePower (Lnet/minecraft/class_2680;)Z
 		COMMENT @deprecated Consider calling {@link AbstractBlockState#emitsRedstonePower} instead. See <a href="#deprecated-methods">the class javadoc</a>.
 		ARG 1 state
-	METHOD method_9514 randomTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)V
+	METHOD method_9514 randomTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V
 		COMMENT @deprecated Consider calling {@link AbstractBlockState#randomTick} instead. See <a href="#deprecated-methods">the class javadoc</a>.
 		ARG 1 state
 		ARG 2 world
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_9516 canPathfindThrough (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_10;)Z
 		COMMENT @deprecated Consider calling {@link AbstractBlockState#canPathfindThrough} instead. See <a href="#deprecated-methods">the class javadoc</a>.
 		ARG 1 state
@@ -222,12 +221,11 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 		ARG 1 state
 		ARG 2 world
 		ARG 3 pos
-	METHOD method_9588 scheduledTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)V
+	METHOD method_9588 scheduledTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V
 		COMMENT @deprecated Consider calling {@link AbstractBlockState#scheduledTick} instead. See <a href="#deprecated-methods">the class javadoc</a>.
 		ARG 1 state
 		ARG 2 world
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_9592 onSyncedBlockEvent (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;II)Z
 		COMMENT @deprecated Consider calling {@link AbstractBlockState#onSyncedBlockEvent} instead. See <a href="#deprecated-methods">the class javadoc</a>.
 		ARG 1 state
@@ -544,10 +542,9 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 				COMMENT the position of this block
 			ARG 5 neighborPos
 				COMMENT the position of the neighbor block
-		METHOD method_26192 scheduledTick (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)V
+		METHOD method_26192 scheduledTick (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V
 			ARG 1 world
 			ARG 2 pos
-			ARG 3 random
 		METHOD method_26193 getOpacity (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)I
 			ARG 1 world
 			ARG 2 pos
@@ -572,10 +569,9 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
 			ARG 2 pos
 			ARG 3 flags
 			ARG 4 maxUpdateDepth
-		METHOD method_26199 randomTick (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)V
+		METHOD method_26199 randomTick (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V
 			ARG 1 world
 			ARG 2 pos
-			ARG 3 random
 		METHOD method_26200 initShapeCache ()V
 		METHOD method_26201 getCullingShape (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_265;
 			ARG 1 world

mappings/net/minecraft/block/AbstractCandleBlock.mapping

@@ -1,10 +1,9 @@
 CLASS net/minecraft/class_5540 net/minecraft/block/AbstractCandleBlock
 	FIELD field_27083 LIT Lnet/minecraft/class_2746;
-	METHOD method_31610 spawnCandleParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_243;Ljava/util/Random;)V
+	METHOD method_31610 spawnCandleParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_243;Lnet/minecraft/class_5819;)V
 		ARG 0 world
 		ARG 1 vec3d
-		ARG 2 random
+	METHOD method_31611 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;Lnet/minecraft/class_243;)V
-	METHOD method_31611 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/Random;Lnet/minecraft/class_243;)V
 		ARG 3 offset
 	METHOD method_31612 setLit (Lnet/minecraft/class_1936;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Z)V
 		ARG 0 world

mappings/net/minecraft/block/AbstractPlantStemBlock.mapping

@@ -10,14 +10,12 @@ CLASS net/minecraft/class_4865 net/minecraft/block/AbstractPlantStemBlock
 		ARG 5 growthChance
 	METHOD method_24949 chooseStemState (Lnet/minecraft/class_2680;)Z
 		ARG 1 state
-	METHOD method_26376 getGrowthLength (Ljava/util/Random;)I
+	METHOD method_26376 getGrowthLength (Lnet/minecraft/class_5819;)I
-		ARG 1 random
 	METHOD method_33625 copyState (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680;
 		ARG 1 from
 		ARG 2 to
-	METHOD method_33626 age (Lnet/minecraft/class_2680;Ljava/util/Random;)Lnet/minecraft/class_2680;
+	METHOD method_33626 age (Lnet/minecraft/class_2680;Lnet/minecraft/class_5819;)Lnet/minecraft/class_2680;
 		ARG 1 state
-		ARG 2 random
 	METHOD method_38232 withMaxAge (Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680;
 		ARG 1 state
 	METHOD method_38233 hasMaxAge (Lnet/minecraft/class_2680;)Z

mappings/net/minecraft/block/BambooBlock.mapping

@@ -5,11 +5,10 @@ CLASS net/minecraft/class_2211 net/minecraft/block/BambooBlock
 	FIELD field_9915 LARGE_LEAVES_SHAPE Lnet/minecraft/class_265;
 	FIELD field_9916 STAGE Lnet/minecraft/class_2758;
 	FIELD field_9917 LEAVES Lnet/minecraft/class_2754;
-	METHOD method_9385 updateLeaves (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/Random;I)V
+	METHOD method_9385 updateLeaves (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;I)V
 		ARG 1 state
 		ARG 2 world
 		ARG 3 pos
-		ARG 4 random
 		ARG 5 height
 	METHOD method_9386 countBambooBelow (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)I
 		ARG 1 world

mappings/net/minecraft/block/BigDripleafBlock.mapping

@@ -10,9 +10,8 @@ CLASS net/minecraft/class_5801 net/minecraft/block/BigDripleafBlock
 		ARG 0 world
 		ARG 1 pos
 		ARG 2 soundEvent
-	METHOD method_33603 grow (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)V
+	METHOD method_33603 grow (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)V
 		ARG 0 world
-		ARG 1 random
 		ARG 2 pos
 		ARG 3 direction
 	METHOD method_33604 changeTilt (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_5816;)V

mappings/net/minecraft/block/Block.mapping

@@ -107,11 +107,10 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
 		ARG 2 pos
 		ARG 3 tool
 		ARG 4 experience
-	METHOD method_9496 randomDisplayTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/Random;)V
+	METHOD method_9496 randomDisplayTick (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V
 		ARG 1 state
 		ARG 2 world
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_9497 dropStacks (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V
 		ARG 0 state
 		ARG 1 world

mappings/net/minecraft/block/ChorusFlowerBlock.mapping

@@ -5,10 +5,9 @@ CLASS net/minecraft/class_2279 net/minecraft/block/ChorusFlowerBlock
 	METHOD <init> (Lnet/minecraft/class_2283;Lnet/minecraft/class_4970$class_2251;)V
 		ARG 1 plantBlock
 		ARG 2 settings
-	METHOD method_9744 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Ljava/util/Random;I)V
+	METHOD method_9744 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;I)V
 		ARG 0 world
 		ARG 1 pos
-		ARG 2 random
 		ARG 3 size
 	METHOD method_9745 grow (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;I)V
 		ARG 1 world
@@ -21,10 +20,9 @@ CLASS net/minecraft/class_2279 net/minecraft/block/ChorusFlowerBlock
 	METHOD method_9747 die (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V
 		ARG 1 world
 		ARG 2 pos
-	METHOD method_9748 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Ljava/util/Random;Lnet/minecraft/class_2338;II)V
+	METHOD method_9748 generate (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;II)V
 		ARG 0 world
 		ARG 1 pos
-		ARG 2 random
 		ARG 3 rootPos
 		ARG 4 size
 		ARG 5 layer

mappings/net/minecraft/block/Degradable.mapping

@@ -2,16 +2,14 @@ CLASS net/minecraft/class_5547 net/minecraft/block/Degradable
 	METHOD method_31639 getDegradationResult (Lnet/minecraft/class_2680;)Ljava/util/Optional;
 		ARG 1 state
 	METHOD method_33620 getDegradationChanceMultiplier ()F
-	METHOD method_33621 tickDegradation (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)V
+	METHOD method_33621 tickDegradation (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V
 		ARG 1 state
 		ARG 2 world
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_33622 getDegradationLevel ()Ljava/lang/Enum;
-	METHOD method_33623 tryDegrade (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)V
+	METHOD method_33623 tryDegrade (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V
 		ARG 1 state
 		ARG 2 world
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_34726 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 2 state

mappings/net/minecraft/block/Fertilizable.mapping

@@ -1,7 +1,6 @@
 CLASS net/minecraft/class_2256 net/minecraft/block/Fertilizable
-	METHOD method_9650 canGrow (Lnet/minecraft/class_1937;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z
+	METHOD method_9650 canGrow (Lnet/minecraft/class_1937;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z
 		ARG 1 world
-		ARG 2 random
 		ARG 3 pos
 		ARG 4 state
 	METHOD method_9651 isFertilizable (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)Z
@@ -9,8 +8,7 @@ CLASS net/minecraft/class_2256 net/minecraft/block/Fertilizable
 		ARG 2 pos
 		ARG 3 state
 		ARG 4 isClient
-	METHOD method_9652 grow (Lnet/minecraft/class_3218;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
+	METHOD method_9652 grow (Lnet/minecraft/class_3218;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 1 world
-		ARG 2 random
 		ARG 3 pos
 		ARG 4 state

mappings/net/minecraft/block/FireBlock.mapping

@@ -31,11 +31,10 @@ CLASS net/minecraft/class_2358 net/minecraft/block/FireBlock
 	METHOD method_10194 getBurnChance (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;)I
 		ARG 1 world
 		ARG 2 pos
-	METHOD method_10196 trySpreadingFire (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;ILjava/util/Random;I)V
+	METHOD method_10196 trySpreadingFire (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;ILnet/minecraft/class_5819;I)V
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 spreadFactor
-		ARG 4 rand
 		ARG 5 currentAge
 	METHOD method_10197 (Ljava/util/Map$Entry;)Z
 		ARG 0 entry
@@ -47,8 +46,7 @@ CLASS net/minecraft/class_2358 net/minecraft/block/FireBlock
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 age
-	METHOD method_26155 getFireTickDelay (Ljava/util/Random;)I
+	METHOD method_26155 getFireTickDelay (Lnet/minecraft/class_5819;)I
-		ARG 0 random
 	METHOD method_31016 getShapeForState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_265;
 		ARG 0 state
 	METHOD method_31017 (Lnet/minecraft/class_2680;)Z

mappings/net/minecraft/block/FrogspawnBlock.mapping

@@ -9,20 +9,17 @@ CLASS net/minecraft/class_7113 net/minecraft/block/FrogspawnBlock
 	METHOD method_41425 setHatchTimeRange (II)V
 		ARG 0 min
 		ARG 1 max
-	METHOD method_41426 hatch (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)V
+	METHOD method_41426 hatch (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V
 		ARG 1 world
 		ARG 2 pos
-		ARG 3 random
 	METHOD method_41427 canLayAt (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z
 		ARG 0 world
 		ARG 1 pos
 	METHOD method_41428 breakWithoutDrop (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V
 		ARG 1 world
 		ARG 2 pos
-	METHOD method_41429 getHatchTime (Ljava/util/Random;)I
+	METHOD method_41429 getHatchTime (Lnet/minecraft/class_5819;)I
-		ARG 0 random
+	METHOD method_41430 spawnTadpoles (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V
-	METHOD method_41430 spawnTadpoles (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)V
 		ARG 1 world
 		ARG 2 pos
-		ARG 3 random
 	METHOD method_41431 resetHatchTimeRange ()V

mappings/net/minecraft/block/LichenGrower.mapping

@@ -32,12 +32,11 @@ CLASS net/minecraft/class_7118 net/minecraft/block/LichenGrower
 		ARG 4 oldDirection
 		ARG 5 newDirection
 		ARG 6 markForPostProcessing
-	METHOD method_41447 grow (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Ljava/util/Random;Z)Ljava/util/Optional;
+	METHOD method_41447 grow (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_5819;Z)Ljava/util/Optional;
 		ARG 1 state
 		ARG 2 world
 		ARG 3 pos
 		ARG 4 direction
-		ARG 5 random
 		ARG 6 markForPostProcessing
 	METHOD method_41448 grow (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Z)J
 		ARG 1 state
@@ -47,12 +46,11 @@ CLASS net/minecraft/class_7118 net/minecraft/block/LichenGrower
 		ARG 5 markForPostProcessing
 	METHOD method_41449 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;ZLnet/minecraft/class_2350;)Ljava/util/Optional;
 		ARG 6 direction2
-	METHOD method_41450 grow (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Ljava/util/Random;)Ljava/util/Optional;
+	METHOD method_41450 grow (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Ljava/util/Optional;
 		ARG 1 state
 		ARG 2 world
 		ARG 3 pos
-		ARG 4 random
+	METHOD method_41451 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;Lnet/minecraft/class_2350;)Ljava/util/Optional;
-	METHOD method_41451 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Ljava/util/Random;Lnet/minecraft/class_2350;)Ljava/util/Optional;
 		ARG 5 direction
 	METHOD method_41452 grow (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Z)J
 		ARG 1 state

mappings/net/minecraft/block/MangroveLeavesBlock.mapping

@@ -1,4 +1 @@
 CLASS net/minecraft/class_7114 net/minecraft/block/MangroveLeavesBlock
-	METHOD method_41433 hasNearbyPropagule (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z
-		ARG 0 world
-		ARG 1 pos

mappings/net/minecraft/block/MushroomPlantBlock.mapping

@@ -4,8 +4,7 @@ CLASS net/minecraft/class_2420 net/minecraft/block/MushroomPlantBlock
 	METHOD <init> (Lnet/minecraft/class_4970$class_2251;Ljava/util/function/Supplier;)V
 		ARG 1 settings
 		ARG 2 feature
-	METHOD method_10349 trySpawningBigMushroom (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;)Z
+	METHOD method_10349 trySpawningBigMushroom (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5819;)Z
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 state
-		ARG 4 random

mappings/net/minecraft/block/PointedDripstoneBlock.mapping

@@ -40,8 +40,7 @@ CLASS net/minecraft/class_5689 net/minecraft/block/PointedDripstoneBlock
 	METHOD method_32774 isPointedDripstoneFacingDirection (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z
 		ARG 0 state
 		ARG 1 direction
-	METHOD method_32775 getDripFluid (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3611;
+	METHOD method_32775 getDripFluid (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3611;
-		ARG 0 world
 		ARG 1 pos
 	METHOD method_32776 getSupportingPos (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;I)Ljava/util/Optional;
 		ARG 0 world
@@ -77,8 +76,6 @@ CLASS net/minecraft/class_5689 net/minecraft/block/PointedDripstoneBlock
 		ARG 0 world
 		ARG 1 pos
 		ARG 2 state
-	METHOD method_33270 (FLnet/minecraft/class_3611;)Z
-		ARG 1 fluid
 	METHOD method_33271 getDripFluid (Lnet/minecraft/class_1937;Lnet/minecraft/class_3611;)Lnet/minecraft/class_3611;
 		ARG 0 world
 		ARG 1 fluid
@@ -101,15 +98,9 @@ CLASS net/minecraft/class_5689 net/minecraft/block/PointedDripstoneBlock
 		ARG 0 world
 		ARG 1 pos
 		ARG 2 state
-	METHOD method_33277 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3611;)V
-		ARG 3 fluid
 	METHOD method_33278 (Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z
 		ARG 1 pos
 		ARG 2 state
-	METHOD method_33279 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3611;
-		ARG 1 pos
-	METHOD method_33280 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3611;)V
-		ARG 3 fluid
 	METHOD method_33281 (Lnet/minecraft/class_2680;)Z
 		ARG 0 state
 	METHOD method_35283 isPointingUp (Lnet/minecraft/class_2680;)Z
@@ -138,11 +129,10 @@ CLASS net/minecraft/class_5689 net/minecraft/block/PointedDripstoneBlock
 		ARG 0 state
 		ARG 1 world
 		ARG 2 pos
-	METHOD method_36375 tryGrow (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;)V
+	METHOD method_36375 tryGrow (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V
 		ARG 0 state
 		ARG 1 world
 		ARG 2 pos
-		ARG 3 random
 	METHOD method_36376 growMerged (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V
 		ARG 0 state
 		ARG 1 world

mappings/net/minecraft/block/RedstoneWireBlock.mapping

@@ -52,9 +52,8 @@ CLASS net/minecraft/class_2457 net/minecraft/block/RedstoneWireBlock
 		ARG 1 state
 	METHOD method_27846 isFullyConnected (Lnet/minecraft/class_2680;)Z
 		ARG 0 state
-	METHOD method_27936 addPoweredParticles (Lnet/minecraft/class_1937;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_243;Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;FF)V
+	METHOD method_27936 addPoweredParticles (Lnet/minecraft/class_1937;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_243;Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;FF)V
 		ARG 1 world
-		ARG 2 random
 		ARG 3 pos
 		ARG 4 color
 	METHOD method_27937 canRunOnTop (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z

mappings/net/minecraft/block/SaplingBlock.mapping

@@ -5,8 +5,7 @@ CLASS net/minecraft/class_2473 net/minecraft/block/SaplingBlock
 	METHOD <init> (Lnet/minecraft/class_2647;Lnet/minecraft/class_4970$class_2251;)V
 		ARG 1 generator
 		ARG 2 settings
-	METHOD method_10507 generate (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;)V
+	METHOD method_10507 generate (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5819;)V
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 state
-		ARG 4 random

mappings/net/minecraft/block/SculkBlock.mapping

@@ -2,10 +2,9 @@ CLASS net/minecraft/class_7125 net/minecraft/block/SculkBlock
 	METHOD method_41474 shouldNotDecay (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z
 		ARG 0 world
 		ARG 1 pos
-	METHOD method_41475 getExtraBlockState (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Ljava/util/Random;Z)Lnet/minecraft/class_2680;
+	METHOD method_41475 getExtraBlockState (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;Z)Lnet/minecraft/class_2680;
 		ARG 1 world
 		ARG 2 pos
-		ARG 3 random
 		ARG 4 allowShrieker
 	METHOD method_41476 getDecay (Lnet/minecraft/class_7128;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;I)I
 		ARG 0 spreadManager

mappings/net/minecraft/block/SculkCatalystBlock.mapping

@@ -2,8 +2,7 @@ CLASS net/minecraft/class_7126 net/minecraft/block/SculkCatalystBlock
 	FIELD field_37603 BLOOM_DURATION I
 	FIELD field_37604 BLOOM Lnet/minecraft/class_2746;
 	FIELD field_37605 experience Lnet/minecraft/class_6017;
-	METHOD method_41477 bloom (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;)V
+	METHOD method_41477 bloom (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5819;)V
 		ARG 0 world
 		ARG 1 pos
 		ARG 2 state
-		ARG 3 random

mappings/net/minecraft/block/SculkSensorBlock.mapping

@@ -19,7 +19,6 @@ CLASS net/minecraft/class_5703 net/minecraft/block/SculkSensorBlock
 		ARG 0 entity
 		ARG 1 world
 		ARG 2 pos
-		ARG 3 state
 		ARG 4 power
 	METHOD method_32905 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5704;)V
 		ARG 0 world

mappings/net/minecraft/block/SculkShriekerBlock.mapping

@@ -3,27 +3,9 @@ CLASS net/minecraft/class_7268 net/minecraft/block/SculkShriekerBlock
 	FIELD field_38230 WATERLOGGED Lnet/minecraft/class_2746;
 	FIELD field_38231 SHAPE Lnet/minecraft/class_265;
 	FIELD field_38232 TOP D
-	FIELD field_38233 SHRIEK_DURATION I
 	FIELD field_38422 CAN_SUMMON Lnet/minecraft/class_2746;
-	METHOD method_42312 shriek (Lnet/minecraft/class_3218;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)V
-		ARG 0 world
-		ARG 1 state
-		ARG 2 pos
-	METHOD method_42313 getClosestPlayerWarningManager (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Ljava/util/Optional;
-		ARG 0 world
-		ARG 1 pos
-	METHOD method_42314 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_7262;)Z
-		ARG 2 warningManager
-	METHOD method_42315 canShriek (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z
-		ARG 0 world
-		ARG 1 pos
-		ARG 2 state
 	METHOD method_42317 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_7133;)V
 		ARG 0 world
 		ARG 1 pos
 		ARG 2 state
 		ARG 3 blockEntity
-	METHOD method_42318 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_7262;)Ljava/lang/Boolean;
-		ARG 2 warningManager
-	METHOD method_42319 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_7262;)V
-		ARG 2 warningManager

mappings/net/minecraft/block/SculkSpreadable.mapping

@@ -1,22 +1,20 @@
 CLASS net/minecraft/class_7124 net/minecraft/block/SculkSpreadable
 	FIELD field_37602 VEIN_ONLY_SPREADER Lnet/minecraft/class_7124;
 	METHOD method_41467 getUpdate ()B
-	METHOD method_41468 spreadAtSamePosition (Lnet/minecraft/class_1936;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Ljava/util/Random;)V
+	METHOD method_41468 spreadAtSamePosition (Lnet/minecraft/class_1936;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V
 		ARG 1 world
 		ARG 2 state
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_41469 spread (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Collection;Z)Z
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 state
 		ARG 4 directions
 		ARG 5 markForPostProcessing
-	METHOD method_41471 spread (Lnet/minecraft/class_7128$class_7129;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Ljava/util/Random;Lnet/minecraft/class_7128;Z)I
+	METHOD method_41471 spread (Lnet/minecraft/class_7128$class_7129;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;Lnet/minecraft/class_7128;Z)I
 		ARG 1 cursor
 		ARG 2 world
 		ARG 3 catalystPos
-		ARG 4 random
 		ARG 5 spreadManager
 		ARG 6 shouldConvertToBlock
 	METHOD method_41472 shouldConvertToSpreadable ()Z

mappings/net/minecraft/block/SculkVeinBlock.mapping

@@ -11,11 +11,10 @@ CLASS net/minecraft/class_7130 net/minecraft/block/SculkVeinBlock
 		ARG 1 pos
 		ARG 2 state
 		ARG 3 directions
-	METHOD method_41515 convertToBlock (Lnet/minecraft/class_7128;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_41515 convertToBlock (Lnet/minecraft/class_7128;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 1 spreadManager
 		ARG 2 world
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_41516 getSamePositionOnlyGrower ()Lnet/minecraft/class_7118;
 	CLASS class_7131 SculkVeinGrowChecker
 		FIELD field_37635 growTypes [Lnet/minecraft/class_7118$class_7123;

mappings/net/minecraft/block/VineBlock.mapping

@@ -11,10 +11,9 @@ CLASS net/minecraft/class_2541 net/minecraft/block/VineBlock
 	FIELD field_11705 WEST_SHAPE Lnet/minecraft/class_265;
 	FIELD field_11706 NORTH Lnet/minecraft/class_2746;
 	FIELD field_26659 shapesByState Ljava/util/Map;
-	METHOD method_10820 getGrownState (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Ljava/util/Random;)Lnet/minecraft/class_2680;
+	METHOD method_10820 getGrownState (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_5819;)Lnet/minecraft/class_2680;
 		ARG 1 above
 		ARG 2 state
-		ARG 3 random
 	METHOD method_10821 shouldConnectTo (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z
 		ARG 0 world
 		ARG 1 pos

mappings/net/minecraft/block/VineLogic.mapping

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_4949 net/minecraft/block/VineLogic
 	METHOD method_25961 isValidForWeepingStem (Lnet/minecraft/class_2680;)Z
 		ARG 0 state
-	METHOD method_26381 getGrowthLength (Ljava/util/Random;)I
+	METHOD method_26381 getGrowthLength (Lnet/minecraft/class_5819;)I
-		ARG 0 random

mappings/net/minecraft/block/entity/DispenserBlockEntity.mapping

@@ -1,9 +1,8 @@
 CLASS net/minecraft/class_2601 net/minecraft/block/entity/DispenserBlockEntity
-	FIELD field_11944 RANDOM Ljava/util/Random;
 	FIELD field_11945 inventory Lnet/minecraft/class_2371;
 	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 1 pos
 		ARG 2 state
 	METHOD method_11075 addToFirstFreeSlot (Lnet/minecraft/class_1799;)I
 		ARG 1 stack
-	METHOD method_11076 chooseNonEmptySlot ()I
+	METHOD method_11076 chooseNonEmptySlot (Lnet/minecraft/class_5819;)I

mappings/net/minecraft/block/entity/EnchantingTableBlockEntity.mapping

@@ -5,7 +5,7 @@ CLASS net/minecraft/class_2605 net/minecraft/block/entity/EnchantingTableBlockEn
 	FIELD field_11961 ticks I
 	FIELD field_11965 pageTurningSpeed F
 	FIELD field_11966 nextPageTurningSpeed F
-	FIELD field_11968 RANDOM Ljava/util/Random;
+	FIELD field_11968 RANDOM Lnet/minecraft/class_5819;
 	METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
 		ARG 1 pos
 		ARG 2 state

mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping

@@ -13,9 +13,8 @@ CLASS net/minecraft/class_2621 net/minecraft/block/entity/LootableContainerBlock
 		ARG 2 seed
 	METHOD method_11286 serializeLootTable (Lnet/minecraft/class_2487;)Z
 		ARG 1 nbt
-	METHOD method_11287 setLootTable (Lnet/minecraft/class_1922;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;)V
+	METHOD method_11287 setLootTable (Lnet/minecraft/class_1922;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;)V
 		ARG 0 world
-		ARG 1 random
 		ARG 2 pos
 		ARG 3 id
 	METHOD method_11289 checkLootInteraction (Lnet/minecraft/class_1657;)V

mappings/net/minecraft/block/entity/SculkShriekerWarningManager.mapping

@@ -1,6 +1,5 @@
 CLASS net/minecraft/class_7262 net/minecraft/block/entity/SculkShriekerWarningManager
 	FIELD field_38183 CODEC Lcom/mojang/serialization/Codec;
-	FIELD field_38193 WARNING_SOUNDS Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
 	FIELD field_38194 ticksSinceLastWarning I
 	FIELD field_38195 warningLevel I
 	FIELD field_38196 cooldownTicks I
@@ -11,15 +10,9 @@ CLASS net/minecraft/class_7262 net/minecraft/block/entity/SculkShriekerWarningMa
 	METHOD method_42247 tick ()V
 	METHOD method_42248 setWarningLevel (I)V
 		ARG 1 warningLevel
-	METHOD method_42249 (Lnet/minecraft/class_3218;Lnet/minecraft/class_7260;)V
-		ARG 1 warden
 	METHOD method_42250 warnNearbyPlayers (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z
 		ARG 1 world
 		ARG 2 pos
-	METHOD method_42251 playWarningSound (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;I)V
-		ARG 0 world
-		ARG 1 pos
-		ARG 2 warningCount
 	METHOD method_42252 copy (Lnet/minecraft/class_7262;)V
 		ARG 1 other
 	METHOD method_42253 (Lnet/minecraft/class_7262;Lnet/minecraft/class_3222;)V
@@ -28,8 +21,6 @@ CLASS net/minecraft/class_7262 net/minecraft/block/entity/SculkShriekerWarningMa
 		ARG 0 instance
 	METHOD method_42255 (Lnet/minecraft/class_243;Lnet/minecraft/class_3222;)Z
 		ARG 1 player
-	METHOD method_42256 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V
-		ARG 0 map
 	METHOD method_42257 (Ljava/util/List;Lnet/minecraft/class_7262;)V
 		ARG 1 manager
 	METHOD method_42258 reset ()V
@@ -39,9 +30,6 @@ CLASS net/minecraft/class_7262 net/minecraft/block/entity/SculkShriekerWarningMa
 	METHOD method_42260 (Lnet/minecraft/class_7262;)I
 		ARG 0 manager
 	METHOD method_42261 increaseWarningLevel ()V
-	METHOD method_42262 warn (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V
-		ARG 1 world
-		ARG 2 pos
 	METHOD method_42263 (Lnet/minecraft/class_7262;)Ljava/lang/Integer;
 		ARG 0 manager
 	METHOD method_42264 decreaseWarningLevel ()V
@@ -51,8 +39,5 @@ CLASS net/minecraft/class_7262 net/minecraft/block/entity/SculkShriekerWarningMa
 	METHOD method_42266 (Lnet/minecraft/class_7262;)Ljava/lang/Integer;
 		ARG 0 manager
 	METHOD method_42267 getWarningLevel ()I
-	METHOD method_42268 trySpawnWarden (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V
-		ARG 0 world
-		ARG 1 pos
 	METHOD method_42269 (Lnet/minecraft/class_7262;)Ljava/lang/Integer;
 		ARG 0 manager

mappings/net/minecraft/block/entity/SculkSpreadManager.mapping

@@ -15,10 +15,9 @@ CLASS net/minecraft/class_7128 net/minecraft/block/entity/SculkSpreadManager
 		ARG 5 spreadChance
 		ARG 6 decayChance
 	METHOD method_41478 create ()Lnet/minecraft/class_7128;
-	METHOD method_41479 tick (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Ljava/util/Random;Z)V
+	METHOD method_41479 tick (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;Z)V
 		ARG 1 world
 		ARG 2 pos
-		ARG 3 random
 		ARG 4 shouldConvertToBlock
 	METHOD method_41480 addCursor (Lnet/minecraft/class_7128$class_7129;)V
 		ARG 1 cursor
@@ -70,14 +69,12 @@ CLASS net/minecraft/class_7128 net/minecraft/block/entity/SculkSpreadManager
 			ARG 0 world
 			ARG 1 pos
 			ARG 2 direction
-		METHOD method_41498 getSpreadPos (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Ljava/util/Random;)Lnet/minecraft/class_2338;
+		METHOD method_41498 getSpreadPos (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Lnet/minecraft/class_2338;
 			ARG 0 world
 			ARG 1 pos
-			ARG 2 random
+		METHOD method_41499 spread (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;Lnet/minecraft/class_7128;Z)V
-		METHOD method_41499 spread (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Ljava/util/Random;Lnet/minecraft/class_7128;Z)V
 			ARG 1 world
 			ARG 2 pos
-			ARG 3 random
 			ARG 4 spreadManager
 			ARG 5 shouldConvertToBlock
 		METHOD method_41500 canSpread (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Z)Z
@@ -96,8 +93,7 @@ CLASS net/minecraft/class_7128 net/minecraft/block/entity/SculkSpreadManager
 			ARG 0 offsets
 		METHOD method_41506 (Ljava/util/List;)Ljava/util/Set;
 			ARG 0 directions
-		METHOD method_41507 shuffleOffsets (Ljava/util/Random;)Ljava/util/List;
+		METHOD method_41507 shuffleOffsets (Lnet/minecraft/class_5819;)Ljava/util/List;
-			ARG 0 random
 		METHOD method_41508 getCharge ()I
 		METHOD method_41509 (Lnet/minecraft/class_7128$class_7129;)Ljava/util/Optional;
 			ARG 0 cursor

mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping

@@ -73,7 +73,7 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt
 	METHOD method_11384 hasStructureName ()Z
 	METHOD method_11385 setRotation (Lnet/minecraft/class_2470;)V
 		ARG 1 rotation
-	METHOD method_20048 createRandom (J)Ljava/util/Random;
+	METHOD method_20048 createRandom (J)Lnet/minecraft/class_5819;
 		ARG 0 seed
 	METHOD method_21864 place (Lnet/minecraft/class_3218;ZLnet/minecraft/class_3499;)Z
 		ARG 1 world

mappings/net/minecraft/block/sapling/LargeTreeSaplingGenerator.mapping

@@ -5,13 +5,11 @@ CLASS net/minecraft/class_2650 net/minecraft/block/sapling/LargeTreeSaplingGener
 		ARG 2 pos
 		ARG 3 x
 		ARG 4 z
-	METHOD method_11443 getLargeTreeFeature (Ljava/util/Random;)Lnet/minecraft/class_6880;
+	METHOD method_11443 getLargeTreeFeature (Lnet/minecraft/class_5819;)Lnet/minecraft/class_6880;
-		ARG 1 random
+	METHOD method_11444 generateLargeTree (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5819;II)Z
-	METHOD method_11444 generateLargeTree (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;II)Z
 		ARG 1 world
 		ARG 2 chunkGenerator
 		ARG 3 pos
 		ARG 4 state
-		ARG 5 random
 		ARG 6 x
 		ARG 7 z

mappings/net/minecraft/block/sapling/SaplingGenerator.mapping

@@ -1,13 +1,11 @@
 CLASS net/minecraft/class_2647 net/minecraft/block/sapling/SaplingGenerator
-	METHOD method_11430 getTreeFeature (Ljava/util/Random;Z)Lnet/minecraft/class_6880;
+	METHOD method_11430 getTreeFeature (Lnet/minecraft/class_5819;Z)Lnet/minecraft/class_6880;
-		ARG 1 random
 		ARG 2 bees
-	METHOD method_11431 generate (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Ljava/util/Random;)Z
+	METHOD method_11431 generate (Lnet/minecraft/class_3218;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5819;)Z
 		ARG 1 world
 		ARG 2 chunkGenerator
 		ARG 3 pos
 		ARG 4 state
-		ARG 5 random
 	METHOD method_24282 areFlowersNearby (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z
 		ARG 1 world
 		ARG 2 pos

mappings/net/minecraft/class_7373.mapping

@@ -0,0 +1,2 @@
+CLASS net/minecraft/class_7373
+	METHOD method_33920 get (Lnet/minecraft/class_5819;)F

mappings/net/minecraft/class_7376.mapping

@@ -0,0 +1,3 @@
+CLASS net/minecraft/class_7376
+	METHOD method_22494 toJson ()Lcom/google/gson/JsonObject;
+	METHOD method_22497 test (Lnet/minecraft/class_1297;Lnet/minecraft/class_3218;Lnet/minecraft/class_243;)Z

mappings/net/minecraft/client/font/FontStorage.mapping

@@ -4,7 +4,7 @@ CLASS net/minecraft/class_377 net/minecraft/client/font/FontStorage
 	FIELD field_2247 fonts Ljava/util/List;
 	FIELD field_2248 textureManager Lnet/minecraft/class_1060;
 	FIELD field_2249 charactersByWidth Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
-	FIELD field_2252 RANDOM Ljava/util/Random;
+	FIELD field_2252 RANDOM Lnet/minecraft/class_5819;
 	FIELD field_2253 glyphRendererCache Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
 	FIELD field_2254 glyphAtlases Ljava/util/List;
 	FIELD field_2256 blankGlyphRenderer Lnet/minecraft/class_382;

mappings/net/minecraft/client/font/TextRenderer.mapping

@@ -8,7 +8,7 @@ CLASS net/minecraft/class_327 net/minecraft/client/font/TextRenderer
 	FIELD field_1997 fontStorageAccessor Ljava/util/function/Function;
 	FIELD field_2000 fontHeight I
 		COMMENT The font height of the text that is rendered by the text renderer.
-	FIELD field_2001 random Ljava/util/Random;
+	FIELD field_2001 random Lnet/minecraft/class_5819;
 	FIELD field_24237 FORWARD_SHIFT Lnet/minecraft/class_1160;
 	FIELD field_24238 handler Lnet/minecraft/class_5225;
 	FIELD field_32166 Z_INDEX F

mappings/net/minecraft/client/gl/Program.mapping

@@ -2,7 +2,6 @@ CLASS net/minecraft/class_281 net/minecraft/client/gl/Program
 	FIELD field_1523 shaderRef I
 	FIELD field_1524 shaderType Lnet/minecraft/class_281$class_282;
 	FIELD field_1525 name Ljava/lang/String;
-	FIELD field_33940 LOGGER Lorg/slf4j/Logger;
 	METHOD <init> (Lnet/minecraft/class_281$class_282;ILjava/lang/String;)V
 		ARG 1 shaderType
 		ARG 2 shaderRef
@@ -24,10 +23,6 @@ CLASS net/minecraft/class_281 net/minecraft/client/gl/Program
 		ARG 3 domain
 		ARG 4 loader
 	METHOD method_34417 getShaderRef ()I
-	METHOD method_35658 create (Lnet/minecraft/class_281$class_282;Ljava/lang/String;I)Lnet/minecraft/class_281;
-		ARG 0 shaderType
-		ARG 1 name
-		ARG 2 shaderRef
 	CLASS class_282 Type
 		FIELD field_1526 name Ljava/lang/String;
 		FIELD field_1527 programCache Ljava/util/Map;

mappings/net/minecraft/client/gui/hud/InGameHud.mapping

@@ -26,7 +26,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud
 	FIELD field_2031 currentStack Lnet/minecraft/class_1799;
 	FIELD field_2032 heartJumpEndTick J
 	FIELD field_2033 renderHealthValue I
-	FIELD field_2034 random Ljava/util/Random;
+	FIELD field_2034 random Lnet/minecraft/class_5819;
 	FIELD field_2035 client Lnet/minecraft/class_310;
 	FIELD field_2036 titleFadeOutTicks I
 	FIELD field_2037 titleFadeInTicks I

mappings/net/minecraft/client/gui/screen/CreditsScreen.mapping

@@ -34,9 +34,9 @@ CLASS net/minecraft/class_445 net/minecraft/client/gui/screen/CreditsScreen
 		ARG 1 text
 	METHOD method_37306 addEmptyLine ()V
 	METHOD method_37369 getSpeed ()F
-	METHOD method_39774 readPoem (Ljava/io/InputStreamReader;)V
+	METHOD method_39774 readPoem (Ljava/io/Reader;)V
 	METHOD method_39775 load (Ljava/lang/String;Lnet/minecraft/class_445$class_6824;)V
 		ARG 1 id
 		ARG 2 reader
-	METHOD method_39776 readCredits (Ljava/io/InputStreamReader;)V
+	METHOD method_39776 readCredits (Ljava/io/Reader;)V
 	CLASS class_6824 CreditsReader

mappings/net/minecraft/client/gui/screen/ingame/EnchantingPhrases.mapping

@@ -3,7 +3,7 @@ CLASS net/minecraft/class_487 net/minecraft/client/gui/screen/ingame/EnchantingP
 	FIELD field_24284 STYLE Lnet/minecraft/class_2583;
 	FIELD field_2916 phrases [Ljava/lang/String;
 	FIELD field_2917 INSTANCE Lnet/minecraft/class_487;
-	FIELD field_2918 random Ljava/util/Random;
+	FIELD field_2918 random Lnet/minecraft/class_5819;
 	METHOD method_2479 generatePhrase (Lnet/minecraft/class_327;I)Lnet/minecraft/class_5348;
 		ARG 1 textRenderer
 		ARG 2 width

mappings/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.mapping

@@ -6,7 +6,7 @@ CLASS net/minecraft/class_486 net/minecraft/client/gui/screen/ingame/Enchantment
 	FIELD field_2908 BOOK_MODEL Lnet/minecraft/class_557;
 	FIELD field_2909 approximatePageAngle F
 	FIELD field_2910 TEXTURE Lnet/minecraft/class_2960;
-	FIELD field_2911 random Ljava/util/Random;
+	FIELD field_2911 random Lnet/minecraft/class_5819;
 	FIELD field_2912 nextPageAngle F
 	FIELD field_2913 stack Lnet/minecraft/class_1799;
 	FIELD field_2914 pageAngle F

mappings/net/minecraft/client/item/2.mapping

@@ -0,0 +1,16 @@
+CLASS net/minecraft/class_7391 net/minecraft/client/item/2
+	FIELD field_24449 aimedInterpolator Lnet/minecraft/class_7391$class_5171;
+	FIELD field_24450 aimlessInterpolator Lnet/minecraft/class_7391$class_5171;
+	METHOD method_32800 scatter (I)I
+		COMMENT Scatters a seed by integer overflow in multiplication onto the whole
+		COMMENT int domain.
+		ARG 1 seed
+	CLASS class_5171 AngleInterpolator
+		FIELD field_23980 value D
+		FIELD field_23981 speed D
+		FIELD field_23982 lastUpdateTime J
+		METHOD method_27190 update (JD)V
+			ARG 1 time
+			ARG 3 target
+		METHOD method_27316 shouldUpdate (J)Z
+			ARG 1 time

mappings/net/minecraft/client/item/ModelPredicateProviderRegistry.mapping

@@ -112,29 +112,3 @@ CLASS net/minecraft/class_5272 net/minecraft/client/item/ModelPredicateProviderR
 		METHOD method_7736 getTime (Lnet/minecraft/class_1937;D)D
 			ARG 1 world
 			ARG 2 skyAngle
-	CLASS 2
-		FIELD field_24449 aimedInterpolator Lnet/minecraft/class_5272$class_5171;
-		FIELD field_24450 aimlessInterpolator Lnet/minecraft/class_5272$class_5171;
-		METHOD method_27896 getItemFrameAngleOffset (Lnet/minecraft/class_1533;)D
-			ARG 1 itemFrame
-		METHOD method_27897 getLodestonePos (Lnet/minecraft/class_1937;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2338;
-			ARG 1 world
-			ARG 2 nbt
-		METHOD method_27898 getAngleToPos (Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)D
-			ARG 1 pos
-			ARG 2 entity
-		METHOD method_27899 getSpawnPos (Lnet/minecraft/class_638;)Lnet/minecraft/class_2338;
-			ARG 1 world
-		METHOD method_32800 scatter (I)I
-			COMMENT Scatters a seed by integer overflow in multiplication onto the whole
-			COMMENT int domain.
-			ARG 1 seed
-	CLASS class_5171 AngleInterpolator
-		FIELD field_23980 value D
-		FIELD field_23981 speed D
-		FIELD field_23982 lastUpdateTime J
-		METHOD method_27190 update (JD)V
-			ARG 1 time
-			ARG 3 target
-		METHOD method_27316 shouldUpdate (J)Z
-			ARG 1 time

mappings/net/minecraft/client/model/ModelPart.mapping

@@ -31,8 +31,7 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart
 		ARG 6 green
 		ARG 7 blue
 		ARG 8 alpha
-	METHOD method_22700 getRandomCuboid (Ljava/util/Random;)Lnet/minecraft/class_630$class_628;
+	METHOD method_22700 getRandomCuboid (Lnet/minecraft/class_5819;)Lnet/minecraft/class_630$class_628;
-		ARG 1 random
 	METHOD method_22702 renderCuboids (Lnet/minecraft/class_4587$class_4665;Lnet/minecraft/class_4588;IIFFFF)V
 		ARG 1 entry
 		ARG 2 vertexConsumer

mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping

@@ -7,7 +7,7 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand
 	FIELD field_26620 DISCONNECT_LOST_TEXT Lnet/minecraft/class_2561;
 	FIELD field_34963 telemetrySender Lnet/minecraft/class_6628;
 	FIELD field_35164 simulationDistance I
-	FIELD field_3687 random Ljava/util/Random;
+	FIELD field_3687 random Lnet/minecraft/class_5819;
 	FIELD field_3688 recipeManager Lnet/minecraft/class_1863;
 	FIELD field_3689 connection Lnet/minecraft/class_2535;
 	FIELD field_3690 client Lnet/minecraft/class_310;

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

@@ -106,6 +106,6 @@ CLASS net/minecraft/class_663 net/minecraft/client/particle/BlockLeakParticle
 			ARG 1 spriteProvider
 	CLASS class_5824 FallingSporeBlossomFactory
 		FIELD field_28784 spriteProvider Lnet/minecraft/class_4002;
-		FIELD field_28785 random Ljava/util/Random;
+		FIELD field_28785 random Lnet/minecraft/class_5819;
 		METHOD <init> (Lnet/minecraft/class_4002;)V
 			ARG 1 spriteProvider

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

@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_5786 net/minecraft/client/particle/GlowParticle
-	FIELD field_28457 RANDOM Ljava/util/Random;
+	FIELD field_28457 RANDOM Lnet/minecraft/class_5819;
 	FIELD field_28458 spriteProvider Lnet/minecraft/class_4002;
 	METHOD <init> (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_4002;)V
 		ARG 1 world

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

@@ -3,7 +3,7 @@ CLASS net/minecraft/class_703 net/minecraft/client/particle/Particle
 	FIELD field_36193 MAX_SQUARED_COLLISION_CHECK_DISTANCE D
 	FIELD field_3838 prevPosY D
 	FIELD field_3839 angle F
-	FIELD field_3840 random Ljava/util/Random;
+	FIELD field_3840 random Lnet/minecraft/class_5819;
 	FIELD field_3841 alpha F
 	FIELD field_3842 green F
 	FIELD field_3843 dead Z

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

@@ -6,7 +6,7 @@ CLASS net/minecraft/class_702 net/minecraft/client/particle/ParticleManager
 	FIELD field_32657 MAX_PARTICLE_COUNT I
 	FIELD field_3830 particles Ljava/util/Map;
 	FIELD field_3831 textureManager Lnet/minecraft/class_1060;
-	FIELD field_3832 random Ljava/util/Random;
+	FIELD field_3832 random Lnet/minecraft/class_5819;
 	FIELD field_3834 world Lnet/minecraft/class_638;
 	FIELD field_3835 factories Lit/unimi/dsi/fastutil/ints/Int2ObjectMap;
 	FIELD field_3836 newParticles Ljava/util/Queue;

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

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_711 net/minecraft/client/particle/SpellParticle
 	FIELD field_17870 spriteProvider Lnet/minecraft/class_4002;
-	FIELD field_3888 RANDOM Ljava/util/Random;
+	FIELD field_3888 RANDOM Lnet/minecraft/class_5819;
 	METHOD <init> (Lnet/minecraft/class_638;DDDDDDLnet/minecraft/class_4002;)V
 		ARG 1 world
 		ARG 2 x

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

@@ -1,4 +1,3 @@
 CLASS net/minecraft/class_4002 net/minecraft/client/particle/SpriteProvider
 	METHOD method_18138 getSprite (II)Lnet/minecraft/class_1058;
-	METHOD method_18139 getSprite (Ljava/util/Random;)Lnet/minecraft/class_1058;
+	METHOD method_18139 getSprite (Lnet/minecraft/class_5819;)Lnet/minecraft/class_1058;
-		ARG 1 random

mappings/net/minecraft/client/render/GameRenderer.mapping

@@ -70,7 +70,7 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer
 	FIELD field_3988 zoomX F
 	FIELD field_3992 renderHand Z
 	FIELD field_3993 LOGGER Lorg/slf4j/Logger;
-	FIELD field_3994 random Ljava/util/Random;
+	FIELD field_3994 random Lnet/minecraft/class_5819;
 	FIELD field_3996 SHADERS_LOCATIONS [Lnet/minecraft/class_2960;
 	FIELD field_3997 lastSkyDarkness F
 	FIELD field_3998 lastWindowFocusedTime J

mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping

@@ -23,7 +23,7 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRender
 		ARG 13 light2
 		ARG 14 light3
 		ARG 15 overlay
-	METHOD method_3361 renderSmooth (Lnet/minecraft/class_1920;Lnet/minecraft/class_1087;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;ZLjava/util/Random;JI)Z
+	METHOD method_3361 renderSmooth (Lnet/minecraft/class_1920;Lnet/minecraft/class_1087;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;ZLnet/minecraft/class_5819;JI)Z
 		ARG 1 world
 		ARG 2 model
 		ARG 3 state
@@ -31,7 +31,6 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRender
 		ARG 5 matrices
 		ARG 6 vertexConsumer
 		ARG 7 cull
-		ARG 8 random
 		ARG 9 seed
 		ARG 11 overlay
 	METHOD method_3363 renderQuadsSmooth (Lnet/minecraft/class_1920;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Ljava/util/List;[FLjava/util/BitSet;Lnet/minecraft/class_778$class_780;I)V
@@ -81,7 +80,7 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRender
 		ARG 8 vertexConsumer
 		ARG 9 quads
 		ARG 10 flags
-	METHOD method_3373 renderFlat (Lnet/minecraft/class_1920;Lnet/minecraft/class_1087;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;ZLjava/util/Random;JI)Z
+	METHOD method_3373 renderFlat (Lnet/minecraft/class_1920;Lnet/minecraft/class_1087;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;ZLnet/minecraft/class_5819;JI)Z
 		ARG 1 world
 		ARG 2 model
 		ARG 3 state
@@ -89,10 +88,9 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRender
 		ARG 5 matrices
 		ARG 6 vertexConsumer
 		ARG 7 cull
-		ARG 8 random
 		ARG 9 seed
 		ARG 11 overlay
-	METHOD method_3374 render (Lnet/minecraft/class_1920;Lnet/minecraft/class_1087;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;ZLjava/util/Random;JI)Z
+	METHOD method_3374 render (Lnet/minecraft/class_1920;Lnet/minecraft/class_1087;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;ZLnet/minecraft/class_5819;JI)Z
 		ARG 1 world
 		ARG 2 model
 		ARG 3 state
@@ -100,7 +98,6 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRender
 		ARG 5 matrices
 		ARG 6 vertexConsumer
 		ARG 7 cull
-		ARG 8 random
 		ARG 9 seed
 		ARG 11 overlay
 	CLASS class_779 NeighborData

mappings/net/minecraft/client/render/block/BlockRenderManager.mapping

@@ -3,7 +3,7 @@ CLASS net/minecraft/class_776 net/minecraft/client/render/block/BlockRenderManag
 	FIELD field_27742 builtinModelItemRenderer Lnet/minecraft/class_756;
 	FIELD field_4167 fluidRenderer Lnet/minecraft/class_775;
 	FIELD field_4168 models Lnet/minecraft/class_773;
-	FIELD field_4169 random Ljava/util/Random;
+	FIELD field_4169 random Lnet/minecraft/class_5819;
 	FIELD field_4170 blockModelRenderer Lnet/minecraft/class_778;
 	METHOD <init> (Lnet/minecraft/class_773;Lnet/minecraft/class_756;Lnet/minecraft/class_324;)V
 		ARG 1 models
@@ -29,11 +29,10 @@ CLASS net/minecraft/class_776 net/minecraft/client/render/block/BlockRenderManag
 		ARG 3 vertexConsumer
 		ARG 4 light
 		ARG 5 overlay
-	METHOD method_3355 renderBlock (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_1920;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;ZLjava/util/Random;)Z
+	METHOD method_3355 renderBlock (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_1920;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;ZLnet/minecraft/class_5819;)Z
 		ARG 1 state
 		ARG 2 pos
 		ARG 3 world
 		ARG 4 matrices
 		ARG 5 vertexConsumer
 		ARG 6 cull
-		ARG 7 random

mappings/net/minecraft/client/render/debug/NameGenerator.mapping

@@ -1,12 +1,11 @@
 CLASS net/minecraft/class_4617 net/minecraft/client/render/debug/NameGenerator
 	FIELD field_21050 PREFIX [Ljava/lang/String;
 	FIELD field_21051 SUFFIX [Ljava/lang/String;
-	METHOD method_23266 getRandom (Ljava/util/Random;[Ljava/lang/String;)Ljava/lang/String;
+	METHOD method_23266 getRandom (Lnet/minecraft/class_5819;[Ljava/lang/String;)Ljava/lang/String;
-		ARG 0 random
 		ARG 1 options
 	METHOD method_23267 name (Ljava/util/UUID;)Ljava/lang/String;
 		ARG 0 uuid
-	METHOD method_23268 randomFromUuid (Ljava/util/UUID;)Ljava/util/Random;
+	METHOD method_23268 randomFromUuid (Ljava/util/UUID;)Lnet/minecraft/class_5819;
 		ARG 0 uuid
 	METHOD method_36154 name (Lnet/minecraft/class_1297;)Ljava/lang/String;
 		ARG 0 entity

mappings/net/minecraft/client/render/entity/EndermanEntityRenderer.mapping

@@ -1,3 +1,3 @@
 CLASS net/minecraft/class_894 net/minecraft/client/render/entity/EndermanEntityRenderer
 	FIELD field_4666 TEXTURE Lnet/minecraft/class_2960;
-	FIELD field_4667 random Ljava/util/Random;
+	FIELD field_4667 random Lnet/minecraft/class_5819;

mappings/net/minecraft/client/render/entity/FrogEntityRenderer.mapping

@@ -1,2 +1 @@
 CLASS net/minecraft/class_7213 net/minecraft/client/render/entity/FrogEntityRenderer
-	FIELD field_37968 TEXTURES Ljava/util/Map;

mappings/net/minecraft/client/render/entity/ItemEntityRenderer.mapping

@@ -3,7 +3,7 @@ CLASS net/minecraft/class_916 net/minecraft/client/render/entity/ItemEntityRende
 	FIELD field_32926 MAX_COUNT_FOR_3_ITEMS_RENDERED I
 	FIELD field_32927 MAX_COUNT_FOR_2_ITEMS_RENDERED I
 	FIELD field_32928 MAX_COUNT_FOR_1_ITEM_RENDERED I
-	FIELD field_4725 random Ljava/util/Random;
+	FIELD field_4725 random Lnet/minecraft/class_5819;
 	FIELD field_4726 itemRenderer Lnet/minecraft/class_918;
 	METHOD method_3998 getRenderedAmount (Lnet/minecraft/class_1799;)I
 		ARG 1 stack

mappings/net/minecraft/client/render/entity/model/PlayerEntityModel.mapping

@@ -76,8 +76,7 @@ CLASS net/minecraft/class_591 net/minecraft/client/render/entity/model/PlayerEnt
 	METHOD <init> (Lnet/minecraft/class_630;Z)V
 		ARG 1 root
 		ARG 2 thinArms
-	METHOD method_22697 getRandomPart (Ljava/util/Random;)Lnet/minecraft/class_630;
+	METHOD method_22697 getRandomPart (Lnet/minecraft/class_5819;)Lnet/minecraft/class_630;
-		ARG 1 random
 	METHOD method_2823 renderCape (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;II)V
 		ARG 1 matrices
 		ARG 2 vertices

mappings/net/minecraft/client/render/model/BakedModel.mapping

@@ -5,10 +5,9 @@ CLASS net/minecraft/class_1087 net/minecraft/client/render/model/BakedModel
 		COMMENT True, the model will be lit from the side, like a block.
 		COMMENT <p>
 		COMMENT False, the model will be lit from the front, like an item.
-	METHOD method_4707 getQuads (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;Ljava/util/Random;)Ljava/util/List;
+	METHOD method_4707 getQuads (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;Lnet/minecraft/class_5819;)Ljava/util/List;
 		ARG 1 state
 		ARG 2 face
-		ARG 3 random
 	METHOD method_4708 useAmbientOcclusion ()Z
 	METHOD method_4709 getTransformation ()Lnet/minecraft/class_809;
 	METHOD method_4710 getOverrides ()Lnet/minecraft/class_806;

mappings/net/minecraft/client/resource/SplashTextResourceSupplier.mapping

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_4008 net/minecraft/client/resource/SplashTextResourceSupplier
 	FIELD field_17904 RESOURCE_ID Lnet/minecraft/class_2960;
-	FIELD field_17905 RANDOM Ljava/util/Random;
+	FIELD field_17905 RANDOM Lnet/minecraft/class_5819;
 	FIELD field_17906 splashTexts Ljava/util/List;
 	FIELD field_18934 session Lnet/minecraft/class_320;
 	METHOD <init> (Lnet/minecraft/class_320;)V

mappings/net/minecraft/client/sound/AbstractSoundInstance.mapping

@@ -11,9 +11,9 @@ CLASS net/minecraft/class_1102 net/minecraft/client/sound/AbstractSoundInstance
 	FIELD field_5449 z D
 	FIELD field_5450 y D
 	FIELD field_5451 repeatDelay I
-	METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_3419;)V
+	METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_3419;Lnet/minecraft/class_5819;)V
 		ARG 1 soundId
 		ARG 2 category
-	METHOD <init> (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;)V
+	METHOD <init> (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;Lnet/minecraft/class_5819;)V
 		ARG 1 sound
 		ARG 2 category

mappings/net/minecraft/client/sound/BiomeEffectSoundPlayer.mapping

@@ -2,7 +2,7 @@ CLASS net/minecraft/class_4897 net/minecraft/client/sound/BiomeEffectSoundPlayer
 	FIELD field_22796 player Lnet/minecraft/class_746;
 	FIELD field_22797 soundManager Lnet/minecraft/class_1144;
 	FIELD field_22798 biomeAccess Lnet/minecraft/class_4543;
-	FIELD field_22799 random Ljava/util/Random;
+	FIELD field_22799 random Lnet/minecraft/class_5819;
 	FIELD field_22800 soundLoops Lit/unimi/dsi/fastutil/objects/Object2ObjectArrayMap;
 	FIELD field_22801 moodSound Ljava/util/Optional;
 	FIELD field_22802 additionsSound Ljava/util/Optional;

mappings/net/minecraft/client/sound/EntityTrackingSoundInstance.mapping

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_1106 net/minecraft/client/sound/EntityTrackingSoundInstance
 	FIELD field_5455 entity Lnet/minecraft/class_1297;
-	METHOD <init> (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFLnet/minecraft/class_1297;)V
+	METHOD <init> (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFLnet/minecraft/class_1297;J)V
 		ARG 1 sound
 		ARG 2 category
 		ARG 3 volume

mappings/net/minecraft/client/sound/MusicTracker.mapping

@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_1142 net/minecraft/client/sound/MusicTracker
-	FIELD field_5571 random Ljava/util/Random;
+	FIELD field_5571 random Lnet/minecraft/class_5819;
 	FIELD field_5572 timeUntilNextSong I
 	FIELD field_5574 current Lnet/minecraft/class_1113;
 	FIELD field_5575 client Lnet/minecraft/class_310;

mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping

@@ -1,52 +1,32 @@
 CLASS net/minecraft/class_1109 net/minecraft/client/sound/PositionedSoundInstance
-	METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_3419;FFZILnet/minecraft/class_1113$class_1114;DDDZ)V
+	METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_3419;FFLnet/minecraft/class_5819;ZILnet/minecraft/class_1113$class_1114;DDDZ)V
 		ARG 1 id
 		ARG 2 category
 		ARG 3 volume
 		ARG 4 pitch
-		ARG 5 repeat
+	METHOD <init> (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFLnet/minecraft/class_5819;DDD)V
-		ARG 6 repeatDelay
-		ARG 7 attenuationType
-		ARG 8 x
-		ARG 10 y
-		ARG 12 z
-		ARG 14 relative
-	METHOD <init> (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFDDD)V
 		ARG 1 sound
 		ARG 2 category
 		ARG 3 volume
 		ARG 4 pitch
-		ARG 5 x
+	METHOD <init> (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFLnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V
-		ARG 7 y
-		ARG 9 z
-	METHOD <init> (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFLnet/minecraft/class_2338;)V
 		ARG 1 sound
 		ARG 2 category
 		ARG 3 volume
 		ARG 4 pitch
-		ARG 5 pos
+	METHOD <init> (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFLnet/minecraft/class_5819;ZILnet/minecraft/class_1113$class_1114;DDD)V
-	METHOD <init> (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFZILnet/minecraft/class_1113$class_1114;DDD)V
 		ARG 1 sound
 		ARG 2 category
 		ARG 3 volume
 		ARG 4 pitch
-		ARG 5 repeat
-		ARG 6 repeatDelay
-		ARG 7 attenuationType
-		ARG 8 x
-		ARG 10 y
-		ARG 12 z
 	METHOD method_24877 ambient (Lnet/minecraft/class_3414;FF)Lnet/minecraft/class_1109;
 		ARG 0 sound
 		ARG 1 pitch
 		ARG 2 volume
 	METHOD method_25466 ambient (Lnet/minecraft/class_3414;)Lnet/minecraft/class_1109;
 		ARG 0 sound
-	METHOD method_25467 ambient (Lnet/minecraft/class_3414;DDD)Lnet/minecraft/class_1109;
+	METHOD method_25467 ambient (Lnet/minecraft/class_3414;Lnet/minecraft/class_5819;DDD)Lnet/minecraft/class_1109;
 		ARG 0 sound
-		ARG 1 x
-		ARG 3 y
-		ARG 5 z
 	METHOD method_4757 master (Lnet/minecraft/class_3414;FF)Lnet/minecraft/class_1109;
 		ARG 0 sound
 		ARG 1 pitch

mappings/net/minecraft/client/sound/Sound.mapping

@@ -1,16 +1,14 @@
 CLASS net/minecraft/class_1111 net/minecraft/client/sound/Sound
 	FIELD field_5463 attenuation I
-	FIELD field_5464 pitch F
+	FIELD field_5464 pitch Lnet/minecraft/class_7373;
 	FIELD field_5465 preload Z
-	FIELD field_5466 volume F
+	FIELD field_5466 volume Lnet/minecraft/class_7373;
 	FIELD field_5467 stream Z
 	FIELD field_5468 weight I
 	FIELD field_5469 id Lnet/minecraft/class_2960;
 	FIELD field_5470 registrationType Lnet/minecraft/class_1111$class_1112;
-	METHOD <init> (Ljava/lang/String;FFILnet/minecraft/class_1111$class_1112;ZZI)V
+	METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_7373;Lnet/minecraft/class_7373;ILnet/minecraft/class_1111$class_1112;ZZI)V
 		ARG 1 id
-		ARG 2 volume
-		ARG 3 pitch
 		ARG 4 weight
 		ARG 5 registrationType
 		ARG 6 stream
@@ -22,8 +20,8 @@ CLASS net/minecraft/class_1111 net/minecraft/client/sound/Sound
 	METHOD method_4768 getRegistrationType ()Lnet/minecraft/class_1111$class_1112;
 	METHOD method_4769 isStreamed ()Z
 	METHOD method_4770 getAttenuation ()I
-	METHOD method_4771 getVolume ()F
+	METHOD method_4771 getVolume ()Lnet/minecraft/class_7373;
-	METHOD method_4772 getPitch ()F
+	METHOD method_4772 getPitch ()Lnet/minecraft/class_7373;
 	CLASS class_1112 RegistrationType
 		FIELD field_5472 name Ljava/lang/String;
 		FIELD field_5473 SOUND_EVENT Lnet/minecraft/class_1111$class_1112;

mappings/net/minecraft/client/sound/SoundContainer.mapping

@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_1148 net/minecraft/client/sound/SoundContainer
 	METHOD method_18188 preload (Lnet/minecraft/class_1140;)V
 		ARG 1 soundSystem
-	METHOD method_4893 getSound ()Ljava/lang/Object;
+	METHOD method_4893 getSound (Lnet/minecraft/class_5819;)Ljava/lang/Object;
 	METHOD method_4894 getWeight ()I

mappings/net/minecraft/client/sound/SoundSystem.mapping

@@ -93,7 +93,6 @@ CLASS net/minecraft/class_1140 net/minecraft/client/sound/SoundSystem
 		ARG 1 sound
 		ARG 2 delay
 	METHOD method_4853 getAdjustedVolume (Lnet/minecraft/class_1113;)F
-		ARG 1 sound
 	METHOD method_4854 play (Lnet/minecraft/class_1113;)V
 		ARG 1 sound
 	METHOD method_4855 registerListener (Lnet/minecraft/class_1145;)V

mappings/net/minecraft/client/sound/WeightedSoundSet.mapping

@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_1146 net/minecraft/client/sound/WeightedSoundSet
 	FIELD field_5599 subtitle Lnet/minecraft/class_2561;
 	FIELD field_5600 sounds Ljava/util/List;
-	FIELD field_5601 random Ljava/util/Random;
+	FIELD field_5601 random Lnet/minecraft/class_5819;
 	FIELD field_5602 id Lnet/minecraft/class_2960;
 	METHOD <init> (Lnet/minecraft/class_2960;Ljava/lang/String;)V
 		ARG 1 id

mappings/net/minecraft/client/texture/ResourceTexture.mapping

@@ -21,6 +21,5 @@ CLASS net/minecraft/class_1049 net/minecraft/client/texture/ResourceTexture
 		METHOD method_18155 getMetadata ()Lnet/minecraft/class_1084;
 		METHOD method_18156 load (Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;)Lnet/minecraft/class_1049$class_4006;
 			ARG 0 resourceManager
-			ARG 1 id
 		METHOD method_18157 getImage ()Lnet/minecraft/class_1011;
 		METHOD method_18158 checkException ()V

mappings/net/minecraft/client/util/ParticleUtil.mapping

@@ -26,5 +26,4 @@ CLASS net/minecraft/class_5945 net/minecraft/client/util/ParticleUtil
 		ARG 4 direction
 		ARG 5 velocity
 		ARG 6 offsetMultiplier
-	METHOD method_41306 getRandomVelocity (Ljava/util/Random;)Lnet/minecraft/class_243;
+	METHOD method_41306 getRandomVelocity (Lnet/minecraft/class_5819;)Lnet/minecraft/class_243;
-		ARG 0 random

mappings/net/minecraft/client/world/ClientWorld.mapping

@@ -74,7 +74,6 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld
 	METHOD method_27873 setSpawnPos (Lnet/minecraft/class_2338;F)V
 		ARG 1 pos
 		ARG 2 angle
-	METHOD method_27874 getSpawnPos ()Lnet/minecraft/class_2338;
 	METHOD method_28103 getDimensionEffects ()Lnet/minecraft/class_5294;
 	METHOD method_29089 setTime (J)V
 		ARG 1 time
@@ -97,12 +96,11 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld
 	METHOD method_2942 addEntity (ILnet/minecraft/class_1297;)V
 		ARG 1 id
 		ARG 2 entity
-	METHOD method_2943 randomBlockDisplayTick (IIIILjava/util/Random;Lnet/minecraft/class_2248;Lnet/minecraft/class_2338$class_2339;)V
+	METHOD method_2943 randomBlockDisplayTick (IIIILnet/minecraft/class_5819;Lnet/minecraft/class_2248;Lnet/minecraft/class_2338$class_2339;)V
 		ARG 1 centerX
 		ARG 2 centerY
 		ARG 3 centerZ
 		ARG 4 radius
-		ARG 5 random
 		ARG 6 block
 		ARG 7 pos
 	METHOD method_2944 setScoreboard (Lnet/minecraft/class_269;)V
@@ -122,7 +120,6 @@ CLASS net/minecraft/class_638 net/minecraft/client/world/ClientWorld
 		ARG 2 parameters
 		ARG 3 shape
 		ARG 4 y
-	METHOD method_30671 getSpawnAngle ()F
 	METHOD method_32121 (Lnet/minecraft/class_1923;Lnet/minecraft/class_6539;Lnet/minecraft/class_4700;)V
 		ARG 1 resolver
 		ARG 2 cache

mappings/net/minecraft/data/server/HusbandryTabAdvancementGenerator.mapping

@@ -15,8 +15,5 @@ CLASS net/minecraft/class_2414 net/minecraft/data/server/HusbandryTabAdvancement
 		ARG 1 builder
 	METHOD method_10342 requireListedAnimalsBred (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;
 		ARG 1 builder
-	METHOD method_16117 (Lnet/minecraft/class_161$class_162;Ljava/lang/Integer;Lnet/minecraft/class_2960;)V
-		ARG 1 type
-		ARG 2 id
 	METHOD method_16118 requireAllCatsTamed (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162;
 		ARG 1 builder

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

@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_1174 net/minecraft/datafixer/fix/EntityZombieVillagerTypeFix
-	FIELD field_5674 RANDOM Ljava/util/Random;
+	FIELD field_5674 RANDOM Lnet/minecraft/class_5819;
 	METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;Z)V
 		ARG 1 outputSchema
 		ARG 2 changesType

mappings/net/minecraft/enchantment/EnchantmentHelper.mapping

@@ -139,11 +139,9 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper
 		ARG 1 stack
 	METHOD method_8226 getLooting (Lnet/minecraft/class_1309;)I
 		ARG 0 entity
-	METHOD method_8227 calculateRequiredExperienceLevel (Ljava/util/Random;IILnet/minecraft/class_1799;)I
+	METHOD method_8227 calculateRequiredExperienceLevel (Lnet/minecraft/class_5819;IILnet/minecraft/class_1799;)I
 		COMMENT {@return the required experience level for an enchanting option in the
 		COMMENT enchanting table's screen, or the enchantment screen}
-		ARG 0 random
-			COMMENT the random, which guarantees consistent results with the same seed
 		ARG 1 slotIndex
 			COMMENT the index of the enchanting option
 		ARG 2 bookshelfCount
@@ -158,9 +156,8 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper
 		ARG 0 power
 		ARG 1 stack
 		ARG 2 treasureAllowed
-	METHOD method_8230 generateEnchantments (Ljava/util/Random;Lnet/minecraft/class_1799;IZ)Ljava/util/List;
+	METHOD method_8230 generateEnchantments (Lnet/minecraft/class_5819;Lnet/minecraft/class_1799;IZ)Ljava/util/List;
 		COMMENT Generate the enchantments for enchanting the {@code stack}.
-		ARG 0 random
 		ARG 1 stack
 		ARG 2 level
 		ARG 3 treasureAllowed
@@ -173,10 +170,8 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper
 			COMMENT the picked entry
 	METHOD method_8232 getDepthStrider (Lnet/minecraft/class_1309;)I
 		ARG 0 entity
-	METHOD method_8233 enchant (Ljava/util/Random;Lnet/minecraft/class_1799;IZ)Lnet/minecraft/class_1799;
+	METHOD method_8233 enchant (Lnet/minecraft/class_5819;Lnet/minecraft/class_1799;IZ)Lnet/minecraft/class_1799;
 		COMMENT Enchants the {@code target} item stack and returns it.
-		ARG 0 random
-			COMMENT the seed
 		ARG 1 target
 			COMMENT the item stack to enchant
 		ARG 2 level

mappings/net/minecraft/enchantment/ThornsEnchantment.mapping

@@ -5,9 +5,7 @@ CLASS net/minecraft/class_1906 net/minecraft/enchantment/ThornsEnchantment
 		ARG 2 slotTypes
 	METHOD method_30345 (Ljava/util/Map$Entry;Lnet/minecraft/class_1309;)V
 		ARG 1 entity
-	METHOD method_8242 getDamageAmount (ILjava/util/Random;)I
+	METHOD method_8242 getDamageAmount (ILnet/minecraft/class_5819;)I
 		ARG 0 level
-		ARG 1 random
+	METHOD method_8243 shouldDamageAttacker (ILnet/minecraft/class_5819;)Z
-	METHOD method_8243 shouldDamageAttacker (ILjava/util/Random;)Z
 		ARG 0 level
-		ARG 1 random

mappings/net/minecraft/enchantment/UnbreakingEnchantment.mapping

@@ -2,7 +2,6 @@ CLASS net/minecraft/class_1885 net/minecraft/enchantment/UnbreakingEnchantment
 	METHOD <init> (Lnet/minecraft/class_1887$class_1888;[Lnet/minecraft/class_1304;)V
 		ARG 1 weight
 		ARG 2 slotTypes
-	METHOD method_8176 shouldPreventDamage (Lnet/minecraft/class_1799;ILjava/util/Random;)Z
+	METHOD method_8176 shouldPreventDamage (Lnet/minecraft/class_1799;ILnet/minecraft/class_5819;)Z
 		ARG 0 item
 		ARG 1 level
-		ARG 2 random

mappings/net/minecraft/entity/Entity.mapping

@@ -82,7 +82,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
 	FIELD field_5971 lastRenderY D
 	FIELD field_5972 netherPortalTime I
 	FIELD field_5973 horizontalSpeed F
-	FIELD field_5974 random Ljava/util/Random;
+	FIELD field_5974 random Lnet/minecraft/class_5819;
 	FIELD field_5975 NAME_VISIBLE Lnet/minecraft/class_2940;
 	FIELD field_5976 horizontalCollision Z
 	FIELD field_5978 CURRENT_ID Ljava/util/concurrent/atomic/AtomicInteger;

mappings/net/minecraft/entity/EntityType.mapping

@@ -85,9 +85,6 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType
 		ARG 1 pos
 		ARG 2 invertY
 		ARG 3 boundingBox
-	METHOD method_5886 newInstance (Lnet/minecraft/class_1937;Lnet/minecraft/class_1299;)Lnet/minecraft/class_1297;
-		ARG 0 world
-		ARG 1 type
 	METHOD method_5888 create (Lnet/minecraft/class_3218;Lnet/minecraft/class_2487;Lnet/minecraft/class_2561;Lnet/minecraft/class_1657;Lnet/minecraft/class_2338;Lnet/minecraft/class_3730;ZZ)Lnet/minecraft/class_1297;
 		ARG 1 world
 		ARG 2 itemNbt

mappings/net/minecraft/entity/LivingEntity.mapping

@@ -298,8 +298,6 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	METHOD method_32326 getPreferredEquipmentSlot (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1304;
 		ARG 0 stack
 	METHOD method_33190 canTakeDamage ()Z
-	METHOD method_33579 readFromPacket (Lnet/minecraft/class_2610;)V
-		ARG 1 packet
 	METHOD method_35053 hasNoDrag ()Z
 	METHOD method_35054 setNoDrag (Z)V
 		ARG 1 noDrag
@@ -429,7 +427,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity
 	METHOD method_6049 canHaveStatusEffect (Lnet/minecraft/class_1293;)Z
 		ARG 1 effect
 	METHOD method_6050 tickStatusEffects ()V
-	METHOD method_6051 getRandom ()Ljava/util/Random;
+	METHOD method_6051 getRandom ()Lnet/minecraft/class_5819;
 	METHOD method_6052 getAttacking ()Lnet/minecraft/class_1309;
 	METHOD method_6053 tickFallFlying ()V
 	METHOD method_6054 shouldDropXp ()Z

mappings/net/minecraft/entity/SaddledComponent.mapping

@@ -11,8 +11,7 @@ CLASS net/minecraft/class_4980 net/minecraft/entity/SaddledComponent
 		ARG 2 boostTime
 		ARG 3 saddled
 	METHOD method_26307 boost ()V
-	METHOD method_26308 boost (Ljava/util/Random;)Z
+	METHOD method_26308 boost (Lnet/minecraft/class_5819;)Z
-		ARG 1 random
 	METHOD method_26309 writeNbt (Lnet/minecraft/class_2487;)V
 		ARG 1 nbt
 	METHOD method_26310 setSaddled (Z)V

mappings/net/minecraft/entity/SpawnRestriction.mapping

@@ -5,12 +5,11 @@ CLASS net/minecraft/class_1317 net/minecraft/entity/SpawnRestriction
 		ARG 1 location
 		ARG 2 heightmapType
 		ARG 3 predicate
-	METHOD method_20638 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_20638 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_6159 getLocation (Lnet/minecraft/class_1299;)Lnet/minecraft/class_1317$class_1319;
 		ARG 0 type
 	METHOD method_6160 getHeightmapType (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2902$class_2903;
@@ -28,9 +27,8 @@ CLASS net/minecraft/class_1317 net/minecraft/entity/SpawnRestriction
 			ARG 1 name
 			ARG 2 id
 	CLASS class_4306 SpawnPredicate
-		METHOD test (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+		METHOD test (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 			ARG 1 type
 			ARG 2 world
 			ARG 3 spawnReason
 			ARG 4 pos
-			ARG 5 random

mappings/net/minecraft/entity/ai/FuzzyPositions.mapping

@@ -1,12 +1,11 @@
 CLASS net/minecraft/class_5535 net/minecraft/entity/ai/FuzzyPositions
 	FIELD field_30264 GAUSS_RANGE I
-	METHOD method_31537 towardTarget (Lnet/minecraft/class_1314;ILjava/util/Random;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338;
+	METHOD method_31537 towardTarget (Lnet/minecraft/class_1314;ILnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338;
 		COMMENT Adjusts the input {@code fuzz} slightly toward the given {@code entity}'s
 		COMMENT {@link net.minecraft.entity.mob.MobEntity#getPositionTarget() position target}
 		COMMENT if it exists.
 		ARG 0 entity
 		ARG 1 horizontalRange
-		ARG 2 random
 		ARG 3 fuzz
 	METHOD method_31538 guessBestPathTarget (Lnet/minecraft/class_1314;Ljava/util/function/Supplier;)Lnet/minecraft/class_243;
 		COMMENT Calls {@link #guessBest(Supplier, ToDoubleFunction)} with the {@code entity}'s
@@ -27,17 +26,15 @@ CLASS net/minecraft/class_5535 net/minecraft/entity/ai/FuzzyPositions
 		ARG 0 pos
 		ARG 1 maxY
 		ARG 2 condition
-	METHOD method_31541 localFuzz (Ljava/util/Random;II)Lnet/minecraft/class_2338;
+	METHOD method_31541 localFuzz (Lnet/minecraft/class_5819;II)Lnet/minecraft/class_2338;
 		COMMENT Creates a fuzzy offset position within the given horizontal and vertical
 		COMMENT ranges.
-		ARG 0 random
 		ARG 1 horizontalRange
 		ARG 2 verticalRange
-	METHOD method_31542 localFuzz (Ljava/util/Random;IIIDDD)Lnet/minecraft/class_2338;
+	METHOD method_31542 localFuzz (Lnet/minecraft/class_5819;IIIDDD)Lnet/minecraft/class_2338;
 		COMMENT Tries to create a fuzzy offset position from the direction and the angle
 		COMMENT range given. It fulfills the constraints given by {@code horizontalRange}
 		COMMENT and {@code verticalRange} and returns {@code null} if it cannot do so.
-		ARG 0 random
 		ARG 1 horizontalRange
 		ARG 2 verticalRange
 		ARG 3 startHeight

mappings/net/minecraft/entity/ai/WardenAngerManager.mapping

@@ -3,26 +3,20 @@ CLASS net/minecraft/class_7254 net/minecraft/entity/ai/WardenAngerManager
 	FIELD field_38128 maxAnger I
 	FIELD field_38129 angerDecreasePerTick I
 	FIELD field_38130 suspects Lit/unimi/dsi/fastutil/objects/Object2IntMap;
-	METHOD <init> (Ljava/util/Map;)V
+	METHOD method_42176 tick (Lnet/minecraft/class_3218;Ljava/util/function/Predicate;)V
-		ARG 1 suspects
+	METHOD method_42177 (ILnet/minecraft/class_1297;Ljava/lang/Integer;)Ljava/lang/Integer;
-	METHOD method_42176 tick ()V
-	METHOD method_42177 (ILjava/util/UUID;Ljava/lang/Integer;)Ljava/lang/Integer;
-		ARG 1 uuid
 		ARG 2 anger
 	METHOD method_42178 removeSuspect (Lnet/minecraft/class_1297;)V
 		ARG 1 entity
 	METHOD method_42179 increaseAngerAt (Lnet/minecraft/class_1297;I)I
 		ARG 1 entity
 		ARG 2 amount
-	METHOD method_42180 (Lnet/minecraft/class_7254;)Ljava/util/Map;
+	METHOD method_42181 getPrimeSuspect ()Ljava/util/Optional;
-		ARG 0 angerManager
-	METHOD method_42181 getPrimeSuspect (Lnet/minecraft/class_1937;)Ljava/util/Optional;
-		ARG 1 world
 	METHOD method_42182 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
 	METHOD method_42185 getPrimeSuspectAnger ()I
 	METHOD method_42186 (Lnet/minecraft/class_1297;)Lnet/minecraft/class_1309;
 		ARG 0 suspect
-	METHOD method_42187 getPrimeSuspect ()Ljava/util/Optional;
+	METHOD method_42187 getPrimeSuspect ()Lnet/minecraft/class_1297;
 	METHOD method_42188 (Lnet/minecraft/class_1297;)Z
 		ARG 0 suspect

mappings/net/minecraft/entity/ai/brain/LivingTargetCache.mapping

@@ -26,4 +26,3 @@ CLASS net/minecraft/class_6670 net/minecraft/entity/ai/brain/LivingTargetCache
 		ARG 1 predicate
 	METHOD method_38981 anyMatch (Ljava/util/function/Predicate;)Z
 		ARG 1 predicate
-	METHOD method_42162 findAny ([Ljava/util/function/Predicate;)Ljava/util/Optional;

mappings/net/minecraft/entity/ai/brain/sensor/Sensor.mapping

@@ -6,7 +6,7 @@ CLASS net/minecraft/class_4148 net/minecraft/entity/ai/brain/sensor/Sensor
 	COMMENT @see net.minecraft.entity.ai.brain.Brain#sensors
 	FIELD field_18463 lastSenseTime J
 	FIELD field_18464 senseInterval I
-	FIELD field_19294 RANDOM Ljava/util/Random;
+	FIELD field_19294 RANDOM Lnet/minecraft/class_5819;
 	FIELD field_26630 TARGET_PREDICATE Lnet/minecraft/class_4051;
 	FIELD field_26631 TARGET_PREDICATE_IGNORE_DISTANCE_SCALING Lnet/minecraft/class_4051;
 	FIELD field_30258 BASE_MAX_DISTANCE I

mappings/net/minecraft/entity/ai/brain/sensor/WardenAttackablesSensor.mapping

@@ -1,9 +1,5 @@
 CLASS net/minecraft/class_7252 net/minecraft/entity/ai/brain/sensor/WardenAttackablesSensor
-	METHOD method_42163 (Lnet/minecraft/class_1309;)Z
+	METHOD method_42164 (Lnet/minecraft/class_7260;Lnet/minecraft/class_1309;)V
-		ARG 0 entity
-	METHOD method_42164 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)V
 		ARG 1 entity
-	METHOD method_42165 (Lnet/minecraft/class_6670;)Ljava/util/Optional;
-		ARG 0 memory
 	METHOD method_42166 (Lnet/minecraft/class_1309;)Z
 		ARG 0 entity

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

@@ -23,14 +23,13 @@ CLASS net/minecraft/class_4096 net/minecraft/entity/ai/brain/task/FindPointOfInt
 		ARG 0 firstModule
 		ARG 1 secondModule
 	CLASS class_5397 RetryMarker
-		FIELD field_25600 random Ljava/util/Random;
+		FIELD field_25600 random Lnet/minecraft/class_5819;
 		FIELD field_25601 previousAttemptAt J
 		FIELD field_25602 nextScheduledAttemptAt J
 		FIELD field_25603 currentDelay I
 		FIELD field_30101 MIN_DELAY I
 		FIELD field_30103 ATTEMPT_DURATION I
-		METHOD <init> (Ljava/util/Random;J)V
+		METHOD <init> (Lnet/minecraft/class_5819;J)V
-			ARG 1 random
 			ARG 2 time
 		METHOD method_29926 setAttemptTime (J)V
 			ARG 1 time

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

@@ -13,9 +13,6 @@ CLASS net/minecraft/class_7108 net/minecraft/entity/ai/brain/task/FrogEatEntityT
 	METHOD <init> (Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;)V
 		ARG 1 tongueSound
 		ARG 2 eatSound
-	METHOD method_41386 createDroppedStack (Lnet/minecraft/class_7102;Lnet/minecraft/class_1297;)Lnet/minecraft/class_1799;
-		ARG 0 frog
-		ARG 1 eatenEntity
 	METHOD method_42667 eat (Lnet/minecraft/class_3218;Lnet/minecraft/class_7102;)V
 		ARG 1 world
 		ARG 2 frog

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

@@ -6,5 +6,4 @@ CLASS net/minecraft/class_4814 net/minecraft/entity/ai/brain/task/GoToCelebrateT
 	METHOD method_24577 fuzz (Lnet/minecraft/class_1308;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338;
 		ARG 0 mob
 		ARG 1 pos
-	METHOD method_24578 fuzz (Ljava/util/Random;)I
+	METHOD method_24578 fuzz (Lnet/minecraft/class_5819;)I
-		ARG 0 random

mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping

@@ -25,7 +25,7 @@ CLASS net/minecraft/class_2943 net/minecraft/entity/data/TrackedDataHandlerRegis
 		ARG 0 handler
 	METHOD method_12721 get (I)Lnet/minecraft/class_2941;
 		ARG 0 id
-	CLASS 2
+	CLASS 3
 		METHOD method_12744 read (Lnet/minecraft/class_2540;Lnet/minecraft/class_2396;)Lnet/minecraft/class_2394;
 			ARG 1 buf
 			ARG 2 type

mappings/net/minecraft/entity/effect/StatusEffect.mapping

@@ -8,7 +8,7 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect
 		ARG 2 color
 	METHOD method_18792 getCategory ()Lnet/minecraft/class_4081;
 	METHOD method_42126 setFactorCalculationDataSupplier (Ljava/util/function/Supplier;)Lnet/minecraft/class_1291;
-	METHOD method_42127 getFactorCalculationDataSupplier ()Ljava/util/function/Supplier;
+	METHOD method_42127 getFactorCalculationDataSupplier ()Ljava/util/Optional;
 	METHOD method_5552 canApplyUpdateEffect (II)Z
 		ARG 1 duration
 		ARG 2 amplifier

mappings/net/minecraft/entity/mob/Angriness.mapping

@@ -2,7 +2,7 @@ CLASS net/minecraft/class_7253 net/minecraft/entity/mob/Angriness
 	FIELD field_38123 VALUES [Lnet/minecraft/class_7253;
 	FIELD field_38124 threshold I
 	FIELD field_38125 sound Lnet/minecraft/class_3414;
-	METHOD <init> (Ljava/lang/String;IILnet/minecraft/class_3414;)V
+	METHOD <init> (Ljava/lang/String;IILnet/minecraft/class_3414;Lnet/minecraft/class_3414;)V
 		ARG 3 threshold
 		ARG 4 sound
 	METHOD method_42170 getThreshold ()I

mappings/net/minecraft/entity/mob/DrownedEntity.mapping

@@ -5,12 +5,11 @@ CLASS net/minecraft/class_1551 net/minecraft/entity/mob/DrownedEntity
 	METHOD method_20672 isValidSpawnDepth (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z
 		ARG 0 world
 		ARG 1 pos
-	METHOD method_20673 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_20673 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_7012 canDrownedAttackTarget (Lnet/minecraft/class_1309;)Z
 		ARG 1 target
 	METHOD method_7013 setTargetingUnderwater (Z)V

mappings/net/minecraft/entity/mob/EndermiteEntity.mapping

@@ -1,10 +1,9 @@
 CLASS net/minecraft/class_1559 net/minecraft/entity/mob/EndermiteEntity
 	FIELD field_30463 DESPAWN_TIME I
 	FIELD field_7250 lifeTime I
-	METHOD method_20674 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_20674 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_26911 createEndermiteAttributes ()Lnet/minecraft/class_5132$class_5133;

mappings/net/minecraft/entity/mob/GhastEntity.mapping

@@ -3,12 +3,11 @@ CLASS net/minecraft/class_1571 net/minecraft/entity/mob/GhastEntity
 	FIELD field_7273 SHOOTING Lnet/minecraft/class_2940;
 	METHOD method_18450 (Lnet/minecraft/class_1309;)Z
 		ARG 1 entity
-	METHOD method_20675 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_20675 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_26913 createGhastAttributes ()Lnet/minecraft/class_5132$class_5133;
 	METHOD method_7048 setShooting (Z)V
 		ARG 1 shooting

mappings/net/minecraft/entity/mob/GuardianEntity.mapping

@@ -11,12 +11,11 @@ CLASS net/minecraft/class_1577 net/minecraft/entity/mob/GuardianEntity
 	FIELD field_7288 cachedBeamTarget Lnet/minecraft/class_1309;
 	FIELD field_7289 wanderGoal Lnet/minecraft/class_1379;
 	FIELD field_7290 BEAM_TARGET_ID Lnet/minecraft/class_2940;
-	METHOD method_20676 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_20676 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_26915 createGuardianAttributes ()Lnet/minecraft/class_5132$class_5133;
 	METHOD method_7052 getBeamTarget ()Lnet/minecraft/class_1309;
 	METHOD method_7053 getSpikesExtension (F)F

mappings/net/minecraft/entity/mob/HoglinEntity.mapping

@@ -5,7 +5,7 @@ CLASS net/minecraft/class_4760 net/minecraft/entity/mob/HoglinEntity
 	FIELD field_23735 timeInOverworld I
 	FIELD field_23736 cannotBeHunted Z
 	FIELD field_23737 BABY Lnet/minecraft/class_2940;
-	METHOD method_24349 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_24349 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason

mappings/net/minecraft/entity/mob/HostileEntity.mapping

@@ -1,21 +1,18 @@
 CLASS net/minecraft/class_1588 net/minecraft/entity/mob/HostileEntity
 	METHOD method_16827 updateDespawnCounter ()V
-	METHOD method_20679 isSpawnDark (Lnet/minecraft/class_5425;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_20679 isSpawnDark (Lnet/minecraft/class_5425;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 world
 		ARG 1 pos
-		ARG 2 random
+	METHOD method_20680 canSpawnInDark (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
-	METHOD method_20680 canSpawnInDark (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random
+	METHOD method_20681 canSpawnIgnoreLightLevel (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
-	METHOD method_20681 canSpawnIgnoreLightLevel (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_26918 createHostileAttributes ()Lnet/minecraft/class_5132$class_5133;
 	METHOD method_7076 isAngryAt (Lnet/minecraft/class_1657;)Z
 		ARG 1 player

mappings/net/minecraft/entity/mob/HuskEntity.mapping

@@ -1,7 +1,6 @@
 CLASS net/minecraft/class_1576 net/minecraft/entity/mob/HuskEntity
-	METHOD method_20677 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_20677 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random

mappings/net/minecraft/entity/mob/MagmaCubeEntity.mapping

@@ -1,8 +1,7 @@
 CLASS net/minecraft/class_1589 net/minecraft/entity/mob/MagmaCubeEntity
-	METHOD method_20678 canMagmaCubeSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_20678 canMagmaCubeSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_26917 createMagmaCubeAttributes ()Lnet/minecraft/class_5132$class_5133;

mappings/net/minecraft/entity/mob/MobEntity.mapping

@@ -81,12 +81,11 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity
 		COMMENT
 		COMMENT <p>The default return value is {@code 10}.
 	METHOD method_20417 updateGoalControls ()V
-	METHOD method_20636 canMobSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_20636 canMobSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_20820 canGather (Lnet/minecraft/class_1799;)Z
 		ARG 1 stack
 	METHOD method_23734 isDisallowedInPeaceful ()Z

mappings/net/minecraft/entity/mob/PatrolEntity.mapping

@@ -14,12 +14,11 @@ CLASS net/minecraft/class_3732 net/minecraft/entity/mob/PatrolEntity
 	METHOD method_16472 hasNoRaid ()Z
 	METHOD method_16485 canLead ()Z
 	METHOD method_16915 isRaidCenterSet ()Z
-	METHOD method_20739 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_20739 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_22332 setPatrolling (Z)V
 		ARG 1 patrolling
 	CLASS class_3733 PatrolGoal

mappings/net/minecraft/entity/mob/PiglinEntity.mapping

@@ -8,12 +8,11 @@ CLASS net/minecraft/class_4836 net/minecraft/entity/mob/PiglinEntity
 	FIELD field_22381 MEMORY_MODULE_TYPES Lcom/google/common/collect/ImmutableList;
 	FIELD field_23738 cannotHunt Z
 	FIELD field_25164 DANCING Lnet/minecraft/class_2940;
-	METHOD method_24695 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_24695 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_24696 equipAtChance (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V
 		ARG 1 slot
 		ARG 2 stack

mappings/net/minecraft/entity/mob/SilverfishEntity.mapping

@@ -1,11 +1,10 @@
 CLASS net/minecraft/class_1614 net/minecraft/entity/mob/SilverfishEntity
 	FIELD field_7366 callForHelpGoal Lnet/minecraft/class_1614$class_1616;
-	METHOD method_20684 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_20684 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_26922 createSilverfishAttributes ()Lnet/minecraft/class_5132$class_5133;
 	CLASS class_1615 WanderAndInfestGoal
 		FIELD field_7367 canInfest Z

mappings/net/minecraft/entity/mob/SlimeEntity.mapping

@@ -6,12 +6,11 @@ CLASS net/minecraft/class_1621 net/minecraft/entity/mob/SlimeEntity
 	FIELD field_7389 targetStretch F
 	FIELD field_7390 SLIME_SIZE Lnet/minecraft/class_2940;
 	FIELD field_7391 onGroundLastTick Z
-	METHOD method_20685 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_20685 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_24353 getJumpSoundPitch ()F
 	METHOD method_7152 getSize ()I
 	METHOD method_7153 getJumpSound ()Lnet/minecraft/class_3414;

mappings/net/minecraft/entity/mob/SpiderEntity.mapping

@@ -11,8 +11,7 @@ CLASS net/minecraft/class_1628 net/minecraft/entity/mob/SpiderEntity
 			ARG 1 spider
 	CLASS class_1630 SpiderData
 		FIELD field_7404 effect Lnet/minecraft/class_1291;
-		METHOD method_7168 setEffect (Ljava/util/Random;)V
+		METHOD method_7168 setEffect (Lnet/minecraft/class_5819;)V
-			ARG 1 random
 	CLASS class_1631 TargetGoal
 		METHOD <init> (Lnet/minecraft/class_1628;Ljava/lang/Class;)V
 			ARG 1 spider

mappings/net/minecraft/entity/mob/StrayEntity.mapping

@@ -1,7 +1,6 @@
 CLASS net/minecraft/class_1627 net/minecraft/entity/mob/StrayEntity
-	METHOD method_20686 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_20686 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random

mappings/net/minecraft/entity/mob/WardenBrain.mapping

@@ -10,8 +10,6 @@ CLASS net/minecraft/class_7261 net/minecraft/entity/mob/WardenBrain
 	METHOD method_42224 getStrollOrWaitTask ()Lnet/minecraft/class_4118;
 	METHOD method_42225 resetDigCooldown (Lnet/minecraft/class_1309;)V
 		ARG 0 warden
-	METHOD method_42226 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1309;)Z
-		ARG 1 entity
 	METHOD method_42227 addCoreActivities (Lnet/minecraft/class_4095;)V
 		ARG 0 brain
 	METHOD method_42228 tick (Lnet/minecraft/class_7260;)V
@@ -40,9 +38,6 @@ CLASS net/minecraft/class_7261 net/minecraft/entity/mob/WardenBrain
 		ARG 0 brain
 	METHOD method_42238 (Lnet/minecraft/class_7260;)Z
 		ARG 0 warden
-	METHOD method_42239 isAngryAt (Lnet/minecraft/class_7260;Lnet/minecraft/class_1309;)Z
-		ARG 0 warden
-		ARG 1 entity
 	METHOD method_42240 addIdleActivities (Lnet/minecraft/class_4095;)V
 		ARG 0 brain
 	METHOD method_42241 (Lnet/minecraft/class_7260;Lnet/minecraft/class_1309;)Z

mappings/net/minecraft/entity/mob/WardenEntity.mapping

@@ -5,14 +5,10 @@ CLASS net/minecraft/class_7260 net/minecraft/entity/mob/WardenEntity
 	FIELD field_38141 angerManager Lnet/minecraft/class_7254;
 	FIELD field_38148 ANGER Lnet/minecraft/class_2940;
 	FIELD field_38166 gameEventHandler Lnet/minecraft/class_5715;
-	FIELD field_38167 vibrationListener Lnet/minecraft/class_5718;
 	FIELD field_38168 roaringAnimationState Lnet/minecraft/class_7094;
 	FIELD field_38169 sniffingAnimationState Lnet/minecraft/class_7094;
 	METHOD method_42202 getHeartPitch (F)F
 		ARG 1 tickDelta
-	METHOD method_42203 playListeningSound (II)V
-		ARG 1 prevAnger
-		ARG 2 anger
 	METHOD method_42204 addDarknessToClosePlayers (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1297;I)V
 		ARG 0 world
 		ARG 1 pos
@@ -21,7 +17,6 @@ CLASS net/minecraft/class_7260 net/minecraft/entity/mob/WardenEntity
 	METHOD method_42205 addDigParticles (Lnet/minecraft/class_7094;)V
 		ARG 1 animationState
 	METHOD method_42206 isValidTarget (Lnet/minecraft/class_1297;)Z
-		ARG 0 entity
 	METHOD method_42207 (Lnet/minecraft/class_1297;Lnet/minecraft/class_1309;)Ljava/lang/Boolean;
 		ARG 1 suspect
 	METHOD method_42208 (Lnet/minecraft/class_7254;)V
@@ -30,8 +25,7 @@ CLASS net/minecraft/class_7260 net/minecraft/entity/mob/WardenEntity
 		ARG 1 angerNbt
 	METHOD method_42211 removeSuspect (Lnet/minecraft/class_1297;)V
 		ARG 1 entity
-	METHOD method_42212 increaseAngerAt (Lnet/minecraft/class_1297;I)V
+	METHOD method_42212 increaseAngerAt (Lnet/minecraft/class_1297;IZ)V
-		ARG 1 entity
 		ARG 2 amount
 	METHOD method_42213 increaseAngerAt (Lnet/minecraft/class_1297;)V
 		ARG 1 entity

mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping

@@ -1,9 +1,8 @@
 CLASS net/minecraft/class_1480 net/minecraft/entity/mob/WaterCreatureEntity
-	METHOD method_38986 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_38986 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 reason
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_6673 tickWaterBreathingAir (I)V
 		ARG 1 air

mappings/net/minecraft/entity/mob/ZombieEntity.mapping

@@ -15,8 +15,7 @@ CLASS net/minecraft/class_1642 net/minecraft/entity/mob/ZombieEntity
 	METHOD method_20009 (Lnet/minecraft/class_1267;)Z
 		ARG 0 difficulty
 	METHOD method_26940 createZombieAttributes ()Lnet/minecraft/class_5132$class_5133;
-	METHOD method_29936 shouldBeBaby (Ljava/util/Random;)Z
+	METHOD method_29936 shouldBeBaby (Lnet/minecraft/class_5819;)Z
-		ARG 0 random
 	METHOD method_6001 initAttributes ()V
 	METHOD method_7200 convertTo (Lnet/minecraft/class_1299;)V
 		ARG 1 entityType

mappings/net/minecraft/entity/mob/ZombifiedPiglinEntity.mapping

@@ -8,12 +8,11 @@ CLASS net/minecraft/class_1590 net/minecraft/entity/mob/ZombifiedPiglinEntity
 	FIELD field_7307 ATTACKING_SPEED_BOOST Lnet/minecraft/class_1322;
 	FIELD field_7308 angrySoundDelay I
 	FIELD field_7311 ATTACKING_SPEED_BOOST_ID Ljava/util/UUID;
-	METHOD method_20682 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_20682 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_26941 createZombifiedPiglinAttributes ()Lnet/minecraft/class_5132$class_5133;
 	METHOD method_29533 playAngrySound ()V
 	METHOD method_29937 (Lnet/minecraft/class_1590;)V

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

@@ -2,12 +2,11 @@ CLASS net/minecraft/class_1429 net/minecraft/entity/passive/AnimalEntity
 	FIELD field_30270 BREEDING_COOLDOWN I
 	FIELD field_6744 lovingPlayer Ljava/util/UUID;
 	FIELD field_6745 loveTicks I
-	METHOD method_20663 isValidNaturalSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_20663 isValidNaturalSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_24650 breed (Lnet/minecraft/class_3218;Lnet/minecraft/class_1429;)V
 		ARG 1 world
 		ARG 2 other

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

@@ -49,8 +49,7 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity
 	FIELD field_34005 MAX_REGENERATION_BUFF_DURATION I
 	METHOD method_33219 setVariant (Lnet/minecraft/class_5762$class_5767;)V
 		ARG 1 variant
-	METHOD method_33221 shouldBabyBeDifferent (Ljava/util/Random;)Z
+	METHOD method_33221 shouldBabyBeDifferent (Lnet/minecraft/class_5819;)Z
-		ARG 0 random
 	METHOD method_33223 buffPlayer (Lnet/minecraft/class_1657;)V
 		ARG 1 player
 	METHOD method_33225 getVariant ()Lnet/minecraft/class_5762$class_5767;
@@ -63,18 +62,16 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity
 	METHOD method_35175 appreciatePlayer (Lnet/minecraft/class_5762;Lnet/minecraft/class_1309;)V
 		ARG 0 axolotl
 	METHOD method_36282 hydrateFromPotion ()V
-	METHOD method_38987 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_38987 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 reason
 		ARG 3 pos
-		ARG 4 random
 	CLASS class_5763 AxolotlData
 		FIELD field_28338 variants [Lnet/minecraft/class_5762$class_5767;
 		METHOD <init> ([Lnet/minecraft/class_5762$class_5767;)V
 			ARG 1 variants
-		METHOD method_33232 getRandomVariant (Ljava/util/Random;)Lnet/minecraft/class_5762$class_5767;
+		METHOD method_33232 getRandomVariant (Lnet/minecraft/class_5819;)Lnet/minecraft/class_5762$class_5767;
-			ARG 1 random
 	CLASS class_5764 AxolotlLookControl
 		METHOD <init> (Lnet/minecraft/class_5762;Lnet/minecraft/class_5762;I)V
 			ARG 2 axolotl
@@ -97,13 +94,10 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity
 			ARG 4 name
 			ARG 5 natural
 		METHOD method_33233 getId ()I
-		METHOD method_33235 getRandomNatural (Ljava/util/Random;)Lnet/minecraft/class_5762$class_5767;
+		METHOD method_33235 getRandomNatural (Lnet/minecraft/class_5819;)Lnet/minecraft/class_5762$class_5767;
-			ARG 0 random
+		METHOD method_33236 getRandom (Lnet/minecraft/class_5819;Z)Lnet/minecraft/class_5762$class_5767;
-		METHOD method_33236 getRandom (Ljava/util/Random;Z)Lnet/minecraft/class_5762$class_5767;
-			ARG 0 random
 			ARG 1 natural
 		METHOD method_33237 (ZLnet/minecraft/class_5762$class_5767;)Z
 			ARG 1 variant
 		METHOD method_33238 getName ()Ljava/lang/String;
-		METHOD method_33240 getRandomUnnatural (Ljava/util/Random;)Lnet/minecraft/class_5762$class_5767;
+		METHOD method_33240 getRandomUnnatural (Lnet/minecraft/class_5819;)Lnet/minecraft/class_5762$class_5767;
-			ARG 0 random

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

@@ -5,12 +5,11 @@ CLASS net/minecraft/class_1420 net/minecraft/entity/passive/BatEntity
 		COMMENT The tracked flags of bats. Only has the {@code 1} bit for {@linkplain
 		COMMENT #isRoosting() roosting}.
 	FIELD field_6729 hangingPosition Lnet/minecraft/class_2338;
-	METHOD method_20661 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_20661 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_26878 createBatAttributes ()Lnet/minecraft/class_5132$class_5133;
 	METHOD method_6449 setRoosting (Z)V
 		ARG 1 roosting

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

@@ -1,6 +1,5 @@
 CLASS net/minecraft/class_1451 net/minecraft/entity/passive/CatEntity
 	COMMENT Meow.
-	FIELD field_16283 TEXTURES Ljava/util/Map;
 	FIELD field_16284 IN_SLEEPING_POSE Lnet/minecraft/class_2940;
 	FIELD field_16285 COLLAR_COLOR Lnet/minecraft/class_2940;
 	FIELD field_16286 headDownAnimation F
@@ -13,39 +12,12 @@ CLASS net/minecraft/class_1451 net/minecraft/entity/passive/CatEntity
 	FIELD field_30310 CROUCHING_SPEED D
 	FIELD field_30311 NORMAL_SPEED D
 	FIELD field_30312 SPRINTING_SPEED D
-	FIELD field_30313 TABBY_TYPE I
-		COMMENT The tabby cat type, whose value is {@value}.
-	FIELD field_30314 BLACK_TYPE I
-		COMMENT The black cat type, whose value is {@value}.
-	FIELD field_30315 RED_TYPE I
-		COMMENT The red cat type, whose value is {@value}.
-	FIELD field_30316 SIAMESE_TYPE I
-		COMMENT The Siamese cat type, whose value is {@value}.
-	FIELD field_30317 BRITISH_SHORTHAIR_TYPE I
-		COMMENT The British shorthair cat type, whose value is {@value}.
-	FIELD field_30318 CALICO_TYPE I
-		COMMENT The calico cat type, whose value is {@value}.
-	FIELD field_30319 PERSIAN_TYPE I
-		COMMENT The Persian cat type, whose value is {@value}.
-	FIELD field_30320 RAGDOLL_TYPE I
-		COMMENT The ragdoll cat type, whose value is {@value}.
-	FIELD field_30321 WHITE_TYPE I
-		COMMENT The white cat type, whose value is {@value}.
-	FIELD field_30322 JELLIE_TYPE I
-		COMMENT The Jellie cat type, whose value is {@value}.
-		COMMENT <p>
-		COMMENT This cat type was added in the 1.14 update after the community cat contest.
-		COMMENT The winner was GoodTimesWithScar's cat named Jellie.
-	FIELD field_30323 ALL_BLACK_TYPE I
-		COMMENT The all black cat type, whose value is {@value}.
 	FIELD field_6808 fleeGoal Lnet/minecraft/class_1451$class_3698;
 	FIELD field_6809 TAMING_INGREDIENT Lnet/minecraft/class_1856;
 	FIELD field_6810 temptGoal Lnet/minecraft/class_1391;
 	FIELD field_6811 CAT_TYPE Lnet/minecraft/class_2940;
 	METHOD method_16082 getSleepAnimation (F)F
 		ARG 1 tickDelta
-	METHOD method_16083 (Ljava/util/HashMap;)V
-		ARG 0 map
 	METHOD method_16084 updateHeadDownAnimation ()V
 	METHOD method_16085 updateAnimations ()V
 	METHOD method_16086 isInSleepingPose ()Z
@@ -69,9 +41,8 @@ CLASS net/minecraft/class_1451 net/minecraft/entity/passive/CatEntity
 	METHOD method_16096 getCollarColor ()Lnet/minecraft/class_1767;
 	METHOD method_22327 getAttackDamage ()F
 	METHOD method_26881 createCatAttributes ()Lnet/minecraft/class_5132$class_5133;
-	METHOD method_6571 getCatType ()I
+	METHOD method_6571 getCatType ()Lnet/minecraft/class_7375;
-	METHOD method_6572 setCatType (I)V
+	METHOD method_6572 setCatType (Lnet/minecraft/class_7375;)V
-		ARG 1 type
 	CLASS class_3698 CatFleeGoal
 		FIELD field_16293 cat Lnet/minecraft/class_1451;
 		METHOD <init> (Lnet/minecraft/class_1451;Ljava/lang/Class;FDD)V

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

@@ -95,12 +95,11 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity
 		ARG 1 entity
 	METHOD method_26885 createFoxAttributes ()Lnet/minecraft/class_5132$class_5133;
 	METHOD method_35172 isJumping ()Z
-	METHOD method_39449 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_39449 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random
 	CLASS class_4020 DefendFriendGoal
 		FIELD field_17966 offender Lnet/minecraft/class_1309;
 		FIELD field_17967 friend Lnet/minecraft/class_1309;

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

@@ -12,9 +12,9 @@ CLASS net/minecraft/class_7102 net/minecraft/entity/passive/FrogEntity
 	FIELD field_37458 TARGET Lnet/minecraft/class_2940;
 	METHOD method_41352 setFrogTarget (Lnet/minecraft/class_1297;)V
 		ARG 1 entity
-	METHOD method_41353 setVariant (Lnet/minecraft/class_7102$class_7106;)V
+	METHOD method_41353 setVariant (Lnet/minecraft/class_7106;)V
 		ARG 1 variant
-	METHOD method_41354 getVariant ()Lnet/minecraft/class_7102$class_7106;
+	METHOD method_41354 getVariant ()Lnet/minecraft/class_7106;
 	METHOD method_41355 createFrogAttributes ()Lnet/minecraft/class_5132$class_5133;
 	METHOD method_41356 shouldWalk ()Z
 	METHOD method_41357 shouldSwim ()Z
@@ -31,14 +31,3 @@ CLASS net/minecraft/class_7102 net/minecraft/entity/passive/FrogEntity
 		METHOD <init> (Lnet/minecraft/class_7102;Lnet/minecraft/class_1937;)V
 			ARG 1 frog
 			ARG 2 world
-	CLASS class_7106 Variant
-		FIELD field_37465 VALUES [Lnet/minecraft/class_7102$class_7106;
-		FIELD field_37466 id I
-		FIELD field_37467 name Ljava/lang/String;
-		METHOD <init> (Ljava/lang/String;IILjava/lang/String;)V
-			ARG 3 id
-			ARG 4 name
-		METHOD method_41361 getId ()I
-		METHOD method_41362 fromId (I)Lnet/minecraft/class_7102$class_7106;
-			ARG 0 id
-		METHOD method_41363 getName ()Ljava/lang/String;

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

@@ -3,9 +3,8 @@ CLASS net/minecraft/class_5776 net/minecraft/entity/passive/GlowSquidEntity
 	METHOD method_33333 setDarkTicksRemaining (I)V
 		ARG 1 ticks
 	METHOD method_33334 getDarkTicksRemaining ()I
-	METHOD method_38962 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_38962 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 reason
 		ARG 3 pos
-		ARG 4 random

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

@@ -14,9 +14,8 @@ CLASS net/minecraft/class_6053 net/minecraft/entity/passive/GoatEntity
 	METHOD method_36283 getHeadPitch ()F
 	METHOD method_36284 setScreaming (Z)V
 		ARG 1 screaming
-	METHOD method_38067 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_38067 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 entityType
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random

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

@@ -13,12 +13,11 @@ CLASS net/minecraft/class_1438 net/minecraft/entity/passive/MooshroomEntity
 		ARG 1 flower
 	METHOD method_20253 (Lnet/minecraft/class_1268;Lnet/minecraft/class_1657;)V
 		ARG 1 player
-	METHOD method_20665 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_20665 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random
 	CLASS class_4053 Type
 		FIELD field_18111 name Ljava/lang/String;
 		FIELD field_18112 mushroom Lnet/minecraft/class_2680;

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

@@ -12,12 +12,11 @@ CLASS net/minecraft/class_3701 net/minecraft/entity/passive/OcelotEntity
 	METHOD method_16102 setTrusting (Z)V
 		ARG 1 trusting
 	METHOD method_16103 updateFleeing ()V
-	METHOD method_20666 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_20666 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_22329 getAttackDamage ()F
 	METHOD method_26887 createOcelotAttributes ()Lnet/minecraft/class_5132$class_5133;
 	CLASS class_3702 FleeGoal

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

@@ -116,8 +116,7 @@ CLASS net/minecraft/class_1440 net/minecraft/entity/passive/PandaEntity
 			ARG 3 id
 			ARG 4 name
 			ARG 5 recessive
-		METHOD method_17688 createRandom (Ljava/util/Random;)Lnet/minecraft/class_1440$class_1443;
+		METHOD method_17688 createRandom (Lnet/minecraft/class_5819;)Lnet/minecraft/class_1440$class_1443;
-			ARG 0 random
 		METHOD method_6564 getId ()I
 		METHOD method_6565 getName ()Ljava/lang/String;
 		METHOD method_6566 byId (I)Lnet/minecraft/class_1440$class_1443;

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

@@ -11,22 +11,19 @@ CLASS net/minecraft/class_1453 net/minecraft/entity/passive/ParrotEntity
 	FIELD field_6827 prevMaxWingDeviation F
 	FIELD field_6828 COOKIE Lnet/minecraft/class_1792;
 	FIELD field_6829 prevFlapProgress F
-	METHOD method_20667 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_20667 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_26889 createParrotAttributes ()Lnet/minecraft/class_5132$class_5133;
 	METHOD method_6578 flapWings ()V
 	METHOD method_6579 (Ljava/util/HashMap;)V
 		ARG 0 map
-	METHOD method_6580 getSoundPitch (Ljava/util/Random;)F
+	METHOD method_6580 getSoundPitch (Lnet/minecraft/class_5819;)F
-		ARG 0 random
 	METHOD method_6582 isSongPlaying ()Z
-	METHOD method_6583 getRandomSound (Lnet/minecraft/class_1937;Ljava/util/Random;)Lnet/minecraft/class_3414;
+	METHOD method_6583 getRandomSound (Lnet/minecraft/class_1937;Lnet/minecraft/class_5819;)Lnet/minecraft/class_3414;
 		ARG 0 world
-		ARG 1 random
 	METHOD method_6584 getVariant ()I
 	METHOD method_6585 setVariant (I)V
 		ARG 1 variant

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

@@ -6,12 +6,11 @@ CLASS net/minecraft/class_1456 net/minecraft/entity/passive/PolarBearEntity
 	FIELD field_6838 lastWarningAnimationProgress F
 	FIELD field_6839 warningSoundCooldown I
 	FIELD field_6840 WARNING Lnet/minecraft/class_2940;
-	METHOD method_20668 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_20668 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_26891 createPolarBearAttributes ()Lnet/minecraft/class_5132$class_5133;
 	METHOD method_6600 isWarning ()Z
 	METHOD method_6601 getWarningAnimationProgress (F)F

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

@@ -14,7 +14,7 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity
 	FIELD field_6850 lastOnGround Z
 	FIELD field_6851 jumpTicks I
 	FIELD field_6852 RABBIT_TYPE Lnet/minecraft/class_2940;
-	METHOD method_20669 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_20669 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 entity
 		ARG 1 world
 		ARG 2 spawnReason

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

@@ -20,8 +20,7 @@ CLASS net/minecraft/class_1472 net/minecraft/entity/passive/SheepEntity
 		ARG 0 color
 	METHOD method_6631 setColor (Lnet/minecraft/class_1767;)V
 		ARG 1 color
-	METHOD method_6632 generateDefaultColor (Ljava/util/Random;)Lnet/minecraft/class_1767;
+	METHOD method_6632 generateDefaultColor (Lnet/minecraft/class_5819;)Lnet/minecraft/class_1767;
-		ARG 0 random
 	METHOD method_6633 getColor ()Lnet/minecraft/class_1767;
 	METHOD method_6634 getRgbColor (Lnet/minecraft/class_1767;)[F
 		ARG 0 dyeColor

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

@@ -10,12 +10,11 @@ CLASS net/minecraft/class_4985 net/minecraft/entity/passive/StriderEntity
 	FIELD field_30499 COLD_SADDLED_SPEED F
 	FIELD field_30500 COLD_SPEED F
 	FIELD field_30501 DEFAULT_SADDLED_SPEED F
-	METHOD method_26344 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_26344 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_26345 getSpeed ()F
 	METHOD method_26347 updateFloating ()V
 	METHOD method_26348 isCold ()Z

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

@@ -6,12 +6,11 @@ CLASS net/minecraft/class_1474 net/minecraft/entity/passive/TropicalFishEntity
 	FIELD field_6877 commonSpawn Z
 	FIELD field_6878 SMALL_FISH_VARIETY_IDS [Lnet/minecraft/class_2960;
 	FIELD field_6879 COMMON_VARIANTS [I
-	METHOD method_38985 canTropicalFishSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_38985 canTropicalFishSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 reason
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_6644 getVariant ()I
 	METHOD method_6645 getPattern (I)I
 		ARG 0 variant

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

@@ -8,12 +8,11 @@ CLASS net/minecraft/class_1481 net/minecraft/entity/passive/TurtleEntity
 	FIELD field_6923 DIGGING_SAND Lnet/minecraft/class_2940;
 	FIELD field_6924 LAND_BOUND Lnet/minecraft/class_2940;
 	FIELD field_6925 ACTIVELY_TRAVELLING Lnet/minecraft/class_2940;
-	METHOD method_20671 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_20671 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_26896 createTurtleAttributes ()Lnet/minecraft/class_5132$class_5133;
 	METHOD method_6676 setDiggingSand (Z)V
 		ARG 1 diggingSand

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

@@ -0,0 +1 @@
+CLASS net/minecraft/class_7106 net/minecraft/entity/passive/Variant

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

@@ -17,12 +17,11 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity
 		ARG 0 entity
 	METHOD method_26897 createWolfAttributes ()Lnet/minecraft/class_5132$class_5133;
 	METHOD method_31167 resetShake ()V
-	METHOD method_39450 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_39450 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 0 type
 		ARG 1 world
 		ARG 2 spawnReason
 		ARG 3 pos
-		ARG 4 random
 	METHOD method_6707 getFurWetBrightnessMultiplier (F)F
 		COMMENT Returns this wolf's brightness multiplier based on the fur wetness.
 		COMMENT <p>

mappings/net/minecraft/entity/projectile/FishingBobberEntity.mapping

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_1536 net/minecraft/entity/projectile/FishingBobberEntity
 	FIELD field_23134 inOpenWater Z
-	FIELD field_23231 velocityRandom Ljava/util/Random;
+	FIELD field_23231 velocityRandom Lnet/minecraft/class_5819;
 	FIELD field_23232 caughtFish Z
 	FIELD field_23233 outOfOpenWaterTicks I
 	FIELD field_23234 CAUGHT_FISH Lnet/minecraft/class_2940;

mappings/net/minecraft/fluid/Fluid.mapping

@@ -6,11 +6,10 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid
 	METHOD method_15774 getBucketItem ()Lnet/minecraft/class_1792;
 	METHOD method_15775 appendProperties (Lnet/minecraft/class_2689$class_2690;)V
 		ARG 1 builder
-	METHOD method_15776 randomDisplayTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Ljava/util/Random;)V
+	METHOD method_15776 randomDisplayTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Lnet/minecraft/class_5819;)V
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 state
-		ARG 4 random
 	METHOD method_15777 canBeReplacedWith (Lnet/minecraft/class_3610;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3611;Lnet/minecraft/class_2350;)Z
 		ARG 1 state
 		ARG 2 world
@@ -45,11 +44,10 @@ CLASS net/minecraft/class_3611 net/minecraft/fluid/Fluid
 		ARG 1 state
 	METHOD method_15791 isIn (Lnet/minecraft/class_6862;)Z
 		ARG 1 tag
-	METHOD method_15792 onRandomTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Ljava/util/Random;)V
+	METHOD method_15792 onRandomTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Lnet/minecraft/class_5819;)V
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 state
-		ARG 4 random
 	METHOD method_15793 isStill (Lnet/minecraft/class_3610;)Z
 		ARG 1 state
 	METHOD method_15794 isEmpty ()Z

mappings/net/minecraft/fluid/FluidState.mapping

@@ -7,10 +7,9 @@ CLASS net/minecraft/class_3610 net/minecraft/fluid/FluidState
 	METHOD method_15756 (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z
 		ARG 1 world
 		ARG 2 pos
-	METHOD method_15757 onRandomTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/Random;)V
+	METHOD method_15757 onRandomTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V
 		ARG 1 world
 		ARG 2 pos
-		ARG 3 random
 	METHOD method_15758 getVelocity (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Lnet/minecraft/class_243;
 		ARG 1 world
 		ARG 2 pos
@@ -28,10 +27,9 @@ CLASS net/minecraft/class_3610 net/minecraft/fluid/FluidState
 	METHOD method_15766 getParticle ()Lnet/minecraft/class_2394;
 	METHOD method_15767 isIn (Lnet/minecraft/class_6862;)Z
 		ARG 1 tag
-	METHOD method_15768 randomDisplayTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Ljava/util/Random;)V
+	METHOD method_15768 randomDisplayTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V
 		ARG 1 world
 		ARG 2 pos
-		ARG 3 random
 	METHOD method_15769 isEmpty ()Z
 	METHOD method_15770 onScheduledTick (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V
 		ARG 1 world

mappings/net/minecraft/item/ArmorStandItem.mapping

@@ -1,4 +1,3 @@
 CLASS net/minecraft/class_1742 net/minecraft/item/ArmorStandItem
-	METHOD method_7701 setRotations (Lnet/minecraft/class_1531;Ljava/util/Random;)V
+	METHOD method_7701 setRotations (Lnet/minecraft/class_1531;Lnet/minecraft/class_5819;)V
 		ARG 1 stand
-		ARG 2 random

mappings/net/minecraft/item/CrossbowItem.mapping

@@ -61,15 +61,13 @@ CLASS net/minecraft/class_1764 net/minecraft/item/CrossbowItem
 	METHOD method_7778 putProjectile (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)V
 		ARG 0 crossbow
 		ARG 1 projectile
-	METHOD method_7780 getSoundPitches (Ljava/util/Random;)[F
+	METHOD method_7780 getSoundPitches (Lnet/minecraft/class_5819;)[F
-		ARG 0 random
 	METHOD method_7781 isCharged (Lnet/minecraft/class_1799;)Z
 		ARG 0 stack
 	METHOD method_7782 setCharged (Lnet/minecraft/class_1799;Z)V
 		ARG 0 stack
 		ARG 1 charged
-	METHOD method_7784 getSoundPitch (ZLjava/util/Random;)F
+	METHOD method_7784 getSoundPitch (ZLnet/minecraft/class_5819;)F
 		ARG 0 flag
-		ARG 1 random
 	METHOD method_7785 getProjectiles (Lnet/minecraft/class_1799;)Ljava/util/List;
 		ARG 0 crossbow

mappings/net/minecraft/item/ItemStack.mapping

@@ -331,9 +331,8 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
 		COMMENT {@return the custom NBT of this item stack, may be {@code null}}
 		COMMENT
 		COMMENT @see <a href="#nbt-operations">Item Stack NBT Operations</a>
-	METHOD method_7970 damage (ILjava/util/Random;Lnet/minecraft/class_3222;)Z
+	METHOD method_7970 damage (ILnet/minecraft/class_5819;Lnet/minecraft/class_3222;)Z
 		ARG 1 amount
-		ARG 2 random
 		ARG 3 player
 	METHOD method_7971 split (I)Lnet/minecraft/class_1799;
 		ARG 1 amount

mappings/net/minecraft/loot/LootTable.mapping

@@ -15,9 +15,8 @@ CLASS net/minecraft/class_52 net/minecraft/loot/LootTable
 	METHOD method_320 generateLoot (Lnet/minecraft/class_47;Ljava/util/function/Consumer;)V
 		ARG 1 context
 		ARG 2 lootConsumer
-	METHOD method_321 getFreeSlots (Lnet/minecraft/class_1263;Ljava/util/Random;)Ljava/util/List;
+	METHOD method_321 getFreeSlots (Lnet/minecraft/class_1263;Lnet/minecraft/class_5819;)Ljava/util/List;
 		ARG 1 inventory
-		ARG 2 random
 	METHOD method_322 getType ()Lnet/minecraft/class_176;
 	METHOD method_324 builder ()Lnet/minecraft/class_52$class_53;
 	METHOD method_328 generateUnprocessedLoot (Lnet/minecraft/class_47;Ljava/util/function/Consumer;)V
@@ -32,10 +31,9 @@ CLASS net/minecraft/class_52 net/minecraft/loot/LootTable
 		ARG 1 stack
 	METHOD method_332 processStacks (Ljava/util/function/Consumer;)Ljava/util/function/Consumer;
 		ARG 0 lootConsumer
-	METHOD method_333 shuffle (Ljava/util/List;ILjava/util/Random;)V
+	METHOD method_333 shuffle (Ljava/util/List;ILnet/minecraft/class_5819;)V
 		ARG 1 drops
 		ARG 2 freeSlots
-		ARG 3 random
 	CLASS class_53 Builder
 		FIELD field_949 pools Ljava/util/List;
 		FIELD field_950 type Lnet/minecraft/class_176;

mappings/net/minecraft/loot/context/LootContext.mapping

@@ -1,15 +1,14 @@
 CLASS net/minecraft/class_47 net/minecraft/loot/context/LootContext
 	FIELD field_20750 conditionGetter Ljava/util/function/Function;
 	FIELD field_20751 conditions Ljava/util/Set;
-	FIELD field_923 random Ljava/util/Random;
+	FIELD field_923 random Lnet/minecraft/class_5819;
 	FIELD field_924 tableGetter Ljava/util/function/Function;
 	FIELD field_925 parameters Ljava/util/Map;
 	FIELD field_926 luck F
 	FIELD field_927 activeTables Ljava/util/Set;
 	FIELD field_928 world Lnet/minecraft/class_3218;
 	FIELD field_929 drops Ljava/util/Map;
-	METHOD <init> (Ljava/util/Random;FLnet/minecraft/class_3218;Ljava/util/function/Function;Ljava/util/function/Function;Ljava/util/Map;Ljava/util/Map;)V
+	METHOD <init> (Lnet/minecraft/class_5819;FLnet/minecraft/class_3218;Ljava/util/function/Function;Ljava/util/function/Function;Ljava/util/Map;Ljava/util/Map;)V
-		ARG 1 random
 		ARG 2 luck
 		ARG 3 world
 		ARG 4 tableGetter
@@ -24,7 +23,7 @@ CLASS net/minecraft/class_47 net/minecraft/loot/context/LootContext
 		ARG 1 condition
 	METHOD method_22558 getCondition (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5341;
 		ARG 1 id
-	METHOD method_294 getRandom ()Ljava/util/Random;
+	METHOD method_294 getRandom ()Lnet/minecraft/class_5819;
 	METHOD method_295 markInactive (Lnet/minecraft/class_52;)V
 		ARG 1 table
 	METHOD method_296 get (Lnet/minecraft/class_169;)Ljava/lang/Object;
@@ -45,7 +44,7 @@ CLASS net/minecraft/class_47 net/minecraft/loot/context/LootContext
 		FIELD field_931 luck F
 		FIELD field_932 parameters Ljava/util/Map;
 		FIELD field_933 drops Ljava/util/Map;
-		FIELD field_934 random Ljava/util/Random;
+		FIELD field_934 random Lnet/minecraft/class_5819;
 		METHOD <init> (Lnet/minecraft/class_3218;)V
 			ARG 1 world
 		METHOD method_303 luck (F)Lnet/minecraft/class_47$class_48;
@@ -64,11 +63,9 @@ CLASS net/minecraft/class_47 net/minecraft/loot/context/LootContext
 			ARG 1 parameter
 		METHOD method_309 build (Lnet/minecraft/class_176;)Lnet/minecraft/class_47;
 			ARG 1 type
-		METHOD method_310 random (JLjava/util/Random;)Lnet/minecraft/class_47$class_48;
+		METHOD method_310 random (JLnet/minecraft/class_5819;)Lnet/minecraft/class_47$class_48;
 			ARG 1 seed
-			ARG 3 random
+		METHOD method_311 random (Lnet/minecraft/class_5819;)Lnet/minecraft/class_47$class_48;
-		METHOD method_311 random (Ljava/util/Random;)Lnet/minecraft/class_47$class_48;
-			ARG 1 random
 		METHOD method_312 parameter (Lnet/minecraft/class_169;Ljava/lang/Object;)Lnet/minecraft/class_47$class_48;
 			ARG 1 key
 			ARG 2 value

mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping

@@ -40,8 +40,7 @@ CLASS net/minecraft/class_94 net/minecraft/loot/function/ApplyBonusLootFunction
 			ARG 1 json
 			ARG 2 context
 		METHOD method_466 getId ()Lnet/minecraft/class_2960;
-		METHOD method_467 getValue (Ljava/util/Random;II)I
+		METHOD method_467 getValue (Lnet/minecraft/class_5819;II)I
-			ARG 1 random
 			ARG 2 initialCount
 			ARG 3 enchantmentLevel
 	CLASS class_97 FormulaFactory

mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping

@@ -4,10 +4,9 @@ CLASS net/minecraft/class_109 net/minecraft/loot/function/EnchantRandomlyLootFun
 	METHOD <init> ([Lnet/minecraft/class_5341;Ljava/util/Collection;)V
 		ARG 1 conditions
 		ARG 2 enchantments
-	METHOD method_26266 addEnchantmentToStack (Lnet/minecraft/class_1799;Lnet/minecraft/class_1887;Ljava/util/Random;)Lnet/minecraft/class_1799;
+	METHOD method_26266 addEnchantmentToStack (Lnet/minecraft/class_1799;Lnet/minecraft/class_1887;Lnet/minecraft/class_5819;)Lnet/minecraft/class_1799;
 		ARG 0 stack
 		ARG 1 enchantment
-		ARG 2 random
 	METHOD method_26267 (ZLnet/minecraft/class_1799;Lnet/minecraft/class_1887;)Z
 		ARG 2 enchantment
 	METHOD method_35520 create ()Lnet/minecraft/class_109$class_4954;

mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping

@@ -113,8 +113,6 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi
 		ARG 1 packet
 	METHOD method_11136 onBlockUpdate (Lnet/minecraft/class_2626;)V
 		ARG 1 packet
-	METHOD method_11138 onMobSpawn (Lnet/minecraft/class_2610;)V
-		ARG 1 packet
 	METHOD method_11139 onEntitySetHeadYaw (Lnet/minecraft/class_2726;)V
 		ARG 1 packet
 	METHOD method_11140 onDifficulty (Lnet/minecraft/class_2632;)V

mappings/net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket.mapping

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_2604 net/minecraft/network/packet/s2c/play/EntitySpawnS2CPacket
 	FIELD field_11946 y D
-	FIELD field_11947 pitch I
+	FIELD field_11947 pitch B
 	FIELD field_11948 x D
 	FIELD field_11949 velocityZ I
 	FIELD field_11950 velocityY I
@@ -10,12 +10,12 @@ CLASS net/minecraft/class_2604 net/minecraft/network/packet/s2c/play/EntitySpawn
 	FIELD field_11954 entityData I
 	FIELD field_11955 entityTypeId Lnet/minecraft/class_1299;
 	FIELD field_11956 z D
-	FIELD field_11957 yaw I
+	FIELD field_11957 yaw B
 	FIELD field_33293 VELOCITY_SCALE D
 	FIELD field_33294 MAX_ABSOLUTE_VELOCITY D
 		COMMENT The maximum absolute value allowed for each scalar value (velocity x, y, z)
 		COMMENT in the velocity vector sent by this packet.
-	METHOD <init> (ILjava/util/UUID;DDDFFLnet/minecraft/class_1299;ILnet/minecraft/class_243;)V
+	METHOD <init> (ILjava/util/UUID;DDDFFLnet/minecraft/class_1299;ILnet/minecraft/class_243;D)V
 		ARG 1 id
 		ARG 2 uuid
 		ARG 3 x
@@ -23,7 +23,6 @@ CLASS net/minecraft/class_2604 net/minecraft/network/packet/s2c/play/EntitySpawn
 		ARG 7 z
 		ARG 9 pitch
 		ARG 10 yaw
-		ARG 11 entityTypeId
 		ARG 12 entityData
 		ARG 13 velocity
 	METHOD <init> (Lnet/minecraft/class_1297;)V
@@ -31,20 +30,17 @@ CLASS net/minecraft/class_2604 net/minecraft/network/packet/s2c/play/EntitySpawn
 	METHOD <init> (Lnet/minecraft/class_1297;I)V
 		ARG 1 entity
 		ARG 2 entityData
-	METHOD <init> (Lnet/minecraft/class_1297;Lnet/minecraft/class_1299;ILnet/minecraft/class_2338;)V
+	METHOD <init> (Lnet/minecraft/class_1297;ILnet/minecraft/class_2338;)V
 		ARG 1 entity
-		ARG 2 entityType
-		ARG 3 data
-		ARG 4 pos
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
 	METHOD method_11164 getUuid ()Ljava/util/UUID;
 	METHOD method_11166 getEntityData ()I
 	METHOD method_11167 getId ()I
-	METHOD method_11168 getYaw ()I
+	METHOD method_11168 getYaw ()F
 	METHOD method_11169 getEntityTypeId ()Lnet/minecraft/class_1299;
 	METHOD method_11170 getVelocityX ()D
-	METHOD method_11171 getPitch ()I
+	METHOD method_11171 getPitch ()F
 	METHOD method_11172 getVelocityY ()D
 	METHOD method_11173 getVelocityZ ()D
 	METHOD method_11174 getY ()D

mappings/net/minecraft/network/packet/s2c/play/MobSpawnS2CPacket.mapping

@@ -1,29 +0,0 @@
-CLASS net/minecraft/class_2610 net/minecraft/network/packet/s2c/play/MobSpawnS2CPacket
-	FIELD field_11990 x D
-	FIELD field_11991 velocityZ I
-	FIELD field_11992 velocityY I
-	FIELD field_11993 velocityX I
-	FIELD field_11995 entityTypeId Lnet/minecraft/class_1299;
-	FIELD field_11996 id I
-	FIELD field_11997 uuid Ljava/util/UUID;
-	FIELD field_11998 headYaw B
-	FIELD field_11999 pitch B
-	FIELD field_12000 yaw B
-	FIELD field_12002 z D
-	FIELD field_12003 y D
-	METHOD <init> (Lnet/minecraft/class_1309;)V
-		ARG 1 entity
-	METHOD <init> (Lnet/minecraft/class_2540;)V
-		ARG 1 buf
-	METHOD method_11204 getHeadYaw ()B
-	METHOD method_11205 getYaw ()B
-	METHOD method_11206 getPitch ()B
-	METHOD method_11207 getId ()I
-	METHOD method_11209 getVelocityZ ()I
-	METHOD method_11210 getEntityTypeId ()Lnet/minecraft/class_1299;
-	METHOD method_11211 getVelocityY ()I
-	METHOD method_11212 getVelocityX ()I
-	METHOD method_11213 getUuid ()Ljava/util/UUID;
-	METHOD method_11214 getX ()D
-	METHOD method_11215 getY ()D
-	METHOD method_11216 getZ ()D

mappings/net/minecraft/network/packet/s2c/play/PlaySoundFromEntityS2CPacket.mapping

@@ -6,7 +6,7 @@ CLASS net/minecraft/class_2765 net/minecraft/network/packet/s2c/play/PlaySoundFr
 	FIELD field_12642 sound Lnet/minecraft/class_3414;
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
-	METHOD <init> (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;Lnet/minecraft/class_1297;FF)V
+	METHOD <init> (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;Lnet/minecraft/class_1297;FFJ)V
 		ARG 1 sound
 		ARG 2 category
 		ARG 3 entity

mappings/net/minecraft/network/packet/s2c/play/PlaySoundIdS2CPacket.mapping

@@ -9,7 +9,7 @@ CLASS net/minecraft/class_2660 net/minecraft/network/packet/s2c/play/PlaySoundId
 	FIELD field_33327 COORDINATE_SCALE F
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
-	METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_3419;Lnet/minecraft/class_243;FF)V
+	METHOD <init> (Lnet/minecraft/class_2960;Lnet/minecraft/class_3419;Lnet/minecraft/class_243;FFJ)V
 		ARG 1 sound
 		ARG 2 category
 		ARG 3 pos

mappings/net/minecraft/network/packet/s2c/play/PlaySoundS2CPacket.mapping

@@ -9,7 +9,7 @@ CLASS net/minecraft/class_2767 net/minecraft/network/packet/s2c/play/PlaySoundS2
 	FIELD field_33353 COORDINATE_SCALE F
 	METHOD <init> (Lnet/minecraft/class_2540;)V
 		ARG 1 buf
-	METHOD <init> (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;DDDFF)V
+	METHOD <init> (Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;DDDFFJ)V
 		ARG 1 sound
 		ARG 2 category
 		ARG 3 x

mappings/net/minecraft/predicate/PlayerPredicate.mapping

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_4553 net/minecraft/predicate/PlayerPredicate
-	FIELD field_20722 ANY Lnet/minecraft/class_4553;
 	FIELD field_20723 experienceLevel Lnet/minecraft/class_2096$class_2100;
 	FIELD field_20724 gameMode Lnet/minecraft/class_1934;
 	FIELD field_20725 stats Ljava/util/Map;
@@ -13,18 +12,16 @@ CLASS net/minecraft/class_4553 net/minecraft/predicate/PlayerPredicate
 		ARG 4 recipes
 		ARG 5 advancements
 		ARG 6 lookingAt
-	METHOD method_22494 toJson ()Lcom/google/gson/JsonElement;
 	METHOD method_22495 getStatId (Lnet/minecraft/class_3445;)Lnet/minecraft/class_2960;
 		ARG 0 stat
 	METHOD method_22496 getStat (Lnet/minecraft/class_3448;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3445;
 		ARG 0 type
 		ARG 1 id
-	METHOD method_22497 test (Lnet/minecraft/class_1297;)Z
+	METHOD method_22497 (Lnet/minecraft/class_1297;Lnet/minecraft/class_3218;Lnet/minecraft/class_243;)Z
 		ARG 1 entity
 	METHOD method_22498 (Lcom/google/gson/JsonArray;Lnet/minecraft/class_3445;Lnet/minecraft/class_2096$class_2100;)V
 		ARG 1 stat
-	METHOD method_22499 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4553;
+	METHOD method_22499 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_4553;
-		ARG 0 json
 	METHOD method_22500 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2960;Ljava/lang/Boolean;)V
 		ARG 1 id
 	METHOD method_22501 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2960;Lnet/minecraft/class_4553$class_4556;)V

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

@@ -1,13 +1,9 @@
 CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate
-	FIELD field_16317 catType Lnet/minecraft/class_2960;
 	FIELD field_16490 equipment Lnet/minecraft/class_3735;
-	FIELD field_20697 player Lnet/minecraft/class_4553;
 	FIELD field_20698 team Ljava/lang/String;
-	FIELD field_23135 fishingHook Lnet/minecraft/class_4965;
 	FIELD field_24488 vehicle Lnet/minecraft/class_2048;
 	FIELD field_24489 targetedEntity Lnet/minecraft/class_2048;
 	FIELD field_33912 steppingOn Lnet/minecraft/class_2090;
-	FIELD field_33913 lightningBolt Lnet/minecraft/class_6404;
 	FIELD field_33914 passenger Lnet/minecraft/class_2048;
 	FIELD field_9594 effects Lnet/minecraft/class_2102;
 	FIELD field_9595 type Lnet/minecraft/class_2050;
@@ -16,7 +12,7 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate
 	FIELD field_9599 ANY Lnet/minecraft/class_2048;
 	FIELD field_9600 nbt Lnet/minecraft/class_2105;
 	FIELD field_9601 distance Lnet/minecraft/class_2025;
-	METHOD <init> (Lnet/minecraft/class_2050;Lnet/minecraft/class_2025;Lnet/minecraft/class_2090;Lnet/minecraft/class_2090;Lnet/minecraft/class_2102;Lnet/minecraft/class_2105;Lnet/minecraft/class_2040;Lnet/minecraft/class_3735;Lnet/minecraft/class_4553;Lnet/minecraft/class_4965;Lnet/minecraft/class_6404;Ljava/lang/String;Lnet/minecraft/class_2960;)V
+	METHOD <init> (Lnet/minecraft/class_2050;Lnet/minecraft/class_2025;Lnet/minecraft/class_2090;Lnet/minecraft/class_2090;Lnet/minecraft/class_2102;Lnet/minecraft/class_2105;Lnet/minecraft/class_2040;Lnet/minecraft/class_3735;Lnet/minecraft/class_7376;Ljava/lang/String;)V
 		ARG 1 type
 		ARG 2 distance
 		ARG 3 location
@@ -25,12 +21,7 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate
 		ARG 6 nbt
 		ARG 7 flags
 		ARG 8 equipment
-		ARG 9 player
+	METHOD <init> (Lnet/minecraft/class_2050;Lnet/minecraft/class_2025;Lnet/minecraft/class_2090;Lnet/minecraft/class_2090;Lnet/minecraft/class_2102;Lnet/minecraft/class_2105;Lnet/minecraft/class_2040;Lnet/minecraft/class_3735;Lnet/minecraft/class_7376;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;Ljava/lang/String;)V
-		ARG 10 fishingHook
-		ARG 11 lightningBolt
-		ARG 12 team
-		ARG 13 catType
-	METHOD <init> (Lnet/minecraft/class_2050;Lnet/minecraft/class_2025;Lnet/minecraft/class_2090;Lnet/minecraft/class_2090;Lnet/minecraft/class_2102;Lnet/minecraft/class_2105;Lnet/minecraft/class_2040;Lnet/minecraft/class_3735;Lnet/minecraft/class_4553;Lnet/minecraft/class_4965;Lnet/minecraft/class_6404;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;Ljava/lang/String;Lnet/minecraft/class_2960;)V
 		ARG 1 type
 		ARG 2 distance
 		ARG 3 location
@@ -39,14 +30,7 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate
 		ARG 6 nbt
 		ARG 7 flags
 		ARG 8 equipment
-		ARG 9 player
-		ARG 10 fishingHook
-		ARG 11 lightningBolt
 		ARG 12 vehicle
-		ARG 13 passenger
-		ARG 14 targetedEntity
-		ARG 15 team
-		ARG 16 catType
 	METHOD method_27802 createAdvancementEntityLootContext (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)Lnet/minecraft/class_47;
 		ARG 0 player
 		ARG 1 target
@@ -63,15 +47,11 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate
 		ARG 1 player
 		ARG 2 entity
 	CLASS class_2049 Builder
-		FIELD field_16318 catType Lnet/minecraft/class_2960;
 		FIELD field_16491 equipment Lnet/minecraft/class_3735;
-		FIELD field_20699 player Lnet/minecraft/class_4553;
 		FIELD field_20700 team Ljava/lang/String;
-		FIELD field_23136 fishHook Lnet/minecraft/class_4965;
 		FIELD field_24490 vehicle Lnet/minecraft/class_2048;
 		FIELD field_24491 targetedEntity Lnet/minecraft/class_2048;
 		FIELD field_33915 steppingOn Lnet/minecraft/class_2090;
-		FIELD field_33916 lightningBolt Lnet/minecraft/class_6404;
 		FIELD field_33917 passenger Lnet/minecraft/class_2048;
 		FIELD field_9602 distance Lnet/minecraft/class_2025;
 		FIELD field_9603 nbt Lnet/minecraft/class_2105;
@@ -79,24 +59,14 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate
 		FIELD field_9605 effects Lnet/minecraft/class_2102;
 		FIELD field_9606 flags Lnet/minecraft/class_2040;
 		FIELD field_9607 type Lnet/minecraft/class_2050;
-		METHOD method_16112 catType (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2048$class_2049;
-			ARG 1 catType
-		METHOD method_16113 type (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2048$class_2049;
-			ARG 1 catType
 		METHOD method_16227 equipment (Lnet/minecraft/class_3735;)Lnet/minecraft/class_2048$class_2049;
 			ARG 1 equipment
-		METHOD method_22469 player (Lnet/minecraft/class_4553;)Lnet/minecraft/class_2048$class_2049;
-			ARG 1 player
 		METHOD method_22470 team (Ljava/lang/String;)Lnet/minecraft/class_2048$class_2049;
 			ARG 1 team
-		METHOD method_26090 fishHook (Lnet/minecraft/class_4965;)Lnet/minecraft/class_2048$class_2049;
-			ARG 1 fishHook
 		METHOD method_27971 vehicle (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2048$class_2049;
 			ARG 1 vehicle
 		METHOD method_27972 targetedEntity (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2048$class_2049;
 			ARG 1 targetedEntity
-		METHOD method_37228 lightningBolt (Lnet/minecraft/class_6404;)Lnet/minecraft/class_2048$class_2049;
-			ARG 1 lightningBolt
 		METHOD method_37229 passenger (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2048$class_2049;
 			ARG 1 passenger
 		METHOD method_37230 steppingOn (Lnet/minecraft/class_2090;)Lnet/minecraft/class_2048$class_2049;

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

@@ -4,10 +4,6 @@ CLASS net/minecraft/class_4965 net/minecraft/predicate/entity/FishingHookPredica
 	FIELD field_30854 IN_OPEN_WATER Ljava/lang/String;
 	METHOD <init> (Z)V
 		ARG 1 inOpenWater
-	METHOD method_26092 toJson ()Lcom/google/gson/JsonElement;
+	METHOD method_26094 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_4965;
-	METHOD method_26093 test (Lnet/minecraft/class_1297;)Z
-		ARG 1 entity
-	METHOD method_26094 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4965;
-		ARG 0 json
 	METHOD method_26095 of (Z)Lnet/minecraft/class_4965;
 		ARG 0 inOpenWater

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

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_6404 net/minecraft/predicate/entity/LightningBoltPredicate
-	FIELD field_33920 ANY Lnet/minecraft/class_6404;
 	FIELD field_33921 BLOCKS_SET_ON_FIRE_KEY Ljava/lang/String;
 	FIELD field_33922 ENTITY_STRUCK_KEY Ljava/lang/String;
 	FIELD field_33923 blocksSetOnFire Lnet/minecraft/class_2096$class_2100;
@@ -7,11 +6,6 @@ CLASS net/minecraft/class_6404 net/minecraft/predicate/entity/LightningBoltPredi
 	METHOD <init> (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2048;)V
 		ARG 1 blocksSetOnFire
 		ARG 2 entityStruck
-	METHOD method_37234 toJson ()Lcom/google/gson/JsonElement;
-	METHOD method_37236 test (Lnet/minecraft/class_1297;Lnet/minecraft/class_3218;Lnet/minecraft/class_243;)Z
-		ARG 1 lightningBolt
-		ARG 2 world
 	METHOD method_37237 of (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_6404;
 		ARG 0 blocksSetOnFire
-	METHOD method_37238 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_6404;
+	METHOD method_37238 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_6404;
-		ARG 0 json

mappings/net/minecraft/resource/DefaultResourcePack.mapping

@@ -31,5 +31,3 @@ CLASS net/minecraft/class_3268 net/minecraft/resource/DefaultResourcePack
 		ARG 0 path
 	METHOD method_37454 getPath (Ljava/net/URI;)Ljava/nio/file/Path;
 		ARG 0 uri
-	CLASS 1
-		FIELD field_29185 stream Ljava/io/InputStream;

mappings/net/minecraft/resource/NamespaceResourceManager.mapping

@@ -12,13 +12,9 @@ CLASS net/minecraft/class_3294 net/minecraft/resource/NamespaceResourceManager
 	METHOD <init> (Lnet/minecraft/class_3264;Ljava/lang/String;)V
 		ARG 1 type
 		ARG 2 namespace
-	METHOD method_14472 validate (Lnet/minecraft/class_2960;)V
-		ARG 1 id
 	METHOD method_14473 getMetadataPath (Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960;
 		ARG 0 id
-	METHOD method_14476 open (Lnet/minecraft/class_2960;Lnet/minecraft/class_3262;)Ljava/io/InputStream;
+	METHOD method_14476 open (Lnet/minecraft/class_2960;Lnet/minecraft/class_3262;)Lnet/minecraft/class_3298$class_7367;
-		ARG 1 id
-		ARG 2 pack
 	METHOD method_18221 isPathAbsolute (Lnet/minecraft/class_2960;)Z
 		ARG 1 id
 	METHOD method_24233 addPack (Lnet/minecraft/class_3262;)V
@@ -62,9 +58,6 @@ CLASS net/minecraft/class_3294 net/minecraft/resource/NamespaceResourceManager
 	CLASS class_7082 FilterablePack
 		FIELD comp_530 underlying Lnet/minecraft/class_3262;
 		METHOD comp_530 underlying ()Lnet/minecraft/class_3262;
-		METHOD method_41267 contains (Lnet/minecraft/class_3264;Lnet/minecraft/class_2960;)Z
-			ARG 1 type
-			ARG 2 id
 		METHOD method_41268 removeFiltered (Ljava/util/Collection;)V
 			ARG 1 ids
 		METHOD method_41269 isFiltered (Lnet/minecraft/class_2960;)Z
@@ -79,4 +72,4 @@ CLASS net/minecraft/class_3294 net/minecraft/resource/NamespaceResourceManager
 			ARG 3 metadataId
 			ARG 4 pack
 		METHOD method_41270 ignoreMetadata ()V
-		METHOD method_41272 toReference ()Lnet/minecraft/class_7086;
+		METHOD method_41272 toReference ()Lnet/minecraft/class_3298;

mappings/net/minecraft/resource/Resource.mapping

@@ -7,20 +7,10 @@ CLASS net/minecraft/class_3298 net/minecraft/resource/Resource
 	COMMENT @see ResourceManager#getAllResources(Identifier)
 	METHOD method_14480 getResourcePackName ()Ljava/lang/String;
 		COMMENT Returns the user-friendly name of the pack this resource is from.
-	METHOD method_14481 getMetadata (Lnet/minecraft/class_3270;)Ljava/lang/Object;
+	METHOD method_14481 getMetadata ()Lnet/minecraft/class_7368;
 		COMMENT Returns a metadata of this resource by the {@code metaReader}, or {@code null}
 		COMMENT if no such metadata exists.
-		ARG 1 metaReader
-			COMMENT the metadata reader
 	METHOD method_14482 getInputStream ()Ljava/io/InputStream;
 		COMMENT Returns the input stream of this resource.
 		COMMENT
 		COMMENT <p>This input stream is closed when this resource is closed.
-	METHOD method_14483 getId ()Lnet/minecraft/class_2960;
-		COMMENT Returns the location of this resource.
-		COMMENT
-		COMMENT <p>Within each resource pack, this location is a unique identifier for a
-		COMMENT resource; however, in a resource manager, there may be multiple resources
-		COMMENT with the same location available.
-	METHOD method_14484 hasMetadata ()Z
-		COMMENT Returns if this resource has any metadata.

mappings/net/minecraft/resource/ResourceFactory.mapping

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_5912 net/minecraft/resource/ResourceFactory
 	COMMENT Provides resource access.
-	METHOD method_14486 getResource (Lnet/minecraft/class_2960;)Lnet/minecraft/class_3298;
+	METHOD method_14486 getResource (Lnet/minecraft/class_2960;)Ljava/util/Optional;
 		COMMENT Finds and returns the corresponding resource for a resource's identifier.
 		COMMENT
 		COMMENT <p>Starts by scanning each resource pack from highest priority to lowest. If no resource packs were found

mappings/net/minecraft/resource/ResourceImpl.mapping

@@ -1,11 +0,0 @@
-CLASS net/minecraft/class_3306 net/minecraft/resource/ResourceImpl
-	FIELD field_14296 packName Ljava/lang/String;
-	FIELD field_14298 inputStream Ljava/io/InputStream;
-	FIELD field_14299 id Lnet/minecraft/class_2960;
-	FIELD field_14300 metaInputStream Ljava/io/InputStream;
-	FIELD field_14302 metadata Lcom/google/gson/JsonObject;
-	METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_2960;Ljava/io/InputStream;Ljava/io/InputStream;)V
-		ARG 1 packName
-		ARG 2 id
-		ARG 3 inputStream
-		ARG 4 metaInputStream

mappings/net/minecraft/resource/ResourceManager.mapping

@@ -28,13 +28,6 @@ CLASS net/minecraft/class_3300 net/minecraft/resource/ResourceManager
 		COMMENT @throws IOException if resources were found, but any one of them could not be opened to be read.
 		ARG 1 id
 			COMMENT the resource identifier to search for
-	METHOD method_18234 containsResource (Lnet/minecraft/class_2960;)Z
-		COMMENT Checks whether any of the currently-loaded resource packs contain an entry for the given id.
-		COMMENT
-		COMMENT <p>Starts by querying the resource pack with the highest priority to lowest until it finds one that
-		COMMENT responds to the requested identifier.
-		ARG 1 id
-			COMMENT the resource identifier to search for
 	METHOD method_29213 streamResourcePacks ()Ljava/util/stream/Stream;
 		COMMENT Gets a stream of loaded resource packs in increasing order of priority.
 	METHOD method_41265 findAllResources (Ljava/lang/String;Ljava/util/function/Predicate;)Ljava/util/Map;

mappings/net/minecraft/resource/ResourceRef.mapping

@@ -1,9 +0,0 @@
-CLASS net/minecraft/class_7086 net/minecraft/resource/ResourceRef
-	FIELD field_37298 packName Ljava/lang/String;
-	FIELD field_37299 opener Lnet/minecraft/class_7086$class_7087;
-	METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_7086$class_7087;)V
-		ARG 1 name
-		ARG 2 opener
-	METHOD method_41290 getPackName ()Ljava/lang/String;
-	METHOD method_41291 open ()Lnet/minecraft/class_3298;
-	CLASS class_7087 Opener

mappings/net/minecraft/screen/EnchantmentScreenHandler.mapping

@@ -2,7 +2,7 @@ CLASS net/minecraft/class_1718 net/minecraft/screen/EnchantmentScreenHandler
 	FIELD field_7808 enchantmentPower [I
 	FIELD field_7809 inventory Lnet/minecraft/class_1263;
 	FIELD field_7810 enchantmentLevel [I
-	FIELD field_7811 random Ljava/util/Random;
+	FIELD field_7811 random Lnet/minecraft/class_5819;
 	FIELD field_7812 enchantmentId [I
 	FIELD field_7813 context Lnet/minecraft/class_3914;
 	FIELD field_7814 seed Lnet/minecraft/class_3915;

mappings/net/minecraft/server/MinecraftServer.mapping

@@ -83,7 +83,7 @@ CLASS net/minecraft/server/MinecraftServer
 	FIELD field_4595 dataPackManager Lnet/minecraft/class_3283;
 	FIELD field_4596 playerIdleTimeout I
 	FIELD field_4599 proxy Ljava/net/Proxy;
-	FIELD field_4602 random Ljava/util/Random;
+	FIELD field_4602 random Lnet/minecraft/class_5819;
 	FIELD field_4603 sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService;
 	FIELD field_4604 pvpEnabled Z
 	FIELD field_4607 resourcePackUrl Ljava/lang/String;

mappings/net/minecraft/server/command/SpreadPlayersCommand.mapping

@@ -5,8 +5,7 @@ CLASS net/minecraft/class_3131 net/minecraft/server/command/SpreadPlayersCommand
 	FIELD field_36326 INVALID_HEIGHT_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType;
 	METHOD method_13652 getPileCountRespectingTeams (Ljava/util/Collection;)I
 		ARG 0 entities
-	METHOD method_13653 makePiles (Ljava/util/Random;IDDDD)[Lnet/minecraft/class_3131$class_3132;
+	METHOD method_13653 makePiles (Lnet/minecraft/class_5819;IDDDD)[Lnet/minecraft/class_3131$class_3132;
-		ARG 0 random
 		ARG 1 count
 		ARG 2 minX
 		ARG 4 minZ
@@ -42,11 +41,10 @@ CLASS net/minecraft/class_3131 net/minecraft/server/command/SpreadPlayersCommand
 		ARG 1 x
 		ARG 2 z
 		ARG 3 maxSpreadDistance
-	METHOD method_13661 spread (Lnet/minecraft/class_241;DLnet/minecraft/class_3218;Ljava/util/Random;DDDDI[Lnet/minecraft/class_3131$class_3132;Z)V
+	METHOD method_13661 spread (Lnet/minecraft/class_241;DLnet/minecraft/class_3218;Lnet/minecraft/class_5819;DDDDI[Lnet/minecraft/class_3131$class_3132;Z)V
 		ARG 0 center
 		ARG 1 spreadDistance
 		ARG 3 world
-		ARG 4 random
 		ARG 5 minX
 		ARG 7 minZ
 		ARG 9 maxX
@@ -72,8 +70,7 @@ CLASS net/minecraft/class_3131 net/minecraft/server/command/SpreadPlayersCommand
 			ARG 3 minZ
 			ARG 5 maxX
 			ARG 7 maxZ
-		METHOD method_13667 setPileLocation (Ljava/util/Random;DDDD)V
+		METHOD method_13667 setPileLocation (Lnet/minecraft/class_5819;DDDD)V
-			ARG 1 random
 			ARG 2 minX
 			ARG 4 minZ
 			ARG 6 maxX

mappings/net/minecraft/server/function/FunctionLoader.mapping

@@ -26,7 +26,7 @@ CLASS net/minecraft/class_5349 net/minecraft/server/function/FunctionLoader
 		ARG 1 level
 		ARG 2 commandDispatcher
 	METHOD method_29447 getFunctions ()Ljava/util/Map;
-	METHOD method_29450 readLines (Lnet/minecraft/class_7086;)Ljava/util/List;
+	METHOD method_29450 readLines (Lnet/minecraft/class_3298;)Ljava/util/List;
 	METHOD method_29452 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_2960;Ljava/util/concurrent/CompletableFuture;)V
 		ARG 1 id
 		ARG 2 functionFuture

mappings/net/minecraft/server/network/ServerLoginNetworkHandler.mapping

@@ -24,7 +24,7 @@ CLASS net/minecraft/class_3248 net/minecraft/server/network/ServerLoginNetworkHa
 		COMMENT to {@code null} once the player is accepted.
 	FIELD field_14162 server Lnet/minecraft/server/MinecraftServer;
 	FIELD field_14163 state Lnet/minecraft/class_3248$class_3249;
-	FIELD field_14164 RANDOM Ljava/util/Random;
+	FIELD field_14164 RANDOM Lnet/minecraft/class_5819;
 	FIELD field_14165 serverId Ljava/lang/String;
 	FIELD field_14166 LOGGER Lorg/slf4j/Logger;
 	FIELD field_14167 nonce [B

mappings/net/minecraft/server/world/ServerWorld.mapping

@@ -262,12 +262,6 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
 			COMMENT whether a rain is ongoing
 		ARG 4 thundering
 			COMMENT whether a thunderstorm is ongoing
-	METHOD method_27911 getSpawnPos ()Lnet/minecraft/class_2338;
-		COMMENT {@return the world spawn point}
-		COMMENT
-		COMMENT @implNote If it is outside the world border, this returns the position of the
-		COMMENT highest {@linkplain net.minecraft.world.Heightmap.Type#MOTION_BLOCKING motion-blocking}
-		COMMENT block at the center of the world border.
 	METHOD method_28125 isFlat ()Z
 	METHOD method_29198 getEnderDragonFight ()Lnet/minecraft/class_2881;
 	METHOD method_29199 setTimeOfDay (J)V
@@ -291,7 +285,6 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
 	METHOD method_29203 tickTime ()V
 	METHOD method_29204 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)V
 		ARG 1 pos
-	METHOD method_30630 getSpawnAngle ()F
 	METHOD method_30736 spawnNewEntityAndPassengers (Lnet/minecraft/class_1297;)Z
 		COMMENT Checks whether any of the entity and its passengers already exist
 		COMMENT in the world, and if not, spawns the entity with its passengers.

mappings/net/minecraft/structure/DesertTempleGenerator.mapping

@@ -2,9 +2,8 @@ CLASS net/minecraft/class_3346 net/minecraft/structure/DesertTempleGenerator
 	FIELD field_14397 hasPlacedChest [Z
 	FIELD field_34725 WIDTH I
 	FIELD field_34726 DEPTH I
-	METHOD <init> (Ljava/util/Random;II)V
-		ARG 1 random
-		ARG 2 x
-		ARG 3 z
 	METHOD <init> (Lnet/minecraft/class_2487;)V
 		ARG 1 nbt
+	METHOD <init> (Lnet/minecraft/class_5819;II)V
+		ARG 2 x
+		ARG 3 z

mappings/net/minecraft/structure/EndCityGenerator.mapping

@@ -6,20 +6,18 @@ CLASS net/minecraft/class_3342 net/minecraft/structure/EndCityGenerator
 	FIELD field_14388 FAT_TOWER_BRIDGE_ATTACHMENTS Ljava/util/List;
 	FIELD field_14390 BUILDING Lnet/minecraft/class_3342$class_3344;
 	FIELD field_31549 MAX_DEPTH I
-	METHOD method_14673 createPart (Lnet/minecraft/class_3485;Lnet/minecraft/class_3342$class_3344;ILnet/minecraft/class_3342$class_3343;Lnet/minecraft/class_2338;Ljava/util/List;Ljava/util/Random;)Z
+	METHOD method_14673 createPart (Lnet/minecraft/class_3485;Lnet/minecraft/class_3342$class_3344;ILnet/minecraft/class_3342$class_3343;Lnet/minecraft/class_2338;Ljava/util/List;Lnet/minecraft/class_5819;)Z
 		ARG 0 manager
 		ARG 1 piece
 		ARG 2 depth
 		ARG 3 parent
 		ARG 4 pos
 		ARG 5 pieces
-		ARG 6 random
+	METHOD method_14679 addPieces (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Ljava/util/List;Lnet/minecraft/class_5819;)V
-	METHOD method_14679 addPieces (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Ljava/util/List;Ljava/util/Random;)V
 		ARG 0 structureManager
 		ARG 1 pos
 		ARG 2 rotation
 		ARG 3 pieces
-		ARG 4 random
 	METHOD method_14681 addPiece (Ljava/util/List;Lnet/minecraft/class_3342$class_3343;)Lnet/minecraft/class_3342$class_3343;
 		ARG 0 pieces
 		ARG 1 piece
@@ -48,11 +46,10 @@ CLASS net/minecraft/class_3342 net/minecraft/structure/EndCityGenerator
 			ARG 0 includeAir
 			ARG 1 rotation
 	CLASS class_3344 Part
-		METHOD method_14687 create (Lnet/minecraft/class_3485;ILnet/minecraft/class_3342$class_3343;Lnet/minecraft/class_2338;Ljava/util/List;Ljava/util/Random;)Z
+		METHOD method_14687 create (Lnet/minecraft/class_3485;ILnet/minecraft/class_3342$class_3343;Lnet/minecraft/class_2338;Ljava/util/List;Lnet/minecraft/class_5819;)Z
 			ARG 1 manager
 			ARG 2 depth
 			ARG 3 root
 			ARG 4 pos
 			ARG 5 pieces
-			ARG 6 random
 		METHOD method_14688 init ()V

mappings/net/minecraft/structure/IglooGenerator.mapping

@@ -5,12 +5,11 @@ CLASS net/minecraft/class_3351 net/minecraft/structure/IglooGenerator
 	FIELD field_14409 TOP_TEMPLATE Lnet/minecraft/class_2960;
 	FIELD field_14410 BOTTOM_TEMPLATE Lnet/minecraft/class_2960;
 	FIELD field_31550 OFFSET_Y I
-	METHOD method_14705 addPieces (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6130;Ljava/util/Random;)V
+	METHOD method_14705 addPieces (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;)V
 		ARG 0 manager
 		ARG 1 pos
 		ARG 2 rotation
 		ARG 3 holder
-		ARG 4 random
 	CLASS class_3352 Piece
 		METHOD <init> (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;)V
 			ARG 1 manager

mappings/net/minecraft/structure/JungleTempleGenerator.mapping

@@ -5,10 +5,9 @@ CLASS net/minecraft/class_3348 net/minecraft/structure/JungleTempleGenerator
 	FIELD field_14402 placedMainChest Z
 	FIELD field_14403 COBBLESTONE_RANDOMIZER Lnet/minecraft/class_3348$class_3349;
 	FIELD field_34728 DEPTH I
-	METHOD <init> (Ljava/util/Random;II)V
-		ARG 1 random
-		ARG 2 x
-		ARG 3 z
 	METHOD <init> (Lnet/minecraft/class_2487;)V
 		ARG 1 nbt
+	METHOD <init> (Lnet/minecraft/class_5819;II)V
+		ARG 2 x
+		ARG 3 z
 	CLASS class_3349 CobblestoneRandomizer

mappings/net/minecraft/structure/MineshaftGenerator.mapping

@@ -1,17 +1,15 @@
 CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator
 	FIELD field_29326 LOGGER Lorg/slf4j/Logger;
-	METHOD method_14711 pieceGenerator (Lnet/minecraft/class_3443;Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3353$class_3356;
+	METHOD method_14711 pieceGenerator (Lnet/minecraft/class_3443;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3353$class_3356;
 		ARG 0 start
 		ARG 1 holder
-		ARG 2 random
 		ARG 3 x
 		ARG 4 y
 		ARG 5 z
 		ARG 6 orientation
 		ARG 7 chainLength
-	METHOD method_14712 pickPiece (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;ILnet/minecraft/class_3098$class_3100;)Lnet/minecraft/class_3353$class_3356;
+	METHOD method_14712 pickPiece (Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;ILnet/minecraft/class_3098$class_3100;)Lnet/minecraft/class_3353$class_3356;
 		ARG 0 holder
-		ARG 1 random
 		ARG 2 x
 		ARG 3 y
 		ARG 4 z
@@ -23,13 +21,12 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator
 		FIELD field_14414 hasSpawner Z
 		FIELD field_14415 hasCobwebs Z
 		FIELD field_14416 hasRails Z
-		METHOD <init> (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;Lnet/minecraft/class_3098$class_3100;)V
+		METHOD <init> (ILnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;Lnet/minecraft/class_3098$class_3100;)V
 			ARG 1 chainLength
-			ARG 2 random
 			ARG 3 boundingBox
 			ARG 4 orientation
 			ARG 5 type
-		METHOD method_14713 generateSupports (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIIIILjava/util/Random;)V
+		METHOD method_14713 generateSupports (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIIIILnet/minecraft/class_5819;)V
 			ARG 1 world
 			ARG 2 boundingBox
 			ARG 3 minX
@@ -37,17 +34,14 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator
 			ARG 5 z
 			ARG 6 maxY
 			ARG 7 maxX
-			ARG 8 random
+		METHOD method_14714 getBoundingBox (Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341;
-		METHOD method_14714 getBoundingBox (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341;
-			ARG 1 random
 			ARG 2 x
 			ARG 3 y
 			ARG 4 z
 			ARG 5 orientation
-		METHOD method_14715 addCobwebsUnderground (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Ljava/util/Random;FIII)V
+		METHOD method_14715 addCobwebsUnderground (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Lnet/minecraft/class_5819;FIII)V
 			ARG 1 world
 			ARG 2 box
-			ARG 3 random
 			ARG 4 threshold
 			ARG 5 x
 			ARG 6 y
@@ -100,9 +94,8 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator
 			ARG 4 minY
 			ARG 5 z
 			ARG 6 maxY
-		METHOD method_14717 getBoundingBox (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341;
+		METHOD method_14717 getBoundingBox (Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341;
 			ARG 0 holder
-			ARG 1 random
 			ARG 2 x
 			ARG 3 y
 			ARG 4 z
@@ -133,9 +126,8 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator
 			ARG 2 box
 	CLASS class_3357 MineshaftRoom
 		FIELD field_14422 entrances Ljava/util/List;
-		METHOD <init> (ILjava/util/Random;IILnet/minecraft/class_3098$class_3100;)V
+		METHOD <init> (ILnet/minecraft/class_5819;IILnet/minecraft/class_3098$class_3100;)V
 			ARG 1 chainLength
-			ARG 2 random
 			ARG 3 x
 			ARG 4 z
 			ARG 5 type
@@ -147,9 +139,8 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator
 			ARG 4 type
 		METHOD <init> (Lnet/minecraft/class_2487;)V
 			ARG 1 nbt
-		METHOD method_14720 getBoundingBox (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341;
+		METHOD method_14720 getBoundingBox (Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341;
 			ARG 0 holder
-			ARG 1 random
 			ARG 2 x
 			ARG 3 y
 			ARG 4 z

mappings/net/minecraft/structure/NetherFortressGenerator.mapping

@@ -1,10 +1,9 @@
 CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 	FIELD field_14493 ALL_CORRIDOR_PIECES [Lnet/minecraft/class_3390$class_3404;
 	FIELD field_14494 ALL_BRIDGE_PIECES [Lnet/minecraft/class_3390$class_3404;
-	METHOD method_14795 createPiece (Lnet/minecraft/class_3390$class_3404;Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3403;
+	METHOD method_14795 createPiece (Lnet/minecraft/class_3390$class_3404;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3403;
 		ARG 0 pieceData
 		ARG 1 holder
-		ARG 2 random
 		ARG 3 x
 		ARG 4 y
 		ARG 5 z
@@ -36,16 +35,14 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 		FIELD field_31562 SIZE_X I
 		FIELD field_31563 SIZE_Y I
 		FIELD field_31564 SIZE_Z I
-		METHOD <init> (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
+		METHOD <init> (ILnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
 			ARG 1 chainLength
-			ARG 2 random
 			ARG 3 boundingBox
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_2487;)V
 			ARG 1 nbt
-		METHOD method_14797 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3392;
+		METHOD method_14797 create (Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3392;
 			ARG 0 holder
-			ARG 1 random
 			ARG 2 x
 			ARG 3 y
 			ARG 4 z
@@ -55,16 +52,14 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 		FIELD field_31565 SIZE_X I
 		FIELD field_31566 SIZE_Y I
 		FIELD field_31567 SIZE_Z I
-		METHOD <init> (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
+		METHOD <init> (ILnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
 			ARG 1 chainLength
-			ARG 2 random
 			ARG 3 boundingBox
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_2487;)V
 			ARG 1 nbt
-		METHOD method_14798 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3393;
+		METHOD method_14798 create (Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3393;
 			ARG 0 holder
-			ARG 1 random
 			ARG 2 x
 			ARG 3 y
 			ARG 4 z
@@ -108,16 +103,14 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 		FIELD field_31574 SIZE_X I
 		FIELD field_31575 SIZE_Y I
 		FIELD field_31576 SIZE_Z I
-		METHOD <init> (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
+		METHOD <init> (ILnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
 			ARG 1 chainLength
-			ARG 2 random
 			ARG 3 boundingBox
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_2487;)V
 			ARG 1 nbt
-		METHOD method_14801 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3396;
+		METHOD method_14801 create (Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3396;
 			ARG 0 holder
-			ARG 1 random
 			ARG 2 x
 			ARG 3 y
 			ARG 4 z
@@ -145,16 +138,14 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 		FIELD field_31580 SIZE_X I
 		FIELD field_31581 SIZE_Y I
 		FIELD field_31582 SIZE_Z I
-		METHOD <init> (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
+		METHOD <init> (ILnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
 			ARG 1 chainLength
-			ARG 2 random
 			ARG 3 boundingBox
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_2487;)V
 			ARG 1 nbt
-		METHOD method_14803 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3398;
+		METHOD method_14803 create (Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3398;
 			ARG 0 holder
-			ARG 1 random
 			ARG 2 x
 			ARG 3 y
 			ARG 4 z
@@ -182,16 +173,14 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 		FIELD field_31586 SIZE_X I
 		FIELD field_31587 SIZE_Y I
 		FIELD field_31588 SIZE_Z I
-		METHOD <init> (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
+		METHOD <init> (ILnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
 			ARG 1 chainLength
-			ARG 2 random
 			ARG 3 boundingBox
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_2487;)V
 			ARG 1 nbt
-		METHOD method_14805 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3400;
+		METHOD method_14805 create (Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3400;
 			ARG 0 holder
-			ARG 1 random
 			ARG 2 x
 			ARG 3 y
 			ARG 4 z
@@ -233,10 +222,9 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 			ARG 4 chainLength
 			ARG 5 orientation
 	CLASS class_3403 Piece
-		METHOD method_14808 fillSEOpening (Lnet/minecraft/class_3390$class_3407;Lnet/minecraft/class_6130;Ljava/util/Random;IIZ)Lnet/minecraft/class_3443;
+		METHOD method_14808 fillSEOpening (Lnet/minecraft/class_3390$class_3407;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIZ)Lnet/minecraft/class_3443;
 			ARG 1 start
 			ARG 2 holder
-			ARG 3 random
 			ARG 4 heightOffset
 			ARG 5 leftRightOffset
 			ARG 6 inside
@@ -244,37 +232,33 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 			ARG 0 boundingBox
 		METHOD method_14810 checkRemainingPieces (Ljava/util/List;)I
 			ARG 1 possiblePieces
-		METHOD method_14811 pickPiece (Lnet/minecraft/class_3390$class_3407;Ljava/util/List;Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3403;
+		METHOD method_14811 pickPiece (Lnet/minecraft/class_3390$class_3407;Ljava/util/List;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3390$class_3403;
 			ARG 1 start
 			ARG 2 possiblePieces
 			ARG 3 holder
-			ARG 4 random
 			ARG 5 x
 			ARG 6 y
 			ARG 7 z
 			ARG 8 orientation
 			ARG 9 chainLength
-		METHOD method_14812 fillNWOpening (Lnet/minecraft/class_3390$class_3407;Lnet/minecraft/class_6130;Ljava/util/Random;IIZ)Lnet/minecraft/class_3443;
+		METHOD method_14812 fillNWOpening (Lnet/minecraft/class_3390$class_3407;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIZ)Lnet/minecraft/class_3443;
 			ARG 1 start
 			ARG 2 holder
-			ARG 3 random
 			ARG 4 heightOffset
 			ARG 5 leftRightOffset
 			ARG 6 inside
-		METHOD method_14813 pieceGenerator (Lnet/minecraft/class_3390$class_3407;Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;IZ)Lnet/minecraft/class_3443;
+		METHOD method_14813 pieceGenerator (Lnet/minecraft/class_3390$class_3407;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;IZ)Lnet/minecraft/class_3443;
 			ARG 1 start
 			ARG 2 holder
-			ARG 3 random
 			ARG 4 x
 			ARG 5 y
 			ARG 6 z
 			ARG 7 orientation
 			ARG 8 chainLength
 			ARG 9 inside
-		METHOD method_14814 fillForwardOpening (Lnet/minecraft/class_3390$class_3407;Lnet/minecraft/class_6130;Ljava/util/Random;IIZ)Lnet/minecraft/class_3443;
+		METHOD method_14814 fillForwardOpening (Lnet/minecraft/class_3390$class_3407;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIZ)Lnet/minecraft/class_3443;
 			ARG 1 start
 			ARG 2 holder
-			ARG 3 random
 			ARG 4 leftRightOffset
 			ARG 5 heightOffset
 			ARG 6 inside
@@ -335,7 +319,6 @@ CLASS net/minecraft/class_3390 net/minecraft/structure/NetherFortressGenerator
 		FIELD field_14505 pieces Ljava/util/List;
 		FIELD field_14506 lastPiece Lnet/minecraft/class_3390$class_3404;
 		FIELD field_14507 bridgePieces Ljava/util/List;
-		METHOD <init> (Ljava/util/Random;II)V
+		METHOD <init> (Lnet/minecraft/class_5819;II)V
-			ARG 1 random
 			ARG 2 x
 			ARG 3 z

mappings/net/minecraft/structure/NetherFossilGenerator.mapping

@@ -1,9 +1,8 @@
 CLASS net/minecraft/class_4787 net/minecraft/structure/NetherFossilGenerator
 	FIELD field_22197 FOSSILS [Lnet/minecraft/class_2960;
-	METHOD method_24453 addPieces (Lnet/minecraft/class_3485;Lnet/minecraft/class_6130;Ljava/util/Random;Lnet/minecraft/class_2338;)V
+	METHOD method_24453 addPieces (Lnet/minecraft/class_3485;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V
 		ARG 0 manager
 		ARG 1 holder
-		ARG 2 random
 		ARG 3 pos
 	CLASS class_4788 Piece
 		METHOD <init> (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;)V

mappings/net/minecraft/structure/OceanMonumentGenerator.mapping

@@ -7,48 +7,37 @@ CLASS net/minecraft/class_3366 net/minecraft/structure/OceanMonumentGenerator
 	CLASS class_3372 SimpleRoomFactory
 	CLASS class_3373 SimpleRoomTopFactory
 	CLASS class_3374 Base
-		METHOD <init> (Ljava/util/Random;IILnet/minecraft/class_2350;)V
+		METHOD <init> (Lnet/minecraft/class_2487;)V
-			ARG 1 random
+			ARG 1 nbt
+		METHOD <init> (Lnet/minecraft/class_5819;IILnet/minecraft/class_2350;)V
 			ARG 2 x
 			ARG 3 z
 			ARG 4 orientation
-		METHOD <init> (Lnet/minecraft/class_2487;)V
+		METHOD method_14761 (ZILnet/minecraft/class_5281;Lnet/minecraft/class_5819;Lnet/minecraft/class_3341;)V
-			ARG 1 nbt
-		METHOD method_14760 (Ljava/util/Random;)Ljava/util/List;
-			ARG 1 random
-		METHOD method_14761 (ZILnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_3341;)V
 			ARG 3 world
-			ARG 4 random
 			ARG 5 box
-		METHOD method_14762 (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_3341;)V
+		METHOD method_14762 (Lnet/minecraft/class_5281;Lnet/minecraft/class_5819;Lnet/minecraft/class_3341;)V
 			ARG 1 world
-			ARG 2 random
 			ARG 3 box
-		METHOD method_14763 (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_3341;)V
+		METHOD method_14763 (Lnet/minecraft/class_5281;Lnet/minecraft/class_5819;Lnet/minecraft/class_3341;)V
 			ARG 1 world
-			ARG 2 random
 			ARG 3 box
-		METHOD method_14764 (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_3341;)V
+		METHOD method_14764 (Lnet/minecraft/class_5281;Lnet/minecraft/class_5819;Lnet/minecraft/class_3341;)V
 			ARG 1 world
-			ARG 2 random
 			ARG 3 box
-		METHOD method_14765 (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_3341;)V
+		METHOD method_14765 (Lnet/minecraft/class_5281;Lnet/minecraft/class_5819;Lnet/minecraft/class_3341;)V
 			ARG 1 world
-			ARG 2 random
 			ARG 3 box
-		METHOD method_14766 (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_3341;)V
+		METHOD method_14766 (Lnet/minecraft/class_5281;Lnet/minecraft/class_5819;Lnet/minecraft/class_3341;)V
 			ARG 1 world
-			ARG 2 random
 			ARG 3 box
-		METHOD method_14767 (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_3341;)V
+		METHOD method_14767 (Lnet/minecraft/class_5281;Lnet/minecraft/class_5819;Lnet/minecraft/class_3341;)V
 			ARG 1 world
-			ARG 2 random
 			ARG 3 box
 	CLASS class_3375 PieceFactory
-		METHOD method_14768 generate (Lnet/minecraft/class_2350;Lnet/minecraft/class_3366$class_3388;Ljava/util/Random;)Lnet/minecraft/class_3366$class_3384;
+		METHOD method_14768 generate (Lnet/minecraft/class_2350;Lnet/minecraft/class_3366$class_3388;Lnet/minecraft/class_5819;)Lnet/minecraft/class_3366$class_3384;
 			ARG 1 direction
 			ARG 2 setting
-			ARG 3 random
 		METHOD method_14769 canGenerate (Lnet/minecraft/class_3366$class_3388;)Z
 			ARG 1 setting
 	CLASS class_3376 CoreRoom
@@ -164,10 +153,9 @@ CLASS net/minecraft/class_3366 net/minecraft/structure/OceanMonumentGenerator
 			ARG 0 orientation
 			ARG 1 setting
 	CLASS class_3385 SimpleRoom
-		METHOD <init> (Lnet/minecraft/class_2350;Lnet/minecraft/class_3366$class_3388;Ljava/util/Random;)V
+		METHOD <init> (Lnet/minecraft/class_2350;Lnet/minecraft/class_3366$class_3388;Lnet/minecraft/class_5819;)V
 			ARG 1 orientation
 			ARG 2 setting
-			ARG 3 random
 		METHOD <init> (Lnet/minecraft/class_2487;)V
 			ARG 1 nbt
 	CLASS class_3386 SimpleRoomTop

mappings/net/minecraft/structure/OceanRuinGenerator.mapping

@@ -7,32 +7,26 @@ CLASS net/minecraft/class_3409 net/minecraft/structure/OceanRuinGenerator
 	FIELD field_14520 BIG_CRACKED_RUINS [Lnet/minecraft/class_2960;
 	FIELD field_14521 WARM_RUINS [Lnet/minecraft/class_2960;
 	FIELD field_14522 MOSSY_RUINS [Lnet/minecraft/class_2960;
-	METHOD method_14821 getRoomPositions (Ljava/util/Random;Lnet/minecraft/class_2338;)Ljava/util/List;
+	METHOD method_14821 getRoomPositions (Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Ljava/util/List;
-		ARG 0 random
 		ARG 1 pos
-	METHOD method_14822 (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6130;Ljava/util/Random;Lnet/minecraft/class_3411;ZF)V
+	METHOD method_14822 (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;Lnet/minecraft/class_3411;ZF)V
 		ARG 0 manager
 		ARG 1 pos
 		ARG 2 rotation
 		ARG 3 holder
-		ARG 4 random
 		ARG 6 large
 		ARG 7 integrity
-	METHOD method_14824 getRandomWarmRuin (Ljava/util/Random;)Lnet/minecraft/class_2960;
+	METHOD method_14824 getRandomWarmRuin (Lnet/minecraft/class_5819;)Lnet/minecraft/class_2960;
-		ARG 0 random
+	METHOD method_14825 (Lnet/minecraft/class_3485;Lnet/minecraft/class_5819;Lnet/minecraft/class_2470;Lnet/minecraft/class_2338;Lnet/minecraft/class_3411;Lnet/minecraft/class_6130;)V
-	METHOD method_14825 (Lnet/minecraft/class_3485;Ljava/util/Random;Lnet/minecraft/class_2470;Lnet/minecraft/class_2338;Lnet/minecraft/class_3411;Lnet/minecraft/class_6130;)V
 		ARG 0 manager
-		ARG 1 random
 		ARG 2 rotation
 		ARG 3 pos
-	METHOD method_14826 getRandomBigWarmRuin (Ljava/util/Random;)Lnet/minecraft/class_2960;
+	METHOD method_14826 getRandomBigWarmRuin (Lnet/minecraft/class_5819;)Lnet/minecraft/class_2960;
-		ARG 0 random
+	METHOD method_14827 addPieces (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;Lnet/minecraft/class_3411;)V
-	METHOD method_14827 addPieces (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6130;Ljava/util/Random;Lnet/minecraft/class_3411;)V
 		ARG 0 manager
 		ARG 1 pos
 		ARG 2 rotation
 		ARG 3 holder
-		ARG 4 random
 	CLASS class_3410 Piece
 		FIELD field_14524 integrity F
 		FIELD field_14525 large Z

mappings/net/minecraft/structure/PoolStructurePiece.mapping

@@ -24,11 +24,10 @@ CLASS net/minecraft/class_3790 net/minecraft/structure/PoolStructurePiece
 	METHOD method_16648 getPos ()Lnet/minecraft/class_2338;
 	METHOD method_16649 (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_2520;)V
 		ARG 2 junctionTag
-	METHOD method_27236 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2338;Z)V
+	METHOD method_27236 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_2338;Z)V
 		ARG 1 world
 		ARG 2 structureAccessor
 		ARG 3 chunkGenerator
-		ARG 4 random
 		ARG 5 boundingBox
 		ARG 6 pos
 		ARG 7 keepJigsaws

mappings/net/minecraft/structure/PostPlacementProcessor.mapping

@@ -3,19 +3,17 @@ CLASS net/minecraft/class_6621 net/minecraft/structure/PostPlacementProcessor
 	COMMENT pieces of a structure start have placed blocks in the world in the
 	COMMENT feature chunk status.
 	FIELD field_34938 EMPTY Lnet/minecraft/class_6621;
-	METHOD afterPlace (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;Lnet/minecraft/class_6624;)V
+	METHOD afterPlace (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;Lnet/minecraft/class_6624;)V
 		ARG 1 world
 		ARG 2 structureAccessor
 		ARG 3 chunkGenerator
-		ARG 4 random
 		ARG 5 chunkBox
 		ARG 6 pos
 		ARG 7 children
-	METHOD method_38701 (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;Lnet/minecraft/class_6624;)V
+	METHOD method_38701 (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;Lnet/minecraft/class_6624;)V
 		ARG 0 world
 		ARG 1 structureAccessor
 		ARG 2 chunkGenerator
-		ARG 3 random
 		ARG 4 chunkBox
 		ARG 5 pos
 		ARG 6 children

mappings/net/minecraft/structure/RuinedPortalStructurePiece.mapping

@@ -30,32 +30,26 @@ CLASS net/minecraft/class_5189 net/minecraft/structure/RuinedPortalStructurePiec
 		ARG 1 updated
 	METHOD method_27241 getHeightmapType (Lnet/minecraft/class_5189$class_5191;)Lnet/minecraft/class_2902$class_2903;
 		ARG 0 verticalPlacement
-	METHOD method_27243 updateNetherracksInBound (Ljava/util/Random;Lnet/minecraft/class_1936;)V
+	METHOD method_27243 updateNetherracksInBound (Lnet/minecraft/class_5819;Lnet/minecraft/class_1936;)V
-		ARG 1 random
 		ARG 2 world
-	METHOD method_27244 generateVines (Ljava/util/Random;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V
+	METHOD method_27244 generateVines (Lnet/minecraft/class_5819;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V
-		ARG 1 random
 		ARG 2 world
 		ARG 3 pos
-	METHOD method_27245 placeNetherrackBase (Ljava/util/Random;Lnet/minecraft/class_1936;)V
+	METHOD method_27245 placeNetherrackBase (Lnet/minecraft/class_5819;Lnet/minecraft/class_1936;)V
-		ARG 1 random
 		ARG 2 world
-	METHOD method_27246 generateOvergrownLeaves (Ljava/util/Random;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V
+	METHOD method_27246 generateOvergrownLeaves (Lnet/minecraft/class_5819;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V
-		ARG 1 random
 		ARG 2 world
 		ARG 3 pos
 	METHOD method_27247 createLavaReplacementRule (Lnet/minecraft/class_5189$class_5191;Lnet/minecraft/class_5189$class_5190;)Lnet/minecraft/class_3821;
 		ARG 0 verticalPlacement
 		ARG 1 properties
-	METHOD method_27248 updateNetherracks (Ljava/util/Random;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V
+	METHOD method_27248 updateNetherracks (Lnet/minecraft/class_5819;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V
-		ARG 1 random
 		ARG 2 world
 		ARG 3 pos
-	METHOD method_27249 placeNetherrackBottom (Ljava/util/Random;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V
+	METHOD method_27249 placeNetherrackBottom (Lnet/minecraft/class_5819;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V
-		ARG 1 random
 		ARG 2 world
 		ARG 3 pos
-	METHOD method_27250 (Ljava/util/Random;Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;)V
+	METHOD method_27250 (Lnet/minecraft/class_5819;Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;)V
 		ARG 3 pos
 	METHOD method_35449 createPlacementData (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3492;
 		ARG 0 manager

mappings/net/minecraft/structure/ShipwreckGenerator.mapping

@@ -3,12 +3,11 @@ CLASS net/minecraft/class_3415 net/minecraft/structure/ShipwreckGenerator
 	FIELD field_14535 REGULAR_TEMPLATES [Lnet/minecraft/class_2960;
 	FIELD field_14536 DEFAULT_POSITION Lnet/minecraft/class_2338;
 	FIELD field_34939 LOOT_TABLES Ljava/util/Map;
-	METHOD method_14834 addParts (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6130;Ljava/util/Random;Z)V
+	METHOD method_14834 addParts (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;Z)V
 		ARG 0 structureManager
 		ARG 1 pos
 		ARG 2 rotation
 		ARG 3 holder
-		ARG 4 random
 	CLASS class_3416 Piece
 		FIELD field_14538 grounded Z
 		METHOD <init> (Lnet/minecraft/class_3485;Lnet/minecraft/class_2487;)V

mappings/net/minecraft/structure/SimpleStructurePiece.mapping

@@ -17,10 +17,9 @@ CLASS net/minecraft/class_3470 net/minecraft/structure/SimpleStructurePiece
 		ARG 2 nbt
 		ARG 3 structureManager
 		ARG 4 placementDataGetter
-	METHOD method_15026 handleMetadata (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_5425;Ljava/util/Random;Lnet/minecraft/class_3341;)V
+	METHOD method_15026 handleMetadata (Ljava/lang/String;Lnet/minecraft/class_2338;Lnet/minecraft/class_5425;Lnet/minecraft/class_5819;Lnet/minecraft/class_3341;)V
 		ARG 1 metadata
 		ARG 2 pos
 		ARG 3 world
-		ARG 4 random
 		ARG 5 boundingBox
 	METHOD method_35470 getId ()Lnet/minecraft/class_2960;

mappings/net/minecraft/structure/StrongholdGenerator.mapping

@@ -4,29 +4,26 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 	FIELD field_15265 ALL_PIECES [Lnet/minecraft/class_3421$class_3427;
 	FIELD field_15266 activePieceType Ljava/lang/Class;
 	FIELD field_15267 possiblePieces Ljava/util/List;
-	METHOD method_14847 createPiece (Ljava/lang/Class;Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3437;
+	METHOD method_14847 createPiece (Ljava/lang/Class;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3437;
 		ARG 0 pieceType
 		ARG 1 holder
-		ARG 2 random
 		ARG 3 x
 		ARG 4 y
 		ARG 5 z
 		ARG 6 orientation
 		ARG 7 chainLength
-	METHOD method_14851 pickPiece (Lnet/minecraft/class_3421$class_3434;Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3437;
+	METHOD method_14851 pickPiece (Lnet/minecraft/class_3421$class_3434;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3437;
 		ARG 0 start
 		ARG 1 holder
-		ARG 2 random
 		ARG 3 x
 		ARG 4 y
 		ARG 5 z
 		ARG 6 orientation
 		ARG 7 chainLength
 	METHOD method_14852 checkRemainingPieces ()Z
-	METHOD method_14854 pieceGenerator (Lnet/minecraft/class_3421$class_3434;Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3443;
+	METHOD method_14854 pieceGenerator (Lnet/minecraft/class_3421$class_3434;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3443;
 		ARG 0 start
 		ARG 1 holder
-		ARG 2 random
 		ARG 3 x
 		ARG 4 y
 		ARG 5 z
@@ -38,16 +35,14 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 		FIELD field_31629 SIZE_X I
 		FIELD field_31630 SIZE_Y I
 		FIELD field_31631 SIZE_Z I
-		METHOD <init> (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
+		METHOD <init> (ILnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
 			ARG 1 chainLength
-			ARG 2 random
 			ARG 3 boundingBox
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_2487;)V
 			ARG 1 nbt
-		METHOD method_14856 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3422;
+		METHOD method_14856 create (Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3422;
 			ARG 0 holder
-			ARG 1 random
 			ARG 2 x
 			ARG 3 y
 			ARG 4 z
@@ -61,9 +56,8 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 			ARG 3 orientation
 		METHOD <init> (Lnet/minecraft/class_2487;)V
 			ARG 1 nbt
-		METHOD method_14857 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341;
+		METHOD method_14857 create (Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;)Lnet/minecraft/class_3341;
 			ARG 0 holder
-			ARG 1 random
 			ARG 2 x
 			ARG 3 y
 			ARG 4 z
@@ -76,32 +70,28 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 		FIELD field_31632 SIZE_X I
 		FIELD field_31633 SIZE_Y I
 		FIELD field_31634 SIZE_Z I
-		METHOD <init> (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
+		METHOD <init> (ILnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
 			ARG 1 chainLength
-			ARG 2 random
 			ARG 3 boundingBox
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_2487;)V
 			ARG 1 nbt
-		METHOD method_14858 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3424;
+		METHOD method_14858 create (Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3424;
 			ARG 0 holder
-			ARG 1 random
 			ARG 2 x
 			ARG 3 y
 			ARG 4 z
 			ARG 5 orientation
 			ARG 6 chainLength
 	CLASS class_3425 LeftTurn
-		METHOD <init> (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
+		METHOD <init> (ILnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
 			ARG 1 chainLength
-			ARG 2 random
 			ARG 3 boundingBox
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_2487;)V
 			ARG 1 nbt
-		METHOD method_14859 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3425;
+		METHOD method_14859 create (Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3425;
 			ARG 0 holder
-			ARG 1 random
 			ARG 2 x
 			ARG 3 y
 			ARG 4 z
@@ -112,16 +102,14 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 		FIELD field_31635 SIZE_X I
 		FIELD field_31637 SIZE_Y I
 		FIELD field_31638 SIZE_Z I
-		METHOD <init> (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
+		METHOD <init> (ILnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
 			ARG 1 chainLength
-			ARG 2 random
 			ARG 3 boundingBox
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_2487;)V
 			ARG 1 nbt
-		METHOD method_14860 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3426;
+		METHOD method_14860 create (Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3426;
 			ARG 0 holder
-			ARG 1 random
 			ARG 2 x
 			ARG 3 y
 			ARG 4 z
@@ -161,32 +149,28 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 		FIELD field_31642 SIZE_X I
 		FIELD field_31643 SIZE_Y I
 		FIELD field_31644 SIZE_Z I
-		METHOD <init> (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
+		METHOD <init> (ILnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
 			ARG 1 chainLength
-			ARG 2 random
 			ARG 3 boundingBox
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_2487;)V
 			ARG 1 nbt
-		METHOD method_14864 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3429;
+		METHOD method_14864 create (Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3429;
 			ARG 0 holder
-			ARG 1 random
 			ARG 2 x
 			ARG 3 y
 			ARG 4 z
 			ARG 5 orientation
 			ARG 6 chainLength
 	CLASS class_3430 RightTurn
-		METHOD <init> (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
+		METHOD <init> (ILnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
 			ARG 1 chainLength
-			ARG 2 random
 			ARG 3 boundingBox
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_2487;)V
 			ARG 1 nbt
-		METHOD method_16652 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3430;
+		METHOD method_16652 create (Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3430;
 			ARG 0 holder
-			ARG 1 random
 			ARG 2 x
 			ARG 3 y
 			ARG 4 z
@@ -197,16 +181,14 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 		FIELD field_31645 SIZE_X I
 		FIELD field_31646 SIZE_Y I
 		FIELD field_31647 SIZE_Z I
-		METHOD <init> (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
+		METHOD <init> (ILnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
 			ARG 1 chainLength
-			ARG 2 random
 			ARG 3 boundingBox
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_2487;)V
 			ARG 1 nbt
-		METHOD method_14865 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3431;
+		METHOD method_14865 create (Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3431;
 			ARG 0 holder
-			ARG 1 random
 			ARG 2 x
 			ARG 3 y
 			ARG 4 z
@@ -218,9 +200,8 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 		FIELD field_31648 SIZE_X I
 		FIELD field_31649 SIZE_Y I
 		FIELD field_31650 SIZE_Z I
-		METHOD <init> (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
+		METHOD <init> (ILnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
 			ARG 1 chainLength
-			ARG 2 random
 			ARG 3 boundingBox
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_2487;)V
@@ -231,9 +212,8 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 			ARG 3 x
 			ARG 4 z
 			ARG 5 orientation
-		METHOD method_14866 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3433;
+		METHOD method_14866 create (Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3433;
 			ARG 0 holder
-			ARG 1 random
 			ARG 2 x
 			ARG 3 y
 			ARG 4 z
@@ -243,24 +223,20 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 		FIELD field_15282 pieces Ljava/util/List;
 		FIELD field_15283 portalRoom Lnet/minecraft/class_3421$class_3428;
 		FIELD field_15284 lastPiece Lnet/minecraft/class_3421$class_3427;
-		METHOD <init> (Ljava/util/Random;II)V
-			ARG 1 random
 	CLASS class_3435 Corridor
 		FIELD field_15285 rightExitExists Z
 		FIELD field_15286 leftExitExists Z
 		FIELD field_31651 SIZE_X I
 		FIELD field_31652 SIZE_Y I
 		FIELD field_31653 SIZE_Z I
-		METHOD <init> (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
+		METHOD <init> (ILnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
 			ARG 1 chainLength
-			ARG 2 random
 			ARG 3 boundingBox
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_2487;)V
 			ARG 1 nbt
-		METHOD method_14867 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3435;
+		METHOD method_14867 create (Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3435;
 			ARG 0 holder
-			ARG 1 random
 			ARG 2 x
 			ARG 3 y
 			ARG 4 z
@@ -270,16 +246,14 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 		FIELD field_31654 SIZE_X I
 		FIELD field_31655 SIZE_Y I
 		FIELD field_31656 SIZE_Z I
-		METHOD <init> (ILjava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
+		METHOD <init> (ILnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_2350;)V
 			ARG 1 chainLength
-			ARG 2 random
 			ARG 3 boundingBox
 			ARG 4 orientation
 		METHOD <init> (Lnet/minecraft/class_2487;)V
 			ARG 1 nbt
-		METHOD method_14868 create (Lnet/minecraft/class_6130;Ljava/util/Random;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3436;
+		METHOD method_14868 create (Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;I)Lnet/minecraft/class_3421$class_3436;
 			ARG 0 holder
-			ARG 1 random
 			ARG 2 x
 			ARG 3 y
 			ARG 4 z
@@ -287,34 +261,29 @@ CLASS net/minecraft/class_3421 net/minecraft/structure/StrongholdGenerator
 			ARG 6 chainLength
 	CLASS class_3437 Piece
 		FIELD field_15287 entryDoor Lnet/minecraft/class_3421$class_3437$class_3438;
-		METHOD method_14869 getRandomEntrance (Ljava/util/Random;)Lnet/minecraft/class_3421$class_3437$class_3438;
+		METHOD method_14869 getRandomEntrance (Lnet/minecraft/class_5819;)Lnet/minecraft/class_3421$class_3437$class_3438;
-			ARG 1 random
+		METHOD method_14870 fillNWOpening (Lnet/minecraft/class_3421$class_3434;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;II)Lnet/minecraft/class_3443;
-		METHOD method_14870 fillNWOpening (Lnet/minecraft/class_3421$class_3434;Lnet/minecraft/class_6130;Ljava/util/Random;II)Lnet/minecraft/class_3443;
 			ARG 1 start
 			ARG 2 holder
-			ARG 3 random
 			ARG 4 heightOffset
 			ARG 5 leftRightOffset
 		METHOD method_14871 isInBounds (Lnet/minecraft/class_3341;)Z
 			ARG 0 boundingBox
-		METHOD method_14872 generateEntrance (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_3421$class_3437$class_3438;III)V
+		METHOD method_14872 generateEntrance (Lnet/minecraft/class_5281;Lnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_3421$class_3437$class_3438;III)V
 			ARG 1 world
-			ARG 2 random
 			ARG 3 boundingBox
 			ARG 4 type
 			ARG 5 x
 			ARG 6 y
 			ARG 7 z
-		METHOD method_14873 fillSEOpening (Lnet/minecraft/class_3421$class_3434;Lnet/minecraft/class_6130;Ljava/util/Random;II)Lnet/minecraft/class_3443;
+		METHOD method_14873 fillSEOpening (Lnet/minecraft/class_3421$class_3434;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;II)Lnet/minecraft/class_3443;
 			ARG 1 start
 			ARG 2 holder
-			ARG 3 random
 			ARG 4 heightOffset
 			ARG 5 leftRightOffset
-		METHOD method_14874 fillForwardOpening (Lnet/minecraft/class_3421$class_3434;Lnet/minecraft/class_6130;Ljava/util/Random;II)Lnet/minecraft/class_3443;
+		METHOD method_14874 fillForwardOpening (Lnet/minecraft/class_3421$class_3434;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;II)Lnet/minecraft/class_3443;
 			ARG 1 start
 			ARG 2 holder
-			ARG 3 random
 			ARG 4 leftRightOffset
 			ARG 5 heightOffset
 		CLASS class_3438 EntranceType

mappings/net/minecraft/structure/Structure.mapping

@@ -50,12 +50,11 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/Structure
 	METHOD method_15171 transform (Lnet/minecraft/class_3492;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338;
 		ARG 0 placementData
 		ARG 1 pos
-	METHOD method_15172 place (Lnet/minecraft/class_5425;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;Ljava/util/Random;I)Z
+	METHOD method_15172 place (Lnet/minecraft/class_5425;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_3492;Lnet/minecraft/class_5819;I)Z
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 pivot
 		ARG 4 placementData
-		ARG 5 random
 		ARG 6 flags
 	METHOD method_15174 saveFromWorld (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;ZLnet/minecraft/class_2248;)V
 		ARG 1 world

mappings/net/minecraft/structure/StructurePiece.mapping

@@ -15,10 +15,9 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece
 	METHOD <init> (Lnet/minecraft/class_3773;Lnet/minecraft/class_2487;)V
 		ARG 1 type
 		ARG 2 nbt
-	METHOD method_14915 addChest (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Ljava/util/Random;IIILnet/minecraft/class_2960;)Z
+	METHOD method_14915 addChest (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2960;)Z
 		ARG 1 world
 		ARG 2 boundingBox
-		ARG 3 random
 		ARG 4 x
 		ARG 5 y
 		ARG 6 z
@@ -34,10 +33,9 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece
 		ARG 4 y
 		ARG 5 z
 		ARG 6 box
-	METHOD method_14918 fillOpenings (Lnet/minecraft/class_3443;Lnet/minecraft/class_6130;Ljava/util/Random;)V
+	METHOD method_14918 fillOpenings (Lnet/minecraft/class_3443;Lnet/minecraft/class_6130;Lnet/minecraft/class_5819;)V
 		ARG 1 start
 		ARG 2 holder
-		ARG 3 random
 	METHOD method_14919 fillHalfEllipsoid (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIIIIILnet/minecraft/class_2680;Z)V
 		ARG 1 world
 		ARG 2 bounds
@@ -49,10 +47,9 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece
 		ARG 8 maxZ
 		ARG 9 block
 		ARG 10 cantReplaceAir
-	METHOD method_14921 addChest (Lnet/minecraft/class_5425;Lnet/minecraft/class_3341;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;Lnet/minecraft/class_2680;)Z
+	METHOD method_14921 addChest (Lnet/minecraft/class_5425;Lnet/minecraft/class_3341;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2960;Lnet/minecraft/class_2680;)Z
 		ARG 1 world
 		ARG 2 boundingBox
-		ARG 3 random
 		ARG 4 pos
 		ARG 5 lootTableId
 		ARG 6 block
@@ -74,27 +71,24 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece
 		ARG 3 y
 		ARG 4 z
 		ARG 5 box
-	METHOD method_14930 addDispenser (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Ljava/util/Random;IIILnet/minecraft/class_2350;Lnet/minecraft/class_2960;)Z
+	METHOD method_14930 addDispenser (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Lnet/minecraft/class_5819;IIILnet/minecraft/class_2350;Lnet/minecraft/class_2960;)Z
 		ARG 1 world
 		ARG 2 boundingBox
-		ARG 3 random
 		ARG 4 x
 		ARG 5 y
 		ARG 6 z
 		ARG 7 facing
 		ARG 8 lootTableId
-	METHOD method_14931 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;Lnet/minecraft/class_2338;)V
+	METHOD method_14931 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;Lnet/minecraft/class_2338;)V
 		ARG 1 world
 		ARG 2 structureAccessor
 		ARG 3 chunkGenerator
-		ARG 4 random
 		ARG 5 chunkBox
 		ARG 6 chunkPos
 		ARG 7 pos
-	METHOD method_14933 fillWithOutlineUnderSeaLevel (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Ljava/util/Random;FIIIIIILnet/minecraft/class_2680;Lnet/minecraft/class_2680;ZZ)V
+	METHOD method_14933 fillWithOutlineUnderSeaLevel (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Lnet/minecraft/class_5819;FIIIIIILnet/minecraft/class_2680;Lnet/minecraft/class_2680;ZZ)V
 		ARG 1 world
 		ARG 2 box
-		ARG 3 random
 		ARG 4 blockChance
 		ARG 5 minX
 		ARG 6 minY
@@ -115,7 +109,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece
 		ARG 4 y
 		ARG 5 z
 		ARG 6 box
-	METHOD method_14938 fillWithOutline (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIIIIIZLjava/util/Random;Lnet/minecraft/class_3443$class_3444;)V
+	METHOD method_14938 fillWithOutline (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;IIIIIIZLnet/minecraft/class_5819;Lnet/minecraft/class_3443$class_3444;)V
 		ARG 1 world
 		ARG 2 box
 		ARG 3 minX
@@ -125,7 +119,6 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece
 		ARG 7 maxY
 		ARG 8 maxZ
 		ARG 9 cantReplaceAir
-		ARG 10 random
 		ARG 11 randomizer
 	METHOD method_14939 isUnderSeaLevel (Lnet/minecraft/class_4538;IIILnet/minecraft/class_3341;)Z
 		ARG 1 world
@@ -160,10 +153,9 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece
 	METHOD method_14943 writeNbt (Lnet/minecraft/class_6625;Lnet/minecraft/class_2487;)V
 		ARG 1 context
 		ARG 2 nbt
-	METHOD method_14945 addBlockWithRandomThreshold (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Ljava/util/Random;FIIILnet/minecraft/class_2680;)V
+	METHOD method_14945 addBlockWithRandomThreshold (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Lnet/minecraft/class_5819;FIIILnet/minecraft/class_2680;)V
 		ARG 1 world
 		ARG 2 bounds
-		ARG 3 random
 		ARG 4 threshold
 		ARG 5 x
 		ARG 6 y
@@ -203,15 +195,13 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece
 		ARG 4 outline
 		ARG 5 inside
 		ARG 6 cantReplaceAir
-	METHOD method_35456 fillWithOutline (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Lnet/minecraft/class_3341;ZLjava/util/Random;Lnet/minecraft/class_3443$class_3444;)V
+	METHOD method_35456 fillWithOutline (Lnet/minecraft/class_5281;Lnet/minecraft/class_3341;Lnet/minecraft/class_3341;ZLnet/minecraft/class_5819;Lnet/minecraft/class_3443$class_3444;)V
 		ARG 1 world
 		ARG 2 box
 		ARG 3 fillBox
 		ARG 4 cantReplaceAir
-		ARG 5 random
 		ARG 6 randomizer
-	METHOD method_35457 getRandomHorizontalDirection (Ljava/util/Random;)Lnet/minecraft/class_2350;
+	METHOD method_35457 getRandomHorizontalDirection (Lnet/minecraft/class_5819;)Lnet/minecraft/class_2350;
-		ARG 0 random
 	METHOD method_35458 getCenter ()Lnet/minecraft/class_2338;
 	METHOD method_35460 getMirror ()Lnet/minecraft/class_2415;
 	METHOD method_38702 firstIntersecting (Ljava/util/List;Lnet/minecraft/class_3341;)Lnet/minecraft/class_3443;
@@ -222,8 +212,7 @@ CLASS net/minecraft/class_3443 net/minecraft/structure/StructurePiece
 	CLASS class_3444 BlockRandomizer
 		FIELD field_15317 block Lnet/minecraft/class_2680;
 		METHOD method_14947 getBlock ()Lnet/minecraft/class_2680;
-		METHOD method_14948 setBlock (Ljava/util/Random;IIIZ)V
+		METHOD method_14948 setBlock (Lnet/minecraft/class_5819;IIIZ)V
-			ARG 1 random
 			ARG 2 x
 			ARG 3 y
 			ARG 4 z

mappings/net/minecraft/structure/StructurePiecesCollector.mapping

@@ -6,15 +6,13 @@ CLASS net/minecraft/class_6626 net/minecraft/structure/StructurePiecesCollector
 	METHOD method_38714 toList ()Lnet/minecraft/class_6624;
 	METHOD method_38715 shift (I)V
 		ARG 1 y
-	METHOD method_38716 shiftInto (IILjava/util/Random;I)V
+	METHOD method_38716 shiftInto (IILnet/minecraft/class_5819;I)V
 		COMMENT Somewhat like {@code shiftInto(random, bottomY, topY - topPenalty)}.
 		ARG 1 topY
 		ARG 2 bottomY
-		ARG 3 random
 		ARG 4 topPenalty
-	METHOD method_38718 shiftInto (Ljava/util/Random;II)V
+	METHOD method_38718 shiftInto (Lnet/minecraft/class_5819;II)V
 		COMMENT Shifts all pieces so they lie within {@code [baseY, topY]} vertically.
-		ARG 1 random
 		ARG 2 baseY
 		ARG 3 topY
 	METHOD method_38719 clear ()V

mappings/net/minecraft/structure/StructurePlacementData.mapping

@@ -4,16 +4,15 @@ CLASS net/minecraft/class_3492 net/minecraft/structure/StructurePlacementData
 	FIELD field_15566 position Lnet/minecraft/class_2338;
 	FIELD field_15567 placeFluids Z
 	FIELD field_15569 rotation Lnet/minecraft/class_2470;
-	FIELD field_15570 random Ljava/util/Random;
+	FIELD field_15570 random Lnet/minecraft/class_5819;
 	FIELD field_15571 ignoreEntities Z
 	FIELD field_16446 processors Ljava/util/List;
 	FIELD field_16587 updateNeighbors Z
 	FIELD field_24043 initializeMobs Z
-	METHOD method_15112 setRandom (Ljava/util/Random;)Lnet/minecraft/class_3492;
+	METHOD method_15112 setRandom (Lnet/minecraft/class_5819;)Lnet/minecraft/class_3492;
-		ARG 1 random
 	METHOD method_15113 getRotation ()Lnet/minecraft/class_2470;
 	METHOD method_15114 getMirror ()Lnet/minecraft/class_2415;
-	METHOD method_15115 getRandom (Lnet/minecraft/class_2338;)Ljava/util/Random;
+	METHOD method_15115 getRandom (Lnet/minecraft/class_2338;)Lnet/minecraft/class_5819;
 		ARG 1 pos
 	METHOD method_15119 setPosition (Lnet/minecraft/class_2338;)Lnet/minecraft/class_3492;
 		ARG 1 position

mappings/net/minecraft/structure/StructureStart.mapping

@@ -28,11 +28,10 @@ CLASS net/minecraft/class_3449 net/minecraft/structure/StructureStart
 	METHOD method_14972 toNbt (Lnet/minecraft/class_6625;Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487;
 		ARG 1 context
 		ARG 2 chunkPos
-	METHOD method_14974 place (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;)V
+	METHOD method_14974 place (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;)V
 		ARG 1 world
 		ARG 2 structureAccessor
 		ARG 3 chunkGenerator
-		ARG 4 random
 		ARG 5 chunkBox
 		ARG 6 chunkPos
 	METHOD method_14979 isInExistingChunk ()Z

mappings/net/minecraft/structure/SwampHutGenerator.mapping

@@ -1,12 +1,11 @@
 CLASS net/minecraft/class_3447 net/minecraft/structure/SwampHutGenerator
 	FIELD field_15322 hasWitch Z
 	FIELD field_16445 hasCat Z
-	METHOD <init> (Ljava/util/Random;II)V
-		ARG 1 random
-		ARG 2 x
-		ARG 3 z
 	METHOD <init> (Lnet/minecraft/class_2487;)V
 		ARG 1 nbt
+	METHOD <init> (Lnet/minecraft/class_5819;II)V
+		ARG 2 x
+		ARG 3 z
 	METHOD method_16181 spawnCat (Lnet/minecraft/class_5425;Lnet/minecraft/class_3341;)V
 		ARG 1 world
 		ARG 2 box

mappings/net/minecraft/structure/WoodlandMansionGenerator.mapping

@@ -1,38 +1,27 @@
 CLASS net/minecraft/class_3471 net/minecraft/structure/WoodlandMansionGenerator
-	METHOD method_15029 addPieces (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Ljava/util/List;Ljava/util/Random;)V
+	METHOD method_15029 addPieces (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Ljava/util/List;Lnet/minecraft/class_5819;)V
 		ARG 0 manager
 		ARG 1 pos
 		ARG 2 rotation
 		ARG 3 pieces
-		ARG 4 random
 	CLASS class_3472 FirstFloorRoomPool
 	CLASS class_3473 RoomPool
-		METHOD method_15031 getMediumGenericRoom (Ljava/util/Random;Z)Ljava/lang/String;
+		METHOD method_15031 getMediumGenericRoom (Lnet/minecraft/class_5819;Z)Ljava/lang/String;
-			ARG 1 random
 			ARG 2 staircase
-		METHOD method_15032 getSmallSecretRoom (Ljava/util/Random;)Ljava/lang/String;
+		METHOD method_15032 getSmallSecretRoom (Lnet/minecraft/class_5819;)Ljava/lang/String;
-			ARG 1 random
+		METHOD method_15033 getMediumFunctionalRoom (Lnet/minecraft/class_5819;Z)Ljava/lang/String;
-		METHOD method_15033 getMediumFunctionalRoom (Ljava/util/Random;Z)Ljava/lang/String;
-			ARG 1 random
 			ARG 2 staircase
-		METHOD method_15034 getBigRoom (Ljava/util/Random;)Ljava/lang/String;
+		METHOD method_15034 getBigRoom (Lnet/minecraft/class_5819;)Ljava/lang/String;
-			ARG 1 random
+		METHOD method_15035 getMediumSecretRoom (Lnet/minecraft/class_5819;)Ljava/lang/String;
-		METHOD method_15035 getMediumSecretRoom (Ljava/util/Random;)Ljava/lang/String;
+		METHOD method_15036 getBigSecretRoom (Lnet/minecraft/class_5819;)Ljava/lang/String;
-			ARG 1 random
+		METHOD method_15037 getSmallRoom (Lnet/minecraft/class_5819;)Ljava/lang/String;
-		METHOD method_15036 getBigSecretRoom (Ljava/util/Random;)Ljava/lang/String;
-			ARG 1 random
-		METHOD method_15037 getSmallRoom (Ljava/util/Random;)Ljava/lang/String;
-			ARG 1 random
 	CLASS class_3474 MansionParameters
-		FIELD field_15438 random Ljava/util/Random;
+		FIELD field_15438 random Lnet/minecraft/class_5819;
-		METHOD <init> (Ljava/util/Random;)V
-			ARG 1 random
 	CLASS class_3475 LayoutGenerator
 		FIELD field_15444 manager Lnet/minecraft/class_3485;
-		FIELD field_15447 random Ljava/util/Random;
+		FIELD field_15447 random Lnet/minecraft/class_5819;
-		METHOD <init> (Lnet/minecraft/class_3485;Ljava/util/Random;)V
+		METHOD <init> (Lnet/minecraft/class_3485;Lnet/minecraft/class_5819;)V
 			ARG 1 manager
-			ARG 2 random
 		METHOD method_15050 generate (Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Ljava/util/List;Lnet/minecraft/class_3471$class_3474;)V
 			ARG 1 pos
 			ARG 2 rotation

mappings/net/minecraft/structure/pool/StructurePool.mapping

@@ -17,11 +17,9 @@ CLASS net/minecraft/class_3785 net/minecraft/structure/pool/StructurePool
 		ARG 3 elementCounts
 		ARG 4 projection
 	METHOD method_16629 getId ()Lnet/minecraft/class_2960;
-	METHOD method_16631 getRandomElement (Ljava/util/Random;)Lnet/minecraft/class_3784;
+	METHOD method_16631 getRandomElement (Lnet/minecraft/class_5819;)Lnet/minecraft/class_3784;
-		ARG 1 random
 	METHOD method_16632 getElementCount ()I
-	METHOD method_16633 getElementIndicesInRandomOrder (Ljava/util/Random;)Ljava/util/List;
+	METHOD method_16633 getElementIndicesInRandomOrder (Lnet/minecraft/class_5819;)Ljava/util/List;
-		ARG 1 random
 	METHOD method_16634 getTerminatorsId ()Lnet/minecraft/class_2960;
 	METHOD method_19309 getHighestY (Lnet/minecraft/class_3485;)I
 		ARG 1 structureManager

mappings/net/minecraft/structure/pool/StructurePoolBasedGenerator.mapping

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGenerator
 	FIELD field_16665 LOGGER Lorg/slf4j/Logger;
-	METHOD method_27230 generate (Lnet/minecraft/class_5455;Lnet/minecraft/class_3790;ILnet/minecraft/class_3778$class_3779;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Ljava/util/List;Ljava/util/Random;Lnet/minecraft/class_5539;Lnet/minecraft/class_7138;)V
+	METHOD method_27230 generate (Lnet/minecraft/class_5455;Lnet/minecraft/class_3790;ILnet/minecraft/class_3778$class_3779;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Ljava/util/List;Lnet/minecraft/class_5819;Lnet/minecraft/class_5539;Lnet/minecraft/class_7138;)V
 		ARG 0 registryManager
 		ARG 1 piece
 		ARG 2 maxDepth
@@ -8,7 +8,6 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGe
 		ARG 4 chunkGenerator
 		ARG 5 structureManager
 		ARG 6 results
-		ARG 7 random
 		ARG 8 world
 	METHOD method_30419 generate (Lnet/minecraft/class_3195$class_7149;Lnet/minecraft/class_6880;ILnet/minecraft/class_3778$class_3779;Lnet/minecraft/class_2338;ZLjava/util/Optional;I)Ljava/util/Optional;
 	CLASS class_3779 PieceFactory
@@ -33,17 +32,16 @@ CLASS net/minecraft/class_3778 net/minecraft/structure/pool/StructurePoolBasedGe
 		FIELD field_18702 chunkGenerator Lnet/minecraft/class_2794;
 		FIELD field_18703 structureManager Lnet/minecraft/class_3485;
 		FIELD field_18704 children Ljava/util/List;
-		FIELD field_18705 random Ljava/util/Random;
+		FIELD field_18705 random Lnet/minecraft/class_5819;
 		FIELD field_18706 structurePieces Ljava/util/Deque;
 		FIELD field_25852 registry Lnet/minecraft/class_2378;
-		METHOD <init> (Lnet/minecraft/class_2378;ILnet/minecraft/class_3778$class_3779;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Ljava/util/List;Ljava/util/Random;)V
+		METHOD <init> (Lnet/minecraft/class_2378;ILnet/minecraft/class_3778$class_3779;Lnet/minecraft/class_2794;Lnet/minecraft/class_3485;Ljava/util/List;Lnet/minecraft/class_5819;)V
 			ARG 1 registry
 			ARG 2 maxSize
 			ARG 3 pieceFactory
 			ARG 4 chunkGenerator
 			ARG 5 structureManager
 			ARG 6 children
-			ARG 7 random
 		METHOD method_19306 generatePiece (Lnet/minecraft/class_3790;Lorg/apache/commons/lang3/mutable/MutableObject;IZLnet/minecraft/class_5539;Lnet/minecraft/class_7138;)V
 			ARG 1 piece
 			ARG 2 pieceShape

mappings/net/minecraft/structure/pool/StructurePoolElement.mapping

@@ -9,7 +9,7 @@ CLASS net/minecraft/class_3784 net/minecraft/structure/pool/StructurePoolElement
 	METHOD method_16622 setProjection (Lnet/minecraft/class_3785$class_3786;)Lnet/minecraft/class_3784;
 		ARG 1 projection
 	METHOD method_16624 getProjection ()Lnet/minecraft/class_3785$class_3786;
-	METHOD method_16626 generate (Lnet/minecraft/class_3485;Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3341;Ljava/util/Random;Z)Z
+	METHOD method_16626 generate (Lnet/minecraft/class_3485;Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_3341;Lnet/minecraft/class_5819;Z)Z
 		ARG 1 structureManager
 		ARG 2 world
 		ARG 3 structureAccessor
@@ -17,23 +17,20 @@ CLASS net/minecraft/class_3784 net/minecraft/structure/pool/StructurePoolElement
 		ARG 5 pos
 		ARG 7 rotation
 		ARG 8 box
-		ARG 9 random
 		ARG 10 keepJigsaws
-	METHOD method_16627 getStructureBlockInfos (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Ljava/util/Random;)Ljava/util/List;
+	METHOD method_16627 getStructureBlockInfos (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_5819;)Ljava/util/List;
 		ARG 1 structureManager
 		ARG 2 pos
 		ARG 3 rotation
-		ARG 4 random
 	METHOD method_16628 getBoundingBox (Lnet/minecraft/class_3485;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;)Lnet/minecraft/class_3341;
 		ARG 1 structureManager
 		ARG 2 pos
 		ARG 3 rotation
-	METHOD method_16756 (Lnet/minecraft/class_1936;Lnet/minecraft/class_3499$class_3501;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Ljava/util/Random;Lnet/minecraft/class_3341;)V
+	METHOD method_16756 (Lnet/minecraft/class_1936;Lnet/minecraft/class_3499$class_3501;Lnet/minecraft/class_2338;Lnet/minecraft/class_2470;Lnet/minecraft/class_5819;Lnet/minecraft/class_3341;)V
 		ARG 1 world
 		ARG 2 structureBlockInfo
 		ARG 3 pos
 		ARG 4 rotation
-		ARG 5 random
 		ARG 6 box
 	METHOD method_16757 getType ()Lnet/minecraft/class_3816;
 	METHOD method_19308 getGroundLevelDelta ()I

mappings/net/minecraft/structure/processor/BlockAgeStructureProcessor.mapping

@@ -4,24 +4,16 @@ CLASS net/minecraft/class_5193 net/minecraft/structure/processor/BlockAgeStructu
 	FIELD field_27338 AGEABLE_SLABS [Lnet/minecraft/class_2680;
 	METHOD <init> (F)V
 		ARG 1 mossiness
-	METHOD method_27256 processBlocks (Ljava/util/Random;)Lnet/minecraft/class_2680;
+	METHOD method_27256 processBlocks (Lnet/minecraft/class_5819;)Lnet/minecraft/class_2680;
-		ARG 1 random
+	METHOD method_27257 randomStairProperties (Lnet/minecraft/class_5819;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2680;
-	METHOD method_27257 randomStairProperties (Ljava/util/Random;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2680;
-		ARG 0 random
 		ARG 1 stairs
-	METHOD method_27258 processStairs (Ljava/util/Random;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680;
+	METHOD method_27258 processStairs (Lnet/minecraft/class_5819;Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680;
-		ARG 1 random
 		ARG 2 state
-	METHOD method_27259 randomState (Ljava/util/Random;[Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680;
+	METHOD method_27259 randomState (Lnet/minecraft/class_5819;[Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680;
-		ARG 0 random
 		ARG 1 states
-	METHOD method_27260 process (Ljava/util/Random;[Lnet/minecraft/class_2680;[Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680;
+	METHOD method_27260 process (Lnet/minecraft/class_5819;[Lnet/minecraft/class_2680;[Lnet/minecraft/class_2680;)Lnet/minecraft/class_2680;
-		ARG 1 random
 		ARG 2 regularStates
 		ARG 3 mossyStates
-	METHOD method_27261 processSlabs (Ljava/util/Random;)Lnet/minecraft/class_2680;
+	METHOD method_27261 processSlabs (Lnet/minecraft/class_5819;)Lnet/minecraft/class_2680;
-		ARG 1 random
+	METHOD method_27262 processWalls (Lnet/minecraft/class_5819;)Lnet/minecraft/class_2680;
-	METHOD method_27262 processWalls (Ljava/util/Random;)Lnet/minecraft/class_2680;
+	METHOD method_27263 processObsidian (Lnet/minecraft/class_5819;)Lnet/minecraft/class_2680;
-		ARG 1 random
-	METHOD method_27263 processObsidian (Ljava/util/Random;)Lnet/minecraft/class_2680;
-		ARG 1 random

mappings/net/minecraft/structure/processor/StructureProcessorRule.mapping

@@ -21,11 +21,10 @@ CLASS net/minecraft/class_3821 net/minecraft/structure/processor/StructureProces
 		ARG 4 outputState
 		ARG 5 nbt
 	METHOD method_16760 getOutputNbt ()Lnet/minecraft/class_2487;
-	METHOD method_16762 test (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_16762 test (Lnet/minecraft/class_2680;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 1 input
 		ARG 2 location
 		ARG 5 pivot
-		ARG 6 random
 	METHOD method_16763 getOutputState ()Lnet/minecraft/class_2680;
 	METHOD method_28984 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance

mappings/net/minecraft/structure/rule/PosRuleTest.mapping

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_4995 net/minecraft/structure/rule/PosRuleTest
 	METHOD method_26404 getType ()Lnet/minecraft/class_4996;
-	METHOD method_26406 test (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_26406 test (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 3 pivot
-		ARG 4 random

mappings/net/minecraft/structure/rule/RuleTest.mapping

@@ -2,6 +2,5 @@ CLASS net/minecraft/class_3825 net/minecraft/structure/rule/RuleTest
 	COMMENT Rule tests are used in structure generation to check if a block state matches some condition.
 	FIELD field_25012 TYPE_CODEC Lcom/mojang/serialization/Codec;
 	METHOD method_16766 getType ()Lnet/minecraft/class_3827;
-	METHOD method_16768 test (Lnet/minecraft/class_2680;Ljava/util/Random;)Z
+	METHOD method_16768 test (Lnet/minecraft/class_2680;Lnet/minecraft/class_5819;)Z
 		ARG 1 state
-		ARG 2 random

mappings/net/minecraft/unused/packageinfo/PackageInfo7374.mapping

@@ -0,0 +1 @@
+CLASS net/minecraft/class_7374 net/minecraft/unused/packageinfo/PackageInfo7374

mappings/net/minecraft/util/BlockRotation.mapping

@@ -9,8 +9,6 @@ CLASS net/minecraft/class_2470 net/minecraft/util/BlockRotation
 		ARG 2 fullTurn
 	METHOD method_10503 rotate (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2350;
 		ARG 1 direction
-	METHOD method_16547 randomRotationOrder (Ljava/util/Random;)Ljava/util/List;
+	METHOD method_16547 randomRotationOrder (Lnet/minecraft/class_5819;)Ljava/util/List;
-		ARG 0 random
+	METHOD method_16548 random (Lnet/minecraft/class_5819;)Lnet/minecraft/class_2470;
-	METHOD method_16548 random (Ljava/util/Random;)Lnet/minecraft/class_2470;
-		ARG 0 random
 	METHOD method_26383 getDirectionTransformation ()Lnet/minecraft/class_4990;

mappings/net/minecraft/util/ItemScatterer.mapping

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_1264 net/minecraft/util/ItemScatterer
-	FIELD field_5797 RANDOM Ljava/util/Random;
 	METHOD method_17348 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V
 		ARG 2 stack
 	METHOD method_17349 spawn (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2371;)V

mappings/net/minecraft/util/LargeEntitySpawnHelper.mapping

@@ -1,3 +1,3 @@
 CLASS net/minecraft/class_7244 net/minecraft/util/LargeEntitySpawnHelper
 	METHOD method_42121 findSpawnPos (Lnet/minecraft/class_3218;ILnet/minecraft/class_2338$class_2339;)Z
-	METHOD method_42122 trySpawnAt (Lnet/minecraft/class_1299;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;III)Ljava/util/Optional;
+	METHOD method_42122 trySpawnAt (Lnet/minecraft/class_1299;Lnet/minecraft/class_3730;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;III)Ljava/util/Optional;

mappings/net/minecraft/util/Util.mapping

@@ -38,12 +38,10 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util
 		ARG 0 t
 	METHOD method_24155 throwUnchecked (Ljava/lang/Throwable;)V
 		ARG 0 t
-	METHOD method_27172 getRandom ([ILjava/util/Random;)I
+	METHOD method_27172 getRandom ([ILnet/minecraft/class_5819;)I
 		ARG 0 array
-		ARG 1 random
+	METHOD method_27173 getRandom ([Ljava/lang/Object;Lnet/minecraft/class_5819;)Ljava/lang/Object;
-	METHOD method_27173 getRandom ([Ljava/lang/Object;Ljava/util/Random;)Ljava/lang/Object;
 		ARG 0 array
-		ARG 1 random
 	METHOD method_27760 backupAndReplace (Ljava/io/File;Ljava/io/File;Ljava/io/File;)V
 		ARG 0 current
 		ARG 1 newFile
@@ -111,9 +109,8 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util
 		ARG 0 path
 	METHOD method_30629 existenceCheckTask (Ljava/nio/file/Path;)Ljava/util/function/BooleanSupplier;
 		ARG 0 path
-	METHOD method_32309 getRandom (Ljava/util/List;Ljava/util/Random;)Ljava/lang/Object;
+	METHOD method_32309 getRandom (Ljava/util/List;Lnet/minecraft/class_5819;)Ljava/lang/Object;
 		ARG 0 list
-		ARG 1 random
 	METHOD method_33141 toArray (Ljava/util/List;I)Lcom/mojang/serialization/DataResult;
 		ARG 0 list
 		ARG 1 length
@@ -154,9 +151,8 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util
 		ARG 1 throwable
 	METHOD method_40082 (Ljava/util/List;Ljava/lang/Void;)Ljava/util/List;
 		ARG 1 void_
-	METHOD method_40083 getRandomOrEmpty (Ljava/util/List;Ljava/util/Random;)Ljava/util/Optional;
+	METHOD method_40083 getRandomOrEmpty (Ljava/util/List;Lnet/minecraft/class_5819;)Ljava/util/Optional;
 		ARG 0 list
-		ARG 1 random
 	METHOD method_41203 backupAndReplace (Ljava/io/File;Ljava/io/File;Ljava/io/File;Z)V
 		ARG 0 current
 		ARG 1 newPath

mappings/net/minecraft/util/collection/DataPool.mapping

@@ -2,8 +2,7 @@ CLASS net/minecraft/class_6005 net/minecraft/util/collection/DataPool
 	METHOD method_34971 builder ()Lnet/minecraft/class_6005$class_6006;
 	METHOD method_34972 createCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
 		ARG 0 dataCodec
-	METHOD method_34973 getDataOrEmpty (Ljava/util/Random;)Ljava/util/Optional;
+	METHOD method_34973 getDataOrEmpty (Lnet/minecraft/class_5819;)Ljava/util/Optional;
-		ARG 1 random
 	METHOD method_38061 of (Ljava/lang/Object;)Lnet/minecraft/class_6005;
 		ARG 0 object
 	METHOD method_38062 empty ()Lnet/minecraft/class_6005;

mappings/net/minecraft/util/collection/Pool.mapping

@@ -10,7 +10,6 @@ CLASS net/minecraft/class_6012 net/minecraft/util/collection/Pool
 	METHOD method_34990 empty ()Lnet/minecraft/class_6012;
 	METHOD method_34991 createCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
 		ARG 0 entryCodec
-	METHOD method_34992 getOrEmpty (Ljava/util/Random;)Ljava/util/Optional;
+	METHOD method_34992 getOrEmpty (Lnet/minecraft/class_5819;)Ljava/util/Optional;
-		ARG 1 random
 	METHOD method_34993 isEmpty ()Z
 	METHOD method_34994 getEntries ()Ljava/util/List;

mappings/net/minecraft/util/collection/WeightedList.mapping

@@ -1,6 +1,6 @@
 CLASS net/minecraft/class_6032 net/minecraft/util/collection/WeightedList
 	FIELD field_30169 entries Ljava/util/List;
-	FIELD field_30170 random Ljava/util/Random;
+	FIELD field_30170 random Lnet/minecraft/class_5819;
 	METHOD <init> (Ljava/util/List;)V
 		ARG 1 list
 	METHOD method_35088 shuffle ()Lnet/minecraft/class_6032;

mappings/net/minecraft/util/collection/Weighting.mapping

@@ -4,10 +4,8 @@ CLASS net/minecraft/class_6011 net/minecraft/util/collection/Weighting
 	METHOD method_34985 getAt (Ljava/util/List;I)Ljava/util/Optional;
 		ARG 0 pool
 		ARG 1 totalWeight
-	METHOD method_34986 getRandom (Ljava/util/Random;Ljava/util/List;)Ljava/util/Optional;
+	METHOD method_34986 getRandom (Lnet/minecraft/class_5819;Ljava/util/List;)Ljava/util/Optional;
-		ARG 0 random
 		ARG 1 pool
-	METHOD method_34987 getRandom (Ljava/util/Random;Ljava/util/List;I)Ljava/util/Optional;
+	METHOD method_34987 getRandom (Lnet/minecraft/class_5819;Ljava/util/List;I)Ljava/util/Optional;
-		ARG 0 random
 		ARG 1 pool
 		ARG 2 totalWeight

mappings/net/minecraft/util/dynamic/EntryLoader.mapping

@@ -11,23 +11,22 @@ CLASS net/minecraft/class_5506 net/minecraft/util/dynamic/EntryLoader
 		FIELD field_36186 JSON Ljava/lang/String;
 		METHOD method_31158 (Lnet/minecraft/class_2960;)Z
 			ARG 0 id
-		METHOD method_39745 (Ljava/lang/String;Lnet/minecraft/class_5321;Ljava/util/Map;Lnet/minecraft/class_2960;Lnet/minecraft/class_7086;)V
+		METHOD method_39745 (Ljava/lang/String;Lnet/minecraft/class_5321;Ljava/util/Map;Lnet/minecraft/class_2960;Lnet/minecraft/class_3298;)V
 			ARG 4 id
 			ARG 5 resourceRef
 		METHOD method_39746 createId (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2960;
 			ARG 0 rootKey
 		METHOD method_39747 getPath (Lnet/minecraft/class_2960;)Ljava/lang/String;
 			ARG 0 id
-		METHOD method_42084 (Lnet/minecraft/class_3300;Lnet/minecraft/class_2960;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;)Lcom/mojang/serialization/DataResult;
+		METHOD method_42084 (Lnet/minecraft/class_3298;Lnet/minecraft/class_2960;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;)Lcom/mojang/serialization/DataResult;
 			ARG 3 jsonOps
 			ARG 4 decoder
-		METHOD method_42085 (Lnet/minecraft/class_7086;Lnet/minecraft/class_2960;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;)Lcom/mojang/serialization/DataResult;
+		METHOD method_42085 (Lnet/minecraft/class_3298;Lnet/minecraft/class_2960;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;)Lcom/mojang/serialization/DataResult;
 			ARG 3 jsonOps
 			ARG 4 decoder
-		METHOD method_42086 parse (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;Lnet/minecraft/class_3298;)Lcom/mojang/serialization/DataResult;
+		METHOD method_42086 parse (Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Decoder;Ljava/io/Reader;)Lcom/mojang/serialization/DataResult;
 			ARG 1 jsonOps
 			ARG 2 decoder
-			ARG 3 resource
 	CLASS class_5507 Impl
 		FIELD field_26741 values Ljava/util/Map;
 		FIELD field_36187 LOGGER Lorg/slf4j/Logger;

mappings/net/minecraft/util/math/BlockPos.mapping

@@ -128,13 +128,11 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos
 		ARG 1 maxX
 		ARG 2 maxY
 		ARG 3 maxZ
-	METHOD method_27156 iterateRandomly (Ljava/util/Random;IIIIIII)Ljava/lang/Iterable;
+	METHOD method_27156 iterateRandomly (Lnet/minecraft/class_5819;IIIIIII)Ljava/lang/Iterable;
 		COMMENT Iterates through {@code count} random block positions in the given area.
 		COMMENT
 		COMMENT <p>The iterator yields positions in no specific order. The same position
 		COMMENT may be returned multiple times by the iterator.
-		ARG 0 random
-			COMMENT the {@link Random} object used to compute new positions
 		ARG 1 count
 			COMMENT the number of positions to iterate
 		ARG 2 minX
@@ -177,13 +175,11 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos
 			COMMENT the direction the iterator moves after the first
 	METHOD method_33096 withY (I)Lnet/minecraft/class_2338;
 		ARG 1 y
-	METHOD method_34848 iterateRandomly (Ljava/util/Random;ILnet/minecraft/class_2338;I)Ljava/lang/Iterable;
+	METHOD method_34848 iterateRandomly (Lnet/minecraft/class_5819;ILnet/minecraft/class_2338;I)Ljava/lang/Iterable;
 		COMMENT Iterates through {@code count} random block positions in a given range around the given position.
 		COMMENT
 		COMMENT <p>The iterator yields positions in no specific order. The same position
 		COMMENT may be returned multiple times by the iterator.
-		ARG 0 random
-			COMMENT the {@link Random} object used to compute new positions
 		ARG 1 count
 			COMMENT the number of positions to iterate
 		ARG 2 around

mappings/net/minecraft/util/math/Direction.mapping

@@ -57,8 +57,7 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction
 		ARG 0 entity
 	METHOD method_10160 rotateYCounterclockwise ()Lnet/minecraft/class_2350;
 	METHOD method_10161 getHorizontal ()I
-	METHOD method_10162 random (Ljava/util/Random;)Lnet/minecraft/class_2350;
+	METHOD method_10162 random (Lnet/minecraft/class_5819;)Lnet/minecraft/class_2350;
-		ARG 0 random
 	METHOD method_10163 getVector ()Lnet/minecraft/class_2382;
 	METHOD method_10164 getOffsetY ()I
 	METHOD method_10165 getOffsetZ ()I
@@ -107,8 +106,7 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction
 	METHOD method_38940 validateVertical (Lnet/minecraft/class_2350;)Lcom/mojang/serialization/DataResult;
 		ARG 0 direction
 	METHOD method_42013 stream ()Ljava/util/stream/Stream;
-	METHOD method_42014 shuffle (Ljava/util/Random;)Ljava/util/Collection;
+	METHOD method_42014 shuffle (Lnet/minecraft/class_5819;)Ljava/util/Collection;
-		ARG 0 random
 	CLASS class_2351 Axis
 		FIELD field_11053 name Ljava/lang/String;
 		FIELD field_23780 VALUES [Lnet/minecraft/class_2350$class_2351;
@@ -129,8 +127,7 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction
 		METHOD method_10178 isVertical ()Z
 		METHOD method_10179 isHorizontal ()Z
 		METHOD method_10180 getType ()Lnet/minecraft/class_2350$class_2353;
-		METHOD method_16699 pickRandomAxis (Ljava/util/Random;)Lnet/minecraft/class_2350$class_2351;
+		METHOD method_16699 pickRandomAxis (Lnet/minecraft/class_5819;)Lnet/minecraft/class_2350$class_2351;
-			ARG 0 random
 	CLASS class_2352 AxisDirection
 		FIELD field_11057 description Ljava/lang/String;
 		FIELD field_11059 offset I
@@ -146,10 +143,8 @@ CLASS net/minecraft/class_2350 net/minecraft/util/math/Direction
 		METHOD <init> (Ljava/lang/String;I[Lnet/minecraft/class_2350;[Lnet/minecraft/class_2350$class_2351;)V
 			ARG 3 facingArray
 			ARG 4 axisArray
-		METHOD method_10183 random (Ljava/util/Random;)Lnet/minecraft/class_2350;
+		METHOD method_10183 random (Lnet/minecraft/class_5819;)Lnet/minecraft/class_2350;
-			ARG 1 random
 		METHOD method_29716 stream ()Ljava/util/stream/Stream;
-		METHOD method_33465 randomAxis (Ljava/util/Random;)Lnet/minecraft/class_2350$class_2351;
+		METHOD method_33465 randomAxis (Lnet/minecraft/class_5819;)Lnet/minecraft/class_2350$class_2351;
-			ARG 1 random
 		METHOD test (Ljava/lang/Object;)Z
 			ARG 1 direction

mappings/net/minecraft/util/math/MathHelper.mapping

@@ -3,7 +3,7 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper
 	FIELD field_15723 MULTIPLY_DE_BRUIJN_BIT_POSITION [I
 	FIELD field_15724 SQUARE_ROOT_OF_TWO F
 	FIELD field_15725 SINE_TABLE [F
-	FIELD field_15726 RANDOM Ljava/util/Random;
+	FIELD field_15726 RANDOM Lnet/minecraft/class_5819;
 	FIELD field_15727 ARCSINE_TABLE [D
 	FIELD field_15728 SMALLEST_FRACTION_FREE_DOUBLE D
 	FIELD field_29844 PI F
@@ -38,8 +38,7 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper
 	METHOD method_15343 parseInt (Ljava/lang/String;I)I
 		ARG 0 string
 		ARG 1 fallback
-	METHOD method_15344 nextFloat (Ljava/util/Random;FF)F
+	METHOD method_15344 nextFloat (Lnet/minecraft/class_5819;FF)F
-		ARG 0 random
 		ARG 1 min
 		ARG 2 max
 	METHOD method_15345 fastInverseSqrt (D)D
@@ -116,8 +115,7 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper
 		ARG 2 max
 	METHOD method_15365 fastFloor (D)I
 		ARG 0 value
-	METHOD method_15366 nextDouble (Ljava/util/Random;DD)D
+	METHOD method_15366 nextDouble (Lnet/minecraft/class_5819;DD)D
-		ARG 0 random
 		ARG 1 min
 		ARG 3 max
 	METHOD method_15367 floorMod (DD)D
@@ -151,8 +149,7 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper
 		ARG 0 value
 	METHOD method_15376 ([F)V
 		ARG 0 sineTable
-	METHOD method_15378 randomUuid (Ljava/util/Random;)Ljava/util/UUID;
+	METHOD method_15378 randomUuid (Lnet/minecraft/class_5819;)Ljava/util/UUID;
-		ARG 0 random
 	METHOD method_15379 abs (F)F
 		ARG 0 value
 	METHOD method_15381 subtractAngles (FF)F
@@ -194,11 +191,10 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper
 		COMMENT Wraps an angle in degrees to the interval {@code [-180, 180)}.
 		ARG 0 degrees
 	METHOD method_15394 randomUuid ()Ljava/util/UUID;
-	METHOD method_15395 nextInt (Ljava/util/Random;II)I
+	METHOD method_15395 nextInt (Lnet/minecraft/class_5819;II)I
 		COMMENT {@return a random, uniformly distributed integer value in {@code
 		COMMENT [min, max]}} If the range is empty (i.e. {@code max < min}), it
 		COMMENT returns {@code min}.
-		ARG 0 random
 		ARG 1 min
 			COMMENT the minimum value, inclusive
 		ARG 2 max
@@ -297,17 +293,15 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper
 		COMMENT is a multiple of {@code divisor}.
 		ARG 0 value
 		ARG 1 divisor
-	METHOD method_32750 nextBetween (Ljava/util/Random;FF)F
+	METHOD method_32750 nextBetween (Lnet/minecraft/class_5819;FF)F
-		ARG 0 random
 		ARG 1 min
 		ARG 2 max
-	METHOD method_32751 nextBetween (Ljava/util/Random;II)I
+	METHOD method_32751 nextBetween (Lnet/minecraft/class_5819;II)I
 		COMMENT {@return a random, uniformly distributed integer value in {@code
 		COMMENT [min, max]}}
 		COMMENT
 		COMMENT @throws IllegalArgumentException if the range is empty (i.e. {@code
 		COMMENT max < min})
-		ARG 0 random
 		ARG 1 min
 			COMMENT the minimum value, inclusive
 		ARG 2 max
@@ -318,8 +312,7 @@ CLASS net/minecraft/class_3532 net/minecraft/util/math/MathHelper
 		ARG 4 lerpEnd
 		ARG 6 start
 		ARG 8 end
-	METHOD method_32855 nextGaussian (Ljava/util/Random;FF)F
+	METHOD method_32855 nextGaussian (Lnet/minecraft/class_5819;FF)F
-		ARG 0 random
 		ARG 1 mean
 		ARG 2 deviation
 	METHOD method_33722 lerpFromProgress (DDDDD)D

mappings/net/minecraft/util/math/floatprovider/ClampedNormalFloatProvider.mapping

@@ -18,8 +18,7 @@ CLASS net/minecraft/class_5861 net/minecraft/util/math/floatprovider/ClampedNorm
 		ARG 0 provider
 	METHOD method_33902 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
-	METHOD method_33903 get (Ljava/util/Random;FFFF)F
+	METHOD method_33903 get (Lnet/minecraft/class_5819;FFFF)F
-		ARG 0 random
 		ARG 1 mean
 		ARG 2 deviation
 		ARG 3 min

mappings/net/minecraft/util/math/floatprovider/FloatProvider.mapping

@@ -11,8 +11,6 @@ CLASS net/minecraft/class_5863 net/minecraft/util/math/floatprovider/FloatProvid
 		ARG 0 provider
 	METHOD method_33919 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_5863;
 		ARG 0 either
-	METHOD method_33920 get (Ljava/util/Random;)F
-		ARG 1 random
 	METHOD method_33921 getMax ()F
 	METHOD method_33922 (Lnet/minecraft/class_5863;)Lnet/minecraft/class_5863;
 		ARG 0 provider

mappings/net/minecraft/util/math/intprovider/ClampedNormalIntProvider.mapping

@@ -18,8 +18,7 @@ CLASS net/minecraft/class_6728 net/minecraft/util/math/intprovider/ClampedNormal
 		ARG 0 provider
 	METHOD method_39158 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
-	METHOD method_39159 next (Ljava/util/Random;FFFF)I
+	METHOD method_39159 next (Lnet/minecraft/class_5819;FFFF)I
-		ARG 0 random
 		ARG 1 mean
 		ARG 2 deviation
 		ARG 3 min

mappings/net/minecraft/util/math/intprovider/IntProvider.mapping

@@ -12,8 +12,7 @@ CLASS net/minecraft/class_6017 net/minecraft/util/math/intprovider/IntProvider
 		ARG 0 provider
 	METHOD method_35007 (Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_6017;
 		ARG 0 either
-	METHOD method_35008 get (Ljava/util/Random;)I
+	METHOD method_35008 get (Lnet/minecraft/class_5819;)I
-		ARG 1 random
 	METHOD method_35009 getMin ()I
 	METHOD method_35010 (Lnet/minecraft/class_6017;)Lnet/minecraft/class_6017;
 		ARG 0 provider

mappings/net/minecraft/util/registry/Registry.mapping

@@ -201,8 +201,7 @@ CLASS net/minecraft/class_2378 net/minecraft/util/registry/Registry
 		ARG 0 registry
 	METHOD method_10237 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2248;
 		ARG 0 registry
-	METHOD method_10240 getRandom (Ljava/util/Random;)Ljava/util/Optional;
+	METHOD method_10240 getRandom (Lnet/minecraft/class_5819;)Ljava/util/Optional;
-		ARG 1 random
 	METHOD method_10243 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1887;
 		ARG 0 registry
 	METHOD method_10245 (Lnet/minecraft/class_2378;)Lnet/minecraft/class_1842;

mappings/net/minecraft/util/registry/RegistryEntryList.mapping

@@ -6,8 +6,7 @@ CLASS net/minecraft/class_6885 net/minecraft/util/registry/RegistryEntryList
 		ARG 1 entry
 	METHOD method_40242 of (Ljava/util/List;)Lnet/minecraft/class_6885$class_6886;
 		ARG 0 entries
-	METHOD method_40243 getRandom (Ljava/util/Random;)Ljava/util/Optional;
+	METHOD method_40243 getRandom (Lnet/minecraft/class_5819;)Ljava/util/Optional;
-		ARG 1 random
 	METHOD method_40244 of (Ljava/util/function/Function;Ljava/util/List;)Lnet/minecraft/class_6885$class_6886;
 		ARG 0 mapper
 		ARG 1 values

mappings/net/minecraft/village/TradeOffers.mapping

@@ -25,12 +25,11 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers
 			ARG 1 experience
 	CLASS class_1652 Factory
 		COMMENT A factory to create trade offers.
-		METHOD method_7246 create (Lnet/minecraft/class_1297;Ljava/util/Random;)Lnet/minecraft/class_1914;
+		METHOD method_7246 create (Lnet/minecraft/class_1297;Lnet/minecraft/class_5819;)Lnet/minecraft/class_1914;
 			COMMENT Creates a trade offer.
 			COMMENT
 			COMMENT @return a new trade offer, or {@code null} if none should be created
 			ARG 1 entity
-			ARG 2 random
 	CLASS class_1654 SellMapFactory
 		FIELD field_18589 price I
 		FIELD field_18590 maxUses I
@@ -58,8 +57,7 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers
 			ARG 2 price
 			ARG 3 maxUses
 			ARG 4 experience
-		METHOD method_19200 getDye (Ljava/util/Random;)Lnet/minecraft/class_1769;
+		METHOD method_19200 getDye (Lnet/minecraft/class_5819;)Lnet/minecraft/class_1769;
-			ARG 0 random
 	CLASS class_4161 BuyForOneEmeraldFactory
 		FIELD field_18548 buy Lnet/minecraft/class_1792;
 		FIELD field_18549 price I

mappings/net/minecraft/village/VillagerGossips.mapping

@@ -3,9 +3,8 @@ CLASS net/minecraft/class_4136 net/minecraft/village/VillagerGossips
 	METHOD method_19059 max (II)I
 		ARG 0 left
 		ARG 1 right
-	METHOD method_19061 shareGossipFrom (Lnet/minecraft/class_4136;Ljava/util/Random;I)V
+	METHOD method_19061 shareGossipFrom (Lnet/minecraft/class_4136;Lnet/minecraft/class_5819;I)V
 		ARG 1 from
-		ARG 2 random
 		ARG 3 count
 	METHOD method_19063 mergeReputation (Lnet/minecraft/class_4139;II)I
 		ARG 1 type
@@ -16,8 +15,7 @@ CLASS net/minecraft/class_4136 net/minecraft/village/VillagerGossips
 		ARG 3 right
 	METHOD method_19066 deserialize (Lcom/mojang/serialization/Dynamic;)V
 	METHOD method_19067 serialize (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/Dynamic;
-	METHOD method_19070 pickGossips (Ljava/util/Random;I)Ljava/util/Collection;
+	METHOD method_19070 pickGossips (Lnet/minecraft/class_5819;I)Ljava/util/Collection;
-		ARG 1 random
 		ARG 2 count
 	METHOD method_19071 getReputationFor (Ljava/util/UUID;)Lnet/minecraft/class_4136$class_4137;
 		ARG 1 target

mappings/net/minecraft/village/raid/Raid.mapping

@@ -2,7 +2,7 @@ CLASS net/minecraft/class_3765 net/minecraft/village/raid/Raid
 	FIELD field_16605 ticksActive J
 	FIELD field_16606 active Z
 	FIELD field_16607 bar Lnet/minecraft/class_3213;
-	FIELD field_16608 random Ljava/util/Random;
+	FIELD field_16608 random Lnet/minecraft/class_5819;
 	FIELD field_16611 started Z
 	FIELD field_16613 center Lnet/minecraft/class_2338;
 	FIELD field_16614 preRaidTicks I
@@ -106,9 +106,8 @@ CLASS net/minecraft/class_3765 net/minecraft/village/raid/Raid
 		ARG 1 member
 		ARG 2 wave
 		ARG 3 extra
-	METHOD method_20019 getBonusCount (Lnet/minecraft/class_3765$class_3766;Ljava/util/Random;ILnet/minecraft/class_1266;Z)I
+	METHOD method_20019 getBonusCount (Lnet/minecraft/class_3765$class_3766;Lnet/minecraft/class_5819;ILnet/minecraft/class_1266;Z)I
 		ARG 1 member
-		ARG 2 random
 		ARG 3 wave
 		ARG 4 localDifficulty
 		ARG 5 extra

mappings/net/minecraft/world/ChunkRegion.mapping

@@ -1,7 +1,7 @@
 CLASS net/minecraft/class_3233 net/minecraft/world/ChunkRegion
 	FIELD field_14087 seed J
 	FIELD field_14088 width I
-	FIELD field_14091 random Ljava/util/Random;
+	FIELD field_14091 random Lnet/minecraft/class_5819;
 	FIELD field_14092 LOGGER Lorg/slf4j/Logger;
 	FIELD field_14093 world Lnet/minecraft/class_3218;
 	FIELD field_14094 fluidTickScheduler Lnet/minecraft/class_3235;

mappings/net/minecraft/world/MobSpawnerLogic.mapping

@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_1917 net/minecraft/world/MobSpawnerLogic
-	FIELD field_27080 random Ljava/util/Random;
+	FIELD field_27080 random Lnet/minecraft/class_5819;
 	FIELD field_9149 spawnCount I
 	FIELD field_9150 maxSpawnDelay I
 	FIELD field_9151 minSpawnDelay I

mappings/net/minecraft/world/SpawnHelper.mapping

@@ -89,10 +89,9 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper
 		ARG 1 world
 		ARG 2 pos
 		ARG 3 entityType
-	METHOD method_8661 populateEntities (Lnet/minecraft/class_5425;Lnet/minecraft/class_6880;Lnet/minecraft/class_1923;Ljava/util/Random;)V
+	METHOD method_8661 populateEntities (Lnet/minecraft/class_5425;Lnet/minecraft/class_6880;Lnet/minecraft/class_1923;Lnet/minecraft/class_5819;)V
 		ARG 0 world
 		ARG 2 chunkPos
-		ARG 3 random
 	METHOD method_8662 isClearForSpawn (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;Lnet/minecraft/class_1299;)Z
 		ARG 0 blockView
 		ARG 1 pos
@@ -105,12 +104,11 @@ CLASS net/minecraft/class_1948 net/minecraft/world/SpawnHelper
 		ARG 2 chunk
 		ARG 3 checker
 		ARG 4 runner
-	METHOD method_8664 pickRandomSpawnEntry (Lnet/minecraft/class_3218;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Ljava/util/Random;Lnet/minecraft/class_2338;)Ljava/util/Optional;
+	METHOD method_8664 pickRandomSpawnEntry (Lnet/minecraft/class_3218;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_1311;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Ljava/util/Optional;
 		ARG 0 world
 		ARG 1 structureAccessor
 		ARG 2 chunkGenerator
 		ARG 3 spawnGroup
-		ARG 4 random
 		ARG 5 pos
 	CLASS class_5259 Runner
 		METHOD run (Lnet/minecraft/class_1308;Lnet/minecraft/class_2791;)V

mappings/net/minecraft/world/WanderingTraderManager.mapping

@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_3990 net/minecraft/world/WanderingTraderManager
-	FIELD field_17726 random Ljava/util/Random;
+	FIELD field_17726 random Lnet/minecraft/class_5819;
 	FIELD field_17728 spawnTimer I
 	FIELD field_17729 spawnDelay I
 	FIELD field_17730 spawnChance I

mappings/net/minecraft/world/World.mapping

@@ -19,7 +19,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
 	FIELD field_38226 neighborUpdater Lnet/minecraft/class_7165;
 	FIELD field_9223 border Lnet/minecraft/class_2784;
 	FIELD field_9226 ambientDarkness I
-	FIELD field_9229 random Ljava/util/Random;
+	FIELD field_9229 random Lnet/minecraft/class_5819;
 	FIELD field_9232 properties Lnet/minecraft/class_5269;
 	FIELD field_9233 DIRECTIONS [Lnet/minecraft/class_2350;
 	FIELD field_9234 thunderGradient F
@@ -186,7 +186,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
 		ARG 1 blockEntity
 	METHOD method_8442 getSkyAngleRadians (F)F
 		ARG 1 tickDelta
-	METHOD method_8449 playSoundFromEntity (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FF)V
+	METHOD method_8449 playSoundFromEntity (Lnet/minecraft/class_1657;Lnet/minecraft/class_1297;Lnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFJ)V
 		ARG 1 except
 			COMMENT the player that should not receive the sound, or {@code null}
 		ARG 2 entity
@@ -225,7 +225,7 @@ CLASS net/minecraft/class_1937 net/minecraft/world/World
 	METHOD method_8459 isEmittingRedstonePower (Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z
 		ARG 1 pos
 		ARG 2 direction
-	METHOD method_8465 playSound (Lnet/minecraft/class_1657;DDDLnet/minecraft/class_3414;Lnet/minecraft/class_3419;FF)V
+	METHOD method_8465 playSound (Lnet/minecraft/class_1657;DDDLnet/minecraft/class_3414;Lnet/minecraft/class_3419;FFJ)V
 		ARG 1 except
 			COMMENT the player that should not receive the sound, or {@code null}
 		ARG 2 x

mappings/net/minecraft/world/WorldAccess.mapping

@@ -75,7 +75,7 @@ CLASS net/minecraft/class_1936 net/minecraft/world/WorldAccess
 	METHOD method_8408 updateNeighbors (Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V
 		ARG 1 pos
 		ARG 2 block
-	METHOD method_8409 getRandom ()Ljava/util/Random;
+	METHOD method_8409 getRandom ()Lnet/minecraft/class_5819;
 	METHOD method_8444 syncWorldEvent (Lnet/minecraft/class_1657;ILnet/minecraft/class_2338;I)V
 		ARG 1 player
 		ARG 2 eventId

mappings/net/minecraft/world/biome/BiomeParticleConfig.mapping

@@ -6,7 +6,6 @@ CLASS net/minecraft/class_4761 net/minecraft/world/biome/BiomeParticleConfig
 		ARG 1 particle
 		ARG 2 probability
 	METHOD method_24369 getParticle ()Lnet/minecraft/class_2394;
-	METHOD method_24370 shouldAddParticle (Ljava/util/Random;)Z
+	METHOD method_24370 shouldAddParticle (Lnet/minecraft/class_5819;)Z
-		ARG 1 random
 	METHOD method_28399 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance

mappings/net/minecraft/world/biome/source/BiomeSource.mapping

@@ -6,13 +6,12 @@ CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource
 		ARG 1 biomes
 	METHOD <init> (Ljava/util/stream/Stream;)V
 		ARG 1 biomeStream
-	METHOD method_24385 locateBiome (IIIIILjava/util/function/Predicate;Ljava/util/Random;ZLnet/minecraft/class_6544$class_6552;)Lcom/mojang/datafixers/util/Pair;
+	METHOD method_24385 locateBiome (IIIIILjava/util/function/Predicate;Lnet/minecraft/class_5819;ZLnet/minecraft/class_6544$class_6552;)Lcom/mojang/datafixers/util/Pair;
 		ARG 1 x
 		ARG 2 y
 		ARG 3 z
 		ARG 4 radius
 		ARG 5 blockCheckInterval
-		ARG 7 random
 		ARG 9 noiseSampler
 	METHOD method_28442 getCodec ()Lcom/mojang/serialization/Codec;
 	METHOD method_28443 getBiomes ()Ljava/util/Set;
@@ -23,13 +22,12 @@ CLASS net/minecraft/class_1966 net/minecraft/world/biome/source/BiomeSource
 	METHOD method_38115 getIndexedFeatures ()Ljava/util/List;
 	METHOD method_39525 (Ljava/util/List;Z)Ljava/util/List;
 		ARG 1 biomes
-	METHOD method_8762 locateBiome (IIIILjava/util/function/Predicate;Ljava/util/Random;Lnet/minecraft/class_6544$class_6552;)Lcom/mojang/datafixers/util/Pair;
+	METHOD method_8762 locateBiome (IIIILjava/util/function/Predicate;Lnet/minecraft/class_5819;Lnet/minecraft/class_6544$class_6552;)Lcom/mojang/datafixers/util/Pair;
 		ARG 1 x
 		ARG 2 y
 		ARG 3 z
 		ARG 4 radius
 		ARG 5 predicate
-		ARG 6 random
 		ARG 7 noiseSampler
 	METHOD method_8763 getBiomesInArea (IIIILnet/minecraft/class_6544$class_6552;)Ljava/util/Set;
 		ARG 1 x

mappings/net/minecraft/world/event/listener/SculkSensorListener.mapping

@@ -15,7 +15,6 @@ CLASS net/minecraft/class_5718 net/minecraft/world/event/listener/SculkSensorLis
 	METHOD method_32964 tick (Lnet/minecraft/class_1937;)V
 		ARG 1 world
 	METHOD method_32966 isOccluded (Lnet/minecraft/class_1937;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z
-		ARG 0 world
 		ARG 1 start
 		ARG 2 end
 	METHOD method_32967 (Lnet/minecraft/class_2680;)Z

mappings/net/minecraft/world/explosion/Explosion.mapping

@@ -8,7 +8,7 @@ CLASS net/minecraft/class_1927 net/minecraft/world/explosion/Explosion
 	FIELD field_9188 affectedBlocks Ljava/util/List;
 	FIELD field_9189 z D
 	FIELD field_9190 power F
-	FIELD field_9191 random Ljava/util/Random;
+	FIELD field_9191 random Lnet/minecraft/class_5819;
 	FIELD field_9192 y D
 	FIELD field_9193 damageSource Lnet/minecraft/class_1282;
 	FIELD field_9194 affectedPlayers Ljava/util/Map;

mappings/net/minecraft/world/gen/carver/Carver.mapping

@@ -9,21 +9,19 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver
 	FIELD field_24831 codec Lcom/mojang/serialization/Codec;
 	METHOD <init> (Lcom/mojang/serialization/Codec;)V
 		ARG 1 configCodec
-	METHOD method_12702 carve (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/Random;Lnet/minecraft/class_6350;Lnet/minecraft/class_1923;Lnet/minecraft/class_6643;)Z
+	METHOD method_12702 carve (Lnet/minecraft/class_5873;Lnet/minecraft/class_5871;Lnet/minecraft/class_2791;Ljava/util/function/Function;Lnet/minecraft/class_5819;Lnet/minecraft/class_6350;Lnet/minecraft/class_1923;Lnet/minecraft/class_6643;)Z
 		ARG 1 context
 		ARG 2 config
 		ARG 3 chunk
 		ARG 4 posToBiome
-		ARG 5 random
 		ARG 6 aquiferSampler
 		ARG 7 pos
 		ARG 8 mask
 	METHOD method_12704 register (Ljava/lang/String;Lnet/minecraft/class_2939;)Lnet/minecraft/class_2939;
 		ARG 0 name
 		ARG 1 carver
-	METHOD method_12705 shouldCarve (Lnet/minecraft/class_5871;Ljava/util/Random;)Z
+	METHOD method_12705 shouldCarve (Lnet/minecraft/class_5871;Lnet/minecraft/class_5819;)Z
 		ARG 1 config
-		ARG 2 random
 	METHOD method_12709 canAlwaysCarveBlock (Lnet/minecraft/class_2680;)Z
 		ARG 1 state
 	METHOD method_12710 getBranchFactor ()I

mappings/net/minecraft/world/gen/carver/CaveCarver.mapping

@@ -27,8 +27,7 @@ CLASS net/minecraft/class_2925 net/minecraft/world/gen/carver/CaveCarver
 		ARG 23 yawPitchRatio
 		ARG 25 mask
 		ARG 26 skipPredicate
-	METHOD method_16576 getTunnelSystemWidth (Ljava/util/Random;)F
+	METHOD method_16576 getTunnelSystemWidth (Lnet/minecraft/class_5819;)F
-		ARG 1 random
 	METHOD method_16577 getMaxCaveCount ()I
 	METHOD method_16578 getTunnelSystemHeightWidthRatio ()D
 	METHOD method_33974 isPositionExcluded (DDDD)Z

mappings/net/minecraft/world/gen/carver/ConfiguredCarver.mapping

@@ -9,15 +9,13 @@ CLASS net/minecraft/class_2922 net/minecraft/world/gen/carver/ConfiguredCarver
 		ARG 2 config
 	METHOD comp_330 carver ()Lnet/minecraft/class_2939;
 	METHOD comp_331 config ()Lnet/minecraft/class_5871;
-	METHOD method_12668 carve (Lnet/minecraft/class_5873;Lnet/minecraft/class_2791;Ljava/util/function/Function;Ljava/util/Random;Lnet/minecraft/class_6350;Lnet/minecraft/class_1923;Lnet/minecraft/class_6643;)Z
+	METHOD method_12668 carve (Lnet/minecraft/class_5873;Lnet/minecraft/class_2791;Ljava/util/function/Function;Lnet/minecraft/class_5819;Lnet/minecraft/class_6350;Lnet/minecraft/class_1923;Lnet/minecraft/class_6643;)Z
 		ARG 1 context
 		ARG 2 chunk
 		ARG 3 posToBiome
-		ARG 4 random
 		ARG 5 aquiferSampler
 		ARG 6 pos
 		ARG 7 mask
-	METHOD method_12669 shouldCarve (Ljava/util/Random;)Z
+	METHOD method_12669 shouldCarve (Lnet/minecraft/class_5819;)Z
-		ARG 1 random
 	METHOD method_28612 (Lnet/minecraft/class_2922;)Lnet/minecraft/class_2939;
 		ARG 0 configuredCarver

mappings/net/minecraft/world/gen/carver/RavineCarver.mapping

@@ -1,7 +1,6 @@
 CLASS net/minecraft/class_5870 net/minecraft/world/gen/carver/RavineCarver
-	METHOD method_33960 getVerticalScale (Lnet/minecraft/class_5869;Ljava/util/Random;DFF)D
+	METHOD method_33960 getVerticalScale (Lnet/minecraft/class_5869;Lnet/minecraft/class_5819;DFF)D
 		ARG 1 config
-		ARG 2 random
 		ARG 3 pitch
 		ARG 5 branchCount
 		ARG 6 branchIndex
@@ -35,7 +34,6 @@ CLASS net/minecraft/class_5870 net/minecraft/world/gen/carver/RavineCarver
 		ARG 5 scaledRelativeY
 		ARG 7 scaledRelativeZ
 		ARG 9 y
-	METHOD method_33966 createHorizontalStretchFactors (Lnet/minecraft/class_5873;Lnet/minecraft/class_5869;Ljava/util/Random;)[F
+	METHOD method_33966 createHorizontalStretchFactors (Lnet/minecraft/class_5873;Lnet/minecraft/class_5869;Lnet/minecraft/class_5819;)[F
 		ARG 1 context
 		ARG 2 config
-		ARG 3 random

mappings/net/minecraft/world/gen/feature/BasaltPillarFeature.mapping

@@ -1,9 +1,7 @@
 CLASS net/minecraft/class_4779 net/minecraft/world/gen/feature/BasaltPillarFeature
-	METHOD method_24434 tryPlaceBasalt (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;)V
+	METHOD method_24434 tryPlaceBasalt (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V
 		ARG 1 world
-		ARG 2 random
 		ARG 3 pos
-	METHOD method_24435 stopOrPlaceBasalt (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;)Z
+	METHOD method_24435 stopOrPlaceBasalt (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Z
 		ARG 1 world
-		ARG 2 random
 		ARG 3 pos

mappings/net/minecraft/world/gen/feature/BlockPileFeature.mapping

@@ -1,10 +1,8 @@
 CLASS net/minecraft/class_3805 net/minecraft/world/gen/feature/BlockPileFeature
-	METHOD method_16707 canPlace (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Ljava/util/Random;)Z
+	METHOD method_16707 canPlace (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z
 		ARG 1 world
 		ARG 2 pos
-		ARG 3 random
+	METHOD method_16708 addPileBlock (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;Lnet/minecraft/class_4634;)V
-	METHOD method_16708 addPileBlock (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Ljava/util/Random;Lnet/minecraft/class_4634;)V
 		ARG 1 world
 		ARG 2 pos
-		ARG 3 random
 		ARG 4 config

mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping

@@ -9,10 +9,9 @@ CLASS net/minecraft/class_2975 net/minecraft/world/gen/feature/ConfiguredFeature
 		ARG 2 config
 	METHOD comp_332 feature ()Lnet/minecraft/class_3031;
 	METHOD comp_333 config ()Lnet/minecraft/class_3037;
-	METHOD method_12862 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z
+	METHOD method_12862 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Z
 		ARG 1 world
 		ARG 2 chunkGenerator
-		ARG 3 random
 		ARG 4 origin
 	METHOD method_28621 (Lnet/minecraft/class_2975;)Lnet/minecraft/class_3031;
 		ARG 0 configuredFeature

mappings/net/minecraft/world/gen/feature/CoralFeature.mapping

@@ -1,21 +1,19 @@
 CLASS net/minecraft/class_2978 net/minecraft/world/gen/feature/CoralFeature
-	METHOD method_12863 generateCoral (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z
+	METHOD method_12863 generateCoral (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z
 		ARG 1 world
-		ARG 2 random
 		ARG 3 pos
 		ARG 4 state
-	METHOD method_12864 generateCoralPiece (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z
+	METHOD method_12864 generateCoralPiece (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z
 		ARG 1 world
-		ARG 2 random
 		ARG 3 pos
 		ARG 4 state
 	METHOD method_40029 (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V
 		ARG 2 block
 	METHOD method_40030 (Lnet/minecraft/class_2350;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2248;)V
 		ARG 3 block
-	METHOD method_40160 (Ljava/util/Random;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional;
+	METHOD method_40160 (Lnet/minecraft/class_5819;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional;
 		ARG 1 blocks
-	METHOD method_40161 (Ljava/util/Random;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional;
+	METHOD method_40161 (Lnet/minecraft/class_5819;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional;
 		ARG 1 blocks
-	METHOD method_40162 (Ljava/util/Random;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional;
+	METHOD method_40162 (Lnet/minecraft/class_5819;Lnet/minecraft/class_6885$class_6888;)Ljava/util/Optional;
 		ARG 1 blocks

mappings/net/minecraft/world/gen/feature/DripstoneClusterFeature.mapping

@@ -16,9 +16,8 @@ CLASS net/minecraft/class_5725 net/minecraft/world/gen/feature/DripstoneClusterF
 		ARG 2 pos
 		ARG 3 height
 		ARG 4 direction
-	METHOD method_33002 generate (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_2338;IIFDIFLnet/minecraft/class_5731;)V
+	METHOD method_33002 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;IIFDIFLnet/minecraft/class_5731;)V
 		ARG 1 world
-		ARG 2 random
 		ARG 3 pos
 		ARG 4 localX
 		ARG 5 localZ
@@ -27,14 +26,12 @@ CLASS net/minecraft/class_5725 net/minecraft/world/gen/feature/DripstoneClusterF
 		ARG 9 height
 		ARG 10 density
 		ARG 11 config
-	METHOD method_33003 clampedGaussian (Ljava/util/Random;FFFF)F
+	METHOD method_33003 clampedGaussian (Lnet/minecraft/class_5819;FFFF)F
-		ARG 0 random
 		ARG 1 min
 		ARG 2 max
 		ARG 3 mean
 		ARG 4 deviation
-	METHOD method_33004 getHeight (Ljava/util/Random;IIFILnet/minecraft/class_5731;)I
+	METHOD method_33004 getHeight (Lnet/minecraft/class_5819;IIFILnet/minecraft/class_5731;)I
-		ARG 1 random
 		ARG 2 localX
 		ARG 3 localZ
 		ARG 4 density

mappings/net/minecraft/world/gen/feature/DungeonFeature.mapping

@@ -2,5 +2,4 @@ CLASS net/minecraft/class_3103 net/minecraft/world/gen/feature/DungeonFeature
 	FIELD field_13698 AIR Lnet/minecraft/class_2680;
 	FIELD field_13699 MOB_SPAWNER_ENTITIES [Lnet/minecraft/class_1299;
 	FIELD field_13700 LOGGER Lorg/slf4j/Logger;
-	METHOD method_13547 getMobSpawnerEntity (Ljava/util/Random;)Lnet/minecraft/class_1299;
+	METHOD method_13547 getMobSpawnerEntity (Lnet/minecraft/class_5819;)Lnet/minecraft/class_1299;
-		ARG 1 random

mappings/net/minecraft/world/gen/feature/EndSpikeFeature.mapping

@@ -2,9 +2,8 @@ CLASS net/minecraft/class_3310 net/minecraft/world/gen/feature/EndSpikeFeature
 	FIELD field_14309 CACHE Lcom/google/common/cache/LoadingCache;
 	METHOD method_14506 getSpikes (Lnet/minecraft/class_5281;)Ljava/util/List;
 		ARG 0 world
-	METHOD method_15888 generateSpike (Lnet/minecraft/class_5425;Ljava/util/Random;Lnet/minecraft/class_3666;Lnet/minecraft/class_3310$class_3181;)V
+	METHOD method_15888 generateSpike (Lnet/minecraft/class_5425;Lnet/minecraft/class_5819;Lnet/minecraft/class_3666;Lnet/minecraft/class_3310$class_3181;)V
 		ARG 1 world
-		ARG 2 random
 		ARG 3 config
 		ARG 4 spike
 	CLASS class_3181 Spike

mappings/net/minecraft/world/gen/feature/Feature.mapping

@@ -47,9 +47,8 @@ CLASS net/minecraft/class_3031 net/minecraft/world/gen/feature/Feature
 	METHOD method_37256 markBlocksAboveForPostProcessing (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;)V
 		ARG 1 world
 		ARG 2 pos
-	METHOD method_40163 generateIfValid (Lnet/minecraft/class_3037;Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z
+	METHOD method_40163 generateIfValid (Lnet/minecraft/class_3037;Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Z
 		ARG 1 config
 		ARG 2 world
 		ARG 3 chunkGenerator
-		ARG 4 random
 		ARG 5 pos

mappings/net/minecraft/world/gen/feature/GlowLichenFeature.mapping

@@ -1,17 +1,14 @@
 CLASS net/minecraft/class_5779 net/minecraft/world/gen/feature/GlowLichenFeature
-	METHOD method_33391 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5780;Ljava/util/Random;Ljava/util/List;)Z
+	METHOD method_33391 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_5780;Lnet/minecraft/class_5819;Ljava/util/List;)Z
 		ARG 0 world
 		ARG 1 pos
 		ARG 2 state
 		ARG 3 config
-		ARG 4 random
 		ARG 5 directions
-	METHOD method_33392 shuffleDirections (Lnet/minecraft/class_5780;Ljava/util/Random;)Ljava/util/List;
+	METHOD method_33392 shuffleDirections (Lnet/minecraft/class_5780;Lnet/minecraft/class_5819;)Ljava/util/List;
 		ARG 0 config
-		ARG 1 random
+	METHOD method_33393 shuffleDirections (Lnet/minecraft/class_5780;Lnet/minecraft/class_5819;Lnet/minecraft/class_2350;)Ljava/util/List;
-	METHOD method_33393 shuffleDirections (Lnet/minecraft/class_5780;Ljava/util/Random;Lnet/minecraft/class_2350;)Ljava/util/List;
 		ARG 0 config
-		ARG 1 random
 		ARG 2 excluded
 	METHOD method_33394 (Lnet/minecraft/class_2350;Lnet/minecraft/class_2350;)Z
 		ARG 1 direction

mappings/net/minecraft/world/gen/feature/HugeFungusFeature.mapping

@@ -1,31 +1,26 @@
 CLASS net/minecraft/class_4781 net/minecraft/world/gen/feature/HugeFungusFeature
-	METHOD method_24439 generateHatBlock (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_4780;Lnet/minecraft/class_2338$class_2339;FFF)V
+	METHOD method_24439 generateHatBlock (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_4780;Lnet/minecraft/class_2338$class_2339;FFF)V
 		ARG 1 world
-		ARG 2 random
 		ARG 3 config
 		ARG 4 pos
 		ARG 5 decorationChance
 		ARG 6 generationChance
 		ARG 7 vineChance
-	METHOD method_24440 generateStem (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_4780;Lnet/minecraft/class_2338;IZ)V
+	METHOD method_24440 generateStem (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_4780;Lnet/minecraft/class_2338;IZ)V
 		ARG 1 world
-		ARG 2 random
 		ARG 3 config
 		ARG 4 pos
 		ARG 5 stemHeight
 		ARG 6 thickStem
-	METHOD method_24441 tryGenerateVines (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)V
+	METHOD method_24441 tryGenerateVines (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Z)V
 		ARG 1 world
-		ARG 2 random
 		ARG 3 pos
 		ARG 4 state
-	METHOD method_24442 generateVines (Lnet/minecraft/class_2338;Lnet/minecraft/class_1936;Ljava/util/Random;)V
+	METHOD method_24442 generateVines (Lnet/minecraft/class_2338;Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;)V
 		ARG 0 pos
 		ARG 1 world
-		ARG 2 random
+	METHOD method_24443 generateHat (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_4780;Lnet/minecraft/class_2338;IZ)V
-	METHOD method_24443 generateHat (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_4780;Lnet/minecraft/class_2338;IZ)V
 		ARG 1 world
-		ARG 2 random
 		ARG 3 config
 		ARG 4 pos
 		ARG 5 hatHeight

mappings/net/minecraft/world/gen/feature/HugeMushroomFeature.mapping

@@ -8,19 +8,16 @@ CLASS net/minecraft/class_4625 net/minecraft/world/gen/feature/HugeMushroomFeatu
 		ARG 3 height
 		ARG 4 mutablePos
 		ARG 5 config
-	METHOD method_23375 generateCap (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;ILnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_4635;)V
+	METHOD method_23375 generateCap (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;ILnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_4635;)V
 		ARG 1 world
-		ARG 2 random
 		ARG 3 start
 		ARG 4 y
 		ARG 5 mutable
 		ARG 6 config
-	METHOD method_23376 generateStem (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_4635;ILnet/minecraft/class_2338$class_2339;)V
+	METHOD method_23376 generateStem (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_4635;ILnet/minecraft/class_2338$class_2339;)V
 		ARG 1 world
-		ARG 2 random
 		ARG 3 pos
 		ARG 4 config
 		ARG 5 height
 		ARG 6 mutablePos
-	METHOD method_23377 getHeight (Ljava/util/Random;)I
+	METHOD method_23377 getHeight (Lnet/minecraft/class_5819;)I
-		ARG 1 random

mappings/net/minecraft/world/gen/feature/IcebergFeature.mapping

@@ -19,18 +19,16 @@ CLASS net/minecraft/class_3074 net/minecraft/world/gen/feature/IcebergFeature
 		ARG 1 world
 		ARG 2 pos
 		ARG 4 height
-	METHOD method_13419 (Ljava/util/Random;III)I
+	METHOD method_13419 (Lnet/minecraft/class_5819;III)I
-		ARG 1 random
 		ARG 2 y
 		ARG 3 height
 		ARG 4 factor
 	METHOD method_13420 isSnowOrIce (Lnet/minecraft/class_2680;)Z
 		ARG 0 state
-	METHOD method_13421 (IILnet/minecraft/class_2338;ILjava/util/Random;)D
+	METHOD method_13421 (IILnet/minecraft/class_2338;ILnet/minecraft/class_5819;)D
 		ARG 1 x
 		ARG 2 z
 		ARG 3 pos
-		ARG 5 random
 	METHOD method_13422 clearSnowAbove (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V
 		ARG 1 world
 		ARG 2 pos
@@ -41,18 +39,16 @@ CLASS net/minecraft/class_3074 net/minecraft/world/gen/feature/IcebergFeature
 		ARG 4 divisor1
 		ARG 5 divisor2
 		ARG 6 randomSine
-	METHOD method_13425 placeBlockOrSnow (Lnet/minecraft/class_2338;Lnet/minecraft/class_1936;Ljava/util/Random;IIZZLnet/minecraft/class_2680;)V
+	METHOD method_13425 placeBlockOrSnow (Lnet/minecraft/class_2338;Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;IIZZLnet/minecraft/class_2680;)V
 		ARG 1 pos
 		ARG 2 world
-		ARG 3 random
 		ARG 4 heightRemaining
 		ARG 5 height
 		ARG 6 lessSnow
 		ARG 7 placeSnow
 		ARG 8 state
-	METHOD method_13426 placeAt (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;IIIIIIZIDZLnet/minecraft/class_2680;)V
+	METHOD method_13426 placeAt (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;IIIIIIZIDZLnet/minecraft/class_2680;)V
 		ARG 1 world
-		ARG 2 random
 		ARG 3 pos
 		ARG 4 height
 		ARG 5 offsetX
@@ -61,12 +57,10 @@ CLASS net/minecraft/class_3074 net/minecraft/world/gen/feature/IcebergFeature
 		ARG 12 randomSine
 		ARG 14 placeSnow
 		ARG 15 state
-	METHOD method_13427 (Ljava/util/Random;III)I
+	METHOD method_13427 (Lnet/minecraft/class_5819;III)I
-		ARG 1 random
 		ARG 2 y
 		ARG 3 height
 		ARG 4 factor
-	METHOD method_13428 (Ljava/util/Random;Lnet/minecraft/class_1936;IILnet/minecraft/class_2338;ZIDI)V
+	METHOD method_13428 (Lnet/minecraft/class_5819;Lnet/minecraft/class_1936;IILnet/minecraft/class_2338;ZIDI)V
-		ARG 1 random
 		ARG 2 world
 		ARG 5 pos

mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping

@@ -1,8 +1,7 @@
 CLASS net/minecraft/class_5727 net/minecraft/world/gen/feature/LargeDripstoneFeature
-	METHOD method_33016 createGenerator (Lnet/minecraft/class_2338;ZLjava/util/Random;ILnet/minecraft/class_5863;Lnet/minecraft/class_5863;)Lnet/minecraft/class_5727$class_5728;
+	METHOD method_33016 createGenerator (Lnet/minecraft/class_2338;ZLnet/minecraft/class_5819;ILnet/minecraft/class_5863;Lnet/minecraft/class_5863;)Lnet/minecraft/class_5727$class_5728;
 		ARG 0 pos
 		ARG 1 isStalagmite
-		ARG 2 random
 		ARG 3 scale
 		ARG 4 bluntness
 		ARG 5 heightScale
@@ -29,9 +28,8 @@ CLASS net/minecraft/class_5727 net/minecraft/world/gen/feature/LargeDripstoneFea
 		METHOD method_33019 canGenerate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5727$class_5729;)Z
 			ARG 1 world
 			ARG 2 wind
-		METHOD method_33020 generate (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_5727$class_5729;)V
+		METHOD method_33020 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5819;Lnet/minecraft/class_5727$class_5729;)V
 			ARG 1 world
-			ARG 2 random
 			ARG 3 wind
 		METHOD method_33025 generateWind (Lnet/minecraft/class_5732;)Z
 			ARG 1 config
@@ -40,9 +38,8 @@ CLASS net/minecraft/class_5727 net/minecraft/world/gen/feature/LargeDripstoneFea
 	CLASS class_5729 WindModifier
 		FIELD field_28211 y I
 		FIELD field_28212 wind Lnet/minecraft/class_243;
-		METHOD <init> (ILjava/util/Random;Lnet/minecraft/class_5863;)V
+		METHOD <init> (ILnet/minecraft/class_5819;Lnet/minecraft/class_5863;)V
 			ARG 1 y
-			ARG 2 random
 			ARG 3 wind
 		METHOD method_33031 modify (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338;
 			ARG 1 pos

mappings/net/minecraft/world/gen/feature/OreFeature.mapping

@@ -1,7 +1,6 @@
 CLASS net/minecraft/class_3122 net/minecraft/world/gen/feature/OreFeature
-	METHOD method_13629 generateVeinPart (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_3124;DDDDDDIIIII)Z
+	METHOD method_13629 generateVeinPart (Lnet/minecraft/class_5281;Lnet/minecraft/class_5819;Lnet/minecraft/class_3124;DDDDDDIIIII)Z
 		ARG 1 world
-		ARG 2 random
 		ARG 3 config
 		ARG 4 startX
 		ARG 6 endX
@@ -14,13 +13,11 @@ CLASS net/minecraft/class_3122 net/minecraft/world/gen/feature/OreFeature
 		ARG 18 z
 		ARG 19 horizontalSize
 		ARG 20 verticalSize
-	METHOD method_33983 shouldPlace (Lnet/minecraft/class_2680;Ljava/util/function/Function;Ljava/util/Random;Lnet/minecraft/class_3124;Lnet/minecraft/class_3124$class_5876;Lnet/minecraft/class_2338$class_2339;)Z
+	METHOD method_33983 shouldPlace (Lnet/minecraft/class_2680;Ljava/util/function/Function;Lnet/minecraft/class_5819;Lnet/minecraft/class_3124;Lnet/minecraft/class_3124$class_5876;Lnet/minecraft/class_2338$class_2339;)Z
 		ARG 0 state
 		ARG 1 posToState
-		ARG 2 random
 		ARG 3 config
 		ARG 4 target
 		ARG 5 pos
-	METHOD method_33984 shouldNotDiscard (Ljava/util/Random;F)Z
+	METHOD method_33984 shouldNotDiscard (Lnet/minecraft/class_5819;F)Z
-		ARG 0 random
 		ARG 1 chance

mappings/net/minecraft/world/gen/feature/PlacedFeature.mapping

@@ -10,18 +10,16 @@ CLASS net/minecraft/class_6796 net/minecraft/world/gen/feature/PlacedFeature
 	METHOD comp_334 feature ()Lnet/minecraft/class_6880;
 	METHOD comp_335 placementModifiers ()Ljava/util/List;
 	METHOD method_39643 getDecoratedFeatures ()Ljava/util/stream/Stream;
-	METHOD method_39644 generateUnregistered (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z
+	METHOD method_39644 generateUnregistered (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Z
 		ARG 1 world
 		ARG 2 generator
-		ARG 3 random
 		ARG 4 pos
-	METHOD method_39648 generate (Lnet/minecraft/class_5444;Ljava/util/Random;Lnet/minecraft/class_2338;)Z
+	METHOD method_39648 generate (Lnet/minecraft/class_5444;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Z
 		ARG 1 context
-		ARG 2 random
 		ARG 3 pos
-	METHOD method_39649 (Lnet/minecraft/class_6797;Lnet/minecraft/class_5444;Ljava/util/Random;Lnet/minecraft/class_2338;)Ljava/util/stream/Stream;
+	METHOD method_39649 (Lnet/minecraft/class_6797;Lnet/minecraft/class_5444;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Ljava/util/stream/Stream;
 		ARG 3 pos
-	METHOD method_39650 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z
+	METHOD method_39650 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Z
 		COMMENT Generates a configured feature at the positions obtained by applying
 		COMMENT placement modifiers to the given position.
 		COMMENT
@@ -30,5 +28,4 @@ CLASS net/minecraft/class_6796 net/minecraft/world/gen/feature/PlacedFeature
 		COMMENT Stream#flatMap flatMap} in order they appear in the list.
 		ARG 1 world
 		ARG 2 generator
-		ARG 3 random
 		ARG 4 pos

mappings/net/minecraft/world/gen/feature/RandomFeatureEntry.mapping

@@ -5,10 +5,9 @@ CLASS net/minecraft/class_3226 net/minecraft/world/gen/feature/RandomFeatureEntr
 	METHOD <init> (Lnet/minecraft/class_6880;F)V
 		ARG 1 feature
 		ARG 2 chance
-	METHOD method_14271 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z
+	METHOD method_14271 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Z
 		ARG 1 world
 		ARG 2 chunkGenerator
-		ARG 3 random
 		ARG 4 pos
 	METHOD method_28668 (Lnet/minecraft/class_3226;)Ljava/lang/Float;
 		ARG 0 config

mappings/net/minecraft/world/gen/feature/RootSystemFeature.mapping

@@ -1,37 +1,33 @@
 CLASS net/minecraft/class_5921 net/minecraft/world/gen/feature/RootSystemFeature
 	METHOD method_34307 (Lnet/minecraft/class_5926;Lnet/minecraft/class_2680;)Z
 		ARG 1 state
-	METHOD method_34308 generateTreeAndRoots (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Lnet/minecraft/class_5926;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2338;)Z
+	METHOD method_34308 generateTreeAndRoots (Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Lnet/minecraft/class_5926;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_2338;)Z
 		ARG 0 world
 		ARG 1 generator
 		ARG 2 config
-		ARG 3 random
 		ARG 4 mutablePos
 		ARG 5 pos
 	METHOD method_34310 hasSpaceForTree (Lnet/minecraft/class_5281;Lnet/minecraft/class_5926;Lnet/minecraft/class_2338;)Z
 		ARG 0 world
 		ARG 1 config
 		ARG 2 pos
-	METHOD method_34311 generateRoots (Lnet/minecraft/class_5281;Lnet/minecraft/class_5926;Ljava/util/Random;IILnet/minecraft/class_2338$class_2339;)V
+	METHOD method_34311 generateRoots (Lnet/minecraft/class_5281;Lnet/minecraft/class_5926;Lnet/minecraft/class_5819;IILnet/minecraft/class_2338$class_2339;)V
 		ARG 0 world
 		ARG 1 config
-		ARG 2 random
 		ARG 3 x
 		ARG 4 z
 		ARG 5 mutablePos
-	METHOD method_34312 generateHangingRoots (Lnet/minecraft/class_5281;Lnet/minecraft/class_5926;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338$class_2339;)V
+	METHOD method_34312 generateHangingRoots (Lnet/minecraft/class_5281;Lnet/minecraft/class_5926;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338$class_2339;)V
 		ARG 0 world
 		ARG 1 config
-		ARG 2 random
 		ARG 3 pos
 		ARG 4 mutablePos
 	METHOD method_36419 isAirOrWater (Lnet/minecraft/class_2680;II)Z
 		ARG 0 state
 		ARG 1 height
 		ARG 2 allowedVerticalWaterForTree
-	METHOD method_39918 generateRootsColumn (Lnet/minecraft/class_2338;ILnet/minecraft/class_5281;Lnet/minecraft/class_5926;Ljava/util/Random;)V
+	METHOD method_39918 generateRootsColumn (Lnet/minecraft/class_2338;ILnet/minecraft/class_5281;Lnet/minecraft/class_5926;Lnet/minecraft/class_5819;)V
 		ARG 0 pos
 		ARG 1 maxY
 		ARG 2 world
 		ARG 3 config
-		ARG 4 random

mappings/net/minecraft/world/gen/feature/RuinedPortalFeature.mapping

@@ -5,12 +5,10 @@ CLASS net/minecraft/class_5183 net/minecraft/world/gen/feature/RuinedPortalFeatu
 	METHOD method_27209 isColdAt (Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)Z
 		ARG 0 pos
 		ARG 1 biome
-	METHOD method_27210 choosePlacementHeight (Ljava/util/Random;II)I
+	METHOD method_27210 choosePlacementHeight (Lnet/minecraft/class_5819;II)I
-		ARG 0 random
 		ARG 1 min
 		ARG 2 max
-	METHOD method_27211 getFloorHeight (Ljava/util/Random;Lnet/minecraft/class_2794;Lnet/minecraft/class_5189$class_5191;ZIILnet/minecraft/class_3341;Lnet/minecraft/class_5539;Lnet/minecraft/class_7138;)I
+	METHOD method_27211 getFloorHeight (Lnet/minecraft/class_5819;Lnet/minecraft/class_2794;Lnet/minecraft/class_5189$class_5191;ZIILnet/minecraft/class_3341;Lnet/minecraft/class_5539;Lnet/minecraft/class_7138;)I
-		ARG 0 random
 		ARG 1 chunkGenerator
 		ARG 2 verticalPlacement
 		ARG 3 airPocket

mappings/net/minecraft/world/gen/feature/ScatteredOreFeature.mapping

@@ -1,9 +1,7 @@
 CLASS net/minecraft/class_5875 net/minecraft/world/gen/feature/ScatteredOreFeature
-	METHOD method_33985 setPos (Lnet/minecraft/class_2338$class_2339;Ljava/util/Random;Lnet/minecraft/class_2338;I)V
+	METHOD method_33985 setPos (Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;I)V
 		ARG 1 mutable
-		ARG 2 random
 		ARG 3 origin
 		ARG 4 spread
-	METHOD method_33986 getSpread (Ljava/util/Random;I)I
+	METHOD method_33986 getSpread (Lnet/minecraft/class_5819;I)I
-		ARG 1 random
 		ARG 2 spread

mappings/net/minecraft/world/gen/feature/SmallDripstoneFeature.mapping

@@ -1,10 +1,8 @@
 CLASS net/minecraft/class_5730 net/minecraft/world/gen/feature/SmallDripstoneFeature
-	METHOD method_33034 generateDripstoneBlocks (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_5733;)V
+	METHOD method_33034 generateDripstoneBlocks (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_5733;)V
 		ARG 0 world
-		ARG 1 random
 		ARG 2 pos
 		ARG 3 config
-	METHOD method_39175 getDirection (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Ljava/util/Random;)Ljava/util/Optional;
+	METHOD method_39175 getDirection (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Ljava/util/Optional;
 		ARG 0 world
 		ARG 1 pos
-		ARG 2 random

mappings/net/minecraft/world/gen/feature/StructureFeature.mapping

@@ -6,11 +6,10 @@ CLASS net/minecraft/class_3195 net/minecraft/world/gen/feature/StructureFeature
 		ARG 1 config
 	METHOD method_38676 getStructurePosition (Lnet/minecraft/class_3195$class_7149;)Ljava/util/Optional;
 		ARG 1 context
-	METHOD method_38694 postPlace (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;Lnet/minecraft/class_6624;)V
+	METHOD method_38694 postPlace (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Lnet/minecraft/class_5819;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;Lnet/minecraft/class_6624;)V
 		ARG 1 world
 		ARG 2 structureAccessor
 		ARG 3 chunkGenerator
-		ARG 4 random
 		ARG 5 box
 		ARG 6 chunkPos
 		ARG 7 pieces

mappings/net/minecraft/world/gen/feature/TreeFeature.mapping

@@ -4,13 +4,9 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/TreeFeature
 		ARG 0 world
 		ARG 1 pos
 		ARG 2 state
-	METHOD method_12775 generate (Lnet/minecraft/class_5281;Ljava/util/Random;Lnet/minecraft/class_2338;Ljava/util/function/BiConsumer;Ljava/util/function/BiConsumer;Lnet/minecraft/class_4643;)Z
+	METHOD method_12775 generate (Lnet/minecraft/class_5281;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Ljava/util/function/BiConsumer;Ljava/util/function/BiConsumer;Ljava/util/function/BiConsumer;Lnet/minecraft/class_4643;)Z
 		ARG 1 world
-		ARG 2 random
 		ARG 3 pos
-		ARG 4 trunkReplacer
-		ARG 5 foliageReplacer
-		ARG 6 config
 	METHOD method_16416 isVine (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z
 		ARG 0 world
 		ARG 1 pos
@@ -29,24 +25,17 @@ CLASS net/minecraft/class_2944 net/minecraft/world/gen/feature/TreeFeature
 		ARG 1 pos
 	METHOD method_16428 (Lnet/minecraft/class_2680;)Z
 		ARG 0 state
-	METHOD method_16431 (Lnet/minecraft/class_2680;)Z
-		ARG 0 state
-	METHOD method_16432 canTreeReplace (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z
-		ARG 0 world
-		ARG 1 pos
 	METHOD method_23380 placeLogsAndLeaves (Lnet/minecraft/class_1936;Lnet/minecraft/class_3341;Ljava/util/Set;Ljava/util/Set;)Lnet/minecraft/class_251;
 		ARG 0 world
 		ARG 1 box
 		ARG 2 trunkPositions
 		ARG 3 decorationPositions
-	METHOD method_23381 (Lnet/minecraft/class_5281;Ljava/util/function/BiConsumer;Ljava/util/Random;Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_4662;)V
-		ARG 5 decorator
 	METHOD method_23384 (Lnet/minecraft/class_2680;)Z
 		ARG 0 state
 	METHOD method_27371 canReplace (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z
 		ARG 0 world
 		ARG 1 pos
-	METHOD method_27372 (Lnet/minecraft/class_4643;Lnet/minecraft/class_5281;Ljava/util/function/BiConsumer;Ljava/util/Random;IIILnet/minecraft/class_4647$class_5208;)V
+	METHOD method_27372 (Lnet/minecraft/class_4643;Lnet/minecraft/class_5281;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;IIILnet/minecraft/class_4647$class_5208;)V
 		ARG 7 node
 	METHOD method_29963 getTopPosition (Lnet/minecraft/class_3746;ILnet/minecraft/class_2338;Lnet/minecraft/class_4643;)I
 		ARG 1 world

mappings/net/minecraft/world/gen/feature/TreeFeatureConfig.mapping

@@ -9,16 +9,11 @@ CLASS net/minecraft/class_4643 net/minecraft/world/gen/feature/TreeFeatureConfig
 	FIELD field_29279 dirtProvider Lnet/minecraft/class_4651;
 	FIELD field_29280 foliageProvider Lnet/minecraft/class_4651;
 	FIELD field_29281 forceDirt Z
-	METHOD <init> (Lnet/minecraft/class_4651;Lnet/minecraft/class_5141;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Lnet/minecraft/class_4651;Lnet/minecraft/class_5201;Ljava/util/List;ZZ)V
+	METHOD <init> (Lnet/minecraft/class_4651;Lnet/minecraft/class_5141;Lnet/minecraft/class_4651;Lnet/minecraft/class_4647;Ljava/util/Optional;Lnet/minecraft/class_4651;Lnet/minecraft/class_5201;Ljava/util/List;ZZ)V
 		ARG 1 trunkProvider
 		ARG 2 trunkPlacer
 		ARG 3 foliageProvider
 		ARG 4 foliagePlacer
-		ARG 5 dirtProvider
-		ARG 6 minimumSize
-		ARG 7 decorators
-		ARG 8 ignoreVines
-		ARG 9 forceDirt
 	METHOD method_28811 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance
 	METHOD method_28814 (Lnet/minecraft/class_4643;)Lnet/minecraft/class_5201;

mappings/net/minecraft/world/gen/feature/TwistingVinesFeature.mapping

@@ -2,9 +2,8 @@ CLASS net/minecraft/class_4953 net/minecraft/world/gen/feature/TwistingVinesFeat
 	METHOD method_25986 isNotSuitable (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z
 		ARG 0 world
 		ARG 1 pos
-	METHOD method_25987 generateVineColumn (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;III)V
+	METHOD method_25987 generateVineColumn (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338$class_2339;III)V
 		ARG 0 world
-		ARG 1 random
 		ARG 2 pos
 		ARG 3 maxLength
 		ARG 4 minAge

mappings/net/minecraft/world/gen/feature/UnderwaterMagmaFeature.mapping

@@ -9,7 +9,7 @@ CLASS net/minecraft/class_5834 net/minecraft/world/gen/feature/UnderwaterMagmaFe
 		ARG 0 world
 		ARG 1 pos
 		ARG 2 config
-	METHOD method_33766 (Ljava/util/Random;Lnet/minecraft/class_5835;Lnet/minecraft/class_2338;)Z
+	METHOD method_33766 (Lnet/minecraft/class_5819;Lnet/minecraft/class_5835;Lnet/minecraft/class_2338;)Z
 		ARG 2 pos
 	METHOD method_33767 (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;)I
 		ARG 1 pos

mappings/net/minecraft/world/gen/feature/VegetationPatchFeature.mapping

@@ -1,30 +1,26 @@
 CLASS net/minecraft/class_5922 net/minecraft/world/gen/feature/VegetationPatchFeature
-	METHOD method_34315 generateVegetationFeature (Lnet/minecraft/class_5281;Lnet/minecraft/class_5927;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;)Z
+	METHOD method_34315 generateVegetationFeature (Lnet/minecraft/class_5281;Lnet/minecraft/class_5927;Lnet/minecraft/class_2794;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Z
 		ARG 1 world
 		ARG 2 config
 		ARG 3 generator
-		ARG 4 random
 		ARG 5 pos
-	METHOD method_34316 placeGroundAndGetPositions (Lnet/minecraft/class_5281;Lnet/minecraft/class_5927;Ljava/util/Random;Lnet/minecraft/class_2338;Ljava/util/function/Predicate;II)Ljava/util/Set;
+	METHOD method_34316 placeGroundAndGetPositions (Lnet/minecraft/class_5281;Lnet/minecraft/class_5927;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Ljava/util/function/Predicate;II)Ljava/util/Set;
 		ARG 1 world
 		ARG 2 config
-		ARG 3 random
 		ARG 4 pos
 		ARG 5 replaceable
 		ARG 6 radiusX
 		ARG 7 radiusZ
-	METHOD method_34317 placeGround (Lnet/minecraft/class_5281;Lnet/minecraft/class_5927;Ljava/util/function/Predicate;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;I)Z
+	METHOD method_34317 placeGround (Lnet/minecraft/class_5281;Lnet/minecraft/class_5927;Ljava/util/function/Predicate;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338$class_2339;I)Z
 		ARG 1 world
 		ARG 2 config
 		ARG 3 replaceable
-		ARG 4 random
 		ARG 5 pos
 		ARG 6 depth
-	METHOD method_34318 generateVegetation (Lnet/minecraft/class_5821;Lnet/minecraft/class_5281;Lnet/minecraft/class_5927;Ljava/util/Random;Ljava/util/Set;II)V
+	METHOD method_34318 generateVegetation (Lnet/minecraft/class_5821;Lnet/minecraft/class_5281;Lnet/minecraft/class_5927;Lnet/minecraft/class_5819;Ljava/util/Set;II)V
 		ARG 1 context
 		ARG 2 world
 		ARG 3 config
-		ARG 4 random
 		ARG 5 positions
 		ARG 6 radiusX
 		ARG 7 radiusZ

mappings/net/minecraft/world/gen/feature/WeepingVinesFeature.mapping

@@ -1,17 +1,14 @@
 CLASS net/minecraft/class_4784 net/minecraft/world/gen/feature/WeepingVinesFeature
 	FIELD field_22196 DIRECTIONS [Lnet/minecraft/class_2350;
-	METHOD method_24450 generateVineColumn (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;III)V
+	METHOD method_24450 generateVineColumn (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338$class_2339;III)V
 		ARG 0 world
-		ARG 1 random
 		ARG 2 pos
 		ARG 3 length
 		ARG 4 minAge
 		ARG 5 maxAge
-	METHOD method_24451 generateNetherWartBlocksInArea (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;)V
+	METHOD method_24451 generateNetherWartBlocksInArea (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V
 		ARG 1 world
-		ARG 2 random
 		ARG 3 pos
-	METHOD method_24452 generateVinesInArea (Lnet/minecraft/class_1936;Ljava/util/Random;Lnet/minecraft/class_2338;)V
+	METHOD method_24452 generateVinesInArea (Lnet/minecraft/class_1936;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V
 		ARG 1 world
-		ARG 2 random
 		ARG 3 pos

mappings/net/minecraft/world/gen/feature/util/FeatureContext.mapping

@@ -1,20 +1,19 @@
 CLASS net/minecraft/class_5821 net/minecraft/world/gen/feature/util/FeatureContext
 	FIELD field_28769 world Lnet/minecraft/class_5281;
 	FIELD field_28770 generator Lnet/minecraft/class_2794;
-	FIELD field_28771 random Ljava/util/Random;
+	FIELD field_28771 random Lnet/minecraft/class_5819;
 	FIELD field_28772 origin Lnet/minecraft/class_2338;
 	FIELD field_28773 config Lnet/minecraft/class_3037;
 	FIELD field_34697 feature Ljava/util/Optional;
-	METHOD <init> (Ljava/util/Optional;Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_3037;)V
+	METHOD <init> (Ljava/util/Optional;Lnet/minecraft/class_5281;Lnet/minecraft/class_2794;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_3037;)V
 		ARG 1 feature
 		ARG 2 world
 		ARG 3 generator
-		ARG 4 random
 		ARG 5 origin
 		ARG 6 config
 	METHOD method_33652 getWorld ()Lnet/minecraft/class_5281;
 	METHOD method_33653 getGenerator ()Lnet/minecraft/class_2794;
-	METHOD method_33654 getRandom ()Ljava/util/Random;
+	METHOD method_33654 getRandom ()Lnet/minecraft/class_5819;
 	METHOD method_33655 getOrigin ()Lnet/minecraft/class_2338;
 	METHOD method_33656 getConfig ()Lnet/minecraft/class_3037;
 	METHOD method_38427 getFeature ()Ljava/util/Optional;

mappings/net/minecraft/world/gen/foliage/FoliagePlacer.mapping

@@ -5,56 +5,48 @@ CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer
 	METHOD <init> (Lnet/minecraft/class_6017;Lnet/minecraft/class_6017;)V
 		ARG 1 radius
 		ARG 2 offset
-	METHOD method_23448 generate (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Lnet/minecraft/class_4643;ILnet/minecraft/class_4647$class_5208;III)V
+	METHOD method_23448 generate (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_4643;ILnet/minecraft/class_4647$class_5208;III)V
 		COMMENT This is the main method used to generate foliage.
 		ARG 1 world
 		ARG 2 replacer
-		ARG 3 random
 		ARG 4 config
 		ARG 5 trunkHeight
 		ARG 6 treeNode
 		ARG 7 foliageHeight
 		ARG 8 radius
 		ARG 9 offset
-	METHOD method_23449 generateSquare (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Lnet/minecraft/class_4643;Lnet/minecraft/class_2338;IIZ)V
+	METHOD method_23449 generateSquare (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_4643;Lnet/minecraft/class_2338;IIZ)V
 		COMMENT Generates a square of leaves with the given radius. Sub-classes can use the method {@code isInvalidForLeaves} to exclude certain positions, such as corners.
 		ARG 1 world
 		ARG 2 replacer
-		ARG 3 random
 		ARG 4 config
 		ARG 5 centerPos
 		ARG 6 radius
 		ARG 7 y
 		ARG 8 giantTrunk
-	METHOD method_23451 isInvalidForLeaves (Ljava/util/Random;IIIIZ)Z
+	METHOD method_23451 isInvalidForLeaves (Lnet/minecraft/class_5819;IIIIZ)Z
 		COMMENT Used to exclude certain positions such as corners when creating a square of leaves.
-		ARG 1 random
 		ARG 2 dx
 		ARG 3 y
 		ARG 4 dz
 		ARG 5 radius
 		ARG 6 giantTrunk
-	METHOD method_23452 getRandomRadius (Ljava/util/Random;I)I
+	METHOD method_23452 getRandomRadius (Lnet/minecraft/class_5819;I)I
-		ARG 1 random
 		ARG 2 baseHeight
-	METHOD method_26989 getRandomHeight (Ljava/util/Random;ILnet/minecraft/class_4643;)I
+	METHOD method_26989 getRandomHeight (Lnet/minecraft/class_5819;ILnet/minecraft/class_4643;)I
-		ARG 1 random
 		ARG 2 trunkHeight
 		ARG 3 config
-	METHOD method_27385 generate (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Lnet/minecraft/class_4643;ILnet/minecraft/class_4647$class_5208;II)V
+	METHOD method_27385 generate (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_4643;ILnet/minecraft/class_4647$class_5208;II)V
 		ARG 1 world
 		ARG 2 replacer
-		ARG 3 random
 		ARG 4 config
 		ARG 5 trunkHeight
 		ARG 6 treeNode
 		ARG 7 foliageHeight
 		ARG 8 radius
-	METHOD method_27386 getRandomOffset (Ljava/util/Random;)I
+	METHOD method_27386 getRandomOffset (Lnet/minecraft/class_5819;)I
-		ARG 1 random
+	METHOD method_27387 isPositionInvalid (Lnet/minecraft/class_5819;IIIIZ)Z
-	METHOD method_27387 isPositionInvalid (Ljava/util/Random;IIIIZ)Z
 		COMMENT Normalizes x and z coords before checking if they are invalid.
-		ARG 1 random
 		ARG 2 dx
 		ARG 3 y
 		ARG 4 dz
@@ -66,10 +58,9 @@ CLASS net/minecraft/class_4647 net/minecraft/world/gen/foliage/FoliagePlacer
 	METHOD method_30411 fillFoliagePlacerFields (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/Products$P2;
 	METHOD method_30412 (Lnet/minecraft/class_4647;)Lnet/minecraft/class_6017;
 		ARG 0 placer
-	METHOD method_34359 placeFoliageBlock (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Lnet/minecraft/class_4643;Lnet/minecraft/class_2338;)V
+	METHOD method_34359 placeFoliageBlock (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_4643;Lnet/minecraft/class_2338;)V
 		ARG 0 world
 		ARG 1 replacer
-		ARG 2 random
 		ARG 3 config
 		ARG 4 pos
 	CLASS class_5208 TreeNode

mappings/net/minecraft/world/gen/heightprovider/HeightProvider.mapping

@@ -5,8 +5,7 @@ CLASS net/minecraft/class_6122 net/minecraft/world/gen/heightprovider/HeightProv
 		ARG 0 either
 	METHOD method_35390 (Lnet/minecraft/class_6122;)Lcom/mojang/datafixers/util/Either;
 		ARG 0 provider
-	METHOD method_35391 get (Ljava/util/Random;Lnet/minecraft/class_5868;)I
+	METHOD method_35391 get (Lnet/minecraft/class_5819;Lnet/minecraft/class_5868;)I
-		ARG 1 random
 		ARG 2 context
 	METHOD method_35392 (Lnet/minecraft/class_6122;)Lnet/minecraft/class_6122;
 		ARG 0 provider

mappings/net/minecraft/world/gen/placementmodifier/AbstractConditionalPlacementModifier.mapping

@@ -1,5 +1,4 @@
 CLASS net/minecraft/class_6661 net/minecraft/world/gen/placementmodifier/AbstractConditionalPlacementModifier
-	METHOD method_38918 shouldPlace (Lnet/minecraft/class_5444;Ljava/util/Random;Lnet/minecraft/class_2338;)Z
+	METHOD method_38918 shouldPlace (Lnet/minecraft/class_5444;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Z
 		ARG 1 context
-		ARG 2 random
 		ARG 3 pos

mappings/net/minecraft/world/gen/placementmodifier/AbstractCountPlacementModifier.mapping

@@ -1,4 +1,3 @@
 CLASS net/minecraft/class_5857 net/minecraft/world/gen/placementmodifier/AbstractCountPlacementModifier
-	METHOD method_14452 getCount (Ljava/util/Random;Lnet/minecraft/class_2338;)I
+	METHOD method_14452 getCount (Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)I
-		ARG 1 random
 		ARG 2 pos

mappings/net/minecraft/world/gen/placementmodifier/PlacementModifier.mapping

@@ -5,9 +5,8 @@ CLASS net/minecraft/class_6797 net/minecraft/world/gen/placementmodifier/Placeme
 	COMMENT
 	COMMENT @see net.minecraft.world.gen.feature.ConfiguredFeature
 	FIELD field_35736 CODEC Lcom/mojang/serialization/Codec;
-	METHOD method_14452 getPositions (Lnet/minecraft/class_5444;Ljava/util/Random;Lnet/minecraft/class_2338;)Ljava/util/stream/Stream;
+	METHOD method_14452 getPositions (Lnet/minecraft/class_5444;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Ljava/util/stream/Stream;
 		COMMENT Applies this placement modifier to the given position.
 		ARG 1 context
-		ARG 2 random
 		ARG 3 pos
 	METHOD method_39615 getType ()Lnet/minecraft/class_6798;

mappings/net/minecraft/world/gen/random/AbstractRandom.mapping

@@ -6,7 +6,13 @@ CLASS net/minecraft/class_5819 net/minecraft/world/gen/random/AbstractRandom
 	METHOD method_39332 nextBetween (II)I
 		ARG 1 min
 		ARG 2 max
-	METHOD nextInt (I)I
+	METHOD method_43048 nextInt (I)I
 		ARG 1 bound
-	METHOD setSeed (J)V
+	METHOD method_43052 setSeed (J)V
 		ARG 1 seed
+	METHOD method_43054 nextInt ()I
+	METHOD method_43055 nextLong ()J
+	METHOD method_43056 nextBoolean ()Z
+	METHOD method_43057 nextFloat ()F
+	METHOD method_43058 nextDouble ()D
+	METHOD method_43059 nextGaussian ()D

mappings/net/minecraft/world/gen/random/BaseSimpleRandom.mapping

@@ -1,5 +1,3 @@
 CLASS net/minecraft/class_6566 net/minecraft/world/gen/random/BaseSimpleRandom
 	FIELD field_34582 FLOAT_MULTIPLIER F
 	FIELD field_34583 DOUBLE_MULTIPLIER D
-	METHOD method_33651 next (I)I
-		ARG 1 bits

mappings/net/minecraft/world/gen/random/ChunkRandom.mapping

@@ -18,7 +18,7 @@ CLASS net/minecraft/class_2919 net/minecraft/world/gen/random/ChunkRandom
 		ARG 1 worldSeed
 		ARG 3 blockX
 		ARG 4 blockZ
-	METHOD method_12662 getSlimeRandom (IIJJ)Ljava/util/Random;
+	METHOD method_12662 getSlimeRandom (IIJJ)Lnet/minecraft/class_5819;
 		ARG 0 chunkX
 		ARG 1 chunkZ
 		ARG 2 worldSeed
@@ -60,7 +60,7 @@ CLASS net/minecraft/class_2919 net/minecraft/world/gen/random/ChunkRandom
 		ARG 4 regionZ
 		ARG 5 salt
 	METHOD method_35335 getSampleCount ()I
-	METHOD next (I)I
+	METHOD method_43156 (I)I
 		ARG 1 count
 	CLASS class_6675 RandomProvider
 		FIELD field_35144 provider Ljava/util/function/LongFunction;

mappings/net/minecraft/world/gen/stateprovider/BlockStateProvider.mapping

@@ -1,9 +1,8 @@
 CLASS net/minecraft/class_4651 net/minecraft/world/gen/stateprovider/BlockStateProvider
 	COMMENT A provider for {@linkplain BlockState block states}. Results may be random or based on a block position.
 	FIELD field_24937 TYPE_CODEC Lcom/mojang/serialization/Codec;
-	METHOD method_23455 getBlockState (Ljava/util/Random;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680;
+	METHOD method_23455 getBlockState (Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680;
 		COMMENT {@return a provided block state}
-		ARG 1 random
 		ARG 2 pos
 	METHOD method_28862 getType ()Lnet/minecraft/class_4652;
 		COMMENT {@return the type of this block state provider}

mappings/net/minecraft/world/gen/treedecorator/AlterGroundTreeDecorator.mapping

@@ -5,17 +5,15 @@ CLASS net/minecraft/class_4658 net/minecraft/world/gen/treedecorator/AlterGround
 		ARG 1 provider
 	METHOD method_23460 (ILnet/minecraft/class_2338;)Z
 		ARG 1 pos
-	METHOD method_23461 (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Lnet/minecraft/class_2338;)V
+	METHOD method_23461 (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V
 		ARG 4 pos
-	METHOD method_23462 setArea (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Lnet/minecraft/class_2338;)V
+	METHOD method_23462 setArea (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V
 		ARG 1 world
 		ARG 2 replacer
-		ARG 3 random
 		ARG 4 pos
-	METHOD method_23463 setColumn (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Lnet/minecraft/class_2338;)V
+	METHOD method_23463 setColumn (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V
 		ARG 1 world
 		ARG 2 replacer
-		ARG 3 random
 		ARG 4 pos
 	METHOD method_28889 (Lnet/minecraft/class_4658;)Lnet/minecraft/class_4651;
 		ARG 0 decorator

mappings/net/minecraft/world/gen/treedecorator/BeehiveTreeDecorator.mapping

@@ -9,7 +9,7 @@ CLASS net/minecraft/class_4659 net/minecraft/world/gen/treedecorator/BeehiveTree
 		ARG 1 pos
 	METHOD method_28890 (Lnet/minecraft/class_4659;)Ljava/lang/Float;
 		ARG 0 decorator
-	METHOD method_35373 (Ljava/util/Random;Lnet/minecraft/class_4482;)V
+	METHOD method_35373 (Lnet/minecraft/class_5819;Lnet/minecraft/class_4482;)V
 		ARG 1 blockEntity
 	METHOD method_40032 (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z
 		ARG 1 pos

mappings/net/minecraft/world/gen/treedecorator/CocoaBeansTreeDecorator.mapping

@@ -5,7 +5,7 @@ CLASS net/minecraft/class_4660 net/minecraft/world/gen/treedecorator/CocoaBeansT
 		ARG 1 probability
 	METHOD method_23465 (ILnet/minecraft/class_2338;)Z
 		ARG 1 pos
-	METHOD method_23466 (Ljava/util/Random;Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;)V
+	METHOD method_23466 (Lnet/minecraft/class_5819;Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;)V
 		ARG 3 pos
 	METHOD method_28891 (Lnet/minecraft/class_4660;)Ljava/lang/Float;
 		ARG 0 decorator

mappings/net/minecraft/world/gen/treedecorator/LeavesVineTreeDecorator.mapping

@@ -1,11 +1,8 @@
 CLASS net/minecraft/class_4661 net/minecraft/world/gen/treedecorator/LeavesVineTreeDecorator
 	FIELD field_24960 CODEC Lcom/mojang/serialization/Codec;
-	FIELD field_24961 INSTANCE Lnet/minecraft/class_4661;
 	METHOD method_23467 placeVines (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;Lnet/minecraft/class_2746;Ljava/util/function/BiConsumer;)V
 		COMMENT Places a vine at a given position and then up to 4 more vines going downwards.
 		ARG 0 world
 		ARG 1 pos
 		ARG 2 facing
 		ARG 3 replacer
-	METHOD method_23468 (Ljava/util/Random;Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;)V
-		ARG 3 pos

mappings/net/minecraft/world/gen/treedecorator/TreeDecorator.mapping

@@ -1,10 +1,9 @@
 CLASS net/minecraft/class_4662 net/minecraft/world/gen/treedecorator/TreeDecorator
 	COMMENT Tree decorators can add additional blocks to trees, such as vines or beehives.
 	FIELD field_24962 TYPE_CODEC Lcom/mojang/serialization/Codec;
-	METHOD method_23469 generate (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Ljava/util/List;Ljava/util/List;)V
+	METHOD method_23469 generate (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Ljava/util/List;Ljava/util/List;Ljava/util/List;)V
 		ARG 1 world
 		ARG 2 replacer
-		ARG 3 random
 		ARG 4 logPositions
 		ARG 5 leavesPositions
 	METHOD method_23471 placeVine (Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;Lnet/minecraft/class_2746;)V

mappings/net/minecraft/world/gen/treedecorator/TrunkVineTreeDecorator.mapping

@@ -1,5 +1,5 @@
 CLASS net/minecraft/class_4664 net/minecraft/world/gen/treedecorator/TrunkVineTreeDecorator
 	FIELD field_24964 CODEC Lcom/mojang/serialization/Codec;
 	FIELD field_24965 INSTANCE Lnet/minecraft/class_4664;
-	METHOD method_23474 (Ljava/util/Random;Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;)V
+	METHOD method_23474 (Lnet/minecraft/class_5819;Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_2338;)V
 		ARG 3 pos

mappings/net/minecraft/world/gen/trunk/GiantTrunkPlacer.mapping

@@ -1,14 +1,5 @@
 CLASS net/minecraft/class_5214 net/minecraft/world/gen/trunk/GiantTrunkPlacer
 	FIELD field_24969 CODEC Lcom/mojang/serialization/Codec;
-	METHOD method_27399 setLog (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_4643;Lnet/minecraft/class_2338;III)V
+	METHOD method_27399 setLog (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_4643;Lnet/minecraft/class_2338;III)V
-		ARG 0 world
-		ARG 1 replacer
-		ARG 2 random
-		ARG 3 pos
-		ARG 4 config
-		ARG 5 startPos
-		ARG 6 x
-		ARG 7 y
-		ARG 8 z
 	METHOD method_28900 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
 		ARG 0 instance

mappings/net/minecraft/world/gen/trunk/LargeOakTrunkPlacer.mapping

@@ -3,18 +3,14 @@ CLASS net/minecraft/class_5212 net/minecraft/world/gen/trunk/LargeOakTrunkPlacer
 	METHOD method_27391 isHighEnough (II)Z
 		ARG 1 treeHeight
 		ARG 2 height
-	METHOD method_27392 makeBranches (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;ILnet/minecraft/class_2338;Ljava/util/List;Lnet/minecraft/class_4643;)V
+	METHOD method_27392 makeBranches (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;ILnet/minecraft/class_2338;Ljava/util/List;Lnet/minecraft/class_4643;)V
 		ARG 1 world
 		ARG 2 replacer
-		ARG 3 random
 		ARG 4 treeHeight
 		ARG 5 startPos
 		ARG 6 branchPositions
 		ARG 7 config
-	METHOD method_27393 makeOrCheckBranch (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;ZLnet/minecraft/class_4643;)Z
+	METHOD method_27393 makeOrCheckBranch (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;ZLnet/minecraft/class_4643;)Z
-		ARG 1 world
-		ARG 2 replacer
-		ARG 3 random
 		ARG 4 startPos
 		ARG 5 branchPos
 		ARG 6 make

mappings/net/minecraft/world/gen/trunk/TrunkPlacer.mapping

@@ -9,35 +9,21 @@ CLASS net/minecraft/class_5141 net/minecraft/world/gen/trunk/TrunkPlacer
 		ARG 1 baseHeight
 		ARG 2 firstRandomHeight
 		ARG 3 secondRandomHeight
-	METHOD method_26991 generate (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;ILnet/minecraft/class_2338;Lnet/minecraft/class_4643;)Ljava/util/List;
+	METHOD method_26991 generate (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;ILnet/minecraft/class_2338;Lnet/minecraft/class_4643;)Ljava/util/List;
 		COMMENT Generates the trunk blocks and return a list of tree nodes to place foliage around
 		ARG 1 world
 		ARG 2 replacer
-		ARG 3 random
 		ARG 4 height
 		ARG 5 startPos
 		ARG 6 config
-	METHOD method_26993 getHeight (Ljava/util/Random;)I
+	METHOD method_26993 getHeight (Lnet/minecraft/class_5819;)I
-		ARG 1 random
+	METHOD method_27400 setToDirt (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_4643;)V
-	METHOD method_27400 setToDirt (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_4643;)V
 		ARG 0 world
 		ARG 1 replacer
-		ARG 2 random
 		ARG 3 pos
 		ARG 4 config
-	METHOD method_27401 trySetState (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_4643;)V
+	METHOD method_27401 trySetState (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338$class_2339;Lnet/minecraft/class_4643;)V
-		ARG 0 world
+	METHOD method_27402 getAndSetState (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_4643;Ljava/util/function/Function;)Z
-		ARG 1 replacer
-		ARG 2 random
-		ARG 3 pos
-		ARG 4 config
-	METHOD method_27402 getAndSetState (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_4643;Ljava/util/function/Function;)Z
-		ARG 0 world
-		ARG 1 replacer
-		ARG 2 random
-		ARG 3 pos
-		ARG 4 config
-		ARG 5 stateProvider
 	METHOD method_27403 canGenerate (Lnet/minecraft/class_3746;Lnet/minecraft/class_2338;)Z
 		ARG 0 world
 		ARG 1 pos
@@ -52,9 +38,4 @@ CLASS net/minecraft/class_5141 net/minecraft/world/gen/trunk/TrunkPlacer
 		ARG 0 placer
 	METHOD method_28907 (Lnet/minecraft/class_5141;)Ljava/lang/Integer;
 		ARG 0 placer
-	METHOD method_35375 getAndSetState (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Ljava/util/Random;Lnet/minecraft/class_2338;Lnet/minecraft/class_4643;)Z
+	METHOD method_35375 getAndSetState (Lnet/minecraft/class_3746;Ljava/util/function/BiConsumer;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;Lnet/minecraft/class_4643;)Z
-		ARG 0 world
-		ARG 1 replacer
-		ARG 2 random
-		ARG 3 pos
-		ARG 4 config

mappings/net/minecraft/world/poi/PointOfInterestStorage.mapping

@@ -61,13 +61,12 @@ CLASS net/minecraft/class_4153 net/minecraft/world/poi/PointOfInterestStorage
 		ARG 2 poiType
 	METHOD method_20004 (Ljava/util/function/Predicate;Lnet/minecraft/class_4156;)Z
 		ARG 1 poi
-	METHOD method_20005 getPosition (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_4153$class_4155;Lnet/minecraft/class_2338;ILjava/util/Random;)Ljava/util/Optional;
+	METHOD method_20005 getPosition (Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_4153$class_4155;Lnet/minecraft/class_2338;ILnet/minecraft/class_5819;)Ljava/util/Optional;
 		ARG 1 typePredicate
 		ARG 2 positionPredicate
 		ARG 3 occupationStatus
 		ARG 4 pos
 		ARG 5 radius
-		ARG 6 random
 	METHOD method_20006 getNearestPosition (Ljava/util/function/Predicate;Lnet/minecraft/class_2338;ILnet/minecraft/class_4153$class_4155;)Ljava/util/Optional;
 		ARG 1 typePredicate
 		ARG 2 pos

mappings/net/minecraft/world/spawner/PatrolSpawner.mapping

@@ -4,9 +4,8 @@ CLASS net/minecraft/class_3769 net/minecraft/world/spawner/PatrolSpawner
 	COMMENT <p>Pillager spawns in pillager outposts are controlled at
 	COMMENT {@link net.minecraft.world.gen.chunk.ChunkGenerator#getEntitySpawnList}.
 	FIELD field_16652 cooldown I
-	METHOD method_16575 spawnPillager (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Ljava/util/Random;Z)Z
+	METHOD method_16575 spawnPillager (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;Z)Z
 		ARG 1 world
 		ARG 2 pos
-		ARG 3 random
 		ARG 4 captain
 			COMMENT whether the pillager is the captain of a patrol