NEw amulet

build.gradle

@@ -23,14 +23,14 @@ allprojects {
     dependencies {
         compileOnly 'org.projectlombok:lombok:1.18.24'
         annotationProcessor 'org.projectlombok:lombok:1.18.24'
-        implementation 'art.arcane.source:Source:22.6.9'
-        implementation 'art.arcane:Amulet:22.7.2'
-        implementation 'com.github.ben-manes.caffeine:caffeine:3.1.1'
         annotationProcessor 'systems.manifold:manifold-ext:2022.1.18'
-        testAnnotationProcessor 'systems.manifold:manifold-ext:2022.1.18'
+        implementation 'art.arcane.source:Source:22.6.9'
-        implementation 'systems.manifold:manifold-rt:2022.1.18'
+        implementation 'art.arcane:Amulet:22.7.12'
+        implementation 'com.google.code.gson:gson:2.9.0'
+        implementation 'com.github.ben-manes.caffeine:caffeine:3.1.1'
         testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
         testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
+        testAnnotationProcessor 'systems.manifold:manifold-ext:2022.1.18'
     }
 }
 

bukkit/build.gradle

@@ -60,7 +60,7 @@ shadowJar {
     //minimize()
     append("plugin.yml")
     relocate 'com.dfsek.paralithic', 'com.volmit.iris.util.paralithic'
-    relocate 'art.arcane.amulet', 'com.volmit.iris.util.amulet'
+    relocate 'art.arcane', 'com.volmit.iris.util.arcane'
     relocate 'com.volmit.fukkit', 'com.volmit.iris.util.fukkit'
     relocate 'manifold', 'com.volmit.iris.util.manifold'
     relocate 'art.arcane.source', 'com.volmit.iris.util.source'
@@ -70,7 +70,7 @@ shadowJar {
     relocate 'Iris.extensions', 'com.volmit.iris.util.extensions'
     dependencies {
         include(dependency('art.arcane.source:Source'))
-        include(dependency('art.arcane:Amulet'))
+        include(dependency('art.arcane:'))
         include(dependency('com.volmit:Fukkit'))
         include(dependency('systems.manifold:'))
         include(dependency("com.dfsek:Paralithic:"))

bukkit/src/main/java/com/volmit/iris/platform/bukkit/IrisBukkitChunkGenerator.java

@@ -1,8 +1,8 @@
 package com.volmit.iris.platform.bukkit;
 
-import art.arcane.amulet.collections.hunk.Hunk;
 import art.arcane.amulet.metric.Average;
 import art.arcane.amulet.metric.PrecisionStopwatch;
+import art.arcane.spatial.hunk.Hunk;
 import com.volmit.iris.engine.EngineConfiguration;
 import com.volmit.iris.engine.Engine;
 import com.volmit.iris.engine.feature.IrisFeatureSizedTarget;
@@ -31,8 +31,7 @@ public class IrisBukkitChunkGenerator extends ChunkGenerator implements Closeabl
     private final PrecisionStopwatch p = PrecisionStopwatch.start();
     private final Average a = new Average(128);
 
-    public IrisBukkitChunkGenerator(IrisPlatform platform, EngineConfiguration configuration)
+    public IrisBukkitChunkGenerator(IrisPlatform platform, EngineConfiguration configuration) {
-    {
         this.perSecond = new AtomicInteger(0);
         this.platform = platform;
         this.configuration = configuration;

bukkit/src/main/java/com/volmit/iris/platform/bukkit/util/ChunkDataHunkView.java

@@ -1,6 +1,6 @@
 package com.volmit.iris.platform.bukkit.util;
 
-import art.arcane.amulet.collections.hunk.Hunk;
+import art.arcane.spatial.hunk.Hunk;
 import com.volmit.iris.platform.PlatformBlock;
 import com.volmit.iris.platform.bukkit.wrapper.BukkitBlock;
 import org.bukkit.generator.ChunkGenerator;

engine/src/main/java/com/volmit/iris/engine/dimension/IrisPalette.java

@@ -17,7 +17,6 @@ import lombok.NoArgsConstructor;
 import lombok.Singular;
 import lombok.ToString;
 import lombok.experimental.Accessors;
-import org.apache.commons.lang3.builder.ToStringExclude;
 
 import java.io.IOException;
 import java.util.ArrayList;

engine/src/main/java/com/volmit/iris/engine/editor/pak/PakWriter.java

@@ -1,9 +1,10 @@
 package com.volmit.iris.engine.editor.pak;
 
-import art.arcane.amulet.io.nbt.nbt.io.NBTUtil;
+import art.arcane.nbtson.NBTSon;
-import art.arcane.amulet.io.nbt.nbt.io.NamedTag;
+import art.arcane.nbtson.io.NBTOutputStream;
-import art.arcane.amulet.io.nbt.objects.NBTObjectSerializer;
+import art.arcane.nbtson.io.NBTUtil;
-import art.arcane.amulet.io.nbt.objects.UnserializableClassException;
+import art.arcane.nbtson.io.NamedTag;
+import art.arcane.nbtson.io.UnserializableClassException;
 
 import java.io.DataOutputStream;
 import java.io.File;
@@ -35,7 +36,7 @@ public class PakWriter {
         this(folder, name, 1LMB);
     }
 
-    public void write() throws IOException, UnserializableClassException, IllegalAccessException {
+    public void write() throws IOException {
         PakMetadata.PakMetadataBuilder meta = PakMetadata.builder().namespace(name).pakSize(pakSize);
         long totalWritten = 0;
 
@@ -50,7 +51,7 @@ public class PakWriter {
             totalWritten += written;
         }
 
-        NBTUtil.write(new NamedTag("Package " + name, NBTObjectSerializer.serialize(meta.build())), new File(folder, name + ".dat"), true);
+        NBTUtil.write(new NamedTag("Package " + name, NBTSon.toNBT(meta.build())), new File(folder, name + ".dat"), true);
         output.close();
     }
 

engine/src/main/java/com/volmit/iris/engine/feature/IrisFeatureSizedTarget.java

@@ -1,10 +1,9 @@
 package com.volmit.iris.engine.feature;
 
-import art.arcane.amulet.collections.hunk.Hunk;
-import art.arcane.amulet.collections.hunk.storage.ArrayHunk;
-import art.arcane.amulet.collections.hunk.view.HunkView;
 import art.arcane.amulet.geometry.Vec;
 import art.arcane.amulet.range.IntegerRange;
+import art.arcane.spatial.hunk.storage.ArrayHunk;
+import art.arcane.spatial.hunk.view.HunkView;
 import com.volmit.iris.platform.PlatformNamespaced;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

engine/src/main/java/com/volmit/iris/engine/feature/IrisFeatureTarget.java

@@ -1,7 +1,7 @@
 package com.volmit.iris.engine.feature;
 
-import art.arcane.amulet.collections.hunk.Hunk;
+import art.arcane.spatial.hunk.Hunk;
-import art.arcane.amulet.collections.hunk.view.HunkView;
+import art.arcane.spatial.hunk.view.HunkView;
 import com.volmit.iris.platform.PlatformNamespaced;
 import lombok.AllArgsConstructor;
 import lombok.Builder;