From d4265f1f709d898f06999237dda242c6a3173129 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 1 Dec 2020 19:14:01 +0000 Subject: [PATCH] Removed legacy NMS version getters --- .../src/main/java/com/willfp/ecoenchants/nms/Cooldown.java | 6 ++---- .../main/java/com/willfp/ecoenchants/nms/TridentStack.java | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/nms/Cooldown.java b/Plugin/src/main/java/com/willfp/ecoenchants/nms/Cooldown.java index 55a8c9f0..04cac94c 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/nms/Cooldown.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/nms/Cooldown.java @@ -1,8 +1,8 @@ package com.willfp.ecoenchants.nms; +import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.nms.API.CooldownWrapper; -import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.jetbrains.annotations.ApiStatus; @@ -12,12 +12,10 @@ import org.jetbrains.annotations.ApiStatus; public class Cooldown { private static CooldownWrapper cooldown; - private static final String version = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3]; - @ApiStatus.Internal public static boolean init() { try { - final Class class2 = Class.forName("com.willfp.ecoenchants." + version + ".Cooldown"); + final Class class2 = Class.forName("com.willfp.ecoenchants." + EcoEnchantsPlugin.NMS_VERSION + ".Cooldown"); if (CooldownWrapper.class.isAssignableFrom(class2)) { cooldown = (CooldownWrapper) class2.getConstructor().newInstance(); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/nms/TridentStack.java b/Plugin/src/main/java/com/willfp/ecoenchants/nms/TridentStack.java index 1f269ebd..6e1b8efa 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/nms/TridentStack.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/nms/TridentStack.java @@ -1,8 +1,8 @@ package com.willfp.ecoenchants.nms; +import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.nms.API.TridentStackWrapper; -import org.bukkit.Bukkit; import org.bukkit.entity.Trident; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.ApiStatus; @@ -13,12 +13,10 @@ import org.jetbrains.annotations.ApiStatus; public class TridentStack { private static TridentStackWrapper tridentStackWrapper; - private static final String version = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3]; - @ApiStatus.Internal public static boolean init() { try { - final Class class2 = Class.forName("com.willfp.ecoenchants." + version + ".TridentStack"); + final Class class2 = Class.forName("com.willfp.ecoenchants." + EcoEnchantsPlugin.NMS_VERSION + ".TridentStack"); if (TridentStackWrapper.class.isAssignableFrom(class2)) { tridentStackWrapper = (TridentStackWrapper) class2.getConstructor().newInstance(); }