Multi-ver support. Allow 1.21.1 versions

Dueris · Aug 10, 2024 · 084cf8a · 084cf8a
1 parent fcf9d83
commit 084cf8a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -64,7 +64,8 @@ allprojects {
                 "mcVer" to mcVer,
                 "pluginVer" to pluginVer,
                 "fullVer" to "mc$mcVer-$pluginVer",
-                "apiVer" to "1.$mcMajorVer"
+                "apiVer" to "1.$mcMajorVer",
+                "supportedVersions" to listOf("1.21", "1.21.1")
             )
             inputs.properties(props)
             filesMatching("paper-plugin.yml") {

diff --git a/origins/src/main/java/me/dueris/originspaper/OriginsPaper.java b/origins/src/main/java/me/dueris/originspaper/OriginsPaper.java
@@ -152,7 +152,8 @@ public void finalizePreboot() {
 				String contents = new String(bytes, StandardCharsets.UTF_8);
 				YamlConfiguration yamlConfiguration = new YamlConfiguration();
 				yamlConfiguration.loadFromString(contents);
-				versions.add(yamlConfiguration.getString("supportedVer"));
+				if (!yamlConfiguration.contains("supportedVersions")) throw new RuntimeException("Supported Versions list not found in plugin yaml!");
+				versions.addAll(yamlConfiguration.getStringList("supportedVersions"));
 				LANGUAGE = yamlConfiguration.getString("default-language");
 			} catch (InvalidConfigurationException | IOException var8) {
 				throw new RuntimeException(var8);
@@ -213,7 +214,7 @@ public void onEnable() {
 				if (isCorrectVersion) {
 					this.getLogger().severe("Unable to start OriginsPaper due to it not being compatible with this server type");
 				} else {
-					this.getLogger().severe("Unable to start OriginsPaper due to it not being compatible with this server version");
+					this.getLogger().severe("Unable to start OriginsPaper due to it not being compatible with this server version, {}".replace("{}", version));
 				}
 
 				Bukkit.getLogger().info("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");

diff --git a/origins/src/main/resources/paper-plugin.yml b/origins/src/main/resources/paper-plugin.yml
@@ -24,5 +24,5 @@ dependencies:
       load: BEFORE
       required: false
 
-supportedVer: "${mcVer}"
+supportedVersions: ${supportedVersions}
 default-language: "en_us"