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

Rework the conflict system to be mostly handled by the enchantment.

Browse source
This commit is contained in:
alexcrea 2024-06-20 02:57:52 +02:00
parent b7fda4dece
commit fa4752ea67
No known key found for this signature in database
GPG key ID: 43FD265DB0DBF91F
4 changed files with 69 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/kotlin/io/delilaheve/util/EnchantmentUtil.kt
View file

@ -55,7 +55,7 @@ object EnchantmentUtil {
}
// Enchantment already in result list
else {
val oldLevel = this[enchantment]!! // <- should not be null. see the comment above
val oldLevel = this[enchantment]!! // <- should not be null. (enchantment already in result list)
// ... and they are conflicting
val conflictType =

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

@ -33,43 +33,35 @@ class EnchantConflictManager {
}
private lateinit var conflictMap: HashMap<WrappedEnchantment, ArrayList<EnchantConflictGroup>>
lateinit var conflictList: ArrayList<EnchantConflictGroup>
// Read and prepare all conflict
fun prepareConflicts(config: ConfigurationSection, itemManager: ItemGroupManager) {
conflictMap = HashMap()
conflictList = ArrayList()
// Clear conflict if exist
for (enchant in WrappedEnchantment.values()) {
enchant.clearConflict()
}
val keys = config.getKeys(false)
for (key in keys) {
val section = config.getConfigurationSection(key)!!
val conflict = createConflict(section, itemManager, key)
addToMap(conflict)
addConflictToEnchantments(conflict)
conflictList.add(conflict)
}
}
// Add the conflict to the map
private fun addToMap(conflict: EnchantConflictGroup) {
// Add the conflict to enchantments
private fun addConflictToEnchantments(conflict: EnchantConflictGroup) {
conflict.getEnchants().forEach { enchant ->
addConflictToConflictMap(enchant, conflict)
enchant.addConflict(conflict)
}
}
fun addConflictToConflictMap(enchant: WrappedEnchantment, conflict: EnchantConflictGroup) {
if (!conflictMap.containsKey(enchant)) {
conflictMap[enchant] = ArrayList()
}
conflictMap[enchant]!!.add(conflict)
}
fun removeConflictFromMap(enchant: WrappedEnchantment, conflict: EnchantConflictGroup): Boolean {
return conflictMap[enchant]!!.remove(conflict)
}
// create and read a conflict from a yaml section
private fun createConflict(
section: ConfigurationSection,
@ -85,7 +77,7 @@ class EnchantConflictManager {
for (enchantName in enchantList) {
val enchant = getEnchantByName(enchantName)
if (enchant == null) {
if (!futureUse) {
if (!futureUse) { //TODO future use will be deprecated once the new update system is finished
CustomAnvil.instance.logger.warning("Enchantment $enchantName do not exist but was asked for conflict $conflictName")
}
continue
@ -153,8 +145,7 @@ class EnchantConflictManager {
fun isConflicting(base: Set<WrappedEnchantment>, mat: Material, newEnchant: WrappedEnchantment): ConflictType {
CustomAnvil.verboseLog("Testing conflict for ${newEnchant.key} on ${mat.key}")
val conflictList = conflictMap[newEnchant] ?: return ConflictType.NO_CONFLICT
CustomAnvil.verboseLog("Did not get skipped")
val conflictList = newEnchant.conflicts;
var result = ConflictType.NO_CONFLICT
for (conflict in conflictList) {
@ -171,15 +162,39 @@ class EnchantConflictManager {
}
}
}
return result
// Test conflict with other conflict system.
val otherConflict = newEnchant.testConflict()
return result.getWorstConflict(otherConflict)
}
}
enum class ConflictType {
NO_CONFLICT,
SMALL_CONFLICT,
BIG_CONFLICT
/**
* Provide information about the current conflict.
*/
enum class ConflictType(private val importance: Int) {
/**
* Allowed to proceed the anvil process.
*/
NO_CONFLICT(0),
/**
* Inform that the anvil process should not change the current applied enchantment.
*/
SMALL_CONFLICT(1),
/**
* Inform that the anvil process should not change the current applied enchantment.
* Also add sacrificeIllegalCost for every enchantment marked as big conflict.
*/
BIG_CONFLICT(2);
fun getWorstConflict(otherConflict: ConflictType): ConflictType {
return if(this.importance > otherConflict.importance) this
else otherConflict
}
}