From 9c4c081e3e47f30a27ed786c08e307a25d2da45f Mon Sep 17 00:00:00 2001 From: Voxelstice Date: Fri, 23 Jun 2023 11:52:55 +0300 Subject: [PATCH 1/3] hh --- src/main/java/com/hbm/items/tool/ItemWiring.java | 2 +- .../hbm/tileentity/network/TileEntityPylonBase.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/hbm/items/tool/ItemWiring.java b/src/main/java/com/hbm/items/tool/ItemWiring.java index fc694ee82..2f384dccb 100644 --- a/src/main/java/com/hbm/items/tool/ItemWiring.java +++ b/src/main/java/com/hbm/items/tool/ItemWiring.java @@ -68,7 +68,7 @@ public class ItemWiring extends Item { player.addChatMessage(new ChatComponentText("Wire end")); } else { - player.addChatMessage(new ChatComponentText("Wire error")); + player.addChatMessage(new ChatComponentText("Wire error - " + TileEntityPylonBase.errorMessage)); } stack.stackTagCompound = null; diff --git a/src/main/java/com/hbm/tileentity/network/TileEntityPylonBase.java b/src/main/java/com/hbm/tileentity/network/TileEntityPylonBase.java index c55fe51d7..7e55e2f17 100644 --- a/src/main/java/com/hbm/tileentity/network/TileEntityPylonBase.java +++ b/src/main/java/com/hbm/tileentity/network/TileEntityPylonBase.java @@ -18,14 +18,19 @@ import net.minecraft.world.WorldServer; public abstract class TileEntityPylonBase extends TileEntityCableBaseNT { public List connected = new ArrayList(); + public static String errorMessage = ""; public static boolean canConnect(TileEntityPylonBase first, TileEntityPylonBase second) { - if(first.getConnectionType() != second.getConnectionType()) + if(first.getConnectionType() != second.getConnectionType()) { + errorMessage = "pylons are not the same type"; return false; + } - if(first == second) + if(first == second) { + errorMessage = "cannot connect to the same pylon"; return false; + } double len = Math.min(first.getMaxWireLength(), second.getMaxWireLength()); @@ -38,6 +43,7 @@ public abstract class TileEntityPylonBase extends TileEntityCableBaseNT { (secondPos.zCoord) - (firstPos.zCoord) ); + errorMessage = "pylon too far away"; return len >= delta.lengthVector(); } From f9959e9a4a92c0e793db332f16f4eb6ca80a4976 Mon Sep 17 00:00:00 2001 From: Voxelstice Date: Mon, 26 Jun 2023 22:31:53 +0300 Subject: [PATCH 2/3] aaaaaaaaaaaaaaaaaa --- .../java/com/hbm/items/tool/ItemWiring.java | 27 ++++++++++++------- .../network/TileEntityPylonBase.java | 12 +++------ 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/hbm/items/tool/ItemWiring.java b/src/main/java/com/hbm/items/tool/ItemWiring.java index 2f384dccb..cd6b5d787 100644 --- a/src/main/java/com/hbm/items/tool/ItemWiring.java +++ b/src/main/java/com/hbm/items/tool/ItemWiring.java @@ -60,17 +60,24 @@ public class ItemWiring extends Item { TileEntityPylonBase first = (TileEntityPylonBase) world.getTileEntity(x1, y1, z1); TileEntityPylonBase second = ((TileEntityPylonBase) te); - - if(TileEntityPylonBase.canConnect(first, second)) { - - first.addConnection(x, y, z); - second.addConnection(x1, y1, z1); - player.addChatMessage(new ChatComponentText("Wire end")); - - } else { - player.addChatMessage(new ChatComponentText("Wire error - " + TileEntityPylonBase.errorMessage)); + + switch (TileEntityPylonBase.canConnect(first, second)) { + case 0: + first.addConnection(x, y, z); + second.addConnection(x1, y1, z1); + player.addChatMessage(new ChatComponentText("Wire end")); + break; + case 1: + player.addChatMessage(new ChatComponentText("Wire error - Pylons are not the same type")); + break; + case 2: + player.addChatMessage(new ChatComponentText("Wire error - Cannot connect to the same pylon")); + break; + case 3: + player.addChatMessage(new ChatComponentText("Wire error - Pylon is too far away")); + break; } - + stack.stackTagCompound = null; } else { diff --git a/src/main/java/com/hbm/tileentity/network/TileEntityPylonBase.java b/src/main/java/com/hbm/tileentity/network/TileEntityPylonBase.java index 7e55e2f17..18c17166a 100644 --- a/src/main/java/com/hbm/tileentity/network/TileEntityPylonBase.java +++ b/src/main/java/com/hbm/tileentity/network/TileEntityPylonBase.java @@ -18,18 +18,15 @@ import net.minecraft.world.WorldServer; public abstract class TileEntityPylonBase extends TileEntityCableBaseNT { public List connected = new ArrayList(); - public static String errorMessage = ""; - public static boolean canConnect(TileEntityPylonBase first, TileEntityPylonBase second) { + public static int canConnect(TileEntityPylonBase first, TileEntityPylonBase second) { if(first.getConnectionType() != second.getConnectionType()) { - errorMessage = "pylons are not the same type"; - return false; + return 1; } if(first == second) { - errorMessage = "cannot connect to the same pylon"; - return false; + return 2; } double len = Math.min(first.getMaxWireLength(), second.getMaxWireLength()); @@ -43,8 +40,7 @@ public abstract class TileEntityPylonBase extends TileEntityCableBaseNT { (secondPos.zCoord) - (firstPos.zCoord) ); - errorMessage = "pylon too far away"; - return len >= delta.lengthVector(); + return len >= delta.lengthVector() ? 0 : 3; } public void addConnection(int x, int y, int z) { From f29a9d7250041f4b73ee962496b3d6d51a30238a Mon Sep 17 00:00:00 2001 From: Voxelstice <95834462+Voxelstice@users.noreply.github.com> Date: Mon, 26 Jun 2023 22:33:11 +0300 Subject: [PATCH 3/3] those extra 2 lines aren't useful anymore --- .../com/hbm/tileentity/network/TileEntityPylonBase.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/hbm/tileentity/network/TileEntityPylonBase.java b/src/main/java/com/hbm/tileentity/network/TileEntityPylonBase.java index 18c17166a..09e335094 100644 --- a/src/main/java/com/hbm/tileentity/network/TileEntityPylonBase.java +++ b/src/main/java/com/hbm/tileentity/network/TileEntityPylonBase.java @@ -21,13 +21,11 @@ public abstract class TileEntityPylonBase extends TileEntityCableBaseNT { public static int canConnect(TileEntityPylonBase first, TileEntityPylonBase second) { - if(first.getConnectionType() != second.getConnectionType()) { + if(first.getConnectionType() != second.getConnectionType()) return 1; - } - if(first == second) { + if(first == second) return 2; - } double len = Math.min(first.getMaxWireLength(), second.getMaxWireLength());