From e21db58a6738fbccec2d153dca01a7f416dcbfb8 Mon Sep 17 00:00:00 2001
From: Christian Koop <contact@sprax2013.de>
Date: Wed, 19 Apr 2023 21:50:30 +0200
Subject: [PATCH 1/5] Reimplement BlockUtils#updateAdjacentComparators in
 WorldCore

The implementation broke in 1.19.4 mid-version.
Fixes `java.lang.NoSuchMethodException: org.bukkit.craftbukkit.v1_19_R3.CraftChunk.getHandle()`


Related commit: a3e73be1aad453f932a14950ae499e5161504c4b
---
 .../main/java/com/songoda/core/utils/BlockUtils.java |  4 ++++
 .../java/com/songoda/core/nms/world/WorldCore.java   |  5 +++--
 .../core/nms/v1_10_R1/world/WorldCoreImpl.java       | 12 ++++++++++++
 .../core/nms/v1_11_R1/world/WorldCoreImpl.java       | 12 ++++++++++++
 .../core/nms/v1_12_R1/world/WorldCoreImpl.java       | 12 ++++++++++++
 .../core/nms/v1_13_R1/world/WorldCoreImpl.java       | 11 +++++++++++
 .../core/nms/v1_13_R2/world/WorldCoreImpl.java       | 11 +++++++++++
 .../core/nms/v1_14_R1/world/WorldCoreImpl.java       | 11 +++++++++++
 .../core/nms/v1_15_R1/world/WorldCoreImpl.java       | 11 +++++++++++
 .../core/nms/v1_16_R1/world/WorldCoreImpl.java       | 11 +++++++++++
 .../core/nms/v1_16_R2/world/WorldCoreImpl.java       | 11 +++++++++++
 .../core/nms/v1_16_R3/world/WorldCoreImpl.java       | 11 +++++++++++
 .../core/nms/v1_17_R1/world/WorldCoreImpl.java       | 11 +++++++++++
 .../core/nms/v1_18_R1/world/WorldCoreImpl.java       | 11 +++++++++++
 .../core/nms/v1_18_R2/world/WorldCoreImpl.java       | 11 +++++++++++
 .../core/nms/v1_19_R1/world/WorldCoreImpl.java       | 11 +++++++++++
 .../core/nms/v1_19_R1v2/world/WorldCoreImpl.java     | 11 +++++++++++
 .../core/nms/v1_19_R2/world/WorldCoreImpl.java       | 11 +++++++++++
 .../core/nms/v1_19_R3/world/WorldCoreImpl.java       | 11 +++++++++++
 .../core/nms/v1_8_R1/world/WorldCoreImpl.java        | 12 ++++++++++++
 .../core/nms/v1_8_R2/world/WorldCoreImpl.java        | 12 ++++++++++++
 .../core/nms/v1_8_R3/world/WorldCoreImpl.java        | 12 ++++++++++++
 .../core/nms/v1_9_R1/world/WorldCoreImpl.java        | 12 ++++++++++++
 .../core/nms/v1_9_R2/world/WorldCoreImpl.java        | 12 ++++++++++++
 24 files changed, 257 insertions(+), 2 deletions(-)

diff --git a/Core/src/main/java/com/songoda/core/utils/BlockUtils.java b/Core/src/main/java/com/songoda/core/utils/BlockUtils.java
index 3329cff4..314feee9 100644
--- a/Core/src/main/java/com/songoda/core/utils/BlockUtils.java
+++ b/Core/src/main/java/com/songoda/core/utils/BlockUtils.java
@@ -4,6 +4,7 @@ import com.songoda.core.compatibility.ClassMapping;
 import com.songoda.core.compatibility.CompatibleMaterial;
 import com.songoda.core.compatibility.MethodMapping;
 import com.songoda.core.compatibility.ServerVersion;
+import com.songoda.core.nms.NmsManager;
 import org.bukkit.Effect;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -337,7 +338,10 @@ public class BlockUtils {
      * Manually trigger the updateAdjacentComparators method for containers
      *
      * @param loc The Location of the container
+     *
+     * @deprecated Broken in/since Spigot 1.19.4! Use {@link com.songoda.core.nms.world.WorldCore#updateAdjacentComparators(Block)} on {@link NmsManager#getWorld()} instead
      */
+    @Deprecated
     public static void updateAdjacentComparators(Location loc) {
         if (loc == null || loc.getWorld() == null) {
             return;
diff --git a/NMS/NMS-API/src/main/java/com/songoda/core/nms/world/WorldCore.java b/NMS/NMS-API/src/main/java/com/songoda/core/nms/world/WorldCore.java
index bf5256ff..302569c9 100644
--- a/NMS/NMS-API/src/main/java/com/songoda/core/nms/world/WorldCore.java
+++ b/NMS/NMS-API/src/main/java/com/songoda/core/nms/world/WorldCore.java
@@ -3,12 +3,11 @@ package com.songoda.core.nms.world;
 import org.bukkit.Chunk;
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.inventory.ItemStack;
 
-import java.lang.reflect.InvocationTargetException;
-
 public interface WorldCore {
     SSpawner getSpawner(CreatureSpawner spawner);
 
@@ -30,6 +29,8 @@ public interface WorldCore {
      */
     void randomTickChunk(Chunk bukkitChunk, int tickAmount) throws ReflectiveOperationException;
 
+    void updateAdjacentComparators(Block bukkitBlock);
+
     /**
      * Ticks all inactive spawners in a specific chunk ignoring the minimum required players within a specific range.<br>
      * A spawner is deemed inactive if no player is within its activation range.
diff --git a/NMS/NMS-v1_10_R1/src/main/java/com/songoda/core/nms/v1_10_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_10_R1/src/main/java/com/songoda/core/nms/v1_10_R1/world/WorldCoreImpl.java
index 25d93b42..37fc32f0 100644
--- a/NMS/NMS-v1_10_R1/src/main/java/com/songoda/core/nms/v1_10_R1/world/WorldCoreImpl.java
+++ b/NMS/NMS-v1_10_R1/src/main/java/com/songoda/core/nms/v1_10_R1/world/WorldCoreImpl.java
@@ -18,6 +18,8 @@ import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.craftbukkit.v1_10_R1.CraftChunk;
+import org.bukkit.craftbukkit.v1_10_R1.block.CraftBlock;
+import org.bukkit.craftbukkit.v1_10_R1.util.CraftMagicNumbers;
 import org.bukkit.inventory.ItemStack;
 
 public class WorldCoreImpl implements WorldCore {
@@ -85,4 +87,14 @@ public class WorldCoreImpl implements WorldCore {
             }
         }
     }
+
+    @Override
+    public void updateAdjacentComparators(org.bukkit.block.Block bukkitBlock) {
+        CraftBlock craftBlock = (CraftBlock) bukkitBlock;
+        CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk();
+        net.minecraft.server.v1_10_R1.World nmsWorld = craftChunk.getHandle().getWorld();
+
+        BlockPosition blockPosition = new BlockPosition(craftBlock.getX(), craftBlock.getY(), craftBlock.getZ());
+        nmsWorld.updateAdjacentComparators(blockPosition, CraftMagicNumbers.getBlock(craftBlock));
+    }
 }
diff --git a/NMS/NMS-v1_11_R1/src/main/java/com/songoda/core/nms/v1_11_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_11_R1/src/main/java/com/songoda/core/nms/v1_11_R1/world/WorldCoreImpl.java
index 966be49c..15e5f026 100644
--- a/NMS/NMS-v1_11_R1/src/main/java/com/songoda/core/nms/v1_11_R1/world/WorldCoreImpl.java
+++ b/NMS/NMS-v1_11_R1/src/main/java/com/songoda/core/nms/v1_11_R1/world/WorldCoreImpl.java
@@ -18,6 +18,8 @@ import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.craftbukkit.v1_11_R1.CraftChunk;
+import org.bukkit.craftbukkit.v1_11_R1.block.CraftBlock;
+import org.bukkit.craftbukkit.v1_11_R1.util.CraftMagicNumbers;
 import org.bukkit.inventory.ItemStack;
 
 public class WorldCoreImpl implements WorldCore {
@@ -85,4 +87,14 @@ public class WorldCoreImpl implements WorldCore {
             }
         }
     }
+
+    @Override
+    public void updateAdjacentComparators(org.bukkit.block.Block bukkitBlock) {
+        CraftBlock craftBlock = (CraftBlock) bukkitBlock;
+        CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk();
+        net.minecraft.server.v1_11_R1.World nmsWorld = craftChunk.getHandle().getWorld();
+
+        BlockPosition blockPosition = new BlockPosition(craftBlock.getX(), craftBlock.getY(), craftBlock.getZ());
+        nmsWorld.updateAdjacentComparators(blockPosition, CraftMagicNumbers.getBlock(craftBlock));
+    }
 }
diff --git a/NMS/NMS-v1_12_R1/src/main/java/com/songoda/core/nms/v1_12_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_12_R1/src/main/java/com/songoda/core/nms/v1_12_R1/world/WorldCoreImpl.java
index 447c2624..eef44159 100644
--- a/NMS/NMS-v1_12_R1/src/main/java/com/songoda/core/nms/v1_12_R1/world/WorldCoreImpl.java
+++ b/NMS/NMS-v1_12_R1/src/main/java/com/songoda/core/nms/v1_12_R1/world/WorldCoreImpl.java
@@ -18,6 +18,8 @@ import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.craftbukkit.v1_12_R1.CraftChunk;
+import org.bukkit.craftbukkit.v1_12_R1.block.CraftBlock;
+import org.bukkit.craftbukkit.v1_12_R1.util.CraftMagicNumbers;
 import org.bukkit.inventory.ItemStack;
 
 public class WorldCoreImpl implements WorldCore {
@@ -85,4 +87,14 @@ public class WorldCoreImpl implements WorldCore {
             }
         }
     }
+
+    @Override
+    public void updateAdjacentComparators(org.bukkit.block.Block bukkitBlock) {
+        CraftBlock craftBlock = (CraftBlock) bukkitBlock;
+        CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk();
+        net.minecraft.server.v1_12_R1.World nmsWorld = craftChunk.getHandle().getWorld();
+
+        BlockPosition blockPosition = new BlockPosition(craftBlock.getX(), craftBlock.getY(), craftBlock.getZ());
+        nmsWorld.updateAdjacentComparators(blockPosition, CraftMagicNumbers.getBlock(craftBlock));
+    }
 }
diff --git a/NMS/NMS-v1_13_R1/src/main/java/com/songoda/core/nms/v1_13_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_13_R1/src/main/java/com/songoda/core/nms/v1_13_R1/world/WorldCoreImpl.java
index 3e34e414..a00cf41d 100644
--- a/NMS/NMS-v1_13_R1/src/main/java/com/songoda/core/nms/v1_13_R1/world/WorldCoreImpl.java
+++ b/NMS/NMS-v1_13_R1/src/main/java/com/songoda/core/nms/v1_13_R1/world/WorldCoreImpl.java
@@ -16,8 +16,10 @@ import net.minecraft.server.v1_13_R1.MobSpawnerAbstract;
 import net.minecraft.server.v1_13_R1.WorldServer;
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.craftbukkit.v1_13_R1.CraftChunk;
+import org.bukkit.craftbukkit.v1_13_R1.block.CraftBlock;
 import org.bukkit.inventory.ItemStack;
 
 public class WorldCoreImpl implements WorldCore {
@@ -89,4 +91,13 @@ public class WorldCoreImpl implements WorldCore {
             }
         }
     }
+
+    @Override
+    public void updateAdjacentComparators(Block bukkitBlock) {
+        CraftBlock craftBlock = (CraftBlock) bukkitBlock;
+        CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk();
+
+        net.minecraft.server.v1_13_R1.World nmsWorld = craftChunk.getHandle().getWorld();
+        nmsWorld.updateAdjacentComparators(craftBlock.getPosition(), craftBlock.getNMS().getBlock());
+    }
 }
diff --git a/NMS/NMS-v1_13_R2/src/main/java/com/songoda/core/nms/v1_13_R2/world/WorldCoreImpl.java b/NMS/NMS-v1_13_R2/src/main/java/com/songoda/core/nms/v1_13_R2/world/WorldCoreImpl.java
index 28b29315..43283261 100644
--- a/NMS/NMS-v1_13_R2/src/main/java/com/songoda/core/nms/v1_13_R2/world/WorldCoreImpl.java
+++ b/NMS/NMS-v1_13_R2/src/main/java/com/songoda/core/nms/v1_13_R2/world/WorldCoreImpl.java
@@ -16,8 +16,10 @@ import net.minecraft.server.v1_13_R2.MobSpawnerAbstract;
 import net.minecraft.server.v1_13_R2.WorldServer;
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.craftbukkit.v1_13_R2.CraftChunk;
+import org.bukkit.craftbukkit.v1_13_R2.block.CraftBlock;
 import org.bukkit.inventory.ItemStack;
 
 public class WorldCoreImpl implements WorldCore {
@@ -96,4 +98,13 @@ public class WorldCoreImpl implements WorldCore {
 
         chunk.world.methodProfiler.exit();
     }
+
+    @Override
+    public void updateAdjacentComparators(Block bukkitBlock) {
+        CraftBlock craftBlock = (CraftBlock) bukkitBlock;
+        CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk();
+
+        net.minecraft.server.v1_13_R2.World nmsWorld = craftChunk.getHandle().getWorld();
+        nmsWorld.updateAdjacentComparators(craftBlock.getPosition(), craftBlock.getNMS().getBlock());
+    }
 }
diff --git a/NMS/NMS-v1_14_R1/src/main/java/com/songoda/core/nms/v1_14_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_14_R1/src/main/java/com/songoda/core/nms/v1_14_R1/world/WorldCoreImpl.java
index 3dbffc9f..9a15ed48 100644
--- a/NMS/NMS-v1_14_R1/src/main/java/com/songoda/core/nms/v1_14_R1/world/WorldCoreImpl.java
+++ b/NMS/NMS-v1_14_R1/src/main/java/com/songoda/core/nms/v1_14_R1/world/WorldCoreImpl.java
@@ -18,8 +18,10 @@ import net.minecraft.server.v1_14_R1.MobSpawnerAbstract;
 import net.minecraft.server.v1_14_R1.WorldServer;
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.craftbukkit.v1_14_R1.CraftChunk;
+import org.bukkit.craftbukkit.v1_14_R1.block.CraftBlock;
 import org.bukkit.inventory.ItemStack;
 
 public class WorldCoreImpl implements WorldCore {
@@ -93,4 +95,13 @@ public class WorldCoreImpl implements WorldCore {
 
         profiler.exit();
     }
+
+    @Override
+    public void updateAdjacentComparators(Block bukkitBlock) {
+        CraftBlock craftBlock = (CraftBlock) bukkitBlock;
+        CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk();
+
+        net.minecraft.server.v1_14_R1.World nmsWorld = craftChunk.getHandle().getWorld();
+        nmsWorld.updateAdjacentComparators(craftBlock.getPosition(), craftBlock.getNMS().getBlock());
+    }
 }
diff --git a/NMS/NMS-v1_15_R1/src/main/java/com/songoda/core/nms/v1_15_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_15_R1/src/main/java/com/songoda/core/nms/v1_15_R1/world/WorldCoreImpl.java
index b32e1e7a..8810cf6a 100644
--- a/NMS/NMS-v1_15_R1/src/main/java/com/songoda/core/nms/v1_15_R1/world/WorldCoreImpl.java
+++ b/NMS/NMS-v1_15_R1/src/main/java/com/songoda/core/nms/v1_15_R1/world/WorldCoreImpl.java
@@ -18,8 +18,10 @@ import net.minecraft.server.v1_15_R1.MobSpawnerAbstract;
 import net.minecraft.server.v1_15_R1.WorldServer;
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.craftbukkit.v1_15_R1.CraftChunk;
+import org.bukkit.craftbukkit.v1_15_R1.block.CraftBlock;
 import org.bukkit.inventory.ItemStack;
 
 public class WorldCoreImpl implements WorldCore {
@@ -96,4 +98,13 @@ public class WorldCoreImpl implements WorldCore {
 
         profiler.exit();
     }
+
+    @Override
+    public void updateAdjacentComparators(Block bukkitBlock) {
+        CraftBlock craftBlock = (CraftBlock) bukkitBlock;
+        CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk();
+
+        net.minecraft.server.v1_15_R1.World nmsWorld = craftChunk.getHandle().getWorld();
+        nmsWorld.updateAdjacentComparators(craftBlock.getPosition(), craftBlock.getNMS().getBlock());
+    }
 }
diff --git a/NMS/NMS-v1_16_R1/src/main/java/com/songoda/core/nms/v1_16_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_16_R1/src/main/java/com/songoda/core/nms/v1_16_R1/world/WorldCoreImpl.java
index b86c9568..cbe8ef07 100644
--- a/NMS/NMS-v1_16_R1/src/main/java/com/songoda/core/nms/v1_16_R1/world/WorldCoreImpl.java
+++ b/NMS/NMS-v1_16_R1/src/main/java/com/songoda/core/nms/v1_16_R1/world/WorldCoreImpl.java
@@ -18,8 +18,10 @@ import net.minecraft.server.v1_16_R1.MobSpawnerAbstract;
 import net.minecraft.server.v1_16_R1.WorldServer;
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.craftbukkit.v1_16_R1.CraftChunk;
+import org.bukkit.craftbukkit.v1_16_R1.block.CraftBlock;
 import org.bukkit.inventory.ItemStack;
 
 public class WorldCoreImpl implements WorldCore {
@@ -97,4 +99,13 @@ public class WorldCoreImpl implements WorldCore {
 
         profiler.exit();
     }
+
+    @Override
+    public void updateAdjacentComparators(Block bukkitBlock) {
+        CraftBlock craftBlock = (CraftBlock) bukkitBlock;
+        CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk();
+
+        net.minecraft.server.v1_16_R1.World nmsWorld = craftChunk.getHandle().getWorld();
+        nmsWorld.updateAdjacentComparators(craftBlock.getPosition(), craftBlock.getNMS().getBlock());
+    }
 }
diff --git a/NMS/NMS-v1_16_R2/src/main/java/com/songoda/core/nms/v1_16_R2/world/WorldCoreImpl.java b/NMS/NMS-v1_16_R2/src/main/java/com/songoda/core/nms/v1_16_R2/world/WorldCoreImpl.java
index bdf815df..842cf36e 100644
--- a/NMS/NMS-v1_16_R2/src/main/java/com/songoda/core/nms/v1_16_R2/world/WorldCoreImpl.java
+++ b/NMS/NMS-v1_16_R2/src/main/java/com/songoda/core/nms/v1_16_R2/world/WorldCoreImpl.java
@@ -18,8 +18,10 @@ import net.minecraft.server.v1_16_R2.MobSpawnerAbstract;
 import net.minecraft.server.v1_16_R2.WorldServer;
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.craftbukkit.v1_16_R2.CraftChunk;
+import org.bukkit.craftbukkit.v1_16_R2.block.CraftBlock;
 import org.bukkit.inventory.ItemStack;
 
 public class WorldCoreImpl implements WorldCore {
@@ -97,4 +99,13 @@ public class WorldCoreImpl implements WorldCore {
 
         profiler.exit();
     }
+
+    @Override
+    public void updateAdjacentComparators(Block bukkitBlock) {
+        CraftBlock craftBlock = (CraftBlock) bukkitBlock;
+        CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk();
+
+        net.minecraft.server.v1_16_R2.World nmsWorld = craftChunk.getHandle().getWorld();
+        nmsWorld.updateAdjacentComparators(craftBlock.getPosition(), craftBlock.getNMS().getBlock());
+    }
 }
diff --git a/NMS/NMS-v1_16_R3/src/main/java/com/songoda/core/nms/v1_16_R3/world/WorldCoreImpl.java b/NMS/NMS-v1_16_R3/src/main/java/com/songoda/core/nms/v1_16_R3/world/WorldCoreImpl.java
index c4b0f5c3..b1ad6147 100644
--- a/NMS/NMS-v1_16_R3/src/main/java/com/songoda/core/nms/v1_16_R3/world/WorldCoreImpl.java
+++ b/NMS/NMS-v1_16_R3/src/main/java/com/songoda/core/nms/v1_16_R3/world/WorldCoreImpl.java
@@ -18,8 +18,10 @@ import net.minecraft.server.v1_16_R3.MobSpawnerAbstract;
 import net.minecraft.server.v1_16_R3.WorldServer;
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.craftbukkit.v1_16_R3.CraftChunk;
+import org.bukkit.craftbukkit.v1_16_R3.block.CraftBlock;
 import org.bukkit.inventory.ItemStack;
 
 public class WorldCoreImpl implements WorldCore {
@@ -98,4 +100,13 @@ public class WorldCoreImpl implements WorldCore {
 
         profiler.exit();
     }
+
+    @Override
+    public void updateAdjacentComparators(Block bukkitBlock) {
+        CraftBlock craftBlock = (CraftBlock) bukkitBlock;
+        CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk();
+
+        net.minecraft.server.v1_16_R3.World nmsWorld = craftChunk.getHandle().getWorld();
+        nmsWorld.updateAdjacentComparators(craftBlock.getPosition(), craftBlock.getNMS().getBlock());
+    }
 }
diff --git a/NMS/NMS-v1_17_R1/src/main/java/com/songoda/core/nms/v1_17_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_17_R1/src/main/java/com/songoda/core/nms/v1_17_R1/world/WorldCoreImpl.java
index 7f800f18..c1ba86ab 100644
--- a/NMS/NMS-v1_17_R1/src/main/java/com/songoda/core/nms/v1_17_R1/world/WorldCoreImpl.java
+++ b/NMS/NMS-v1_17_R1/src/main/java/com/songoda/core/nms/v1_17_R1/world/WorldCoreImpl.java
@@ -18,8 +18,10 @@ import net.minecraft.world.level.chunk.ChunkSection;
 import net.minecraft.world.level.material.Fluid;
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.craftbukkit.v1_17_R1.CraftChunk;
+import org.bukkit.craftbukkit.v1_17_R1.block.CraftBlock;
 import org.bukkit.inventory.ItemStack;
 
 public class WorldCoreImpl implements WorldCore {
@@ -96,4 +98,13 @@ public class WorldCoreImpl implements WorldCore {
 
         profiler.exit();
     }
+
+    @Override
+    public void updateAdjacentComparators(Block bukkitBlock) {
+        CraftBlock craftBlock = (CraftBlock) bukkitBlock;
+        CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk();
+
+        net.minecraft.world.level.World nmsWorld = craftChunk.getHandle().getWorld();
+        nmsWorld.updateAdjacentComparators(craftBlock.getPosition(), craftBlock.getNMS().getBlock());
+    }
 }
diff --git a/NMS/NMS-v1_18_R1/src/main/java/com/songoda/core/nms/v1_18_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_18_R1/src/main/java/com/songoda/core/nms/v1_18_R1/world/WorldCoreImpl.java
index 88bec313..cefdd224 100644
--- a/NMS/NMS-v1_18_R1/src/main/java/com/songoda/core/nms/v1_18_R1/world/WorldCoreImpl.java
+++ b/NMS/NMS-v1_18_R1/src/main/java/com/songoda/core/nms/v1_18_R1/world/WorldCoreImpl.java
@@ -18,8 +18,10 @@ import net.minecraft.world.level.chunk.ChunkSection;
 import net.minecraft.world.level.material.Fluid;
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.craftbukkit.v1_18_R1.CraftChunk;
+import org.bukkit.craftbukkit.v1_18_R1.block.CraftBlock;
 import org.bukkit.inventory.ItemStack;
 
 public class WorldCoreImpl implements WorldCore {
@@ -93,4 +95,13 @@ public class WorldCoreImpl implements WorldCore {
 
         gameprofilerfiller.c();
     }
+
+    @Override
+    public void updateAdjacentComparators(Block bukkitBlock) {
+        CraftBlock craftBlock = (CraftBlock) bukkitBlock;
+        CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk();
+
+        WorldServer nmsWorld = craftChunk.getHandle().q;
+        nmsWorld.c(craftBlock.getPosition(), craftBlock.getNMS().b());
+    }
 }
diff --git a/NMS/NMS-v1_18_R2/src/main/java/com/songoda/core/nms/v1_18_R2/world/WorldCoreImpl.java b/NMS/NMS-v1_18_R2/src/main/java/com/songoda/core/nms/v1_18_R2/world/WorldCoreImpl.java
index fc0198eb..bbfc8474 100644
--- a/NMS/NMS-v1_18_R2/src/main/java/com/songoda/core/nms/v1_18_R2/world/WorldCoreImpl.java
+++ b/NMS/NMS-v1_18_R2/src/main/java/com/songoda/core/nms/v1_18_R2/world/WorldCoreImpl.java
@@ -18,8 +18,10 @@ import net.minecraft.world.level.chunk.LevelChunkSection;
 import net.minecraft.world.level.material.FluidState;
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.craftbukkit.v1_18_R2.CraftChunk;
+import org.bukkit.craftbukkit.v1_18_R2.block.CraftBlock;
 import org.bukkit.inventory.ItemStack;
 
 public class WorldCoreImpl implements WorldCore {
@@ -92,4 +94,13 @@ public class WorldCoreImpl implements WorldCore {
 
         gameProfilerFiller.pop();
     }
+
+    @Override
+    public void updateAdjacentComparators(Block bukkitBlock) {
+        CraftBlock craftBlock = (CraftBlock) bukkitBlock;
+        CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk();
+
+        ServerLevel nmsWorld = craftChunk.getHandle().q;
+        nmsWorld.updateNeighbourForOutputSignal(craftBlock.getPosition(), craftBlock.getNMS().getBlock());
+    }
 }
diff --git a/NMS/NMS-v1_19_R1/src/main/java/com/songoda/core/nms/v1_19_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_19_R1/src/main/java/com/songoda/core/nms/v1_19_R1/world/WorldCoreImpl.java
index 02b63a43..ef9b1958 100644
--- a/NMS/NMS-v1_19_R1/src/main/java/com/songoda/core/nms/v1_19_R1/world/WorldCoreImpl.java
+++ b/NMS/NMS-v1_19_R1/src/main/java/com/songoda/core/nms/v1_19_R1/world/WorldCoreImpl.java
@@ -18,8 +18,10 @@ import net.minecraft.world.level.chunk.LevelChunkSection;
 import net.minecraft.world.level.material.FluidState;
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.craftbukkit.v1_19_R1.CraftChunk;
+import org.bukkit.craftbukkit.v1_19_R1.block.CraftBlock;
 import org.bukkit.inventory.ItemStack;
 
 public class WorldCoreImpl implements WorldCore {
@@ -90,4 +92,13 @@ public class WorldCoreImpl implements WorldCore {
             }
         }
     }
+
+    @Override
+    public void updateAdjacentComparators(Block bukkitBlock) {
+        CraftBlock craftBlock = (CraftBlock) bukkitBlock;
+        CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk();
+
+        ServerLevel nmsWorld = craftChunk.getHandle().q;
+        nmsWorld.updateNeighbourForOutputSignal(craftBlock.getPosition(), craftBlock.getNMS().getBlock());
+    }
 }
diff --git a/NMS/NMS-v1_19_R1v2/src/main/java/com/songoda/core/nms/v1_19_R1v2/world/WorldCoreImpl.java b/NMS/NMS-v1_19_R1v2/src/main/java/com/songoda/core/nms/v1_19_R1v2/world/WorldCoreImpl.java
index 496fa18e..b0015e23 100644
--- a/NMS/NMS-v1_19_R1v2/src/main/java/com/songoda/core/nms/v1_19_R1v2/world/WorldCoreImpl.java
+++ b/NMS/NMS-v1_19_R1v2/src/main/java/com/songoda/core/nms/v1_19_R1v2/world/WorldCoreImpl.java
@@ -18,8 +18,10 @@ import net.minecraft.world.level.chunk.LevelChunkSection;
 import net.minecraft.world.level.material.FluidState;
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.craftbukkit.v1_19_R1.CraftChunk;
+import org.bukkit.craftbukkit.v1_19_R1.block.CraftBlock;
 import org.bukkit.inventory.ItemStack;
 
 public class WorldCoreImpl implements WorldCore {
@@ -90,4 +92,13 @@ public class WorldCoreImpl implements WorldCore {
             }
         }
     }
+
+    @Override
+    public void updateAdjacentComparators(Block bukkitBlock) {
+        CraftBlock craftBlock = (CraftBlock) bukkitBlock;
+        CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk();
+
+        ServerLevel nmsWorld = craftChunk.getHandle().q;
+        nmsWorld.updateNeighbourForOutputSignal(craftBlock.getPosition(), craftBlock.getNMS().getBlock());
+    }
 }
diff --git a/NMS/NMS-v1_19_R2/src/main/java/com/songoda/core/nms/v1_19_R2/world/WorldCoreImpl.java b/NMS/NMS-v1_19_R2/src/main/java/com/songoda/core/nms/v1_19_R2/world/WorldCoreImpl.java
index c616f9ff..cd919101 100644
--- a/NMS/NMS-v1_19_R2/src/main/java/com/songoda/core/nms/v1_19_R2/world/WorldCoreImpl.java
+++ b/NMS/NMS-v1_19_R2/src/main/java/com/songoda/core/nms/v1_19_R2/world/WorldCoreImpl.java
@@ -18,8 +18,10 @@ import net.minecraft.world.level.chunk.LevelChunkSection;
 import net.minecraft.world.level.material.FluidState;
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.craftbukkit.v1_19_R2.CraftChunk;
+import org.bukkit.craftbukkit.v1_19_R2.block.CraftBlock;
 import org.bukkit.inventory.ItemStack;
 
 public class WorldCoreImpl implements WorldCore {
@@ -90,4 +92,13 @@ public class WorldCoreImpl implements WorldCore {
             }
         }
     }
+
+    @Override
+    public void updateAdjacentComparators(Block bukkitBlock) {
+        CraftBlock craftBlock = (CraftBlock) bukkitBlock;
+        CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk();
+
+        ServerLevel nmsWorld = craftChunk.getHandle().q;
+        nmsWorld.updateNeighbourForOutputSignal(craftBlock.getPosition(), craftBlock.getNMS().getBlock());
+    }
 }
diff --git a/NMS/NMS-v1_19_R3/src/main/java/com/songoda/core/nms/v1_19_R3/world/WorldCoreImpl.java b/NMS/NMS-v1_19_R3/src/main/java/com/songoda/core/nms/v1_19_R3/world/WorldCoreImpl.java
index 5a84efc4..1a3b56ca 100644
--- a/NMS/NMS-v1_19_R3/src/main/java/com/songoda/core/nms/v1_19_R3/world/WorldCoreImpl.java
+++ b/NMS/NMS-v1_19_R3/src/main/java/com/songoda/core/nms/v1_19_R3/world/WorldCoreImpl.java
@@ -19,8 +19,10 @@ import net.minecraft.world.level.chunk.LevelChunkSection;
 import net.minecraft.world.level.material.FluidState;
 import org.bukkit.Location;
 import org.bukkit.World;
+import org.bukkit.block.Block;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.craftbukkit.v1_19_R3.CraftChunk;
+import org.bukkit.craftbukkit.v1_19_R3.block.CraftBlock;
 import org.bukkit.inventory.ItemStack;
 
 public class WorldCoreImpl implements WorldCore {
@@ -91,4 +93,13 @@ public class WorldCoreImpl implements WorldCore {
             }
         }
     }
+
+    @Override
+    public void updateAdjacentComparators(Block bukkitBlock) {
+        CraftBlock craftBlock = (CraftBlock) bukkitBlock;
+        CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk();
+        LevelChunk nmsChunk = (LevelChunk) craftChunk.getHandle(ChunkStatus.FULL);
+
+        nmsChunk.q.updateNeighbourForOutputSignal(craftBlock.getPosition(), craftBlock.getNMS().getBlock());
+    }
 }
diff --git a/NMS/NMS-v1_8_R1/src/main/java/com/songoda/core/nms/v1_8_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_8_R1/src/main/java/com/songoda/core/nms/v1_8_R1/world/WorldCoreImpl.java
index 2c024638..abd021ad 100644
--- a/NMS/NMS-v1_8_R1/src/main/java/com/songoda/core/nms/v1_8_R1/world/WorldCoreImpl.java
+++ b/NMS/NMS-v1_8_R1/src/main/java/com/songoda/core/nms/v1_8_R1/world/WorldCoreImpl.java
@@ -18,6 +18,8 @@ import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.craftbukkit.v1_8_R1.CraftChunk;
+import org.bukkit.craftbukkit.v1_8_R1.block.CraftBlock;
+import org.bukkit.craftbukkit.v1_8_R1.util.CraftMagicNumbers;
 import org.bukkit.inventory.ItemStack;
 
 public class WorldCoreImpl implements WorldCore {
@@ -87,4 +89,14 @@ public class WorldCoreImpl implements WorldCore {
             }
         }
     }
+
+    @Override
+    public void updateAdjacentComparators(org.bukkit.block.Block bukkitBlock) {
+        CraftBlock craftBlock = (CraftBlock) bukkitBlock;
+        CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk();
+        net.minecraft.server.v1_8_R1.World nmsWorld = craftChunk.getHandle().getWorld();
+
+        BlockPosition blockPosition = new BlockPosition(craftBlock.getX(), craftBlock.getY(), craftBlock.getZ());
+        nmsWorld.updateAdjacentComparators(blockPosition, CraftMagicNumbers.getBlock(craftBlock));
+    }
 }
diff --git a/NMS/NMS-v1_8_R2/src/main/java/com/songoda/core/nms/v1_8_R2/world/WorldCoreImpl.java b/NMS/NMS-v1_8_R2/src/main/java/com/songoda/core/nms/v1_8_R2/world/WorldCoreImpl.java
index bd0d76bc..158e7a2a 100644
--- a/NMS/NMS-v1_8_R2/src/main/java/com/songoda/core/nms/v1_8_R2/world/WorldCoreImpl.java
+++ b/NMS/NMS-v1_8_R2/src/main/java/com/songoda/core/nms/v1_8_R2/world/WorldCoreImpl.java
@@ -18,6 +18,8 @@ import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.craftbukkit.v1_8_R2.CraftChunk;
+import org.bukkit.craftbukkit.v1_8_R2.block.CraftBlock;
+import org.bukkit.craftbukkit.v1_8_R2.util.CraftMagicNumbers;
 import org.bukkit.inventory.ItemStack;
 
 public class WorldCoreImpl implements WorldCore {
@@ -87,4 +89,14 @@ public class WorldCoreImpl implements WorldCore {
             }
         }
     }
+
+    @Override
+    public void updateAdjacentComparators(org.bukkit.block.Block bukkitBlock) {
+        CraftBlock craftBlock = (CraftBlock) bukkitBlock;
+        CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk();
+        net.minecraft.server.v1_8_R2.World nmsWorld = craftChunk.getHandle().getWorld();
+
+        BlockPosition blockPosition = new BlockPosition(craftBlock.getX(), craftBlock.getY(), craftBlock.getZ());
+        nmsWorld.updateAdjacentComparators(blockPosition, CraftMagicNumbers.getBlock(craftBlock));
+    }
 }
diff --git a/NMS/NMS-v1_8_R3/src/main/java/com/songoda/core/nms/v1_8_R3/world/WorldCoreImpl.java b/NMS/NMS-v1_8_R3/src/main/java/com/songoda/core/nms/v1_8_R3/world/WorldCoreImpl.java
index 45fcb655..bba6b4f7 100644
--- a/NMS/NMS-v1_8_R3/src/main/java/com/songoda/core/nms/v1_8_R3/world/WorldCoreImpl.java
+++ b/NMS/NMS-v1_8_R3/src/main/java/com/songoda/core/nms/v1_8_R3/world/WorldCoreImpl.java
@@ -18,6 +18,8 @@ import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.craftbukkit.v1_8_R3.CraftChunk;
+import org.bukkit.craftbukkit.v1_8_R3.block.CraftBlock;
+import org.bukkit.craftbukkit.v1_8_R3.util.CraftMagicNumbers;
 import org.bukkit.inventory.ItemStack;
 
 public class WorldCoreImpl implements WorldCore {
@@ -86,4 +88,14 @@ public class WorldCoreImpl implements WorldCore {
             }
         }
     }
+
+    @Override
+    public void updateAdjacentComparators(org.bukkit.block.Block bukkitBlock) {
+        CraftBlock craftBlock = (CraftBlock) bukkitBlock;
+        CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk();
+        net.minecraft.server.v1_8_R3.World nmsWorld = craftChunk.getHandle().getWorld();
+
+        BlockPosition blockPosition = new BlockPosition(craftBlock.getX(), craftBlock.getY(), craftBlock.getZ());
+        nmsWorld.updateAdjacentComparators(blockPosition, CraftMagicNumbers.getBlock(craftBlock));
+    }
 }
diff --git a/NMS/NMS-v1_9_R1/src/main/java/com/songoda/core/nms/v1_9_R1/world/WorldCoreImpl.java b/NMS/NMS-v1_9_R1/src/main/java/com/songoda/core/nms/v1_9_R1/world/WorldCoreImpl.java
index 66c3e421..1cf86d79 100644
--- a/NMS/NMS-v1_9_R1/src/main/java/com/songoda/core/nms/v1_9_R1/world/WorldCoreImpl.java
+++ b/NMS/NMS-v1_9_R1/src/main/java/com/songoda/core/nms/v1_9_R1/world/WorldCoreImpl.java
@@ -18,6 +18,8 @@ import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.craftbukkit.v1_9_R1.CraftChunk;
+import org.bukkit.craftbukkit.v1_9_R1.block.CraftBlock;
+import org.bukkit.craftbukkit.v1_9_R1.util.CraftMagicNumbers;
 import org.bukkit.inventory.ItemStack;
 
 public class WorldCoreImpl implements WorldCore {
@@ -86,4 +88,14 @@ public class WorldCoreImpl implements WorldCore {
             }
         }
     }
+
+    @Override
+    public void updateAdjacentComparators(org.bukkit.block.Block bukkitBlock) {
+        CraftBlock craftBlock = (CraftBlock) bukkitBlock;
+        CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk();
+        net.minecraft.server.v1_9_R1.World nmsWorld = craftChunk.getHandle().getWorld();
+
+        BlockPosition blockPosition = new BlockPosition(craftBlock.getX(), craftBlock.getY(), craftBlock.getZ());
+        nmsWorld.updateAdjacentComparators(blockPosition, CraftMagicNumbers.getBlock(craftBlock));
+    }
 }
diff --git a/NMS/NMS-v1_9_R2/src/main/java/com/songoda/core/nms/v1_9_R2/world/WorldCoreImpl.java b/NMS/NMS-v1_9_R2/src/main/java/com/songoda/core/nms/v1_9_R2/world/WorldCoreImpl.java
index 5dfeba18..41091719 100644
--- a/NMS/NMS-v1_9_R2/src/main/java/com/songoda/core/nms/v1_9_R2/world/WorldCoreImpl.java
+++ b/NMS/NMS-v1_9_R2/src/main/java/com/songoda/core/nms/v1_9_R2/world/WorldCoreImpl.java
@@ -18,6 +18,8 @@ import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.block.CreatureSpawner;
 import org.bukkit.craftbukkit.v1_9_R2.CraftChunk;
+import org.bukkit.craftbukkit.v1_9_R2.block.CraftBlock;
+import org.bukkit.craftbukkit.v1_9_R2.util.CraftMagicNumbers;
 import org.bukkit.inventory.ItemStack;
 
 public class WorldCoreImpl implements WorldCore {
@@ -85,4 +87,14 @@ public class WorldCoreImpl implements WorldCore {
             }
         }
     }
+
+    @Override
+    public void updateAdjacentComparators(org.bukkit.block.Block bukkitBlock) {
+        CraftBlock craftBlock = (CraftBlock) bukkitBlock;
+        CraftChunk craftChunk = (CraftChunk) bukkitBlock.getChunk();
+        net.minecraft.server.v1_9_R2.World nmsWorld = craftChunk.getHandle().getWorld();
+
+        BlockPosition blockPosition = new BlockPosition(craftBlock.getX(), craftBlock.getY(), craftBlock.getZ());
+        nmsWorld.updateAdjacentComparators(blockPosition, CraftMagicNumbers.getBlock(craftBlock));
+    }
 }

From eb76ba47ee4120ce75ccf53e998d4bf95be8fe2e Mon Sep 17 00:00:00 2001
From: Christian Koop <contact@sprax2013.de>
Date: Wed, 19 Apr 2023 21:51:42 +0200
Subject: [PATCH 2/5] Deprecate the ClassMapping and MethodMapping classes

They are a huge pain to maintain... I should have put a stronger word against this when it got added...
---
 .../java/com/songoda/core/compatibility/ClassMapping.java     | 4 ++++
 .../java/com/songoda/core/compatibility/MethodMapping.java    | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/Compatibility/src/main/java/com/songoda/core/compatibility/ClassMapping.java b/Compatibility/src/main/java/com/songoda/core/compatibility/ClassMapping.java
index 4fe950f7..4087cc18 100644
--- a/Compatibility/src/main/java/com/songoda/core/compatibility/ClassMapping.java
+++ b/Compatibility/src/main/java/com/songoda/core/compatibility/ClassMapping.java
@@ -1,5 +1,9 @@
 package com.songoda.core.compatibility;
 
+/**
+ * @deprecated Usage is highly discouraged – use NMSManager instead
+ */
+@Deprecated
 public enum ClassMapping {
     BIOME_BASE("world.level.biome", "BiomeBase"),
     BIOME_STORAGE("world.level.chunk", "BiomeStorage"),
diff --git a/Compatibility/src/main/java/com/songoda/core/compatibility/MethodMapping.java b/Compatibility/src/main/java/com/songoda/core/compatibility/MethodMapping.java
index 640a1c1b..39d6c394 100644
--- a/Compatibility/src/main/java/com/songoda/core/compatibility/MethodMapping.java
+++ b/Compatibility/src/main/java/com/songoda/core/compatibility/MethodMapping.java
@@ -5,6 +5,10 @@ import org.bukkit.inventory.ItemStack;
 
 import java.lang.reflect.Method;
 
+/**
+ * @deprecated Usage is highly discouraged – use NMSManager instead
+ */
+@Deprecated
 public enum MethodMapping {
     MC_ITEM_STACK__GET_TAG("getTag", "getTag", "s", "t", "u"),
     MC_ITEM_STACK__SET_TAG("setTag", "setTag", "c", "c", "c", ClassMapping.NBT_TAG_COMPOUND.getClazz()),

From 9361fad0bf1372dd95319af06f1887292006a23f Mon Sep 17 00:00:00 2001
From: Christian Koop <contact@sprax2013.de>
Date: Sat, 22 Apr 2023 15:18:29 +0200
Subject: [PATCH 3/5] Deprecate BlockUtils and BlockUtilsModern classes

---
 Core/src/main/java/com/songoda/core/utils/BlockUtils.java     | 4 ++++
 .../main/java/com/songoda/core/utils/BlockUtilsModern.java    | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/Core/src/main/java/com/songoda/core/utils/BlockUtils.java b/Core/src/main/java/com/songoda/core/utils/BlockUtils.java
index 314feee9..d6d97d77 100644
--- a/Core/src/main/java/com/songoda/core/utils/BlockUtils.java
+++ b/Core/src/main/java/com/songoda/core/utils/BlockUtils.java
@@ -20,6 +20,10 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+/**
+ * @deprecated This class will be removed in the future and replaced with a more maintainable system.
+ */
+@Deprecated
 public class BlockUtils {
     protected static final Set<Material> DOORS;
     protected static final Set<Material> PRESSURE_PLATES;
diff --git a/Core/src/main/java/com/songoda/core/utils/BlockUtilsModern.java b/Core/src/main/java/com/songoda/core/utils/BlockUtilsModern.java
index 9eff9b46..08e1a7ee 100644
--- a/Core/src/main/java/com/songoda/core/utils/BlockUtilsModern.java
+++ b/Core/src/main/java/com/songoda/core/utils/BlockUtilsModern.java
@@ -22,6 +22,10 @@ import java.lang.reflect.Method;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+/**
+ * @deprecated This class will be removed in the future and replaced with a more maintainable system.
+ */
+@Deprecated
 public class BlockUtilsModern {
     protected static void _updatePressurePlateModern(Block plate, int power) {
         BlockData blockData = plate.getBlockData();

From 8d9508413710e7dd2d6e3e0f3e1dc265635906c6 Mon Sep 17 00:00:00 2001
From: Christian Koop <contact@sprax2013.de>
Date: Sat, 22 Apr 2023 16:13:01 +0200
Subject: [PATCH 4/5] Adds missing Spawn Eggs to CompatibleMaterial, added in
 Minecraft 1.19.3

fixes #46
---
 .../com/songoda/core/compatibility/CompatibleMaterial.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Compatibility/src/main/java/com/songoda/core/compatibility/CompatibleMaterial.java b/Compatibility/src/main/java/com/songoda/core/compatibility/CompatibleMaterial.java
index f56914ba..0558dce3 100644
--- a/Compatibility/src/main/java/com/songoda/core/compatibility/CompatibleMaterial.java
+++ b/Compatibility/src/main/java/com/songoda/core/compatibility/CompatibleMaterial.java
@@ -32,6 +32,12 @@ public enum CompatibleMaterial {
      DARK_OAK_DOOR_ITEM(431),
      */
 
+    /* 1.19.3 */
+    ENDER_DRAGON_SPAWN_EGG(),
+    IRON_GOLEM_SPAWN_EGG(),
+    SNOW_GOLEM_SPAWN_EGG(),
+    WITHER_SPAWN_EGG(),
+
     /* 1.19 */
     ACACIA_CHEST_BOAT(),
     ALLAY_SPAWN_EGG(),

From 7a7d2e8b9757305a5a6d917ab4df50608d38a7ef Mon Sep 17 00:00:00 2001
From: Christian Koop <contact@sprax2013.de>
Date: Wed, 19 Apr 2023 21:52:21 +0200
Subject: [PATCH 5/5] Release v2.6.20

---
 Compatibility/pom.xml                                | 2 +-
 Core/pom.xml                                         | 2 +-
 Core/src/main/java/com/songoda/core/SongodaCore.java | 2 +-
 NMS/NMS-API/pom.xml                                  | 2 +-
 NMS/NMS-v1_10_R1/pom.xml                             | 2 +-
 NMS/NMS-v1_11_R1/pom.xml                             | 2 +-
 NMS/NMS-v1_12_R1/pom.xml                             | 2 +-
 NMS/NMS-v1_13_R1/pom.xml                             | 2 +-
 NMS/NMS-v1_13_R2/pom.xml                             | 2 +-
 NMS/NMS-v1_14_R1/pom.xml                             | 2 +-
 NMS/NMS-v1_15_R1/pom.xml                             | 2 +-
 NMS/NMS-v1_16_R1/pom.xml                             | 2 +-
 NMS/NMS-v1_16_R2/pom.xml                             | 2 +-
 NMS/NMS-v1_16_R3/pom.xml                             | 2 +-
 NMS/NMS-v1_17_R1/pom.xml                             | 2 +-
 NMS/NMS-v1_18_R1/pom.xml                             | 2 +-
 NMS/NMS-v1_18_R2/pom.xml                             | 2 +-
 NMS/NMS-v1_19_R1/pom.xml                             | 2 +-
 NMS/NMS-v1_19_R1v2/pom.xml                           | 2 +-
 NMS/NMS-v1_19_R2/pom.xml                             | 2 +-
 NMS/NMS-v1_19_R3/pom.xml                             | 2 +-
 NMS/NMS-v1_8_R1/pom.xml                              | 2 +-
 NMS/NMS-v1_8_R2/pom.xml                              | 2 +-
 NMS/NMS-v1_8_R3/pom.xml                              | 2 +-
 NMS/NMS-v1_9_R1/pom.xml                              | 2 +-
 NMS/NMS-v1_9_R2/pom.xml                              | 2 +-
 pom.xml                                              | 2 +-
 27 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/Compatibility/pom.xml b/Compatibility/pom.xml
index 3c34e61d..9d94b4da 100644
--- a/Compatibility/pom.xml
+++ b/Compatibility/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/Core/pom.xml b/Core/pom.xml
index d62fab4c..6efa329c 100644
--- a/Core/pom.xml
+++ b/Core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/Core/src/main/java/com/songoda/core/SongodaCore.java b/Core/src/main/java/com/songoda/core/SongodaCore.java
index 9ef03580..c6023751 100644
--- a/Core/src/main/java/com/songoda/core/SongodaCore.java
+++ b/Core/src/main/java/com/songoda/core/SongodaCore.java
@@ -55,7 +55,7 @@ public class SongodaCore {
     /**
      * @since coreRevision 6
      */
-    private final static String coreVersion = "2.6.19";
+    private final static String coreVersion = "2.6.20";
 
     /**
      * This is specific to the website api
diff --git a/NMS/NMS-API/pom.xml b/NMS/NMS-API/pom.xml
index 54653ced..05888076 100644
--- a/NMS/NMS-API/pom.xml
+++ b/NMS/NMS-API/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_10_R1/pom.xml b/NMS/NMS-v1_10_R1/pom.xml
index 3eedb030..db30de3d 100644
--- a/NMS/NMS-v1_10_R1/pom.xml
+++ b/NMS/NMS-v1_10_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_11_R1/pom.xml b/NMS/NMS-v1_11_R1/pom.xml
index 0c9f6cf1..fb523499 100644
--- a/NMS/NMS-v1_11_R1/pom.xml
+++ b/NMS/NMS-v1_11_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_12_R1/pom.xml b/NMS/NMS-v1_12_R1/pom.xml
index 55f19bb1..dc37b0c7 100644
--- a/NMS/NMS-v1_12_R1/pom.xml
+++ b/NMS/NMS-v1_12_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_13_R1/pom.xml b/NMS/NMS-v1_13_R1/pom.xml
index b8275b07..a4179b3c 100644
--- a/NMS/NMS-v1_13_R1/pom.xml
+++ b/NMS/NMS-v1_13_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_13_R2/pom.xml b/NMS/NMS-v1_13_R2/pom.xml
index adf4ea90..8a9404e4 100644
--- a/NMS/NMS-v1_13_R2/pom.xml
+++ b/NMS/NMS-v1_13_R2/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_14_R1/pom.xml b/NMS/NMS-v1_14_R1/pom.xml
index e3516501..452fdc9b 100644
--- a/NMS/NMS-v1_14_R1/pom.xml
+++ b/NMS/NMS-v1_14_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_15_R1/pom.xml b/NMS/NMS-v1_15_R1/pom.xml
index 5b2d8e47..8ff64932 100644
--- a/NMS/NMS-v1_15_R1/pom.xml
+++ b/NMS/NMS-v1_15_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_16_R1/pom.xml b/NMS/NMS-v1_16_R1/pom.xml
index 5f4ba56d..d1564071 100644
--- a/NMS/NMS-v1_16_R1/pom.xml
+++ b/NMS/NMS-v1_16_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_16_R2/pom.xml b/NMS/NMS-v1_16_R2/pom.xml
index 1cf5ed06..089771bd 100644
--- a/NMS/NMS-v1_16_R2/pom.xml
+++ b/NMS/NMS-v1_16_R2/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_16_R3/pom.xml b/NMS/NMS-v1_16_R3/pom.xml
index 680b913f..f5635c9c 100644
--- a/NMS/NMS-v1_16_R3/pom.xml
+++ b/NMS/NMS-v1_16_R3/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_17_R1/pom.xml b/NMS/NMS-v1_17_R1/pom.xml
index 21e00633..748d2638 100644
--- a/NMS/NMS-v1_17_R1/pom.xml
+++ b/NMS/NMS-v1_17_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_18_R1/pom.xml b/NMS/NMS-v1_18_R1/pom.xml
index 5e1dbb91..6f99c559 100644
--- a/NMS/NMS-v1_18_R1/pom.xml
+++ b/NMS/NMS-v1_18_R1/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_18_R2/pom.xml b/NMS/NMS-v1_18_R2/pom.xml
index 65ce83a2..d7f5c630 100644
--- a/NMS/NMS-v1_18_R2/pom.xml
+++ b/NMS/NMS-v1_18_R2/pom.xml
@@ -60,7 +60,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_19_R1/pom.xml b/NMS/NMS-v1_19_R1/pom.xml
index 078319cc..52adb7d8 100644
--- a/NMS/NMS-v1_19_R1/pom.xml
+++ b/NMS/NMS-v1_19_R1/pom.xml
@@ -60,7 +60,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_19_R1v2/pom.xml b/NMS/NMS-v1_19_R1v2/pom.xml
index 69bab071..e0e3e858 100644
--- a/NMS/NMS-v1_19_R1v2/pom.xml
+++ b/NMS/NMS-v1_19_R1v2/pom.xml
@@ -60,7 +60,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_19_R2/pom.xml b/NMS/NMS-v1_19_R2/pom.xml
index 0773ce86..b0a69d5f 100644
--- a/NMS/NMS-v1_19_R2/pom.xml
+++ b/NMS/NMS-v1_19_R2/pom.xml
@@ -60,7 +60,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_19_R3/pom.xml b/NMS/NMS-v1_19_R3/pom.xml
index 1b638b7b..a85a5de6 100644
--- a/NMS/NMS-v1_19_R3/pom.xml
+++ b/NMS/NMS-v1_19_R3/pom.xml
@@ -60,7 +60,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_8_R1/pom.xml b/NMS/NMS-v1_8_R1/pom.xml
index 5f774ddd..035cb273 100644
--- a/NMS/NMS-v1_8_R1/pom.xml
+++ b/NMS/NMS-v1_8_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_8_R2/pom.xml b/NMS/NMS-v1_8_R2/pom.xml
index 281344d2..2f28a5a9 100644
--- a/NMS/NMS-v1_8_R2/pom.xml
+++ b/NMS/NMS-v1_8_R2/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_8_R3/pom.xml b/NMS/NMS-v1_8_R3/pom.xml
index 2af8c463..078f178b 100644
--- a/NMS/NMS-v1_8_R3/pom.xml
+++ b/NMS/NMS-v1_8_R3/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_9_R1/pom.xml b/NMS/NMS-v1_9_R1/pom.xml
index 214d23c7..98cdbaeb 100644
--- a/NMS/NMS-v1_9_R1/pom.xml
+++ b/NMS/NMS-v1_9_R1/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/NMS/NMS-v1_9_R2/pom.xml b/NMS/NMS-v1_9_R2/pom.xml
index 7a564fc7..fc03e492 100644
--- a/NMS/NMS-v1_9_R2/pom.xml
+++ b/NMS/NMS-v1_9_R2/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.songoda</groupId>
         <artifactId>SongodaCore-Modules</artifactId>
-        <version>2.6.19</version>
+        <version>2.6.20</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 2ba3e4f0..47277582 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.songoda</groupId>
     <artifactId>SongodaCore-Modules</artifactId>
-    <version>2.6.19</version>
+    <version>2.6.20</version>
     <packaging>pom</packaging>
 
     <!-- Run 'mvn versions:set -DgenerateBackupPoms=false -DnewVersion=X.Y.Z' to update version recursively -->