From 975096b2216bdd602a8756276c74bad85fed345f Mon Sep 17 00:00:00 2001 From: DanLT Date: Mon, 21 Jun 2021 06:54:29 -0800 Subject: [PATCH] Remove smoothiemap usages --- .../com/volmit/iris/object/IrisObject.java | 45 +++++-------------- src/main/java/net/querz/mca/Section.java | 6 +-- .../java/net/querz/nbt/tag/CompoundTag.java | 6 +-- 3 files changed, 14 insertions(+), 43 deletions(-) diff --git a/src/main/java/com/volmit/iris/object/IrisObject.java b/src/main/java/com/volmit/iris/object/IrisObject.java index 989a6e8e3..700bb1559 100644 --- a/src/main/java/com/volmit/iris/object/IrisObject.java +++ b/src/main/java/com/volmit/iris/object/IrisObject.java @@ -5,8 +5,6 @@ import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.object.tile.TileData; import com.volmit.iris.scaffold.cache.AtomicCache; import com.volmit.iris.util.*; -import io.timeandspace.smoothie.OptimizationObjective; -import io.timeandspace.smoothie.SmoothieMap; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -34,8 +32,8 @@ public class IrisObject extends IrisRegistrant private static final BlockData VAIR_DEBUG = B.get("COBWEB"); private static final BlockData[] SNOW_LAYERS = new BlockData[] {B.get("minecraft:snow[layers=1]"), B.get("minecraft:snow[layers=2]"), B.get("minecraft:snow[layers=3]"), B.get("minecraft:snow[layers=4]"), B.get("minecraft:snow[layers=5]"), B.get("minecraft:snow[layers=6]"), B.get("minecraft:snow[layers=7]"), B.get("minecraft:snow[layers=8]")}; public static boolean shitty = false; - private SmoothieMap blocks; - private SmoothieMap> states; + private KMap blocks; + private KMap> states; private int w; private int d; private int h; @@ -219,15 +217,8 @@ public class IrisObject extends IrisRegistrant public IrisObject(int w, int h, int d) { Iris.warnsmoothie(); - blocks = SmoothieMap.newBuilder() - .doShrink(true) - .optimizeFor(OptimizationObjective.LOW_GARBAGE) - .expectedSize(Math.max(100, (w * h * d) / 2)) - .build(); - states = SmoothieMap.>newBuilder() - .doShrink(true) - .optimizeFor(OptimizationObjective.LOW_GARBAGE) - .build(); + blocks = new KMap<>(); + states = new KMap<>(); this.w = w; this.h = h; this.d = d; @@ -383,22 +374,14 @@ public class IrisObject extends IrisRegistrant public void clean() { - SmoothieMap d = SmoothieMap.newBuilder() - .doShrink(true) - .optimizeFor(OptimizationObjective.LOW_GARBAGE) - .expectedSize(getBlocks().size()) - .build(); + KMap d = new KMap<>(); for(BlockVector i : getBlocks().keySet()) { d.put(new BlockVector(i.getBlockX(), i.getBlockY(), i.getBlockZ()), Objects.requireNonNull(getBlocks().get(i))); } - SmoothieMap> dx = SmoothieMap.>newBuilder() - .doShrink(true) - .optimizeFor(OptimizationObjective.LOW_GARBAGE) - .expectedSize(getStates().size()) - .build(); + KMap> dx = new KMap<>(); for(BlockVector i : getBlocks().keySet()) { @@ -842,22 +825,14 @@ public class IrisObject extends IrisRegistrant public void rotate(IrisObjectRotation r, int spinx, int spiny, int spinz) { - SmoothieMap d = SmoothieMap.newBuilder() - .doShrink(true) - .optimizeFor(OptimizationObjective.LOW_GARBAGE) - .expectedSize(getBlocks().size()) - .build(); + KMap d = new KMap<>(); for(BlockVector i : getBlocks().keySet()) { d.put(r.rotate(i.clone(), spinx, spiny, spinz), r.rotate(Objects.requireNonNull(getBlocks().get(i)).clone(), spinx, spiny, spinz)); } - SmoothieMap> dx = SmoothieMap.>newBuilder() - .doShrink(true) - .optimizeFor(OptimizationObjective.LOW_GARBAGE) - .expectedSize(getStates().size()) - .build(); + KMap> dx = new KMap<>(); for(BlockVector i : getStates().keySet()) { @@ -899,12 +874,12 @@ public class IrisObject extends IrisRegistrant } } - public synchronized SmoothieMap getBlocks() + public synchronized KMap getBlocks() { return blocks; } - public synchronized SmoothieMap> getStates() + public synchronized KMap> getStates() { return states; } diff --git a/src/main/java/net/querz/mca/Section.java b/src/main/java/net/querz/mca/Section.java index 19c1e0f9d..3e8ae1774 100644 --- a/src/main/java/net/querz/mca/Section.java +++ b/src/main/java/net/querz/mca/Section.java @@ -1,8 +1,7 @@ package net.querz.mca; import com.volmit.iris.Iris; -import io.timeandspace.smoothie.OptimizationObjective; -import io.timeandspace.smoothie.SmoothieMap; +import com.volmit.iris.util.KMap; import net.querz.nbt.tag.ByteArrayTag; import net.querz.nbt.tag.CompoundTag; import net.querz.nbt.tag.ListTag; @@ -18,8 +17,7 @@ import static net.querz.mca.LoadFlags.*; public class Section { private CompoundTag data; - private Map> valueIndexedPalette = SmoothieMap.>newBuilder() - .optimizeFor(OptimizationObjective.FOOTPRINT).build(); + private Map> valueIndexedPalette = new KMap<>(); private ListTag palette; private byte[] blockLight; private long[] blockStates; diff --git a/src/main/java/net/querz/nbt/tag/CompoundTag.java b/src/main/java/net/querz/nbt/tag/CompoundTag.java index c91016cb0..8489ba4d1 100644 --- a/src/main/java/net/querz/nbt/tag/CompoundTag.java +++ b/src/main/java/net/querz/nbt/tag/CompoundTag.java @@ -1,8 +1,7 @@ package net.querz.nbt.tag; import com.volmit.iris.Iris; -import io.timeandspace.smoothie.OptimizationObjective; -import io.timeandspace.smoothie.SmoothieMap; +import com.volmit.iris.util.KMap; import net.querz.io.MaxDepthIO; import java.util.*; @@ -23,8 +22,7 @@ public class CompoundTag extends Tag>> implements Iterable> createEmptyValue() { - return SmoothieMap.>newBuilder() - .optimizeFor(OptimizationObjective.FOOTPRINT).build(); + return new KMap<>(); } public int size() {