diff --git a/pom.xml b/pom.xml
index 4700244..a3393d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
- com.songoda:SongodaCore
+ com.craftaroSongodaCore
@@ -71,7 +71,7 @@
- com.songoda.core
+ com.craftaro.core
${project.groupId}.epicvouchers.core
@@ -98,12 +98,24 @@
- songoda-public
- https://repo.songoda.com/repository/public/
+ craftaro-minecraft-plugins
+ https://repo.craftaro.com/repository/minecraft-plugins/
+
+
+
+ SpigotMC
+ https://hub.spigotmc.org/nexus/content/repositories/snapshots/
+
+ com.craftaro
+ CraftaroCore
+ 3.0.0-SNAPSHOT
+ compile
+
+
org.spigotmc
spigot-api
@@ -111,13 +123,6 @@
provided
-
- com.songoda
- SongodaCore
- 2.6.21
- compile
-
-
org.projectlombok
lombok
diff --git a/src/main/java/com/songoda/epicvouchers/EpicVouchers.java b/src/main/java/com/songoda/epicvouchers/EpicVouchers.java
index 698cfff..94127c5 100644
--- a/src/main/java/com/songoda/epicvouchers/EpicVouchers.java
+++ b/src/main/java/com/songoda/epicvouchers/EpicVouchers.java
@@ -1,11 +1,11 @@
package com.songoda.epicvouchers;
-import com.songoda.core.SongodaCore;
-import com.songoda.core.SongodaPlugin;
-import com.songoda.core.commands.CommandManager;
-import com.songoda.core.compatibility.CompatibleMaterial;
-import com.songoda.core.configuration.Config;
-import com.songoda.core.gui.GuiManager;
+import com.craftaro.core.SongodaCore;
+import com.craftaro.core.SongodaPlugin;
+import com.craftaro.core.commands.CommandManager;
+import com.craftaro.core.configuration.Config;
+import com.craftaro.core.gui.GuiManager;
+import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
import com.songoda.epicvouchers.commands.CommandEditor;
import com.songoda.epicvouchers.commands.CommandEpicVouchers;
import com.songoda.epicvouchers.commands.CommandForce;
@@ -67,7 +67,7 @@ public class EpicVouchers extends SongodaPlugin {
@Override
public void onPluginEnable() {
// Run Songoda Updater
- SongodaCore.registerPlugin(this, 25, CompatibleMaterial.EMERALD);
+ SongodaCore.registerPlugin(this, 25, XMaterial.EMERALD);
// Setup Config
Settings.setupConfig();
diff --git a/src/main/java/com/songoda/epicvouchers/commands/CommandEditor.java b/src/main/java/com/songoda/epicvouchers/commands/CommandEditor.java
index 64e81d0..4b07750 100644
--- a/src/main/java/com/songoda/epicvouchers/commands/CommandEditor.java
+++ b/src/main/java/com/songoda/epicvouchers/commands/CommandEditor.java
@@ -1,6 +1,6 @@
package com.songoda.epicvouchers.commands;
-import com.songoda.core.commands.AbstractCommand;
+import com.craftaro.core.commands.AbstractCommand;
import com.songoda.epicvouchers.EpicVouchers;
import com.songoda.epicvouchers.menus.VoucherMenu;
import org.bukkit.command.CommandSender;
diff --git a/src/main/java/com/songoda/epicvouchers/commands/CommandEpicVouchers.java b/src/main/java/com/songoda/epicvouchers/commands/CommandEpicVouchers.java
index 2672e77..b35fb1a 100644
--- a/src/main/java/com/songoda/epicvouchers/commands/CommandEpicVouchers.java
+++ b/src/main/java/com/songoda/epicvouchers/commands/CommandEpicVouchers.java
@@ -1,6 +1,6 @@
package com.songoda.epicvouchers.commands;
-import com.songoda.core.commands.AbstractCommand;
+import com.craftaro.core.commands.AbstractCommand;
import com.songoda.epicvouchers.EpicVouchers;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
diff --git a/src/main/java/com/songoda/epicvouchers/commands/CommandForce.java b/src/main/java/com/songoda/epicvouchers/commands/CommandForce.java
index 89dd9e0..64eee4f 100644
--- a/src/main/java/com/songoda/epicvouchers/commands/CommandForce.java
+++ b/src/main/java/com/songoda/epicvouchers/commands/CommandForce.java
@@ -1,6 +1,6 @@
package com.songoda.epicvouchers.commands;
-import com.songoda.core.commands.AbstractCommand;
+import com.craftaro.core.commands.AbstractCommand;
import com.songoda.epicvouchers.EpicVouchers;
import com.songoda.epicvouchers.voucher.Voucher;
import org.bukkit.Bukkit;
diff --git a/src/main/java/com/songoda/epicvouchers/commands/CommandForceAll.java b/src/main/java/com/songoda/epicvouchers/commands/CommandForceAll.java
index 564fe44..9d9a977 100644
--- a/src/main/java/com/songoda/epicvouchers/commands/CommandForceAll.java
+++ b/src/main/java/com/songoda/epicvouchers/commands/CommandForceAll.java
@@ -1,6 +1,6 @@
package com.songoda.epicvouchers.commands;
-import com.songoda.core.commands.AbstractCommand;
+import com.craftaro.core.commands.AbstractCommand;
import com.songoda.epicvouchers.EpicVouchers;
import com.songoda.epicvouchers.voucher.Voucher;
import org.bukkit.Bukkit;
diff --git a/src/main/java/com/songoda/epicvouchers/commands/CommandGive.java b/src/main/java/com/songoda/epicvouchers/commands/CommandGive.java
index c0bae2e..f276cd4 100644
--- a/src/main/java/com/songoda/epicvouchers/commands/CommandGive.java
+++ b/src/main/java/com/songoda/epicvouchers/commands/CommandGive.java
@@ -1,6 +1,6 @@
package com.songoda.epicvouchers.commands;
-import com.songoda.core.commands.AbstractCommand;
+import com.craftaro.core.commands.AbstractCommand;
import com.songoda.epicvouchers.EpicVouchers;
import com.songoda.epicvouchers.voucher.Voucher;
import org.bukkit.Bukkit;
diff --git a/src/main/java/com/songoda/epicvouchers/commands/CommandGiveAll.java b/src/main/java/com/songoda/epicvouchers/commands/CommandGiveAll.java
index a876146..d0dec42 100644
--- a/src/main/java/com/songoda/epicvouchers/commands/CommandGiveAll.java
+++ b/src/main/java/com/songoda/epicvouchers/commands/CommandGiveAll.java
@@ -1,6 +1,6 @@
package com.songoda.epicvouchers.commands;
-import com.songoda.core.commands.AbstractCommand;
+import com.craftaro.core.commands.AbstractCommand;
import com.songoda.epicvouchers.EpicVouchers;
import com.songoda.epicvouchers.voucher.Voucher;
import org.bukkit.command.CommandSender;
diff --git a/src/main/java/com/songoda/epicvouchers/commands/CommandList.java b/src/main/java/com/songoda/epicvouchers/commands/CommandList.java
index d53a307..3b44106 100644
--- a/src/main/java/com/songoda/epicvouchers/commands/CommandList.java
+++ b/src/main/java/com/songoda/epicvouchers/commands/CommandList.java
@@ -1,6 +1,6 @@
package com.songoda.epicvouchers.commands;
-import com.songoda.core.commands.AbstractCommand;
+import com.craftaro.core.commands.AbstractCommand;
import com.songoda.epicvouchers.EpicVouchers;
import com.songoda.epicvouchers.voucher.Voucher;
import org.bukkit.command.CommandSender;
diff --git a/src/main/java/com/songoda/epicvouchers/commands/CommandReload.java b/src/main/java/com/songoda/epicvouchers/commands/CommandReload.java
index c304790..68d4730 100644
--- a/src/main/java/com/songoda/epicvouchers/commands/CommandReload.java
+++ b/src/main/java/com/songoda/epicvouchers/commands/CommandReload.java
@@ -1,6 +1,6 @@
package com.songoda.epicvouchers.commands;
-import com.songoda.core.commands.AbstractCommand;
+import com.craftaro.core.commands.AbstractCommand;
import com.songoda.epicvouchers.EpicVouchers;
import org.bukkit.command.CommandSender;
diff --git a/src/main/java/com/songoda/epicvouchers/handlers/Connections.java b/src/main/java/com/songoda/epicvouchers/handlers/Connections.java
index be43d64..e7197af 100644
--- a/src/main/java/com/songoda/epicvouchers/handlers/Connections.java
+++ b/src/main/java/com/songoda/epicvouchers/handlers/Connections.java
@@ -1,6 +1,6 @@
package com.songoda.epicvouchers.handlers;
-import com.songoda.core.utils.TextUtils;
+import com.craftaro.core.utils.TextUtils;
import com.songoda.epicvouchers.EpicVouchers;
import org.bukkit.entity.Player;
diff --git a/src/main/java/com/songoda/epicvouchers/libraries/inventory/PlayersMenu.java b/src/main/java/com/songoda/epicvouchers/libraries/inventory/PlayersMenu.java
index 5cf2445..16e765c 100644
--- a/src/main/java/com/songoda/epicvouchers/libraries/inventory/PlayersMenu.java
+++ b/src/main/java/com/songoda/epicvouchers/libraries/inventory/PlayersMenu.java
@@ -1,6 +1,7 @@
package com.songoda.epicvouchers.libraries.inventory;
-import com.songoda.core.compatibility.CompatibleMaterial;
+import com.craftaro.core.third_party.com.cryptomorin.xseries.SkullUtils;
+import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
import com.songoda.epicvouchers.EpicVouchers;
import com.songoda.epicvouchers.libraries.ItemBuilder;
import com.songoda.epicvouchers.menus.ActionMenu;
@@ -9,7 +10,7 @@ import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.SkullMeta;
+import org.bukkit.inventory.meta.ItemMeta;
import java.util.List;
import java.util.function.BiConsumer;
@@ -52,17 +53,11 @@ public abstract class PlayersMenu extends FastInv {
Player player = this.players.get(index);
- ItemStack itemStack = CompatibleMaterial.PLAYER_HEAD.getItem();
+ ItemStack itemStack = SkullUtils.getSkull(player.getUniqueId());
- SkullMeta skullMeta = (SkullMeta) itemStack.getItemMeta();
-
- try {
- skullMeta.setOwningPlayer(player);
- } catch (Throwable ignore) {
- }
-
- skullMeta.setDisplayName(YELLOW + player.getName());
- itemStack.setItemMeta(skullMeta);
+ ItemMeta itemMeta = itemStack.getItemMeta();
+ itemMeta.setDisplayName(YELLOW + player.getName());
+ itemStack.setItemMeta(itemMeta);
addItem(slot, itemStack, event -> this.playerConsumer.accept(event.getPlayer(), player));
});
@@ -95,7 +90,7 @@ public abstract class PlayersMenu extends FastInv {
}
if (this.instance.getConfig().getBoolean("Interface.Fill Interfaces With Glass")) {
- ItemStack fillItem = CompatibleMaterial.GRAY_STAINED_GLASS_PANE.getItem();
+ ItemStack fillItem = XMaterial.GRAY_STAINED_GLASS_PANE.parseItem();
IntStream.rangeClosed(this.SLOTS + 1, 26).forEach(slot -> {
if (getInventory().getItem(slot) == null) {
diff --git a/src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/ListEntryIcon.java b/src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/ListEntryIcon.java
index be3a692..5670ea3 100644
--- a/src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/ListEntryIcon.java
+++ b/src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/ListEntryIcon.java
@@ -1,6 +1,6 @@
package com.songoda.epicvouchers.libraries.inventory.icons;
-import com.songoda.core.input.ChatPrompt;
+import com.craftaro.core.input.ChatPrompt;
import com.songoda.epicvouchers.EpicVouchers;
import com.songoda.epicvouchers.libraries.ItemBuilder;
import com.songoda.epicvouchers.utils.Pair;
diff --git a/src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/StringIcon.java b/src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/StringIcon.java
index 2f844e5..eda89ff 100644
--- a/src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/StringIcon.java
+++ b/src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/StringIcon.java
@@ -1,8 +1,8 @@
package com.songoda.epicvouchers.libraries.inventory.icons;
-import com.songoda.core.compatibility.ServerVersion;
-import com.songoda.core.input.ChatPrompt;
-import com.songoda.core.utils.TextUtils;
+import com.craftaro.core.compatibility.ServerVersion;
+import com.craftaro.core.input.ChatPrompt;
+import com.craftaro.core.utils.TextUtils;
import com.songoda.epicvouchers.EpicVouchers;
import com.songoda.epicvouchers.libraries.ItemBuilder;
import org.bukkit.Bukkit;
diff --git a/src/main/java/com/songoda/epicvouchers/listeners/PlayerInteractListener.java b/src/main/java/com/songoda/epicvouchers/listeners/PlayerInteractListener.java
index 8742469..2e9e0fa 100644
--- a/src/main/java/com/songoda/epicvouchers/listeners/PlayerInteractListener.java
+++ b/src/main/java/com/songoda/epicvouchers/listeners/PlayerInteractListener.java
@@ -1,6 +1,6 @@
package com.songoda.epicvouchers.listeners;
-import com.songoda.core.third_party.de.tr7zw.nbtapi.NBTItem;
+import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTItem;
import com.songoda.epicvouchers.EpicVouchers;
import com.songoda.epicvouchers.settings.Settings;
import com.songoda.epicvouchers.utils.CachedSet;
diff --git a/src/main/java/com/songoda/epicvouchers/menus/ActionMenu.java b/src/main/java/com/songoda/epicvouchers/menus/ActionMenu.java
index 0cf96be..1d9a803 100644
--- a/src/main/java/com/songoda/epicvouchers/menus/ActionMenu.java
+++ b/src/main/java/com/songoda/epicvouchers/menus/ActionMenu.java
@@ -1,7 +1,7 @@
package com.songoda.epicvouchers.menus;
-import com.songoda.core.compatibility.CompatibleMaterial;
-import com.songoda.core.utils.TextUtils;
+import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
+import com.craftaro.core.utils.TextUtils;
import com.songoda.epicvouchers.EpicVouchers;
import com.songoda.epicvouchers.libraries.ItemBuilder;
import com.songoda.epicvouchers.libraries.inventory.FastInv;
@@ -61,7 +61,7 @@ public class ActionMenu extends FastInv {
.addGlow().build(), event -> new VoucherMenu(instance).open(event.getPlayer()));
if (instance.getConfig().getBoolean("Interface.Fill Interfaces With Glass")) {
- ItemStack fillItem = CompatibleMaterial.GRAY_STAINED_GLASS_PANE.getItem();
+ ItemStack fillItem = XMaterial.GRAY_STAINED_GLASS_PANE.parseItem();
fill(new ItemBuilder(fillItem).name(ChatColor.RESET.toString()).build());
}
diff --git a/src/main/java/com/songoda/epicvouchers/menus/ConfirmMenu.java b/src/main/java/com/songoda/epicvouchers/menus/ConfirmMenu.java
index b573c49..e1a72cf 100644
--- a/src/main/java/com/songoda/epicvouchers/menus/ConfirmMenu.java
+++ b/src/main/java/com/songoda/epicvouchers/menus/ConfirmMenu.java
@@ -1,6 +1,6 @@
package com.songoda.epicvouchers.menus;
-import com.songoda.core.compatibility.CompatibleMaterial;
+import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
import com.songoda.epicvouchers.EpicVouchers;
import com.songoda.epicvouchers.libraries.ItemBuilder;
import com.songoda.epicvouchers.libraries.inventory.FastInv;
@@ -34,7 +34,7 @@ public class ConfirmMenu extends FastInv {
});
if (instance.getConfig().getBoolean("Interface.Fill Interfaces With Glass")) {
- ItemStack fillItem = CompatibleMaterial.GRAY_STAINED_GLASS_PANE.getItem();
+ ItemStack fillItem = XMaterial.GRAY_STAINED_GLASS_PANE.parseItem();
fill(new ItemBuilder(fillItem).name(ChatColor.RESET.toString()).build());
}
diff --git a/src/main/java/com/songoda/epicvouchers/menus/OptionMenu.java b/src/main/java/com/songoda/epicvouchers/menus/OptionMenu.java
index cd70d07..c300653 100644
--- a/src/main/java/com/songoda/epicvouchers/menus/OptionMenu.java
+++ b/src/main/java/com/songoda/epicvouchers/menus/OptionMenu.java
@@ -1,7 +1,7 @@
package com.songoda.epicvouchers.menus;
-import com.songoda.core.compatibility.CompatibleMaterial;
-import com.songoda.core.utils.TextUtils;
+import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
+import com.craftaro.core.utils.TextUtils;
import com.songoda.epicvouchers.EpicVouchers;
import com.songoda.epicvouchers.libraries.ItemBuilder;
import com.songoda.epicvouchers.libraries.inventory.FastInv;
@@ -43,6 +43,6 @@ public class OptionMenu extends FastInv {
.lore(TextUtils.formatText("&eSet the options of your voucher."))
.build(), event -> new VoucherEditorMenu(instance, voucher).open(event.getPlayer()));
- fill(new ItemBuilder(CompatibleMaterial.GRAY_STAINED_GLASS_PANE.getItem()).name(ChatColor.RESET.toString()).build());
+ fill(new ItemBuilder(XMaterial.GRAY_STAINED_GLASS_PANE.parseMaterial()).name(ChatColor.RESET.toString()).build());
}
}
diff --git a/src/main/java/com/songoda/epicvouchers/menus/VoucherEditorMenu.java b/src/main/java/com/songoda/epicvouchers/menus/VoucherEditorMenu.java
index c877a2f..0fa70fb 100644
--- a/src/main/java/com/songoda/epicvouchers/menus/VoucherEditorMenu.java
+++ b/src/main/java/com/songoda/epicvouchers/menus/VoucherEditorMenu.java
@@ -1,7 +1,7 @@
package com.songoda.epicvouchers.menus;
-import com.songoda.core.compatibility.CompatibleMaterial;
-import com.songoda.core.utils.ItemUtils;
+import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
+import com.craftaro.core.utils.ItemUtils;
import com.songoda.epicvouchers.EpicVouchers;
import com.songoda.epicvouchers.libraries.ItemBuilder;
import com.songoda.epicvouchers.libraries.inventory.IconInv;
@@ -89,7 +89,7 @@ public class VoucherEditorMenu extends IconInv {
reopen(player);
}));
- addIcon(13, new StringIcon(instance, new ItemBuilder(voucher.getTexture() == null ? CompatibleMaterial.PLAYER_HEAD.getItem() : ItemUtils.getCustomHead(voucher.getTexture()))
+ addIcon(13, new StringIcon(instance, new ItemBuilder(voucher.getTexture() == null ? XMaterial.PLAYER_HEAD.parseItem() : ItemUtils.getCustomHead(voucher.getTexture()))
.name(YELLOW + "Skull Texture")
.lore(GRAY + "Right click to edit", GRAY + "Left click to clear").build(), voucher.getTexture(), (player, editString) -> {
voucher.setTexture(editString);
diff --git a/src/main/java/com/songoda/epicvouchers/menus/VoucherMenu.java b/src/main/java/com/songoda/epicvouchers/menus/VoucherMenu.java
index 5714fa3..9e5c4b1 100644
--- a/src/main/java/com/songoda/epicvouchers/menus/VoucherMenu.java
+++ b/src/main/java/com/songoda/epicvouchers/menus/VoucherMenu.java
@@ -1,8 +1,8 @@
package com.songoda.epicvouchers.menus;
-import com.songoda.core.compatibility.ServerVersion;
-import com.songoda.core.gui.AnvilGui;
-import com.songoda.core.utils.TextUtils;
+import com.craftaro.core.compatibility.ServerVersion;
+import com.craftaro.core.gui.AnvilGui;
+import com.craftaro.core.utils.TextUtils;
import com.songoda.epicvouchers.EpicVouchers;
import com.songoda.epicvouchers.libraries.ItemBuilder;
import com.songoda.epicvouchers.libraries.inventory.IconInv;
diff --git a/src/main/java/com/songoda/epicvouchers/menus/sub/editor/SetItemMenu.java b/src/main/java/com/songoda/epicvouchers/menus/sub/editor/SetItemMenu.java
index 265b6db..7f7df33 100644
--- a/src/main/java/com/songoda/epicvouchers/menus/sub/editor/SetItemMenu.java
+++ b/src/main/java/com/songoda/epicvouchers/menus/sub/editor/SetItemMenu.java
@@ -1,6 +1,6 @@
package com.songoda.epicvouchers.menus.sub.editor;
-import com.songoda.core.compatibility.CompatibleMaterial;
+import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
import com.songoda.epicvouchers.EpicVouchers;
import com.songoda.epicvouchers.libraries.ItemBuilder;
import com.songoda.epicvouchers.libraries.inventory.FastInv;
@@ -20,7 +20,7 @@ public class SetItemMenu extends FastInv {
setDefaultCancel(false);
- fill(new ItemBuilder(CompatibleMaterial.GRAY_STAINED_GLASS_PANE.getItem())
+ fill(new ItemBuilder(XMaterial.GRAY_STAINED_GLASS_PANE.parseItem())
.name(ChatColor.RESET.toString()).build(), event -> event.setCancelled(true));
addItem(13, null);
diff --git a/src/main/java/com/songoda/epicvouchers/menus/sub/editor/StringListMenu.java b/src/main/java/com/songoda/epicvouchers/menus/sub/editor/StringListMenu.java
index f54f4e1..3098a23 100644
--- a/src/main/java/com/songoda/epicvouchers/menus/sub/editor/StringListMenu.java
+++ b/src/main/java/com/songoda/epicvouchers/menus/sub/editor/StringListMenu.java
@@ -1,7 +1,7 @@
package com.songoda.epicvouchers.menus.sub.editor;
-import com.songoda.core.input.ChatPrompt;
-import com.songoda.core.utils.TextUtils;
+import com.craftaro.core.input.ChatPrompt;
+import com.craftaro.core.utils.TextUtils;
import com.songoda.epicvouchers.EpicVouchers;
import com.songoda.epicvouchers.libraries.ItemBuilder;
import com.songoda.epicvouchers.libraries.inventory.IconInv;
diff --git a/src/main/java/com/songoda/epicvouchers/settings/Settings.java b/src/main/java/com/songoda/epicvouchers/settings/Settings.java
index 10e05ee..dafd736 100644
--- a/src/main/java/com/songoda/epicvouchers/settings/Settings.java
+++ b/src/main/java/com/songoda/epicvouchers/settings/Settings.java
@@ -1,7 +1,7 @@
package com.songoda.epicvouchers.settings;
-import com.songoda.core.configuration.Config;
-import com.songoda.core.configuration.ConfigSetting;
+import com.craftaro.core.configuration.Config;
+import com.craftaro.core.configuration.ConfigSetting;
import com.songoda.epicvouchers.EpicVouchers;
import org.bukkit.event.Listener;
diff --git a/src/main/java/com/songoda/epicvouchers/voucher/Voucher.java b/src/main/java/com/songoda/epicvouchers/voucher/Voucher.java
index f09fb3e..53248d9 100644
--- a/src/main/java/com/songoda/epicvouchers/voucher/Voucher.java
+++ b/src/main/java/com/songoda/epicvouchers/voucher/Voucher.java
@@ -1,10 +1,10 @@
package com.songoda.epicvouchers.voucher;
-import com.songoda.core.compatibility.CompatibleMaterial;
-import com.songoda.core.compatibility.ServerVersion;
-import com.songoda.core.third_party.de.tr7zw.nbtapi.NBTItem;
-import com.songoda.core.utils.ItemUtils;
-import com.songoda.core.utils.TextUtils;
+import com.craftaro.core.compatibility.ServerVersion;
+import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial;
+import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTItem;
+import com.craftaro.core.utils.ItemUtils;
+import com.craftaro.core.utils.TextUtils;
import com.songoda.epicvouchers.EpicVouchers;
import com.songoda.epicvouchers.events.ForceRedeemEvent;
import com.songoda.epicvouchers.events.VoucherReceiveEvent;
@@ -119,7 +119,7 @@ public class Voucher {
}
}
- if (this.texture != null && !this.texture.isEmpty() && CompatibleMaterial.PLAYER_HEAD.getMaterial() == this.material) {
+ if (this.texture != null && !this.texture.isEmpty() && XMaterial.PLAYER_HEAD.parseMaterial() == this.material) {
item = ItemUtils.getCustomHead(this.texture);
}
diff --git a/src/main/java/com/songoda/epicvouchers/voucher/VoucherExecutor.java b/src/main/java/com/songoda/epicvouchers/voucher/VoucherExecutor.java
index 1e91ba6..43b23b1 100644
--- a/src/main/java/com/songoda/epicvouchers/voucher/VoucherExecutor.java
+++ b/src/main/java/com/songoda/epicvouchers/voucher/VoucherExecutor.java
@@ -1,7 +1,7 @@
package com.songoda.epicvouchers.voucher;
-import com.songoda.core.compatibility.CompatibleSound;
-import com.songoda.core.compatibility.ServerVersion;
+import com.craftaro.core.compatibility.CompatibleSound;
+import com.craftaro.core.compatibility.ServerVersion;
import com.songoda.epicvouchers.EpicVouchers;
import com.songoda.epicvouchers.events.VoucherRedeemEvent;
import com.songoda.epicvouchers.listeners.PlayerCommandListener;