From 4f53b058fa27a2a4f1b2e273f5dac5b8cc7ba234 Mon Sep 17 00:00:00 2001 From: cyberpwn Date: Mon, 5 Sep 2022 14:28:41 -0400 Subject: [PATCH] fixes --- build.gradle | 12 ++++++------ bukkit/build.gradle | 4 ++-- .../com/volmit/iris/platform/bukkit/IrisBukkit.java | 2 +- .../iris/platform/bukkit/wrapper/BukkitBlock.java | 3 +-- .../com/volmit/iris/engine/EngineBlockCache.java | 2 +- .../java/com/volmit/iris/engine/EngineRegistry.java | 2 +- .../volmit/iris/engine/dimension/IrisPalette.java | 2 +- .../iris/engine/feature/features/FeatureTerrain.java | 2 +- .../features/synthetic/SyntheticBiomeTerrain.java | 2 +- .../iris/engine/network/server/EngineServer.java | 4 ++-- .../com/volmit/iris/engine/resolver/Resolvable.java | 2 +- .../java/com/volmit/iris/platform/IrisPlatform.java | 2 ++ .../java/com/volmit/iris/platform/PlatformWorld.java | 1 + 13 files changed, 21 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index 81126ff2a..2c6146059 100644 --- a/build.gradle +++ b/build.gradle @@ -16,22 +16,22 @@ allprojects { apply plugin: 'java' repositories { - maven { url "https://dl.cloudsmith.io/public/arcane/archive/maven/" } + maven { url "https://arcanearts.jfrog.io/artifactory/archives" } mavenCentral() } dependencies { 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:22.7.2' - implementation 'art.arcane:Cram:22.7.3' - implementation 'art.arcane:Amulet:22.7.13' + annotationProcessor 'systems.manifold:manifold-ext:2022.1.19' + implementation 'art.arcane:Source:22.9.3' + implementation 'art.arcane:Cram:22.9.3' + implementation 'art.arcane:Amulet:22.9.5' 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' + testAnnotationProcessor 'systems.manifold:manifold-ext:2022.1.19' } } diff --git a/bukkit/build.gradle b/bukkit/build.gradle index aae954a1d..9220b2f9d 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -95,13 +95,13 @@ java { } repositories { - maven { url "https://dl.cloudsmith.io/public/arcane/archive/maven/" } + maven { url "https://arcanearts.jfrog.io/artifactory/archives" } mavenCentral() } dependencies { implementation 'org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT' - implementation 'art.arcane:Fukkit:22.7.5' + implementation 'art.arcane:Fukkit:22.9.2' implementation project(":engine") } diff --git a/bukkit/src/main/java/com/volmit/iris/platform/bukkit/IrisBukkit.java b/bukkit/src/main/java/com/volmit/iris/platform/bukkit/IrisBukkit.java index c244a13a2..5c7e2b8b8 100644 --- a/bukkit/src/main/java/com/volmit/iris/platform/bukkit/IrisBukkit.java +++ b/bukkit/src/main/java/com/volmit/iris/platform/bukkit/IrisBukkit.java @@ -4,7 +4,7 @@ import art.arcane.amulet.io.IO; import com.volmit.iris.engine.EngineConfiguration; import com.volmit.iris.platform.IrisPlatform; import com.volmit.iris.platform.PlatformBiome; -import com.volmit.iris.platform.PlatformBlock; +import com.volmit.iris.platform.block.PlatformBlock; import com.volmit.iris.platform.PlatformNamespaceKey; import com.volmit.iris.platform.PlatformWorld; import com.volmit.iris.platform.bukkit.wrapper.BukkitBiome; diff --git a/bukkit/src/main/java/com/volmit/iris/platform/bukkit/wrapper/BukkitBlock.java b/bukkit/src/main/java/com/volmit/iris/platform/bukkit/wrapper/BukkitBlock.java index 5f2036438..56718ec6c 100644 --- a/bukkit/src/main/java/com/volmit/iris/platform/bukkit/wrapper/BukkitBlock.java +++ b/bukkit/src/main/java/com/volmit/iris/platform/bukkit/wrapper/BukkitBlock.java @@ -1,8 +1,7 @@ package com.volmit.iris.platform.bukkit.wrapper; -import com.volmit.iris.platform.PlatformBlock; +import com.volmit.iris.platform.block.PlatformBlock; import com.volmit.iris.platform.PlatformNamespaceKey; -import com.volmit.iris.platform.block.PlatformAgeable; import com.volmit.iris.platform.block.PlatformBlock; import lombok.Data; import org.bukkit.Bukkit; diff --git a/engine/src/main/java/com/volmit/iris/engine/EngineBlockCache.java b/engine/src/main/java/com/volmit/iris/engine/EngineBlockCache.java index 6dc2045e0..dde7251cd 100644 --- a/engine/src/main/java/com/volmit/iris/engine/EngineBlockCache.java +++ b/engine/src/main/java/com/volmit/iris/engine/EngineBlockCache.java @@ -1,6 +1,6 @@ package com.volmit.iris.engine; -import com.volmit.iris.platform.PlatformBlock; +import com.volmit.iris.platform.block.PlatformBlock; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/engine/src/main/java/com/volmit/iris/engine/EngineRegistry.java b/engine/src/main/java/com/volmit/iris/engine/EngineRegistry.java index de43c11e3..c1b9d98df 100644 --- a/engine/src/main/java/com/volmit/iris/engine/EngineRegistry.java +++ b/engine/src/main/java/com/volmit/iris/engine/EngineRegistry.java @@ -1,7 +1,7 @@ package com.volmit.iris.engine; import com.volmit.iris.platform.PlatformBiome; -import com.volmit.iris.platform.PlatformBlock; +import com.volmit.iris.platform.block.PlatformBlock; import com.volmit.iris.platform.PlatformRegistry; import lombok.Builder; import lombok.Data; diff --git a/engine/src/main/java/com/volmit/iris/engine/dimension/IrisPalette.java b/engine/src/main/java/com/volmit/iris/engine/dimension/IrisPalette.java index 8f6cdc29b..171d2863d 100644 --- a/engine/src/main/java/com/volmit/iris/engine/dimension/IrisPalette.java +++ b/engine/src/main/java/com/volmit/iris/engine/dimension/IrisPalette.java @@ -9,7 +9,7 @@ import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonWriter; import com.volmit.iris.engine.resolver.EngineResolvable; import com.volmit.iris.engine.resolver.Resolvable; -import com.volmit.iris.platform.PlatformBlock; +import com.volmit.iris.platform.block.PlatformBlock; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; 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 a3e970da3..750e66629 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 @@ -4,7 +4,7 @@ import art.arcane.source.NoisePlane; import art.arcane.source.util.NoisePreset; import com.volmit.iris.engine.Engine; import com.volmit.iris.engine.feature.*; -import com.volmit.iris.platform.PlatformBlock; +import com.volmit.iris.platform.block.PlatformBlock; import com.volmit.iris.util.ShortNoiseCache; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/engine/src/main/java/com/volmit/iris/engine/feature/features/synthetic/SyntheticBiomeTerrain.java b/engine/src/main/java/com/volmit/iris/engine/feature/features/synthetic/SyntheticBiomeTerrain.java index a2da3f487..1bb0c448a 100644 --- a/engine/src/main/java/com/volmit/iris/engine/feature/features/synthetic/SyntheticBiomeTerrain.java +++ b/engine/src/main/java/com/volmit/iris/engine/feature/features/synthetic/SyntheticBiomeTerrain.java @@ -6,7 +6,7 @@ import com.volmit.iris.engine.feature.FeatureStorage; import com.volmit.iris.engine.feature.FeatureTarget; import com.volmit.iris.engine.feature.SyntheticFeature; import com.volmit.iris.engine.feature.features.FeatureTerrain; -import com.volmit.iris.platform.PlatformBlock; +import com.volmit.iris.platform.block.PlatformBlock; public class SyntheticBiomeTerrain implements SyntheticFeature { diff --git a/engine/src/main/java/com/volmit/iris/engine/network/server/EngineServer.java b/engine/src/main/java/com/volmit/iris/engine/network/server/EngineServer.java index 7ed1cda06..66c2382fb 100644 --- a/engine/src/main/java/com/volmit/iris/engine/network/server/EngineServer.java +++ b/engine/src/main/java/com/volmit/iris/engine/network/server/EngineServer.java @@ -8,6 +8,7 @@ import java.net.Socket; import java.net.SocketTimeoutException; import java.util.HashMap; import java.util.Map; +import java.util.UUID; public class EngineServer extends Thread { private final Engine engine; @@ -37,8 +38,7 @@ public class EngineServer extends Thread { } } - public void close() - { + public void close() throws IOException { this.interrupt(); server.close(); } diff --git a/engine/src/main/java/com/volmit/iris/engine/resolver/Resolvable.java b/engine/src/main/java/com/volmit/iris/engine/resolver/Resolvable.java index c23abbec0..35de7a86e 100644 --- a/engine/src/main/java/com/volmit/iris/engine/resolver/Resolvable.java +++ b/engine/src/main/java/com/volmit/iris/engine/resolver/Resolvable.java @@ -7,7 +7,7 @@ import com.google.gson.stream.JsonToken; import com.google.gson.stream.JsonWriter; import com.volmit.iris.engine.EngineData; import com.volmit.iris.platform.PlatformBiome; -import com.volmit.iris.platform.PlatformBlock; +import com.volmit.iris.platform.block.PlatformBlock; import com.volmit.iris.platform.PlatformNamespaced; import com.volmit.iris.platform.PlatformNamespacedMutable; import lombok.AllArgsConstructor; diff --git a/engine/src/main/java/com/volmit/iris/platform/IrisPlatform.java b/engine/src/main/java/com/volmit/iris/platform/IrisPlatform.java index 92414831e..235f8b77e 100644 --- a/engine/src/main/java/com/volmit/iris/platform/IrisPlatform.java +++ b/engine/src/main/java/com/volmit/iris/platform/IrisPlatform.java @@ -1,5 +1,7 @@ package com.volmit.iris.platform; +import com.volmit.iris.platform.block.PlatformBlock; + import java.io.File; import java.util.stream.Stream; diff --git a/engine/src/main/java/com/volmit/iris/platform/PlatformWorld.java b/engine/src/main/java/com/volmit/iris/platform/PlatformWorld.java index c04fd0fab..61e0aabeb 100644 --- a/engine/src/main/java/com/volmit/iris/platform/PlatformWorld.java +++ b/engine/src/main/java/com/volmit/iris/platform/PlatformWorld.java @@ -1,5 +1,6 @@ package com.volmit.iris.platform; +import com.volmit.iris.platform.block.PlatformBlock; import com.volmit.iris.util.WorldHeight; import java.io.File;