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

Fix major issue with work penalty

Browse source 
also update linked wiki page
This commit is contained in:
alexcrea 2025-03-10 16:40:11 +01:00
parent 904bdc4868
commit 79f05d0f82
No known key found for this signature in database
GPG key ID: 43FD265DB0DBF91F
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/kotlin/xyz/alexcrea/cuanvil/util/AnvilXpUtil.kt
View file

@ -81,7 +81,7 @@ object AnvilXpUtil {
* Also change result work penalty if right item is not null * Also change result work penalty if right item is not null
*/ */
fun calculatePenalty(left: ItemStack, right: ItemStack?, result: ItemStack, useType: AnvilUseType): Int { fun calculatePenalty(left: ItemStack, right: ItemStack?, result: ItemStack, useType: AnvilUseType): Int {
// Extracted From https://minecraft.fandom.com/wiki/Anvil_mechanics#Enchantment_equation // Extracted From https://minecraft.wiki/w/Anvil_mechanics#Enchantment_equation
// Calculate work penalty // Calculate work penalty
val penaltyType = ConfigOptions.workPenaltyPart(useType) val penaltyType = ConfigOptions.workPenaltyPart(useType)
val leftPenalty = (left.itemMeta as? Repairable)?.repairCost ?: 0 val leftPenalty = (left.itemMeta as? Repairable)?.repairCost ?: 0
@ -95,12 +95,12 @@ object AnvilXpUtil {
// Increase penalty on fusing or unit repair // Increase penalty on fusing or unit repair
if (penaltyType.penaltyIncrease) { if (penaltyType.penaltyIncrease) {
result.itemMeta?.let { result.itemMeta?.let {
(it as? Repairable)?.repairCost = leftPenalty * 2 + 1 (it as? Repairable)?.repairCost = leftPenalty.coerceAtLeast(rightPenalty) * 2 + 1
result.itemMeta = it result.itemMeta = it
} }
} }
if (penaltyType.exclusivePenaltyIncrease) { if (penaltyType.exclusivePenaltyIncrease) {
val resultPenalty = leftExclusivePenalty * 2 + 1 val resultPenalty = leftExclusivePenalty.coerceAtLeast(rightExclusivePenalty) * 2 + 1
setExclusivePenalty(result, resultPenalty, useType) setExclusivePenalty(result, resultPenalty, useType)
} }