diff --git a/core/src/main/java/com/volmit/iris/engine/IrisComplex.java b/core/src/main/java/com/volmit/iris/engine/IrisComplex.java index 70422c6a1..1ce21d29d 100644 --- a/core/src/main/java/com/volmit/iris/engine/IrisComplex.java +++ b/core/src/main/java/com/volmit/iris/engine/IrisComplex.java @@ -25,8 +25,6 @@ import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; 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.collection.KSet; import com.volmit.iris.util.context.IrisContext; import com.volmit.iris.util.data.DataProvider; import com.volmit.iris.util.interpolation.IrisInterpolation.NoiseKey; @@ -43,7 +41,7 @@ import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; import java.io.File; -import java.util.UUID; +import java.util.*; @Data @EqualsAndHashCode(exclude = "data") @@ -53,7 +51,7 @@ public class IrisComplex implements DataProvider { private RNG rng; private double fluidHeight; private IrisData data; - private KMap> generators; + private Map> generators; private ProceduralStream regionStream; private ProceduralStream regionStyleStream; private ProceduralStream regionIdentityStream; @@ -98,10 +96,10 @@ public class IrisComplex implements DataProvider { this.data = engine.getData(); double height = engine.getMaxHeight(); fluidHeight = engine.getDimension().getFluidHeight(); - generators = new KMap<>(); + generators = new HashMap<>(); focusBiome = engine.getFocus(); focusRegion = engine.getFocusRegion(); - KMap> inferredStreams = new KMap<>(); + Map> inferredStreams = new HashMap<>(); if (focusBiome != null) { focusBiome.setInferredType(InferredType.LAND); @@ -302,12 +300,12 @@ public class IrisComplex implements DataProvider { return biome; } - private double interpolateGenerators(Engine engine, IrisInterpolator interpolator, KSet generators, double x, double z, long seed) { + private double interpolateGenerators(Engine engine, IrisInterpolator interpolator, Set generators, double x, double z, long seed) { if (generators.isEmpty()) { return 0; } - KMap cache = new KMap<>(); + HashMap cache = new HashMap<>(64); double hi = interpolator.interpolate(x, z, (xx, zz) -> { try { IrisBiome bx = baseBiomeStream.get(xx, zz); @@ -379,7 +377,7 @@ public class IrisComplex implements DataProvider { } private void registerGenerator(IrisGenerator cachedGenerator) { - generators.computeIfAbsent(cachedGenerator.getInterpolator(), (k) -> new KSet<>()).add(cachedGenerator); + generators.computeIfAbsent(cachedGenerator.getInterpolator(), (k) -> new HashSet<>()).add(cachedGenerator); } private IrisBiome implode(IrisBiome b, Double x, Double z) {