From 1aae3340a333361ddf21ea7197414a83662edd31 Mon Sep 17 00:00:00 2001 From: Sn0wStorm Date: Thu, 29 Oct 2020 17:34:12 +0100 Subject: [PATCH] Updated Dependencies for 1.16 --- pom.xml | 27 +++++++++++-------- .../integration/IntegrationListener.java | 3 +-- .../integration/item/MMOItemsPluginItem.java | 3 +-- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index ec73c01..66eea67 100644 --- a/pom.xml +++ b/pom.xml @@ -106,13 +106,18 @@ CodeMC https://repo.codemc.org/repository/maven-public + + + MMOPlugins + https://mvn.lumine.io/repository/maven-releases/ + - org.bukkit - bukkit - 1.15.2-R0.1-SNAPSHOT + org.spigotmc + spigot-api + 1.16.3-R0.1-SNAPSHOT provided @@ -146,7 +151,7 @@ com.sk89q.worldedit worldedit-bukkit - 7.1.0 + 7.2.0-SNAPSHOT provided @@ -158,7 +163,7 @@ com.sk89q.worldedit worldedit-core - 7.1.0 + 7.2.0-SNAPSHOT provided @@ -170,7 +175,7 @@ com.sk89q.worldguard worldguard-core - 7.0.2 + 7.0.4 provided @@ -188,7 +193,7 @@ com.github.TechFortress GriefPrevention - 16.13.0 + 16.16.0 provided @@ -217,15 +222,15 @@ provided --> - net.mmogroup - mmolib - 1.0.9 + net.Indyuce + MMOLib + 1.4.0 provided com.acrobot.chestshop chestshop - 3.10.1 + 3.11 provided diff --git a/src/com/dre/brewery/integration/IntegrationListener.java b/src/com/dre/brewery/integration/IntegrationListener.java index 712f8b1..de7e320 100644 --- a/src/com/dre/brewery/integration/IntegrationListener.java +++ b/src/com/dre/brewery/integration/IntegrationListener.java @@ -13,7 +13,6 @@ import com.dre.brewery.integration.item.MMOItemsPluginItem; import com.dre.brewery.recipe.BCauldronRecipe; import com.dre.brewery.recipe.RecipeItem; import com.dre.brewery.utility.LegacyUtil; -import net.mmogroup.mmolib.MMOLib; import net.mmogroup.mmolib.api.item.NBTItem; import org.bukkit.GameMode; import org.bukkit.Material; @@ -228,7 +227,7 @@ public class IntegrationListener implements Listener { try { if (event.getAction() == Action.RIGHT_CLICK_BLOCK && event.hasItem() && event.getHand() == EquipmentSlot.HAND) { if (event.getClickedBlock() != null && event.getClickedBlock().getType() == Material.CAULDRON) { - NBTItem item = MMOLib.plugin.getNMS().getNBTItem(event.getItem()); + NBTItem item = NBTItem.get(event.getItem()); if (item.hasType()) { for (RecipeItem rItem : BCauldronRecipe.acceptedCustom) { if (rItem instanceof MMOItemsPluginItem) { diff --git a/src/com/dre/brewery/integration/item/MMOItemsPluginItem.java b/src/com/dre/brewery/integration/item/MMOItemsPluginItem.java index e3002f9..8ef60b9 100644 --- a/src/com/dre/brewery/integration/item/MMOItemsPluginItem.java +++ b/src/com/dre/brewery/integration/item/MMOItemsPluginItem.java @@ -3,7 +3,6 @@ package com.dre.brewery.integration.item; import com.dre.brewery.P; import com.dre.brewery.filedata.BConfig; import com.dre.brewery.recipe.PluginItem; -import net.mmogroup.mmolib.MMOLib; import net.mmogroup.mmolib.api.item.NBTItem; import org.bukkit.inventory.ItemStack; @@ -21,7 +20,7 @@ public class MMOItemsPluginItem extends PluginItem { if (!BConfig.hasMMOItems) return false; try { - NBTItem nbtItem = MMOLib.plugin.getNMS().getNBTItem(item); + NBTItem nbtItem = NBTItem.get(item); return nbtItem.hasType() && nbtItem.getString("MMOITEMS_ITEM_ID").equalsIgnoreCase(getItemId()); } catch (Throwable e) { e.printStackTrace();