Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2025-03-09 12:49:06 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

!THIS BUILDS WITH MYTHICLIB PLEASE DONT PUSH OR USE

Browse Source
This commit is contained in:
Joshua 2021-02-03 14:18:34 -06:00
parent 5edacc6e37
commit 104375febd
337 changed files with 1045 additions and 1159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pom.xml
View File

@ -50,6 +50,10 @@
</plugins>
</build>
<repositories>
<repository>
<id>lumine-repo</id>
<url>https://mvn.lumine.io/repository/maven-public/</url>
</repository>
<repository>
<id>mojang</id>
<url>https://libraries.minecraft.net/</url>
@ -86,10 +90,15 @@
<dependency>
<groupId>net.Indyuce</groupId>
<artifactId>MMOCore</artifactId>
<version>1.5</version>
<scope>system</scope>
<systemPath>${basedir}/lib/MMOCore.jar</systemPath>
<version>1.6.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.lumine</groupId>
<artifactId>MythicLib</artifactId>
<version>0.0.1-20210203.081118-2</version>
</dependency>
<!--
<dependency>
<groupId>net.Indyuce</groupId>
<artifactId>MMOLib</artifactId>
@ -97,6 +106,7 @@
<scope>system</scope>
<systemPath>${basedir}/lib/MMOLib.jar</systemPath>
</dependency>
-->
<!-- APIs -->
<dependency>

2
src/main/java/net/Indyuce/mmoitems/ItemStats.java
View File

@ -13,7 +13,7 @@ import net.Indyuce.mmoitems.stat.type.DisableStat;
import net.Indyuce.mmoitems.stat.type.DoubleStat;
import net.Indyuce.mmoitems.stat.type.ItemStat;
import net.Indyuce.mmoitems.stat.type.StringStat;
import net.mmogroup.mmolib.version.VersionMaterial;
import io.lumine.mythic.lib.version.VersionMaterial;
/**
* A central file for the plugin since new stats are added ALL the time.

83
src/main/java/net/Indyuce/mmoitems/MMOItems.java
View File

@ -1,48 +1,20 @@
package net.Indyuce.mmoitems;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import javax.annotation.Nullable;
import net.Indyuce.mmoitems.comp.inventory.*;
import org.apache.commons.lang.Validate;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.java.JavaPlugin;
import net.Indyuce.mmoitems.api.ClaseMuyImportante;
import net.Indyuce.mmoitems.api.ConfigFile;
import net.Indyuce.mmoitems.api.ItemTier;
import net.Indyuce.mmoitems.api.SoulboundInfo;
import net.Indyuce.mmoitems.api.Type;
import io.lumine.mythic.lib.version.SpigotPlugin;
import net.Indyuce.mmoitems.api.*;
import net.Indyuce.mmoitems.api.item.mmoitem.MMOItem;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.Indyuce.mmoitems.command.MMOItemsCommandTreeRoot;
import net.Indyuce.mmoitems.command.UpdateItemCommand;
import net.Indyuce.mmoitems.command.completion.UpdateItemCompletion;
import net.Indyuce.mmoitems.comp.AdvancedEnchantmentsHook;
import net.Indyuce.mmoitems.comp.MMOItemsMetrics;
import net.Indyuce.mmoitems.comp.MMOItemsRewardTypes;
import net.Indyuce.mmoitems.comp.McMMONonRPGHook;
import net.Indyuce.mmoitems.comp.RealDualWieldHook;
import net.Indyuce.mmoitems.comp.WorldEditSupport;
import net.Indyuce.mmoitems.comp.*;
import net.Indyuce.mmoitems.comp.eco.VaultSupport;
import net.Indyuce.mmoitems.comp.flags.DefaultFlags;
import net.Indyuce.mmoitems.comp.flags.FlagPlugin;
import net.Indyuce.mmoitems.comp.flags.ResidenceFlags;
import net.Indyuce.mmoitems.comp.flags.WorldGuardFlags;
import net.Indyuce.mmoitems.comp.holograms.CMIPlugin;
import net.Indyuce.mmoitems.comp.holograms.HologramSupport;
import net.Indyuce.mmoitems.comp.holograms.HologramsPlugin;
import net.Indyuce.mmoitems.comp.holograms.HolographicDisplaysPlugin;
import net.Indyuce.mmoitems.comp.holograms.TrHologramPlugin;
import net.Indyuce.mmoitems.comp.holograms.*;
import net.Indyuce.mmoitems.comp.inventory.*;
import net.Indyuce.mmoitems.comp.itemglow.ItemGlowListener;
import net.Indyuce.mmoitems.comp.itemglow.NoGlowListener;
import net.Indyuce.mmoitems.comp.mmocore.MMOCoreMMOLoader;
@ -59,34 +31,23 @@ import net.Indyuce.mmoitems.comp.rpg.McMMOHook;
import net.Indyuce.mmoitems.comp.rpg.RPGHandler;
import net.Indyuce.mmoitems.gui.PluginInventory;
import net.Indyuce.mmoitems.gui.listener.GuiListener;
import net.Indyuce.mmoitems.listener.CraftingListener;
import net.Indyuce.mmoitems.listener.CustomBlockListener;
import net.Indyuce.mmoitems.listener.CustomSoundListener;
import net.Indyuce.mmoitems.listener.DisableInteractions;
import net.Indyuce.mmoitems.listener.DurabilityListener;
import net.Indyuce.mmoitems.listener.ElementListener;
import net.Indyuce.mmoitems.listener.ItemListener;
import net.Indyuce.mmoitems.listener.ItemUse;
import net.Indyuce.mmoitems.listener.PlayerListener;
import net.Indyuce.mmoitems.manager.AbilityManager;
import net.Indyuce.mmoitems.manager.BlockManager;
import net.Indyuce.mmoitems.manager.ConfigManager;
import net.Indyuce.mmoitems.manager.CraftingManager;
import net.Indyuce.mmoitems.manager.DropTableManager;
import net.Indyuce.mmoitems.manager.EntityManager;
import net.Indyuce.mmoitems.manager.ItemManager;
import net.Indyuce.mmoitems.manager.LayoutManager;
import net.Indyuce.mmoitems.manager.LoreFormatManager;
import net.Indyuce.mmoitems.manager.PluginUpdateManager;
import net.Indyuce.mmoitems.manager.RecipeManager;
import net.Indyuce.mmoitems.manager.SetManager;
import net.Indyuce.mmoitems.manager.StatManager;
import net.Indyuce.mmoitems.manager.TemplateManager;
import net.Indyuce.mmoitems.manager.TierManager;
import net.Indyuce.mmoitems.manager.TypeManager;
import net.Indyuce.mmoitems.manager.UpgradeManager;
import net.Indyuce.mmoitems.manager.WorldGenManager;
import net.mmogroup.mmolib.version.SpigotPlugin;
import net.Indyuce.mmoitems.listener.*;
import net.Indyuce.mmoitems.manager.*;
import org.apache.commons.lang.Validate;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.java.JavaPlugin;
import javax.annotation.Nullable;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
public class MMOItems extends JavaPlugin {
public static MMOItems plugin;

8
src/main/java/net/Indyuce/mmoitems/MMOUtils.java
View File

@ -3,7 +3,7 @@ package net.Indyuce.mmoitems;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.Property;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.mmogroup.mmolib.MMOLib;
import io.lumine.mythic.lib.MythicLib;
import org.apache.commons.codec.binary.Base64;
import org.bukkit.ChatColor;
import org.bukkit.Location;
@ -196,7 +196,7 @@ public class MMOUtils {
* Extra plugin compatibility, everything is handled via MMOLib because
* the same system is used by MMOCore
*/
if (MMOLib.plugin.getEntities().findCustom(target)) return false;
if (MythicLib.plugin.getEntities().findCustom(target)) return false;
/*
* The ability player damage option is cached for quicker access in the
@ -205,7 +205,7 @@ public class MMOUtils {
if (target instanceof Player && (!MMOItems.plugin.getLanguage().abilityPlayerDamage || !MMOItems.plugin.getFlags().isPvpAllowed(target.getLocation())))
return false;
return loc == null || MMOLib.plugin.getVersion().getWrapper().isInBoundingBox(target, loc);
return loc == null || MythicLib.plugin.getVersion().getWrapper().isInBoundingBox(target, loc);
}
private static final String[] romanChars = {"M", "CM", "D", "CD", "C", "XC", "L", "XL", "X", "IX", "V", "IV", "I"};
@ -280,6 +280,6 @@ public class MMOUtils {
public static ItemStack readIcon(String string) throws IllegalArgumentException {
String[] split = string.split(":");
Material material = Material.valueOf(split[0].toUpperCase().replace("-", "_").replace(" ", "_"));
return split.length > 1 ? MMOLib.plugin.getVersion().getWrapper().textureItem(material, Integer.parseInt(split[1])) : new ItemStack(material);
return split.length > 1 ? MythicLib.plugin.getVersion().getWrapper().textureItem(material, Integer.parseInt(split[1])) : new ItemStack(material);
}
}

2
src/main/java/net/Indyuce/mmoitems/ability/Black_Hole.java
View File

@ -15,7 +15,7 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.LocationAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.version.VersionSound;
public class Black_Hole extends Ability {
public Black_Hole() {

2
src/main/java/net/Indyuce/mmoitems/ability/Blink.java
View File

@ -10,7 +10,7 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.SimpleAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.version.VersionSound;
public class Blink extends Ability {
public Blink() {

4
src/main/java/net/Indyuce/mmoitems/ability/Bouncy_Fireball.java
View File

@ -16,8 +16,8 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.VectorAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
public class Bouncy_Fireball extends Ability {
public Bouncy_Fireball() {

2
src/main/java/net/Indyuce/mmoitems/ability/Bunny_Mode.java
View File

@ -18,7 +18,7 @@ import net.Indyuce.mmoitems.api.ability.SimpleAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.api.util.TemporaryListener;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.version.VersionSound;
public class Bunny_Mode extends Ability {
public Bunny_Mode() {

4
src/main/java/net/Indyuce/mmoitems/ability/Burning_Hands.java
View File

@ -16,8 +16,8 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.SimpleAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
public class Burning_Hands extends Ability {
public Burning_Hands() {

4
src/main/java/net/Indyuce/mmoitems/ability/Circular_Slash.java
View File

@ -16,8 +16,8 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.SimpleAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
public class Circular_Slash extends Ability {
public Circular_Slash() {

10
src/main/java/net/Indyuce/mmoitems/ability/Contamination.java
View File

@ -15,10 +15,10 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.LocationAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.MythicLib;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
import io.lumine.mythic.lib.version.VersionSound;
public class Contamination extends Ability {
public Contamination() {
@ -67,7 +67,7 @@ public class Contamination extends Ability {
loc.getWorld().playSound(loc, VersionSound.ENTITY_ENDERMAN_HURT.toSound(), 2, 1);
for (Entity entity : MMOUtils.getNearbyChunkEntities(loc))
if (MMOUtils.canDamage(stats.getPlayer(), entity) && entity.getLocation().distanceSquared(loc) <= 25)
MMOLib.plugin.getDamage().damage(stats.getPlayer(), (LivingEntity) entity,
MythicLib.plugin.getDamage().damage(stats.getPlayer(), (LivingEntity) entity,
new AttackResult(dps, DamageType.SKILL, DamageType.MAGIC), false);
}
}

21
src/main/java/net/Indyuce/mmoitems/ability/Corrupt.java
View File

@ -1,13 +1,8 @@
package net.Indyuce.mmoitems.ability;
import org.bukkit.Color;
import org.bukkit.Location;
import org.bukkit.Particle;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
import io.lumine.mythic.lib.version.VersionSound;
import net.Indyuce.mmoitems.MMOUtils;
import net.Indyuce.mmoitems.api.ItemAttackResult;
import net.Indyuce.mmoitems.api.ability.Ability;
@ -15,9 +10,13 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.LocationAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import net.mmogroup.mmolib.version.VersionSound;
import org.bukkit.Color;
import org.bukkit.Location;
import org.bukkit.Particle;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
public class Corrupt extends Ability {
public Corrupt() {

4
src/main/java/net/Indyuce/mmoitems/ability/Corrupted_Fangs.java
View File

@ -23,8 +23,8 @@ import net.Indyuce.mmoitems.api.ability.VectorAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.api.util.TemporaryListener;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
public class Corrupted_Fangs extends Ability implements Listener {
public Corrupted_Fangs() {

6
src/main/java/net/Indyuce/mmoitems/ability/Cursed_Beam.java
View File

@ -20,9 +20,9 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.VectorAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
import io.lumine.mythic.lib.version.VersionSound;
public class Cursed_Beam extends Ability {
public Cursed_Beam() {

4
src/main/java/net/Indyuce/mmoitems/ability/Earthquake.java
View File

@ -22,8 +22,8 @@ import net.Indyuce.mmoitems.api.ability.SimpleAbilityResult;
import net.Indyuce.mmoitems.api.ability.VectorAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
public class Earthquake extends Ability {
public Earthquake() {

23
src/main/java/net/Indyuce/mmoitems/ability/Explosive_Turkey.java
View File

@ -1,5 +1,16 @@
package net.Indyuce.mmoitems.ability;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.MMOUtils;
import net.Indyuce.mmoitems.api.ItemAttackResult;
import net.Indyuce.mmoitems.api.ability.Ability;
import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.SimpleAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.api.util.TemporaryListener;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import org.bukkit.Particle;
import org.bukkit.Sound;
import org.bukkit.attribute.Attribute;
@ -13,18 +24,6 @@ import org.bukkit.event.entity.EntityDeathEvent;
import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.util.Vector;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.MMOUtils;
import net.Indyuce.mmoitems.api.ItemAttackResult;
import net.Indyuce.mmoitems.api.ability.Ability;
import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.SimpleAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.api.util.TemporaryListener;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
public class Explosive_Turkey extends Ability implements Listener {
public Explosive_Turkey() {
super(CastingMode.ON_HIT, CastingMode.WHEN_HIT, CastingMode.LEFT_CLICK, CastingMode.RIGHT_CLICK, CastingMode.SHIFT_LEFT_CLICK,

6
src/main/java/net/Indyuce/mmoitems/ability/Fire_Meteor.java
View File

@ -17,9 +17,9 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.VectorAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
import io.lumine.mythic.lib.version.VersionSound;
public class Fire_Meteor extends Ability {
public Fire_Meteor() {

6
src/main/java/net/Indyuce/mmoitems/ability/Firebolt.java
View File

@ -18,9 +18,9 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.VectorAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
import io.lumine.mythic.lib.version.VersionSound;
public class Firebolt extends Ability {
public Firebolt() {

6
src/main/java/net/Indyuce/mmoitems/ability/Firefly.java
View File

@ -17,9 +17,9 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.SimpleAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
import io.lumine.mythic.lib.version.VersionSound;
public class Firefly extends Ability {
public Firefly() {

6
src/main/java/net/Indyuce/mmoitems/ability/Freezing_Curse.java
View File

@ -17,9 +17,9 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.LocationAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
import io.lumine.mythic.lib.version.VersionSound;
public class Freezing_Curse extends Ability {
public Freezing_Curse() {

2
src/main/java/net/Indyuce/mmoitems/ability/Frog_Mode.java
View File

@ -13,7 +13,7 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.SimpleAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.version.VersionSound;
public class Frog_Mode extends Ability implements Listener {
public Frog_Mode() {

4
src/main/java/net/Indyuce/mmoitems/ability/Heavy_Charge.java
View File

@ -15,8 +15,8 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.VectorAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
public class Heavy_Charge extends Ability {
public Heavy_Charge() {

6
src/main/java/net/Indyuce/mmoitems/ability/Holy_Missile.java
View File

@ -18,9 +18,9 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.VectorAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
import io.lumine.mythic.lib.version.VersionSound;
public class Holy_Missile extends Ability {
public Holy_Missile() {

6
src/main/java/net/Indyuce/mmoitems/ability/Ice_Crystal.java
View File

@ -21,9 +21,9 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.VectorAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
import io.lumine.mythic.lib.version.VersionSound;
public class Ice_Crystal extends Ability {
public Ice_Crystal() {

6
src/main/java/net/Indyuce/mmoitems/ability/Item_Bomb.java
View File

@ -20,9 +20,9 @@ import net.Indyuce.mmoitems.api.ability.VectorAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.api.util.NoClipItem;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
import io.lumine.mythic.lib.version.VersionSound;
public class Item_Bomb extends Ability implements Listener {
public Item_Bomb() {

4
src/main/java/net/Indyuce/mmoitems/ability/Item_Throw.java
View File

@ -18,8 +18,8 @@ import net.Indyuce.mmoitems.api.ability.VectorAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.api.util.NoClipItem;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
public class Item_Throw extends Ability implements Listener {
public Item_Throw() {

2
src/main/java/net/Indyuce/mmoitems/ability/Leap.java
View File

@ -12,7 +12,7 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.SimpleAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.version.VersionSound;
public class Leap extends Ability {
public Leap() {

6
src/main/java/net/Indyuce/mmoitems/ability/Life_Ender.java
View File

@ -16,9 +16,9 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.LocationAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
import io.lumine.mythic.lib.version.VersionSound;
public class Life_Ender extends Ability {
public Life_Ender() {

6
src/main/java/net/Indyuce/mmoitems/ability/Light_Dash.java
View File

@ -17,9 +17,9 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.SimpleAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
import io.lumine.mythic.lib.version.VersionSound;
public class Light_Dash extends Ability {
public Light_Dash() {

6
src/main/java/net/Indyuce/mmoitems/ability/Lightning_Beam.java
View File

@ -13,9 +13,9 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.LocationAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
import io.lumine.mythic.lib.version.VersionSound;
public class Lightning_Beam extends Ability {
public Lightning_Beam() {

2
src/main/java/net/Indyuce/mmoitems/ability/Magical_Path.java
View File

@ -20,7 +20,7 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.SimpleAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.version.VersionSound;
public class Magical_Path extends Ability {
public Magical_Path() {

2
src/main/java/net/Indyuce/mmoitems/ability/Magical_Shield.java
View File

@ -19,7 +19,7 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.SimpleAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.version.VersionSound;
public class Magical_Shield extends Ability {
public Magical_Shield() {

6
src/main/java/net/Indyuce/mmoitems/ability/Magma_Fissure.java
View File

@ -14,9 +14,9 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.TargetAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
import io.lumine.mythic.lib.version.VersionSound;
public class Magma_Fissure extends Ability {
public Magma_Fissure() {

6
src/main/java/net/Indyuce/mmoitems/ability/Overload.java
View File

@ -15,9 +15,9 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.SimpleAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
import io.lumine.mythic.lib.version.VersionSound;
public class Overload extends Ability {
public Overload() {

8
src/main/java/net/Indyuce/mmoitems/ability/Present_Throw.java
View File

@ -25,10 +25,10 @@ import net.Indyuce.mmoitems.api.ability.SimpleAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.api.util.NoClipItem;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import net.mmogroup.mmolib.version.VersionMaterial;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
import io.lumine.mythic.lib.version.VersionMaterial;
import io.lumine.mythic.lib.version.VersionSound;
public class Present_Throw extends Ability {
private final ItemStack present = VersionMaterial.PLAYER_HEAD.toItem();

4
src/main/java/net/Indyuce/mmoitems/ability/Regen_Ally.java
View File

@ -13,7 +13,7 @@ import net.Indyuce.mmoitems.api.ability.Ability;
import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.MMOLib;
import io.lumine.mythic.lib.MythicLib;
public class Regen_Ally extends Ability {
public Regen_Ally() {
@ -66,7 +66,7 @@ public class Regen_Ally extends Ability {
public FriendlyTargetAbilityResult(AbilityData ability, Player caster, LivingEntity target) {
super(ability);
this.target = target != null ? target : MMOLib.plugin.getVersion().getWrapper().rayTrace(caster, 50, entity -> (entity instanceof Player && MMOUtils.canDamage(caster, entity))).getHit();
this.target = target != null ? target : MythicLib.plugin.getVersion().getWrapper().rayTrace(caster, 50, entity -> (entity instanceof Player && MMOUtils.canDamage(caster, entity))).getHit();
}
public LivingEntity getTarget() {

2
src/main/java/net/Indyuce/mmoitems/ability/Shadow_Veil.java
View File

@ -7,7 +7,7 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.SimpleAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.version.VersionSound;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Particle;

6
src/main/java/net/Indyuce/mmoitems/ability/Shulker_Missile.java
View File

@ -23,9 +23,9 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.VectorAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import net.mmogroup.mmolib.api.item.NBTItem;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
import io.lumine.mythic.lib.api.item.NBTItem;
public class Shulker_Missile extends Ability implements Listener {
public Shulker_Missile() {

4
src/main/java/net/Indyuce/mmoitems/ability/Sky_Smash.java
View File

@ -15,8 +15,8 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.SimpleAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
public class Sky_Smash extends Ability {
public Sky_Smash() {

4
src/main/java/net/Indyuce/mmoitems/ability/Smite.java
View File

@ -8,8 +8,8 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.TargetAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
public class Smite extends Ability {
public Smite() {

2
src/main/java/net/Indyuce/mmoitems/ability/Snowman_Turret.java
View File

@ -28,7 +28,7 @@ import net.Indyuce.mmoitems.api.ability.LocationAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.api.util.TemporaryListener;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.version.VersionSound;
public class Snowman_Turret extends Ability {
public Snowman_Turret() {

6
src/main/java/net/Indyuce/mmoitems/ability/Sparkle.java
View File

@ -13,9 +13,9 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.TargetAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
import io.lumine.mythic.lib.version.VersionSound;
public class Sparkle extends Ability {
public Sparkle() {

2
src/main/java/net/Indyuce/mmoitems/ability/Swiftness.java
View File

@ -11,7 +11,7 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.SimpleAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.version.VersionSound;
public class Swiftness extends Ability {
public Swiftness() {

4
src/main/java/net/Indyuce/mmoitems/ability/Tactical_Grenade.java
View File

@ -19,8 +19,8 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.TargetAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
public class Tactical_Grenade extends Ability {
public Tactical_Grenade() {

6
src/main/java/net/Indyuce/mmoitems/ability/Targeted_Fireball.java
View File

@ -15,9 +15,9 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.TargetAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
import io.lumine.mythic.lib.version.VersionSound;
public class Targeted_Fireball extends Ability {
public Targeted_Fireball() {

4
src/main/java/net/Indyuce/mmoitems/ability/Throw_Up.java
View File

@ -20,8 +20,8 @@ import net.Indyuce.mmoitems.api.ability.SimpleAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.api.util.NoClipItem;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
public class Throw_Up extends Ability implements Listener {
public Throw_Up() {

4
src/main/java/net/Indyuce/mmoitems/ability/Thrust.java
View File

@ -16,8 +16,8 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.VectorAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
public class Thrust extends Ability {
public Thrust() {

19
src/main/java/net/Indyuce/mmoitems/ability/arcane/Arcane_Hail.java
View File

@ -1,12 +1,8 @@
package net.Indyuce.mmoitems.ability.arcane;
import org.bukkit.Location;
import org.bukkit.Particle;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.util.Vector;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
import io.lumine.mythic.lib.version.VersionSound;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.MMOUtils;
import net.Indyuce.mmoitems.api.ItemAttackResult;
@ -15,9 +11,12 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.LocationAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import net.mmogroup.mmolib.version.VersionSound;
import org.bukkit.Location;
import org.bukkit.Particle;
import org.bukkit.entity.Entity;
import org.bukkit.entity.LivingEntity;
import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.util.Vector;
public class Arcane_Hail extends Ability {
public Arcane_Hail() {

6
src/main/java/net/Indyuce/mmoitems/ability/arcane/Arcane_Rift.java
View File

@ -21,9 +21,9 @@ import net.Indyuce.mmoitems.api.ability.SimpleAbilityResult;
import net.Indyuce.mmoitems.api.ability.VectorAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
import io.lumine.mythic.lib.version.VersionSound;
public class Arcane_Rift extends Ability {
public Arcane_Rift() {

2
src/main/java/net/Indyuce/mmoitems/ability/onhit/Blind.java
View File

@ -15,7 +15,7 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.TargetAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.version.VersionSound;
public class Blind extends Ability {
public Blind() {

8
src/main/java/net/Indyuce/mmoitems/ability/onhit/Death_Mark.java
View File

@ -14,9 +14,9 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.TargetAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import io.lumine.mythic.lib.MythicLib;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
public class Death_Mark extends Ability {
public Death_Mark() {
@ -55,7 +55,7 @@ public class Death_Mark extends Ability {
target.getWorld().spawnParticle(Particle.SPELL_MOB, target.getLocation(), 4, .2, 0, .2, 0);
if (ti % 20 == 0)
MMOLib.plugin.getDamage().damage(stats.getPlayer(), target, new AttackResult(dps, DamageType.SKILL, DamageType.MAGIC), false);
MythicLib.plugin.getDamage().damage(stats.getPlayer(), target, new AttackResult(dps, DamageType.SKILL, DamageType.MAGIC), false);
}
}.runTaskTimer(MMOItems.plugin, 0, 1);
target.getWorld().playSound(target.getLocation(), Sound.ENTITY_BLAZE_HURT, 1, 2);

2
src/main/java/net/Indyuce/mmoitems/ability/onhit/Freeze.java
View File

@ -14,7 +14,7 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.LocationAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.version.VersionSound;
public class Freeze extends Ability {
public Freeze() {

2
src/main/java/net/Indyuce/mmoitems/ability/onhit/Ignite.java
View File

@ -12,7 +12,7 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.LocationAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.version.VersionSound;
public class Ignite extends Ability {
public Ignite() {

4
src/main/java/net/Indyuce/mmoitems/ability/onhit/Minor_Explosion.java
View File

@ -13,8 +13,8 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.LocationAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
public class Minor_Explosion extends Ability {
public Minor_Explosion() {

2
src/main/java/net/Indyuce/mmoitems/ability/onhit/Shock.java
View File

@ -13,7 +13,7 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.TargetAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.version.VersionSound;
public class Shock extends Ability {
public Shock() {

2
src/main/java/net/Indyuce/mmoitems/ability/onhit/Starfall.java
View File

@ -14,7 +14,7 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.TargetAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.version.VersionSound;
public class Starfall extends Ability {
public Starfall() {

2
src/main/java/net/Indyuce/mmoitems/ability/onhit/Weaken_Target.java
View File

@ -26,7 +26,7 @@ import net.Indyuce.mmoitems.api.ability.AbilityResult;
import net.Indyuce.mmoitems.api.ability.TargetAbilityResult;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.version.VersionSound;
public class Weaken_Target extends Ability implements Listener {
public final Map<UUID, WeakenedInfo> marked = new HashMap<>();

2
src/main/java/net/Indyuce/mmoitems/api/ArrowParticles.java
View File

@ -3,7 +3,7 @@ package net.Indyuce.mmoitems.api;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import net.Indyuce.mmoitems.MMOItems;
import net.mmogroup.mmolib.api.item.NBTItem;
import io.lumine.mythic.lib.api.item.NBTItem;
import org.bukkit.Color;
import org.bukkit.Particle;

2
src/main/java/net/Indyuce/mmoitems/api/CustomSound.java
View File

@ -4,7 +4,7 @@ import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
import net.Indyuce.mmoitems.MMOUtils;
import net.mmogroup.mmolib.version.VersionMaterial;
import io.lumine.mythic.lib.version.VersionMaterial;
public enum CustomSound {
ON_ATTACK(Material.IRON_SWORD, 19, "Plays when attacking an entity."),

6
src/main/java/net/Indyuce/mmoitems/api/Element.java
View File

@ -20,9 +20,9 @@ import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.MMOUtils;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.listener.ElementListener;
import net.mmogroup.mmolib.api.DamageType;
import net.mmogroup.mmolib.version.VersionMaterial;
import net.mmogroup.mmolib.version.VersionSound;
import io.lumine.mythic.lib.api.DamageType;
import io.lumine.mythic.lib.version.VersionMaterial;
import io.lumine.mythic.lib.version.VersionSound;
public enum Element {
FIRE(Material.BLAZE_POWDER, ChatColor.DARK_RED, new ElementParticle(Particle.FLAME, .05f, 8), (stats, result, target, attack, absolute) -> {

6
src/main/java/net/Indyuce/mmoitems/api/ElementalAttack.java
View File

@ -9,8 +9,8 @@ import org.bukkit.inventory.ItemStack;
import net.Indyuce.mmoitems.api.player.PlayerData.CooldownType;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.item.NBTItem;
import io.lumine.mythic.lib.MythicLib;
import io.lumine.mythic.lib.api.item.NBTItem;
public class ElementalAttack {
private final Map<Element, Double> relative = new HashMap<>();
@ -40,7 +40,7 @@ public class ElementalAttack {
// elemental defense
for (ItemStack equip : target.getEquipment().getArmorContents()) {
NBTItem nbtEquip = MMOLib.plugin.getVersion().getWrapper().getNBTItem(equip);
NBTItem nbtEquip = MythicLib.plugin.getVersion().getWrapper().getNBTItem(equip);
if (nbtEquip.getType() != null)
for (Element element : absolute.keySet()) {
double defense = nbtEquip.getStat(element.name() + "_DEFENSE") / 100;

13
src/main/java/net/Indyuce/mmoitems/api/ItemAttackResult.java
View File

@ -1,13 +1,12 @@
package net.Indyuce.mmoitems.api;
import org.bukkit.entity.LivingEntity;
import io.lumine.mythic.lib.MythicLib;
import io.lumine.mythic.lib.api.AttackResult;
import io.lumine.mythic.lib.api.DamageType;
import io.lumine.mythic.lib.api.item.NBTItem;
import net.Indyuce.mmoitems.api.ability.Ability.CastingMode;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.AttackResult;
import net.mmogroup.mmolib.api.DamageType;
import net.mmogroup.mmolib.api.item.NBTItem;
import org.bukkit.entity.LivingEntity;
public class ItemAttackResult extends AttackResult {
public ItemAttackResult(boolean successful, DamageType... types) {
@ -48,7 +47,7 @@ public class ItemAttackResult extends AttackResult {
* The entity target
*/
public void applyEffectsAndDamage(CachedStats stats, NBTItem item, LivingEntity target) {
MMOLib.plugin.getDamage().damage(stats.getPlayer(), target, applyEffects(stats, item, target));
MythicLib.plugin.getDamage().damage(stats.getPlayer(), target, applyEffects(stats, item, target));
}
/**

6
src/main/java/net/Indyuce/mmoitems/api/ItemTier.java
View File

@ -1,10 +1,10 @@
package net.Indyuce.mmoitems.api;
import io.lumine.mythic.lib.MythicLib;
import net.Indyuce.mmoitems.api.droptable.DropTable;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.Indyuce.mmoitems.api.util.NumericStatFormula;
import net.Indyuce.mmoitems.comp.itemglow.TierColor;
import net.mmogroup.mmolib.MMOLib;
import org.bukkit.Bukkit;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.inventory.ItemStack;
@ -35,7 +35,7 @@ public class ItemTier {
public ItemTier(ConfigurationSection config) {
id = config.getName().toUpperCase().replace("-", "_");
name = MMOLib.plugin.parseColors(config.getString("name"));
name = MythicLib.plugin.parseColors(config.getString("name"));
deconstruct = config.contains("deconstruct-item") ? new DropTable(config.getConfigurationSection("deconstruct-item")) : null;
unidentificationInfo = new UnidentificationInfo(config.getConfigurationSection("unidentification"));
@ -144,6 +144,6 @@ public class ItemTier {
}
private String color(String str) {
return MMOLib.plugin.parseColors(str);
return MythicLib.plugin.parseColors(str);
}
}

6
src/main/java/net/Indyuce/mmoitems/api/ProjectileData.java
View File

@ -9,8 +9,8 @@ import com.google.gson.JsonObject;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.Indyuce.mmoitems.stat.data.PotionEffectData;
import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.item.NBTItem;
import io.lumine.mythic.lib.MythicLib;
import io.lumine.mythic.lib.api.item.NBTItem;
public class ProjectileData {
private final NBTItem sourceItem;
@ -41,7 +41,7 @@ public class ProjectileData {
public void applyPotionEffects(LivingEntity target) {
if (sourceItem.hasTag("MMOITEMS_ARROW_POTION_EFFECTS"))
for (JsonElement entry : MMOLib.plugin.getJson().parse(sourceItem.getString("MMOITEMS_ARROW_POTION_EFFECTS"), JsonArray.class)) {
for (JsonElement entry : MythicLib.plugin.getJson().parse(sourceItem.getString("MMOITEMS_ARROW_POTION_EFFECTS"), JsonArray.class)) {
if (!entry.isJsonObject())
continue;

22
src/main/java/net/Indyuce/mmoitems/api/Type.java
View File

@ -1,20 +1,18 @@
package net.Indyuce.mmoitems.api;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nullable;
import io.lumine.mythic.lib.MythicLib;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.item.util.identify.UnidentifiedItem;
import net.Indyuce.mmoitems.manager.TypeManager;
import net.Indyuce.mmoitems.stat.type.ItemStat;
import org.apache.commons.lang.Validate;
import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.inventory.ItemStack;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.item.util.identify.UnidentifiedItem;
import net.Indyuce.mmoitems.manager.TypeManager;
import net.Indyuce.mmoitems.stat.type.ItemStat;
import net.mmogroup.mmolib.MMOLib;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;
@SuppressWarnings("unused")
public class Type {
@ -202,7 +200,7 @@ public class Type {
String[] split = str.split(":");
Material material = Material.valueOf(split[0]);
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);
}
/**
@ -216,7 +214,7 @@ public class Type {
*/
@Deprecated
public static Type get(ItemStack item) {
return Type.get(MMOLib.plugin.getVersion().getWrapper().getNBTItem(item).getType());
return Type.get(MythicLib.plugin.getVersion().getWrapper().getNBTItem(item).getType());
}
/**

2
src/main/java/net/Indyuce/mmoitems/api/TypeSet.java
View File

@ -1,12 +1,12 @@
package net.Indyuce.mmoitems.api;
import io.lumine.mythic.lib.version.VersionSound;
import net.Indyuce.mmoitems.ItemStats;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.MMOUtils;
import net.Indyuce.mmoitems.api.interaction.weapon.Weapon;
import net.Indyuce.mmoitems.api.player.PlayerData.CooldownType;
import net.Indyuce.mmoitems.api.player.PlayerStats.CachedStats;
import net.mmogroup.mmolib.version.VersionSound;
import org.bukkit.Location;
import org.bukkit.Particle;
import org.bukkit.Sound;

2
src/main/java/net/Indyuce/mmoitems/api/UpdaterData.java
View File

@ -10,7 +10,7 @@ import org.bukkit.configuration.ConfigurationSection;
import net.Indyuce.mmoitems.api.item.template.MMOItemTemplate;
import net.Indyuce.mmoitems.manager.UpdaterManager.KeepOption;
import net.mmogroup.mmolib.api.item.NBTItem;
import io.lumine.mythic.lib.api.item.NBTItem;
public class UpdaterData {

4
src/main/java/net/Indyuce/mmoitems/api/ability/TargetAbilityResult.java
View File

@ -5,7 +5,7 @@ import org.bukkit.entity.Player;
import net.Indyuce.mmoitems.MMOUtils;
import net.Indyuce.mmoitems.stat.data.AbilityData;
import net.mmogroup.mmolib.MMOLib;
import io.lumine.mythic.lib.MythicLib;
public class TargetAbilityResult extends AbilityResult {
private final LivingEntity target;
@ -13,7 +13,7 @@ public class TargetAbilityResult extends AbilityResult {
public TargetAbilityResult(AbilityData ability, Player caster, LivingEntity target) {
super(ability);
this.target = target != null ? target : MMOLib.plugin.getVersion().getWrapper().rayTrace(caster, 50, entity -> MMOUtils.canDamage(caster, entity)).getHit();
this.target = target != null ? target : MythicLib.plugin.getVersion().getWrapper().rayTrace(caster, 50, entity -> MMOUtils.canDamage(caster, entity)).getHit();
}
public LivingEntity getTarget() {

10
src/main/java/net/Indyuce/mmoitems/api/crafting/CraftingStation.java
View File

@ -1,14 +1,14 @@
package net.Indyuce.mmoitems.api.crafting;
import io.lumine.mythic.lib.MythicLib;
import io.lumine.mythic.lib.api.util.PostLoadObject;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.crafting.recipe.CheckedRecipe;
import net.Indyuce.mmoitems.api.crafting.recipe.CraftingRecipe;
import net.Indyuce.mmoitems.api.crafting.recipe.Recipe;
import net.Indyuce.mmoitems.api.crafting.recipe.Recipe.RecipeOption;
import net.Indyuce.mmoitems.api.crafting.recipe.CheckedRecipe;
import net.Indyuce.mmoitems.api.crafting.recipe.UpgradingRecipe;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.util.PostLoadObject;
import org.apache.commons.lang.Validate;
import org.bukkit.Sound;
import org.bukkit.configuration.ConfigurationSection;
@ -31,7 +31,7 @@ public class CraftingStation extends PostLoadObject {
super(config);
this.id = id.toLowerCase().replace("_", "-").replace(" ", "-");
this.name = MMOLib.plugin.parseColors(config.getString("name"));
this.name = MythicLib.plugin.parseColors(config.getString("name"));
this.layout = MMOItems.plugin.getLayouts().getLayout(config.getString("layout", "default"));
this.sound = Sound.valueOf(config.getString("sound", "ENTITY_EXPERIENCE_ORB_PICKUP").toUpperCase());
@ -55,7 +55,7 @@ public class CraftingStation extends PostLoadObject {
Validate.notNull(sound, "Crafting station sound must not be null");
this.id = id.toLowerCase().replace("_", "-").replace(" ", "-");
this.name = MMOLib.plugin.parseColors(name);
this.name = MythicLib.plugin.parseColors(name);
this.layout = layout;
this.sound = sound;
this.itemOptions = itemOptions;

19
src/main/java/net/Indyuce/mmoitems/api/crafting/IngredientInventory.java
View File

@ -1,21 +1,16 @@
package net.Indyuce.mmoitems.api.crafting;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import io.lumine.mythic.lib.MythicLib;
import io.lumine.mythic.lib.api.item.NBTItem;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.crafting.ingredient.Ingredient;
import net.Indyuce.mmoitems.manager.CraftingManager.IngredientType;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.crafting.ingredient.Ingredient;
import net.Indyuce.mmoitems.manager.CraftingManager.IngredientType;
import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.item.NBTItem;
import java.util.*;
public class IngredientInventory {
@ -34,7 +29,7 @@ public class IngredientInventory {
public IngredientInventory(Inventory inv) {
loop: for (ItemStack item : inv.getContents())
if (item != null && item.getType() != Material.AIR) {
NBTItem nbt = MMOLib.plugin.getVersion().getWrapper().getNBTItem(item);
NBTItem nbt = MythicLib.plugin.getVersion().getWrapper().getNBTItem(item);
for (IngredientType ingredient : MMOItems.plugin.getCrafting().getIngredients()) {
if (ingredient.check(nbt)) {
addIngredient(nbt, ingredient);

2
src/main/java/net/Indyuce/mmoitems/api/crafting/condition/ClassCondition.java
View File

@ -4,7 +4,7 @@ import java.util.Arrays;
import java.util.List;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.mmogroup.mmolib.api.MMOLineConfig;
import io.lumine.mythic.lib.api.MMOLineConfig;
public class ClassCondition extends Condition {
private final List<String> classes;

2
src/main/java/net/Indyuce/mmoitems/api/crafting/condition/FoodCondition.java
View File

@ -1,7 +1,7 @@
package net.Indyuce.mmoitems.api.crafting.condition;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.mmogroup.mmolib.api.MMOLineConfig;
import io.lumine.mythic.lib.api.MMOLineConfig;
public class FoodCondition extends Condition {
private final int amount;

2
src/main/java/net/Indyuce/mmoitems/api/crafting/condition/LevelCondition.java
View File

@ -1,7 +1,7 @@
package net.Indyuce.mmoitems.api.crafting.condition;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.mmogroup.mmolib.api.MMOLineConfig;
import io.lumine.mythic.lib.api.MMOLineConfig;
public class LevelCondition extends Condition {
private final int level;

2
src/main/java/net/Indyuce/mmoitems/api/crafting/condition/ManaCondition.java
View File

@ -1,7 +1,7 @@
package net.Indyuce.mmoitems.api.crafting.condition;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.mmogroup.mmolib.api.MMOLineConfig;
import io.lumine.mythic.lib.api.MMOLineConfig;
public class ManaCondition extends Condition {
private final double amount;

2
src/main/java/net/Indyuce/mmoitems/api/crafting/condition/PermissionCondition.java
View File

@ -4,7 +4,7 @@ import java.util.Arrays;
import java.util.List;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.mmogroup.mmolib.api.MMOLineConfig;
import io.lumine.mythic.lib.api.MMOLineConfig;
public class PermissionCondition extends Condition {
private final List<String> permissions;

2
src/main/java/net/Indyuce/mmoitems/api/crafting/condition/StaminaCondition.java
View File

@ -1,7 +1,7 @@
package net.Indyuce.mmoitems.api.crafting.condition;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.mmogroup.mmolib.api.MMOLineConfig;
import io.lumine.mythic.lib.api.MMOLineConfig;
public class StaminaCondition extends Condition {
private final double amount;

6
src/main/java/net/Indyuce/mmoitems/api/crafting/ingredient/Ingredient.java
View File

@ -1,14 +1,14 @@
package net.Indyuce.mmoitems.api.crafting.ingredient;
import org.bukkit.inventory.ItemStack;
import io.lumine.mythic.lib.api.MMOLineConfig;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.crafting.ConditionalDisplay;
import net.Indyuce.mmoitems.api.crafting.IngredientInventory;
import net.Indyuce.mmoitems.api.crafting.IngredientInventory.IngredientLookupMode;
import net.Indyuce.mmoitems.api.crafting.IngredientInventory.PlayerIngredient;
import net.Indyuce.mmoitems.api.player.RPGPlayer;
import net.mmogroup.mmolib.api.MMOLineConfig;
import org.bukkit.inventory.ItemStack;
public abstract class Ingredient {
private final String id;

2
src/main/java/net/Indyuce/mmoitems/api/crafting/ingredient/MMOItemIngredient.java
View File

@ -10,7 +10,7 @@ import net.Indyuce.mmoitems.api.crafting.ConfigMMOItem;
import net.Indyuce.mmoitems.api.item.template.MMOItemTemplate;
import net.Indyuce.mmoitems.api.player.RPGPlayer;
import net.Indyuce.mmoitems.stat.data.MaterialData;
import net.mmogroup.mmolib.api.MMOLineConfig;
import io.lumine.mythic.lib.api.MMOLineConfig;
public class MMOItemIngredient extends Ingredient {
private final MMOItemTemplate template;

6
src/main/java/net/Indyuce/mmoitems/api/crafting/ingredient/VanillaIngredient.java
View File

@ -6,8 +6,8 @@ import org.bukkit.inventory.meta.ItemMeta;
import net.Indyuce.mmoitems.MMOUtils;
import net.Indyuce.mmoitems.api.player.RPGPlayer;
import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.MMOLineConfig;
import io.lumine.mythic.lib.MythicLib;
import io.lumine.mythic.lib.api.MMOLineConfig;
public class VanillaIngredient extends Ingredient {
private final Material material;
@ -24,7 +24,7 @@ public class VanillaIngredient extends Ingredient {
config.validate("type");
material = Material.valueOf(config.getString("type").toUpperCase().replace("-", "_").replace(" ", "_"));
displayName = config.contains("name") ? MMOLib.plugin.parseColors(config.getString("name")) : null;
displayName = config.contains("name") ? MythicLib.plugin.parseColors(config.getString("name")) : null;
display = config.contains("display") ? config.getString("display") : MMOUtils.caseOnWords(material.name().toLowerCase().replace("_", " "));
}

13
src/main/java/net/Indyuce/mmoitems/api/crafting/recipe/CraftingRecipe.java
View File

@ -1,11 +1,6 @@
package net.Indyuce.mmoitems.api.crafting.recipe;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Sound;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.inventory.ItemStack;
import io.lumine.mythic.lib.api.util.SmartGive;
import net.Indyuce.mmoitems.api.crafting.ConfigMMOItem;
import net.Indyuce.mmoitems.api.crafting.CraftingStation;
import net.Indyuce.mmoitems.api.crafting.CraftingStatus.CraftingQueue;
@ -14,7 +9,11 @@ import net.Indyuce.mmoitems.api.event.PlayerUseCraftingStationEvent;
import net.Indyuce.mmoitems.api.item.util.ConfigItems;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.Indyuce.mmoitems.api.util.message.Message;
import net.mmogroup.mmolib.api.util.SmartGive;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Sound;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.inventory.ItemStack;
public class CraftingRecipe extends Recipe {
private final ConfigMMOItem output;

19
src/main/java/net/Indyuce/mmoitems/api/crafting/recipe/Recipe.java
View File

@ -1,14 +1,6 @@
package net.Indyuce.mmoitems.api.crafting.recipe;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
import org.apache.commons.lang.Validate;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.inventory.ItemStack;
import io.lumine.mythic.lib.api.MMOLineConfig;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.crafting.CraftingStation;
import net.Indyuce.mmoitems.api.crafting.IngredientInventory;
@ -16,7 +8,14 @@ import net.Indyuce.mmoitems.api.crafting.condition.Condition;
import net.Indyuce.mmoitems.api.crafting.ingredient.Ingredient;
import net.Indyuce.mmoitems.api.crafting.trigger.Trigger;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.mmogroup.mmolib.api.MMOLineConfig;
import org.apache.commons.lang.Validate;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.inventory.ItemStack;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
@SuppressWarnings("unused")
public abstract class Recipe {

4
src/main/java/net/Indyuce/mmoitems/api/crafting/recipe/UpgradingRecipe.java
View File

@ -21,7 +21,7 @@ import net.Indyuce.mmoitems.api.item.util.ConfigItems;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.Indyuce.mmoitems.api.util.message.Message;
import net.Indyuce.mmoitems.stat.data.UpgradeData;
import net.mmogroup.mmolib.MMOLib;
import io.lumine.mythic.lib.MythicLib;
public class UpgradingRecipe extends Recipe {
private final ConfigMMOItem item;
@ -77,7 +77,7 @@ public class UpgradingRecipe extends Recipe {
}
UpgradingRecipeInfo recipe = (UpgradingRecipeInfo) uncastRecipe;
if (!(recipe.mmoitem = new LiveMMOItem(MMOLib.plugin.getVersion().getWrapper().getNBTItem(upgraded.getFirstItem())))
if (!(recipe.mmoitem = new LiveMMOItem(MythicLib.plugin.getVersion().getWrapper().getNBTItem(upgraded.getFirstItem())))
.hasData(ItemStats.UPGRADE))
return false;

2
src/main/java/net/Indyuce/mmoitems/api/crafting/trigger/CommandTrigger.java
View File

@ -1,7 +1,7 @@
package net.Indyuce.mmoitems.api.crafting.trigger;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.mmogroup.mmolib.api.MMOLineConfig;
import io.lumine.mythic.lib.api.MMOLineConfig;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;

4
src/main/java/net/Indyuce/mmoitems/api/crafting/trigger/MMOItemTrigger.java
View File

@ -8,8 +8,8 @@ import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.Type;
import net.Indyuce.mmoitems.api.item.template.MMOItemTemplate;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.mmogroup.mmolib.api.MMOLineConfig;
import net.mmogroup.mmolib.api.util.SmartGive;
import io.lumine.mythic.lib.api.MMOLineConfig;
import io.lumine.mythic.lib.api.util.SmartGive;
public class MMOItemTrigger extends Trigger {
private final MMOItemTemplate template;

2
src/main/java/net/Indyuce/mmoitems/api/crafting/trigger/MessageTrigger.java
View File

@ -2,7 +2,7 @@ package net.Indyuce.mmoitems.api.crafting.trigger;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.mmogroup.mmolib.api.MMOLineConfig;
import io.lumine.mythic.lib.api.MMOLineConfig;
public class MessageTrigger extends Trigger {
private final String message;

2
src/main/java/net/Indyuce/mmoitems/api/crafting/trigger/SoundTrigger.java
View File

@ -1,7 +1,7 @@
package net.Indyuce.mmoitems.api.crafting.trigger;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.mmogroup.mmolib.api.MMOLineConfig;
import io.lumine.mythic.lib.api.MMOLineConfig;
import org.bukkit.Sound;
public class SoundTrigger extends Trigger {

4
src/main/java/net/Indyuce/mmoitems/api/crafting/trigger/VanillaTrigger.java
View File

@ -1,8 +1,8 @@
package net.Indyuce.mmoitems.api.crafting.trigger;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.mmogroup.mmolib.api.MMOLineConfig;
import net.mmogroup.mmolib.api.util.SmartGive;
import io.lumine.mythic.lib.api.MMOLineConfig;
import io.lumine.mythic.lib.api.util.SmartGive;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;

2
src/main/java/net/Indyuce/mmoitems/api/droptable/item/MMOItemDropItem.java
View File

@ -7,7 +7,7 @@ import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.Type;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.Indyuce.mmoitems.api.util.RandomAmount;
import net.mmogroup.mmolib.api.item.NBTItem;
import io.lumine.mythic.lib.api.item.NBTItem;
public class MMOItemDropItem extends DropItem {
private final Type type;

4
src/main/java/net/Indyuce/mmoitems/api/edition/NewItemEdition.java
View File

@ -8,7 +8,7 @@ import net.Indyuce.mmoitems.api.edition.input.AnvilGUI;
import net.Indyuce.mmoitems.api.edition.input.ChatEdition;
import net.Indyuce.mmoitems.gui.ItemBrowser;
import net.Indyuce.mmoitems.gui.PluginInventory;
import net.mmogroup.mmolib.MMOLib;
import io.lumine.mythic.lib.MythicLib;
public class NewItemEdition implements Edition {
private final ItemBrowser inv;
@ -34,7 +34,7 @@ public class NewItemEdition implements Edition {
* anvil text input feature. enables players to use an anvil to input
* text if they are having conflicts with their chat management plugins.
*/
if (MMOItems.plugin.getConfig().getBoolean("anvil-text-input") && MMOLib.plugin.getVersion().isBelowOrEqual(1, 13)) {
if (MMOItems.plugin.getConfig().getBoolean("anvil-text-input") && MythicLib.plugin.getVersion().isBelowOrEqual(1, 13)) {
new AnvilGUI(this);
return;
}

7
src/main/java/net/Indyuce/mmoitems/api/edition/StatEdition.java
View File

@ -1,7 +1,6 @@
package net.Indyuce.mmoitems.api.edition;
import org.bukkit.ChatColor;
import io.lumine.mythic.lib.MythicLib;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.edition.input.AnvilGUI;
import net.Indyuce.mmoitems.api.edition.input.ChatEdition;
@ -9,7 +8,7 @@ import net.Indyuce.mmoitems.comp.parse.StringInputParser;
import net.Indyuce.mmoitems.gui.PluginInventory;
import net.Indyuce.mmoitems.gui.edition.EditionInventory;
import net.Indyuce.mmoitems.stat.type.ItemStat;
import net.mmogroup.mmolib.MMOLib;
import org.bukkit.ChatColor;
public class StatEdition implements Edition {
@ -54,7 +53,7 @@ public class StatEdition implements Edition {
* anvil text input feature. enables players to use an anvil to input
* text if they are having conflicts with their chat management plugins.
*/
if (MMOItems.plugin.getConfig().getBoolean("anvil-text-input") && MMOLib.plugin.getVersion().isBelowOrEqual(1, 13)) {
if (MMOItems.plugin.getConfig().getBoolean("anvil-text-input") && MythicLib.plugin.getVersion().isBelowOrEqual(1, 13)) {
new AnvilGUI(this);
return;
}

26
src/main/java/net/Indyuce/mmoitems/api/edition/input/AnvilGUI.java
View File

@ -13,7 +13,7 @@ import org.bukkit.inventory.meta.ItemMeta;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.edition.Edition;
import net.mmogroup.mmolib.MMOLib;
import io.lumine.mythic.lib.MythicLib;
public class AnvilGUI extends PlayerInputHandler implements Listener {
private final int containerId;
@ -34,21 +34,21 @@ public class AnvilGUI extends PlayerInputHandler implements Listener {
paperMeta.setDisplayName("Input text..");
paper.setItemMeta(paperMeta);
MMOLib.plugin.getVersion().getWrapper().handleInventoryCloseEvent(getPlayer());
MMOLib.plugin.getVersion().getWrapper().setActiveContainerDefault(getPlayer());
MythicLib.plugin.getVersion().getWrapper().handleInventoryCloseEvent(getPlayer());
MythicLib.plugin.getVersion().getWrapper().setActiveContainerDefault(getPlayer());
Bukkit.getPluginManager().registerEvents(this, MMOItems.plugin);
final Object container = MMOLib.plugin.getVersion().getWrapper().newContainerAnvil(getPlayer());
final Object container = MythicLib.plugin.getVersion().getWrapper().newContainerAnvil(getPlayer());
inventory = MMOLib.plugin.getVersion().getWrapper().toBukkitInventory(container);
inventory = MythicLib.plugin.getVersion().getWrapper().toBukkitInventory(container);
inventory.setItem(0, paper);
containerId = MMOLib.plugin.getVersion().getWrapper().getNextContainerId(getPlayer());
MMOLib.plugin.getVersion().getWrapper().sendPacketOpenWindow(getPlayer(), containerId);
MMOLib.plugin.getVersion().getWrapper().setActiveContainer(getPlayer(), container);
MMOLib.plugin.getVersion().getWrapper().setActiveContainerId(container, containerId);
MMOLib.plugin.getVersion().getWrapper().addActiveContainerSlotListener(container, getPlayer());
containerId = MythicLib.plugin.getVersion().getWrapper().getNextContainerId(getPlayer());
MythicLib.plugin.getVersion().getWrapper().sendPacketOpenWindow(getPlayer(), containerId);
MythicLib.plugin.getVersion().getWrapper().setActiveContainer(getPlayer(), container);
MythicLib.plugin.getVersion().getWrapper().setActiveContainerId(container, containerId);
MythicLib.plugin.getVersion().getWrapper().addActiveContainerSlotListener(container, getPlayer());
open = true;
}
@ -63,9 +63,9 @@ public class AnvilGUI extends PlayerInputHandler implements Listener {
return;
open = false;
MMOLib.plugin.getVersion().getWrapper().handleInventoryCloseEvent(getPlayer());
MMOLib.plugin.getVersion().getWrapper().setActiveContainerDefault(getPlayer());
MMOLib.plugin.getVersion().getWrapper().sendPacketCloseWindow(getPlayer(), containerId);
MythicLib.plugin.getVersion().getWrapper().handleInventoryCloseEvent(getPlayer());
MythicLib.plugin.getVersion().getWrapper().setActiveContainerDefault(getPlayer());
MythicLib.plugin.getVersion().getWrapper().sendPacketCloseWindow(getPlayer(), containerId);
HandlerList.unregisterAll(this);
}

2
src/main/java/net/Indyuce/mmoitems/api/event/item/ApplySoulboundEvent.java
View File

@ -5,7 +5,7 @@ import org.bukkit.event.HandlerList;
import net.Indyuce.mmoitems.api.event.PlayerDataEvent;
import net.Indyuce.mmoitems.api.item.mmoitem.VolatileMMOItem;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.mmogroup.mmolib.api.item.NBTItem;
import io.lumine.mythic.lib.api.item.NBTItem;
public class ApplySoulboundEvent extends PlayerDataEvent {
private static final HandlerList handlers = new HandlerList();

2
src/main/java/net/Indyuce/mmoitems/api/event/item/BreakSoulboundEvent.java
View File

@ -5,7 +5,7 @@ import org.bukkit.event.HandlerList;
import net.Indyuce.mmoitems.api.event.PlayerDataEvent;
import net.Indyuce.mmoitems.api.item.mmoitem.VolatileMMOItem;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.mmogroup.mmolib.api.item.NBTItem;
import io.lumine.mythic.lib.api.item.NBTItem;
public class BreakSoulboundEvent extends PlayerDataEvent {
private static final HandlerList handlers = new HandlerList();

2
src/main/java/net/Indyuce/mmoitems/api/event/item/DeconstructItemEvent.java
View File

@ -8,7 +8,7 @@ import org.bukkit.inventory.ItemStack;
import net.Indyuce.mmoitems.api.event.PlayerDataEvent;
import net.Indyuce.mmoitems.api.item.mmoitem.VolatileMMOItem;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.mmogroup.mmolib.api.item.NBTItem;
import io.lumine.mythic.lib.api.item.NBTItem;
public class DeconstructItemEvent extends PlayerDataEvent {
private static final HandlerList handlers = new HandlerList();

5
src/main/java/net/Indyuce/mmoitems/api/event/item/IdentifyItemEvent.java
View File

@ -1,11 +1,10 @@
package net.Indyuce.mmoitems.api.event.item;
import org.bukkit.event.HandlerList;
import io.lumine.mythic.lib.api.item.NBTItem;
import net.Indyuce.mmoitems.api.event.PlayerDataEvent;
import net.Indyuce.mmoitems.api.item.mmoitem.VolatileMMOItem;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.mmogroup.mmolib.api.item.NBTItem;
import org.bukkit.event.HandlerList;
public class IdentifyItemEvent extends PlayerDataEvent {
private static final HandlerList handlers = new HandlerList();

2
src/main/java/net/Indyuce/mmoitems/api/event/item/RepairItemEvent.java
View File

@ -5,7 +5,7 @@ import org.bukkit.event.HandlerList;
import net.Indyuce.mmoitems.api.event.PlayerDataEvent;
import net.Indyuce.mmoitems.api.item.mmoitem.VolatileMMOItem;
import net.Indyuce.mmoitems.api.player.PlayerData;
import net.mmogroup.mmolib.api.item.NBTItem;
import io.lumine.mythic.lib.api.item.NBTItem;
public class RepairItemEvent extends PlayerDataEvent {
private static final HandlerList handlers = new HandlerList();

27
src/main/java/net/Indyuce/mmoitems/api/interaction/Consumable.java
View File

@ -1,14 +1,9 @@
package net.Indyuce.mmoitems.api.interaction;
import java.util.List;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import io.lumine.mythic.lib.MythicLib;
import io.lumine.mythic.lib.api.item.ItemTag;
import io.lumine.mythic.lib.api.item.NBTItem;
import io.lumine.mythic.lib.api.util.SmartGive;
import net.Indyuce.mmoitems.ItemStats;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.MMOUtils;
@ -16,10 +11,14 @@ import net.Indyuce.mmoitems.api.Type;
import net.Indyuce.mmoitems.comp.flags.FlagPlugin.CustomFlag;
import net.Indyuce.mmoitems.stat.data.PotionEffectListData;
import net.Indyuce.mmoitems.stat.type.ConsumableItemInteraction;
import net.mmogroup.mmolib.MMOLib;
import net.mmogroup.mmolib.api.item.ItemTag;
import net.mmogroup.mmolib.api.item.NBTItem;
import net.mmogroup.mmolib.api.util.SmartGive;
import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import java.util.List;
public class Consumable extends UseItem {
public Consumable(Player player, NBTItem item) {
@ -96,7 +95,7 @@ public class Consumable extends UseItem {
int maxConsume = (int) nbtItem.getStat("MAX_CONSUME");
if (maxConsume > 1) {
ItemStack item = nbtItem.toItem().clone();
String configMaxConsumeLore = MMOLib.plugin.parseColors(MMOItems.plugin.getLanguage().getStatFormat("max-consume"));
String configMaxConsumeLore = MythicLib.plugin.parseColors(MMOItems.plugin.getLanguage().getStatFormat("max-consume"));
String maxConsumeLore = configMaxConsumeLore.replace("#", Integer.toString(maxConsume));
maxConsume -= 1;

2
src/main/java/net/Indyuce/mmoitems/api/interaction/GemStone.java
View File

@ -13,7 +13,7 @@ import net.Indyuce.mmoitems.stat.data.type.Mergeable;
import net.Indyuce.mmoitems.stat.data.type.StatData;
import net.Indyuce.mmoitems.stat.type.GemStoneStat;
import net.Indyuce.mmoitems.stat.type.ItemStat;
import net.mmogroup.mmolib.api.item.NBTItem;
import io.lumine.mythic.lib.api.item.NBTItem;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Sound;

6
src/main/java/net/Indyuce/mmoitems/api/interaction/ItemSkin.java
View File

@ -7,9 +7,9 @@ import net.Indyuce.mmoitems.api.Type;
import net.Indyuce.mmoitems.api.util.message.Message;
import net.Indyuce.mmoitems.stat.data.SkullTextureData;
import net.Indyuce.mmoitems.stat.data.StringListData;
import net.mmogroup.mmolib.api.item.ItemTag;
import net.mmogroup.mmolib.api.item.NBTItem;
import net.mmogroup.mmolib.version.VersionMaterial;
import io.lumine.mythic.lib.api.item.ItemTag;
import io.lumine.mythic.lib.api.item.NBTItem;
import io.lumine.mythic.lib.version.VersionMaterial;
import org.bukkit.ChatColor;
import org.bukkit.Sound;
import org.bukkit.entity.Player;

10
src/main/java/net/Indyuce/mmoitems/api/interaction/Tool.java
View File

@ -1,6 +1,10 @@
package net.Indyuce.mmoitems.api.interaction;
import net.mmogroup.mmolib.UtilityMethods;
import io.lumine.mythic.lib.UtilityMethods;
import io.lumine.mythic.lib.api.item.NBTItem;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.comp.flags.FlagPlugin.CustomFlag;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Particle;
@ -12,10 +16,6 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.util.Vector;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.comp.flags.FlagPlugin.CustomFlag;
import net.mmogroup.mmolib.api.item.NBTItem;
public class Tool extends UseItem {
public Tool(Player player, NBTItem item) {
super(player, item);

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