chore: merge #12

Fix threading issue with SchematicChunkLoader

Author: LooFifteen

src/main/java/net/crystalgames/scaffolding/instance/SchematicChunkLoader.java

@@ -12,8 +12,10 @@
 import net.minestom.server.utils.chunk.ChunkUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import space.vectrix.flare.fastutil.Long2ObjectSyncMap;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
@@ -23,11 +25,11 @@
 public class SchematicChunkLoader implements IChunkLoader {
 
     private final @NotNull Function<@NotNull Chunk, @NotNull CompletableFuture<Void>> saveHandler;
-    private final Long2ObjectMap<ChunkBatch> batches = new Long2ObjectOpenHashMap<>();
+    private final Long2ObjectMap<ChunkBatch> batches = Long2ObjectSyncMap.hashmap();
 
     private SchematicChunkLoader(
             @NotNull Function<@NotNull Chunk, @NotNull CompletableFuture<Void>> saveHandler,
-            @NotNull List<Schematic> schematics,
+            @NotNull Collection<Schematic> schematics,
             int offsetX,
             int offsetY,
             int offsetZ
@@ -137,5 +139,4 @@ private Builder() {
             return new SchematicChunkLoader(handler, List.copyOf(schematics), xOffset, yOffset, zOffset);
         }
     }
-
 }

src/main/java/net/crystalgames/scaffolding/region/Region.java

@@ -1,9 +1,10 @@
 package net.crystalgames.scaffolding.region;
 
+import net.minestom.server.coordinate.Point;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.instance.Instance;
 
-public record Region(Instance instance, Pos lower, Pos upper) {
+public record Region(Instance instance, Point lower, Point upper) {
 
     public int sizeX() {
         return (upper.blockX() - lower.blockX()) + 1;

src/main/java/net/crystalgames/scaffolding/schematic/Schematic.java

@@ -1,6 +1,7 @@
 package net.crystalgames.scaffolding.schematic;
 
 import net.crystalgames.scaffolding.region.Region;
+import net.minestom.server.coordinate.Point;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.instance.Instance;
 import net.minestom.server.instance.block.Block;
@@ -17,16 +18,16 @@
 
 public interface Schematic {
 
-    default void read(InputStream inputStream) throws IOException, NBTException {
+    default void read(@NotNull InputStream inputStream) throws IOException, NBTException {
         NBTReader reader = new NBTReader(inputStream, CompressedProcesser.GZIP);
         read((NBTCompound) reader.readNamed().getSecond());
         reader.close();
         inputStream.close();
     }
-    void read(NBTCompound nbtTag) throws NBTException;
+    void read(@NotNull NBTCompound nbtTag) throws NBTException;
+    void write(@NotNull OutputStream outputStream, @NotNull Region region) throws IOException;
 
-    void write(OutputStream outputStream, Region region) throws IOException;
-    CompletableFuture<Region> build(Instance instance, Pos position);
+    CompletableFuture<Region> build(Instance instance, Point position);
 
     short getWidth();
     short getHeight();

src/main/java/net/crystalgames/scaffolding/schematic/impl/MCEditSchematic.java

@@ -2,6 +2,7 @@
 
 import net.crystalgames.scaffolding.region.Region;
 import net.crystalgames.scaffolding.schematic.Schematic;
+import net.minestom.server.coordinate.Point;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.instance.Instance;
 import net.minestom.server.instance.batch.AbsoluteBlockBatch;
@@ -34,7 +35,7 @@ public class MCEditSchematic implements Schematic {
     private int offsetZ;
 
     @Override
-    public void read(NBTCompound nbtTag) throws NBTException {
+    public void read(@NotNull NBTCompound nbtTag) throws NBTException {
         if (!nbtTag.containsKey("Blocks")) throw new NBTException("Invalid Schematic: No Blocks");
 
         readSizes(nbtTag);
@@ -113,12 +114,12 @@ public void readBlocks() {
     }
 
     @Override
-    public void write(OutputStream outputStream, Region region) {
+    public void write(@NotNull OutputStream outputStream, @NotNull Region region) {
         // TODO: Complete
     }
 
     @Override
-    public CompletableFuture<Region> build(Instance instance, Pos position) {
+    public CompletableFuture<Region> build(Instance instance, Point position) {
         if (!read) throw new IllegalStateException("Schematic not read");
         CompletableFuture<Region> future = new CompletableFuture<>();
         CompletableFuture.runAsync(() -> {

src/main/java/net/crystalgames/scaffolding/schematic/impl/SpongeSchematic.java

@@ -2,6 +2,7 @@
 
 import net.crystalgames.scaffolding.region.Region;
 import net.crystalgames.scaffolding.schematic.Schematic;
+import net.minestom.server.coordinate.Point;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.instance.Instance;
 import net.minestom.server.instance.batch.AbsoluteBlockBatch;
@@ -33,7 +34,7 @@ public class SpongeSchematic implements Schematic {
     private int offsetZ;
 
     @Override
-    public void read(NBTCompound nbtTag) throws NBTException {
+    public void read(@NotNull NBTCompound nbtTag) throws NBTException {
         readSizes(nbtTag);
         readBlockPalette(nbtTag);
         readOffsets(nbtTag);
@@ -133,12 +134,12 @@ private void readBlocks() throws NBTException {
     }
 
     @Override
-    public void write(OutputStream outputStream, Region region) {
+    public void write(@NotNull OutputStream outputStream, @NotNull Region region) {
         // TODO: Complete
     }
 
     @Override
-    public CompletableFuture<Region> build(Instance instance, Pos position) {
+    public CompletableFuture<Region> build(Instance instance, Point position) {
         if (!read) throw new IllegalStateException("Schematic not read");
         CompletableFuture<Region> future = new CompletableFuture<>();
         CompletableFuture.runAsync(() -> {