Repo-Mirror/EcoArmor
9
0
Fork 0
mirror of https://github.com/Auxilor/EcoArmor.git synced 2025-12-28 03:19:25 +00:00
Code Issues Releases 1 Activity

Added warning and checks for invalid enchantments, effects, potion effects, default tiers.

Browse Source
This commit is contained in:
Auxilor
2021-03-22 20:17:41 +00:00
parent 9fbc1946a3
commit 9b367985f8
4 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/Effects.java
View File

@@ -20,6 +20,7 @@ import com.willfp.ecoarmor.effects.effects.TridentDamageMultiplier;
import com.willfp.ecoarmor.effects.effects.WarpChance;
import lombok.experimental.UtilityClass;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.List;
@@ -53,6 +54,7 @@ public class Effects {
* @param name The name to query.
* @return The matching effect, or null if not found.
*/
@Nullable
public static Effect<?> getByName(@NotNull final String name) {
return BY_NAME.get(name);
}

46
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/sets/ArmorSet.java
View File

@@ -14,9 +14,11 @@ import com.willfp.ecoarmor.effects.Effect;
import com.willfp.ecoarmor.effects.Effects;
import com.willfp.ecoarmor.sets.meta.ArmorSlot;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
import com.willfp.ecoarmor.upgrades.Tier;
import com.willfp.ecoarmor.upgrades.Tiers;
import lombok.AccessLevel;
import lombok.Getter;
import org.bukkit.Bukkit;
import org.bukkit.Color;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
@@ -128,7 +130,11 @@ public class ArmorSet {
String key = split[0].trim();
String value = split[1].trim();
Condition<?> condition = Conditions.getByName(key);
conditions.put(condition, ArmorUtils.getConditionValue(value, condition));
if (condition == null) {
Bukkit.getLogger().warning("Invalid condition specified in " + this.name);
} else {
conditions.put(condition, ArmorUtils.getConditionValue(value, condition));
}
}
for (String definedKey : this.getConfig().getStrings("set-bonus")) {
@@ -136,7 +142,11 @@ public class ArmorSet {
String key = split[0].trim();
String value = split[1].trim();
Effect<?> effect = Effects.getByName(key);
effects.put(effect, ArmorUtils.getEffectValue(value, effect));
if (effect == null) {
Bukkit.getLogger().warning("Invalid effect specified in " + this.name);
} else {
effects.put(effect, ArmorUtils.getEffectValue(value, effect));
}
}
for (String definedKey : this.getConfig().getStrings("advanced-set-bonus")) {
@@ -144,7 +154,11 @@ public class ArmorSet {
String key = split[0].trim();
String value = split[1].trim();
Effect<?> effect = Effects.getByName(key);
advancedEffects.put(effect, ArmorUtils.getEffectValue(value, effect));
if (effect == null) {
Bukkit.getLogger().warning("Invalid advanced effect specified in " + this.name);
} else {
advancedEffects.put(effect, ArmorUtils.getEffectValue(value, effect));
}
}
for (String definedKey : this.getConfig().getStrings("potion-effects")) {
@@ -152,7 +166,11 @@ public class ArmorSet {
String key = split[0].trim();
String value = split[1].trim();
PotionEffectType type = PotionEffectType.getByName(key.toUpperCase());
potionEffects.put(type, Integer.parseInt(value));
if (type == null) {
Bukkit.getLogger().warning("Invalid potion effect specified in " + this.name);
} else {
potionEffects.put(type, Integer.parseInt(value));
}
}
for (String definedKey : this.getConfig().getStrings("advanced-potion-effects")) {
@@ -160,7 +178,11 @@ public class ArmorSet {
String key = split[0].trim();
String value = split[1].trim();
PotionEffectType type = PotionEffectType.getByName(key.toUpperCase());
advancedPotionEffects.put(type, Integer.parseInt(value));
if (type == null) {
Bukkit.getLogger().warning("Invalid advanced potion effect specified in " + this.name);
} else {
advancedPotionEffects.put(type, Integer.parseInt(value));
}
}
for (ArmorSlot slot : ArmorSlot.values()) {
@@ -226,7 +248,11 @@ public class ArmorSet {
String key = split[0].trim();
String value = split[1].trim();
Enchantment enchantment = Enchantment.getByKey(NamespacedKey.minecraft(key));
enchants.put(enchantment, Integer.valueOf(value));
if (enchantment == null) {
Bukkit.getLogger().warning("Invalid enchantment specified in " + this.name + " " + pieceName);
} else {
enchants.put(enchantment, Integer.valueOf(value));
}
}
assert material != null;
@@ -294,7 +320,13 @@ public class ArmorSet {
itemStack.setItemMeta(meta);
ArmorUtils.setAdvanced(itemStack, advanced);
ArmorUtils.setTier(itemStack, Tiers.getByName(this.getConfig().getString(pieceName + ".default-tier")));
Tier defaultTier = Tiers.getByName(this.getConfig().getString(pieceName + ".default-tier"));
if (defaultTier == null) {
Bukkit.getLogger().warning("Default tier specified in " + this.name + " " + pieceName + " is invalid! Defaulting to 'default'");
ArmorUtils.setTier(itemStack, Tiers.DEFAULT);
} else {
ArmorUtils.setTier(itemStack, defaultTier);
}
if (advanced) {
RecipeParts.registerRecipePart(PLUGIN.getNamespacedKeyFactory().create("set_" + name.toLowerCase() + "_" + pieceName + "_advanced"), new ComplexRecipePart(test -> {

2
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/sets/ArmorSets.java
View File

@@ -11,6 +11,7 @@ import com.willfp.ecoarmor.config.CustomConfig;
import lombok.experimental.UtilityClass;
import org.bukkit.configuration.file.YamlConfiguration;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.io.IOException;
@@ -51,6 +52,7 @@ public class ArmorSets {
* @param name The name to search for.
* @return The matching {@link ArmorSet}, or null if not found.
*/
@Nullable
public static ArmorSet getByName(@NotNull final String name) {
return BY_NAME.get(name);
}

1
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/Tiers.java
View File

@@ -55,6 +55,7 @@ public class Tiers {
* @param name The name to search for.
* @return The matching {@link Tiers}, or null if not found.
*/
@Nullable
public static Tier getByName(@Nullable final String name) {
return BY_NAME.get(name);
}