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

MMOItems have changed their api again

Browse Source
This commit is contained in:
Sn0wStorm
2021-04-07 16:23:30 +02:00
parent 556ce7ed34
commit 7f0c4ad3c2
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+4 -4
View File
@@ -132,7 +132,7 @@
<url>https://repo.codemc.org/repository/maven-public</url> <url>https://repo.codemc.org/repository/maven-public</url>
</repository> </repository>
<repository> <repository>
<!-- MMOLib --> <!-- MythicLib (MMOItems) -->
<id>MMOPlugins</id> <id>MMOPlugins</id>
<url>https://mvn.lumine.io/repository/maven-releases/</url> <url>https://mvn.lumine.io/repository/maven-releases/</url>
</repository> </repository>
@@ -252,9 +252,9 @@
<scope>provided</scope> <scope>provided</scope>
</dependency>--> </dependency>-->
<dependency> <dependency>
<groupId>net.Indyuce</groupId> <groupId>io.lumine</groupId>
<artifactId>MMOLib</artifactId> <artifactId>MythicLib</artifactId>
<version>1.4.0</version> <version>1.0.18</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
src/com/dre/brewery/integration/IntegrationListener.java
+3 -2
View File
@@ -15,7 +15,7 @@ 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.api.item.NBTItem; import io.lumine.mythic.lib.api.item.NBTItem;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
@@ -318,7 +318,8 @@ public class IntegrationListener implements Listener {
// Catch the Interact Event early, so MMOItems does not act before us and cancel the event while we try to add it to the Cauldron // Catch the Interact Event early, so MMOItems does not act before us and cancel the event while we try to add it to the Cauldron
if (!P.use1_9) return; if (!P.use1_9) return;
if (BConfig.hasMMOItems == null) { if (BConfig.hasMMOItems == null) {
BConfig.hasMMOItems = P.p.getServer().getPluginManager().isPluginEnabled("MMOItems"); BConfig.hasMMOItems = P.p.getServer().getPluginManager().isPluginEnabled("MMOItems")
&& P.p.getServer().getPluginManager().isPluginEnabled("MythicLib");
} }
if (!BConfig.hasMMOItems) return; if (!BConfig.hasMMOItems) return;
try { try {
src/com/dre/brewery/integration/item/MMOItemsPluginItem.java
+3 -2
View File
@@ -3,7 +3,7 @@ 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.api.item.NBTItem; import io.lumine.mythic.lib.api.item.NBTItem;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
public class MMOItemsPluginItem extends PluginItem { public class MMOItemsPluginItem extends PluginItem {
@@ -15,7 +15,8 @@ public class MMOItemsPluginItem extends PluginItem {
@Override @Override
public boolean matches(ItemStack item) { public boolean matches(ItemStack item) {
if (BConfig.hasMMOItems == null) { if (BConfig.hasMMOItems == null) {
BConfig.hasMMOItems = P.p.getServer().getPluginManager().isPluginEnabled("MMOItems"); BConfig.hasMMOItems = P.p.getServer().getPluginManager().isPluginEnabled("MMOItems")
&& P.p.getServer().getPluginManager().isPluginEnabled("MythicLib");
} }
if (!BConfig.hasMMOItems) return false; if (!BConfig.hasMMOItems) return false;