From f49ba88cb44d0ec5f13e1164b8e13cf75d92cfe5 Mon Sep 17 00:00:00 2001 From: dfsek Date: Mon, 30 Nov 2020 19:59:28 -0700 Subject: [PATCH] Add author option to config pack --- src/main/java/com/dfsek/terra/config/base/ConfigPack.java | 2 +- .../com/dfsek/terra/config/base/ConfigPackTemplate.java | 8 ++++++++ src/main/resources/lang/en_us.yml | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/dfsek/terra/config/base/ConfigPack.java b/src/main/java/com/dfsek/terra/config/base/ConfigPack.java index 739842d19..f40b79785 100644 --- a/src/main/java/com/dfsek/terra/config/base/ConfigPack.java +++ b/src/main/java/com/dfsek/terra/config/base/ConfigPack.java @@ -107,7 +107,7 @@ public class ConfigPack { load(new FolderLoader(folder.toPath())); - LangUtil.log("config-pack.loaded", Level.INFO, template.getID(), String.valueOf((System.nanoTime() - l) / 1000000D)); + LangUtil.log("config-pack.loaded", Level.INFO, template.getID(), String.valueOf((System.nanoTime() - l) / 1000000D), template.getAuthor()); } public ConfigPack(ZipFile file) throws ConfigException { diff --git a/src/main/java/com/dfsek/terra/config/base/ConfigPackTemplate.java b/src/main/java/com/dfsek/terra/config/base/ConfigPackTemplate.java index 452608ed5..cf5ad12c9 100644 --- a/src/main/java/com/dfsek/terra/config/base/ConfigPackTemplate.java +++ b/src/main/java/com/dfsek/terra/config/base/ConfigPackTemplate.java @@ -85,10 +85,18 @@ public class ConfigPackTemplate implements ConfigTemplate { @Default private boolean vanillaStructures = false; + @Value("author") + @Default + private String author = "Anon Y. Mous"; + public String getID() { return id; } + public String getAuthor() { + return author; + } + public boolean vanillaMobs() { return vanillaMobs; } diff --git a/src/main/resources/lang/en_us.yml b/src/main/resources/lang/en_us.yml index f5b4e5fba..2c7228527 100644 --- a/src/main/resources/lang/en_us.yml +++ b/src/main/resources/lang/en_us.yml @@ -88,7 +88,7 @@ world-config: error: "Unable to load configuration for world %s" done: "World load complete. Time elapsed: %sms" config-pack: - loaded: "Loaded config %1$s in %2$sms." + loaded: "config %1$s by %3$s loaded in %2$sms." config: loaded: "Loaded %1$s from file %2$s" loaded-all: "Loaded %1$s %2$s(s) in %3$sms."