Repo-Mirror/EcoEnchants
9
0
Fork 0
Code Issues Releases 1 Activity

Added Prerequisite descriptions

Browse Source
This commit is contained in:
BuildTools
2020-10-14 10:42:03 +01:00
parent f116d94df8
commit 374edf3bfc
3 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java
View File

@@ -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;

12
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java
View File

@@ -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

18
Plugin/src/main/java/com/willfp/ecoenchants/util/optional/Prerequisite.java
View File

@@ -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() {