Compare commits

...

2 commits

3 changed files with 12 additions and 2 deletions

View file

@ -16,7 +16,7 @@ plugins {
} }
group = "xyz.alexcrea" group = "xyz.alexcrea"
version = "1.6.11" version = "1.6.12-debug"
repositories { repositories {
// EcoEnchants // EcoEnchants

View file

@ -89,7 +89,11 @@ object EnchantmentUtil {
// We test if it is allowed to merge at this level // We test if it is allowed to merge at this level
if(!bypassLevel){ if(!bypassLevel){
val maxBeforeDisabled = ConfigOptions.maxBeforeMergeDisabled(enchantment) val maxBeforeDisabled = ConfigOptions.maxBeforeMergeDisabled(enchantment)
if((maxBeforeDisabled > 0) && (oldLevel >= maxBeforeDisabled)) return@forEach 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 // Now we increase the enchantment level by 1

View file

@ -52,6 +52,11 @@ class AnvilResultListener: Listener {
val leftItem = inventory.getItem(ANVIL_INPUT_LEFT) ?: return val leftItem = inventory.getItem(ANVIL_INPUT_LEFT) ?: return
val rightItem = inventory.getItem(ANVIL_INPUT_RIGHT) val rightItem = inventory.getItem(ANVIL_INPUT_RIGHT)
if(!GameMode.CREATIVE.equals(player.gameMode) && inventory.repairCost >= inventory.maximumRepairCost) {
event.result = Event.Result.DENY
return
}
// Test custom recipe // Test custom recipe
val recipe = CustomRecipeUtil.getCustomRecipe(leftItem, rightItem) val recipe = CustomRecipeUtil.getCustomRecipe(leftItem, rightItem)
if(recipe != null){ if(recipe != null){
@ -107,6 +112,7 @@ class AnvilResultListener: Listener {
val amount = CustomRecipeUtil.getCustomRecipeAmount(recipe, leftItem, rightItem) val amount = CustomRecipeUtil.getCustomRecipeAmount(recipe, leftItem, rightItem)
val xpCost = amount * recipe.xpCostPerCraft val xpCost = amount * recipe.xpCostPerCraft
CustomAnvil.log("gamemode: ${player.gameMode != GameMode.CREATIVE}, cost: $xpCost, level: ${player.level}, result: ${player.level < xpCost}")
if ((player.gameMode != GameMode.CREATIVE) && (player.level < xpCost)) return if ((player.gameMode != GameMode.CREATIVE) && (player.level < xpCost)) return
// We give the item manually // We give the item manually