From c28a9919736fc47378d83efa4c41eb423239cef0 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sat, 20 Mar 2021 21:08:45 +0000 Subject: [PATCH] Added default tier option to armor pieces --- .../src/main/java/com/willfp/ecoarmor/EcoArmorPlugin.java | 4 ++-- .../src/main/java/com/willfp/ecoarmor/sets/ArmorSet.java | 2 +- eco-core/core-plugin/src/main/resources/sets/ender.yml | 5 +++++ eco-core/core-plugin/src/main/resources/sets/miner.yml | 5 +++++ eco-core/core-plugin/src/main/resources/sets/reaper.yml | 7 ++++++- eco-core/core-plugin/src/main/resources/sets/young.yml | 5 +++++ 6 files changed, 24 insertions(+), 4 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/EcoArmorPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/EcoArmorPlugin.java index ef0209d..d35408f 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/EcoArmorPlugin.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/EcoArmorPlugin.java @@ -150,9 +150,9 @@ public class EcoArmorPlugin extends AbstractEcoPlugin { @Override public List> getUpdatableClasses() { return Arrays.asList( + Tiers.class, ArmorSets.class, - TabcompleterEagive.class, - Tiers.class + TabcompleterEagive.class ); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/sets/ArmorSet.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/sets/ArmorSet.java index cd8a03a..721aa1e 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/sets/ArmorSet.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/sets/ArmorSet.java @@ -294,7 +294,7 @@ public class ArmorSet { itemStack.setItemMeta(meta); ArmorUtils.setAdvanced(itemStack, advanced); - ArmorUtils.setTier(itemStack, Tiers.DEFAULT); + ArmorUtils.setTier(itemStack, Tiers.getByName(pieceName + ".default-tier")); if (advanced) { RecipeParts.registerRecipePart(PLUGIN.getNamespacedKeyFactory().create("set_" + name.toLowerCase() + "_" + pieceName + "_advanced"), new ComplexRecipePart(test -> { diff --git a/eco-core/core-plugin/src/main/resources/sets/ender.yml b/eco-core/core-plugin/src/main/resources/sets/ender.yml index b5be962..3051fde 100644 --- a/eco-core/core-plugin/src/main/resources/sets/ender.yml +++ b/eco-core/core-plugin/src/main/resources/sets/ender.yml @@ -50,6 +50,7 @@ helmet: - "&fTier: %tier%" - "&8&oUpgrade with an Upgrade Crystal" craftable: true + default-tier: default recipe: - ender_eye - ender_eye @@ -83,6 +84,7 @@ chestplate: - "&fTier: %tier%" - "&8&oUpgrade with an Upgrade Crystal" craftable: true + default-tier: default recipe: - ender_eye - ender_eye @@ -114,6 +116,7 @@ elytra: - "&fTier: %tier%" - "&8&oUpgrade with an Upgrade Crystal" craftable: true + default-tier: default recipe: - ender_eye - ender_eye @@ -147,6 +150,7 @@ leggings: - "&fTier: %tier%" - "&8&oUpgrade with an Upgrade Crystal" craftable: true + default-tier: default recipe: - ender_eye - ender_eye @@ -180,6 +184,7 @@ boots: - "&fTier: %tier%" - "&8&oUpgrade with an Upgrade Crystal" craftable: true + default-tier: default recipe: - ender_eye - ender_eye diff --git a/eco-core/core-plugin/src/main/resources/sets/miner.yml b/eco-core/core-plugin/src/main/resources/sets/miner.yml index 184ea11..644f6c0 100644 --- a/eco-core/core-plugin/src/main/resources/sets/miner.yml +++ b/eco-core/core-plugin/src/main/resources/sets/miner.yml @@ -52,6 +52,7 @@ helmet: - "&fTier: %tier%" - "&8&oUpgrade with an Upgrade Crystal" craftable: true + default-tier: default recipe: - air - diamond_pickaxe @@ -85,6 +86,7 @@ chestplate: - "&fTier: %tier%" - "&8&oUpgrade with an Upgrade Crystal" craftable: true + default-tier: default recipe: - air - diamond_pickaxe @@ -116,6 +118,7 @@ elytra: - "&fTier: %tier%" - "&8&oUpgrade with an Upgrade Crystal" craftable: true + default-tier: default recipe: - air - diamond_pickaxe @@ -149,6 +152,7 @@ leggings: - "&fTier: %tier%" - "&8&oUpgrade with an Upgrade Crystal" craftable: true + default-tier: default recipe: - air - diamond_pickaxe @@ -182,6 +186,7 @@ boots: - "&fTier: %tier%" - "&8&oUpgrade with an Upgrade Crystal" craftable: true + default-tier: default recipe: - air - diamond_pickaxe diff --git a/eco-core/core-plugin/src/main/resources/sets/reaper.yml b/eco-core/core-plugin/src/main/resources/sets/reaper.yml index 44cb4a6..52ede4c 100644 --- a/eco-core/core-plugin/src/main/resources/sets/reaper.yml +++ b/eco-core/core-plugin/src/main/resources/sets/reaper.yml @@ -3,7 +3,7 @@ conditions: [] set-bonus: - "damage-multiplier: 1.25" advanced-set-bonus: - - "damage-taken-multiplier: 0.9" + - "damage-tasken-multiplier: 0.9" advanced-lore: - "" - "&lADVANCED BONUS" @@ -46,6 +46,7 @@ helmet: - "&fTier: %tier%" - "&8&oUpgrade with an Upgrade Crystal" craftable: true + default-tier: default recipe: - air - nether_star @@ -78,6 +79,7 @@ chestplate: - "&fTier: %tier%" - "&8&oUpgrade with an Upgrade Crystal" craftable: true + default-tier: default recipe: - air - nether_star @@ -108,6 +110,7 @@ elytra: - "&fTier: %tier%" - "&8&oUpgrade with an Upgrade Crystal" craftable: true + default-tier: default recipe: - air - nether_star @@ -140,6 +143,7 @@ leggings: - "&fTier: %tier%" - "&8&oUpgrade with an Upgrade Crystal" craftable: true + default-tier: default recipe: - air - nether_star @@ -172,6 +176,7 @@ boots: - "&fTier: %tier%" - "&8&oUpgrade with an Upgrade Crystal" craftable: true + default-tier: default recipe: - air - nether_star diff --git a/eco-core/core-plugin/src/main/resources/sets/young.yml b/eco-core/core-plugin/src/main/resources/sets/young.yml index d31f389..0287c71 100644 --- a/eco-core/core-plugin/src/main/resources/sets/young.yml +++ b/eco-core/core-plugin/src/main/resources/sets/young.yml @@ -50,6 +50,7 @@ helmet: - "&fTier: %tier%" - "&8&oUpgrade with an Upgrade Crystal" craftable: true + default-tier: default recipe: - diamond - redstone @@ -82,6 +83,7 @@ chestplate: - "&fTier: %tier%" - "&8&oUpgrade with an Upgrade Crystal" craftable: true + default-tier: default recipe: - diamond - air @@ -112,6 +114,7 @@ elytra: - "&fTier: %tier%" - "&8&oUpgrade with an Upgrade Crystal" craftable: true + default-tier: default recipe: - air - redstone @@ -144,6 +147,7 @@ leggings: - "&fTier: %tier%" - "&8&oUpgrade with an Upgrade Crystal" craftable: true + default-tier: default recipe: - diamond - redstone @@ -177,6 +181,7 @@ boots: - "&fTier: %tier%" - "&8&oUpgrade with an Upgrade Crystal" craftable: true + default-tier: default recipe: - air - air