Update to Paper 26.2

MrPowerGamerBR · MrPowerGamerBR · commit aeaa4bf200db · 2026-06-30T00:54:21.000-03:00
diff --git a/.github/workflows/auto-update.yml b/.github/workflows/auto-update.yml
@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           path: 'SparklyPaper'
-          ref: 'ver/26.1.2'
+          ref: 'ver/26.2'
           token: ${{ secrets.LORITTA_PAT }}
         
       - name: Checkout Paper Repository
diff --git a/gradle.properties b/gradle.properties
@@ -1,8 +1,8 @@
 group=net.sparklypower.sparklypaper
-version=26.1.2-SNAPSHOT
-mcVersion=26.1.2
-apiVersion=26.1.2
-paperRef=76d2ac758cb3abe75aceefa88207443768f585c6
+version=26.2-SNAPSHOT
+mcVersion=26.2
+apiVersion=26.2
+paperRef=0ae1b4239e9559516917f86bfcac404a091c710c
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true
diff --git a/sparklypaper-api/paper-patches/files/src/main/java/com/destroystokyo/paper/MaterialTags.java.patch b/sparklypaper-api/paper-patches/files/src/main/java/com/destroystokyo/paper/MaterialTags.java.patch
@@ -8,15 +8,15 @@
          .ensureSize("CONCRETES", 16).lock();
  
      /**
-@@ -182,6 +_,7 @@
+@@ -183,6 +_,7 @@
          .endsWith("TERRACOTTA")
          .not(Material.TERRACOTTA)
          .notEndsWith("GLAZED_TERRACOTTA")
 +        .notStartsWith("SPARKLYPOWER_") // SparklyPaper - custom blocks
          .ensureSize("STAINED_TERRACOTTA", 16).lock();
  
      /**
-@@ -189,6 +_,7 @@
+@@ -190,6 +_,7 @@
       */
      public static final MaterialSetTag TERRACOTTA = new MaterialSetTag(keyFor("terracotta"))
          .endsWith("TERRACOTTA")
diff --git a/sparklypaper-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch b/sparklypaper-api/paper-patches/files/src/main/java/org/bukkit/Material.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/Material.java
 +++ b/src/main/java/org/bukkit/Material.java
-@@ -1810,6 +_,16 @@
+@@ -1841,6 +_,16 @@
      ZOMBIE_HEAD(-1, Skull.class),
      ZOMBIE_WALL_HEAD(-1, WallSkull.class),
      // End generate - Blocks
diff --git a/sparklypaper-api/paper-patches/files/src/main/java/org/bukkit/block/BlockType.java.patch b/sparklypaper-api/paper-patches/files/src/main/java/org/bukkit/block/BlockType.java.patch
@@ -1,6 +1,6 @@
 --- a/src/main/java/org/bukkit/block/BlockType.java
 +++ b/src/main/java/org/bukkit/block/BlockType.java
-@@ -2529,6 +_,16 @@
+@@ -2586,6 +_,16 @@
      BlockType.Typed<WallSkull> ZOMBIE_WALL_HEAD = getBlockType("zombie_wall_head");
      // End generate - BlockType
      //</editor-fold>
diff --git a/sparklypaper-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch b/sparklypaper-api/paper-patches/files/src/main/java/org/bukkit/entity/Player.java.patch
@@ -1,9 +1,9 @@
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -4013,4 +_,104 @@
-      */
-     @ApiStatus.Experimental
-     PlayerGameConnection getConnection();
+@@ -4020,4 +_,104 @@
+     default ObjectContents asObjectContents() {
+         return this.getPlayerProfile().asObjectContents();
+     }
 +
 +    // SparklyPaper start - per-player chunk rate overrides
 +    /**
diff --git a/sparklypaper-server/build.gradle.kts.patch b/sparklypaper-server/build.gradle.kts.patch
@@ -58,7 +58,7 @@
 +    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
 +    implementation("com.charleskorn.kaml:kaml:0.97.0")
 +    // SparklyPaper end
-     implementation("ca.spottedleaf:concurrentutil:0.0.10")
+     implementation("ca.spottedleaf:leafpile:1.0.0")
      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
 @@ -193,9 +_,14 @@
diff --git a/sparklypaper-server/minecraft-patches/features/0001-Parallel-World-Ticking.patch b/sparklypaper-server/minecraft-patches/features/0001-Parallel-World-Ticking.patch
diff --git a/sparklypaper-server/minecraft-patches/features/0002-Add-WorldTickStartEvent-and-WorldTickEndEvent.patch b/sparklypaper-server/minecraft-patches/features/0002-Add-WorldTickStartEvent-and-WorldTickEndEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add WorldTickStartEvent and WorldTickEndEvent
 
 
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 19c7ee376466176fc2879e252caba9beba91ea3c..4c2bcb62316b710c41bc8bb148d38f435659dd35 100644
+index 1461d1fac7c9ccc3a7e4fade3919843732f819cf..6c41f7697c2c3f1cd8035b8d9d1ecfbd289cf9e4 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1856,11 +1856,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -1832,11 +1832,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
                          ca.spottedleaf.moonrise.common.util.TickThread.ServerLevelTickThread currentThread = (ca.spottedleaf.moonrise.common.util.TickThread.ServerLevelTickThread) Thread.currentThread();
                          currentThread.currentlyTickingServerLevel = level;
  
diff --git a/sparklypaper-server/minecraft-patches/sources/net/minecraft/network/protocol/game/ClientboundBlockUpdatePacket.java.patch b/sparklypaper-server/minecraft-patches/sources/net/minecraft/network/protocol/game/ClientboundBlockUpdatePacket.java.patch
@@ -4,7 +4,7 @@
          ClientboundBlockUpdatePacket::new
      );
      private final BlockPos pos;
--    public final BlockState blockState;
+-    private final BlockState blockState;
 +    public BlockState blockState; // SparklyPaper - Helpful NMS packet changes: remove final
  
      public ClientboundBlockUpdatePacket(final BlockPos pos, final BlockState state) {
diff --git a/sparklypaper-server/minecraft-patches/sources/net/minecraft/references/BlockItemIds.java.patch b/sparklypaper-server/minecraft-patches/sources/net/minecraft/references/BlockItemIds.java.patch
@@ -0,0 +1,16 @@
+--- a/net/minecraft/references/BlockItemIds.java
++++ b/net/minecraft/references/BlockItemIds.java
+@@ -788,4 +_,13 @@
+     private static WeatheringCopperCollection<BlockItemId> createSimpleCopper(final String baseName) {
+         return WeatheringCopperCollection.prefixWithState(WeatheringCopperCollection.create(baseName)).map(BlockItemId::create);
+     }
++
++    // SparklyPower Block IDs
++    public static final BlockItemId SPARKLYPOWER_RAINBOW_WOOL = BlockItemId.create("sparklypower_rainbow_wool");
++    public static final BlockItemId SPARKLYPOWER_RAINBOW_CONCRETE = BlockItemId.create("sparklypower_rainbow_concrete");
++    public static final BlockItemId SPARKLYPOWER_RAINBOW_TERRACOTTA = BlockItemId.create("sparklypower_rainbow_terracotta");
++    public static final BlockItemId SPARKLYPOWER_ASPHALT_SERVER = BlockItemId.create("sparklypower_asphalt_server");
++    public static final BlockItemId SPARKLYPOWER_ASPHALT_SERVER_SLAB = BlockItemId.create("sparklypower_asphalt_server_slab");
++    public static final BlockItemId SPARKLYPOWER_ASPHALT_PLAYER = BlockItemId.create("sparklypower_asphalt_player");
++    public static final BlockItemId SPARKLYPOWER_ASPHALT_PLAYER_SLAB = BlockItemId.create("sparklypower_asphalt_player_slab");
+ }
diff --git a/sparklypaper-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch b/sparklypaper-server/minecraft-patches/sources/net/minecraft/server/MinecraftServer.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
-@@ -1845,7 +_,15 @@
+@@ -1821,7 +_,15 @@
              profiler.push("tick");
  
              try {
diff --git a/sparklypaper-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch b/sparklypaper-server/minecraft-patches/sources/net/minecraft/server/dedicated/DedicatedServer.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/net/minecraft/server/dedicated/DedicatedServer.java
-@@ -273,6 +_,15 @@
+@@ -234,6 +_,15 @@
          org.spigotmc.SpigotConfig.init((java.io.File) this.options.valueOf("spigot-settings"));
          org.spigotmc.SpigotConfig.registerCommands();
          // Spigot end
diff --git a/sparklypaper-server/minecraft-patches/sources/net/minecraft/server/level/ServerEntity.java.patch b/sparklypaper-server/minecraft-patches/sources/net/minecraft/server/level/ServerEntity.java.patch
@@ -1,14 +1,14 @@
 --- a/net/minecraft/server/level/ServerEntity.java
 +++ b/net/minecraft/server/level/ServerEntity.java
-@@ -197,6 +_,7 @@
+@@ -202,6 +_,7 @@
  
-                 if (this.entity.needsSync || this.trackDelta || this.entity instanceof LivingEntity && ((LivingEntity)this.entity).isFallFlying()) {
+                 if (this.entity.needsSync || this.trackDelta || this.entity instanceof LivingEntity livingEntity && livingEntity.isFallFlying()) {
                      Vec3 movement = this.entity.getDeltaMovement();
 +                    if (movement != this.lastSentMovement) { // SparklyPaper start - skip distanceToSqr call in ServerEntity#sendChanges if the delta movement hasn't changed
                      double diff = movement.distanceToSqr(this.lastSentMovement);
                      if (diff > 1.0E-7 || diff > 0.0 && movement.lengthSqr() == 0.0) {
                          this.lastSentMovement = movement;
-@@ -214,6 +_,7 @@
+@@ -219,6 +_,7 @@
                              this.synchronizer.sendToTrackingPlayers(new ClientboundSetEntityMotionPacket(this.entity.getId(), this.lastSentMovement));
                          }
                      }
diff --git a/sparklypaper-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch b/sparklypaper-server/minecraft-patches/sources/net/minecraft/server/level/ServerLevel.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
-@@ -604,6 +_,12 @@
+@@ -607,6 +_,12 @@
      }
      // Paper end - chunk tick iteration
  
diff --git a/sparklypaper-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch b/sparklypaper-server/minecraft-patches/sources/net/minecraft/server/level/ServerPlayer.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
-@@ -465,6 +_,13 @@
+@@ -471,6 +_,13 @@
          return this.viewDistanceHolder;
      }
      // Paper end - rewrite chunk system
diff --git a/sparklypaper-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch b/sparklypaper-server/minecraft-patches/sources/net/minecraft/server/network/ServerGamePacketListenerImpl.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -649,6 +_,31 @@
+@@ -652,6 +_,31 @@
                      LOGGER.warn("{} (vehicle of {}) moved wrongly! {}", vehicle.getPlainTextName(), this.player.getPlainTextName(), Math.sqrt(movedDist));
                  }
  
@@ -32,7 +32,7 @@
                  // Paper start - optimise out extra getCubes
                  boolean teleportBack = fail;
                  if (!teleportBack) {
-@@ -1579,7 +_,7 @@
+@@ -1582,7 +_,7 @@
                                  xDist = targetX - this.lastGoodX; // Paper - diff on change, used for checking large move vectors above
                                  yDist = targetY - this.lastGoodY; // Paper - diff on change, used for checking large move vectors above
                                  zDist = targetZ - this.lastGoodZ; // Paper - diff on change, used for checking large move vectors above
@@ -41,7 +41,7 @@
                                  if (this.player.onGround() && !packet.isOnGround() && movedUpwards) {
                                      // Paper start - Add PlayerJumpEvent
                                      org.bukkit.entity.Player player = this.getCraftPlayer();
-@@ -1613,7 +_,37 @@
+@@ -1603,7 +_,38 @@
  
                                  boolean playerStandsOnSomething = this.player.verticalCollisionBelow;
                                  this.player.move(MoverType.PLAYER, new Vec3(xDist, yDist, zDist));
@@ -51,20 +51,21 @@
 +                                boolean horizontalCollision = packet.horizontalCollision();
 +                                if (net.sparklypower.sparklypaper.event.player.PlayerPreMoveEvent.getHandlerList().getRegisteredListeners().length != 0) {
 +                                    org.bukkit.entity.Player player = this.getCraftPlayer();
-+                                    Location from = new Location(player.getWorld(), lastPosX, lastPosY, lastPosZ, lastYaw, lastPitch); // Get the Players previous Event location.
++                                    Location from = new Location(player.getWorld(), lastPosX, lastPosY, lastPosZ, this.lastYRot, this.lastXRot); // Get the Players previous Event location.
 +                                    Location to = player.getLocation().clone(); // Start off the To location as the Players current location.
 +
 +                                    // If the packet contains movement information then we update the To location with the correct XYZ.
-+                                    if (packet.hasPos) {
-+                                        to.setX(packet.x);
-+                                        to.setY(packet.y);
-+                                        to.setZ(packet.z);
++                                    // The fallbacks should NEVER be used here because we already check the pos/rot anyway
++                                    if (packet.hasPosition()) {
++                                        to.setX(packet.getX(0.0));
++                                        to.setY(packet.getY(0.0));
++                                        to.setZ(packet.getZ(0.0));
 +                                    }
 +
 +                                    // If the packet contains look information then we update the To location with the correct Yaw & Pitch.
-+                                    if (packet.hasRot) {
-+                                        to.setYaw(packet.yRot);
-+                                        to.setPitch(packet.xRot);
++                                    if (packet.hasRotation()) {
++                                        to.setYaw(packet.getYRot(0.0f));
++                                        to.setPitch(packet.getXRot(0.0f));
 +                                    }
 +
 +                                    net.sparklypower.sparklypaper.event.player.PlayerPreMoveEvent event = new net.sparklypower.sparklypaper.event.player.PlayerPreMoveEvent(player, from, to, packet.isOnGround(), packet.horizontalCollision(), movedUpwards);
@@ -80,7 +81,7 @@
                                  final boolean didCollide = targetX != this.player.getX() || targetY != this.player.getY() || targetZ != this.player.getZ(); // Paper - needed here as the difference in Y can be reset - also note: this is only a guess at whether collisions took place, floating point errors can make this true when it shouldn't be...
                                  // Paper start - prevent position desync
                                  if (this.awaitingPositionFromClient != null) {
-@@ -1747,14 +_,14 @@
+@@ -1724,14 +_,14 @@
                                          && this.noBlocksAround(this.player);
                                      this.player.level().getChunkSource().move(this.player);
                                      Vec3 clientDeltaMovement = new Vec3(this.player.getX() - startX, this.player.getY() - startY, this.player.getZ() - startZ);
@@ -98,7 +99,7 @@
                                          || this.player.hasLandedInLiquid()
                                          || this.player.onClimbable()
                                          || this.player.isSpectator()
-@@ -1771,7 +_,7 @@
+@@ -1748,7 +_,7 @@
                                      this.internalTeleport(startX, startY, startZ, targetYRot, targetXRot); // CraftBukkit - SPIGOT-1807: Don't call teleport event, when the client thinks the player is falling, because the chunks are not loaded on the client yet.
                                      this.player
                                          .doCheckFallDamage(
@@ -107,7 +108,7 @@
                                          );
                                      this.player.removeLatestMovementRecording();
                                  }
-@@ -3328,6 +_,21 @@
+@@ -3315,6 +_,21 @@
                                  } else {
                                      event = new CraftItemEvent(recipe, inventory, type, slotIndex, click, action);
                                  }
diff --git a/sparklypaper-server/minecraft-patches/sources/net/minecraft/server/network/ServerLoginPacketListenerImpl.java.patch b/sparklypaper-server/minecraft-patches/sources/net/minecraft/server/network/ServerLoginPacketListenerImpl.java.patch
@@ -39,7 +39,7 @@
                  }
                  // Paper end - Add Velocity IP Forwarding Support
                  // Paper start - Virtual authenticator threads
-@@ -316,7 +_,9 @@
+@@ -318,7 +_,9 @@
      // CraftBukkit start
      private GameProfile callPlayerPreLoginEvents(GameProfile gameprofile) throws Exception { // Paper - Add more fields to AsyncPlayerPreLoginEvent
          // Paper start - Add Velocity IP Forwarding Support
diff --git a/sparklypaper-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Monster.java.patch b/sparklypaper-server/minecraft-patches/sources/net/minecraft/world/entity/monster/Monster.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/monster/Monster.java
 +++ b/net/minecraft/world/entity/monster/Monster.java
-@@ -147,6 +_,12 @@
+@@ -145,6 +_,12 @@
      @Override
      public ItemStack getProjectile(final ItemStack heldWeapon) {
          if (heldWeapon.getItem() instanceof ProjectileWeaponItem) {
diff --git a/sparklypaper-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch b/sparklypaper-server/minecraft-patches/sources/net/minecraft/world/entity/player/Player.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/entity/player/Player.java
 +++ b/net/minecraft/world/entity/player/Player.java
-@@ -2045,6 +_,12 @@
+@@ -2060,6 +_,12 @@
              return ItemStack.EMPTY;
          }
  
diff --git a/sparklypaper-server/minecraft-patches/sources/net/minecraft/world/item/BowItem.java.patch b/sparklypaper-server/minecraft-patches/sources/net/minecraft/world/item/BowItem.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/item/BowItem.java
 +++ b/net/minecraft/world/item/BowItem.java
-@@ -34,6 +_,11 @@
+@@ -32,6 +_,11 @@
  
              int timeHeld = this.getUseDuration(itemStack, entity) - remainingTime;
              float pow = getPowerForTime(timeHeld);
diff --git a/sparklypaper-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch b/sparklypaper-server/minecraft-patches/sources/net/minecraft/world/level/Level.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/level/Level.java
 +++ b/net/minecraft/world/level/Level.java
-@@ -118,7 +_,7 @@
+@@ -119,7 +_,7 @@
          .add(new ExplosionParticleInfo(ParticleTypes.POOF, 0.5F, 1.0F))
          .add(new ExplosionParticleInfo(ParticleTypes.SMOKE, 1.0F, 1.0F))
          .build();
@@ -9,23 +9,23 @@
      protected final CollectingNeighborUpdater neighborUpdater;
      private final List<TickingBlockEntity> pendingBlockEntityTickers = Lists.newArrayList();
      private boolean tickingBlockEntities;
-@@ -146,6 +_,7 @@
+@@ -147,6 +_,7 @@
  
      // CraftBukkit start
      public final io.papermc.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
 +    public net.sparklypower.sparklypaper.configs.SparklyPaperConfig.SparklyPaperWorldConfig sparklyPaperConfig; // SparklyPaper - config files
      private final CraftWorld world;
      public org.bukkit.generator.@Nullable ChunkGenerator generator;
  
-@@ -852,6 +_,7 @@
+@@ -853,6 +_,7 @@
          final org.bukkit.NamespacedKey worldKey = CraftNamespacedKey.fromMinecraft(dimension.identifier()); // Paper
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig(bukkitName, worldKey); // Spigot
          this.paperConfig = paperWorldConfigCreator.apply(this.spigotConfig); // Paper - create paper world config
 +        this.sparklyPaperConfig = net.sparklypower.sparklypaper.configs.SparklyPaperConfigUtils.INSTANCE.getWorldSettings(((net.minecraft.world.level.storage.ServerLevelData) levelData).getLevelName()); // SparklyPaper - config files
          this.generator = generator;
          this.world = new CraftWorld((ServerLevel) this, worldKey, biomeProvider, environment);
  
-@@ -1490,14 +_,10 @@
+@@ -1495,14 +_,10 @@
          boolean tickBlockEntities = this.tickRateManager().runsNormally();
  
          int tickedEntities = 0; // Paper - rewrite chunk system
@@ -42,7 +42,7 @@
              } else if (tickBlockEntities && this.shouldTickBlocksAt(ticker.getPos())) {
                  ticker.tick();
                  // Paper start - rewrite chunk system
-@@ -1508,7 +_,7 @@
+@@ -1513,7 +_,7 @@
              }
          }
  
diff --git a/sparklypaper-server/minecraft-patches/sources/net/minecraft/world/level/block/Blocks.java.patch b/sparklypaper-server/minecraft-patches/sources/net/minecraft/world/level/block/Blocks.java.patch
@@ -1,28 +1,28 @@
 --- a/net/minecraft/world/level/block/Blocks.java
 +++ b/net/minecraft/world/level/block/Blocks.java
-@@ -7044,6 +_,52 @@
+@@ -5846,6 +_,52 @@
              .sound(SoundType.SWEET_BERRY_BUSH)
              .pushReaction(PushReaction.DESTROY)
      );
 +    // SparklyPaper start - SparklyPower Survival custom blocks
 +    // Blocks' strength should be synced with the replaced block on the client side!
 +    public static final Block SPARKLYPOWER_RAINBOW_WOOL = register(
-+        "sparklypower_rainbow_wool",
++        BlockItemIds.SPARKLYPOWER_RAINBOW_WOOL,
 +        Block::new,
 +        BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_RED).strength(0.5F).sound(SoundType.GRASS)
 +    );
 +    public static final Block SPARKLYPOWER_RAINBOW_CONCRETE = register(
-+        "sparklypower_rainbow_concrete",
++        BlockItemIds.SPARKLYPOWER_RAINBOW_CONCRETE,
 +        Block::new,
 +        BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_RED).strength(0.5F).sound(SoundType.GRASS)
 +    );
 +    public static final Block SPARKLYPOWER_RAINBOW_TERRACOTTA = register(
-+        "sparklypower_rainbow_terracotta",
++        BlockItemIds.SPARKLYPOWER_RAINBOW_TERRACOTTA,
 +        Block::new,
 +        BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_RED).strength(0.5F).sound(SoundType.GRASS)
 +    );
 +    public static final Block SPARKLYPOWER_ASPHALT_SERVER = register(
-+        "sparklypower_asphalt_server",
++        BlockItemIds.SPARKLYPOWER_ASPHALT_SERVER,
 +        Block::new,
 +        BlockBehaviour.Properties.of()
 +            .mapColor(MapColor.COLOR_BLACK)
@@ -31,12 +31,12 @@
 +            .strength(1.5F, 6.0F)
 +    );
 +    public static final Block SPARKLYPOWER_ASPHALT_SERVER_SLAB = register(
-+        "sparklypower_asphalt_server_slab",
++        BlockItemIds.SPARKLYPOWER_ASPHALT_SERVER_SLAB,
 +        SlabBlock::new,
 +        BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLACK).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(2.0F, 6.0F)
 +    );
 +    public static final Block SPARKLYPOWER_ASPHALT_PLAYER = register(
-+        "sparklypower_asphalt_player",
++        BlockItemIds.SPARKLYPOWER_ASPHALT_PLAYER,
 +        Block::new,
 +        BlockBehaviour.Properties.of()
 +            .mapColor(MapColor.COLOR_BLACK)
@@ -45,7 +45,7 @@
 +            .strength(1.5F, 6.0F)
 +    );
 +    public static final Block SPARKLYPOWER_ASPHALT_PLAYER_SLAB = register(
-+        "sparklypower_asphalt_player_slab",
++        BlockItemIds.SPARKLYPOWER_ASPHALT_PLAYER_SLAB,
 +        SlabBlock::new,
 +        BlockBehaviour.Properties.of().mapColor(MapColor.COLOR_BLACK).instrument(NoteBlockInstrument.BASEDRUM).requiresCorrectToolForDrops().strength(2.0F, 6.0F)
 +    );
diff --git a/sparklypaper-server/minecraft-patches/sources/net/minecraft/world/level/block/CrafterBlock.java.patch b/sparklypaper-server/minecraft-patches/sources/net/minecraft/world/level/block/CrafterBlock.java.patch
@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/level/block/CrafterBlock.java
 +++ b/net/minecraft/world/level/block/CrafterBlock.java
-@@ -162,6 +_,12 @@
+@@ -163,6 +_,12 @@
                  }
                  results = org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getResult());
                  // CraftBukkit end
diff --git a/sparklypaper-server/paper-patches/features/0001-Parallel-World-Ticking.patch b/sparklypaper-server/paper-patches/features/0001-Parallel-World-Ticking.patch
diff --git a/sparklypaper-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch b/sparklypaper-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/CraftServer.java.patch
diff --git a/sparklypaper-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch b/sparklypaper-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java.patch
diff --git a/sparklypaper-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java.patch b/sparklypaper-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java.patch
diff --git a/sparklypaper-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch b/sparklypaper-server/paper-patches/files/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java.patch
diff --git a/sparklypaper-server/paper-patches/files/src/main/java/org/spigotmc/WatchdogThread.java.patch b/sparklypaper-server/paper-patches/files/src/main/java/org/spigotmc/WatchdogThread.java.patch
diff --git a/sparklypaper-server/paper-patches/files/src/test/java/org/bukkit/craftbukkit/legacy/LegacyTest.java.patch b/sparklypaper-server/paper-patches/files/src/test/java/org/bukkit/craftbukkit/legacy/LegacyTest.java.patch
