From f7664a5c29ee6b082e61647637e10bb208c0835f Mon Sep 17 00:00:00 2001 From: destro174 <40720638+destro174@users.noreply.github.com> Date: Tue, 15 Feb 2022 21:13:15 +0100 Subject: [PATCH] Fix config path and config not loading --- .../alttd/config/AbstractConfig.java | 3 ++- .../GriefPrevention/alttd/config/Config.java | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/alttd/config/AbstractConfig.java b/src/main/java/me/ryanhamshire/GriefPrevention/alttd/config/AbstractConfig.java index 636448c..824b718 100644 --- a/src/main/java/me/ryanhamshire/GriefPrevention/alttd/config/AbstractConfig.java +++ b/src/main/java/me/ryanhamshire/GriefPrevention/alttd/config/AbstractConfig.java @@ -1,6 +1,7 @@ package me.ryanhamshire.GriefPrevention.alttd.config; import com.google.common.collect.ImmutableMap; +import me.ryanhamshire.GriefPrevention.DataStore; import me.ryanhamshire.GriefPrevention.GriefPrevention; import me.ryanhamshire.GriefPrevention.alttd.util.Logger; import org.bukkit.Bukkit; @@ -31,7 +32,7 @@ abstract class AbstractConfig { File configPath; AbstractConfig(String filename) { - this.configPath = GriefPrevention.instance.getDataFolder(); + this.configPath = new File(DataStore.dataLayerFolderPath); this.file = new File(configPath, filename); this.yaml = new YamlConfiguration(); if (!this.file.getParentFile().exists()) { diff --git a/src/main/java/me/ryanhamshire/GriefPrevention/alttd/config/Config.java b/src/main/java/me/ryanhamshire/GriefPrevention/alttd/config/Config.java index 76fa93e..59ef348 100644 --- a/src/main/java/me/ryanhamshire/GriefPrevention/alttd/config/Config.java +++ b/src/main/java/me/ryanhamshire/GriefPrevention/alttd/config/Config.java @@ -142,4 +142,21 @@ public class Config extends AbstractConfig { ignoreClaimWarningPermission = config.getString("settings.ignore-claim-warning-permission", ignoreClaimWarningPermission); } + public static HashMap claimBlockPrices = new HashMap<>(); + public static void claimBlockSettings() { + claimBlockPrices.clear(); + config.getMap( "claimblock-prices", new HashMap(){{ + put("0", .25); + put("501", .5); + put("10001", .75); + put("50001", 1.00); + put("300001", 2.00); + put("1000001", 5.00); + }}) + .forEach((key, value) -> { + try { + claimBlockPrices.put(Integer.parseInt(key), value); + } catch (NumberFormatException ignored) {} + }); + } }