pass player brush manager directly

Author: david

src/main/java/net/onelitefeather/bettergopaint/BetterGoPaint.java

@@ -120,9 +120,9 @@ private void registerCommands() {
 
     private void registerListeners() {
         PluginManager pm = getServer().getPluginManager();
-        pm.registerEvents(new ConnectListener(this), this);
+        pm.registerEvents(new InventoryListener(getBrushManager()), this);
         pm.registerEvents(new InteractListener(this), this);
-        pm.registerEvents(new InventoryListener(this), this);
+        pm.registerEvents(new ConnectListener(getBrushManager()), this);
     }
 
     private boolean hasOriginalGoPaint() {

src/main/java/net/onelitefeather/bettergopaint/listeners/ConnectListener.java

@@ -18,23 +18,23 @@
  */
 package net.onelitefeather.bettergopaint.listeners;
 
-import net.onelitefeather.bettergopaint.BetterGoPaint;
+import net.onelitefeather.bettergopaint.brush.PlayerBrushManager;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerQuitEvent;
 
 public class ConnectListener implements Listener {
 
-    private final BetterGoPaint plugin;
+    private final PlayerBrushManager brushManager;
 
-    public ConnectListener(BetterGoPaint plugin) {
-        this.plugin = plugin;
+    public ConnectListener(PlayerBrushManager brushManager) {
+        this.brushManager = brushManager;
     }
 
     @EventHandler(priority = EventPriority.LOWEST)
     public void onQuit(PlayerQuitEvent event) {
-        plugin.getBrushManager().removeBrush(event.getPlayer());
+        brushManager.removeBrush(event.getPlayer());
     }
 
 }

src/main/java/net/onelitefeather/bettergopaint/listeners/InventoryListener.java

@@ -19,8 +19,8 @@
 package net.onelitefeather.bettergopaint.listeners;
 
 import net.kyori.adventure.text.TextComponent;
-import net.onelitefeather.bettergopaint.BetterGoPaint;
 import net.onelitefeather.bettergopaint.brush.PlayerBrush;
+import net.onelitefeather.bettergopaint.brush.PlayerBrushManager;
 import net.onelitefeather.bettergopaint.objects.brush.AngleBrush;
 import net.onelitefeather.bettergopaint.objects.brush.Brush;
 import net.onelitefeather.bettergopaint.objects.brush.DiscBrush;
@@ -45,10 +45,10 @@
 
 public final class InventoryListener implements Listener {
 
-    private final BetterGoPaint plugin;
+    private final PlayerBrushManager brushManager;
 
-    public InventoryListener(BetterGoPaint plugin) {
-        this.plugin = plugin;
+    public InventoryListener(PlayerBrushManager brushManager) {
+        this.brushManager = brushManager;
     }
 
     @EventHandler(priority = EventPriority.LOWEST)
@@ -65,7 +65,7 @@ public void menuClick(InventoryClickEvent event) {
             }
             return;
         }
-        PlayerBrush playerBrush = plugin.getBrushManager().getBrush(player);
+        PlayerBrush playerBrush = brushManager.getBrush(player);
         if (event.getRawSlot() == 10 || event.getRawSlot() == 1 || event.getRawSlot() == 19) {
             if (event.getClick().equals(ClickType.LEFT)) {
                 if (!event.getCursor().getType().isBlock()) {
@@ -210,7 +210,7 @@ public void menuBrushClick(InventoryClickEvent event) {
             return;
         }
 
-        PlayerBrush playerBrush = plugin.getBrushManager().getBrush(player);
+        PlayerBrush playerBrush = brushManager.getBrush(player);
 
         ItemMeta itemMeta = event.getCurrentItem().getItemMeta();
 
@@ -220,7 +220,7 @@ public void menuBrushClick(InventoryClickEvent event) {
 
         //noinspection deprecation
         String name = itemMeta.getDisplayName().replace("§6", "");
-        plugin.getBrushManager().getBrushHandler(name).ifPresent(brush -> {
+        brushManager.getBrushHandler(name).ifPresent(brush -> {
             playerBrush.setBrush(brush);
             playerBrush.updateInventory();
             player.openInventory(playerBrush.getInventory());