Fixed NoSuchFieldError in MC 1.20.5 and earlier

Author: Intelli

lang/en.yml

@@ -209,4 +209,4 @@ VALID_DONATION_KEY: "Valid donation key."
 VERSION_INCOMPATIBLE: "{0} {1} is not supported."
 VERSION_NOTICE: "Version {0} is now available."
 VERSION_REQUIRED: "{0} {1} or higher is required."
-WORLD_NOT_FOUND: "World \"{0}\" not found."
+WORLD_NOT_FOUND: "World \"{0}\" not found."

src/main/java/net/coreprotect/bukkit/BukkitAdapter.java

@@ -23,6 +23,7 @@
 import org.bukkit.entity.ItemFrame;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.block.SignChangeEvent;
+import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.MerchantRecipe;
@@ -355,6 +356,11 @@ public Object getRegistryValue(String key, Object tClass) {
         return null;
     }
 
+    @Override
+    public boolean isCrafter(InventoryType type) {
+        return false;
+    }
+
     @Override
     public boolean isCopperChest(Material material) {
         return false;

src/main/java/net/coreprotect/bukkit/BukkitInterface.java

@@ -15,6 +15,7 @@
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.block.SignChangeEvent;
+import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.MerchantRecipe;
@@ -434,7 +435,10 @@ public interface BukkitInterface {
      */
     String parseLegacyName(String name);
 
+    boolean isCrafter(InventoryType type);
+
     boolean isCopperChest(Material material);
 
     Set<Material> copperChestMaterials();
+
 }

src/main/java/net/coreprotect/bukkit/Bukkit_v1_21.java

@@ -11,6 +11,7 @@
 import org.bukkit.NamespacedKey;
 import org.bukkit.Tag;
 import org.bukkit.entity.EntityType;
+import org.bukkit.event.inventory.InventoryType;
 
 import net.coreprotect.model.BlockGroup;
 
@@ -162,6 +163,11 @@ public void setWolfVariant(org.bukkit.entity.Wolf wolf, Object value) {
 
     }
 
+    @Override
+    public boolean isCrafter(InventoryType type) {
+        return type == InventoryType.CRAFTER;
+    }
+
     @Override
     public boolean isCopperChest(Material material) {
         if (COPPER_CHESTS.contains(material) && material != Material.CHEST) {

src/main/java/net/coreprotect/listener/player/InventoryChangeListener.java

@@ -17,10 +17,19 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.*;
-import org.bukkit.inventory.*;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.event.inventory.InventoryAction;
+import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.event.inventory.InventoryDragEvent;
+import org.bukkit.event.inventory.InventoryMoveItemEvent;
+import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.inventory.BlockInventoryHolder;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.InventoryHolder;
+import org.bukkit.inventory.ItemStack;
 
 import net.coreprotect.CoreProtect;
+import net.coreprotect.bukkit.BukkitAdapter;
 import net.coreprotect.config.Config;
 import net.coreprotect.config.ConfigHandler;
 import net.coreprotect.consumer.Queue;
@@ -338,7 +347,7 @@ private boolean checkAnvilOperation(InventoryClickEvent event) {
 
     private boolean checkCrafterSlotChange(InventoryClickEvent event) {
         // Check if the clicked inventory is a crafter
-        if (event.getInventory().getType() != InventoryType.CRAFTER) {
+        if (!BukkitAdapter.ADAPTER.isCrafter(event.getInventory().getType())) {
             return false;
         }
 
@@ -364,7 +373,8 @@ private boolean checkCrafterSlotChange(InventoryClickEvent event) {
         Location location = null;
         try {
             location = inventory.getLocation();
-        } catch (Exception e) {
+        }
+        catch (Exception e) {
             return false;
         }
 

src/main/java/net/coreprotect/services/VersionCheckService.java

@@ -45,7 +45,7 @@ public static boolean performVersionChecks() {
             }
 
             // Patch version validation
-            if (VersionUtils.newVersion(ConfigHandler.PATCH_VERSION, VersionUtils.getPluginVersion()) && !ConfigHandler.EDITION_BRANCH.contains("-dev")) {
+            if (VersionUtils.newVersion(ConfigHandler.PATCH_VERSION, VersionUtils.getPluginVersion()) && !VersionUtils.isBranch("dev")) {
                 Chat.console(Phrase.build(Phrase.VERSION_INCOMPATIBLE, "CoreProtect", "v" + VersionUtils.getPluginVersion()));
                 Chat.sendConsoleMessage(Color.GREY + "[CoreProtect] " + Phrase.build(Phrase.INVALID_BRANCH_2));
                 return false;