From fc678684f5369477fce1b10bd7d276f0ffe303fd Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Tue, 27 Jul 2021 17:34:51 -0400 Subject: [PATCH] Cleanup --- .../java/com/volmit/iris/core/IrisProject.java | 3 +-- .../java/com/volmit/iris/core/TreeManager.java | 7 +++---- .../methods/SyndicatePregenMethod.java | 2 +- .../java/com/volmit/iris/engine/IrisEngine.java | 12 ++++-------- .../volmit/iris/engine/IrisEngineParallax.java | 8 +++----- .../actuator/IrisTerrainNormalActuator.java | 15 ++++++--------- .../engine/framework/EngineParallaxManager.java | 2 -- .../iris/engine/modifier/IrisCaveModifier.java | 12 +++--------- .../iris/engine/modifier/IrisPostModifier.java | 8 ++------ 9 files changed, 23 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/volmit/iris/core/IrisProject.java b/src/main/java/com/volmit/iris/core/IrisProject.java index a3dff9ee0..03542b0e4 100644 --- a/src/main/java/com/volmit/iris/core/IrisProject.java +++ b/src/main/java/com/volmit/iris/core/IrisProject.java @@ -216,8 +216,7 @@ public class IrisProject { try { KList reports = scanForErrors(); - if(reports.isNotEmpty()) - { + if (reports.isNotEmpty()) { sender.sendMessage("There are " + reports.size() + " problems detected with this project. See console!"); Iris.error("==========================================================="); for (Report i : reports) { diff --git a/src/main/java/com/volmit/iris/core/TreeManager.java b/src/main/java/com/volmit/iris/core/TreeManager.java index b7022a309..97af60c99 100644 --- a/src/main/java/com/volmit/iris/core/TreeManager.java +++ b/src/main/java/com/volmit/iris/core/TreeManager.java @@ -122,7 +122,7 @@ public class TreeManager implements Listener { BlockState state = b.getState(); state.setBlockData(d); blockStateList.add(b.getState()); - dataCache.put(new Location(event.getWorld(), x,y,z), d); + dataCache.put(new Location(event.getWorld(), x, y, z), d); } @Override @@ -188,8 +188,7 @@ public class TreeManager implements Listener { for (BlockState block : iGrow.getBlocks()) { Location l = block.getLocation(); - if(dataCache.containsKey(l)) - { + if (dataCache.containsKey(l)) { l.getBlock().setBlockData(dataCache.get(l), false); } } @@ -274,7 +273,7 @@ public class TreeManager implements Listener { } Iris.debug("Blocks: " + blockPositions.size()); - Iris.debug("Min: " + a.toString() + " Max: " + b.toString()); + Iris.debug("Min: " + a + " Max: " + b); // Create a cuboid with the size calculated before Cuboid cuboid = new Cuboid(a.toBlock(world).getLocation(), b.toBlock(world).getLocation()); diff --git a/src/main/java/com/volmit/iris/core/pregenerator/methods/SyndicatePregenMethod.java b/src/main/java/com/volmit/iris/core/pregenerator/methods/SyndicatePregenMethod.java index d07fb43ee..94059000f 100644 --- a/src/main/java/com/volmit/iris/core/pregenerator/methods/SyndicatePregenMethod.java +++ b/src/main/java/com/volmit/iris/core/pregenerator/methods/SyndicatePregenMethod.java @@ -75,7 +75,7 @@ public class SyndicatePregenMethod implements PregeneratorMethod { .seed(seed) .build()) .output((o) -> { - File to = new File(Iris.getTemp(), "send-" + pack.toString() + ".zip"); + File to = new File(Iris.getTemp(), "send-" + pack + ".zip"); ZipUtil.pack(dimension.getLoader().getDataFolder(), to); try { diff --git a/src/main/java/com/volmit/iris/engine/IrisEngine.java b/src/main/java/com/volmit/iris/engine/IrisEngine.java index 8604b229c..d68abcd76 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngine.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngine.java @@ -169,8 +169,7 @@ public class IrisEngine extends BlockPopulator implements Engine { Hunk blocks = vblocks.listen((xx, y, zz, t) -> catchBlockUpdates(x + xx, y + getMinHeight(), z + zz, t)); PrecisionStopwatch px = PrecisionStopwatch.start(); - if(multicore) - { + if (multicore) { BurstExecutor b = burst().burst(16); for (int i = 0; i < vblocks.getWidth(); i++) { int finalI = i; @@ -205,15 +204,12 @@ public class IrisEngine extends BlockPopulator implements Engine { } getMetrics().getTotal().put(p.getMilliseconds()); - if(IrisSettings.get().getGeneral().isDebug()) - { + if (IrisSettings.get().getGeneral().isDebug()) { KList v = new KList<>(); KMap g = getMetrics().pull(); - for(String i : g.sortKNumber()) - { - if(g.get(i) != null) - { + for (String i : g.sortKNumber()) { + if (g.get(i) != null) { v.add(C.RESET + "" + C.LIGHT_PURPLE + i + ": " + C.UNDERLINE + C.BLUE + Form.duration(g.get(i), 0) + C.RESET + C.GRAY + ""); } } diff --git a/src/main/java/com/volmit/iris/engine/IrisEngineParallax.java b/src/main/java/com/volmit/iris/engine/IrisEngineParallax.java index 186efd811..f3cef2b55 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngineParallax.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngineParallax.java @@ -25,7 +25,6 @@ import com.volmit.iris.engine.framework.EngineParallaxManager; import com.volmit.iris.engine.object.IrisFeaturePositional; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.documentation.BlockCoordinates; -import com.volmit.iris.util.scheduling.IrisLock; import lombok.Getter; import org.bukkit.util.Consumer; @@ -62,13 +61,12 @@ public class IrisEngineParallax implements EngineParallaxManager { @Override @BlockCoordinates public KList forEachFeature(double x, double z) { - int cx = ((int)x) >> 4; - int cz = ((int)x) >> 4; + int cx = ((int) x) >> 4; + int cz = ((int) x) >> 4; long key = Cache.key(cx, cz); return featureCache.compute(key, (k, v) -> { - if(v != null) - { + if (v != null) { return v; } diff --git a/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java index a09aebded..38266229b 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java @@ -54,8 +54,7 @@ public class IrisTerrainNormalActuator extends EngineAssignedActuator public void onActuate(int x, int z, Hunk h, boolean multicore) { PrecisionStopwatch p = PrecisionStopwatch.start(); - if(multicore) - { + if (multicore) { BurstExecutor e = getEngine().burst().burst(h.getWidth()); for (int xf = 0; xf < h.getWidth(); xf++) { int finalXf = xf; @@ -63,10 +62,7 @@ public class IrisTerrainNormalActuator extends EngineAssignedActuator } e.complete(); - } - - else - { + } else { for (int xf = 0; xf < h.getWidth(); xf++) { terrainSliver(x, z, xf, h); } @@ -77,10 +73,11 @@ public class IrisTerrainNormalActuator extends EngineAssignedActuator /** * This is calling 1/16th of a chunk x/z slice. It is a plane from sky to bedrock 1 thick in the x direction. - * @param x the chunk x in blocks - * @param z the chunk z in blocks + * + * @param x the chunk x in blocks + * @param z the chunk z in blocks * @param xf the current x slice - * @param h the blockdata + * @param h the blockdata */ @BlockCoordinates public void terrainSliver(int x, int z, int xf, Hunk h) { diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java b/src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java index 9ebfe4567..78cbaab6b 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java @@ -18,7 +18,6 @@ package com.volmit.iris.engine.framework; -import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisDataManager; import com.volmit.iris.engine.IrisComplex; @@ -42,7 +41,6 @@ import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.format.Form; import com.volmit.iris.util.function.Consumer4; import com.volmit.iris.util.math.RNG; -import com.volmit.iris.util.scheduling.IrisLock; import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import org.bukkit.Chunk; diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier.java index 6afb645c5..1a2cce5c8 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier.java @@ -18,7 +18,6 @@ package com.volmit.iris.engine.modifier; -import com.volmit.iris.Iris; import com.volmit.iris.engine.data.B; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedModifier; @@ -56,8 +55,7 @@ public class IrisCaveModifier extends EngineAssignedModifier { } PrecisionStopwatch p = PrecisionStopwatch.start(); - if(multicore) - { + if (multicore) { BurstExecutor e = getEngine().burst().burst(a.getWidth()); for (int i = 0; i < a.getWidth(); i++) { int finalI = i; @@ -65,10 +63,7 @@ public class IrisCaveModifier extends EngineAssignedModifier { } e.complete(); - } - - else - { + } else { for (int i = 0; i < a.getWidth(); i++) { modifySliver(x, z, i, a); } @@ -77,8 +72,7 @@ public class IrisCaveModifier extends EngineAssignedModifier { getEngine().getMetrics().getCave().put(p.getMilliseconds()); } - public void modifySliver(int x, int z, int finalI, Hunk a) - { + public void modifySliver(int x, int z, int finalI, Hunk a) { for (int j = 0; j < a.getDepth(); j++) { KList caves = genCaves(x + finalI, z + j, finalI, j, a); int he = (int) Math.round(getComplex().getHeightStream().get(x + finalI, z + j)); 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 d04c00f2b..776b7a065 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java @@ -51,8 +51,7 @@ public class IrisPostModifier extends EngineAssignedModifier { PrecisionStopwatch p = PrecisionStopwatch.start(); int i; AtomicInteger j = new AtomicInteger(); - if(multicore) - { + if (multicore) { BurstExecutor e = getEngine().burst().burst(output.getWidth()); for (i = 0; i < output.getWidth(); i++) { int finalI = i; @@ -63,10 +62,7 @@ public class IrisPostModifier extends EngineAssignedModifier { }); } e.complete(); - } - - else - { + } else { for (i = 0; i < output.getWidth(); i++) { for (j.set(0); j.get() < output.getDepth(); j.getAndIncrement()) { post(i, j.get(), output, i + x, j.get() + z);