diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt b/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt index c659676e6..712cf512d 100644 --- a/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt +++ b/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt @@ -41,8 +41,8 @@ fun Project.configureDependencies() { if (project(":common:addons").subprojects.contains(this)) { // If this is an addon project, depend on the API. dependencies { - "compileOnly"(project(":common:api")) - "testImplementation"(project(":common:api")) + "compileOnly"(project(":common:api:core")) + "testImplementation"(project(":common:api:core")) } } } \ No newline at end of file diff --git a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/ManifestLoaderEntry.java b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/ManifestLoaderEntry.java new file mode 100644 index 000000000..7a3645ae5 --- /dev/null +++ b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/ManifestLoaderEntry.java @@ -0,0 +1,4 @@ +package com.dfsek.terra.addons.manifest; + +public class ManifestLoaderEntry { +} diff --git a/common/addons/manifest-addon-loader/src/main/resources/META-INF/MANIFEST.MF b/common/addons/manifest-addon-loader/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 000000000..0cd2377d6 --- /dev/null +++ b/common/addons/manifest-addon-loader/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1 @@ +Entry-Point: com.dfsek.terra.addons.manifest.ManifestLoaderEntry diff --git a/common/api/build.gradle.kts b/common/api/core/build.gradle.kts similarity index 100% rename from common/api/build.gradle.kts rename to common/api/core/build.gradle.kts diff --git a/common/api/src/main/java/com/dfsek/terra/api/Handle.java b/common/api/core/src/main/java/com/dfsek/terra/api/Handle.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/Handle.java rename to common/api/core/src/main/java/com/dfsek/terra/api/Handle.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/Logger.java b/common/api/core/src/main/java/com/dfsek/terra/api/Logger.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/Logger.java rename to common/api/core/src/main/java/com/dfsek/terra/api/Logger.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/StringIdentifiable.java b/common/api/core/src/main/java/com/dfsek/terra/api/StringIdentifiable.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/StringIdentifiable.java rename to common/api/core/src/main/java/com/dfsek/terra/api/StringIdentifiable.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/TerraPlugin.java b/common/api/core/src/main/java/com/dfsek/terra/api/TerraPlugin.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/TerraPlugin.java rename to common/api/core/src/main/java/com/dfsek/terra/api/TerraPlugin.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/addon/Addon.java b/common/api/core/src/main/java/com/dfsek/terra/api/addon/Addon.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/addon/Addon.java rename to common/api/core/src/main/java/com/dfsek/terra/api/addon/Addon.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/addon/AddonLoader.java b/common/api/core/src/main/java/com/dfsek/terra/api/addon/AddonLoader.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/addon/AddonLoader.java rename to common/api/core/src/main/java/com/dfsek/terra/api/addon/AddonLoader.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/addon/TerraAddon.java b/common/api/core/src/main/java/com/dfsek/terra/api/addon/TerraAddon.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/addon/TerraAddon.java rename to common/api/core/src/main/java/com/dfsek/terra/api/addon/TerraAddon.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/addon/annotations/Addon.java b/common/api/core/src/main/java/com/dfsek/terra/api/addon/annotations/Addon.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/addon/annotations/Addon.java rename to common/api/core/src/main/java/com/dfsek/terra/api/addon/annotations/Addon.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/addon/annotations/Author.java b/common/api/core/src/main/java/com/dfsek/terra/api/addon/annotations/Author.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/addon/annotations/Author.java rename to common/api/core/src/main/java/com/dfsek/terra/api/addon/annotations/Author.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/addon/annotations/Depends.java b/common/api/core/src/main/java/com/dfsek/terra/api/addon/annotations/Depends.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/addon/annotations/Depends.java rename to common/api/core/src/main/java/com/dfsek/terra/api/addon/annotations/Depends.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/addon/annotations/Version.java b/common/api/core/src/main/java/com/dfsek/terra/api/addon/annotations/Version.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/addon/annotations/Version.java rename to common/api/core/src/main/java/com/dfsek/terra/api/addon/annotations/Version.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/BlockType.java b/common/api/core/src/main/java/com/dfsek/terra/api/block/BlockType.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/block/BlockType.java rename to common/api/core/src/main/java/com/dfsek/terra/api/block/BlockType.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/entity/BlockEntity.java b/common/api/core/src/main/java/com/dfsek/terra/api/block/entity/BlockEntity.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/block/entity/BlockEntity.java rename to common/api/core/src/main/java/com/dfsek/terra/api/block/entity/BlockEntity.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/entity/Container.java b/common/api/core/src/main/java/com/dfsek/terra/api/block/entity/Container.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/block/entity/Container.java rename to common/api/core/src/main/java/com/dfsek/terra/api/block/entity/Container.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/entity/MobSpawner.java b/common/api/core/src/main/java/com/dfsek/terra/api/block/entity/MobSpawner.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/block/entity/MobSpawner.java rename to common/api/core/src/main/java/com/dfsek/terra/api/block/entity/MobSpawner.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/entity/SerialState.java b/common/api/core/src/main/java/com/dfsek/terra/api/block/entity/SerialState.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/block/entity/SerialState.java rename to common/api/core/src/main/java/com/dfsek/terra/api/block/entity/SerialState.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/entity/Sign.java b/common/api/core/src/main/java/com/dfsek/terra/api/block/entity/Sign.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/block/entity/Sign.java rename to common/api/core/src/main/java/com/dfsek/terra/api/block/entity/Sign.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/BlockState.java b/common/api/core/src/main/java/com/dfsek/terra/api/block/state/BlockState.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/block/state/BlockState.java rename to common/api/core/src/main/java/com/dfsek/terra/api/block/state/BlockState.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/Property.java b/common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/Property.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/block/state/properties/Property.java rename to common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/Property.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/BooleanProperty.java b/common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/base/BooleanProperty.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/BooleanProperty.java rename to common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/base/BooleanProperty.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/EnumProperty.java b/common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/base/EnumProperty.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/EnumProperty.java rename to common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/base/EnumProperty.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/IntProperty.java b/common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/base/IntProperty.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/IntProperty.java rename to common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/base/IntProperty.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/Properties.java b/common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/base/Properties.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/block/state/properties/base/Properties.java rename to common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/base/Properties.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Axis.java b/common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Axis.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Axis.java rename to common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Axis.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Direction.java b/common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Direction.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Direction.java rename to common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Direction.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Half.java b/common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Half.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Half.java rename to common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/enums/Half.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/RailShape.java b/common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/enums/RailShape.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/RailShape.java rename to common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/enums/RailShape.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/RedstoneConnection.java b/common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/enums/RedstoneConnection.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/RedstoneConnection.java rename to common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/enums/RedstoneConnection.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/WallHeight.java b/common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/enums/WallHeight.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/block/state/properties/enums/WallHeight.java rename to common/api/core/src/main/java/com/dfsek/terra/api/block/state/properties/enums/WallHeight.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/command/CommandManager.java b/common/api/core/src/main/java/com/dfsek/terra/api/command/CommandManager.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/command/CommandManager.java rename to common/api/core/src/main/java/com/dfsek/terra/api/command/CommandManager.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/command/CommandTemplate.java b/common/api/core/src/main/java/com/dfsek/terra/api/command/CommandTemplate.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/command/CommandTemplate.java rename to common/api/core/src/main/java/com/dfsek/terra/api/command/CommandTemplate.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/command/annotation/Argument.java b/common/api/core/src/main/java/com/dfsek/terra/api/command/annotation/Argument.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/command/annotation/Argument.java rename to common/api/core/src/main/java/com/dfsek/terra/api/command/annotation/Argument.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/command/annotation/Command.java b/common/api/core/src/main/java/com/dfsek/terra/api/command/annotation/Command.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/command/annotation/Command.java rename to common/api/core/src/main/java/com/dfsek/terra/api/command/annotation/Command.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/command/annotation/Subcommand.java b/common/api/core/src/main/java/com/dfsek/terra/api/command/annotation/Subcommand.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/command/annotation/Subcommand.java rename to common/api/core/src/main/java/com/dfsek/terra/api/command/annotation/Subcommand.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/command/annotation/Switch.java b/common/api/core/src/main/java/com/dfsek/terra/api/command/annotation/Switch.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/command/annotation/Switch.java rename to common/api/core/src/main/java/com/dfsek/terra/api/command/annotation/Switch.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/command/annotation/inject/ArgumentTarget.java b/common/api/core/src/main/java/com/dfsek/terra/api/command/annotation/inject/ArgumentTarget.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/command/annotation/inject/ArgumentTarget.java rename to common/api/core/src/main/java/com/dfsek/terra/api/command/annotation/inject/ArgumentTarget.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/command/annotation/inject/SwitchTarget.java b/common/api/core/src/main/java/com/dfsek/terra/api/command/annotation/inject/SwitchTarget.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/command/annotation/inject/SwitchTarget.java rename to common/api/core/src/main/java/com/dfsek/terra/api/command/annotation/inject/SwitchTarget.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/command/annotation/type/DebugCommand.java b/common/api/core/src/main/java/com/dfsek/terra/api/command/annotation/type/DebugCommand.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/command/annotation/type/DebugCommand.java rename to common/api/core/src/main/java/com/dfsek/terra/api/command/annotation/type/DebugCommand.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/command/annotation/type/PlayerCommand.java b/common/api/core/src/main/java/com/dfsek/terra/api/command/annotation/type/PlayerCommand.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/command/annotation/type/PlayerCommand.java rename to common/api/core/src/main/java/com/dfsek/terra/api/command/annotation/type/PlayerCommand.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/command/annotation/type/WorldCommand.java b/common/api/core/src/main/java/com/dfsek/terra/api/command/annotation/type/WorldCommand.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/command/annotation/type/WorldCommand.java rename to common/api/core/src/main/java/com/dfsek/terra/api/command/annotation/type/WorldCommand.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/command/arg/ArgumentParser.java b/common/api/core/src/main/java/com/dfsek/terra/api/command/arg/ArgumentParser.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/command/arg/ArgumentParser.java rename to common/api/core/src/main/java/com/dfsek/terra/api/command/arg/ArgumentParser.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/command/arg/DoubleArgumentParser.java b/common/api/core/src/main/java/com/dfsek/terra/api/command/arg/DoubleArgumentParser.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/command/arg/DoubleArgumentParser.java rename to common/api/core/src/main/java/com/dfsek/terra/api/command/arg/DoubleArgumentParser.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/command/arg/IntegerArgumentParser.java b/common/api/core/src/main/java/com/dfsek/terra/api/command/arg/IntegerArgumentParser.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/command/arg/IntegerArgumentParser.java rename to common/api/core/src/main/java/com/dfsek/terra/api/command/arg/IntegerArgumentParser.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/command/arg/StringArgumentParser.java b/common/api/core/src/main/java/com/dfsek/terra/api/command/arg/StringArgumentParser.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/command/arg/StringArgumentParser.java rename to common/api/core/src/main/java/com/dfsek/terra/api/command/arg/StringArgumentParser.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/command/exception/CommandException.java b/common/api/core/src/main/java/com/dfsek/terra/api/command/exception/CommandException.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/command/exception/CommandException.java rename to common/api/core/src/main/java/com/dfsek/terra/api/command/exception/CommandException.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/command/exception/ExecutionException.java b/common/api/core/src/main/java/com/dfsek/terra/api/command/exception/ExecutionException.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/command/exception/ExecutionException.java rename to common/api/core/src/main/java/com/dfsek/terra/api/command/exception/ExecutionException.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/command/exception/InvalidArgumentsException.java b/common/api/core/src/main/java/com/dfsek/terra/api/command/exception/InvalidArgumentsException.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/command/exception/InvalidArgumentsException.java rename to common/api/core/src/main/java/com/dfsek/terra/api/command/exception/InvalidArgumentsException.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/command/exception/MalformedCommandException.java b/common/api/core/src/main/java/com/dfsek/terra/api/command/exception/MalformedCommandException.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/command/exception/MalformedCommandException.java rename to common/api/core/src/main/java/com/dfsek/terra/api/command/exception/MalformedCommandException.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/command/exception/SwitchFormatException.java b/common/api/core/src/main/java/com/dfsek/terra/api/command/exception/SwitchFormatException.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/command/exception/SwitchFormatException.java rename to common/api/core/src/main/java/com/dfsek/terra/api/command/exception/SwitchFormatException.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/command/tab/NothingCompleter.java b/common/api/core/src/main/java/com/dfsek/terra/api/command/tab/NothingCompleter.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/command/tab/NothingCompleter.java rename to common/api/core/src/main/java/com/dfsek/terra/api/command/tab/NothingCompleter.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/command/tab/TabCompleter.java b/common/api/core/src/main/java/com/dfsek/terra/api/command/tab/TabCompleter.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/command/tab/TabCompleter.java rename to common/api/core/src/main/java/com/dfsek/terra/api/command/tab/TabCompleter.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/config/AbstractableTemplate.java b/common/api/core/src/main/java/com/dfsek/terra/api/config/AbstractableTemplate.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/config/AbstractableTemplate.java rename to common/api/core/src/main/java/com/dfsek/terra/api/config/AbstractableTemplate.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/config/ConfigFactory.java b/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigFactory.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/config/ConfigFactory.java rename to common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigFactory.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/config/ConfigPack.java b/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/config/ConfigPack.java rename to common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/config/ConfigType.java b/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigType.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/config/ConfigType.java rename to common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigType.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/config/Loader.java b/common/api/core/src/main/java/com/dfsek/terra/api/config/Loader.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/config/Loader.java rename to common/api/core/src/main/java/com/dfsek/terra/api/config/Loader.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/config/PluginConfig.java b/common/api/core/src/main/java/com/dfsek/terra/api/config/PluginConfig.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/config/PluginConfig.java rename to common/api/core/src/main/java/com/dfsek/terra/api/config/PluginConfig.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/config/WorldConfig.java b/common/api/core/src/main/java/com/dfsek/terra/api/config/WorldConfig.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/config/WorldConfig.java rename to common/api/core/src/main/java/com/dfsek/terra/api/config/WorldConfig.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/config/meta/Meta.java b/common/api/core/src/main/java/com/dfsek/terra/api/config/meta/Meta.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/config/meta/Meta.java rename to common/api/core/src/main/java/com/dfsek/terra/api/config/meta/Meta.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/entity/CommandSender.java b/common/api/core/src/main/java/com/dfsek/terra/api/entity/CommandSender.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/entity/CommandSender.java rename to common/api/core/src/main/java/com/dfsek/terra/api/entity/CommandSender.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/entity/Entity.java b/common/api/core/src/main/java/com/dfsek/terra/api/entity/Entity.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/entity/Entity.java rename to common/api/core/src/main/java/com/dfsek/terra/api/entity/Entity.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/entity/EntityType.java b/common/api/core/src/main/java/com/dfsek/terra/api/entity/EntityType.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/entity/EntityType.java rename to common/api/core/src/main/java/com/dfsek/terra/api/entity/EntityType.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/entity/Player.java b/common/api/core/src/main/java/com/dfsek/terra/api/entity/Player.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/entity/Player.java rename to common/api/core/src/main/java/com/dfsek/terra/api/entity/Player.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/EventHandler.java b/common/api/core/src/main/java/com/dfsek/terra/api/event/EventHandler.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/event/EventHandler.java rename to common/api/core/src/main/java/com/dfsek/terra/api/event/EventHandler.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/EventManager.java b/common/api/core/src/main/java/com/dfsek/terra/api/event/EventManager.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/event/EventManager.java rename to common/api/core/src/main/java/com/dfsek/terra/api/event/EventManager.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/AbstractCancellable.java b/common/api/core/src/main/java/com/dfsek/terra/api/event/events/AbstractCancellable.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/event/events/AbstractCancellable.java rename to common/api/core/src/main/java/com/dfsek/terra/api/event/events/AbstractCancellable.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/Cancellable.java b/common/api/core/src/main/java/com/dfsek/terra/api/event/events/Cancellable.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/event/events/Cancellable.java rename to common/api/core/src/main/java/com/dfsek/terra/api/event/events/Cancellable.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/Event.java b/common/api/core/src/main/java/com/dfsek/terra/api/event/events/Event.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/event/events/Event.java rename to common/api/core/src/main/java/com/dfsek/terra/api/event/events/Event.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/FailThroughEvent.java b/common/api/core/src/main/java/com/dfsek/terra/api/event/events/FailThroughEvent.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/event/events/FailThroughEvent.java rename to common/api/core/src/main/java/com/dfsek/terra/api/event/events/FailThroughEvent.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/PackEvent.java b/common/api/core/src/main/java/com/dfsek/terra/api/event/events/PackEvent.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/event/events/PackEvent.java rename to common/api/core/src/main/java/com/dfsek/terra/api/event/events/PackEvent.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigurationDiscoveryEvent.java b/common/api/core/src/main/java/com/dfsek/terra/api/event/events/config/ConfigurationDiscoveryEvent.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigurationDiscoveryEvent.java rename to common/api/core/src/main/java/com/dfsek/terra/api/event/events/config/ConfigurationDiscoveryEvent.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigurationLoadEvent.java b/common/api/core/src/main/java/com/dfsek/terra/api/event/events/config/ConfigurationLoadEvent.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigurationLoadEvent.java rename to common/api/core/src/main/java/com/dfsek/terra/api/event/events/config/ConfigurationLoadEvent.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/pack/ConfigPackLoadEvent.java b/common/api/core/src/main/java/com/dfsek/terra/api/event/events/config/pack/ConfigPackLoadEvent.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/event/events/config/pack/ConfigPackLoadEvent.java rename to common/api/core/src/main/java/com/dfsek/terra/api/event/events/config/pack/ConfigPackLoadEvent.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/pack/ConfigPackPostLoadEvent.java b/common/api/core/src/main/java/com/dfsek/terra/api/event/events/config/pack/ConfigPackPostLoadEvent.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/event/events/config/pack/ConfigPackPostLoadEvent.java rename to common/api/core/src/main/java/com/dfsek/terra/api/event/events/config/pack/ConfigPackPostLoadEvent.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/pack/ConfigPackPreLoadEvent.java b/common/api/core/src/main/java/com/dfsek/terra/api/event/events/config/pack/ConfigPackPreLoadEvent.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/event/events/config/pack/ConfigPackPreLoadEvent.java rename to common/api/core/src/main/java/com/dfsek/terra/api/event/events/config/pack/ConfigPackPreLoadEvent.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypeLoadEvent.java b/common/api/core/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypeLoadEvent.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypeLoadEvent.java rename to common/api/core/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypeLoadEvent.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypePostLoadEvent.java b/common/api/core/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypePostLoadEvent.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypePostLoadEvent.java rename to common/api/core/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypePostLoadEvent.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypePreLoadEvent.java b/common/api/core/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypePreLoadEvent.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypePreLoadEvent.java rename to common/api/core/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypePreLoadEvent.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/platform/PlatformInitializationEvent.java b/common/api/core/src/main/java/com/dfsek/terra/api/event/events/platform/PlatformInitializationEvent.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/event/events/platform/PlatformInitializationEvent.java rename to common/api/core/src/main/java/com/dfsek/terra/api/event/events/platform/PlatformInitializationEvent.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/EntitySpawnEvent.java b/common/api/core/src/main/java/com/dfsek/terra/api/event/events/world/generation/EntitySpawnEvent.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/EntitySpawnEvent.java rename to common/api/core/src/main/java/com/dfsek/terra/api/event/events/world/generation/EntitySpawnEvent.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java b/common/api/core/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java rename to common/api/core/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/functional/EventContext.java b/common/api/core/src/main/java/com/dfsek/terra/api/event/functional/EventContext.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/event/functional/EventContext.java rename to common/api/core/src/main/java/com/dfsek/terra/api/event/functional/EventContext.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/functional/FunctionalEventHandler.java b/common/api/core/src/main/java/com/dfsek/terra/api/event/functional/FunctionalEventHandler.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/event/functional/FunctionalEventHandler.java rename to common/api/core/src/main/java/com/dfsek/terra/api/event/functional/FunctionalEventHandler.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/handle/ItemHandle.java b/common/api/core/src/main/java/com/dfsek/terra/api/handle/ItemHandle.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/handle/ItemHandle.java rename to common/api/core/src/main/java/com/dfsek/terra/api/handle/ItemHandle.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java b/common/api/core/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java rename to common/api/core/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/injection/Injector.java b/common/api/core/src/main/java/com/dfsek/terra/api/injection/Injector.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/injection/Injector.java rename to common/api/core/src/main/java/com/dfsek/terra/api/injection/Injector.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/injection/annotations/Inject.java b/common/api/core/src/main/java/com/dfsek/terra/api/injection/annotations/Inject.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/injection/annotations/Inject.java rename to common/api/core/src/main/java/com/dfsek/terra/api/injection/annotations/Inject.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/injection/exception/InjectionException.java b/common/api/core/src/main/java/com/dfsek/terra/api/injection/exception/InjectionException.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/injection/exception/InjectionException.java rename to common/api/core/src/main/java/com/dfsek/terra/api/injection/exception/InjectionException.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/inventory/BlockInventoryHolder.java b/common/api/core/src/main/java/com/dfsek/terra/api/inventory/BlockInventoryHolder.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/inventory/BlockInventoryHolder.java rename to common/api/core/src/main/java/com/dfsek/terra/api/inventory/BlockInventoryHolder.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/inventory/Inventory.java b/common/api/core/src/main/java/com/dfsek/terra/api/inventory/Inventory.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/inventory/Inventory.java rename to common/api/core/src/main/java/com/dfsek/terra/api/inventory/Inventory.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/inventory/InventoryHolder.java b/common/api/core/src/main/java/com/dfsek/terra/api/inventory/InventoryHolder.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/inventory/InventoryHolder.java rename to common/api/core/src/main/java/com/dfsek/terra/api/inventory/InventoryHolder.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/inventory/Item.java b/common/api/core/src/main/java/com/dfsek/terra/api/inventory/Item.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/inventory/Item.java rename to common/api/core/src/main/java/com/dfsek/terra/api/inventory/Item.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/inventory/ItemStack.java b/common/api/core/src/main/java/com/dfsek/terra/api/inventory/ItemStack.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/inventory/ItemStack.java rename to common/api/core/src/main/java/com/dfsek/terra/api/inventory/ItemStack.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/inventory/item/Damageable.java b/common/api/core/src/main/java/com/dfsek/terra/api/inventory/item/Damageable.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/inventory/item/Damageable.java rename to common/api/core/src/main/java/com/dfsek/terra/api/inventory/item/Damageable.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/inventory/item/Enchantment.java b/common/api/core/src/main/java/com/dfsek/terra/api/inventory/item/Enchantment.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/inventory/item/Enchantment.java rename to common/api/core/src/main/java/com/dfsek/terra/api/inventory/item/Enchantment.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/inventory/item/ItemMeta.java b/common/api/core/src/main/java/com/dfsek/terra/api/inventory/item/ItemMeta.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/inventory/item/ItemMeta.java rename to common/api/core/src/main/java/com/dfsek/terra/api/inventory/item/ItemMeta.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/lang/Language.java b/common/api/core/src/main/java/com/dfsek/terra/api/lang/Language.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/lang/Language.java rename to common/api/core/src/main/java/com/dfsek/terra/api/lang/Language.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/lang/Message.java b/common/api/core/src/main/java/com/dfsek/terra/api/lang/Message.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/lang/Message.java rename to common/api/core/src/main/java/com/dfsek/terra/api/lang/Message.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/noise/NoiseSampler.java b/common/api/core/src/main/java/com/dfsek/terra/api/noise/NoiseSampler.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/noise/NoiseSampler.java rename to common/api/core/src/main/java/com/dfsek/terra/api/noise/NoiseSampler.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/profiler/ProfileFrame.java b/common/api/core/src/main/java/com/dfsek/terra/api/profiler/ProfileFrame.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/profiler/ProfileFrame.java rename to common/api/core/src/main/java/com/dfsek/terra/api/profiler/ProfileFrame.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/profiler/Profiler.java b/common/api/core/src/main/java/com/dfsek/terra/api/profiler/Profiler.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/profiler/Profiler.java rename to common/api/core/src/main/java/com/dfsek/terra/api/profiler/Profiler.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/profiler/Timings.java b/common/api/core/src/main/java/com/dfsek/terra/api/profiler/Timings.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/profiler/Timings.java rename to common/api/core/src/main/java/com/dfsek/terra/api/profiler/Timings.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/properties/Context.java b/common/api/core/src/main/java/com/dfsek/terra/api/properties/Context.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/properties/Context.java rename to common/api/core/src/main/java/com/dfsek/terra/api/properties/Context.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/properties/Properties.java b/common/api/core/src/main/java/com/dfsek/terra/api/properties/Properties.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/properties/Properties.java rename to common/api/core/src/main/java/com/dfsek/terra/api/properties/Properties.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/properties/PropertyHolder.java b/common/api/core/src/main/java/com/dfsek/terra/api/properties/PropertyHolder.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/properties/PropertyHolder.java rename to common/api/core/src/main/java/com/dfsek/terra/api/properties/PropertyHolder.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/properties/annotations/Linked.java b/common/api/core/src/main/java/com/dfsek/terra/api/properties/annotations/Linked.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/properties/annotations/Linked.java rename to common/api/core/src/main/java/com/dfsek/terra/api/properties/annotations/Linked.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java b/common/api/core/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java rename to common/api/core/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java b/common/api/core/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java rename to common/api/core/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/registry/Registry.java b/common/api/core/src/main/java/com/dfsek/terra/api/registry/Registry.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/registry/Registry.java rename to common/api/core/src/main/java/com/dfsek/terra/api/registry/Registry.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/registry/exception/DuplicateEntryException.java b/common/api/core/src/main/java/com/dfsek/terra/api/registry/exception/DuplicateEntryException.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/registry/exception/DuplicateEntryException.java rename to common/api/core/src/main/java/com/dfsek/terra/api/registry/exception/DuplicateEntryException.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/registry/meta/RegistryFactory.java b/common/api/core/src/main/java/com/dfsek/terra/api/registry/meta/RegistryFactory.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/registry/meta/RegistryFactory.java rename to common/api/core/src/main/java/com/dfsek/terra/api/registry/meta/RegistryFactory.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/registry/meta/RegistryHolder.java b/common/api/core/src/main/java/com/dfsek/terra/api/registry/meta/RegistryHolder.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/registry/meta/RegistryHolder.java rename to common/api/core/src/main/java/com/dfsek/terra/api/registry/meta/RegistryHolder.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/LootTable.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/LootTable.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/structure/LootTable.java rename to common/api/core/src/main/java/com/dfsek/terra/api/structure/LootTable.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/Structure.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/Structure.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/structure/Structure.java rename to common/api/core/src/main/java/com/dfsek/terra/api/structure/Structure.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java rename to common/api/core/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/buffer/Buffer.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/Buffer.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/structure/buffer/Buffer.java rename to common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/Buffer.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/buffer/BufferedItem.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/BufferedItem.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/structure/buffer/BufferedItem.java rename to common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/BufferedItem.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java rename to common/api/core/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/feature/BinaryColumn.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/feature/BinaryColumn.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/structure/feature/BinaryColumn.java rename to common/api/core/src/main/java/com/dfsek/terra/api/structure/feature/BinaryColumn.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Distributor.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/feature/Distributor.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/structure/feature/Distributor.java rename to common/api/core/src/main/java/com/dfsek/terra/api/structure/feature/Distributor.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Feature.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/feature/Feature.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/structure/feature/Feature.java rename to common/api/core/src/main/java/com/dfsek/terra/api/structure/feature/Feature.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/feature/Locator.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/feature/Locator.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/structure/feature/Locator.java rename to common/api/core/src/main/java/com/dfsek/terra/api/structure/feature/Locator.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/rotation/Rotation.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/rotation/Rotation.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/structure/rotation/Rotation.java rename to common/api/core/src/main/java/com/dfsek/terra/api/structure/rotation/Rotation.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/tectonic/LoaderHolder.java b/common/api/core/src/main/java/com/dfsek/terra/api/tectonic/LoaderHolder.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/tectonic/LoaderHolder.java rename to common/api/core/src/main/java/com/dfsek/terra/api/tectonic/LoaderHolder.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/tectonic/LoaderRegistrar.java b/common/api/core/src/main/java/com/dfsek/terra/api/tectonic/LoaderRegistrar.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/tectonic/LoaderRegistrar.java rename to common/api/core/src/main/java/com/dfsek/terra/api/tectonic/LoaderRegistrar.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/transform/Transform.java b/common/api/core/src/main/java/com/dfsek/terra/api/transform/Transform.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/transform/Transform.java rename to common/api/core/src/main/java/com/dfsek/terra/api/transform/Transform.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/transform/Transformer.java b/common/api/core/src/main/java/com/dfsek/terra/api/transform/Transformer.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/transform/Transformer.java rename to common/api/core/src/main/java/com/dfsek/terra/api/transform/Transformer.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/transform/Validator.java b/common/api/core/src/main/java/com/dfsek/terra/api/transform/Validator.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/transform/Validator.java rename to common/api/core/src/main/java/com/dfsek/terra/api/transform/Validator.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/transform/exception/AttemptsFailedException.java b/common/api/core/src/main/java/com/dfsek/terra/api/transform/exception/AttemptsFailedException.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/transform/exception/AttemptsFailedException.java rename to common/api/core/src/main/java/com/dfsek/terra/api/transform/exception/AttemptsFailedException.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/transform/exception/TransformException.java b/common/api/core/src/main/java/com/dfsek/terra/api/transform/exception/TransformException.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/transform/exception/TransformException.java rename to common/api/core/src/main/java/com/dfsek/terra/api/transform/exception/TransformException.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/ConstantRange.java b/common/api/core/src/main/java/com/dfsek/terra/api/util/ConstantRange.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/util/ConstantRange.java rename to common/api/core/src/main/java/com/dfsek/terra/api/util/ConstantRange.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/MathUtil.java b/common/api/core/src/main/java/com/dfsek/terra/api/util/MathUtil.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/util/MathUtil.java rename to common/api/core/src/main/java/com/dfsek/terra/api/util/MathUtil.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/PopulationUtil.java b/common/api/core/src/main/java/com/dfsek/terra/api/util/PopulationUtil.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/util/PopulationUtil.java rename to common/api/core/src/main/java/com/dfsek/terra/api/util/PopulationUtil.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/Range.java b/common/api/core/src/main/java/com/dfsek/terra/api/util/Range.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/util/Range.java rename to common/api/core/src/main/java/com/dfsek/terra/api/util/Range.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/RotationUtil.java b/common/api/core/src/main/java/com/dfsek/terra/api/util/RotationUtil.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/util/RotationUtil.java rename to common/api/core/src/main/java/com/dfsek/terra/api/util/RotationUtil.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/collection/MaterialSet.java b/common/api/core/src/main/java/com/dfsek/terra/api/util/collection/MaterialSet.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/util/collection/MaterialSet.java rename to common/api/core/src/main/java/com/dfsek/terra/api/util/collection/MaterialSet.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/collection/ProbabilityCollection.java b/common/api/core/src/main/java/com/dfsek/terra/api/util/collection/ProbabilityCollection.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/util/collection/ProbabilityCollection.java rename to common/api/core/src/main/java/com/dfsek/terra/api/util/collection/ProbabilityCollection.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/generic/Construct.java b/common/api/core/src/main/java/com/dfsek/terra/api/util/generic/Construct.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/util/generic/Construct.java rename to common/api/core/src/main/java/com/dfsek/terra/api/util/generic/Construct.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/generic/Lazy.java b/common/api/core/src/main/java/com/dfsek/terra/api/util/generic/Lazy.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/util/generic/Lazy.java rename to common/api/core/src/main/java/com/dfsek/terra/api/util/generic/Lazy.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/generic/either/Either.java b/common/api/core/src/main/java/com/dfsek/terra/api/util/generic/either/Either.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/util/generic/either/Either.java rename to common/api/core/src/main/java/com/dfsek/terra/api/util/generic/either/Either.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/generic/pair/ImmutablePair.java b/common/api/core/src/main/java/com/dfsek/terra/api/util/generic/pair/ImmutablePair.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/util/generic/pair/ImmutablePair.java rename to common/api/core/src/main/java/com/dfsek/terra/api/util/generic/pair/ImmutablePair.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/generic/pair/Pair.java b/common/api/core/src/main/java/com/dfsek/terra/api/util/generic/pair/Pair.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/util/generic/pair/Pair.java rename to common/api/core/src/main/java/com/dfsek/terra/api/util/generic/pair/Pair.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableBoolean.java b/common/api/core/src/main/java/com/dfsek/terra/api/util/mutable/MutableBoolean.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableBoolean.java rename to common/api/core/src/main/java/com/dfsek/terra/api/util/mutable/MutableBoolean.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableDouble.java b/common/api/core/src/main/java/com/dfsek/terra/api/util/mutable/MutableDouble.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableDouble.java rename to common/api/core/src/main/java/com/dfsek/terra/api/util/mutable/MutableDouble.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableInteger.java b/common/api/core/src/main/java/com/dfsek/terra/api/util/mutable/MutableInteger.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableInteger.java rename to common/api/core/src/main/java/com/dfsek/terra/api/util/mutable/MutableInteger.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableNumber.java b/common/api/core/src/main/java/com/dfsek/terra/api/util/mutable/MutableNumber.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableNumber.java rename to common/api/core/src/main/java/com/dfsek/terra/api/util/mutable/MutableNumber.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutablePrimitive.java b/common/api/core/src/main/java/com/dfsek/terra/api/util/mutable/MutablePrimitive.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutablePrimitive.java rename to common/api/core/src/main/java/com/dfsek/terra/api/util/mutable/MutablePrimitive.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/mutable/package-info.java b/common/api/core/src/main/java/com/dfsek/terra/api/util/mutable/package-info.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/util/mutable/package-info.java rename to common/api/core/src/main/java/com/dfsek/terra/api/util/mutable/package-info.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/reflection/ReflectionUtil.java b/common/api/core/src/main/java/com/dfsek/terra/api/util/reflection/ReflectionUtil.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/util/reflection/ReflectionUtil.java rename to common/api/core/src/main/java/com/dfsek/terra/api/util/reflection/ReflectionUtil.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/reflection/TypeKey.java b/common/api/core/src/main/java/com/dfsek/terra/api/util/reflection/TypeKey.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/util/reflection/TypeKey.java rename to common/api/core/src/main/java/com/dfsek/terra/api/util/reflection/TypeKey.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/vector/Vector2.java b/common/api/core/src/main/java/com/dfsek/terra/api/vector/Vector2.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/vector/Vector2.java rename to common/api/core/src/main/java/com/dfsek/terra/api/vector/Vector2.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/vector/Vector3.java b/common/api/core/src/main/java/com/dfsek/terra/api/vector/Vector3.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/vector/Vector3.java rename to common/api/core/src/main/java/com/dfsek/terra/api/vector/Vector3.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/BiomeGrid.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/BiomeGrid.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/world/BiomeGrid.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/BiomeGrid.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/Carver.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/Carver.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/world/Carver.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/Carver.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/Chunk.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/Chunk.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/world/Chunk.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/Chunk.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/ChunkAccess.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/ChunkAccess.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/world/ChunkAccess.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/ChunkAccess.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/Column.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/Column.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/world/Column.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/Column.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/Flora.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/Flora.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/world/Flora.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/Flora.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/Tree.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/Tree.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/world/Tree.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/Tree.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/World.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/World.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/world/World.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/World.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/biome/Biome.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/biome/Biome.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/world/biome/Biome.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/biome/Biome.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/biome/GenerationSettings.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/biome/GenerationSettings.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/world/biome/GenerationSettings.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/biome/GenerationSettings.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/biome/PaletteSettings.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/biome/PaletteSettings.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/world/biome/PaletteSettings.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/biome/PaletteSettings.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/biome/TerraBiome.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/biome/TerraBiome.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/world/biome/TerraBiome.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/biome/TerraBiome.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/generator/ChunkData.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/ChunkData.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/world/generator/ChunkData.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/generator/ChunkData.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/generator/ChunkGenerator.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/ChunkGenerator.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/world/generator/ChunkGenerator.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/generator/ChunkGenerator.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/generator/ChunkGeneratorProvider.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/ChunkGeneratorProvider.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/world/generator/ChunkGeneratorProvider.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/generator/ChunkGeneratorProvider.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/generator/ChunkInterpolator.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/ChunkInterpolator.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/world/generator/ChunkInterpolator.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/generator/ChunkInterpolator.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/generator/Chunkified.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/Chunkified.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/world/generator/Chunkified.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/generator/Chunkified.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/generator/GenerationStage.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/GenerationStage.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/world/generator/GenerationStage.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/generator/GenerationStage.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/generator/GenerationStageProvider.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/GenerationStageProvider.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/world/generator/GenerationStageProvider.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/generator/GenerationStageProvider.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/generator/GeneratorWrapper.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/GeneratorWrapper.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/world/generator/GeneratorWrapper.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/generator/GeneratorWrapper.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/generator/Palette.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/Palette.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/world/generator/Palette.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/generator/Palette.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/generator/Sampler.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/Sampler.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/world/generator/Sampler.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/generator/Sampler.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/generator/SamplerCache.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/SamplerCache.java similarity index 100% rename from common/api/src/main/java/com/dfsek/terra/api/world/generator/SamplerCache.java rename to common/api/core/src/main/java/com/dfsek/terra/api/world/generator/SamplerCache.java diff --git a/common/implementation/build.gradle.kts b/common/implementation/build.gradle.kts index 299324611..6173da7e3 100644 --- a/common/implementation/build.gradle.kts +++ b/common/implementation/build.gradle.kts @@ -1,5 +1,5 @@ dependencies { - "shadedApi"(project(":common:api")) + "shadedApi"(project(":common:api:core")) "shadedApi"(project(":common:loader:config")) "shadedApi"(project(":common:loader:addon")) diff --git a/common/loader/addon/build.gradle.kts b/common/loader/addon/build.gradle.kts index e4239d784..f2cb9058c 100644 --- a/common/loader/addon/build.gradle.kts +++ b/common/loader/addon/build.gradle.kts @@ -1,3 +1,3 @@ dependencies { - "shadedApi"(project(":common:api")) + "shadedApi"(project(":common:api:core")) } diff --git a/common/loader/config/build.gradle.kts b/common/loader/config/build.gradle.kts index e4239d784..f2cb9058c 100644 --- a/common/loader/config/build.gradle.kts +++ b/common/loader/config/build.gradle.kts @@ -1,3 +1,3 @@ dependencies { - "shadedApi"(project(":common:api")) + "shadedApi"(project(":common:api:core")) } diff --git a/settings.gradle.kts b/settings.gradle.kts index ac19ff704..4a7b3993d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,6 +1,5 @@ rootProject.name = "Terra" -include("common:api") include("common:implementation") include("common:loader:config") @@ -15,6 +14,8 @@ fun includeImmediateChildren(dir: File, type: String) { } } +includeImmediateChildren(file("common/api"), "API") + includeImmediateChildren(file("common/addons"), "addon") includeImmediateChildren(file("platforms"), "platform")