Properly remove items from inv

NeumimTo · Jun 27, 2023 · 3d1d918 · 3d1d918
1 parent 6ebcbe3
commit 3d1d918
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/src/main/java/cz/neumimto/towny/townycivs/StructureInventoryService.java b/src/main/java/cz/neumimto/towny/townycivs/StructureInventoryService.java
@@ -283,10 +283,9 @@ private void processUpkeep(Inventory inventory, Map<Material, AmountAndModel> fu
             }
 
             if (itemMeta instanceof Damageable d) {
-                d.setDamage(d.getDamage() + 1);
+                d.setDamage(d.getDamage() + amountAndModel.amount);
                 if (d.getDamage() >= content.getType().getMaxDurability()) {
-                    inventory.getContents()[i] = null;
-
+                    inventory.setItem(i, null);
                 } else {
                     content.setItemMeta(d);
                     fulfilled.remove(content.getType());
@@ -299,7 +298,7 @@ private void processUpkeep(Inventory inventory, Map<Material, AmountAndModel> fu
                     fulfilled.remove(content.getType());
 
                 } else {
-                    inventory.getContents()[i] = null;
+                    inventory.setItem(i, null);
                     amountAndModel.amount -= amount;
                 }
 
@@ -317,7 +316,6 @@ public boolean anyInventoryIsBeingAccessed(LoadedStructure structure) {
         return false;
     }
 
-
     private record StructAndInv(UUID structureId, Inventory inventory, Location location) {
     }
 

diff --git a/src/main/java/cz/neumimto/towny/townycivs/mechanics/ItemProduction.java b/src/main/java/cz/neumimto/towny/townycivs/mechanics/ItemProduction.java
@@ -18,6 +18,13 @@ public String id() {
 
     @Override
     public boolean check(TownContext townContext, ItemList configContext) {
+        Set<ItemStack> itemStackSet = new HashSet<>();
+        for (ItemList.ConfigItem configItem : configContext.configItems) {
+            ItemStack itemStack = configItem.toItemStack();
+            itemStackSet.add(itemStack);
+        }
+
+        //todo TownyCivs.injector.getInstance(StructureInventoryService.class).canTakeProducedItems(townContext.loadedStructure, itemStackSet);
         return true;
     }
 

diff --git a/src/main/java/cz/neumimto/towny/townycivs/schedulers/FolliaScheduler.java b/src/main/java/cz/neumimto/towny/townycivs/schedulers/FolliaScheduler.java
@@ -80,6 +80,12 @@ private void handleTick(LoadedStructure structure, TownContext ctx) {
             }
         }
 
+        for (Structure.LoadedPair<Mechanic<Object>, Object> m : structure.structureDef.production) {
+            if (!m.mechanic.check(ctx, m.configValue)) {
+                return;
+            }
+        }
+
         for (Structure.LoadedPair<Mechanic<Object>, Object> m : upkeep) {
             m.mechanic.postAction(ctx, m.configValue);
         }