From ce2a36dbd657a2db5a52f690e0c9f5d192558022 Mon Sep 17 00:00:00 2001 From: Ryan <12160169+TheRealRyGuy@users.noreply.github.com> Date: Mon, 27 Mar 2023 22:56:09 -0400 Subject: [PATCH] Fix PluginMeta#getDisplayName (#9038) * fix plugin versioning * fix properly * fix version command * ngl idk where my logic was behind this --- patches/server/0013-Paper-Plugins.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/server/0013-Paper-Plugins.patch b/patches/server/0013-Paper-Plugins.patch index a3f4685bf..b5e6053b8 100644 --- a/patches/server/0013-Paper-Plugins.patch +++ b/patches/server/0013-Paper-Plugins.patch @@ -813,7 +813,7 @@ index 0000000000000000000000000000000000000000..f9a2c55a354c877749db3f92956de802 +} diff --git a/src/main/java/io/papermc/paper/plugin/entrypoint/classloader/PaperPluginClassLoader.java b/src/main/java/io/papermc/paper/plugin/entrypoint/classloader/PaperPluginClassLoader.java new file mode 100644 -index 0000000000000000000000000000000000000000..ecd11d3bd6c7e80a9b33cb8c2d7ed8a582857533 +index 0000000000000000000000000000000000000000..79995ab1b624d7c7aaaa467a86255ad97385cf72 --- /dev/null +++ b/src/main/java/io/papermc/paper/plugin/entrypoint/classloader/PaperPluginClassLoader.java @@ -0,0 +1,207 @@ @@ -966,7 +966,7 @@ index 0000000000000000000000000000000000000000..ecd11d3bd6c7e80a9b33cb8c2d7ed8a5 + PluginMeta config = this.configuration; + PluginDescriptionFile pluginDescriptionFile = new PluginDescriptionFile( + config.getName(), -+ config.getDisplayName(), ++ config.getName().replace('_', ' '), + config.getProvidedPlugins(), + config.getMainClass(), + "", // Classloader load order api @@ -4387,7 +4387,7 @@ index 0000000000000000000000000000000000000000..e3430f535e8e9c3b8b44bf2daece8c47 +} diff --git a/src/main/java/io/papermc/paper/plugin/provider/configuration/PaperPluginMeta.java b/src/main/java/io/papermc/paper/plugin/provider/configuration/PaperPluginMeta.java new file mode 100644 -index 0000000000000000000000000000000000000000..3808f5a9abc9f084cbabfc4cb95394cc37aaf4bb +index 0000000000000000000000000000000000000000..7605efe37ac4a63cb95c8c64c576e93c0e676cc0 --- /dev/null +++ b/src/main/java/io/papermc/paper/plugin/provider/configuration/PaperPluginMeta.java @@ -0,0 +1,227 @@ @@ -4500,7 +4500,7 @@ index 0000000000000000000000000000000000000000..3808f5a9abc9f084cbabfc4cb95394cc + .build(); + } + -+ pluginConfiguration.displayName = pluginConfiguration.name.replace('_', ' '); ++ pluginConfiguration.displayName = pluginConfiguration.name.replace('_', ' ') + " v" + pluginConfiguration.version; + + return pluginConfiguration; + }