Repo-Mirror/EcoEnchants
9
0
Fork 0
Code Issues Releases 1 Activity

Merge pull request #323 from 0ft3n/master

Browse Source 
vanillaenchants.yml reverting fix
This commit is contained in:
Will FP
2022-10-23 22:57:47 +01:00
committed by GitHub
parent 787ad69928 eda6a95c76
commit f0836554a7
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/commands/CommandGiveRandomBook.kt
View File

@@ -84,7 +84,11 @@ class CommandGiveRandomBook(plugin: EcoPlugin) : PluginCommand(
1 -> Bukkit.getOnlinePlayers().map { it.name }
2 -> (EnchantmentRarities.values().map { it.id } + EnchantmentTypes.values().map { it.id })
3 -> (1..10).map { it.toString() }
4 -> ((args[3].toIntOrNull() ?: 1)..(args[3].toIntOrNull() ?: 1) + 10).map { it.toString() }
4 -> {
val startLevel = args[3].toIntOrNull() ?: 1
val endLevel = startLevel + 10
(startLevel..endLevel).map { it.toString() }
}
else -> emptyList()
}
}

7
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/config/Configs.kt
View File

@@ -3,8 +3,13 @@ package com.willfp.ecoenchants.config
import com.willfp.eco.core.EcoPlugin
import com.willfp.eco.core.config.BaseConfig
import com.willfp.eco.core.config.ConfigType
import com.willfp.eco.core.config.ExtendableConfig
import com.willfp.ecoenchants.enchants.EcoEnchant
import org.bukkit.enchantments.Enchantment
class TypesYml(plugin: EcoPlugin) : BaseConfig("types", plugin, true, ConfigType.YAML)
class TargetsYml(plugin: EcoPlugin) : BaseConfig("targets", plugin, true, ConfigType.YAML)
class RarityYml(plugin: EcoPlugin) : BaseConfig("rarity", plugin, true, ConfigType.YAML)
class VanillaEnchantsYml(plugin: EcoPlugin) : BaseConfig("vanillaenchants", plugin, true, ConfigType.YAML)
class VanillaEnchantsYml(plugin: EcoPlugin) : ExtendableConfig("vanillaenchants", true, plugin,
plugin.javaClass, "", ConfigType.YAML, *Enchantment.values().filter { it !is EcoEnchant }
.map { it.key.key.lowercase() }.toTypedArray())