From bd37391e88ceb3dc1521d8afca60704ad22b15b0 Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaoscaot@zohomail.eu>
Date: Sat, 4 Feb 2023 19:51:12 +0100
Subject: [PATCH] Refactor (should be working)

---
 .../autocheck/AutoChecker15.java              | 20 +++++++++----------
 .../autocheck/AutoChecker8.java               | 15 +++++++++-----
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java b/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java
index 4bfd30f..ddbf4ef 100644
--- a/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java
+++ b/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java
@@ -1,7 +1,7 @@
 /*
    This file is a part of the SteamWar software.
 
-   Copyright (C) 2022  SteamWar.de-Serverteam
+   Copyright (C) 2023  SteamWar.de-Serverteam
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Affero General Public License as published by
@@ -26,10 +26,7 @@ import com.sk89q.worldedit.world.block.BaseBlock;
 import de.steamwar.schematicsystem.CheckSchemType;
 import org.bukkit.Material;
 
-import java.util.EnumSet;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 public class AutoChecker15 implements AutoChecker.IAutoChecker {
     private static final Set<Material> INVENTORY = EnumSet.of(
@@ -110,6 +107,13 @@ public class AutoChecker15 implements AutoChecker.IAutoChecker {
         return result;
     }
 
+    private static final Map<Material, EnumSet<Material>> itemsInInv = new EnumMap<>(Material.class);
+
+    static {
+        itemsInInv.put(Material.BUCKET, EnumSet.of(Material.DISPENSER));
+        itemsInInv.put(Material.TNT, EnumSet.of(Material.CHEST, Material.BARREL));
+    }
+
     private void checkInventory(AutoChecker.BlockScanResult result, BaseBlock block, Material material, BlockPos pos) {
         CompoundTag nbt = block.getNbtData();
         if(nbt == null) {
@@ -140,11 +144,7 @@ public class AutoChecker15 implements AutoChecker.IAutoChecker {
 
             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))) {
-
-                if(material == Material.DISPENSER && itemType.equals(Material.BUCKET))
-                    return;
-
+            }else if (!FLOWERS.contains(itemType) && !itemsInInv.getOrDefault(itemType, EnumSet.noneOf(Material.class)).contains(material)) {
                 result.getForbiddenItems().computeIfAbsent(pos, blockVector3 -> new HashSet<>()).add(itemType);
             } else if (item.containsKey("tag")) {
                 result.getForbiddenNbt().computeIfAbsent(pos, blockVector3 -> new HashSet<>()).add(itemType);
diff --git a/SchematicSystem_8/src/de/steamwar/schematicsystem/autocheck/AutoChecker8.java b/SchematicSystem_8/src/de/steamwar/schematicsystem/autocheck/AutoChecker8.java
index 0efbb09..784ddc5 100644
--- a/SchematicSystem_8/src/de/steamwar/schematicsystem/autocheck/AutoChecker8.java
+++ b/SchematicSystem_8/src/de/steamwar/schematicsystem/autocheck/AutoChecker8.java
@@ -1,7 +1,7 @@
 /*
    This file is a part of the SteamWar software.
 
-   Copyright (C) 2022  SteamWar.de-Serverteam
+   Copyright (C) 2023  SteamWar.de-Serverteam
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Affero General Public License as published by
@@ -27,9 +27,7 @@ import com.sk89q.worldedit.regions.Region;
 import de.steamwar.schematicsystem.CheckSchemType;
 import org.bukkit.Material;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 @SuppressWarnings("deprecation")
 public class AutoChecker8 implements AutoChecker.IAutoChecker {
@@ -90,6 +88,13 @@ public class AutoChecker8 implements AutoChecker.IAutoChecker {
         }
     }
 
+    private static final Map<Material, EnumSet<Material>> itemsInInv = new EnumMap<>(Material.class);
+
+    static {
+        itemsInInv.put(Material.BUCKET, EnumSet.of(Material.DISPENSER));
+        itemsInInv.put(Material.TNT, EnumSet.of(Material.CHEST));
+    }
+
     private static void checkInventory(AutoChecker.BlockScanResult result, BaseBlock block, int blockId, BlockPos pos) {
         CompoundTag nbt = block.getNbtData();
         if(nbt == null){
@@ -125,7 +130,7 @@ public class AutoChecker8 implements AutoChecker.IAutoChecker {
 
             if(blockId == DISPENSER && (itemType.equals(Material.FIREBALL) || itemType.equals(Material.ARROW)))
                 counter += item.getByte("Count");
-            else if(!FLOWERS.contains(itemType) && !(blockId == CHEST && itemType.equals(Material.TNT))) {
+            else if(!FLOWERS.contains(itemType) && !itemsInInv.getOrDefault(itemType, EnumSet.noneOf(Material.class)).contains(Material.getMaterial(blockId))) {
                 result.getForbiddenItems().computeIfAbsent(pos, blockPos -> new HashSet<>()).add(Material.getMaterial(blockId));
             }
             else if(item.containsKey("tag")) {