From fb4d803d928485d9b3ec833a25547798157fcc83 Mon Sep 17 00:00:00 2001 From: yoyosource Date: Mon, 30 Jan 2023 16:08:06 +0100 Subject: [PATCH] Update some stuff Signed-off-by: yoyosource --- .../bausystem/features/cuboid/CuboidCreator4.java | 15 ++++++++------- .../features/cuboid/io/CSchemWriter.java | 5 +---- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/cuboid/CuboidCreator4.java b/BauSystem_Main/src/de/steamwar/bausystem/features/cuboid/CuboidCreator4.java index 0df0430b..1cd74724 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/cuboid/CuboidCreator4.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/cuboid/CuboidCreator4.java @@ -30,12 +30,12 @@ import java.util.*; public class CuboidCreator4 implements Iterator { private static final List AXES = Arrays.asList( - new Axis[]{Axis.X, Axis.Y, Axis.Z}, + // new Axis[]{Axis.X, Axis.Y, Axis.Z}, new Axis[]{Axis.X, Axis.Z, Axis.Y}, - new Axis[]{Axis.Y, Axis.X, Axis.Z}, - new Axis[]{Axis.Y, Axis.Z, Axis.X}, - new Axis[]{Axis.Z, Axis.X, Axis.Y}, - new Axis[]{Axis.Z, Axis.Y, Axis.X} + // new Axis[]{Axis.Y, Axis.X, Axis.Z}, + // new Axis[]{Axis.Y, Axis.Z, Axis.X}, + new Axis[]{Axis.Z, Axis.X, Axis.Y} + // new Axis[]{Axis.Z, Axis.Y, Axis.X} ); private List invisibleOrder = new ArrayList<>(); @@ -91,12 +91,13 @@ public class CuboidCreator4 implements Iterator { expand(currentCuboid, new ArrayList<>(Arrays.asList(axes)), entry.getValue()); if (cuboid == null || cuboid.size() < currentCuboid.size()) { cuboid = currentCuboid; - if (cuboid.size() >= positions.size()) { + if (cuboid.size() >= positions.size() * 0.5) { break; } } + break; } - if (cuboid.size() >= positions.size()) { + if (cuboid.size() >= positions.size() * 0.5) { break; } } diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/cuboid/io/CSchemWriter.java b/BauSystem_Main/src/de/steamwar/bausystem/features/cuboid/io/CSchemWriter.java index 2d8fb7ca..cfbd4921 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/cuboid/io/CSchemWriter.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/cuboid/io/CSchemWriter.java @@ -33,10 +33,7 @@ import de.steamwar.bausystem.features.cuboid.CuboidClipboard; import de.steamwar.bausystem.features.cuboid.CuboidCreator; import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; public class CSchemWriter implements ClipboardWriter {