From f061b5848a18713c34b79a64fb792aaef5754994 Mon Sep 17 00:00:00 2001 From: DanMB Date: Wed, 6 Jul 2022 14:43:01 -0700 Subject: [PATCH] Update packages --- build.gradle | 4 ++-- bukkit/build.gradle | 5 +---- .../iris/platform/bukkit/IrisBukkitChunkGenerator.java | 4 ++-- engine/src/main/java/com/volmit/iris/engine/Engine.java | 3 +-- .../com/volmit/iris/engine/dimension/IrisGenerator.java | 6 +++--- .../com/volmit/iris/engine/feature/IrisFeatureTask.java | 2 +- .../volmit/iris/engine/feature/features/FeatureTerrain.java | 4 ++-- .../iris/engine/optimizer/IrisOptimizationAttempt.java | 2 +- 8 files changed, 13 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index 853503bca..e62c113c7 100644 --- a/build.gradle +++ b/build.gradle @@ -24,8 +24,8 @@ allprojects { compileOnly 'org.projectlombok:lombok:1.18.24' annotationProcessor 'org.projectlombok:lombok:1.18.24' annotationProcessor 'systems.manifold:manifold-ext:2022.1.18' - implementation 'art.arcane.source:Source:22.6.9' - implementation 'art.arcane:Amulet:22.7.12' + implementation 'art.arcane:Source:22.7.2' + implementation 'art.arcane:Amulet:22.7.13' 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' diff --git a/bukkit/build.gradle b/bukkit/build.gradle index 1d3182ce2..1cf5d4a41 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -61,7 +61,6 @@ shadowJar { append("plugin.yml") relocate 'com.dfsek.paralithic', 'com.volmit.iris.util.paralithic' 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' relocate 'ChumBukkit.extensions', 'com.volmit.iris.util.extensions' @@ -69,9 +68,7 @@ shadowJar { relocate 'Amulet.extensions', 'com.volmit.iris.util.extensions' relocate 'Iris.extensions', 'com.volmit.iris.util.extensions' dependencies { - include(dependency('art.arcane.source:Source')) include(dependency('art.arcane:')) - include(dependency('com.volmit:Fukkit')) include(dependency('systems.manifold:')) include(dependency("com.dfsek:Paralithic:")) include(dependency(":engine")) @@ -103,7 +100,7 @@ repositories { dependencies { implementation 'org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT' - implementation 'com.volmit:Fukkit:22.6.13' + implementation 'art.arcane:Fukkit:22.7.4' implementation project(":engine") } diff --git a/bukkit/src/main/java/com/volmit/iris/platform/bukkit/IrisBukkitChunkGenerator.java b/bukkit/src/main/java/com/volmit/iris/platform/bukkit/IrisBukkitChunkGenerator.java index 2ca3954ca..b30180aa2 100644 --- a/bukkit/src/main/java/com/volmit/iris/platform/bukkit/IrisBukkitChunkGenerator.java +++ b/bukkit/src/main/java/com/volmit/iris/platform/bukkit/IrisBukkitChunkGenerator.java @@ -1,7 +1,7 @@ package com.volmit.iris.platform.bukkit; -import art.arcane.amulet.metric.Average; -import art.arcane.amulet.metric.PrecisionStopwatch; +import art.arcane.chrono.Average; +import art.arcane.chrono.PrecisionStopwatch; import art.arcane.spatial.hunk.Hunk; import com.volmit.iris.engine.EngineConfiguration; import com.volmit.iris.engine.Engine; diff --git a/engine/src/main/java/com/volmit/iris/engine/Engine.java b/engine/src/main/java/com/volmit/iris/engine/Engine.java index 64a9d28ca..0c8f737fd 100644 --- a/engine/src/main/java/com/volmit/iris/engine/Engine.java +++ b/engine/src/main/java/com/volmit/iris/engine/Engine.java @@ -1,7 +1,6 @@ package com.volmit.iris.engine; -import art.arcane.amulet.format.Form; -import art.arcane.amulet.metric.PrecisionStopwatch; +import art.arcane.chrono.PrecisionStopwatch; import com.volmit.iris.engine.feature.features.FeatureTerrain; import com.volmit.iris.engine.pipeline.EnginePipeline; import com.volmit.iris.engine.pipeline.EnginePlumbing; diff --git a/engine/src/main/java/com/volmit/iris/engine/dimension/IrisGenerator.java b/engine/src/main/java/com/volmit/iris/engine/dimension/IrisGenerator.java index be8dad1ec..ae9e187e7 100644 --- a/engine/src/main/java/com/volmit/iris/engine/dimension/IrisGenerator.java +++ b/engine/src/main/java/com/volmit/iris/engine/dimension/IrisGenerator.java @@ -1,8 +1,8 @@ package com.volmit.iris.engine.dimension; -import art.arcane.source.api.NoisePlane; -import art.arcane.source.api.script.NoisePlaneConstructor; -import art.arcane.source.api.util.NoisePreset; +import art.arcane.source.NoisePlane; +import art.arcane.source.script.NoisePlaneConstructor; +import art.arcane.source.util.NoisePreset; import com.google.gson.Gson; import com.google.gson.TypeAdapter; import com.google.gson.TypeAdapterFactory; diff --git a/engine/src/main/java/com/volmit/iris/engine/feature/IrisFeatureTask.java b/engine/src/main/java/com/volmit/iris/engine/feature/IrisFeatureTask.java index 5ff5c96a5..86957fe49 100644 --- a/engine/src/main/java/com/volmit/iris/engine/feature/IrisFeatureTask.java +++ b/engine/src/main/java/com/volmit/iris/engine/feature/IrisFeatureTask.java @@ -1,6 +1,6 @@ package com.volmit.iris.engine.feature; -import art.arcane.amulet.metric.PrecisionStopwatch; +import art.arcane.chrono.PrecisionStopwatch; import com.volmit.iris.engine.Engine; import com.volmit.iris.platform.PlatformNamespaced; import lombok.AllArgsConstructor; diff --git a/engine/src/main/java/com/volmit/iris/engine/feature/features/FeatureTerrain.java b/engine/src/main/java/com/volmit/iris/engine/feature/features/FeatureTerrain.java index e373959dc..d17f44a3b 100644 --- a/engine/src/main/java/com/volmit/iris/engine/feature/features/FeatureTerrain.java +++ b/engine/src/main/java/com/volmit/iris/engine/feature/features/FeatureTerrain.java @@ -1,8 +1,8 @@ package com.volmit.iris.engine.feature.features; import art.arcane.amulet.range.IntegerRange; -import art.arcane.source.api.NoisePlane; -import art.arcane.source.api.util.NoisePreset; +import art.arcane.source.NoisePlane; +import art.arcane.source.util.NoisePreset; import com.volmit.iris.engine.Engine; import com.volmit.iris.engine.feature.IrisFeature; import com.volmit.iris.engine.feature.IrisFeatureSizedTarget; diff --git a/engine/src/main/java/com/volmit/iris/engine/optimizer/IrisOptimizationAttempt.java b/engine/src/main/java/com/volmit/iris/engine/optimizer/IrisOptimizationAttempt.java index 6ee65836f..7867ea825 100644 --- a/engine/src/main/java/com/volmit/iris/engine/optimizer/IrisOptimizationAttempt.java +++ b/engine/src/main/java/com/volmit/iris/engine/optimizer/IrisOptimizationAttempt.java @@ -1,6 +1,6 @@ package com.volmit.iris.engine.optimizer; -import art.arcane.amulet.metric.Average; +import art.arcane.chrono.Average; import lombok.Data; import java.util.concurrent.atomic.AtomicInteger;