Fixed zot overloader not charging zots

Alessio-Colombo · Alessio-Colombo · commit a66f1e7c8485 · 2024-03-30T12:22:45.000+01:00
diff --git a/src/main/java/me/sfiguz7/transcendence/implementation/items/machines/ZotOverloader.java b/src/main/java/me/sfiguz7/transcendence/implementation/items/machines/ZotOverloader.java
@@ -166,7 +166,7 @@ private void processInputSlots(Block b, BlockMenu menu, ItemStack zot, ItemMeta
                         int inpToBeRemoved = inpRemoveCalc(inpSpin, zotSpin);
 
                         if (inputItem.getAmount() >= inpToBeRemoved) {
-                            handleInputRemoval(b, menu, zot, zotMeta, zotCharge, chargeKey, requiredCharge, inputSlot, inputItem, inpToBeRemoved);
+                            handleInputRemoval(b, menu, zot, zotMeta, ++zotCharge, chargeKey, requiredCharge, inputSlot, inputItem, inpToBeRemoved);
                         }
                         break;
                     }
@@ -179,10 +179,11 @@ private boolean isValidInput(ItemStack inputItem) {
 
             private void handleInputRemoval(Block b, BlockMenu menu, ItemStack zot, ItemMeta zotMeta, int zotCharge,
                                             NamespacedKey chargeKey, int requiredCharge, int inputSlot, ItemStack inputItem, int inpToBeRemoved) {
-                if (zotCharge == requiredCharge - 1) {
+                if (zotCharge == requiredCharge) {
                     menu.replaceExistingItem(ZOT_SLOT, getZot(zotMeta.getDisplayName().split(" ")[1]));
                 } else {
-                    updateZotMeta(zotMeta, zotCharge, requiredCharge);
+                    zotMeta.setLore(Arrays.asList(ChatColor.BLUE + "Concentrated matter",
+                        ChatColor.GRAY + "Charge: " + ChatColor.YELLOW + zotCharge + "/" + requiredCharge));
                 }
 
                 PersistentDataAPI.setInt(zotMeta, chargeKey, zotCharge);
@@ -196,13 +197,6 @@ private void handleInputRemoval(Block b, BlockMenu menu, ItemStack zot, ItemMeta
                 }
             }
 
-            private void updateZotMeta(ItemMeta zotMeta, int zotCharge, int requiredCharge) {
-                zotMeta.setLore(Arrays.asList(ChatColor.BLUE + "Concentrated matter",
-                    ChatColor.GRAY + "Charge: " + ChatColor.YELLOW + ++zotCharge + "/" + requiredCharge));
-            }
-
-
-
             @Override
             public boolean isSynchronized() {
                 return true;
