diff --git a/pom.xml b/pom.xml index 2a5976a..710eac1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.songoda - EpicVouchers + com.craftaro + EpicVouchers-Plugin 2.2.6 EpicVouchers @@ -44,7 +44,7 @@ com.craftaro.core - com.songoda.epicvouchers.core + com.craftaro.epicvouchers.core diff --git a/src/main/java/com/songoda/epicvouchers/EpicVouchers.java b/src/main/java/com/craftaro/epicvouchers/EpicVouchers.java similarity index 91% rename from src/main/java/com/songoda/epicvouchers/EpicVouchers.java rename to src/main/java/com/craftaro/epicvouchers/EpicVouchers.java index 94127c5..ec089df 100644 --- a/src/main/java/com/songoda/epicvouchers/EpicVouchers.java +++ b/src/main/java/com/craftaro/epicvouchers/EpicVouchers.java @@ -1,4 +1,4 @@ -package com.songoda.epicvouchers; +package com.craftaro.epicvouchers; import com.craftaro.core.SongodaCore; import com.craftaro.core.SongodaPlugin; @@ -6,26 +6,26 @@ 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; -import com.songoda.epicvouchers.commands.CommandForceAll; -import com.songoda.epicvouchers.commands.CommandGive; -import com.songoda.epicvouchers.commands.CommandGiveAll; -import com.songoda.epicvouchers.commands.CommandList; -import com.songoda.epicvouchers.commands.CommandReload; -import com.songoda.epicvouchers.handlers.Connections; -import com.songoda.epicvouchers.libraries.inventory.FastInv; -import com.songoda.epicvouchers.libraries.inventory.IconInv; -import com.songoda.epicvouchers.listeners.PlayerCommandListener; -import com.songoda.epicvouchers.listeners.PlayerInteractListener; -import com.songoda.epicvouchers.settings.Settings; -import com.songoda.epicvouchers.utils.Callback; -import com.songoda.epicvouchers.utils.ThreadSync; -import com.songoda.epicvouchers.voucher.CoolDownManager; -import com.songoda.epicvouchers.voucher.Voucher; -import com.songoda.epicvouchers.voucher.VoucherExecutor; -import com.songoda.epicvouchers.voucher.VoucherManager; +import com.craftaro.epicvouchers.commands.CommandEditor; +import com.craftaro.epicvouchers.commands.CommandEpicVouchers; +import com.craftaro.epicvouchers.commands.CommandForce; +import com.craftaro.epicvouchers.commands.CommandForceAll; +import com.craftaro.epicvouchers.commands.CommandGive; +import com.craftaro.epicvouchers.commands.CommandGiveAll; +import com.craftaro.epicvouchers.commands.CommandList; +import com.craftaro.epicvouchers.commands.CommandReload; +import com.craftaro.epicvouchers.handlers.Connections; +import com.craftaro.epicvouchers.libraries.inventory.FastInv; +import com.craftaro.epicvouchers.libraries.inventory.IconInv; +import com.craftaro.epicvouchers.listeners.PlayerCommandListener; +import com.craftaro.epicvouchers.listeners.PlayerInteractListener; +import com.craftaro.epicvouchers.settings.Settings; +import com.craftaro.epicvouchers.utils.Callback; +import com.craftaro.epicvouchers.utils.ThreadSync; +import com.craftaro.epicvouchers.voucher.CoolDownManager; +import com.craftaro.epicvouchers.voucher.Voucher; +import com.craftaro.epicvouchers.voucher.VoucherExecutor; +import com.craftaro.epicvouchers.voucher.VoucherManager; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; diff --git a/src/main/java/com/songoda/epicvouchers/commands/CommandEditor.java b/src/main/java/com/craftaro/epicvouchers/commands/CommandEditor.java similarity index 87% rename from src/main/java/com/songoda/epicvouchers/commands/CommandEditor.java rename to src/main/java/com/craftaro/epicvouchers/commands/CommandEditor.java index 4b07750..26d63ec 100644 --- a/src/main/java/com/songoda/epicvouchers/commands/CommandEditor.java +++ b/src/main/java/com/craftaro/epicvouchers/commands/CommandEditor.java @@ -1,8 +1,8 @@ -package com.songoda.epicvouchers.commands; +package com.craftaro.epicvouchers.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.epicvouchers.EpicVouchers; -import com.songoda.epicvouchers.menus.VoucherMenu; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.menus.VoucherMenu; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicvouchers/commands/CommandEpicVouchers.java b/src/main/java/com/craftaro/epicvouchers/commands/CommandEpicVouchers.java similarity index 89% rename from src/main/java/com/songoda/epicvouchers/commands/CommandEpicVouchers.java rename to src/main/java/com/craftaro/epicvouchers/commands/CommandEpicVouchers.java index b35fb1a..140d8c5 100644 --- a/src/main/java/com/songoda/epicvouchers/commands/CommandEpicVouchers.java +++ b/src/main/java/com/craftaro/epicvouchers/commands/CommandEpicVouchers.java @@ -1,7 +1,7 @@ -package com.songoda.epicvouchers.commands; +package com.craftaro.epicvouchers.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.EpicVouchers; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; @@ -19,7 +19,7 @@ public class CommandEpicVouchers extends AbstractCommand { protected ReturnType runCommand(CommandSender sender, String... args) { sender.sendMessage(""); this.instance.getLocale().newMessage("&7Version " + this.instance.getDescription().getVersion() - + " Created with <3 by &5&l&oSongoda").sendPrefixedMessage(sender); + + " Created with <3 by &5&l&oCraftaro").sendPrefixedMessage(sender); for (AbstractCommand command : this.instance.getCommandManager().getAllCommands()) { if (command.getPermissionNode() == null || sender.hasPermission(command.getPermissionNode())) { diff --git a/src/main/java/com/songoda/epicvouchers/commands/CommandForce.java b/src/main/java/com/craftaro/epicvouchers/commands/CommandForce.java similarity index 94% rename from src/main/java/com/songoda/epicvouchers/commands/CommandForce.java rename to src/main/java/com/craftaro/epicvouchers/commands/CommandForce.java index 64eee4f..57d3d5f 100644 --- a/src/main/java/com/songoda/epicvouchers/commands/CommandForce.java +++ b/src/main/java/com/craftaro/epicvouchers/commands/CommandForce.java @@ -1,8 +1,8 @@ -package com.songoda.epicvouchers.commands; +package com.craftaro.epicvouchers.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.epicvouchers.EpicVouchers; -import com.songoda.epicvouchers.voucher.Voucher; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.voucher.Voucher; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicvouchers/commands/CommandForceAll.java b/src/main/java/com/craftaro/epicvouchers/commands/CommandForceAll.java similarity index 93% rename from src/main/java/com/songoda/epicvouchers/commands/CommandForceAll.java rename to src/main/java/com/craftaro/epicvouchers/commands/CommandForceAll.java index 9d9a977..22e355a 100644 --- a/src/main/java/com/songoda/epicvouchers/commands/CommandForceAll.java +++ b/src/main/java/com/craftaro/epicvouchers/commands/CommandForceAll.java @@ -1,8 +1,8 @@ -package com.songoda.epicvouchers.commands; +package com.craftaro.epicvouchers.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.epicvouchers.EpicVouchers; -import com.songoda.epicvouchers.voucher.Voucher; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.voucher.Voucher; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/songoda/epicvouchers/commands/CommandGive.java b/src/main/java/com/craftaro/epicvouchers/commands/CommandGive.java similarity index 94% rename from src/main/java/com/songoda/epicvouchers/commands/CommandGive.java rename to src/main/java/com/craftaro/epicvouchers/commands/CommandGive.java index f276cd4..7bcac4b 100644 --- a/src/main/java/com/songoda/epicvouchers/commands/CommandGive.java +++ b/src/main/java/com/craftaro/epicvouchers/commands/CommandGive.java @@ -1,8 +1,8 @@ -package com.songoda.epicvouchers.commands; +package com.craftaro.epicvouchers.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.epicvouchers.EpicVouchers; -import com.songoda.epicvouchers.voucher.Voucher; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.voucher.Voucher; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicvouchers/commands/CommandGiveAll.java b/src/main/java/com/craftaro/epicvouchers/commands/CommandGiveAll.java similarity index 92% rename from src/main/java/com/songoda/epicvouchers/commands/CommandGiveAll.java rename to src/main/java/com/craftaro/epicvouchers/commands/CommandGiveAll.java index d0dec42..75c5403 100644 --- a/src/main/java/com/songoda/epicvouchers/commands/CommandGiveAll.java +++ b/src/main/java/com/craftaro/epicvouchers/commands/CommandGiveAll.java @@ -1,8 +1,8 @@ -package com.songoda.epicvouchers.commands; +package com.craftaro.epicvouchers.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.epicvouchers.EpicVouchers; -import com.songoda.epicvouchers.voucher.Voucher; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.voucher.Voucher; import org.bukkit.command.CommandSender; import java.util.ArrayList; diff --git a/src/main/java/com/songoda/epicvouchers/commands/CommandList.java b/src/main/java/com/craftaro/epicvouchers/commands/CommandList.java similarity index 89% rename from src/main/java/com/songoda/epicvouchers/commands/CommandList.java rename to src/main/java/com/craftaro/epicvouchers/commands/CommandList.java index 3b44106..d579818 100644 --- a/src/main/java/com/songoda/epicvouchers/commands/CommandList.java +++ b/src/main/java/com/craftaro/epicvouchers/commands/CommandList.java @@ -1,8 +1,8 @@ -package com.songoda.epicvouchers.commands; +package com.craftaro.epicvouchers.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.epicvouchers.EpicVouchers; -import com.songoda.epicvouchers.voucher.Voucher; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.voucher.Voucher; import org.bukkit.command.CommandSender; import java.util.List; diff --git a/src/main/java/com/songoda/epicvouchers/commands/CommandReload.java b/src/main/java/com/craftaro/epicvouchers/commands/CommandReload.java similarity index 92% rename from src/main/java/com/songoda/epicvouchers/commands/CommandReload.java rename to src/main/java/com/craftaro/epicvouchers/commands/CommandReload.java index 68d4730..836eea3 100644 --- a/src/main/java/com/songoda/epicvouchers/commands/CommandReload.java +++ b/src/main/java/com/craftaro/epicvouchers/commands/CommandReload.java @@ -1,7 +1,7 @@ -package com.songoda.epicvouchers.commands; +package com.craftaro.epicvouchers.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.EpicVouchers; import org.bukkit.command.CommandSender; import java.util.List; diff --git a/src/main/java/com/songoda/epicvouchers/events/ForceRedeemEvent.java b/src/main/java/com/craftaro/epicvouchers/events/ForceRedeemEvent.java similarity index 96% rename from src/main/java/com/songoda/epicvouchers/events/ForceRedeemEvent.java rename to src/main/java/com/craftaro/epicvouchers/events/ForceRedeemEvent.java index 468d510..f051b38 100644 --- a/src/main/java/com/songoda/epicvouchers/events/ForceRedeemEvent.java +++ b/src/main/java/com/craftaro/epicvouchers/events/ForceRedeemEvent.java @@ -1,4 +1,4 @@ -package com.songoda.epicvouchers.events; +package com.craftaro.epicvouchers.events; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicvouchers/events/VoucherReceiveEvent.java b/src/main/java/com/craftaro/epicvouchers/events/VoucherReceiveEvent.java similarity index 97% rename from src/main/java/com/songoda/epicvouchers/events/VoucherReceiveEvent.java rename to src/main/java/com/craftaro/epicvouchers/events/VoucherReceiveEvent.java index a93638c..f141c9e 100644 --- a/src/main/java/com/songoda/epicvouchers/events/VoucherReceiveEvent.java +++ b/src/main/java/com/craftaro/epicvouchers/events/VoucherReceiveEvent.java @@ -1,4 +1,4 @@ -package com.songoda.epicvouchers.events; +package com.craftaro.epicvouchers.events; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicvouchers/events/VoucherRedeemEvent.java b/src/main/java/com/craftaro/epicvouchers/events/VoucherRedeemEvent.java similarity index 96% rename from src/main/java/com/songoda/epicvouchers/events/VoucherRedeemEvent.java rename to src/main/java/com/craftaro/epicvouchers/events/VoucherRedeemEvent.java index fb846d7..2f278a9 100644 --- a/src/main/java/com/songoda/epicvouchers/events/VoucherRedeemEvent.java +++ b/src/main/java/com/craftaro/epicvouchers/events/VoucherRedeemEvent.java @@ -1,4 +1,4 @@ -package com.songoda.epicvouchers.events; +package com.craftaro.epicvouchers.events; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; diff --git a/src/main/java/com/songoda/epicvouchers/handlers/Connections.java b/src/main/java/com/craftaro/epicvouchers/handlers/Connections.java similarity index 97% rename from src/main/java/com/songoda/epicvouchers/handlers/Connections.java rename to src/main/java/com/craftaro/epicvouchers/handlers/Connections.java index e7197af..733779a 100644 --- a/src/main/java/com/songoda/epicvouchers/handlers/Connections.java +++ b/src/main/java/com/craftaro/epicvouchers/handlers/Connections.java @@ -1,7 +1,7 @@ -package com.songoda.epicvouchers.handlers; +package com.craftaro.epicvouchers.handlers; import com.craftaro.core.utils.TextUtils; -import com.songoda.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.EpicVouchers; import org.bukkit.entity.Player; import java.sql.Connection; diff --git a/src/main/java/com/songoda/epicvouchers/libraries/ItemBuilder.java b/src/main/java/com/craftaro/epicvouchers/libraries/ItemBuilder.java similarity index 99% rename from src/main/java/com/songoda/epicvouchers/libraries/ItemBuilder.java rename to src/main/java/com/craftaro/epicvouchers/libraries/ItemBuilder.java index a533f2a..f07b36e 100644 --- a/src/main/java/com/songoda/epicvouchers/libraries/ItemBuilder.java +++ b/src/main/java/com/craftaro/epicvouchers/libraries/ItemBuilder.java @@ -1,4 +1,4 @@ -package com.songoda.epicvouchers.libraries; +package com.craftaro.epicvouchers.libraries; import org.bukkit.Color; import org.bukkit.DyeColor; diff --git a/src/main/java/com/songoda/epicvouchers/libraries/inventory/FastInv.java b/src/main/java/com/craftaro/epicvouchers/libraries/inventory/FastInv.java similarity index 99% rename from src/main/java/com/songoda/epicvouchers/libraries/inventory/FastInv.java rename to src/main/java/com/craftaro/epicvouchers/libraries/inventory/FastInv.java index 09e8999..4481cbe 100644 --- a/src/main/java/com/songoda/epicvouchers/libraries/inventory/FastInv.java +++ b/src/main/java/com/craftaro/epicvouchers/libraries/inventory/FastInv.java @@ -1,4 +1,4 @@ -package com.songoda.epicvouchers.libraries.inventory; +package com.craftaro.epicvouchers.libraries.inventory; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicvouchers/libraries/inventory/IconInv.java b/src/main/java/com/craftaro/epicvouchers/libraries/inventory/IconInv.java similarity index 99% rename from src/main/java/com/songoda/epicvouchers/libraries/inventory/IconInv.java rename to src/main/java/com/craftaro/epicvouchers/libraries/inventory/IconInv.java index 9092a61..774a101 100644 --- a/src/main/java/com/songoda/epicvouchers/libraries/inventory/IconInv.java +++ b/src/main/java/com/craftaro/epicvouchers/libraries/inventory/IconInv.java @@ -1,6 +1,6 @@ -package com.songoda.epicvouchers.libraries.inventory; +package com.craftaro.epicvouchers.libraries.inventory; -import com.songoda.epicvouchers.libraries.inventory.icons.Icon; +import com.craftaro.epicvouchers.libraries.inventory.icons.Icon; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/src/main/java/com/songoda/epicvouchers/libraries/inventory/PlayersMenu.java b/src/main/java/com/craftaro/epicvouchers/libraries/inventory/PlayersMenu.java similarity index 93% rename from src/main/java/com/songoda/epicvouchers/libraries/inventory/PlayersMenu.java rename to src/main/java/com/craftaro/epicvouchers/libraries/inventory/PlayersMenu.java index 16e765c..4906910 100644 --- a/src/main/java/com/songoda/epicvouchers/libraries/inventory/PlayersMenu.java +++ b/src/main/java/com/craftaro/epicvouchers/libraries/inventory/PlayersMenu.java @@ -1,11 +1,11 @@ -package com.songoda.epicvouchers.libraries.inventory; +package com.craftaro.epicvouchers.libraries.inventory; 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; -import com.songoda.epicvouchers.voucher.Voucher; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.libraries.ItemBuilder; +import com.craftaro.epicvouchers.menus.ActionMenu; +import com.craftaro.epicvouchers.voucher.Voucher; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/Icon.java b/src/main/java/com/craftaro/epicvouchers/libraries/inventory/icons/Icon.java similarity index 57% rename from src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/Icon.java rename to src/main/java/com/craftaro/epicvouchers/libraries/inventory/icons/Icon.java index 9b6f295..1f442cf 100644 --- a/src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/Icon.java +++ b/src/main/java/com/craftaro/epicvouchers/libraries/inventory/icons/Icon.java @@ -1,25 +1,25 @@ -package com.songoda.epicvouchers.libraries.inventory.icons; +package com.craftaro.epicvouchers.libraries.inventory.icons; -import com.songoda.epicvouchers.libraries.inventory.IconInv.IconClickEvent; +import com.craftaro.epicvouchers.libraries.inventory.IconInv; import org.bukkit.inventory.ItemStack; import java.util.function.Consumer; public class Icon { private final ItemStack itemStack; - private final Consumer consumer; + private final Consumer consumer; public Icon(ItemStack item) { this(item, event -> { }); } - public Icon(ItemStack item, Consumer consumer) { + public Icon(ItemStack item, Consumer consumer) { this.itemStack = item; this.consumer = consumer; } - public void run(IconClickEvent e) { + public void run(IconInv.IconClickEvent e) { this.consumer.accept(e); } diff --git a/src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/IntegerIcon.java b/src/main/java/com/craftaro/epicvouchers/libraries/inventory/icons/IntegerIcon.java similarity index 82% rename from src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/IntegerIcon.java rename to src/main/java/com/craftaro/epicvouchers/libraries/inventory/icons/IntegerIcon.java index 839033f..71907f3 100644 --- a/src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/IntegerIcon.java +++ b/src/main/java/com/craftaro/epicvouchers/libraries/inventory/icons/IntegerIcon.java @@ -1,6 +1,6 @@ -package com.songoda.epicvouchers.libraries.inventory.icons; +package com.craftaro.epicvouchers.libraries.inventory.icons; -import com.songoda.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.EpicVouchers; import org.apache.commons.lang.StringUtils; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/ListEntryIcon.java b/src/main/java/com/craftaro/epicvouchers/libraries/inventory/icons/ListEntryIcon.java similarity index 84% rename from src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/ListEntryIcon.java rename to src/main/java/com/craftaro/epicvouchers/libraries/inventory/icons/ListEntryIcon.java index 5670ea3..16395ae 100644 --- a/src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/ListEntryIcon.java +++ b/src/main/java/com/craftaro/epicvouchers/libraries/inventory/icons/ListEntryIcon.java @@ -1,9 +1,9 @@ -package com.songoda.epicvouchers.libraries.inventory.icons; +package com.craftaro.epicvouchers.libraries.inventory.icons; import com.craftaro.core.input.ChatPrompt; -import com.songoda.epicvouchers.EpicVouchers; -import com.songoda.epicvouchers.libraries.ItemBuilder; -import com.songoda.epicvouchers.utils.Pair; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.libraries.ItemBuilder; +import com.craftaro.epicvouchers.utils.Pair; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; diff --git a/src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/StringIcon.java b/src/main/java/com/craftaro/epicvouchers/libraries/inventory/icons/StringIcon.java similarity index 95% rename from src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/StringIcon.java rename to src/main/java/com/craftaro/epicvouchers/libraries/inventory/icons/StringIcon.java index eda89ff..7a27f2c 100644 --- a/src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/StringIcon.java +++ b/src/main/java/com/craftaro/epicvouchers/libraries/inventory/icons/StringIcon.java @@ -1,10 +1,10 @@ -package com.songoda.epicvouchers.libraries.inventory.icons; +package com.craftaro.epicvouchers.libraries.inventory.icons; 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 com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.libraries.ItemBuilder; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/StringListIcon.java b/src/main/java/com/craftaro/epicvouchers/libraries/inventory/icons/StringListIcon.java similarity index 64% rename from src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/StringListIcon.java rename to src/main/java/com/craftaro/epicvouchers/libraries/inventory/icons/StringListIcon.java index 67eaa92..cf963f2 100644 --- a/src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/StringListIcon.java +++ b/src/main/java/com/craftaro/epicvouchers/libraries/inventory/icons/StringListIcon.java @@ -1,9 +1,9 @@ -package com.songoda.epicvouchers.libraries.inventory.icons; +package com.craftaro.epicvouchers.libraries.inventory.icons; -import com.songoda.epicvouchers.EpicVouchers; -import com.songoda.epicvouchers.libraries.ItemBuilder; -import com.songoda.epicvouchers.menus.sub.editor.StringListMenu; -import com.songoda.epicvouchers.voucher.Voucher; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.libraries.ItemBuilder; +import com.craftaro.epicvouchers.menus.sub.editor.StringListMenu; +import com.craftaro.epicvouchers.voucher.Voucher; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/ToggleableIcon.java b/src/main/java/com/craftaro/epicvouchers/libraries/inventory/icons/ToggleableIcon.java similarity index 54% rename from src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/ToggleableIcon.java rename to src/main/java/com/craftaro/epicvouchers/libraries/inventory/icons/ToggleableIcon.java index 6c96d25..4299d13 100644 --- a/src/main/java/com/songoda/epicvouchers/libraries/inventory/icons/ToggleableIcon.java +++ b/src/main/java/com/craftaro/epicvouchers/libraries/inventory/icons/ToggleableIcon.java @@ -1,16 +1,16 @@ -package com.songoda.epicvouchers.libraries.inventory.icons; +package com.craftaro.epicvouchers.libraries.inventory.icons; -import com.songoda.epicvouchers.libraries.ItemBuilder; -import com.songoda.epicvouchers.libraries.inventory.IconInv.IconClickEvent; +import com.craftaro.epicvouchers.libraries.ItemBuilder; +import com.craftaro.epicvouchers.libraries.inventory.IconInv; import org.bukkit.ChatColor; import org.bukkit.Material; import java.util.function.Consumer; public class ToggleableIcon extends Icon { - private final Consumer consumer; + private final Consumer consumer; - public ToggleableIcon(String displayname, Consumer consumer, boolean state) { + public ToggleableIcon(String displayname, Consumer consumer, boolean state) { super(new ItemBuilder(Material.PAPER) .name(ChatColor.YELLOW + displayname) .lore(state ? ChatColor.GREEN + "ENABLED" : ChatColor.RED + "DISABLED") @@ -20,7 +20,7 @@ public class ToggleableIcon extends Icon { } @Override - public void run(IconClickEvent e) { + public void run(IconInv.IconClickEvent e) { this.consumer.accept(e); } } diff --git a/src/main/java/com/songoda/epicvouchers/listeners/PlayerCommandListener.java b/src/main/java/com/craftaro/epicvouchers/listeners/PlayerCommandListener.java similarity index 94% rename from src/main/java/com/songoda/epicvouchers/listeners/PlayerCommandListener.java rename to src/main/java/com/craftaro/epicvouchers/listeners/PlayerCommandListener.java index 856212d..a6fd3d3 100644 --- a/src/main/java/com/songoda/epicvouchers/listeners/PlayerCommandListener.java +++ b/src/main/java/com/craftaro/epicvouchers/listeners/PlayerCommandListener.java @@ -1,4 +1,4 @@ -package com.songoda.epicvouchers.listeners; +package com.craftaro.epicvouchers.listeners; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/com/songoda/epicvouchers/listeners/PlayerInteractListener.java b/src/main/java/com/craftaro/epicvouchers/listeners/PlayerInteractListener.java similarity index 93% rename from src/main/java/com/songoda/epicvouchers/listeners/PlayerInteractListener.java rename to src/main/java/com/craftaro/epicvouchers/listeners/PlayerInteractListener.java index 2e9e0fa..4836e05 100644 --- a/src/main/java/com/songoda/epicvouchers/listeners/PlayerInteractListener.java +++ b/src/main/java/com/craftaro/epicvouchers/listeners/PlayerInteractListener.java @@ -1,10 +1,10 @@ -package com.songoda.epicvouchers.listeners; +package com.craftaro.epicvouchers.listeners; 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; -import com.songoda.epicvouchers.voucher.Voucher; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.settings.Settings; +import com.craftaro.epicvouchers.utils.CachedSet; +import com.craftaro.epicvouchers.voucher.Voucher; import org.bukkit.ChatColor; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/com/songoda/epicvouchers/menus/ActionMenu.java b/src/main/java/com/craftaro/epicvouchers/menus/ActionMenu.java similarity index 88% rename from src/main/java/com/songoda/epicvouchers/menus/ActionMenu.java rename to src/main/java/com/craftaro/epicvouchers/menus/ActionMenu.java index 1d9a803..977863e 100644 --- a/src/main/java/com/songoda/epicvouchers/menus/ActionMenu.java +++ b/src/main/java/com/craftaro/epicvouchers/menus/ActionMenu.java @@ -1,13 +1,13 @@ -package com.songoda.epicvouchers.menus; +package com.craftaro.epicvouchers.menus; 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; -import com.songoda.epicvouchers.menus.sub.action.ForceMenu; -import com.songoda.epicvouchers.menus.sub.action.GiveMenu; -import com.songoda.epicvouchers.voucher.Voucher; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.libraries.ItemBuilder; +import com.craftaro.epicvouchers.libraries.inventory.FastInv; +import com.craftaro.epicvouchers.menus.sub.action.ForceMenu; +import com.craftaro.epicvouchers.menus.sub.action.GiveMenu; +import com.craftaro.epicvouchers.voucher.Voucher; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/src/main/java/com/songoda/epicvouchers/menus/ConfirmMenu.java b/src/main/java/com/craftaro/epicvouchers/menus/ConfirmMenu.java similarity index 89% rename from src/main/java/com/songoda/epicvouchers/menus/ConfirmMenu.java rename to src/main/java/com/craftaro/epicvouchers/menus/ConfirmMenu.java index e1a72cf..3e628df 100644 --- a/src/main/java/com/songoda/epicvouchers/menus/ConfirmMenu.java +++ b/src/main/java/com/craftaro/epicvouchers/menus/ConfirmMenu.java @@ -1,9 +1,9 @@ -package com.songoda.epicvouchers.menus; +package com.craftaro.epicvouchers.menus; 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; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.libraries.ItemBuilder; +import com.craftaro.epicvouchers.libraries.inventory.FastInv; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/com/songoda/epicvouchers/menus/OptionMenu.java b/src/main/java/com/craftaro/epicvouchers/menus/OptionMenu.java similarity index 85% rename from src/main/java/com/songoda/epicvouchers/menus/OptionMenu.java rename to src/main/java/com/craftaro/epicvouchers/menus/OptionMenu.java index c300653..930650c 100644 --- a/src/main/java/com/songoda/epicvouchers/menus/OptionMenu.java +++ b/src/main/java/com/craftaro/epicvouchers/menus/OptionMenu.java @@ -1,12 +1,12 @@ -package com.songoda.epicvouchers.menus; +package com.craftaro.epicvouchers.menus; 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; -import com.songoda.epicvouchers.menus.sub.editor.SetItemMenu; -import com.songoda.epicvouchers.voucher.Voucher; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.libraries.ItemBuilder; +import com.craftaro.epicvouchers.libraries.inventory.FastInv; +import com.craftaro.epicvouchers.menus.sub.editor.SetItemMenu; +import com.craftaro.epicvouchers.voucher.Voucher; import org.bukkit.ChatColor; import static org.bukkit.ChatColor.GRAY; diff --git a/src/main/java/com/songoda/epicvouchers/menus/VoucherEditorMenu.java b/src/main/java/com/craftaro/epicvouchers/menus/VoucherEditorMenu.java similarity index 88% rename from src/main/java/com/songoda/epicvouchers/menus/VoucherEditorMenu.java rename to src/main/java/com/craftaro/epicvouchers/menus/VoucherEditorMenu.java index 0fa70fb..4616a2e 100644 --- a/src/main/java/com/songoda/epicvouchers/menus/VoucherEditorMenu.java +++ b/src/main/java/com/craftaro/epicvouchers/menus/VoucherEditorMenu.java @@ -1,19 +1,19 @@ -package com.songoda.epicvouchers.menus; +package com.craftaro.epicvouchers.menus; 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; -import com.songoda.epicvouchers.libraries.inventory.icons.Icon; -import com.songoda.epicvouchers.libraries.inventory.icons.StringIcon; -import com.songoda.epicvouchers.libraries.inventory.icons.StringListIcon; -import com.songoda.epicvouchers.libraries.inventory.icons.ToggleableIcon; -import com.songoda.epicvouchers.menus.sub.editor.EffectsMenu; -import com.songoda.epicvouchers.menus.sub.editor.ParticlesMenu; -import com.songoda.epicvouchers.menus.sub.editor.SoundsMenu; -import com.songoda.epicvouchers.menus.sub.editor.TitlesMenu; -import com.songoda.epicvouchers.voucher.Voucher; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.libraries.ItemBuilder; +import com.craftaro.epicvouchers.libraries.inventory.IconInv; +import com.craftaro.epicvouchers.libraries.inventory.icons.Icon; +import com.craftaro.epicvouchers.libraries.inventory.icons.StringIcon; +import com.craftaro.epicvouchers.libraries.inventory.icons.StringListIcon; +import com.craftaro.epicvouchers.libraries.inventory.icons.ToggleableIcon; +import com.craftaro.epicvouchers.menus.sub.editor.EffectsMenu; +import com.craftaro.epicvouchers.menus.sub.editor.ParticlesMenu; +import com.craftaro.epicvouchers.menus.sub.editor.SoundsMenu; +import com.craftaro.epicvouchers.menus.sub.editor.TitlesMenu; +import com.craftaro.epicvouchers.voucher.Voucher; import org.apache.commons.lang.StringUtils; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicvouchers/menus/VoucherMenu.java b/src/main/java/com/craftaro/epicvouchers/menus/VoucherMenu.java similarity index 89% rename from src/main/java/com/songoda/epicvouchers/menus/VoucherMenu.java rename to src/main/java/com/craftaro/epicvouchers/menus/VoucherMenu.java index 9e5c4b1..787c74c 100644 --- a/src/main/java/com/songoda/epicvouchers/menus/VoucherMenu.java +++ b/src/main/java/com/craftaro/epicvouchers/menus/VoucherMenu.java @@ -1,13 +1,13 @@ -package com.songoda.epicvouchers.menus; +package com.craftaro.epicvouchers.menus; 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; -import com.songoda.epicvouchers.libraries.inventory.icons.Icon; -import com.songoda.epicvouchers.voucher.Voucher; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.libraries.ItemBuilder; +import com.craftaro.epicvouchers.libraries.inventory.IconInv; +import com.craftaro.epicvouchers.libraries.inventory.icons.Icon; +import com.craftaro.epicvouchers.voucher.Voucher; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/com/songoda/epicvouchers/menus/sub/action/ForceMenu.java b/src/main/java/com/craftaro/epicvouchers/menus/sub/action/ForceMenu.java similarity index 63% rename from src/main/java/com/songoda/epicvouchers/menus/sub/action/ForceMenu.java rename to src/main/java/com/craftaro/epicvouchers/menus/sub/action/ForceMenu.java index 2583623..d24b17a 100644 --- a/src/main/java/com/songoda/epicvouchers/menus/sub/action/ForceMenu.java +++ b/src/main/java/com/craftaro/epicvouchers/menus/sub/action/ForceMenu.java @@ -1,8 +1,8 @@ -package com.songoda.epicvouchers.menus.sub.action; +package com.craftaro.epicvouchers.menus.sub.action; -import com.songoda.epicvouchers.EpicVouchers; -import com.songoda.epicvouchers.libraries.inventory.PlayersMenu; -import com.songoda.epicvouchers.voucher.Voucher; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.libraries.inventory.PlayersMenu; +import com.craftaro.epicvouchers.voucher.Voucher; import org.bukkit.Bukkit; import java.util.ArrayList; diff --git a/src/main/java/com/songoda/epicvouchers/menus/sub/action/GiveMenu.java b/src/main/java/com/craftaro/epicvouchers/menus/sub/action/GiveMenu.java similarity index 62% rename from src/main/java/com/songoda/epicvouchers/menus/sub/action/GiveMenu.java rename to src/main/java/com/craftaro/epicvouchers/menus/sub/action/GiveMenu.java index 99935c8..174ad02 100644 --- a/src/main/java/com/songoda/epicvouchers/menus/sub/action/GiveMenu.java +++ b/src/main/java/com/craftaro/epicvouchers/menus/sub/action/GiveMenu.java @@ -1,8 +1,8 @@ -package com.songoda.epicvouchers.menus.sub.action; +package com.craftaro.epicvouchers.menus.sub.action; -import com.songoda.epicvouchers.EpicVouchers; -import com.songoda.epicvouchers.libraries.inventory.PlayersMenu; -import com.songoda.epicvouchers.voucher.Voucher; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.libraries.inventory.PlayersMenu; +import com.craftaro.epicvouchers.voucher.Voucher; import org.bukkit.Bukkit; import java.util.ArrayList; diff --git a/src/main/java/com/songoda/epicvouchers/menus/sub/editor/EffectsMenu.java b/src/main/java/com/craftaro/epicvouchers/menus/sub/editor/EffectsMenu.java similarity index 71% rename from src/main/java/com/songoda/epicvouchers/menus/sub/editor/EffectsMenu.java rename to src/main/java/com/craftaro/epicvouchers/menus/sub/editor/EffectsMenu.java index e43753b..5d4e297 100644 --- a/src/main/java/com/songoda/epicvouchers/menus/sub/editor/EffectsMenu.java +++ b/src/main/java/com/craftaro/epicvouchers/menus/sub/editor/EffectsMenu.java @@ -1,12 +1,12 @@ -package com.songoda.epicvouchers.menus.sub.editor; +package com.craftaro.epicvouchers.menus.sub.editor; -import com.songoda.epicvouchers.EpicVouchers; -import com.songoda.epicvouchers.libraries.ItemBuilder; -import com.songoda.epicvouchers.libraries.inventory.IconInv; -import com.songoda.epicvouchers.libraries.inventory.icons.IntegerIcon; -import com.songoda.epicvouchers.libraries.inventory.icons.StringIcon; -import com.songoda.epicvouchers.menus.VoucherEditorMenu; -import com.songoda.epicvouchers.voucher.Voucher; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.libraries.ItemBuilder; +import com.craftaro.epicvouchers.libraries.inventory.IconInv; +import com.craftaro.epicvouchers.libraries.inventory.icons.IntegerIcon; +import com.craftaro.epicvouchers.libraries.inventory.icons.StringIcon; +import com.craftaro.epicvouchers.menus.VoucherEditorMenu; +import com.craftaro.epicvouchers.voucher.Voucher; import org.bukkit.Material; import static org.bukkit.ChatColor.GRAY; diff --git a/src/main/java/com/songoda/epicvouchers/menus/sub/editor/ParticlesMenu.java b/src/main/java/com/craftaro/epicvouchers/menus/sub/editor/ParticlesMenu.java similarity index 67% rename from src/main/java/com/songoda/epicvouchers/menus/sub/editor/ParticlesMenu.java rename to src/main/java/com/craftaro/epicvouchers/menus/sub/editor/ParticlesMenu.java index ab91f79..1bbac08 100644 --- a/src/main/java/com/songoda/epicvouchers/menus/sub/editor/ParticlesMenu.java +++ b/src/main/java/com/craftaro/epicvouchers/menus/sub/editor/ParticlesMenu.java @@ -1,12 +1,12 @@ -package com.songoda.epicvouchers.menus.sub.editor; +package com.craftaro.epicvouchers.menus.sub.editor; -import com.songoda.epicvouchers.EpicVouchers; -import com.songoda.epicvouchers.libraries.ItemBuilder; -import com.songoda.epicvouchers.libraries.inventory.IconInv; -import com.songoda.epicvouchers.libraries.inventory.icons.IntegerIcon; -import com.songoda.epicvouchers.libraries.inventory.icons.StringIcon; -import com.songoda.epicvouchers.menus.VoucherEditorMenu; -import com.songoda.epicvouchers.voucher.Voucher; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.libraries.ItemBuilder; +import com.craftaro.epicvouchers.libraries.inventory.IconInv; +import com.craftaro.epicvouchers.libraries.inventory.icons.IntegerIcon; +import com.craftaro.epicvouchers.libraries.inventory.icons.StringIcon; +import com.craftaro.epicvouchers.menus.VoucherEditorMenu; +import com.craftaro.epicvouchers.voucher.Voucher; import org.bukkit.Material; import static org.bukkit.ChatColor.GRAY; diff --git a/src/main/java/com/songoda/epicvouchers/menus/sub/editor/SetItemMenu.java b/src/main/java/com/craftaro/epicvouchers/menus/sub/editor/SetItemMenu.java similarity index 88% rename from src/main/java/com/songoda/epicvouchers/menus/sub/editor/SetItemMenu.java rename to src/main/java/com/craftaro/epicvouchers/menus/sub/editor/SetItemMenu.java index 7f7df33..7317b5e 100644 --- a/src/main/java/com/songoda/epicvouchers/menus/sub/editor/SetItemMenu.java +++ b/src/main/java/com/craftaro/epicvouchers/menus/sub/editor/SetItemMenu.java @@ -1,11 +1,11 @@ -package com.songoda.epicvouchers.menus.sub.editor; +package com.craftaro.epicvouchers.menus.sub.editor; 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; -import com.songoda.epicvouchers.menus.OptionMenu; -import com.songoda.epicvouchers.voucher.Voucher; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.libraries.ItemBuilder; +import com.craftaro.epicvouchers.libraries.inventory.FastInv; +import com.craftaro.epicvouchers.menus.OptionMenu; +import com.craftaro.epicvouchers.voucher.Voucher; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.event.inventory.ClickType; diff --git a/src/main/java/com/songoda/epicvouchers/menus/sub/editor/SoundsMenu.java b/src/main/java/com/craftaro/epicvouchers/menus/sub/editor/SoundsMenu.java similarity index 69% rename from src/main/java/com/songoda/epicvouchers/menus/sub/editor/SoundsMenu.java rename to src/main/java/com/craftaro/epicvouchers/menus/sub/editor/SoundsMenu.java index ec9db99..42b9d72 100644 --- a/src/main/java/com/songoda/epicvouchers/menus/sub/editor/SoundsMenu.java +++ b/src/main/java/com/craftaro/epicvouchers/menus/sub/editor/SoundsMenu.java @@ -1,13 +1,13 @@ -package com.songoda.epicvouchers.menus.sub.editor; +package com.craftaro.epicvouchers.menus.sub.editor; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.libraries.ItemBuilder; +import com.craftaro.epicvouchers.libraries.inventory.IconInv; +import com.craftaro.epicvouchers.libraries.inventory.icons.IntegerIcon; +import com.craftaro.epicvouchers.libraries.inventory.icons.StringIcon; +import com.craftaro.epicvouchers.menus.VoucherEditorMenu; +import com.craftaro.epicvouchers.voucher.Voucher; import com.google.common.base.Enums; -import com.songoda.epicvouchers.EpicVouchers; -import com.songoda.epicvouchers.libraries.ItemBuilder; -import com.songoda.epicvouchers.libraries.inventory.IconInv; -import com.songoda.epicvouchers.libraries.inventory.icons.IntegerIcon; -import com.songoda.epicvouchers.libraries.inventory.icons.StringIcon; -import com.songoda.epicvouchers.menus.VoucherEditorMenu; -import com.songoda.epicvouchers.voucher.Voucher; import org.bukkit.Material; import org.bukkit.Sound; diff --git a/src/main/java/com/songoda/epicvouchers/menus/sub/editor/StringListMenu.java b/src/main/java/com/craftaro/epicvouchers/menus/sub/editor/StringListMenu.java similarity index 85% rename from src/main/java/com/songoda/epicvouchers/menus/sub/editor/StringListMenu.java rename to src/main/java/com/craftaro/epicvouchers/menus/sub/editor/StringListMenu.java index 3098a23..f0652a3 100644 --- a/src/main/java/com/songoda/epicvouchers/menus/sub/editor/StringListMenu.java +++ b/src/main/java/com/craftaro/epicvouchers/menus/sub/editor/StringListMenu.java @@ -1,13 +1,13 @@ -package com.songoda.epicvouchers.menus.sub.editor; +package com.craftaro.epicvouchers.menus.sub.editor; 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; -import com.songoda.epicvouchers.libraries.inventory.icons.ListEntryIcon; -import com.songoda.epicvouchers.menus.VoucherEditorMenu; -import com.songoda.epicvouchers.voucher.Voucher; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.libraries.ItemBuilder; +import com.craftaro.epicvouchers.libraries.inventory.IconInv; +import com.craftaro.epicvouchers.libraries.inventory.icons.ListEntryIcon; +import com.craftaro.epicvouchers.menus.VoucherEditorMenu; +import com.craftaro.epicvouchers.voucher.Voucher; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/src/main/java/com/songoda/epicvouchers/menus/sub/editor/TitlesMenu.java b/src/main/java/com/craftaro/epicvouchers/menus/sub/editor/TitlesMenu.java similarity index 77% rename from src/main/java/com/songoda/epicvouchers/menus/sub/editor/TitlesMenu.java rename to src/main/java/com/craftaro/epicvouchers/menus/sub/editor/TitlesMenu.java index 253663d..567f0b0 100644 --- a/src/main/java/com/songoda/epicvouchers/menus/sub/editor/TitlesMenu.java +++ b/src/main/java/com/craftaro/epicvouchers/menus/sub/editor/TitlesMenu.java @@ -1,12 +1,12 @@ -package com.songoda.epicvouchers.menus.sub.editor; +package com.craftaro.epicvouchers.menus.sub.editor; -import com.songoda.epicvouchers.EpicVouchers; -import com.songoda.epicvouchers.libraries.ItemBuilder; -import com.songoda.epicvouchers.libraries.inventory.IconInv; -import com.songoda.epicvouchers.libraries.inventory.icons.IntegerIcon; -import com.songoda.epicvouchers.libraries.inventory.icons.StringIcon; -import com.songoda.epicvouchers.menus.VoucherEditorMenu; -import com.songoda.epicvouchers.voucher.Voucher; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.libraries.ItemBuilder; +import com.craftaro.epicvouchers.libraries.inventory.IconInv; +import com.craftaro.epicvouchers.libraries.inventory.icons.IntegerIcon; +import com.craftaro.epicvouchers.libraries.inventory.icons.StringIcon; +import com.craftaro.epicvouchers.menus.VoucherEditorMenu; +import com.craftaro.epicvouchers.voucher.Voucher; import org.bukkit.Material; import static org.bukkit.ChatColor.GRAY; diff --git a/src/main/java/com/songoda/epicvouchers/settings/Settings.java b/src/main/java/com/craftaro/epicvouchers/settings/Settings.java similarity index 95% rename from src/main/java/com/songoda/epicvouchers/settings/Settings.java rename to src/main/java/com/craftaro/epicvouchers/settings/Settings.java index dafd736..d49f7bf 100644 --- a/src/main/java/com/songoda/epicvouchers/settings/Settings.java +++ b/src/main/java/com/craftaro/epicvouchers/settings/Settings.java @@ -1,8 +1,8 @@ -package com.songoda.epicvouchers.settings; +package com.craftaro.epicvouchers.settings; import com.craftaro.core.configuration.Config; import com.craftaro.core.configuration.ConfigSetting; -import com.songoda.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.EpicVouchers; import org.bukkit.event.Listener; public class Settings implements Listener { diff --git a/src/main/java/com/songoda/epicvouchers/utils/CachedSet.java b/src/main/java/com/craftaro/epicvouchers/utils/CachedSet.java similarity index 96% rename from src/main/java/com/songoda/epicvouchers/utils/CachedSet.java rename to src/main/java/com/craftaro/epicvouchers/utils/CachedSet.java index 849c8a2..2740bc8 100644 --- a/src/main/java/com/songoda/epicvouchers/utils/CachedSet.java +++ b/src/main/java/com/craftaro/epicvouchers/utils/CachedSet.java @@ -1,4 +1,4 @@ -package com.songoda.epicvouchers.utils; +package com.craftaro.epicvouchers.utils; import java.util.Map; import java.util.WeakHashMap; diff --git a/src/main/java/com/songoda/epicvouchers/utils/Callback.java b/src/main/java/com/craftaro/epicvouchers/utils/Callback.java similarity index 76% rename from src/main/java/com/songoda/epicvouchers/utils/Callback.java rename to src/main/java/com/craftaro/epicvouchers/utils/Callback.java index 0ceed6e..6cb2905 100644 --- a/src/main/java/com/songoda/epicvouchers/utils/Callback.java +++ b/src/main/java/com/craftaro/epicvouchers/utils/Callback.java @@ -1,4 +1,4 @@ -package com.songoda.epicvouchers.utils; +package com.craftaro.epicvouchers.utils; // TODO: Copied from EpicAnchors - Move to SongodaCore (maybe rename too?) public interface Callback { diff --git a/src/main/java/com/songoda/epicvouchers/utils/Pair.java b/src/main/java/com/craftaro/epicvouchers/utils/Pair.java similarity index 98% rename from src/main/java/com/songoda/epicvouchers/utils/Pair.java rename to src/main/java/com/craftaro/epicvouchers/utils/Pair.java index a729018..be289d4 100644 --- a/src/main/java/com/songoda/epicvouchers/utils/Pair.java +++ b/src/main/java/com/craftaro/epicvouchers/utils/Pair.java @@ -1,4 +1,4 @@ -package com.songoda.epicvouchers.utils; +package com.craftaro.epicvouchers.utils; import java.io.Serializable; import java.util.Objects; diff --git a/src/main/java/com/songoda/epicvouchers/utils/ThreadSync.java b/src/main/java/com/craftaro/epicvouchers/utils/ThreadSync.java similarity index 94% rename from src/main/java/com/songoda/epicvouchers/utils/ThreadSync.java rename to src/main/java/com/craftaro/epicvouchers/utils/ThreadSync.java index 4f49af9..8742704 100644 --- a/src/main/java/com/songoda/epicvouchers/utils/ThreadSync.java +++ b/src/main/java/com/craftaro/epicvouchers/utils/ThreadSync.java @@ -1,4 +1,4 @@ -package com.songoda.epicvouchers.utils; +package com.craftaro.epicvouchers.utils; import java.util.concurrent.atomic.AtomicReference; diff --git a/src/main/java/com/songoda/epicvouchers/voucher/CoolDownManager.java b/src/main/java/com/craftaro/epicvouchers/voucher/CoolDownManager.java similarity index 93% rename from src/main/java/com/songoda/epicvouchers/voucher/CoolDownManager.java rename to src/main/java/com/craftaro/epicvouchers/voucher/CoolDownManager.java index aacc87a..5b5ac03 100644 --- a/src/main/java/com/songoda/epicvouchers/voucher/CoolDownManager.java +++ b/src/main/java/com/craftaro/epicvouchers/voucher/CoolDownManager.java @@ -1,6 +1,6 @@ -package com.songoda.epicvouchers.voucher; +package com.craftaro.epicvouchers.voucher; -import com.songoda.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.EpicVouchers; import org.bukkit.Bukkit; import java.util.HashMap; diff --git a/src/main/java/com/songoda/epicvouchers/voucher/Voucher.java b/src/main/java/com/craftaro/epicvouchers/voucher/Voucher.java similarity index 98% rename from src/main/java/com/songoda/epicvouchers/voucher/Voucher.java rename to src/main/java/com/craftaro/epicvouchers/voucher/Voucher.java index 53248d9..9f210d9 100644 --- a/src/main/java/com/songoda/epicvouchers/voucher/Voucher.java +++ b/src/main/java/com/craftaro/epicvouchers/voucher/Voucher.java @@ -1,14 +1,14 @@ -package com.songoda.epicvouchers.voucher; +package com.craftaro.epicvouchers.voucher; 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; -import com.songoda.epicvouchers.menus.ConfirmMenu; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.events.ForceRedeemEvent; +import com.craftaro.epicvouchers.events.VoucherReceiveEvent; +import com.craftaro.epicvouchers.menus.ConfirmMenu; import lombok.experimental.Accessors; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/src/main/java/com/songoda/epicvouchers/voucher/VoucherExecutor.java b/src/main/java/com/craftaro/epicvouchers/voucher/VoucherExecutor.java similarity index 97% rename from src/main/java/com/songoda/epicvouchers/voucher/VoucherExecutor.java rename to src/main/java/com/craftaro/epicvouchers/voucher/VoucherExecutor.java index 43b23b1..bd3c481 100644 --- a/src/main/java/com/songoda/epicvouchers/voucher/VoucherExecutor.java +++ b/src/main/java/com/craftaro/epicvouchers/voucher/VoucherExecutor.java @@ -1,10 +1,10 @@ -package com.songoda.epicvouchers.voucher; +package com.craftaro.epicvouchers.voucher; 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; +import com.craftaro.epicvouchers.EpicVouchers; +import com.craftaro.epicvouchers.events.VoucherRedeemEvent; +import com.craftaro.epicvouchers.listeners.PlayerCommandListener; import org.apache.commons.lang.StringUtils; import org.bukkit.Bukkit; import org.bukkit.Effect; diff --git a/src/main/java/com/songoda/epicvouchers/voucher/VoucherManager.java b/src/main/java/com/craftaro/epicvouchers/voucher/VoucherManager.java similarity index 94% rename from src/main/java/com/songoda/epicvouchers/voucher/VoucherManager.java rename to src/main/java/com/craftaro/epicvouchers/voucher/VoucherManager.java index 5bf9c48..2156530 100644 --- a/src/main/java/com/songoda/epicvouchers/voucher/VoucherManager.java +++ b/src/main/java/com/craftaro/epicvouchers/voucher/VoucherManager.java @@ -1,4 +1,4 @@ -package com.songoda.epicvouchers.voucher; +package com.craftaro.epicvouchers.voucher; import java.util.Collection; import java.util.HashMap; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 982742c..8df8b72 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -3,7 +3,7 @@ description: ${project.description} version: ${project.version} api-version: 1.13 -main: com.songoda.epicvouchers.EpicVouchers +main: com.craftaro.epicvouchers.EpicVouchers author: Craftaro website: ${project.url} diff --git a/src/main/resources/vouchers.yml b/src/main/resources/vouchers.yml index 0d85345..7eb4f08 100644 --- a/src/main/resources/vouchers.yml +++ b/src/main/resources/vouchers.yml @@ -12,7 +12,7 @@ vouchers: - "ðis nice cookie will tell you." - "" - "&cWhat could be inside this voucher?" - - "&6- Songoda" + - "&6- Craftaro" glow: true confirm: true unbreakable: true