Remove NMS Version Check (#124)

Removes the NmsManager checks for goPaint tool interaction Fixes the error on 1.20.5/6 servers
Arcaniax-Development · Jun 27, 2024 · 59ba578 · 59ba578
1 parent bd0c9f8
commit 59ba578
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 71 deletions.
diff --git a/src/main/java/net/arcaniax/gopaint/GoPaintPlugin.java b/src/main/java/net/arcaniax/gopaint/GoPaintPlugin.java
@@ -23,7 +23,6 @@
 import net.arcaniax.gopaint.listeners.ConnectListener;
 import net.arcaniax.gopaint.listeners.InteractListener;
 import net.arcaniax.gopaint.listeners.InventoryListener;
-import net.arcaniax.gopaint.objects.other.NmsManager;
 import net.arcaniax.gopaint.objects.other.Settings;
 import net.arcaniax.gopaint.objects.player.PlayerBrushManager;
 import net.arcaniax.gopaint.utils.DisabledBlocks;
@@ -40,7 +39,6 @@ public class GoPaintPlugin extends JavaPlugin implements Listener {
 
     private static final int BSTATS_ID = 10557;
     public static boolean plotSquaredEnabled;
-    public static NmsManager nmsManager;
     private static PlayerBrushManager manager;
     private static GoPaintPlugin goPaintPlugin;
     private static Settings settings;
@@ -88,7 +86,6 @@ public void onEnable() {
         pm.registerEvents(inventoryListener, this);
         pm.registerEvents(cmdHandler, this);
         getCommand("gopaint").setExecutor(cmdHandler);
-        nmsManager = new NmsManager();
         DisabledBlocks.addBlocks();
         // Check if we are in a safe environment
         ServerLib.checkUnsafeForks();

diff --git a/src/main/java/net/arcaniax/gopaint/listeners/InteractListener.java b/src/main/java/net/arcaniax/gopaint/listeners/InteractListener.java
@@ -23,7 +23,6 @@
 import net.arcaniax.gopaint.objects.player.PlayerBrush;
 import net.arcaniax.gopaint.utils.XMaterial;
 import org.bukkit.Location;
-import org.bukkit.Material;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -32,8 +31,6 @@
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.EquipmentSlot;
 
-import java.util.Set;
-
 public class InteractListener implements Listener {
 
     public GoPaintPlugin plugin;
@@ -45,10 +42,8 @@ public InteractListener(GoPaintPlugin main) {
     @SuppressWarnings("deprecation")
     @EventHandler(priority = EventPriority.LOWEST)
     public void onClick(PlayerInteractEvent e) {
-        if (GoPaintPlugin.nmsManager.isAtLeastVersion(1, 9, 0)) {
-            if (e.getHand() == EquipmentSlot.OFF_HAND) {
-                return;
-            }
+        if (e.getHand() == EquipmentSlot.OFF_HAND) {
+            return;
         }
         if (!e.getPlayer().hasPermission("gopaint.use")) {
             return;

diff --git a/src/main/java/net/arcaniax/gopaint/objects/other/NmsManager.java b/src/main/java/net/arcaniax/gopaint/objects/other/NmsManager.java