From 43a712c62af16e77a6c26df945875a437fc5a8fa Mon Sep 17 00:00:00 2001 From: MoBrot <90271578+MoBrot@users.noreply.github.com> Date: Sun, 22 Jan 2023 21:40:53 +0100 Subject: [PATCH 1/2] Buckets in inventories --- .../de/steamwar/schematicsystem/autocheck/AutoChecker15.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java b/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java index ac0547b..9f61fe9 100644 --- a/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java +++ b/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java @@ -138,7 +138,7 @@ public class AutoChecker15 implements AutoChecker.IAutoChecker { if(itemType == null) //Leere Slots continue; - if(material == Material.DISPENSER && (itemType.equals(Material.FIRE_CHARGE) || itemType.equals(Material.ARROW))) { + if(material == Material.DISPENSER && (itemType.equals(Material.FIRE_CHARGE) || itemType.equals(Material.ARROW) || itemType.equals(Material.BUCKET))) { counter += item.getByte("Count"); } else if(!FLOWERS.contains(itemType) && !((material == Material.CHEST || material == Material.BARREL) && itemType.equals(Material.TNT))) { result.getForbiddenItems().computeIfAbsent(pos, blockVector3 -> new HashSet<>()).add(itemType); From cdf12be6561c9adc6475155c7ed059dbe7118c4d Mon Sep 17 00:00:00 2001 From: MoBrot <90271578+MoBrot@users.noreply.github.com> Date: Sun, 22 Jan 2023 23:03:58 +0100 Subject: [PATCH 2/2] Buckets in inventories --- .../steamwar/schematicsystem/autocheck/AutoChecker15.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java b/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java index 9f61fe9..fba059a 100644 --- a/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java +++ b/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java @@ -138,11 +138,12 @@ public class AutoChecker15 implements AutoChecker.IAutoChecker { if(itemType == null) //Leere Slots continue; - if(material == Material.DISPENSER && (itemType.equals(Material.FIRE_CHARGE) || itemType.equals(Material.ARROW) || itemType.equals(Material.BUCKET))) { + if(material == Material.DISPENSER && (itemType.equals(Material.FIRE_CHARGE) || itemType.equals(Material.ARROW))) { counter += item.getByte("Count"); - } else if(!FLOWERS.contains(itemType) && !((material == Material.CHEST || material == Material.BARREL) && itemType.equals(Material.TNT))) { + }else if (!FLOWERS.contains(itemType) && !((material == Material.CHEST || material == Material.BARREL) && itemType.equals(Material.TNT)) + && (material == Material.DISPENSER && !itemType.equals(Material.BUCKET))) { result.getForbiddenItems().computeIfAbsent(pos, blockVector3 -> new HashSet<>()).add(itemType); - }else if(item.containsKey("tag")) { + } else if (item.containsKey("tag")) { result.getForbiddenNbt().computeIfAbsent(pos, blockVector3 -> new HashSet<>()).add(itemType); } }