craftbukkit/nms-patches/net/minecraft/world/inventory/ContainerAnvil.patch

132 lines
5.8 KiB
Diff
Raw Normal View History

2021-03-16 09:00:00 +11:00
--- a/net/minecraft/world/inventory/ContainerAnvil.java
+++ b/net/minecraft/world/inventory/ContainerAnvil.java
2022-06-08 02:00:00 +10:00
@@ -17,6 +17,10 @@
2022-03-01 02:00:00 +11:00
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
2016-11-17 12:41:03 +11:00
+// CraftBukkit start
2016-03-01 08:32:46 +11:00
+import org.bukkit.craftbukkit.inventory.CraftInventoryView;
+// CraftBukkit end
+
2020-06-25 10:00:00 +10:00
public class ContainerAnvil extends ContainerAnvilAbstract {
2022-03-01 02:00:00 +11:00
private static final Logger LOGGER = LogUtils.getLogger();
@@ -32,6 +36,11 @@
2021-06-11 15:00:00 +10:00
private static final int COST_REPAIR_SACRIFICE = 2;
private static final int COST_INCOMPATIBLE_PENALTY = 1;
private static final int COST_RENAME = 1;
+ // CraftBukkit start
+ public static final int DEFAULT_DENIED_COST = -1;
+ public int maximumRepairCost = 40;
2016-11-17 12:41:03 +11:00
+ private CraftInventoryView bukkitEntity;
2015-02-26 22:41:06 +00:00
+ // CraftBukkit end
2019-04-23 12:00:00 +10:00
public ContainerAnvil(int i, PlayerInventory playerinventory) {
2021-06-11 15:00:00 +10:00
this(i, playerinventory, ContainerAccess.NULL);
@@ -50,7 +59,7 @@
@Override
protected boolean mayPickup(EntityHuman entityhuman, boolean flag) {
- return (entityhuman.getAbilities().instabuild || entityhuman.experienceLevel >= this.cost.get()) && this.cost.get() > 0;
+ return (entityhuman.getAbilities().instabuild || entityhuman.experienceLevel >= this.cost.get()) && this.cost.get() > ContainerAnvil.DEFAULT_DENIED_COST && flag; // CraftBukkit - allow cost 0 like a free item
}
@Override
@@ -73,7 +82,7 @@
this.inputSlots.setItem(1, ItemStack.EMPTY);
}
- this.cost.set(0);
+ this.cost.set(DEFAULT_DENIED_COST); // CraftBukkit - use a variable for set a cost for denied item
this.access.execute((world, blockposition) -> {
IBlockData iblockdata = world.getBlockState(blockposition);
@@ -104,8 +113,8 @@
2016-03-01 08:32:46 +11:00
byte b1 = 0;
2016-11-17 12:41:03 +11:00
if (itemstack.isEmpty()) {
2021-06-11 15:00:00 +10:00
- this.resultSlots.setItem(0, ItemStack.EMPTY);
- this.cost.set(0);
2021-06-11 15:00:00 +10:00
+ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareAnvilEvent(getBukkitView(), ItemStack.EMPTY); // CraftBukkit
+ this.cost.set(DEFAULT_DENIED_COST); // CraftBukkit - use a variable for set a cost for denied item
2016-03-01 08:32:46 +11:00
} else {
2021-11-22 09:00:00 +11:00
ItemStack itemstack1 = itemstack.copy();
ItemStack itemstack2 = this.inputSlots.getItem(1);
@@ -122,8 +131,8 @@
2021-11-22 09:00:00 +11:00
if (itemstack1.isDamageableItem() && itemstack1.getItem().isValidRepairItem(itemstack, itemstack2)) {
k = Math.min(itemstack1.getDamageValue(), itemstack1.getMaxDamage() / 4);
2016-03-01 08:32:46 +11:00
if (k <= 0) {
2021-06-11 15:00:00 +10:00
- this.resultSlots.setItem(0, ItemStack.EMPTY);
- this.cost.set(0);
2021-06-11 15:00:00 +10:00
+ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareAnvilEvent(getBukkitView(), ItemStack.EMPTY); // CraftBukkit
+ this.cost.set(DEFAULT_DENIED_COST); // CraftBukkit - use a variable for set a cost for denied item
2016-03-01 08:32:46 +11:00
return;
}
@@ -137,8 +146,8 @@
2021-06-11 15:00:00 +10:00
this.repairItemCountCost = i1;
2016-03-01 08:32:46 +11:00
} else {
2021-11-22 09:00:00 +11:00
if (!flag && (!itemstack1.is(itemstack2.getItem()) || !itemstack1.isDamageableItem())) {
2021-06-11 15:00:00 +10:00
- this.resultSlots.setItem(0, ItemStack.EMPTY);
- this.cost.set(0);
2021-06-11 15:00:00 +10:00
+ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareAnvilEvent(getBukkitView(), ItemStack.EMPTY); // CraftBukkit
+ this.cost.set(DEFAULT_DENIED_COST); // CraftBukkit - use a variable for set a cost for denied item
return;
}
@@ -227,8 +236,8 @@
}
if (flag2 && !flag1) {
2021-06-11 15:00:00 +10:00
- this.resultSlots.setItem(0, ItemStack.EMPTY);
- this.cost.set(0);
2021-06-11 15:00:00 +10:00
+ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareAnvilEvent(getBukkitView(), ItemStack.EMPTY); // CraftBukkit
+ this.cost.set(DEFAULT_DENIED_COST); // CraftBukkit - use a variable for set a cost for denied item
2016-03-01 08:32:46 +11:00
return;
}
}
@@ -251,11 +260,11 @@
2021-06-11 15:00:00 +10:00
itemstack1 = ItemStack.EMPTY;
}
2021-06-11 15:00:00 +10:00
- if (b1 == i && b1 > 0 && this.cost.get() >= 40) {
- this.cost.set(39);
+ if (b1 == i && b1 > 0 && this.cost.get() >= maximumRepairCost) { // CraftBukkit
+ this.cost.set(maximumRepairCost - 1); // CraftBukkit
}
2021-06-11 15:00:00 +10:00
- if (this.cost.get() >= 40 && !this.player.getAbilities().instabuild) {
+ if (this.cost.get() >= maximumRepairCost && !this.player.getAbilities().instabuild) { // CraftBukkit
itemstack1 = ItemStack.EMPTY;
}
@@ -274,7 +283,8 @@
2021-11-22 09:00:00 +11:00
EnchantmentManager.setEnchantments(map, itemstack1);
2016-03-01 08:32:46 +11:00
}
2021-06-11 15:00:00 +10:00
- this.resultSlots.setItem(0, itemstack1);
2016-03-01 08:32:46 +11:00
+ org.bukkit.craftbukkit.event.CraftEventFactory.callPrepareAnvilEvent(getBukkitView(), itemstack1); // CraftBukkit
2021-11-22 09:00:00 +11:00
+ sendAllDataToRemote(); // CraftBukkit - SPIGOT-6686: Always send completed inventory to stay in sync with client
this.broadcastChanges();
2016-03-01 08:32:46 +11:00
}
}
@@ -301,4 +311,18 @@
2021-11-22 09:00:00 +11:00
public int getCost() {
2021-06-11 15:00:00 +10:00
return this.cost.get();
}
2016-11-17 12:41:03 +11:00
+
+ // CraftBukkit start
+ @Override
+ public CraftInventoryView getBukkitView() {
+ if (bukkitEntity != null) {
+ return bukkitEntity;
+ }
+
2016-03-01 08:32:46 +11:00
+ org.bukkit.craftbukkit.inventory.CraftInventory inventory = new org.bukkit.craftbukkit.inventory.CraftInventoryAnvil(
2021-06-11 15:00:00 +10:00
+ access.getLocation(), this.inputSlots, this.resultSlots, this);
2018-12-13 11:00:00 +11:00
+ bukkitEntity = new CraftInventoryView(this.player.getBukkitEntity(), inventory, this);
+ return bukkitEntity;
+ }
+ // CraftBukkit end
2016-11-17 12:41:03 +11:00
}