diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..58801e4d3 --- /dev/null +++ b/build.gradle @@ -0,0 +1,70 @@ +plugins { + id 'java' + id "io.freefair.lombok" version "6.3.0" +} + +group 'com.volmit.iris' +version '1.0-SNAPSHOT' + +jar { + manifest { + attributes('Contains-Sources':'java,class') + } +} + +allprojects { + apply plugin: 'java' + apply plugin: 'io.freefair.lombok' + + configurations { + testImplementation.extendsFrom annotationProcessor + } + + java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } + } + + repositories { + maven { url "https://dl.cloudsmith.io/public/arcane/archive/maven/" } + mavenCentral() + } + + 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' + annotationProcessor 'systems.manifold:manifold-ext:2022.1.18' + testAnnotationProcessor 'systems.manifold:manifold-ext:2022.1.18' + implementation 'systems.manifold:manifold-rt:2022.1.18' + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2' + } + + if (JavaVersion.current() != JavaVersion.VERSION_1_8 && + sourceSets.main.allJava.files.any {it.name == "module-info.java"}) { + tasks.withType(JavaCompile) { + options.compilerArgs += ['-Xplugin:Manifold', '--module-path', it.classpath.asPath] + } + } else { + tasks.withType(JavaCompile) { + options.compilerArgs += ['-Xplugin:Manifold'] + } + } +} + +subprojects { + apply plugin: 'java' + apply plugin: 'io.freefair.lombok' + + dependencies { + implementation rootProject + } +} + +dependencies { + +} + diff --git a/bukkit/build.gradle b/bukkit/build.gradle new file mode 100644 index 000000000..82ac5569e --- /dev/null +++ b/bukkit/build.gradle @@ -0,0 +1,11 @@ +plugins { + id 'java' +} + +group rootProject.group +version rootProject.version + +dependencies { + implementation 'org.spigotmc:spigot-api:1.19-R0.1-SNAPSHOT' + implementation 'com.volmit:Fukkit:22.6.13' +} 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 new file mode 100644 index 000000000..d91234a25 --- /dev/null +++ b/bukkit/src/main/java/com/volmit/iris/platform/bukkit/IrisBukkit.java @@ -0,0 +1,56 @@ +package com.volmit.iris.platform.bukkit; + +import art.arcane.amulet.MagicalSugar; +import art.arcane.amulet.logging.LogListener; +import com.volmit.iris.engine.EngineConfiguration; +import com.volmit.iris.engine.IrisEngine; +import com.volmit.iris.engine.object.NSKey; +import com.volmit.iris.engine.object.biome.NativeBiome; +import com.volmit.iris.engine.object.block.IrisBlock; +import com.volmit.iris.platform.IrisPlatform; +import com.volmit.iris.platform.PlatformDataTransformer; +import com.volmit.iris.platform.PlatformTransformer; +import com.volmit.iris.platform.bukkit.transformers.BukkitBiomeTransformer; +import com.volmit.iris.platform.bukkit.transformers.BukkitBlockDataTransformer; +import com.volmit.iris.platform.bukkit.transformers.BukkitNamespaceTransformer; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.bukkit.Bukkit; +import org.bukkit.Material; +import org.bukkit.NamespacedKey; +import org.bukkit.block.Biome; +import org.bukkit.block.data.BlockData; +import org.bukkit.material.MaterialData; +import org.bukkit.plugin.java.JavaPlugin; + +@Data +@EqualsAndHashCode(callSuper = false) +public class IrisBukkit extends JavaPlugin implements IrisPlatform { + private static IrisBukkit instance; + private PlatformTransformer namespaceTransformer; + private PlatformDataTransformer blockDataTransformer; + private PlatformDataTransformer biomeTransformer; + + public void onEnable() + { + instance = this; + namespaceTransformer = new BukkitNamespaceTransformer(); + blockDataTransformer = new BukkitBlockDataTransformer(); + biomeTransformer = new BukkitBiomeTransformer(); + } + + public void onDisable() + { + + } + + public static IrisBukkit getInstance() + { + return instance; + } + + @Override + public String getPlatformName() { + return "Bukkit"; + } +} diff --git a/bukkit/src/main/java/com/volmit/iris/platform/bukkit/transformers/BukkitBiomeTransformer.java b/bukkit/src/main/java/com/volmit/iris/platform/bukkit/transformers/BukkitBiomeTransformer.java new file mode 100644 index 000000000..7a2cd6fbd --- /dev/null +++ b/bukkit/src/main/java/com/volmit/iris/platform/bukkit/transformers/BukkitBiomeTransformer.java @@ -0,0 +1,42 @@ +package com.volmit.iris.platform.bukkit.transformers; + +import com.volmit.iris.engine.object.NSKey; +import com.volmit.iris.engine.object.biome.NativeBiome; +import com.volmit.iris.platform.PlatformDataTransformer; +import com.volmit.iris.platform.PlatformTransformer; +import com.volmit.iris.platform.bukkit.IrisBukkit; +import org.bukkit.NamespacedKey; +import org.bukkit.WorldType; +import org.bukkit.block.Biome; + +import java.util.Arrays; +import java.util.stream.Stream; + +public class BukkitBiomeTransformer implements PlatformDataTransformer { + @Override + public Stream getRegistry() { + return Arrays.stream(Biome.values()).parallel().filter((i) -> i != Biome.CUSTOM); + } + + @Override + public NSKey getKey(Biome nativeType) { + return IrisBukkit.getInstance().getNamespaceTransformer().toIris(nativeType.getKey()); + } + + @Override + public String getTypeName() { + return "Block"; + } + + @Override + public NativeBiome toIris(Biome biome) { + PlatformTransformer transformer = IrisBukkit.getInstance().getNamespaceTransformer(); + return new NativeBiome(transformer.toIris(biome.getKey())); + } + + @Override + public Biome toNative(NativeBiome nativeBiome) { + PlatformTransformer transformer = IrisBukkit.getInstance().getNamespaceTransformer(); + return Biome.values().stream().filter((i) -> transformer.toIris(i.getKey()).equals(nativeBiome.getKey())).findFirst().get(); + } +} diff --git a/bukkit/src/main/java/com/volmit/iris/platform/bukkit/transformers/BukkitBlockDataTransformer.java b/bukkit/src/main/java/com/volmit/iris/platform/bukkit/transformers/BukkitBlockDataTransformer.java new file mode 100644 index 000000000..fe9431999 --- /dev/null +++ b/bukkit/src/main/java/com/volmit/iris/platform/bukkit/transformers/BukkitBlockDataTransformer.java @@ -0,0 +1,73 @@ +package com.volmit.iris.platform.bukkit.transformers; + +import art.arcane.amulet.util.Platform; +import com.volmit.iris.engine.object.NSKey; +import com.volmit.iris.engine.object.block.IrisBlock; +import com.volmit.iris.platform.PlatformDataTransformer; +import com.volmit.iris.platform.PlatformTransformer; +import com.volmit.iris.platform.bukkit.IrisBukkit; +import org.bukkit.Bukkit; +import org.bukkit.Material; +import org.bukkit.NamespacedKey; +import org.bukkit.block.Biome; +import org.bukkit.block.data.BlockData; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; +import java.util.stream.Stream; + +public class BukkitBlockDataTransformer implements PlatformDataTransformer { + @Override + public Stream getRegistry() { + return Arrays.stream(Material.values()).parallel().filter(Material::isBlock).map(Material::createBlockData); + } + + @Override + public NSKey getKey(BlockData nativeType) { + return IrisBukkit.getInstance().getNamespaceTransformer().toIris(nativeType.getMaterial().getKey()); + } + + @Override + public String getTypeName() { + return "Biome"; + } + + @Override + public IrisBlock toIris(BlockData blockData) { + PlatformTransformer transformer = IrisBukkit.getInstance().getNamespaceTransformer(); + + String s = blockData.getAsString(true); + + if(s.contains("[")) + { + Map properties = new HashMap<>(); + String[] props = new String[]{s.split("\\Q[\\E")[1].split("\\Q]\\E")[0]}; + String[] p; + if(props[0].contains(",")) + { + for(String i : props[0].split("\\Q,\\E")) + { + p = i.split("\\Q=\\E"); + properties.put(p[0], p[1]); + } + } + + else { + p = props[0].split("\\Q=\\E"); + properties.put(p[0], p[1]); + } + + return new IrisBlock(transformer.toIris(blockData.getMaterial().getKey()), properties); + } + + else { + return new IrisBlock(transformer.toIris(blockData.getMaterial().getKey())); + } + } + + @Override + public BlockData toNative(IrisBlock irisBlock) { + return Bukkit.createBlockData(irisBlock.toString()); + } +} diff --git a/bukkit/src/main/java/com/volmit/iris/platform/bukkit/transformers/BukkitNamespaceTransformer.java b/bukkit/src/main/java/com/volmit/iris/platform/bukkit/transformers/BukkitNamespaceTransformer.java new file mode 100644 index 000000000..162be01f9 --- /dev/null +++ b/bukkit/src/main/java/com/volmit/iris/platform/bukkit/transformers/BukkitNamespaceTransformer.java @@ -0,0 +1,17 @@ +package com.volmit.iris.platform.bukkit.transformers; + +import com.volmit.iris.engine.object.NSKey; +import com.volmit.iris.platform.PlatformTransformer; +import org.bukkit.NamespacedKey; + +public class BukkitNamespaceTransformer implements PlatformTransformer { + @Override + public NSKey toIris(NamespacedKey namespacedKey) { + return new NSKey(namespacedKey.toString()); + } + + @Override + public NamespacedKey toNative(NSKey nsKey) { + return new NamespacedKey(nsKey.getNamespace(), nsKey.getKey()); + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 000000000..41d9927a4 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..41dfb8790 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 000000000..1b6c78733 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..107acd32c --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 000000000..2a265a2be --- /dev/null +++ b/settings.gradle @@ -0,0 +1,3 @@ +rootProject.name = 'Iris' +include 'bukkit' + diff --git a/src/main/java/com/volmit/iris/engine/EngineConfiguration.java b/src/main/java/com/volmit/iris/engine/EngineConfiguration.java new file mode 100644 index 000000000..60a499d61 --- /dev/null +++ b/src/main/java/com/volmit/iris/engine/EngineConfiguration.java @@ -0,0 +1,21 @@ +package com.volmit.iris.engine; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Builder +@Data +@NoArgsConstructor +@AllArgsConstructor +public class EngineConfiguration { + @Builder.Default + private boolean mutable = false; + + @Builder.Default + private boolean timings = false; + + @Builder.Default + private int threads = 4; +} diff --git a/src/main/java/com/volmit/iris/engine/IrisEngine.java b/src/main/java/com/volmit/iris/engine/IrisEngine.java new file mode 100644 index 000000000..b2225b690 --- /dev/null +++ b/src/main/java/com/volmit/iris/engine/IrisEngine.java @@ -0,0 +1,23 @@ +package com.volmit.iris.engine; + +import com.volmit.iris.engine.registry.EngineRegistry; +import com.volmit.iris.engine.registry.PlatformRegistry; +import com.volmit.iris.platform.IrisPlatform; +import lombok.Data; + +@Data +public class IrisEngine { + private IrisPlatform platform; + private EngineRegistry registry; + private EngineConfiguration configuration; + + public IrisEngine(IrisPlatform platform, EngineConfiguration configuration) + { + this.configuration = configuration; + this.platform = platform; + this.registry = EngineRegistry.builder() + .blockRegistry(new PlatformRegistry<>(getPlatform().getBlockDataTransformer())) + .biomeRegistry(new PlatformRegistry<>(getPlatform().getBiomeTransformer())) + .build(); + } +} diff --git a/src/main/java/com/volmit/iris/engine/object/NSKey.java b/src/main/java/com/volmit/iris/engine/object/NSKey.java new file mode 100644 index 000000000..6f8d0c29c --- /dev/null +++ b/src/main/java/com/volmit/iris/engine/object/NSKey.java @@ -0,0 +1,53 @@ +package com.volmit.iris.engine.object; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; + +@Builder +@Data +public class NSKey +{ + private final String key; + + /** + * accepts dirt as minecraft:dirt + * accepts somemod:ground as somemod:ground + * @param key the key + */ + public NSKey(String key) + { + this(key.contains(":") ? key.split("\\Q:\\E")[0] : "minecraft", key.contains(":") ? key.split("\\Q:\\E")[1] : key); + } + + public NSKey(String namespace, String key) + { + this.key = namespace + ":" + key; + } + + public String getNamespace() + { + return key.split("\\Q:\\E")[0]; + } + + public String getKey() + { + return key.split("\\Q:\\E")[1]; + } + + public NSKey withKey(String key) + { + return new NSKey(getNamespace(), key); + } + + public NSKey withNamespace(String namespace) + { + return new NSKey(namespace, getKey()); + } + + @Override + public String toString() + { + return key; + } +} diff --git a/src/main/java/com/volmit/iris/engine/object/Namespaced.java b/src/main/java/com/volmit/iris/engine/object/Namespaced.java new file mode 100644 index 000000000..4916aa4cc --- /dev/null +++ b/src/main/java/com/volmit/iris/engine/object/Namespaced.java @@ -0,0 +1,5 @@ +package com.volmit.iris.engine.object; + +public interface Namespaced { + NSKey getKey(); +} diff --git a/src/main/java/com/volmit/iris/engine/object/biome/NativeBiome.java b/src/main/java/com/volmit/iris/engine/object/biome/NativeBiome.java new file mode 100644 index 000000000..a0ba79fa0 --- /dev/null +++ b/src/main/java/com/volmit/iris/engine/object/biome/NativeBiome.java @@ -0,0 +1,20 @@ +package com.volmit.iris.engine.object.biome; + +import com.volmit.iris.engine.object.Namespaced; +import com.volmit.iris.engine.object.NSKey; +import lombok.Data; + +@Data +public class NativeBiome implements Namespaced { + private final NSKey key; + + public NativeBiome(NSKey key) + { + this.key = key; + } + + public String toString() + { + return key.toString(); + } +} diff --git a/src/main/java/com/volmit/iris/engine/object/block/IrisBlock.java b/src/main/java/com/volmit/iris/engine/object/block/IrisBlock.java new file mode 100644 index 000000000..7552721ac --- /dev/null +++ b/src/main/java/com/volmit/iris/engine/object/block/IrisBlock.java @@ -0,0 +1,45 @@ +package com.volmit.iris.engine.object.block; + +import com.volmit.iris.engine.object.Namespaced; +import com.volmit.iris.engine.object.NSKey; +import lombok.Data; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +@Data +public class IrisBlock implements Namespaced { + private static final Map EMPTY_PROPERTIES = Map.of(); + private final NSKey key; + private final Map properties; + + public IrisBlock(NSKey key, Map properties) + { + this.key = key; + this.properties = Collections.unmodifiableMap(properties); + } + + public IrisBlock(NSKey key) + { + this(key, EMPTY_PROPERTIES); + } + + public IrisBlock property(String key, String value) { + Map map = new HashMap<>(getProperties()); + map.put(key, value); + return new IrisBlock(getKey(), map); + } + + public String toString() + { + StringBuilder sb = new StringBuilder(); + + for(String i : getProperties().keySet()) + { + sb.append(",").append(i).append("=").append(getProperties().get(i)); + } + + return sb.append(getKey()).append("[") + sb.append("]").substring(1); + } +} diff --git a/src/main/java/com/volmit/iris/engine/object/world/IrisWorld.java b/src/main/java/com/volmit/iris/engine/object/world/IrisWorld.java new file mode 100644 index 000000000..7ed601cd7 --- /dev/null +++ b/src/main/java/com/volmit/iris/engine/object/world/IrisWorld.java @@ -0,0 +1,6 @@ +package com.volmit.iris.engine.object.world; + +public class IrisWorld +{ + +} diff --git a/src/main/java/com/volmit/iris/engine/registry/EngineRegistry.java b/src/main/java/com/volmit/iris/engine/registry/EngineRegistry.java new file mode 100644 index 000000000..4ef686fd1 --- /dev/null +++ b/src/main/java/com/volmit/iris/engine/registry/EngineRegistry.java @@ -0,0 +1,13 @@ +package com.volmit.iris.engine.registry; + +import com.volmit.iris.engine.object.biome.NativeBiome; +import com.volmit.iris.engine.object.block.IrisBlock; +import lombok.Builder; +import lombok.Data; + +@Builder +@Data +public class EngineRegistry { + private final PlatformRegistry blockRegistry; + private final PlatformRegistry biomeRegistry; +} diff --git a/src/main/java/com/volmit/iris/engine/registry/PlatformRegistry.java b/src/main/java/com/volmit/iris/engine/registry/PlatformRegistry.java new file mode 100644 index 000000000..7e45e7442 --- /dev/null +++ b/src/main/java/com/volmit/iris/engine/registry/PlatformRegistry.java @@ -0,0 +1,43 @@ +package com.volmit.iris.engine.registry; + +import art.arcane.amulet.collections.Biset; +import art.arcane.amulet.collections.ObjectBiset; +import com.volmit.iris.engine.object.Namespaced; +import com.volmit.iris.engine.object.NSKey; +import com.volmit.iris.platform.PlatformDataTransformer; +import lombok.Data; +import lombok.Getter; + +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; + + +public class PlatformRegistry { + @Getter + private final PlatformDataTransformer transformer; + private final Map> registry; + + public PlatformRegistry(PlatformDataTransformer transformer) + { + this.transformer = transformer; + registry = transformer.getRegistry().collect(Collectors.toMap(transformer::getKey, (t) -> new RegistryValue<>(t, transformer.toIris(t)))); + d("Registered " + transformer.countSuffixName(registry.size())); + } + + public NATIVE getNative(NSKey key) { + return registry.get(key).getNativeValue(); + } + + public T get(NSKey key) { + return registry.get(key).getValue(); + } + + public Set getKeys() { + return Collections.unmodifiableSet(registry.keySet()); + } +} \ No newline at end of file diff --git a/src/main/java/com/volmit/iris/engine/registry/RegistryValue.java b/src/main/java/com/volmit/iris/engine/registry/RegistryValue.java new file mode 100644 index 000000000..94eba21fa --- /dev/null +++ b/src/main/java/com/volmit/iris/engine/registry/RegistryValue.java @@ -0,0 +1,9 @@ +package com.volmit.iris.engine.registry; + +import lombok.Data; + +@Data +public class RegistryValue { + private final NATIVE nativeValue; + private final T value; +} diff --git a/src/main/java/com/volmit/iris/platform/IrisPlatform.java b/src/main/java/com/volmit/iris/platform/IrisPlatform.java new file mode 100644 index 000000000..1775d25dd --- /dev/null +++ b/src/main/java/com/volmit/iris/platform/IrisPlatform.java @@ -0,0 +1,15 @@ +package com.volmit.iris.platform; + +import com.volmit.iris.engine.object.NSKey; +import com.volmit.iris.engine.object.biome.NativeBiome; +import com.volmit.iris.engine.object.block.IrisBlock; + +public interface IrisPlatform { + String getPlatformName(); + + PlatformTransformer getNamespaceTransformer(); + + PlatformDataTransformer getBlockDataTransformer(); + + PlatformDataTransformer getBiomeTransformer(); +} diff --git a/src/main/java/com/volmit/iris/platform/PlatformDataTransformer.java b/src/main/java/com/volmit/iris/platform/PlatformDataTransformer.java new file mode 100644 index 000000000..b3bbf4729 --- /dev/null +++ b/src/main/java/com/volmit/iris/platform/PlatformDataTransformer.java @@ -0,0 +1,29 @@ +package com.volmit.iris.platform; + +import com.volmit.iris.engine.object.Namespaced; +import com.volmit.iris.engine.object.NSKey; + +import java.text.Normalizer; +import java.util.stream.Stream; + +public interface PlatformDataTransformer extends PlatformTransformer { + default Stream getRegistryKeys() { + return getRegistry().map(this::getKey); + } + + Stream getRegistry(); + + NSKey getKey(NATIVE nativeType); + + String getTypeName(); + + default String getTypeNamePlural() + { + return getTypeName() + "s"; + } + + default String countSuffixName(int count) + { + return count + " " + (count == 1 ? getTypeName() : getTypeNamePlural()); + } +} diff --git a/src/main/java/com/volmit/iris/platform/PlatformTransformer.java b/src/main/java/com/volmit/iris/platform/PlatformTransformer.java new file mode 100644 index 000000000..6c7cb7263 --- /dev/null +++ b/src/main/java/com/volmit/iris/platform/PlatformTransformer.java @@ -0,0 +1,7 @@ +package com.volmit.iris.platform; + +public interface PlatformTransformer { + T toIris(NATIVE nativeType); + + NATIVE toNative(T t); +}