diff options
Diffstat (limited to 'src/main/java/gregtech/common')
| -rw-r--r-- | src/main/java/gregtech/common/GT_Network.java | 4 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/Behaviour_Switch_Mode.java | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/main/java/gregtech/common/GT_Network.java b/src/main/java/gregtech/common/GT_Network.java index 3d081b3320..37c7f7df57 100644 --- a/src/main/java/gregtech/common/GT_Network.java +++ b/src/main/java/gregtech/common/GT_Network.java @@ -34,6 +34,7 @@ import gregtech.api.net.GT_Packet_TileEntity; import gregtech.api.net.GT_Packet_TileEntityCover; import gregtech.api.net.GT_Packet_TileEntityCoverGUI; import gregtech.api.net.GT_Packet_TileEntityCoverNew; +import gregtech.api.net.GT_Packet_ToolSwitchMode; import gregtech.api.net.GT_Packet_UpdateItem; import gregtech.api.net.GT_Packet_WirelessRedstoneCover; import gregtech.api.net.IGT_NetworkHandler; @@ -75,7 +76,8 @@ public class GT_Network extends MessageToMessageCodec<FMLProxyPacket, GT_Packet> new GT_Packet_SendCoverData(), // 16 new GT_Packet_RequestCoverData(), // 17 new GT_Packet_MultiTileEntity(true), // 18 - new GT_Packet_SendOregenPattern() // 19 + new GT_Packet_SendOregenPattern(), // 19 + new GT_Packet_ToolSwitchMode() // 20 ); } diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Switch_Mode.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Switch_Mode.java index 1e93362882..4054377568 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Switch_Mode.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Switch_Mode.java @@ -7,8 +7,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import gregtech.api.enums.GT_Values; import gregtech.api.items.GT_MetaBase_Item; import gregtech.api.items.GT_MetaGenerated_Tool; +import gregtech.api.net.GT_Packet_ToolSwitchMode; import gregtech.api.util.GT_Utility; public class Behaviour_Switch_Mode extends Behaviour_None { @@ -17,7 +19,7 @@ public class Behaviour_Switch_Mode extends Behaviour_None { @Override public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) { - if (aStack != null && (aPlayer == null || aPlayer.isSneaking()) && !aWorld.isRemote) { + if (aStack != null && (aPlayer == null || aPlayer.isSneaking()) && aWorld.isRemote) { GT_MetaGenerated_Tool itemTool = (GT_MetaGenerated_Tool) aItem; final byte maxMode = itemTool.getToolMaxMode(aStack); @@ -25,11 +27,9 @@ public class Behaviour_Switch_Mode extends Behaviour_None { return aStack; } - MovingObjectPosition mop = GT_Utility.getPlayerLookingTarget(); + MovingObjectPosition mop = GT_Utility.getPlayerLookingTarget(aPlayer); if (mop == null) { - byte currentMode = itemTool.getToolMode(aStack); - currentMode = (byte) ((currentMode + 1) % maxMode); - itemTool.setToolMode(aStack, currentMode); + GT_Values.NW.sendToServer(new GT_Packet_ToolSwitchMode()); } return aStack; } |