diff options
Diffstat (limited to 'src')
4 files changed, 71 insertions, 14 deletions
diff --git a/src/main/java/gregtech/api/net/GT_Packet_ToolSwitchMode.java b/src/main/java/gregtech/api/net/GT_Packet_ToolSwitchMode.java new file mode 100644 index 0000000000..63c1953814 --- /dev/null +++ b/src/main/java/gregtech/api/net/GT_Packet_ToolSwitchMode.java @@ -0,0 +1,52 @@ +package gregtech.api.net; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.network.INetHandler; +import net.minecraft.network.NetHandlerPlayServer; +import net.minecraft.world.IBlockAccess; + +import com.google.common.io.ByteArrayDataInput; + +import gregtech.api.items.GT_MetaGenerated_Tool; +import io.netty.buffer.ByteBuf; + +public class GT_Packet_ToolSwitchMode extends GT_Packet_New { + + private EntityPlayerMP player; + + public GT_Packet_ToolSwitchMode() { + super(true); + } + + @Override + public byte getPacketID() { + return 20; + } + + @Override + public void encode(ByteBuf aOut) { + + } + + @Override + public GT_Packet_New decode(ByteArrayDataInput aData) { + return new GT_Packet_ToolSwitchMode(); + } + + @Override + public void setINetHandler(INetHandler aHandler) { + player = ((NetHandlerPlayServer) aHandler).playerEntity; + } + + @Override + public void process(IBlockAccess aWorld) { + ItemStack currentItem = player.inventory.getCurrentItem(); + if (currentItem == null || (!(currentItem.getItem() instanceof GT_MetaGenerated_Tool item))) return; + byte maxMode = item.getToolMaxMode(currentItem); + if (maxMode <= 1) return; + byte newMode = (byte) ((GT_MetaGenerated_Tool.getToolMode(currentItem) + 1) % maxMode); + GT_MetaGenerated_Tool.setToolMode(currentItem, newMode); + player.sendSlotContents(player.inventoryContainer, player.inventory.currentItem, currentItem); + } +} diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index 62c4498927..1e88d0b75d 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -4965,18 +4965,21 @@ public class GT_Utility { return 0; } - public static MovingObjectPosition getPlayerLookingTarget() { - // Basically copied from waila, thanks Caedis for such challenge - Minecraft mc = Minecraft.getMinecraft(); - EntityLivingBase viewpoint = mc.renderViewEntity; - if (viewpoint == null) return null; - - float reachDistance = mc.playerController.getBlockReachDistance(); - Vec3 posVec = viewpoint.getPosition(0); + public static MovingObjectPosition getPlayerLookingTarget(EntityPlayer viewpoint) { + double reachDistance = viewpoint instanceof EntityPlayerMP mp ? mp.theItemInWorldManager.getBlockReachDistance() + : getClientReachDistance(); + Vec3 posVec = Vec3.createVectorHelper( + viewpoint.posX, + viewpoint.posY + (viewpoint.getEyeHeight() - viewpoint.getDefaultEyeHeight()), + viewpoint.posZ); Vec3 lookVec = viewpoint.getLook(0); Vec3 modifiedPosVec = posVec .addVector(lookVec.xCoord * reachDistance, lookVec.yCoord * reachDistance, lookVec.zCoord * reachDistance); return viewpoint.worldObj.rayTraceBlocks(posVec, modifiedPosVec); } + + public static float getClientReachDistance() { + return Minecraft.getMinecraft().playerController.getBlockReachDistance(); + } } 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; } |