Things

src/main/java/me/cortex/voxy/client/core/rendering/hierachical2/NodeCleaner.java

@@ -62,6 +62,7 @@ public class NodeCleaner {
 
     public void tick() {
         this.clearIds();
+
     }
 
     private void clearIds() {

src/main/java/me/cortex/voxy/common/storage/other/TranslocatingStorageAdaptor.java

@@ -1,118 +0,0 @@
-package me.cortex.voxy.common.storage.other;
-
-import me.cortex.voxy.common.storage.StorageBackend;
-import me.cortex.voxy.common.storage.config.ConfigBuildCtx;
-import me.cortex.voxy.common.storage.config.StorageConfig;
-import me.cortex.voxy.common.util.MemoryBuffer;
-import me.cortex.voxy.common.world.WorldEngine;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.List;
-
-public class TranslocatingStorageAdaptor extends DelegatingStorageAdaptor {
-    public enum Mode {
-        BOX_ONLY,
-        PRIORITY_BOX,
-        PRIORITY_ORIGINAL
-    }
-    public record BoxTransform(int x1, int y1, int z1, int x2, int y2, int z2, int dx, int dy, int dz, Mode mode) {
-        public BoxTransform(int x1, int y1, int z1, int x2, int y2, int z2, int dx, int dy, int dz) {
-            this(x1, y1, z1, x2, y2, z2, dx, dy, dz, Mode.BOX_ONLY);
-        }
-        public long transformIfInBox(long pos) {
-            int lvl = WorldEngine.getLevel(pos);
-            int x = WorldEngine.getX(pos);
-            int y = WorldEngine.getY(pos);
-            int z = WorldEngine.getZ(pos);
-
-            //TODO: FIXME this might need to be the other way around, as in shift x,y,z instead of x1 etc
-            if (!((this.x1>>lvl) <= x && x <= (this.x2>>lvl) &&
-                  (this.y1>>lvl) <= y && y <= (this.y2>>lvl) &&
-                  (this.z1>>lvl) <= z && z <= (this.z2>>lvl))) {
-                return -1;
-            }
-            return WorldEngine.getWorldSectionId(lvl,
-                    x + (this.dx>>lvl),
-                    y + (this.dy>>lvl),
-                    z + (this.dz>>lvl)
-            );
-        }
-    }
-
-    private final BoxTransform[] transforms;
-
-    public TranslocatingStorageAdaptor(StorageBackend delegate, BoxTransform... transforms) {
-        super(delegate);
-        this.transforms = transforms;
-    }
-
-    @Override
-    public MemoryBuffer getSectionData(long key, MemoryBuffer scratch) {
-        for (var transform : this.transforms) {
-            long tpos = transform.transformIfInBox(key);
-            if (tpos != -1) {
-                if (transform.mode == Mode.BOX_ONLY || transform.mode == null) {
-                    return super.getSectionData(tpos, scratch);
-                } else if (transform.mode == Mode.PRIORITY_BOX) {
-                    var data = super.getSectionData(tpos, scratch);
-                    if (data == null) {
-                        return super.getSectionData(key, scratch);
-                    }
-                } else if (transform.mode == Mode.PRIORITY_ORIGINAL) {
-                    var data = super.getSectionData(key, scratch);
-                    if (data == null) {
-                        return super.getSectionData(tpos, scratch);
-                    }
-                } else {
-                    throw new IllegalStateException();
-                }
-            }
-        }
-        return super.getSectionData(key, scratch);
-    }
-
-    @Override
-    public void setSectionData(long key, MemoryBuffer data) {
-        //Dont save data if its a transformed position
-        for (var transform : this.transforms) {
-            long tpos = transform.transformIfInBox(key);
-            if (tpos != -1) {
-                return;
-            }
-        }
-        super.setSectionData(key, data);
-    }
-
-    @Override
-    public void deleteSectionData(long key) {
-        //Dont delete save data if its a transformed position
-        for (var transform : this.transforms) {
-            long tpos = transform.transformIfInBox(key);
-            if (tpos != -1) {
-                return;
-            }
-        }
-        super.deleteSectionData(key);
-    }
-
-    public static class Config extends StorageConfig {
-        public StorageConfig delegate;
-        public List<BoxTransform> transforms = new ArrayList<>();
-
-
-        @Override
-        public StorageBackend build(ConfigBuildCtx ctx) {
-            return new TranslocatingStorageAdaptor(this.delegate.build(ctx), this.transforms.toArray(BoxTransform[]::new));
-        }
-
-        @Override
-        public List<StorageConfig> getChildStorageConfigs() {
-            return List.of(this.delegate);
-        }
-
-        public static String getConfigTypeName() {
-            return "TranslocatingAdaptor";
-        }
-    }
-}

src/main/java/me/cortex/voxy/common/voxelization/WorldConversionFactory.java

@@ -42,7 +42,11 @@ public class WorldConversionFactory {
                                             block = state;
                                             blockId = 0;
                                         } else {
-                                            blockId = blockCache.computeIfAbsent(state, stateMapper::getIdForBlockState);
+                                            blockId = blockCache.getOrDefault(state, -1);
+                                            if (blockId == -1) {
+                                                blockId = stateMapper.getIdForBlockState(state);
+                                                blockCache.put(state, blockId);
+                                            }
                                             block = state;
                                         }
                                     }

src/main/java/me/cortex/voxy/common/world/WorldEngine.java

@@ -93,8 +93,6 @@ public class WorldEngine {
     public static int getLevel(long id) {
         return (int) ((id>>60)&0xf);
     }
-
-    //TODO: check these shifts are correct for all the gets
     public static int getX(long id) {
         return (int) ((id<<36)>>40);
     }