From 648cbf7dda31bc6737430c73d8bc1b028b71c48e Mon Sep 17 00:00:00 2001 From: psxlover Date: Wed, 16 May 2012 00:33:50 +0300 Subject: [PATCH 1/2] Fixed build.bat --- build.bat | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/build.bat b/build.bat index 46f5474b..d4ec8c23 100644 --- a/build.bat +++ b/build.bat @@ -4,16 +4,16 @@ rmdir /S /Q ..\src mkdir ..\src xcopy /Y /E ..\src_work\* ..\src\ -xcopy /Y /E buildcraft_client\src\net\* ..\src\minecraft\net -xcopy /Y /E buildcraft_server\src\net\* ..\src\minecraft_server\net +xcopy /Y /E buildcraft_client\net\* ..\src\minecraft\net\ +xcopy /Y /E buildcraft_server\net\* ..\src\minecraft_server\net\ -xcopy /Y /E common\net\* ..\src\minecraft\net -xcopy /Y /E common\net\* ..\src\minecraft_server\net +xcopy /Y /E common\net\* ..\src\minecraft\net\ +xcopy /Y /E common\net\* ..\src\minecraft_server\net\ -xcopy /Y /E ..\forge\forge_client\src\net\* ..\src\minecraft\net +xcopy /Y /E ..\forge\forge_client\src\net\* ..\src\minecraft\net\ -xcopy /Y /E ..\forge\forge_common\net\* ..\src\minecraft\net -xcopy /Y /E ..\forge\forge_common\net\* ..\src\minecraft_server\net +xcopy /Y /E ..\forge\forge_common\net\* ..\src\minecraft\net\ +xcopy /Y /E ..\forge\forge_common\net\* ..\src\minecraft_server\net\ cd .. cmd /C recompile.bat @@ -25,8 +25,8 @@ mkdir ..\bin\minecraft\net\minecraft\src\buildcraft\transport\gui mkdir ..\bin\minecraft\net\minecraft\src\buildcraft\builders\gui mkdir ..\bin\minecraft\net\minecraft\src\buildcraft\energy\gui -xcopy /Y /E common\net\minecraft\src\buildcraft\core\gui\*.png ..\bin\minecraft\net\minecraft\src\buildcraft\core\gui -xcopy /Y /E common\net\minecraft\src\buildcraft\factory\gui\*.png ..\bin\minecraft\net\minecraft\src\buildcraft\factory\gui -xcopy /Y /E common\net\minecraft\src\buildcraft\transport\gui\*.png ..\bin\minecraft\net\minecraft\src\buildcraft\transport\gui -xcopy /Y /E common\net\minecraft\src\buildcraft\builders\gui\*.png ..\bin\minecraft\net\minecraft\src\buildcraft\builders\gui -xcopy /Y /E common\net\minecraft\src\buildcraft\energy\gui\*.png ..\bin\minecraft\net\minecraft\src\buildcraft\energy\gui +xcopy /Y /E common\net\minecraft\src\buildcraft\core\gui\*.png ..\bin\minecraft\net\minecraft\src\buildcraft\core\gui\ +xcopy /Y /E common\net\minecraft\src\buildcraft\factory\gui\*.png ..\bin\minecraft\net\minecraft\src\buildcraft\factory\gui\ +xcopy /Y /E common\net\minecraft\src\buildcraft\transport\gui\*.png ..\bin\minecraft\net\minecraft\src\buildcraft\transport\gui\ +xcopy /Y /E common\net\minecraft\src\buildcraft\builders\gui\*.png ..\bin\minecraft\net\minecraft\src\buildcraft\builders\gui\ +xcopy /Y /E common\net\minecraft\src\buildcraft\energy\gui\*.png ..\bin\minecraft\net\minecraft\src\buildcraft\energy\gui\ From 20e5a70575888b311529a5d0c6c7a6d03bd04543 Mon Sep 17 00:00:00 2001 From: psxlover Date: Wed, 16 May 2012 00:37:08 +0300 Subject: [PATCH 2/2] Null pointer exception when selecting an item to build in the assembly table. --- .../buildcraft/silicon/GuiAssemblyTable.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/buildcraft_client/net/minecraft/src/buildcraft/silicon/GuiAssemblyTable.java b/buildcraft_client/net/minecraft/src/buildcraft/silicon/GuiAssemblyTable.java index 3497641e..7924fe11 100644 --- a/buildcraft_client/net/minecraft/src/buildcraft/silicon/GuiAssemblyTable.java +++ b/buildcraft_client/net/minecraft/src/buildcraft/silicon/GuiAssemblyTable.java @@ -14,6 +14,7 @@ import java.util.LinkedList; import net.minecraft.src.IInventory; import net.minecraft.src.ItemStack; +import net.minecraft.src.buildcraft.api.APIProxy; import net.minecraft.src.buildcraft.core.AssemblyRecipe; import net.minecraft.src.buildcraft.core.CoreProxy; import net.minecraft.src.buildcraft.core.GuiAdvancedInterface; @@ -148,15 +149,16 @@ public class GuiAssemblyTable extends GuiAdvancedInterface { ContainerAssemblyTable container = (ContainerAssemblyTable)inventorySlots; - PacketPayload payload = TileAssemblyTable.selectionMessageWrapper - .toPayload(container.x, container.y, - container.z, message); + if(APIProxy.isRemote()) { + PacketPayload payload = TileAssemblyTable.selectionMessageWrapper.toPayload(container.x, container.y,container.z, message); - PacketUpdate packet = new PacketUpdate(PacketIds.SELECTION_ASSEMBLY, payload); - packet.posX = container.x; - packet.posY = container.y; - packet.posZ = container.z; - CoreProxy.sendToServer(packet.getPacket()); + PacketUpdate packet = new PacketUpdate(PacketIds.SELECTION_ASSEMBLY, payload); + packet.posX = container.x; + packet.posY = container.y; + packet.posZ = container.z; + + CoreProxy.sendToServer(packet.getPacket()); + } } }