From 7dc56cc0751ba44d91e1ed50a9a1ea7d48e9a7ff Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Fri, 30 Jul 2021 04:40:26 -0400 Subject: [PATCH] Cleanup --- src/main/java/com/volmit/iris/Iris.java | 6 ++++-- src/main/java/com/volmit/iris/engine/IrisEngine.java | 7 ++----- .../com/volmit/iris/engine/jigsaw/PlannedStructure.java | 3 +-- .../com/volmit/iris/engine/modifier/IrisPostModifier.java | 1 - 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index 3ffc08863..29baaf38b 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -28,10 +28,12 @@ import com.volmit.iris.core.link.MythicMobsLink; import com.volmit.iris.core.nms.INMS; import com.volmit.iris.core.tools.IrisWorlds; import com.volmit.iris.engine.framework.EngineCompositeGenerator; -import com.volmit.iris.engine.object.*; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisBiomeCustom; +import com.volmit.iris.engine.object.IrisCompat; +import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.engine.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; -import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.format.C; import com.volmit.iris.util.format.Form; diff --git a/src/main/java/com/volmit/iris/engine/IrisEngine.java b/src/main/java/com/volmit/iris/engine/IrisEngine.java index 19ea0b734..52553821e 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngine.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngine.java @@ -22,11 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.engine.framework.*; import com.volmit.iris.engine.hunk.Hunk; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisBiomePaletteLayer; -import com.volmit.iris.engine.object.IrisDecorator; -import com.volmit.iris.engine.object.IrisObjectPlacement; -import com.volmit.iris.engine.parallel.BurstExecutor; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.documentation.ChunkCoordinates; @@ -184,6 +180,7 @@ public class IrisEngine extends BlockPopulator implements Engine { getFramework().getTerrainActuator().actuate(x, z, vblocks, multicore); } } + getMetrics().getTotal().put(p.getMilliseconds()); if (IrisSettings.get().getGeneral().isDebug()) { diff --git a/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java index 5d376edee..9a0f3af7b 100644 --- a/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java +++ b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java @@ -287,8 +287,7 @@ public class PlannedStructure { IrisPosition shift = test.getWorldPosition(testConnector); test.setPosition(desiredPosition.sub(shift)); - if(collidesWith(test, piece)) - { + if (collidesWith(test, piece)) { return false; } diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java index 877b6e431..4d47685ae 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java @@ -25,7 +25,6 @@ import com.volmit.iris.engine.framework.EngineAssignedModifier; import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.common.CaveResult; -import com.volmit.iris.engine.parallel.BurstExecutor; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import org.bukkit.Material;