Repo-Mirror/Iris-World-Engine
9
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-01-04 15:41:30 +00:00
Code Issues Releases Activity

Resolvers

Browse Source
This commit is contained in:
cyberpwn
2022-06-30 19:31:13 -04:00
parent 0a2e3e5e88
commit 8b124bf298
28 changed files with 410 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build.gradle
View File

@@ -12,8 +12,7 @@ jar {
}
}
allprojects
{
allprojects {
apply plugin: 'java'
repositories {
@@ -24,8 +23,8 @@ allprojects
dependencies {
compileOnly 'org.projectlombok:lombok:1.18.24'
annotationProcessor 'org.projectlombok:lombok:1.18.24'
implementation 'art.arcane.source:Source:22.6.4'
implementation 'art.arcane:Amulet:22.6.7'
implementation 'art.arcane.source:Source:22.6.9'
implementation 'art.arcane:Amulet:22.6.9'
annotationProcessor 'systems.manifold:manifold-ext:2022.1.18'
testAnnotationProcessor 'systems.manifold:manifold-ext:2022.1.18'
implementation 'systems.manifold:manifold-rt:2022.1.18'

9
bukkit/build.gradle
View File

@@ -59,14 +59,21 @@ compileJava {
shadowJar {
//minimize()
append("plugin.yml")
relocate 'com.volmit.fukkit', 'com.volmit.iris.util.fukkit'
relocate 'com.dfsek.paralithic', 'com.volmit.iris.util.paralithic'
relocate 'art.arcane.amulet', 'com.volmit.iris.util.amulet'
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'
relocate 'Fukkit.extensions', 'com.volmit.iris.util.extensions'
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:Amulet'))
include(dependency('com.volmit:Fukkit'))
include(dependency('systems.manifold:'))
include(dependency("com.dfsek:Paralithic:"))
include(dependency(":engine"))
}
}

2
bukkit/src/main/java/Iris/extensions/org/bukkit/Chunk/XChunk.java → bukkit/src/main/java/IrisBukkit/extensions/org/bukkit/Chunk/XChunk.java
View File

@@ -1,4 +1,4 @@
package Iris.extensions.org.bukkit.Chunk;
package IrisBukkit.extensions.org.bukkit.Chunk;
import com.volmit.iris.platform.bukkit.wrapper.BukkitChunk;
import manifold.ext.rt.api.Extension;

2
bukkit/src/main/java/Iris/extensions/org/bukkit/NamespacedKey/XNamespacedKey.java → bukkit/src/main/java/IrisBukkit/extensions/org/bukkit/NamespacedKey/XNamespacedKey.java
View File

@@ -1,4 +1,4 @@
package Iris.extensions.org.bukkit.NamespacedKey;
package IrisBukkit.extensions.org.bukkit.NamespacedKey;
import com.volmit.iris.platform.bukkit.wrapper.BukkitKey;
import manifold.ext.rt.api.Extension;

2
bukkit/src/main/java/Iris/extensions/org/bukkit/World/XWorld.java → bukkit/src/main/java/IrisBukkit/extensions/org/bukkit/World/XWorld.java
View File

@@ -1,4 +1,4 @@
package Iris.extensions.org.bukkit.World;
package IrisBukkit.extensions.org.bukkit.World;
import com.volmit.iris.platform.bukkit.wrapper.BukkitWorld;
import manifold.ext.rt.api.Extension;

2
bukkit/src/main/java/Iris/extensions/org/bukkit/block/Biome/XBiome.java → bukkit/src/main/java/IrisBukkit/extensions/org/bukkit/block/Biome/XBiome.java
View File

@@ -1,4 +1,4 @@
package Iris.extensions.org.bukkit.block.Biome;
package IrisBukkit.extensions.org.bukkit.block.Biome;
import com.volmit.iris.platform.bukkit.wrapper.BukkitBiome;
import com.volmit.iris.platform.bukkit.wrapper.BukkitKey;

2
bukkit/src/main/java/Iris/extensions/org/bukkit/block/data/BlockData/XBlockData.java → bukkit/src/main/java/IrisBukkit/extensions/org/bukkit/block/data/BlockData/XBlockData.java
View File

@@ -1,4 +1,4 @@
package Iris.extensions.org.bukkit.block.data.BlockData;
package IrisBukkit.extensions.org.bukkit.block.data.BlockData;
import com.volmit.iris.platform.bukkit.wrapper.BukkitBlock;
import com.volmit.iris.platform.bukkit.wrapper.BukkitKey;

2
bukkit/src/main/java/Iris/extensions/org/bukkit/entity/Player/XPlayer.java → bukkit/src/main/java/IrisBukkit/extensions/org/bukkit/entity/Player/XPlayer.java
View File

@@ -1,4 +1,4 @@
package Iris.extensions.org.bukkit.entity.Player;
package IrisBukkit.extensions.org.bukkit.entity.Player;
import com.volmit.iris.platform.bukkit.wrapper.BukkitPlayer;
import manifold.ext.rt.api.Extension;

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

@@ -34,6 +34,7 @@ public class IrisBukkit extends JavaPlugin implements IrisPlatform {
getServer().getScheduler().scheduleSyncDelayedTask(this, () -> {
World world = Bukkit.createWorld(new WorldCreator("iristests/" + UUID.randomUUID()).generator(new IrisBukkitChunkGenerator(this, EngineConfiguration.builder()
.timings(true).mutable(true)
.build())));
for(Player i : Bukkit.getOnlinePlayers())
{
@@ -89,7 +90,8 @@ public class IrisBukkit extends JavaPlugin implements IrisPlatform {
public Stream<PlatformBlock> getBlocks() {
//This is because it's a method extension
//noinspection Convert2MethodRef
return Arrays.stream(Material.values()).parallel().filter((i) -> !i.isLegacy())
return Arrays.stream(Material.values())
.filter(i -> !i.isLegacy())
.filter(Material::isBlock)
.map(Material::createBlockData).map(i -> i.bukkitBlock());
}

6
bukkit/src/main/resources/plugin.yml
View File

@@ -1,3 +1,7 @@
name: Iris
main: com.volmit.iris.platform.bukkit.IrisBukkit
version: 1.0.0
version: 1.0.0
api-version: 1.19
libraries:
- org.apache-extras.beanshell:bsh:2.0b6
- com.google.code.gson:gson:2.8.9

16
engine/src/main/java/com/volmit/iris/engine/Engine.java
View File

@@ -1,5 +1,7 @@
package com.volmit.iris.engine;
import art.arcane.amulet.format.Form;
import art.arcane.amulet.metric.PrecisionStopwatch;
import com.volmit.iris.engine.feature.features.FeatureTerrain;
import com.volmit.iris.engine.pipeline.EnginePipeline;
import com.volmit.iris.engine.pipeline.EnginePlumbing;
@@ -30,17 +32,23 @@ public class Engine implements Closeable {
private final EngineExecutor executor;
private final EnginePlumbing plumbing;
private final EngineSeedManager seedManager;
private final EngineEditor editor;
public Engine(IrisPlatform platform, PlatformWorld world, EngineConfiguration configuration) {
PrecisionStopwatch p = PrecisionStopwatch.start();
this.configuration = configuration;
this.platform = platform;
this.world = world;
i("Initializing Iris Engine for " + platform.getPlatformName() + " in " + world.getName()
+ " with " + configuration.getThreads() + " priority " + configuration.getThreadPriority()
+ " threads in " + (configuration.isMutable() ? "edit mode" : "production mode"));
this.editor = configuration.isMutable() ? new EngineEditor(this) : null;
this.seedManager = getSeedManager();
this.registry = EngineRegistry.builder()
.blockRegistry(new PlatformRegistry<>(platform.getBlocks()))
.biomeRegistry(new PlatformRegistry<>(platform.getBiomes()))
.build();
this.blockCache = new EngineBlockCache(this);
this.registry = EngineRegistry.builder()
.blockRegistry(new PlatformRegistry<>("Block", platform.getBlocks()))
.biomeRegistry(new PlatformRegistry<>("Biome", platform.getBiomes()))
.build();
this.executor = new EngineExecutor(this);
this.plumbing = EnginePlumbing.builder().engine(this)
.pipeline(EnginePipeline.builder()

41
engine/src/main/java/com/volmit/iris/engine/EngineEditor.java Normal file
View File

@@ -0,0 +1,41 @@
package com.volmit.iris.engine;
import art.arcane.amulet.concurrent.J;
import art.arcane.amulet.io.JarLoader;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.TypeAdapterFactory;
import com.volmit.iris.engine.dimension.IrisBiome;
import com.volmit.iris.engine.dimension.IrisDimension;
import com.volmit.iris.engine.dimension.IrisGenerator;
import com.volmit.iris.engine.dimension.IrisSeedSet;
import com.volmit.iris.engine.editor.Mutated;
import lombok.Data;
import java.lang.reflect.InvocationTargetException;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@Data
public class EngineEditor {
private final Engine engine;
private final Gson gson;
private List<Mutated> mutatedTypes;
public EngineEditor(Engine engine)
{
this.engine = engine;
this.mutatedTypes = J.attempt(() -> new JarLoader(getClass()).all().parallel()
.filter(Objects::nonNull)
.filter(i -> !i.isInterface() && !i.isEnum())
.filter(i -> i.isAssignableFrom(Mutated.class) || Mutated.class.isAssignableFrom(i))
.map(i -> J.attempt(() -> (Mutated) i.getDeclaredConstructor().newInstance(), null)).toList(), List.of());
GsonBuilder gsonBuilder = new GsonBuilder();
mutatedTypes.forEach(i -> i.apply(gsonBuilder));
this.gson = gsonBuilder.setPrettyPrinting().create();
i("Registered " + mutatedTypes.size() + " Mutators with " + mutatedTypes.stream().filter(i -> i instanceof TypeAdapterFactory).count() + " Type Adapter Factories");
i(gson.toJson(gson.fromJson("Noise.simplex(seed)", IrisGenerator.class)));
}
}

16
engine/src/main/java/com/volmit/iris/engine/EngineExecutor.java
View File

@@ -1,5 +1,6 @@
package com.volmit.iris.engine;
import art.arcane.amulet.concurrent.J;
import lombok.Data;
import java.io.Closeable;
@@ -16,6 +17,7 @@ public class EngineExecutor implements ForkJoinPool.ForkJoinWorkerThreadFactory,
{
this.engine = engine;
forks = new ForkJoinPool(engine.getConfiguration().getThreads(), this, this, true);
i("Started Pool with " + engine.getConfiguration().getThreads() + " priority " + engine.getConfiguration().getThreadPriority() + " threads.");
}
@Override
@@ -32,6 +34,18 @@ public class EngineExecutor implements ForkJoinPool.ForkJoinWorkerThreadFactory,
@Override
public void close() throws IOException {
forks.shutdownNow().forEach(Runnable::run);
i("Shutting down generator pool");
forks.shutdownNow().forEach((i) -> {
try
{
i.run();
}
catch(Throwable e)
{
e.printStackTrace();
}
});
i("Generator pool shutdown");
}
}

8
engine/src/main/java/com/volmit/iris/engine/EngineSeedManager.java
View File

@@ -4,7 +4,13 @@ import lombok.AllArgsConstructor;
import lombok.Data;
@Data
@AllArgsConstructor
public class EngineSeedManager {
private final Engine engine;
private final long worldSeed;
public EngineSeedManager(Engine engine)
{
this.engine = engine;
this.worldSeed = engine.getWorld().getSeed();
}
}

17
engine/src/main/java/com/volmit/iris/engine/dimension/IrisBiome.java Normal file
View File

@@ -0,0 +1,17 @@
package com.volmit.iris.engine.dimension;
import com.volmit.iris.engine.editor.Mutated;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
@Builder
@Data
@AllArgsConstructor
@NoArgsConstructor
@Accessors(fluent = true, chain = true)
public class IrisBiome implements Mutated {
private String name;
}

31
engine/src/main/java/com/volmit/iris/engine/dimension/IrisDimension.java
View File

@@ -1,29 +1,24 @@
package com.volmit.iris.engine.dimension;
import com.volmit.iris.engine.editor.Mutated;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.Singular;
import lombok.experimental.Accessors;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@Data
public class IrisDimension
@NoArgsConstructor
@Builder
@AllArgsConstructor
@Accessors(fluent = true, chain = true)
public class IrisDimension implements Mutated
{
private String name;
@Data
public static class IrisDimensionMeta
{
private String name;
private String description;
private String version;
private List<IrisDimensionAuthor> authors = new ArrayList<>();
}
@Data
public static class IrisDimensionAuthor
{
private String name;
private Map<String, String> social;
}
@Builder.Default
private IrisDimensionMeta meta = new IrisDimensionMeta();
}

21
engine/src/main/java/com/volmit/iris/engine/dimension/IrisDimensionAuthor.java Normal file
View File

@@ -0,0 +1,21 @@
package com.volmit.iris.engine.dimension;
import com.volmit.iris.engine.editor.Mutated;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import java.util.Map;
@Data
@NoArgsConstructor
@Builder
@AllArgsConstructor
@Accessors(fluent = true, chain = true)
public class IrisDimensionAuthor implements Mutated
{
private String name;
private Map<String, String> social;
}

26
engine/src/main/java/com/volmit/iris/engine/dimension/IrisDimensionMeta.java Normal file
View File

@@ -0,0 +1,26 @@
package com.volmit.iris.engine.dimension;
import com.volmit.iris.engine.editor.Mutated;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.Singular;
import lombok.experimental.Accessors;
import java.util.ArrayList;
import java.util.List;
@Data
@NoArgsConstructor
@Builder
@AllArgsConstructor
@Accessors(fluent = true, chain = true)
public class IrisDimensionMeta implements Mutated
{
private String name;
private String description;
private String version;
@Singular
private List<IrisDimensionAuthor> authors = new ArrayList<>();
}

75
engine/src/main/java/com/volmit/iris/engine/dimension/IrisGenerator.java Normal file
View File

@@ -0,0 +1,75 @@
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 com.google.gson.Gson;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonParseException;
import com.google.gson.JsonSyntaxException;
import com.google.gson.TypeAdapter;
import com.google.gson.TypeAdapterFactory;
import com.google.gson.reflect.TypeToken;
import com.google.gson.stream.JsonReader;
import com.google.gson.stream.JsonToken;
import com.google.gson.stream.JsonWriter;
import com.volmit.iris.engine.editor.Mutated;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import lombok.extern.java.Log;
import javax.script.ScriptException;
import java.io.IOException;
import java.lang.reflect.Type;
@Data
@NoArgsConstructor
@Builder
@AllArgsConstructor
@Accessors(fluent = true, chain = true)
public class IrisGenerator implements Mutated, TypeAdapterFactory {
@Builder.Default
private String java = "art.arcane.source.api.util.NoisePreset.NATURAL.create(seed)";
@Builder.Default
private IrisSeedSet seed = new IrisSeedSet();
public NoisePlane getNoisePlane(long seed)
{
try {
return NoisePlaneConstructor.execute(seed, java);
} catch(ScriptException e) {
e.printStackTrace();
return NoisePreset.NATURAL.create(seed);
}
}
@Override
public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
final TypeAdapter<T> delegate = gson.getDelegateAdapter(this, type);
if(!type.getRawType().equals(getClass())) {
return null;
}
return new TypeAdapter<>() {
public void write(JsonWriter out, T value) {writeSafeJson(delegate, out, value);}
public T read(JsonReader in) throws IOException {
JsonToken token = in.peek();
if(token == JsonToken.STRING)
{
return (T) IrisGenerator.builder().java(in.nextString()).build();
}
return delegate.read(in);
}
};
}
}

30
engine/src/main/java/com/volmit/iris/engine/dimension/IrisSeedSet.java Normal file
View File

@@ -0,0 +1,30 @@
package com.volmit.iris.engine.dimension;
import com.volmit.iris.engine.Engine;
import com.volmit.iris.engine.editor.Mutated;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
@Data
@NoArgsConstructor
@AllArgsConstructor
@Accessors(fluent = true, chain = true)
public class IrisSeedSet implements Mutated {
private IrisSeedSetMode mode = IrisSeedSetMode.LOCAL_OFFSET;
private long offset = 1337;
public double getSeed(Engine engine, long localSeed)
{
return switch(mode)
{
case WORLD -> engine.getSeedManager().getWorldSeed();
case LOCAL -> localSeed;
case LOCAL_OFFSET -> localSeed + offset;
case RAW -> offset;
case WORLD_OFFSET -> engine.getSeedManager().getWorldSeed() + offset;
case RANDOM -> (Math.random() * Long.MAX_VALUE) + (Math.random() * Long.MAX_VALUE);
};
}
}

11
engine/src/main/java/com/volmit/iris/engine/dimension/IrisSeedSetMode.java Normal file
View File

@@ -0,0 +1,11 @@
package com.volmit.iris.engine.dimension;
public enum IrisSeedSetMode
{
WORLD,
RAW,
WORLD_OFFSET,
LOCAL,
LOCAL_OFFSET,
RANDOM
}

28
engine/src/main/java/com/volmit/iris/engine/editor/Mutated.java Normal file
View File

@@ -0,0 +1,28 @@
package com.volmit.iris.engine.editor;
import com.google.gson.GsonBuilder;
import com.google.gson.TypeAdapter;
import com.google.gson.TypeAdapterFactory;
import com.google.gson.stream.JsonWriter;
import java.io.IOException;
public interface Mutated {
default void apply(GsonBuilder builder) {
if(this instanceof TypeAdapterFactory f) {
builder.registerTypeAdapterFactory(f);
}
}
default <T> void writeSafeJson(TypeAdapter<T> delegate, JsonWriter out, T value) {
try {
delegate.write(out, value);
} catch (IOException e) {
try {
delegate.write(out, null);
} catch(IOException ex) {
throw new RuntimeException(ex);
}
}
}
}

18
engine/src/main/java/com/volmit/iris/engine/editor/MutatedFrozenResolver.java Normal file
View File

@@ -0,0 +1,18 @@
package com.volmit.iris.engine.editor;
import com.volmit.iris.platform.PlatformNamespaced;
import java.util.Map;
public class MutatedFrozenResolver<T extends Mutated> implements MutatedResolver<T> {
private final Map<PlatformNamespaced, T> registry;
public MutatedFrozenResolver(Map<PlatformNamespaced, T> registry)
{
this.registry = registry;
}
public T resolve(PlatformNamespaced key) {
return registry.get(key);
}
}

18
engine/src/main/java/com/volmit/iris/engine/editor/MutatedLoadingResolver.java Normal file
View File

@@ -0,0 +1,18 @@
package com.volmit.iris.engine.editor;
import com.volmit.iris.platform.PlatformNamespaced;
import java.util.Map;
public class MutatedLoadingResolver<T extends Mutated> implements MutatedResolver<T> {
private final Map<PlatformNamespaced, T> registry;
public MutatedLoadingResolver(Map<PlatformNamespaced, T> registry)
{
this.registry = registry;
}
public T resolve(PlatformNamespaced key) {
return registry.get(key);
}
}

8
engine/src/main/java/com/volmit/iris/engine/editor/MutatedResolver.java Normal file
View File

@@ -0,0 +1,8 @@
package com.volmit.iris.engine.editor;
import com.volmit.iris.platform.PlatformNamespaced;
@FunctionalInterface
public interface MutatedResolver<T extends Mutated> {
T resolve(PlatformNamespaced key);
}

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

@@ -4,9 +4,9 @@ import art.arcane.amulet.range.IntegerRange;
import art.arcane.source.api.NoisePlane;
import art.arcane.source.api.fractal.FractalFBMProvider;
import art.arcane.source.api.interpolator.StarcastInterpolator;
import art.arcane.source.api.noise.Generator;
import art.arcane.source.api.noise.provider.CellularProvider;
import art.arcane.source.api.noise.provider.SimplexProvider;
import art.arcane.source.api.util.NoisePreset;
import com.volmit.iris.engine.Engine;
import com.volmit.iris.engine.feature.IrisFeature;
import com.volmit.iris.engine.feature.IrisFeatureSizedTarget;
@@ -26,12 +26,7 @@ public class FeatureTerrain extends IrisFeature<PlatformBlock, FeatureTerrain.Te
{
super("terrain", engine);
stone = engine.block("stone");
Generator g = new Generator(new FractalFBMProvider((s) -> new CellularProvider(s), 1234));
g.scale(0.01);
this.generator = new StarcastInterpolator(new Generator(new SimplexProvider(engine.getWorld().getSeed()))
.maxOutput(64)
.minOutput(0)
.scale(0.01).warp(g), 8, 96);
this.generator = NoisePreset.NATURAL.create(1234).fit(0, 64).scale(0.2);
}
@Override

17
engine/src/main/java/com/volmit/iris/platform/PlatformRegistry.java
View File

@@ -1,19 +1,32 @@
package com.volmit.iris.platform;
import art.arcane.amulet.format.Form;
import lombok.Data;
import java.util.Collections;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@Data
public class PlatformRegistry<T extends PlatformNamespaced> {
private final Map<PlatformNamespaceKey, T> registry;
private final String name;
private final String namePlural;
public PlatformRegistry(Stream<T> stream) {
public PlatformRegistry(String name, String namePlural, Stream<T> stream) {
this.name = name;
this.namePlural = namePlural;
registry = Collections.unmodifiableMap(stream.collect(Collectors.toMap(PlatformNamespaced::getKey, (t) -> t)));
i("Registered " + Form.f(registry.size()) + " " + namePlural);
}
public PlatformRegistry(String name, Stream<T> stream) {
this(name, name + "s", stream);
}
public T get(PlatformNamespaceKey key) {
return registry.get(key);
}

28
engine/src/main/java/com/volmit/iris/util/NSK.java Normal file
View File

@@ -0,0 +1,28 @@
package com.volmit.iris.util;
import com.volmit.iris.platform.PlatformNamespaceKey;
import lombok.AllArgsConstructor;
import lombok.Data;
@Data
@AllArgsConstructor
public class NSK implements PlatformNamespaceKey {
private final String namespace;
private final String key;
public NSK(String namespacedkey)
{
this(namespacedkey.contains(":") ? namespacedkey.split("\\Q:\\E")[0] : "minecraft",
namespacedkey.contains(":") ? namespacedkey.split("\\Q:\\E")[1] : namespacedkey);
}
@Override
public String getNamespace() {
return namespace;
}
@Override
public String getKey() {
return key;
}
}