From eb065aa6676aad214a5b5b449ae4b94d571262f5 Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Wed, 10 Jun 2020 15:30:11 +0800 Subject: [PATCH] Print logo on startup. --- arclight-common/src/main/resources/arclight.yml | 12 ------------ arclight-common/src/main/resources/log4j2.xml | 9 ++++++--- arclight-forge-1.14/build.gradle | 3 ++- .../main/java/io/izzel/arclight/server/Main.java | 14 ++++++++++++++ .../src/main/resources/META-INF/i18n/en_us.conf | 15 +++++++++++++++ .../src/main/resources/META-INF/i18n/zh_cn.conf | 15 +++++++++++++++ 6 files changed, 52 insertions(+), 16 deletions(-) delete mode 100644 arclight-common/src/main/resources/arclight.yml diff --git a/arclight-common/src/main/resources/arclight.yml b/arclight-common/src/main/resources/arclight.yml deleted file mode 100644 index a2b58d2a..00000000 --- a/arclight-common/src/main/resources/arclight.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################ -# Arclight configurations -# -# Repository https://github.com/IzzelAliz/Arclight -# Issue Tracker https://github.com/IzzelAliz/Arclight/issues -# -############################################################################ - -optimizations: - # The stream allocates useless garbage and hurts a lot of performance - # Arclight optimizes this by removing them - removeStreams: true diff --git a/arclight-common/src/main/resources/log4j2.xml b/arclight-common/src/main/resources/log4j2.xml index c1a27ab8..03477e15 100644 --- a/arclight-common/src/main/resources/log4j2.xml +++ b/arclight-common/src/main/resources/log4j2.xml @@ -21,10 +21,13 @@ - + - - + + diff --git a/arclight-forge-1.14/build.gradle b/arclight-forge-1.14/build.gradle index aaba13a3..617ab974 100644 --- a/arclight-forge-1.14/build.gradle +++ b/arclight-forge-1.14/build.gradle @@ -97,8 +97,9 @@ jar { manifest.attributes 'MixinConnector': 'io.izzel.arclight.common.mod.ArclightConnector' manifest.attributes 'Main-Class': 'io.izzel.arclight.server.Main' manifest.attributes 'Implementation-Title': 'Arclight' - manifest.attributes 'Implementation-Version': "arclight-${project.version}-${getGitHash()}" + manifest.attributes 'Implementation-Version': "arclight-$minecraftVersion-${project.version}-${getGitHash()}" manifest.attributes 'Implementation-Vendor': 'Arclight Team' + manifest.attributes 'Implementation-Timestamp': new Date().format("yyyy-MM-dd HH:mm:ss") from(configurations.embed.collect { it.isDirectory() ? it : zipTree(it) }) { exclude "META-INF/MANIFEST.MF" exclude "META-INF/*.SF" diff --git a/arclight-forge-1.14/src/main/java/io/izzel/arclight/server/Main.java b/arclight-forge-1.14/src/main/java/io/izzel/arclight/server/Main.java index 69d0fc17..234b1650 100644 --- a/arclight-forge-1.14/src/main/java/io/izzel/arclight/server/Main.java +++ b/arclight-forge-1.14/src/main/java/io/izzel/arclight/server/Main.java @@ -10,7 +10,10 @@ import io.izzel.arclight.i18n.ArclightConfig; import io.izzel.arclight.i18n.ArclightLocale; import net.minecraftforge.server.ServerMain; +import java.io.InputStream; import java.util.Objects; +import java.util.jar.Attributes; +import java.util.jar.Manifest; public class Main { @@ -31,6 +34,7 @@ public class Main { return; } try { + printLogo(); ArclightI18nLogger.getLogger("Arclight").info("loading-mapping"); Objects.requireNonNull(ArclightRemapper.INSTANCE); ServerMain.main(args); @@ -39,4 +43,14 @@ public class Main { System.err.println("Fail to launch Arclight."); } } + + private static void printLogo() throws Exception { + try (InputStream stream = Main.class.getResourceAsStream("/META-INF/MANIFEST.MF")) { + Manifest manifest = new Manifest(stream); + Attributes attributes = manifest.getMainAttributes(); + String version = attributes.getValue(Attributes.Name.IMPLEMENTATION_VERSION); + String buildTime = attributes.getValue("Implementation-Timestamp"); + ArclightI18nLogger.getLogger("Arclight").info("logo", version, buildTime); + } + } } diff --git a/i18n-config/src/main/resources/META-INF/i18n/en_us.conf b/i18n-config/src/main/resources/META-INF/i18n/en_us.conf index ccc5bb4e..3063c8a8 100644 --- a/i18n-config/src/main/resources/META-INF/i18n/en_us.conf +++ b/i18n-config/src/main/resources/META-INF/i18n/en_us.conf @@ -1,3 +1,18 @@ +logo = [ + "" + "" + " §1 ___ §9 §3 §6___§e §6 __ /\\" + " §1 / |§9 ____§3____§6/ §e(_)§6__ / / / /" + " §1 / /| |§9/ __§3/ __§6/ §e/ /§6 _ / _ \\/__/" + " §1 / ___ §9/ / §3/ /_§6/ §e/ /§6 / / // / /" + " §1/_/ |§9/_/ §3\\__§6/_§e/_/§6\\_ /_//_/ /" + " §1 §9 §3 §6 §e §6/__/ \\/" + "" + " §aVersion {}" + " §aBuild Date {}" + "" +] + i18n { current-not-available = "Current locale {0} is not available" using-language = "Using locale {0} and fallback locale {1}" diff --git a/i18n-config/src/main/resources/META-INF/i18n/zh_cn.conf b/i18n-config/src/main/resources/META-INF/i18n/zh_cn.conf index 46357ee4..447f6aa8 100644 --- a/i18n-config/src/main/resources/META-INF/i18n/zh_cn.conf +++ b/i18n-config/src/main/resources/META-INF/i18n/zh_cn.conf @@ -1,3 +1,18 @@ +logo = [ + "" + "" + " §1 ___ §9 §3 §6___§e §6 __ /\\" + " §1 / |§9 ____§3____§6/ §e(_)§6__ / / / /" + " §1 / /| |§9/ __§3/ __§6/ §e/ /§6 _ / _ \\/__/" + " §1 / ___ §9/ / §3/ /_§6/ §e/ /§6 / / // / /" + " §1/_/ |§9/_/ §3\\__§6/_§e/_/§6\\_ /_//_/ /" + " §1 §9 §3 §6 §e §6/__/ \\/" + "" + " §a运行版本 {}" + " §a构建日期 {}" + "" +] + i18n { current-not-available = "选择的语言 {0} 不可用" using-language = "正在使用 {0} 语言，{1} 作为备选语言"