diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/components/SkillIcon.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/components/SkillIcon.kt index a258fb8..cbcc829 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/components/SkillIcon.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/components/SkillIcon.kt @@ -42,7 +42,7 @@ class SkillIcon( } } - override val isEnabled = config.getBool("enabled") + override val isEnabled = config.getBoolOrNull("enabled") ?: true override val row = config.getInt("position.row") override val column = config.getInt("position.column") diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/components/StatIcon.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/components/StatIcon.kt index b2b0890..7ef0d62 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/components/StatIcon.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoskills/gui/components/StatIcon.kt @@ -38,7 +38,7 @@ class StatIcon( } } - override val isEnabled = config.getBool("enabled") + override val isEnabled = config.getBoolOrNull("enabled") ?: true override val row = config.getInt("position.row") override val column = config.getInt("position.column") diff --git a/eco-core/core-plugin/src/main/resources/skills/mining.yml b/eco-core/core-plugin/src/main/resources/skills/mining.yml index 6304ffc..cc8883d 100644 --- a/eco-core/core-plugin/src/main/resources/skills/mining.yml +++ b/eco-core/core-plugin/src/main/resources/skills/mining.yml @@ -122,14 +122,14 @@ reward-messages: - " %ecoskills_dynamic_mining_description%" xp-gain-methods: - - trigger: break_block + - trigger: mine_block multiplier: 0.5 filters: player_placed: false blocks: - netherrack - - trigger: break_block + - trigger: mine_block multiplier: 1 filters: player_placed: false @@ -140,7 +140,7 @@ xp-gain-methods: - andesite - cobblestone - - trigger: break_block + - trigger: mine_block multiplier: 1.5 filters: player_placed: false @@ -149,14 +149,14 @@ xp-gain-methods: - blackstone - deepslate - - trigger: break_block + - trigger: mine_block multiplier: 2.5 filters: player_placed: false blocks: - calcite - - trigger: break_block + - trigger: mine_block multiplier: 3 filters: player_placed: false @@ -164,14 +164,14 @@ xp-gain-methods: - sand - end_stone - - trigger: break_block + - trigger: mine_block multiplier: 4 filters: player_placed: false blocks: - gravel - - trigger: break_block + - trigger: mine_block multiplier: 5 filters: player_placed: false @@ -182,14 +182,14 @@ xp-gain-methods: - copper_ore - amethyst_block - - trigger: break_block + - trigger: mine_block multiplier: 6 filters: player_placed: false blocks: - gold_ore - - trigger: break_block + - trigger: mine_block multiplier: 7 filters: player_placed: false @@ -197,7 +197,7 @@ xp-gain-methods: - lapis_ore - redstone_ore - - trigger: break_block + - trigger: mine_block multiplier: 7.5 filters: player_placed: false @@ -206,21 +206,21 @@ xp-gain-methods: - deepslate_iron_ore - deepslate_copper_ore - - trigger: break_block + - trigger: mine_block multiplier: 9 filters: player_placed: false blocks: - emerald_ore - - trigger: break_block + - trigger: mine_block multiplier: 9 filters: player_placed: false blocks: - deepslate_gold_ore - - trigger: break_block + - trigger: mine_block multiplier: 10 filters: player_placed: false @@ -228,7 +228,7 @@ xp-gain-methods: - gilded_blackstone - diamond_ore - - trigger: break_block + - trigger: mine_block multiplier: 10.5 filters: player_placed: false @@ -236,28 +236,28 @@ xp-gain-methods: - deepslate_lapis_ore - deepslate_redstone_ore - - trigger: break_block + - trigger: mine_block multiplier: 13.5 filters: player_placed: false blocks: - deepslate_emerald_ore - - trigger: break_block + - trigger: mine_block multiplier: 15 filters: player_placed: false blocks: - deepslate_diamond_ore - - trigger: break_block + - trigger: mine_block multiplier: 22 filters: player_placed: false blocks: - ancient_debris - - trigger: break_block + - trigger: mine_block multiplier: 8.5 filters: player_placed: false diff --git a/eco-core/core-plugin/src/main/resources/skills/woodcutting.yml b/eco-core/core-plugin/src/main/resources/skills/woodcutting.yml index 70a054b..24c83c7 100644 --- a/eco-core/core-plugin/src/main/resources/skills/woodcutting.yml +++ b/eco-core/core-plugin/src/main/resources/skills/woodcutting.yml @@ -100,7 +100,7 @@ reward-messages: xp-gain-methods: - - trigger: break_block + - trigger: mine_block multiplier: 6 filters: player_placed: false @@ -118,7 +118,7 @@ xp-gain-methods: - acacia_wood - dark_oak_wood - - trigger: break_block + - trigger: mine_block multiplier: 14 filters: player_placed: false diff --git a/gradle.properties b/gradle.properties index 5d36815..030271d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ #libreforge-updater #Tue May 09 17:44:57 BST 2023 kotlin.code.style=official -libreforge-version=4.10.0 +libreforge-version=4.11.0 version=3.0.0