diff --git a/pom.xml b/pom.xml index 8ff117e9..c3db8e19 100644 --- a/pom.xml +++ b/pom.xml @@ -83,6 +83,10 @@ jitpack.io https://jitpack.io + + lumine-repo + https://mvn.lumine.io/repository/maven-public/ + spigot-repo https://hub.spigotmc.org/nexus/content/repositories/snapshots/ @@ -107,13 +111,19 @@ - + + + io.lumine + MythicLib + 0.0.1-20210203.081118-2 + diff --git a/src/main/java/net/Indyuce/mmocore/MMOCore.java b/src/main/java/net/Indyuce/mmocore/MMOCore.java index 0515f39a..a609e226 100644 --- a/src/main/java/net/Indyuce/mmocore/MMOCore.java +++ b/src/main/java/net/Indyuce/mmocore/MMOCore.java @@ -1,5 +1,7 @@ package net.Indyuce.mmocore; +import io.lumine.mythic.lib.comp.Metrics; +import io.lumine.mythic.lib.version.SpigotPlugin; import net.Indyuce.mmocore.api.ConfigFile; import net.Indyuce.mmocore.api.PlayerActionBar; import net.Indyuce.mmocore.api.loot.LootChest; @@ -8,18 +10,7 @@ import net.Indyuce.mmocore.api.player.profess.resource.PlayerResource; import net.Indyuce.mmocore.api.player.social.guilds.Guild; import net.Indyuce.mmocore.api.player.stats.StatType; import net.Indyuce.mmocore.api.util.debug.DebugMode; -import net.Indyuce.mmocore.command.AttributesCommand; -import net.Indyuce.mmocore.command.ClassCommand; -import net.Indyuce.mmocore.command.DepositCommand; -import net.Indyuce.mmocore.command.FriendsCommand; -import net.Indyuce.mmocore.command.GuildCommand; -import net.Indyuce.mmocore.command.MMOCoreCommandTreeRoot; -import net.Indyuce.mmocore.command.PartyCommand; -import net.Indyuce.mmocore.command.PlayerStatsCommand; -import net.Indyuce.mmocore.command.QuestsCommand; -import net.Indyuce.mmocore.command.SkillsCommand; -import net.Indyuce.mmocore.command.WaypointsCommand; -import net.Indyuce.mmocore.command.WithdrawCommand; +import net.Indyuce.mmocore.command.*; import net.Indyuce.mmocore.comp.anticheat.AntiCheatSupport; import net.Indyuce.mmocore.comp.anticheat.SpartanPlugin; import net.Indyuce.mmocore.comp.citizens.CitizenInteractEventListener; @@ -43,48 +34,22 @@ import net.Indyuce.mmocore.comp.region.WorldGuardMMOLoader; import net.Indyuce.mmocore.comp.region.WorldGuardRegionHandler; import net.Indyuce.mmocore.comp.vault.VaultEconomy; import net.Indyuce.mmocore.comp.vault.VaultMMOLoader; -import net.Indyuce.mmocore.listener.BlockListener; -import net.Indyuce.mmocore.listener.GoldPouchesListener; -import net.Indyuce.mmocore.listener.GuildListener; -import net.Indyuce.mmocore.listener.LootableChestsListener; -import net.Indyuce.mmocore.listener.PartyListener; -import net.Indyuce.mmocore.listener.PlayerListener; -import net.Indyuce.mmocore.listener.SpellCast; -import net.Indyuce.mmocore.listener.WaypointsListener; +import net.Indyuce.mmocore.listener.*; import net.Indyuce.mmocore.listener.option.DeathExperienceLoss; import net.Indyuce.mmocore.listener.option.NoSpawnerEXP; import net.Indyuce.mmocore.listener.option.RedirectVanillaExp; import net.Indyuce.mmocore.listener.option.VanillaExperienceOverride; import net.Indyuce.mmocore.listener.profession.FishingListener; import net.Indyuce.mmocore.listener.profession.PlayerCollectStats; -import net.Indyuce.mmocore.manager.AttributeManager; -import net.Indyuce.mmocore.manager.ClassManager; -import net.Indyuce.mmocore.manager.ConfigItemManager; -import net.Indyuce.mmocore.manager.ConfigManager; -import net.Indyuce.mmocore.manager.CustomBlockManager; -import net.Indyuce.mmocore.manager.DropTableManager; import net.Indyuce.mmocore.manager.ExperienceManager; -import net.Indyuce.mmocore.manager.InventoryManager; -import net.Indyuce.mmocore.manager.LootChestManager; -import net.Indyuce.mmocore.manager.MMOLoadManager; -import net.Indyuce.mmocore.manager.QuestManager; -import net.Indyuce.mmocore.manager.RestrictionManager; -import net.Indyuce.mmocore.manager.SkillManager; -import net.Indyuce.mmocore.manager.SoundManager; -import net.Indyuce.mmocore.manager.WaypointManager; +import net.Indyuce.mmocore.manager.*; import net.Indyuce.mmocore.manager.data.DataProvider; import net.Indyuce.mmocore.manager.data.mysql.MySQLDataProvider; import net.Indyuce.mmocore.manager.data.yaml.YAMLDataProvider; -import net.Indyuce.mmocore.manager.profession.AlchemyManager; -import net.Indyuce.mmocore.manager.profession.EnchantManager; -import net.Indyuce.mmocore.manager.profession.FishingManager; -import net.Indyuce.mmocore.manager.profession.ProfessionManager; -import net.Indyuce.mmocore.manager.profession.SmithingManager; +import net.Indyuce.mmocore.manager.profession.*; import net.Indyuce.mmocore.manager.social.BoosterManager; import net.Indyuce.mmocore.manager.social.PartyManager; import net.Indyuce.mmocore.manager.social.RequestManager; -import net.mmogroup.mmolib.comp.Metrics; -import net.mmogroup.mmolib.version.SpigotPlugin; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandMap; diff --git a/src/main/java/net/Indyuce/mmocore/api/ConfigMessage.java b/src/main/java/net/Indyuce/mmocore/api/ConfigMessage.java index 38093007..9f3919c2 100644 --- a/src/main/java/net/Indyuce/mmocore/api/ConfigMessage.java +++ b/src/main/java/net/Indyuce/mmocore/api/ConfigMessage.java @@ -7,7 +7,7 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import net.Indyuce.mmocore.MMOCore; -import net.mmogroup.mmolib.MMOLib; +import io.lumine.mythic.lib.MythicLib; public class ConfigMessage { private final List messages; @@ -30,7 +30,7 @@ public class ConfigMessage { } public void send(CommandSender sender) { - messages.forEach(line -> sender.sendMessage(MMOLib.plugin.parseColors(line))); + messages.forEach(line -> sender.sendMessage(MythicLib.plugin.parseColors(line))); } public void send(Collection players) { @@ -38,6 +38,6 @@ public class ConfigMessage { } public void sendAsJSon(Player player) { - messages.forEach(line -> MMOLib.plugin.getVersion().getWrapper().sendJson(player, MMOLib.plugin.parseColors(line))); + messages.forEach(line -> MythicLib.plugin.getVersion().getWrapper().sendJson(player, MythicLib.plugin.parseColors(line))); } } diff --git a/src/main/java/net/Indyuce/mmocore/api/PlayerActionBar.java b/src/main/java/net/Indyuce/mmocore/api/PlayerActionBar.java index faaf5a74..eb04b3c4 100644 --- a/src/main/java/net/Indyuce/mmocore/api/PlayerActionBar.java +++ b/src/main/java/net/Indyuce/mmocore/api/PlayerActionBar.java @@ -11,7 +11,7 @@ import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.stats.StatType; import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.chat.TextComponent; -import net.mmogroup.mmolib.MMOLib; +import io.lumine.mythic.lib.MythicLib; public class PlayerActionBar extends BukkitRunnable { boolean initialized = false; @@ -21,7 +21,7 @@ public class PlayerActionBar extends BukkitRunnable { public void reload(ConfigurationSection cfg) { config = new ActionBarConfig(cfg); - digit = new DecimalFormat(config.digit, MMOLib.plugin.getMMOConfig().formatSymbols); + digit = new DecimalFormat(config.digit, MythicLib.plugin.getMMOConfig().formatSymbols); if(!initialized && config.enabled) { runTaskTimer(MMOCore.plugin, 0, config.ticks); @@ -38,7 +38,7 @@ public class PlayerActionBar extends BukkitRunnable { for (PlayerData data : PlayerData.getAll()) if (data.isOnline() && !data.getPlayer().isDead() && !data.isCasting() && data.canSeeActionBar()) { data.getPlayer().spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(MMOCore.plugin.placeholderParser.parse(data.getPlayer(), - MMOLib.plugin.parseColors((data.getProfess().hasActionBar() ? data.getProfess().getActionBar() : config.format) + MythicLib.plugin.parseColors((data.getProfess().hasActionBar() ? data.getProfess().getActionBar() : config.format) .replace("{health}", digit.format(data.getPlayer().getHealth())) .replace("{max_health}", "" + StatType.MAX_HEALTH.format(data.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue())) .replace("{mana_icon}", data.getProfess().getManaDisplay().getIcon()) diff --git a/src/main/java/net/Indyuce/mmocore/api/block/BlockInfo.java b/src/main/java/net/Indyuce/mmocore/api/block/BlockInfo.java index 91fd1302..60b8236a 100644 --- a/src/main/java/net/Indyuce/mmocore/api/block/BlockInfo.java +++ b/src/main/java/net/Indyuce/mmocore/api/block/BlockInfo.java @@ -1,11 +1,13 @@ package net.Indyuce.mmocore.api.block; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; - +import io.lumine.mythic.lib.UtilityMethods; +import io.lumine.mythic.lib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.condition.type.BlockCondition; +import io.lumine.mythic.lib.api.condition.type.MMOCondition; +import net.Indyuce.mmocore.MMOCore; +import net.Indyuce.mmocore.api.droptable.DropTable; +import net.Indyuce.mmocore.api.loot.LootBuilder; +import net.Indyuce.mmocore.api.quest.trigger.Trigger; import org.apache.commons.lang.Validate; import org.bukkit.Location; import org.bukkit.block.Block; @@ -13,14 +15,11 @@ import org.bukkit.block.data.BlockData; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.inventory.ItemStack; -import net.Indyuce.mmocore.MMOCore; -import net.Indyuce.mmocore.api.droptable.DropTable; -import net.Indyuce.mmocore.api.loot.LootBuilder; -import net.Indyuce.mmocore.api.quest.trigger.Trigger; -import net.mmogroup.mmolib.UtilityMethods; -import net.mmogroup.mmolib.api.MMOLineConfig; -import net.mmogroup.mmolib.api.condition.type.BlockCondition; -import net.mmogroup.mmolib.api.condition.type.MMOCondition; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.logging.Level; public class BlockInfo { private final BlockType block; diff --git a/src/main/java/net/Indyuce/mmocore/api/block/RegenInfo.java b/src/main/java/net/Indyuce/mmocore/api/block/RegenInfo.java index 68bca37d..c33183ab 100644 --- a/src/main/java/net/Indyuce/mmocore/api/block/RegenInfo.java +++ b/src/main/java/net/Indyuce/mmocore/api/block/RegenInfo.java @@ -4,7 +4,7 @@ import org.apache.commons.lang.Validate; import org.bukkit.configuration.ConfigurationSection; import net.Indyuce.mmocore.MMOCore; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class RegenInfo { private final BlockType temporary; diff --git a/src/main/java/net/Indyuce/mmocore/api/block/SkullBlockType.java b/src/main/java/net/Indyuce/mmocore/api/block/SkullBlockType.java index 43581090..b3d01e3b 100644 --- a/src/main/java/net/Indyuce/mmocore/api/block/SkullBlockType.java +++ b/src/main/java/net/Indyuce/mmocore/api/block/SkullBlockType.java @@ -5,9 +5,9 @@ import org.bukkit.block.Block; import net.Indyuce.mmocore.api.block.BlockInfo.RegeneratingBlock; import net.Indyuce.mmocore.api.util.MMOCoreUtils; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.MMOLineConfig; -import net.mmogroup.mmolib.version.VersionMaterial; +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.MMOLineConfig; +import io.lumine.mythic.lib.version.VersionMaterial; public class SkullBlockType implements BlockType { private final String value; @@ -19,7 +19,7 @@ public class SkullBlockType implements BlockType { } public SkullBlockType(Block block) { - value = MMOLib.plugin.getVersion().getWrapper().getSkullValue(block); + value = MythicLib.plugin.getVersion().getWrapper().getSkullValue(block); } public String getValue() { @@ -35,7 +35,7 @@ public class SkullBlockType implements BlockType { if (MMOCoreUtils.isPlayerHead(block.getBlockData().getMaterial())) loc.getBlock().setBlockData(block.getBlockData()); - MMOLib.plugin.getVersion().getWrapper().setSkullValue(loc.getBlock(), value); + MythicLib.plugin.getVersion().getWrapper().setSkullValue(loc.getBlock(), value); } @Override @@ -44,7 +44,7 @@ public class SkullBlockType implements BlockType { // This makes sure that if a skull loses its original rotation // it can revert back to it when the base block is regenerated loc.getBlock().setBlockData(block.getBlockData()); - MMOLib.plugin.getVersion().getWrapper().setSkullValue(loc.getBlock(), value); + MythicLib.plugin.getVersion().getWrapper().setSkullValue(loc.getBlock(), value); } @Override diff --git a/src/main/java/net/Indyuce/mmocore/api/block/VanillaBlockType.java b/src/main/java/net/Indyuce/mmocore/api/block/VanillaBlockType.java index 60066aa2..d91add8f 100644 --- a/src/main/java/net/Indyuce/mmocore/api/block/VanillaBlockType.java +++ b/src/main/java/net/Indyuce/mmocore/api/block/VanillaBlockType.java @@ -8,7 +8,7 @@ import org.bukkit.block.data.Ageable; import org.bukkit.block.data.BlockData; import net.Indyuce.mmocore.api.block.BlockInfo.RegeneratingBlock; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class VanillaBlockType implements BlockType { private final Material type; diff --git a/src/main/java/net/Indyuce/mmocore/api/droptable/DropTable.java b/src/main/java/net/Indyuce/mmocore/api/droptable/DropTable.java index 2cf15ae9..3d69053f 100644 --- a/src/main/java/net/Indyuce/mmocore/api/droptable/DropTable.java +++ b/src/main/java/net/Indyuce/mmocore/api/droptable/DropTable.java @@ -14,8 +14,8 @@ import net.Indyuce.mmocore.api.droptable.condition.Condition; import net.Indyuce.mmocore.api.droptable.condition.ConditionInstance; import net.Indyuce.mmocore.api.droptable.dropitem.DropItem; import net.Indyuce.mmocore.api.loot.LootBuilder; -import net.mmogroup.mmolib.api.MMOLineConfig; -import net.mmogroup.mmolib.api.util.PostLoadObject; +import io.lumine.mythic.lib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.util.PostLoadObject; public class DropTable extends PostLoadObject { private final String id; diff --git a/src/main/java/net/Indyuce/mmocore/api/droptable/condition/BiomeCondition.java b/src/main/java/net/Indyuce/mmocore/api/droptable/condition/BiomeCondition.java index 90cc7a05..aaa47376 100644 --- a/src/main/java/net/Indyuce/mmocore/api/droptable/condition/BiomeCondition.java +++ b/src/main/java/net/Indyuce/mmocore/api/droptable/condition/BiomeCondition.java @@ -5,7 +5,7 @@ import java.util.List; import org.bukkit.block.Biome; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class BiomeCondition extends Condition { private final List names; diff --git a/src/main/java/net/Indyuce/mmocore/api/droptable/condition/Condition.java b/src/main/java/net/Indyuce/mmocore/api/droptable/condition/Condition.java index 2ff59ff7..1650113a 100644 --- a/src/main/java/net/Indyuce/mmocore/api/droptable/condition/Condition.java +++ b/src/main/java/net/Indyuce/mmocore/api/droptable/condition/Condition.java @@ -1,6 +1,6 @@ package net.Indyuce.mmocore.api.droptable.condition; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public abstract class Condition { private final String id; diff --git a/src/main/java/net/Indyuce/mmocore/api/droptable/condition/LevelCondition.java b/src/main/java/net/Indyuce/mmocore/api/droptable/condition/LevelCondition.java index 8a5007f2..ed694ddd 100644 --- a/src/main/java/net/Indyuce/mmocore/api/droptable/condition/LevelCondition.java +++ b/src/main/java/net/Indyuce/mmocore/api/droptable/condition/LevelCondition.java @@ -1,7 +1,7 @@ package net.Indyuce.mmocore.api.droptable.condition; import net.Indyuce.mmocore.api.player.PlayerData; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; import org.bukkit.entity.Player; public class LevelCondition extends Condition { diff --git a/src/main/java/net/Indyuce/mmocore/api/droptable/condition/PermissionCondition.java b/src/main/java/net/Indyuce/mmocore/api/droptable/condition/PermissionCondition.java index 266f1735..c43ac77f 100644 --- a/src/main/java/net/Indyuce/mmocore/api/droptable/condition/PermissionCondition.java +++ b/src/main/java/net/Indyuce/mmocore/api/droptable/condition/PermissionCondition.java @@ -2,7 +2,7 @@ package net.Indyuce.mmocore.api.droptable.condition; import org.bukkit.entity.Player; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class PermissionCondition extends Condition { private final String perm; diff --git a/src/main/java/net/Indyuce/mmocore/api/droptable/condition/WorldCondition.java b/src/main/java/net/Indyuce/mmocore/api/droptable/condition/WorldCondition.java index c2c1e30e..4ff87b19 100644 --- a/src/main/java/net/Indyuce/mmocore/api/droptable/condition/WorldCondition.java +++ b/src/main/java/net/Indyuce/mmocore/api/droptable/condition/WorldCondition.java @@ -3,7 +3,7 @@ package net.Indyuce.mmocore.api.droptable.condition; import java.util.Arrays; import java.util.List; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class WorldCondition extends Condition { private final List names; diff --git a/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/DropItem.java b/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/DropItem.java index 2edda920..23806894 100644 --- a/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/DropItem.java +++ b/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/DropItem.java @@ -4,7 +4,7 @@ import java.util.Random; import net.Indyuce.mmocore.api.loot.LootBuilder; import net.Indyuce.mmocore.api.util.math.formula.RandomAmount; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public abstract class DropItem { protected static final Random random = new Random(); diff --git a/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/DropTableDropItem.java b/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/DropTableDropItem.java index aa0c7f67..f7b224b7 100644 --- a/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/DropTableDropItem.java +++ b/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/DropTableDropItem.java @@ -7,7 +7,7 @@ import net.Indyuce.mmocore.api.droptable.DropTable; import net.Indyuce.mmocore.api.droptable.condition.ConditionInstance; import net.Indyuce.mmocore.api.loot.LootBuilder; import net.Indyuce.mmocore.api.player.PlayerData; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class DropTableDropItem extends DropItem { private final DropTable dropTable; diff --git a/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/GoldDropItem.java b/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/GoldDropItem.java index db70e947..975435bf 100644 --- a/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/GoldDropItem.java +++ b/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/GoldDropItem.java @@ -2,7 +2,7 @@ package net.Indyuce.mmocore.api.droptable.dropitem; import net.Indyuce.mmocore.api.loot.LootBuilder; import net.Indyuce.mmocore.api.util.item.CurrencyItem; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class GoldDropItem extends DropItem { public GoldDropItem(MMOLineConfig config) { diff --git a/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/MMDropTableDropItem.java b/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/MMDropTableDropItem.java index fa9e7000..ed5d0f82 100644 --- a/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/MMDropTableDropItem.java +++ b/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/MMDropTableDropItem.java @@ -10,7 +10,7 @@ import io.lumine.xikage.mythicmobs.drops.DropTable; import io.lumine.xikage.mythicmobs.drops.IItemDrop; import io.lumine.xikage.mythicmobs.drops.LootBag; import net.Indyuce.mmocore.api.loot.LootBuilder; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class MMDropTableDropItem extends DropItem { private final DropTable dropTable; diff --git a/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/NoteDropItem.java b/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/NoteDropItem.java index c37f5025..93107b63 100644 --- a/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/NoteDropItem.java +++ b/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/NoteDropItem.java @@ -2,7 +2,7 @@ package net.Indyuce.mmocore.api.droptable.dropitem; import net.Indyuce.mmocore.api.loot.LootBuilder; import net.Indyuce.mmocore.api.util.item.CurrencyItem; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class NoteDropItem extends DropItem { private final int min, max; diff --git a/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/VanillaDropItem.java b/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/VanillaDropItem.java index cecf92d1..3cca4e05 100644 --- a/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/VanillaDropItem.java +++ b/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/VanillaDropItem.java @@ -4,7 +4,7 @@ import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import net.Indyuce.mmocore.api.loot.LootBuilder; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class VanillaDropItem extends DropItem { private final Material material; diff --git a/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/fishing/FishingDropItem.java b/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/fishing/FishingDropItem.java index f952c73e..3722f00a 100644 --- a/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/fishing/FishingDropItem.java +++ b/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/fishing/FishingDropItem.java @@ -7,7 +7,7 @@ import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.droptable.dropitem.DropItem; import net.Indyuce.mmocore.api.loot.LootBuilder; import net.Indyuce.mmocore.api.util.math.formula.RandomAmount; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class FishingDropItem { private final RandomAmount experience, tugs; diff --git a/src/main/java/net/Indyuce/mmocore/api/eco/Withdraw.java b/src/main/java/net/Indyuce/mmocore/api/eco/Withdraw.java index 31e491eb..f1669ba0 100644 --- a/src/main/java/net/Indyuce/mmocore/api/eco/Withdraw.java +++ b/src/main/java/net/Indyuce/mmocore/api/eco/Withdraw.java @@ -18,7 +18,7 @@ import org.bukkit.inventory.ItemStack; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.util.item.CurrencyItem; -import net.mmogroup.mmolib.api.util.SmartGive; +import io.lumine.mythic.lib.api.util.SmartGive; public class Withdraw implements Listener { private static final Set withdrawing = new HashSet<>(); diff --git a/src/main/java/net/Indyuce/mmocore/api/experience/PlayerProfessions.java b/src/main/java/net/Indyuce/mmocore/api/experience/PlayerProfessions.java index 59a2830b..cc52806e 100644 --- a/src/main/java/net/Indyuce/mmocore/api/experience/PlayerProfessions.java +++ b/src/main/java/net/Indyuce/mmocore/api/experience/PlayerProfessions.java @@ -23,7 +23,7 @@ import net.Indyuce.mmocore.api.event.PlayerLevelUpEvent; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.util.math.particle.SmallParticleEffect; import net.Indyuce.mmocore.manager.SoundManager; -import net.mmogroup.mmolib.MMOLib; +import io.lumine.mythic.lib.MythicLib; public class PlayerProfessions { private final Map exp = new HashMap<>(); @@ -184,6 +184,6 @@ public class PlayerProfessions { bar.append(j == chars ? "" + ChatColor.WHITE + ChatColor.BOLD : "").append("|"); if (playerData.isOnline()) MMOCore.plugin.configManager.getSimpleMessage("exp-notification", "profession", profession.getName(), "progress", bar.toString(), "ratio", - MMOLib.plugin.getMMOConfig().decimal.format((double) exp / needed * 100)).send(playerData.getPlayer()); + MythicLib.plugin.getMMOConfig().decimal.format((double) exp / needed * 100)).send(playerData.getPlayer()); } } diff --git a/src/main/java/net/Indyuce/mmocore/api/experience/Profession.java b/src/main/java/net/Indyuce/mmocore/api/experience/Profession.java index 3e4819ea..950d406b 100644 --- a/src/main/java/net/Indyuce/mmocore/api/experience/Profession.java +++ b/src/main/java/net/Indyuce/mmocore/api/experience/Profession.java @@ -13,9 +13,9 @@ import org.bukkit.potion.PotionType; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.util.math.formula.LinearValue; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.MMOLineConfig; -import net.mmogroup.mmolib.api.util.PostLoadObject; +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.util.PostLoadObject; public class Profession extends PostLoadObject { private final String id, name; @@ -94,7 +94,7 @@ public class Profession extends PostLoadObject { if (config.contains("base-enchant-exp")) for (String key : config.getConfigurationSection("base-enchant-exp").getKeys(false)) try { - Enchantment enchant = MMOLib.plugin.getVersion().getWrapper().getEnchantmentFromString(key.toLowerCase().replace("-", "_")); + Enchantment enchant = MythicLib.plugin.getVersion().getWrapper().getEnchantmentFromString(key.toLowerCase().replace("-", "_")); MMOCore.plugin.enchantManager.registerBaseExperience(enchant, config.getDouble("base-enchant-exp." + key)); } catch (IllegalArgumentException exception) { MMOCore.log(Level.WARNING, "[PlayerProfessions:" + id + "] Could not read enchant from " + key); diff --git a/src/main/java/net/Indyuce/mmocore/api/experience/source/BrewPotionExperienceSource.java b/src/main/java/net/Indyuce/mmocore/api/experience/source/BrewPotionExperienceSource.java index b5ae1ca1..1e7cbf42 100644 --- a/src/main/java/net/Indyuce/mmocore/api/experience/source/BrewPotionExperienceSource.java +++ b/src/main/java/net/Indyuce/mmocore/api/experience/source/BrewPotionExperienceSource.java @@ -21,7 +21,7 @@ import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.experience.source.type.ExperienceSource; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.manager.profession.ExperienceManager; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class BrewPotionExperienceSource extends ExperienceSource { private final List types = new ArrayList<>(); diff --git a/src/main/java/net/Indyuce/mmocore/api/experience/source/CraftItemExperienceSource.java b/src/main/java/net/Indyuce/mmocore/api/experience/source/CraftItemExperienceSource.java index d04191a0..1d8f6bca 100644 --- a/src/main/java/net/Indyuce/mmocore/api/experience/source/CraftItemExperienceSource.java +++ b/src/main/java/net/Indyuce/mmocore/api/experience/source/CraftItemExperienceSource.java @@ -10,7 +10,7 @@ import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.experience.source.type.SpecificExperienceSource; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.manager.profession.ExperienceManager; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; import org.bukkit.event.inventory.InventoryAction; public class CraftItemExperienceSource extends SpecificExperienceSource { diff --git a/src/main/java/net/Indyuce/mmocore/api/experience/source/EnchantItemExperienceSource.java b/src/main/java/net/Indyuce/mmocore/api/experience/source/EnchantItemExperienceSource.java index beabc9a8..f6ad18ed 100644 --- a/src/main/java/net/Indyuce/mmocore/api/experience/source/EnchantItemExperienceSource.java +++ b/src/main/java/net/Indyuce/mmocore/api/experience/source/EnchantItemExperienceSource.java @@ -16,8 +16,8 @@ import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.experience.source.type.ExperienceSource; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.manager.profession.ExperienceManager; -import net.mmogroup.mmolib.api.MMOLineConfig; -import net.mmogroup.mmolib.MMOLib; +import io.lumine.mythic.lib.api.MMOLineConfig; +import io.lumine.mythic.lib.MythicLib; public class EnchantItemExperienceSource extends ExperienceSource { private final List enchants = new ArrayList<>(); @@ -27,7 +27,7 @@ public class EnchantItemExperienceSource extends ExperienceSource { if (config.contains("enchant")) for (String key : config.getString("enchant").split(",")) - enchants.add(MMOLib.plugin.getVersion().getWrapper().getEnchantmentFromString(key.toLowerCase().replace("-", "_"))); + enchants.add(MythicLib.plugin.getVersion().getWrapper().getEnchantmentFromString(key.toLowerCase().replace("-", "_"))); } @Override diff --git a/src/main/java/net/Indyuce/mmocore/api/experience/source/FishItemExperienceSource.java b/src/main/java/net/Indyuce/mmocore/api/experience/source/FishItemExperienceSource.java index 2b328d24..f5f34962 100644 --- a/src/main/java/net/Indyuce/mmocore/api/experience/source/FishItemExperienceSource.java +++ b/src/main/java/net/Indyuce/mmocore/api/experience/source/FishItemExperienceSource.java @@ -12,7 +12,7 @@ import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.experience.source.type.SpecificExperienceSource; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.manager.profession.ExperienceManager; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class FishItemExperienceSource extends SpecificExperienceSource { private final Material material; diff --git a/src/main/java/net/Indyuce/mmocore/api/experience/source/KillMobExperienceSource.java b/src/main/java/net/Indyuce/mmocore/api/experience/source/KillMobExperienceSource.java index b37bdec6..0635a2f0 100644 --- a/src/main/java/net/Indyuce/mmocore/api/experience/source/KillMobExperienceSource.java +++ b/src/main/java/net/Indyuce/mmocore/api/experience/source/KillMobExperienceSource.java @@ -12,8 +12,8 @@ import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.experience.source.type.SpecificExperienceSource; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.manager.profession.ExperienceManager; -import net.mmogroup.mmolib.api.MMOLineConfig; -import net.mmogroup.mmolib.api.event.EntityKillEntityEvent; +import io.lumine.mythic.lib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.event.EntityKillEntityEvent; public class KillMobExperienceSource extends SpecificExperienceSource { public final EntityType type; diff --git a/src/main/java/net/Indyuce/mmocore/api/experience/source/MineBlockExperienceSource.java b/src/main/java/net/Indyuce/mmocore/api/experience/source/MineBlockExperienceSource.java index 908cfe2d..b673af38 100644 --- a/src/main/java/net/Indyuce/mmocore/api/experience/source/MineBlockExperienceSource.java +++ b/src/main/java/net/Indyuce/mmocore/api/experience/source/MineBlockExperienceSource.java @@ -12,8 +12,8 @@ import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.experience.source.type.SpecificExperienceSource; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.manager.profession.ExperienceManager; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.MMOLineConfig; public class MineBlockExperienceSource extends SpecificExperienceSource { public final Material material; @@ -45,7 +45,7 @@ public class MineBlockExperienceSource extends SpecificExperienceSource { public final Material material; diff --git a/src/main/java/net/Indyuce/mmocore/api/experience/source/RepairItemExperienceSource.java b/src/main/java/net/Indyuce/mmocore/api/experience/source/RepairItemExperienceSource.java index d98d306a..810fff3c 100644 --- a/src/main/java/net/Indyuce/mmocore/api/experience/source/RepairItemExperienceSource.java +++ b/src/main/java/net/Indyuce/mmocore/api/experience/source/RepairItemExperienceSource.java @@ -15,7 +15,7 @@ import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.experience.source.type.ExperienceSource; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.manager.profession.ExperienceManager; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class RepairItemExperienceSource extends ExperienceSource { private final Material material; diff --git a/src/main/java/net/Indyuce/mmocore/api/experience/source/SmeltItemExperienceSource.java b/src/main/java/net/Indyuce/mmocore/api/experience/source/SmeltItemExperienceSource.java index 8bce6caf..5e8391df 100644 --- a/src/main/java/net/Indyuce/mmocore/api/experience/source/SmeltItemExperienceSource.java +++ b/src/main/java/net/Indyuce/mmocore/api/experience/source/SmeltItemExperienceSource.java @@ -14,7 +14,7 @@ import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.experience.source.type.SpecificExperienceSource; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.manager.profession.ExperienceManager; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class SmeltItemExperienceSource extends SpecificExperienceSource { private final Material material; diff --git a/src/main/java/net/Indyuce/mmocore/api/experience/source/type/SpecificExperienceSource.java b/src/main/java/net/Indyuce/mmocore/api/experience/source/type/SpecificExperienceSource.java index 101dd32d..3cde4b3b 100644 --- a/src/main/java/net/Indyuce/mmocore/api/experience/source/type/SpecificExperienceSource.java +++ b/src/main/java/net/Indyuce/mmocore/api/experience/source/type/SpecificExperienceSource.java @@ -5,7 +5,7 @@ import org.bukkit.Location; import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.util.math.formula.RandomAmount; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public abstract class SpecificExperienceSource extends ExperienceSource { private final RandomAmount amount; diff --git a/src/main/java/net/Indyuce/mmocore/api/load/DefaultMMOLoader.java b/src/main/java/net/Indyuce/mmocore/api/load/DefaultMMOLoader.java index 0b154bcd..493c09ad 100644 --- a/src/main/java/net/Indyuce/mmocore/api/load/DefaultMMOLoader.java +++ b/src/main/java/net/Indyuce/mmocore/api/load/DefaultMMOLoader.java @@ -41,7 +41,7 @@ import net.Indyuce.mmocore.api.quest.trigger.SoundTrigger; import net.Indyuce.mmocore.api.quest.trigger.StaminaTrigger; import net.Indyuce.mmocore.api.quest.trigger.StelliumTrigger; import net.Indyuce.mmocore.api.quest.trigger.Trigger; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class DefaultMMOLoader extends MMOLoader { diff --git a/src/main/java/net/Indyuce/mmocore/api/load/MMOLoader.java b/src/main/java/net/Indyuce/mmocore/api/load/MMOLoader.java index fd068150..5d2a9ec7 100644 --- a/src/main/java/net/Indyuce/mmocore/api/load/MMOLoader.java +++ b/src/main/java/net/Indyuce/mmocore/api/load/MMOLoader.java @@ -9,7 +9,7 @@ import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.experience.source.type.ExperienceSource; import net.Indyuce.mmocore.api.quest.objective.Objective; import net.Indyuce.mmocore.api.quest.trigger.Trigger; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class MMOLoader { diff --git a/src/main/java/net/Indyuce/mmocore/api/loot/ChestTier.java b/src/main/java/net/Indyuce/mmocore/api/loot/ChestTier.java index b547177a..2d5e2738 100644 --- a/src/main/java/net/Indyuce/mmocore/api/loot/ChestTier.java +++ b/src/main/java/net/Indyuce/mmocore/api/loot/ChestTier.java @@ -1,11 +1,10 @@ package net.Indyuce.mmocore.api.loot; -import org.bukkit.configuration.ConfigurationSection; - +import io.lumine.mythic.lib.api.math.ScalingFormula; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.droptable.DropTable; import net.Indyuce.mmocore.api.player.PlayerData; -import net.mmogroup.mmolib.api.math.ScalingFormula; +import org.bukkit.configuration.ConfigurationSection; public class ChestTier { private final TierEffect effect; diff --git a/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java b/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java index 9f2fe566..26eb1b86 100644 --- a/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java +++ b/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java @@ -1,36 +1,10 @@ package net.Indyuce.mmocore.api.player; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.logging.Level; - -import javax.annotation.Nullable; - -import org.bukkit.Bukkit; -import org.bukkit.Color; -import org.bukkit.Location; -import org.bukkit.OfflinePlayer; -import org.bukkit.Particle; -import org.bukkit.attribute.Attribute; -import org.bukkit.entity.Player; -import org.bukkit.potion.PotionEffect; -import org.bukkit.potion.PotionEffectType; -import org.bukkit.scheduler.BukkitRunnable; - +import io.lumine.mythic.lib.api.player.MMOPlayerData; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.ConfigMessage; import net.Indyuce.mmocore.api.Waypoint; -import net.Indyuce.mmocore.api.event.PlayerExperienceGainEvent; -import net.Indyuce.mmocore.api.event.PlayerLevelUpEvent; -import net.Indyuce.mmocore.api.event.PlayerPostCastSkillEvent; -import net.Indyuce.mmocore.api.event.PlayerPreCastSkillEvent; -import net.Indyuce.mmocore.api.event.PlayerRegenResourceEvent; +import net.Indyuce.mmocore.api.event.*; import net.Indyuce.mmocore.api.experience.EXPSource; import net.Indyuce.mmocore.api.experience.PlayerProfessions; import net.Indyuce.mmocore.api.player.attribute.PlayerAttribute; @@ -55,7 +29,17 @@ import net.Indyuce.mmocore.listener.SpellCast.SkillCasting; import net.Indyuce.mmocore.manager.SoundManager; import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.chat.TextComponent; -import net.mmogroup.mmolib.api.player.MMOPlayerData; +import org.bukkit.*; +import org.bukkit.attribute.Attribute; +import org.bukkit.entity.Player; +import org.bukkit.potion.PotionEffect; +import org.bukkit.potion.PotionEffectType; +import org.bukkit.scheduler.BukkitRunnable; + +import javax.annotation.Nullable; +import java.util.*; +import java.util.logging.Level; + public class PlayerData extends OfflinePlayerData { diff --git a/src/main/java/net/Indyuce/mmocore/api/player/attribute/PlayerAttribute.java b/src/main/java/net/Indyuce/mmocore/api/player/attribute/PlayerAttribute.java index 8465e394..5650fdad 100644 --- a/src/main/java/net/Indyuce/mmocore/api/player/attribute/PlayerAttribute.java +++ b/src/main/java/net/Indyuce/mmocore/api/player/attribute/PlayerAttribute.java @@ -1,16 +1,15 @@ package net.Indyuce.mmocore.api.player.attribute; +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.stat.modifier.StatModifier; +import net.Indyuce.mmocore.MMOCore; +import org.apache.commons.lang.Validate; +import org.bukkit.configuration.ConfigurationSection; + import java.util.HashMap; import java.util.Map; import java.util.logging.Level; -import org.apache.commons.lang.Validate; -import org.bukkit.configuration.ConfigurationSection; - -import net.Indyuce.mmocore.MMOCore; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.stat.modifier.StatModifier; - public class PlayerAttribute { private final String id, name; private final int max; @@ -25,7 +24,7 @@ public class PlayerAttribute { Validate.notNull(config, "Could not load config"); id = config.getName().toLowerCase().replace("_", "-").replace(" ", "-"); - name = MMOLib.plugin.parseColors(config.getString("name", "Attribute")); + name = MythicLib.plugin.parseColors(config.getString("name", "Attribute")); max = config.contains("max-points") ? Math.max(1, config.getInt("max-points")) : 0; if (config.contains("buff")) diff --git a/src/main/java/net/Indyuce/mmocore/api/player/attribute/PlayerAttributes.java b/src/main/java/net/Indyuce/mmocore/api/player/attribute/PlayerAttributes.java index aa1c92ef..eb1c73a4 100644 --- a/src/main/java/net/Indyuce/mmocore/api/player/attribute/PlayerAttributes.java +++ b/src/main/java/net/Indyuce/mmocore/api/player/attribute/PlayerAttributes.java @@ -1,5 +1,16 @@ package net.Indyuce.mmocore.api.player.attribute; +import com.google.gson.Gson; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import io.lumine.mythic.lib.api.stat.modifier.Closable; +import io.lumine.mythic.lib.api.stat.modifier.ModifierType; +import io.lumine.mythic.lib.api.stat.modifier.StatModifier; +import net.Indyuce.mmocore.MMOCore; +import net.Indyuce.mmocore.api.player.PlayerData; +import org.apache.commons.lang.Validate; +import org.bukkit.configuration.ConfigurationSection; + import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -7,19 +18,6 @@ import java.util.Map.Entry; import java.util.Set; import java.util.logging.Level; -import org.apache.commons.lang.Validate; -import org.bukkit.configuration.ConfigurationSection; - -import com.google.gson.Gson; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; - -import net.Indyuce.mmocore.MMOCore; -import net.Indyuce.mmocore.api.player.PlayerData; -import net.mmogroup.mmolib.api.stat.modifier.Closable; -import net.mmogroup.mmolib.api.stat.modifier.ModifierType; -import net.mmogroup.mmolib.api.stat.modifier.StatModifier; - public class PlayerAttributes { private final PlayerData data; private final Map instances = new HashMap<>(); diff --git a/src/main/java/net/Indyuce/mmocore/api/player/profess/PlayerClass.java b/src/main/java/net/Indyuce/mmocore/api/player/profess/PlayerClass.java index b0c09940..aa9ab37e 100644 --- a/src/main/java/net/Indyuce/mmocore/api/player/profess/PlayerClass.java +++ b/src/main/java/net/Indyuce/mmocore/api/player/profess/PlayerClass.java @@ -1,28 +1,11 @@ package net.Indyuce.mmocore.api.player.profess; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.Set; -import java.util.UUID; -import java.util.logging.Level; - -import org.apache.commons.lang.Validate; -import org.bukkit.Material; -import org.bukkit.Particle; -import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.meta.ItemMeta; - import com.mojang.authlib.GameProfile; import com.mojang.authlib.properties.Property; - +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.util.PostLoadObject; +import io.lumine.mythic.lib.version.VersionMaterial; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.experience.ExpCurve; import net.Indyuce.mmocore.api.experience.source.type.ExperienceSource; @@ -37,10 +20,17 @@ import net.Indyuce.mmocore.api.util.MMOCoreUtils; import net.Indyuce.mmocore.api.util.math.formula.LinearValue; import net.Indyuce.mmocore.api.util.math.particle.CastingParticle; import net.md_5.bungee.api.ChatColor; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.MMOLineConfig; -import net.mmogroup.mmolib.api.util.PostLoadObject; -import net.mmogroup.mmolib.version.VersionMaterial; +import org.apache.commons.lang.Validate; +import org.bukkit.Material; +import org.bukkit.Particle; +import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.ItemMeta; + +import java.lang.reflect.Field; +import java.util.*; +import java.util.logging.Level; public class PlayerClass extends PostLoadObject { private final String name, id, actionBarFormat; @@ -65,7 +55,7 @@ public class PlayerClass extends PostLoadObject { this.id = id.toUpperCase().replace("-", "_").replace(" ", "_"); - name = MMOLib.plugin.parseColors(config.getString("display.name", "INVALID DISPLAY NAME")); + name = MythicLib.plugin.parseColors(config.getString("display.name", "INVALID DISPLAY NAME")); icon = MMOCoreUtils.readIcon(config.getString("display.item", "BARRIER")); if (config.contains("display.texture") && icon.getType() == VersionMaterial.PLAYER_HEAD.toMaterial()) @@ -83,9 +73,9 @@ public class PlayerClass extends PostLoadObject { } for (String string : config.getStringList("display.lore")) - description.add(ChatColor.GRAY + MMOLib.plugin.parseColors(string)); + description.add(ChatColor.GRAY + MythicLib.plugin.parseColors(string)); for (String string : config.getStringList("display.attribute-lore")) - attrDescription.add(ChatColor.GRAY + MMOLib.plugin.parseColors(string)); + attrDescription.add(ChatColor.GRAY + MythicLib.plugin.parseColors(string)); manaDisplay = config.contains("mana") ? new ManaDisplayOptions(config.getConfigurationSection("mana")) : ManaDisplayOptions.DEFAULT; maxLevel = config.getInt("max-level"); diff --git a/src/main/java/net/Indyuce/mmocore/api/player/profess/event/EventTrigger.java b/src/main/java/net/Indyuce/mmocore/api/player/profess/event/EventTrigger.java index 6844d5b1..0303b5f2 100644 --- a/src/main/java/net/Indyuce/mmocore/api/player/profess/event/EventTrigger.java +++ b/src/main/java/net/Indyuce/mmocore/api/player/profess/event/EventTrigger.java @@ -9,7 +9,7 @@ import org.apache.commons.lang.Validate; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.quest.trigger.Trigger; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class EventTrigger { private final String event; diff --git a/src/main/java/net/Indyuce/mmocore/api/player/profess/event/trigger/AttackEventTrigger.java b/src/main/java/net/Indyuce/mmocore/api/player/profess/event/trigger/AttackEventTrigger.java index 7e7f5353..20d8cf29 100644 --- a/src/main/java/net/Indyuce/mmocore/api/player/profess/event/trigger/AttackEventTrigger.java +++ b/src/main/java/net/Indyuce/mmocore/api/player/profess/event/trigger/AttackEventTrigger.java @@ -6,8 +6,8 @@ import org.bukkit.event.EventPriority; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.profess.PlayerClass; import net.Indyuce.mmocore.api.player.profess.event.EventTriggerHandler; -import net.mmogroup.mmolib.api.DamageType; -import net.mmogroup.mmolib.api.event.PlayerAttackEvent; +import io.lumine.mythic.lib.api.DamageType; +import io.lumine.mythic.lib.api.event.PlayerAttackEvent; public class AttackEventTrigger implements EventTriggerHandler { diff --git a/src/main/java/net/Indyuce/mmocore/api/player/profess/resource/ManaDisplayOptions.java b/src/main/java/net/Indyuce/mmocore/api/player/profess/resource/ManaDisplayOptions.java index 678ee549..970d329a 100644 --- a/src/main/java/net/Indyuce/mmocore/api/player/profess/resource/ManaDisplayOptions.java +++ b/src/main/java/net/Indyuce/mmocore/api/player/profess/resource/ManaDisplayOptions.java @@ -1,11 +1,11 @@ package net.Indyuce.mmocore.api.player.profess.resource; +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.util.AltChar; import org.apache.commons.lang.Validate; import org.bukkit.ChatColor; import org.bukkit.configuration.ConfigurationSection; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.util.AltChar; public class ManaDisplayOptions { private final ChatColor full, half, empty; @@ -30,7 +30,7 @@ public class ManaDisplayOptions { Validate.notEmpty(format, "Could not load mana bar character"); barCharacter = format.charAt(0); - icon = MMOLib.plugin.parseColors(config.getString("icon", "")); + icon = MythicLib.plugin.parseColors(config.getString("icon", "")); Validate.notEmpty(format, "Could not load mana action bar icon"); } diff --git a/src/main/java/net/Indyuce/mmocore/api/player/stats/PlayerStats.java b/src/main/java/net/Indyuce/mmocore/api/player/stats/PlayerStats.java index 8c8e25c6..7913c2ae 100644 --- a/src/main/java/net/Indyuce/mmocore/api/player/stats/PlayerStats.java +++ b/src/main/java/net/Indyuce/mmocore/api/player/stats/PlayerStats.java @@ -1,10 +1,10 @@ package net.Indyuce.mmocore.api.player.stats; +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.stat.StatInstance; +import io.lumine.mythic.lib.api.stat.StatMap; +import io.lumine.mythic.lib.api.stat.modifier.StatModifier; import net.Indyuce.mmocore.api.player.PlayerData; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.stat.StatInstance; -import net.mmogroup.mmolib.api.stat.StatMap; -import net.mmogroup.mmolib.api.stat.modifier.StatModifier; public class PlayerStats { private final PlayerData data; @@ -61,6 +61,6 @@ public class PlayerStats { instance.addModifier("mmocoreClass", new StatModifier(total)); } - MMOLib.plugin.getStats().runUpdates(getMap()); + MythicLib.plugin.getStats().runUpdates(getMap()); } } diff --git a/src/main/java/net/Indyuce/mmocore/api/player/stats/StatType.java b/src/main/java/net/Indyuce/mmocore/api/player/stats/StatType.java index 55c31c99..a5b096a9 100644 --- a/src/main/java/net/Indyuce/mmocore/api/player/stats/StatType.java +++ b/src/main/java/net/Indyuce/mmocore/api/player/stats/StatType.java @@ -4,7 +4,7 @@ import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.ConfigFile; import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.util.math.formula.LinearValue; -import net.mmogroup.mmolib.MMOLib; +import io.lumine.mythic.lib.MythicLib; import org.bukkit.configuration.file.FileConfiguration; import java.text.DecimalFormat; @@ -124,7 +124,7 @@ public enum StatType { FileConfiguration config = new ConfigFile("stats").getConfig(); for (StatType stat : values()) { stat.defaultInfo = config.contains("default." + stat.name()) ? new LinearValue(config.getConfigurationSection("default." + stat.name())) : new LinearValue(0, 0); - stat.format = MMOLib.plugin.getMMOConfig().newFormat(config.contains("decimal-format." + stat.name()) ? config.getString("decimal-format." + stat.name()) : "0.#"); + stat.format = MythicLib.plugin.getMMOConfig().newFormat(config.contains("decimal-format." + stat.name()) ? config.getString("decimal-format." + stat.name()) : "0.#"); } } } diff --git a/src/main/java/net/Indyuce/mmocore/api/quest/PlayerQuests.java b/src/main/java/net/Indyuce/mmocore/api/quest/PlayerQuests.java index 7806d4ff..e13add5c 100644 --- a/src/main/java/net/Indyuce/mmocore/api/quest/PlayerQuests.java +++ b/src/main/java/net/Indyuce/mmocore/api/quest/PlayerQuests.java @@ -5,7 +5,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; -import net.mmogroup.mmolib.MMOLib; +import io.lumine.mythic.lib.MythicLib; import org.bukkit.NamespacedKey; import org.bukkit.boss.BarColor; import org.bukkit.boss.BarStyle; @@ -29,7 +29,7 @@ public class PlayerQuests { public PlayerQuests(PlayerData playerData) { this.playerData = playerData; - bossbar = MMOLib.plugin.getVersion().getWrapper().createBossBar( + bossbar = MythicLib.plugin.getVersion().getWrapper().createBossBar( new NamespacedKey(MMOCore.plugin, "quest_bar_" + playerData.getUniqueId().toString()), "", BarColor.PURPLE, BarStyle.SEGMENTED_20); if(playerData.isOnline()) diff --git a/src/main/java/net/Indyuce/mmocore/api/quest/Quest.java b/src/main/java/net/Indyuce/mmocore/api/quest/Quest.java index ef5db42c..4739cf55 100644 --- a/src/main/java/net/Indyuce/mmocore/api/quest/Quest.java +++ b/src/main/java/net/Indyuce/mmocore/api/quest/Quest.java @@ -15,8 +15,8 @@ import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.quest.objective.Objective; -import net.mmogroup.mmolib.api.MMOLineConfig; -import net.mmogroup.mmolib.api.util.PostLoadObject; +import io.lumine.mythic.lib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.util.PostLoadObject; public class Quest extends PostLoadObject { private final String id; diff --git a/src/main/java/net/Indyuce/mmocore/api/quest/QuestProgress.java b/src/main/java/net/Indyuce/mmocore/api/quest/QuestProgress.java index 1ae950d9..99abb972 100644 --- a/src/main/java/net/Indyuce/mmocore/api/quest/QuestProgress.java +++ b/src/main/java/net/Indyuce/mmocore/api/quest/QuestProgress.java @@ -2,7 +2,7 @@ package net.Indyuce.mmocore.api.quest; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.quest.objective.Objective; -import net.mmogroup.mmolib.MMOLib; +import io.lumine.mythic.lib.MythicLib; public class QuestProgress { private final Quest quest; @@ -60,6 +60,6 @@ public class QuestProgress { } public String getFormattedLore() { - return MMOLib.plugin.parseColors(objectiveProgress.formatLore(objectiveProgress.getObjective().getDefaultLore())); + return MythicLib.plugin.parseColors(objectiveProgress.formatLore(objectiveProgress.getObjective().getDefaultLore())); } } \ No newline at end of file diff --git a/src/main/java/net/Indyuce/mmocore/api/quest/objective/ClickonObjective.java b/src/main/java/net/Indyuce/mmocore/api/quest/objective/ClickonObjective.java index 71fba1a7..506b13c2 100644 --- a/src/main/java/net/Indyuce/mmocore/api/quest/objective/ClickonObjective.java +++ b/src/main/java/net/Indyuce/mmocore/api/quest/objective/ClickonObjective.java @@ -13,7 +13,7 @@ import org.bukkit.event.player.PlayerInteractEvent; import net.Indyuce.mmocore.api.quest.ObjectiveProgress; import net.Indyuce.mmocore.api.quest.QuestProgress; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class ClickonObjective extends Objective { private final Location loc; diff --git a/src/main/java/net/Indyuce/mmocore/api/quest/objective/GoToObjective.java b/src/main/java/net/Indyuce/mmocore/api/quest/objective/GoToObjective.java index c7d0c5db..ee85470a 100644 --- a/src/main/java/net/Indyuce/mmocore/api/quest/objective/GoToObjective.java +++ b/src/main/java/net/Indyuce/mmocore/api/quest/objective/GoToObjective.java @@ -12,7 +12,7 @@ import org.bukkit.event.player.PlayerMoveEvent; import net.Indyuce.mmocore.api.quest.ObjectiveProgress; import net.Indyuce.mmocore.api.quest.QuestProgress; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class GoToObjective extends Objective { private final Location loc; diff --git a/src/main/java/net/Indyuce/mmocore/api/quest/objective/KillMobObjective.java b/src/main/java/net/Indyuce/mmocore/api/quest/objective/KillMobObjective.java index eadff63b..0a284ebd 100644 --- a/src/main/java/net/Indyuce/mmocore/api/quest/objective/KillMobObjective.java +++ b/src/main/java/net/Indyuce/mmocore/api/quest/objective/KillMobObjective.java @@ -7,8 +7,8 @@ import org.bukkit.event.Listener; import net.Indyuce.mmocore.api.quest.ObjectiveProgress; import net.Indyuce.mmocore.api.quest.QuestProgress; -import net.mmogroup.mmolib.api.MMOLineConfig; -import net.mmogroup.mmolib.api.event.EntityKillEntityEvent; +import io.lumine.mythic.lib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.event.EntityKillEntityEvent; public class KillMobObjective extends Objective { private final EntityType type; diff --git a/src/main/java/net/Indyuce/mmocore/api/quest/objective/MineBlockObjective.java b/src/main/java/net/Indyuce/mmocore/api/quest/objective/MineBlockObjective.java index 7e1dca89..59ddf77c 100644 --- a/src/main/java/net/Indyuce/mmocore/api/quest/objective/MineBlockObjective.java +++ b/src/main/java/net/Indyuce/mmocore/api/quest/objective/MineBlockObjective.java @@ -10,7 +10,7 @@ import org.bukkit.event.block.BlockBreakEvent; import net.Indyuce.mmocore.api.event.CustomBlockMineEvent; import net.Indyuce.mmocore.api.quest.ObjectiveProgress; import net.Indyuce.mmocore.api.quest.QuestProgress; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class MineBlockObjective extends Objective { private final Material block; diff --git a/src/main/java/net/Indyuce/mmocore/api/quest/objective/Objective.java b/src/main/java/net/Indyuce/mmocore/api/quest/objective/Objective.java index b77fa486..b520fa8f 100644 --- a/src/main/java/net/Indyuce/mmocore/api/quest/objective/Objective.java +++ b/src/main/java/net/Indyuce/mmocore/api/quest/objective/Objective.java @@ -12,7 +12,7 @@ import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.quest.ObjectiveProgress; import net.Indyuce.mmocore.api.quest.QuestProgress; import net.Indyuce.mmocore.api.quest.trigger.Trigger; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public abstract class Objective { private final String id, lore; diff --git a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/CommandTrigger.java b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/CommandTrigger.java index bff68d0b..a727cdb2 100644 --- a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/CommandTrigger.java +++ b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/CommandTrigger.java @@ -5,7 +5,7 @@ import org.bukkit.entity.Player; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class CommandTrigger extends Trigger { private final String command; diff --git a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ExperienceTrigger.java b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ExperienceTrigger.java index ca0a87ad..5ac82293 100644 --- a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ExperienceTrigger.java +++ b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ExperienceTrigger.java @@ -8,7 +8,7 @@ import net.Indyuce.mmocore.api.experience.ExperienceInfo; import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.util.math.formula.RandomAmount; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class ExperienceTrigger extends Trigger { private final RandomAmount amount; diff --git a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ItemTrigger.java b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ItemTrigger.java index daeef370..16b6533d 100644 --- a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ItemTrigger.java +++ b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ItemTrigger.java @@ -1,11 +1,11 @@ package net.Indyuce.mmocore.api.quest.trigger; +import io.lumine.mythic.lib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.util.SmartGive; +import net.Indyuce.mmocore.api.player.PlayerData; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -import net.Indyuce.mmocore.api.player.PlayerData; -import net.mmogroup.mmolib.api.MMOLineConfig; -import net.mmogroup.mmolib.api.util.SmartGive; public class ItemTrigger extends Trigger { private final Material material; diff --git a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ManaTrigger.java b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ManaTrigger.java index 0b795ebc..bd02227e 100644 --- a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ManaTrigger.java +++ b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ManaTrigger.java @@ -2,7 +2,7 @@ package net.Indyuce.mmocore.api.quest.trigger; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.util.math.formula.RandomAmount; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class ManaTrigger extends Trigger { private final RandomAmount amount; diff --git a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/MessageTrigger.java b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/MessageTrigger.java index 308d072f..c6156b37 100644 --- a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/MessageTrigger.java +++ b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/MessageTrigger.java @@ -4,7 +4,7 @@ import org.bukkit.entity.Player; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class MessageTrigger extends Trigger { private final String message; diff --git a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/SoundTrigger.java b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/SoundTrigger.java index ca4ef01f..22647262 100644 --- a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/SoundTrigger.java +++ b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/SoundTrigger.java @@ -3,7 +3,7 @@ package net.Indyuce.mmocore.api.quest.trigger; import org.bukkit.Sound; import net.Indyuce.mmocore.api.player.PlayerData; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class SoundTrigger extends Trigger { private final Sound sound; diff --git a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/StaminaTrigger.java b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/StaminaTrigger.java index 60ad7f96..0b5c6722 100644 --- a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/StaminaTrigger.java +++ b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/StaminaTrigger.java @@ -2,7 +2,7 @@ package net.Indyuce.mmocore.api.quest.trigger; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.util.math.formula.RandomAmount; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class StaminaTrigger extends Trigger { private final RandomAmount amount; diff --git a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/StelliumTrigger.java b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/StelliumTrigger.java index 1956442a..d03fe152 100644 --- a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/StelliumTrigger.java +++ b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/StelliumTrigger.java @@ -3,7 +3,7 @@ package net.Indyuce.mmocore.api.quest.trigger; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.quest.trigger.ManaTrigger.Operation; import net.Indyuce.mmocore.api.util.math.formula.RandomAmount; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class StelliumTrigger extends Trigger { private final RandomAmount amount; diff --git a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/Trigger.java b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/Trigger.java index fb95975c..c34b7a70 100644 --- a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/Trigger.java +++ b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/Trigger.java @@ -4,7 +4,7 @@ import org.bukkit.Bukkit; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public abstract class Trigger { private final long delay; diff --git a/src/main/java/net/Indyuce/mmocore/api/skill/result/TargetSkillResult.java b/src/main/java/net/Indyuce/mmocore/api/skill/result/TargetSkillResult.java index 1a09b392..c5e3d34d 100644 --- a/src/main/java/net/Indyuce/mmocore/api/skill/result/TargetSkillResult.java +++ b/src/main/java/net/Indyuce/mmocore/api/skill/result/TargetSkillResult.java @@ -6,8 +6,8 @@ import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.skill.Skill.SkillInfo; import net.Indyuce.mmocore.api.skill.SkillResult; import net.Indyuce.mmocore.api.util.MMOCoreUtils; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.MMORayTraceResult; +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.MMORayTraceResult; public class TargetSkillResult extends SkillResult { private LivingEntity target; @@ -31,7 +31,7 @@ public class TargetSkillResult extends SkillResult { super(data, skill); if (isSuccessful()) { - MMORayTraceResult result = MMOLib.plugin.getVersion().getWrapper().rayTrace(data.getPlayer(), range, + MMORayTraceResult result = MythicLib.plugin.getVersion().getWrapper().rayTrace(data.getPlayer(), range, entity -> MMOCoreUtils.canTarget(data, entity, buff)); if (!result.hasHit()) abort(); diff --git a/src/main/java/net/Indyuce/mmocore/api/util/MMOCoreUtils.java b/src/main/java/net/Indyuce/mmocore/api/util/MMOCoreUtils.java index e3cf1e6d..e8cac543 100644 --- a/src/main/java/net/Indyuce/mmocore/api/util/MMOCoreUtils.java +++ b/src/main/java/net/Indyuce/mmocore/api/util/MMOCoreUtils.java @@ -26,9 +26,9 @@ import org.bukkit.util.io.BukkitObjectOutputStream; import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder; import net.Indyuce.mmocore.api.player.PlayerData; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.item.NBTItem; -import net.mmogroup.mmolib.version.VersionMaterial; +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.item.NBTItem; +import io.lumine.mythic.lib.version.VersionMaterial; public class MMOCoreUtils { public static boolean pluginItem(ItemStack item) { @@ -61,14 +61,14 @@ public class MMOCoreUtils { public static ItemStack readIcon(String string) throws IllegalArgumentException { String[] split = string.split(":"); Material material = Material.valueOf(split[0].toUpperCase().replace("-", "_").replace(" ", "_")); - return split.length > 1 ? MMOLib.plugin.getVersion().getWrapper().textureItem(material, Integer.parseInt(split[1])) : new ItemStack(material); + return split.length > 1 ? MythicLib.plugin.getVersion().getWrapper().textureItem(material, Integer.parseInt(split[1])) : new ItemStack(material); } public static int getWorth(ItemStack[] items) { int t = 0; for (ItemStack item : items) if (item != null && item.getType() != Material.AIR) - t += MMOLib.plugin.getVersion().getWrapper().getNBTItem(item).getInteger("RpgWorth") * item.getAmount(); + t += MythicLib.plugin.getVersion().getWrapper().getNBTItem(item).getInteger("RpgWorth") * item.getAmount(); return t; } @@ -177,7 +177,7 @@ public class MMOCoreUtils { // basic checks if (!(target instanceof LivingEntity) || player.getPlayer().equals(target) || target.isDead() - || MMOLib.plugin.getEntities().findCustom(target)) + || MythicLib.plugin.getEntities().findCustom(target)) return false; // party check diff --git a/src/main/java/net/Indyuce/mmocore/api/util/input/AnvilGUI.java b/src/main/java/net/Indyuce/mmocore/api/util/input/AnvilGUI.java index 2af41a61..45e3a4f4 100644 --- a/src/main/java/net/Indyuce/mmocore/api/util/input/AnvilGUI.java +++ b/src/main/java/net/Indyuce/mmocore/api/util/input/AnvilGUI.java @@ -12,7 +12,7 @@ import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.util.Consumer; import net.Indyuce.mmocore.MMOCore; -import net.mmogroup.mmolib.MMOLib; +import io.lumine.mythic.lib.MythicLib; public class AnvilGUI extends PlayerInput { private final int containerId; @@ -26,25 +26,25 @@ public class AnvilGUI extends PlayerInput { paperMeta.setDisplayName(MMOCore.plugin.configManager.getSimpleMessage("player-input.anvil." + type.getLowerCaseName()).message()); paper.setItemMeta(paperMeta); - MMOLib.plugin.getVersion().getWrapper().handleInventoryCloseEvent(player); - MMOLib.plugin.getVersion().getWrapper().setActiveContainerDefault(player); + MythicLib.plugin.getVersion().getWrapper().handleInventoryCloseEvent(player); + MythicLib.plugin.getVersion().getWrapper().setActiveContainerDefault(player); - final Object container = MMOLib.plugin.getVersion().getWrapper().newContainerAnvil(player); + final Object container = MythicLib.plugin.getVersion().getWrapper().newContainerAnvil(player); - inventory = MMOLib.plugin.getVersion().getWrapper().toBukkitInventory(container); + inventory = MythicLib.plugin.getVersion().getWrapper().toBukkitInventory(container); inventory.setItem(0, paper); - containerId = MMOLib.plugin.getVersion().getWrapper().getNextContainerId(player); - MMOLib.plugin.getVersion().getWrapper().sendPacketOpenWindow(player, containerId); - MMOLib.plugin.getVersion().getWrapper().setActiveContainer(player, container); - MMOLib.plugin.getVersion().getWrapper().setActiveContainerId(container, containerId); - MMOLib.plugin.getVersion().getWrapper().addActiveContainerSlotListener(container, player); + containerId = MythicLib.plugin.getVersion().getWrapper().getNextContainerId(player); + MythicLib.plugin.getVersion().getWrapper().sendPacketOpenWindow(player, containerId); + MythicLib.plugin.getVersion().getWrapper().setActiveContainer(player, container); + MythicLib.plugin.getVersion().getWrapper().setActiveContainerId(container, containerId); + MythicLib.plugin.getVersion().getWrapper().addActiveContainerSlotListener(container, player); } public void close() { - MMOLib.plugin.getVersion().getWrapper().handleInventoryCloseEvent(getPlayer()); - MMOLib.plugin.getVersion().getWrapper().setActiveContainerDefault(getPlayer()); - MMOLib.plugin.getVersion().getWrapper().sendPacketCloseWindow(getPlayer(), containerId); + MythicLib.plugin.getVersion().getWrapper().handleInventoryCloseEvent(getPlayer()); + MythicLib.plugin.getVersion().getWrapper().setActiveContainerDefault(getPlayer()); + MythicLib.plugin.getVersion().getWrapper().sendPacketCloseWindow(getPlayer(), containerId); InventoryClickEvent.getHandlerList().unregister(this); InventoryCloseEvent.getHandlerList().unregister(this); diff --git a/src/main/java/net/Indyuce/mmocore/api/util/item/ConfigItem.java b/src/main/java/net/Indyuce/mmocore/api/util/item/ConfigItem.java index d1f9f6cf..42c0962a 100644 --- a/src/main/java/net/Indyuce/mmocore/api/util/item/ConfigItem.java +++ b/src/main/java/net/Indyuce/mmocore/api/util/item/ConfigItem.java @@ -20,10 +20,10 @@ import com.mojang.authlib.GameProfile; import com.mojang.authlib.properties.Property; import net.Indyuce.mmocore.MMOCore; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.item.ItemTag; -import net.mmogroup.mmolib.api.item.NBTItem; -import net.mmogroup.mmolib.version.VersionMaterial; +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.item.ItemTag; +import io.lumine.mythic.lib.api.item.NBTItem; +import io.lumine.mythic.lib.version.VersionMaterial; public class ConfigItem { private final String name, id, texture; @@ -110,7 +110,7 @@ public class ConfigItem { if (meta instanceof Damageable) ((Damageable) meta).setDamage(damage); - if (MMOLib.plugin.getVersion().isStrictlyHigher(1, 13)) + if (MythicLib.plugin.getVersion().isStrictlyHigher(1, 13)) meta.setCustomModelData(modeldata); if (item.getType() == VersionMaterial.PLAYER_HEAD.toMaterial() && texture != null) @@ -139,6 +139,6 @@ public class ConfigItem { for (String placeholder : placeholders.keySet()) if (string.contains("{" + placeholder + "}")) string = string.replace("{" + placeholder + "}", "" + placeholders.get(placeholder)); - return MMOLib.plugin.parseColors(string); + return MythicLib.plugin.parseColors(string); } } diff --git a/src/main/java/net/Indyuce/mmocore/api/util/item/CurrencyItem.java b/src/main/java/net/Indyuce/mmocore/api/util/item/CurrencyItem.java index 3dbeccd7..ca8366e6 100644 --- a/src/main/java/net/Indyuce/mmocore/api/util/item/CurrencyItem.java +++ b/src/main/java/net/Indyuce/mmocore/api/util/item/CurrencyItem.java @@ -7,9 +7,9 @@ import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.item.ItemTag; -import net.mmogroup.mmolib.api.item.NBTItem; +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.item.ItemTag; +import io.lumine.mythic.lib.api.item.NBTItem; public class CurrencyItem extends ConfigItem { private final int worth, amount; @@ -36,7 +36,7 @@ public class CurrencyItem extends ConfigItem { getLore().forEach(line -> lore.add(format(line))); meta.setLore(lore); - if(MMOLib.plugin.getVersion().isStrictlyHigher(1, 13)) + if(MythicLib.plugin.getVersion().isStrictlyHigher(1, 13)) meta.setCustomModelData(getModelData()); item.setItemMeta(meta); diff --git a/src/main/java/net/Indyuce/mmocore/api/util/item/NamedItemStack.java b/src/main/java/net/Indyuce/mmocore/api/util/item/NamedItemStack.java index f8db7dcd..8bdc5608 100644 --- a/src/main/java/net/Indyuce/mmocore/api/util/item/NamedItemStack.java +++ b/src/main/java/net/Indyuce/mmocore/api/util/item/NamedItemStack.java @@ -4,14 +4,14 @@ import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; -import net.mmogroup.mmolib.MMOLib; +import io.lumine.mythic.lib.MythicLib; public class NamedItemStack extends ItemStack { public NamedItemStack(Material material, String name) { super(material); ItemMeta meta = getItemMeta(); - meta.setDisplayName(MMOLib.plugin.parseColors(name)); + meta.setDisplayName(MythicLib.plugin.parseColors(name)); setItemMeta(meta); } } diff --git a/src/main/java/net/Indyuce/mmocore/api/util/math/formula/LinearValue.java b/src/main/java/net/Indyuce/mmocore/api/util/math/formula/LinearValue.java index a47eaaa6..57292b2c 100644 --- a/src/main/java/net/Indyuce/mmocore/api/util/math/formula/LinearValue.java +++ b/src/main/java/net/Indyuce/mmocore/api/util/math/formula/LinearValue.java @@ -1,6 +1,6 @@ package net.Indyuce.mmocore.api.util.math.formula; -import net.mmogroup.mmolib.MMOLib; +import io.lumine.mythic.lib.MythicLib; import org.bukkit.configuration.ConfigurationSection; public class LinearValue { @@ -74,7 +74,7 @@ public class LinearValue { } public String getDisplay(int level) { - return MMOLib.plugin.getMMOConfig().decimals.format(calculate(level)); + return MythicLib.plugin.getMMOConfig().decimals.format(calculate(level)); } public double calculate(int level) { diff --git a/src/main/java/net/Indyuce/mmocore/command/CommandVerbose.java b/src/main/java/net/Indyuce/mmocore/command/CommandVerbose.java index 32244e5f..e4d5a166 100644 --- a/src/main/java/net/Indyuce/mmocore/command/CommandVerbose.java +++ b/src/main/java/net/Indyuce/mmocore/command/CommandVerbose.java @@ -1,7 +1,7 @@ package net.Indyuce.mmocore.command; +import io.lumine.mythic.lib.api.util.EnumUtils; import net.Indyuce.mmocore.MMOCore; -import net.mmogroup.mmolib.api.util.EnumUtils; import org.bukkit.command.CommandSender; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Player; diff --git a/src/main/java/net/Indyuce/mmocore/command/MMOCoreCommandTreeRoot.java b/src/main/java/net/Indyuce/mmocore/command/MMOCoreCommandTreeRoot.java index 58b1b8e8..6729bf0d 100644 --- a/src/main/java/net/Indyuce/mmocore/command/MMOCoreCommandTreeRoot.java +++ b/src/main/java/net/Indyuce/mmocore/command/MMOCoreCommandTreeRoot.java @@ -1,8 +1,7 @@ package net.Indyuce.mmocore.command; -import org.bukkit.command.CommandExecutor; -import org.bukkit.command.TabCompleter; - +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeRoot; +import io.lumine.mythic.lib.mmolibcommands.api.Parameter; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.command.rpg.CoinsCommandTreeNode; import net.Indyuce.mmocore.command.rpg.NoteCommandTreeNode; @@ -12,8 +11,8 @@ import net.Indyuce.mmocore.command.rpg.booster.BoosterCommandTreeNode; import net.Indyuce.mmocore.command.rpg.debug.DebugCommandTreeNode; import net.Indyuce.mmocore.command.rpg.quest.QuestCommandTreeNode; import net.Indyuce.mmocore.command.rpg.waypoint.WaypointsCommandTreeNode; -import net.mmogroup.mmolib.command.api.CommandTreeRoot; -import net.mmogroup.mmolib.command.api.Parameter; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.TabCompleter; public class MMOCoreCommandTreeRoot extends CommandTreeRoot implements CommandExecutor, TabCompleter { public static final Parameter PROFESSION = new Parameter("", (explorer, list) -> { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/CoinsCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/CoinsCommandTreeNode.java index 96f9358a..048121db 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/CoinsCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/CoinsCommandTreeNode.java @@ -1,14 +1,14 @@ package net.Indyuce.mmocore.command.rpg; +import io.lumine.mythic.lib.api.util.SmartGive; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import net.Indyuce.mmocore.api.util.item.CurrencyItem; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import net.Indyuce.mmocore.api.util.item.CurrencyItem; -import net.mmogroup.mmolib.api.util.SmartGive; -import net.mmogroup.mmolib.command.api.CommandTreeNode; -import net.mmogroup.mmolib.command.api.Parameter; public class CoinsCommandTreeNode extends CommandTreeNode { public CoinsCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/NoteCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/NoteCommandTreeNode.java index 121bdf73..28bfc48e 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/NoteCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/NoteCommandTreeNode.java @@ -8,9 +8,9 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import net.Indyuce.mmocore.api.util.item.CurrencyItem; -import net.mmogroup.mmolib.api.util.SmartGive; -import net.mmogroup.mmolib.command.api.CommandTreeNode; -import net.mmogroup.mmolib.command.api.Parameter; +import io.lumine.mythic.lib.api.util.SmartGive; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.Parameter; public class NoteCommandTreeNode extends CommandTreeNode { public NoteCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/ReloadCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/ReloadCommandTreeNode.java index ef6e47e7..5ea545bf 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/ReloadCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/ReloadCommandTreeNode.java @@ -5,7 +5,7 @@ import org.bukkit.command.CommandSender; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; -import net.mmogroup.mmolib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; public class ReloadCommandTreeNode extends CommandTreeNode { public ReloadCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/AdminCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/AdminCommandTreeNode.java index 2b157422..e4c642ba 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/AdminCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/AdminCommandTreeNode.java @@ -3,7 +3,7 @@ package net.Indyuce.mmocore.command.rpg.admin; import net.Indyuce.mmocore.api.player.PlayerData; import org.bukkit.command.CommandSender; -import net.mmogroup.mmolib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; public class AdminCommandTreeNode extends CommandTreeNode { public AdminCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/AttributeCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/AttributeCommandTreeNode.java index 17f558dc..c0e7f784 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/AttributeCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/AttributeCommandTreeNode.java @@ -10,8 +10,8 @@ import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.attribute.PlayerAttribute; import net.Indyuce.mmocore.api.player.attribute.PlayerAttributes.AttributeInstance; -import net.mmogroup.mmolib.command.api.CommandTreeNode; -import net.mmogroup.mmolib.command.api.Parameter; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.Parameter; public class AttributeCommandTreeNode extends CommandTreeNode { public AttributeCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ClassCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ClassCommandTreeNode.java index 7704b345..5c1e37cb 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ClassCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ClassCommandTreeNode.java @@ -12,8 +12,8 @@ import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.profess.PlayerClass; import net.Indyuce.mmocore.api.player.profess.SavedClassInformation; import net.Indyuce.mmocore.command.CommandVerbose; -import net.mmogroup.mmolib.command.api.CommandTreeNode; -import net.mmogroup.mmolib.command.api.Parameter; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.Parameter; public class ClassCommandTreeNode extends CommandTreeNode { public ClassCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ExperienceCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ExperienceCommandTreeNode.java index 388eaa84..4cdbdacb 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ExperienceCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ExperienceCommandTreeNode.java @@ -14,8 +14,8 @@ import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.command.CommandVerbose; import net.Indyuce.mmocore.command.MMOCoreCommandTreeRoot; -import net.mmogroup.mmolib.command.api.CommandTreeNode; -import net.mmogroup.mmolib.command.api.Parameter; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.Parameter; public class ExperienceCommandTreeNode extends CommandTreeNode { public ExperienceCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ForceClassCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ForceClassCommandTreeNode.java index afd2d6b0..481fab16 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ForceClassCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ForceClassCommandTreeNode.java @@ -9,8 +9,8 @@ import org.bukkit.entity.Player; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.profess.PlayerClass; -import net.mmogroup.mmolib.command.api.CommandTreeNode; -import net.mmogroup.mmolib.command.api.Parameter; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.Parameter; public class ForceClassCommandTreeNode extends CommandTreeNode { public ForceClassCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandTreeNode.java index c1a3587d..d337dc79 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandTreeNode.java @@ -6,8 +6,8 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import net.Indyuce.mmocore.api.player.PlayerData; -import net.mmogroup.mmolib.command.api.CommandTreeNode; -import net.mmogroup.mmolib.command.api.Parameter; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.Parameter; public class HideActionBarCommandTreeNode extends CommandTreeNode { public HideActionBarCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/InfoCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/InfoCommandTreeNode.java index c8456231..d3e83797 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/InfoCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/InfoCommandTreeNode.java @@ -8,8 +8,8 @@ import org.bukkit.entity.Player; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.player.PlayerData; -import net.mmogroup.mmolib.command.api.CommandTreeNode; -import net.mmogroup.mmolib.command.api.Parameter; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.Parameter; public class InfoCommandTreeNode extends CommandTreeNode { public InfoCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/LevelCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/LevelCommandTreeNode.java index 342a811e..2c894aad 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/LevelCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/LevelCommandTreeNode.java @@ -14,8 +14,8 @@ import net.Indyuce.mmocore.api.experience.PlayerProfessions; import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.command.MMOCoreCommandTreeRoot; -import net.mmogroup.mmolib.command.api.CommandTreeNode; -import net.mmogroup.mmolib.command.api.Parameter; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.Parameter; public class LevelCommandTreeNode extends CommandTreeNode { public LevelCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/NoCooldownCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/NoCooldownCommandTreeNode.java index 65b39e3d..c7c63019 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/NoCooldownCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/NoCooldownCommandTreeNode.java @@ -7,8 +7,8 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import net.Indyuce.mmocore.api.player.PlayerData; -import net.mmogroup.mmolib.command.api.CommandTreeNode; -import net.mmogroup.mmolib.command.api.Parameter; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.Parameter; public class NoCooldownCommandTreeNode extends CommandTreeNode { public NoCooldownCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/PointsCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/PointsCommandTreeNode.java index c2f15535..3daf0dc2 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/PointsCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/PointsCommandTreeNode.java @@ -10,8 +10,8 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import net.Indyuce.mmocore.api.player.PlayerData; -import net.mmogroup.mmolib.command.api.CommandTreeNode; -import net.mmogroup.mmolib.command.api.Parameter; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.Parameter; public class PointsCommandTreeNode extends CommandTreeNode { private final String type; diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResetCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResetCommandTreeNode.java index caed9c79..a942638c 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResetCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResetCommandTreeNode.java @@ -10,8 +10,8 @@ import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.attribute.PlayerAttributes.AttributeInstance; import net.Indyuce.mmocore.command.CommandVerbose; -import net.mmogroup.mmolib.command.api.CommandTreeNode; -import net.mmogroup.mmolib.command.api.Parameter; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.Parameter; public class ResetCommandTreeNode extends CommandTreeNode { public ResetCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResourceCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResourceCommandTreeNode.java index 547c1da1..97880a95 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResourceCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResourceCommandTreeNode.java @@ -10,8 +10,8 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import net.Indyuce.mmocore.api.player.PlayerData; -import net.mmogroup.mmolib.command.api.CommandTreeNode; -import net.mmogroup.mmolib.command.api.Parameter; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.Parameter; public class ResourceCommandTreeNode extends CommandTreeNode { private final String type; diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/BoosterCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/BoosterCommandTreeNode.java index babcea5a..59d6362a 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/BoosterCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/BoosterCommandTreeNode.java @@ -2,7 +2,7 @@ package net.Indyuce.mmocore.command.rpg.booster; import org.bukkit.command.CommandSender; -import net.mmogroup.mmolib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; public class BoosterCommandTreeNode extends CommandTreeNode { public BoosterCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/CreateCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/CreateCommandTreeNode.java index 906bf854..0ab2332a 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/CreateCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/CreateCommandTreeNode.java @@ -12,8 +12,8 @@ import net.Indyuce.mmocore.api.ConfigMessage; import net.Indyuce.mmocore.api.experience.Booster; import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.command.MMOCoreCommandTreeRoot; -import net.mmogroup.mmolib.command.api.CommandTreeNode; -import net.mmogroup.mmolib.command.api.Parameter; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.Parameter; public class CreateCommandTreeNode extends CommandTreeNode { public CreateCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/ListCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/ListCommandTreeNode.java index 389f1758..2c57f5df 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/ListCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/ListCommandTreeNode.java @@ -7,8 +7,8 @@ import org.bukkit.entity.Player; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.experience.Booster; import net.Indyuce.mmocore.api.util.math.format.DelayFormat; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; public class ListCommandTreeNode extends CommandTreeNode { public ListCommandTreeNode(CommandTreeNode parent) { @@ -23,8 +23,8 @@ public class ListCommandTreeNode extends CommandTreeNode { sender.sendMessage(ChatColor.YELLOW + "----------------------------------------------------"); for (Booster booster : MMOCore.plugin.boosterManager.getBoosters()) if (!booster.isTimedOut()) - MMOLib.plugin.getVersion().getWrapper().sendJson((Player) sender, "{\"text\":\"" + ChatColor.YELLOW + "- " + ChatColor.GOLD - + MMOLib.plugin.getMMOConfig().decimal.format((1 + booster.getExtra())) + "x" + ChatColor.YELLOW + " Booster - " + MythicLib.plugin.getVersion().getWrapper().sendJson((Player) sender, "{\"text\":\"" + ChatColor.YELLOW + "- " + ChatColor.GOLD + + MythicLib.plugin.getMMOConfig().decimal.format((1 + booster.getExtra())) + "x" + ChatColor.YELLOW + " Booster - " + ChatColor.GOLD + (!booster.hasProfession() ? "ExploreAttributesCommand" : booster.getProfession().getName()) + ChatColor.YELLOW + " - " + ChatColor.GOLD + new DelayFormat().format(booster.getCreationDate() + booster.getLength() - System.currentTimeMillis()) diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/RemoveCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/RemoveCommandTreeNode.java index 8f2b9a2a..9c07520a 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/RemoveCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/RemoveCommandTreeNode.java @@ -8,8 +8,8 @@ import org.bukkit.command.CommandSender; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.experience.Booster; -import net.mmogroup.mmolib.command.api.CommandTreeNode; -import net.mmogroup.mmolib.command.api.Parameter; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.Parameter; public class RemoveCommandTreeNode extends CommandTreeNode { public RemoveCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/debug/DebugCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/debug/DebugCommandTreeNode.java index 8bf0bf28..cf2a5ca9 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/debug/DebugCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/debug/DebugCommandTreeNode.java @@ -3,7 +3,7 @@ package net.Indyuce.mmocore.command.rpg.debug; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; -import net.mmogroup.mmolib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; public class DebugCommandTreeNode extends CommandTreeNode { public static final String commandPrefix = ChatColor.YELLOW + "[" + ChatColor.RED + "DEBUG" + ChatColor.GOLD + "] " + ChatColor.RESET; diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatModifiersCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatModifiersCommandTreeNode.java index 4c4dd09c..be5aaef6 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatModifiersCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatModifiersCommandTreeNode.java @@ -1,15 +1,15 @@ package net.Indyuce.mmocore.command.rpg.debug; +import io.lumine.mythic.lib.api.stat.StatInstance; +import io.lumine.mythic.lib.api.stat.modifier.StatModifier; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import net.Indyuce.mmocore.api.player.PlayerData; +import net.Indyuce.mmocore.api.player.stats.StatType; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import net.Indyuce.mmocore.api.player.PlayerData; -import net.Indyuce.mmocore.api.player.stats.StatType; -import net.mmogroup.mmolib.api.stat.StatInstance; -import net.mmogroup.mmolib.api.stat.modifier.StatModifier; -import net.mmogroup.mmolib.command.api.CommandTreeNode; -import net.mmogroup.mmolib.command.api.Parameter; public class StatModifiersCommandTreeNode extends CommandTreeNode { public StatModifiersCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatValueCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatValueCommandTreeNode.java index b6f31d47..f99681dc 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatValueCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatValueCommandTreeNode.java @@ -6,8 +6,8 @@ import org.bukkit.entity.Player; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.stats.StatType; -import net.mmogroup.mmolib.command.api.CommandTreeNode; -import net.mmogroup.mmolib.command.api.Parameter; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.Parameter; public class StatValueCommandTreeNode extends CommandTreeNode { public StatValueCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/quest/CancelCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/quest/CancelCommandTreeNode.java index 7cc9e730..60b4b617 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/quest/CancelCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/quest/CancelCommandTreeNode.java @@ -7,8 +7,8 @@ import org.bukkit.entity.Player; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.quest.PlayerQuests; -import net.mmogroup.mmolib.command.api.CommandTreeNode; -import net.mmogroup.mmolib.command.api.Parameter; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.Parameter; public class CancelCommandTreeNode extends CommandTreeNode { public CancelCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/quest/QuestCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/quest/QuestCommandTreeNode.java index 4c9ae130..d3fb4eb0 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/quest/QuestCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/quest/QuestCommandTreeNode.java @@ -2,7 +2,7 @@ package net.Indyuce.mmocore.command.rpg.quest; import org.bukkit.command.CommandSender; -import net.mmogroup.mmolib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; public class QuestCommandTreeNode extends CommandTreeNode { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/quest/StartCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/quest/StartCommandTreeNode.java index 5721d172..868a4adf 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/quest/StartCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/quest/StartCommandTreeNode.java @@ -10,8 +10,8 @@ import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.quest.PlayerQuests; import net.Indyuce.mmocore.api.quest.Quest; import net.Indyuce.mmocore.command.MMOCoreCommandTreeRoot; -import net.mmogroup.mmolib.command.api.CommandTreeNode; -import net.mmogroup.mmolib.command.api.Parameter; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.Parameter; public class StartCommandTreeNode extends CommandTreeNode { public StartCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/OpenCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/OpenCommandTreeNode.java index 3a7bd80f..f4b818ef 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/OpenCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/OpenCommandTreeNode.java @@ -6,8 +6,8 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import net.Indyuce.mmocore.manager.InventoryManager; -import net.mmogroup.mmolib.command.api.CommandTreeNode; -import net.mmogroup.mmolib.command.api.Parameter; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.Parameter; public class OpenCommandTreeNode extends CommandTreeNode { public OpenCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/TeleportCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/TeleportCommandTreeNode.java index cf9d8237..a6f4ca96 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/TeleportCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/TeleportCommandTreeNode.java @@ -1,15 +1,14 @@ package net.Indyuce.mmocore.command.rpg.waypoint; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.Parameter; +import net.Indyuce.mmocore.MMOCore; +import net.Indyuce.mmocore.api.Waypoint; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import net.Indyuce.mmocore.MMOCore; -import net.Indyuce.mmocore.api.Waypoint; -import net.mmogroup.mmolib.command.api.CommandTreeNode; -import net.mmogroup.mmolib.command.api.Parameter; - public class TeleportCommandTreeNode extends CommandTreeNode { public TeleportCommandTreeNode(CommandTreeNode parent) { super(parent, "teleport"); diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/UnlockCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/UnlockCommandTreeNode.java index 017b01df..50eac9c5 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/UnlockCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/UnlockCommandTreeNode.java @@ -8,8 +8,8 @@ import org.bukkit.entity.Player; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.Waypoint; import net.Indyuce.mmocore.api.player.PlayerData; -import net.mmogroup.mmolib.command.api.CommandTreeNode; -import net.mmogroup.mmolib.command.api.Parameter; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.Parameter; public class UnlockCommandTreeNode extends CommandTreeNode { public UnlockCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/WaypointsCommandTreeNode.java b/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/WaypointsCommandTreeNode.java index fccf99b5..2c426760 100644 --- a/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/WaypointsCommandTreeNode.java +++ b/src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/WaypointsCommandTreeNode.java @@ -2,7 +2,7 @@ package net.Indyuce.mmocore.command.rpg.waypoint; import org.bukkit.command.CommandSender; -import net.mmogroup.mmolib.command.api.CommandTreeNode; +import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode; public class WaypointsCommandTreeNode extends CommandTreeNode { public WaypointsCommandTreeNode(CommandTreeNode parent) { diff --git a/src/main/java/net/Indyuce/mmocore/comp/citizens/CitizensMMOLoader.java b/src/main/java/net/Indyuce/mmocore/comp/citizens/CitizensMMOLoader.java index 26e3a76a..3d421934 100644 --- a/src/main/java/net/Indyuce/mmocore/comp/citizens/CitizensMMOLoader.java +++ b/src/main/java/net/Indyuce/mmocore/comp/citizens/CitizensMMOLoader.java @@ -4,7 +4,7 @@ import org.bukkit.configuration.ConfigurationSection; import net.Indyuce.mmocore.api.load.MMOLoader; import net.Indyuce.mmocore.api.quest.objective.Objective; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class CitizensMMOLoader extends MMOLoader { diff --git a/src/main/java/net/Indyuce/mmocore/comp/citizens/GetItemObjective.java b/src/main/java/net/Indyuce/mmocore/comp/citizens/GetItemObjective.java index 8805ee91..103dd856 100644 --- a/src/main/java/net/Indyuce/mmocore/comp/citizens/GetItemObjective.java +++ b/src/main/java/net/Indyuce/mmocore/comp/citizens/GetItemObjective.java @@ -10,7 +10,7 @@ import org.bukkit.inventory.ItemStack; import net.Indyuce.mmocore.api.quest.ObjectiveProgress; import net.Indyuce.mmocore.api.quest.QuestProgress; import net.Indyuce.mmocore.api.quest.objective.Objective; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class GetItemObjective extends Objective { private final Material material; diff --git a/src/main/java/net/Indyuce/mmocore/comp/citizens/TalktoCitizenObjective.java b/src/main/java/net/Indyuce/mmocore/comp/citizens/TalktoCitizenObjective.java index e4894c62..63b2976f 100644 --- a/src/main/java/net/Indyuce/mmocore/comp/citizens/TalktoCitizenObjective.java +++ b/src/main/java/net/Indyuce/mmocore/comp/citizens/TalktoCitizenObjective.java @@ -7,7 +7,7 @@ import org.bukkit.event.Listener; import net.Indyuce.mmocore.api.quest.ObjectiveProgress; import net.Indyuce.mmocore.api.quest.QuestProgress; import net.Indyuce.mmocore.api.quest.objective.Objective; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class TalktoCitizenObjective extends Objective { private final int id; diff --git a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/MythicMobsMMOLoader.java b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/MythicMobsMMOLoader.java index 43426510..be2157d4 100644 --- a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/MythicMobsMMOLoader.java +++ b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/MythicMobsMMOLoader.java @@ -12,7 +12,7 @@ import net.Indyuce.mmocore.comp.mythicmobs.load.KillMythicFactionObjective; import net.Indyuce.mmocore.comp.mythicmobs.load.KillMythicMobExperienceSource; import net.Indyuce.mmocore.comp.mythicmobs.load.KillMythicMobObjective; import net.Indyuce.mmocore.comp.mythicmobs.load.MythicMobSkillTrigger; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class MythicMobsMMOLoader extends MMOLoader { diff --git a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/GoldPouchDrop.java b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/GoldPouchDrop.java index e4194a58..57f8c2ac 100644 --- a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/GoldPouchDrop.java +++ b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/GoldPouchDrop.java @@ -15,8 +15,8 @@ import io.lumine.xikage.mythicmobs.io.MythicLineConfig; import net.Indyuce.mmocore.api.util.MMOCoreUtils; import net.Indyuce.mmocore.api.util.item.ConfigItem; import net.Indyuce.mmocore.api.util.item.CurrencyItem; -import net.mmogroup.mmolib.api.item.ItemTag; -import net.mmogroup.mmolib.api.item.NBTItem; +import io.lumine.mythic.lib.api.item.ItemTag; +import io.lumine.mythic.lib.api.item.NBTItem; public class GoldPouchDrop extends Drop implements IMultiDrop { private final int min; diff --git a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/KillMythicFactionExperienceSource.java b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/KillMythicFactionExperienceSource.java index aee174bb..7c9999c9 100644 --- a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/KillMythicFactionExperienceSource.java +++ b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/KillMythicFactionExperienceSource.java @@ -10,7 +10,7 @@ import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.experience.source.type.SpecificExperienceSource; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.manager.profession.ExperienceManager; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class KillMythicFactionExperienceSource extends SpecificExperienceSource { private final String factionName; diff --git a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/KillMythicFactionObjective.java b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/KillMythicFactionObjective.java index e39c03bd..f3f7dfd1 100644 --- a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/KillMythicFactionObjective.java +++ b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/KillMythicFactionObjective.java @@ -9,7 +9,7 @@ import io.lumine.xikage.mythicmobs.api.bukkit.events.MythicMobDeathEvent; import net.Indyuce.mmocore.api.quest.ObjectiveProgress; import net.Indyuce.mmocore.api.quest.QuestProgress; import net.Indyuce.mmocore.api.quest.objective.Objective; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class KillMythicFactionObjective extends Objective { private final String factionName; diff --git a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/KillMythicMobExperienceSource.java b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/KillMythicMobExperienceSource.java index 90298eaa..537da125 100644 --- a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/KillMythicMobExperienceSource.java +++ b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/KillMythicMobExperienceSource.java @@ -10,7 +10,7 @@ import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.experience.source.type.SpecificExperienceSource; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.manager.profession.ExperienceManager; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class KillMythicMobExperienceSource extends SpecificExperienceSource { private final String internalName; diff --git a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/KillMythicMobObjective.java b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/KillMythicMobObjective.java index 29497a53..e932722d 100644 --- a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/KillMythicMobObjective.java +++ b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/KillMythicMobObjective.java @@ -9,7 +9,7 @@ import io.lumine.xikage.mythicmobs.api.bukkit.events.MythicMobDeathEvent; import net.Indyuce.mmocore.api.quest.ObjectiveProgress; import net.Indyuce.mmocore.api.quest.QuestProgress; import net.Indyuce.mmocore.api.quest.objective.Objective; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class KillMythicMobObjective extends Objective { private final String internalName; diff --git a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/MythicMobSkillTrigger.java b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/MythicMobSkillTrigger.java index 0c17ac50..ae0e4611 100644 --- a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/MythicMobSkillTrigger.java +++ b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/MythicMobSkillTrigger.java @@ -11,7 +11,7 @@ import io.lumine.xikage.mythicmobs.MythicMobs; import io.lumine.xikage.mythicmobs.skills.Skill; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.quest.trigger.Trigger; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class MythicMobSkillTrigger extends Trigger { private final Skill skill; diff --git a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/skill/MythicMobSkill.java b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/skill/MythicMobSkill.java index d0501e9f..f3b8b12d 100644 --- a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/skill/MythicMobSkill.java +++ b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/skill/MythicMobSkill.java @@ -1,19 +1,6 @@ package net.Indyuce.mmocore.comp.mythicmobs.skill; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.logging.Level; - -import net.mmogroup.mmolib.api.util.EnumUtils; -import org.apache.commons.lang.Validate; -import org.bukkit.Bukkit; -import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.entity.Entity; - +import io.lumine.mythic.lib.api.util.EnumUtils; import io.lumine.xikage.mythicmobs.MythicMobs; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; @@ -24,6 +11,14 @@ import net.Indyuce.mmocore.api.util.MMOCoreUtils; import net.Indyuce.mmocore.api.util.math.formula.IntegerLinearValue; import net.Indyuce.mmocore.api.util.math.formula.LinearValue; import net.Indyuce.mmocore.comp.anticheat.CheatType; +import org.apache.commons.lang.Validate; +import org.bukkit.Bukkit; +import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.entity.Entity; + +import java.util.*; +import java.util.logging.Level; public class MythicMobSkill extends Skill { private final io.lumine.xikage.mythicmobs.skills.Skill skill; diff --git a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/skill/handlers/EntityDeathSkillHandler.java b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/skill/handlers/EntityDeathSkillHandler.java index ed513b72..b8cb6dd3 100644 --- a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/skill/handlers/EntityDeathSkillHandler.java +++ b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/skill/handlers/EntityDeathSkillHandler.java @@ -1,13 +1,13 @@ package net.Indyuce.mmocore.comp.mythicmobs.skill.handlers; +import io.lumine.mythic.lib.api.event.EntityKillEntityEvent; +import net.Indyuce.mmocore.api.player.PlayerData; +import net.Indyuce.mmocore.comp.mythicmobs.skill.MythicMobSkill; +import net.Indyuce.mmocore.comp.mythicmobs.skill.PassiveMythicMobSkillHandler; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; -import net.Indyuce.mmocore.api.player.PlayerData; -import net.Indyuce.mmocore.comp.mythicmobs.skill.MythicMobSkill; -import net.Indyuce.mmocore.comp.mythicmobs.skill.PassiveMythicMobSkillHandler; -import net.mmogroup.mmolib.api.event.EntityKillEntityEvent; public class EntityDeathSkillHandler extends PassiveMythicMobSkillHandler { /** diff --git a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/skill/handlers/PlayerAttackSkillHandler.java b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/skill/handlers/PlayerAttackSkillHandler.java index 58a84a8a..82b38966 100644 --- a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/skill/handlers/PlayerAttackSkillHandler.java +++ b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/skill/handlers/PlayerAttackSkillHandler.java @@ -5,7 +5,7 @@ import org.bukkit.event.EventHandler; import net.Indyuce.mmocore.comp.mythicmobs.skill.MythicMobSkill; import net.Indyuce.mmocore.comp.mythicmobs.skill.PassiveMythicMobSkillHandler; -import net.mmogroup.mmolib.api.event.PlayerAttackEvent; +import io.lumine.mythic.lib.api.event.PlayerAttackEvent; public class PlayerAttackSkillHandler extends PassiveMythicMobSkillHandler { /** diff --git a/src/main/java/net/Indyuce/mmocore/comp/placeholder/DefaultParser.java b/src/main/java/net/Indyuce/mmocore/comp/placeholder/DefaultParser.java index ee82d3d4..a1529c1a 100644 --- a/src/main/java/net/Indyuce/mmocore/comp/placeholder/DefaultParser.java +++ b/src/main/java/net/Indyuce/mmocore/comp/placeholder/DefaultParser.java @@ -2,12 +2,12 @@ package net.Indyuce.mmocore.comp.placeholder; import org.bukkit.OfflinePlayer; -import net.mmogroup.mmolib.MMOLib; +import io.lumine.mythic.lib.MythicLib; public class DefaultParser implements PlaceholderParser { @Override public String parse(OfflinePlayer player, String string) { - return MMOLib.plugin.parseColors(string.replace("%player%", player.getName())); + return MythicLib.plugin.parseColors(string.replace("%player%", player.getName())); } } diff --git a/src/main/java/net/Indyuce/mmocore/comp/placeholder/PlaceholderAPIParser.java b/src/main/java/net/Indyuce/mmocore/comp/placeholder/PlaceholderAPIParser.java index 783e1698..4776fdf4 100644 --- a/src/main/java/net/Indyuce/mmocore/comp/placeholder/PlaceholderAPIParser.java +++ b/src/main/java/net/Indyuce/mmocore/comp/placeholder/PlaceholderAPIParser.java @@ -3,7 +3,7 @@ package net.Indyuce.mmocore.comp.placeholder; import org.bukkit.OfflinePlayer; import me.clip.placeholderapi.PlaceholderAPI; -import net.mmogroup.mmolib.MMOLib; +import io.lumine.mythic.lib.MythicLib; public class PlaceholderAPIParser implements PlaceholderParser { public PlaceholderAPIParser() { @@ -12,6 +12,6 @@ public class PlaceholderAPIParser implements PlaceholderParser { @Override public String parse(OfflinePlayer player, String string) { - return MMOLib.plugin.parseColors(PlaceholderAPI.setPlaceholders(player, string.replace("%player%", player.getName()))); + return MythicLib.plugin.parseColors(PlaceholderAPI.setPlaceholders(player, string.replace("%player%", player.getName()))); } } diff --git a/src/main/java/net/Indyuce/mmocore/comp/placeholder/RPGPlaceholders.java b/src/main/java/net/Indyuce/mmocore/comp/placeholder/RPGPlaceholders.java index 1610b752..25177eaf 100644 --- a/src/main/java/net/Indyuce/mmocore/comp/placeholder/RPGPlaceholders.java +++ b/src/main/java/net/Indyuce/mmocore/comp/placeholder/RPGPlaceholders.java @@ -1,12 +1,7 @@ package net.Indyuce.mmocore.comp.placeholder; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.OfflinePlayer; -import org.bukkit.attribute.Attribute; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.util.AltChar; import me.clip.placeholderapi.expansion.PlaceholderExpansion; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.experience.PlayerProfessions; @@ -14,8 +9,13 @@ import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.stats.StatType; import net.Indyuce.mmocore.api.quest.PlayerQuests; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.util.AltChar; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.OfflinePlayer; +import org.bukkit.attribute.Attribute; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + public class RPGPlaceholders extends PlaceholderExpansion { @Override @@ -58,7 +58,7 @@ public class RPGPlaceholders extends PlaceholderExpansion { else if (identifier.equals("level_percent")) { double current = playerData.getExperience(), next = playerData.getLevelUpExperience(); - return MMOLib.plugin.getMMOConfig().decimal.format(current / next * 100); + return MythicLib.plugin.getMMOConfig().decimal.format(current / next * 100); } else if (identifier.equals("health") && player.isOnline()) { @@ -85,7 +85,7 @@ public class RPGPlaceholders extends PlaceholderExpansion { String name = identifier.substring(19).replace(" ", "-").replace("_", "-").toLowerCase(); Profession profession = MMOCore.plugin.professionManager.get(name); double current = professions.getExperience(profession), next = professions.getLevelUpExperience(profession); - return MMOLib.plugin.getMMOConfig().decimal.format(current / next * 100); + return MythicLib.plugin.getMMOConfig().decimal.format(current / next * 100); } else if (identifier.startsWith("is_casting")) { @@ -135,7 +135,7 @@ public class RPGPlaceholders extends PlaceholderExpansion { .getAttribute(MMOCore.plugin.attributeManager.get(identifier.substring(10).toLowerCase().replace("_", "-")))); else if (identifier.equals("mana")) - return MMOLib.plugin.getMMOConfig().decimal.format(playerData.getMana()); + return MythicLib.plugin.getMMOConfig().decimal.format(playerData.getMana()); else if (identifier.equals("mana_bar")) { return playerData.getProfess().getManaDisplay().generateBar(playerData.getMana(), playerData.getStats().getStat(StatType.MAX_MANA)); @@ -144,17 +144,17 @@ public class RPGPlaceholders extends PlaceholderExpansion { else if (identifier.startsWith("exp_multiplier_")) { String format = identifier.substring(15).toLowerCase().replace("_", "-").replace(" ", "-"); Profession profession = format.equals("main") ? null : MMOCore.plugin.professionManager.get(format); - return MMOLib.plugin.getMMOConfig().decimal.format(MMOCore.plugin.boosterManager.getMultiplier(profession) * 100); + return MythicLib.plugin.getMMOConfig().decimal.format(MMOCore.plugin.boosterManager.getMultiplier(profession) * 100); } else if (identifier.startsWith("exp_boost_")) { String format = identifier.substring(10).toLowerCase().replace("_", "-").replace(" ", "-"); Profession profession = format.equals("main") ? null : MMOCore.plugin.professionManager.get(format); - return MMOLib.plugin.getMMOConfig().decimal.format((MMOCore.plugin.boosterManager.getMultiplier(profession) - 1) * 100); + return MythicLib.plugin.getMMOConfig().decimal.format((MMOCore.plugin.boosterManager.getMultiplier(profession) - 1) * 100); } else if (identifier.equals("stamina")) - return MMOLib.plugin.getMMOConfig().decimal.format(playerData.getStamina()); + return MythicLib.plugin.getMMOConfig().decimal.format(playerData.getStamina()); else if (identifier.equals("stamina_bar")) { StringBuilder format = new StringBuilder(); @@ -172,7 +172,7 @@ public class RPGPlaceholders extends PlaceholderExpansion { } else if (identifier.equals("stellium")) - return MMOLib.plugin.getMMOConfig().decimal.format(playerData.getStellium()); + return MythicLib.plugin.getMMOConfig().decimal.format(playerData.getStellium()); else if (identifier.equals("stellium_bar")) { StringBuilder format = new StringBuilder(); @@ -189,7 +189,7 @@ public class RPGPlaceholders extends PlaceholderExpansion { else if (identifier.equals("quest_progress")) { PlayerQuests data = playerData.getQuestData(); - return data.hasCurrent() ? MMOLib.plugin.getMMOConfig().decimal + return data.hasCurrent() ? MythicLib.plugin.getMMOConfig().decimal .format((int) (double) data.getCurrent().getObjectiveNumber() / data.getCurrent().getQuest().getObjectives().size() * 100) : "0"; } diff --git a/src/main/java/net/Indyuce/mmocore/comp/region/RegionCondition.java b/src/main/java/net/Indyuce/mmocore/comp/region/RegionCondition.java index 8c1c7c4d..0795d84d 100644 --- a/src/main/java/net/Indyuce/mmocore/comp/region/RegionCondition.java +++ b/src/main/java/net/Indyuce/mmocore/comp/region/RegionCondition.java @@ -5,7 +5,7 @@ import java.util.List; import net.Indyuce.mmocore.api.droptable.condition.Condition; import net.Indyuce.mmocore.api.droptable.condition.ConditionInstance; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class RegionCondition extends Condition { private final List names; diff --git a/src/main/java/net/Indyuce/mmocore/comp/region/WorldGuardMMOLoader.java b/src/main/java/net/Indyuce/mmocore/comp/region/WorldGuardMMOLoader.java index 2721595e..5fed85e4 100644 --- a/src/main/java/net/Indyuce/mmocore/comp/region/WorldGuardMMOLoader.java +++ b/src/main/java/net/Indyuce/mmocore/comp/region/WorldGuardMMOLoader.java @@ -2,7 +2,7 @@ package net.Indyuce.mmocore.comp.region; import net.Indyuce.mmocore.api.droptable.condition.Condition; import net.Indyuce.mmocore.api.load.MMOLoader; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class WorldGuardMMOLoader extends MMOLoader { diff --git a/src/main/java/net/Indyuce/mmocore/comp/vault/MoneyTrigger.java b/src/main/java/net/Indyuce/mmocore/comp/vault/MoneyTrigger.java index 39c44680..94b16b01 100644 --- a/src/main/java/net/Indyuce/mmocore/comp/vault/MoneyTrigger.java +++ b/src/main/java/net/Indyuce/mmocore/comp/vault/MoneyTrigger.java @@ -4,7 +4,7 @@ import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.quest.trigger.Trigger; import net.Indyuce.mmocore.api.util.math.formula.RandomAmount; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class MoneyTrigger extends Trigger { private final RandomAmount amount; diff --git a/src/main/java/net/Indyuce/mmocore/comp/vault/VaultMMOLoader.java b/src/main/java/net/Indyuce/mmocore/comp/vault/VaultMMOLoader.java index b78f7bcd..a77f69f7 100644 --- a/src/main/java/net/Indyuce/mmocore/comp/vault/VaultMMOLoader.java +++ b/src/main/java/net/Indyuce/mmocore/comp/vault/VaultMMOLoader.java @@ -2,7 +2,7 @@ package net.Indyuce.mmocore.comp.vault; import net.Indyuce.mmocore.api.load.MMOLoader; import net.Indyuce.mmocore.api.quest.trigger.Trigger; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class VaultMMOLoader extends MMOLoader { diff --git a/src/main/java/net/Indyuce/mmocore/gui/ClassSelect.java b/src/main/java/net/Indyuce/mmocore/gui/ClassSelect.java index a28b1510..2dffda23 100644 --- a/src/main/java/net/Indyuce/mmocore/gui/ClassSelect.java +++ b/src/main/java/net/Indyuce/mmocore/gui/ClassSelect.java @@ -23,9 +23,9 @@ import net.Indyuce.mmocore.gui.api.item.InventoryItem; import net.Indyuce.mmocore.gui.api.item.NoPlaceholderItem; import net.Indyuce.mmocore.manager.InventoryManager; import net.Indyuce.mmocore.manager.SoundManager; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.item.ItemTag; -import net.mmogroup.mmolib.api.item.NBTItem; +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.item.ItemTag; +import io.lumine.mythic.lib.api.item.NBTItem; public class ClassSelect extends EditableInventory { public ClassSelect() { @@ -68,7 +68,7 @@ public class ClassSelect extends EditableInventory { ItemMeta meta = item.getItemMeta(); if (hideFlags()) meta.addItemFlags(ItemFlag.values()); - meta.setDisplayName(MMOLib.plugin.parseColors(name).replace("{name}", profess.getName())); + meta.setDisplayName(MythicLib.plugin.parseColors(name).replace("{name}", profess.getName())); List lore = new ArrayList<>(this.lore); int index = lore.indexOf("{lore}"); diff --git a/src/main/java/net/Indyuce/mmocore/gui/PlayerStats.java b/src/main/java/net/Indyuce/mmocore/gui/PlayerStats.java index b6c6adfa..757e437e 100644 --- a/src/main/java/net/Indyuce/mmocore/gui/PlayerStats.java +++ b/src/main/java/net/Indyuce/mmocore/gui/PlayerStats.java @@ -21,7 +21,7 @@ import net.Indyuce.mmocore.gui.api.item.InventoryItem; import net.Indyuce.mmocore.gui.api.item.InventoryPlaceholderItem; import net.Indyuce.mmocore.gui.api.item.NoPlaceholderItem; import net.Indyuce.mmocore.gui.api.item.Placeholders; -import net.mmogroup.mmolib.version.VersionMaterial; +import io.lumine.mythic.lib.version.VersionMaterial; public class PlayerStats extends EditableInventory { public PlayerStats() { diff --git a/src/main/java/net/Indyuce/mmocore/gui/QuestViewer.java b/src/main/java/net/Indyuce/mmocore/gui/QuestViewer.java index 51b48584..96749198 100644 --- a/src/main/java/net/Indyuce/mmocore/gui/QuestViewer.java +++ b/src/main/java/net/Indyuce/mmocore/gui/QuestViewer.java @@ -26,8 +26,8 @@ import net.Indyuce.mmocore.gui.api.item.InventoryPlaceholderItem; import net.Indyuce.mmocore.gui.api.item.NoPlaceholderItem; import net.Indyuce.mmocore.gui.api.item.Placeholders; import net.Indyuce.mmocore.manager.SoundManager; -import net.mmogroup.mmolib.api.item.ItemTag; -import net.mmogroup.mmolib.api.item.NBTItem; +import io.lumine.mythic.lib.api.item.ItemTag; +import io.lumine.mythic.lib.api.item.NBTItem; public class QuestViewer extends EditableInventory { public QuestViewer() { diff --git a/src/main/java/net/Indyuce/mmocore/gui/SkillList.java b/src/main/java/net/Indyuce/mmocore/gui/SkillList.java index 3e00d48e..358fb5ac 100644 --- a/src/main/java/net/Indyuce/mmocore/gui/SkillList.java +++ b/src/main/java/net/Indyuce/mmocore/gui/SkillList.java @@ -26,9 +26,9 @@ import net.Indyuce.mmocore.gui.api.item.InventoryItem; import net.Indyuce.mmocore.gui.api.item.InventoryPlaceholderItem; import net.Indyuce.mmocore.gui.api.item.NoPlaceholderItem; import net.Indyuce.mmocore.gui.api.item.Placeholders; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.item.ItemTag; -import net.mmogroup.mmolib.api.item.NBTItem; +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.item.ItemTag; +import io.lumine.mythic.lib.api.item.NBTItem; public class SkillList extends EditableInventory { public SkillList() { @@ -70,7 +70,7 @@ public class SkillList extends EditableInventory { if (function.equals("slot")) return new InventoryPlaceholderItem(config) { - private final String none = MMOLib.plugin.parseColors(config.getString("no-skill")); + private final String none = MythicLib.plugin.parseColors(config.getString("no-skill")); private final Material emptyMaterial = Material .valueOf(config.getString("empty-item").toUpperCase().replace("-", "_").replace(" ", "_")); private final int emptyCMD = config.getInt("empty-custom-model-data", getModelData()); @@ -96,7 +96,7 @@ public class SkillList extends EditableInventory { if (!inv.getPlayerData().hasSkillBound(n)) { item.setType(emptyMaterial); - if (MMOLib.plugin.getVersion().isStrictlyHigher(1, 13)) { + if (MythicLib.plugin.getVersion().isStrictlyHigher(1, 13)) { ItemMeta meta = item.getItemMeta(); meta.setCustomModelData(emptyCMD); item.setItemMeta(meta); @@ -177,15 +177,15 @@ public class SkillList extends EditableInventory { lore.add(index + j, skillLore.get(j)); for (int j = 0; j < lore.size(); j++) - lore.set(j, ChatColor.GRAY + MMOLib.plugin.parseColors(lore.get(j))); + lore.set(j, ChatColor.GRAY + MythicLib.plugin.parseColors(lore.get(j))); ItemStack item = new ItemStack(getMaterial()); ItemMeta meta = item.getItemMeta(); - meta.setDisplayName(MMOLib.plugin.parseColors(getName().replace("{skill}", skill.getSkill().getName()) + meta.setDisplayName(MythicLib.plugin.parseColors(getName().replace("{skill}", skill.getSkill().getName()) .replace("{roman}", MMOCoreUtils.intToRoman(skillLevel)).replace("{level}", "" + skillLevel))); meta.addItemFlags(ItemFlag.values()); meta.setLore(lore); - if (MMOLib.plugin.getVersion().isStrictlyHigher(1, 13)) + if (MythicLib.plugin.getVersion().isStrictlyHigher(1, 13)) meta.setCustomModelData(getModelData()); item.setItemMeta(meta); diff --git a/src/main/java/net/Indyuce/mmocore/gui/SubclassSelect.java b/src/main/java/net/Indyuce/mmocore/gui/SubclassSelect.java index f0f6b402..fec8cb9e 100644 --- a/src/main/java/net/Indyuce/mmocore/gui/SubclassSelect.java +++ b/src/main/java/net/Indyuce/mmocore/gui/SubclassSelect.java @@ -20,9 +20,9 @@ import net.Indyuce.mmocore.gui.api.item.InventoryItem; import net.Indyuce.mmocore.gui.api.item.NoPlaceholderItem; import net.Indyuce.mmocore.manager.InventoryManager; import net.Indyuce.mmocore.manager.SoundManager; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.item.ItemTag; -import net.mmogroup.mmolib.api.item.NBTItem; +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.item.ItemTag; +import io.lumine.mythic.lib.api.item.NBTItem; public class SubclassSelect extends EditableInventory { public SubclassSelect() { @@ -65,7 +65,7 @@ public class SubclassSelect extends EditableInventory { ItemStack item = profess.getIcon(); ItemMeta meta = item.getItemMeta(); - meta.setDisplayName(MMOLib.plugin.parseColors(name).replace("{name}", profess.getName())); + meta.setDisplayName(MythicLib.plugin.parseColors(name).replace("{name}", profess.getName())); List lore = new ArrayList<>(this.lore); int index = lore.indexOf("{lore}"); diff --git a/src/main/java/net/Indyuce/mmocore/gui/WaypointViewer.java b/src/main/java/net/Indyuce/mmocore/gui/WaypointViewer.java index 1f6547e3..38507907 100644 --- a/src/main/java/net/Indyuce/mmocore/gui/WaypointViewer.java +++ b/src/main/java/net/Indyuce/mmocore/gui/WaypointViewer.java @@ -19,8 +19,8 @@ import net.Indyuce.mmocore.gui.api.item.InventoryItem; import net.Indyuce.mmocore.gui.api.item.InventoryPlaceholderItem; import net.Indyuce.mmocore.gui.api.item.NoPlaceholderItem; import net.Indyuce.mmocore.gui.api.item.Placeholders; -import net.mmogroup.mmolib.api.item.ItemTag; -import net.mmogroup.mmolib.api.item.NBTItem; +import io.lumine.mythic.lib.api.item.ItemTag; +import io.lumine.mythic.lib.api.item.NBTItem; public class WaypointViewer extends EditableInventory { public WaypointViewer() { diff --git a/src/main/java/net/Indyuce/mmocore/gui/api/EditableInventory.java b/src/main/java/net/Indyuce/mmocore/gui/api/EditableInventory.java index d942c8c9..a8de6b39 100644 --- a/src/main/java/net/Indyuce/mmocore/gui/api/EditableInventory.java +++ b/src/main/java/net/Indyuce/mmocore/gui/api/EditableInventory.java @@ -1,19 +1,18 @@ package net.Indyuce.mmocore.gui.api; +import io.lumine.mythic.lib.MythicLib; +import net.Indyuce.mmocore.MMOCore; +import net.Indyuce.mmocore.gui.api.item.InventoryItem; +import net.Indyuce.mmocore.gui.api.item.TriggerItem; +import org.apache.commons.lang.Validate; +import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.configuration.file.FileConfiguration; + import java.text.DecimalFormat; import java.util.LinkedHashSet; import java.util.Set; import java.util.logging.Level; -import net.mmogroup.mmolib.MMOLib; -import org.apache.commons.lang.Validate; -import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.configuration.file.FileConfiguration; - -import net.Indyuce.mmocore.MMOCore; -import net.Indyuce.mmocore.gui.api.item.InventoryItem; -import net.Indyuce.mmocore.gui.api.item.TriggerItem; - public abstract class EditableInventory { private final String id; @@ -26,7 +25,7 @@ public abstract class EditableInventory { */ private final Set items = new LinkedHashSet<>(); - protected static final DecimalFormat decimal = MMOLib.plugin.getMMOConfig().decimal; + protected static final DecimalFormat decimal = MythicLib.plugin.getMMOConfig().decimal; public EditableInventory(String id) { this.id = id; diff --git a/src/main/java/net/Indyuce/mmocore/gui/api/GeneratedInventory.java b/src/main/java/net/Indyuce/mmocore/gui/api/GeneratedInventory.java index 24a2b29b..4fe60788 100644 --- a/src/main/java/net/Indyuce/mmocore/gui/api/GeneratedInventory.java +++ b/src/main/java/net/Indyuce/mmocore/gui/api/GeneratedInventory.java @@ -10,7 +10,7 @@ import org.bukkit.inventory.Inventory; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.gui.api.item.InventoryItem; import net.Indyuce.mmocore.gui.api.item.TriggerItem; -import net.mmogroup.mmolib.MMOLib; +import io.lumine.mythic.lib.MythicLib; public abstract class GeneratedInventory extends PluginInventory { private final EditableInventory editable; @@ -54,7 +54,7 @@ public abstract class GeneratedInventory extends PluginInventory { @Override public Inventory getInventory() { - Inventory inv = Bukkit.createInventory(this, editable.getSlots(), MMOLib.plugin.parseColors(calculateName())); + Inventory inv = Bukkit.createInventory(this, editable.getSlots(), MythicLib.plugin.parseColors(calculateName())); for (InventoryItem item : editable.getItems()) if (item.canDisplay(this)) diff --git a/src/main/java/net/Indyuce/mmocore/gui/api/item/InventoryPlaceholderItem.java b/src/main/java/net/Indyuce/mmocore/gui/api/item/InventoryPlaceholderItem.java index 8cbe145b..bfeeaebf 100644 --- a/src/main/java/net/Indyuce/mmocore/gui/api/item/InventoryPlaceholderItem.java +++ b/src/main/java/net/Indyuce/mmocore/gui/api/item/InventoryPlaceholderItem.java @@ -20,7 +20,7 @@ import com.mojang.authlib.properties.Property; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.gui.api.GeneratedInventory; import net.Indyuce.mmocore.gui.api.PluginInventory; -import net.mmogroup.mmolib.MMOLib; +import io.lumine.mythic.lib.MythicLib; public abstract class InventoryPlaceholderItem extends InventoryItem { private final Material material; @@ -110,7 +110,7 @@ public abstract class InventoryPlaceholderItem extends InventoryItem { meta.setLore(lore); } - if (MMOLib.plugin.getVersion().isStrictlyHigher(1, 13)) + if (MythicLib.plugin.getVersion().isStrictlyHigher(1, 13)) meta.setCustomModelData(getModelData()); item.setItemMeta(meta); diff --git a/src/main/java/net/Indyuce/mmocore/gui/api/item/TriggerItem.java b/src/main/java/net/Indyuce/mmocore/gui/api/item/TriggerItem.java index 6dc1603b..2eef64b3 100644 --- a/src/main/java/net/Indyuce/mmocore/gui/api/item/TriggerItem.java +++ b/src/main/java/net/Indyuce/mmocore/gui/api/item/TriggerItem.java @@ -5,7 +5,7 @@ import org.bukkit.configuration.ConfigurationSection; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.quest.trigger.Trigger; import net.Indyuce.mmocore.gui.api.PluginInventory; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class TriggerItem extends InventoryPlaceholderItem { private final Trigger trigger; diff --git a/src/main/java/net/Indyuce/mmocore/gui/eco/DepositMenu.java b/src/main/java/net/Indyuce/mmocore/gui/eco/DepositMenu.java index ea6a3d7e..7a9f24b3 100644 --- a/src/main/java/net/Indyuce/mmocore/gui/eco/DepositMenu.java +++ b/src/main/java/net/Indyuce/mmocore/gui/eco/DepositMenu.java @@ -14,8 +14,8 @@ import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.util.MMOCoreUtils; import net.Indyuce.mmocore.api.util.item.ConfigItem; import net.Indyuce.mmocore.gui.api.PluginInventory; -import net.mmogroup.mmolib.api.item.NBTItem; -import net.mmogroup.mmolib.api.util.SmartGive; +import io.lumine.mythic.lib.api.item.NBTItem; +import io.lumine.mythic.lib.api.util.SmartGive; public class DepositMenu extends PluginInventory { private ItemStack depositItem; diff --git a/src/main/java/net/Indyuce/mmocore/gui/eco/GoldPouch.java b/src/main/java/net/Indyuce/mmocore/gui/eco/GoldPouch.java index d67d385a..e0f018ff 100644 --- a/src/main/java/net/Indyuce/mmocore/gui/eco/GoldPouch.java +++ b/src/main/java/net/Indyuce/mmocore/gui/eco/GoldPouch.java @@ -12,8 +12,8 @@ import org.bukkit.inventory.ItemStack; import net.Indyuce.mmocore.api.util.MMOCoreUtils; import net.Indyuce.mmocore.gui.api.PluginInventory; -import net.mmogroup.mmolib.api.item.ItemTag; -import net.mmogroup.mmolib.api.item.NBTItem; +import io.lumine.mythic.lib.api.item.ItemTag; +import io.lumine.mythic.lib.api.item.NBTItem; public class GoldPouch extends PluginInventory { private final boolean mob; diff --git a/src/main/java/net/Indyuce/mmocore/gui/social/friend/EditableFriendList.java b/src/main/java/net/Indyuce/mmocore/gui/social/friend/EditableFriendList.java index 8a85e7ac..6a5c6070 100644 --- a/src/main/java/net/Indyuce/mmocore/gui/social/friend/EditableFriendList.java +++ b/src/main/java/net/Indyuce/mmocore/gui/social/friend/EditableFriendList.java @@ -26,8 +26,8 @@ import net.Indyuce.mmocore.gui.api.item.InventoryPlaceholderItem; import net.Indyuce.mmocore.gui.api.item.NoPlaceholderItem; import net.Indyuce.mmocore.gui.api.item.Placeholders; import net.Indyuce.mmocore.manager.InventoryManager; -import net.mmogroup.mmolib.api.item.ItemTag; -import net.mmogroup.mmolib.api.item.NBTItem; +import io.lumine.mythic.lib.api.item.ItemTag; +import io.lumine.mythic.lib.api.item.NBTItem; public class EditableFriendList extends EditableInventory { public EditableFriendList() { diff --git a/src/main/java/net/Indyuce/mmocore/gui/social/guild/EditableGuildAdmin.java b/src/main/java/net/Indyuce/mmocore/gui/social/guild/EditableGuildAdmin.java index 0e81bf2f..51a53438 100644 --- a/src/main/java/net/Indyuce/mmocore/gui/social/guild/EditableGuildAdmin.java +++ b/src/main/java/net/Indyuce/mmocore/gui/social/guild/EditableGuildAdmin.java @@ -25,8 +25,8 @@ import net.Indyuce.mmocore.gui.api.item.InventoryItem; import net.Indyuce.mmocore.gui.api.item.InventoryPlaceholderItem; import net.Indyuce.mmocore.gui.api.item.NoPlaceholderItem; import net.Indyuce.mmocore.gui.api.item.Placeholders; -import net.mmogroup.mmolib.api.item.ItemTag; -import net.mmogroup.mmolib.api.item.NBTItem; +import io.lumine.mythic.lib.api.item.ItemTag; +import io.lumine.mythic.lib.api.item.NBTItem; public class EditableGuildAdmin extends EditableInventory { public EditableGuildAdmin() { diff --git a/src/main/java/net/Indyuce/mmocore/gui/social/guild/EditableGuildView.java b/src/main/java/net/Indyuce/mmocore/gui/social/guild/EditableGuildView.java index 332cd46c..ee2f453b 100644 --- a/src/main/java/net/Indyuce/mmocore/gui/social/guild/EditableGuildView.java +++ b/src/main/java/net/Indyuce/mmocore/gui/social/guild/EditableGuildView.java @@ -26,8 +26,8 @@ import net.Indyuce.mmocore.gui.api.item.InventoryItem; import net.Indyuce.mmocore.gui.api.item.InventoryPlaceholderItem; import net.Indyuce.mmocore.gui.api.item.NoPlaceholderItem; import net.Indyuce.mmocore.gui.api.item.Placeholders; -import net.mmogroup.mmolib.api.item.ItemTag; -import net.mmogroup.mmolib.api.item.NBTItem; +import io.lumine.mythic.lib.api.item.ItemTag; +import io.lumine.mythic.lib.api.item.NBTItem; public class EditableGuildView extends EditableInventory { public EditableGuildView() { diff --git a/src/main/java/net/Indyuce/mmocore/gui/social/party/EditablePartyView.java b/src/main/java/net/Indyuce/mmocore/gui/social/party/EditablePartyView.java index c0abb935..7db95023 100644 --- a/src/main/java/net/Indyuce/mmocore/gui/social/party/EditablePartyView.java +++ b/src/main/java/net/Indyuce/mmocore/gui/social/party/EditablePartyView.java @@ -1,7 +1,18 @@ package net.Indyuce.mmocore.gui.social.party; -import java.util.UUID; - +import io.lumine.mythic.lib.api.item.ItemTag; +import io.lumine.mythic.lib.api.item.NBTItem; +import net.Indyuce.mmocore.MMOCore; +import net.Indyuce.mmocore.api.player.PlayerData; +import net.Indyuce.mmocore.api.util.input.PlayerInput.InputType; +import net.Indyuce.mmocore.api.util.math.format.DelayFormat; +import net.Indyuce.mmocore.gui.api.EditableInventory; +import net.Indyuce.mmocore.gui.api.GeneratedInventory; +import net.Indyuce.mmocore.gui.api.PluginInventory; +import net.Indyuce.mmocore.gui.api.item.InventoryItem; +import net.Indyuce.mmocore.gui.api.item.InventoryPlaceholderItem; +import net.Indyuce.mmocore.gui.api.item.NoPlaceholderItem; +import net.Indyuce.mmocore.gui.api.item.Placeholders; import org.apache.commons.lang.Validate; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; @@ -14,19 +25,9 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.SkullMeta; -import net.Indyuce.mmocore.MMOCore; -import net.Indyuce.mmocore.api.player.PlayerData; -import net.Indyuce.mmocore.api.util.input.PlayerInput.InputType; -import net.Indyuce.mmocore.api.util.math.format.DelayFormat; -import net.Indyuce.mmocore.gui.api.EditableInventory; -import net.Indyuce.mmocore.gui.api.GeneratedInventory; -import net.Indyuce.mmocore.gui.api.PluginInventory; -import net.Indyuce.mmocore.gui.api.item.InventoryItem; -import net.Indyuce.mmocore.gui.api.item.InventoryPlaceholderItem; -import net.Indyuce.mmocore.gui.api.item.NoPlaceholderItem; -import net.Indyuce.mmocore.gui.api.item.Placeholders; -import net.mmogroup.mmolib.api.item.ItemTag; -import net.mmogroup.mmolib.api.item.NBTItem; +import java.util.UUID; + + public class EditablePartyView extends EditableInventory { public EditablePartyView() { diff --git a/src/main/java/net/Indyuce/mmocore/listener/BlockListener.java b/src/main/java/net/Indyuce/mmocore/listener/BlockListener.java index 19bbace5..e025f265 100644 --- a/src/main/java/net/Indyuce/mmocore/listener/BlockListener.java +++ b/src/main/java/net/Indyuce/mmocore/listener/BlockListener.java @@ -27,7 +27,7 @@ import net.Indyuce.mmocore.api.block.BlockInfo.BlockInfoOption; import net.Indyuce.mmocore.api.event.CustomBlockMineEvent; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.util.MMOCoreUtils; -import net.mmogroup.mmolib.UtilityMethods; +import io.lumine.mythic.lib.UtilityMethods; public class BlockListener implements Listener { private static final BlockFace[] order = { BlockFace.UP, BlockFace.DOWN, BlockFace.EAST, BlockFace.NORTH, BlockFace.WEST, BlockFace.SOUTH }; diff --git a/src/main/java/net/Indyuce/mmocore/listener/GoldPouchesListener.java b/src/main/java/net/Indyuce/mmocore/listener/GoldPouchesListener.java index a980e661..3de515f0 100644 --- a/src/main/java/net/Indyuce/mmocore/listener/GoldPouchesListener.java +++ b/src/main/java/net/Indyuce/mmocore/listener/GoldPouchesListener.java @@ -9,7 +9,7 @@ import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; import net.Indyuce.mmocore.gui.eco.GoldPouch; -import net.mmogroup.mmolib.api.item.NBTItem; +import io.lumine.mythic.lib.api.item.NBTItem; public class GoldPouchesListener implements Listener { @EventHandler diff --git a/src/main/java/net/Indyuce/mmocore/listener/PartyListener.java b/src/main/java/net/Indyuce/mmocore/listener/PartyListener.java index ddfb051b..2c80f5c1 100644 --- a/src/main/java/net/Indyuce/mmocore/listener/PartyListener.java +++ b/src/main/java/net/Indyuce/mmocore/listener/PartyListener.java @@ -12,7 +12,7 @@ import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.event.social.PartyChatEvent; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.manager.ConfigManager.SimpleMessage; -import net.mmogroup.mmolib.api.event.PlayerAttackEvent; +import io.lumine.mythic.lib.api.event.PlayerAttackEvent; public class PartyListener implements Listener { diff --git a/src/main/java/net/Indyuce/mmocore/listener/profession/FishingListener.java b/src/main/java/net/Indyuce/mmocore/listener/profession/FishingListener.java index 2b7be833..83bb797a 100644 --- a/src/main/java/net/Indyuce/mmocore/listener/profession/FishingListener.java +++ b/src/main/java/net/Indyuce/mmocore/listener/profession/FishingListener.java @@ -32,7 +32,7 @@ import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.stats.StatType; import net.Indyuce.mmocore.api.util.MMOCoreUtils; import net.Indyuce.mmocore.manager.profession.FishingManager.FishingDropTable; -import net.mmogroup.mmolib.version.VersionSound; +import io.lumine.mythic.lib.version.VersionSound; public class FishingListener implements Listener { private final Set fishing = new HashSet<>(); diff --git a/src/main/java/net/Indyuce/mmocore/listener/profession/PlayerCollectStats.java b/src/main/java/net/Indyuce/mmocore/listener/profession/PlayerCollectStats.java index 18332c8f..b27a618b 100644 --- a/src/main/java/net/Indyuce/mmocore/listener/profession/PlayerCollectStats.java +++ b/src/main/java/net/Indyuce/mmocore/listener/profession/PlayerCollectStats.java @@ -14,7 +14,7 @@ import org.bukkit.potion.PotionEffectType; import net.Indyuce.mmocore.api.event.CustomBlockMineEvent; import net.Indyuce.mmocore.api.player.stats.StatType; import net.Indyuce.mmocore.api.util.math.particle.SmallParticleEffect; -import net.mmogroup.mmolib.MMOLib; +import io.lumine.mythic.lib.MythicLib; public class PlayerCollectStats implements Listener { private static final Random random = new Random(); @@ -39,7 +39,7 @@ public class PlayerCollectStats implements Listener { item.setAmount(item.getAmount() + a); } - if(MMOLib.plugin.getVersion().getWrapper().isCropFullyGrown(event.getBlock())) + if(MythicLib.plugin.getVersion().getWrapper().isCropFullyGrown(event.getBlock())) { // drop more items if fortune enchant double l = event.getData().getStats().getStat(StatType.LUCK_OF_THE_FIELD); diff --git a/src/main/java/net/Indyuce/mmocore/manager/ConfigManager.java b/src/main/java/net/Indyuce/mmocore/manager/ConfigManager.java index da063a28..abda34d0 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/ConfigManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/ConfigManager.java @@ -1,5 +1,7 @@ package net.Indyuce.mmocore.manager; +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.util.EnumUtils; import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.ConfigFile; import net.Indyuce.mmocore.api.player.PlayerData; @@ -8,8 +10,6 @@ import net.Indyuce.mmocore.api.util.input.ChatInput; import net.Indyuce.mmocore.api.util.input.PlayerInput; import net.Indyuce.mmocore.api.util.input.PlayerInput.InputType; import net.Indyuce.mmocore.command.CommandVerbose; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.util.EnumUtils; import org.bukkit.ChatColor; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; @@ -152,7 +152,7 @@ public class ConfigManager { String format = messages.getString(key, ""); for (int j = 0; j < placeholders.length - 1; j += 2) format = format.replace("{" + placeholders[j] + "}", placeholders[j + 1]); - return new SimpleMessage(MMOLib.plugin.parseColors(format)); + return new SimpleMessage(MythicLib.plugin.parseColors(format)); } public static class SimpleMessage { diff --git a/src/main/java/net/Indyuce/mmocore/manager/CustomBlockManager.java b/src/main/java/net/Indyuce/mmocore/manager/CustomBlockManager.java index 97c2bcc4..90283e76 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/CustomBlockManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/CustomBlockManager.java @@ -10,7 +10,7 @@ import net.Indyuce.mmocore.api.block.VanillaBlockType; import net.Indyuce.mmocore.api.droptable.condition.Condition; import net.Indyuce.mmocore.api.droptable.condition.ConditionInstance; import net.Indyuce.mmocore.api.util.MMOCoreUtils; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.block.Block; diff --git a/src/main/java/net/Indyuce/mmocore/manager/DropTableManager.java b/src/main/java/net/Indyuce/mmocore/manager/DropTableManager.java index f38fc9d9..c8a25660 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/DropTableManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/DropTableManager.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Set; import java.util.logging.Level; -import net.mmogroup.mmolib.api.util.PostLoadObject; +import io.lumine.mythic.lib.api.util.PostLoadObject; import org.bukkit.Bukkit; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.file.FileConfiguration; diff --git a/src/main/java/net/Indyuce/mmocore/manager/MMOLoadManager.java b/src/main/java/net/Indyuce/mmocore/manager/MMOLoadManager.java index c4e2b8c1..148bf05a 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/MMOLoadManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/MMOLoadManager.java @@ -18,7 +18,7 @@ import net.Indyuce.mmocore.api.load.DefaultMMOLoader; import net.Indyuce.mmocore.api.load.MMOLoader; import net.Indyuce.mmocore.api.quest.objective.Objective; import net.Indyuce.mmocore.api.quest.trigger.Trigger; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class MMOLoadManager { private final List loaders = new ArrayList<>(); diff --git a/src/main/java/net/Indyuce/mmocore/manager/RestrictionManager.java b/src/main/java/net/Indyuce/mmocore/manager/RestrictionManager.java index 886a9ee9..b1804b90 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/RestrictionManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/RestrictionManager.java @@ -1,21 +1,20 @@ package net.Indyuce.mmocore.manager; +import io.lumine.mythic.lib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.itemtype.ItemType; +import io.lumine.mythic.lib.api.util.PostLoadObject; +import net.Indyuce.mmocore.MMOCore; +import net.Indyuce.mmocore.api.block.BlockType; +import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.inventory.ItemStack; + import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.logging.Level; -import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.inventory.ItemStack; - -import net.Indyuce.mmocore.MMOCore; -import net.Indyuce.mmocore.api.block.BlockType; -import net.mmogroup.mmolib.api.MMOLineConfig; -import net.mmogroup.mmolib.api.itemtype.ItemType; -import net.mmogroup.mmolib.api.util.PostLoadObject; - public class RestrictionManager { private final Map map = new HashMap<>(); diff --git a/src/main/java/net/Indyuce/mmocore/manager/data/PlayerDataManager.java b/src/main/java/net/Indyuce/mmocore/manager/data/PlayerDataManager.java index 69ae7b8d..b1d895bc 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/data/PlayerDataManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/data/PlayerDataManager.java @@ -13,7 +13,7 @@ import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.event.PlayerDataLoadEvent; import net.Indyuce.mmocore.api.player.OfflinePlayerData; import net.Indyuce.mmocore.api.player.PlayerData; -import net.mmogroup.mmolib.api.player.MMOPlayerData; +import io.lumine.mythic.lib.api.player.MMOPlayerData; public abstract class PlayerDataManager { private final static Map data = new HashMap<>(); diff --git a/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLDataProvider.java b/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLDataProvider.java index 57c28557..e90d93ac 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLDataProvider.java +++ b/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLDataProvider.java @@ -1,12 +1,11 @@ package net.Indyuce.mmocore.manager.data.mysql; -import org.bukkit.configuration.file.FileConfiguration; - +import io.lumine.mythic.lib.sql.MMODataSource; import net.Indyuce.mmocore.manager.data.DataProvider; import net.Indyuce.mmocore.manager.data.GuildDataManager; import net.Indyuce.mmocore.manager.data.PlayerDataManager; import net.Indyuce.mmocore.manager.data.yaml.YAMLGuildDataManager; -import net.mmogroup.mmolib.sql.MMODataSource; +import org.bukkit.configuration.file.FileConfiguration; public class MySQLDataProvider extends MMODataSource implements DataProvider { private final MySQLPlayerDataManager playerManager = new MySQLPlayerDataManager(this); diff --git a/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLPlayerDataManager.java b/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLPlayerDataManager.java index 6be1eebb..77bab968 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLPlayerDataManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/data/mysql/MySQLPlayerDataManager.java @@ -10,7 +10,7 @@ import net.Indyuce.mmocore.api.player.profess.SavedClassInformation; import net.Indyuce.mmocore.api.player.stats.StatType; import net.Indyuce.mmocore.manager.data.PlayerDataManager; import net.Indyuce.mmocore.manager.data.mysql.MySQLTableEditor.Table; -import net.mmogroup.mmolib.MMOLib; +import io.lumine.mythic.lib.MythicLib; import org.apache.commons.lang.Validate; import java.sql.SQLException; @@ -76,7 +76,7 @@ public class MySQLPlayerDataManager extends PlayerDataManager { if (!isEmpty(result.getString("friends"))) getJSONArray(result.getString("friends")).forEach(str -> data.getFriends().add(UUID.fromString(str))); if (!isEmpty(result.getString("skills"))) { - JsonObject object = MMOLib.plugin.getJson().parse(result.getString("skills"), JsonObject.class); + JsonObject object = MythicLib.plugin.getJson().parse(result.getString("skills"), JsonObject.class); for (Entry entry : object.entrySet()) data.setSkillLevel(entry.getKey(), entry.getValue().getAsInt()); } @@ -85,7 +85,7 @@ public class MySQLPlayerDataManager extends PlayerDataManager { if (data.getProfess().hasSkill(skill)) data.getBoundSkills().add(data.getProfess().getSkill(skill)); if (!isEmpty(result.getString("class_info"))) { - JsonObject object = MMOLib.plugin.getJson().parse(result.getString("class_info"), JsonObject.class); + JsonObject object = MythicLib.plugin.getJson().parse(result.getString("class_info"), JsonObject.class); for (Entry entry : object.entrySet()) { try { PlayerClass profess = MMOCore.plugin.classManager.get(entry.getKey()); @@ -172,7 +172,7 @@ public class MySQLPlayerDataManager extends PlayerDataManager { } private Collection getJSONArray(String json) { - return new ArrayList<>(Arrays.asList(MMOLib.plugin.getJson().parse(json, String[].class))); + return new ArrayList<>(Arrays.asList(MythicLib.plugin.getJson().parse(json, String[].class))); } public class MySQLOfflinePlayerData extends OfflinePlayerData { diff --git a/src/main/java/net/Indyuce/mmocore/manager/profession/FishingManager.java b/src/main/java/net/Indyuce/mmocore/manager/profession/FishingManager.java index 61fb1c4e..47e703d0 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/profession/FishingManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/profession/FishingManager.java @@ -17,7 +17,7 @@ import net.Indyuce.mmocore.api.droptable.condition.Condition; import net.Indyuce.mmocore.api.droptable.condition.ConditionInstance; import net.Indyuce.mmocore.api.droptable.dropitem.fishing.FishingDropItem; import net.Indyuce.mmocore.manager.MMOManager; -import net.mmogroup.mmolib.api.MMOLineConfig; +import io.lumine.mythic.lib.api.MMOLineConfig; public class FishingManager extends MMOManager { private final Set tables = new LinkedHashSet<>(); diff --git a/src/main/java/net/Indyuce/mmocore/manager/profession/ProfessionManager.java b/src/main/java/net/Indyuce/mmocore/manager/profession/ProfessionManager.java index bbb196c1..3bba5b39 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/profession/ProfessionManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/profession/ProfessionManager.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.Map; import java.util.logging.Level; -import net.mmogroup.mmolib.api.util.PostLoadObject; +import io.lumine.mythic.lib.api.util.PostLoadObject; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.event.HandlerList; diff --git a/src/main/java/net/Indyuce/mmocore/manager/social/PartyManager.java b/src/main/java/net/Indyuce/mmocore/manager/social/PartyManager.java index cce819f8..8ca0939b 100644 --- a/src/main/java/net/Indyuce/mmocore/manager/social/PartyManager.java +++ b/src/main/java/net/Indyuce/mmocore/manager/social/PartyManager.java @@ -1,19 +1,19 @@ package net.Indyuce.mmocore.manager.social; +import io.lumine.mythic.lib.api.stat.modifier.StatModifier; +import net.Indyuce.mmocore.MMOCore; +import net.Indyuce.mmocore.api.player.PlayerData; +import net.Indyuce.mmocore.api.player.social.Party; +import net.Indyuce.mmocore.api.player.stats.StatType; +import net.Indyuce.mmocore.manager.MMOManager; +import org.bukkit.configuration.ConfigurationSection; + import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; import java.util.logging.Level; -import org.bukkit.configuration.ConfigurationSection; - -import net.Indyuce.mmocore.MMOCore; -import net.Indyuce.mmocore.api.player.PlayerData; -import net.Indyuce.mmocore.api.player.social.Party; -import net.Indyuce.mmocore.api.player.stats.StatType; -import net.Indyuce.mmocore.manager.MMOManager; -import net.mmogroup.mmolib.api.stat.modifier.StatModifier; public class PartyManager extends MMOManager { private final Set parties = new HashSet<>(); diff --git a/src/main/java/net/Indyuce/mmocore/skill/Ambers.java b/src/main/java/net/Indyuce/mmocore/skill/Ambers.java index 4f4cf3ae..a390bac8 100644 --- a/src/main/java/net/Indyuce/mmocore/skill/Ambers.java +++ b/src/main/java/net/Indyuce/mmocore/skill/Ambers.java @@ -17,8 +17,8 @@ import net.Indyuce.mmocore.api.skill.Skill; import net.Indyuce.mmocore.api.skill.SkillResult; import net.Indyuce.mmocore.api.util.math.formula.LinearValue; import net.Indyuce.mmocore.api.util.math.particle.ParabolicProjectile; -import net.mmogroup.mmolib.api.DamageType; -import net.mmogroup.mmolib.api.event.PlayerAttackEvent; +import io.lumine.mythic.lib.api.DamageType; +import io.lumine.mythic.lib.api.event.PlayerAttackEvent; public class Ambers extends Skill implements Listener { public Ambers() { diff --git a/src/main/java/net/Indyuce/mmocore/skill/Backstab.java b/src/main/java/net/Indyuce/mmocore/skill/Backstab.java index d9c778f9..7fcc8b4e 100644 --- a/src/main/java/net/Indyuce/mmocore/skill/Backstab.java +++ b/src/main/java/net/Indyuce/mmocore/skill/Backstab.java @@ -13,8 +13,8 @@ import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.skill.Skill; import net.Indyuce.mmocore.api.skill.SkillResult; import net.Indyuce.mmocore.api.util.math.formula.LinearValue; -import net.mmogroup.mmolib.api.DamageType; -import net.mmogroup.mmolib.api.event.PlayerAttackEvent; +import io.lumine.mythic.lib.api.DamageType; +import io.lumine.mythic.lib.api.event.PlayerAttackEvent; public class Backstab extends Skill implements Listener { public Backstab() { diff --git a/src/main/java/net/Indyuce/mmocore/skill/Combo_Attack.java b/src/main/java/net/Indyuce/mmocore/skill/Combo_Attack.java index 74788540..661543be 100644 --- a/src/main/java/net/Indyuce/mmocore/skill/Combo_Attack.java +++ b/src/main/java/net/Indyuce/mmocore/skill/Combo_Attack.java @@ -12,9 +12,9 @@ import net.Indyuce.mmocore.api.skill.Skill; import net.Indyuce.mmocore.api.skill.SkillResult; import net.Indyuce.mmocore.api.skill.result.TargetSkillResult; import net.Indyuce.mmocore.api.util.math.formula.LinearValue; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.AttackResult; -import net.mmogroup.mmolib.api.DamageType; +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.AttackResult; +import io.lumine.mythic.lib.api.DamageType; public class Combo_Attack extends Skill { public Combo_Attack() { @@ -51,7 +51,7 @@ public class Combo_Attack extends Skill { target.getWorld().playSound(target.getLocation(), Sound.ENTITY_PLAYER_ATTACK_KNOCKBACK, 1, 2); target.getWorld().spawnParticle(Particle.CRIT, target.getLocation().add(0, target.getHeight() / 2, 0), 24, 0, 0, 0, .7); - MMOLib.plugin.getDamage().damage(data.getPlayer(), target, new AttackResult(damage, DamageType.SKILL, DamageType.PHYSICAL)); + MythicLib.plugin.getDamage().damage(data.getPlayer(), target, new AttackResult(damage, DamageType.SKILL, DamageType.PHYSICAL)); } }.runTaskTimer(MMOCore.plugin, 0, 5); return cast; diff --git a/src/main/java/net/Indyuce/mmocore/skill/Control.java b/src/main/java/net/Indyuce/mmocore/skill/Control.java index c32b0356..6887d08f 100644 --- a/src/main/java/net/Indyuce/mmocore/skill/Control.java +++ b/src/main/java/net/Indyuce/mmocore/skill/Control.java @@ -19,8 +19,8 @@ import net.Indyuce.mmocore.api.skill.Skill; import net.Indyuce.mmocore.api.skill.SkillResult; import net.Indyuce.mmocore.api.skill.result.TargetSkillResult; import net.Indyuce.mmocore.api.util.math.formula.LinearValue; -import net.mmogroup.mmolib.version.VersionMaterial; -import net.mmogroup.mmolib.version.VersionSound; +import io.lumine.mythic.lib.version.VersionMaterial; +import io.lumine.mythic.lib.version.VersionSound; public class Control extends Skill { public Control() { diff --git a/src/main/java/net/Indyuce/mmocore/skill/Deep_Wound.java b/src/main/java/net/Indyuce/mmocore/skill/Deep_Wound.java index 5c98ec7b..0f338aaf 100644 --- a/src/main/java/net/Indyuce/mmocore/skill/Deep_Wound.java +++ b/src/main/java/net/Indyuce/mmocore/skill/Deep_Wound.java @@ -11,9 +11,9 @@ import net.Indyuce.mmocore.api.skill.Skill; import net.Indyuce.mmocore.api.skill.SkillResult; import net.Indyuce.mmocore.api.skill.result.TargetSkillResult; import net.Indyuce.mmocore.api.util.math.formula.LinearValue; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.AttackResult; -import net.mmogroup.mmolib.api.DamageType; +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.AttackResult; +import io.lumine.mythic.lib.api.DamageType; public class Deep_Wound extends Skill { public Deep_Wound() { @@ -44,7 +44,7 @@ public class Deep_Wound extends Skill { double ratio = (max - target.getHealth()) / max; double damage = cast.getModifier("damage") * (1 + cast.getModifier("extra") * ratio / 100); - MMOLib.plugin.getDamage().damage(data.getPlayer(), target, new AttackResult(damage, DamageType.SKILL, DamageType.PHYSICAL)); + MythicLib.plugin.getDamage().damage(data.getPlayer(), target, new AttackResult(damage, DamageType.SKILL, DamageType.PHYSICAL)); return cast; } } diff --git a/src/main/java/net/Indyuce/mmocore/skill/Empowered_Attack.java b/src/main/java/net/Indyuce/mmocore/skill/Empowered_Attack.java index 8c2a4b41..2c99a5e8 100644 --- a/src/main/java/net/Indyuce/mmocore/skill/Empowered_Attack.java +++ b/src/main/java/net/Indyuce/mmocore/skill/Empowered_Attack.java @@ -1,5 +1,18 @@ package net.Indyuce.mmocore.skill; +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.AttackResult; +import io.lumine.mythic.lib.api.DamageType; +import io.lumine.mythic.lib.api.event.PlayerAttackEvent; +import io.lumine.mythic.lib.version.VersionMaterial; +import io.lumine.mythic.lib.version.VersionSound; +import net.Indyuce.mmocore.MMOCore; +import net.Indyuce.mmocore.api.player.PlayerData; +import net.Indyuce.mmocore.api.skill.Skill; +import net.Indyuce.mmocore.api.skill.SkillResult; +import net.Indyuce.mmocore.api.util.MMOCoreUtils; +import net.Indyuce.mmocore.api.util.math.formula.LinearValue; +import net.Indyuce.mmocore.api.util.math.particle.SmallParticleEffect; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Particle; @@ -10,20 +23,6 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.util.Vector; -import net.Indyuce.mmocore.MMOCore; -import net.Indyuce.mmocore.api.player.PlayerData; -import net.Indyuce.mmocore.api.skill.Skill; -import net.Indyuce.mmocore.api.skill.SkillResult; -import net.Indyuce.mmocore.api.util.MMOCoreUtils; -import net.Indyuce.mmocore.api.util.math.formula.LinearValue; -import net.Indyuce.mmocore.api.util.math.particle.SmallParticleEffect; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.AttackResult; -import net.mmogroup.mmolib.api.DamageType; -import net.mmogroup.mmolib.api.event.PlayerAttackEvent; -import net.mmogroup.mmolib.version.VersionMaterial; -import net.mmogroup.mmolib.version.VersionSound; - public class Empowered_Attack extends Skill { private static final double perb = 5; @@ -109,7 +108,7 @@ public class Empowered_Attack extends Skill { for (Entity entity : target.getNearbyEntities(rad, rad, rad)) if (MMOCoreUtils.canTarget(player, entity)) { drawVector(src, entity.getLocation().add(0, entity.getHeight() / 2, 0).subtract(src).toVector()); - MMOLib.plugin.getDamage().damage(player.getPlayer(), (LivingEntity) entity, new AttackResult(sweep, DamageType.SKILL, DamageType.PHYSICAL)); + MythicLib.plugin.getDamage().damage(player.getPlayer(), (LivingEntity) entity, new AttackResult(sweep, DamageType.SKILL, DamageType.PHYSICAL)); } /* diff --git a/src/main/java/net/Indyuce/mmocore/skill/Evade.java b/src/main/java/net/Indyuce/mmocore/skill/Evade.java index c458bef6..ae88973a 100644 --- a/src/main/java/net/Indyuce/mmocore/skill/Evade.java +++ b/src/main/java/net/Indyuce/mmocore/skill/Evade.java @@ -15,9 +15,9 @@ import net.Indyuce.mmocore.api.skill.Skill; import net.Indyuce.mmocore.api.skill.SkillResult; import net.Indyuce.mmocore.api.util.math.formula.LinearValue; import net.Indyuce.mmocore.api.util.math.particle.SmallParticleEffect; -import net.mmogroup.mmolib.api.DamageType; -import net.mmogroup.mmolib.api.event.PlayerAttackEvent; -import net.mmogroup.mmolib.version.VersionSound; +import io.lumine.mythic.lib.api.DamageType; +import io.lumine.mythic.lib.api.event.PlayerAttackEvent; +import io.lumine.mythic.lib.version.VersionSound; public class Evade extends Skill { public Evade() { diff --git a/src/main/java/net/Indyuce/mmocore/skill/Fire_Berserker.java b/src/main/java/net/Indyuce/mmocore/skill/Fire_Berserker.java index 12df2248..fa7f81b5 100644 --- a/src/main/java/net/Indyuce/mmocore/skill/Fire_Berserker.java +++ b/src/main/java/net/Indyuce/mmocore/skill/Fire_Berserker.java @@ -12,7 +12,7 @@ import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.skill.Skill; import net.Indyuce.mmocore.api.util.math.formula.LinearValue; -import net.mmogroup.mmolib.api.event.PlayerAttackEvent; +import io.lumine.mythic.lib.api.event.PlayerAttackEvent; public class Fire_Berserker extends Skill implements Listener { public Fire_Berserker() { diff --git a/src/main/java/net/Indyuce/mmocore/skill/Fire_Rage.java b/src/main/java/net/Indyuce/mmocore/skill/Fire_Rage.java index ce138489..53a12a29 100644 --- a/src/main/java/net/Indyuce/mmocore/skill/Fire_Rage.java +++ b/src/main/java/net/Indyuce/mmocore/skill/Fire_Rage.java @@ -22,11 +22,11 @@ import net.Indyuce.mmocore.api.skill.SkillResult; import net.Indyuce.mmocore.api.util.MMOCoreUtils; import net.Indyuce.mmocore.api.util.math.VectorRotation; import net.Indyuce.mmocore.api.util.math.formula.LinearValue; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.AttackResult; -import net.mmogroup.mmolib.api.DamageType; -import net.mmogroup.mmolib.version.VersionMaterial; -import net.mmogroup.mmolib.version.VersionSound; +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.AttackResult; +import io.lumine.mythic.lib.api.DamageType; +import io.lumine.mythic.lib.version.VersionMaterial; +import io.lumine.mythic.lib.version.VersionSound; public class Fire_Rage extends Skill { public Fire_Rage() { @@ -136,12 +136,12 @@ public class Fire_Rage extends Skill { loc.getWorld().spawnParticle(Particle.LAVA, loc, 0); for (Entity target : MMOCoreUtils.getNearbyChunkEntities(loc)) - if (MMOLib.plugin.getVersion().getWrapper().isInBoundingBox(target, loc) && MMOCoreUtils.canTarget(data, target)) { + if (MythicLib.plugin.getVersion().getWrapper().isInBoundingBox(target, loc) && MMOCoreUtils.canTarget(data, target)) { loc.getWorld().spawnParticle(Particle.LAVA, loc, 8); loc.getWorld().spawnParticle(Particle.FLAME, loc, 32, 0, 0, 0, .1); loc.getWorld().playSound(loc, Sound.ENTITY_BLAZE_HURT, 2, 1); target.setFireTicks(target.getFireTicks() + ignite); - MMOLib.plugin.getDamage().damage(data.getPlayer(), (LivingEntity) target, new AttackResult(damage, DamageType.SKILL, DamageType.PROJECTILE, DamageType.MAGIC)); + MythicLib.plugin.getDamage().damage(data.getPlayer(), (LivingEntity) target, new AttackResult(damage, DamageType.SKILL, DamageType.PROJECTILE, DamageType.MAGIC)); cancel(); } } diff --git a/src/main/java/net/Indyuce/mmocore/skill/Fire_Storm.java b/src/main/java/net/Indyuce/mmocore/skill/Fire_Storm.java index dc8a6bab..4a704208 100644 --- a/src/main/java/net/Indyuce/mmocore/skill/Fire_Storm.java +++ b/src/main/java/net/Indyuce/mmocore/skill/Fire_Storm.java @@ -15,10 +15,10 @@ import net.Indyuce.mmocore.api.skill.SkillResult; import net.Indyuce.mmocore.api.skill.result.TargetSkillResult; import net.Indyuce.mmocore.api.util.math.formula.LinearValue; import net.Indyuce.mmocore.api.util.math.particle.ParabolicProjectile; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.AttackResult; -import net.mmogroup.mmolib.api.DamageType; -import net.mmogroup.mmolib.version.VersionSound; +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.AttackResult; +import io.lumine.mythic.lib.api.DamageType; +import io.lumine.mythic.lib.version.VersionSound; public class Fire_Storm extends Skill { public Fire_Storm() { @@ -60,7 +60,7 @@ public class Fire_Storm extends Skill { new ParabolicProjectile(data.getPlayer().getLocation().add(0, 1, 0), target.getLocation().add(0, target.getHeight() / 2, 0), randomVector(data.getPlayer()), () -> { target.getWorld().playSound(target.getLocation(), VersionSound.ENTITY_FIREWORK_ROCKET_TWINKLE.toSound(), 1, 2); target.getWorld().spawnParticle(Particle.SMOKE_NORMAL, target.getLocation().add(0, target.getHeight() / 2, 0), 8, 0, 0, 0, .15); - MMOLib.plugin.getDamage().damage(data.getPlayer(), target, new AttackResult(damage, DamageType.SKILL, DamageType.PROJECTILE, DamageType.MAGIC)); + MythicLib.plugin.getDamage().damage(data.getPlayer(), target, new AttackResult(damage, DamageType.SKILL, DamageType.PROJECTILE, DamageType.MAGIC)); target.setFireTicks(ignite); }, 2, Particle.FLAME); diff --git a/src/main/java/net/Indyuce/mmocore/skill/Fireball.java b/src/main/java/net/Indyuce/mmocore/skill/Fireball.java index 473f4d7f..239ddde0 100644 --- a/src/main/java/net/Indyuce/mmocore/skill/Fireball.java +++ b/src/main/java/net/Indyuce/mmocore/skill/Fireball.java @@ -1,5 +1,17 @@ package net.Indyuce.mmocore.skill; +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.AttackResult; +import io.lumine.mythic.lib.api.DamageType; +import io.lumine.mythic.lib.api.MMORayTraceResult; +import io.lumine.mythic.lib.version.VersionMaterial; +import io.lumine.mythic.lib.version.VersionSound; +import net.Indyuce.mmocore.MMOCore; +import net.Indyuce.mmocore.api.player.PlayerData; +import net.Indyuce.mmocore.api.skill.Skill; +import net.Indyuce.mmocore.api.skill.SkillResult; +import net.Indyuce.mmocore.api.util.MMOCoreUtils; +import net.Indyuce.mmocore.api.util.math.formula.LinearValue; import org.bukkit.Location; import org.bukkit.Particle; import org.bukkit.Sound; @@ -8,19 +20,6 @@ import org.bukkit.entity.LivingEntity; import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.util.Vector; -import net.Indyuce.mmocore.MMOCore; -import net.Indyuce.mmocore.api.player.PlayerData; -import net.Indyuce.mmocore.api.skill.Skill; -import net.Indyuce.mmocore.api.skill.SkillResult; -import net.Indyuce.mmocore.api.util.MMOCoreUtils; -import net.Indyuce.mmocore.api.util.math.formula.LinearValue; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.AttackResult; -import net.mmogroup.mmolib.api.DamageType; -import net.mmogroup.mmolib.api.MMORayTraceResult; -import net.mmogroup.mmolib.version.VersionMaterial; -import net.mmogroup.mmolib.version.VersionSound; - public class Fireball extends Skill { public Fireball() { super(); @@ -60,13 +59,13 @@ public class Fireball extends Skill { loc.getWorld().spawnParticle(Particle.LAVA, loc, 0); for (Entity target : MMOCoreUtils.getNearbyChunkEntities(loc)) - if (MMOLib.plugin.getVersion().getWrapper().isInBoundingBox(target, loc) && MMOCoreUtils.canTarget(data, target)) { + if (MythicLib.plugin.getVersion().getWrapper().isInBoundingBox(target, loc) && MMOCoreUtils.canTarget(data, target)) { loc.getWorld().spawnParticle(Particle.LAVA, loc, 8); loc.getWorld().spawnParticle(Particle.FLAME, loc, 32, 0, 0, 0, .1); loc.getWorld().playSound(loc, Sound.ENTITY_BLAZE_HURT, 2, 1); target.setFireTicks((int) (target.getFireTicks() + cast.getModifier("ignite") * 20)); double damage = cast.getModifier("damage"); - MMOLib.plugin.getDamage().damage(data.getPlayer(), (LivingEntity) target, new AttackResult(damage, DamageType.SKILL, DamageType.PROJECTILE, DamageType.MAGIC)); + MythicLib.plugin.getDamage().damage(data.getPlayer(), (LivingEntity) target, new AttackResult(damage, DamageType.SKILL, DamageType.PROJECTILE, DamageType.MAGIC)); new BukkitRunnable() { int i = 0; @@ -82,9 +81,9 @@ public class Fireball extends Skill { Vector dir = randomDirection(); loc.getWorld().playSound(loc, Sound.ENTITY_BLAZE_HURT, 2, 1.5f); - MMORayTraceResult result = MMOLib.plugin.getVersion().getWrapper().rayTrace(loc, dir, range, entity -> MMOCoreUtils.canTarget(data, entity)); + MMORayTraceResult result = MythicLib.plugin.getVersion().getWrapper().rayTrace(loc, dir, range, entity -> MMOCoreUtils.canTarget(data, entity)); if (result.hasHit()) - MMOLib.plugin.getDamage().damage(data.getPlayer(), result.getHit(), new AttackResult(damage, DamageType.SKILL, DamageType.PROJECTILE, DamageType.MAGIC)); + MythicLib.plugin.getDamage().damage(data.getPlayer(), result.getHit(), new AttackResult(damage, DamageType.SKILL, DamageType.PROJECTILE, DamageType.MAGIC)); result.draw(loc.clone(), dir, 8, tick -> tick.getWorld().spawnParticle(Particle.FLAME, tick, 0)); } diff --git a/src/main/java/net/Indyuce/mmocore/skill/Furtive_Strike.java b/src/main/java/net/Indyuce/mmocore/skill/Furtive_Strike.java index 705fa31e..613fe3ac 100644 --- a/src/main/java/net/Indyuce/mmocore/skill/Furtive_Strike.java +++ b/src/main/java/net/Indyuce/mmocore/skill/Furtive_Strike.java @@ -11,9 +11,9 @@ import net.Indyuce.mmocore.api.skill.SkillResult; import net.Indyuce.mmocore.api.skill.result.TargetSkillResult; import net.Indyuce.mmocore.api.util.math.formula.LinearValue; import net.Indyuce.mmocore.api.util.math.particle.SmallParticleEffect; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.AttackResult; -import net.mmogroup.mmolib.api.DamageType; +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.AttackResult; +import io.lumine.mythic.lib.api.DamageType; public class Furtive_Strike extends Skill { public Furtive_Strike() { @@ -47,7 +47,7 @@ public class Furtive_Strike extends Skill { damage *= 1 + cast.getModifier("extra") / 100; } - MMOLib.plugin.getDamage().damage(data.getPlayer(), target, new AttackResult(damage, DamageType.SKILL, DamageType.PHYSICAL)); + MythicLib.plugin.getDamage().damage(data.getPlayer(), target, new AttackResult(damage, DamageType.SKILL, DamageType.PHYSICAL)); return cast; } } diff --git a/src/main/java/net/Indyuce/mmocore/skill/Human_Shield.java b/src/main/java/net/Indyuce/mmocore/skill/Human_Shield.java index 6d7aab74..380459fd 100644 --- a/src/main/java/net/Indyuce/mmocore/skill/Human_Shield.java +++ b/src/main/java/net/Indyuce/mmocore/skill/Human_Shield.java @@ -17,7 +17,7 @@ import net.Indyuce.mmocore.api.skill.Skill; import net.Indyuce.mmocore.api.skill.SkillResult; import net.Indyuce.mmocore.api.skill.result.TargetSkillResult; import net.Indyuce.mmocore.api.util.math.formula.LinearValue; -import net.mmogroup.mmolib.version.VersionMaterial; +import io.lumine.mythic.lib.version.VersionMaterial; public class Human_Shield extends Skill { public Human_Shield() { diff --git a/src/main/java/net/Indyuce/mmocore/skill/Ice_Spikes.java b/src/main/java/net/Indyuce/mmocore/skill/Ice_Spikes.java index b1f349fb..ff28852f 100644 --- a/src/main/java/net/Indyuce/mmocore/skill/Ice_Spikes.java +++ b/src/main/java/net/Indyuce/mmocore/skill/Ice_Spikes.java @@ -18,10 +18,10 @@ import net.Indyuce.mmocore.api.skill.result.LocationSkillResult; import net.Indyuce.mmocore.api.util.MMOCoreUtils; import net.Indyuce.mmocore.api.util.math.Line3D; import net.Indyuce.mmocore.api.util.math.formula.LinearValue; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.AttackResult; -import net.mmogroup.mmolib.api.DamageType; -import net.mmogroup.mmolib.version.VersionMaterial; +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.AttackResult; +import io.lumine.mythic.lib.api.DamageType; +import io.lumine.mythic.lib.version.VersionMaterial; public class Ice_Spikes extends Skill { private static final double radius = 3; @@ -66,7 +66,7 @@ public class Ice_Spikes extends Skill { Line3D line = new Line3D(loc.toVector(), loc.toVector().add(new Vector(0, 1, 0))); for (Entity entity : MMOCoreUtils.getNearbyChunkEntities(loc1)) if (line.distanceSquared(entity.getLocation().toVector()) < radius && Math.abs(entity.getLocation().getY() - loc1.getY()) < 10 && MMOCoreUtils.canTarget(data, entity)) { - MMOLib.plugin.getDamage().damage(data.getPlayer(), (LivingEntity) entity, new AttackResult(damage, DamageType.SKILL, DamageType.MAGIC)); + MythicLib.plugin.getDamage().damage(data.getPlayer(), (LivingEntity) entity, new AttackResult(damage, DamageType.SKILL, DamageType.MAGIC)); ((LivingEntity) entity).addPotionEffect(new PotionEffect(PotionEffectType.SLOW, slow, 0)); } } diff --git a/src/main/java/net/Indyuce/mmocore/skill/Neptune_Gift.java b/src/main/java/net/Indyuce/mmocore/skill/Neptune_Gift.java index a3686385..9da94530 100644 --- a/src/main/java/net/Indyuce/mmocore/skill/Neptune_Gift.java +++ b/src/main/java/net/Indyuce/mmocore/skill/Neptune_Gift.java @@ -12,7 +12,7 @@ import net.Indyuce.mmocore.api.event.PlayerRegenResourceEvent; import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.skill.Skill; import net.Indyuce.mmocore.api.util.math.formula.LinearValue; -import net.mmogroup.mmolib.version.VersionMaterial; +import io.lumine.mythic.lib.version.VersionMaterial; public class Neptune_Gift extends Skill implements Listener { public Neptune_Gift() { diff --git a/src/main/java/net/Indyuce/mmocore/skill/Power_Mark.java b/src/main/java/net/Indyuce/mmocore/skill/Power_Mark.java index 411dd205..affa38d6 100644 --- a/src/main/java/net/Indyuce/mmocore/skill/Power_Mark.java +++ b/src/main/java/net/Indyuce/mmocore/skill/Power_Mark.java @@ -22,12 +22,12 @@ import net.Indyuce.mmocore.api.skill.SkillResult; import net.Indyuce.mmocore.api.util.MMOCoreUtils; import net.Indyuce.mmocore.api.util.math.formula.LinearValue; import net.Indyuce.mmocore.api.util.math.particle.ParabolicProjectile; -import net.mmogroup.mmolib.MMOLib; -import net.mmogroup.mmolib.api.AttackResult; -import net.mmogroup.mmolib.api.DamageType; -import net.mmogroup.mmolib.api.event.PlayerAttackEvent; -import net.mmogroup.mmolib.version.VersionMaterial; -import net.mmogroup.mmolib.version.VersionSound; +import io.lumine.mythic.lib.MythicLib; +import io.lumine.mythic.lib.api.AttackResult; +import io.lumine.mythic.lib.api.DamageType; +import io.lumine.mythic.lib.api.event.PlayerAttackEvent; +import io.lumine.mythic.lib.version.VersionMaterial; +import io.lumine.mythic.lib.version.VersionSound; public class Power_Mark extends Skill implements Listener { public Power_Mark() { @@ -117,7 +117,7 @@ public class Power_Mark extends Skill implements Listener { for (Entity entity : MMOCoreUtils.getNearbyChunkEntities(loc)) if (entity.getLocation().distanceSquared(loc) < 25 && MMOCoreUtils.canTarget(data, entity)) { ((LivingEntity) entity).addPotionEffect(new PotionEffect(PotionEffectType.SLOW, (int) (stun * 20), 10, false, false)); - MMOLib.plugin.getDamage().damage(data.getPlayer(), (LivingEntity) entity, new AttackResult(accumulate, DamageType.SKILL, DamageType.MAGIC)); + MythicLib.plugin.getDamage().damage(data.getPlayer(), (LivingEntity) entity, new AttackResult(accumulate, DamageType.SKILL, DamageType.MAGIC)); entity.setVelocity(format(entity.getLocation().subtract(loc).toVector().setY(0)).setY(.3)); } return; diff --git a/src/main/java/net/Indyuce/mmocore/skill/Sneaky_Picky.java b/src/main/java/net/Indyuce/mmocore/skill/Sneaky_Picky.java index f731b9b1..39c9cea5 100644 --- a/src/main/java/net/Indyuce/mmocore/skill/Sneaky_Picky.java +++ b/src/main/java/net/Indyuce/mmocore/skill/Sneaky_Picky.java @@ -13,8 +13,8 @@ import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.skill.Skill; import net.Indyuce.mmocore.api.skill.SkillResult; import net.Indyuce.mmocore.api.util.math.formula.LinearValue; -import net.mmogroup.mmolib.api.DamageType; -import net.mmogroup.mmolib.api.event.PlayerAttackEvent; +import io.lumine.mythic.lib.api.DamageType; +import io.lumine.mythic.lib.api.event.PlayerAttackEvent; public class Sneaky_Picky extends Skill implements Listener { public Sneaky_Picky() { diff --git a/src/main/java/net/Indyuce/mmocore/skill/Telekinesy.java b/src/main/java/net/Indyuce/mmocore/skill/Telekinesy.java index b95914be..476f47ca 100644 --- a/src/main/java/net/Indyuce/mmocore/skill/Telekinesy.java +++ b/src/main/java/net/Indyuce/mmocore/skill/Telekinesy.java @@ -18,8 +18,8 @@ import net.Indyuce.mmocore.api.skill.SkillResult; import net.Indyuce.mmocore.api.skill.result.TargetSkillResult; import net.Indyuce.mmocore.api.util.math.formula.LinearValue; import net.Indyuce.mmocore.api.util.math.particle.ParabolicProjectile; -import net.mmogroup.mmolib.version.VersionMaterial; -import net.mmogroup.mmolib.version.VersionSound; +import io.lumine.mythic.lib.version.VersionMaterial; +import io.lumine.mythic.lib.version.VersionSound; public class Telekinesy extends Skill { public Telekinesy() { diff --git a/src/main/java/net/Indyuce/mmocore/skill/Warp.java b/src/main/java/net/Indyuce/mmocore/skill/Warp.java index 993753c8..4ec1b82d 100644 --- a/src/main/java/net/Indyuce/mmocore/skill/Warp.java +++ b/src/main/java/net/Indyuce/mmocore/skill/Warp.java @@ -11,7 +11,7 @@ import net.Indyuce.mmocore.api.skill.Skill; import net.Indyuce.mmocore.api.skill.SkillResult; import net.Indyuce.mmocore.api.util.math.formula.LinearValue; import net.Indyuce.mmocore.api.util.math.particle.ParabolicProjectile; -import net.mmogroup.mmolib.version.VersionSound; +import io.lumine.mythic.lib.version.VersionSound; public class Warp extends Skill { public Warp() { diff --git a/src/main/java/net/Indyuce/mmocore/skill/Weaken.java b/src/main/java/net/Indyuce/mmocore/skill/Weaken.java index b96aa671..e2a42cc9 100644 --- a/src/main/java/net/Indyuce/mmocore/skill/Weaken.java +++ b/src/main/java/net/Indyuce/mmocore/skill/Weaken.java @@ -18,7 +18,7 @@ import net.Indyuce.mmocore.api.skill.result.TargetSkillResult; import net.Indyuce.mmocore.api.util.math.formula.LinearValue; import net.Indyuce.mmocore.api.util.math.particle.ParabolicProjectile; import net.Indyuce.mmocore.api.util.math.particle.SmallParticleEffect; -import net.mmogroup.mmolib.version.VersionMaterial; +import io.lumine.mythic.lib.version.VersionMaterial; public class Weaken extends Skill { public Weaken() {