mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 18:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove smoothiemap usages

Browse Source
This commit is contained in:
DanLT 2021-06-21 06:54:29 -08:00
parent 0c4c790a65
commit 975096b221
3 changed files with 14 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/main/java/com/volmit/iris/object/IrisObject.java
View File

@ -5,8 +5,6 @@ import com.volmit.iris.manager.IrisDataManager;
import com.volmit.iris.object.tile.TileData; import com.volmit.iris.object.tile.TileData;
import com.volmit.iris.scaffold.cache.AtomicCache; import com.volmit.iris.scaffold.cache.AtomicCache;
import com.volmit.iris.util.*; import com.volmit.iris.util.*;
import io.timeandspace.smoothie.OptimizationObjective;
import io.timeandspace.smoothie.SmoothieMap;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; 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 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]")}; 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; public static boolean shitty = false;
private SmoothieMap<BlockVector, BlockData> blocks; private KMap<BlockVector, BlockData> blocks;
private SmoothieMap<BlockVector, TileData<? extends TileState>> states; private KMap<BlockVector, TileData<? extends TileState>> states;
private int w; private int w;
private int d; private int d;
private int h; private int h;
@ -219,15 +217,8 @@ public class IrisObject extends IrisRegistrant
public IrisObject(int w, int h, int d) public IrisObject(int w, int h, int d)
{ {
Iris.warnsmoothie(); Iris.warnsmoothie();
blocks = SmoothieMap.<BlockVector, BlockData>newBuilder() blocks = new KMap<>();
.doShrink(true) states = new KMap<>();
.optimizeFor(OptimizationObjective.LOW_GARBAGE)
.expectedSize(Math.max(100, (w * h * d) / 2))
.build();
states = SmoothieMap.<BlockVector, TileData<? extends TileState>>newBuilder()
.doShrink(true)
.optimizeFor(OptimizationObjective.LOW_GARBAGE)
.build();
this.w = w; this.w = w;
this.h = h; this.h = h;
this.d = d; this.d = d;
@ -383,22 +374,14 @@ public class IrisObject extends IrisRegistrant
public void clean() public void clean()
{ {
SmoothieMap<BlockVector, BlockData> d = SmoothieMap.<BlockVector, BlockData>newBuilder() KMap<BlockVector, BlockData> d = new KMap<>();
.doShrink(true)
.optimizeFor(OptimizationObjective.LOW_GARBAGE)
.expectedSize(getBlocks().size())
.build();
for(BlockVector i : getBlocks().keySet()) for(BlockVector i : getBlocks().keySet())
{ {
d.put(new BlockVector(i.getBlockX(), i.getBlockY(), i.getBlockZ()), Objects.requireNonNull(getBlocks().get(i))); d.put(new BlockVector(i.getBlockX(), i.getBlockY(), i.getBlockZ()), Objects.requireNonNull(getBlocks().get(i)));
} }
SmoothieMap<BlockVector, TileData<? extends TileState>> dx = SmoothieMap.<BlockVector, TileData<? extends TileState>>newBuilder() KMap<BlockVector, TileData<? extends TileState>> dx = new KMap<>();
.doShrink(true)
.optimizeFor(OptimizationObjective.LOW_GARBAGE)
.expectedSize(getStates().size())
.build();
for(BlockVector i : getBlocks().keySet()) 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) public void rotate(IrisObjectRotation r, int spinx, int spiny, int spinz)
{ {
SmoothieMap<BlockVector, BlockData> d = SmoothieMap.<BlockVector, BlockData>newBuilder() KMap<BlockVector, BlockData> d = new KMap<>();
.doShrink(true)
.optimizeFor(OptimizationObjective.LOW_GARBAGE)
.expectedSize(getBlocks().size())
.build();
for(BlockVector i : getBlocks().keySet()) 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)); d.put(r.rotate(i.clone(), spinx, spiny, spinz), r.rotate(Objects.requireNonNull(getBlocks().get(i)).clone(), spinx, spiny, spinz));
} }
SmoothieMap<BlockVector, TileData<? extends TileState>> dx = SmoothieMap.<BlockVector, TileData<? extends TileState>>newBuilder() KMap<BlockVector, TileData<? extends TileState>> dx = new KMap<>();
.doShrink(true)
.optimizeFor(OptimizationObjective.LOW_GARBAGE)
.expectedSize(getStates().size())
.build();
for(BlockVector i : getStates().keySet()) for(BlockVector i : getStates().keySet())
{ {
@ -899,12 +874,12 @@ public class IrisObject extends IrisRegistrant
} }
} }
public synchronized SmoothieMap<BlockVector, BlockData> getBlocks() public synchronized KMap<BlockVector, BlockData> getBlocks()
{ {
return blocks; return blocks;
} }
public synchronized SmoothieMap<BlockVector, TileData<? extends TileState>> getStates() public synchronized KMap<BlockVector, TileData<? extends TileState>> getStates()
{ {
return states; return states;
} }

6
src/main/java/net/querz/mca/Section.java
View File

@ -1,8 +1,7 @@
package net.querz.mca; package net.querz.mca;
import com.volmit.iris.Iris; import com.volmit.iris.Iris;
import io.timeandspace.smoothie.OptimizationObjective; import com.volmit.iris.util.KMap;
import io.timeandspace.smoothie.SmoothieMap;
import net.querz.nbt.tag.ByteArrayTag; import net.querz.nbt.tag.ByteArrayTag;
import net.querz.nbt.tag.CompoundTag; import net.querz.nbt.tag.CompoundTag;
import net.querz.nbt.tag.ListTag; import net.querz.nbt.tag.ListTag;
@ -18,8 +17,7 @@ import static net.querz.mca.LoadFlags.*;
public class Section { public class Section {
private CompoundTag data; private CompoundTag data;
private Map<String, List<PaletteIndex>> valueIndexedPalette = SmoothieMap.<String, List<PaletteIndex>>newBuilder() private Map<String, List<PaletteIndex>> valueIndexedPalette = new KMap<>();
.optimizeFor(OptimizationObjective.FOOTPRINT).build();
private ListTag<CompoundTag> palette; private ListTag<CompoundTag> palette;
private byte[] blockLight; private byte[] blockLight;
private long[] blockStates; private long[] blockStates;

6
src/main/java/net/querz/nbt/tag/CompoundTag.java
View File

@ -1,8 +1,7 @@
package net.querz.nbt.tag; package net.querz.nbt.tag;
import com.volmit.iris.Iris; import com.volmit.iris.Iris;
import io.timeandspace.smoothie.OptimizationObjective; import com.volmit.iris.util.KMap;
import io.timeandspace.smoothie.SmoothieMap;
import net.querz.io.MaxDepthIO; import net.querz.io.MaxDepthIO;
import java.util.*; import java.util.*;
@ -23,8 +22,7 @@ public class CompoundTag extends Tag<Map<String, Tag<?>>> implements Iterable<Ma
} }
private static Map<String, Tag<?>> createEmptyValue() { private static Map<String, Tag<?>> createEmptyValue() {
return SmoothieMap.<String, Tag<?>>newBuilder() return new KMap<>();
.optimizeFor(OptimizationObjective.FOOTPRINT).build();
} }
public int size() { public int size() {