Move API to one package

2026-02-16 10:30:42 +00:00 · 2021-12-23 13:51:21 -07:00
parent 3d9d0d46fb
commit 0f50b29c4e
155 changed files with 10 additions and 51 deletions
--- a/common/api/addons/build.gradle.kts
+++ b/common/api/addons/build.gradle.kts
@@ -1,4 +0,0 @@
-dependencies {
-    shadedApi(project(":common:api:util"))
-    shadedApi("ca.solo-studios", "strata", Versions.Libraries.strata)
-}
--- a/common/api/build.gradle.kts
+++ b/common/api/build.gradle.kts
@@ -1,10 +1,11 @@
-afterEvaluate {
-    subprojects.forEach {
-        if (it != project) {
-            println("Project: ${it.name}")
-            dependencies {
-                shadedApi(it)
-            }
-        }
-    }
+dependencies {
+    shadedApi("ca.solo-studios", "strata", Versions.Libraries.strata)
+    shadedApi("org.slf4j", "slf4j-api", Versions.Libraries.slf4j)
+    shadedApi("cloud.commandframework", "cloud-core", Versions.Libraries.cloud)
+    
+    shadedApi("com.dfsek", "paralithic", Versions.Libraries.paralithic)
+    shadedApi("com.dfsek.tectonic", "common", Versions.Libraries.tectonic)
+    
+    
+    shadedImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
 }
--- a/common/api/core/build.gradle.kts
+++ b/common/api/core/build.gradle.kts
@@ -1,13 +0,0 @@
-dependencies {
-    shadedApi(project(":common:api:util"))
-    shadedApi(project(":common:api:noise"))
-    shadedApi(project(":common:api:registry"))
-    shadedApi(project(":common:api:addons"))
-    
-    shadedApi("org.slf4j", "slf4j-api", Versions.Libraries.slf4j)
-    shadedApi("cloud.commandframework", "cloud-core", Versions.Libraries.cloud)
-    
-    
-    shadedImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-}
-
--- a/common/api/inject/README.md
+++ b/common/api/inject/README.md
@@ -1,3 +0,0 @@
-# Dependency Injection
-
-A simple annotation-based dependency injection framework
--- a/common/api/inject/build.gradle.kts
+++ b/common/api/inject/build.gradle.kts
@@ -1,4 +0,0 @@
-dependencies {
-    shadedApi(project(":common:api:util"))
-}
-
--- a/common/api/noise/build.gradle.kts
+++ b/common/api/noise/build.gradle.kts
@@ -1,8 +0,0 @@
-dependencies {
-    shadedApi(project(":common:api:util"))
-    
-    shadedApi("com.dfsek", "paralithic", Versions.Libraries.paralithic)
-    
-    shadedImplementation("net.jafama", "jafama", Versions.Libraries.Internal.jafama)
-}
-
--- a/common/api/registry/build.gradle.kts
+++ b/common/api/registry/build.gradle.kts
@@ -1,4 +0,0 @@
-dependencies {
-    shadedApi(project(":common:api:util"))
-}
-
--- a/common/api/core/src/main/java/com/dfsek/terra/api/Handle.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/Handle.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/Platform.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/Platform.java
--- a/common/api/addons/src/main/java/com/dfsek/terra/api/addon/BaseAddon.java
+++ b/common/api/addons/src/main/java/com/dfsek/terra/api/addon/BaseAddon.java
--- a/common/api/addons/src/main/java/com/dfsek/terra/api/addon/bootstrap/BootstrapBaseAddon.java
+++ b/common/api/addons/src/main/java/com/dfsek/terra/api/addon/bootstrap/BootstrapBaseAddon.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/block/BlockType.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/block/BlockType.java
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/src/main/java/com/dfsek/terra/api/command/arguments/RegistryArgument.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/command/arguments/RegistryArgument.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/config/AbstractableTemplate.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/config/AbstractableTemplate.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigFactory.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigFactory.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigType.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigType.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/config/Loader.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/config/Loader.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/config/PluginConfig.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/config/PluginConfig.java
--- a/common/api/core/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
--- a/common/api/core/src/main/java/com/dfsek/terra/api/entity/CommandSender.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/entity/CommandSender.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/entity/Entity.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/entity/Entity.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/entity/EntityType.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/entity/EntityType.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/entity/Player.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/entity/Player.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/event/EventHandler.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/event/EventHandler.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/event/EventManager.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/event/EventManager.java
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/src/main/java/com/dfsek/terra/api/event/events/platform/CommandRegistrationEvent.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/event/events/platform/CommandRegistrationEvent.java
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/src/main/java/com/dfsek/terra/api/handle/ItemHandle.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/handle/ItemHandle.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java
--- a/common/api/inject/src/main/java/com/dfsek/terra/api/inject/Injector.java
+++ b/common/api/inject/src/main/java/com/dfsek/terra/api/inject/Injector.java
--- a/common/api/inject/src/main/java/com/dfsek/terra/api/inject/annotations/Inject.java
+++ b/common/api/inject/src/main/java/com/dfsek/terra/api/inject/annotations/Inject.java
--- a/common/api/inject/src/main/java/com/dfsek/terra/api/inject/exception/InjectionException.java
+++ b/common/api/inject/src/main/java/com/dfsek/terra/api/inject/exception/InjectionException.java
--- a/common/api/inject/src/main/java/com/dfsek/terra/api/inject/impl/InjectorImpl.java
+++ b/common/api/inject/src/main/java/com/dfsek/terra/api/inject/impl/InjectorImpl.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/inventory/BlockInventoryHolder.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/inventory/BlockInventoryHolder.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/inventory/Inventory.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/inventory/Inventory.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/inventory/InventoryHolder.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/inventory/InventoryHolder.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/inventory/Item.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/inventory/Item.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/inventory/ItemStack.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/inventory/ItemStack.java
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/noise/src/main/java/com/dfsek/terra/api/noise/NoiseSampler.java
+++ b/common/api/noise/src/main/java/com/dfsek/terra/api/noise/NoiseSampler.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/profiler/ProfileFrame.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/profiler/ProfileFrame.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/profiler/Profiler.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/profiler/Profiler.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/profiler/Timings.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/profiler/Timings.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/properties/Context.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/properties/Context.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/properties/Properties.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/properties/Properties.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/properties/PropertyHolder.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/properties/PropertyHolder.java
--- a/common/api/core/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
--- a/common/api/registry/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java
+++ b/common/api/registry/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java
--- a/common/api/registry/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java
+++ b/common/api/registry/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java
--- a/common/api/registry/src/main/java/com/dfsek/terra/api/registry/Registry.java
+++ b/common/api/registry/src/main/java/com/dfsek/terra/api/registry/Registry.java
--- a/common/api/registry/src/main/java/com/dfsek/terra/api/registry/exception/DuplicateEntryException.java
+++ b/common/api/registry/src/main/java/com/dfsek/terra/api/registry/exception/DuplicateEntryException.java
--- a/common/api/registry/src/main/java/com/dfsek/terra/api/registry/exception/NoSuchEntryException.java
+++ b/common/api/registry/src/main/java/com/dfsek/terra/api/registry/exception/NoSuchEntryException.java
--- a/common/api/registry/src/main/java/com/dfsek/terra/api/registry/meta/RegistryHolder.java
+++ b/common/api/registry/src/main/java/com/dfsek/terra/api/registry/meta/RegistryHolder.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/LootTable.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/LootTable.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/Structure.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/Structure.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/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
--- a/common/api/core/src/main/java/com/dfsek/terra/api/tectonic/ConfigLoadingDelegate.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/tectonic/ConfigLoadingDelegate.java
--- a/common/api/core/src/main/java/com/dfsek/terra/api/tectonic/LoaderRegistrar.java
+++ b/common/api/core/src/main/java/com/dfsek/terra/api/tectonic/LoaderRegistrar.java
--- a/Show More
+++ b/Show More