Maybe fix open, added support for not converting items with custom model data

Author: AverageGithub

src/main/java/com/artillexstudios/axsmithing/gui/impl/SmithingTable_V1_16.java

@@ -30,12 +30,14 @@ public class SmithingTable_V1_16 implements SmithingTable, InventoryHolder {
     private final int outputSlot;
     private final int upgradeSlot;
     private final int itemSlot;
+    private final boolean dontConvertWithModelData;
 
     public SmithingTable_V1_16() {
         YamlDocument config = AxSmithingPlugin.getConfiguration();
         outputSlot = config.getInt("menu.1_16.output-slot");
         upgradeSlot = config.getInt("menu.1_16.upgrade-slot");
         itemSlot = config.getInt("menu.1_16.item-slot");
+        dontConvertWithModelData = config.getBoolean("menu.1_16.dont-convert-with-modeldata");
     }
 
     @Override
@@ -184,6 +186,10 @@ private boolean checkRecipe(Inventory inventory, ItemStack finalBase, ItemStack
                 ItemMeta baseItemMeta = finalBase.getItemMeta();
                 boolean test2 = smithingRecipe.getAddition().test(finalAddition);
 
+                if (dontConvertWithModelData && baseItemMeta.hasCustomModelData()) {
+                    return false;
+                }
+
                 if (test1 && test2) {
                     ItemStack item = smithingRecipe.getResult();
                     item.setItemMeta(baseItemMeta);

src/main/java/com/artillexstudios/axsmithing/gui/impl/SmithingTable_V1_20.java

@@ -38,6 +38,7 @@ public class SmithingTable_V1_20 implements SmithingTable, InventoryHolder {
     private final int itemSlot;
     private final int templateSlot;
     private final boolean needNetheriteTemplate;
+    private final boolean dontConvertWithModelData;
 
     public SmithingTable_V1_20() {
         YamlDocument config = AxSmithingPlugin.getConfiguration();
@@ -46,6 +47,7 @@ public SmithingTable_V1_20() {
         templateSlot = config.getInt("menu.1_20.template-slot");
         itemSlot = config.getInt("menu.1_20.item-slot");
         needNetheriteTemplate = config.getBoolean("menu.1_20.need-netherite-template");
+        dontConvertWithModelData = config.getBoolean("menu.1_20.dont-convert-with-modeldata");
     }
 
     @Override
@@ -259,6 +261,10 @@ private boolean checkRecipe(Inventory inventory, ItemStack finalTemplate, ItemSt
                 ItemMeta baseItemMeta = finalBase.getItemMeta();
                 boolean test3 = transformRecipe.getAddition().test(finalAddition);
 
+                if (dontConvertWithModelData && baseItemMeta.hasCustomModelData()) {
+                    return false;
+                }
+
                 if (test1 && test2 && test3) {
                     ItemStack item = transformRecipe.getResult();
                     item.setItemMeta(baseItemMeta);

src/main/java/com/artillexstudios/axsmithing/listener/InteractListener.java

@@ -55,6 +55,6 @@ public void onInventoryOpenEvent(@NotNull final InventoryOpenEvent event) {
         }
 
         event.getPlayer().closeInventory();
-        AxSmithingPlugin.getSmithingTableImpl().open((Player) event.getPlayer());
+        Bukkit.getScheduler().runTaskLater(AxSmithingPlugin.getInstance(), () -> AxSmithingPlugin.getSmithingTableImpl().open((Player) event.getPlayer()),1L);
     }
 }

src/main/resources/config.yml

@@ -12,6 +12,7 @@ menu:
     # If we should force our gui instead of the default one, for 1.20 players.
     # Can be useful, if you want to remove the need for netherite template usage
     force-for-1_20-clients: false
+    dont-convert-with-modeldata: false
     items:
       '1':
         slots:
@@ -30,6 +31,7 @@ menu:
     item-slot: 11
     upgrade-slot: 12
     output-slot: 14
+    dont-convert-with-modeldata: false
     items:
       '1':
         slots: