Final update + Sanitize

build.gradle

@@ -33,10 +33,7 @@ writtenbooks {
 }
 
 compass {
-    version = '1.21.4-rc3'
-    migration {
-        targetVersion = '1.21.3'
-    }
+    version = '1.21.4'
 }
 
 repositories {

data/com/mojang/blaze3d/platform/NativeImage.mapping

@@ -201,13 +201,13 @@ CLASS com/mojang/blaze3d/platform/NativeImage
 			ARG 15 supportedByStb
 		METHOD getStbFormat (I)Lcom/mojang/blaze3d/platform/NativeImage$Format;
 			ARG 0 channels
-	CLASS InternalGlFormat
-		METHOD <init> (Ljava/lang/String;II)V
-			ARG 3 glFormat
 	CLASS WriteCallback
 		METHOD <init> (Ljava/nio/channels/WritableByteChannel;)V
 			ARG 1 output
 		METHOD invoke (JJI)V
 			ARG 1 context
 			ARG 3 data
 			ARG 5 size
+	CLASS InternalGlFormat
+		METHOD <init> (Ljava/lang/String;II)V
+			ARG 3 glFormat

data/net/minecraft/client/data/models/BlockModelGenerators.mapping

@@ -683,17 +683,32 @@ CLASS net/minecraft/client/data/models/BlockModelGenerators
 	METHOD wrapModels (Ljava/util/List;Ljava/util/function/UnaryOperator;)Ljava/util/List;
 		ARG 0 modelLocations
 		ARG 1 variantMapper
-	CLASS BlockEntityModelGenerator
-		METHOD <init> (Lnet/minecraft/client/data/models/BlockModelGenerators;Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/world/level/block/Block;)V
-			ARG 2 baseModel
-			ARG 3 particleBlock
-		METHOD create ([Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/client/data/models/BlockModelGenerators$BlockEntityModelGenerator;
-			ARG 1 blocks
-		METHOD createWithCustomBlockItemModel (Lnet/minecraft/client/data/models/model/ModelTemplate;[Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/client/data/models/BlockModelGenerators$BlockEntityModelGenerator;
-			ARG 1 modelTemplate
-			ARG 2 blocks
-		METHOD createWithoutBlockItem ([Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/client/data/models/BlockModelGenerators$BlockEntityModelGenerator;
-			ARG 1 blocks
+	CLASS PlantType
+		METHOD <init> (Ljava/lang/String;ILnet/minecraft/client/data/models/model/ModelTemplate;Lnet/minecraft/client/data/models/model/ModelTemplate;Z)V
+			ARG 3 blockTemplate
+			ARG 4 flowerPotTemplate
+			ARG 5 isEmissive
+		METHOD createItemModel (Lnet/minecraft/client/data/models/BlockModelGenerators;Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/resources/ResourceLocation;
+			ARG 1 generator
+			ARG 2 block
+		METHOD createItemModel (Lnet/minecraft/client/data/models/BlockModelGenerators;Lnet/minecraft/world/level/block/Block;)V
+			ARG 1 blockModelGenerator
+			ARG 2 block
+		METHOD getPlantTextureMapping (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/client/data/models/model/TextureMapping;
+			ARG 1 block
+		METHOD getTextureMapping (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/client/data/models/model/TextureMapping;
+			ARG 1 block
+	CLASS WoodProvider
+		METHOD <init> (Lnet/minecraft/client/data/models/BlockModelGenerators;Lnet/minecraft/client/data/models/model/TextureMapping;)V
+			ARG 2 logMapping
+		METHOD log (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/client/data/models/BlockModelGenerators$WoodProvider;
+			ARG 1 logBlock
+		METHOD logUVLocked (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/client/data/models/BlockModelGenerators$WoodProvider;
+			ARG 1 logBlock
+		METHOD logWithHorizontal (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/client/data/models/BlockModelGenerators$WoodProvider;
+			ARG 1 logBlock
+		METHOD wood (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/client/data/models/BlockModelGenerators$WoodProvider;
+			ARG 1 woodBlock
 	CLASS BlockFamilyProvider
 		METHOD <init> (Lnet/minecraft/client/data/models/BlockModelGenerators;Lnet/minecraft/client/data/models/model/TextureMapping;)V
 			ARG 2 mapping
@@ -739,35 +754,20 @@ CLASS net/minecraft/client/data/models/BlockModelGenerators
 			ARG 1 trapdoorBlock
 		METHOD wall (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/client/data/models/BlockModelGenerators$BlockFamilyProvider;
 			ARG 1 wallBlock
+	CLASS BlockEntityModelGenerator
+		METHOD <init> (Lnet/minecraft/client/data/models/BlockModelGenerators;Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/world/level/block/Block;)V
+			ARG 2 baseModel
+			ARG 3 particleBlock
+		METHOD create ([Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/client/data/models/BlockModelGenerators$BlockEntityModelGenerator;
+			ARG 1 blocks
+		METHOD createWithCustomBlockItemModel (Lnet/minecraft/client/data/models/model/ModelTemplate;[Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/client/data/models/BlockModelGenerators$BlockEntityModelGenerator;
+			ARG 1 modelTemplate
+			ARG 2 blocks
+		METHOD createWithoutBlockItem ([Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/client/data/models/BlockModelGenerators$BlockEntityModelGenerator;
+			ARG 1 blocks
 	CLASS BlockStateGeneratorSupplier
 		METHOD create (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/client/data/models/model/TextureMapping;Ljava/util/function/BiConsumer;)Lnet/minecraft/client/data/models/blockstates/BlockStateGenerator;
 			ARG 1 block
 			ARG 2 modelLocation
 			ARG 3 textureMapping
 			ARG 4 modelOutput
-	CLASS PlantType
-		METHOD <init> (Ljava/lang/String;ILnet/minecraft/client/data/models/model/ModelTemplate;Lnet/minecraft/client/data/models/model/ModelTemplate;Z)V
-			ARG 3 blockTemplate
-			ARG 4 flowerPotTemplate
-			ARG 5 isEmissive
-		METHOD createItemModel (Lnet/minecraft/client/data/models/BlockModelGenerators;Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/resources/ResourceLocation;
-			ARG 1 generator
-			ARG 2 block
-		METHOD createItemModel (Lnet/minecraft/client/data/models/BlockModelGenerators;Lnet/minecraft/world/level/block/Block;)V
-			ARG 1 blockModelGenerator
-			ARG 2 block
-		METHOD getPlantTextureMapping (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/client/data/models/model/TextureMapping;
-			ARG 1 block
-		METHOD getTextureMapping (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/client/data/models/model/TextureMapping;
-			ARG 1 block
-	CLASS WoodProvider
-		METHOD <init> (Lnet/minecraft/client/data/models/BlockModelGenerators;Lnet/minecraft/client/data/models/model/TextureMapping;)V
-			ARG 2 logMapping
-		METHOD log (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/client/data/models/BlockModelGenerators$WoodProvider;
-			ARG 1 logBlock
-		METHOD logUVLocked (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/client/data/models/BlockModelGenerators$WoodProvider;
-			ARG 1 logBlock
-		METHOD logWithHorizontal (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/client/data/models/BlockModelGenerators$WoodProvider;
-			ARG 1 logBlock
-		METHOD wood (Lnet/minecraft/world/level/block/Block;)Lnet/minecraft/client/data/models/BlockModelGenerators$WoodProvider;
-			ARG 1 woodBlock

data/net/minecraft/client/data/models/ItemModelGenerators.mapping

@@ -135,11 +135,11 @@ CLASS net/minecraft/client/data/models/ItemModelGenerators
 	METHOD getItemModelForTrimMaterial (Lnet/minecraft/resources/ResourceLocation;Ljava/lang/String;)Lnet/minecraft/resources/ResourceLocation;
 		ARG 1 modelLocation
 		ARG 2 trimId
-	CLASS TrimMaterialData
-		METHOD textureName (Lnet/minecraft/resources/ResourceKey;)Ljava/lang/String;
-			ARG 1 key
 	CLASS TrimModelData
 		METHOD name (Lnet/minecraft/core/Holder;)Ljava/lang/String;
 			ARG 1 armorMaterial
 		METHOD name (Lnet/minecraft/resources/ResourceLocation;)Ljava/lang/String;
 			ARG 1 name
+	CLASS TrimMaterialData
+		METHOD textureName (Lnet/minecraft/resources/ResourceKey;)Ljava/lang/String;
+			ARG 1 key

data/net/minecraft/client/data/models/ModelProvider.mapping

@@ -5,18 +5,6 @@ CLASS net/minecraft/client/data/models/ModelProvider
 		ARG 0 output
 		ARG 1 pathGetter
 		ARG 2 entries
-	CLASS BlockStateGeneratorCollector
-		METHOD accept (Ljava/lang/Object;)V
-			ARG 1 generator
-		METHOD lambda$validate$0 (Lnet/minecraft/core/Holder$Reference;)Z
-			ARG 0 block
-		METHOD lambda$validate$1 (Lnet/minecraft/core/Holder$Reference;)Z
-			ARG 1 block
-		METHOD lambda$validate$2 (Lnet/minecraft/core/Holder$Reference;)Lnet/minecraft/resources/ResourceLocation;
-			ARG 0 block
-		METHOD save (Lnet/minecraft/data/CachedOutput;Lnet/minecraft/data/PackOutput$PathProvider;)Ljava/util/concurrent/CompletableFuture;
-			ARG 1 output
-			ARG 2 pathProvider
 	CLASS ItemInfoCollector
 		METHOD lambda$finalizeAndValidate$2 (Lnet/minecraft/core/Holder$Reference;)Z
 			ARG 1 item
@@ -35,3 +23,15 @@ CLASS net/minecraft/client/data/models/ModelProvider
 		METHOD save (Lnet/minecraft/data/CachedOutput;Lnet/minecraft/data/PackOutput$PathProvider;)Ljava/util/concurrent/CompletableFuture;
 			ARG 1 output
 			ARG 2 pathProvider
+	CLASS BlockStateGeneratorCollector
+		METHOD accept (Ljava/lang/Object;)V
+			ARG 1 generator
+		METHOD lambda$validate$0 (Lnet/minecraft/core/Holder$Reference;)Z
+			ARG 0 block
+		METHOD lambda$validate$1 (Lnet/minecraft/core/Holder$Reference;)Z
+			ARG 1 block
+		METHOD lambda$validate$2 (Lnet/minecraft/core/Holder$Reference;)Lnet/minecraft/resources/ResourceLocation;
+			ARG 0 block
+		METHOD save (Lnet/minecraft/data/CachedOutput;Lnet/minecraft/data/PackOutput$PathProvider;)Ljava/util/concurrent/CompletableFuture;
+			ARG 1 output
+			ARG 2 pathProvider

data/net/minecraft/client/data/models/blockstates/Condition.mapping

@@ -5,12 +5,6 @@ CLASS net/minecraft/client/data/models/blockstates/Condition
 		ARG 0 conditions
 	METHOD validate (Lnet/minecraft/world/level/block/state/StateDefinition;)V
 		ARG 1 stateDefinition
-	CLASS CompositeCondition
-		METHOD <init> (Lnet/minecraft/client/data/models/blockstates/Condition$Operation;Ljava/util/List;)V
-			ARG 1 operation
-			ARG 2 subconditions
-		METHOD lambda$validate$0 (Lnet/minecraft/world/level/block/state/StateDefinition;Lnet/minecraft/client/data/models/blockstates/Condition;)V
-			ARG 1 condition
 	CLASS Operation
 		METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
 			ARG 3 id
@@ -44,3 +38,9 @@ CLASS net/minecraft/client/data/models/blockstates/Condition
 			ARG 1 property
 			ARG 2 startValue
 			ARG 3 otherValues
+	CLASS CompositeCondition
+		METHOD <init> (Lnet/minecraft/client/data/models/blockstates/Condition$Operation;Ljava/util/List;)V
+			ARG 1 operation
+			ARG 2 subconditions
+		METHOD lambda$validate$0 (Lnet/minecraft/world/level/block/state/StateDefinition;Lnet/minecraft/client/data/models/blockstates/Condition;)V
+			ARG 1 condition

data/net/minecraft/client/data/models/blockstates/MultiPartGenerator.mapping

@@ -18,14 +18,14 @@ CLASS net/minecraft/client/data/models/blockstates/MultiPartGenerator
 		ARG 2 variants
 	METHOD with (Lnet/minecraft/client/data/models/blockstates/Variant;)Lnet/minecraft/client/data/models/blockstates/MultiPartGenerator;
 		ARG 1 variant
-	CLASS ConditionalEntry
-		METHOD <init> (Lnet/minecraft/client/data/models/blockstates/Condition;Ljava/util/List;)V
-			ARG 1 condition
-			ARG 2 variants
 	CLASS Entry
 		METHOD <init> (Ljava/util/List;)V
 			ARG 1 variants
 		METHOD decorate (Lcom/google/gson/JsonObject;)V
 			ARG 1 json
 		METHOD validate (Lnet/minecraft/world/level/block/state/StateDefinition;)V
 			ARG 1 stateDefinition
+	CLASS ConditionalEntry
+		METHOD <init> (Lnet/minecraft/client/data/models/blockstates/Condition;Ljava/util/List;)V
+			ARG 1 condition
+			ARG 2 variants

data/net/minecraft/client/data/models/blockstates/PropertyDispatch.mapping

@@ -181,21 +181,21 @@ CLASS net/minecraft/client/data/models/blockstates/PropertyDispatch
 			ARG 4 value4
 			ARG 5 value5
 			ARG 6 variant
-	CLASS PentaFunction
-		METHOD apply (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	CLASS TriFunction
+		METHOD apply (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 p1
 			ARG 2 p2
 			ARG 3 p3
-			ARG 4 p4
-			ARG 5 p5
 	CLASS QuadFunction
 		METHOD apply (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 p1
 			ARG 2 p2
 			ARG 3 p3
 			ARG 4 p4
-	CLASS TriFunction
-		METHOD apply (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+	CLASS PentaFunction
+		METHOD apply (Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
 			ARG 1 p1
 			ARG 2 p2
 			ARG 3 p3
+			ARG 4 p4
+			ARG 5 p5

data/net/minecraft/client/gui/screens/achievement/StatsScreen.mapping

@@ -18,14 +18,6 @@ CLASS net/minecraft/client/gui/screens/achievement/StatsScreen
 		ARG 1 listener
 	METHOD setActiveList (Lnet/minecraft/client/gui/components/ObjectSelectionList;)V
 		ARG 1 activeList
-	CLASS GeneralStatisticsList
-		METHOD <init> (Lnet/minecraft/client/gui/screens/achievement/StatsScreen;Lnet/minecraft/client/Minecraft;)V
-			ARG 2 minecraft
-		METHOD lambda$new$0 (Lnet/minecraft/stats/Stat;)Ljava/lang/String;
-			ARG 0 stat
-		CLASS Entry
-			METHOD <init> (Lnet/minecraft/client/gui/screens/achievement/StatsScreen$GeneralStatisticsList;Lnet/minecraft/stats/Stat;)V
-				ARG 2 stat
 	CLASS ItemStatisticsList
 		METHOD <init> (Lnet/minecraft/client/gui/screens/achievement/StatsScreen;Lnet/minecraft/client/Minecraft;)V
 			ARG 2 minecraft
@@ -62,3 +54,11 @@ CLASS net/minecraft/client/gui/screens/achievement/StatsScreen
 		CLASS MobRow
 			METHOD <init> (Lnet/minecraft/client/gui/screens/achievement/StatsScreen$MobsStatisticsList;Lnet/minecraft/world/entity/EntityType;)V
 				ARG 2 entityType
+	CLASS GeneralStatisticsList
+		METHOD <init> (Lnet/minecraft/client/gui/screens/achievement/StatsScreen;Lnet/minecraft/client/Minecraft;)V
+			ARG 2 minecraft
+		METHOD lambda$new$0 (Lnet/minecraft/stats/Stat;)Ljava/lang/String;
+			ARG 0 stat
+		CLASS Entry
+			METHOD <init> (Lnet/minecraft/client/gui/screens/achievement/StatsScreen$GeneralStatisticsList;Lnet/minecraft/stats/Stat;)V
+				ARG 2 stat

data/net/minecraft/client/particle/BreakingItemParticle.mapping

@@ -29,10 +29,6 @@ CLASS net/minecraft/client/particle/BreakingItemParticle
 		ARG 4 y
 		ARG 6 z
 		ARG 8 stack
-	CLASS ItemParticleProvider
-		METHOD calculateState (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/client/multiplayer/ClientLevel;)Lnet/minecraft/client/renderer/item/ItemStackRenderState;
-			ARG 1 stack
-			ARG 2 level
 	CLASS Provider
 		METHOD createParticle (Lnet/minecraft/core/particles/ItemParticleOption;Lnet/minecraft/client/multiplayer/ClientLevel;DDDDDD)Lnet/minecraft/client/particle/Particle;
 			ARG 1 type
@@ -63,3 +59,7 @@ CLASS net/minecraft/client/particle/BreakingItemParticle
 			ARG 9 xSpeed
 			ARG 11 ySpeed
 			ARG 13 zSpeed
+	CLASS ItemParticleProvider
+		METHOD calculateState (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/client/multiplayer/ClientLevel;)Lnet/minecraft/client/renderer/item/ItemStackRenderState;
+			ARG 1 stack
+			ARG 2 level

data/net/minecraft/client/renderer/RenderStateShard.mapping

@@ -5,29 +5,50 @@ CLASS net/minecraft/client/renderer/RenderStateShard
 		ARG 3 clearState
 	METHOD setupGlintTexturing (F)V
 		ARG 0 scale
+	CLASS CullStateShard
+		METHOD <init> (Z)V
+			ARG 1 useCull
+	CLASS LineStateShard
+		METHOD <init> (Ljava/util/OptionalDouble;)V
+			ARG 1 width
+	CLASS ShaderStateShard
+		METHOD <init> (Ljava/util/function/Supplier;)V
+			ARG 1 shader
+		METHOD <init> (Lnet/minecraft/client/renderer/ShaderProgram;)V
+			ARG 1 shader
 	CLASS BooleanStateShard
 		METHOD <init> (Ljava/lang/String;Ljava/lang/Runnable;Ljava/lang/Runnable;Z)V
 			ARG 1 name
 			ARG 2 setupState
 			ARG 3 clearState
 			ARG 4 enabled
-	CLASS CullStateShard
+	CLASS OverlayStateShard
 		METHOD <init> (Z)V
-			ARG 1 useCull
+			ARG 1 useOverlay
+	CLASS TextureStateShard
+		METHOD <init> (Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/util/TriState;Z)V
+			ARG 1 texture
+			ARG 2 blur
+			ARG 3 mipmap
+		METHOD <init> (Lnet/minecraft/resources/ResourceLocation;ZZ)V
+			ARG 1 texture
+			ARG 2 blur
+			ARG 3 mipmap
+	CLASS LightmapStateShard
+		METHOD <init> (Z)V
+			ARG 1 useLightmap
 	CLASS DepthTestStateShard
 		METHOD <init> (Ljava/lang/String;I)V
 			ARG 1 functionName
 			ARG 2 depthFunc
+	CLASS WriteMaskStateShard
+		METHOD <init> (ZZ)V
+			ARG 1 writeColor
+			ARG 2 writeDepth
 	CLASS EmptyTextureStateShard
 		METHOD <init> (Ljava/lang/Runnable;Ljava/lang/Runnable;)V
 			ARG 1 setupState
 			ARG 2 clearState
-	CLASS LightmapStateShard
-		METHOD <init> (Z)V
-			ARG 1 useLightmap
-	CLASS LineStateShard
-		METHOD <init> (Ljava/util/OptionalDouble;)V
-			ARG 1 width
 	CLASS MultiTextureStateShard
 		METHOD <init> (Lcom/google/common/collect/ImmutableList;)V
 			ARG 1 textures
@@ -42,24 +63,3 @@ CLASS net/minecraft/client/renderer/RenderStateShard
 		METHOD <init> (FF)V
 			ARG 1 u
 			ARG 2 v
-	CLASS OverlayStateShard
-		METHOD <init> (Z)V
-			ARG 1 useOverlay
-	CLASS ShaderStateShard
-		METHOD <init> (Ljava/util/function/Supplier;)V
-			ARG 1 shader
-		METHOD <init> (Lnet/minecraft/client/renderer/ShaderProgram;)V
-			ARG 1 shader
-	CLASS TextureStateShard
-		METHOD <init> (Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/util/TriState;Z)V
-			ARG 1 texture
-			ARG 2 blur
-			ARG 3 mipmap
-		METHOD <init> (Lnet/minecraft/resources/ResourceLocation;ZZ)V
-			ARG 1 texture
-			ARG 2 blur
-			ARG 3 mipmap
-	CLASS WriteMaskStateShard
-		METHOD <init> (ZZ)V
-			ARG 1 writeColor
-			ARG 2 writeDepth