Switch to using spatial instead of a copy

Author: robotgryphon

core-api/build.gradle.kts

@@ -34,6 +34,24 @@ neoForge {
     version = neoforged.versions.neoforge
 }
 
+repositories {
+    mavenLocal()
+    maven("https://maven.pkg.github.com/compactmods/spatial") {
+        name = "Github PKG - Spatial"
+        credentials {
+            username = project.findProperty("gpr.user") as String? ?: System.getenv("GITHUB_ACTOR")
+            password = project.findProperty("gpr.token") as String? ?: System.getenv("GITHUB_TOKEN")
+        }
+    }
+}
+
+dependencies {
+    compileOnly(compactmods.spatial)
+    jarJar(compactmods.spatial) { isTransitive = false }
+}
+
+
+
 tasks.withType<JavaCompile> {
     options.encoding = "UTF-8"
     options.compilerArgs.add("-proc:none")

core-api/src/main/java/dev/compactmods/machines/api/room/CompactRoomGenerator.java

@@ -1,18 +1,15 @@
 package dev.compactmods.machines.api.room;
 
 import dev.compactmods.machines.api.WallConstants;
-import dev.compactmods.machines.api.room.spatial.IRoomBoundaries;
-import dev.compactmods.machines.api.util.AABBAligner;
-import dev.compactmods.machines.api.util.AABBHelper;
 import dev.compactmods.machines.api.util.BlockSpaceUtil;
-import dev.compactmods.machines.api.util.VectorUtils;
+import dev.compactmods.spatial.aabb.AABBAligner;
+import dev.compactmods.spatial.aabb.AABBHelper;
+import dev.compactmods.spatial.vector.VectorUtils;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.core.Vec3i;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
@@ -21,7 +18,6 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructurePlaceSettings;
 import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.Vec3;
 import org.joml.Vector3d;
 
 public class CompactRoomGenerator {
@@ -90,7 +86,7 @@ public static void populateStructure(ServerLevel level, ResourceLocation templat
                     .setMirror(Mirror.NONE);
 
             AABB placementBounds = null;
-            final AABBAligner aligner = AABBAligner.create(roomInnerBounds, templateSize);
+            final AABBAligner.Bounded aligner = AABBAligner.create(roomInnerBounds, AABBHelper.zeroOriginSized(templateSize));
             switch (placement) {
                 case CENTERED -> placementBounds = aligner
                         .center(roomInnerBounds.getCenter())
@@ -106,7 +102,8 @@ public static void populateStructure(ServerLevel level, ResourceLocation templat
             }
 
             if(placementBounds != null) {
-                BlockPos placeAt = BlockPos.containing(AABBHelper.minCorner(placementBounds));
+                final var pos = AABBHelper.minCorner(placementBounds);
+                BlockPos placeAt = BlockPos.containing(pos.x(), pos.y(), pos.z());
                 tem.placeInWorld(level, placeAt, placeAt, placementSettings, level.random, Block.UPDATE_ALL);
             }
         });

core-api/src/main/java/dev/compactmods/machines/api/room/RoomTranslations.java

@@ -2,7 +2,7 @@
 
 import dev.compactmods.machines.api.CompactMachines;
 import dev.compactmods.machines.api.room.function.PlayerAndRoomCodeFunction;
-import dev.compactmods.machines.api.util.AABBHelper;
+import dev.compactmods.spatial.aabb.AABBHelper;
 import net.minecraft.ChatFormatting;
 import net.minecraft.Util;
 import net.minecraft.core.BlockPos;

core-api/src/main/java/dev/compactmods/machines/api/room/spatial/IRoomBoundaries.java

@@ -1,8 +1,7 @@
 package dev.compactmods.machines.api.room.spatial;
 
-import dev.compactmods.machines.api.util.AABBHelper;
+import dev.compactmods.spatial.aabb.AABBHelper;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.Vec3i;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;

core-api/src/main/java/dev/compactmods/machines/api/util/AABBAligner.java

@@ -14,19 +14,6 @@ public static Stream<BlockPos> blocksInside(AABB bounds) {
         return BlockPos.betweenClosedStream(bounds.contract(1, 1, 1));
     }
 
-    public static Stream<BlockPos> forAllCorners(AABB bounds) {
-        Stream.Builder<BlockPos> stream = Stream.builder();
-        stream.add(BlockPos.containing(bounds.maxX - 1, bounds.maxY - 1, bounds.maxZ - 1));
-        stream.add(BlockPos.containing(bounds.minX, bounds.maxY - 1, bounds.maxZ - 1));
-        stream.add(BlockPos.containing(bounds.maxX - 1, bounds.minY, bounds.maxZ - 1));
-        stream.add(BlockPos.containing(bounds.minX, bounds.minY, bounds.maxZ - 1));
-        stream.add(BlockPos.containing(bounds.maxX - 1, bounds.maxY - 1, bounds.minZ));
-        stream.add(BlockPos.containing(bounds.minX, bounds.maxY - 1, bounds.minZ));
-        stream.add(BlockPos.containing(bounds.maxX - 1, bounds.minY, bounds.minZ));
-        stream.add(BlockPos.containing(bounds.minX, bounds.minY, bounds.minZ));
-        return stream.build();
-    }
-
     public static AABB getWallBounds(AABB area, Direction wall) {
         return getWallBounds(area, wall, 1d);
     }

core-api/src/main/java/dev/compactmods/machines/api/util/AABBHelper.java

@@ -173,19 +173,22 @@ dependencies {
         compileOnly(coreApi)
         testCompileOnly(coreApi)
         jarJar(coreApi)
-
-        compileOnly(libraries.feather)
-        testImplementation(libraries.feather)
-        jarJar(libraries.feather) { isTransitive = false }
     }
 
     runtimeOnly(neoforged.testframework)
     testImplementation(neoforged.testframework)
     testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 
-    additionalRuntimeClasspath(libraries.feather)
     additionalRuntimeClasspath(libraries.jnanoid)
+    compileOnly(compactmods.feather)
+    testImplementation(compactmods.feather)
+    jarJar(compactmods.feather) { isTransitive = false }
+
+    compileOnly(compactmods.spatial)
+    testImplementation(compactmods.spatial)
+    jarJar(compactmods.spatial) { isTransitive = false }
+    additionalRuntimeClasspath(compactmods.spatial)
 }
 
 tasks.withType<Test> {