diff --git a/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java b/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java
index d171e8b..ac0547b 100644
--- a/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java
+++ b/SchematicSystem_15/src/de/steamwar/schematicsystem/autocheck/AutoChecker15.java
@@ -1,21 +1,21 @@
/*
- This file is a part of the SteamWar software.
+ This file is a part of the SteamWar software.
- Copyright (C) 2022 SteamWar.de-Serverteam
+ Copyright (C) 2022 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 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.
+ 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 .
-*/
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+ */
package de.steamwar.schematicsystem.autocheck;
@@ -85,7 +85,7 @@ public class AutoChecker15 implements AutoChecker.IAutoChecker {
Material.HONEY_BOTTLE);
@Override
- public AutoChecker.BlockScanResult scan(Clipboard clipboard, CheckSchemType type) {
+ public AutoChecker.BlockScanResult scan(Clipboard clipboard) {
AutoChecker.BlockScanResult result = new AutoChecker.BlockScanResult();
BlockVector3 min = clipboard.getMinimumPoint();
BlockVector3 max = clipboard.getMaximumPoint();
diff --git a/SchematicSystem_8/src/de/steamwar/schematicsystem/autocheck/AutoChecker8.java b/SchematicSystem_8/src/de/steamwar/schematicsystem/autocheck/AutoChecker8.java
index af24a28..0efbb09 100644
--- a/SchematicSystem_8/src/de/steamwar/schematicsystem/autocheck/AutoChecker8.java
+++ b/SchematicSystem_8/src/de/steamwar/schematicsystem/autocheck/AutoChecker8.java
@@ -1,21 +1,21 @@
/*
- This file is a part of the SteamWar software.
+ This file is a part of the SteamWar software.
- Copyright (C) 2022 SteamWar.de-Serverteam
+ Copyright (C) 2022 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 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.
+ 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 .
-*/
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+ */
package de.steamwar.schematicsystem.autocheck;
@@ -74,7 +74,6 @@ public class AutoChecker8 implements AutoChecker.IAutoChecker {
Vector min = region.getMinimumPoint();
Vector max = region.getMaximumPoint();
- int blocks = 0;
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++){
@@ -83,9 +82,6 @@ public class AutoChecker8 implements AutoChecker.IAutoChecker {
result.getBlockCounts().merge(Material.getMaterial(blockId), 1, Integer::sum);
- if (blockId != AIR)
- blocks++;
-
if(INVENTORY.contains(blockId)){
checkInventory(result, block, blockId, new BlockPos(x, y, z));
}
@@ -141,7 +137,9 @@ public class AutoChecker8 implements AutoChecker.IAutoChecker {
}
@Override
- public AutoChecker.BlockScanResult scan(Clipboard clipboard, CheckSchemType type) {
- return null;
+ public AutoChecker.BlockScanResult scan(Clipboard clipboard) {
+ AutoChecker.BlockScanResult result = new AutoChecker.BlockScanResult();
+ scan(result, clipboard);
+ return result;
}
}
diff --git a/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoChecker.java b/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoChecker.java
index 4170828..0c759e0 100644
--- a/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoChecker.java
+++ b/SchematicSystem_Core/src/de/steamwar/schematicsystem/autocheck/AutoChecker.java
@@ -1,21 +1,21 @@
/*
- This file is a part of the SteamWar software.
+ This file is a part of the SteamWar software.
- Copyright (C) 2022 SteamWar.de-Serverteam
+ Copyright (C) 2022 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 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.
+ 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 .
-*/
+ You should have received a copy of the GNU Affero General Public License
+ along with this program. If not, see .
+ */
package de.steamwar.schematicsystem.autocheck;
@@ -32,7 +32,7 @@ import java.util.*;
public class AutoChecker {
public static AutoCheckerResult check(Clipboard clipboard, CheckSchemType type) {
- BlockScanResult blockScanResult = impl.scan(clipboard, type);
+ BlockScanResult blockScanResult = impl.scan(clipboard);
return AutoCheckerResult.builder()
.type(type)
.height(clipboard.getDimensions().getBlockY())
@@ -59,7 +59,7 @@ public class AutoChecker {
private static final IAutoChecker impl = VersionDependent.getVersionImpl(SchematicSystem.getInstance());
public interface IAutoChecker {
- BlockScanResult scan(Clipboard clipboard, CheckSchemType type);
+ BlockScanResult scan(Clipboard clipboard);
}
@Getter