Fork/mmocore
1
0
Fork 0
forked from Upstream/mmocore
Code Pull Requests Activity

!THIS BUILD USES MYTHICLIB PLEASE DO NOT PUSH OR USE

Browse Source
This commit is contained in:
Joshua 2021-02-03 14:00:20 -06:00
parent 52d525241b
commit 046168b900
173 changed files with 506 additions and 573 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pom.xml
View File

@ -83,6 +83,10 @@
<id>jitpack.io</id> <id>jitpack.io</id>
<url>https://jitpack.io</url> <url>https://jitpack.io</url>
</repository> </repository>
<repository>
<id>lumine-repo</id>
<url>https://mvn.lumine.io/repository/maven-public/</url>
</repository>
<repository> <repository>
<id>spigot-repo</id> <id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url> <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
@ -107,13 +111,19 @@
</dependency> </dependency>
<!-- MMOs --> <!-- MMOs -->
<dependency> <!--<dependency>
<groupId>net.Indyuce</groupId> <groupId>net.Indyuce</groupId>
<artifactId>MMOLib</artifactId> <artifactId>MMOLib</artifactId>
<version>1.7.3</version> <version>1.7.3</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${basedir}/lib/MMOLib.jar</systemPath> <systemPath>${basedir}/lib/MMOLib.jar</systemPath>
</dependency> </dependency>
-->
<dependency>
<groupId>io.lumine</groupId>
<artifactId>MythicLib</artifactId>
<version>0.0.1-20210203.081118-2</version>
</dependency>
<!-- APIs --> <!-- APIs -->
<dependency> <dependency>

47
src/main/java/net/Indyuce/mmocore/MMOCore.java
View File

@ -1,5 +1,7 @@
package net.Indyuce.mmocore; 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.ConfigFile;
import net.Indyuce.mmocore.api.PlayerActionBar; import net.Indyuce.mmocore.api.PlayerActionBar;
import net.Indyuce.mmocore.api.loot.LootChest; 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.social.guilds.Guild;
import net.Indyuce.mmocore.api.player.stats.StatType; import net.Indyuce.mmocore.api.player.stats.StatType;
import net.Indyuce.mmocore.api.util.debug.DebugMode; import net.Indyuce.mmocore.api.util.debug.DebugMode;
import net.Indyuce.mmocore.command.AttributesCommand; import net.Indyuce.mmocore.command.*;
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.comp.anticheat.AntiCheatSupport; import net.Indyuce.mmocore.comp.anticheat.AntiCheatSupport;
import net.Indyuce.mmocore.comp.anticheat.SpartanPlugin; import net.Indyuce.mmocore.comp.anticheat.SpartanPlugin;
import net.Indyuce.mmocore.comp.citizens.CitizenInteractEventListener; 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.region.WorldGuardRegionHandler;
import net.Indyuce.mmocore.comp.vault.VaultEconomy; import net.Indyuce.mmocore.comp.vault.VaultEconomy;
import net.Indyuce.mmocore.comp.vault.VaultMMOLoader; import net.Indyuce.mmocore.comp.vault.VaultMMOLoader;
import net.Indyuce.mmocore.listener.BlockListener; import net.Indyuce.mmocore.listener.*;
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.option.DeathExperienceLoss; import net.Indyuce.mmocore.listener.option.DeathExperienceLoss;
import net.Indyuce.mmocore.listener.option.NoSpawnerEXP; import net.Indyuce.mmocore.listener.option.NoSpawnerEXP;
import net.Indyuce.mmocore.listener.option.RedirectVanillaExp; import net.Indyuce.mmocore.listener.option.RedirectVanillaExp;
import net.Indyuce.mmocore.listener.option.VanillaExperienceOverride; import net.Indyuce.mmocore.listener.option.VanillaExperienceOverride;
import net.Indyuce.mmocore.listener.profession.FishingListener; import net.Indyuce.mmocore.listener.profession.FishingListener;
import net.Indyuce.mmocore.listener.profession.PlayerCollectStats; 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.ExperienceManager;
import net.Indyuce.mmocore.manager.InventoryManager; import net.Indyuce.mmocore.manager.*;
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.data.DataProvider; import net.Indyuce.mmocore.manager.data.DataProvider;
import net.Indyuce.mmocore.manager.data.mysql.MySQLDataProvider; import net.Indyuce.mmocore.manager.data.mysql.MySQLDataProvider;
import net.Indyuce.mmocore.manager.data.yaml.YAMLDataProvider; import net.Indyuce.mmocore.manager.data.yaml.YAMLDataProvider;
import net.Indyuce.mmocore.manager.profession.AlchemyManager; import net.Indyuce.mmocore.manager.profession.*;
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.social.BoosterManager; import net.Indyuce.mmocore.manager.social.BoosterManager;
import net.Indyuce.mmocore.manager.social.PartyManager; import net.Indyuce.mmocore.manager.social.PartyManager;
import net.Indyuce.mmocore.manager.social.RequestManager; 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.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.CommandMap; import org.bukkit.command.CommandMap;

6
src/main/java/net/Indyuce/mmocore/api/ConfigMessage.java
View File

@ -7,7 +7,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.mmogroup.mmolib.MMOLib; import io.lumine.mythic.lib.MythicLib;
public class ConfigMessage { public class ConfigMessage {
private final List<String> messages; private final List<String> messages;
@ -30,7 +30,7 @@ public class ConfigMessage {
} }
public void send(CommandSender sender) { 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<? extends Player> players) { public void send(Collection<? extends Player> players) {
@ -38,6 +38,6 @@ public class ConfigMessage {
} }
public void sendAsJSon(Player player) { 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)));
} }
} }

6
src/main/java/net/Indyuce/mmocore/api/PlayerActionBar.java
View File

@ -11,7 +11,7 @@ import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.player.stats.StatType; import net.Indyuce.mmocore.api.player.stats.StatType;
import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.ChatMessageType;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import net.mmogroup.mmolib.MMOLib; import io.lumine.mythic.lib.MythicLib;
public class PlayerActionBar extends BukkitRunnable { public class PlayerActionBar extends BukkitRunnable {
boolean initialized = false; boolean initialized = false;
@ -21,7 +21,7 @@ public class PlayerActionBar extends BukkitRunnable {
public void reload(ConfigurationSection cfg) { public void reload(ConfigurationSection cfg) {
config = new ActionBarConfig(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) { if(!initialized && config.enabled) {
runTaskTimer(MMOCore.plugin, 0, config.ticks); runTaskTimer(MMOCore.plugin, 0, config.ticks);
@ -38,7 +38,7 @@ public class PlayerActionBar extends BukkitRunnable {
for (PlayerData data : PlayerData.getAll()) for (PlayerData data : PlayerData.getAll())
if (data.isOnline() && !data.getPlayer().isDead() && !data.isCasting() && data.canSeeActionBar()) { 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(), 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("{health}", digit.format(data.getPlayer().getHealth()))
.replace("{max_health}", "" + StatType.MAX_HEALTH.format(data.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue())) .replace("{max_health}", "" + StatType.MAX_HEALTH.format(data.getPlayer().getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()))
.replace("{mana_icon}", data.getProfess().getManaDisplay().getIcon()) .replace("{mana_icon}", data.getProfess().getManaDisplay().getIcon())

27
src/main/java/net/Indyuce/mmocore/api/block/BlockInfo.java
View File

@ -1,11 +1,13 @@
package net.Indyuce.mmocore.api.block; package net.Indyuce.mmocore.api.block;
import java.util.ArrayList; import io.lumine.mythic.lib.UtilityMethods;
import java.util.HashMap; import io.lumine.mythic.lib.api.MMOLineConfig;
import java.util.List; import io.lumine.mythic.lib.api.condition.type.BlockCondition;
import java.util.Map; import io.lumine.mythic.lib.api.condition.type.MMOCondition;
import java.util.logging.Level; 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.apache.commons.lang.Validate;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.block.Block; import org.bukkit.block.Block;
@ -13,14 +15,11 @@ import org.bukkit.block.data.BlockData;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import net.Indyuce.mmocore.MMOCore; import java.util.ArrayList;
import net.Indyuce.mmocore.api.droptable.DropTable; import java.util.HashMap;
import net.Indyuce.mmocore.api.loot.LootBuilder; import java.util.List;
import net.Indyuce.mmocore.api.quest.trigger.Trigger; import java.util.Map;
import net.mmogroup.mmolib.UtilityMethods; import java.util.logging.Level;
import net.mmogroup.mmolib.api.MMOLineConfig;
import net.mmogroup.mmolib.api.condition.type.BlockCondition;
import net.mmogroup.mmolib.api.condition.type.MMOCondition;
public class BlockInfo { public class BlockInfo {
private final BlockType block; private final BlockType block;

2
src/main/java/net/Indyuce/mmocore/api/block/RegenInfo.java
View File

@ -4,7 +4,7 @@ import org.apache.commons.lang.Validate;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.mmogroup.mmolib.api.MMOLineConfig; import io.lumine.mythic.lib.api.MMOLineConfig;
public class RegenInfo { public class RegenInfo {
private final BlockType temporary; private final BlockType temporary;

12
src/main/java/net/Indyuce/mmocore/api/block/SkullBlockType.java
View File

@ -5,9 +5,9 @@ import org.bukkit.block.Block;
import net.Indyuce.mmocore.api.block.BlockInfo.RegeneratingBlock; import net.Indyuce.mmocore.api.block.BlockInfo.RegeneratingBlock;
import net.Indyuce.mmocore.api.util.MMOCoreUtils; import net.Indyuce.mmocore.api.util.MMOCoreUtils;
import net.mmogroup.mmolib.MMOLib; import io.lumine.mythic.lib.MythicLib;
import net.mmogroup.mmolib.api.MMOLineConfig; import io.lumine.mythic.lib.api.MMOLineConfig;
import net.mmogroup.mmolib.version.VersionMaterial; import io.lumine.mythic.lib.version.VersionMaterial;
public class SkullBlockType implements BlockType { public class SkullBlockType implements BlockType {
private final String value; private final String value;
@ -19,7 +19,7 @@ public class SkullBlockType implements BlockType {
} }
public SkullBlockType(Block block) { public SkullBlockType(Block block) {
value = MMOLib.plugin.getVersion().getWrapper().getSkullValue(block); value = MythicLib.plugin.getVersion().getWrapper().getSkullValue(block);
} }
public String getValue() { public String getValue() {
@ -35,7 +35,7 @@ public class SkullBlockType implements BlockType {
if (MMOCoreUtils.isPlayerHead(block.getBlockData().getMaterial())) if (MMOCoreUtils.isPlayerHead(block.getBlockData().getMaterial()))
loc.getBlock().setBlockData(block.getBlockData()); loc.getBlock().setBlockData(block.getBlockData());
MMOLib.plugin.getVersion().getWrapper().setSkullValue(loc.getBlock(), value); MythicLib.plugin.getVersion().getWrapper().setSkullValue(loc.getBlock(), value);
} }
@Override @Override
@ -44,7 +44,7 @@ public class SkullBlockType implements BlockType {
// This makes sure that if a skull loses its original rotation // This makes sure that if a skull loses its original rotation
// it can revert back to it when the base block is regenerated // it can revert back to it when the base block is regenerated
loc.getBlock().setBlockData(block.getBlockData()); loc.getBlock().setBlockData(block.getBlockData());
MMOLib.plugin.getVersion().getWrapper().setSkullValue(loc.getBlock(), value); MythicLib.plugin.getVersion().getWrapper().setSkullValue(loc.getBlock(), value);
} }
@Override @Override

2
src/main/java/net/Indyuce/mmocore/api/block/VanillaBlockType.java
View File

@ -8,7 +8,7 @@ import org.bukkit.block.data.Ageable;
import org.bukkit.block.data.BlockData; import org.bukkit.block.data.BlockData;
import net.Indyuce.mmocore.api.block.BlockInfo.RegeneratingBlock; 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 { public class VanillaBlockType implements BlockType {
private final Material type; private final Material type;

4
src/main/java/net/Indyuce/mmocore/api/droptable/DropTable.java
View File

@ -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.condition.ConditionInstance;
import net.Indyuce.mmocore.api.droptable.dropitem.DropItem; import net.Indyuce.mmocore.api.droptable.dropitem.DropItem;
import net.Indyuce.mmocore.api.loot.LootBuilder; import net.Indyuce.mmocore.api.loot.LootBuilder;
import net.mmogroup.mmolib.api.MMOLineConfig; import io.lumine.mythic.lib.api.MMOLineConfig;
import net.mmogroup.mmolib.api.util.PostLoadObject; import io.lumine.mythic.lib.api.util.PostLoadObject;
public class DropTable extends PostLoadObject { public class DropTable extends PostLoadObject {
private final String id; private final String id;

2
src/main/java/net/Indyuce/mmocore/api/droptable/condition/BiomeCondition.java
View File

@ -5,7 +5,7 @@ import java.util.List;
import org.bukkit.block.Biome; import org.bukkit.block.Biome;
import net.mmogroup.mmolib.api.MMOLineConfig; import io.lumine.mythic.lib.api.MMOLineConfig;
public class BiomeCondition extends Condition { public class BiomeCondition extends Condition {
private final List<String> names; private final List<String> names;

2
src/main/java/net/Indyuce/mmocore/api/droptable/condition/Condition.java
View File

@ -1,6 +1,6 @@
package net.Indyuce.mmocore.api.droptable.condition; package net.Indyuce.mmocore.api.droptable.condition;
import net.mmogroup.mmolib.api.MMOLineConfig; import io.lumine.mythic.lib.api.MMOLineConfig;
public abstract class Condition { public abstract class Condition {
private final String id; private final String id;

2
src/main/java/net/Indyuce/mmocore/api/droptable/condition/LevelCondition.java
View File

@ -1,7 +1,7 @@
package net.Indyuce.mmocore.api.droptable.condition; package net.Indyuce.mmocore.api.droptable.condition;
import net.Indyuce.mmocore.api.player.PlayerData; 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; import org.bukkit.entity.Player;
public class LevelCondition extends Condition { public class LevelCondition extends Condition {

2
src/main/java/net/Indyuce/mmocore/api/droptable/condition/PermissionCondition.java
View File

@ -2,7 +2,7 @@ package net.Indyuce.mmocore.api.droptable.condition;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import net.mmogroup.mmolib.api.MMOLineConfig; import io.lumine.mythic.lib.api.MMOLineConfig;
public class PermissionCondition extends Condition { public class PermissionCondition extends Condition {
private final String perm; private final String perm;

2
src/main/java/net/Indyuce/mmocore/api/droptable/condition/WorldCondition.java
View File

@ -3,7 +3,7 @@ package net.Indyuce.mmocore.api.droptable.condition;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import net.mmogroup.mmolib.api.MMOLineConfig; import io.lumine.mythic.lib.api.MMOLineConfig;
public class WorldCondition extends Condition { public class WorldCondition extends Condition {
private final List<String> names; private final List<String> names;

2
src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/DropItem.java
View File

@ -4,7 +4,7 @@ import java.util.Random;
import net.Indyuce.mmocore.api.loot.LootBuilder; import net.Indyuce.mmocore.api.loot.LootBuilder;
import net.Indyuce.mmocore.api.util.math.formula.RandomAmount; 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 { public abstract class DropItem {
protected static final Random random = new Random(); protected static final Random random = new Random();

2
src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/DropTableDropItem.java
View File

@ -7,7 +7,7 @@ import net.Indyuce.mmocore.api.droptable.DropTable;
import net.Indyuce.mmocore.api.droptable.condition.ConditionInstance; import net.Indyuce.mmocore.api.droptable.condition.ConditionInstance;
import net.Indyuce.mmocore.api.loot.LootBuilder; import net.Indyuce.mmocore.api.loot.LootBuilder;
import net.Indyuce.mmocore.api.player.PlayerData; 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 { public class DropTableDropItem extends DropItem {
private final DropTable dropTable; private final DropTable dropTable;

2
src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/GoldDropItem.java
View File

@ -2,7 +2,7 @@ package net.Indyuce.mmocore.api.droptable.dropitem;
import net.Indyuce.mmocore.api.loot.LootBuilder; import net.Indyuce.mmocore.api.loot.LootBuilder;
import net.Indyuce.mmocore.api.util.item.CurrencyItem; 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 class GoldDropItem extends DropItem {
public GoldDropItem(MMOLineConfig config) { public GoldDropItem(MMOLineConfig config) {

2
src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/MMDropTableDropItem.java
View File

@ -10,7 +10,7 @@ import io.lumine.xikage.mythicmobs.drops.DropTable;
import io.lumine.xikage.mythicmobs.drops.IItemDrop; import io.lumine.xikage.mythicmobs.drops.IItemDrop;
import io.lumine.xikage.mythicmobs.drops.LootBag; import io.lumine.xikage.mythicmobs.drops.LootBag;
import net.Indyuce.mmocore.api.loot.LootBuilder; 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 { public class MMDropTableDropItem extends DropItem {
private final DropTable dropTable; private final DropTable dropTable;

2
src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/NoteDropItem.java
View File

@ -2,7 +2,7 @@ package net.Indyuce.mmocore.api.droptable.dropitem;
import net.Indyuce.mmocore.api.loot.LootBuilder; import net.Indyuce.mmocore.api.loot.LootBuilder;
import net.Indyuce.mmocore.api.util.item.CurrencyItem; 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 { public class NoteDropItem extends DropItem {
private final int min, max; private final int min, max;

2
src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/VanillaDropItem.java
View File

@ -4,7 +4,7 @@ import org.bukkit.Material;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import net.Indyuce.mmocore.api.loot.LootBuilder; 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 { public class VanillaDropItem extends DropItem {
private final Material material; private final Material material;

2
src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/fishing/FishingDropItem.java
View File

@ -7,7 +7,7 @@ import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.droptable.dropitem.DropItem; import net.Indyuce.mmocore.api.droptable.dropitem.DropItem;
import net.Indyuce.mmocore.api.loot.LootBuilder; import net.Indyuce.mmocore.api.loot.LootBuilder;
import net.Indyuce.mmocore.api.util.math.formula.RandomAmount; 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 { public class FishingDropItem {
private final RandomAmount experience, tugs; private final RandomAmount experience, tugs;

2
src/main/java/net/Indyuce/mmocore/api/eco/Withdraw.java
View File

@ -18,7 +18,7 @@ import org.bukkit.inventory.ItemStack;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.util.item.CurrencyItem; 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 { public class Withdraw implements Listener {
private static final Set<UUID> withdrawing = new HashSet<>(); private static final Set<UUID> withdrawing = new HashSet<>();

4
src/main/java/net/Indyuce/mmocore/api/experience/PlayerProfessions.java
View File

@ -23,7 +23,7 @@ import net.Indyuce.mmocore.api.event.PlayerLevelUpEvent;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.util.math.particle.SmallParticleEffect; import net.Indyuce.mmocore.api.util.math.particle.SmallParticleEffect;
import net.Indyuce.mmocore.manager.SoundManager; import net.Indyuce.mmocore.manager.SoundManager;
import net.mmogroup.mmolib.MMOLib; import io.lumine.mythic.lib.MythicLib;
public class PlayerProfessions { public class PlayerProfessions {
private final Map<String, Integer> exp = new HashMap<>(); private final Map<String, Integer> exp = new HashMap<>();
@ -184,6 +184,6 @@ public class PlayerProfessions {
bar.append(j == chars ? "" + ChatColor.WHITE + ChatColor.BOLD : "").append("|"); bar.append(j == chars ? "" + ChatColor.WHITE + ChatColor.BOLD : "").append("|");
if (playerData.isOnline()) if (playerData.isOnline())
MMOCore.plugin.configManager.getSimpleMessage("exp-notification", "profession", profession.getName(), "progress", bar.toString(), "ratio", 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());
} }
} }

8
src/main/java/net/Indyuce/mmocore/api/experience/Profession.java
View File

@ -13,9 +13,9 @@ import org.bukkit.potion.PotionType;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.util.math.formula.LinearValue; import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
import net.mmogroup.mmolib.MMOLib; import io.lumine.mythic.lib.MythicLib;
import net.mmogroup.mmolib.api.MMOLineConfig; import io.lumine.mythic.lib.api.MMOLineConfig;
import net.mmogroup.mmolib.api.util.PostLoadObject; import io.lumine.mythic.lib.api.util.PostLoadObject;
public class Profession extends PostLoadObject { public class Profession extends PostLoadObject {
private final String id, name; private final String id, name;
@ -94,7 +94,7 @@ public class Profession extends PostLoadObject {
if (config.contains("base-enchant-exp")) if (config.contains("base-enchant-exp"))
for (String key : config.getConfigurationSection("base-enchant-exp").getKeys(false)) for (String key : config.getConfigurationSection("base-enchant-exp").getKeys(false))
try { 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)); MMOCore.plugin.enchantManager.registerBaseExperience(enchant, config.getDouble("base-enchant-exp." + key));
} catch (IllegalArgumentException exception) { } catch (IllegalArgumentException exception) {
MMOCore.log(Level.WARNING, "[PlayerProfessions:" + id + "] Could not read enchant from " + key); MMOCore.log(Level.WARNING, "[PlayerProfessions:" + id + "] Could not read enchant from " + key);

2
src/main/java/net/Indyuce/mmocore/api/experience/source/BrewPotionExperienceSource.java
View File

@ -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.experience.source.type.ExperienceSource;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.manager.profession.ExperienceManager; 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<PotionMeta> { public class BrewPotionExperienceSource extends ExperienceSource<PotionMeta> {
private final List<PotionType> types = new ArrayList<>(); private final List<PotionType> types = new ArrayList<>();

2
src/main/java/net/Indyuce/mmocore/api/experience/source/CraftItemExperienceSource.java
View File

@ -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.experience.source.type.SpecificExperienceSource;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.manager.profession.ExperienceManager; 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; import org.bukkit.event.inventory.InventoryAction;
public class CraftItemExperienceSource extends SpecificExperienceSource<Material> { public class CraftItemExperienceSource extends SpecificExperienceSource<Material> {

6
src/main/java/net/Indyuce/mmocore/api/experience/source/EnchantItemExperienceSource.java
View File

@ -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.experience.source.type.ExperienceSource;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.manager.profession.ExperienceManager; import net.Indyuce.mmocore.manager.profession.ExperienceManager;
import net.mmogroup.mmolib.api.MMOLineConfig; import io.lumine.mythic.lib.api.MMOLineConfig;
import net.mmogroup.mmolib.MMOLib; import io.lumine.mythic.lib.MythicLib;
public class EnchantItemExperienceSource extends ExperienceSource<Void> { public class EnchantItemExperienceSource extends ExperienceSource<Void> {
private final List<Enchantment> enchants = new ArrayList<>(); private final List<Enchantment> enchants = new ArrayList<>();
@ -27,7 +27,7 @@ public class EnchantItemExperienceSource extends ExperienceSource<Void> {
if (config.contains("enchant")) if (config.contains("enchant"))
for (String key : config.getString("enchant").split(",")) 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 @Override

2
src/main/java/net/Indyuce/mmocore/api/experience/source/FishItemExperienceSource.java
View File

@ -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.experience.source.type.SpecificExperienceSource;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.manager.profession.ExperienceManager; 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<ItemStack> { public class FishItemExperienceSource extends SpecificExperienceSource<ItemStack> {
private final Material material; private final Material material;

4
src/main/java/net/Indyuce/mmocore/api/experience/source/KillMobExperienceSource.java
View File

@ -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.experience.source.type.SpecificExperienceSource;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.manager.profession.ExperienceManager; import net.Indyuce.mmocore.manager.profession.ExperienceManager;
import net.mmogroup.mmolib.api.MMOLineConfig; import io.lumine.mythic.lib.api.MMOLineConfig;
import net.mmogroup.mmolib.api.event.EntityKillEntityEvent; import io.lumine.mythic.lib.api.event.EntityKillEntityEvent;
public class KillMobExperienceSource extends SpecificExperienceSource<Entity> { public class KillMobExperienceSource extends SpecificExperienceSource<Entity> {
public final EntityType type; public final EntityType type;

6
src/main/java/net/Indyuce/mmocore/api/experience/source/MineBlockExperienceSource.java
View File

@ -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.experience.source.type.SpecificExperienceSource;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.manager.profession.ExperienceManager; import net.Indyuce.mmocore.manager.profession.ExperienceManager;
import net.mmogroup.mmolib.MMOLib; import io.lumine.mythic.lib.MythicLib;
import net.mmogroup.mmolib.api.MMOLineConfig; import io.lumine.mythic.lib.api.MMOLineConfig;
public class MineBlockExperienceSource extends SpecificExperienceSource<Material> { public class MineBlockExperienceSource extends SpecificExperienceSource<Material> {
public final Material material; public final Material material;
@ -45,7 +45,7 @@ public class MineBlockExperienceSource extends SpecificExperienceSource<Material
for (MineBlockExperienceSource source : getSources()) { for (MineBlockExperienceSource source : getSources()) {
if (source.silkTouch && hasSilkTouch(event.getPlayer().getInventory().getItemInMainHand())) if (source.silkTouch && hasSilkTouch(event.getPlayer().getInventory().getItemInMainHand()))
continue; continue;
if (source.crop && !MMOLib.plugin.getVersion().getWrapper().isCropFullyGrown(event.getBlock())) if (source.crop && !MythicLib.plugin.getVersion().getWrapper().isCropFullyGrown(event.getBlock()))
continue; continue;
if ((!source.playerPlaced) && event.getBlock().hasMetadata("player_placed")) if ((!source.playerPlaced) && event.getBlock().hasMetadata("player_placed"))
continue; continue;

2
src/main/java/net/Indyuce/mmocore/api/experience/source/PlaceBlockExperienceSource.java
View File

@ -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.experience.source.type.SpecificExperienceSource;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.manager.profession.ExperienceManager; import net.Indyuce.mmocore.manager.profession.ExperienceManager;
import net.mmogroup.mmolib.api.MMOLineConfig; import io.lumine.mythic.lib.api.MMOLineConfig;
public class PlaceBlockExperienceSource extends SpecificExperienceSource<Material> { public class PlaceBlockExperienceSource extends SpecificExperienceSource<Material> {
public final Material material; public final Material material;

2
src/main/java/net/Indyuce/mmocore/api/experience/source/RepairItemExperienceSource.java
View File

@ -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.experience.source.type.ExperienceSource;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.manager.profession.ExperienceManager; 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<ItemStack> { public class RepairItemExperienceSource extends ExperienceSource<ItemStack> {
private final Material material; private final Material material;

2
src/main/java/net/Indyuce/mmocore/api/experience/source/SmeltItemExperienceSource.java
View File

@ -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.experience.source.type.SpecificExperienceSource;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.manager.profession.ExperienceManager; 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<ItemStack> { public class SmeltItemExperienceSource extends SpecificExperienceSource<ItemStack> {
private final Material material; private final Material material;

2
src/main/java/net/Indyuce/mmocore/api/experience/source/type/SpecificExperienceSource.java
View File

@ -5,7 +5,7 @@ import org.bukkit.Location;
import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.experience.Profession;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.util.math.formula.RandomAmount; 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<T> extends ExperienceSource<T> { public abstract class SpecificExperienceSource<T> extends ExperienceSource<T> {
private final RandomAmount amount; private final RandomAmount amount;

2
src/main/java/net/Indyuce/mmocore/api/load/DefaultMMOLoader.java
View File

@ -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.StaminaTrigger;
import net.Indyuce.mmocore.api.quest.trigger.StelliumTrigger; import net.Indyuce.mmocore.api.quest.trigger.StelliumTrigger;
import net.Indyuce.mmocore.api.quest.trigger.Trigger; 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 { public class DefaultMMOLoader extends MMOLoader {

2
src/main/java/net/Indyuce/mmocore/api/load/MMOLoader.java
View File

@ -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.experience.source.type.ExperienceSource;
import net.Indyuce.mmocore.api.quest.objective.Objective; import net.Indyuce.mmocore.api.quest.objective.Objective;
import net.Indyuce.mmocore.api.quest.trigger.Trigger; import net.Indyuce.mmocore.api.quest.trigger.Trigger;
import net.mmogroup.mmolib.api.MMOLineConfig; import io.lumine.mythic.lib.api.MMOLineConfig;
public class MMOLoader { public class MMOLoader {

5
src/main/java/net/Indyuce/mmocore/api/loot/ChestTier.java
View File

@ -1,11 +1,10 @@
package net.Indyuce.mmocore.api.loot; 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.MMOCore;
import net.Indyuce.mmocore.api.droptable.DropTable; import net.Indyuce.mmocore.api.droptable.DropTable;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.mmogroup.mmolib.api.math.ScalingFormula; import org.bukkit.configuration.ConfigurationSection;
public class ChestTier { public class ChestTier {
private final TierEffect effect; private final TierEffect effect;

42
src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
View File

@ -1,36 +1,10 @@
package net.Indyuce.mmocore.api.player; package net.Indyuce.mmocore.api.player;
import java.util.ArrayList; import io.lumine.mythic.lib.api.player.MMOPlayerData;
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 net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.ConfigMessage; import net.Indyuce.mmocore.api.ConfigMessage;
import net.Indyuce.mmocore.api.Waypoint; import net.Indyuce.mmocore.api.Waypoint;
import net.Indyuce.mmocore.api.event.PlayerExperienceGainEvent; import net.Indyuce.mmocore.api.event.*;
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.experience.EXPSource; import net.Indyuce.mmocore.api.experience.EXPSource;
import net.Indyuce.mmocore.api.experience.PlayerProfessions; import net.Indyuce.mmocore.api.experience.PlayerProfessions;
import net.Indyuce.mmocore.api.player.attribute.PlayerAttribute; 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.Indyuce.mmocore.manager.SoundManager;
import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.ChatMessageType;
import net.md_5.bungee.api.chat.TextComponent; 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 { public class PlayerData extends OfflinePlayerData {

15
src/main/java/net/Indyuce/mmocore/api/player/attribute/PlayerAttribute.java
View File

@ -1,16 +1,15 @@
package net.Indyuce.mmocore.api.player.attribute; 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.HashMap;
import java.util.Map; import java.util.Map;
import java.util.logging.Level; 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 { public class PlayerAttribute {
private final String id, name; private final String id, name;
private final int max; private final int max;
@ -25,7 +24,7 @@ public class PlayerAttribute {
Validate.notNull(config, "Could not load config"); Validate.notNull(config, "Could not load config");
id = config.getName().toLowerCase().replace("_", "-").replace(" ", "-"); 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; max = config.contains("max-points") ? Math.max(1, config.getInt("max-points")) : 0;
if (config.contains("buff")) if (config.contains("buff"))

24
src/main/java/net/Indyuce/mmocore/api/player/attribute/PlayerAttributes.java
View File

@ -1,5 +1,16 @@
package net.Indyuce.mmocore.api.player.attribute; 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.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@ -7,19 +18,6 @@ import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import java.util.logging.Level; 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 { public class PlayerAttributes {
private final PlayerData data; private final PlayerData data;
private final Map<String, AttributeInstance> instances = new HashMap<>(); private final Map<String, AttributeInstance> instances = new HashMap<>();

46
src/main/java/net/Indyuce/mmocore/api/player/profess/PlayerClass.java
View File

@ -1,28 +1,11 @@
package net.Indyuce.mmocore.api.player.profess; 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.GameProfile;
import com.mojang.authlib.properties.Property; 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.MMOCore;
import net.Indyuce.mmocore.api.experience.ExpCurve; import net.Indyuce.mmocore.api.experience.ExpCurve;
import net.Indyuce.mmocore.api.experience.source.type.ExperienceSource; 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.formula.LinearValue;
import net.Indyuce.mmocore.api.util.math.particle.CastingParticle; import net.Indyuce.mmocore.api.util.math.particle.CastingParticle;
import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ChatColor;
import net.mmogroup.mmolib.MMOLib; import org.apache.commons.lang.Validate;
import net.mmogroup.mmolib.api.MMOLineConfig; import org.bukkit.Material;
import net.mmogroup.mmolib.api.util.PostLoadObject; import org.bukkit.Particle;
import net.mmogroup.mmolib.version.VersionMaterial; 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 { public class PlayerClass extends PostLoadObject {
private final String name, id, actionBarFormat; private final String name, id, actionBarFormat;
@ -65,7 +55,7 @@ public class PlayerClass extends PostLoadObject {
this.id = id.toUpperCase().replace("-", "_").replace(" ", "_"); 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")); icon = MMOCoreUtils.readIcon(config.getString("display.item", "BARRIER"));
if (config.contains("display.texture") && icon.getType() == VersionMaterial.PLAYER_HEAD.toMaterial()) 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")) 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")) 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")) manaDisplay = config.contains("mana") ? new ManaDisplayOptions(config.getConfigurationSection("mana"))
: ManaDisplayOptions.DEFAULT; : ManaDisplayOptions.DEFAULT;
maxLevel = config.getInt("max-level"); maxLevel = config.getInt("max-level");

2
src/main/java/net/Indyuce/mmocore/api/player/profess/event/EventTrigger.java
View File

@ -9,7 +9,7 @@ import org.apache.commons.lang.Validate;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.quest.trigger.Trigger; import net.Indyuce.mmocore.api.quest.trigger.Trigger;
import net.mmogroup.mmolib.api.MMOLineConfig; import io.lumine.mythic.lib.api.MMOLineConfig;
public class EventTrigger { public class EventTrigger {
private final String event; private final String event;

4
src/main/java/net/Indyuce/mmocore/api/player/profess/event/trigger/AttackEventTrigger.java
View File

@ -6,8 +6,8 @@ import org.bukkit.event.EventPriority;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.player.profess.PlayerClass; import net.Indyuce.mmocore.api.player.profess.PlayerClass;
import net.Indyuce.mmocore.api.player.profess.event.EventTriggerHandler; import net.Indyuce.mmocore.api.player.profess.event.EventTriggerHandler;
import net.mmogroup.mmolib.api.DamageType; import io.lumine.mythic.lib.api.DamageType;
import net.mmogroup.mmolib.api.event.PlayerAttackEvent; import io.lumine.mythic.lib.api.event.PlayerAttackEvent;
public class AttackEventTrigger implements EventTriggerHandler { public class AttackEventTrigger implements EventTriggerHandler {

6
src/main/java/net/Indyuce/mmocore/api/player/profess/resource/ManaDisplayOptions.java
View File

@ -1,11 +1,11 @@
package net.Indyuce.mmocore.api.player.profess.resource; 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.apache.commons.lang.Validate;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.util.AltChar;
public class ManaDisplayOptions { public class ManaDisplayOptions {
private final ChatColor full, half, empty; private final ChatColor full, half, empty;
@ -30,7 +30,7 @@ public class ManaDisplayOptions {
Validate.notEmpty(format, "Could not load mana bar character"); Validate.notEmpty(format, "Could not load mana bar character");
barCharacter = format.charAt(0); 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"); Validate.notEmpty(format, "Could not load mana action bar icon");
} }

10
src/main/java/net/Indyuce/mmocore/api/player/stats/PlayerStats.java
View File

@ -1,10 +1,10 @@
package net.Indyuce.mmocore.api.player.stats; 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.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 { public class PlayerStats {
private final PlayerData data; private final PlayerData data;
@ -61,6 +61,6 @@ public class PlayerStats {
instance.addModifier("mmocoreClass", new StatModifier(total)); instance.addModifier("mmocoreClass", new StatModifier(total));
} }
MMOLib.plugin.getStats().runUpdates(getMap()); MythicLib.plugin.getStats().runUpdates(getMap());
} }
} }

4
src/main/java/net/Indyuce/mmocore/api/player/stats/StatType.java
View File

@ -4,7 +4,7 @@ import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.ConfigFile; import net.Indyuce.mmocore.api.ConfigFile;
import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.experience.Profession;
import net.Indyuce.mmocore.api.util.math.formula.LinearValue; 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 org.bukkit.configuration.file.FileConfiguration;
import java.text.DecimalFormat; import java.text.DecimalFormat;
@ -124,7 +124,7 @@ public enum StatType {
FileConfiguration config = new ConfigFile("stats").getConfig(); FileConfiguration config = new ConfigFile("stats").getConfig();
for (StatType stat : values()) { for (StatType stat : values()) {
stat.defaultInfo = config.contains("default." + stat.name()) ? new LinearValue(config.getConfigurationSection("default." + stat.name())) : new LinearValue(0, 0); 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.#");
} }
} }
} }

4
src/main/java/net/Indyuce/mmocore/api/quest/PlayerQuests.java
View File

@ -5,7 +5,7 @@ import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.player.PlayerData; 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.NamespacedKey;
import org.bukkit.boss.BarColor; import org.bukkit.boss.BarColor;
import org.bukkit.boss.BarStyle; import org.bukkit.boss.BarStyle;
@ -29,7 +29,7 @@ public class PlayerQuests {
public PlayerQuests(PlayerData playerData) { public PlayerQuests(PlayerData playerData) {
this.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()), new NamespacedKey(MMOCore.plugin, "quest_bar_" + playerData.getUniqueId().toString()),
"", BarColor.PURPLE, BarStyle.SEGMENTED_20); "", BarColor.PURPLE, BarStyle.SEGMENTED_20);
if(playerData.isOnline()) if(playerData.isOnline())

4
src/main/java/net/Indyuce/mmocore/api/quest/Quest.java
View File

@ -15,8 +15,8 @@ import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.experience.Profession;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.quest.objective.Objective; import net.Indyuce.mmocore.api.quest.objective.Objective;
import net.mmogroup.mmolib.api.MMOLineConfig; import io.lumine.mythic.lib.api.MMOLineConfig;
import net.mmogroup.mmolib.api.util.PostLoadObject; import io.lumine.mythic.lib.api.util.PostLoadObject;
public class Quest extends PostLoadObject { public class Quest extends PostLoadObject {
private final String id; private final String id;

4
src/main/java/net/Indyuce/mmocore/api/quest/QuestProgress.java
View File

@ -2,7 +2,7 @@ package net.Indyuce.mmocore.api.quest;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.quest.objective.Objective; import net.Indyuce.mmocore.api.quest.objective.Objective;
import net.mmogroup.mmolib.MMOLib; import io.lumine.mythic.lib.MythicLib;
public class QuestProgress { public class QuestProgress {
private final Quest quest; private final Quest quest;
@ -60,6 +60,6 @@ public class QuestProgress {
} }
public String getFormattedLore() { public String getFormattedLore() {
return MMOLib.plugin.parseColors(objectiveProgress.formatLore(objectiveProgress.getObjective().getDefaultLore())); return MythicLib.plugin.parseColors(objectiveProgress.formatLore(objectiveProgress.getObjective().getDefaultLore()));
} }
} }

2
src/main/java/net/Indyuce/mmocore/api/quest/objective/ClickonObjective.java
View File

@ -13,7 +13,7 @@ import org.bukkit.event.player.PlayerInteractEvent;
import net.Indyuce.mmocore.api.quest.ObjectiveProgress; import net.Indyuce.mmocore.api.quest.ObjectiveProgress;
import net.Indyuce.mmocore.api.quest.QuestProgress; 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 { public class ClickonObjective extends Objective {
private final Location loc; private final Location loc;

2
src/main/java/net/Indyuce/mmocore/api/quest/objective/GoToObjective.java
View File

@ -12,7 +12,7 @@ import org.bukkit.event.player.PlayerMoveEvent;
import net.Indyuce.mmocore.api.quest.ObjectiveProgress; import net.Indyuce.mmocore.api.quest.ObjectiveProgress;
import net.Indyuce.mmocore.api.quest.QuestProgress; 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 { public class GoToObjective extends Objective {
private final Location loc; private final Location loc;

4
src/main/java/net/Indyuce/mmocore/api/quest/objective/KillMobObjective.java
View File

@ -7,8 +7,8 @@ import org.bukkit.event.Listener;
import net.Indyuce.mmocore.api.quest.ObjectiveProgress; import net.Indyuce.mmocore.api.quest.ObjectiveProgress;
import net.Indyuce.mmocore.api.quest.QuestProgress; import net.Indyuce.mmocore.api.quest.QuestProgress;
import net.mmogroup.mmolib.api.MMOLineConfig; import io.lumine.mythic.lib.api.MMOLineConfig;
import net.mmogroup.mmolib.api.event.EntityKillEntityEvent; import io.lumine.mythic.lib.api.event.EntityKillEntityEvent;
public class KillMobObjective extends Objective { public class KillMobObjective extends Objective {
private final EntityType type; private final EntityType type;

2
src/main/java/net/Indyuce/mmocore/api/quest/objective/MineBlockObjective.java
View File

@ -10,7 +10,7 @@ import org.bukkit.event.block.BlockBreakEvent;
import net.Indyuce.mmocore.api.event.CustomBlockMineEvent; import net.Indyuce.mmocore.api.event.CustomBlockMineEvent;
import net.Indyuce.mmocore.api.quest.ObjectiveProgress; import net.Indyuce.mmocore.api.quest.ObjectiveProgress;
import net.Indyuce.mmocore.api.quest.QuestProgress; 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 { public class MineBlockObjective extends Objective {
private final Material block; private final Material block;

2
src/main/java/net/Indyuce/mmocore/api/quest/objective/Objective.java
View File

@ -12,7 +12,7 @@ import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.quest.ObjectiveProgress; import net.Indyuce.mmocore.api.quest.ObjectiveProgress;
import net.Indyuce.mmocore.api.quest.QuestProgress; import net.Indyuce.mmocore.api.quest.QuestProgress;
import net.Indyuce.mmocore.api.quest.trigger.Trigger; 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 { public abstract class Objective {
private final String id, lore; private final String id, lore;

2
src/main/java/net/Indyuce/mmocore/api/quest/trigger/CommandTrigger.java
View File

@ -5,7 +5,7 @@ import org.bukkit.entity.Player;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.player.PlayerData; 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 { public class CommandTrigger extends Trigger {
private final String command; private final String command;

2
src/main/java/net/Indyuce/mmocore/api/quest/trigger/ExperienceTrigger.java
View File

@ -8,7 +8,7 @@ import net.Indyuce.mmocore.api.experience.ExperienceInfo;
import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.experience.Profession;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.util.math.formula.RandomAmount; 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 { public class ExperienceTrigger extends Trigger {
private final RandomAmount amount; private final RandomAmount amount;

6
src/main/java/net/Indyuce/mmocore/api/quest/trigger/ItemTrigger.java
View File

@ -1,11 +1,11 @@
package net.Indyuce.mmocore.api.quest.trigger; 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.Material;
import org.bukkit.inventory.ItemStack; 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 { public class ItemTrigger extends Trigger {
private final Material material; private final Material material;

2
src/main/java/net/Indyuce/mmocore/api/quest/trigger/ManaTrigger.java
View File

@ -2,7 +2,7 @@ package net.Indyuce.mmocore.api.quest.trigger;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.util.math.formula.RandomAmount; 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 { public class ManaTrigger extends Trigger {
private final RandomAmount amount; private final RandomAmount amount;

2
src/main/java/net/Indyuce/mmocore/api/quest/trigger/MessageTrigger.java
View File

@ -4,7 +4,7 @@ import org.bukkit.entity.Player;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.player.PlayerData; 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 { public class MessageTrigger extends Trigger {
private final String message; private final String message;

2
src/main/java/net/Indyuce/mmocore/api/quest/trigger/SoundTrigger.java
View File

@ -3,7 +3,7 @@ package net.Indyuce.mmocore.api.quest.trigger;
import org.bukkit.Sound; import org.bukkit.Sound;
import net.Indyuce.mmocore.api.player.PlayerData; 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 { public class SoundTrigger extends Trigger {
private final Sound sound; private final Sound sound;

2
src/main/java/net/Indyuce/mmocore/api/quest/trigger/StaminaTrigger.java
View File

@ -2,7 +2,7 @@ package net.Indyuce.mmocore.api.quest.trigger;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.util.math.formula.RandomAmount; 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 { public class StaminaTrigger extends Trigger {
private final RandomAmount amount; private final RandomAmount amount;

2
src/main/java/net/Indyuce/mmocore/api/quest/trigger/StelliumTrigger.java
View File

@ -3,7 +3,7 @@ package net.Indyuce.mmocore.api.quest.trigger;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.quest.trigger.ManaTrigger.Operation; import net.Indyuce.mmocore.api.quest.trigger.ManaTrigger.Operation;
import net.Indyuce.mmocore.api.util.math.formula.RandomAmount; 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 { public class StelliumTrigger extends Trigger {
private final RandomAmount amount; private final RandomAmount amount;

2
src/main/java/net/Indyuce/mmocore/api/quest/trigger/Trigger.java
View File

@ -4,7 +4,7 @@ import org.bukkit.Bukkit;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.mmogroup.mmolib.api.MMOLineConfig; import io.lumine.mythic.lib.api.MMOLineConfig;
public abstract class Trigger { public abstract class Trigger {
private final long delay; private final long delay;

6
src/main/java/net/Indyuce/mmocore/api/skill/result/TargetSkillResult.java
View File

@ -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.Skill.SkillInfo;
import net.Indyuce.mmocore.api.skill.SkillResult; import net.Indyuce.mmocore.api.skill.SkillResult;
import net.Indyuce.mmocore.api.util.MMOCoreUtils; import net.Indyuce.mmocore.api.util.MMOCoreUtils;
import net.mmogroup.mmolib.MMOLib; import io.lumine.mythic.lib.MythicLib;
import net.mmogroup.mmolib.api.MMORayTraceResult; import io.lumine.mythic.lib.api.MMORayTraceResult;
public class TargetSkillResult extends SkillResult { public class TargetSkillResult extends SkillResult {
private LivingEntity target; private LivingEntity target;
@ -31,7 +31,7 @@ public class TargetSkillResult extends SkillResult {
super(data, skill); super(data, skill);
if (isSuccessful()) { 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)); entity -> MMOCoreUtils.canTarget(data, entity, buff));
if (!result.hasHit()) if (!result.hasHit())
abort(); abort();

12
src/main/java/net/Indyuce/mmocore/api/util/MMOCoreUtils.java
View File

@ -26,9 +26,9 @@ import org.bukkit.util.io.BukkitObjectOutputStream;
import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder; import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.mmogroup.mmolib.MMOLib; import io.lumine.mythic.lib.MythicLib;
import net.mmogroup.mmolib.api.item.NBTItem; import io.lumine.mythic.lib.api.item.NBTItem;
import net.mmogroup.mmolib.version.VersionMaterial; import io.lumine.mythic.lib.version.VersionMaterial;
public class MMOCoreUtils { public class MMOCoreUtils {
public static boolean pluginItem(ItemStack item) { public static boolean pluginItem(ItemStack item) {
@ -61,14 +61,14 @@ public class MMOCoreUtils {
public static ItemStack readIcon(String string) throws IllegalArgumentException { public static ItemStack readIcon(String string) throws IllegalArgumentException {
String[] split = string.split(":"); String[] split = string.split(":");
Material material = Material.valueOf(split[0].toUpperCase().replace("-", "_").replace(" ", "_")); 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) { public static int getWorth(ItemStack[] items) {
int t = 0; int t = 0;
for (ItemStack item : items) for (ItemStack item : items)
if (item != null && item.getType() != Material.AIR) 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; return t;
} }
@ -177,7 +177,7 @@ public class MMOCoreUtils {
// basic checks // basic checks
if (!(target instanceof LivingEntity) || player.getPlayer().equals(target) || target.isDead() if (!(target instanceof LivingEntity) || player.getPlayer().equals(target) || target.isDead()
|| MMOLib.plugin.getEntities().findCustom(target)) || MythicLib.plugin.getEntities().findCustom(target))
return false; return false;
// party check // party check

26
src/main/java/net/Indyuce/mmocore/api/util/input/AnvilGUI.java
View File

@ -12,7 +12,7 @@ import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.util.Consumer; import org.bukkit.util.Consumer;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.mmogroup.mmolib.MMOLib; import io.lumine.mythic.lib.MythicLib;
public class AnvilGUI extends PlayerInput { public class AnvilGUI extends PlayerInput {
private final int containerId; 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()); paperMeta.setDisplayName(MMOCore.plugin.configManager.getSimpleMessage("player-input.anvil." + type.getLowerCaseName()).message());
paper.setItemMeta(paperMeta); paper.setItemMeta(paperMeta);
MMOLib.plugin.getVersion().getWrapper().handleInventoryCloseEvent(player); MythicLib.plugin.getVersion().getWrapper().handleInventoryCloseEvent(player);
MMOLib.plugin.getVersion().getWrapper().setActiveContainerDefault(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); inventory.setItem(0, paper);
containerId = MMOLib.plugin.getVersion().getWrapper().getNextContainerId(player); containerId = MythicLib.plugin.getVersion().getWrapper().getNextContainerId(player);
MMOLib.plugin.getVersion().getWrapper().sendPacketOpenWindow(player, containerId); MythicLib.plugin.getVersion().getWrapper().sendPacketOpenWindow(player, containerId);
MMOLib.plugin.getVersion().getWrapper().setActiveContainer(player, container); MythicLib.plugin.getVersion().getWrapper().setActiveContainer(player, container);
MMOLib.plugin.getVersion().getWrapper().setActiveContainerId(container, containerId); MythicLib.plugin.getVersion().getWrapper().setActiveContainerId(container, containerId);
MMOLib.plugin.getVersion().getWrapper().addActiveContainerSlotListener(container, player); MythicLib.plugin.getVersion().getWrapper().addActiveContainerSlotListener(container, player);
} }
public void close() { public void close() {
MMOLib.plugin.getVersion().getWrapper().handleInventoryCloseEvent(getPlayer()); MythicLib.plugin.getVersion().getWrapper().handleInventoryCloseEvent(getPlayer());
MMOLib.plugin.getVersion().getWrapper().setActiveContainerDefault(getPlayer()); MythicLib.plugin.getVersion().getWrapper().setActiveContainerDefault(getPlayer());
MMOLib.plugin.getVersion().getWrapper().sendPacketCloseWindow(getPlayer(), containerId); MythicLib.plugin.getVersion().getWrapper().sendPacketCloseWindow(getPlayer(), containerId);
InventoryClickEvent.getHandlerList().unregister(this); InventoryClickEvent.getHandlerList().unregister(this);
InventoryCloseEvent.getHandlerList().unregister(this); InventoryCloseEvent.getHandlerList().unregister(this);

12
src/main/java/net/Indyuce/mmocore/api/util/item/ConfigItem.java
View File

@ -20,10 +20,10 @@ import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.Property; import com.mojang.authlib.properties.Property;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.mmogroup.mmolib.MMOLib; import io.lumine.mythic.lib.MythicLib;
import net.mmogroup.mmolib.api.item.ItemTag; import io.lumine.mythic.lib.api.item.ItemTag;
import net.mmogroup.mmolib.api.item.NBTItem; import io.lumine.mythic.lib.api.item.NBTItem;
import net.mmogroup.mmolib.version.VersionMaterial; import io.lumine.mythic.lib.version.VersionMaterial;
public class ConfigItem { public class ConfigItem {
private final String name, id, texture; private final String name, id, texture;
@ -110,7 +110,7 @@ public class ConfigItem {
if (meta instanceof Damageable) if (meta instanceof Damageable)
((Damageable) meta).setDamage(damage); ((Damageable) meta).setDamage(damage);
if (MMOLib.plugin.getVersion().isStrictlyHigher(1, 13)) if (MythicLib.plugin.getVersion().isStrictlyHigher(1, 13))
meta.setCustomModelData(modeldata); meta.setCustomModelData(modeldata);
if (item.getType() == VersionMaterial.PLAYER_HEAD.toMaterial() && texture != null) if (item.getType() == VersionMaterial.PLAYER_HEAD.toMaterial() && texture != null)
@ -139,6 +139,6 @@ public class ConfigItem {
for (String placeholder : placeholders.keySet()) for (String placeholder : placeholders.keySet())
if (string.contains("{" + placeholder + "}")) if (string.contains("{" + placeholder + "}"))
string = string.replace("{" + placeholder + "}", "" + placeholders.get(placeholder)); string = string.replace("{" + placeholder + "}", "" + placeholders.get(placeholder));
return MMOLib.plugin.parseColors(string); return MythicLib.plugin.parseColors(string);
} }
} }

8
src/main/java/net/Indyuce/mmocore/api/util/item/CurrencyItem.java
View File

@ -7,9 +7,9 @@ import org.bukkit.inventory.ItemFlag;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
import net.mmogroup.mmolib.MMOLib; import io.lumine.mythic.lib.MythicLib;
import net.mmogroup.mmolib.api.item.ItemTag; import io.lumine.mythic.lib.api.item.ItemTag;
import net.mmogroup.mmolib.api.item.NBTItem; import io.lumine.mythic.lib.api.item.NBTItem;
public class CurrencyItem extends ConfigItem { public class CurrencyItem extends ConfigItem {
private final int worth, amount; private final int worth, amount;
@ -36,7 +36,7 @@ public class CurrencyItem extends ConfigItem {
getLore().forEach(line -> lore.add(format(line))); getLore().forEach(line -> lore.add(format(line)));
meta.setLore(lore); meta.setLore(lore);
if(MMOLib.plugin.getVersion().isStrictlyHigher(1, 13)) if(MythicLib.plugin.getVersion().isStrictlyHigher(1, 13))
meta.setCustomModelData(getModelData()); meta.setCustomModelData(getModelData());
item.setItemMeta(meta); item.setItemMeta(meta);

4
src/main/java/net/Indyuce/mmocore/api/util/item/NamedItemStack.java
View File

@ -4,14 +4,14 @@ import org.bukkit.Material;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
import net.mmogroup.mmolib.MMOLib; import io.lumine.mythic.lib.MythicLib;
public class NamedItemStack extends ItemStack { public class NamedItemStack extends ItemStack {
public NamedItemStack(Material material, String name) { public NamedItemStack(Material material, String name) {
super(material); super(material);
ItemMeta meta = getItemMeta(); ItemMeta meta = getItemMeta();
meta.setDisplayName(MMOLib.plugin.parseColors(name)); meta.setDisplayName(MythicLib.plugin.parseColors(name));
setItemMeta(meta); setItemMeta(meta);
} }
} }

4
src/main/java/net/Indyuce/mmocore/api/util/math/formula/LinearValue.java
View File

@ -1,6 +1,6 @@
package net.Indyuce.mmocore.api.util.math.formula; package net.Indyuce.mmocore.api.util.math.formula;
import net.mmogroup.mmolib.MMOLib; import io.lumine.mythic.lib.MythicLib;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
public class LinearValue { public class LinearValue {
@ -74,7 +74,7 @@ public class LinearValue {
} }
public String getDisplay(int level) { 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) { public double calculate(int level) {

2
src/main/java/net/Indyuce/mmocore/command/CommandVerbose.java
View File

@ -1,7 +1,7 @@
package net.Indyuce.mmocore.command; package net.Indyuce.mmocore.command;
import io.lumine.mythic.lib.api.util.EnumUtils;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.mmogroup.mmolib.api.util.EnumUtils;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;

9
src/main/java/net/Indyuce/mmocore/command/MMOCoreCommandTreeRoot.java
View File

@ -1,8 +1,7 @@
package net.Indyuce.mmocore.command; package net.Indyuce.mmocore.command;
import org.bukkit.command.CommandExecutor; import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeRoot;
import org.bukkit.command.TabCompleter; import io.lumine.mythic.lib.mmolibcommands.api.Parameter;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.command.rpg.CoinsCommandTreeNode; import net.Indyuce.mmocore.command.rpg.CoinsCommandTreeNode;
import net.Indyuce.mmocore.command.rpg.NoteCommandTreeNode; 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.debug.DebugCommandTreeNode;
import net.Indyuce.mmocore.command.rpg.quest.QuestCommandTreeNode; import net.Indyuce.mmocore.command.rpg.quest.QuestCommandTreeNode;
import net.Indyuce.mmocore.command.rpg.waypoint.WaypointsCommandTreeNode; import net.Indyuce.mmocore.command.rpg.waypoint.WaypointsCommandTreeNode;
import net.mmogroup.mmolib.command.api.CommandTreeRoot; import org.bukkit.command.CommandExecutor;
import net.mmogroup.mmolib.command.api.Parameter; import org.bukkit.command.TabCompleter;
public class MMOCoreCommandTreeRoot extends CommandTreeRoot implements CommandExecutor, TabCompleter { public class MMOCoreCommandTreeRoot extends CommandTreeRoot implements CommandExecutor, TabCompleter {
public static final Parameter PROFESSION = new Parameter("<profession/main>", (explorer, list) -> { public static final Parameter PROFESSION = new Parameter("<profession/main>", (explorer, list) -> {

8
src/main/java/net/Indyuce/mmocore/command/rpg/CoinsCommandTreeNode.java
View File

@ -1,14 +1,14 @@
package net.Indyuce.mmocore.command.rpg; 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.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; 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 class CoinsCommandTreeNode extends CommandTreeNode {
public CoinsCommandTreeNode(CommandTreeNode parent) { public CoinsCommandTreeNode(CommandTreeNode parent) {

6
src/main/java/net/Indyuce/mmocore/command/rpg/NoteCommandTreeNode.java
View File

@ -8,9 +8,9 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import net.Indyuce.mmocore.api.util.item.CurrencyItem; import net.Indyuce.mmocore.api.util.item.CurrencyItem;
import net.mmogroup.mmolib.api.util.SmartGive; import io.lumine.mythic.lib.api.util.SmartGive;
import net.mmogroup.mmolib.command.api.CommandTreeNode; import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode;
import net.mmogroup.mmolib.command.api.Parameter; import io.lumine.mythic.lib.mmolibcommands.api.Parameter;
public class NoteCommandTreeNode extends CommandTreeNode { public class NoteCommandTreeNode extends CommandTreeNode {
public NoteCommandTreeNode(CommandTreeNode parent) { public NoteCommandTreeNode(CommandTreeNode parent) {

2
src/main/java/net/Indyuce/mmocore/command/rpg/ReloadCommandTreeNode.java
View File

@ -5,7 +5,7 @@ import org.bukkit.command.CommandSender;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.player.PlayerData; 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 class ReloadCommandTreeNode extends CommandTreeNode {
public ReloadCommandTreeNode(CommandTreeNode parent) { public ReloadCommandTreeNode(CommandTreeNode parent) {

2
src/main/java/net/Indyuce/mmocore/command/rpg/admin/AdminCommandTreeNode.java
View File

@ -3,7 +3,7 @@ package net.Indyuce.mmocore.command.rpg.admin;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import org.bukkit.command.CommandSender; 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 class AdminCommandTreeNode extends CommandTreeNode {
public AdminCommandTreeNode(CommandTreeNode parent) { public AdminCommandTreeNode(CommandTreeNode parent) {

4
src/main/java/net/Indyuce/mmocore/command/rpg/admin/AttributeCommandTreeNode.java
View File

@ -10,8 +10,8 @@ import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.player.attribute.PlayerAttribute; import net.Indyuce.mmocore.api.player.attribute.PlayerAttribute;
import net.Indyuce.mmocore.api.player.attribute.PlayerAttributes.AttributeInstance; import net.Indyuce.mmocore.api.player.attribute.PlayerAttributes.AttributeInstance;
import net.mmogroup.mmolib.command.api.CommandTreeNode; import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode;
import net.mmogroup.mmolib.command.api.Parameter; import io.lumine.mythic.lib.mmolibcommands.api.Parameter;
public class AttributeCommandTreeNode extends CommandTreeNode { public class AttributeCommandTreeNode extends CommandTreeNode {
public AttributeCommandTreeNode(CommandTreeNode parent) { public AttributeCommandTreeNode(CommandTreeNode parent) {

4
src/main/java/net/Indyuce/mmocore/command/rpg/admin/ClassCommandTreeNode.java
View File

@ -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.PlayerClass;
import net.Indyuce.mmocore.api.player.profess.SavedClassInformation; import net.Indyuce.mmocore.api.player.profess.SavedClassInformation;
import net.Indyuce.mmocore.command.CommandVerbose; import net.Indyuce.mmocore.command.CommandVerbose;
import net.mmogroup.mmolib.command.api.CommandTreeNode; import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode;
import net.mmogroup.mmolib.command.api.Parameter; import io.lumine.mythic.lib.mmolibcommands.api.Parameter;
public class ClassCommandTreeNode extends CommandTreeNode { public class ClassCommandTreeNode extends CommandTreeNode {
public ClassCommandTreeNode(CommandTreeNode parent) { public ClassCommandTreeNode(CommandTreeNode parent) {

4
src/main/java/net/Indyuce/mmocore/command/rpg/admin/ExperienceCommandTreeNode.java
View File

@ -14,8 +14,8 @@ import net.Indyuce.mmocore.api.experience.Profession;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.command.CommandVerbose; import net.Indyuce.mmocore.command.CommandVerbose;
import net.Indyuce.mmocore.command.MMOCoreCommandTreeRoot; import net.Indyuce.mmocore.command.MMOCoreCommandTreeRoot;
import net.mmogroup.mmolib.command.api.CommandTreeNode; import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode;
import net.mmogroup.mmolib.command.api.Parameter; import io.lumine.mythic.lib.mmolibcommands.api.Parameter;
public class ExperienceCommandTreeNode extends CommandTreeNode { public class ExperienceCommandTreeNode extends CommandTreeNode {
public ExperienceCommandTreeNode(CommandTreeNode parent) { public ExperienceCommandTreeNode(CommandTreeNode parent) {

4
src/main/java/net/Indyuce/mmocore/command/rpg/admin/ForceClassCommandTreeNode.java
View File

@ -9,8 +9,8 @@ import org.bukkit.entity.Player;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.player.profess.PlayerClass; import net.Indyuce.mmocore.api.player.profess.PlayerClass;
import net.mmogroup.mmolib.command.api.CommandTreeNode; import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode;
import net.mmogroup.mmolib.command.api.Parameter; import io.lumine.mythic.lib.mmolibcommands.api.Parameter;
public class ForceClassCommandTreeNode extends CommandTreeNode { public class ForceClassCommandTreeNode extends CommandTreeNode {
public ForceClassCommandTreeNode(CommandTreeNode parent) { public ForceClassCommandTreeNode(CommandTreeNode parent) {

4
src/main/java/net/Indyuce/mmocore/command/rpg/admin/HideActionBarCommandTreeNode.java
View File

@ -6,8 +6,8 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.mmogroup.mmolib.command.api.CommandTreeNode; import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode;
import net.mmogroup.mmolib.command.api.Parameter; import io.lumine.mythic.lib.mmolibcommands.api.Parameter;
public class HideActionBarCommandTreeNode extends CommandTreeNode { public class HideActionBarCommandTreeNode extends CommandTreeNode {
public HideActionBarCommandTreeNode(CommandTreeNode parent) { public HideActionBarCommandTreeNode(CommandTreeNode parent) {

4
src/main/java/net/Indyuce/mmocore/command/rpg/admin/InfoCommandTreeNode.java
View File

@ -8,8 +8,8 @@ import org.bukkit.entity.Player;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.experience.Profession;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.mmogroup.mmolib.command.api.CommandTreeNode; import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode;
import net.mmogroup.mmolib.command.api.Parameter; import io.lumine.mythic.lib.mmolibcommands.api.Parameter;
public class InfoCommandTreeNode extends CommandTreeNode { public class InfoCommandTreeNode extends CommandTreeNode {
public InfoCommandTreeNode(CommandTreeNode parent) { public InfoCommandTreeNode(CommandTreeNode parent) {

4
src/main/java/net/Indyuce/mmocore/command/rpg/admin/LevelCommandTreeNode.java
View File

@ -14,8 +14,8 @@ import net.Indyuce.mmocore.api.experience.PlayerProfessions;
import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.experience.Profession;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.command.MMOCoreCommandTreeRoot; import net.Indyuce.mmocore.command.MMOCoreCommandTreeRoot;
import net.mmogroup.mmolib.command.api.CommandTreeNode; import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode;
import net.mmogroup.mmolib.command.api.Parameter; import io.lumine.mythic.lib.mmolibcommands.api.Parameter;
public class LevelCommandTreeNode extends CommandTreeNode { public class LevelCommandTreeNode extends CommandTreeNode {
public LevelCommandTreeNode(CommandTreeNode parent) { public LevelCommandTreeNode(CommandTreeNode parent) {

4
src/main/java/net/Indyuce/mmocore/command/rpg/admin/NoCooldownCommandTreeNode.java
View File

@ -7,8 +7,8 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.mmogroup.mmolib.command.api.CommandTreeNode; import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode;
import net.mmogroup.mmolib.command.api.Parameter; import io.lumine.mythic.lib.mmolibcommands.api.Parameter;
public class NoCooldownCommandTreeNode extends CommandTreeNode { public class NoCooldownCommandTreeNode extends CommandTreeNode {
public NoCooldownCommandTreeNode(CommandTreeNode parent) { public NoCooldownCommandTreeNode(CommandTreeNode parent) {

4
src/main/java/net/Indyuce/mmocore/command/rpg/admin/PointsCommandTreeNode.java
View File

@ -10,8 +10,8 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.mmogroup.mmolib.command.api.CommandTreeNode; import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode;
import net.mmogroup.mmolib.command.api.Parameter; import io.lumine.mythic.lib.mmolibcommands.api.Parameter;
public class PointsCommandTreeNode extends CommandTreeNode { public class PointsCommandTreeNode extends CommandTreeNode {
private final String type; private final String type;

4
src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResetCommandTreeNode.java
View File

@ -10,8 +10,8 @@ import net.Indyuce.mmocore.api.experience.Profession;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.player.attribute.PlayerAttributes.AttributeInstance; import net.Indyuce.mmocore.api.player.attribute.PlayerAttributes.AttributeInstance;
import net.Indyuce.mmocore.command.CommandVerbose; import net.Indyuce.mmocore.command.CommandVerbose;
import net.mmogroup.mmolib.command.api.CommandTreeNode; import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode;
import net.mmogroup.mmolib.command.api.Parameter; import io.lumine.mythic.lib.mmolibcommands.api.Parameter;
public class ResetCommandTreeNode extends CommandTreeNode { public class ResetCommandTreeNode extends CommandTreeNode {
public ResetCommandTreeNode(CommandTreeNode parent) { public ResetCommandTreeNode(CommandTreeNode parent) {

4
src/main/java/net/Indyuce/mmocore/command/rpg/admin/ResourceCommandTreeNode.java
View File

@ -10,8 +10,8 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.mmogroup.mmolib.command.api.CommandTreeNode; import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode;
import net.mmogroup.mmolib.command.api.Parameter; import io.lumine.mythic.lib.mmolibcommands.api.Parameter;
public class ResourceCommandTreeNode extends CommandTreeNode { public class ResourceCommandTreeNode extends CommandTreeNode {
private final String type; private final String type;

2
src/main/java/net/Indyuce/mmocore/command/rpg/booster/BoosterCommandTreeNode.java
View File

@ -2,7 +2,7 @@ package net.Indyuce.mmocore.command.rpg.booster;
import org.bukkit.command.CommandSender; 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 class BoosterCommandTreeNode extends CommandTreeNode {
public BoosterCommandTreeNode(CommandTreeNode parent) { public BoosterCommandTreeNode(CommandTreeNode parent) {

4
src/main/java/net/Indyuce/mmocore/command/rpg/booster/CreateCommandTreeNode.java
View File

@ -12,8 +12,8 @@ import net.Indyuce.mmocore.api.ConfigMessage;
import net.Indyuce.mmocore.api.experience.Booster; import net.Indyuce.mmocore.api.experience.Booster;
import net.Indyuce.mmocore.api.experience.Profession; import net.Indyuce.mmocore.api.experience.Profession;
import net.Indyuce.mmocore.command.MMOCoreCommandTreeRoot; import net.Indyuce.mmocore.command.MMOCoreCommandTreeRoot;
import net.mmogroup.mmolib.command.api.CommandTreeNode; import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode;
import net.mmogroup.mmolib.command.api.Parameter; import io.lumine.mythic.lib.mmolibcommands.api.Parameter;
public class CreateCommandTreeNode extends CommandTreeNode { public class CreateCommandTreeNode extends CommandTreeNode {
public CreateCommandTreeNode(CommandTreeNode parent) { public CreateCommandTreeNode(CommandTreeNode parent) {

8
src/main/java/net/Indyuce/mmocore/command/rpg/booster/ListCommandTreeNode.java
View File

@ -7,8 +7,8 @@ import org.bukkit.entity.Player;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.experience.Booster; import net.Indyuce.mmocore.api.experience.Booster;
import net.Indyuce.mmocore.api.util.math.format.DelayFormat; import net.Indyuce.mmocore.api.util.math.format.DelayFormat;
import net.mmogroup.mmolib.MMOLib; import io.lumine.mythic.lib.MythicLib;
import net.mmogroup.mmolib.command.api.CommandTreeNode; import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode;
public class ListCommandTreeNode extends CommandTreeNode { public class ListCommandTreeNode extends CommandTreeNode {
public ListCommandTreeNode(CommandTreeNode parent) { public ListCommandTreeNode(CommandTreeNode parent) {
@ -23,8 +23,8 @@ public class ListCommandTreeNode extends CommandTreeNode {
sender.sendMessage(ChatColor.YELLOW + "----------------------------------------------------"); sender.sendMessage(ChatColor.YELLOW + "----------------------------------------------------");
for (Booster booster : MMOCore.plugin.boosterManager.getBoosters()) for (Booster booster : MMOCore.plugin.boosterManager.getBoosters())
if (!booster.isTimedOut()) if (!booster.isTimedOut())
MMOLib.plugin.getVersion().getWrapper().sendJson((Player) sender, "{\"text\":\"" + ChatColor.YELLOW + "- " + ChatColor.GOLD MythicLib.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.getMMOConfig().decimal.format((1 + booster.getExtra())) + "x" + ChatColor.YELLOW + " Booster - "
+ ChatColor.GOLD + (!booster.hasProfession() ? "ExploreAttributesCommand" : booster.getProfession().getName()) + ChatColor.GOLD + (!booster.hasProfession() ? "ExploreAttributesCommand" : booster.getProfession().getName())
+ ChatColor.YELLOW + " - " + ChatColor.GOLD + ChatColor.YELLOW + " - " + ChatColor.GOLD
+ new DelayFormat().format(booster.getCreationDate() + booster.getLength() - System.currentTimeMillis()) + new DelayFormat().format(booster.getCreationDate() + booster.getLength() - System.currentTimeMillis())

4
src/main/java/net/Indyuce/mmocore/command/rpg/booster/RemoveCommandTreeNode.java
View File

@ -8,8 +8,8 @@ import org.bukkit.command.CommandSender;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.experience.Booster; import net.Indyuce.mmocore.api.experience.Booster;
import net.mmogroup.mmolib.command.api.CommandTreeNode; import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode;
import net.mmogroup.mmolib.command.api.Parameter; import io.lumine.mythic.lib.mmolibcommands.api.Parameter;
public class RemoveCommandTreeNode extends CommandTreeNode { public class RemoveCommandTreeNode extends CommandTreeNode {
public RemoveCommandTreeNode(CommandTreeNode parent) { public RemoveCommandTreeNode(CommandTreeNode parent) {

2
src/main/java/net/Indyuce/mmocore/command/rpg/debug/DebugCommandTreeNode.java
View File

@ -3,7 +3,7 @@ package net.Indyuce.mmocore.command.rpg.debug;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; 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 class DebugCommandTreeNode extends CommandTreeNode {
public static final String commandPrefix = ChatColor.YELLOW + "[" + ChatColor.RED + "DEBUG" + ChatColor.GOLD + "] " + ChatColor.RESET; public static final String commandPrefix = ChatColor.YELLOW + "[" + ChatColor.RED + "DEBUG" + ChatColor.GOLD + "] " + ChatColor.RESET;

12
src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatModifiersCommandTreeNode.java
View File

@ -1,15 +1,15 @@
package net.Indyuce.mmocore.command.rpg.debug; 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.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; 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 class StatModifiersCommandTreeNode extends CommandTreeNode {
public StatModifiersCommandTreeNode(CommandTreeNode parent) { public StatModifiersCommandTreeNode(CommandTreeNode parent) {

4
src/main/java/net/Indyuce/mmocore/command/rpg/debug/StatValueCommandTreeNode.java
View File

@ -6,8 +6,8 @@ import org.bukkit.entity.Player;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.player.stats.StatType; import net.Indyuce.mmocore.api.player.stats.StatType;
import net.mmogroup.mmolib.command.api.CommandTreeNode; import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode;
import net.mmogroup.mmolib.command.api.Parameter; import io.lumine.mythic.lib.mmolibcommands.api.Parameter;
public class StatValueCommandTreeNode extends CommandTreeNode { public class StatValueCommandTreeNode extends CommandTreeNode {
public StatValueCommandTreeNode(CommandTreeNode parent) { public StatValueCommandTreeNode(CommandTreeNode parent) {

4
src/main/java/net/Indyuce/mmocore/command/rpg/quest/CancelCommandTreeNode.java
View File

@ -7,8 +7,8 @@ import org.bukkit.entity.Player;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.quest.PlayerQuests; import net.Indyuce.mmocore.api.quest.PlayerQuests;
import net.mmogroup.mmolib.command.api.CommandTreeNode; import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode;
import net.mmogroup.mmolib.command.api.Parameter; import io.lumine.mythic.lib.mmolibcommands.api.Parameter;
public class CancelCommandTreeNode extends CommandTreeNode { public class CancelCommandTreeNode extends CommandTreeNode {
public CancelCommandTreeNode(CommandTreeNode parent) { public CancelCommandTreeNode(CommandTreeNode parent) {

2
src/main/java/net/Indyuce/mmocore/command/rpg/quest/QuestCommandTreeNode.java
View File

@ -2,7 +2,7 @@ package net.Indyuce.mmocore.command.rpg.quest;
import org.bukkit.command.CommandSender; 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 { public class QuestCommandTreeNode extends CommandTreeNode {

4
src/main/java/net/Indyuce/mmocore/command/rpg/quest/StartCommandTreeNode.java
View File

@ -10,8 +10,8 @@ import net.Indyuce.mmocore.api.player.PlayerData;
import net.Indyuce.mmocore.api.quest.PlayerQuests; import net.Indyuce.mmocore.api.quest.PlayerQuests;
import net.Indyuce.mmocore.api.quest.Quest; import net.Indyuce.mmocore.api.quest.Quest;
import net.Indyuce.mmocore.command.MMOCoreCommandTreeRoot; import net.Indyuce.mmocore.command.MMOCoreCommandTreeRoot;
import net.mmogroup.mmolib.command.api.CommandTreeNode; import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode;
import net.mmogroup.mmolib.command.api.Parameter; import io.lumine.mythic.lib.mmolibcommands.api.Parameter;
public class StartCommandTreeNode extends CommandTreeNode { public class StartCommandTreeNode extends CommandTreeNode {
public StartCommandTreeNode(CommandTreeNode parent) { public StartCommandTreeNode(CommandTreeNode parent) {

4
src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/OpenCommandTreeNode.java
View File

@ -6,8 +6,8 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import net.Indyuce.mmocore.manager.InventoryManager; import net.Indyuce.mmocore.manager.InventoryManager;
import net.mmogroup.mmolib.command.api.CommandTreeNode; import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode;
import net.mmogroup.mmolib.command.api.Parameter; import io.lumine.mythic.lib.mmolibcommands.api.Parameter;
public class OpenCommandTreeNode extends CommandTreeNode { public class OpenCommandTreeNode extends CommandTreeNode {
public OpenCommandTreeNode(CommandTreeNode parent) { public OpenCommandTreeNode(CommandTreeNode parent) {

9
src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/TeleportCommandTreeNode.java
View File

@ -1,15 +1,14 @@
package net.Indyuce.mmocore.command.rpg.waypoint; 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.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; 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 class TeleportCommandTreeNode extends CommandTreeNode {
public TeleportCommandTreeNode(CommandTreeNode parent) { public TeleportCommandTreeNode(CommandTreeNode parent) {
super(parent, "teleport"); super(parent, "teleport");

4
src/main/java/net/Indyuce/mmocore/command/rpg/waypoint/UnlockCommandTreeNode.java
View File

@ -8,8 +8,8 @@ import org.bukkit.entity.Player;
import net.Indyuce.mmocore.MMOCore; import net.Indyuce.mmocore.MMOCore;
import net.Indyuce.mmocore.api.Waypoint; import net.Indyuce.mmocore.api.Waypoint;
import net.Indyuce.mmocore.api.player.PlayerData; import net.Indyuce.mmocore.api.player.PlayerData;
import net.mmogroup.mmolib.command.api.CommandTreeNode; import io.lumine.mythic.lib.mmolibcommands.api.CommandTreeNode;
import net.mmogroup.mmolib.command.api.Parameter; import io.lumine.mythic.lib.mmolibcommands.api.Parameter;
public class UnlockCommandTreeNode extends CommandTreeNode { public class UnlockCommandTreeNode extends CommandTreeNode {
public UnlockCommandTreeNode(CommandTreeNode parent) { public UnlockCommandTreeNode(CommandTreeNode parent) {

Some files were not shown because too many files have changed in this diff Show More