From 697ad1b3cec98eb6f51bdd715cce3cb36de850d1 Mon Sep 17 00:00:00 2001 From: Intelli Date: Sun, 1 Aug 2021 16:53:14 -0600 Subject: [PATCH] Minor cleanup in adapters --- .../net/coreprotect/bukkit/BukkitAdapter.java | 20 +++++++------- .../net/coreprotect/paper/PaperAdapter.java | 26 +++++++++---------- .../net/coreprotect/spigot/SpigotAdapter.java | 26 +++++++++---------- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/main/java/net/coreprotect/bukkit/BukkitAdapter.java b/src/main/java/net/coreprotect/bukkit/BukkitAdapter.java index 15c0311..1dbe09a 100644 --- a/src/main/java/net/coreprotect/bukkit/BukkitAdapter.java +++ b/src/main/java/net/coreprotect/bukkit/BukkitAdapter.java @@ -22,25 +22,25 @@ import net.coreprotect.utility.Util; public class BukkitAdapter implements BukkitInterface { public static BukkitInterface ADAPTER; - public static final int BUKKIT_v1_13 = 13; - public static final int BUKKIT_v1_14 = 14; - public static final int BUKKIT_v1_15 = 15; - public static final int BUKKIT_v1_16 = 16; - public static final int BUKKIT_v1_17 = 17; + public static final int BUKKIT_V1_13 = 13; + public static final int BUKKIT_V1_14 = 14; + public static final int BUKKIT_V1_15 = 15; + public static final int BUKKIT_V1_16 = 16; + public static final int BUKKIT_V1_17 = 17; public static void loadAdapter() { switch (ConfigHandler.SERVER_VERSION) { - case BUKKIT_v1_13: - case BUKKIT_v1_14: + case BUKKIT_V1_13: + case BUKKIT_V1_14: BukkitAdapter.ADAPTER = new BukkitAdapter(); break; - case BUKKIT_v1_15: + case BUKKIT_V1_15: BukkitAdapter.ADAPTER = new Bukkit_v1_15(); break; - case BUKKIT_v1_16: + case BUKKIT_V1_16: BukkitAdapter.ADAPTER = new Bukkit_v1_16(); break; - case BUKKIT_v1_17: + case BUKKIT_V1_17: default: BukkitAdapter.ADAPTER = new Bukkit_v1_17(); break; diff --git a/src/main/java/net/coreprotect/paper/PaperAdapter.java b/src/main/java/net/coreprotect/paper/PaperAdapter.java index 26cf0eb..f55db21 100644 --- a/src/main/java/net/coreprotect/paper/PaperAdapter.java +++ b/src/main/java/net/coreprotect/paper/PaperAdapter.java @@ -10,29 +10,29 @@ public class PaperAdapter implements PaperInterface { public static PaperInterface ADAPTER; public static final int PAPER_UNAVAILABLE = 0; - public static final int PAPER_v1_13 = BukkitAdapter.BUKKIT_v1_13; - public static final int PAPER_v1_14 = BukkitAdapter.BUKKIT_v1_14; - public static final int PAPER_v1_15 = BukkitAdapter.BUKKIT_v1_15; - public static final int PAPER_v1_16 = BukkitAdapter.BUKKIT_v1_16; - public static final int PAPER_v1_17 = BukkitAdapter.BUKKIT_v1_17; + public static final int PAPER_V1_13 = BukkitAdapter.BUKKIT_V1_13; + public static final int PAPER_V1_14 = BukkitAdapter.BUKKIT_V1_14; + public static final int PAPER_V1_15 = BukkitAdapter.BUKKIT_V1_15; + public static final int PAPER_V1_16 = BukkitAdapter.BUKKIT_V1_16; + public static final int PAPER_V1_17 = BukkitAdapter.BUKKIT_V1_17; public static void loadAdapter() { - int PAPER_VERSION = ConfigHandler.SERVER_VERSION; + int paperVersion = ConfigHandler.SERVER_VERSION; if (!ConfigHandler.isPaper) { - PAPER_VERSION = PAPER_UNAVAILABLE; + paperVersion = PAPER_UNAVAILABLE; } - switch (PAPER_VERSION) { + switch (paperVersion) { case PAPER_UNAVAILABLE: PaperAdapter.ADAPTER = new PaperAdapter(); break; - case PAPER_v1_13: - case PAPER_v1_14: - case PAPER_v1_15: + case PAPER_V1_13: + case PAPER_V1_14: + case PAPER_V1_15: PaperAdapter.ADAPTER = new PaperHandler(); break; - case PAPER_v1_16: - case PAPER_v1_17: + case PAPER_V1_16: + case PAPER_V1_17: default: PaperAdapter.ADAPTER = new Paper_v1_16(); break; diff --git a/src/main/java/net/coreprotect/spigot/SpigotAdapter.java b/src/main/java/net/coreprotect/spigot/SpigotAdapter.java index c8e4baf..d47c13c 100644 --- a/src/main/java/net/coreprotect/spigot/SpigotAdapter.java +++ b/src/main/java/net/coreprotect/spigot/SpigotAdapter.java @@ -13,29 +13,29 @@ public class SpigotAdapter implements SpigotInterface { public static SpigotInterface ADAPTER; public static final int SPIGOT_UNAVAILABLE = 0; - public static final int SPIGOT_v1_13 = BukkitAdapter.BUKKIT_v1_13; - public static final int SPIGOT_v1_14 = BukkitAdapter.BUKKIT_v1_14; - public static final int SPIGOT_v1_15 = BukkitAdapter.BUKKIT_v1_15; - public static final int SPIGOT_v1_16 = BukkitAdapter.BUKKIT_v1_16; - public static final int SPIGOT_v1_17 = BukkitAdapter.BUKKIT_v1_17; + public static final int SPIGOT_V1_13 = BukkitAdapter.BUKKIT_V1_13; + public static final int SPIGOT_V1_14 = BukkitAdapter.BUKKIT_V1_14; + public static final int SPIGOT_V1_15 = BukkitAdapter.BUKKIT_V1_15; + public static final int SPIGOT_V1_16 = BukkitAdapter.BUKKIT_V1_16; + public static final int SPIGOT_V1_17 = BukkitAdapter.BUKKIT_V1_17; public static void loadAdapter() { - int SPIGOT_VERSION = ConfigHandler.SERVER_VERSION; + int spigotVersion = ConfigHandler.SERVER_VERSION; if (!ConfigHandler.isSpigot) { - SPIGOT_VERSION = SPIGOT_UNAVAILABLE; + spigotVersion = SPIGOT_UNAVAILABLE; } - switch (SPIGOT_VERSION) { + switch (spigotVersion) { case SPIGOT_UNAVAILABLE: SpigotAdapter.ADAPTER = new SpigotAdapter(); break; - case SPIGOT_v1_13: - case SPIGOT_v1_14: - case SPIGOT_v1_15: + case SPIGOT_V1_13: + case SPIGOT_V1_14: + case SPIGOT_V1_15: SpigotAdapter.ADAPTER = new SpigotHandler(); break; - case SPIGOT_v1_16: - case SPIGOT_v1_17: + case SPIGOT_V1_16: + case SPIGOT_V1_17: default: SpigotAdapter.ADAPTER = new Spigot_v1_16(); break;