From f9715c6010560b0e682caba9754afb2576bea2b8 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 29 Nov 2020 12:37:24 +0000 Subject: [PATCH] Refactored Prerequisites --- .../java/com/willfp/ecoenchants/biomes/BiomesEnchantment.java | 2 +- .../java/com/willfp/ecoenchants/effects/EffectsEnchantment.java | 2 +- .../main/java/com/willfp/ecoenchants/mmo/MMOPrerequisites.java | 2 +- .../com/willfp/ecoenchants/mmo/structure/MMOEnchantment.java | 2 +- .../java/com/willfp/ecoenchants/mmo/structure/MMOSpell.java | 2 +- .../com/willfp/ecoenchants/summoning/SummoningEnchantment.java | 2 +- .../java/com/willfp/ecoenchants/enchantments/EcoEnchant.java | 2 +- .../enchantments/ecoenchants/artifact/AshArtifact.java | 2 +- .../enchantments/ecoenchants/artifact/CrimsonArtifact.java | 2 +- .../enchantments/ecoenchants/artifact/SoulArtifact.java | 2 +- .../enchantments/ecoenchants/artifact/SoulFireArtifact.java | 2 +- .../enchantments/ecoenchants/artifact/TearArtifact.java | 2 +- .../enchantments/ecoenchants/artifact/WarpedArtifact.java | 2 +- .../ecoenchants/enchantments/ecoenchants/normal/Economical.java | 2 +- .../ecoenchants/enchantments/ecoenchants/normal/Plasmic.java | 2 +- .../com/willfp/ecoenchants/enchantments/itemtypes/Artifact.java | 2 +- .../com/willfp/ecoenchants/enchantments/itemtypes/Spell.java | 2 +- .../main/java/com/willfp/ecoenchants/util/internal/Loader.java | 1 - .../ecoenchants/util/{optional => internal}/Prerequisite.java | 2 +- 19 files changed, 18 insertions(+), 19 deletions(-) rename Plugin/src/main/java/com/willfp/ecoenchants/util/{optional => internal}/Prerequisite.java (97%) diff --git a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/BiomesEnchantment.java b/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/BiomesEnchantment.java index cad118cf..85019a19 100644 --- a/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/BiomesEnchantment.java +++ b/Extensions/Biomes/src/main/java/com/willfp/ecoenchants/biomes/BiomesEnchantment.java @@ -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; diff --git a/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/EffectsEnchantment.java b/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/EffectsEnchantment.java index 7b759db9..16456430 100644 --- a/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/EffectsEnchantment.java +++ b/Extensions/Effects/src/main/java/com/willfp/ecoenchants/effects/EffectsEnchantment.java @@ -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; diff --git a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/MMOPrerequisites.java b/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/MMOPrerequisites.java index 2796a63c..3d15d249 100644 --- a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/MMOPrerequisites.java +++ b/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/MMOPrerequisites.java @@ -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; diff --git a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/structure/MMOEnchantment.java b/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/structure/MMOEnchantment.java index 4806dc75..90ab5746 100644 --- a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/structure/MMOEnchantment.java +++ b/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/structure/MMOEnchantment.java @@ -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) { diff --git a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/structure/MMOSpell.java b/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/structure/MMOSpell.java index 02fd6615..5a18526f 100644 --- a/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/structure/MMOSpell.java +++ b/Extensions/MMO/src/main/java/com/willfp/ecoenchants/mmo/structure/MMOSpell.java @@ -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) { diff --git a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java b/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java index 453c284b..2405dde2 100644 --- a/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java +++ b/Extensions/Summoning/src/main/java/com/willfp/ecoenchants/summoning/SummoningEnchantment.java @@ -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; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java index 0fefe681..7d0da553 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java @@ -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; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/AshArtifact.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/AshArtifact.java index 66038cfb..7b062089 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/AshArtifact.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/AshArtifact.java @@ -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 { diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/CrimsonArtifact.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/CrimsonArtifact.java index 062e00cc..f69c7994 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/CrimsonArtifact.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/CrimsonArtifact.java @@ -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 { diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/SoulArtifact.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/SoulArtifact.java index 4497daa0..cea1fbb3 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/SoulArtifact.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/SoulArtifact.java @@ -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 { diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/SoulFireArtifact.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/SoulFireArtifact.java index fd6d9ce8..88d631c7 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/SoulFireArtifact.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/SoulFireArtifact.java @@ -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 { diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/TearArtifact.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/TearArtifact.java index a7855c1c..71f2f583 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/TearArtifact.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/TearArtifact.java @@ -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 { diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/WarpedArtifact.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/WarpedArtifact.java index a0286766..fbe4ca1b 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/WarpedArtifact.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/artifact/WarpedArtifact.java @@ -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 { diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Economical.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Economical.java index d3d9d043..9a8c645e 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Economical.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Economical.java @@ -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 { diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Plasmic.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Plasmic.java index 29159012..286d257a 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Plasmic.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Plasmic.java @@ -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; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Artifact.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Artifact.java index acb2f74b..426c9a4e 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Artifact.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Artifact.java @@ -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; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Spell.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Spell.java index 1ae40f9b..c26ce413 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Spell.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Spell.java @@ -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; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/Loader.java b/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/Loader.java index dbef4729..dc0ceda4 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/Loader.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/Loader.java @@ -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; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/util/optional/Prerequisite.java b/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/Prerequisite.java similarity index 97% rename from Plugin/src/main/java/com/willfp/ecoenchants/util/optional/Prerequisite.java rename to Plugin/src/main/java/com/willfp/ecoenchants/util/internal/Prerequisite.java index 27171cff..fd02beb0 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/util/optional/Prerequisite.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/util/internal/Prerequisite.java @@ -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;