diff --git a/pom.xml b/pom.xml
index f334d46..270b0ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,13 +125,6 @@
provided
-
- com.songoda
- UltimateBottles
- 1_0
- provided
-
-
me.clip
placeholderapi
diff --git a/src/main/java/com/songoda/epicenchants/EpicEnchants.java b/src/main/java/com/songoda/epicenchants/EpicEnchants.java
index ace332e..d6da4ba 100644
--- a/src/main/java/com/songoda/epicenchants/EpicEnchants.java
+++ b/src/main/java/com/songoda/epicenchants/EpicEnchants.java
@@ -30,7 +30,6 @@ import com.songoda.epicenchants.listeners.item.WhiteScrollListener;
import com.songoda.epicenchants.managers.EnchantManager;
import com.songoda.epicenchants.managers.FileManager;
import com.songoda.epicenchants.managers.GroupManager;
-import com.songoda.epicenchants.managers.HookManager;
import com.songoda.epicenchants.managers.InfoManager;
import com.songoda.epicenchants.objects.Enchant;
import com.songoda.epicenchants.utils.EnchantUtils;
@@ -53,7 +52,6 @@ public class EpicEnchants extends SongodaPlugin {
private InfoManager infoManager;
private GroupManager groupManager;
private FileManager fileManager;
- private HookManager hookManager;
private CommandManager commandManager;
private SpecialItems specialItems;
@@ -105,13 +103,11 @@ public class EpicEnchants extends SongodaPlugin {
this.infoManager = new InfoManager(this);
this.specialItems = new SpecialItems(this);
this.commandManager = new CommandManager(this);
- this.hookManager = new HookManager();
this.itemGroup = new ItemGroup();
groupManager.loadGroups();
enchantManager.loadEnchants();
infoManager.loadMenus();
- hookManager.setup();
// Listeners
guiManager.init();
@@ -183,10 +179,6 @@ public class EpicEnchants extends SongodaPlugin {
return this.fileManager;
}
- public HookManager getHookManager() {
- return this.hookManager;
- }
-
public SpecialItems getSpecialItems() {
return this.specialItems;
}
diff --git a/src/main/java/com/songoda/epicenchants/enums/ItemType.java b/src/main/java/com/songoda/epicenchants/enums/ItemType.java
index 52adccb..7683545 100644
--- a/src/main/java/com/songoda/epicenchants/enums/ItemType.java
+++ b/src/main/java/com/songoda/epicenchants/enums/ItemType.java
@@ -1,5 +1,11 @@
package com.songoda.epicenchants.enums;
public enum ItemType {
- BOOK, ENCHANTED, NONE
+ BOOK,
+ /**
+ * @deprecated Was once used for UltimateBottles integration, but I don't think it ever got published
+ */
+ @Deprecated
+ ENCHANTED,
+ NONE
}
diff --git a/src/main/java/com/songoda/epicenchants/managers/HookManager.java b/src/main/java/com/songoda/epicenchants/managers/HookManager.java
deleted file mode 100644
index dcc7609..0000000
--- a/src/main/java/com/songoda/epicenchants/managers/HookManager.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.songoda.epicenchants.managers;
-
-import com.songoda.ultimatebottles.UltimateBottles;
-import org.bukkit.Bukkit;
-
-import java.util.Optional;
-
-public class HookManager {
- private UltimateBottles ultimateBottles;
-
- public void setup() {
- ultimateBottles = Bukkit.getPluginManager().isPluginEnabled("UltimateBottles") ? (UltimateBottles) Bukkit.getPluginManager().getPlugin("UltimateBottles") : null;
- }
-
- public Optional getUltimateBottles() {
- return Optional.ofNullable(ultimateBottles);
- }
-}
diff --git a/src/main/java/com/songoda/epicenchants/menus/TinkererMenu.java b/src/main/java/com/songoda/epicenchants/menus/TinkererMenu.java
index 4744042..bdd85b6 100644
--- a/src/main/java/com/songoda/epicenchants/menus/TinkererMenu.java
+++ b/src/main/java/com/songoda/epicenchants/menus/TinkererMenu.java
@@ -174,10 +174,6 @@ public class TinkererMenu extends FastInv {
return BOOK;
}
- if (!instance.getHookManager().getUltimateBottles().isPresent()) {
- return NONE;
- }
-
if (!itemStack.getEnchantments().isEmpty() || (nbtItem.getCompound("enchants") != null && !nbtItem.getCompound("enchants").getKeys().isEmpty())) {
if (getExpAmount(itemStack) == 0) {
return NONE;
@@ -203,13 +199,8 @@ public class TinkererMenu extends FastInv {
addItem(emptySlot.get().getKey(), finalItemStack);
- switch (itemType) {
- case BOOK:
- getInventory().setItem(emptySlot.get().getValue(), instance.getSpecialItems().getSecretDust(new NBTItem(finalItemStack)));
- break;
- case ENCHANTED:
- getInventory().setItem(emptySlot.get().getValue(), instance.getHookManager().getUltimateBottles().get().createBottle("Tinkerer", getExpAmount(finalItemStack)));
- break;
+ if (itemType == BOOK) {
+ getInventory().setItem(emptySlot.get().getValue(), instance.getSpecialItems().getSecretDust(new NBTItem(finalItemStack)));
}
return true;
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 981c636..23d6453 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -7,7 +7,6 @@ main: com.songoda.epicenchants.EpicEnchants
softdepend:
- PlaceholderAPI
- PlayerPoints
- - UltimateBottles
- Vault
author: Craftaro