mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 20:52:34 +00:00
* Added ability to AnvilUpdateEvent to alter stackSizeToBeUsedInRepair (vanilla behavior is now reproducable) * Added AnvilRepairEvent, fired when the player removes an ItemStack from the output slot of ContainerRepair, and allows the chance to damage the anvil to be altered.
46 lines
2.3 KiB
Diff
46 lines
2.3 KiB
Diff
--- ../src-base/minecraft/net/minecraft/inventory/ContainerRepair.java
|
|
+++ ../src-work/minecraft/net/minecraft/inventory/ContainerRepair.java
|
|
@@ -12,6 +12,7 @@
|
|
import net.minecraft.init.Items;
|
|
import net.minecraft.item.ItemStack;
|
|
import net.minecraft.world.World;
|
|
+import net.minecraftforge.common.ForgeHooks;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.logging.log4j.LogManager;
|
|
import org.apache.logging.log4j.Logger;
|
|
@@ -66,6 +67,8 @@
|
|
p_82870_1_.func_82242_a(-ContainerRepair.this.field_82854_e);
|
|
}
|
|
|
|
+ float breakChance = ForgeHooks.onAnvilRepair(p_82870_1_, p_82870_2_, ContainerRepair.this.field_82853_g.func_70301_a(0), ContainerRepair.this.field_82853_g.func_70301_a(1));
|
|
+
|
|
ContainerRepair.this.field_82853_g.func_70299_a(0, (ItemStack)null);
|
|
|
|
if (ContainerRepair.this.field_82856_l > 0)
|
|
@@ -89,7 +92,7 @@
|
|
|
|
ContainerRepair.this.field_82854_e = 0;
|
|
|
|
- if (!p_82870_1_.field_71075_bZ.field_75098_d && !p_i1800_2_.field_72995_K && p_i1800_2_.func_147439_a(p_i1800_3_, p_i1800_4_, p_i1800_5_) == Blocks.field_150467_bQ && p_82870_1_.func_70681_au().nextFloat() < 0.12F)
|
|
+ if (!p_82870_1_.field_71075_bZ.field_75098_d && !p_i1800_2_.field_72995_K && p_i1800_2_.func_147439_a(p_i1800_3_, p_i1800_4_, p_i1800_5_) == Blocks.field_150467_bQ && p_82870_1_.func_70681_au().nextFloat() < breakChance)
|
|
{
|
|
int i1 = p_i1800_2_.func_72805_g(p_i1800_3_, p_i1800_4_, p_i1800_5_);
|
|
int k = i1 & 3;
|
|
@@ -170,6 +173,7 @@
|
|
|
|
if (itemstack2 != null)
|
|
{
|
|
+ if (!ForgeHooks.onAnvilChange(this, itemstack, itemstack2, field_82852_f, field_82857_m, k2)) return;
|
|
flag = itemstack2.func_77973_b() == Items.field_151134_bR && Items.field_151134_bR.func_92110_g(itemstack2).func_74745_c() > 0;
|
|
|
|
if (itemstack1.func_77984_f() && itemstack1.func_77973_b().func_82789_a(itemstack, itemstack2))
|
|
@@ -373,6 +377,8 @@
|
|
k2 = Math.max(1, k2 / 2);
|
|
}
|
|
|
|
+ if (flag && !itemstack1.func_77973_b().isBookEnchantable(itemstack1, itemstack2)) itemstack1 = null;
|
|
+
|
|
this.field_82854_e = k2 + i;
|
|
|
|
if (i <= 0)
|