diff --git a/fml-src-3.0.180.354.zip b/fml-src-3.0.183.356.zip similarity index 94% rename from fml-src-3.0.180.354.zip rename to fml-src-3.0.183.356.zip index 43e637f02..4430920e3 100644 Binary files a/fml-src-3.0.180.354.zip and b/fml-src-3.0.183.356.zip differ diff --git a/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch b/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch index dbfeec16e..6854d61ea 100644 --- a/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch +++ b/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch @@ -21,10 +21,10 @@ this.field_72554_f = true; this.mc.loadWorld((WorldClient)null); this.mc.displayGuiScreen(new GuiDisconnected("disconnect.disconnected", "disconnect.genericReason", new Object[] {par1Packet255KickDisconnect.reason})); -@@ -655,7 +660,11 @@ - +@@ -656,7 +661,11 @@ public void handleChat(Packet3Chat par1Packet3Chat) { + par1Packet3Chat = FMLNetworkHandler.handleChatMessage(this, par1Packet3Chat); - this.mc.ingameGUI.getChatGUI().printChatMessage(par1Packet3Chat.message); + ClientChatReceivedEvent event = new ClientChatReceivedEvent(par1Packet3Chat.message); + if (!MinecraftForge.EVENT_BUS.post(event) && event.message != null) @@ -34,7 +34,7 @@ } public void handleAnimation(Packet18Animation par1Packet18Animation) -@@ -1010,6 +1019,19 @@ +@@ -1011,6 +1020,19 @@ { ((TileEntityMobSpawner)var2).readFromNBT(par1Packet132TileEntityData.customParam1); } @@ -42,13 +42,13 @@ + { + var2.onDataPacket(netManager, par1Packet132TileEntityData); + } -+ else ++ else + { + /*Packet132TileEntityData pkt = par1Packet132TileEntityData; + ModLoader.getLogger().log(Level.WARNING, String.format( -+ "Received a TileEntityData packet for a location that did not have a TileEntity: (%d, %d, %d) %d: %d, %d, %d", ++ "Received a TileEntityData packet for a location that did not have a TileEntity: (%d, %d, %d) %d: %d, %d, %d", + pkt.xPosition, pkt.yPosition, pkt.zPosition, -+ pkt.actionType, ++ pkt.actionType, + pkt.customParam1, pkt.customParam2, pkt.customParam3));*/ + } }