fix line mode toggle broken on MP (#2611)

* fix line mode toggle broken on MP

* fix more client only method

* spotless

* change to client initiated mode switch instead

2 files changed, 63 insertions, 8 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();
+    }
 }