Repo-Mirror/EcoArmor
9
0
Fork 0
mirror of https://github.com/Auxilor/EcoArmor.git synced 2025-12-27 02:49:22 +00:00
Code Issues Releases 1 Activity

Updated to 6.7.0

Browse Source
This commit is contained in:
Auxilor
2021-12-04 15:42:37 +00:00
parent ae32b78bc1
commit a43b2f684e
12 changed files with 1574 additions and 1992 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -61,7 +61,7 @@ allprojects {
}
dependencies {
compileOnly 'com.willfp:eco:6.13.10'
compileOnly 'com.willfp:eco:6.15.0'
implementation 'com.willfp:libreforge:2.0.2'
compileOnly 'org.jetbrains:annotations:23.0.0'

8
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/EcoArmorPlugin.java
View File

@@ -5,7 +5,7 @@ import com.willfp.eco.core.command.impl.PluginCommand;
import com.willfp.eco.core.display.DisplayModule;
import com.willfp.eco.core.integrations.IntegrationLoader;
import com.willfp.ecoarmor.commands.CommandEcoarmor;
import com.willfp.ecoarmor.config.EcoArmorJson;
import com.willfp.ecoarmor.config.EcoArmorYml;
import com.willfp.ecoarmor.display.ArmorDisplay;
import com.willfp.ecoarmor.sets.ArmorSets;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
@@ -35,10 +35,10 @@ public class EcoArmorPlugin extends EcoPlugin {
private static EcoArmorPlugin instance;
/**
* ecoarmor.json.
* ecoarmor.yml.
*/
@Getter
private final EcoArmorJson ecoArmorJson;
private final EcoArmorYml ecoArmorYml;
/**
* Internal constructor called by bukkit on plugin load.
@@ -47,7 +47,7 @@ public class EcoArmorPlugin extends EcoPlugin {
super(687, 10002, "&c");
instance = this;
this.ecoArmorJson = new EcoArmorJson(this);
this.ecoArmorYml = new EcoArmorYml(this);
LibReforge.init(this);
LibReforge.registerHolderProvider(player -> {

17
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/config/EcoArmorJson.java
View File

@@ -1,17 +0,0 @@
package com.willfp.ecoarmor.config;
import com.willfp.eco.core.EcoPlugin;
import com.willfp.eco.core.config.json.JSONBaseConfig;
import com.willfp.eco.core.config.json.JSONStaticBaseConfig;
import org.jetbrains.annotations.NotNull;
public class EcoArmorJson extends JSONBaseConfig {
/**
* Create tiers.json.
*
* @param plugin Instance of EcoArmor.
*/
public EcoArmorJson(@NotNull final EcoPlugin plugin) {
super("ecoarmor", false, plugin);
}
}

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

@@ -2,7 +2,6 @@ package com.willfp.ecoarmor.sets;
import com.willfp.eco.core.EcoPlugin;
import com.willfp.eco.core.config.interfaces.Config;
import com.willfp.eco.core.config.interfaces.JSONConfig;
import com.willfp.eco.core.display.Display;
import com.willfp.eco.core.items.CustomItem;
import com.willfp.eco.core.items.Items;
@@ -56,7 +55,7 @@ public class ArmorSet {
* The config of the set.
*/
@Getter(AccessLevel.PRIVATE)
private final JSONConfig config;
private final Config config;
/**
* The name of the set.
@@ -107,14 +106,14 @@ public class ArmorSet {
* @param config The set's config.
* @param plugin Instance of EcoArmor.
*/
public ArmorSet(@NotNull final JSONConfig config,
public ArmorSet(@NotNull final Config config,
@NotNull final EcoPlugin plugin) {
this.config = config;
this.plugin = plugin;
this.name = config.getString("name");
Set<ConfiguredCondition> conditions = new HashSet<>();
for (JSONConfig cfg : this.getConfig().getSubsections("conditions")) {
for (Config cfg : this.getConfig().getSubsections("conditions")) {
ConfiguredCondition conf = Conditions.compile(cfg, "Armor Set " + this.name);
if (conf != null) {
conditions.add(conf);
@@ -122,7 +121,7 @@ public class ArmorSet {
}
Set<ConfiguredEffect> effects = new HashSet<>();
for (JSONConfig cfg : this.getConfig().getSubsections("effects")) {
for (Config cfg : this.getConfig().getSubsections("effects")) {
ConfiguredEffect conf = Effects.compile(cfg, "Armor Set " + this.name);
if (conf != null) {
effects.add(conf);
@@ -130,7 +129,7 @@ public class ArmorSet {
}
Set<ConfiguredEffect> advancedEffects = new HashSet<>();
for (JSONConfig cfg : this.getConfig().getSubsections("advancedEffects")) {
for (Config cfg : this.getConfig().getSubsections("advancedEffects")) {
ConfiguredEffect conf = Effects.compile(cfg, "Armor Set " + this.name + " (Advanced)");
if (conf != null) {
effects.add(conf);
@@ -183,7 +182,7 @@ public class ArmorSet {
}
private ItemStack construct(@NotNull final ArmorSlot slot,
@NotNull final JSONConfig slotConfig,
@NotNull final Config slotConfig,
final boolean advanced) {
Material material = Material.getMaterial(slotConfig.getString("material").toUpperCase());
@@ -234,7 +233,7 @@ public class ArmorSet {
Map<Enchantment, Integer> enchants = new HashMap<>();
for (JSONConfig enchantSection : slotConfig.getSubsections("enchants")) {
for (Config enchantSection : slotConfig.getSubsections("enchants")) {
Enchantment enchantment = Enchantment.getByKey(NamespacedKey.minecraft(enchantSection.getString("id")));
if (enchantment == null) {
continue;

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

@@ -4,7 +4,7 @@ package com.willfp.ecoarmor.sets;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import com.google.common.collect.ImmutableList;
import com.willfp.eco.core.config.interfaces.JSONConfig;
import com.willfp.eco.core.config.interfaces.Config;
import com.willfp.eco.core.config.updating.ConfigUpdater;
import com.willfp.ecoarmor.EcoArmorPlugin;
import lombok.experimental.UtilityClass;
@@ -51,7 +51,7 @@ public class ArmorSets {
removeSet(set);
}
for (JSONConfig setConfig : plugin.getEcoArmorJson().getSubsections("sets")) {
for (Config setConfig : plugin.getEcoArmorYml().getSubsections("sets")) {
new ArmorSet(setConfig, plugin);
}
}

4
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/upgrades/Tier.java
View File

@@ -3,7 +3,6 @@ package com.willfp.ecoarmor.upgrades;
import com.willfp.eco.core.EcoPlugin;
import com.willfp.eco.core.PluginDependent;
import com.willfp.eco.core.config.interfaces.Config;
import com.willfp.eco.core.config.interfaces.JSONConfig;
import com.willfp.eco.core.display.Display;
import com.willfp.eco.core.items.CustomItem;
import com.willfp.eco.core.items.Items;
@@ -13,7 +12,6 @@ import com.willfp.ecoarmor.sets.meta.ArmorSlot;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
import lombok.AccessLevel;
import lombok.Getter;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
@@ -83,7 +81,7 @@ public class Tier extends PluginDependent<EcoPlugin> {
* @param config The config of the tier.
* @param plugin Instance of EcoArmor.
*/
public Tier(@NotNull final JSONConfig config,
public Tier(@NotNull final Config config,
@NotNull final EcoPlugin plugin) {
super(plugin);
this.name = config.getString("name");

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

@@ -3,7 +3,7 @@ package com.willfp.ecoarmor.upgrades;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import com.google.common.collect.ImmutableList;
import com.willfp.eco.core.config.interfaces.JSONConfig;
import com.willfp.eco.core.config.interfaces.Config;
import com.willfp.eco.core.config.updating.ConfigUpdater;
import com.willfp.ecoarmor.EcoArmorPlugin;
import lombok.Getter;
@@ -65,7 +65,7 @@ public class Tiers {
public static void reload(@NotNull final EcoArmorPlugin plugin) {
BY_NAME.clear();
for (JSONConfig tierConfig : plugin.getEcoArmorJson().getSubsections("tiers")) {
for (Config tierConfig : plugin.getEcoArmorYml().getSubsections("tiers")) {
new Tier(tierConfig, plugin);
}

6
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoarmor/config/EcoArmorYml.kt Normal file
View File

@@ -0,0 +1,6 @@
package com.willfp.ecoarmor.config
import com.willfp.eco.core.EcoPlugin
import com.willfp.eco.core.config.yaml.YamlBaseConfig
class EcoArmorYml(plugin: EcoPlugin) : YamlBaseConfig("ecoarmor", false, plugin)

2
eco-core/core-plugin/src/main/resources/config.yml
View File

@@ -3,6 +3,8 @@
# by Auxilor
#
use-json: false # false = ecoarmor.yml, true = ecoarmor.json
discover-recipes: true # If all recipes should be automatically discovered.
advancement-shard-material: prismarine_shard # The material for advancement shards.

1954
eco-core/core-plugin/src/main/resources/ecoarmor.json
View File

File diff suppressed because it is too large Load Diff

1548
eco-core/core-plugin/src/main/resources/ecoarmor.yml Normal file
View File

File diff suppressed because it is too large Load Diff

2
gradle.properties
View File

@@ -1,2 +1,2 @@
version = 6.6.0
version = 6.7.0
plugin-name = EcoArmor