From 99e8fa7b832d237cab421707a0ddf52bc056c542 Mon Sep 17 00:00:00 2001 From: RaphiMC <50594595+RaphiMC@users.noreply.github.com> Date: Tue, 15 Aug 2023 01:49:41 +0200 Subject: [PATCH] Use full implementation version as subplatform name --- build.gradle | 10 ++++++++++ src/main/java/net/raphimc/vialegacy/ViaLegacy.java | 1 + .../raphimc/vialegacy/platform/ViaLegacyPlatform.java | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 0bea8fb..e53886b 100644 --- a/build.gradle +++ b/build.gradle @@ -30,6 +30,7 @@ dependencies { blossom { replaceToken("\${version}", project.version, "src/main/java/net/raphimc/vialegacy/ViaLegacy.java") + replaceToken("\${impl_version}", "git-${project.archivesBaseName}-${project.version}:${latestCommitHash()}", "src/main/java/net/raphimc/vialegacy/ViaLegacy.java") } java { @@ -87,3 +88,12 @@ publishing { } } } + +String latestCommitHash() { + def stdout = new ByteArrayOutputStream() + exec { + commandLine "git", "rev-parse", "--short", "HEAD" + standardOutput = stdout + } + return stdout.toString().trim() +} diff --git a/src/main/java/net/raphimc/vialegacy/ViaLegacy.java b/src/main/java/net/raphimc/vialegacy/ViaLegacy.java index 7cb3051..b1ca715 100644 --- a/src/main/java/net/raphimc/vialegacy/ViaLegacy.java +++ b/src/main/java/net/raphimc/vialegacy/ViaLegacy.java @@ -23,6 +23,7 @@ import net.raphimc.vialegacy.platform.ViaLegacyPlatform; public class ViaLegacy { public static final String VERSION = "${version}"; + public static final String IMPL_VERSION = "${impl_version}"; private static ViaLegacyPlatform platform; private static ViaLegacyConfig config; diff --git a/src/main/java/net/raphimc/vialegacy/platform/ViaLegacyPlatform.java b/src/main/java/net/raphimc/vialegacy/platform/ViaLegacyPlatform.java index 0402ac0..12ce286 100644 --- a/src/main/java/net/raphimc/vialegacy/platform/ViaLegacyPlatform.java +++ b/src/main/java/net/raphimc/vialegacy/platform/ViaLegacyPlatform.java @@ -74,7 +74,7 @@ public interface ViaLegacyPlatform { final ViaLegacyConfig config = new ViaLegacyConfig(new File(dataFolder, "vialegacy.yml")); config.reloadConfig(); ViaLegacy.init(this, config); - Via.getManager().getSubPlatforms().add("ViaLegacy-" + ViaLegacy.VERSION); + Via.getManager().getSubPlatforms().add(ViaLegacy.IMPL_VERSION); final ProtocolManager protocolManager = Via.getManager().getProtocolManager(); protocolManager.registerProtocol(new Protocol1_8to1_7_6_10(), ProtocolVersion.v1_8, ProtocolVersion.v1_7_6);