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

made combine with logic work

Browse source
This commit is contained in:
alexcrea 2026-01-17 00:47:42 +01:00 • committed by alexcrea
parent 33a86cd3bc
commit 2cff7bd83c
2 changed files with 68 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,6 @@ import io.delilaheve.CustomAnvil
import org.bukkit.entity.HumanEntity
import org.bukkit.inventory.ItemStack
import xyz.alexcrea.cuanvil.config.ConfigHolder
import xyz.alexcrea.cuanvil.dependency.DependencyManager
import xyz.alexcrea.cuanvil.enchant.CAEnchantment
import xyz.alexcrea.cuanvil.group.ConflictType
import kotlin.math.max
@ -37,18 +36,70 @@ object EnchantmentUtil {
var maxEnchantCount = ConfigOptions.getEnchantCountLimit(item.type)
if(maxEnchantCount == null || maxEnchantCount < 0) maxEnchantCount = Int.MAX_VALUE
other.forEach { (enchantment, level) ->
if(!enchantment.isAllowed(player)) return@forEach
val allowed = other.filter { (enchantment, _) -> enchantment.isAllowed(player) }
val new = allowed.filter{ (enchantment, _) -> !containsKey(enchantment)}
val old = allowed.filter{ (enchantment, _) -> containsKey(enchantment)}
// Get max level or 255 if player can bypass
val maxLevel = if (bypassLevel) { 255 }
fun maxLevel(enchantment: CAEnchantment): Int {
val max = if (bypassLevel) { 255 }
else { ConfigOptions.enchantLimit(enchantment) }
CustomAnvil.verboseLog("Max level of ${enchantment.key} is $maxLevel (bypassLevel is $bypassLevel)")
CustomAnvil.verboseLog("Max level of ${enchantment.key} is $max (bypassLevel is $bypassLevel)")
return max
}
old.forEach { (enchantment, level) ->
// Get max level or 255 if player can bypass
val maxLevel = maxLevel(enchantment)
val cappedLevel = min(level, maxLevel)
val oldLevel = this[enchantment]!! // <- should not be null. (enchantment already in result list)
// ... and they're not the same level
if (oldLevel != cappedLevel) {
// apply the greater of the two or left one if right is above max
this[enchantment] = max(oldLevel, cappedLevel)
}
// ... and they're the same level
else {
// We test if it is allowed to merge at this level
if(!bypassLevel){
val maxBeforeDisabled = ConfigOptions.maxBeforeMergeDisabled(enchantment)
if((maxBeforeDisabled > 0) && (oldLevel >= maxBeforeDisabled)) {
CustomAnvil.verboseLog(
"Reached max merge before disable for ${enchantment.key}: $oldLevel/$maxBeforeDisabled)")
return@forEach
}
}
// Now we increase the enchantment level by 1
var newLevel = oldLevel + 1
newLevel = max(min(newLevel, maxLevel), oldLevel)
this[enchantment] = newLevel
}
if(bypassFuse){
CustomAnvil.verboseLog("Bypassed conflict check for ${enchantment.key}")
} else {
val conflictType = ConfigHolder.CONFLICT_HOLDER.conflictManager
.isConflicting(this, item, enchantment)
// ... and they are conflicting
if(conflictType != ConflictType.NO_CONFLICT){
CustomAnvil.verboseLog(
"Enchantment already in result list, and they are conflicting (${enchantment.key}, conflict: $conflictType)")
this[enchantment] = oldLevel
return@forEach
}
}
}
// Try to add new now
new.forEach { (enchantment, level) ->
// Get max level or 255 if player can bypass
val maxLevel = maxLevel(enchantment)
val cappedLevel = min(level, maxLevel)
// Enchantment not yet in result list
if (!containsKey(enchantment)) {
// Do not allow new enchantment if above maximum
if(this.size >= maxEnchantCount) return@forEach
@ -68,50 +119,7 @@ object EnchantmentUtil {
}
}
// Enchantment already in result list
else {
val oldLevel = this[enchantment]!! // <- should not be null. (enchantment already in result list)
if(bypassFuse){
CustomAnvil.verboseLog("Bypassed conflict check for ${enchantment.key}")
} else {
val conflictType = ConfigHolder.CONFLICT_HOLDER.conflictManager
.isConflicting(this, item, enchantment)
// ... and they are conflicting
if(conflictType != ConflictType.NO_CONFLICT){
CustomAnvil.verboseLog(
"Enchantment already in result list, and they are conflicting (${enchantment.key}, conflict: $conflictType)")
return@forEach
}
}
// ... and they're not the same level
if (oldLevel != cappedLevel) {
// apply the greater of the two or left one if right is above max
this[enchantment] = max(oldLevel, cappedLevel)
}
// ... and they're the same level
else {
// We test if it is allowed to merge at this level
if(!bypassLevel){
val maxBeforeDisabled = ConfigOptions.maxBeforeMergeDisabled(enchantment)
if((maxBeforeDisabled > 0) && (oldLevel >= maxBeforeDisabled)) {
CustomAnvil.verboseLog(
"Reached max merge before disable for ${enchantment.key}: $oldLevel/$maxBeforeDisabled)")
return@forEach
}
}
// Now we increase the enchantment level by 1
var newLevel = oldLevel + 1
newLevel = max(min(newLevel, maxLevel), oldLevel)
this[enchantment] = newLevel
}
}
}
}
}

3
src/main/kotlin/xyz/alexcrea/cuanvil/group/EnchantConflictGroup.kt
View file

@ -26,7 +26,8 @@ class EnchantConflictGroup(
// Or we check if any conflict after enchantment is true
for (entry in conflictAfterLevel) {
if(enchants.getOrDefault(entry.key, 0) >= entry.value)
val current = enchants.getOrDefault(entry.key, 0)
if(current > entry.value)
return false
}