From 8a20b49bfdfa589538b02edbe53fb4b30505c47e Mon Sep 17 00:00:00 2001 From: GeorgH93 Date: Mon, 24 Jul 2023 22:44:59 +0200 Subject: [PATCH] Add missing build timestamp when using plugin with paper --- .../Minepacks-Bootstrap-Paper/resources/paper-plugin.yml | 4 ++-- Minepacks/pom.xml | 4 ---- Minepacks/resources/plugin.yml | 2 +- .../Minepacks/Bukkit/Command/DebugCommand.java | 2 +- pom.xml | 5 +++++ 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Components/Minepacks-Bootstrap-Paper/resources/paper-plugin.yml b/Components/Minepacks-Bootstrap-Paper/resources/paper-plugin.yml index e79c0bf..3d0dbd8 100644 --- a/Components/Minepacks-Bootstrap-Paper/resources/paper-plugin.yml +++ b/Components/Minepacks-Bootstrap-Paper/resources/paper-plugin.yml @@ -1,6 +1,6 @@ name: "Minepacks" -author: "GeorgH93" -version: "${version}" +author: "${author}" +version: "${pluginVersion}" api-version: "1.19" main: "at.pcgamingfreaks.MinepacksStandalone.Bukkit.Minepacks" diff --git a/Minepacks/pom.xml b/Minepacks/pom.xml index 8f726bf..32fc28c 100644 --- a/Minepacks/pom.xml +++ b/Minepacks/pom.xml @@ -16,10 +16,6 @@ https://www.spigotmc.org/resources/19286/ - GeorgH93 - yyyyMMddHHmmss - ${maven.build.timestamp} - ${project.version}-T${timestamp} PCGF_PluginLib ${project.groupId}.${project.artifactId}.Bukkit.${project.artifactId} diff --git a/Minepacks/resources/plugin.yml b/Minepacks/resources/plugin.yml index 1ff8a3a..e99d469 100644 --- a/Minepacks/resources/plugin.yml +++ b/Minepacks/resources/plugin.yml @@ -3,7 +3,7 @@ author: "${author}" website: "${project.url}" main: "${mainClass}" description: "${project.description}" -version: "${version}" +version: "${pluginVersion}" api-version: "1.13" depend: [${dependencies}] softdepend: [MVdWPlaceholderAPI, PlaceholderAPI ${soft-dependencies}] diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/DebugCommand.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/DebugCommand.java index 259c133..9b045c3 100644 --- a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/DebugCommand.java +++ b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Command/DebugCommand.java @@ -206,7 +206,7 @@ public class DebugCommand extends MinepacksCommand { if (args.length == 1) { - List completeList = new ArrayList<>(2); + List completeList = new ArrayList<>(3); if ("size".startsWith(args[0])) { completeList.add("size"); } if ("system".startsWith(args[0])) { completeList.add("system"); } if ("permissions".startsWith(args[0])) { completeList.add("permissions"); } diff --git a/pom.xml b/pom.xml index 2dae450..b2cc028 100644 --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,11 @@ 1.15.2-R0.1-SNAPSHOT 3.4.1 + GeorgH93 + yyyyMMddHHmmss + ${maven.build.timestamp} + ${project.version}-T${timestamp} + georgh93 https://sonarcloud.io