From 82169f0921de3abe0a9a40f6017a349f677530e8 Mon Sep 17 00:00:00 2001 From: dfsek Date: Thu, 22 Jul 2021 13:04:33 -0700 Subject: [PATCH] ConfigType#getTypeClass -> getTypeKey --- .../dfsek/terra/addons/biome/BiomeConfigType.java | 2 +- .../terra/addons/feature/FeatureConfigType.java | 2 +- .../dfsek/terra/addons/flora/FloraConfigType.java | 2 +- .../com/dfsek/terra/addons/ore/OreConfigType.java | 2 +- .../terra/addons/palette/PaletteConfigType.java | 2 +- .../java/com/dfsek/terra/api/config/ConfigType.java | 2 +- .../event/events/config/ConfigurationLoadEvent.java | 6 +++--- .../events/config/type/ConfigTypeLoadEvent.java | 6 +++--- .../com/dfsek/terra/config/pack/ConfigPackImpl.java | 12 ++++++------ .../terra/registry/config/ConfigTypeRegistry.java | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java index 9f9786b07..d6cdb8416 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java @@ -32,7 +32,7 @@ public class BiomeConfigType implements ConfigType { } @Override - public TypeKey getTypeClass() { + public TypeKey getTypeKey() { return BIOME_TYPE_TOKEN; } diff --git a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureConfigType.java b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureConfigType.java index 3d2c3e709..7a02bd640 100644 --- a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureConfigType.java +++ b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureConfigType.java @@ -26,7 +26,7 @@ public class FeatureConfigType implements ConfigType { } @Override - public TypeKey getTypeClass() { + public TypeKey getTypeKey() { return FEATURE_TYPE_KEY; } diff --git a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraConfigType.java b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraConfigType.java index 1fc80a9b4..c17a604ba 100644 --- a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraConfigType.java +++ b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraConfigType.java @@ -26,7 +26,7 @@ public class FloraConfigType implements ConfigType { } @Override - public TypeKey getTypeClass() { + public TypeKey getTypeKey() { return FLORA_TYPE_TOKEN; } diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java index e284b41d3..36ffa5785 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java @@ -25,7 +25,7 @@ public class OreConfigType implements ConfigType { } @Override - public TypeKey getTypeClass() { + public TypeKey getTypeKey() { return ORE_TYPE_TOKEN; } diff --git a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java index 2a3c821be..97d4c81fa 100644 --- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java +++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java @@ -34,7 +34,7 @@ public class PaletteConfigType implements ConfigType { } @Override - public TypeKey getTypeClass() { + public TypeKey getTypeKey() { return PALETTE_TYPE_TOKEN; } diff --git a/common/api/src/main/java/com/dfsek/terra/api/config/ConfigType.java b/common/api/src/main/java/com/dfsek/terra/api/config/ConfigType.java index 15ad2541d..7cefbda01 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/config/ConfigType.java +++ b/common/api/src/main/java/com/dfsek/terra/api/config/ConfigType.java @@ -11,7 +11,7 @@ public interface ConfigType { ConfigFactory getFactory(); - TypeKey getTypeClass(); + TypeKey getTypeKey(); Supplier> registrySupplier(ConfigPack pack); } diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigurationLoadEvent.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigurationLoadEvent.java index b6486a137..0fb9f3363 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigurationLoadEvent.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigurationLoadEvent.java @@ -51,13 +51,13 @@ public class ConfigurationLoadEvent implements PackEvent, FailThroughEvent { } public boolean is(Class clazz) { - return clazz.isAssignableFrom(type.getTypeClass().getRawType()); + return clazz.isAssignableFrom(type.getTypeKey().getRawType()); } @SuppressWarnings("unchecked") public T getLoadedObject(Class clazz) { - if(!clazz.isAssignableFrom(type.getTypeClass().getRawType())) - throw new ClassCastException("Cannot assign object from loader of type " + ReflectionUtil.typeToString(type.getTypeClass().getType()) + " to class " + clazz.getCanonicalName()); + if(!clazz.isAssignableFrom(type.getTypeKey().getRawType())) + throw new ClassCastException("Cannot assign object from loader of type " + ReflectionUtil.typeToString(type.getTypeKey().getType()) + " to class " + clazz.getCanonicalName()); return (T) loaded; } diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypeLoadEvent.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypeLoadEvent.java index 14a4d6d50..a18568d45 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypeLoadEvent.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/type/ConfigTypeLoadEvent.java @@ -25,13 +25,13 @@ public abstract class ConfigTypeLoadEvent implements PackEvent, FailThroughEvent } public boolean is(Class clazz) { - return clazz.isAssignableFrom(type.getTypeClass().getRawType()); + return clazz.isAssignableFrom(type.getTypeKey().getRawType()); } @SuppressWarnings("unchecked") public CheckedRegistry getRegistry(Class clazz) { - if(!clazz.isAssignableFrom(type.getTypeClass().getRawType())) - throw new ClassCastException("Cannot assign object from loader of type " + ReflectionUtil.typeToString(type.getTypeClass().getType()) + " to class " + clazz.getCanonicalName()); + if(!clazz.isAssignableFrom(type.getTypeKey().getRawType())) + throw new ClassCastException("Cannot assign object from loader of type " + ReflectionUtil.typeToString(type.getTypeKey().getType()) + " to class " + clazz.getCanonicalName()); return (CheckedRegistry) registry; } } diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java b/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java index 93357edb1..035c81d6a 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java @@ -199,12 +199,12 @@ public class ConfigPackImpl implements ConfigPack { private ConfigTypeRegistry createRegistry() { return new ConfigTypeRegistry(main, (id, configType) -> { OpenRegistry openRegistry = configType.registrySupplier(this).get(); - if(registryMap.containsKey(configType.getTypeClass().getType())) { // Someone already registered something; we need to copy things to the new registry. - registryMap.get(configType.getTypeClass().getType()).getLeft().forEach(((OpenRegistry) openRegistry)::register); + if(registryMap.containsKey(configType.getTypeKey().getType())) { // Someone already registered something; we need to copy things to the new registry. + registryMap.get(configType.getTypeKey().getType()).getLeft().forEach(((OpenRegistry) openRegistry)::register); } - selfLoader.registerLoader(configType.getTypeClass().getType(), openRegistry); - abstractConfigLoader.registerLoader(configType.getTypeClass().getType(), openRegistry); - registryMap.put(configType.getTypeClass().getType(), ImmutablePair.of(openRegistry, new CheckedRegistryImpl<>(openRegistry))); + selfLoader.registerLoader(configType.getTypeKey().getType(), openRegistry); + abstractConfigLoader.registerLoader(configType.getTypeKey().getType(), openRegistry); + registryMap.put(configType.getTypeKey().getType(), ImmutablePair.of(openRegistry, new CheckedRegistryImpl<>(openRegistry))); }); } @@ -265,7 +265,7 @@ public class ConfigPackImpl implements ConfigPack { } for(ConfigType configType : configTypeRegistry.entries()) { // Load the configs - CheckedRegistry registry = getCheckedRegistry(configType.getTypeClass()); + CheckedRegistry registry = getCheckedRegistry(configType.getTypeKey()); main.getEventManager().callEvent(new ConfigTypePreLoadEvent(configType, registry, this)); for(AbstractConfiguration config : abstractConfigLoader.loadConfigs(configs.getOrDefault(configType, Collections.emptyList()))) { try { diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java b/common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java index b12af27ef..9686546b2 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java +++ b/common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java @@ -22,7 +22,7 @@ public class ConfigTypeRegistry extends OpenRegistryImpl> { @Override public boolean register(String identifier, Entry> value) { callback.accept(identifier, value.getValue()); - main.getDebugLogger().info("Registered config registry with ID " + identifier + " to type " + ReflectionUtil.typeToString(value.getValue().getTypeClass().getType())); + main.getDebugLogger().info("Registered config registry with ID " + identifier + " to type " + ReflectionUtil.typeToString(value.getValue().getTypeKey().getType())); return super.register(identifier, value); } }