From 8b5ec41de0d0121c5dab3371035b04ebfae352f3 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Tue, 2 Oct 2018 19:18:21 -0400 Subject: [PATCH] Add API Version flag for 1.13+ Bukkit plugins Fixes GH-453 --- .../com/demonwav/mcdev/platform/bukkit/BukkitTemplate.kt | 8 ++++++++ .../j2ee/bukkit_plugin_description_file.yml.ft | 3 +++ 2 files changed, 11 insertions(+) diff --git a/src/main/kotlin/com/demonwav/mcdev/platform/bukkit/BukkitTemplate.kt b/src/main/kotlin/com/demonwav/mcdev/platform/bukkit/BukkitTemplate.kt index 12cd8fbd2..d40bc8f7b 100644 --- a/src/main/kotlin/com/demonwav/mcdev/platform/bukkit/BukkitTemplate.kt +++ b/src/main/kotlin/com/demonwav/mcdev/platform/bukkit/BukkitTemplate.kt @@ -101,6 +101,14 @@ object BukkitTemplate { properties.setProperty("HAS_WEBSITE", "true") } + // Plugins targeting 1.13 or newer need an explicit api declaration flag + // Unfortunately this flag has no contract to match any specific API version + val mcVer = settings.minecraftVersion.substring(0, 4).toDoubleOrNull() + if (mcVer != null && mcVer >= 1.13) { + properties.setProperty("API_VERSION", "1.13") + properties.setProperty("HAS_API_VERSION", "true") + } + BaseTemplate.applyTemplate(project, file, MinecraftFileTemplateGroupFactory.BUKKIT_PLUGIN_YML_TEMPLATE, properties, true) } } diff --git a/src/main/resources/fileTemplates/j2ee/bukkit_plugin_description_file.yml.ft b/src/main/resources/fileTemplates/j2ee/bukkit_plugin_description_file.yml.ft index 1db7ea2e8..fcbb600a9 100644 --- a/src/main/resources/fileTemplates/j2ee/bukkit_plugin_description_file.yml.ft +++ b/src/main/resources/fileTemplates/j2ee/bukkit_plugin_description_file.yml.ft @@ -1,6 +1,9 @@ name: ${NAME} version: ${VERSION} main: ${MAIN} +#if (${HAS_API_VERSION}) +api-version: ${API_VERSION} +#end #if (${HAS_PREFIX}) prefix: ${PREFIX} #end