Started work on ChunkScanning.kt

Author: Stick404

Common/src/main/java/at/petrak/hexcasting/api/casting/circles/CircleExecutionState.java

@@ -6,6 +6,7 @@
 import at.petrak.hexcasting.api.misc.Result;
 import at.petrak.hexcasting.api.mod.HexConfig;
 import at.petrak.hexcasting.api.pigment.FrozenPigment;
+import at.petrak.hexcasting.api.utils.ChunkScanning;
 import at.petrak.hexcasting.api.utils.HexUtils;
 import com.mojang.datafixers.util.Pair;
 import net.minecraft.ChatFormatting;
@@ -19,15 +20,10 @@
 import net.minecraft.server.level.*;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.phys.AABB;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
-import java.util.concurrent.ExecutionException;
 
 /**
  * See {@link BlockEntityAbstractImpetus}, this is what's stored in it
@@ -113,30 +109,17 @@ protected CircleExecutionState(BlockPos impetusPos, Direction impetusDir,
         var positiveBlock = new BlockPos.MutableBlockPos();
         var negativeBlock = new BlockPos.MutableBlockPos();
         var lastBlockPos = new BlockPos.MutableBlockPos();
+        var scanning = new ChunkScanning(level);
         BlockPos firstBlock = null;
-        HashMap<ChunkPos, ChunkAccess> chunkMap = new HashMap<>();
+
         while (!todo.isEmpty()) {
             var pair = todo.pop();
             var enterDir = pair.getFirst();
             var herePos = pair.getSecond();
+            var hereBs = scanning.getBlock(herePos);
 
-            BlockState hereBs;
-            var chunkPos = new ChunkPos(herePos);
-
-            if (!chunkMap.containsKey(chunkPos)) { // Have we found/loaded this chunk yet?
-                var z = level.getChunkSource().getChunkFuture(chunkPos.x,chunkPos.z, ChunkStatus.EMPTY,true); // For some reason, loads almost no chunks
-                try {
-                    if (z.get().left().isPresent()){ // Has the Future computed yet?
-                        chunkMap.put(chunkPos,z.get().left().get());
-                        hereBs = z.get().left().get().getBlockState(herePos);
-                    } else { // If the future has not been somehow, run normal getBlockState
-                        hereBs = level.getLevel().getBlockState(herePos);
-                    }
-                } catch (InterruptedException | ExecutionException e) { // If something goes *wrong*, run normal getBlockState
-                    hereBs = level.getLevel().getBlockState(herePos);
-                }
-            } else { // Oh good! We found this chunk already, get it from the HashMap
-                hereBs = chunkMap.get(chunkPos).getBlockState(herePos);
+            if (hereBs == null){
+                continue;
             }
 
             if (!(hereBs.getBlock() instanceof ICircleComponent cmp)) {
@@ -175,6 +158,8 @@ protected CircleExecutionState(BlockPos impetusPos, Direction impetusDir,
                 return new Result.Err<>(null);
             }
         }
+        // Maybe not required, but still seems like a good idea
+        scanning.clearCache();
 
         if (firstBlock == null) {
             return new Result.Err<>(null);

Common/src/main/java/at/petrak/hexcasting/api/utils/ChunkScanning.kt

@@ -0,0 +1,70 @@
+package at.petrak.hexcasting.api.utils
+
+import at.petrak.hexcasting.api.HexAPI
+import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap
+import net.minecraft.core.BlockPos
+import net.minecraft.server.level.ServerLevel
+import net.minecraft.world.level.ChunkPos
+import net.minecraft.world.level.block.entity.BlockEntity
+import net.minecraft.world.level.block.state.BlockState
+import net.minecraft.world.level.chunk.ChunkStatus
+import net.minecraft.world.level.chunk.ImposterProtoChunk
+
+/**
+ * This is a helper class to efficiently scan chunks in ways Minecraft did not intend for. This is for only reading chunks, not writing
+ *
+ * TODO: MAKE DOC THIS BETTER
+ */
+class ChunkScanning(var level: ServerLevel) {
+    var chunks: Long2ObjectLinkedOpenHashMap<ImposterProtoChunk> = Long2ObjectLinkedOpenHashMap()
+
+    /**
+     *  This attempts to cache a chunk to the local [chunks]
+     * @param ChunkPos the chunk to try to cache
+     * @return If the function could cache the chunk or not
+     */
+    fun cacheChunk(chunk: ChunkPos): Boolean {
+        val chunkLong = chunk.toLong()
+        // We have the chunk already, so we can skip it
+        if (chunks.contains(chunkLong)){
+            return true
+        }
+        val future = level.chunkSource.getChunkFuture(chunk.x,chunk.z, ChunkStatus.EMPTY,true).get()
+        if (future.left().isPresent){
+            chunks.put(chunkLong, future.left().get() as ImposterProtoChunk)
+            return true
+        }
+        HexAPI.LOGGER.warn("Failed to get chunk at {}!",chunk)
+        return false
+    }
+
+    fun cacheChunk(chunk: Long): Boolean{
+        return cacheChunk(ChunkPos(chunk))
+    }
+
+    fun getBlock(blockPos: BlockPos): BlockState? {
+        val chunkPos = ChunkPos(blockPos).toLong()
+        if (!cacheChunk(chunkPos)){
+            return null
+        }
+        return chunks.get(chunkPos).getBlockState(blockPos)
+    }
+
+    fun getBlockEntity(blockPos: BlockPos): BlockEntity? {
+        val chunkPos = ChunkPos(blockPos).toLong()
+        if (!cacheChunk(chunkPos)){
+            return null
+        }
+        return chunks.get(chunkPos).getBlockEntity(blockPos)
+    }
+
+    // maybe not required, but still not a bad idea to have a Clear method
+    fun clearCache(){
+        chunks.clear()
+    }
+
+    // TODO: Might not need this
+    fun containsChunk(chunk: ChunkPos): Boolean{
+        return chunks.contains(chunk.toLong())
+    }
+}