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

Fix unit repair not increasing penalty and version up.

Browse source 
This was caused by previous fix fixing renaming increasing penalty.
This commit is contained in:
alexcrea 2024-07-30 22:33:55 +02:00
parent 44367d0ced
commit 056892ee1e
No known key found for this signature in database
GPG key ID: 43FD265DB0DBF91F
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build.gradle.kts
View file

@ -13,7 +13,7 @@ plugins {
}
group = "xyz.alexcrea"
version = "1.5.4"
version = "1.5.4-fix"
java {
disableAutoTargetJvm()

14
src/main/kotlin/io/delilaheve/AnvilEventListener.kt
View file

@ -145,7 +145,7 @@ class AnvilEventListener(private val packetManager: PacketManager) : Listener {
anvilCost += repairAmount * ConfigOptions.unitRepairCost
}
// We do not care about right item penalty for unit repair
anvilCost += calculatePenalty(first, null, resultItem)
anvilCost += calculatePenalty(first, null, resultItem, true)
// Test/stop if nothing changed.
if (first == resultItem) {
@ -506,6 +506,14 @@ class AnvilEventListener(private val packetManager: PacketManager) : Listener {
* Also change result work penalty if right item is not null
*/
private fun calculatePenalty(left: ItemStack, right: ItemStack?, result: ItemStack): Int {
return calculatePenalty(left, right, result, false)
}
/**
* Function to calculate work penalty of anvil work
* Also change result work penalty if right item is not null
*/
private fun calculatePenalty(left: ItemStack, right: ItemStack?, result: ItemStack, unitRepair: Boolean): Int {
// Extracted From https://minecraft.fandom.com/wiki/Anvil_mechanics#Enchantment_equation
// Calculate work penalty
val leftPenalty = (left.itemMeta as? Repairable)?.repairCost ?: 0
@ -516,8 +524,8 @@ class AnvilEventListener(private val packetManager: PacketManager) : Listener {
(right.itemMeta as? Repairable)?.repairCost ?: 0
}
// Try to set work penalty for the result item only if right item not null
if(right != null){
// Increase penalty on fusing or unit repair
if(right != null || unitRepair){
result.itemMeta?.let {
(it as? Repairable)?.repairCost = leftPenalty * 2 + 1
result.itemMeta = it

2
src/main/resources/plugin.yml
View file

@ -1,7 +1,7 @@
main: io.delilaheve.CustomAnvil
name: CustomAnvil
prefix: "Custom Anvil"
version: 1.5.4
version: 1.5.4-fix
description: Allow to customise anvil mechanics
api-version: 1.16
load: POSTWORLD