From 8ccfc5c82de60f3b15519a9036751ac080053672 Mon Sep 17 00:00:00 2001 From: ANGEL Date: Tue, 25 Jul 2023 12:39:40 +0300 Subject: [PATCH] Move classes from package com.songoda to com.craftaro; Changed links to Craftaro's wiki --- pom.xml | 9 ++- .../epicenchants/CommandCommons.java | 2 +- .../epicenchants/EpicEnchants.java | 60 +++++++++---------- .../commands/CommandAlchemist.java | 6 +- .../epicenchants/commands/CommandApply.java | 20 +++---- .../commands/CommandEnchanter.java | 6 +- .../commands/CommandGiveBook.java | 8 +-- .../commands/CommandGiveItemDust.java | 8 +-- .../commands/CommandGiveRandomBook.java | 6 +- .../commands/CommandGiveScroll.java | 6 +- .../epicenchants/commands/CommandList.java | 4 +- .../epicenchants/commands/CommandReload.java | 4 +- .../commands/CommandSettings.java | 4 +- .../commands/CommandTinkerer.java | 6 +- .../effect/EffectEventExecutor.java | 4 +- .../epicenchants/effect/EffectExecutor.java | 16 ++--- .../epicenchants/effect/EffectManager.java | 4 +- .../epicenchants/effect/effects/Burn.java | 8 +-- .../effect/effects/CancelEvent.java | 6 +- .../effect/effects/ConsoleCommand.java | 10 ++-- .../epicenchants/effect/effects/DropHead.java | 6 +- .../epicenchants/effect/effects/DropHeld.java | 8 +-- .../epicenchants/effect/effects/DropItem.java | 8 +-- .../epicenchants/effect/effects/Explode.java | 8 +-- .../effect/effects/Extinguish.java | 6 +- .../epicenchants/effect/effects/Fly.java | 8 +-- .../effect/effects/Lightning.java | 6 +- .../epicenchants/effect/effects/Message.java | 10 ++-- .../effect/effects/ModifyBlock.java | 6 +- .../effect/effects/ModifyDamage.java | 8 +-- .../effect/effects/ModifyExp.java | 10 ++-- .../effect/effects/ModifyFood.java | 6 +- .../effect/effects/ModifyHealth.java | 6 +- .../effect/effects/ModifyOxygen.java | 6 +- .../effect/effects/MoreDrops.java | 8 +-- .../effect/effects/PlayerCommand.java | 17 +++--- .../epicenchants/effect/effects/Potion.java | 10 ++-- .../effect/effects/RemoveEffect.java | 6 +- .../epicenchants/effect/effects/Repair.java | 6 +- .../epicenchants/effect/effects/SpawnMob.java | 14 ++--- .../epicenchants/effect/effects/SpawnTnt.java | 8 +-- .../epicenchants/effect/effects/StealExp.java | 10 ++-- .../effect/effects/StealFood.java | 6 +- .../effect/effects/StealHealth.java | 6 +- .../epicenchants/effect/effects/Throw.java | 12 ++-- .../epicenchants/enums/EnchantResult.java | 2 +- .../epicenchants/enums/EventType.java | 2 +- .../epicenchants/enums/GiveType.java | 2 +- .../epicenchants/enums/ItemType.java | 2 +- .../epicenchants/enums/TriggerType.java | 2 +- .../epicenchants/events/ArmorEquipEvent.java | 2 +- .../events/EnchantApplyEvent.java | 4 +- .../events/HeldItemChangedEvent.java | 2 +- .../epicenchants/listeners/ArmorListener.java | 40 ++++++------- .../listeners/EntityListener.java | 8 +-- .../listeners/HeldItemListener.java | 25 ++++---- .../listeners/PlayerListener.java | 16 ++--- .../listeners/item/BlackScrollListener.java | 10 ++-- .../listeners/item/BookListener.java | 28 ++++----- .../listeners/item/DustListener.java | 8 +-- .../listeners/item/ItemListener.java | 4 +- .../listeners/item/WhiteScrollListener.java | 10 ++-- .../epicenchants/managers/EnchantManager.java | 10 ++-- .../epicenchants/managers/FileManager.java | 10 ++-- .../epicenchants/managers/GroupManager.java | 8 +-- .../epicenchants/managers/InfoManager.java | 10 ++-- .../epicenchants/managers/Manager.java | 4 +- .../epicenchants/menus/AlchemistMenu.java | 59 +++++++++--------- .../epicenchants/menus/EnchanterMenu.java | 28 ++++----- .../epicenchants/menus/InfoMenu.java | 30 +++++----- .../epicenchants/menus/MainInfoMenu.java | 14 ++--- .../epicenchants/menus/TinkererMenu.java | 22 +++---- .../epicenchants/objects/BookItem.java | 16 ++--- .../epicenchants/objects/Condition.java | 6 +- .../epicenchants/objects/Enchant.java | 12 ++-- .../epicenchants/objects/Group.java | 2 +- .../epicenchants/objects/LeveledModifier.java | 6 +- .../epicenchants/objects/Placeholder.java | 2 +- .../epicenchants/utils/EnchantUtils.java | 43 ++++++------- .../epicenchants/utils/SpecialItems.java | 34 +++++------ .../epicenchants/utils/Tuple.java | 2 +- .../epicenchants/utils/objects/FastInv.java | 2 +- .../utils/objects/FileLocation.java | 2 +- .../utils/objects/ItemBuilder.java | 12 ++-- .../epicenchants/utils/settings/Settings.java | 4 +- .../utils/single/ConfigParser.java | 24 ++++---- .../epicenchants/utils/single/Experience.java | 2 +- .../utils/single/GeneralUtils.java | 6 +- .../epicenchants/utils/single/ItemGroup.java | 5 +- .../utils/single/Placeholders.java | 4 +- .../utils/single/RomanNumber.java | 2 +- .../wrappers/EnchantmentWrapper.java | 4 +- .../resources/enchants/elite/AntiGravity.yml | 4 +- src/main/resources/enchants/elite/Frozen.yml | 4 +- src/main/resources/enchants/elite/Healy.yml | 2 +- src/main/resources/enchants/elite/Poison.yml | 4 +- .../resources/enchants/elite/RocketEscape.yml | 4 +- .../resources/enchants/elite/Shockwave.yml | 6 +- src/main/resources/enchants/elite/Shocky.yml | 2 +- src/main/resources/enchants/elite/Wither.yml | 4 +- .../enchants/legendary/DeathBringer.yml | 4 +- .../resources/enchants/legendary/DeathGod.yml | 4 +- .../enchants/legendary/Divergent.yml | 2 +- .../resources/enchants/legendary/Drunk.yml | 2 +- .../enchants/legendary/Enlightened.yml | 4 +- .../resources/enchants/legendary/Gears.yml | 4 +- .../enchants/legendary/LifeSteal.yml | 4 +- .../resources/enchants/legendary/Overload.yml | 4 +- .../resources/enchants/legendary/Resist.yml | 2 +- .../enchants/legendary/SkillSwipe.yml | 4 +- .../resources/enchants/simple/Aquatic.yml | 4 +- .../resources/enchants/simple/Confusion.yml | 4 +- .../resources/enchants/simple/Experience.yml | 4 +- .../resources/enchants/simple/Glowing.yml | 4 +- src/main/resources/enchants/simple/Haste.yml | 4 +- .../resources/enchants/simple/Insomnia.yml | 4 +- .../resources/enchants/simple/Lightning.yml | 4 +- .../resources/enchants/simple/Obliterate.yml | 4 +- .../resources/enchants/simple/Oxygenate.yml | 4 +- .../resources/enchants/ultimate/Blind.yml | 4 +- .../resources/enchants/ultimate/Dodge.yml | 4 +- src/main/resources/enchants/ultimate/Fly.yml | 2 +- .../resources/enchants/ultimate/FoodSteal.yml | 2 +- .../resources/enchants/ultimate/IceAspect.yml | 6 +- .../resources/enchants/ultimate/StormFall.yml | 4 +- .../resources/enchants/unique/Berserk.yml | 4 +- .../enchants/unique/Decapitation.yml | 2 +- .../resources/enchants/unique/Explosive.yml | 4 +- .../enchants/unique/FeatherWeight.yml | 4 +- .../resources/enchants/unique/Inquisitive.yml | 2 +- .../enchants/unique/ObsidianDestroyer.yml | 4 +- .../enchants/unique/PlagueCarrier.yml | 4 +- .../resources/enchants/unique/Ragdoll.yml | 4 +- .../enchants/unique/SelfDestruct.yml | 4 +- src/main/resources/plugin.yml | 7 +-- 135 files changed, 547 insertions(+), 568 deletions(-) rename src/main/java/com/{songoda => craftaro}/epicenchants/CommandCommons.java (92%) rename src/main/java/com/{songoda => craftaro}/epicenchants/EpicEnchants.java (75%) rename src/main/java/com/{songoda => craftaro}/epicenchants/commands/CommandAlchemist.java (88%) rename src/main/java/com/{songoda => craftaro}/epicenchants/commands/CommandApply.java (87%) rename src/main/java/com/{songoda => craftaro}/epicenchants/commands/CommandEnchanter.java (88%) rename src/main/java/com/{songoda => craftaro}/epicenchants/commands/CommandGiveBook.java (96%) rename src/main/java/com/{songoda => craftaro}/epicenchants/commands/CommandGiveItemDust.java (95%) rename src/main/java/com/{songoda => craftaro}/epicenchants/commands/CommandGiveRandomBook.java (95%) rename src/main/java/com/{songoda => craftaro}/epicenchants/commands/CommandGiveScroll.java (96%) rename src/main/java/com/{songoda => craftaro}/epicenchants/commands/CommandList.java (94%) rename src/main/java/com/{songoda => craftaro}/epicenchants/commands/CommandReload.java (91%) rename src/main/java/com/{songoda => craftaro}/epicenchants/commands/CommandSettings.java (92%) rename src/main/java/com/{songoda => craftaro}/epicenchants/commands/CommandTinkerer.java (88%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/EffectEventExecutor.java (88%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/EffectExecutor.java (89%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/EffectManager.java (88%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/Burn.java (74%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/CancelEvent.java (78%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/ConsoleCommand.java (72%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/DropHead.java (94%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/DropHeld.java (80%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/DropItem.java (75%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/Explode.java (76%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/Extinguish.java (76%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/Fly.java (69%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/Lightning.java (77%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/Message.java (73%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/ModifyBlock.java (87%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/ModifyDamage.java (76%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/ModifyExp.java (78%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/ModifyFood.java (82%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/ModifyHealth.java (84%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/ModifyOxygen.java (85%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/MoreDrops.java (83%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/PlayerCommand.java (60%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/Potion.java (87%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/RemoveEffect.java (85%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/Repair.java (80%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/SpawnMob.java (92%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/SpawnTnt.java (87%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/StealExp.java (78%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/StealFood.java (87%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/StealHealth.java (88%) rename src/main/java/com/{songoda => craftaro}/epicenchants/effect/effects/Throw.java (82%) rename src/main/java/com/{songoda => craftaro}/epicenchants/enums/EnchantResult.java (74%) rename src/main/java/com/{songoda => craftaro}/epicenchants/enums/EventType.java (52%) rename src/main/java/com/{songoda => craftaro}/epicenchants/enums/GiveType.java (58%) rename src/main/java/com/{songoda => craftaro}/epicenchants/enums/ItemType.java (82%) rename src/main/java/com/{songoda => craftaro}/epicenchants/enums/TriggerType.java (93%) rename src/main/java/com/{songoda => craftaro}/epicenchants/events/ArmorEquipEvent.java (99%) rename src/main/java/com/{songoda => craftaro}/epicenchants/events/EnchantApplyEvent.java (94%) rename src/main/java/com/{songoda => craftaro}/epicenchants/events/HeldItemChangedEvent.java (98%) rename src/main/java/com/{songoda => craftaro}/epicenchants/listeners/ArmorListener.java (75%) rename src/main/java/com/{songoda => craftaro}/epicenchants/listeners/EntityListener.java (96%) rename src/main/java/com/{songoda => craftaro}/epicenchants/listeners/HeldItemListener.java (91%) rename src/main/java/com/{songoda => craftaro}/epicenchants/listeners/PlayerListener.java (92%) rename src/main/java/com/{songoda => craftaro}/epicenchants/listeners/item/BlackScrollListener.java (86%) rename src/main/java/com/{songoda => craftaro}/epicenchants/listeners/item/BookListener.java (83%) rename src/main/java/com/{songoda => craftaro}/epicenchants/listeners/item/DustListener.java (91%) rename src/main/java/com/{songoda => craftaro}/epicenchants/listeners/item/ItemListener.java (96%) rename src/main/java/com/{songoda => craftaro}/epicenchants/listeners/item/WhiteScrollListener.java (77%) rename src/main/java/com/{songoda => craftaro}/epicenchants/managers/EnchantManager.java (84%) rename src/main/java/com/{songoda => craftaro}/epicenchants/managers/FileManager.java (95%) rename src/main/java/com/{songoda => craftaro}/epicenchants/managers/GroupManager.java (74%) rename src/main/java/com/{songoda => craftaro}/epicenchants/managers/InfoManager.java (86%) rename src/main/java/com/{songoda => craftaro}/epicenchants/managers/Manager.java (92%) rename src/main/java/com/{songoda => craftaro}/epicenchants/menus/AlchemistMenu.java (85%) rename src/main/java/com/{songoda => craftaro}/epicenchants/menus/EnchanterMenu.java (80%) rename src/main/java/com/{songoda => craftaro}/epicenchants/menus/InfoMenu.java (73%) rename src/main/java/com/{songoda => craftaro}/epicenchants/menus/MainInfoMenu.java (75%) rename src/main/java/com/{songoda => craftaro}/epicenchants/menus/TinkererMenu.java (93%) rename src/main/java/com/{songoda => craftaro}/epicenchants/objects/BookItem.java (90%) rename src/main/java/com/{songoda => craftaro}/epicenchants/objects/Condition.java (83%) rename src/main/java/com/{songoda => craftaro}/epicenchants/objects/Enchant.java (94%) rename src/main/java/com/{songoda => craftaro}/epicenchants/objects/Group.java (99%) rename src/main/java/com/{songoda => craftaro}/epicenchants/objects/LeveledModifier.java (83%) rename src/main/java/com/{songoda => craftaro}/epicenchants/objects/Placeholder.java (92%) rename src/main/java/com/{songoda => craftaro}/epicenchants/utils/EnchantUtils.java (81%) rename src/main/java/com/{songoda => craftaro}/epicenchants/utils/SpecialItems.java (80%) rename src/main/java/com/{songoda => craftaro}/epicenchants/utils/Tuple.java (90%) rename src/main/java/com/{songoda => craftaro}/epicenchants/utils/objects/FastInv.java (99%) rename src/main/java/com/{songoda => craftaro}/epicenchants/utils/objects/FileLocation.java (95%) rename src/main/java/com/{songoda => craftaro}/epicenchants/utils/objects/ItemBuilder.java (95%) rename src/main/java/com/{songoda => craftaro}/epicenchants/utils/settings/Settings.java (96%) rename src/main/java/com/{songoda => craftaro}/epicenchants/utils/single/ConfigParser.java (83%) rename src/main/java/com/{songoda => craftaro}/epicenchants/utils/single/Experience.java (98%) rename src/main/java/com/{songoda => craftaro}/epicenchants/utils/single/GeneralUtils.java (96%) rename src/main/java/com/{songoda => craftaro}/epicenchants/utils/single/ItemGroup.java (96%) rename src/main/java/com/{songoda => craftaro}/epicenchants/utils/single/Placeholders.java (97%) rename src/main/java/com/{songoda => craftaro}/epicenchants/utils/single/RomanNumber.java (93%) rename src/main/java/com/{songoda => craftaro}/epicenchants/wrappers/EnchantmentWrapper.java (94%) diff --git a/pom.xml b/pom.xml index 46c8929..e69f965 100644 --- a/pom.xml +++ b/pom.xml @@ -4,9 +4,9 @@ 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 + com.craftaro EpicEnchants - 1.3.0-SNAPSHOT + 1.3.1-SNAPSHOT EpicEnchants Unlock the potential of your weapons, tools and armor by making your own custom enchants. @@ -31,19 +31,18 @@ + clean install org.apache.maven.plugins maven-shade-plugin 3.4.1 - package shade - ${project.name}-${project.version} @@ -54,7 +53,7 @@ com.craftaro.core - com.songoda.epicenchants.core + com.craftaro.epicenchants.core diff --git a/src/main/java/com/songoda/epicenchants/CommandCommons.java b/src/main/java/com/craftaro/epicenchants/CommandCommons.java similarity index 92% rename from src/main/java/com/songoda/epicenchants/CommandCommons.java rename to src/main/java/com/craftaro/epicenchants/CommandCommons.java index 14b40fd..7e1b4e0 100644 --- a/src/main/java/com/songoda/epicenchants/CommandCommons.java +++ b/src/main/java/com/craftaro/epicenchants/CommandCommons.java @@ -1,4 +1,4 @@ -package com.songoda.epicenchants; +package com.craftaro.epicenchants; import com.craftaro.core.utils.NumberUtils; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/songoda/epicenchants/EpicEnchants.java b/src/main/java/com/craftaro/epicenchants/EpicEnchants.java similarity index 75% rename from src/main/java/com/songoda/epicenchants/EpicEnchants.java rename to src/main/java/com/craftaro/epicenchants/EpicEnchants.java index b68bc96..541134b 100644 --- a/src/main/java/com/songoda/epicenchants/EpicEnchants.java +++ b/src/main/java/com/craftaro/epicenchants/EpicEnchants.java @@ -1,4 +1,4 @@ -package com.songoda.epicenchants; +package com.craftaro.epicenchants; import com.craftaro.core.SongodaCore; import com.craftaro.core.SongodaPlugin; @@ -7,35 +7,35 @@ import com.craftaro.core.configuration.Config; import com.craftaro.core.gui.GuiManager; import com.craftaro.core.hooks.EconomyManager; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; -import com.songoda.epicenchants.commands.CommandAlchemist; -import com.songoda.epicenchants.commands.CommandApply; -import com.songoda.epicenchants.commands.CommandEnchanter; -import com.songoda.epicenchants.commands.CommandGiveBook; -import com.songoda.epicenchants.commands.CommandGiveItemDust; -import com.songoda.epicenchants.commands.CommandGiveRandomBook; -import com.songoda.epicenchants.commands.CommandGiveScroll; -import com.songoda.epicenchants.commands.CommandList; -import com.songoda.epicenchants.commands.CommandReload; -import com.songoda.epicenchants.commands.CommandSettings; -import com.songoda.epicenchants.commands.CommandTinkerer; -import com.songoda.epicenchants.listeners.ArmorListener; -import com.songoda.epicenchants.listeners.EntityListener; -import com.songoda.epicenchants.listeners.HeldItemListener; -import com.songoda.epicenchants.listeners.PlayerListener; -import com.songoda.epicenchants.listeners.item.BlackScrollListener; -import com.songoda.epicenchants.listeners.item.BookListener; -import com.songoda.epicenchants.listeners.item.DustListener; -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.InfoManager; -import com.songoda.epicenchants.objects.Enchant; -import com.songoda.epicenchants.utils.EnchantUtils; -import com.songoda.epicenchants.utils.SpecialItems; -import com.songoda.epicenchants.utils.objects.FastInv; -import com.songoda.epicenchants.utils.settings.Settings; -import com.songoda.epicenchants.utils.single.ItemGroup; +import com.craftaro.epicenchants.listeners.ArmorListener; +import com.craftaro.epicenchants.listeners.EntityListener; +import com.craftaro.epicenchants.listeners.HeldItemListener; +import com.craftaro.epicenchants.listeners.PlayerListener; +import com.craftaro.epicenchants.listeners.item.BlackScrollListener; +import com.craftaro.epicenchants.listeners.item.BookListener; +import com.craftaro.epicenchants.listeners.item.DustListener; +import com.craftaro.epicenchants.listeners.item.WhiteScrollListener; +import com.craftaro.epicenchants.managers.EnchantManager; +import com.craftaro.epicenchants.managers.FileManager; +import com.craftaro.epicenchants.managers.GroupManager; +import com.craftaro.epicenchants.managers.InfoManager; +import com.craftaro.epicenchants.objects.Enchant; +import com.craftaro.epicenchants.commands.CommandAlchemist; +import com.craftaro.epicenchants.commands.CommandApply; +import com.craftaro.epicenchants.commands.CommandEnchanter; +import com.craftaro.epicenchants.commands.CommandGiveBook; +import com.craftaro.epicenchants.commands.CommandGiveItemDust; +import com.craftaro.epicenchants.commands.CommandGiveRandomBook; +import com.craftaro.epicenchants.commands.CommandGiveScroll; +import com.craftaro.epicenchants.commands.CommandList; +import com.craftaro.epicenchants.commands.CommandReload; +import com.craftaro.epicenchants.commands.CommandSettings; +import com.craftaro.epicenchants.commands.CommandTinkerer; +import com.craftaro.epicenchants.utils.EnchantUtils; +import com.craftaro.epicenchants.utils.SpecialItems; +import com.craftaro.epicenchants.utils.objects.FastInv; +import com.craftaro.epicenchants.utils.settings.Settings; +import com.craftaro.epicenchants.utils.single.ItemGroup; import org.bukkit.Bukkit; import org.bukkit.plugin.PluginManager; diff --git a/src/main/java/com/songoda/epicenchants/commands/CommandAlchemist.java b/src/main/java/com/craftaro/epicenchants/commands/CommandAlchemist.java similarity index 88% rename from src/main/java/com/songoda/epicenchants/commands/CommandAlchemist.java rename to src/main/java/com/craftaro/epicenchants/commands/CommandAlchemist.java index 5cc0440..e10ba80 100644 --- a/src/main/java/com/songoda/epicenchants/commands/CommandAlchemist.java +++ b/src/main/java/com/craftaro/epicenchants/commands/CommandAlchemist.java @@ -1,8 +1,8 @@ -package com.songoda.epicenchants.commands; +package com.craftaro.epicenchants.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.menus.AlchemistMenu; +import com.craftaro.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.menus.AlchemistMenu; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/commands/CommandApply.java b/src/main/java/com/craftaro/epicenchants/commands/CommandApply.java similarity index 87% rename from src/main/java/com/songoda/epicenchants/commands/CommandApply.java rename to src/main/java/com/craftaro/epicenchants/commands/CommandApply.java index 779d067..99af82d 100644 --- a/src/main/java/com/songoda/epicenchants/commands/CommandApply.java +++ b/src/main/java/com/craftaro/epicenchants/commands/CommandApply.java @@ -1,12 +1,12 @@ -package com.songoda.epicenchants.commands; +package com.craftaro.epicenchants.commands; import com.craftaro.core.commands.AbstractCommand; -import com.craftaro.core.compatibility.CompatibleMaterial; -import com.songoda.epicenchants.CommandCommons; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.enums.EnchantResult; -import com.songoda.epicenchants.objects.Enchant; -import com.songoda.epicenchants.utils.Tuple; +import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; +import com.craftaro.epicenchants.objects.Enchant; +import com.craftaro.epicenchants.CommandCommons; +import com.craftaro.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.enums.EnchantResult; +import com.craftaro.epicenchants.utils.Tuple; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -16,8 +16,8 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import static com.songoda.epicenchants.enums.EnchantResult.BROKEN_FAILURE; -import static com.songoda.epicenchants.utils.single.GeneralUtils.getMessageFromResult; +import static com.craftaro.epicenchants.enums.EnchantResult.BROKEN_FAILURE; +import static com.craftaro.epicenchants.utils.single.GeneralUtils.getMessageFromResult; public class CommandApply extends AbstractCommand { private final EpicEnchants plugin; @@ -65,7 +65,7 @@ public class CommandApply extends AbstractCommand { int level = Integer.parseInt(args[1]); Player player = (Player) sender; - if (!enchant.getItemWhitelist().contains(CompatibleMaterial.getMaterial(player.getItemInHand().getType()).get())) { + if (!enchant.getItemWhitelist().contains(XMaterial.matchXMaterial(player.getItemInHand().getType()))) { System.out.println("List = " + enchant.getItemWhitelist()); this.plugin.getLocale().getMessage("command.apply.invaliditem") .processPlaceholder("enchant", enchant.getIdentifier()) diff --git a/src/main/java/com/songoda/epicenchants/commands/CommandEnchanter.java b/src/main/java/com/craftaro/epicenchants/commands/CommandEnchanter.java similarity index 88% rename from src/main/java/com/songoda/epicenchants/commands/CommandEnchanter.java rename to src/main/java/com/craftaro/epicenchants/commands/CommandEnchanter.java index f6abfb0..ef74cc6 100644 --- a/src/main/java/com/songoda/epicenchants/commands/CommandEnchanter.java +++ b/src/main/java/com/craftaro/epicenchants/commands/CommandEnchanter.java @@ -1,8 +1,8 @@ -package com.songoda.epicenchants.commands; +package com.craftaro.epicenchants.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.menus.EnchanterMenu; +import com.craftaro.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.menus.EnchanterMenu; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/commands/CommandGiveBook.java b/src/main/java/com/craftaro/epicenchants/commands/CommandGiveBook.java similarity index 96% rename from src/main/java/com/songoda/epicenchants/commands/CommandGiveBook.java rename to src/main/java/com/craftaro/epicenchants/commands/CommandGiveBook.java index 6644fa9..7b4a73e 100644 --- a/src/main/java/com/songoda/epicenchants/commands/CommandGiveBook.java +++ b/src/main/java/com/craftaro/epicenchants/commands/CommandGiveBook.java @@ -1,9 +1,9 @@ -package com.songoda.epicenchants.commands; +package com.craftaro.epicenchants.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.epicenchants.CommandCommons; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.objects.Enchant; +import com.craftaro.epicenchants.objects.Enchant; +import com.craftaro.epicenchants.CommandCommons; +import com.craftaro.epicenchants.EpicEnchants; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/songoda/epicenchants/commands/CommandGiveItemDust.java b/src/main/java/com/craftaro/epicenchants/commands/CommandGiveItemDust.java similarity index 95% rename from src/main/java/com/songoda/epicenchants/commands/CommandGiveItemDust.java rename to src/main/java/com/craftaro/epicenchants/commands/CommandGiveItemDust.java index b1d3cbb..02b4b2d 100644 --- a/src/main/java/com/songoda/epicenchants/commands/CommandGiveItemDust.java +++ b/src/main/java/com/craftaro/epicenchants/commands/CommandGiveItemDust.java @@ -1,9 +1,9 @@ -package com.songoda.epicenchants.commands; +package com.craftaro.epicenchants.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.epicenchants.CommandCommons; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.objects.Group; +import com.craftaro.epicenchants.objects.Group; +import com.craftaro.epicenchants.CommandCommons; +import com.craftaro.epicenchants.EpicEnchants; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/songoda/epicenchants/commands/CommandGiveRandomBook.java b/src/main/java/com/craftaro/epicenchants/commands/CommandGiveRandomBook.java similarity index 95% rename from src/main/java/com/songoda/epicenchants/commands/CommandGiveRandomBook.java rename to src/main/java/com/craftaro/epicenchants/commands/CommandGiveRandomBook.java index 3b92324..d5b2c2c 100644 --- a/src/main/java/com/songoda/epicenchants/commands/CommandGiveRandomBook.java +++ b/src/main/java/com/craftaro/epicenchants/commands/CommandGiveRandomBook.java @@ -1,8 +1,8 @@ -package com.songoda.epicenchants.commands; +package com.craftaro.epicenchants.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.objects.Group; +import com.craftaro.epicenchants.objects.Group; +import com.craftaro.epicenchants.EpicEnchants; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/songoda/epicenchants/commands/CommandGiveScroll.java b/src/main/java/com/craftaro/epicenchants/commands/CommandGiveScroll.java similarity index 96% rename from src/main/java/com/songoda/epicenchants/commands/CommandGiveScroll.java rename to src/main/java/com/craftaro/epicenchants/commands/CommandGiveScroll.java index e9abe38..e4c0784 100644 --- a/src/main/java/com/songoda/epicenchants/commands/CommandGiveScroll.java +++ b/src/main/java/com/craftaro/epicenchants/commands/CommandGiveScroll.java @@ -1,8 +1,8 @@ -package com.songoda.epicenchants.commands; +package com.craftaro.epicenchants.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.epicenchants.CommandCommons; -import com.songoda.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.CommandCommons; +import com.craftaro.epicenchants.EpicEnchants; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/songoda/epicenchants/commands/CommandList.java b/src/main/java/com/craftaro/epicenchants/commands/CommandList.java similarity index 94% rename from src/main/java/com/songoda/epicenchants/commands/CommandList.java rename to src/main/java/com/craftaro/epicenchants/commands/CommandList.java index 5418915..a854df9 100644 --- a/src/main/java/com/songoda/epicenchants/commands/CommandList.java +++ b/src/main/java/com/craftaro/epicenchants/commands/CommandList.java @@ -1,7 +1,7 @@ -package com.songoda.epicenchants.commands; +package com.craftaro.epicenchants.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.EpicEnchants; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/commands/CommandReload.java b/src/main/java/com/craftaro/epicenchants/commands/CommandReload.java similarity index 91% rename from src/main/java/com/songoda/epicenchants/commands/CommandReload.java rename to src/main/java/com/craftaro/epicenchants/commands/CommandReload.java index 3b9c02e..06a371f 100644 --- a/src/main/java/com/songoda/epicenchants/commands/CommandReload.java +++ b/src/main/java/com/craftaro/epicenchants/commands/CommandReload.java @@ -1,7 +1,7 @@ -package com.songoda.epicenchants.commands; +package com.craftaro.epicenchants.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.EpicEnchants; import org.bukkit.command.CommandSender; import java.util.List; diff --git a/src/main/java/com/songoda/epicenchants/commands/CommandSettings.java b/src/main/java/com/craftaro/epicenchants/commands/CommandSettings.java similarity index 92% rename from src/main/java/com/songoda/epicenchants/commands/CommandSettings.java rename to src/main/java/com/craftaro/epicenchants/commands/CommandSettings.java index df4cacc..d4a0abf 100644 --- a/src/main/java/com/songoda/epicenchants/commands/CommandSettings.java +++ b/src/main/java/com/craftaro/epicenchants/commands/CommandSettings.java @@ -1,8 +1,8 @@ -package com.songoda.epicenchants.commands; +package com.craftaro.epicenchants.commands; import com.craftaro.core.commands.AbstractCommand; import com.craftaro.core.configuration.editor.PluginConfigGui; -import com.songoda.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.EpicEnchants; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/commands/CommandTinkerer.java b/src/main/java/com/craftaro/epicenchants/commands/CommandTinkerer.java similarity index 88% rename from src/main/java/com/songoda/epicenchants/commands/CommandTinkerer.java rename to src/main/java/com/craftaro/epicenchants/commands/CommandTinkerer.java index e313f87..cf2a3ba 100644 --- a/src/main/java/com/songoda/epicenchants/commands/CommandTinkerer.java +++ b/src/main/java/com/craftaro/epicenchants/commands/CommandTinkerer.java @@ -1,8 +1,8 @@ -package com.songoda.epicenchants.commands; +package com.craftaro.epicenchants.commands; import com.craftaro.core.commands.AbstractCommand; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.menus.TinkererMenu; +import com.craftaro.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.menus.TinkererMenu; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/effect/EffectEventExecutor.java b/src/main/java/com/craftaro/epicenchants/effect/EffectEventExecutor.java similarity index 88% rename from src/main/java/com/songoda/epicenchants/effect/EffectEventExecutor.java rename to src/main/java/com/craftaro/epicenchants/effect/EffectEventExecutor.java index 0077002..f9bd738 100644 --- a/src/main/java/com/songoda/epicenchants/effect/EffectEventExecutor.java +++ b/src/main/java/com/craftaro/epicenchants/effect/EffectEventExecutor.java @@ -1,6 +1,6 @@ -package com.songoda.epicenchants.effect; +package com.craftaro.epicenchants.effect; -import com.songoda.epicenchants.enums.EventType; +import com.craftaro.epicenchants.enums.EventType; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/effect/EffectExecutor.java b/src/main/java/com/craftaro/epicenchants/effect/EffectExecutor.java similarity index 89% rename from src/main/java/com/songoda/epicenchants/effect/EffectExecutor.java rename to src/main/java/com/craftaro/epicenchants/effect/EffectExecutor.java index 91a040b..0736588 100644 --- a/src/main/java/com/songoda/epicenchants/effect/EffectExecutor.java +++ b/src/main/java/com/craftaro/epicenchants/effect/EffectExecutor.java @@ -1,10 +1,10 @@ -package com.songoda.epicenchants.effect; +package com.craftaro.epicenchants.effect; -import com.songoda.epicenchants.enums.EventType; -import com.songoda.epicenchants.enums.TriggerType; -import com.songoda.epicenchants.objects.Condition; -import com.songoda.epicenchants.objects.LeveledModifier; -import com.songoda.epicenchants.utils.single.GeneralUtils; +import com.craftaro.epicenchants.enums.EventType; +import com.craftaro.epicenchants.enums.TriggerType; +import com.craftaro.epicenchants.objects.Condition; +import com.craftaro.epicenchants.objects.LeveledModifier; +import com.craftaro.epicenchants.utils.single.GeneralUtils; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -18,8 +18,8 @@ import java.util.Set; import java.util.function.Consumer; import java.util.stream.Collectors; -import static com.songoda.epicenchants.effect.EffectExecutor.Who.OPPONENT; -import static com.songoda.epicenchants.effect.EffectExecutor.Who.USER; +import static com.craftaro.epicenchants.effect.EffectExecutor.Who.OPPONENT; +import static com.craftaro.epicenchants.effect.EffectExecutor.Who.USER; public abstract class EffectExecutor { private final ConfigurationSection section; diff --git a/src/main/java/com/songoda/epicenchants/effect/EffectManager.java b/src/main/java/com/craftaro/epicenchants/effect/EffectManager.java similarity index 88% rename from src/main/java/com/songoda/epicenchants/effect/EffectManager.java rename to src/main/java/com/craftaro/epicenchants/effect/EffectManager.java index afc312a..d0e70f1 100644 --- a/src/main/java/com/songoda/epicenchants/effect/EffectManager.java +++ b/src/main/java/com/craftaro/epicenchants/effect/EffectManager.java @@ -1,4 +1,4 @@ -package com.songoda.epicenchants.effect; +package com.craftaro.epicenchants.effect; import org.bukkit.Bukkit; import org.bukkit.configuration.ConfigurationSection; @@ -17,7 +17,7 @@ public class EffectManager { try { String formatted = UPPER_UNDERSCORE.to(UPPER_CAMEL, section.getName().toLowerCase()).replaceAll("-.*$", ""); - Class clazz = Class.forName("com.songoda.epicenchants.effect.effects." + formatted); + Class clazz = Class.forName("com.craftaro.epicenchants.effect.effects." + formatted); Constructor constructor = clazz.getConstructor(ConfigurationSection.class); Object object = constructor.newInstance(section); return Optional.of((EffectExecutor) object); diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/Burn.java b/src/main/java/com/craftaro/epicenchants/effect/effects/Burn.java similarity index 74% rename from src/main/java/com/songoda/epicenchants/effect/effects/Burn.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/Burn.java index 2aa3184..9474368 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/Burn.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/Burn.java @@ -1,8 +1,8 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectExecutor; -import com.songoda.epicenchants.enums.EventType; -import com.songoda.epicenchants.objects.LeveledModifier; +import com.craftaro.epicenchants.effect.EffectExecutor; +import com.craftaro.epicenchants.enums.EventType; +import com.craftaro.epicenchants.objects.LeveledModifier; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/CancelEvent.java b/src/main/java/com/craftaro/epicenchants/effect/effects/CancelEvent.java similarity index 78% rename from src/main/java/com/songoda/epicenchants/effect/effects/CancelEvent.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/CancelEvent.java index d78d729..9950d76 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/CancelEvent.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/CancelEvent.java @@ -1,7 +1,7 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectEventExecutor; -import com.songoda.epicenchants.enums.EventType; +import com.craftaro.epicenchants.effect.EffectEventExecutor; +import com.craftaro.epicenchants.enums.EventType; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/ConsoleCommand.java b/src/main/java/com/craftaro/epicenchants/effect/effects/ConsoleCommand.java similarity index 72% rename from src/main/java/com/songoda/epicenchants/effect/effects/ConsoleCommand.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/ConsoleCommand.java index 7980703..58f4e36 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/ConsoleCommand.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/ConsoleCommand.java @@ -1,9 +1,9 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectExecutor; -import com.songoda.epicenchants.enums.EventType; -import com.songoda.epicenchants.utils.single.GeneralUtils; -import com.songoda.epicenchants.utils.single.Placeholders; +import com.craftaro.epicenchants.effect.EffectExecutor; +import com.craftaro.epicenchants.enums.EventType; +import com.craftaro.epicenchants.utils.single.GeneralUtils; +import com.craftaro.epicenchants.utils.single.Placeholders; import org.bukkit.Bukkit; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/DropHead.java b/src/main/java/com/craftaro/epicenchants/effect/effects/DropHead.java similarity index 94% rename from src/main/java/com/songoda/epicenchants/effect/effects/DropHead.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/DropHead.java index 5d3408b..df6da9d 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/DropHead.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/DropHead.java @@ -1,8 +1,8 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; -import com.songoda.epicenchants.effect.EffectExecutor; -import com.songoda.epicenchants.enums.EventType; +import com.craftaro.epicenchants.effect.EffectExecutor; +import com.craftaro.epicenchants.enums.EventType; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/DropHeld.java b/src/main/java/com/craftaro/epicenchants/effect/effects/DropHeld.java similarity index 80% rename from src/main/java/com/songoda/epicenchants/effect/effects/DropHeld.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/DropHeld.java index 6c5d3aa..31d5850 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/DropHeld.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/DropHeld.java @@ -1,8 +1,8 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectExecutor; -import com.songoda.epicenchants.enums.EventType; -import com.songoda.epicenchants.utils.objects.ItemBuilder; +import com.craftaro.epicenchants.effect.EffectExecutor; +import com.craftaro.epicenchants.enums.EventType; +import com.craftaro.epicenchants.utils.objects.ItemBuilder; import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/DropItem.java b/src/main/java/com/craftaro/epicenchants/effect/effects/DropItem.java similarity index 75% rename from src/main/java/com/songoda/epicenchants/effect/effects/DropItem.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/DropItem.java index f087337..bf9fa0e 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/DropItem.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/DropItem.java @@ -1,8 +1,8 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectExecutor; -import com.songoda.epicenchants.enums.EventType; -import com.songoda.epicenchants.utils.objects.ItemBuilder; +import com.craftaro.epicenchants.effect.EffectExecutor; +import com.craftaro.epicenchants.enums.EventType; +import com.craftaro.epicenchants.utils.objects.ItemBuilder; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/Explode.java b/src/main/java/com/craftaro/epicenchants/effect/effects/Explode.java similarity index 76% rename from src/main/java/com/songoda/epicenchants/effect/effects/Explode.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/Explode.java index e7fc2a5..c09a402 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/Explode.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/Explode.java @@ -1,8 +1,8 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectExecutor; -import com.songoda.epicenchants.enums.EventType; -import com.songoda.epicenchants.objects.LeveledModifier; +import com.craftaro.epicenchants.effect.EffectExecutor; +import com.craftaro.epicenchants.enums.EventType; +import com.craftaro.epicenchants.objects.LeveledModifier; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/Extinguish.java b/src/main/java/com/craftaro/epicenchants/effect/effects/Extinguish.java similarity index 76% rename from src/main/java/com/songoda/epicenchants/effect/effects/Extinguish.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/Extinguish.java index a7ff663..4d3093f 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/Extinguish.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/Extinguish.java @@ -1,7 +1,7 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectExecutor; -import com.songoda.epicenchants.enums.EventType; +import com.craftaro.epicenchants.effect.EffectExecutor; +import com.craftaro.epicenchants.enums.EventType; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/Fly.java b/src/main/java/com/craftaro/epicenchants/effect/effects/Fly.java similarity index 69% rename from src/main/java/com/songoda/epicenchants/effect/effects/Fly.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/Fly.java index aa98dd1..0abc745 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/Fly.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/Fly.java @@ -1,13 +1,13 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectExecutor; -import com.songoda.epicenchants.enums.EventType; +import com.craftaro.epicenchants.effect.EffectExecutor; +import com.craftaro.epicenchants.enums.EventType; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; -import static com.songoda.epicenchants.enums.EventType.ON; +import static com.craftaro.epicenchants.enums.EventType.ON; public class Fly extends EffectExecutor { public Fly(ConfigurationSection section) { diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/Lightning.java b/src/main/java/com/craftaro/epicenchants/effect/effects/Lightning.java similarity index 77% rename from src/main/java/com/songoda/epicenchants/effect/effects/Lightning.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/Lightning.java index 896a681..044beed 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/Lightning.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/Lightning.java @@ -1,7 +1,7 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectExecutor; -import com.songoda.epicenchants.enums.EventType; +import com.craftaro.epicenchants.effect.EffectExecutor; +import com.craftaro.epicenchants.enums.EventType; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/Message.java b/src/main/java/com/craftaro/epicenchants/effect/effects/Message.java similarity index 73% rename from src/main/java/com/songoda/epicenchants/effect/effects/Message.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/Message.java index 38467d4..f0ce91a 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/Message.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/Message.java @@ -1,9 +1,9 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectExecutor; -import com.songoda.epicenchants.enums.EventType; -import com.songoda.epicenchants.utils.single.GeneralUtils; -import com.songoda.epicenchants.utils.single.Placeholders; +import com.craftaro.epicenchants.effect.EffectExecutor; +import com.craftaro.epicenchants.enums.EventType; +import com.craftaro.epicenchants.utils.single.GeneralUtils; +import com.craftaro.epicenchants.utils.single.Placeholders; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/ModifyBlock.java b/src/main/java/com/craftaro/epicenchants/effect/effects/ModifyBlock.java similarity index 87% rename from src/main/java/com/songoda/epicenchants/effect/effects/ModifyBlock.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/ModifyBlock.java index 695536f..abb9d3c 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/ModifyBlock.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/ModifyBlock.java @@ -1,7 +1,7 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectEventExecutor; -import com.songoda.epicenchants.enums.EventType; +import com.craftaro.epicenchants.effect.EffectEventExecutor; +import com.craftaro.epicenchants.enums.EventType; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.configuration.ConfigurationSection; diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/ModifyDamage.java b/src/main/java/com/craftaro/epicenchants/effect/effects/ModifyDamage.java similarity index 76% rename from src/main/java/com/songoda/epicenchants/effect/effects/ModifyDamage.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/ModifyDamage.java index bc3523a..74a6526 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/ModifyDamage.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/ModifyDamage.java @@ -1,8 +1,8 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectEventExecutor; -import com.songoda.epicenchants.enums.EventType; -import com.songoda.epicenchants.objects.LeveledModifier; +import com.craftaro.epicenchants.effect.EffectEventExecutor; +import com.craftaro.epicenchants.enums.EventType; +import com.craftaro.epicenchants.objects.LeveledModifier; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/ModifyExp.java b/src/main/java/com/craftaro/epicenchants/effect/effects/ModifyExp.java similarity index 78% rename from src/main/java/com/songoda/epicenchants/effect/effects/ModifyExp.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/ModifyExp.java index 2aae644..05df643 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/ModifyExp.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/ModifyExp.java @@ -1,9 +1,9 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectExecutor; -import com.songoda.epicenchants.enums.EventType; -import com.songoda.epicenchants.objects.LeveledModifier; -import com.songoda.epicenchants.utils.single.Experience; +import com.craftaro.epicenchants.effect.EffectExecutor; +import com.craftaro.epicenchants.enums.EventType; +import com.craftaro.epicenchants.objects.LeveledModifier; +import com.craftaro.epicenchants.utils.single.Experience; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/ModifyFood.java b/src/main/java/com/craftaro/epicenchants/effect/effects/ModifyFood.java similarity index 82% rename from src/main/java/com/songoda/epicenchants/effect/effects/ModifyFood.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/ModifyFood.java index b01a990..6b6804e 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/ModifyFood.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/ModifyFood.java @@ -1,7 +1,7 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectExecutor; -import com.songoda.epicenchants.enums.EventType; +import com.craftaro.epicenchants.effect.EffectExecutor; +import com.craftaro.epicenchants.enums.EventType; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/ModifyHealth.java b/src/main/java/com/craftaro/epicenchants/effect/effects/ModifyHealth.java similarity index 84% rename from src/main/java/com/songoda/epicenchants/effect/effects/ModifyHealth.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/ModifyHealth.java index 21040a8..8b9c2de 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/ModifyHealth.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/ModifyHealth.java @@ -1,7 +1,7 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectExecutor; -import com.songoda.epicenchants.enums.EventType; +import com.craftaro.epicenchants.effect.EffectExecutor; +import com.craftaro.epicenchants.enums.EventType; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/ModifyOxygen.java b/src/main/java/com/craftaro/epicenchants/effect/effects/ModifyOxygen.java similarity index 85% rename from src/main/java/com/songoda/epicenchants/effect/effects/ModifyOxygen.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/ModifyOxygen.java index 6f410ad..0a99c27 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/ModifyOxygen.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/ModifyOxygen.java @@ -1,7 +1,7 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectEventExecutor; -import com.songoda.epicenchants.enums.EventType; +import com.craftaro.epicenchants.effect.EffectEventExecutor; +import com.craftaro.epicenchants.enums.EventType; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/MoreDrops.java b/src/main/java/com/craftaro/epicenchants/effect/effects/MoreDrops.java similarity index 83% rename from src/main/java/com/songoda/epicenchants/effect/effects/MoreDrops.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/MoreDrops.java index 6ab29c7..e871934 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/MoreDrops.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/MoreDrops.java @@ -1,8 +1,8 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectEventExecutor; -import com.songoda.epicenchants.enums.EventType; -import com.songoda.epicenchants.objects.LeveledModifier; +import com.craftaro.epicenchants.effect.EffectEventExecutor; +import com.craftaro.epicenchants.enums.EventType; +import com.craftaro.epicenchants.objects.LeveledModifier; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/PlayerCommand.java b/src/main/java/com/craftaro/epicenchants/effect/effects/PlayerCommand.java similarity index 60% rename from src/main/java/com/songoda/epicenchants/effect/effects/PlayerCommand.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/PlayerCommand.java index 6d6de1f..85ac227 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/PlayerCommand.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/PlayerCommand.java @@ -1,17 +1,16 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectExecutor; -import com.songoda.epicenchants.enums.EventType; -import com.songoda.epicenchants.utils.single.GeneralUtils; -import com.songoda.epicenchants.utils.single.Placeholders; +import com.craftaro.epicenchants.effect.EffectExecutor; +import com.craftaro.epicenchants.enums.EventType; +import com.craftaro.epicenchants.utils.single.GeneralUtils; +import com.craftaro.epicenchants.utils.single.Placeholders; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; -import static com.songoda.epicenchants.effect.EffectExecutor.Who.OPPONENT; -import static com.songoda.epicenchants.enums.EventType.NONE; -import static com.songoda.epicenchants.enums.EventType.ON; +import static com.craftaro.epicenchants.enums.EventType.NONE; +import static com.craftaro.epicenchants.enums.EventType.ON; public class PlayerCommand extends EffectExecutor { public PlayerCommand(ConfigurationSection section) { @@ -24,7 +23,7 @@ public class PlayerCommand extends EffectExecutor { return; } - if (who() == OPPONENT && !(opponent instanceof Player)) { + if (who() == Who.OPPONENT && !(opponent instanceof Player)) { return; } diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/Potion.java b/src/main/java/com/craftaro/epicenchants/effect/effects/Potion.java similarity index 87% rename from src/main/java/com/songoda/epicenchants/effect/effects/Potion.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/Potion.java index cccc78f..c8d8186 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/Potion.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/Potion.java @@ -1,9 +1,9 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectExecutor; -import com.songoda.epicenchants.enums.EventType; -import com.songoda.epicenchants.enums.TriggerType; -import com.songoda.epicenchants.objects.LeveledModifier; +import com.craftaro.epicenchants.effect.EffectExecutor; +import com.craftaro.epicenchants.enums.EventType; +import com.craftaro.epicenchants.enums.TriggerType; +import com.craftaro.epicenchants.objects.LeveledModifier; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/RemoveEffect.java b/src/main/java/com/craftaro/epicenchants/effect/effects/RemoveEffect.java similarity index 85% rename from src/main/java/com/songoda/epicenchants/effect/effects/RemoveEffect.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/RemoveEffect.java index 2c5dca3..303570c 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/RemoveEffect.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/RemoveEffect.java @@ -1,7 +1,7 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectExecutor; -import com.songoda.epicenchants.enums.EventType; +import com.craftaro.epicenchants.effect.EffectExecutor; +import com.craftaro.epicenchants.enums.EventType; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/Repair.java b/src/main/java/com/craftaro/epicenchants/effect/effects/Repair.java similarity index 80% rename from src/main/java/com/songoda/epicenchants/effect/effects/Repair.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/Repair.java index f87d287..553e836 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/Repair.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/Repair.java @@ -1,7 +1,7 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectExecutor; -import com.songoda.epicenchants.enums.EventType; +import com.craftaro.epicenchants.effect.EffectExecutor; +import com.craftaro.epicenchants.enums.EventType; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/SpawnMob.java b/src/main/java/com/craftaro/epicenchants/effect/effects/SpawnMob.java similarity index 92% rename from src/main/java/com/songoda/epicenchants/effect/effects/SpawnMob.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/SpawnMob.java index 35b8157..63e10fa 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/SpawnMob.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/SpawnMob.java @@ -1,9 +1,9 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectExecutor; -import com.songoda.epicenchants.enums.EventType; -import com.songoda.epicenchants.objects.LeveledModifier; -import com.songoda.epicenchants.utils.objects.ItemBuilder; +import com.craftaro.epicenchants.effect.EffectExecutor; +import com.craftaro.epicenchants.enums.EventType; +import com.craftaro.epicenchants.objects.LeveledModifier; +import com.craftaro.epicenchants.utils.objects.ItemBuilder; import org.bukkit.Location; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Entity; @@ -14,8 +14,8 @@ import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static com.songoda.epicenchants.objects.LeveledModifier.of; -import static com.songoda.epicenchants.utils.single.GeneralUtils.color; +import static com.craftaro.epicenchants.objects.LeveledModifier.of; +import static com.craftaro.epicenchants.utils.single.GeneralUtils.color; import static java.util.concurrent.ThreadLocalRandom.current; public class SpawnMob extends EffectExecutor { diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/SpawnTnt.java b/src/main/java/com/craftaro/epicenchants/effect/effects/SpawnTnt.java similarity index 87% rename from src/main/java/com/songoda/epicenchants/effect/effects/SpawnTnt.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/SpawnTnt.java index 494e9b2..d6d08f8 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/SpawnTnt.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/SpawnTnt.java @@ -1,8 +1,8 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectExecutor; -import com.songoda.epicenchants.enums.EventType; -import com.songoda.epicenchants.objects.LeveledModifier; +import com.craftaro.epicenchants.effect.EffectExecutor; +import com.craftaro.epicenchants.enums.EventType; +import com.craftaro.epicenchants.objects.LeveledModifier; import org.bukkit.Location; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.EntityType; diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/StealExp.java b/src/main/java/com/craftaro/epicenchants/effect/effects/StealExp.java similarity index 78% rename from src/main/java/com/songoda/epicenchants/effect/effects/StealExp.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/StealExp.java index e3d4986..4a1202b 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/StealExp.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/StealExp.java @@ -1,15 +1,15 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectExecutor; -import com.songoda.epicenchants.enums.EventType; +import com.craftaro.epicenchants.effect.EffectExecutor; +import com.craftaro.epicenchants.enums.EventType; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static com.songoda.epicenchants.utils.single.Experience.changeExp; -import static com.songoda.epicenchants.utils.single.Experience.getExp; +import static com.craftaro.epicenchants.utils.single.Experience.changeExp; +import static com.craftaro.epicenchants.utils.single.Experience.getExp; public class StealExp extends EffectExecutor { public StealExp(ConfigurationSection section) { diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/StealFood.java b/src/main/java/com/craftaro/epicenchants/effect/effects/StealFood.java similarity index 87% rename from src/main/java/com/songoda/epicenchants/effect/effects/StealFood.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/StealFood.java index a3b590f..efc42a0 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/StealFood.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/StealFood.java @@ -1,7 +1,7 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectExecutor; -import com.songoda.epicenchants.enums.EventType; +import com.craftaro.epicenchants.effect.EffectExecutor; +import com.craftaro.epicenchants.enums.EventType; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/StealHealth.java b/src/main/java/com/craftaro/epicenchants/effect/effects/StealHealth.java similarity index 88% rename from src/main/java/com/songoda/epicenchants/effect/effects/StealHealth.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/StealHealth.java index ad41e34..50c643d 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/StealHealth.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/StealHealth.java @@ -1,7 +1,7 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectExecutor; -import com.songoda.epicenchants.enums.EventType; +import com.craftaro.epicenchants.effect.EffectExecutor; +import com.craftaro.epicenchants.enums.EventType; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/effect/effects/Throw.java b/src/main/java/com/craftaro/epicenchants/effect/effects/Throw.java similarity index 82% rename from src/main/java/com/songoda/epicenchants/effect/effects/Throw.java rename to src/main/java/com/craftaro/epicenchants/effect/effects/Throw.java index 5770b17..a00850c 100644 --- a/src/main/java/com/songoda/epicenchants/effect/effects/Throw.java +++ b/src/main/java/com/craftaro/epicenchants/effect/effects/Throw.java @@ -1,16 +1,14 @@ -package com.songoda.epicenchants.effect.effects; +package com.craftaro.epicenchants.effect.effects; -import com.songoda.epicenchants.effect.EffectExecutor; -import com.songoda.epicenchants.enums.EventType; -import com.songoda.epicenchants.objects.LeveledModifier; +import com.craftaro.epicenchants.effect.EffectExecutor; +import com.craftaro.epicenchants.enums.EventType; +import com.craftaro.epicenchants.objects.LeveledModifier; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; -import static com.songoda.epicenchants.effect.EffectExecutor.Who.USER; - public class Throw extends EffectExecutor { public Throw(ConfigurationSection section) { super(section); @@ -28,7 +26,7 @@ public class Throw extends EffectExecutor { Vector vector; double magnitude = LeveledModifier.of(getSection().getString("magnitude")).get(level, 0.1, user, opponent); - LivingEntity livingEntity = who() == USER ? user : opponent; + LivingEntity livingEntity = who() == Who.USER ? user : opponent; String relativeToStr = getSection().getString("relative-to"); LivingEntity relative = relativeToStr == null || relativeToStr.equalsIgnoreCase("user") ? user : opponent; diff --git a/src/main/java/com/songoda/epicenchants/enums/EnchantResult.java b/src/main/java/com/craftaro/epicenchants/enums/EnchantResult.java similarity index 74% rename from src/main/java/com/songoda/epicenchants/enums/EnchantResult.java rename to src/main/java/com/craftaro/epicenchants/enums/EnchantResult.java index 002a9c2..5b961ca 100644 --- a/src/main/java/com/songoda/epicenchants/enums/EnchantResult.java +++ b/src/main/java/com/craftaro/epicenchants/enums/EnchantResult.java @@ -1,4 +1,4 @@ -package com.songoda.epicenchants.enums; +package com.craftaro.epicenchants.enums; public enum EnchantResult { SUCCESS, FAILURE, BROKEN_FAILURE, CONFLICT, MAXED_OUT, ALREADY_APPLIED, PROTECTED diff --git a/src/main/java/com/songoda/epicenchants/enums/EventType.java b/src/main/java/com/craftaro/epicenchants/enums/EventType.java similarity index 52% rename from src/main/java/com/songoda/epicenchants/enums/EventType.java rename to src/main/java/com/craftaro/epicenchants/enums/EventType.java index f6fe809..aecfe7d 100644 --- a/src/main/java/com/songoda/epicenchants/enums/EventType.java +++ b/src/main/java/com/craftaro/epicenchants/enums/EventType.java @@ -1,4 +1,4 @@ -package com.songoda.epicenchants.enums; +package com.craftaro.epicenchants.enums; public enum EventType { ON, OFF, NONE diff --git a/src/main/java/com/songoda/epicenchants/enums/GiveType.java b/src/main/java/com/craftaro/epicenchants/enums/GiveType.java similarity index 58% rename from src/main/java/com/songoda/epicenchants/enums/GiveType.java rename to src/main/java/com/craftaro/epicenchants/enums/GiveType.java index b3631bc..90debf1 100644 --- a/src/main/java/com/songoda/epicenchants/enums/GiveType.java +++ b/src/main/java/com/craftaro/epicenchants/enums/GiveType.java @@ -1,4 +1,4 @@ -package com.songoda.epicenchants.enums; +package com.craftaro.epicenchants.enums; public enum GiveType { WHITE_SCROLL, BLACK_SCROLL diff --git a/src/main/java/com/songoda/epicenchants/enums/ItemType.java b/src/main/java/com/craftaro/epicenchants/enums/ItemType.java similarity index 82% rename from src/main/java/com/songoda/epicenchants/enums/ItemType.java rename to src/main/java/com/craftaro/epicenchants/enums/ItemType.java index 7683545..f3b261e 100644 --- a/src/main/java/com/songoda/epicenchants/enums/ItemType.java +++ b/src/main/java/com/craftaro/epicenchants/enums/ItemType.java @@ -1,4 +1,4 @@ -package com.songoda.epicenchants.enums; +package com.craftaro.epicenchants.enums; public enum ItemType { BOOK, diff --git a/src/main/java/com/songoda/epicenchants/enums/TriggerType.java b/src/main/java/com/craftaro/epicenchants/enums/TriggerType.java similarity index 93% rename from src/main/java/com/songoda/epicenchants/enums/TriggerType.java rename to src/main/java/com/craftaro/epicenchants/enums/TriggerType.java index ed289ca..07d2274 100644 --- a/src/main/java/com/songoda/epicenchants/enums/TriggerType.java +++ b/src/main/java/com/craftaro/epicenchants/enums/TriggerType.java @@ -1,4 +1,4 @@ -package com.songoda.epicenchants.enums; +package com.craftaro.epicenchants.enums; public enum TriggerType { ATTACK_PLAYER_MELEE, diff --git a/src/main/java/com/songoda/epicenchants/events/ArmorEquipEvent.java b/src/main/java/com/craftaro/epicenchants/events/ArmorEquipEvent.java similarity index 99% rename from src/main/java/com/songoda/epicenchants/events/ArmorEquipEvent.java rename to src/main/java/com/craftaro/epicenchants/events/ArmorEquipEvent.java index 3aa585e..43bd479 100644 --- a/src/main/java/com/songoda/epicenchants/events/ArmorEquipEvent.java +++ b/src/main/java/com/craftaro/epicenchants/events/ArmorEquipEvent.java @@ -1,4 +1,4 @@ -package com.songoda.epicenchants.events; +package com.craftaro.epicenchants.events; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/events/EnchantApplyEvent.java b/src/main/java/com/craftaro/epicenchants/events/EnchantApplyEvent.java similarity index 94% rename from src/main/java/com/songoda/epicenchants/events/EnchantApplyEvent.java rename to src/main/java/com/craftaro/epicenchants/events/EnchantApplyEvent.java index 469ecfc..dab9bbf 100644 --- a/src/main/java/com/songoda/epicenchants/events/EnchantApplyEvent.java +++ b/src/main/java/com/craftaro/epicenchants/events/EnchantApplyEvent.java @@ -1,6 +1,6 @@ -package com.songoda.epicenchants.events; +package com.craftaro.epicenchants.events; -import com.songoda.epicenchants.objects.Enchant; +import com.craftaro.epicenchants.objects.Enchant; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; diff --git a/src/main/java/com/songoda/epicenchants/events/HeldItemChangedEvent.java b/src/main/java/com/craftaro/epicenchants/events/HeldItemChangedEvent.java similarity index 98% rename from src/main/java/com/songoda/epicenchants/events/HeldItemChangedEvent.java rename to src/main/java/com/craftaro/epicenchants/events/HeldItemChangedEvent.java index cb43011..68cda9b 100644 --- a/src/main/java/com/songoda/epicenchants/events/HeldItemChangedEvent.java +++ b/src/main/java/com/craftaro/epicenchants/events/HeldItemChangedEvent.java @@ -1,4 +1,4 @@ -package com.songoda.epicenchants.events; +package com.craftaro.epicenchants.events; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/listeners/ArmorListener.java b/src/main/java/com/craftaro/epicenchants/listeners/ArmorListener.java similarity index 75% rename from src/main/java/com/songoda/epicenchants/listeners/ArmorListener.java rename to src/main/java/com/craftaro/epicenchants/listeners/ArmorListener.java index b21875b..cb3858d 100644 --- a/src/main/java/com/songoda/epicenchants/listeners/ArmorListener.java +++ b/src/main/java/com/craftaro/epicenchants/listeners/ArmorListener.java @@ -1,8 +1,6 @@ -package com.songoda.epicenchants.listeners; +package com.craftaro.epicenchants.listeners; -import com.songoda.epicenchants.events.ArmorEquipEvent; -import com.songoda.epicenchants.events.ArmorEquipEvent.ArmorType; -import com.songoda.epicenchants.events.ArmorEquipEvent.EquipMethod; +import com.craftaro.epicenchants.events.ArmorEquipEvent; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -56,7 +54,7 @@ public class ArmorListener implements Listener { numberKey = true; } - ArmorType newArmorType = ArmorType.matchType(shift ? e.getCurrentItem() : e.getCursor()); + ArmorEquipEvent.ArmorType newArmorType = ArmorEquipEvent.ArmorType.matchType(shift ? e.getCurrentItem() : e.getCursor()); if (!shift && newArmorType != null && e.getRawSlot() != newArmorType.getSlot()) { // Used for drag and drop checking to make sure you aren't trying to place a helmet in the boots slot. @@ -64,14 +62,14 @@ public class ArmorListener implements Listener { } if (shift) { - newArmorType = ArmorType.matchType(e.getCurrentItem()); + newArmorType = ArmorEquipEvent.ArmorType.matchType(e.getCurrentItem()); if (newArmorType != null) { boolean equipping = true; if (e.getRawSlot() == newArmorType.getSlot()) { equipping = false; } - if (newArmorType.equals(ArmorType.HELMET) && (equipping == isAirOrNull(e.getWhoClicked().getInventory().getHelmet())) || newArmorType.equals(ArmorType.CHESTPLATE) && (equipping == isAirOrNull(e.getWhoClicked().getInventory().getChestplate())) || newArmorType.equals(ArmorType.LEGGINGS) && (equipping == isAirOrNull(e.getWhoClicked().getInventory().getLeggings())) || newArmorType.equals(ArmorType.BOOTS) && (equipping == isAirOrNull(e.getWhoClicked().getInventory().getBoots()))) { - ArmorEquipEvent armorEquipEvent = new ArmorEquipEvent((Player) e.getWhoClicked(), EquipMethod.SHIFT_CLICK, newArmorType, equipping ? null : e.getCurrentItem(), equipping ? e.getCurrentItem() : null); + if (newArmorType.equals(ArmorEquipEvent.ArmorType.HELMET) && (equipping == isAirOrNull(e.getWhoClicked().getInventory().getHelmet())) || newArmorType.equals(ArmorEquipEvent.ArmorType.CHESTPLATE) && (equipping == isAirOrNull(e.getWhoClicked().getInventory().getChestplate())) || newArmorType.equals(ArmorEquipEvent.ArmorType.LEGGINGS) && (equipping == isAirOrNull(e.getWhoClicked().getInventory().getLeggings())) || newArmorType.equals(ArmorEquipEvent.ArmorType.BOOTS) && (equipping == isAirOrNull(e.getWhoClicked().getInventory().getBoots()))) { + ArmorEquipEvent armorEquipEvent = new ArmorEquipEvent((Player) e.getWhoClicked(), ArmorEquipEvent.EquipMethod.SHIFT_CLICK, newArmorType, equipping ? null : e.getCurrentItem(), equipping ? e.getCurrentItem() : null); Bukkit.getServer().getPluginManager().callEvent(armorEquipEvent); if (armorEquipEvent.isCancelled()) { e.setCancelled(true); @@ -89,24 +87,24 @@ public class ArmorListener implements Listener { // e.getSlot() == Armor slot, can't use e.getRawSlot() as that gives a hotbar slot ;-; ItemStack hotbarItem = e.getClickedInventory().getItem(e.getHotbarButton()); if (!isAirOrNull(hotbarItem)) {// Equipping - newArmorType = ArmorType.matchType(hotbarItem); + newArmorType = ArmorEquipEvent.ArmorType.matchType(hotbarItem); newArmorPiece = hotbarItem; oldArmorPiece = e.getClickedInventory().getItem(e.getSlot()); } else {// Unequipping - newArmorType = ArmorType.matchType(!isAirOrNull(e.getCurrentItem()) ? e.getCurrentItem() : e.getCursor()); + newArmorType = ArmorEquipEvent.ArmorType.matchType(!isAirOrNull(e.getCurrentItem()) ? e.getCurrentItem() : e.getCursor()); } } } else { if (isAirOrNull(e.getCursor()) && !isAirOrNull(e.getCurrentItem())) {// unequip with no new item going into the slot. - newArmorType = ArmorType.matchType(e.getCurrentItem()); + newArmorType = ArmorEquipEvent.ArmorType.matchType(e.getCurrentItem()); } // e.getCurrentItem() == Unequip // e.getCursor() == Equip // newArmorType = ArmorType.matchType(!isAirOrNull(e.getCurrentItem()) ? e.getCurrentItem() : e.getCursor()); } if (newArmorType != null && e.getRawSlot() == newArmorType.getSlot()) { - EquipMethod method = EquipMethod.PICK_DROP; - if (e.getAction().equals(InventoryAction.HOTBAR_SWAP) || numberKey) method = EquipMethod.HOTBAR_SWAP; + ArmorEquipEvent.EquipMethod method = ArmorEquipEvent.EquipMethod.PICK_DROP; + if (e.getAction().equals(InventoryAction.HOTBAR_SWAP) || numberKey) method = ArmorEquipEvent.EquipMethod.HOTBAR_SWAP; ArmorEquipEvent armorEquipEvent = new ArmorEquipEvent((Player) e.getWhoClicked(), method, newArmorType, oldArmorPiece, newArmorPiece); Bukkit.getServer().getPluginManager().callEvent(armorEquipEvent); if (armorEquipEvent.isCancelled()) { @@ -130,10 +128,10 @@ public class ArmorListener implements Listener { }*/ } - ArmorType newArmorType = ArmorType.matchType(e.getItem()); + ArmorEquipEvent.ArmorType newArmorType = ArmorEquipEvent.ArmorType.matchType(e.getItem()); if (newArmorType != null) { - if (newArmorType.equals(ArmorType.HELMET) && isAirOrNull(e.getPlayer().getInventory().getHelmet()) || newArmorType.equals(ArmorType.CHESTPLATE) && isAirOrNull(e.getPlayer().getInventory().getChestplate()) || newArmorType.equals(ArmorType.LEGGINGS) && isAirOrNull(e.getPlayer().getInventory().getLeggings()) || newArmorType.equals(ArmorType.BOOTS) && isAirOrNull(e.getPlayer().getInventory().getBoots())) { - ArmorEquipEvent armorEquipEvent = new ArmorEquipEvent(e.getPlayer(), EquipMethod.HOTBAR, ArmorType.matchType(e.getItem()), null, e.getItem()); + if (newArmorType.equals(ArmorEquipEvent.ArmorType.HELMET) && isAirOrNull(e.getPlayer().getInventory().getHelmet()) || newArmorType.equals(ArmorEquipEvent.ArmorType.CHESTPLATE) && isAirOrNull(e.getPlayer().getInventory().getChestplate()) || newArmorType.equals(ArmorEquipEvent.ArmorType.LEGGINGS) && isAirOrNull(e.getPlayer().getInventory().getLeggings()) || newArmorType.equals(ArmorEquipEvent.ArmorType.BOOTS) && isAirOrNull(e.getPlayer().getInventory().getBoots())) { + ArmorEquipEvent armorEquipEvent = new ArmorEquipEvent(e.getPlayer(), ArmorEquipEvent.EquipMethod.HOTBAR, ArmorEquipEvent.ArmorType.matchType(e.getItem()), null, e.getItem()); Bukkit.getServer().getPluginManager().callEvent(armorEquipEvent); if (armorEquipEvent.isCancelled()) { e.setCancelled(true); @@ -150,10 +148,10 @@ public class ArmorListener implements Listener { return; } - ArmorType type = ArmorType.matchType(event.getOldCursor()); + ArmorEquipEvent.ArmorType type = ArmorEquipEvent.ArmorType.matchType(event.getOldCursor()); if (type != null && type.getSlot() == event.getRawSlots().stream().findFirst().orElse(0)) { - ArmorEquipEvent armorEquipEvent = new ArmorEquipEvent((Player) event.getWhoClicked(), EquipMethod.DRAG, type, null, event.getOldCursor()); + ArmorEquipEvent armorEquipEvent = new ArmorEquipEvent((Player) event.getWhoClicked(), ArmorEquipEvent.EquipMethod.DRAG, type, null, event.getOldCursor()); Bukkit.getServer().getPluginManager().callEvent(armorEquipEvent); if (armorEquipEvent.isCancelled()) { event.setResult(Result.DENY); @@ -164,10 +162,10 @@ public class ArmorListener implements Listener { @EventHandler public void itemBreakEvent(PlayerItemBreakEvent e) { - ArmorType type = ArmorType.matchType(e.getBrokenItem()); + ArmorEquipEvent.ArmorType type = ArmorEquipEvent.ArmorType.matchType(e.getBrokenItem()); if (type != null) { Player p = e.getPlayer(); - ArmorEquipEvent armorEquipEvent = new ArmorEquipEvent(p, EquipMethod.BROKE, type, e.getBrokenItem(), null); + ArmorEquipEvent armorEquipEvent = new ArmorEquipEvent(p, ArmorEquipEvent.EquipMethod.BROKE, type, e.getBrokenItem(), null); Bukkit.getServer().getPluginManager().callEvent(armorEquipEvent); if (armorEquipEvent.isCancelled()) { ItemStack i = e.getBrokenItem().clone(); @@ -195,7 +193,7 @@ public class ArmorListener implements Listener { public void playerDeathEvent(PlayerDeathEvent event) { for (ItemStack item : event.getEntity().getInventory().getArmorContents()) { if (!isAirOrNull(item)) { - Bukkit.getServer().getPluginManager().callEvent(new ArmorEquipEvent(event.getEntity(), EquipMethod.DEATH, ArmorType.matchType(item), item, null)); + Bukkit.getServer().getPluginManager().callEvent(new ArmorEquipEvent(event.getEntity(), ArmorEquipEvent.EquipMethod.DEATH, ArmorEquipEvent.ArmorType.matchType(item), item, null)); // No way to cancel a death event. } } diff --git a/src/main/java/com/songoda/epicenchants/listeners/EntityListener.java b/src/main/java/com/craftaro/epicenchants/listeners/EntityListener.java similarity index 96% rename from src/main/java/com/songoda/epicenchants/listeners/EntityListener.java rename to src/main/java/com/craftaro/epicenchants/listeners/EntityListener.java index 1d70460..bf15267 100644 --- a/src/main/java/com/songoda/epicenchants/listeners/EntityListener.java +++ b/src/main/java/com/craftaro/epicenchants/listeners/EntityListener.java @@ -1,8 +1,8 @@ -package com.songoda.epicenchants.listeners; +package com.craftaro.epicenchants.listeners; import com.craftaro.core.nms.Nms; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.enums.TriggerType; +import com.craftaro.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.enums.TriggerType; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Monster; import org.bukkit.entity.Player; @@ -17,7 +17,7 @@ import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.event.entity.EntityTargetLivingEntityEvent; import org.bukkit.projectiles.ProjectileSource; -import static com.songoda.epicenchants.enums.TriggerType.*; +import static com.craftaro.epicenchants.enums.TriggerType.*; public class EntityListener implements Listener { private final EpicEnchants instance; diff --git a/src/main/java/com/songoda/epicenchants/listeners/HeldItemListener.java b/src/main/java/com/craftaro/epicenchants/listeners/HeldItemListener.java similarity index 91% rename from src/main/java/com/songoda/epicenchants/listeners/HeldItemListener.java rename to src/main/java/com/craftaro/epicenchants/listeners/HeldItemListener.java index facbce8..c7a0d05 100644 --- a/src/main/java/com/songoda/epicenchants/listeners/HeldItemListener.java +++ b/src/main/java/com/craftaro/epicenchants/listeners/HeldItemListener.java @@ -1,8 +1,7 @@ -package com.songoda.epicenchants.listeners; +package com.craftaro.epicenchants.listeners; -import com.songoda.epicenchants.events.ArmorEquipEvent; -import com.songoda.epicenchants.events.HeldItemChangedEvent; -import com.songoda.epicenchants.events.HeldItemChangedEvent.EquipMethod; +import com.craftaro.epicenchants.events.ArmorEquipEvent; +import com.craftaro.epicenchants.events.HeldItemChangedEvent; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -115,26 +114,26 @@ public class HeldItemListener implements Listener { } else { ItemStack newItem = e.getCursor(); ItemStack oldItem = e.getCurrentItem(); - EquipMethod method; + HeldItemChangedEvent.EquipMethod method; if (numberKey) { if (!(e.getClickedInventory() instanceof PlayerInventory) || e.getHotbarButton() != heldslot) //we only care about heldslot return; - method = EquipMethod.HOTBAR_SWAP; + method = HeldItemChangedEvent.EquipMethod.HOTBAR_SWAP; newItem = e.getCurrentItem(); oldItem = e.getClickedInventory().getItem(e.getHotbarButton()); } else if (swapoffhand) { if (!(e.getClickedInventory() instanceof PlayerInventory) || e.getSlot() != heldslot) //we only care about heldslot return; - method = EquipMethod.OFFHAND_SWAP; + method = HeldItemChangedEvent.EquipMethod.OFFHAND_SWAP; newItem = e.getClickedInventory().getItem(40); oldItem = e.getCurrentItem(); } else { if (!(e.getClickedInventory() instanceof PlayerInventory) || e.getSlot() != heldslot) //we only care about heldslot return; - method = EquipMethod.PICK_DROP; + method = HeldItemChangedEvent.EquipMethod.PICK_DROP; } HeldItemChangedEvent heldItemChangedEvent = new HeldItemChangedEvent((Player) e.getWhoClicked(), method, oldItem, newItem); Bukkit.getServer().getPluginManager().callEvent(heldItemChangedEvent); @@ -154,7 +153,7 @@ public class HeldItemListener implements Listener { boolean bottominventory = rawslot != invslot; if (bottominventory && event.getWhoClicked().getInventory().getHeldItemSlot() == invslot) { - HeldItemChangedEvent heldItemChangedEvent = new HeldItemChangedEvent((Player) event.getWhoClicked(), EquipMethod.DRAG, null, event.getOldCursor()); + HeldItemChangedEvent heldItemChangedEvent = new HeldItemChangedEvent((Player) event.getWhoClicked(), HeldItemChangedEvent.EquipMethod.DRAG, null, event.getOldCursor()); Bukkit.getServer().getPluginManager().callEvent(heldItemChangedEvent); if (heldItemChangedEvent.isCancelled()) { event.setResult(Result.DENY); @@ -175,7 +174,7 @@ public class HeldItemListener implements Listener { hotbarslot = inv.getHeldItemSlot(); if (hotbarslot != -1) { - HeldItemChangedEvent heldItemChangedEvent = new HeldItemChangedEvent(p, EquipMethod.BROKE, e.getBrokenItem(), null); + HeldItemChangedEvent heldItemChangedEvent = new HeldItemChangedEvent(p, HeldItemChangedEvent.EquipMethod.BROKE, e.getBrokenItem(), null); Bukkit.getServer().getPluginManager().callEvent(heldItemChangedEvent); if (heldItemChangedEvent.isCancelled()) { ItemStack i = e.getBrokenItem().clone(); @@ -190,7 +189,7 @@ public class HeldItemListener implements Listener { public void playerDeathEvent(PlayerDeathEvent event) { ItemStack i = event.getEntity().getInventory().getItem(event.getEntity().getInventory().getHeldItemSlot()); if (!isAirOrNull(i)) { - Bukkit.getServer().getPluginManager().callEvent(new HeldItemChangedEvent(event.getEntity(), EquipMethod.DEATH, i, null)); + Bukkit.getServer().getPluginManager().callEvent(new HeldItemChangedEvent(event.getEntity(), HeldItemChangedEvent.EquipMethod.DEATH, i, null)); } // No way to cancel a death event. } @@ -202,7 +201,7 @@ public class HeldItemListener implements Listener { //we try to make a best efford solution //when the item in the held slot is null we assume it was dropped by pressing Q if (isAirOrNull(event.getPlayer().getInventory().getItem(event.getPlayer().getInventory().getHeldItemSlot()))) - Bukkit.getServer().getPluginManager().callEvent(new HeldItemChangedEvent(event.getPlayer(), EquipMethod.DROP_ITEM, event.getItemDrop().getItemStack(), null)); + Bukkit.getServer().getPluginManager().callEvent(new HeldItemChangedEvent(event.getPlayer(), HeldItemChangedEvent.EquipMethod.DROP_ITEM, event.getItemDrop().getItemStack(), null)); } @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST) @@ -211,7 +210,7 @@ public class HeldItemListener implements Listener { int firstEmpty = event.getPlayer().getInventory().firstEmpty(); if (0 <= firstEmpty && firstEmpty <= 8 && event.getPlayer().getInventory().getHeldItemSlot() == firstEmpty) - Bukkit.getServer().getPluginManager().callEvent(new HeldItemChangedEvent(event.getPlayer(), EquipMethod.PICKUP_ITEM, null, event.getItem().getItemStack())); + Bukkit.getServer().getPluginManager().callEvent(new HeldItemChangedEvent(event.getPlayer(), HeldItemChangedEvent.EquipMethod.PICKUP_ITEM, null, event.getItem().getItemStack())); } } diff --git a/src/main/java/com/songoda/epicenchants/listeners/PlayerListener.java b/src/main/java/com/craftaro/epicenchants/listeners/PlayerListener.java similarity index 92% rename from src/main/java/com/songoda/epicenchants/listeners/PlayerListener.java rename to src/main/java/com/craftaro/epicenchants/listeners/PlayerListener.java index 893acd5..dcc2ff5 100644 --- a/src/main/java/com/songoda/epicenchants/listeners/PlayerListener.java +++ b/src/main/java/com/craftaro/epicenchants/listeners/PlayerListener.java @@ -1,9 +1,9 @@ -package com.songoda.epicenchants.listeners; +package com.craftaro.epicenchants.listeners; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.events.ArmorEquipEvent; -import com.songoda.epicenchants.events.HeldItemChangedEvent; -import com.songoda.epicenchants.objects.Enchant; +import com.craftaro.epicenchants.events.ArmorEquipEvent; +import com.craftaro.epicenchants.events.HeldItemChangedEvent; +import com.craftaro.epicenchants.objects.Enchant; +import com.craftaro.epicenchants.EpicEnchants; import org.bukkit.Material; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -19,9 +19,9 @@ import org.bukkit.inventory.ItemStack; import java.util.Arrays; import java.util.Map; -import static com.songoda.epicenchants.enums.EventType.OFF; -import static com.songoda.epicenchants.enums.EventType.ON; -import static com.songoda.epicenchants.enums.TriggerType.*; +import static com.craftaro.epicenchants.enums.EventType.OFF; +import static com.craftaro.epicenchants.enums.EventType.ON; +import static com.craftaro.epicenchants.enums.TriggerType.*; public class PlayerListener implements Listener { private final EpicEnchants instance; diff --git a/src/main/java/com/songoda/epicenchants/listeners/item/BlackScrollListener.java b/src/main/java/com/craftaro/epicenchants/listeners/item/BlackScrollListener.java similarity index 86% rename from src/main/java/com/songoda/epicenchants/listeners/item/BlackScrollListener.java rename to src/main/java/com/craftaro/epicenchants/listeners/item/BlackScrollListener.java index b2f3f25..c4bd02f 100644 --- a/src/main/java/com/songoda/epicenchants/listeners/item/BlackScrollListener.java +++ b/src/main/java/com/craftaro/epicenchants/listeners/item/BlackScrollListener.java @@ -1,14 +1,14 @@ -package com.songoda.epicenchants.listeners.item; +package com.craftaro.epicenchants.listeners.item; import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTCompound; import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTItem; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.objects.Enchant; -import com.songoda.epicenchants.utils.single.RomanNumber; +import com.craftaro.epicenchants.objects.Enchant; +import com.craftaro.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.utils.single.RomanNumber; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.ItemStack; -import static com.songoda.epicenchants.utils.single.GeneralUtils.getRandomElement; +import static com.craftaro.epicenchants.utils.single.GeneralUtils.getRandomElement; public class BlackScrollListener extends ItemListener { public BlackScrollListener(EpicEnchants instance) { diff --git a/src/main/java/com/songoda/epicenchants/listeners/item/BookListener.java b/src/main/java/com/craftaro/epicenchants/listeners/item/BookListener.java similarity index 83% rename from src/main/java/com/songoda/epicenchants/listeners/item/BookListener.java rename to src/main/java/com/craftaro/epicenchants/listeners/item/BookListener.java index 0e1be2f..94d0011 100644 --- a/src/main/java/com/songoda/epicenchants/listeners/item/BookListener.java +++ b/src/main/java/com/craftaro/epicenchants/listeners/item/BookListener.java @@ -1,14 +1,14 @@ -package com.songoda.epicenchants.listeners.item; +package com.craftaro.epicenchants.listeners.item; -import com.craftaro.core.compatibility.CompatibleMaterial; +import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTItem; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.enums.EnchantResult; -import com.songoda.epicenchants.events.EnchantApplyEvent; -import com.songoda.epicenchants.objects.Enchant; -import com.songoda.epicenchants.objects.Group; -import com.songoda.epicenchants.utils.Tuple; -import com.songoda.epicenchants.utils.single.GeneralUtils; +import com.craftaro.epicenchants.events.EnchantApplyEvent; +import com.craftaro.epicenchants.objects.Enchant; +import com.craftaro.epicenchants.objects.Group; +import com.craftaro.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.enums.EnchantResult; +import com.craftaro.epicenchants.utils.Tuple; +import com.craftaro.epicenchants.utils.single.GeneralUtils; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.inventory.InventoryClickEvent; @@ -17,10 +17,10 @@ import org.bukkit.inventory.ItemStack; import java.util.Optional; -import static com.songoda.epicenchants.enums.EnchantResult.ALREADY_APPLIED; -import static com.songoda.epicenchants.enums.EnchantResult.BROKEN_FAILURE; -import static com.songoda.epicenchants.enums.EnchantResult.CONFLICT; -import static com.songoda.epicenchants.enums.EnchantResult.MAXED_OUT; +import static com.craftaro.epicenchants.enums.EnchantResult.ALREADY_APPLIED; +import static com.craftaro.epicenchants.enums.EnchantResult.BROKEN_FAILURE; +import static com.craftaro.epicenchants.enums.EnchantResult.CONFLICT; +import static com.craftaro.epicenchants.enums.EnchantResult.MAXED_OUT; import static java.util.concurrent.ThreadLocalRandom.current; public class BookListener extends ItemListener { @@ -39,7 +39,7 @@ public class BookListener extends ItemListener { ItemStack toApply = event.getCurrentItem(); Enchant enchant = this.instance.getEnchantManager().getValue(cursor.getString("enchant")).orElseThrow(() -> new IllegalStateException("Book without enchant!")); - if (!enchant.getItemWhitelist().contains(CompatibleMaterial.getMaterial(current.getItem().getType()).get())) { + if (!enchant.getItemWhitelist().contains(XMaterial.matchXMaterial(current.getItem().getType()))) { return; } // get total amount of enchantments on item diff --git a/src/main/java/com/songoda/epicenchants/listeners/item/DustListener.java b/src/main/java/com/craftaro/epicenchants/listeners/item/DustListener.java similarity index 91% rename from src/main/java/com/songoda/epicenchants/listeners/item/DustListener.java rename to src/main/java/com/craftaro/epicenchants/listeners/item/DustListener.java index eaab724..7a53b35 100644 --- a/src/main/java/com/songoda/epicenchants/listeners/item/DustListener.java +++ b/src/main/java/com/craftaro/epicenchants/listeners/item/DustListener.java @@ -1,9 +1,9 @@ -package com.songoda.epicenchants.listeners.item; +package com.craftaro.epicenchants.listeners.item; import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTItem; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.objects.Enchant; -import com.songoda.epicenchants.objects.Group; +import com.craftaro.epicenchants.objects.Enchant; +import com.craftaro.epicenchants.objects.Group; +import com.craftaro.epicenchants.EpicEnchants; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.player.PlayerInteractEvent; diff --git a/src/main/java/com/songoda/epicenchants/listeners/item/ItemListener.java b/src/main/java/com/craftaro/epicenchants/listeners/item/ItemListener.java similarity index 96% rename from src/main/java/com/songoda/epicenchants/listeners/item/ItemListener.java rename to src/main/java/com/craftaro/epicenchants/listeners/item/ItemListener.java index 69ec6e0..09649c5 100644 --- a/src/main/java/com/songoda/epicenchants/listeners/item/ItemListener.java +++ b/src/main/java/com/craftaro/epicenchants/listeners/item/ItemListener.java @@ -1,8 +1,8 @@ -package com.songoda.epicenchants.listeners.item; +package com.craftaro.epicenchants.listeners.item; import com.craftaro.core.compatibility.CompatibleHand; import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTItem; -import com.songoda.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.EpicEnchants; import org.bukkit.Material; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/src/main/java/com/songoda/epicenchants/listeners/item/WhiteScrollListener.java b/src/main/java/com/craftaro/epicenchants/listeners/item/WhiteScrollListener.java similarity index 77% rename from src/main/java/com/songoda/epicenchants/listeners/item/WhiteScrollListener.java rename to src/main/java/com/craftaro/epicenchants/listeners/item/WhiteScrollListener.java index 89173e7..80d6db2 100644 --- a/src/main/java/com/songoda/epicenchants/listeners/item/WhiteScrollListener.java +++ b/src/main/java/com/craftaro/epicenchants/listeners/item/WhiteScrollListener.java @@ -1,9 +1,9 @@ -package com.songoda.epicenchants.listeners.item; +package com.craftaro.epicenchants.listeners.item; -import com.craftaro.core.compatibility.CompatibleMaterial; +import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTItem; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.utils.objects.ItemBuilder; +import com.craftaro.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.utils.objects.ItemBuilder; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.ItemStack; @@ -26,7 +26,7 @@ public class WhiteScrollListener extends ItemListener { return; } - if (!this.instance.getItemGroup().isValid(CompatibleMaterial.getMaterial(event.getCurrentItem().getType()).get())) { + if (!this.instance.getItemGroup().isValid(XMaterial.matchXMaterial(event.getCurrentItem().getType()))) { return; } diff --git a/src/main/java/com/songoda/epicenchants/managers/EnchantManager.java b/src/main/java/com/craftaro/epicenchants/managers/EnchantManager.java similarity index 84% rename from src/main/java/com/songoda/epicenchants/managers/EnchantManager.java rename to src/main/java/com/craftaro/epicenchants/managers/EnchantManager.java index 2939930..a8e8f40 100644 --- a/src/main/java/com/songoda/epicenchants/managers/EnchantManager.java +++ b/src/main/java/com/craftaro/epicenchants/managers/EnchantManager.java @@ -1,8 +1,8 @@ -package com.songoda.epicenchants.managers; +package com.craftaro.epicenchants.managers; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.objects.Enchant; -import com.songoda.epicenchants.objects.Group; +import com.craftaro.epicenchants.objects.Enchant; +import com.craftaro.epicenchants.objects.Group; +import com.craftaro.epicenchants.EpicEnchants; import org.bukkit.Bukkit; import org.bukkit.configuration.file.YamlConfiguration; @@ -12,7 +12,7 @@ import java.util.Collections; import java.util.Optional; import java.util.stream.Collectors; -import static com.songoda.epicenchants.utils.single.ConfigParser.parseEnchant; +import static com.craftaro.epicenchants.utils.single.ConfigParser.parseEnchant; public class EnchantManager extends Manager { public EnchantManager(EpicEnchants instance) { diff --git a/src/main/java/com/songoda/epicenchants/managers/FileManager.java b/src/main/java/com/craftaro/epicenchants/managers/FileManager.java similarity index 95% rename from src/main/java/com/songoda/epicenchants/managers/FileManager.java rename to src/main/java/com/craftaro/epicenchants/managers/FileManager.java index e3428e7..e3f4be0 100644 --- a/src/main/java/com/songoda/epicenchants/managers/FileManager.java +++ b/src/main/java/com/craftaro/epicenchants/managers/FileManager.java @@ -1,9 +1,9 @@ -package com.songoda.epicenchants.managers; +package com.craftaro.epicenchants.managers; import com.craftaro.core.compatibility.ServerVersion; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.utils.objects.FileLocation; -import com.songoda.epicenchants.utils.settings.Settings; +import com.craftaro.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.utils.objects.FileLocation; +import com.craftaro.epicenchants.utils.settings.Settings; import org.bukkit.Bukkit; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.FileConfiguration; @@ -20,7 +20,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Optional; -import static com.songoda.epicenchants.utils.objects.FileLocation.of; +import static com.craftaro.epicenchants.utils.objects.FileLocation.of; import static java.io.File.separator; import static java.util.Arrays.asList; diff --git a/src/main/java/com/songoda/epicenchants/managers/GroupManager.java b/src/main/java/com/craftaro/epicenchants/managers/GroupManager.java similarity index 74% rename from src/main/java/com/songoda/epicenchants/managers/GroupManager.java rename to src/main/java/com/craftaro/epicenchants/managers/GroupManager.java index 96cbcf1..52cd19b 100644 --- a/src/main/java/com/songoda/epicenchants/managers/GroupManager.java +++ b/src/main/java/com/craftaro/epicenchants/managers/GroupManager.java @@ -1,8 +1,8 @@ -package com.songoda.epicenchants.managers; +package com.craftaro.epicenchants.managers; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.objects.Group; -import com.songoda.epicenchants.utils.single.ConfigParser; +import com.craftaro.epicenchants.objects.Group; +import com.craftaro.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.utils.single.ConfigParser; import org.bukkit.configuration.ConfigurationSection; public class GroupManager extends Manager { diff --git a/src/main/java/com/songoda/epicenchants/managers/InfoManager.java b/src/main/java/com/craftaro/epicenchants/managers/InfoManager.java similarity index 86% rename from src/main/java/com/songoda/epicenchants/managers/InfoManager.java rename to src/main/java/com/craftaro/epicenchants/managers/InfoManager.java index 951149b..7bef631 100644 --- a/src/main/java/com/songoda/epicenchants/managers/InfoManager.java +++ b/src/main/java/com/craftaro/epicenchants/managers/InfoManager.java @@ -1,9 +1,9 @@ -package com.songoda.epicenchants.managers; +package com.craftaro.epicenchants.managers; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.menus.InfoMenu; -import com.songoda.epicenchants.menus.MainInfoMenu; -import com.songoda.epicenchants.objects.Group; +import com.craftaro.epicenchants.objects.Group; +import com.craftaro.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.menus.InfoMenu; +import com.craftaro.epicenchants.menus.MainInfoMenu; import org.bukkit.Bukkit; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/main/java/com/songoda/epicenchants/managers/Manager.java b/src/main/java/com/craftaro/epicenchants/managers/Manager.java similarity index 92% rename from src/main/java/com/songoda/epicenchants/managers/Manager.java rename to src/main/java/com/craftaro/epicenchants/managers/Manager.java index dbdde62..efa94c2 100644 --- a/src/main/java/com/songoda/epicenchants/managers/Manager.java +++ b/src/main/java/com/craftaro/epicenchants/managers/Manager.java @@ -1,6 +1,6 @@ -package com.songoda.epicenchants.managers; +package com.craftaro.epicenchants.managers; -import com.songoda.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.EpicEnchants; import java.util.Collection; import java.util.Collections; diff --git a/src/main/java/com/songoda/epicenchants/menus/AlchemistMenu.java b/src/main/java/com/craftaro/epicenchants/menus/AlchemistMenu.java similarity index 85% rename from src/main/java/com/songoda/epicenchants/menus/AlchemistMenu.java rename to src/main/java/com/craftaro/epicenchants/menus/AlchemistMenu.java index 144663e..ffa16da 100644 --- a/src/main/java/com/songoda/epicenchants/menus/AlchemistMenu.java +++ b/src/main/java/com/craftaro/epicenchants/menus/AlchemistMenu.java @@ -1,14 +1,14 @@ -package com.songoda.epicenchants.menus; +package com.craftaro.epicenchants.menus; import com.craftaro.core.hooks.EconomyManager; import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTItem; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.objects.Enchant; -import com.songoda.epicenchants.objects.Group; -import com.songoda.epicenchants.objects.Placeholder; -import com.songoda.epicenchants.utils.objects.FastInv; -import com.songoda.epicenchants.utils.objects.ItemBuilder; -import com.songoda.epicenchants.utils.single.GeneralUtils; +import com.craftaro.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.objects.Enchant; +import com.craftaro.epicenchants.objects.Group; +import com.craftaro.epicenchants.objects.Placeholder; +import com.craftaro.epicenchants.utils.objects.FastInv; +import com.craftaro.epicenchants.utils.objects.ItemBuilder; +import com.craftaro.epicenchants.utils.single.GeneralUtils; import org.bukkit.Material; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; @@ -18,11 +18,10 @@ import org.bukkit.inventory.ItemStack; import java.util.HashSet; import java.util.Set; -import static com.songoda.epicenchants.objects.Placeholder.of; -import static com.songoda.epicenchants.utils.single.Experience.changeExp; -import static com.songoda.epicenchants.utils.single.Experience.getExp; -import static com.songoda.epicenchants.utils.single.GeneralUtils.color; -import static com.songoda.epicenchants.utils.single.GeneralUtils.getSlots; +import static com.craftaro.epicenchants.utils.single.Experience.changeExp; +import static com.craftaro.epicenchants.utils.single.Experience.getExp; +import static com.craftaro.epicenchants.utils.single.GeneralUtils.color; +import static com.craftaro.epicenchants.utils.single.GeneralUtils.getSlots; public class AlchemistMenu extends FastInv { private final EpicEnchants instance; @@ -213,23 +212,23 @@ public class AlchemistMenu extends FastInv { int rightDestroy = rightItem.getInteger("destroy-rate"); Placeholder[] placeholders = new Placeholder[] { - of("left_success_rate", leftSuccess), - of("right_success_rate", rightSuccess), - of("left_destroy_rate", leftDestroy), - of("right_destroy_rate", rightDestroy), - of("max_destroy_rate", Math.max(leftDestroy, rightDestroy)), - of("min_destroy_rate", Math.min(leftDestroy, rightDestroy)), - of("max_success_rate", Math.max(leftSuccess, rightSuccess)), - of("min_success_rate", Math.min(leftSuccess, rightSuccess)) + Placeholder.of("left_success_rate", leftSuccess), + Placeholder.of("right_success_rate", rightSuccess), + Placeholder.of("left_destroy_rate", leftDestroy), + Placeholder.of("right_destroy_rate", rightDestroy), + Placeholder.of("max_destroy_rate", Math.max(leftDestroy, rightDestroy)), + Placeholder.of("min_destroy_rate", Math.min(leftDestroy, rightDestroy)), + Placeholder.of("max_success_rate", Math.max(leftSuccess, rightSuccess)), + Placeholder.of("min_success_rate", Math.min(leftSuccess, rightSuccess)) }; int successRate = getFromFormula("book.success-rate-formula", placeholders); int destroyRate = getFromFormula("book.destroy-rate-formula", placeholders); Placeholder[] costPlaceholders = new Placeholder[] { - of("group_order_index", enchant.getGroup().getOrder()), - of("final_success_rate", successRate), - of("final_destroy_rate", destroyRate), + Placeholder.of("group_order_index", enchant.getGroup().getOrder()), + Placeholder.of("final_success_rate", successRate), + Placeholder.of("final_destroy_rate", destroyRate), }; ecoCost = getFromFormula("book.eco-cost-formula", costPlaceholders); @@ -240,15 +239,15 @@ public class AlchemistMenu extends FastInv { Group group = this.instance.getGroupManager().getValue(leftItem.getString("group")).orElseThrow(() -> new IllegalStateException("Dust without group!")); Placeholder[] placeholders = new Placeholder[] { - of("left_percentage", leftItem.getInteger("percentage")), - of("right_percentage", rightItem.getInteger("percentage")) + Placeholder.of("left_percentage", leftItem.getInteger("percentage")), + Placeholder.of("right_percentage", rightItem.getInteger("percentage")) }; int successRate = getFromFormula("dust.percentage-formula", placeholders); Placeholder[] costPlaceholders = new Placeholder[] { - of("group_order_index", group.getOrder()), - of("final_success_rate", successRate), + Placeholder.of("group_order_index", group.getOrder()), + Placeholder.of("final_success_rate", successRate), }; ecoCost = getFromFormula("dust.eco-cost-formula", costPlaceholders); @@ -266,8 +265,8 @@ public class AlchemistMenu extends FastInv { } addItem(this.ACCEPT_SLOT, new ItemBuilder(this.config.getConfigurationSection("contents.accept-after"), - of("eco_cost", ecoCost), - of("exp_cost", expCost) + Placeholder.of("eco_cost", ecoCost), + Placeholder.of("exp_cost", expCost) ).build(), event -> { if (!EconomyManager.hasBalance(event.getPlayer(), ecoCost) || getExp(event.getPlayer()) < expCost) { this.instance.getLocale().getMessage("alchemist.cannotafford").sendPrefixedMessage(event.getPlayer()); diff --git a/src/main/java/com/songoda/epicenchants/menus/EnchanterMenu.java b/src/main/java/com/craftaro/epicenchants/menus/EnchanterMenu.java similarity index 80% rename from src/main/java/com/songoda/epicenchants/menus/EnchanterMenu.java rename to src/main/java/com/craftaro/epicenchants/menus/EnchanterMenu.java index 9e5ee34..b0a466f 100644 --- a/src/main/java/com/songoda/epicenchants/menus/EnchanterMenu.java +++ b/src/main/java/com/craftaro/epicenchants/menus/EnchanterMenu.java @@ -1,10 +1,11 @@ -package com.songoda.epicenchants.menus; +package com.craftaro.epicenchants.menus; import com.craftaro.core.hooks.EconomyManager; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.objects.Group; -import com.songoda.epicenchants.utils.objects.FastInv; -import com.songoda.epicenchants.utils.objects.ItemBuilder; +import com.craftaro.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.objects.Group; +import com.craftaro.epicenchants.objects.Placeholder; +import com.craftaro.epicenchants.utils.objects.FastInv; +import com.craftaro.epicenchants.utils.objects.ItemBuilder; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -13,11 +14,10 @@ import java.util.HashMap; import java.util.Map; import java.util.UUID; -import static com.songoda.epicenchants.objects.Placeholder.of; -import static com.songoda.epicenchants.utils.single.Experience.changeExp; -import static com.songoda.epicenchants.utils.single.Experience.getExp; -import static com.songoda.epicenchants.utils.single.GeneralUtils.color; -import static com.songoda.epicenchants.utils.single.GeneralUtils.getSlots; +import static com.craftaro.epicenchants.utils.single.Experience.changeExp; +import static com.craftaro.epicenchants.utils.single.Experience.getExp; +import static com.craftaro.epicenchants.utils.single.GeneralUtils.color; +import static com.craftaro.epicenchants.utils.single.GeneralUtils.getSlots; public class EnchanterMenu extends FastInv { private final Map delay = new HashMap<>(); @@ -44,10 +44,10 @@ public class EnchanterMenu extends FastInv { Group group = instance.getGroupManager().getValue(section.getString("group").toUpperCase()) .orElseThrow(() -> new IllegalArgumentException("Invalid group set in enchanter: " + section.getString("group"))); ItemStack itemStack = new ItemBuilder(section, - of("exp_cost", expCost), - of("eco_cost", ecoCost), - of("exp_left", xpLeft), - of("eco_left", ecoLeft)).build(); + Placeholder.of("exp_cost", expCost), + Placeholder.of("eco_cost", ecoCost), + Placeholder.of("exp_left", xpLeft), + Placeholder.of("eco_left", ecoLeft)).build(); addItem(getSlots(section.getString("slot")), itemStack, event -> { // Todo: wanna change this diff --git a/src/main/java/com/songoda/epicenchants/menus/InfoMenu.java b/src/main/java/com/craftaro/epicenchants/menus/InfoMenu.java similarity index 73% rename from src/main/java/com/songoda/epicenchants/menus/InfoMenu.java rename to src/main/java/com/craftaro/epicenchants/menus/InfoMenu.java index 6e08720..0404d3e 100644 --- a/src/main/java/com/songoda/epicenchants/menus/InfoMenu.java +++ b/src/main/java/com/craftaro/epicenchants/menus/InfoMenu.java @@ -1,10 +1,11 @@ -package com.songoda.epicenchants.menus; +package com.craftaro.epicenchants.menus; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.objects.Enchant; -import com.songoda.epicenchants.objects.Group; -import com.songoda.epicenchants.utils.objects.FastInv; -import com.songoda.epicenchants.utils.objects.ItemBuilder; +import com.craftaro.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.objects.Enchant; +import com.craftaro.epicenchants.objects.Group; +import com.craftaro.epicenchants.objects.Placeholder; +import com.craftaro.epicenchants.utils.objects.FastInv; +import com.craftaro.epicenchants.utils.objects.ItemBuilder; import org.apache.commons.lang.StringUtils; import org.bukkit.configuration.file.FileConfiguration; @@ -13,9 +14,8 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.IntStream; -import static com.songoda.epicenchants.objects.Placeholder.of; -import static com.songoda.epicenchants.utils.single.GeneralUtils.color; -import static com.songoda.epicenchants.utils.single.GeneralUtils.getSlots; +import static com.craftaro.epicenchants.utils.single.GeneralUtils.color; +import static com.craftaro.epicenchants.utils.single.GeneralUtils.getSlots; import static java.util.Arrays.stream; public class InfoMenu extends FastInv { @@ -54,12 +54,12 @@ public class InfoMenu extends FastInv { .collect(Collectors.joining(", ")); addItem(slot, new ItemBuilder(config.getConfigurationSection("enchant-item"), - of("group_color", enchant.getGroup().getColor()), - of("enchant", enchant.getIdentifier()), - of("max_level", enchant.getMaxLevel()), - of("applicable_to", whitelist), - of("enchant", enchant.getIdentifier()), - of("description", enchant + Placeholder.of("group_color", enchant.getGroup().getColor()), + Placeholder.of("enchant", enchant.getIdentifier()), + Placeholder.of("max_level", enchant.getMaxLevel()), + Placeholder.of("applicable_to", whitelist), + Placeholder.of("enchant", enchant.getIdentifier()), + Placeholder.of("description", enchant .getDescription() .stream() .map(s -> config.getString("enchant-item.description-color") + s) diff --git a/src/main/java/com/songoda/epicenchants/menus/MainInfoMenu.java b/src/main/java/com/craftaro/epicenchants/menus/MainInfoMenu.java similarity index 75% rename from src/main/java/com/songoda/epicenchants/menus/MainInfoMenu.java rename to src/main/java/com/craftaro/epicenchants/menus/MainInfoMenu.java index fb18d7d..207c79e 100644 --- a/src/main/java/com/songoda/epicenchants/menus/MainInfoMenu.java +++ b/src/main/java/com/craftaro/epicenchants/menus/MainInfoMenu.java @@ -1,14 +1,14 @@ -package com.songoda.epicenchants.menus; +package com.craftaro.epicenchants.menus; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.objects.Group; -import com.songoda.epicenchants.utils.objects.FastInv; -import com.songoda.epicenchants.utils.objects.ItemBuilder; +import com.craftaro.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.objects.Group; +import com.craftaro.epicenchants.utils.objects.FastInv; +import com.craftaro.epicenchants.utils.objects.ItemBuilder; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.event.Listener; -import static com.songoda.epicenchants.utils.single.GeneralUtils.color; -import static com.songoda.epicenchants.utils.single.GeneralUtils.getSlots; +import static com.craftaro.epicenchants.utils.single.GeneralUtils.color; +import static com.craftaro.epicenchants.utils.single.GeneralUtils.getSlots; public class MainInfoMenu extends FastInv implements Listener { public MainInfoMenu(EpicEnchants instance, FileConfiguration config) { diff --git a/src/main/java/com/songoda/epicenchants/menus/TinkererMenu.java b/src/main/java/com/craftaro/epicenchants/menus/TinkererMenu.java similarity index 93% rename from src/main/java/com/songoda/epicenchants/menus/TinkererMenu.java rename to src/main/java/com/craftaro/epicenchants/menus/TinkererMenu.java index dff2914..8f084da 100644 --- a/src/main/java/com/songoda/epicenchants/menus/TinkererMenu.java +++ b/src/main/java/com/craftaro/epicenchants/menus/TinkererMenu.java @@ -1,12 +1,12 @@ -package com.songoda.epicenchants.menus; +package com.craftaro.epicenchants.menus; import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTCompound; import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTItem; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.enums.ItemType; -import com.songoda.epicenchants.objects.Enchant; -import com.songoda.epicenchants.utils.objects.FastInv; -import com.songoda.epicenchants.utils.objects.ItemBuilder; +import com.craftaro.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.objects.Enchant; +import com.craftaro.epicenchants.enums.ItemType; +import com.craftaro.epicenchants.utils.objects.FastInv; +import com.craftaro.epicenchants.utils.objects.ItemBuilder; import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; @@ -22,11 +22,11 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; -import static com.songoda.epicenchants.enums.ItemType.BOOK; -import static com.songoda.epicenchants.enums.ItemType.ENCHANTED; -import static com.songoda.epicenchants.enums.ItemType.NONE; -import static com.songoda.epicenchants.utils.single.GeneralUtils.color; -import static com.songoda.epicenchants.utils.single.GeneralUtils.getSlots; +import static com.craftaro.epicenchants.enums.ItemType.BOOK; +import static com.craftaro.epicenchants.enums.ItemType.ENCHANTED; +import static com.craftaro.epicenchants.enums.ItemType.NONE; +import static com.craftaro.epicenchants.utils.single.GeneralUtils.color; +import static com.craftaro.epicenchants.utils.single.GeneralUtils.getSlots; import static java.util.Arrays.stream; public class TinkererMenu extends FastInv { diff --git a/src/main/java/com/songoda/epicenchants/objects/BookItem.java b/src/main/java/com/craftaro/epicenchants/objects/BookItem.java similarity index 90% rename from src/main/java/com/songoda/epicenchants/objects/BookItem.java rename to src/main/java/com/craftaro/epicenchants/objects/BookItem.java index c6e3e86..7e9dbaa 100644 --- a/src/main/java/com/songoda/epicenchants/objects/BookItem.java +++ b/src/main/java/com/craftaro/epicenchants/objects/BookItem.java @@ -1,12 +1,12 @@ -package com.songoda.epicenchants.objects; +package com.craftaro.epicenchants.objects; import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTItem; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.utils.objects.ItemBuilder; -import com.songoda.epicenchants.utils.settings.Settings; -import com.songoda.epicenchants.utils.single.GeneralUtils; -import com.songoda.epicenchants.utils.single.ItemGroup; -import com.songoda.epicenchants.utils.single.RomanNumber; +import com.craftaro.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.utils.objects.ItemBuilder; +import com.craftaro.epicenchants.utils.settings.Settings; +import com.craftaro.epicenchants.utils.single.GeneralUtils; +import com.craftaro.epicenchants.utils.single.ItemGroup; +import com.craftaro.epicenchants.utils.single.RomanNumber; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import static com.songoda.epicenchants.utils.single.GeneralUtils.color; +import static com.craftaro.epicenchants.utils.single.GeneralUtils.color; import static java.util.concurrent.ThreadLocalRandom.current; public class BookItem { diff --git a/src/main/java/com/songoda/epicenchants/objects/Condition.java b/src/main/java/com/craftaro/epicenchants/objects/Condition.java similarity index 83% rename from src/main/java/com/songoda/epicenchants/objects/Condition.java rename to src/main/java/com/craftaro/epicenchants/objects/Condition.java index 2b6e0eb..b4bc380 100644 --- a/src/main/java/com/songoda/epicenchants/objects/Condition.java +++ b/src/main/java/com/craftaro/epicenchants/objects/Condition.java @@ -1,7 +1,7 @@ -package com.songoda.epicenchants.objects; +package com.craftaro.epicenchants.objects; -import com.songoda.epicenchants.utils.single.GeneralUtils; -import com.songoda.epicenchants.utils.single.Placeholders; +import com.craftaro.epicenchants.utils.single.GeneralUtils; +import com.craftaro.epicenchants.utils.single.Placeholders; import org.bukkit.ChatColor; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/objects/Enchant.java b/src/main/java/com/craftaro/epicenchants/objects/Enchant.java similarity index 94% rename from src/main/java/com/songoda/epicenchants/objects/Enchant.java rename to src/main/java/com/craftaro/epicenchants/objects/Enchant.java index 171e276..797f776 100644 --- a/src/main/java/com/songoda/epicenchants/objects/Enchant.java +++ b/src/main/java/com/craftaro/epicenchants/objects/Enchant.java @@ -1,10 +1,10 @@ -package com.songoda.epicenchants.objects; +package com.craftaro.epicenchants.objects; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; -import com.songoda.epicenchants.effect.EffectExecutor; -import com.songoda.epicenchants.enums.EventType; -import com.songoda.epicenchants.enums.TriggerType; -import com.songoda.epicenchants.utils.single.RomanNumber; +import com.craftaro.epicenchants.effect.EffectExecutor; +import com.craftaro.epicenchants.enums.EventType; +import com.craftaro.epicenchants.enums.TriggerType; +import com.craftaro.epicenchants.utils.single.RomanNumber; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.Event; @@ -15,7 +15,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import static com.songoda.epicenchants.utils.single.GeneralUtils.color; +import static com.craftaro.epicenchants.utils.single.GeneralUtils.color; public class Enchant { private final String author; diff --git a/src/main/java/com/songoda/epicenchants/objects/Group.java b/src/main/java/com/craftaro/epicenchants/objects/Group.java similarity index 99% rename from src/main/java/com/songoda/epicenchants/objects/Group.java rename to src/main/java/com/craftaro/epicenchants/objects/Group.java index c7b7771..bd695fd 100644 --- a/src/main/java/com/songoda/epicenchants/objects/Group.java +++ b/src/main/java/com/craftaro/epicenchants/objects/Group.java @@ -1,4 +1,4 @@ -package com.songoda.epicenchants.objects; +package com.craftaro.epicenchants.objects; public class Group { private final String identifier; diff --git a/src/main/java/com/songoda/epicenchants/objects/LeveledModifier.java b/src/main/java/com/craftaro/epicenchants/objects/LeveledModifier.java similarity index 83% rename from src/main/java/com/songoda/epicenchants/objects/LeveledModifier.java rename to src/main/java/com/craftaro/epicenchants/objects/LeveledModifier.java index f8d4d4f..097a420 100644 --- a/src/main/java/com/songoda/epicenchants/objects/LeveledModifier.java +++ b/src/main/java/com/craftaro/epicenchants/objects/LeveledModifier.java @@ -1,7 +1,7 @@ -package com.songoda.epicenchants.objects; +package com.craftaro.epicenchants.objects; -import com.songoda.epicenchants.utils.single.GeneralUtils; -import com.songoda.epicenchants.utils.single.Placeholders; +import com.craftaro.epicenchants.utils.single.GeneralUtils; +import com.craftaro.epicenchants.utils.single.Placeholders; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/objects/Placeholder.java b/src/main/java/com/craftaro/epicenchants/objects/Placeholder.java similarity index 92% rename from src/main/java/com/songoda/epicenchants/objects/Placeholder.java rename to src/main/java/com/craftaro/epicenchants/objects/Placeholder.java index 7e4a326..6e51fcb 100644 --- a/src/main/java/com/songoda/epicenchants/objects/Placeholder.java +++ b/src/main/java/com/craftaro/epicenchants/objects/Placeholder.java @@ -1,4 +1,4 @@ -package com.songoda.epicenchants.objects; +package com.craftaro.epicenchants.objects; public class Placeholder { private final String placeholder; diff --git a/src/main/java/com/songoda/epicenchants/utils/EnchantUtils.java b/src/main/java/com/craftaro/epicenchants/utils/EnchantUtils.java similarity index 81% rename from src/main/java/com/songoda/epicenchants/utils/EnchantUtils.java rename to src/main/java/com/craftaro/epicenchants/utils/EnchantUtils.java index 74714b6..81daa29 100644 --- a/src/main/java/com/songoda/epicenchants/utils/EnchantUtils.java +++ b/src/main/java/com/craftaro/epicenchants/utils/EnchantUtils.java @@ -1,17 +1,17 @@ -package com.songoda.epicenchants.utils; +package com.craftaro.epicenchants.utils; import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTCompound; import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTItem; import com.craftaro.core.utils.NumberUtils; import com.craftaro.core.utils.TextUtils; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.enums.EnchantResult; -import com.songoda.epicenchants.enums.EventType; -import com.songoda.epicenchants.enums.TriggerType; -import com.songoda.epicenchants.objects.Enchant; -import com.songoda.epicenchants.utils.objects.ItemBuilder; -import com.songoda.epicenchants.utils.settings.Settings; -import com.songoda.epicenchants.utils.single.GeneralUtils; +import com.craftaro.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.enums.EnchantResult; +import com.craftaro.epicenchants.enums.EventType; +import com.craftaro.epicenchants.enums.TriggerType; +import com.craftaro.epicenchants.objects.Enchant; +import com.craftaro.epicenchants.utils.objects.ItemBuilder; +import com.craftaro.epicenchants.utils.settings.Settings; +import com.craftaro.epicenchants.utils.single.GeneralUtils; import org.bukkit.Material; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; @@ -31,15 +31,6 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; -import static com.songoda.epicenchants.enums.EnchantResult.ALREADY_APPLIED; -import static com.songoda.epicenchants.enums.EnchantResult.BROKEN_FAILURE; -import static com.songoda.epicenchants.enums.EnchantResult.CONFLICT; -import static com.songoda.epicenchants.enums.EnchantResult.FAILURE; -import static com.songoda.epicenchants.enums.EnchantResult.MAXED_OUT; -import static com.songoda.epicenchants.enums.EnchantResult.PROTECTED; -import static com.songoda.epicenchants.enums.EnchantResult.SUCCESS; -import static com.songoda.epicenchants.enums.TriggerType.HELD_ITEM; - public class EnchantUtils { private final EpicEnchants instance; @@ -56,15 +47,15 @@ public class EnchantUtils { Set currentConflicts = currentEnchantMap.keySet().stream().map(Enchant::getConflict).flatMap(Collection::stream).collect(Collectors.toSet()); if (enchant.getConflict().stream().anyMatch(currentIds::contains) || currentConflicts.contains(enchant.getIdentifier())) { - return Tuple.of(itemStack, CONFLICT); + return Tuple.of(itemStack, EnchantResult.CONFLICT); } if (currentEnchantMap.entrySet().stream().anyMatch(entry -> entry.getKey().equals(enchant) && entry.getValue() == enchant.getMaxLevel())) { - return Tuple.of(itemStack, MAXED_OUT); + return Tuple.of(itemStack, EnchantResult.MAXED_OUT); } if (currentEnchantMap.entrySet().stream().anyMatch(entry -> entry.getKey().equals(enchant) && entry.getValue() >= level)) { - return Tuple.of(itemStack, ALREADY_APPLIED); + return Tuple.of(itemStack, EnchantResult.ALREADY_APPLIED); } if (!GeneralUtils.chance(successRate)) { @@ -72,11 +63,11 @@ public class EnchantUtils { if (hasProtection) { NBTItem nbtItem = new ItemBuilder(itemStack).removeLore(this.instance.getSpecialItems().getWhiteScrollLore()).nbt(); nbtItem.removeKey("protected"); - return Tuple.of(nbtItem.getItem(), PROTECTED); + return Tuple.of(nbtItem.getItem(), EnchantResult.PROTECTED); } - return Tuple.of(new ItemStack(Material.AIR), BROKEN_FAILURE); + return Tuple.of(new ItemStack(Material.AIR), EnchantResult.BROKEN_FAILURE); } - return Tuple.of(itemStack, FAILURE); + return Tuple.of(itemStack, EnchantResult.FAILURE); } ItemBuilder itemBuilder = new ItemBuilder(itemStack); @@ -97,7 +88,7 @@ public class EnchantUtils { NBTCompound compound = nbtItem.getOrCreateCompound("enchants"); compound.setInteger(enchant.getIdentifier(), level); - return Tuple.of(nbtItem.getItem(), SUCCESS); + return Tuple.of(nbtItem.getItem(), EnchantResult.SUCCESS); } public Map getEnchants(ItemStack itemStack) { @@ -125,7 +116,7 @@ public class EnchantUtils { stacks.add(GeneralUtils.getHeldItem(player, event)); stacks.removeIf(Objects::isNull); - if (triggerType == HELD_ITEM) { + if (triggerType == TriggerType.HELD_ITEM) { stacks = Collections.singletonList(player.getItemInHand()); } diff --git a/src/main/java/com/songoda/epicenchants/utils/SpecialItems.java b/src/main/java/com/craftaro/epicenchants/utils/SpecialItems.java similarity index 80% rename from src/main/java/com/songoda/epicenchants/utils/SpecialItems.java rename to src/main/java/com/craftaro/epicenchants/utils/SpecialItems.java index 94ec5dd..cbde238 100644 --- a/src/main/java/com/songoda/epicenchants/utils/SpecialItems.java +++ b/src/main/java/com/craftaro/epicenchants/utils/SpecialItems.java @@ -1,10 +1,11 @@ -package com.songoda.epicenchants.utils; +package com.craftaro.epicenchants.utils; import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTItem; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.objects.Group; -import com.songoda.epicenchants.utils.objects.ItemBuilder; -import com.songoda.epicenchants.utils.settings.Settings; +import com.craftaro.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.objects.Group; +import com.craftaro.epicenchants.objects.Placeholder; +import com.craftaro.epicenchants.utils.objects.ItemBuilder; +import com.craftaro.epicenchants.utils.settings.Settings; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.inventory.ItemStack; @@ -12,8 +13,7 @@ import org.jetbrains.annotations.Nullable; import java.util.concurrent.ThreadLocalRandom; -import static com.songoda.epicenchants.objects.Placeholder.of; -import static com.songoda.epicenchants.utils.single.GeneralUtils.color; +import static com.craftaro.epicenchants.utils.single.GeneralUtils.color; public class SpecialItems { private final EpicEnchants instance; @@ -34,7 +34,7 @@ public class SpecialItems { public ItemStack getBlackScroll(int amount, int chance) { int successRate = chance == -1 ? ThreadLocalRandom.current().nextInt(Settings.BLACK_MIN.getInt(), Settings.BLACK_MAX.getInt() + 1) : chance; - NBTItem nbtItem = new ItemBuilder(this.instance.getFileManager().getConfiguration("items/special-items").getConfigurationSection("black-scroll"), of("success-rate", successRate)).nbt(); + NBTItem nbtItem = new ItemBuilder(this.instance.getFileManager().getConfiguration("items/special-items").getConfigurationSection("black-scroll"), Placeholder.of("success-rate", successRate)).nbt(); nbtItem.setBoolean("black-scroll", true); nbtItem.setInteger("success-rate", successRate); @@ -48,8 +48,8 @@ public class SpecialItems { public ItemStack getMysteryBook(Group group) { NBTItem nbtItem = new ItemBuilder(this.instance.getFileManager().getConfiguration("items/special-items").getConfigurationSection("mystery-book"), - of("group-color", group.getColor()), - of("group-name", group.getName())).nbt(); + Placeholder.of("group-color", group.getColor()), + Placeholder.of("group-name", group.getName())).nbt(); nbtItem.setBoolean("mystery-book", true); nbtItem.setString("group", group.getIdentifier()); @@ -63,10 +63,10 @@ public class SpecialItems { public ItemStack getSecretDust(Group group, int max) { NBTItem nbtItem = new ItemBuilder(this.instance.getFileManager().getConfiguration("items/dusts").getConfigurationSection("secret-dust"), - of("group-color", group.getColor()), - of("group-name", group.getName()), - of("max-rate", max), - of("min-rate", 0)).nbt(); + Placeholder.of("group-color", group.getColor()), + Placeholder.of("group-name", group.getName()), + Placeholder.of("max-rate", max), + Placeholder.of("min-rate", 0)).nbt(); nbtItem.setBoolean("secret-dust", true); nbtItem.setString("group", group.getIdentifier()); @@ -103,9 +103,9 @@ public class SpecialItems { } NBTItem nbtItem = new ItemBuilder(config, - of("group-color", group.getColor()), - of("group-name", group.getName()), - of("percentage", percentage)).nbt(); + Placeholder.of("group-color", group.getColor()), + Placeholder.of("group-name", group.getName()), + Placeholder.of("percentage", percentage)).nbt(); if (type.equalsIgnoreCase("mystery")) { return nbtItem.getItem(); diff --git a/src/main/java/com/songoda/epicenchants/utils/Tuple.java b/src/main/java/com/craftaro/epicenchants/utils/Tuple.java similarity index 90% rename from src/main/java/com/songoda/epicenchants/utils/Tuple.java rename to src/main/java/com/craftaro/epicenchants/utils/Tuple.java index fba3ff3..cbfed48 100644 --- a/src/main/java/com/songoda/epicenchants/utils/Tuple.java +++ b/src/main/java/com/craftaro/epicenchants/utils/Tuple.java @@ -1,4 +1,4 @@ -package com.songoda.epicenchants.utils; +package com.craftaro.epicenchants.utils; public class Tuple { private final key x; diff --git a/src/main/java/com/songoda/epicenchants/utils/objects/FastInv.java b/src/main/java/com/craftaro/epicenchants/utils/objects/FastInv.java similarity index 99% rename from src/main/java/com/songoda/epicenchants/utils/objects/FastInv.java rename to src/main/java/com/craftaro/epicenchants/utils/objects/FastInv.java index b375872..60b05a5 100644 --- a/src/main/java/com/songoda/epicenchants/utils/objects/FastInv.java +++ b/src/main/java/com/craftaro/epicenchants/utils/objects/FastInv.java @@ -1,4 +1,4 @@ -package com.songoda.epicenchants.utils.objects; +package com.craftaro.epicenchants.utils.objects; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/utils/objects/FileLocation.java b/src/main/java/com/craftaro/epicenchants/utils/objects/FileLocation.java similarity index 95% rename from src/main/java/com/songoda/epicenchants/utils/objects/FileLocation.java rename to src/main/java/com/craftaro/epicenchants/utils/objects/FileLocation.java index 6435613..55e307f 100644 --- a/src/main/java/com/songoda/epicenchants/utils/objects/FileLocation.java +++ b/src/main/java/com/craftaro/epicenchants/utils/objects/FileLocation.java @@ -1,4 +1,4 @@ -package com.songoda.epicenchants.utils.objects; +package com.craftaro.epicenchants.utils.objects; public class FileLocation { private final boolean required, versionDependent; diff --git a/src/main/java/com/songoda/epicenchants/utils/objects/ItemBuilder.java b/src/main/java/com/craftaro/epicenchants/utils/objects/ItemBuilder.java similarity index 95% rename from src/main/java/com/songoda/epicenchants/utils/objects/ItemBuilder.java rename to src/main/java/com/craftaro/epicenchants/utils/objects/ItemBuilder.java index 67cf786..b30ba67 100644 --- a/src/main/java/com/songoda/epicenchants/utils/objects/ItemBuilder.java +++ b/src/main/java/com/craftaro/epicenchants/utils/objects/ItemBuilder.java @@ -1,11 +1,11 @@ -package com.songoda.epicenchants.utils.objects; +package com.craftaro.epicenchants.utils.objects; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.craftaro.core.third_party.de.tr7zw.nbtapi.NBTItem; -import com.songoda.epicenchants.objects.Placeholder; -import com.songoda.epicenchants.utils.single.ConfigParser; -import com.songoda.epicenchants.utils.single.GeneralUtils; -import com.songoda.epicenchants.wrappers.EnchantmentWrapper; +import com.craftaro.epicenchants.objects.Placeholder; +import com.craftaro.epicenchants.wrappers.EnchantmentWrapper; +import com.craftaro.epicenchants.utils.single.ConfigParser; +import com.craftaro.epicenchants.utils.single.GeneralUtils; import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.enchantments.Enchantment; @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import static com.songoda.epicenchants.utils.single.GeneralUtils.color; +import static com.craftaro.epicenchants.utils.single.GeneralUtils.color; public class ItemBuilder { private final ItemStack item; diff --git a/src/main/java/com/songoda/epicenchants/utils/settings/Settings.java b/src/main/java/com/craftaro/epicenchants/utils/settings/Settings.java similarity index 96% rename from src/main/java/com/songoda/epicenchants/utils/settings/Settings.java rename to src/main/java/com/craftaro/epicenchants/utils/settings/Settings.java index 5f3d025..b48ea7d 100644 --- a/src/main/java/com/songoda/epicenchants/utils/settings/Settings.java +++ b/src/main/java/com/craftaro/epicenchants/utils/settings/Settings.java @@ -1,9 +1,9 @@ -package com.songoda.epicenchants.utils.settings; +package com.craftaro.epicenchants.utils.settings; import com.craftaro.core.configuration.Config; import com.craftaro.core.configuration.ConfigSetting; import com.craftaro.core.hooks.EconomyManager; -import com.songoda.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.EpicEnchants; import java.util.stream.Collectors; diff --git a/src/main/java/com/songoda/epicenchants/utils/single/ConfigParser.java b/src/main/java/com/craftaro/epicenchants/utils/single/ConfigParser.java similarity index 83% rename from src/main/java/com/songoda/epicenchants/utils/single/ConfigParser.java rename to src/main/java/com/craftaro/epicenchants/utils/single/ConfigParser.java index f9eb97f..552f69b 100644 --- a/src/main/java/com/songoda/epicenchants/utils/single/ConfigParser.java +++ b/src/main/java/com/craftaro/epicenchants/utils/single/ConfigParser.java @@ -1,12 +1,12 @@ -package com.songoda.epicenchants.utils.single; +package com.craftaro.epicenchants.utils.single; -import com.songoda.epicenchants.EpicEnchants; -import com.songoda.epicenchants.effect.EffectManager; -import com.songoda.epicenchants.objects.BookItem; -import com.songoda.epicenchants.objects.Enchant; -import com.songoda.epicenchants.objects.Group; -import com.songoda.epicenchants.objects.LeveledModifier; -import com.songoda.epicenchants.wrappers.EnchantmentWrapper; +import com.craftaro.epicenchants.EpicEnchants; +import com.craftaro.epicenchants.effect.EffectManager; +import com.craftaro.epicenchants.objects.BookItem; +import com.craftaro.epicenchants.objects.Enchant; +import com.craftaro.epicenchants.objects.Group; +import com.craftaro.epicenchants.objects.LeveledModifier; +import com.craftaro.epicenchants.wrappers.EnchantmentWrapper; import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; @@ -18,8 +18,6 @@ import java.util.HashSet; import java.util.Optional; import java.util.stream.Collectors; -import static com.songoda.epicenchants.utils.single.GeneralUtils.color; - public class ConfigParser { public static Enchant parseEnchant(EpicEnchants instance, FileConfiguration config) { return Enchant.builder() @@ -27,7 +25,7 @@ public class ConfigParser { .identifier(config.getString("identifier")) .group(instance.getGroupManager().getValue(config.getString("group").toUpperCase()).orElseThrow(() -> new IllegalArgumentException("Invalid group: " + config.getString("group")))) .maxLevel(config.getInt("max-level")) - .format(config.isSet("applied-format") ? color(config.getString("applied-format")) : "") + .format(config.isSet("applied-format") ? GeneralUtils.color(config.getString("applied-format")) : "") .bookItem(parseBookItem(instance, config.getConfigurationSection("book-item"))) .itemWhitelist((config.isList("item-whitelist") ? config.getStringList("item-whitelist").stream().map(instance.getItemGroup()::get).flatMap(Collection::stream).collect(Collectors.toSet()) : Collections.emptySet())) .conflict(config.isList("conflicting-enchants") ? new HashSet<>(config.getStringList("conflicting-enchants")) : Collections.emptySet()) @@ -53,7 +51,7 @@ public class ConfigParser { return section != null ? BookItem.builder() .instance(instance) .material(Material.valueOf(section.getString("material"))) - .displayName(color(section.getString("display-name"))) + .displayName(GeneralUtils.color(section.getString("display-name"))) .lore(section.getStringList("lore").stream().map(GeneralUtils::color).collect(Collectors.toList())) .build() : null; } @@ -62,7 +60,7 @@ public class ConfigParser { return section != null ? Group.builder() .order(section.getInt("order")) .identifier(section.getName()) - .name(color(section.getString("group-name"))) + .name(GeneralUtils.color(section.getString("group-name"))) .format(section.getString("group-lore-format")) .color(section.getString("group-color")) .descriptionColor(section.getString("description-color")) diff --git a/src/main/java/com/songoda/epicenchants/utils/single/Experience.java b/src/main/java/com/craftaro/epicenchants/utils/single/Experience.java similarity index 98% rename from src/main/java/com/songoda/epicenchants/utils/single/Experience.java rename to src/main/java/com/craftaro/epicenchants/utils/single/Experience.java index 8dfbdb3..028f5e5 100644 --- a/src/main/java/com/songoda/epicenchants/utils/single/Experience.java +++ b/src/main/java/com/craftaro/epicenchants/utils/single/Experience.java @@ -1,4 +1,4 @@ -package com.songoda.epicenchants.utils.single; +package com.craftaro.epicenchants.utils.single; import org.bukkit.entity.Player; diff --git a/src/main/java/com/songoda/epicenchants/utils/single/GeneralUtils.java b/src/main/java/com/craftaro/epicenchants/utils/single/GeneralUtils.java similarity index 96% rename from src/main/java/com/songoda/epicenchants/utils/single/GeneralUtils.java rename to src/main/java/com/craftaro/epicenchants/utils/single/GeneralUtils.java index dad86f3..5027e1a 100644 --- a/src/main/java/com/songoda/epicenchants/utils/single/GeneralUtils.java +++ b/src/main/java/com/craftaro/epicenchants/utils/single/GeneralUtils.java @@ -1,9 +1,9 @@ -package com.songoda.epicenchants.utils.single; +package com.craftaro.epicenchants.utils.single; import com.craftaro.core.compatibility.CompatibleHand; import com.craftaro.core.math.MathUtils; -import com.songoda.epicenchants.enums.EnchantResult; -import com.songoda.epicenchants.enums.TriggerType; +import com.craftaro.epicenchants.enums.EnchantResult; +import com.craftaro.epicenchants.enums.TriggerType; import org.apache.commons.lang.StringUtils; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/src/main/java/com/songoda/epicenchants/utils/single/ItemGroup.java b/src/main/java/com/craftaro/epicenchants/utils/single/ItemGroup.java similarity index 96% rename from src/main/java/com/songoda/epicenchants/utils/single/ItemGroup.java rename to src/main/java/com/craftaro/epicenchants/utils/single/ItemGroup.java index e860f86..234f3a1 100644 --- a/src/main/java/com/songoda/epicenchants/utils/single/ItemGroup.java +++ b/src/main/java/com/craftaro/epicenchants/utils/single/ItemGroup.java @@ -1,6 +1,5 @@ -package com.songoda.epicenchants.utils.single; +package com.craftaro.epicenchants.utils.single; -import com.craftaro.core.compatibility.CompatibleMaterial; import com.craftaro.core.third_party.com.cryptomorin.xseries.XMaterial; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -54,7 +53,7 @@ public class ItemGroup { optionalGroup.ifPresent(group -> output.addAll(getMaterials(group))); - Optional material = CompatibleMaterial.getMaterial(key); + Optional material = XMaterial.matchXMaterial(key); material.ifPresent(output::add); return output; diff --git a/src/main/java/com/songoda/epicenchants/utils/single/Placeholders.java b/src/main/java/com/craftaro/epicenchants/utils/single/Placeholders.java similarity index 97% rename from src/main/java/com/songoda/epicenchants/utils/single/Placeholders.java rename to src/main/java/com/craftaro/epicenchants/utils/single/Placeholders.java index ad3b822..202ab80 100644 --- a/src/main/java/com/songoda/epicenchants/utils/single/Placeholders.java +++ b/src/main/java/com/craftaro/epicenchants/utils/single/Placeholders.java @@ -1,4 +1,4 @@ -package com.songoda.epicenchants.utils.single; +package com.craftaro.epicenchants.utils.single; import me.clip.placeholderapi.PlaceholderAPI; import org.bukkit.Bukkit; @@ -27,7 +27,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; -import static com.songoda.epicenchants.utils.single.GeneralUtils.getHeldItem; +import static com.craftaro.epicenchants.utils.single.GeneralUtils.getHeldItem; public class Placeholders { private static final Map> EVENT_FUNCTIONS = new HashMap>() {{ diff --git a/src/main/java/com/songoda/epicenchants/utils/single/RomanNumber.java b/src/main/java/com/craftaro/epicenchants/utils/single/RomanNumber.java similarity index 93% rename from src/main/java/com/songoda/epicenchants/utils/single/RomanNumber.java rename to src/main/java/com/craftaro/epicenchants/utils/single/RomanNumber.java index 3fdf8ae..310c38a 100644 --- a/src/main/java/com/songoda/epicenchants/utils/single/RomanNumber.java +++ b/src/main/java/com/craftaro/epicenchants/utils/single/RomanNumber.java @@ -1,4 +1,4 @@ -package com.songoda.epicenchants.utils.single; +package com.craftaro.epicenchants.utils.single; import java.util.TreeMap; diff --git a/src/main/java/com/songoda/epicenchants/wrappers/EnchantmentWrapper.java b/src/main/java/com/craftaro/epicenchants/wrappers/EnchantmentWrapper.java similarity index 94% rename from src/main/java/com/songoda/epicenchants/wrappers/EnchantmentWrapper.java rename to src/main/java/com/craftaro/epicenchants/wrappers/EnchantmentWrapper.java index 6eebc93..2aeede4 100644 --- a/src/main/java/com/songoda/epicenchants/wrappers/EnchantmentWrapper.java +++ b/src/main/java/com/craftaro/epicenchants/wrappers/EnchantmentWrapper.java @@ -1,6 +1,6 @@ -package com.songoda.epicenchants.wrappers; +package com.craftaro.epicenchants.wrappers; -import com.songoda.epicenchants.objects.LeveledModifier; +import com.craftaro.epicenchants.objects.LeveledModifier; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; diff --git a/src/main/resources/enchants/elite/AntiGravity.yml b/src/main/resources/enchants/elite/AntiGravity.yml index 10bfb3f..4d09162 100644 --- a/src/main/resources/enchants/elite/AntiGravity.yml +++ b/src/main/resources/enchants/elite/AntiGravity.yml @@ -1,4 +1,4 @@ -author: Songoda +author: Craftaro # The enchant identifier must be unique. identifier: AntiGravity @@ -20,7 +20,7 @@ description: item-whitelist: - "BOOTS" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: POTION: # The trigger that will fire this effect. diff --git a/src/main/resources/enchants/elite/Frozen.yml b/src/main/resources/enchants/elite/Frozen.yml index ea17b78..274f1b1 100644 --- a/src/main/resources/enchants/elite/Frozen.yml +++ b/src/main/resources/enchants/elite/Frozen.yml @@ -1,4 +1,4 @@ -author: Songoda +author: Craftaro # The enchant identifier must be unique. identifier: Frozen @@ -21,7 +21,7 @@ description: item-whitelist: - "ARMOR" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: POTION: # The trigger that will fire this effect. diff --git a/src/main/resources/enchants/elite/Healy.yml b/src/main/resources/enchants/elite/Healy.yml index d717d5e..e76c568 100644 --- a/src/main/resources/enchants/elite/Healy.yml +++ b/src/main/resources/enchants/elite/Healy.yml @@ -30,7 +30,7 @@ description: item-whitelist: - "ARMOR" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: REMOVE_EFFECT: # The trigger that will fire this effect. diff --git a/src/main/resources/enchants/elite/Poison.yml b/src/main/resources/enchants/elite/Poison.yml index 08f1262..dc3118e 100644 --- a/src/main/resources/enchants/elite/Poison.yml +++ b/src/main/resources/enchants/elite/Poison.yml @@ -1,4 +1,4 @@ -author: Songoda +author: Craftaro # The enchant identifier must be unique. identifier: Poison @@ -20,7 +20,7 @@ description: item-whitelist: - "SWORDS" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: POTION: # The trigger that will fire this effect. diff --git a/src/main/resources/enchants/elite/RocketEscape.yml b/src/main/resources/enchants/elite/RocketEscape.yml index b07b4fa..b947454 100644 --- a/src/main/resources/enchants/elite/RocketEscape.yml +++ b/src/main/resources/enchants/elite/RocketEscape.yml @@ -1,4 +1,4 @@ -author: Songoda +author: Craftaro # The enchant identifier must be unique. identifier: RocketEscape @@ -20,7 +20,7 @@ description: item-whitelist: - "BOOTS" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: THROW: # The trigger that will fire this effect. diff --git a/src/main/resources/enchants/elite/Shockwave.yml b/src/main/resources/enchants/elite/Shockwave.yml index 449c5a4..bd08345 100644 --- a/src/main/resources/enchants/elite/Shockwave.yml +++ b/src/main/resources/enchants/elite/Shockwave.yml @@ -1,4 +1,4 @@ -author: Songoda +author: Craftaro # The enchant identifier must be unique. identifier: Shockwave @@ -21,7 +21,7 @@ description: item-whitelist: - "CHESTPLATES" -# For a full list of effects, please visit: https://wiki.songoda.com/display/SON/EpicEnchants +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: THROW: # The trigger that will fire this effect. @@ -33,4 +33,4 @@ effects: # Magnitude of the throw. magnitude: "{level} * 0.2" # Chance of the effect firing. - chance: "{level} * 3" \ No newline at end of file + chance: "{level} * 3" diff --git a/src/main/resources/enchants/elite/Shocky.yml b/src/main/resources/enchants/elite/Shocky.yml index 61100ee..5f03f0c 100644 --- a/src/main/resources/enchants/elite/Shocky.yml +++ b/src/main/resources/enchants/elite/Shocky.yml @@ -32,7 +32,7 @@ description: item-whitelist: - "PICKAXE" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: SPAWN_TNT: # The trigger that will fire this effect. diff --git a/src/main/resources/enchants/elite/Wither.yml b/src/main/resources/enchants/elite/Wither.yml index 086e515..be54e0e 100644 --- a/src/main/resources/enchants/elite/Wither.yml +++ b/src/main/resources/enchants/elite/Wither.yml @@ -1,4 +1,4 @@ -author: Songoda +author: Craftaro # The enchant identifier must be unique. identifier: Wither @@ -21,7 +21,7 @@ description: item-whitelist: - "ARMOR" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: POTION: # The trigger that will fire this effect. diff --git a/src/main/resources/enchants/legendary/DeathBringer.yml b/src/main/resources/enchants/legendary/DeathBringer.yml index daeaab9..56d2ed3 100644 --- a/src/main/resources/enchants/legendary/DeathBringer.yml +++ b/src/main/resources/enchants/legendary/DeathBringer.yml @@ -1,4 +1,4 @@ -author: Songoda +author: Craftaro # The enchant identifier must be unique. identifier: DeathBringer @@ -20,7 +20,7 @@ description: item-whitelist: - "AXES" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: POTION: # The trigger that will fire this effect diff --git a/src/main/resources/enchants/legendary/DeathGod.yml b/src/main/resources/enchants/legendary/DeathGod.yml index 911782a..7faaf75 100644 --- a/src/main/resources/enchants/legendary/DeathGod.yml +++ b/src/main/resources/enchants/legendary/DeathGod.yml @@ -1,4 +1,4 @@ -author: Songoda +author: Craftaro # The enchant identifier must be unique. identifier: DeathGod @@ -21,7 +21,7 @@ description: item-whitelist: - "HELMETS" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: MODIFY_HEALTH: # The trigger that will fire this effect diff --git a/src/main/resources/enchants/legendary/Divergent.yml b/src/main/resources/enchants/legendary/Divergent.yml index ba56789..9d8bed2 100644 --- a/src/main/resources/enchants/legendary/Divergent.yml +++ b/src/main/resources/enchants/legendary/Divergent.yml @@ -30,7 +30,7 @@ description: item-whitelist: - "ARMOR" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: POTION: # The trigger that will fire this effect. diff --git a/src/main/resources/enchants/legendary/Drunk.yml b/src/main/resources/enchants/legendary/Drunk.yml index d29da3b..5fc84af 100644 --- a/src/main/resources/enchants/legendary/Drunk.yml +++ b/src/main/resources/enchants/legendary/Drunk.yml @@ -30,7 +30,7 @@ description: item-whitelist: - "ARMOR" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: POTION: # The trigger that will fire this effect. diff --git a/src/main/resources/enchants/legendary/Enlightened.yml b/src/main/resources/enchants/legendary/Enlightened.yml index bbdcc3a..0622810 100644 --- a/src/main/resources/enchants/legendary/Enlightened.yml +++ b/src/main/resources/enchants/legendary/Enlightened.yml @@ -1,4 +1,4 @@ -author: Songoda +author: Craftaro # The enchant identifier must be unique. identifier: Enlightened @@ -20,7 +20,7 @@ description: item-whitelist: - "ARMOR" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: MODIFY_HEALTH: # The trigger that will fire this effect diff --git a/src/main/resources/enchants/legendary/Gears.yml b/src/main/resources/enchants/legendary/Gears.yml index 34984c4..96f90f5 100644 --- a/src/main/resources/enchants/legendary/Gears.yml +++ b/src/main/resources/enchants/legendary/Gears.yml @@ -1,4 +1,4 @@ -author: Songoda +author: Craftaro # The enchant identifier must be unique. identifier: Gears @@ -20,7 +20,7 @@ description: item-whitelist: - "BOOTS" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: POTION: # The trigger that will fire this effect. diff --git a/src/main/resources/enchants/legendary/LifeSteal.yml b/src/main/resources/enchants/legendary/LifeSteal.yml index 8a227e7..513c59b 100644 --- a/src/main/resources/enchants/legendary/LifeSteal.yml +++ b/src/main/resources/enchants/legendary/LifeSteal.yml @@ -1,4 +1,4 @@ -author: Songoda +author: Craftaro # The enchant identifier must be unique. identifier: LifeSteal @@ -20,7 +20,7 @@ description: item-whitelist: - "SWORDS" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: STEAL_HEALTH: # The trigger that will fire this effect diff --git a/src/main/resources/enchants/legendary/Overload.yml b/src/main/resources/enchants/legendary/Overload.yml index ad4e3b5..a80c1dc 100644 --- a/src/main/resources/enchants/legendary/Overload.yml +++ b/src/main/resources/enchants/legendary/Overload.yml @@ -1,4 +1,4 @@ -author: Songoda +author: Craftaro # The enchant identifier must be unique. identifier: Overload @@ -20,7 +20,7 @@ description: item-whitelist: - "ARMOR" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: POTION: # The trigger that will fire this effect. diff --git a/src/main/resources/enchants/legendary/Resist.yml b/src/main/resources/enchants/legendary/Resist.yml index b0d5da9..3a1c388 100644 --- a/src/main/resources/enchants/legendary/Resist.yml +++ b/src/main/resources/enchants/legendary/Resist.yml @@ -20,7 +20,7 @@ description: item-whitelist: - "ARMOR" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: POTION: # The trigger that will fire this effect. diff --git a/src/main/resources/enchants/legendary/SkillSwipe.yml b/src/main/resources/enchants/legendary/SkillSwipe.yml index d410b74..05dc0fe 100644 --- a/src/main/resources/enchants/legendary/SkillSwipe.yml +++ b/src/main/resources/enchants/legendary/SkillSwipe.yml @@ -1,4 +1,4 @@ -author: Songoda +author: Craftaro # The enchant identifier must be unique. identifier: SkillSwipe @@ -20,7 +20,7 @@ description: item-whitelist: - "SWORDS" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: STEAL_EXP: # The trigger that will fire this effect diff --git a/src/main/resources/enchants/simple/Aquatic.yml b/src/main/resources/enchants/simple/Aquatic.yml index 4794270..dc861ae 100644 --- a/src/main/resources/enchants/simple/Aquatic.yml +++ b/src/main/resources/enchants/simple/Aquatic.yml @@ -1,4 +1,4 @@ -author: Songoda +author: Craftaro # The enchant identifier must be unique. identifier: Aquatic @@ -20,7 +20,7 @@ description: item-whitelist: - "HELMETS" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: POTION: # The trigger that will fire this effect diff --git a/src/main/resources/enchants/simple/Confusion.yml b/src/main/resources/enchants/simple/Confusion.yml index 0dc7f7e..4fd4280 100644 --- a/src/main/resources/enchants/simple/Confusion.yml +++ b/src/main/resources/enchants/simple/Confusion.yml @@ -1,4 +1,4 @@ -author: Songoda +author: Craftaro # The enchant identifier must be unique. identifier: Confusion @@ -21,7 +21,7 @@ description: item-whitelist: - "HELMETS" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: POTION: # The trigger that will fire this effect diff --git a/src/main/resources/enchants/simple/Experience.yml b/src/main/resources/enchants/simple/Experience.yml index 494c84a..59303ae 100644 --- a/src/main/resources/enchants/simple/Experience.yml +++ b/src/main/resources/enchants/simple/Experience.yml @@ -1,4 +1,4 @@ -author: Songoda +author: Craftaro # The enchant identifier must be unique. identifier: Experience @@ -21,7 +21,7 @@ description: item-whitelist: - "TOOLS" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: MODIFY_EXP: # Chance that this will happen diff --git a/src/main/resources/enchants/simple/Glowing.yml b/src/main/resources/enchants/simple/Glowing.yml index 041a14b..c2a703f 100644 --- a/src/main/resources/enchants/simple/Glowing.yml +++ b/src/main/resources/enchants/simple/Glowing.yml @@ -1,4 +1,4 @@ -author: Songoda +author: Craftaro # The enchant identifier must be unique. identifier: Glowing @@ -20,7 +20,7 @@ description: item-whitelist: - "HELMETS" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: POTION-1: # The trigger that will fire this effect diff --git a/src/main/resources/enchants/simple/Haste.yml b/src/main/resources/enchants/simple/Haste.yml index 9016b52..75d228c 100644 --- a/src/main/resources/enchants/simple/Haste.yml +++ b/src/main/resources/enchants/simple/Haste.yml @@ -1,4 +1,4 @@ -author: Songoda +author: Craftaro # The enchant identifier must be unique. identifier: Haste @@ -21,7 +21,7 @@ description: item-whitelist: - "TOOLS" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: POTION: # The trigger that will fire this effect diff --git a/src/main/resources/enchants/simple/Insomnia.yml b/src/main/resources/enchants/simple/Insomnia.yml index f57e5ca..025e960 100644 --- a/src/main/resources/enchants/simple/Insomnia.yml +++ b/src/main/resources/enchants/simple/Insomnia.yml @@ -1,4 +1,4 @@ -author: Songoda +author: Craftaro # The enchant identifier must be unique. identifier: Insomnia @@ -21,7 +21,7 @@ description: item-whitelist: - "SWORDS" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: POTION-1: # Chance that this will happen diff --git a/src/main/resources/enchants/simple/Lightning.yml b/src/main/resources/enchants/simple/Lightning.yml index 680c818..4aadde1 100644 --- a/src/main/resources/enchants/simple/Lightning.yml +++ b/src/main/resources/enchants/simple/Lightning.yml @@ -1,4 +1,4 @@ -author: Songoda +author: Craftaro # The enchant identifier must be unique. identifier: Lightning @@ -21,7 +21,7 @@ description: item-whitelist: - "BOWS" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: LIGHTNING: # Chance that this will happen diff --git a/src/main/resources/enchants/simple/Obliterate.yml b/src/main/resources/enchants/simple/Obliterate.yml index 1e082f8..1b7622b 100644 --- a/src/main/resources/enchants/simple/Obliterate.yml +++ b/src/main/resources/enchants/simple/Obliterate.yml @@ -1,4 +1,4 @@ -author: Songoda +author: Craftaro # The enchant identifier must be unique. identifier: Obliterate @@ -20,7 +20,7 @@ description: item-whitelist: - "WEAPONS" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: THROW: # Chance that this will happen diff --git a/src/main/resources/enchants/simple/Oxygenate.yml b/src/main/resources/enchants/simple/Oxygenate.yml index 4ed66c1..a0d2d31 100644 --- a/src/main/resources/enchants/simple/Oxygenate.yml +++ b/src/main/resources/enchants/simple/Oxygenate.yml @@ -1,4 +1,4 @@ -author: Songoda +author: Craftaro # The enchant identifier must be unique. identifier: Oxygenate @@ -21,7 +21,7 @@ description: item-whitelist: - "TOOLS" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: POTION: # The trigger that will fire this effect diff --git a/src/main/resources/enchants/ultimate/Blind.yml b/src/main/resources/enchants/ultimate/Blind.yml index 879574f..6896450 100644 --- a/src/main/resources/enchants/ultimate/Blind.yml +++ b/src/main/resources/enchants/ultimate/Blind.yml @@ -1,4 +1,4 @@ -author: "Songoda" +author: "Craftaro" # The enchant identifier must be unique. identifier: Blind @@ -21,7 +21,7 @@ description: item-whitelist: - "WEAPONS" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: POTION: # The trigger that will fire this effect. diff --git a/src/main/resources/enchants/ultimate/Dodge.yml b/src/main/resources/enchants/ultimate/Dodge.yml index b7bea93..8ab4034 100644 --- a/src/main/resources/enchants/ultimate/Dodge.yml +++ b/src/main/resources/enchants/ultimate/Dodge.yml @@ -1,4 +1,4 @@ -author: "Songoda" +author: "Craftaro" # The enchant identifier must be unique. identifier: Dodge @@ -21,7 +21,7 @@ description: item-whitelist: - "ARMOR" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: CANCEL_EVENT: # The trigger that will fire this effect diff --git a/src/main/resources/enchants/ultimate/Fly.yml b/src/main/resources/enchants/ultimate/Fly.yml index 17670c3..2655b94 100644 --- a/src/main/resources/enchants/ultimate/Fly.yml +++ b/src/main/resources/enchants/ultimate/Fly.yml @@ -22,7 +22,7 @@ item-whitelist: - "ARMOR" - "TOOLS" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: FLY: # The trigger that will fire this effect diff --git a/src/main/resources/enchants/ultimate/FoodSteal.yml b/src/main/resources/enchants/ultimate/FoodSteal.yml index 01470ba..1400d20 100644 --- a/src/main/resources/enchants/ultimate/FoodSteal.yml +++ b/src/main/resources/enchants/ultimate/FoodSteal.yml @@ -20,7 +20,7 @@ description: item-whitelist: - "SWORDS" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: STEAL_FOOD: # The trigger that will fire this effect diff --git a/src/main/resources/enchants/ultimate/IceAspect.yml b/src/main/resources/enchants/ultimate/IceAspect.yml index d569780..81f0696 100644 --- a/src/main/resources/enchants/ultimate/IceAspect.yml +++ b/src/main/resources/enchants/ultimate/IceAspect.yml @@ -1,4 +1,4 @@ -author: "Songoda" +author: "Craftaro" # The enchant identifier must be unique. identifier: IceAspect @@ -21,7 +21,7 @@ item-whitelist: - "SWORDS" - "AXES" -# For a full list of effects, please visit: https://wiki.songoda.com/display/SON/EpicEnchants +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: POTION: trigger: 'ATTACK_PLAYER_MELEE,ATTACK_PLAYER_RANGE,ATTACK_MOB_MELEE,ATTACK_MOB_RANGE' @@ -29,4 +29,4 @@ effects: duration: '10*{level}' amplifier: '{level}' who: OPPONENT - chance: '15*{level}' \ No newline at end of file + chance: '15*{level}' diff --git a/src/main/resources/enchants/ultimate/StormFall.yml b/src/main/resources/enchants/ultimate/StormFall.yml index 853e626..76000bb 100644 --- a/src/main/resources/enchants/ultimate/StormFall.yml +++ b/src/main/resources/enchants/ultimate/StormFall.yml @@ -1,4 +1,4 @@ -author: "Songoda" +author: "Craftaro" # The enchant identifier must be unique. identifier: StormFall @@ -20,7 +20,7 @@ description: item-whitelist: - "BOWS" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: effects: LIGHTNING-1: diff --git a/src/main/resources/enchants/unique/Berserk.yml b/src/main/resources/enchants/unique/Berserk.yml index 941580c..3d8de07 100644 --- a/src/main/resources/enchants/unique/Berserk.yml +++ b/src/main/resources/enchants/unique/Berserk.yml @@ -1,4 +1,4 @@ -author: "Songoda" +author: "Craftaro" # The enchant identifier must be unique. identifier: Berserk @@ -21,7 +21,7 @@ description: item-whitelist: - "AXES" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: POTION: # Chance that this will happen diff --git a/src/main/resources/enchants/unique/Decapitation.yml b/src/main/resources/enchants/unique/Decapitation.yml index ba41904..27ce259 100644 --- a/src/main/resources/enchants/unique/Decapitation.yml +++ b/src/main/resources/enchants/unique/Decapitation.yml @@ -21,7 +21,7 @@ description: item-whitelist: - "AXES" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: DROP_HEAD: # Chance that this will happen diff --git a/src/main/resources/enchants/unique/Explosive.yml b/src/main/resources/enchants/unique/Explosive.yml index 82eb2be..ea6f8cb 100644 --- a/src/main/resources/enchants/unique/Explosive.yml +++ b/src/main/resources/enchants/unique/Explosive.yml @@ -1,4 +1,4 @@ -author: "Songoda" +author: "Craftaro" # The enchant identifier must be unique. identifier: Explosive @@ -21,7 +21,7 @@ description: item-whitelist: - "BOWS" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: EXPLODE: # Chance that this will happen diff --git a/src/main/resources/enchants/unique/FeatherWeight.yml b/src/main/resources/enchants/unique/FeatherWeight.yml index fc3b5ec..7ca5330 100644 --- a/src/main/resources/enchants/unique/FeatherWeight.yml +++ b/src/main/resources/enchants/unique/FeatherWeight.yml @@ -1,4 +1,4 @@ -author: "Songoda" +author: "Craftaro" # The enchant identifier must be unique. identifier: FeatherWeight @@ -21,7 +21,7 @@ description: item-whitelist: - "TOOLS" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: POTION: # The trigger that will fire this effect diff --git a/src/main/resources/enchants/unique/Inquisitive.yml b/src/main/resources/enchants/unique/Inquisitive.yml index 9117cb0..b9bcdc4 100644 --- a/src/main/resources/enchants/unique/Inquisitive.yml +++ b/src/main/resources/enchants/unique/Inquisitive.yml @@ -21,7 +21,7 @@ applied-format: "&cInquisitive {level}" item-whitelist: - "SWORDS" -# For a full list of effects, please visit: https://wiki.songoda.com/display/SON/EpicEnchants +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: MODIFY_EXP: # The trigger that will fire this effect diff --git a/src/main/resources/enchants/unique/ObsidianDestroyer.yml b/src/main/resources/enchants/unique/ObsidianDestroyer.yml index 3d61c9f..d0350a2 100644 --- a/src/main/resources/enchants/unique/ObsidianDestroyer.yml +++ b/src/main/resources/enchants/unique/ObsidianDestroyer.yml @@ -1,4 +1,4 @@ -author: "Songoda" +author: "Craftaro" # The enchant identifier must be unique. identifier: ObsidianDestroyer @@ -20,7 +20,7 @@ description: item-whitelist: - "PICKAXES" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: MODIFY_BLOCK: # The trigger that will fire this effect diff --git a/src/main/resources/enchants/unique/PlagueCarrier.yml b/src/main/resources/enchants/unique/PlagueCarrier.yml index 6833792..24859ad 100644 --- a/src/main/resources/enchants/unique/PlagueCarrier.yml +++ b/src/main/resources/enchants/unique/PlagueCarrier.yml @@ -1,4 +1,4 @@ -author: "Songoda" +author: "Craftaro" # The enchant identifier must be unique. identifier: "PlagueCarrier" @@ -21,7 +21,7 @@ description: item-whitelist: - "LEGGINGS" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: SPAWN_MOB: # The mob type. diff --git a/src/main/resources/enchants/unique/Ragdoll.yml b/src/main/resources/enchants/unique/Ragdoll.yml index a3cdb0f..3085cd0 100644 --- a/src/main/resources/enchants/unique/Ragdoll.yml +++ b/src/main/resources/enchants/unique/Ragdoll.yml @@ -1,4 +1,4 @@ -author: "Songoda" +author: "Craftaro" # The enchant identifier must be unique. identifier: Ragdoll @@ -21,7 +21,7 @@ description: item-whitelist: - "ARMOR" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: THROW: # Chance that this will happen diff --git a/src/main/resources/enchants/unique/SelfDestruct.yml b/src/main/resources/enchants/unique/SelfDestruct.yml index f8d072c..8c1cffe 100644 --- a/src/main/resources/enchants/unique/SelfDestruct.yml +++ b/src/main/resources/enchants/unique/SelfDestruct.yml @@ -1,4 +1,4 @@ -author: "Songoda" +author: "Craftaro" # The enchant identifier must be unique. identifier: "SelfDestruct" @@ -20,7 +20,7 @@ description: item-whitelist: - "ARMOR" -# For a full list of effects, please visit: https://wiki.songoda.com/Epic_Enchants#Tutorials +# For a full list of effects, please visit: https://wiki.craftaro.com/index.php/Epic_Enchants#Tutorials effects: SPAWN_TNT: # Trigger event that spawns the mob. diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 23d6453..e5aa9c5 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.epicenchants.EpicEnchants +main: com.craftaro.epicenchants.EpicEnchants softdepend: - PlaceholderAPI - PlayerPoints @@ -15,6 +15,5 @@ website: ${project.url} # TODO: Fix the stuff below (ussage?, why ee and not epicenchants?, etc.) commands: ee: - aliases: - - epicenchants - ussage: reload + aliases: [epicenchants] + usage: reload