From 9c148b56f8f646648bec9d075da519fcee60f2ae Mon Sep 17 00:00:00 2001 From: Mathe172 Date: Fri, 26 May 2017 23:19:58 +0200 Subject: [PATCH] Fix patches of GuiScreen(#3704) and ItemDye(#3736) (#3878) --- .../minecraft/client/gui/GuiScreen.java.patch | 16 ++++++++-------- src/main/resources/forge.exc | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/patches/minecraft/net/minecraft/client/gui/GuiScreen.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiScreen.java.patch index 7f30109a20..b9c16b91d0 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiScreen.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/GuiScreen.java.patch @@ -8,7 +8,7 @@ public void func_73863_a(int p_73863_1_, int p_73863_2_, float p_73863_3_) { -@@ -147,7 +145,10 @@ +@@ -147,7 +148,10 @@ } } @@ -20,7 +20,7 @@ } protected void func_146279_a(String p_146279_1_, int p_146279_2_, int p_146279_3_) -@@ -157,7 +158,13 @@ +@@ -157,7 +161,13 @@ protected void func_146283_a(List p_146283_1_, int p_146283_2_, int p_146283_3_) { @@ -35,7 +35,7 @@ { GlStateManager.func_179101_C(); RenderHelper.func_74518_a(); -@@ -414,10 +421,13 @@ +@@ -414,10 +424,13 @@ public void func_175281_b(String p_175281_1_, boolean p_175281_2_) { @@ -49,7 +49,7 @@ this.field_146297_k.field_71439_g.func_71165_d(p_175281_1_); } -@@ -432,9 +442,15 @@ +@@ -432,9 +445,15 @@ if (guibutton.func_146116_c(this.field_146297_k, p_73864_1_, p_73864_2_)) { @@ -65,7 +65,7 @@ } } } -@@ -464,8 +480,12 @@ +@@ -464,8 +483,12 @@ this.field_146289_q = p_146280_1_.field_71466_p; this.field_146294_l = p_146280_2_; this.field_146295_m = p_146280_3_; @@ -78,7 +78,7 @@ } public void func_183500_a(int p_183500_1_, int p_183500_2_) -@@ -484,7 +504,10 @@ +@@ -484,7 +507,10 @@ { while (Mouse.next()) { @@ -89,7 +89,7 @@ } } -@@ -492,7 +515,10 @@ +@@ -492,7 +518,10 @@ { while (Keyboard.next()) { @@ -100,7 +100,7 @@ } } } -@@ -554,6 +580,7 @@ +@@ -554,6 +583,7 @@ public void func_146276_q_() { this.func_146270_b(0); diff --git a/src/main/resources/forge.exc b/src/main/resources/forge.exc index dccad386af..dc8426164b 100644 --- a/src/main/resources/forge.exc +++ b/src/main/resources/forge.exc @@ -27,6 +27,7 @@ net/minecraft/world/gen/ChunkProviderServer.loadChunk(IILjava/lang/Runnable;)Lne net/minecraft/block/BlockFire.tryCatchFire(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;ILjava/util/Random;ILnet/minecraft/util/EnumFacing;)V=|p_176536_1_,p_176536_2_,p_176536_3_,p_176536_4_,p_176536_5_,face net/minecraft/block/BlockSkull.getDrops(Lnet/minecraft/world/IBlockAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/state/IBlockState;I)Ljava/util/List;=|p_180663_1_,p_180663_2_,p_180663_3_,fortune net/minecraft/item/ItemDye.applyBonemeal(Lnet/minecraft/item/ItemStack;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/player/EntityPlayer;)Z=|p_179234_0_,p_179234_1_,p_179234_2_,player +net/minecraft/item/ItemDye.applyBonemeal(Lnet/minecraft/item/ItemStack;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/player/EntityPlayer;Lnet/minecraft/util/EnumHand;)Z=|p_179234_0_,p_179234_1_,p_179234_2_,player,hand net/minecraft/server/management/ItemInWorldManager.removeBlock(Lnet/minecraft/util/math/BlockPos;Z)Z=|p_180235_1_,canHarvest net/minecraft/client/gui/GuiScreen.drawHoveringText(Ljava/util/List;IILnet/minecraft/client/gui/FontRenderer;)V=|p_146283_1_,p_146283_2_,p_146283_3_,font net/minecraft/block/state/BlockState.(Lnet/minecraft/block/Block;[Lnet/minecraft/block/properties/IProperty;Lcom/google/common/collect/ImmutableMap;)V=|p_i45663_1_,p_i45663_2_,unlistedProperties