Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@2b694c9 Updated Upstream (Paper)
PurpurMC/Purpur@96d7ef7 Updated Upstream (Paper)
PurpurMC/Purpur@e141f68 Updated Upstream (Paper)
PurpurMC/Purpur@7f6f667 Updated Upstream (Pufferfish)
PurpurMC/Purpur@de20ba9 ignore `minecart.max-speed` config value if using minecart experiment, closes #1618

gradle.properties

@@ -4,7 +4,7 @@ version = 1.21.3-R0.1-SNAPSHOT
 mcVersion = 1.21.3
 
 # Upstream commit
-purpurCommit = 504f31151f25cde91d686ef5ab7b0736f75168db
+purpurCommit = de20ba9e3ecf1a5cddc1aa228c4699f0f3c88052
 
 # Gradle
 org.gradle.caching = true

patches/server/0001-Init.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Init
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index c673a2cf682378aac38d047b999d8a1731f7569d..691b475a1d5577170e11a69700c2d98dd8192274 100644
+index 77602e4445b1b45a17e5552ac6a769e0ed46ebc7..82ca36909d4f4e4910f23812fbe2c22fdd7ab957 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -25,7 +25,7 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider {
@@ -17,7 +17,7 @@ index c673a2cf682378aac38d047b999d8a1731f7569d..691b475a1d5577170e11a69700c2d98d
      // Paper start
      implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
      implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
-@@ -103,14 +103,14 @@ tasks.jar {
+@@ -118,14 +118,14 @@ tasks.jar {
          val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",

patches/removed/server/0002-Pufferfish-s-yaml-changes.patch → patches/server/0002-Pufferfish-s-yaml-changes.patch

@@ -6,12 +6,12 @@ Subject: [PATCH] Pufferfish's yaml changes
 Include Simple-YAML repo and sync snakeyaml version to API's one
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 99ba2fc1fd9d442f26e32ce29bd61b70e07e246d..f4a9915f520fa55a5186caedd355b85d0f631b71 100644
+index 82ca36909d4f4e4910f23812fbe2c22fdd7ab957..f66407a02d39785b5f6980f1299a4402c14c1b81 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -12,6 +12,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
+@@ -24,6 +24,12 @@ abstract class MockitoAgentProvider : CommandLineArgumentProvider {
  }
- val alsoShade: Configuration by configurations.creating
+ // Paper end - configure mockito agent that is needed in newer java versions
 
 +// Kiterino start - Pufferfish's yaml changes
 +repositories {
@@ -22,12 +22,12 @@ index 99ba2fc1fd9d442f26e32ce29bd61b70e07e246d..f4a9915f520fa55a5186caedd355b85d
  dependencies {
      implementation(project(":kiterino-api")) // Kiterino - Init
      // Paper start
-@@ -48,7 +54,7 @@ dependencies {
+@@ -61,7 +67,7 @@ dependencies {
      runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18")
 
      // Pufferfish start
 -    implementation("org.yaml:snakeyaml:1.32")
-+    implementation("org.yaml:snakeyaml:2.2") // Kiterino start - Sync snakeyaml to API's version - Pufferfish's yaml changes
++    implementation("org.yaml:snakeyaml:2.2") // Kiterino - Sync snakeyaml to API's version - Pufferfish's yaml changes
      implementation ("com.github.carleslc.Simple-YAML:Simple-Yaml:1.8.4") { // Purpur
          exclude(group="org.yaml", module="snakeyaml")
      }

patches/server/0002-Hide-irrelevant-compilation-warnings.patch → patches/server/0003-Hide-irrelevant-compilation-warnings.patch

@@ -5,17 +5,10 @@ Subject: [PATCH] Hide irrelevant compilation warnings
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 691b475a1d5577170e11a69700c2d98dd8192274..0fa47955027052c6df301a2206e4897236a90ddb 100644
+index f66407a02d39785b5f6980f1299a4402c14c1b81..a69a1ca3fc10df9f7ad08500abb8b7dfd3e352a3 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -1,4 +1,5 @@
--import io.papermc.paperweight.util.*
-+import io.papermc.paperweight.util.Git
-+import io.papermc.paperweight.util.path
- import java.time.Instant
-
- plugins {
-@@ -255,3 +256,12 @@ tasks.registerRunTask("runReobfPaperclip") {
+@@ -276,3 +276,12 @@ tasks.registerRunTask("runReobfPaperclip") {
      classpath(rootProject.tasks.named<io.papermc.paperweight.tasks.CreatePaperclipJar>("createReobfPaperclipJar").flatMap { it.outputZip })
      mainClass.set(null as String?)
  }

patches/server/0003-Rebrand.patch → patches/server/0004-Rebrand.patch

@@ -40,18 +40,18 @@ index 90b3526479320064378f2cde6c2f2b8e48a59ba6..70145bafa7c9c45a6f7a7a6854e9eefa
                  .completer(new ConsoleCommandCompleter(this.server))
                  .option(LineReader.Option.COMPLETE_IN_WORD, true);
 diff --git a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
-index a6e5950b5875cafd734300cdfbf58f5d3736f3c8..aeb739d8d0f1178bcbade4913b3391f0808dbf0d 100644
+index 3099c21ee589acf6edff5903a23673adf489024f..b49360050a81ce984e7f9fdd04894be296648540 100644
 --- a/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
 +++ b/src/main/java/io/papermc/paper/ServerBuildInfoImpl.java
-@@ -32,6 +32,7 @@ public record ServerBuildInfoImpl(
-
+@@ -33,6 +33,7 @@ public record ServerBuildInfoImpl(
      private static final String BRAND_PAPER_NAME = "Paper";
+     private static final String BRAND_PUFFERFISH_NAME = "Pufferfish"; // Purpur
      private static final String BRAND_PURPUR_NAME = "Purpur"; // Purpur
 +    private static final String BRAND_KITERINO_NAME = "Kiterino"; // Kiterino - Rebrand
 
      private static final String BUILD_DEV = "DEV";
 
-@@ -43,9 +44,9 @@ public record ServerBuildInfoImpl(
+@@ -44,9 +45,9 @@ public record ServerBuildInfoImpl(
          this(
              getManifestAttribute(manifest, ATTRIBUTE_BRAND_ID)
                  .map(Key::key)
@@ -63,12 +63,12 @@ index a6e5950b5875cafd734300cdfbf58f5d3736f3c8..aeb739d8d0f1178bcbade4913b3391f0
              SharedConstants.getCurrentVersion().getId(),
              SharedConstants.getCurrentVersion().getName(),
              getManifestAttribute(manifest, ATTRIBUTE_BUILD_NUMBER)
-@@ -62,7 +63,7 @@ public record ServerBuildInfoImpl(
+@@ -63,7 +64,7 @@ public record ServerBuildInfoImpl(
 
      @Override
      public boolean isBrandCompatible(final @NotNull Key brandId) {
--        return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID); // Purpur
-+        return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID) || brandId.equals(BRAND_PURPUR_ID); // Purpur // Kiterino - Rebrand
+-        return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID) || brandId.equals(BRAND_PUFFERFISH_ID); // Purpur
++        return brandId.equals(this.brandId) || brandId.equals(BRAND_PAPER_ID) || brandId.equals(BRAND_PUFFERFISH_ID) || brandId.equals(BRAND_PURPUR_ID); // Purpur // Kiterino - Rebrand
      }
 
      @Override

patches/server/0006-Init-Kiterino-configs.patch → patches/server/0007-Init-Kiterino-configs.patch

@@ -19,7 +19,7 @@ index 0000000000000000000000000000000000000000..0d0312744369b332ed0dfd171c060fc9
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index e9ad8e2ac267c46df80e884308df8bb12d0deeff..d020f6158228f0399f597dfe40437c557aa73205 100644
+index 7a442fb4cf78bcb1268359ee41a6de138edb76b6..b6c9c7732a9eddec41111cedaec50feaa7cb2abb 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -229,6 +229,15 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface
@@ -39,7 +39,7 @@ index e9ad8e2ac267c46df80e884308df8bb12d0deeff..d020f6158228f0399f597dfe40437c55
          this.paperConfigurations.initializeGlobalConfiguration(this.registryAccess());
          this.paperConfigurations.initializeWorldDefaultsConfiguration(this.registryAccess());
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index c5311db98e6a5fb48cbbc6f60874fd3edb475dd3..722a8e774fee5433b1e55fae8214e1a1bcaba48a 100644
+index 34e8eb828be517d9ee3973597c74c5cac3d75c99..760f7105d9d4d6277a354d387827c273edb545b5 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -175,6 +175,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable, ca.spottedl
@@ -85,10 +85,10 @@ index 81922bf93f8a96e6cf05944ca98a82cc5945a6c6..6df57f213eca74b00842e9c2ee292ae9
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 5bce26e9671aab15ac4bac9a0d00b5184bef74ea..5fbb2740a21a84dbae3c6ec6d8e144b72021cccd 100644
+index 430407b0cf06ba337c59cd576c7e40a8e5fe8229..31fcdc4e2fecc2fbf03bd53bd881a78e82582b4f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -191,6 +191,14 @@ public class Main {
+@@ -197,6 +197,14 @@ public class Main {
                          .defaultsTo("Unknown Server")
                          .describedAs("Name");
                  // Paper end

patches/server/0008-Red-tint-API.patch → patches/server/0009-Red-tint-API.patch

@@ -42,7 +42,7 @@ index 802de2ff74b490ea73c415739375a0169fce9f2f..f191e86c6d3a76225be95914ba521492
          this.oldSize = buf.readDouble();
          this.newSize = buf.readDouble();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 49f69a42dbf35ac812b5bd53f395c3de8b332c19..55ddb8b29fdd678a60e02d6c0d9bc88a61058553 100644
+index e7600715c0b063ef74ecd29ff4bba927d4e91519..985aa95a90867187f6d1c55bd21cc7b670b883a5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -3675,4 +3675,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

patches/server/0009-Forced-panic-mode-API.patch → patches/server/0010-Forced-panic-mode-API.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Forced panic mode API
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 31326cc83130e4226aee443be880c00c2adc7ab0..aa51fd2feffec755ef0752d9f66652238876ada6 100644
+index aa171a1afb9800e6ec84f6b4f1b28e44177752f7..201d547b3b004edcdd1b18368eea472a81a90312 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -306,6 +306,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -16,7 +16,7 @@ index 31326cc83130e4226aee443be880c00c2adc7ab0..aa51fd2feffec755ef0752d9f6665223
      public boolean wasTouchingWater;
      protected Object2DoubleMap<TagKey<Fluid>> fluidHeight;
      protected boolean wasEyeInWater;
-@@ -961,6 +962,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -964,6 +965,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              this.clearFire();
          }
 

patches/server/0010-Allow-setting-entity-s-rider.patch → patches/server/0011-Allow-setting-entity-s-rider.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Allow setting entity's rider
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index aa51fd2feffec755ef0752d9f66652238876ada6..2ecc051c102e5d4d5f0e75fa3888c5a8e6a9261e 100644
+index 201d547b3b004edcdd1b18368eea472a81a90312..b431f627cadd264478f573b167052a86e439be37 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3347,6 +3347,21 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3350,6 +3350,21 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          }
      }
 

patches/server/0011-Item-Modifiers-API.patch → patches/server/0012-Item-Modifiers-API.patch

@@ -767,7 +767,7 @@ index 2490a42c9c35c7e080279ef8566288a28362d167..c4eb48cfcf363da7968c0022919bc23b
      private final boolean symmetrical;
 
 diff --git a/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java b/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java
-index 12f95bee2a69fd5df7c4a165537e01299e60c5f6..4aa41825806f6baa0c07a1d8c085428a35912bab 100644
+index d7ce86752e4138cdd3844b3374609753aa20f9ea..4a111a9a71d462c12053ca339b74246c82818484 100644
 --- a/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java
 +++ b/src/main/java/net/minecraft/world/item/crafting/ShapelessRecipe.java
 @@ -27,8 +27,8 @@ public class ShapelessRecipe implements CraftingRecipe {
@@ -780,7 +780,7 @@ index 12f95bee2a69fd5df7c4a165537e01299e60c5f6..4aa41825806f6baa0c07a1d8c085428a
 +    public final List<Ingredient> ingredients; // Kiterino - Item Modification API
      @Nullable
      private PlacementInfo placementInfo;
-
+     private final boolean isBukkit; // Pufferfish
 diff --git a/src/main/java/net/minecraft/world/item/crafting/SingleItemRecipe.java b/src/main/java/net/minecraft/world/item/crafting/SingleItemRecipe.java
 index 834a874beedeba65d4f6425189b7e1739a9411bf..d37d53914eeca66d76892f864b55bd81485f70d1 100644
 --- a/src/main/java/net/minecraft/world/item/crafting/SingleItemRecipe.java

patches/server/0015-Parse-items-in-show_item-hover-event.patch → patches/server/0016-Parse-items-in-show_item-hover-event.patch

@@ -23,7 +23,7 @@ index 25eafe3b3cce238ebd556ac894bb59c549c27e48..48f6ee0a3ac1f3276d90229aafe42e16
      public static boolean preventCreativeItemOverride;
      private static void preventCreativeItemsOverride() {
 diff --git a/src/main/java/me/sosedik/kiterino/modifier/item/ItemModifiersHandlerImpl.java b/src/main/java/me/sosedik/kiterino/modifier/item/ItemModifiersHandlerImpl.java
-index 6a5a61def44c7c5a3e9fb76c825893e59ef05c54..34e4c1ff35c3e976d1a3dc1cb856dae4bee5f0d8 100644
+index c6d52745ec4b99191c8bd366d8360316eca9faa2..ad238f0e17c70bcc0c637ff03ae4a7140ef29dc7 100644
 --- a/src/main/java/me/sosedik/kiterino/modifier/item/ItemModifiersHandlerImpl.java
 +++ b/src/main/java/me/sosedik/kiterino/modifier/item/ItemModifiersHandlerImpl.java
 @@ -22,6 +22,8 @@ import net.minecraft.advancements.AdvancementHolder;

patches/server/0017-Data-driven-items.patch → patches/server/0018-Data-driven-items.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Data-driven items
 
 
 diff --git a/src/main/java/io/papermc/paper/registry/PaperRegistries.java b/src/main/java/io/papermc/paper/registry/PaperRegistries.java
-index b81d0d906789ef2ff3759395821316462aacf323..e65060f8361a5bcaa3b8f3e7fe920ab306dc763e 100644
+index 132afec6bceb6c866de0aeb83db9613d4e74e2e7..ae5850c9f5d4187341c8357a79a7c1a8f9402001 100644
 --- a/src/main/java/io/papermc/paper/registry/PaperRegistries.java
 +++ b/src/main/java/io/papermc/paper/registry/PaperRegistries.java
 @@ -87,7 +87,7 @@ public final class PaperRegistries {
@@ -48,14 +48,14 @@ index 1e9a0143bc3b70dfc5e129a0fe849ff3e01447ab..7ed31220736afedd41dabc0343e18e22
  }
 diff --git a/src/main/java/me/sosedik/kiterino/registry/data/KiterinoItemRegistryEntity.java b/src/main/java/me/sosedik/kiterino/registry/data/KiterinoItemRegistryEntity.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..a71123cbc2cc1b3a4496f4bf0e9a782279f6ce7a
+index 0000000000000000000000000000000000000000..eddac4503a7fac252c1c738d50d8363a4890ac89
 --- /dev/null
 +++ b/src/main/java/me/sosedik/kiterino/registry/data/KiterinoItemRegistryEntity.java
 @@ -0,0 +1,145 @@
 +package me.sosedik.kiterino.registry.data;
 +
 +import io.papermc.paper.datacomponent.DataComponentType;
-+import io.papermc.paper.datacomponent.PaperComponentType;
++import io.papermc.paper.datacomponent.PaperDataComponentType;
 +import io.papermc.paper.registry.PaperRegistryBuilder;
 +import io.papermc.paper.registry.TypedKey;
 +import io.papermc.paper.registry.data.util.Conversions;
@@ -174,10 +174,10 @@ index 0000000000000000000000000000000000000000..a71123cbc2cc1b3a4496f4bf0e9a7822
 +				var properties = new Item.Properties();
 +				properties.setId(ResourceKey.create(Registries.ITEM, ResourceLocation.fromNamespaceAndPath(this.itemKey.key().namespace(), this.itemKey.key().value())));
 +				this.components.forEach((type, value) -> {
-+					if (type instanceof PaperComponentType.ValuedImpl<?, ?> valued) {
-+						setData(properties, (PaperComponentType<Object, Object>) valued, value);
++					if (type instanceof PaperDataComponentType.ValuedImpl<?, ?> valued) {
++						setData(properties, (PaperDataComponentType<Object, Object>) valued, value);
 +					} else {
-+						setData(properties, (PaperComponentType.NonValuedImpl<Object, Object>) type, null);
++						setData(properties, (PaperDataComponentType.NonValuedImpl<Object, Object>) type, null);
 +					}
 +				});
 +				if (this.nmsItemFunction == null) {
@@ -190,7 +190,7 @@ index 0000000000000000000000000000000000000000..a71123cbc2cc1b3a4496f4bf0e9a7822
 +			return item;
 +		}
 +
-+		private void setData(Item.@NonNull Properties properties, @NonNull PaperComponentType<Object, Object> type, @Nullable Object value) {
++		private void setData(Item.@NonNull Properties properties, @NonNull PaperDataComponentType<Object, Object> type, @Nullable Object value) {
 +			properties.component(type.getHandle(), type.getAdapter().toVanilla(value));
 +		}
 +

patches/server/0018-Injecting-custom-Materials.patch → patches/server/0019-Injecting-custom-Materials.patch

@@ -5,18 +5,18 @@ Subject: [PATCH] Injecting custom Materials
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 0fa47955027052c6df301a2206e4897236a90ddb..1c072ccde1f29e439d58ad81e083f1c345f87184 100644
+index a69a1ca3fc10df9f7ad08500abb8b7dfd3e352a3..82fdf50a60c64343230d77f4936d0cfee4f7dfb4 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -104,6 +104,7 @@ tasks.jar {
+@@ -124,6 +124,7 @@ tasks.jar {
          val gitBranch = git("rev-parse", "--abbrev-ref", "HEAD").getText().trim() // Paper
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
 +            "Add-Opens" to "java.base/java.lang", // Kiterino - Injecting custom Materials
              "Implementation-Title" to "Kiterino", // Kiterino - Init
              "Implementation-Version" to implementationVersion,
              "Implementation-Vendor" to date, // Paper
-@@ -188,6 +189,7 @@ fun TaskContainer.registerRunTask(
+@@ -208,6 +209,7 @@ fun TaskContainer.registerRunTask(
          vendor.set(JvmVendorSpec.JETBRAINS)
      })
      jvmArgs("-XX:+AllowEnhancedClassRedefinition", "-XX:+AllowRedefinitionToAddDeleteMethods")

patches/server/0019-Implement-packet-item-faker-for-injected-items.patch → patches/server/0020-Implement-packet-item-faker-for-injected-items.patch

@@ -67,7 +67,7 @@ index 0000000000000000000000000000000000000000..0a27cb17c68901f0d921e2239ac1a174
 +
 +}
 diff --git a/src/main/java/me/sosedik/kiterino/registry/data/KiterinoItemRegistryEntity.java b/src/main/java/me/sosedik/kiterino/registry/data/KiterinoItemRegistryEntity.java
-index a71123cbc2cc1b3a4496f4bf0e9a782279f6ce7a..1ad99eadb0d8a47b251719a63c479a101021c11a 100644
+index eddac4503a7fac252c1c738d50d8363a4890ac89..325b0f62ca5b3ba92f2b403709672a1766ccd1d4 100644
 --- a/src/main/java/me/sosedik/kiterino/registry/data/KiterinoItemRegistryEntity.java
 +++ b/src/main/java/me/sosedik/kiterino/registry/data/KiterinoItemRegistryEntity.java
 @@ -1,5 +1,9 @@
@@ -78,7 +78,7 @@ index a71123cbc2cc1b3a4496f4bf0e9a782279f6ce7a..1ad99eadb0d8a47b251719a63c479a10
 +import org.bukkit.inventory.ItemStack;
 +
  import io.papermc.paper.datacomponent.DataComponentType;
- import io.papermc.paper.datacomponent.PaperComponentType;
+ import io.papermc.paper.datacomponent.PaperDataComponentType;
  import io.papermc.paper.registry.PaperRegistryBuilder;
 @@ -24,6 +28,7 @@ public class KiterinoItemRegistryEntity implements ItemRegistryEntity {
  	protected @Nullable Float compostChance;

patches/server/0020-Data-driven-mob-effects.patch → patches/server/0021-Data-driven-mob-effects.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Data-driven mob effects
 
 
 diff --git a/src/main/java/io/papermc/paper/registry/PaperRegistries.java b/src/main/java/io/papermc/paper/registry/PaperRegistries.java
-index e65060f8361a5bcaa3b8f3e7fe920ab306dc763e..f6735b6e4807f5b2304e407981ffb6624e08a746 100644
+index ae5850c9f5d4187341c8357a79a7c1a8f9402001..b15ed5e980d852097e4f044aea347136f1e655c9 100644
 --- a/src/main/java/io/papermc/paper/registry/PaperRegistries.java
 +++ b/src/main/java/io/papermc/paper/registry/PaperRegistries.java
 @@ -85,7 +85,7 @@ public final class PaperRegistries {
@@ -209,7 +209,7 @@ index 0000000000000000000000000000000000000000..e39eeb78f824cdc5b912f1260096d371
 +
 +}
 diff --git a/src/test/java/io/papermc/paper/registry/RegistryBuilderTest.java b/src/test/java/io/papermc/paper/registry/RegistryBuilderTest.java
-index b31d6d19ee12c6c79792af4220597673000ad44c..d27f4fcab0c6ed05554523a2d47fede80da8dfc8 100644
+index 6f3d99ae7a959f53aec2d1a39110782b6db47df5..7a534c33fd0fb45af9a24b71d3d15405a38f01c9 100644
 --- a/src/test/java/io/papermc/paper/registry/RegistryBuilderTest.java
 +++ b/src/test/java/io/papermc/paper/registry/RegistryBuilderTest.java
 @@ -26,6 +26,7 @@ class RegistryBuilderTest {