diff --git a/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/patches/minecraft/net/minecraft/client/Minecraft.java.patch index 7c6ff2e94..36c822b55 100644 --- a/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -86,7 +86,17 @@ if (itemstack == null) { -@@ -1704,6 +1713,8 @@ +@@ -1506,7 +1515,8 @@ + { + ItemStack itemstack1 = this.field_71439_g.field_71071_by.func_70448_g(); + +- if (itemstack1 != null && this.field_71442_b.func_78769_a(this.field_71439_g, this.field_71441_e, itemstack1)) ++ boolean result = !net.minecraftforge.event.ForgeEventFactory.onPlayerInteract(field_71439_g, net.minecraftforge.event.entity.player.PlayerInteractEvent.Action.RIGHT_CLICK_AIR, field_71441_e, null, null).isCanceled(); ++ if (result && itemstack1 != null && this.field_71442_b.func_78769_a(this.field_71439_g, this.field_71441_e, itemstack1)) + { + this.field_71460_t.field_78516_c.func_78445_c(); + } +@@ -1704,6 +1714,8 @@ while (Mouse.next()) { @@ -95,7 +105,7 @@ i = Mouse.getEventButton(); KeyBinding.func_74510_a(i - 100, Mouse.getEventButtonState()); -@@ -2213,7 +2224,13 @@ +@@ -2213,7 +2225,13 @@ NetworkManager networkmanager = NetworkManager.func_150722_a(socketaddress); networkmanager.func_150719_a(new NetHandlerLoginClient(networkmanager, this, (GuiScreen)null)); networkmanager.func_179290_a(new C00Handshake(47, socketaddress.toString(), 0, EnumConnectionState.LOGIN, true)); @@ -110,7 +120,7 @@ this.field_71453_ak = networkmanager; } -@@ -2224,6 +2241,8 @@ +@@ -2224,6 +2242,8 @@ public void func_71353_a(WorldClient p_71353_1_, String p_71353_2_) { @@ -119,7 +129,7 @@ if (p_71353_1_ == null) { NetHandlerPlayClient nethandlerplayclient = this.func_147114_u(); -@@ -2237,6 +2256,18 @@ +@@ -2237,6 +2257,18 @@ { this.field_71437_Z.func_71263_m(); this.field_71437_Z.func_175592_a(); @@ -138,7 +148,7 @@ } this.field_71437_Z = null; -@@ -2368,134 +2399,11 @@ +@@ -2368,134 +2400,11 @@ if (this.field_71476_x != null) { boolean flag = this.field_71439_g.field_71075_bZ.field_75098_d; @@ -275,7 +285,7 @@ if (flag) { int j = this.field_71439_g.field_71069_bz.field_75151_b.size() - 9 + inventoryplayer.field_70461_c; -@@ -2751,8 +2659,11 @@ +@@ -2751,8 +2660,11 @@ p_70001_1_.func_152767_b("gl_max_texture_size", Integer.valueOf(func_71369_N())); } @@ -287,7 +297,7 @@ for (int i = 16384; i > 0; i >>= 1) { GL11.glTexImage2D(GL11.GL_PROXY_TEXTURE_2D, 0, GL11.GL_RGBA, i, i, 0, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, (ByteBuffer)null); -@@ -2760,6 +2671,7 @@ +@@ -2760,6 +2672,7 @@ if (j != 0) {