From 6a4f6c509b6823345649ec9062424142c67e665e Mon Sep 17 00:00:00 2001 From: dfsek Date: Fri, 17 Dec 2021 08:32:08 -0700 Subject: [PATCH] LoaderHolder -> ConfigLoadingDelegate --- .../java/com/dfsek/terra/api/config/ConfigPack.java | 4 ++-- .../{LoaderHolder.java => ConfigLoadingDelegate.java} | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) rename common/api/core/src/main/java/com/dfsek/terra/api/tectonic/{LoaderHolder.java => ConfigLoadingDelegate.java} (57%) diff --git 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 index 6ec95cc53..605280397 100644 --- 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 @@ -17,7 +17,7 @@ import java.util.Map; import com.dfsek.terra.api.addon.BaseAddon; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.registry.meta.RegistryHolder; -import com.dfsek.terra.api.tectonic.LoaderHolder; +import com.dfsek.terra.api.tectonic.ConfigLoadingDelegate; import com.dfsek.terra.api.tectonic.LoaderRegistrar; import com.dfsek.terra.api.util.StringIdentifiable; import com.dfsek.terra.api.util.reflection.TypeKey; @@ -26,7 +26,7 @@ import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage; import com.dfsek.terra.api.world.chunk.generation.util.provider.ChunkGeneratorProvider; -public interface ConfigPack extends LoaderRegistrar, LoaderHolder, RegistryHolder, StringIdentifiable { +public interface ConfigPack extends LoaderRegistrar, ConfigLoadingDelegate, RegistryHolder, StringIdentifiable { ConfigPack registerConfigType(ConfigType type, String id, int priority); diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/tectonic/LoaderHolder.java b/common/api/core/src/main/java/com/dfsek/terra/api/tectonic/ConfigLoadingDelegate.java similarity index 57% rename from common/api/core/src/main/java/com/dfsek/terra/api/tectonic/LoaderHolder.java rename to common/api/core/src/main/java/com/dfsek/terra/api/tectonic/ConfigLoadingDelegate.java index b36240864..e0969eba3 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/tectonic/LoaderHolder.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/tectonic/ConfigLoadingDelegate.java @@ -14,16 +14,16 @@ import java.lang.reflect.Type; import java.util.function.Supplier; -public interface LoaderHolder { - LoaderHolder applyLoader(Type type, TypeLoader loader); +public interface ConfigLoadingDelegate { + ConfigLoadingDelegate applyLoader(Type type, TypeLoader loader); - default LoaderHolder applyLoader(Class type, TypeLoader loader) { + default ConfigLoadingDelegate applyLoader(Class type, TypeLoader loader) { return applyLoader((Type) type, loader); } - LoaderHolder applyLoader(Type type, Supplier> loader); + ConfigLoadingDelegate applyLoader(Type type, Supplier> loader); - default LoaderHolder applyLoader(Class type, Supplier> loader) { + default ConfigLoadingDelegate applyLoader(Class type, Supplier> loader) { return applyLoader((Type) type, loader); } }