reformat all code

2026-04-20 23:30:29 +00:00 · 2022-03-30 14:43:50 -07:00
parent d79c37fc49
commit 4a3c22a8d6
201 changed files with 925 additions and 1040 deletions
--- a/common/implementation/base/src/main/java/com/dfsek/terra/AbstractPlatform.java
+++ b/common/implementation/base/src/main/java/com/dfsek/terra/AbstractPlatform.java
@@ -18,9 +18,6 @@
 package com.dfsek.terra;

 import com.dfsek.tectonic.api.TypeRegistry;
-
-import com.dfsek.terra.api.util.reflection.TypeKey;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.jetbrains.annotations.NotNull;
@@ -60,6 +57,7 @@ import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.registry.Registry;
 import com.dfsek.terra.api.registry.key.StringIdentifiable;
 import com.dfsek.terra.api.util.mutable.MutableBoolean;
+import com.dfsek.terra.api.util.reflection.TypeKey;
 import com.dfsek.terra.config.GenericLoaders;
 import com.dfsek.terra.config.PluginConfigImpl;
 import com.dfsek.terra.event.EventManagerImpl;
@@ -151,24 +149,24 @@ public abstract class AbstractPlatform implements Platform {
    
    protected InternalAddon loadAddons() {
        List<BaseAddon> addonList = new ArrayList<>();
-    
+
        InternalAddon internalAddon = new InternalAddon();
-    
+
        addonList.add(internalAddon);
-    
+
        platformAddon().forEach(addonList::add);
-    
+
        BootstrapAddonLoader bootstrapAddonLoader = new BootstrapAddonLoader();
-    
+
        Path addonsFolder = getDataFolder().toPath().resolve("addons");
-    
+
        Injector<Platform> platformInjector = new InjectorImpl<>(this);
        platformInjector.addExplicitTarget(Platform.class);
-    
+
        bootstrapAddonLoader.loadAddons(addonsFolder, getClass().getClassLoader())
                            .forEach(bootstrapAddon -> {
                                platformInjector.inject(bootstrapAddon);
-        
+
                                bootstrapAddon.loadAddons(addonsFolder, getClass().getClassLoader())
                                              .forEach(addonList::add);
                            });
@@ -179,7 +177,7 @@ public abstract class AbstractPlatform implements Platform {
            builder.append("Loading ")
                   .append(addonList.size())
                   .append(" Terra addons:");
-        
+
            for(BaseAddon addon : addonList) {
                builder.append("\n        ")
                       .append("- ")
@@ -187,10 +185,10 @@ public abstract class AbstractPlatform implements Platform {
                       .append("@")
                       .append(addon.getVersion().getFormatted());
            }
-        
+
            logger.info(builder.toString());
        }
-    
+
        DependencySorter sorter = new DependencySorter();
        addonList.forEach(sorter::add);
        sorter.sort().forEach(addon -> {
--- a/common/implementation/base/src/main/java/com/dfsek/terra/addon/DependencySorter.java
+++ b/common/implementation/base/src/main/java/com/dfsek/terra/addon/DependencySorter.java
@@ -62,7 +62,8 @@ public class DependencySorter {
    
    private BaseAddon get(String id, BaseAddon addon) {
        if(!addons.containsKey(id)) {
-            throw new DependencyException("Addon " + addon.getID() + " specifies dependency on " + id + ", versions " + addon.getDependencies().get(id).getFormatted() +
+            throw new DependencyException("Addon " + addon.getID() + " specifies dependency on " + id + ", versions " +
+                                          addon.getDependencies().get(id).getFormatted() +
                                          ", but no such addon is installed.");
        }
        return addons.get(id);
--- a/common/implementation/base/src/main/java/com/dfsek/terra/addon/InternalAddon.java
+++ b/common/implementation/base/src/main/java/com/dfsek/terra/addon/InternalAddon.java
@@ -19,25 +19,15 @@ package com.dfsek.terra.addon;

 import ca.solostudios.strata.Versions;
 import ca.solostudios.strata.version.Version;
-import cloud.commandframework.ArgumentDescription;
-import cloud.commandframework.CommandManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;

-import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.addon.BaseAddon;
-import com.dfsek.terra.api.command.arguments.RegistryArgument;
-import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.api.command.CommandSender;
-import com.dfsek.terra.api.event.events.platform.CommandRegistrationEvent;
-import com.dfsek.terra.api.event.functional.FunctionalEventHandler;


 public class InternalAddon implements BaseAddon {
    private static final Version VERSION = Versions.getVersion(1, 0, 0);
    
    public InternalAddon() {
-    
+
    }
    
    @Override
--- a/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/GenericTemplateSupplierLoader.java
+++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/GenericTemplateSupplierLoader.java
@@ -19,11 +19,11 @@ package com.dfsek.terra.config.loaders;

 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
 import com.dfsek.tectonic.api.depth.DepthTracker;
-import com.dfsek.tectonic.api.exception.ConfigException;
 import com.dfsek.tectonic.api.exception.LoadException;
 import com.dfsek.tectonic.api.loader.ConfigLoader;
 import com.dfsek.tectonic.api.loader.type.TypeLoader;
 import com.dfsek.tectonic.impl.MapConfiguration;
+import org.jetbrains.annotations.NotNull;

 import java.lang.reflect.AnnotatedType;
 import java.util.Map;
@@ -31,8 +31,6 @@ import java.util.function.Supplier;

 import com.dfsek.terra.api.registry.Registry;

-import org.jetbrains.annotations.NotNull;
-

 public class GenericTemplateSupplierLoader<T> implements TypeLoader<T> {
    private final Registry<Supplier<ObjectTemplate<T>>> registry;
--- a/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/LinkedHashMapLoader.java
+++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/LinkedHashMapLoader.java
@@ -32,7 +32,8 @@ import java.util.Map;
@SuppressWarnings("unchecked")
 public class LinkedHashMapLoader implements TypeLoader<LinkedHashMap<Object, Object>> {
    @Override
-    public LinkedHashMap<Object, Object> load(@NotNull AnnotatedType t, @NotNull Object c, @NotNull ConfigLoader loader, DepthTracker depthTracker) throws LoadException {
+    public LinkedHashMap<Object, Object> load(@NotNull AnnotatedType t, @NotNull Object c, @NotNull ConfigLoader loader,
+                                              DepthTracker depthTracker) throws LoadException {
        Map<String, Object> config = (Map<String, Object>) c;
        LinkedHashMap<Object, Object> map = new LinkedHashMap<>();
        if(t instanceof AnnotatedParameterizedType pType) {
--- a/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/MaterialSetLoader.java
+++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/MaterialSetLoader.java
@@ -21,6 +21,7 @@ import com.dfsek.tectonic.api.depth.DepthTracker;
 import com.dfsek.tectonic.api.exception.LoadException;
 import com.dfsek.tectonic.api.loader.ConfigLoader;
 import com.dfsek.tectonic.api.loader.type.TypeLoader;
+import org.jetbrains.annotations.NotNull;

 import java.lang.reflect.AnnotatedType;
 import java.util.List;
@@ -28,13 +29,12 @@ import java.util.List;
 import com.dfsek.terra.api.block.BlockType;
 import com.dfsek.terra.api.util.collection.MaterialSet;

-import org.jetbrains.annotations.NotNull;
-

@SuppressWarnings("unchecked")
 public class MaterialSetLoader implements TypeLoader<MaterialSet> {
    @Override
-    public MaterialSet load(@NotNull AnnotatedType type, @NotNull Object o, @NotNull ConfigLoader configLoader, DepthTracker depthTracker) throws LoadException {
+    public MaterialSet load(@NotNull AnnotatedType type, @NotNull Object o, @NotNull ConfigLoader configLoader, DepthTracker depthTracker)
+    throws LoadException {
        List<String> stringData = (List<String>) o;
        
        if(stringData.size() == 1) {
--- a/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/ProbabilityCollectionLoader.java
+++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/ProbabilityCollectionLoader.java
@@ -21,6 +21,7 @@ import com.dfsek.tectonic.api.depth.DepthTracker;
 import com.dfsek.tectonic.api.exception.LoadException;
 import com.dfsek.tectonic.api.loader.ConfigLoader;
 import com.dfsek.tectonic.api.loader.type.TypeLoader;
+import org.jetbrains.annotations.NotNull;

 import java.lang.reflect.AnnotatedParameterizedType;
 import java.lang.reflect.AnnotatedType;
@@ -30,8 +31,6 @@ import java.util.Map.Entry;

 import com.dfsek.terra.api.util.collection.ProbabilityCollection;

-import org.jetbrains.annotations.NotNull;
-

@SuppressWarnings("unchecked")
 public class ProbabilityCollectionLoader implements TypeLoader<ProbabilityCollection<Object>> {
--- a/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/RangeLoader.java
+++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/RangeLoader.java
@@ -33,7 +33,8 @@ import com.dfsek.terra.api.util.Range;
@SuppressWarnings("unchecked")
 public class RangeLoader implements TypeLoader<Range> {
    @Override
-    public Range load(@NotNull AnnotatedType type, @NotNull Object o, @NotNull ConfigLoader configLoader, DepthTracker depthTracker) throws LoadException {
+    public Range load(@NotNull AnnotatedType type, @NotNull Object o, @NotNull ConfigLoader configLoader, DepthTracker depthTracker)
+    throws LoadException {
        if(o instanceof Map) {
            Map<String, Integer> map = (Map<String, Integer>) o;
            return new ConstantRange(map.get("min"), map.get("max"));
--- a/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/VersionLoader.java
+++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/VersionLoader.java
@@ -14,7 +14,8 @@ import java.lang.reflect.AnnotatedType;

 public class VersionLoader implements TypeLoader<Version> {
    @Override
-    public Version load(@NotNull AnnotatedType t, @NotNull Object c, @NotNull ConfigLoader loader, DepthTracker depthTracker) throws LoadException {
+    public Version load(@NotNull AnnotatedType t, @NotNull Object c, @NotNull ConfigLoader loader, DepthTracker depthTracker)
+    throws LoadException {
        try {
            return Versions.parseVersion((String) c);
        } catch(ParseException e) {
--- a/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/VersionRangeLoader.java
+++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/VersionRangeLoader.java
@@ -31,7 +31,8 @@ import java.lang.reflect.AnnotatedType;

 public class VersionRangeLoader implements TypeLoader<VersionRange> {
    @Override
-    public VersionRange load(@NotNull AnnotatedType t, @NotNull Object c, @NotNull ConfigLoader loader, DepthTracker depthTracker) throws LoadException {
+    public VersionRange load(@NotNull AnnotatedType t, @NotNull Object c, @NotNull ConfigLoader loader, DepthTracker depthTracker)
+    throws LoadException {
        try {
            return Versions.parseVersionRange((String) c);
        } catch(ParseException e) {
--- a/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/config/BufferedImageLoader.java
+++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/config/BufferedImageLoader.java
@@ -21,6 +21,7 @@ import com.dfsek.tectonic.api.depth.DepthTracker;
 import com.dfsek.tectonic.api.exception.LoadException;
 import com.dfsek.tectonic.api.loader.ConfigLoader;
 import com.dfsek.tectonic.api.loader.type.TypeLoader;
+import org.jetbrains.annotations.NotNull;

 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
@@ -29,8 +30,6 @@ import java.lang.reflect.AnnotatedType;

 import com.dfsek.terra.api.config.Loader;

-import org.jetbrains.annotations.NotNull;
-

 public class BufferedImageLoader implements TypeLoader<BufferedImage> {
    private final Loader files;
@@ -40,7 +39,8 @@ public class BufferedImageLoader implements TypeLoader<BufferedImage> {
    }
    
    @Override
-    public BufferedImage load(@NotNull AnnotatedType t, @NotNull Object c, @NotNull ConfigLoader loader, DepthTracker depthTracker) throws LoadException {
+    public BufferedImage load(@NotNull AnnotatedType t, @NotNull Object c, @NotNull ConfigLoader loader, DepthTracker depthTracker)
+    throws LoadException {
        try {
            return ImageIO.read(files.get((String) c));
        } catch(IOException e) {
--- a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java
+++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java
@@ -22,15 +22,10 @@ import ca.solostudios.strata.version.VersionRange;
 import com.dfsek.tectonic.api.TypeRegistry;
 import com.dfsek.tectonic.api.config.Configuration;
 import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
-import com.dfsek.tectonic.api.exception.LoadException;
 import com.dfsek.tectonic.api.loader.AbstractConfigLoader;
 import com.dfsek.tectonic.api.loader.ConfigLoader;
 import com.dfsek.tectonic.api.loader.type.TypeLoader;
 import com.dfsek.tectonic.yaml.YamlConfiguration;
-
-import com.dfsek.terra.api.properties.Context;
-import com.dfsek.terra.api.registry.key.RegistryKey;
-
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Multimaps;
 import org.jetbrains.annotations.NotNull;
@@ -71,9 +66,11 @@ import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPostLoadEvent;
 import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent;
 import com.dfsek.terra.api.event.events.config.type.ConfigTypePostLoadEvent;
+import com.dfsek.terra.api.properties.Context;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.registry.OpenRegistry;
 import com.dfsek.terra.api.registry.Registry;
+import com.dfsek.terra.api.registry.key.RegistryKey;
 import com.dfsek.terra.api.tectonic.ShortcutLoader;
 import com.dfsek.terra.api.util.generic.Construct;
 import com.dfsek.terra.api.util.generic.pair.Pair;
@@ -101,11 +98,10 @@ import com.dfsek.terra.registry.ShortcutHolder;
 * Represents a Terra configuration pack.
 */
 public class ConfigPackImpl implements ConfigPack {
-    private final Context context = new Context();
    public static final TypeKey<ConfigType<?, ?>> CONFIG_TYPE_TYPE_KEY = new TypeKey<>() {
    };
    private static final Logger logger = LoggerFactory.getLogger(ConfigPackImpl.class);
-    
+    private final Context context = new Context();
    private final ConfigPackTemplate template = new ConfigPackTemplate();
    
    private final AbstractConfigLoader abstractConfigLoader = new AbstractConfigLoader();
@@ -216,10 +212,11 @@ public class ConfigPackImpl implements ConfigPack {
                        Object loaded = ((ConfigFactory) configType.getFactory()).build(
                                selfLoader.load(configType.getTemplate(this, platform), configuration), platform);
                        platform.getEventManager().callEvent(new ConfigurationLoadEvent(this,
-                                                          configuration,
-                                                          template -> selfLoader.load(template, configuration),
-                                                          configType,
-                                                          loaded));
+                                                                                        configuration,
+                                                                                        template -> selfLoader.load(template,
+                                                                                                                    configuration),
+                                                                                        configType,
+                                                                                        loaded));
                        return Pair.of(configuration.getID(), loaded);
                    })
                    .toList()
--- a/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaListLikePreprocessor.java
+++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaListLikePreprocessor.java
@@ -23,9 +23,6 @@ import com.dfsek.tectonic.api.depth.IndexLevel;
 import com.dfsek.tectonic.api.exception.LoadException;
 import com.dfsek.tectonic.api.loader.ConfigLoader;
 import com.dfsek.tectonic.api.preprocessor.Result;
-
-import com.dfsek.terra.api.util.generic.pair.Pair;
-
 import org.jetbrains.annotations.NotNull;

 import java.lang.reflect.AnnotatedType;
@@ -37,6 +34,7 @@ import java.util.Optional;
 import java.util.Set;

 import com.dfsek.terra.api.config.meta.Meta;
+import com.dfsek.terra.api.util.generic.pair.Pair;


 public class MetaListLikePreprocessor extends MetaPreprocessor<Meta> {
@@ -64,13 +62,14 @@ public class MetaListLikePreprocessor extends MetaPreprocessor<Meta> {
                        if(!s.startsWith("<< ")) continue;
                        String meta = s.substring(3);
                        
-    
+
                        Pair<Configuration, Object> pair = getMetaValue(meta, depthTracker);
                        Object metaValue = pair.getRight();
                        
                        if(!(metaValue instanceof List)) {
                            throw new LoadException(
-                                    "MetaList/Set injection candidate must be list, is type " + metaValue.getClass().getCanonicalName(), depthTracker);
+                                    "MetaList/Set injection candidate must be list, is type " + metaValue.getClass().getCanonicalName(),
+                                    depthTracker);
                        }
                        
                        List<Object> metaList = (List<Object>) metaValue;
--- a/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaMapPreprocessor.java
+++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaMapPreprocessor.java
@@ -23,9 +23,6 @@ import com.dfsek.tectonic.api.depth.EntryLevel;
 import com.dfsek.tectonic.api.exception.LoadException;
 import com.dfsek.tectonic.api.loader.ConfigLoader;
 import com.dfsek.tectonic.api.preprocessor.Result;
-
-import com.dfsek.terra.api.util.generic.pair.Pair;
-
 import org.jetbrains.annotations.NotNull;

 import java.lang.reflect.AnnotatedType;
@@ -36,6 +33,7 @@ import java.util.Map;
 import java.util.Optional;

 import com.dfsek.terra.api.config.meta.Meta;
+import com.dfsek.terra.api.util.generic.pair.Pair;
 import com.dfsek.terra.api.util.reflection.TypeKey;


@@ -65,10 +63,11 @@ public class MetaMapPreprocessor extends MetaPreprocessor<Meta> {
                            Object meta = pair.getRight();
                            if(!(meta instanceof Map)) {
                                throw new LoadException(
-                                        "MetaMap injection candidate must be list, is type " + meta.getClass().getCanonicalName(), depthTracker);
+                                        "MetaMap injection candidate must be list, is type " + meta.getClass().getCanonicalName(),
+                                        depthTracker);
                            }
                            newMap.putAll((Map<?, ?>) meta);
-    
+
                            String configName;
                            if(pair.getLeft().getName() == null) {
                                configName = "Anonymous Configuration";
--- a/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaPreprocessor.java
+++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaPreprocessor.java
@@ -22,11 +22,11 @@ import com.dfsek.tectonic.api.depth.DepthTracker;
 import com.dfsek.tectonic.api.exception.LoadException;
 import com.dfsek.tectonic.api.preprocessor.ValuePreprocessor;

-import com.dfsek.terra.api.util.generic.pair.Pair;
-
 import java.lang.annotation.Annotation;
 import java.util.Map;

+import com.dfsek.terra.api.util.generic.pair.Pair;
+

 public abstract class MetaPreprocessor<A extends Annotation> implements ValuePreprocessor<A> {
    private final Map<String, Configuration> configs;
--- a/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaValuePreprocessor.java
+++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaValuePreprocessor.java
@@ -21,15 +21,13 @@ import com.dfsek.tectonic.api.config.Configuration;
 import com.dfsek.tectonic.api.depth.DepthTracker;
 import com.dfsek.tectonic.api.loader.ConfigLoader;
 import com.dfsek.tectonic.api.preprocessor.Result;
-
-import com.dfsek.terra.api.util.generic.pair.Pair;
-
 import org.jetbrains.annotations.NotNull;

 import java.lang.reflect.AnnotatedType;
 import java.util.Map;

 import com.dfsek.terra.api.config.meta.Meta;
+import com.dfsek.terra.api.util.generic.pair.Pair;


 public class MetaValuePreprocessor extends MetaPreprocessor<Meta> {
@@ -46,7 +44,7 @@ public class MetaValuePreprocessor extends MetaPreprocessor<Meta> {
            if(value.startsWith("$") // it's a meta value.
               && !value.startsWith("${")) { // it's not a meta string template.
                Pair<Configuration, Object> pair = getMetaValue(value.substring(1), depthTracker);
-    
+
                String configName;
                if(pair.getLeft().getName() == null) {
                    configName = "Anonymous Configuration";
--- a/common/implementation/base/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java
+++ b/common/implementation/base/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java
@@ -20,10 +20,6 @@ package com.dfsek.terra.registry;
 import com.dfsek.tectonic.api.depth.DepthTracker;
 import com.dfsek.tectonic.api.exception.LoadException;
 import com.dfsek.tectonic.api.loader.ConfigLoader;
-
-import com.dfsek.terra.api.registry.key.RegistryKey;
-import com.dfsek.terra.api.util.reflection.TypeKey;
-
 import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.NotNull;

@@ -38,6 +34,8 @@ import java.util.function.Consumer;
 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.registry.OpenRegistry;
 import com.dfsek.terra.api.registry.exception.DuplicateEntryException;
+import com.dfsek.terra.api.registry.key.RegistryKey;
+import com.dfsek.terra.api.util.reflection.TypeKey;


 /**
@@ -48,15 +46,15 @@ import com.dfsek.terra.api.registry.exception.DuplicateEntryException;
 public class CheckedRegistryImpl<T> implements CheckedRegistry<T> {
    private final OpenRegistry<T> registry;
    
+    public CheckedRegistryImpl(OpenRegistry<T> registry) {
+        this.registry = registry;
+    }
+    
    @Internal
    public OpenRegistry<T> getRegistry() {
        return registry;
    }
    
-    public CheckedRegistryImpl(OpenRegistry<T> registry) {
-        this.registry = registry;
-    }
-    
    @Override
    public void register(@NotNull RegistryKey identifier, @NotNull T value) throws DuplicateEntryException {
        registry.registerChecked(identifier, value);
@@ -103,7 +101,8 @@ public class CheckedRegistryImpl<T> implements CheckedRegistry<T> {
    }
    
    @Override
-    public T load(@NotNull AnnotatedType t, @NotNull Object c, @NotNull ConfigLoader loader, DepthTracker depthTracker) throws LoadException {
+    public T load(@NotNull AnnotatedType t, @NotNull Object c, @NotNull ConfigLoader loader, DepthTracker depthTracker)
+    throws LoadException {
        return registry.load(t, c, loader, depthTracker);
    }
 }
--- a/common/implementation/base/src/main/java/com/dfsek/terra/registry/LockedRegistryImpl.java
+++ b/common/implementation/base/src/main/java/com/dfsek/terra/registry/LockedRegistryImpl.java
@@ -20,10 +20,6 @@ package com.dfsek.terra.registry;
 import com.dfsek.tectonic.api.depth.DepthTracker;
 import com.dfsek.tectonic.api.exception.LoadException;
 import com.dfsek.tectonic.api.loader.ConfigLoader;
-
-import com.dfsek.terra.api.registry.key.RegistryKey;
-import com.dfsek.terra.api.util.reflection.TypeKey;
-
 import org.jetbrains.annotations.NotNull;

 import java.lang.reflect.AnnotatedType;
@@ -35,6 +31,8 @@ import java.util.function.BiConsumer;
 import java.util.function.Consumer;

 import com.dfsek.terra.api.registry.Registry;
+import com.dfsek.terra.api.registry.key.RegistryKey;
+import com.dfsek.terra.api.util.reflection.TypeKey;


 /**
@@ -90,7 +88,8 @@ public class LockedRegistryImpl<T> implements Registry<T> {
    }
    
    @Override
-    public T load(@NotNull AnnotatedType t, @NotNull Object c, @NotNull ConfigLoader loader, DepthTracker depthTracker) throws LoadException {
+    public T load(@NotNull AnnotatedType t, @NotNull Object c, @NotNull ConfigLoader loader, DepthTracker depthTracker)
+    throws LoadException {
        return registry.load(t, c, loader, depthTracker);
    }
 }
--- a/common/implementation/base/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java
+++ b/common/implementation/base/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java
@@ -20,11 +20,6 @@ package com.dfsek.terra.registry;
 import com.dfsek.tectonic.api.depth.DepthTracker;
 import com.dfsek.tectonic.api.exception.LoadException;
 import com.dfsek.tectonic.api.loader.ConfigLoader;
-
-import com.dfsek.terra.api.registry.key.RegistryKey;
-import com.dfsek.terra.api.util.generic.pair.Pair;
-import com.dfsek.terra.api.util.reflection.TypeKey;
-
 import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Multimaps;
 import org.jetbrains.annotations.NotNull;
@@ -43,6 +38,9 @@ import java.util.stream.Collectors;

 import com.dfsek.terra.api.registry.OpenRegistry;
 import com.dfsek.terra.api.registry.exception.DuplicateEntryException;
+import com.dfsek.terra.api.registry.key.RegistryKey;
+import com.dfsek.terra.api.util.generic.pair.Pair;
+import com.dfsek.terra.api.util.reflection.TypeKey;


 /**
@@ -66,7 +64,8 @@ public class OpenRegistryImpl<T> implements OpenRegistry<T> {
    }
    
    @Override
-    public T load(@NotNull AnnotatedType type, @NotNull Object o, @NotNull ConfigLoader configLoader, DepthTracker depthTracker) throws LoadException {
+    public T load(@NotNull AnnotatedType type, @NotNull Object o, @NotNull ConfigLoader configLoader, DepthTracker depthTracker)
+    throws LoadException {
        return getByID((String) o).orElseThrow(() -> new LoadException("No such " + type.getType().getTypeName() + " matching \"" + o +
                                                                       "\" was found in this registry. Registry contains items: " +
                                                                       getItemsFormatted(), depthTracker));
--- a/common/implementation/base/src/main/java/com/dfsek/terra/registry/ShortcutHolder.java
+++ b/common/implementation/base/src/main/java/com/dfsek/terra/registry/ShortcutHolder.java
@@ -4,16 +4,15 @@ import com.dfsek.tectonic.api.depth.DepthTracker;
 import com.dfsek.tectonic.api.exception.LoadException;
 import com.dfsek.tectonic.api.loader.ConfigLoader;
 import com.dfsek.tectonic.api.loader.type.TypeLoader;
-
-import com.dfsek.terra.api.tectonic.ShortcutLoader;
-import com.dfsek.terra.api.registry.Registry;
-
 import org.jetbrains.annotations.NotNull;

 import java.lang.reflect.AnnotatedType;
 import java.util.HashMap;
 import java.util.Map;

+import com.dfsek.terra.api.registry.Registry;
+import com.dfsek.terra.api.tectonic.ShortcutLoader;
+

 public class ShortcutHolder<T> implements TypeLoader<T> {
    private final Map<String, ShortcutLoader<T>> shortcuts = new HashMap<>();
@@ -35,12 +34,14 @@ public class ShortcutHolder<T> implements TypeLoader<T> {
    }
    
    @Override
-    public T load(@NotNull AnnotatedType annotatedType, @NotNull Object o, @NotNull ConfigLoader configLoader, DepthTracker depthTracker) throws LoadException {
+    public T load(@NotNull AnnotatedType annotatedType, @NotNull Object o, @NotNull ConfigLoader configLoader, DepthTracker depthTracker)
+    throws LoadException {
        String id = (String) o;
        if(id.contains(":")) {
            String shortcut = id.substring(0, id.indexOf(":"));
            if(shortcuts.containsKey(shortcut)) {
-                return shortcuts.get(shortcut).load(configLoader, id.substring(id.indexOf(":") + 1), depthTracker.intrinsic("Using shortcut \"" + shortcut + "\""));
+                return shortcuts.get(shortcut).load(configLoader, id.substring(id.indexOf(":") + 1),
+                                                    depthTracker.intrinsic("Using shortcut \"" + shortcut + "\""));
            }
            throw new LoadException("Shortcut \"" + shortcut + "\" is not defined.", depthTracker);
        }
--- a/common/implementation/base/src/main/java/com/dfsek/terra/registry/master/ConfigRegistry.java
+++ b/common/implementation/base/src/main/java/com/dfsek/terra/registry/master/ConfigRegistry.java
@@ -18,9 +18,6 @@
 package com.dfsek.terra.registry.master;

 import com.dfsek.tectonic.api.exception.ConfigException;
-
-import com.dfsek.terra.api.util.reflection.TypeKey;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@@ -31,6 +28,7 @@ import java.util.zip.ZipFile;

 import com.dfsek.terra.api.Platform;
 import com.dfsek.terra.api.config.ConfigPack;
+import com.dfsek.terra.api.util.reflection.TypeKey;
 import com.dfsek.terra.config.pack.ConfigPackImpl;
 import com.dfsek.terra.registry.OpenRegistryImpl;

--- a/common/implementation/base/src/test/java/registry/RegistryTest.java
+++ b/common/implementation/base/src/test/java/registry/RegistryTest.java
@@ -17,14 +17,13 @@

 package registry;

-import com.dfsek.terra.api.registry.key.RegistryKey;
-import com.dfsek.terra.api.util.reflection.TypeKey;
-
 import org.junit.jupiter.api.Test;

 import com.dfsek.terra.api.registry.CheckedRegistry;
 import com.dfsek.terra.api.registry.OpenRegistry;
 import com.dfsek.terra.api.registry.exception.DuplicateEntryException;
+import com.dfsek.terra.api.registry.key.RegistryKey;
+import com.dfsek.terra.api.util.reflection.TypeKey;
 import com.dfsek.terra.registry.CheckedRegistryImpl;
 import com.dfsek.terra.registry.OpenRegistryImpl;

@@ -91,7 +90,7 @@ public class RegistryTest {
            test.getByID("test");
            fail("Shouldn't be able to get with ambiguous ID!");
        } catch(IllegalArgumentException ignore) {
-        
+
        }
    }
 }