diff --git a/src/main/java/net/arcaniax/gopaint/GoPaintPlugin.java b/src/main/java/net/arcaniax/gopaint/GoPaintPlugin.java index f4ba153..952bd91 100644 --- 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 index 8cb2f10..b8a4e52 100644 --- 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 deleted file mode 100644 index 2022724..0000000 --- a/src/main/java/net/arcaniax/gopaint/objects/other/NmsManager.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * goPaint is designed to simplify painting inside of Minecraft. - * Copyright (C) Arcaniax-Development - * Copyright (C) Arcaniax team and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package net.arcaniax.gopaint.objects.other; - -import net.arcaniax.gopaint.GoPaintPlugin; - -public class NmsManager { - - String version; - - public NmsManager() { - String a = GoPaintPlugin.getGoPaintPlugin().getServer().getClass().getPackage().getName(); - version = a.substring(a.lastIndexOf('.') + 1); - } - - public boolean isVersion(String v) { - return version.equalsIgnoreCase(v); - } - - public boolean isVersion(int gameV, int releaseV, int subReleaseV) { - return version.equalsIgnoreCase("v" + gameV + "_" + releaseV + "_R" + subReleaseV); - } - - public boolean isAtLeastVersion(int gameV, int releaseV, int subReleaseV) { - String[] split = version.split("_"); - int game = Integer.parseInt(split[0].toLowerCase().replace("v", "")); - int release = Integer.parseInt(split[1]); - int subRelease = Integer.parseInt(split[2].toLowerCase().replace("r", "")); - - if (game > gameV) { - return true; - } else if (game < gameV) { - return false; - } else { - if (release > releaseV) { - return true; - } else if (release < releaseV) { - return false; - } else { - return subRelease >= subReleaseV; - } - } - } - -}