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 87d7ac7c3..49fc1a27f 100644 --- a/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java +++ b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java @@ -29,8 +29,6 @@ import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.object.common.IObjectPlacer; import com.volmit.iris.engine.parallax.ParallaxChunkMeta; import com.volmit.iris.util.collection.KList; -import com.volmit.iris.util.collection.KMap; -import com.volmit.iris.util.format.Form; import com.volmit.iris.util.math.RNG; import lombok.Data; import org.bukkit.Axis; @@ -53,8 +51,6 @@ public class PlannedStructure { private RNG rng; private boolean verbose; private boolean terminating; - private static int hit = 0; - private static int miss = 0; public PlannedStructure(IrisJigsawStructure structure, IrisPosition position, RNG rng) { terminating = false; @@ -402,19 +398,11 @@ public class PlannedStructure { String key = piece.getObject() + "-" + rotation.hashCode(); return objectRotationCache.compute(key, (k, v) -> { - if(v == null) - { - miss++; + if (v == null) { return rotation.rotateCopy(data.getObjectLoader().load(piece.getObject())); } - hit++; - printCacheHit(); return v; }); } - - private void printCacheHit() { - System.out.println("Cache Hit " + Form.pc((double) hit / (double) (hit + miss), 2) + " Cache Hit: " + hit + " hits " + miss + " misses."); - } } 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 a8e1a0d73..df7cd62e4 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java @@ -473,7 +473,7 @@ public class IrisPostModifier extends EngineAssignedModifier { BlockData d = getPostBlock(x, y, z, currentPostX, currentPostZ, currentData); return d instanceof Levelled; } - + public void setPostBlock(int x, int y, int z, BlockData d, int currentPostX, int currentPostZ, Hunk currentData) { if (y < currentData.getHeight()) { currentData.set(x & 15, y, z & 15, d); diff --git a/src/main/java/com/volmit/iris/engine/noise/CNG.java b/src/main/java/com/volmit/iris/engine/noise/CNG.java index 984e3142b..1e76cf150 100644 --- a/src/main/java/com/volmit/iris/engine/noise/CNG.java +++ b/src/main/java/com/volmit/iris/engine/noise/CNG.java @@ -349,8 +349,7 @@ public class CNG { private double getNoise(double... dim) { double scale = noscale ? 1 : this.bakedScale * this.scale; - if(fracture == null || noscale) - { + if (fracture == null || noscale) { return generator.noise( (dim.length > 0 ? dim[0] : 0D) * scale, (dim.length > 1 ? dim[1] : 0D) * scale, @@ -372,18 +371,11 @@ public class CNG { } public double invertNoise(double... dim) { - if(dim.length == 1) - { + if (dim.length == 1) { return noise(-dim[0]); - } - - else if(dim.length == 2) - { + } else if (dim.length == 2) { return noise(dim[1], dim[0]); - } - - else if(dim.length == 3) - { + } else if (dim.length == 3) { return noise(dim[1], dim[2], dim[0]); }