From 49d8ba304db2a7222182b1b52f5e968da75605c9 Mon Sep 17 00:00:00 2001 From: alexcrea <42614139+alexcrea@users.noreply.github.com> Date: Tue, 28 May 2024 23:10:37 +0200 Subject: [PATCH] Fix unit repair not being capped. Also fix wrong range in lore. --- .../cuanvil/gui/config/global/BasicConfigGui.java | 2 +- src/main/kotlin/io/delilaheve/AnvilEventListener.kt | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/BasicConfigGui.java b/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/BasicConfigGui.java index 5fd12a3..6476bec 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/BasicConfigGui.java +++ b/src/main/java/xyz/alexcrea/cuanvil/gui/config/global/BasicConfigGui.java @@ -110,7 +110,7 @@ public class BasicConfigGui extends ValueUpdatableGui { ConfigOptions.MAX_ANVIL_COST, ConfigHolder.DEFAULT_CONFIG, Arrays.asList( "\u00A77Max cost the Anvil can get to.", - "\u00A77Valid values include \u00A7e1 \u00A77to \u00A7e255\u00A77.", + "\u00A77Valid values include \u00A7e0 \u00A77to \u00A7e1000\u00A77.", "\u00A77Cost will be displayed as \u00A7cToo Expensive\u00A77:", "\u00A77- If Cost is above \u00A7e39", "\u00A77- And \u00A7eReplace Too Expensive\u00A77 is disabled" diff --git a/src/main/kotlin/io/delilaheve/AnvilEventListener.kt b/src/main/kotlin/io/delilaheve/AnvilEventListener.kt index 12e6550..fd9bfdd 100644 --- a/src/main/kotlin/io/delilaheve/AnvilEventListener.kt +++ b/src/main/kotlin/io/delilaheve/AnvilEventListener.kt @@ -99,7 +99,6 @@ class AnvilEventListener(private val packetManager: PacketManager) : Listener { // Test for merge if (first.canMergeWith(second)) { - val newEnchants = first.findEnchantments() .combineWith(second.findEnchantments(), first.type, player) val resultItem = first.clone() @@ -210,7 +209,6 @@ class AnvilEventListener(private val packetManager: PacketManager) : Listener { if ((output == inventory.getItem(ANVIL_INPUT_LEFT)) || !allowed ) { - event.result = Event.Result.DENY return } @@ -334,6 +332,13 @@ class AnvilEventListener(private val packetManager: PacketManager) : Listener { repairCost += calculatePenalty(leftItem, null, resultCopy) repairCost += resultAmount * ConfigOptions.unitRepairCost + if ( + !ConfigOptions.doRemoveCostLimit && + ConfigOptions.doCapCost) { + + repairCost = min(repairCost, ConfigOptions.maxAnvilCost) + } + if ((inventory.maximumRepairCost < repairCost) || (player.level < repairCost) ) return