From 9715171abace17aec500d7201ab084d734c9758a Mon Sep 17 00:00:00 2001 From: dfsek Date: Tue, 9 Nov 2021 23:49:49 -0700 Subject: [PATCH] move registry api to new module --- common/addons/config-noise-function | 2 +- common/api/core/build.gradle.kts | 1 + common/api/registry/build.gradle.kts | 6 ++++++ .../java/com/dfsek/terra/api/registry/CheckedRegistry.java | 0 .../java/com/dfsek/terra/api/registry/OpenRegistry.java | 0 .../main/java/com/dfsek/terra/api/registry/Registry.java | 0 .../api/registry/exception/DuplicateEntryException.java | 0 .../com/dfsek/terra/api/registry/meta/RegistryFactory.java | 0 .../com/dfsek/terra/api/registry/meta/RegistryHolder.java | 0 .../java/com/dfsek/terra/registry/OpenRegistryImpl.java | 2 -- .../src/main/java/com/dfsek/terra/StandalonePlugin.java | 4 ++-- 11 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 common/api/registry/build.gradle.kts rename common/api/{core => registry}/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java (100%) rename common/api/{core => registry}/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java (100%) rename common/api/{core => registry}/src/main/java/com/dfsek/terra/api/registry/Registry.java (100%) rename common/api/{core => registry}/src/main/java/com/dfsek/terra/api/registry/exception/DuplicateEntryException.java (100%) rename common/api/{core => registry}/src/main/java/com/dfsek/terra/api/registry/meta/RegistryFactory.java (100%) rename common/api/{core => registry}/src/main/java/com/dfsek/terra/api/registry/meta/RegistryHolder.java (100%) diff --git a/common/addons/config-noise-function b/common/addons/config-noise-function index dadffdfa4..5032f2b9e 160000 --- a/common/addons/config-noise-function +++ b/common/addons/config-noise-function @@ -1 +1 @@ -Subproject commit dadffdfa46d743bcd1a45cd2ff3b4b9c2f401d5e +Subproject commit 5032f2b9eac7a7dbf79d4a50cf90306efd0fee27 diff --git a/common/api/core/build.gradle.kts b/common/api/core/build.gradle.kts index 974fd5097..dd0447e2c 100644 --- a/common/api/core/build.gradle.kts +++ b/common/api/core/build.gradle.kts @@ -1,6 +1,7 @@ dependencies { "shadedApi"(project(":common:api:util")) "shadedApi"(project(":common:api:noise")) + "shadedApi"(project(":common:api:registry")) "shadedApi"("com.dfsek:Paralithic:0.5.0") diff --git a/common/api/registry/build.gradle.kts b/common/api/registry/build.gradle.kts new file mode 100644 index 000000000..5e4da02be --- /dev/null +++ b/common/api/registry/build.gradle.kts @@ -0,0 +1,6 @@ +dependencies { + "shadedApi"(project(":common:api:util")) + + "shadedApi"("com.dfsek.tectonic:common:2.1.2") +} + diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java b/common/api/registry/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java similarity index 100% rename from common/api/core/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java rename to common/api/registry/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java b/common/api/registry/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java similarity index 100% rename from common/api/core/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java rename to common/api/registry/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/registry/Registry.java b/common/api/registry/src/main/java/com/dfsek/terra/api/registry/Registry.java similarity index 100% rename from common/api/core/src/main/java/com/dfsek/terra/api/registry/Registry.java rename to common/api/registry/src/main/java/com/dfsek/terra/api/registry/Registry.java diff --git a/common/api/core/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 similarity index 100% rename from common/api/core/src/main/java/com/dfsek/terra/api/registry/exception/DuplicateEntryException.java rename to common/api/registry/src/main/java/com/dfsek/terra/api/registry/exception/DuplicateEntryException.java diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/registry/meta/RegistryFactory.java b/common/api/registry/src/main/java/com/dfsek/terra/api/registry/meta/RegistryFactory.java similarity index 100% rename from common/api/core/src/main/java/com/dfsek/terra/api/registry/meta/RegistryFactory.java rename to common/api/registry/src/main/java/com/dfsek/terra/api/registry/meta/RegistryFactory.java diff --git a/common/api/core/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 similarity index 100% rename from common/api/core/src/main/java/com/dfsek/terra/api/registry/meta/RegistryHolder.java rename to common/api/registry/src/main/java/com/dfsek/terra/api/registry/meta/RegistryHolder.java diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java b/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java index 3cbbdf32a..5bf886b31 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java @@ -1,7 +1,6 @@ package com.dfsek.terra.registry; import com.dfsek.tectonic.exception.LoadException; -import com.dfsek.tectonic.exception.ValidationException; import com.dfsek.tectonic.loading.ConfigLoader; import java.lang.reflect.AnnotatedType; @@ -13,7 +12,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.regex.Pattern; -import java.util.stream.Collector; import java.util.stream.Collectors; import com.dfsek.terra.api.registry.OpenRegistry; diff --git a/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java b/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java index 6ec8ae9e0..c361eef70 100644 --- a/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java +++ b/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java @@ -12,8 +12,8 @@ import com.dfsek.terra.api.handle.ItemHandle; import com.dfsek.terra.api.handle.WorldHandle; import com.dfsek.terra.api.lang.Language; import com.dfsek.terra.api.profiler.Profiler; -import com.dfsek.terra.api.registry.CheckedRegistry; -import com.dfsek.terra.api.registry.Registry; +import com.dfsek.terra.api.registry.registry.CheckedRegistry; +import com.dfsek.terra.api.registry.registry.Registry; import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.config.GenericLoaders; import com.dfsek.terra.config.PluginConfigImpl;