mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-02 07:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
cyberpwn 2022-09-05 14:28:41 -04:00
parent fdca73405e
commit 4f53b058fa
13 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.gradle
View File

@ -16,22 +16,22 @@ allprojects {
apply plugin: 'java' apply plugin: 'java'
repositories { repositories {
maven { url "https://dl.cloudsmith.io/public/arcane/archive/maven/" } maven { url "https://arcanearts.jfrog.io/artifactory/archives" }
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
compileOnly 'org.projectlombok:lombok:1.18.24' compileOnly 'org.projectlombok:lombok:1.18.24'
annotationProcessor 'org.projectlombok:lombok:1.18.24' annotationProcessor 'org.projectlombok:lombok:1.18.24'
annotationProcessor 'systems.manifold:manifold-ext:2022.1.18' annotationProcessor 'systems.manifold:manifold-ext:2022.1.19'
implementation 'art.arcane:Source:22.7.2' implementation 'art.arcane:Source:22.9.3'
implementation 'art.arcane:Cram:22.7.3' implementation 'art.arcane:Cram:22.9.3'
implementation 'art.arcane:Amulet:22.7.13' implementation 'art.arcane:Amulet:22.9.5'
implementation 'com.google.code.gson:gson:2.9.0' implementation 'com.google.code.gson:gson:2.9.0'
implementation 'com.github.ben-manes.caffeine:caffeine:3.1.1' implementation 'com.github.ben-manes.caffeine:caffeine:3.1.1'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine: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'
} }
} }

4
bukkit/build.gradle
View File

@ -95,13 +95,13 @@ java {
} }
repositories { repositories {
maven { url "https://dl.cloudsmith.io/public/arcane/archive/maven/" } maven { url "https://arcanearts.jfrog.io/artifactory/archives" }
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
implementation 'org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT' 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") implementation project(":engine")
} }

2
bukkit/src/main/java/com/volmit/iris/platform/bukkit/IrisBukkit.java
View File

@ -4,7 +4,7 @@ import art.arcane.amulet.io.IO;
import com.volmit.iris.engine.EngineConfiguration; import com.volmit.iris.engine.EngineConfiguration;
import com.volmit.iris.platform.IrisPlatform; import com.volmit.iris.platform.IrisPlatform;
import com.volmit.iris.platform.PlatformBiome; 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.PlatformNamespaceKey;
import com.volmit.iris.platform.PlatformWorld; import com.volmit.iris.platform.PlatformWorld;
import com.volmit.iris.platform.bukkit.wrapper.BukkitBiome; import com.volmit.iris.platform.bukkit.wrapper.BukkitBiome;

3
bukkit/src/main/java/com/volmit/iris/platform/bukkit/wrapper/BukkitBlock.java
View File

@ -1,8 +1,7 @@
package com.volmit.iris.platform.bukkit.wrapper; 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.PlatformNamespaceKey;
import com.volmit.iris.platform.block.PlatformAgeable;
import com.volmit.iris.platform.block.PlatformBlock; import com.volmit.iris.platform.block.PlatformBlock;
import lombok.Data; import lombok.Data;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;

2
engine/src/main/java/com/volmit/iris/engine/EngineBlockCache.java
View File

@ -1,6 +1,6 @@
package com.volmit.iris.engine; 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.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;

2
engine/src/main/java/com/volmit/iris/engine/EngineRegistry.java
View File

@ -1,7 +1,7 @@
package com.volmit.iris.engine; package com.volmit.iris.engine;
import com.volmit.iris.platform.PlatformBiome; 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 com.volmit.iris.platform.PlatformRegistry;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;

2
engine/src/main/java/com/volmit/iris/engine/dimension/IrisPalette.java
View File

@ -9,7 +9,7 @@ import com.google.gson.stream.JsonToken;
import com.google.gson.stream.JsonWriter; import com.google.gson.stream.JsonWriter;
import com.volmit.iris.engine.resolver.EngineResolvable; import com.volmit.iris.engine.resolver.EngineResolvable;
import com.volmit.iris.engine.resolver.Resolvable; 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.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;

2
engine/src/main/java/com/volmit/iris/engine/feature/features/FeatureTerrain.java
View File

@ -4,7 +4,7 @@ import art.arcane.source.NoisePlane;
import art.arcane.source.util.NoisePreset; import art.arcane.source.util.NoisePreset;
import com.volmit.iris.engine.Engine; import com.volmit.iris.engine.Engine;
import com.volmit.iris.engine.feature.*; 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 com.volmit.iris.util.ShortNoiseCache;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;

2
engine/src/main/java/com/volmit/iris/engine/feature/features/synthetic/SyntheticBiomeTerrain.java
View File

@ -6,7 +6,7 @@ import com.volmit.iris.engine.feature.FeatureStorage;
import com.volmit.iris.engine.feature.FeatureTarget; import com.volmit.iris.engine.feature.FeatureTarget;
import com.volmit.iris.engine.feature.SyntheticFeature; import com.volmit.iris.engine.feature.SyntheticFeature;
import com.volmit.iris.engine.feature.features.FeatureTerrain; 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<PlatformBlock, IrisBiome, FeatureTerrain.State> public class SyntheticBiomeTerrain implements SyntheticFeature<PlatformBlock, IrisBiome, FeatureTerrain.State>
{ {

4
engine/src/main/java/com/volmit/iris/engine/network/server/EngineServer.java
View File

@ -8,6 +8,7 @@ import java.net.Socket;
import java.net.SocketTimeoutException; import java.net.SocketTimeoutException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.UUID;
public class EngineServer extends Thread { public class EngineServer extends Thread {
private final Engine engine; private final Engine engine;
@ -37,8 +38,7 @@ public class EngineServer extends Thread {
} }
} }
public void close() public void close() throws IOException {
{
this.interrupt(); this.interrupt();
server.close(); server.close();
} }

2
engine/src/main/java/com/volmit/iris/engine/resolver/Resolvable.java
View File

@ -7,7 +7,7 @@ import com.google.gson.stream.JsonToken;
import com.google.gson.stream.JsonWriter; import com.google.gson.stream.JsonWriter;
import com.volmit.iris.engine.EngineData; import com.volmit.iris.engine.EngineData;
import com.volmit.iris.platform.PlatformBiome; 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.PlatformNamespaced;
import com.volmit.iris.platform.PlatformNamespacedMutable; import com.volmit.iris.platform.PlatformNamespacedMutable;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

2
engine/src/main/java/com/volmit/iris/platform/IrisPlatform.java
View File

@ -1,5 +1,7 @@
package com.volmit.iris.platform; package com.volmit.iris.platform;
import com.volmit.iris.platform.block.PlatformBlock;
import java.io.File; import java.io.File;
import java.util.stream.Stream; import java.util.stream.Stream;

1
engine/src/main/java/com/volmit/iris/platform/PlatformWorld.java
View File

@ -1,5 +1,6 @@
package com.volmit.iris.platform; package com.volmit.iris.platform;
import com.volmit.iris.platform.block.PlatformBlock;
import com.volmit.iris.util.WorldHeight; import com.volmit.iris.util.WorldHeight;
import java.io.File; import java.io.File;