ConfigType#getTypeClass -> getTypeKey

common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java

@@ -32,7 +32,7 @@ public class BiomeConfigType implements ConfigType<BiomeTemplate, TerraBiome> {
     }
 
     @Override
-    public TypeKey<TerraBiome> getTypeClass() {
+    public TypeKey<TerraBiome> getTypeKey() {
         return BIOME_TYPE_TOKEN;
     }
 

common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureConfigType.java

@@ -26,7 +26,7 @@ public class FeatureConfigType implements ConfigType<FeatureTemplate, Feature> {
     }
 
     @Override
-    public TypeKey<Feature> getTypeClass() {
+    public TypeKey<Feature> getTypeKey() {
         return FEATURE_TYPE_KEY;
     }
 

common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraConfigType.java

@@ -26,7 +26,7 @@ public class FloraConfigType implements ConfigType<FloraTemplate, Flora> {
     }
 
     @Override
-    public TypeKey<Flora> getTypeClass() {
+    public TypeKey<Flora> getTypeKey() {
         return FLORA_TYPE_TOKEN;
     }
 

common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java

@@ -25,7 +25,7 @@ public class OreConfigType implements ConfigType<OreTemplate, Ore> {
     }
 
     @Override
-    public TypeKey<Ore> getTypeClass() {
+    public TypeKey<Ore> getTypeKey() {
         return ORE_TYPE_TOKEN;
     }
 

common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java

@@ -34,7 +34,7 @@ public class PaletteConfigType implements ConfigType<PaletteTemplate, Palette> {
     }
 
     @Override
-    public TypeKey<Palette> getTypeClass() {
+    public TypeKey<Palette> getTypeKey() {
         return PALETTE_TYPE_TOKEN;
     }
 

common/api/src/main/java/com/dfsek/terra/api/config/ConfigType.java

@@ -11,7 +11,7 @@ public interface ConfigType<T extends AbstractableTemplate, R> {
 
     ConfigFactory<T, R> getFactory();
 
-    TypeKey<R> getTypeClass();
+    TypeKey<R> getTypeKey();
 
     Supplier<OpenRegistry<R>> registrySupplier(ConfigPack pack);
 }

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> T getLoadedObject(Class<T> clazz) {
-        if(!clazz.isAssignableFrom(type.getTypeClass().getRawType()))
+        if(!clazz.isAssignableFrom(type.getTypeKey().getRawType()))
-            throw new ClassCastException("Cannot assign object from loader of type " + ReflectionUtil.typeToString(type.getTypeClass().getType()) + " to class " + clazz.getCanonicalName());
+            throw new ClassCastException("Cannot assign object from loader of type " + ReflectionUtil.typeToString(type.getTypeKey().getType()) + " to class " + clazz.getCanonicalName());
         return (T) loaded;
     }
 

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 <T> CheckedRegistry<T> getRegistry(Class<T> clazz) {
-        if(!clazz.isAssignableFrom(type.getTypeClass().getRawType()))
+        if(!clazz.isAssignableFrom(type.getTypeKey().getRawType()))
-            throw new ClassCastException("Cannot assign object from loader of type " + ReflectionUtil.typeToString(type.getTypeClass().getType()) + " to class " + clazz.getCanonicalName());
+            throw new ClassCastException("Cannot assign object from loader of type " + ReflectionUtil.typeToString(type.getTypeKey().getType()) + " to class " + clazz.getCanonicalName());
         return (CheckedRegistry<T>) registry;
     }
 }

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.
+            if(registryMap.containsKey(configType.getTypeKey().getType())) { // Someone already registered something; we need to copy things to the new registry.
-                registryMap.get(configType.getTypeClass().getType()).getLeft().forEach(((OpenRegistry<Object>) openRegistry)::register);
+                registryMap.get(configType.getTypeKey().getType()).getLeft().forEach(((OpenRegistry<Object>) openRegistry)::register);
             }
-            selfLoader.registerLoader(configType.getTypeClass().getType(), openRegistry);
+            selfLoader.registerLoader(configType.getTypeKey().getType(), openRegistry);
-            abstractConfigLoader.registerLoader(configType.getTypeClass().getType(), openRegistry);
+            abstractConfigLoader.registerLoader(configType.getTypeKey().getType(), openRegistry);
-            registryMap.put(configType.getTypeClass().getType(), ImmutablePair.of(openRegistry, new CheckedRegistryImpl<>(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 {

common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java

@@ -22,7 +22,7 @@ public class ConfigTypeRegistry extends OpenRegistryImpl<ConfigType<?, ?>> {
     @Override
     public boolean register(String identifier, Entry<ConfigType<?, ?>> 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);
     }
 }