From 374edf3bfc2519234b687e5306f8974148eb1daf Mon Sep 17 00:00:00 2001 From: BuildTools Date: Wed, 14 Oct 2020 10:42:03 +0100 Subject: [PATCH] Added Prerequisite descriptions --- .../ecoenchants/enchantments/EcoEnchant.java | 2 +- .../ecoenchants/enchantments/EcoEnchants.java | 12 ++++++++++++ .../util/optional/Prerequisite.java | 18 +++++++++++++++--- 3 files changed, 28 insertions(+), 4 deletions(-) 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 1fcb7624..c72bb105 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java @@ -61,7 +61,7 @@ public abstract class EcoEnchant extends Enchantment implements Listener, Regist if(!Arrays.stream(prerequisites).allMatch(Prerequisite::isMet)) { Arrays.stream(prerequisites).forEach(prerequisite -> { if(!prerequisite.isMet()) { - Logger.warn("Enchantment " + builder.key + " does not match prerequisite \"" + prerequisite.name() + "\". It will not be available."); + Logger.warn("Enchantment " + builder.key + " does not match prerequisite \"" + prerequisite.getDescription() + "\". It will not be available."); } }); return; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java index 28d4a5be..c9f60b3d 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java @@ -1,6 +1,8 @@ package com.willfp.ecoenchants.enchantments; +import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.AshArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.CloudsArtifact; +import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.CrimsonArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.DamageArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.DragonArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.DustArtifact; @@ -20,8 +22,12 @@ import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.NetherArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.RedstoneArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.SmokeArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.SnowArtifact; +import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.SoulArtifact; +import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.SoulFireArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.SparkleArtifact; +import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.TearArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.TotemArtifact; +import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.WarpedArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.WaterArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.WitchArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.ZapArtifact; @@ -282,6 +288,12 @@ public class EcoEnchants { public static final EcoEnchant RESPIRATOR = new Respirator(); public static final EcoEnchant FETCHING = new Fetching(); public static final EcoEnchant ECONOMICAL = new Economical(); + public static final EcoEnchant SOUL_ARTIFACT = new SoulArtifact(); + public static final EcoEnchant SOUL_FIRE_ARTIFACT = new SoulFireArtifact(); + public static final EcoEnchant CRIMSON_ARTIFACT = new CrimsonArtifact(); + public static final EcoEnchant ASH_ARTIFACT = new AshArtifact(); + public static final EcoEnchant WARPED_ARTIFACT = new WarpedArtifact(); + public static final EcoEnchant TEAR_ARTIFACT = new TearArtifact(); /** * Get all registered {@link EcoEnchant}s diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/util/optional/Prerequisite.java b/Plugin/src/main/java/com/willfp/ecoenchants/util/optional/Prerequisite.java index 4834ac2f..19c72581 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/util/optional/Prerequisite.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/util/optional/Prerequisite.java @@ -4,13 +4,25 @@ import com.willfp.ecoenchants.util.ClassUtils; import org.bukkit.Bukkit; public enum Prerequisite { - MinVer1_16(false), - HasPaper(false); + MinVer1_16( + false, + "Requires minimum server version of 1.16" + ), + HasPaper( + false, + "Requires server to be running paper (or a fork)" + ); private boolean isMet; + private final String description; - Prerequisite(boolean isMet) { + Prerequisite(boolean isMet, String description) { this.isMet = isMet; + this.description = description; + } + + public String getDescription() { + return description; } public boolean isMet() {