13
0

Fix: 1.12 AutoChecker
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful

Dieser Commit ist enthalten in:
Chaoscaot 2022-12-05 06:51:44 +01:00
Ursprung 051c3a0d97
Commit d95ecb088b
3 geänderte Dateien mit 46 neuen und 48 gelöschten Zeilen

Datei anzeigen

@ -15,7 +15,7 @@
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;
@ -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();

Datei anzeigen

@ -15,7 +15,7 @@
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;
@ -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;
}
}

Datei anzeigen

@ -15,7 +15,7 @@
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;
@ -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