diff --git a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddon.java b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddon.java index 8a3a13b01..36db78805 100644 --- a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddon.java +++ b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddon.java @@ -7,11 +7,13 @@ package com.dfsek.terra.addons.manifest.impl; -import java.util.List; -import java.util.Map; - import ca.solostudios.strata.version.Version; import ca.solostudios.strata.version.VersionRange; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; +import java.util.Map; import com.dfsek.terra.addons.manifest.api.AddonInitializer; import com.dfsek.terra.addons.manifest.impl.config.AddonManifest; @@ -20,9 +22,6 @@ import com.dfsek.terra.api.addon.BaseAddon; import com.dfsek.terra.api.inject.Injector; import com.dfsek.terra.api.inject.annotations.Inject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - public class ManifestAddon implements BaseAddon { private final AddonManifest manifest; @@ -32,7 +31,7 @@ public class ManifestAddon implements BaseAddon { @Inject private Platform platform; - private static final Logger LOGGER = LoggerFactory.getLogger(ManifestAddon.class); + private static final Logger logger = LoggerFactory.getLogger(ManifestAddon.class); public ManifestAddon(AddonManifest manifest, List initializers) { this.manifest = manifest; @@ -47,14 +46,14 @@ public class ManifestAddon implements BaseAddon { public void initialize() { Injector addonInjector = Injector.get(this); addonInjector.addExplicitTarget(BaseAddon.class); - + Injector platformInjector = Injector.get(platform); platformInjector.addExplicitTarget(Platform.class); - - LOGGER.info("Initializing addon " + getID()); - + + logger.info("Initializing addon {}", getID()); + initializers.forEach(initializer -> { - LOGGER.debug("Invoking entry point {}", initializer.getClass()); + logger.debug("Invoking entry point {}", initializer.getClass()); addonInjector.inject(initializer); platformInjector.inject(initializer); initializer.initialize(); diff --git 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 index 10f2cbc60..d329baf45 100644 --- 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 @@ -201,7 +201,7 @@ public class ConfigPackImpl implements ConfigPack { selfLoader.load(template, configuration); - logger.info("Loading config pack \"" + template.getID() + "\""); + logger.info("Loading config pack \"{}\"", template.getID()); load(l, platform); diff --git 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 index ce33ff6a8..b47f931ce 100644 --- 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 @@ -56,7 +56,7 @@ public class ConfigRegistry extends OpenRegistryImpl { } for(File zip : packsFolder.listFiles(file -> file.getName().endsWith(".zip") || file.getName().endsWith(".terra"))) { try { - logger.info("Loading ZIP archive: " + zip.getName()); + logger.info("Loading ZIP archive: {}", zip.getName()); load(new ZipFile(zip), platform); } catch(IOException | ConfigException e) { logger.error("Error loading config pack {}", zip.getName(), e);