Fixes

Author: AverageGithub

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

@@ -80,20 +80,16 @@ public void handleClick(InventoryClickEvent event) {
             int amount;
             if (event.getInventory().getItem(itemSlot) != null) {
                 amount = event.getInventory().getItem(itemSlot).getAmount() - 1;
-                if (amount == 0) {
-                    event.getInventory().setItem(itemSlot, null);
-                } else {
-                    event.getInventory().getItem(itemSlot).setAmount(amount);
-                }
+                ItemStack item = event.getInventory().getItem(itemSlot);
+                item.setAmount(amount);
+                event.getInventory().setItem(itemSlot, item);
             }
 
             if (event.getInventory().getItem(upgradeSlot) != null) {
                 amount = event.getInventory().getItem(upgradeSlot).getAmount() - 1;
-                if (amount == 0) {
-                    event.getInventory().setItem(upgradeSlot, null);
-                } else {
-                    event.getInventory().getItem(upgradeSlot).setAmount(amount);
-                }
+                ItemStack item = event.getInventory().getItem(upgradeSlot);
+                item.setAmount(amount);
+                event.getInventory().setItem(upgradeSlot, item);
             }
 
             return;
@@ -106,17 +102,17 @@ public void handleClick(InventoryClickEvent event) {
     public void handleClose(InventoryCloseEvent event) {
         if (!(event.getInventory().getHolder() instanceof SmithingTable_V1_16)) return;
 
-        if (event.getInventory().getItem(itemSlot) != null)
+        if (event.getInventory().getItem(itemSlot) != null && event.getInventory().getItem(itemSlot).getType() != Material.AIR)
             event.getPlayer().getInventory().addItem(event.getInventory().getItem(itemSlot));
-        if (event.getInventory().getItem(upgradeSlot) != null)
+        if (event.getInventory().getItem(upgradeSlot) != null && event.getInventory().getItem(upgradeSlot).getType() != Material.AIR)
             event.getPlayer().getInventory().addItem(event.getInventory().getItem(upgradeSlot));
     }
 
     @Override
     public void handleDrag(InventoryDragEvent event) {
         if (!(event.getInventory().getHolder() instanceof SmithingTable_V1_16)) return;
 
-        if (event.getInventory().getItem(outputSlot) != null) {
+        if (event.getInventory().getItem(outputSlot) != null && event.getInventory().getItem(outputSlot).getType() != Material.AIR) {
             event.getInventory().getItem(outputSlot).setAmount(0);
         }
 

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

@@ -20,7 +20,7 @@ public void onPlayerInteractEvent(@NotNull final PlayerInteractEvent event) {
         if (event.getAction().equals(Action.LEFT_CLICK_BLOCK)) return;
 
         if (AxSmithingPlugin.is1_20()) {
-            if (Via.getAPI().getPlayerVersion(event.getPlayer()) == ProtocolVersion.v1_20.getVersion()) {
+            if (Via.getAPI().getPlayerVersion(event.getPlayer()) == ProtocolVersion.v1_20.getVersion() && !AxSmithingPlugin.getConfiguration().getBoolean("menu.v1_20.force-for-1_20-clients")) {
                 return;
             }
         } else {

src/main/resources/config.yml

@@ -9,6 +9,9 @@ menu:
     output-slot: 14
     # If you need netherite upgrade template to convert a diamond item to netherite
     need-netherite-template: true
+    # 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
     items:
       '1':
         slots: