Merge branch 'versions/1.21.x' into advancement-and-client-mappings

ParchmentMC · Nov 13, 2024 · 7c34139 · 7c34139
2 parents 7e2e32e + d99f0bb
commit 7c34139
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -36,7 +36,7 @@ writtenbooks {
 }
 
 compass {
-    version = '1.21'
+    version = '1.21.1'
 }
 
 repositories {
@@ -72,7 +72,7 @@ dependencies {
     remapper 'net.minecraftforge:ForgeAutoRenamingTool:1.0.2'
 
     // Enigma, gorgeous interface for editing mappings
-    enigma 'org.quiltmc:enigma-swing:2.4.0'
+    enigma 'org.quiltmc:enigma-swing:2.5.2'
 
     // ParchmentJAM, JAMMER integration for migrating mapping data
     jammer 'org.parchmentmc.jam:jam-parchment:0.1.0'

diff --git a/data/net/minecraft/client/renderer/ShaderInstance.mapping b/data/net/minecraft/client/renderer/ShaderInstance.mapping
@@ -17,8 +17,8 @@ CLASS net/minecraft/client/renderer/ShaderInstance
 		ARG 1 name
 	METHOD setDefaultUniforms (Lcom/mojang/blaze3d/vertex/VertexFormat$Mode;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lcom/mojang/blaze3d/platform/Window;)V
 		ARG 1 mode
-		ARG 2 projectionMatrix
-		ARG 3 frustrumMatrix
+		ARG 2 frustumMatrix
+		ARG 3 projectionMatrix
 		ARG 4 window
 	METHOD setSampler (Ljava/lang/String;Ljava/lang/Object;)V
 		ARG 1 name

diff --git a/data/net/minecraft/commands/arguments/EntityArgument.mapping b/data/net/minecraft/commands/arguments/EntityArgument.mapping
@@ -27,6 +27,9 @@ CLASS net/minecraft/commands/arguments/EntityArgument
 		ARG 2 builder
 	METHOD parse (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/commands/arguments/selector/EntitySelector;
 		ARG 1 reader
+	METHOD parse (Lcom/mojang/brigadier/StringReader;Z)Lnet/minecraft/commands/arguments/selector/EntitySelector;
+		ARG 1 reader
+		ARG 2 allowSelectors
 	CLASS Info
 		CLASS Template
 			METHOD <init> (Lnet/minecraft/commands/arguments/EntityArgument$Info;ZZ)V

diff --git a/data/net/minecraft/commands/arguments/GameProfileArgument.mapping b/data/net/minecraft/commands/arguments/GameProfileArgument.mapping
@@ -2,15 +2,16 @@ CLASS net/minecraft/commands/arguments/GameProfileArgument
 	METHOD getGameProfiles (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/util/Collection;
 		ARG 0 context
 		ARG 1 name
-	METHOD lambda$listSuggestions$1 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)V
-		ARG 1 offsetBuilder
 	METHOD lambda$parse$0 (Ljava/lang/String;Lnet/minecraft/commands/CommandSourceStack;)Ljava/util/Collection;
 		ARG 1 source
 	METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture;
 		ARG 1 context
 		ARG 2 builder
 	METHOD parse (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/commands/arguments/GameProfileArgument$Result;
 		ARG 1 reader
+	METHOD parse (Lcom/mojang/brigadier/StringReader;Z)Lnet/minecraft/commands/arguments/GameProfileArgument$Result;
+		ARG 0 reader
+		ARG 1 allowSelectors
 	CLASS Result
 		METHOD getNames (Lnet/minecraft/commands/CommandSourceStack;)Ljava/util/Collection;
 			ARG 1 source

diff --git a/data/net/minecraft/commands/arguments/ScoreHolderArgument.mapping b/data/net/minecraft/commands/arguments/ScoreHolderArgument.mapping
@@ -27,6 +27,9 @@ CLASS net/minecraft/commands/arguments/ScoreHolderArgument
 		ARG 1 builder
 	METHOD parse (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/commands/arguments/ScoreHolderArgument$Result;
 		ARG 1 reader
+	METHOD parse (Lcom/mojang/brigadier/StringReader;Z)Lnet/minecraft/commands/arguments/ScoreHolderArgument$Result;
+		ARG 1 reader
+		ARG 2 allowSelectors
 	CLASS Info
 		CLASS Template
 			METHOD <init> (Lnet/minecraft/commands/arguments/ScoreHolderArgument$Info;Z)V

diff --git a/data/net/minecraft/commands/arguments/selector/EntitySelectorParser.mapping b/data/net/minecraft/commands/arguments/selector/EntitySelectorParser.mapping
@@ -1,11 +1,11 @@
 CLASS net/minecraft/commands/arguments/selector/EntitySelectorParser
-	METHOD <init> (Lcom/mojang/brigadier/StringReader;)V
-		ARG 1 reader
 	METHOD <init> (Lcom/mojang/brigadier/StringReader;Z)V
 		ARG 1 reader
 		ARG 2 allowSelectors
 	METHOD addPredicate (Ljava/util/function/Predicate;)V
 		ARG 1 predicate
+	METHOD allowSelectors (Ljava/lang/Object;)Z
+		ARG 0 suggestionProvider
 	METHOD createAabb (DDD)Lnet/minecraft/world/phys/AABB;
 		ARG 1 sizeX
 		ARG 3 sizeY

diff --git a/data/net/minecraft/util/RandomSource.mapping b/data/net/minecraft/util/RandomSource.mapping
@@ -19,5 +19,5 @@ CLASS net/minecraft/util/RandomSource
 	METHOD setSeed (J)V
 		ARG 1 seed
 	METHOD triangle (DD)D
-		ARG 1 min
-		ARG 3 max
+		ARG 1 center
+		ARG 3 maxDeviation
diff --git a/data/net/minecraft/world/entity/Entity.mapping b/data/net/minecraft/world/entity/Entity.mapping
@@ -252,8 +252,12 @@ CLASS net/minecraft/world/entity/Entity
 		ARG 1 partialTick
 	METHOD getX (D)D
 		ARG 1 scale
+	METHOD getXRot ()F
+		COMMENT Gets the rotation of this entity around the x-axis (the pitch) in degrees.
 	METHOD getY (D)D
 		ARG 1 scale
+	METHOD getYRot ()F
+		COMMENT Gets the rotation of this entity around the y-axis (the yaw) in degrees.
 	METHOD getZ (D)D
 		ARG 1 scale
 	METHOD handleDamageEvent (Lnet/minecraft/world/damagesource/DamageSource;)V
@@ -627,6 +631,7 @@ CLASS net/minecraft/world/entity/Entity
 	METHOD setViewScale (D)V
 		ARG 0 renderDistWeight
 	METHOD setXRot (F)V
+		COMMENT Sets the rotation of this entity around the x-axis (the pitch) in degrees.
 		ARG 1 xRot
 	METHOD setYBodyRot (F)V
 		COMMENT Set the body Y rotation of the entity.
@@ -635,6 +640,7 @@ CLASS net/minecraft/world/entity/Entity
 		COMMENT Sets the head's Y rotation of the entity.
 		ARG 1 yHeadRot
 	METHOD setYRot (F)V
+		COMMENT Sets the rotation of this entity around the y-axis (the yaw) in degrees.
 		ARG 1 yRot
 	METHOD shouldBlockExplode (Lnet/minecraft/world/level/Explosion;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;F)Z
 		ARG 1 explosion

diff --git a/data/net/minecraft/world/entity/LivingEntity.mapping b/data/net/minecraft/world/entity/LivingEntity.mapping
@@ -193,6 +193,7 @@ CLASS net/minecraft/world/entity/LivingEntity
 	METHOD getMaxHealth ()F
 		COMMENT Returns the maximum health of the entity (what it is able to regenerate up to, what it spawned with, etc.)
 	METHOD getProjectile (Lnet/minecraft/world/item/ItemStack;)Lnet/minecraft/world/item/ItemStack;
+		COMMENT Gets an item stack available to this entity to be loaded into the provided weapon, or an empty item stack if no such item stack is available.
 		ARG 1 weaponStack
 	METHOD getRiddenInput (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/phys/Vec3;)Lnet/minecraft/world/phys/Vec3;
 		ARG 1 player

diff --git a/data/net/minecraft/world/entity/player/Player.mapping b/data/net/minecraft/world/entity/player/Player.mapping
@@ -172,6 +172,7 @@ CLASS net/minecraft/world/entity/player/Player
 	METHOD lambda$readAdditionalSaveData$2 (Lnet/minecraft/world/phys/Vec3;)V
 		ARG 1 currentImpulseImpactPos
 	METHOD magicCrit (Lnet/minecraft/world/entity/Entity;)V
+		COMMENT Called when the entity hit is dealt extra melee damage due to an enchantment.
 		ARG 1 entityHit
 	METHOD makeStuckInBlock (Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/phys/Vec3;)V
 		ARG 1 state
@@ -267,6 +268,7 @@ CLASS net/minecraft/world/entity/player/Player
 	METHOD setShoulderEntityRight (Lnet/minecraft/nbt/CompoundTag;)V
 		ARG 1 entityCompound
 	METHOD startAutoSpinAttack (IFLnet/minecraft/world/item/ItemStack;)V
+		COMMENT Starts the attack used by the Riptide enchantment.
 		ARG 1 ticks
 		ARG 2 damage
 		ARG 3 itemStack