From b952ad71f8780fbf255c3553469cc85665735940 Mon Sep 17 00:00:00 2001 From: Butzlabben Date: Wed, 1 May 2019 14:12:22 +0200 Subject: [PATCH] Added 1.14 compatibility --- .../java/de/butzlabben/world/WorldSystem.java | 9 ++-- .../de/butzlabben/world/util/VersionUtil.java | 52 +++++++++++++++++++ 2 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 src/main/java/de/butzlabben/world/util/VersionUtil.java diff --git a/src/main/java/de/butzlabben/world/WorldSystem.java b/src/main/java/de/butzlabben/world/WorldSystem.java index 606efa7..5eab96c 100644 --- a/src/main/java/de/butzlabben/world/WorldSystem.java +++ b/src/main/java/de/butzlabben/world/WorldSystem.java @@ -5,6 +5,7 @@ import de.butzlabben.world.command.*; import de.butzlabben.world.config.*; import de.butzlabben.world.listener.*; import de.butzlabben.world.util.PapiExtension; +import de.butzlabben.world.util.VersionUtil; import de.butzlabben.world.util.database.DatabaseRepository; import de.butzlabben.world.wrapper.AsyncCreatorAdapter; import de.butzlabben.world.wrapper.CreatorAdapter; @@ -32,13 +33,13 @@ public class WorldSystem extends JavaPlugin { private CreatorAdapter creator; - private static boolean is1_13 = false; + private static boolean is1_13Plus = false; @Override public void onEnable() { //Set right version - if (Bukkit.getVersion().contains("1.13") || Bukkit.getVersion().contains("1_13")) - is1_13 = true; + if (VersionUtil.getVersion() >= 13) + is1_13Plus = true; createConfigs(); @@ -190,6 +191,6 @@ public class WorldSystem extends JavaPlugin { } public static boolean is1_13() { - return is1_13; + return is1_13Plus; } } diff --git a/src/main/java/de/butzlabben/world/util/VersionUtil.java b/src/main/java/de/butzlabben/world/util/VersionUtil.java new file mode 100644 index 0000000..8d682d0 --- /dev/null +++ b/src/main/java/de/butzlabben/world/util/VersionUtil.java @@ -0,0 +1,52 @@ +package de.butzlabben.world.util; + +import org.bukkit.Bukkit; + +/** + * @author Butzlabben + * @since 14.08.2018 + */ +public class VersionUtil { + + private static int version; + + public static int getVersion() { + if (version == 0) { + // Detect version + String v = Bukkit.getVersion(); + if (v.contains("1.14")) + version = 14; + else if (v.contains("1.13")) + version = 13; + else if (v.contains("1.12")) + version = 12; + else if (v.contains("1.11")) + version = 11; + else if (v.contains("1.10")) + version = 10; + else if (v.contains("1.9")) + version = 9; + else if (v.contains("1.8")) + version = 8; + else if (v.contains("1.7")) + version = 7; + else if (v.contains("1.6")) + version = 6; + else if (v.contains("1.5")) + version = 5; + else if (v.contains("1.4")) + version = 4; + else if (v.contains("1.3")) + version = 3; + } + if (version == 0) { + System.err.println("[WorldSystem] Unknown version: " + Bukkit.getVersion()); + System.err.println("WorldSystem] Choosing version 1.12.2"); + version = 12; + } + return version; + } + + private VersionUtil() { + } +}