Refactored Prerequisites

This commit is contained in:
Auxilor 2020-11-29 12:37:24 +00:00
parent d748127893
commit f9715c6010
19 changed files with 18 additions and 19 deletions

View File

@ -2,7 +2,7 @@ package com.willfp.ecoenchants.biomes;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.util.optional.Prerequisite;
import com.willfp.ecoenchants.util.internal.Prerequisite;
import org.bukkit.block.Biome;
import org.bukkit.entity.Arrow;
import org.bukkit.entity.LivingEntity;

View File

@ -4,7 +4,7 @@ import com.willfp.ecoenchants.EcoEnchantsPlugin;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
import com.willfp.ecoenchants.events.armorequip.ArmorEquipEvent;
import com.willfp.ecoenchants.util.optional.Prerequisite;
import com.willfp.ecoenchants.util.internal.Prerequisite;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;

View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.mmo;
import com.willfp.ecoenchants.util.optional.Prerequisite;
import com.willfp.ecoenchants.util.internal.Prerequisite;
import org.bukkit.Bukkit;
import org.bukkit.plugin.Plugin;

View File

@ -3,7 +3,7 @@ package com.willfp.ecoenchants.mmo.structure;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.mmo.MMOMain;
import com.willfp.ecoenchants.mmo.MMOPrerequisites;
import com.willfp.ecoenchants.util.optional.Prerequisite;
import com.willfp.ecoenchants.util.internal.Prerequisite;
public abstract class MMOEnchantment extends EcoEnchant implements MMOEnchant {
protected MMOEnchantment(String key, EnchantmentType type, Prerequisite... prerequisites) {

View File

@ -4,7 +4,7 @@ package com.willfp.ecoenchants.mmo.structure
import com.willfp.ecoenchants.enchantments.itemtypes.Spell;
import com.willfp.ecoenchants.mmo.MMOMain;
import com.willfp.ecoenchants.mmo.MMOPrerequisites;
import com.willfp.ecoenchants.util.optional.Prerequisite;
import com.willfp.ecoenchants.util.internal.Prerequisite;
public abstract class MMOSpell extends Spell implements MMOEnchant {
protected MMOSpell(String key, Prerequisite... prerequisites) {

View File

@ -6,7 +6,7 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils;
import com.willfp.ecoenchants.nms.Cooldown;
import com.willfp.ecoenchants.util.NumberUtils;
import com.willfp.ecoenchants.util.optional.Prerequisite;
import com.willfp.ecoenchants.util.internal.Prerequisite;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;

View File

@ -9,7 +9,7 @@ import com.willfp.ecoenchants.enchantments.util.Watcher;
import com.willfp.ecoenchants.util.StringUtils;
import com.willfp.ecoenchants.util.interfaces.ObjectCallable;
import com.willfp.ecoenchants.util.interfaces.Registerable;
import com.willfp.ecoenchants.util.optional.Prerequisite;
import com.willfp.ecoenchants.util.internal.Prerequisite;
import org.apache.commons.lang.WordUtils;
import org.bukkit.Bukkit;
import org.bukkit.Material;

View File

@ -1,7 +1,7 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.artifact;
import com.willfp.ecoenchants.enchantments.itemtypes.Artifact;
import com.willfp.ecoenchants.util.optional.Prerequisite;
import com.willfp.ecoenchants.util.internal.Prerequisite;
import org.bukkit.Particle;
public class AshArtifact extends Artifact {

View File

@ -1,7 +1,7 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.artifact;
import com.willfp.ecoenchants.enchantments.itemtypes.Artifact;
import com.willfp.ecoenchants.util.optional.Prerequisite;
import com.willfp.ecoenchants.util.internal.Prerequisite;
import org.bukkit.Particle;
public class CrimsonArtifact extends Artifact {

View File

@ -1,7 +1,7 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.artifact;
import com.willfp.ecoenchants.enchantments.itemtypes.Artifact;
import com.willfp.ecoenchants.util.optional.Prerequisite;
import com.willfp.ecoenchants.util.internal.Prerequisite;
import org.bukkit.Particle;
public class SoulArtifact extends Artifact {

View File

@ -1,7 +1,7 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.artifact;
import com.willfp.ecoenchants.enchantments.itemtypes.Artifact;
import com.willfp.ecoenchants.util.optional.Prerequisite;
import com.willfp.ecoenchants.util.internal.Prerequisite;
import org.bukkit.Particle;
public class SoulFireArtifact extends Artifact {

View File

@ -1,7 +1,7 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.artifact;
import com.willfp.ecoenchants.enchantments.itemtypes.Artifact;
import com.willfp.ecoenchants.util.optional.Prerequisite;
import com.willfp.ecoenchants.util.internal.Prerequisite;
import org.bukkit.Particle;
public class TearArtifact extends Artifact {

View File

@ -1,7 +1,7 @@
package com.willfp.ecoenchants.enchantments.ecoenchants.artifact;
import com.willfp.ecoenchants.enchantments.itemtypes.Artifact;
import com.willfp.ecoenchants.util.optional.Prerequisite;
import com.willfp.ecoenchants.util.internal.Prerequisite;
import org.bukkit.Particle;
public class WarpedArtifact extends Artifact {

View File

@ -4,7 +4,7 @@ import com.destroystokyo.paper.event.player.PlayerElytraBoostEvent;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils;
import com.willfp.ecoenchants.util.optional.Prerequisite;
import com.willfp.ecoenchants.util.internal.Prerequisite;
import org.bukkit.event.EventHandler;
public class Economical extends EcoEnchant {

View File

@ -2,7 +2,7 @@ package com.willfp.ecoenchants.enchantments.ecoenchants.normal;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.util.optional.Prerequisite;
import com.willfp.ecoenchants.util.internal.Prerequisite;
import org.bukkit.Material;
import org.bukkit.entity.LivingEntity;
import org.bukkit.event.entity.EntityDamageByEntityEvent;

View File

@ -7,7 +7,7 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
import com.willfp.ecoenchants.nms.TridentStack;
import com.willfp.ecoenchants.util.NumberUtils;
import com.willfp.ecoenchants.util.optional.Prerequisite;
import com.willfp.ecoenchants.util.internal.Prerequisite;
import org.bukkit.Location;
import org.bukkit.Particle;
import org.bukkit.block.Block;

View File

@ -7,7 +7,7 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.util.EnchantChecks;
import com.willfp.ecoenchants.enchantments.util.SpellRunnable;
import com.willfp.ecoenchants.util.optional.Prerequisite;
import com.willfp.ecoenchants.util.internal.Prerequisite;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.Sound;

View File

@ -47,7 +47,6 @@ import com.willfp.ecoenchants.listeners.PlayerJoinListener;
import com.willfp.ecoenchants.nms.*;
import com.willfp.ecoenchants.util.interfaces.Callable;
import com.willfp.ecoenchants.util.interfaces.EcoRunnable;
import com.willfp.ecoenchants.util.optional.Prerequisite;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.bstats.bukkit.Metrics;
import org.bukkit.Bukkit;

View File

@ -1,4 +1,4 @@
package com.willfp.ecoenchants.util.optional;
package com.willfp.ecoenchants.util.internal;
import com.willfp.ecoenchants.util.ClassUtils;
import com.willfp.ecoenchants.util.interfaces.ObjectCallable;