MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Anvil craft fixes

Browse source
This commit is contained in:
Aleksey 2021-01-30 11:45:21 +03:00
parent 7b1c9ec0fb
commit 4cba51a9de
3 changed files with 34 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/main/java/ru/betterend/recipe/builders/AnvilRecipe.java
View file

@ -28,6 +28,8 @@ import ru.betterend.registry.EndTags;
import ru.betterend.util.ItemUtil;
import ru.betterend.util.RecipeHelper;
import java.util.Objects;
public class AnvilRecipe implements Recipe<Inventory>, BetterEndRecipe {
public final static String GROUP = "smithing";
@ -71,15 +73,21 @@ public class AnvilRecipe implements Recipe<Inventory>, BetterEndRecipe {
public ItemStack craft(Inventory craftingInventory, PlayerEntity player) {
if (!player.isCreative()) {
if (!checkHammerDurability(craftingInventory, player)) return ItemStack.EMPTY;
ItemStack hammer = craftingInventory.getStack(1);
int damage = hammer.getDamage() + this.damage;
if (damage >= hammer.getMaxDamage()) return ItemStack.EMPTY;
hammer.damage(this.damage, player, entity -> {
entity.sendEquipmentBreakStatus(null);
});
}
return this.craft(craftingInventory);
}
public boolean checkHammerDurability(Inventory craftingInventory, PlayerEntity player) {
if (player.isCreative()) return true;
ItemStack hammer = craftingInventory.getStack(1);
int damage = hammer.getDamage() + this.damage;
return damage < hammer.getMaxDamage();
}
public boolean matches(Inventory craftingInventory) {
ItemStack hammer = craftingInventory.getStack(1);
@ -125,7 +133,20 @@ public class AnvilRecipe implements Recipe<Inventory>, BetterEndRecipe {
public boolean isIgnoredInRecipeBook() {
return true;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
AnvilRecipe that = (AnvilRecipe) o;
return damage == that.damage && level == that.level && id.equals(that.id) && input.equals(that.input) && output.equals(that.output);
}
@Override
public int hashCode() {
return Objects.hash(id, input, output, damage, level);
}
public static class Builder {
private final static Builder INSTANCE = new Builder();
@ -244,5 +265,7 @@ public class AnvilRecipe implements Recipe<Inventory>, BetterEndRecipe {
packetBuffer.writeVarInt(recipe.level);
packetBuffer.writeVarInt(recipe.damage);
}
}
}