From 7c72d388e6b9ed0add1bde040d235f040c59ead3 Mon Sep 17 00:00:00 2001
From: Auxilor <will@willfp.com>
Date: Fri, 11 Dec 2020 18:19:14 +0000
Subject: [PATCH] Cleaned up main class

---
 .../willfp/ecoenchants/EcoEnchantsPlugin.java | 19 ++++++++++++++-----
 .../display/AbstractPacketAdapter.java        |  4 ++--
 .../ecoenchants/util/internal/Loader.java     |  2 --
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java b/Plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java
index bac9b8c3..c500c13d 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java
@@ -1,5 +1,6 @@
 package com.willfp.ecoenchants;
 
+import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.ProtocolManager;
 import com.willfp.ecoenchants.extensions.loader.EcoExtensionLoader;
 import com.willfp.ecoenchants.extensions.loader.ExtensionLoader;
@@ -21,16 +22,16 @@ public class EcoEnchantsPlugin extends JavaPlugin {
      */
     private final ExtensionLoader loader = new EcoExtensionLoader();
 
+    /**
+     * ProtocolLib
+     */
+    private final ProtocolManager protocolManager = ProtocolLibrary.getProtocolManager();
+
     /**
      * NMS version
      */
     public static final String NMS_VERSION = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
 
-    /**
-     * ProtocolLib
-     */
-    public ProtocolManager protocolManager;
-
     /**
      * Calls {@link Loader#load()}
      */
@@ -60,6 +61,14 @@ public class EcoEnchantsPlugin extends JavaPlugin {
         return loader;
     }
 
+    /**
+     * Get ProtocolLib protocol manager
+     * @return The {@link ProtocolManager} that EcoEnchants interacts with
+     */
+    public ProtocolManager getProtocolManager() {
+        return protocolManager;
+    }
+
     /**
      * Get plugin instance
      * @return Plugin instance
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/display/AbstractPacketAdapter.java b/Plugin/src/main/java/com/willfp/ecoenchants/display/AbstractPacketAdapter.java
index b617a6c5..566f7593 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/display/AbstractPacketAdapter.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/display/AbstractPacketAdapter.java
@@ -49,8 +49,8 @@ public abstract class AbstractPacketAdapter extends PacketAdapter {
     }
 
     public final void register() {
-        if(!EcoEnchantsPlugin.getInstance().protocolManager.getPacketListeners().contains(this)) {
-            EcoEnchantsPlugin.getInstance().protocolManager.addPacketListener(this);
+        if(!EcoEnchantsPlugin.getInstance().getProtocolManager().getPacketListeners().contains(this)) {
+            EcoEnchantsPlugin.getInstance().getProtocolManager().addPacketListener(this);
         }
     }
 }
diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/Loader.java b/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/Loader.java
index f6cd2373..87c9bb2b 100644
--- a/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/Loader.java
+++ b/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/Loader.java
@@ -1,6 +1,5 @@
 package com.willfp.ecoenchants.util.internal;
 
-import com.comphenix.protocol.ProtocolLibrary;
 import com.willfp.ecoenchants.EcoEnchantsPlugin;
 import com.willfp.ecoenchants.command.commands.CommandEcodebug;
 import com.willfp.ecoenchants.command.commands.CommandEcoreload;
@@ -102,7 +101,6 @@ public class Loader {
          */
 
         Logger.info("Loading ProtocolLib...");
-        EcoEnchantsPlugin.getInstance().protocolManager = ProtocolLibrary.getProtocolManager();
         if (ConfigManager.getConfig().getBool("villager.enabled")) {
             new PacketOpenWindowMerchant().register();
         }