diff --git a/src/main/kotlin/io/delilaheve/util/ConfigOptions.kt b/src/main/kotlin/io/delilaheve/util/ConfigOptions.kt index 9dbaa65..d548cb2 100644 --- a/src/main/kotlin/io/delilaheve/util/ConfigOptions.kt +++ b/src/main/kotlin/io/delilaheve/util/ConfigOptions.kt @@ -11,8 +11,6 @@ object ConfigOptions { // Path for default enchantment limits private const val DEFAULT_LIMIT_PATH = "default_limit" - // Path for allowing unsafe enchants - private const val ALLOW_UNSAFE_PATH = "allow_unsafe" // Path for limiting repair cost private const val LIMIT_REPAIR_COST = "limit_repair_cost" // Path for repair value limit @@ -35,8 +33,6 @@ object ConfigOptions { // Default value for enchantment limits private const val DEFAULT_ENCHANT_LIMIT = 5 - // Default value for allowing unsafe enchantments - private const val DEFAULT_ALLOW_UNSAFE = true // Default value for limiting repair cost private const val DEFAULT_LIMIT_REPAIR = true // Default value for repair cost limit @@ -70,16 +66,6 @@ object ConfigOptions { .getInt(DEFAULT_LIMIT_PATH, DEFAULT_ENCHANT_LIMIT) } - /** - * Whether to allow unsafe enchantments - */ - val allowUnsafe: Boolean - get() { - return UnsafeEnchants.instance - .config - .getBoolean(ALLOW_UNSAFE_PATH, DEFAULT_ALLOW_UNSAFE) - } - /** * Whether to limit repair costs to the vanilla limit */ diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index ad073a0..0c23ac6 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -1,17 +1,3 @@ -# Default limit to apply to any enchants missing from override_limits -# -# Valid range of 1 - 255 -default_limit: 5 - -# Whether enchants should be combined without regard for conflicts by default -# -# This setting will override permissions, if a player has ue.unsafe but this is false -# they will be unable to combine conflicting enchantments -# -# i.e. Protection and Blast Protection can be on the same piece of armour -# Please note, this configuration should be set to true if you want custom conflicts rule -allow_unsafe: true - # Whether all anvil actions should be capped # # If true, all anvil repairs will max out at the value of limit_repair_value @@ -22,6 +8,11 @@ limit_repair_cost: true # Valid range of 1 - 39 (vanilla will consider 40+ as "too expensive") limit_repair_value: 39 +# Whether the anvil's repair limit should be removed entirely +# +# The anvil will still visually display "too expensive" however the action will be completable +remove_repair_limit: false + # Value added to the anvil when the item durability increase # # Valid range of 0 - 255 @@ -32,10 +23,10 @@ item_repair_cost: 2 # Valid range of 0 - 255 sacrifice_illegal_enchant_cost: 1 -# Whether the anvil's repair limit should be removed entirely +# Default limit to apply to any enchants missing from override_limits # -# The anvil will still visually display "too expensive" however the action will be completable -remove_repair_limit: false +# Valid range of 1 - 255 +default_limit: 5 # Override limits for specific enchants #