exituser/Brewery
1
0
Fork 0
mirror of https://github.com/exituser/Brewery.git synced 2026-09-17 05:28:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated Dependencies for 1.16

Browse Source
This commit is contained in:
Sn0wStorm
2020-10-29 17:34:12 +01:00
parent eeb9be74f9
commit 1aae3340a3
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+16 -11
View File
@@ -106,13 +106,18 @@
<id>CodeMC</id> <id>CodeMC</id>
<url>https://repo.codemc.org/repository/maven-public</url> <url>https://repo.codemc.org/repository/maven-public</url>
</repository> </repository>
<repository>
<!--MMOLib -->
<id>MMOPlugins</id>
<url>https://mvn.lumine.io/repository/maven-releases/</url>
</repository>
</repositories> </repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.spigotmc</groupId>
<artifactId>bukkit</artifactId> <artifactId>spigot-api</artifactId>
<version>1.15.2-R0.1-SNAPSHOT</version> <version>1.16.3-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
@@ -146,7 +151,7 @@
<dependency> <dependency>
<groupId>com.sk89q.worldedit</groupId> <groupId>com.sk89q.worldedit</groupId>
<artifactId>worldedit-bukkit</artifactId> <artifactId>worldedit-bukkit</artifactId>
<version>7.1.0</version> <version>7.2.0-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
@@ -158,7 +163,7 @@
<dependency> <dependency>
<groupId>com.sk89q.worldedit</groupId> <groupId>com.sk89q.worldedit</groupId>
<artifactId>worldedit-core</artifactId> <artifactId>worldedit-core</artifactId>
<version>7.1.0</version> <version>7.2.0-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
@@ -170,7 +175,7 @@
<dependency> <dependency>
<groupId>com.sk89q.worldguard</groupId> <groupId>com.sk89q.worldguard</groupId>
<artifactId>worldguard-core</artifactId> <artifactId>worldguard-core</artifactId>
<version>7.0.2</version> <version>7.0.4</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
@@ -188,7 +193,7 @@
<dependency> <dependency>
<groupId>com.github.TechFortress</groupId> <groupId>com.github.TechFortress</groupId>
<artifactId>GriefPrevention</artifactId> <artifactId>GriefPrevention</artifactId>
<version>16.13.0</version> <version>16.16.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@@ -217,15 +222,15 @@
<scope>provided</scope> <scope>provided</scope>
</dependency>--> </dependency>-->
<dependency> <dependency>
<groupId>net.mmogroup</groupId> <groupId>net.Indyuce</groupId>
<artifactId>mmolib</artifactId> <artifactId>MMOLib</artifactId>
<version>1.0.9</version> <version>1.4.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.acrobot.chestshop</groupId> <groupId>com.acrobot.chestshop</groupId>
<artifactId>chestshop</artifactId> <artifactId>chestshop</artifactId>
<version>3.10.1</version> <version>3.11</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
src/com/dre/brewery/integration/IntegrationListener.java
+1 -2
View File
@@ -13,7 +13,6 @@ import com.dre.brewery.integration.item.MMOItemsPluginItem;
import com.dre.brewery.recipe.BCauldronRecipe; import com.dre.brewery.recipe.BCauldronRecipe;
import com.dre.brewery.recipe.RecipeItem; import com.dre.brewery.recipe.RecipeItem;
import com.dre.brewery.utility.LegacyUtil; import com.dre.brewery.utility.LegacyUtil;
import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.item.NBTItem; import net.mmogroup.mmolib.api.item.NBTItem;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Material; import org.bukkit.Material;
@@ -228,7 +227,7 @@ public class IntegrationListener implements Listener {
try { try {
if (event.getAction() == Action.RIGHT_CLICK_BLOCK && event.hasItem() && event.getHand() == EquipmentSlot.HAND) { if (event.getAction() == Action.RIGHT_CLICK_BLOCK && event.hasItem() && event.getHand() == EquipmentSlot.HAND) {
if (event.getClickedBlock() != null && event.getClickedBlock().getType() == Material.CAULDRON) { 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()) { if (item.hasType()) {
for (RecipeItem rItem : BCauldronRecipe.acceptedCustom) { for (RecipeItem rItem : BCauldronRecipe.acceptedCustom) {
if (rItem instanceof MMOItemsPluginItem) { if (rItem instanceof MMOItemsPluginItem) {
src/com/dre/brewery/integration/item/MMOItemsPluginItem.java
+1 -2
View File
@@ -3,7 +3,6 @@ package com.dre.brewery.integration.item;
import com.dre.brewery.P; import com.dre.brewery.P;
import com.dre.brewery.filedata.BConfig; import com.dre.brewery.filedata.BConfig;
import com.dre.brewery.recipe.PluginItem; import com.dre.brewery.recipe.PluginItem;
import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.item.NBTItem; import net.mmogroup.mmolib.api.item.NBTItem;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@@ -21,7 +20,7 @@ public class MMOItemsPluginItem extends PluginItem {
if (!BConfig.hasMMOItems) return false; if (!BConfig.hasMMOItems) return false;
try { try {
NBTItem nbtItem = MMOLib.plugin.getNMS().getNBTItem(item); NBTItem nbtItem = NBTItem.get(item);
return nbtItem.hasType() && nbtItem.getString("MMOITEMS_ITEM_ID").equalsIgnoreCase(getItemId()); return nbtItem.hasType() && nbtItem.getString("MMOITEMS_ITEM_ID").equalsIgnoreCase(getItemId());
} catch (Throwable e) { } catch (Throwable e) {
e.printStackTrace(); e.printStackTrace();