Update to 1.21.1

README.md

@@ -40,7 +40,7 @@ How To (Plugin Developers)
 <dependency>
     <groupId>io.papermc.paper</groupId>
     <artifactId>paper-api</artifactId>
-    <version>1.21-R0.1-SNAPSHOT</version>
+    <version>1.21.1-R0.1-SNAPSHOT</version>
     <scope>provided</scope>
 </dependency>
 ```
@@ -53,7 +53,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly("io.papermc.paper:paper-api:1.21-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT")
 }
 
 java {

build.gradle.kts

@@ -67,7 +67,7 @@ repositories {
 }
 
 dependencies {
-    paramMappings("net.fabricmc:yarn:1.21+build.1:mergedv2")
+    paramMappings("net.fabricmc:yarn:1.21.1+build.3:mergedv2")
     remapper("net.fabricmc:tiny-remapper:0.10.3:fat")
     decompiler("org.vineflower:vineflower:1.10.1")
     spigotDecompiler("io.papermc:patched-spigot-fernflower:0.1+build.13")

gradle.properties

@@ -1,6 +1,6 @@
 group=io.papermc.paper
-version=1.21-R0.1-SNAPSHOT
-mcVersion=1.21
+version=1.21.1-R0.1-SNAPSHOT
+mcVersion=1.21.1
 
 # Set to true while updating Minecraft version
 updatingMinecraft=false

patches/api/Convert-project-to-Gradle.patch

@@ -135,7 +135,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot-api</artifactId>
--    <version>1.21-R0.1-SNAPSHOT</version>
+-    <version>1.21.1-R0.1-SNAPSHOT</version>
 -    <packaging>jar</packaging>
 -
 -    <name>Spigot-API</name>

patches/server/API-to-get-a-BlockState-without-a-snapshot.patch

@@ -17,13 +17,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 @@ -0,0 +0,0 @@ public abstract class BlockEntity {
-         this.type = type;
          this.worldPosition = pos.immutable();
+         this.validateBlockState(state);
          this.blockState = state;
 +        this.persistentDataContainer = new CraftPersistentDataContainer(DATA_TYPE_REGISTRY); // Paper - always init
      }
  
-     public static BlockPos getPosFromTag(CompoundTag nbt) {
+     private void validateBlockState(BlockState state) {
 @@ -0,0 +0,0 @@ public abstract class BlockEntity {
  
      // CraftBukkit start - read container

patches/server/Fix-EntityArgument-suggestion-permissions-to-align-w.patch

@@ -16,7 +16,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              StringReader stringreader = new StringReader(suggestionsbuilder.getInput());
  
              stringreader.setCursor(suggestionsbuilder.getStart());
--            EntitySelectorParser argumentparserselector = new EntitySelectorParser(stringreader, icompletionprovider.hasPermission(2));
+-            EntitySelectorParser argumentparserselector = new EntitySelectorParser(stringreader, EntitySelectorParser.allowSelectors(icompletionprovider));
 +            // Paper start - Fix EntityArgument suggestion permissions
 +            final boolean permission = object instanceof CommandSourceStack stack
 +                    ? stack.bypassSelectorPermissions || stack.hasPermission(2, "minecraft.command.selector")

patches/server/Fix-entity-type-tags-suggestions-in-selectors.patch

@@ -103,10 +103,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      private boolean usesSelectors;
 +    public boolean parsingEntityArgumentSuggestions; // Paper - tell clients to ask server for suggestions for EntityArguments
  
-     public EntitySelectorParser(StringReader reader) {
-         this(reader, true);
-     }
- 
      public EntitySelectorParser(StringReader reader, boolean atAllowed) {
 +        // Paper start - tell clients to ask server for suggestions for EntityArguments
 +        this(reader, atAllowed, false);

patches/server/Prevent-block-entity-and-entity-crashes.patch

@@ -30,8 +30,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BlockEntity.java
 @@ -0,0 +0,0 @@ public abstract class BlockEntity {
-             return s + " // " + this.getClass().getCanonicalName();
-         });
+     public void fillCrashReportCategory(CrashReportCategory crashReportSection) {
+         crashReportSection.setDetail("Name", this::getNameForReporting);
          if (this.level != null) {
 -            CrashReportCategory.populateBlockDetails(crashReportSection, this.level, this.worldPosition, this.getBlockState());
 +            // Paper start - Prevent block entity and entity crashes

patches/server/Prevent-sending-oversized-item-data-in-equipment-and.patch

@@ -160,15 +160,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 @@ -0,0 +0,0 @@ public class ClientboundSetEquipmentPacket implements Packet<ClientGamePacketLis
      private final List<Pair<EquipmentSlot, ItemStack>> slots;
  
-     public ClientboundSetEquipmentPacket(int id, List<Pair<EquipmentSlot, ItemStack>> equipmentList) {
+     public ClientboundSetEquipmentPacket(int entityId, List<Pair<EquipmentSlot, ItemStack>> equipmentList) {
 +        // Paper start - data sanitization
-+        this(id, equipmentList, false);
++        this(entityId, equipmentList, false);
 +    }
-+    private boolean sanitize = false;
-+    public ClientboundSetEquipmentPacket(int id, List<Pair<EquipmentSlot, ItemStack>> equipmentList, boolean sanitize) {
++    private boolean sanitize;
++    public ClientboundSetEquipmentPacket(int entityId, List<Pair<EquipmentSlot, ItemStack>> equipmentList, boolean sanitize) {
 +        this.sanitize = sanitize;
 +        // Paper end - data sanitization
-         this.entity = id;
+         this.entity = entityId;
          this.slots = equipmentList;
      }
 @@ -0,0 +0,0 @@ public class ClientboundSetEquipmentPacket implements Packet<ClientGamePacketLis

patches/server/Setup-Gradle-project.patch

@@ -170,7 +170,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 -    <groupId>org.spigotmc</groupId>
 -    <artifactId>spigot</artifactId>
 -    <packaging>jar</packaging>
--    <version>1.21-R0.1-SNAPSHOT</version>
+-    <version>1.21.1-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>https://www.spigotmc.org/</url>
 -