From 599e6f3e648f179aecceb4c7b910f2afd0bbc6ea Mon Sep 17 00:00:00 2001 From: yueh Date: Mon, 30 Nov 2015 12:55:47 +0100 Subject: [PATCH] Exception during GridConnection now reports the machine and side. --- src/main/java/appeng/me/GridConnection.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/appeng/me/GridConnection.java b/src/main/java/appeng/me/GridConnection.java index 690dc166..d8f111d8 100644 --- a/src/main/java/appeng/me/GridConnection.java +++ b/src/main/java/appeng/me/GridConnection.java @@ -77,11 +77,14 @@ public class GridConnection implements IGridConnection, IPathItem if( a.hasConnection( b ) || b.hasConnection( a ) ) { - final String aCoords = a.getGridBlock().getLocation().toString(); - final String bCoords = b.getGridBlock().getLocation().toString(); + final String aMachineClass = a.getGridBlock().getMachine().getClass().getSimpleName(); + final String bMachineClass = b.getGridBlock().getMachine().getClass().getSimpleName(); + final String aCoordinates = a.getGridBlock().getLocation().toString(); + final String bCoordinates = b.getGridBlock().getLocation().toString(); - throw new GridException( String.format( "Connection already exists between node at [%s] and node at [%s].", aCoords, bCoords ) ); + throw new GridException( String.format( "Connection between node [machine=%s, %s] and [machine=%s, %s] on [%s] already exists.", aMachineClass, aCoordinates, bMachineClass, bCoordinates, fromAtoB ) ); } + this.sideA = a; this.fromAtoB = fromAtoB; this.sideB = b;