alexcrea/CustomAnvil
1
0
Fork 0
mirror of https://github.com/alexcrea/CustomAnvil.git synced 2026-06-23 16:16:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

avoid warn on default config

Browse source
This commit is contained in:
alexcrea 2024-02-01 20:42:41 +01:00
parent 9f35c1a98d
commit 17bc9073a2
3 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/main/kotlin/xyz/alexcrea/group/EnchantConflictManager.kt
View file

@ -17,6 +17,9 @@ class EnchantConflictManager {
private const val CONFLICT_GROUP_PATH = "notAffectedGroups"
// Path for the maximum number of enchantment before validating the conflict
private const val ENCH_MAX_PATH = "maxEnchantmentBeforeConflict"
// Path for a flag: if the enchantment will be used in the last supported version
// TODO maybe replace this system by a list of "future" enchantment.
private const val FUTURE_USE_PATH = "useInFuture"
// Default name for an empty Material group
private val DEFAULT_EMPTY_GROUP = IncludeGroup("empty")
// Default name for a joining group
@ -33,8 +36,9 @@ class EnchantConflictManager {
for (key in keys) {
val section = config.getConfigurationSection(key)!!
val conflict = createConflict(section,itemManager,key)
conflictList.add(conflict)
if(conflict != null){
conflictList.add(conflict)
}
}
}
@ -42,8 +46,9 @@ class EnchantConflictManager {
// create and read a conflict from a yaml section
private fun createConflict(section: ConfigurationSection,
itemManager: ItemGroupManager,
conflictName: String): EnchantConflictGroup {
conflictName: String): EnchantConflictGroup? {
// Is it planed for the future
val futureUse = section.getBoolean(FUTURE_USE_PATH,false)
// Create conflict
val conflict = createConflictObject(section,itemManager,conflictName)
// Read and add enchantment to conflict
@ -52,13 +57,18 @@ class EnchantConflictManager {
val enchantKey = NamespacedKey.minecraft(enchantName)
val enchant = Enchantment.getByKey(enchantKey)
if(enchant == null){
UnsafeEnchants.instance.logger.warning("Enchantment $enchantName do not exist but was asked for conflict $conflictName")
if(!futureUse){
UnsafeEnchants.instance.logger.warning("Enchantment $enchantName do not exist but was asked for conflict $conflictName")
}
continue
}
conflict.addEnchantment(enchant)
}
if(conflict.isEnchantEmpty()){
UnsafeEnchants.instance.logger.warning("Conflict $conflictName do not have valid enchantment, it will not work")
if(!futureUse){
UnsafeEnchants.instance.logger.warning("Conflict $conflictName do not have valid enchantment, it will not work")
}
return null
}
return conflict

10
src/main/kotlin/xyz/alexcrea/group/ItemGroupManager.kt
View file

@ -16,6 +16,8 @@ class ItemGroupManager {
private const val MATERIAL_LIST_PATH = "items"
// Path for included groups list
private const val GROUP_LIST_PATH = "groups"
// Temporary list of elements in default config that are use in future
private val FUTURE_MATERIAL = setOf("PIGLIN_HEAD","BRUSH")
}
private lateinit var groupMap : HashMap<String,MaterialGroup>
@ -66,8 +68,12 @@ class ItemGroupManager {
val materialName = materialTemp.uppercase(Locale.getDefault())
val material = Material.getMaterial(materialName)
if(material == null){
UnsafeEnchants.instance.logger.warning(
"Unknown material $materialTemp on group ${group.getName()}")
// Check if we should warn the user
if(materialName !in FUTURE_MATERIAL){
UnsafeEnchants.instance.logger.warning(
"Unknown material $materialTemp on group ${group.getName()}")
}
continue
}
group.addToPolicy(material)