Dieser Commit ist enthalten in:
Ursprung
051c3a0d97
Commit
d95ecb088b
@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
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/>.
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package de.steamwar.schematicsystem.autocheck;
|
package de.steamwar.schematicsystem.autocheck;
|
||||||
|
|
||||||
@ -85,7 +85,7 @@ public class AutoChecker15 implements AutoChecker.IAutoChecker {
|
|||||||
Material.HONEY_BOTTLE);
|
Material.HONEY_BOTTLE);
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AutoChecker.BlockScanResult scan(Clipboard clipboard, CheckSchemType type) {
|
public AutoChecker.BlockScanResult scan(Clipboard clipboard) {
|
||||||
AutoChecker.BlockScanResult result = new AutoChecker.BlockScanResult();
|
AutoChecker.BlockScanResult result = new AutoChecker.BlockScanResult();
|
||||||
BlockVector3 min = clipboard.getMinimumPoint();
|
BlockVector3 min = clipboard.getMinimumPoint();
|
||||||
BlockVector3 max = clipboard.getMaximumPoint();
|
BlockVector3 max = clipboard.getMaximumPoint();
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
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/>.
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package de.steamwar.schematicsystem.autocheck;
|
package de.steamwar.schematicsystem.autocheck;
|
||||||
|
|
||||||
@ -74,7 +74,6 @@ public class AutoChecker8 implements AutoChecker.IAutoChecker {
|
|||||||
Vector min = region.getMinimumPoint();
|
Vector min = region.getMinimumPoint();
|
||||||
Vector max = region.getMaximumPoint();
|
Vector max = region.getMaximumPoint();
|
||||||
|
|
||||||
int blocks = 0;
|
|
||||||
for(int x = min.getBlockX(); x <= max.getBlockX(); x++){
|
for(int x = min.getBlockX(); x <= max.getBlockX(); x++){
|
||||||
for(int y = min.getBlockY(); y <= max.getBlockY(); y++){
|
for(int y = min.getBlockY(); y <= max.getBlockY(); y++){
|
||||||
for(int z = min.getBlockZ(); z <= max.getBlockZ(); z++){
|
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);
|
result.getBlockCounts().merge(Material.getMaterial(blockId), 1, Integer::sum);
|
||||||
|
|
||||||
if (blockId != AIR)
|
|
||||||
blocks++;
|
|
||||||
|
|
||||||
if(INVENTORY.contains(blockId)){
|
if(INVENTORY.contains(blockId)){
|
||||||
checkInventory(result, block, blockId, new BlockPos(x, y, z));
|
checkInventory(result, block, blockId, new BlockPos(x, y, z));
|
||||||
}
|
}
|
||||||
@ -141,7 +137,9 @@ public class AutoChecker8 implements AutoChecker.IAutoChecker {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AutoChecker.BlockScanResult scan(Clipboard clipboard, CheckSchemType type) {
|
public AutoChecker.BlockScanResult scan(Clipboard clipboard) {
|
||||||
return null;
|
AutoChecker.BlockScanResult result = new AutoChecker.BlockScanResult();
|
||||||
|
scan(result, clipboard);
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
|
|
||||||
You should have received a copy of the GNU Affero General Public License
|
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/>.
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package de.steamwar.schematicsystem.autocheck;
|
package de.steamwar.schematicsystem.autocheck;
|
||||||
|
|
||||||
@ -32,7 +32,7 @@ import java.util.*;
|
|||||||
public class AutoChecker {
|
public class AutoChecker {
|
||||||
|
|
||||||
public static AutoCheckerResult check(Clipboard clipboard, CheckSchemType type) {
|
public static AutoCheckerResult check(Clipboard clipboard, CheckSchemType type) {
|
||||||
BlockScanResult blockScanResult = impl.scan(clipboard, type);
|
BlockScanResult blockScanResult = impl.scan(clipboard);
|
||||||
return AutoCheckerResult.builder()
|
return AutoCheckerResult.builder()
|
||||||
.type(type)
|
.type(type)
|
||||||
.height(clipboard.getDimensions().getBlockY())
|
.height(clipboard.getDimensions().getBlockY())
|
||||||
@ -59,7 +59,7 @@ public class AutoChecker {
|
|||||||
private static final IAutoChecker impl = VersionDependent.getVersionImpl(SchematicSystem.getInstance());
|
private static final IAutoChecker impl = VersionDependent.getVersionImpl(SchematicSystem.getInstance());
|
||||||
|
|
||||||
public interface IAutoChecker {
|
public interface IAutoChecker {
|
||||||
BlockScanResult scan(Clipboard clipboard, CheckSchemType type);
|
BlockScanResult scan(Clipboard clipboard);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
|
In neuem Issue referenzieren
Einen Benutzer sperren