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 unit repair not being capped.

Browse source 
Also fix wrong range in lore.
This commit is contained in:
alexcrea 2024-05-28 23:10:37 +02:00
parent 78e77df071
commit 49d8ba304d
No known key found for this signature in database
GPG key ID: 43FD265DB0DBF91F
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/xyz/alexcrea/cuanvil/gui/config/global/BasicConfigGui.java
View file

@ -110,7 +110,7 @@ public class BasicConfigGui extends ValueUpdatableGui {
ConfigOptions.MAX_ANVIL_COST, ConfigHolder.DEFAULT_CONFIG, ConfigOptions.MAX_ANVIL_COST, ConfigHolder.DEFAULT_CONFIG,
Arrays.asList( Arrays.asList(
"\u00A77Max cost the Anvil can get to.", "\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:", "\u00A77Cost will be displayed as \u00A7cToo Expensive\u00A77:",
"\u00A77- If Cost is above \u00A7e39", "\u00A77- If Cost is above \u00A7e39",
"\u00A77- And \u00A7eReplace Too Expensive\u00A77 is disabled" "\u00A77- And \u00A7eReplace Too Expensive\u00A77 is disabled"

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

@ -99,7 +99,6 @@ class AnvilEventListener(private val packetManager: PacketManager) : Listener {
// Test for merge // Test for merge
if (first.canMergeWith(second)) { if (first.canMergeWith(second)) {
val newEnchants = first.findEnchantments() val newEnchants = first.findEnchantments()
.combineWith(second.findEnchantments(), first.type, player) .combineWith(second.findEnchantments(), first.type, player)
val resultItem = first.clone() val resultItem = first.clone()
@ -210,7 +209,6 @@ class AnvilEventListener(private val packetManager: PacketManager) : Listener {
if ((output == inventory.getItem(ANVIL_INPUT_LEFT)) if ((output == inventory.getItem(ANVIL_INPUT_LEFT))
|| !allowed || !allowed
) { ) {
event.result = Event.Result.DENY event.result = Event.Result.DENY
return return
} }
@ -334,6 +332,13 @@ class AnvilEventListener(private val packetManager: PacketManager) : Listener {
repairCost += calculatePenalty(leftItem, null, resultCopy) repairCost += calculatePenalty(leftItem, null, resultCopy)
repairCost += resultAmount * ConfigOptions.unitRepairCost repairCost += resultAmount * ConfigOptions.unitRepairCost
if (
!ConfigOptions.doRemoveCostLimit &&
ConfigOptions.doCapCost) {
repairCost = min(repairCost, ConfigOptions.maxAnvilCost)
}
if ((inventory.maximumRepairCost < repairCost) if ((inventory.maximumRepairCost < repairCost)
|| (player.level < repairCost) || (player.level < repairCost)
) return ) return