Remove code duplication

SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java

@@ -31,57 +31,6 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 public class AutoChecker15 implements AutoChecker.IAutoChecker {
-    private static final Set<Material> INVENTORY = EnumSet.of(
-            Material.BARREL,
-            Material.BLAST_FURNACE,
-            Material.BREWING_STAND,
-            Material.CAMPFIRE,
-            Material.CHEST,
-            Material.DISPENSER,
-            Material.DROPPER,
-            Material.FURNACE,
-            Material.HOPPER,
-            Material.JUKEBOX,
-            Material.SHULKER_BOX,
-            Material.WHITE_SHULKER_BOX,
-            Material.ORANGE_SHULKER_BOX,
-            Material.MAGENTA_SHULKER_BOX,
-            Material.LIGHT_BLUE_SHULKER_BOX,
-            Material.YELLOW_SHULKER_BOX,
-            Material.LIME_SHULKER_BOX,
-            Material.PINK_SHULKER_BOX,
-            Material.GRAY_SHULKER_BOX,
-            Material.LIGHT_GRAY_SHULKER_BOX,
-            Material.CYAN_SHULKER_BOX,
-            Material.PURPLE_SHULKER_BOX,
-            Material.BLUE_SHULKER_BOX,
-            Material.BROWN_SHULKER_BOX,
-            Material.GREEN_SHULKER_BOX,
-            Material.RED_SHULKER_BOX,
-            Material.BLACK_SHULKER_BOX,
-            Material.SMOKER,
-            Material.TRAPPED_CHEST);
-
-    private static final Set<Material> FLOWERS = EnumSet.of(
-            Material.CORNFLOWER,
-            Material.POPPY,
-            Material.FERN,
-            Material.DANDELION,
-            Material.BLUE_ORCHID,
-            Material.ALLIUM,
-            Material.AZURE_BLUET,
-            Material.RED_TULIP,
-            Material.ORANGE_TULIP,
-            Material.WHITE_TULIP,
-            Material.PINK_TULIP,
-            Material.OXEYE_DAISY,
-            Material.LILY_OF_THE_VALLEY,
-            Material.WITHER_ROSE,
-            Material.SUNFLOWER,
-            Material.DIAMOND_HORSE_ARMOR,
-            Material.IRON_HORSE_ARMOR,
-            Material.GOLDEN_HORSE_ARMOR,
-            Material.HONEY_BOTTLE);
 
     public AutoChecker.BlockScanResult scan(Clipboard clipboard) {
         AutoChecker.BlockScanResult result = new AutoChecker.BlockScanResult();
@@ -98,7 +47,7 @@ public class AutoChecker15 implements AutoChecker.IAutoChecker {
 
                     result.getBlockCounts().merge(material, 1, Integer::sum);
 
-                    if(INVENTORY.contains(material)) {
+                    if(AutoCheckerItems.impl.getInventoryMaterials().contains(material)) {
                         checkInventory(result, block, material, new BlockPos(x, y, z));
                     }
 
@@ -125,7 +74,7 @@ public class AutoChecker15 implements AutoChecker.IAutoChecker {
         ));
         itemsInInv.put(Material.FIRE_CHARGE, EnumSet.of(Material.DISPENSER));
         itemsInInv.put(Material.ARROW, EnumSet.of(Material.DISPENSER));
-        FLOWERS.forEach(material -> itemsInInv.put(material, INVENTORY));
+        AutoCheckerItems.impl.getAllowedMaterialsInInventory().forEach(material -> itemsInInv.put(material, AutoCheckerItems.impl.getInventoryMaterials()));
     }
 
     private void checkInventory(AutoChecker.BlockScanResult result, BaseBlock block, Material material, BlockPos pos) {

SchematicSystem/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoCheckerItems15.java

@@ -0,0 +1,90 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.schematicsystem.autocheck;
+
+import org.bukkit.Material;
+
+import java.util.EnumSet;
+import java.util.Set;
+
+public class AutoCheckerItems15 implements AutoCheckerItems {
+
+    private static final Set<Material> INVENTORY = EnumSet.of(
+            Material.BARREL,
+            Material.BLAST_FURNACE,
+            Material.BREWING_STAND,
+            Material.CAMPFIRE,
+            Material.CHEST,
+            Material.DISPENSER,
+            Material.DROPPER,
+            Material.FURNACE,
+            Material.HOPPER,
+            Material.JUKEBOX,
+            Material.SHULKER_BOX,
+            Material.WHITE_SHULKER_BOX,
+            Material.ORANGE_SHULKER_BOX,
+            Material.MAGENTA_SHULKER_BOX,
+            Material.LIGHT_BLUE_SHULKER_BOX,
+            Material.YELLOW_SHULKER_BOX,
+            Material.LIME_SHULKER_BOX,
+            Material.PINK_SHULKER_BOX,
+            Material.GRAY_SHULKER_BOX,
+            Material.LIGHT_GRAY_SHULKER_BOX,
+            Material.CYAN_SHULKER_BOX,
+            Material.PURPLE_SHULKER_BOX,
+            Material.BLUE_SHULKER_BOX,
+            Material.BROWN_SHULKER_BOX,
+            Material.GREEN_SHULKER_BOX,
+            Material.RED_SHULKER_BOX,
+            Material.BLACK_SHULKER_BOX,
+            Material.SMOKER,
+            Material.TRAPPED_CHEST);
+
+    private static final Set<Material> FLOWERS = EnumSet.of(
+            Material.CORNFLOWER,
+            Material.POPPY,
+            Material.FERN,
+            Material.DANDELION,
+            Material.BLUE_ORCHID,
+            Material.ALLIUM,
+            Material.AZURE_BLUET,
+            Material.RED_TULIP,
+            Material.ORANGE_TULIP,
+            Material.WHITE_TULIP,
+            Material.PINK_TULIP,
+            Material.OXEYE_DAISY,
+            Material.LILY_OF_THE_VALLEY,
+            Material.WITHER_ROSE,
+            Material.SUNFLOWER,
+            Material.DIAMOND_HORSE_ARMOR,
+            Material.IRON_HORSE_ARMOR,
+            Material.GOLDEN_HORSE_ARMOR,
+            Material.HONEY_BOTTLE);
+
+    @Override
+    public Set<Material> getInventoryMaterials() {
+        return INVENTORY;
+    }
+
+    @Override
+    public Set<Material> getAllowedMaterialsInInventory() {
+        return FLOWERS;
+    }
+}

SchematicSystem/SchematicSystem_19/src/de/steamwar/schematicsystem/autocheck/AutoChecker19.java

@@ -1,213 +0,0 @@
-/*
-   This file is a part of the SteamWar software.
-
-   Copyright (C) 2025  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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-   GNU Affero General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package de.steamwar.schematicsystem.autocheck;
-
-import com.sk89q.jnbt.CompoundTag;
-import com.sk89q.worldedit.entity.Entity;
-import com.sk89q.worldedit.extent.clipboard.Clipboard;
-import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.world.block.BaseBlock;
-import de.steamwar.schematicsystem.CheckSchemType;
-import org.bukkit.Material;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-public class AutoChecker19 implements AutoChecker.IAutoChecker {
-    private static final Set<Material> INVENTORY = EnumSet.of(
-            Material.BARREL,
-            Material.BLAST_FURNACE,
-            Material.BREWING_STAND,
-            Material.CAMPFIRE,
-            Material.CHEST,
-            Material.DISPENSER,
-            Material.DROPPER,
-            Material.FURNACE,
-            Material.HOPPER,
-            Material.JUKEBOX,
-            Material.SHULKER_BOX,
-            Material.WHITE_SHULKER_BOX,
-            Material.ORANGE_SHULKER_BOX,
-            Material.MAGENTA_SHULKER_BOX,
-            Material.LIGHT_BLUE_SHULKER_BOX,
-            Material.YELLOW_SHULKER_BOX,
-            Material.LIME_SHULKER_BOX,
-            Material.PINK_SHULKER_BOX,
-            Material.GRAY_SHULKER_BOX,
-            Material.LIGHT_GRAY_SHULKER_BOX,
-            Material.CYAN_SHULKER_BOX,
-            Material.PURPLE_SHULKER_BOX,
-            Material.BLUE_SHULKER_BOX,
-            Material.BROWN_SHULKER_BOX,
-            Material.GREEN_SHULKER_BOX,
-            Material.RED_SHULKER_BOX,
-            Material.BLACK_SHULKER_BOX,
-            Material.SMOKER,
-            Material.TRAPPED_CHEST);
-
-    private static final Set<Material> FLOWERS = EnumSet.of(
-            // 64-stackable Items
-            Material.CORNFLOWER,
-            Material.POPPY,
-            Material.FERN,
-            Material.DANDELION,
-            Material.BLUE_ORCHID,
-            Material.ALLIUM,
-            Material.AZURE_BLUET,
-            Material.RED_TULIP,
-            Material.ORANGE_TULIP,
-            Material.WHITE_TULIP,
-            Material.PINK_TULIP,
-            Material.OXEYE_DAISY,
-            Material.LILY_OF_THE_VALLEY,
-            Material.WITHER_ROSE,
-            Material.SUNFLOWER,
-            // 16-stackable Items
-            Material.HONEY_BOTTLE,
-            // Non-stackable items
-            Material.DIAMOND_HORSE_ARMOR,
-            Material.IRON_HORSE_ARMOR,
-            Material.GOLDEN_HORSE_ARMOR,
-            // Disks
-            Material.MUSIC_DISC_11,
-            Material.MUSIC_DISC_13,
-            Material.MUSIC_DISC_CAT,
-            Material.MUSIC_DISC_BLOCKS,
-            Material.MUSIC_DISC_CHIRP,
-            Material.MUSIC_DISC_FAR,
-            Material.MUSIC_DISC_MALL,
-            Material.MUSIC_DISC_MELLOHI,
-            Material.MUSIC_DISC_STAL,
-            Material.MUSIC_DISC_STRAD,
-            Material.MUSIC_DISC_WAIT,
-            Material.MUSIC_DISC_WARD,
-            Material.MUSIC_DISC_OTHERSIDE,
-            Material.MUSIC_DISC_PIGSTEP,
-            Material.MUSIC_DISC_RELIC,
-            Material.MUSIC_DISC_5
-    );
-
-    public AutoChecker.BlockScanResult scan(Clipboard clipboard) {
-        AutoChecker.BlockScanResult result = new AutoChecker.BlockScanResult();
-        BlockVector3 min = clipboard.getMinimumPoint();
-        BlockVector3 max = clipboard.getMaximumPoint();
-        for(int x = min.getBlockX(); x <= max.getBlockX(); x++){
-            for(int y = min.getBlockY(); y <= max.getBlockY(); y++) {
-                for (int z = min.getBlockZ(); z <= max.getBlockZ(); z++) {
-                    final BaseBlock block = clipboard.getFullBlock(BlockVector3.at(x, y, z));
-                    final Material material = Material.matchMaterial(block.getBlockType().getId());
-                    if(material == null) {
-                        continue;
-                    }
-
-                    result.getBlockCounts().merge(material, 1, Integer::sum);
-
-                    if(INVENTORY.contains(material)) {
-                        checkInventory(result, block, material, new BlockPos(x, y, z));
-                    }
-
-                    if(x == 0 || x == max.getBlockX() - 1 || y == max.getBlockY() - 1 || z == 0 || z == max.getBlockZ() - 1) {
-                        result.getDesignBlocks().computeIfAbsent(material, m -> new ArrayList<>()).add(new BlockPos(x, y, z));
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    private static final Map<Material, Set<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, Material.SHULKER_BOX, Material.BLACK_SHULKER_BOX,
-                Material.BLUE_SHULKER_BOX, Material.BROWN_SHULKER_BOX, Material.CYAN_SHULKER_BOX,
-                Material.GRAY_SHULKER_BOX, Material.GREEN_SHULKER_BOX, Material.LIGHT_BLUE_SHULKER_BOX,
-                Material.LIGHT_GRAY_SHULKER_BOX, Material.LIME_SHULKER_BOX, Material.MAGENTA_SHULKER_BOX,
-                Material.ORANGE_SHULKER_BOX, Material.PINK_SHULKER_BOX, Material.PURPLE_SHULKER_BOX,
-                Material.RED_SHULKER_BOX, Material.WHITE_SHULKER_BOX, Material.YELLOW_SHULKER_BOX
-        ));
-        itemsInInv.put(Material.FIRE_CHARGE, EnumSet.of(Material.DISPENSER));
-        itemsInInv.put(Material.ARROW, EnumSet.of(Material.DISPENSER));
-        FLOWERS.forEach(material -> itemsInInv.put(material, INVENTORY));
-    }
-
-    private void checkInventory(AutoChecker.BlockScanResult result, BaseBlock block, Material material, BlockPos pos) {
-        CompoundTag nbt = block.getNbtData();
-        if(nbt == null) {
-            result.getDefunctNbt().add(pos);
-            return;
-        }
-
-
-        if(material == Material.JUKEBOX && nbt.getValue().containsKey("RecordItem")){
-            result.getRecords().add(pos);
-            return;
-        }
-
-        List<CompoundTag> items = nbt.getList("Items", CompoundTag.class);
-        if(items.isEmpty())
-            return; //Leeres Inventar
-
-        int counter = 0;
-        for(CompoundTag item : items){
-            if(!item.containsKey("id")){
-                result.getDefunctNbt().add(pos);
-                continue;
-            }
-
-            Material itemType = Material.matchMaterial(item.getString("id"));
-            if(itemType == null) //Leere Slots
-                continue;
-
-            if (!itemsInInv.getOrDefault(itemType, EnumSet.noneOf(Material.class)).contains(material)) {
-                result.getForbiddenItems().computeIfAbsent(pos, blockVector3 -> new HashSet<>()).add(itemType);
-            } else if(material == Material.DISPENSER && (itemType == Material.ARROW || itemType == Material.FIRE_CHARGE)) {
-                counter += item.getByte("Count");
-            }
-            if (item.containsKey("tag")) {
-                result.getForbiddenNbt().computeIfAbsent(pos, blockVector3 -> new HashSet<>()).add(itemType);
-            }
-        }
-        result.getDispenserItems().put(pos, counter);
-    }
-
-    @Override
-    public AutoCheckerResult check(Clipboard clipboard, CheckSchemType type) {
-        return AutoCheckerResult.builder()
-                .type(type)
-                .height(clipboard.getDimensions().getBlockY())
-                .width(clipboard.getDimensions().getBlockX())
-                .depth(clipboard.getDimensions().getBlockZ())
-                .blockScanResult(scan(clipboard))
-                .entities(clipboard.getEntities().stream().map(Entity::getLocation).map(blockVector3 -> new BlockPos(blockVector3.getBlockX(), blockVector3.getBlockY(), blockVector3.getBlockZ())).collect(Collectors.toList()))
-                .build();
-    }
-
-    @Override
-    public AutoCheckerResult sizeCheck(Clipboard clipboard, CheckSchemType type) {
-        return AutoCheckerResult.builder()
-                .type(type)
-                .height(clipboard.getDimensions().getBlockY())
-                .width(clipboard.getDimensions().getBlockX())
-                .depth(clipboard.getDimensions().getBlockZ())
-                .build();
-    }
-}

SchematicSystem/SchematicSystem_19/src/de/steamwar/schematicsystem/autocheck/AutoCheckerItems19.java

@@ -0,0 +1,111 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.schematicsystem.autocheck;
+
+import org.bukkit.Material;
+
+import java.util.EnumSet;
+import java.util.Set;
+
+public class AutoCheckerItems19 implements AutoCheckerItems {
+
+    private static final Set<Material> INVENTORY = EnumSet.of(
+            Material.BARREL,
+            Material.BLAST_FURNACE,
+            Material.BREWING_STAND,
+            Material.CAMPFIRE,
+            Material.CHEST,
+            Material.DISPENSER,
+            Material.DROPPER,
+            Material.FURNACE,
+            Material.HOPPER,
+            Material.JUKEBOX,
+            Material.SHULKER_BOX,
+            Material.WHITE_SHULKER_BOX,
+            Material.ORANGE_SHULKER_BOX,
+            Material.MAGENTA_SHULKER_BOX,
+            Material.LIGHT_BLUE_SHULKER_BOX,
+            Material.YELLOW_SHULKER_BOX,
+            Material.LIME_SHULKER_BOX,
+            Material.PINK_SHULKER_BOX,
+            Material.GRAY_SHULKER_BOX,
+            Material.LIGHT_GRAY_SHULKER_BOX,
+            Material.CYAN_SHULKER_BOX,
+            Material.PURPLE_SHULKER_BOX,
+            Material.BLUE_SHULKER_BOX,
+            Material.BROWN_SHULKER_BOX,
+            Material.GREEN_SHULKER_BOX,
+            Material.RED_SHULKER_BOX,
+            Material.BLACK_SHULKER_BOX,
+            Material.SMOKER,
+            Material.TRAPPED_CHEST);
+
+    private static final Set<Material> ALLOWED_ITEMS_IN_INVENTORY = EnumSet.of(
+            // 64-stackable Items
+            Material.CORNFLOWER,
+            Material.POPPY,
+            Material.FERN,
+            Material.DANDELION,
+            Material.BLUE_ORCHID,
+            Material.ALLIUM,
+            Material.AZURE_BLUET,
+            Material.RED_TULIP,
+            Material.ORANGE_TULIP,
+            Material.WHITE_TULIP,
+            Material.PINK_TULIP,
+            Material.OXEYE_DAISY,
+            Material.LILY_OF_THE_VALLEY,
+            Material.WITHER_ROSE,
+            Material.SUNFLOWER,
+            // 16-stackable Items
+            Material.HONEY_BOTTLE,
+            // Non-stackable items
+            Material.DIAMOND_HORSE_ARMOR,
+            Material.IRON_HORSE_ARMOR,
+            Material.GOLDEN_HORSE_ARMOR,
+            // Disks
+            Material.MUSIC_DISC_11,
+            Material.MUSIC_DISC_13,
+            Material.MUSIC_DISC_CAT,
+            Material.MUSIC_DISC_BLOCKS,
+            Material.MUSIC_DISC_CHIRP,
+            Material.MUSIC_DISC_FAR,
+            Material.MUSIC_DISC_MALL,
+            Material.MUSIC_DISC_MELLOHI,
+            Material.MUSIC_DISC_STAL,
+            Material.MUSIC_DISC_STRAD,
+            Material.MUSIC_DISC_WAIT,
+            Material.MUSIC_DISC_WARD,
+            Material.MUSIC_DISC_OTHERSIDE,
+            Material.MUSIC_DISC_PIGSTEP,
+            Material.MUSIC_DISC_RELIC,
+            Material.MUSIC_DISC_5
+    );
+
+    @Override
+    public Set<Material> getInventoryMaterials() {
+        return INVENTORY;
+    }
+
+    @Override
+    public Set<Material> getAllowedMaterialsInInventory() {
+        return ALLOWED_ITEMS_IN_INVENTORY;
+    }
+}

SchematicSystem/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoCheckerItems.java

@@ -0,0 +1,34 @@
+/*
+ * This file is a part of the SteamWar software.
+ *
+ * Copyright (C) 2020  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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.steamwar.schematicsystem.autocheck;
+
+import de.steamwar.core.VersionDependent;
+import de.steamwar.schematicsystem.SchematicSystem;
+import org.bukkit.Material;
+
+import java.util.Set;
+
+public interface AutoCheckerItems {
+
+    AutoCheckerItems impl = VersionDependent.getVersionImpl(SchematicSystem.getInstance());
+
+    Set<Material> getInventoryMaterials();
+    Set<Material> getAllowedMaterialsInInventory();
+}