From 410c5e8c30f0601033cc282c2ce941edcbcfcf26 Mon Sep 17 00:00:00 2001
From: Evgeniy Zhabotinsky <evg-zhabotinsky@yandex.ru>
Date: Mon, 18 Jan 2016 14:39:51 +0300
Subject: [PATCH 1/9] Fixed IOBits getting stuck in CAD and enhanced their
 tooltips. Closes #176.

---
 .../client/gui/component/GuiIO.java           | 14 ++-
 .../integratedcircuits/cp/CircuitData.java    | 93 ++++++++-----------
 .../net/pcb/PacketPCBChangeInput.java         |  4 +-
 3 files changed, 49 insertions(+), 62 deletions(-)

diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/client/gui/component/GuiIO.java b/src/main/java/moe/nightfall/vic/integratedcircuits/client/gui/component/GuiIO.java
index 5d4a416..43698e2 100644
--- a/src/main/java/moe/nightfall/vic/integratedcircuits/client/gui/component/GuiIO.java
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/client/gui/component/GuiIO.java
@@ -95,18 +95,22 @@ public boolean mousePressed(Minecraft mc, int par1, int par2) {
 	public List<String> getHoverInformation() {
 		ArrayList<String> text = new ArrayList<String>();
 		ForgeDirection dir = MiscUtils.getDirection(side);
-		if (te.getCircuitData().getProperties().getModeAtSide(side) == EnumConnectionType.ANALOG)
-			text.add("S: " + color);
-		else
-			text.add("F: 0x" + Integer.toHexString(color));
 		if (isActive) {
+			EnumConnectionType mode = te.getCircuitData().getProperties().getModeAtSide(side);
+			if (mode != EnumConnectionType.SIMPLE) {
+				if (mode == EnumConnectionType.ANALOG)
+					text.add("S: " + color);
+				else
+					text.add("F: 0x" + Integer.toHexString(color));
+			}
 			text.add("I: "
 					+ I18n.format("gui.integratedcircuits.cad.mode."
 							+ (te.getExternalInputFromSide(dir, color) ? "high" : "low")));
 			text.add("O: "
 					+ I18n.format("gui.integratedcircuits.cad.mode."
 							+ (te.getOutputToSide(dir, color) ? "high" : "low")));
-		}
+		} else
+			text.add("N");
 		return text;
 	}
 }
diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/CircuitData.java b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/CircuitData.java
index 79e6962..e96b4f2 100644
--- a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/CircuitData.java
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/CircuitData.java
@@ -14,6 +14,7 @@
 import moe.nightfall.vic.integratedcircuits.cp.part.PartIOBit;
 import moe.nightfall.vic.integratedcircuits.cp.part.PartNull;
 import moe.nightfall.vic.integratedcircuits.misc.CraftingAmount;
+import moe.nightfall.vic.integratedcircuits.misc.MiscUtils;
 import moe.nightfall.vic.integratedcircuits.misc.Vec2;
 
 import net.minecraft.nbt.NBTTagCompound;
@@ -155,60 +156,53 @@ private EnumConnectionType[] getAndFixModePerSide() {
 	/** Clears the circuit and sets it up **/
 	public void clearAllAndSetup(int size) {
 		clearAll(size);
-		setupIO();
+		FixIO();
 	}
 	
-	/** Clears the IOBits, and sets them up again. **/
-	public void clearIOAndSetupIO() {
-		clearIO();
-		setupIO();
-	}
-	
-	/** Sets up the IOBits for the circuit. **/
-	public void setupIO() {
+	/** Sets up the IOBits and clears unused ones. **/
+	public void FixIO() {
 		getAndFixModePerSide();
 		
-		int o = (supportsBundled() ? size / 2 - 8 : 1);
+		int o = (supportsBundled() ? size / 2 - 8 : 1); // Offset of first IOBit
 		// Get the ID of the IOBit
 		int cid = CircuitPart.getId(PartIOBit.class);
+		Vec2[] pos = new Vec2[4];
 		
 		for (int i = 0; i < (supportsBundled() ? 16 : 1); i++) {
 			// Get the positions
-			Vec2 pos1 = new Vec2(size - 1 - (i + o), 0);
-			Vec2 pos2 = new Vec2(size - 1, size - 1 - (i + o));
-			Vec2 pos3 = new Vec2(i + o, size - 1);
-			Vec2 pos4 = new Vec2(0, i + o);
-			
-			if (prop.getModeAtSide(0) != EnumConnectionType.NONE && !(prop.getModeAtSide(0) == EnumConnectionType.SIMPLE && i >= 1)) {
-				// Set the part at the position to be a IOBit
-				setID(pos1, cid);
-				// Get the IOBit at that position
-				PartIOBit io1 = (PartIOBit) getPart(pos1);
-				// Set the number of the IOBit (colour / redstone strength)
-				io1.setFrequency(pos1, parent, i);
-				// The rotation is what side the IOBit is on
-				io1.setRotation(pos1, parent, 0);
-			}
-			
-			if (prop.getModeAtSide(1) != EnumConnectionType.NONE && !(prop.getModeAtSide(1) == EnumConnectionType.SIMPLE && i >= 1)) {
-				setID(pos2, cid);
-				PartIOBit io2 = (PartIOBit) getPart(pos2);
-				io2.setFrequency(pos2, parent, i);
-				io2.setRotation(pos2, parent, 1);
-			}
+			pos[0] = new Vec2(size - 1 - (i + o), 0);
+			pos[1] = new Vec2(size - 1, size - 1 - (i + o));
+			pos[2] = new Vec2(i + o, size - 1);
+			pos[3] = new Vec2(0, i + o);
 			
-			if (prop.getModeAtSide(2) != EnumConnectionType.NONE && !(prop.getModeAtSide(2) == EnumConnectionType.SIMPLE && i >= 1)) {
-				setID(pos3, cid);
-				PartIOBit io3 = (PartIOBit) getPart(pos3);
-				io3.setFrequency(pos3, parent, i);
-				io3.setRotation(pos3, parent, 2);
-			}
-			
-			if (prop.getModeAtSide(3) != EnumConnectionType.NONE && !(prop.getModeAtSide(3) == EnumConnectionType.SIMPLE && i >= 1)) {
-				setID(pos4, cid);
-				PartIOBit io4 = (PartIOBit) getPart(pos4);
-				io4.setFrequency(pos4, parent, i);
-				io4.setRotation(pos4, parent, 3);
+			for (int j = 0; j < 4; j++) {
+				if (prop.getModeAtSide(j) != EnumConnectionType.NONE && !(prop.getModeAtSide(j) == EnumConnectionType.SIMPLE && i >= 1)) {
+					// Set the part at the position to be a IOBit
+					setID(pos[j], cid);
+					// Get the IOBit at that position
+					PartIOBit io = (PartIOBit) getPart(pos[j]);
+					// Set the number of the IOBit (colour / redstone strength)
+					io.setFrequency(pos[j], parent, i);
+					// The rotation is what side the IOBit is on
+					io.setRotation(pos[j], parent, j);
+					// Make sure that IOBit does not stall
+					io.scheduleInputChange(pos[j], parent);
+				} else {
+					// Get old part at the position
+					CircuitPart part = getPart(pos[j]);
+					if (part instanceof PartIOBit) {
+						// There was an IOBit. Clear corresponding output signal.
+						PartIOBit io = (PartIOBit)part;
+						parent.setOutputToSide(
+							MiscUtils.getDirection(io.getRotation(pos[j], parent)),
+							io.getFrequency(pos[j], parent), false);
+					}
+					// Clear part at the position
+					setID(pos[j], 0);
+					setMeta(pos[j], 0);
+					// Notify neighbour parts about is
+					getPart(pos[j]).notifyNeighbours(pos[j], parent);
+				}
 			}
 		}
 	}
@@ -238,17 +232,6 @@ public void clearColumn(int x) {
 		}
 	}
 	
-	public void clearIO() {
-		// Clear top
-		clearRow(0);
-		// Clear bottom
-		clearRow(this.size - 1);
-		// Clear left
-		clearColumn(0);
-		// Clear right
-		clearColumn(this.size - 1);
-	}
-	
 	/** Clears the contents of the circuit and gives it a new size. **/
 	public void clearContents(int size) {
 		this.id = new int[size][size];
diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/net/pcb/PacketPCBChangeInput.java b/src/main/java/moe/nightfall/vic/integratedcircuits/net/pcb/PacketPCBChangeInput.java
index e24f86d..c2d7aeb 100644
--- a/src/main/java/moe/nightfall/vic/integratedcircuits/net/pcb/PacketPCBChangeInput.java
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/net/pcb/PacketPCBChangeInput.java
@@ -76,10 +76,10 @@ public void process(EntityPlayer player, Side side) {
 		CircuitData data = te.getCircuitData();
 		
 		data.getProperties().setCon(con);
-		data.clearIOAndSetupIO();
+		data.FixIO();
 		
 		if (input && side == Side.SERVER) {
-			te.getCircuitData().updateInput();
+			data.updateInput();
 			CommonProxy.networkWrapper.sendToAllAround(this, new TargetPoint(te.getWorldObj().getWorldInfo()
 				.getVanillaDimension(), xCoord, yCoord, zCoord, 8));
 		}

From 9450ef844fa142807e512a3f431e3218270c80bb Mon Sep 17 00:00:00 2001
From: Evgeniy Zhabotinsky <evg-zhabotinsky@yandex.ru>
Date: Mon, 18 Jan 2016 21:22:36 +0300
Subject: [PATCH 2/9] Fixed #174.

---
 .../moe/nightfall/vic/integratedcircuits/tile/BlockSocket.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/tile/BlockSocket.java b/src/main/java/moe/nightfall/vic/integratedcircuits/tile/BlockSocket.java
index e6a9617..fd6da3f 100644
--- a/src/main/java/moe/nightfall/vic/integratedcircuits/tile/BlockSocket.java
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/tile/BlockSocket.java
@@ -200,7 +200,7 @@ public int isProvidingStrongPower(IBlockAccess world, int x, int y, int z, int s
 		if ((side & 6) == (socket.getSide() & 6))
 			return 0;
 		int rot = socket.getSideRel(side);
-		if (!socket.getConnectionTypeAtSide(side).isRedstone())
+		if (!socket.getConnectionTypeAtSide(rot).isRedstone())
 			return 0;
 
 		return socket.getRedstoneOutput(rot);

From a2b63d6c9ce7e9d96673f0442d4c9311f47e1697 Mon Sep 17 00:00:00 2001
From: Evgeniy Zhabotinsky <evg-zhabotinsky@yandex.ru>
Date: Mon, 18 Jan 2016 18:04:53 +0300
Subject: [PATCH 3/9] Fixed textures to make connections less abrupt.

---
 .../textures/gui/sublogicpart.png             | Bin 4669 -> 4517 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/assets/integratedcircuits/textures/gui/sublogicpart.png b/src/main/resources/assets/integratedcircuits/textures/gui/sublogicpart.png
index 23db946189019629c3fdc71b0f0602708e8beaa5..e2204f03848ecc4973704f682c9641064240d7a1 100644
GIT binary patch
delta 4295
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

literal 4669
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


From c2354b3caa57772c566da08d1beaa8cca59f1138 Mon Sep 17 00:00:00 2001
From: Evgeniy Zhabotinsky <evg-zhabotinsky@yandex.ru>
Date: Mon, 18 Jan 2016 18:32:57 +0300
Subject: [PATCH 4/9] Made tunnels be a kind of wire. Closes #160

Tunnels are still separate gate, just derived from wire.
Current problem: drop-down menu for wires almost goes off-screen, not sure how to fix properly.
---
 .../client/gui/cad/PlaceHandler.java          |  6 +-
 .../integratedcircuits/cp/CircuitData.java    |  2 +-
 .../integratedcircuits/cp/CircuitPart.java    |  2 +-
 .../cp/legacy/LegacyLoader.java               |  1 +
 .../cp/legacy/LegacyLoader_1_Tunnels.java     | 57 +++++++++++++++++++
 .../cp/part/PartTunnel.java                   | 27 ++++-----
 .../integratedcircuits/cp/part/PartWire.java  | 11 +++-
 .../assets/integratedcircuits/lang/PT_BR.lang |  4 +-
 .../assets/integratedcircuits/lang/en_US.lang |  4 +-
 .../assets/integratedcircuits/lang/ru_RU.lang |  6 +-
 10 files changed, 92 insertions(+), 28 deletions(-)
 create mode 100644 src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/LegacyLoader_1_Tunnels.java

diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/client/gui/cad/PlaceHandler.java b/src/main/java/moe/nightfall/vic/integratedcircuits/client/gui/cad/PlaceHandler.java
index bfdc225..7ebfe4a 100644
--- a/src/main/java/moe/nightfall/vic/integratedcircuits/client/gui/cad/PlaceHandler.java
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/client/gui/cad/PlaceHandler.java
@@ -51,7 +51,7 @@ public void renderCADCursor(GuiCAD parent, double mouseX, double mouseY, int gri
 			CircuitPartRenderer.renderPart(selectedPart, gridX * PART_SIZE, gridY * PART_SIZE);
 			GL11.glPopMatrix();
 			GL11.glColor3f(1, 1, 1);
-		} else if (selectedPart.getPart() instanceof PartWire) {
+		} else if (selectedPart.getPart().getClass().equals(PartWire.class)) {
 			PartWire wire = (PartWire) selectedPart.getPart();
 			switch (wire.getColor(selectedPart.getPos(), selectedPart)) {
 				case 1:
@@ -143,7 +143,7 @@ public void onMouseDown(GuiCAD parent, int mx, int my, int button) {
 		if (gridX > 0 && gridY > 0 && gridX < w - 1 && gridY < w - 1 && !GuiScreen.isShiftKeyDown()) {
 			parent.startX = gridX;
 			parent.startY = gridY;
-			if (selectedPart.getPart() instanceof PartWire) {
+			if (selectedPart.getPart().getClass().equals(PartWire.class)) {
 				parent.drag = true;
 			}
 		}
@@ -160,7 +160,7 @@ public void onMouseUp(GuiCAD parent, int mx, int my, int button) {
 		}
 
 		if (parent.drag) {
-			if (selectedPart.getPart() instanceof PartWire) {
+			if (selectedPart.getPart().getClass().equals(PartWire.class)) {
 				int id = CircuitPart.getId(selectedPart.getPart());
 				int state = selectedPart.getState();
 
diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/CircuitData.java b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/CircuitData.java
index e96b4f2..7ab4d33 100644
--- a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/CircuitData.java
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/CircuitData.java
@@ -32,7 +32,7 @@
 public class CircuitData implements Cloneable {
 
 	// cdata version
-	public static final int version = 1;
+	public static final int version = 2;
 
 	private int size;
 	private int[][] meta;
diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/CircuitPart.java b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/CircuitPart.java
index 0c01700..7e8f66b 100644
--- a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/CircuitPart.java
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/CircuitPart.java
@@ -279,7 +279,7 @@ public final CircuitPart getNeighbourOnSide(Vec2 pos, ICircuit parent, ForgeDire
 		return parent.getCircuitData().getPart(pos.offset(side));
 	}
 
-	public final boolean getInput(Vec2 pos, ICircuit parent) {
+	public boolean getInput(Vec2 pos, ICircuit parent) {
 		return getInputFromSide(pos, parent, ForgeDirection.NORTH)
 				|| getInputFromSide(pos, parent, ForgeDirection.EAST)
 				|| getInputFromSide(pos, parent, ForgeDirection.SOUTH)
diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/LegacyLoader.java b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/LegacyLoader.java
index f285e19..f8b8ef0 100644
--- a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/LegacyLoader.java
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/LegacyLoader.java
@@ -16,6 +16,7 @@ public abstract class LegacyLoader implements Comparable<LegacyLoader> {
 	private static final List<LegacyLoader> legacyLoaders = new ArrayList<LegacyLoader>();
 	static {
 		legacyLoaders.add(new LegacyLoader_0_8());
+		legacyLoaders.add(new LegacyLoader_1_Tunnels());
 		Collections.sort(legacyLoaders);
 	}
 
diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/LegacyLoader_1_Tunnels.java b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/LegacyLoader_1_Tunnels.java
new file mode 100644
index 0000000..1a4c4f3
--- /dev/null
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/LegacyLoader_1_Tunnels.java
@@ -0,0 +1,57 @@
+package moe.nightfall.vic.integratedcircuits.cp.legacy;
+
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import moe.nightfall.vic.integratedcircuits.cp.CircuitData;
+import moe.nightfall.vic.integratedcircuits.cp.legacy.LegacyLoader;
+import moe.nightfall.vic.integratedcircuits.misc.MiscUtils;
+import moe.nightfall.vic.integratedcircuits.misc.Vec2;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.common.util.ForgeDirection;
+
+public final class LegacyLoader_1_Tunnels extends LegacyLoader {
+	@Override
+	public int getVersion() {
+		return 1;
+	}
+
+	{
+		addTransformer(new PartTunnelTransformer(), 27);
+	}
+
+	private static class PartTunnelTransformer extends PartTransformer {
+		// The old PartTunnel property map
+		// PartCPGate:
+		protected final int oldInput = old.allocate(4);
+		// PartTunnel:
+		protected final int oldPosX = old.allocate(8);
+		protected final int oldPosY = old.allocate(8);
+		protected final int oldIn = old.allocate();
+
+		// Tunnels are now derived from wires
+		// PartCPGate:
+		protected final int newInput = transformed.allocate(4);
+		// PartWire:
+		protected final int newColor = transformed.allocate(2);
+		// PartTunnel:
+		protected final int newPosX = transformed.allocate(8);
+		protected final int newPosY = transformed.allocate(8);
+		protected final int newIn = transformed.allocate();
+
+		@Override
+		public void transformImpl() {
+			setInt(newInput, getInt(oldInput));
+			// Old tunnels are converted to green tunnels
+			setInt(newColor, 0); // 0 is green
+			setInt(newPosX, getInt(oldPosX));
+			setInt(newPosY, getInt(oldPosY));
+			setBit(newIn, getBit(oldIn));
+		}
+	}
+
+}
diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/part/PartTunnel.java b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/part/PartTunnel.java
index 0bc7049..0f9d6fe 100644
--- a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/part/PartTunnel.java
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/part/PartTunnel.java
@@ -18,12 +18,17 @@
 import net.minecraft.init.Items;
 import net.minecraftforge.common.util.ForgeDirection;
 
-public class PartTunnel extends CircuitPart {
+public class PartTunnel extends PartWire {
 
 	public final IntProperty PROP_POS_X = new IntProperty("PROP_POS_X", stitcher, 255);
 	public final IntProperty PROP_POS_Y = new IntProperty("PROP_POS_Y", stitcher, 255);
 	public final BooleanProperty PROP_IN = new BooleanProperty("PROP_IN", stitcher);
 
+	@Override
+	public boolean getInput(Vec2 pos, ICircuit parent) {
+		return super.getInput(pos, parent) || getProperty(pos, parent, PROP_IN);
+	}
+
 	// pos is for CURRENT part
 	public Vec2 getConnectedPos(Vec2 pos, ICircuit parent) {
 		return new Vec2(getProperty(pos, parent, PROP_POS_X), getProperty(pos, parent, PROP_POS_Y));
@@ -80,7 +85,7 @@ public boolean getOutputToSide(Vec2 pos, ICircuit parent, ForgeDirection side) {
 		boolean in = getProperty(pos, parent, PROP_IN);
 		if (side == ForgeDirection.UNKNOWN)
 			return getInput(pos, parent) && !in;
-		return (getInput(pos, parent) || in) && !getInputFromSide(pos, parent, side);
+		return (getInput(pos, parent)) && !getInputFromSide(pos, parent, side);
 	}
 
 	@Override
@@ -126,20 +131,6 @@ public void onRemoved(Vec2 pos, ICircuit parent) {
 		dropConnected(pos, parent, getConnectedPos(pos, parent));
 	}
 
-	@Override
-	public void renderPart(Vec2 pos, ICircuit parent, double x, double y, EnumRenderType type) {
-		Tessellator tes = Tessellator.instance;
-
-		RenderUtils.applyColorIRGBA(tes, Config.colorGreen);
-		CircuitPartRenderer.addQuad(x, y, 16, 4 * 16, 16, 16);
-		if (getInput(pos, parent) || getProperty(pos, parent, PROP_IN)) {
-			RenderUtils.applyColorIRGBA(tes, Config.colorGreen);
-		} else {
-			RenderUtils.applyColorIRGBA(tes, Config.colorGreen, 0.4F);
-		}
-		CircuitPartRenderer.addQuad(x, y, 0, 4 * 16, 16, 16);
-	}
-
 	@Override
 	public Category getCategory() {
 		return Category.WIRE;
@@ -156,13 +147,15 @@ public String getLocalizedName(Vec2 pos, ICircuit parent) {
 
 	@Override
 	public void getCraftingCost(CraftingAmount amount, CircuitData parent, Vec2 pos) {
+		// Tunnels are twice as expensive as wires and also cost a bit of silicon.
 		amount.add(new ItemAmount(Items.redstone, 0.1));
 		amount.add(new ItemAmount(Content.itemSiliconDrop, 0.1));
 
 		int data = parent.getMeta(pos);
 		Vec2 end = new Vec2(PROP_POS_X.get(data), PROP_POS_Y.get(data));
 		if (isConnected(end)) {
-			amount.add(new ItemAmount(Items.redstone, 0.1 * pos.distanceTo(end)));
+			// Half the amount, because it will be added twice.
+			amount.add(new ItemAmount(Items.redstone, 0.05 * pos.distanceTo(end)));
 		}
 	}
 }
diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/part/PartWire.java b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/part/PartWire.java
index 1c7503a..af4d597 100644
--- a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/part/PartWire.java
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/part/PartWire.java
@@ -35,10 +35,17 @@ public boolean getOutputToSide(Vec2 pos, ICircuit parent, ForgeDirection side) {
 
 	@Override
 	@SideOnly(Side.CLIENT)
+	// This renders BOTH WIRES AND TUNNELS
 	public void renderPart(Vec2 pos, ICircuit parent, double x, double y, CircuitPartRenderer.EnumRenderType type) {
 		int color = this.getColor(pos, parent);
+		boolean tun = this instanceof PartTunnel;
 		Tessellator tes = Tessellator.instance;
 
+		if (tun) {
+			RenderUtils.applyColorIRGBA(tes, Config.colorGreen);
+			CircuitPartRenderer.addQuad(x, y, 16, 4*16, 16, 16);
+		}
+
 		if (type == CircuitPartRenderer.EnumRenderType.GUI) {
 			switch (color) {
 				case 1:
@@ -66,9 +73,9 @@ public void renderPart(Vec2 pos, ICircuit parent, double x, double y, CircuitPar
 		int ty = type == CircuitPartRenderer.EnumRenderType.WORLD_16x ? 3 * 16 : 0;
 
 		int con = CircuitPartRenderer.checkConnections(pos, parent, this);
-		if ((con & 12) == 12 && (con & ~12) == 0)
+		if ((con & 12) == 12 && (con & ~12) == 0 && !tun)
 			CircuitPartRenderer.addQuad(x, y, 6 * 16, ty, 16, 16);
-		else if ((con & 3) == 3 && (con & ~3) == 0)
+		else if ((con & 3) == 3 && (con & ~3) == 0 && !tun)
 			CircuitPartRenderer.addQuad(x, y, 5 * 16, ty, 16, 16);
 		else {
 			if ((con & 8) > 0)
diff --git a/src/main/resources/assets/integratedcircuits/lang/PT_BR.lang b/src/main/resources/assets/integratedcircuits/lang/PT_BR.lang
index f3f16cd..4ebf9c8 100644
--- a/src/main/resources/assets/integratedcircuits/lang/PT_BR.lang
+++ b/src/main/resources/assets/integratedcircuits/lang/PT_BR.lang
@@ -23,7 +23,9 @@ tile.integratedcircuits.assembler.name=Montadora
 # parts
 part.integratedcircuits.iobit.name=IOBit
 part.integratedcircuits.torch.name=Tocha
-part.integratedcircuits.tunnel.name=Tunel
+part.integratedcircuits.tunnel.0.name=Tunel
+part.integratedcircuits.tunnel.1.name=Tunel vermelho
+part.integratedcircuits.tunnel.2.name=Tunel laranja
 part.integratedcircuits.wire.0.name=Fio
 part.integratedcircuits.wire.1.name=Fio vermelho
 part.integratedcircuits.wire.2.name=Fio laranja
diff --git a/src/main/resources/assets/integratedcircuits/lang/en_US.lang b/src/main/resources/assets/integratedcircuits/lang/en_US.lang
index 09d7da2..ecb164a 100644
--- a/src/main/resources/assets/integratedcircuits/lang/en_US.lang
+++ b/src/main/resources/assets/integratedcircuits/lang/en_US.lang
@@ -25,7 +25,9 @@ tile.integratedcircuits.pcbprinter.name=Printer
 # parts
 part.integratedcircuits.iobit.name=IOBit
 part.integratedcircuits.torch.name=Torch
-part.integratedcircuits.tunnel.name=Tunnel
+part.integratedcircuits.tunnel.0.name=Tunnel
+part.integratedcircuits.tunnel.1.name=Red Tunnel
+part.integratedcircuits.tunnel.2.name=Orange Tunnel
 part.integratedcircuits.wire.0.name=Wire
 part.integratedcircuits.wire.1.name=Red Wire
 part.integratedcircuits.wire.2.name=Orange Wire
diff --git a/src/main/resources/assets/integratedcircuits/lang/ru_RU.lang b/src/main/resources/assets/integratedcircuits/lang/ru_RU.lang
index 125878a..d6cf853 100644
--- a/src/main/resources/assets/integratedcircuits/lang/ru_RU.lang
+++ b/src/main/resources/assets/integratedcircuits/lang/ru_RU.lang
@@ -23,7 +23,9 @@ tile.integratedcircuits.assembler.name=Сборщик микросхем
 # parts
 part.integratedcircuits.iobit.name=Внешний вывод
 part.integratedcircuits.torch.name=Факел
-part.integratedcircuits.tunnel.name=Перемычка
+part.integratedcircuits.tunnel.0.name=Перемычка
+part.integratedcircuits.tunnel.1.name=Красная Перемычка
+part.integratedcircuits.tunnel.2.name=Оранжевая Перемычка
 part.integratedcircuits.wire.0.name=Провод
 part.integratedcircuits.wire.1.name=Красный провод
 part.integratedcircuits.wire.2.name=Оранжевый провод
@@ -153,4 +155,4 @@ fdirection.east.name=ВОСТОК
 fdirection.south.name=ЮГ
 fdirection.west.name=ЗАПАД
 fdirection.up.name=ВЕРХ
-fdirection.down.name=НИЗ
\ No newline at end of file
+fdirection.down.name=НИЗ

From c83b6d18db440744d878085df7e8fa72d0aa2180 Mon Sep 17 00:00:00 2001
From: Evgeniy Zhabotinsky <evg-zhabotinsky@yandex.ru>
Date: Tue, 19 Jan 2016 22:19:12 +0300
Subject: [PATCH 5/9] Stopped part chooser dropdowns being partially off-screen

Done so by moving them up.
---
 .../integratedcircuits/client/gui/cad/GuiCAD.java    |  7 ++++++-
 .../client/gui/component/GuiPartChooser.java         | 12 +++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/client/gui/cad/GuiCAD.java b/src/main/java/moe/nightfall/vic/integratedcircuits/client/gui/cad/GuiCAD.java
index 2c559e8..fecbb82 100644
--- a/src/main/java/moe/nightfall/vic/integratedcircuits/client/gui/cad/GuiCAD.java
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/client/gui/cad/GuiCAD.java
@@ -244,7 +244,12 @@ public void initGui() {
 			// If the part hasn't got a category, or there are no parts in the category, do not add the button for the category.
 			if (category == CircuitPart.Category.NONE || parts.size() == 0)
 				continue;
-			this.buttonList.add(new GuiPartChooser(7, toolsXPosition, currentPosition, GuiPartChooser.getRenderWrapperParts(parts), this));
+			// To fit drop-down menu should have its bottom no lower than eraser button's.
+			List<CircuitRenderWrapper> wrappers = GuiPartChooser.getRenderWrapperParts(parts);
+			int partsAbove = wrappers.size() - (guiBottom - 19 - currentPosition) / 21;
+			if (partsAbove < 0)
+				partsAbove = 0;
+			this.buttonList.add(new GuiPartChooser(7, toolsXPosition, currentPosition, partsAbove, wrappers, this));
 			currentPosition += 21;
 		}
 
diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/client/gui/component/GuiPartChooser.java b/src/main/java/moe/nightfall/vic/integratedcircuits/client/gui/component/GuiPartChooser.java
index 7f5e45d..b697d51 100644
--- a/src/main/java/moe/nightfall/vic/integratedcircuits/client/gui/component/GuiPartChooser.java
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/client/gui/component/GuiPartChooser.java
@@ -23,6 +23,7 @@ public class GuiPartChooser extends GuiButton implements IHoverable {
 	private boolean showList = false;
 	private GuiCAD parent;
 	private GuiPartChooser chooserParent;
+	private int partsAbove = 0;
 
 	public GuiPartChooser(int id, int x, int y, int mode, GuiCAD parent) {
 		super(id, x, y, 20, 20, "");
@@ -53,14 +54,15 @@ public GuiPartChooser(int id, int x, int y, CircuitRenderWrapper current, List<C
 		this.parent = parent;
 	}
 
-	public GuiPartChooser(int id, int x, int y, List<CircuitRenderWrapper> list2, GuiCAD parent) {
+	public GuiPartChooser(int id, int x, int y, int above, List<CircuitRenderWrapper> list2, GuiCAD parent) {
 		super(id, x, y, 20, 20, "");
+		partsAbove = above;
 		if (list2.size() > 0) {
 			current = list2.get(0);
 			ArrayList<CircuitRenderWrapper> list3 = new ArrayList<CircuitRenderWrapper>(list2);
 			this.children = new ArrayList<GuiPartChooser>();
 			for (int i = 0; i < list3.size(); i++) {
-				GuiPartChooser child = new GuiPartChooser(i, x - 21, y + i * 21, list3.get(i), parent);
+				GuiPartChooser child = new GuiPartChooser(i, x - 21, y + (i - partsAbove) * 21, list3.get(i), parent);
 				child.chooserParent = this;
 				child.visible = false;
 				this.children.add(child);
@@ -70,6 +72,10 @@ public GuiPartChooser(int id, int x, int y, List<CircuitRenderWrapper> list2, Gu
 		this.parent = parent;
 	}
 
+	public GuiPartChooser(int id, int x, int y, List<CircuitRenderWrapper> list2, GuiCAD parent) {
+		this(id, x, y, 0, list2, parent);
+	}
+
 	public GuiPartChooser(int id, int x, int y, CircuitPart.Category category, GuiCAD parent) {
 		this(id, x, y, getRenderWrapperParts(category), parent);
 	}
@@ -100,7 +106,7 @@ public void drawButton(Minecraft mc, int x, int y) {
 
 		if (showList && children != null) {
 			drawRect(xPosition, yPosition - 1, xPosition + width + 1, yPosition + height + 1, 180 << 24);
-			drawRect(xPosition - 22, yPosition - 1, xPosition, yPosition + children.size() * 21, 180 << 24);
+			drawRect(xPosition - 22, yPosition - 1 - partsAbove * 21, xPosition, yPosition + (children.size() - partsAbove) * 21, 180 << 24);
 			for (GuiPartChooser child : children) {
 				child.drawButton(mc, x, y);
 			}

From 3daee2d1d9bee44e515c39ecec93bc4c91e21b99 Mon Sep 17 00:00:00 2001
From: Evgeniy Zhabotinsky <evg-zhabotinsky@yandex.ru>
Date: Wed, 20 Jan 2016 00:33:15 +0300
Subject: [PATCH 6/9] Refactoring.

Added `allowsDragPlacement` method, currently only used for wires.
Split wire/tunnel rendering into separate methods.
---
 .../client/gui/cad/PlaceHandler.java          |  6 +-
 .../integratedcircuits/cp/CircuitData.java    |  4 +-
 .../integratedcircuits/cp/CircuitPart.java    |  5 ++
 .../cp/part/PartTunnel.java                   | 19 ++++++
 .../integratedcircuits/cp/part/PartWire.java  | 66 ++++++++++++-------
 .../net/pcb/PacketPCBChangeInput.java         |  2 +-
 6 files changed, 72 insertions(+), 30 deletions(-)

diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/client/gui/cad/PlaceHandler.java b/src/main/java/moe/nightfall/vic/integratedcircuits/client/gui/cad/PlaceHandler.java
index 7ebfe4a..11818fe 100644
--- a/src/main/java/moe/nightfall/vic/integratedcircuits/client/gui/cad/PlaceHandler.java
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/client/gui/cad/PlaceHandler.java
@@ -51,7 +51,7 @@ public void renderCADCursor(GuiCAD parent, double mouseX, double mouseY, int gri
 			CircuitPartRenderer.renderPart(selectedPart, gridX * PART_SIZE, gridY * PART_SIZE);
 			GL11.glPopMatrix();
 			GL11.glColor3f(1, 1, 1);
-		} else if (selectedPart.getPart().getClass().equals(PartWire.class)) {
+		} else if (selectedPart.getPart().allowsDragPlacement()) {
 			PartWire wire = (PartWire) selectedPart.getPart();
 			switch (wire.getColor(selectedPart.getPos(), selectedPart)) {
 				case 1:
@@ -143,7 +143,7 @@ public void onMouseDown(GuiCAD parent, int mx, int my, int button) {
 		if (gridX > 0 && gridY > 0 && gridX < w - 1 && gridY < w - 1 && !GuiScreen.isShiftKeyDown()) {
 			parent.startX = gridX;
 			parent.startY = gridY;
-			if (selectedPart.getPart().getClass().equals(PartWire.class)) {
+			if (selectedPart.getPart().allowsDragPlacement()) {
 				parent.drag = true;
 			}
 		}
@@ -160,7 +160,7 @@ public void onMouseUp(GuiCAD parent, int mx, int my, int button) {
 		}
 
 		if (parent.drag) {
-			if (selectedPart.getPart().getClass().equals(PartWire.class)) {
+			if (selectedPart.getPart().allowsDragPlacement()) {
 				int id = CircuitPart.getId(selectedPart.getPart());
 				int state = selectedPart.getState();
 
diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/CircuitData.java b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/CircuitData.java
index 7ab4d33..8d7c91f 100644
--- a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/CircuitData.java
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/CircuitData.java
@@ -156,11 +156,11 @@ private EnumConnectionType[] getAndFixModePerSide() {
 	/** Clears the circuit and sets it up **/
 	public void clearAllAndSetup(int size) {
 		clearAll(size);
-		FixIO();
+		fixIO();
 	}
 	
 	/** Sets up the IOBits and clears unused ones. **/
-	public void FixIO() {
+	public void fixIO() {
 		getAndFixModePerSide();
 		
 		int o = (supportsBundled() ? size / 2 - 8 : 1); // Offset of first IOBit
diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/CircuitPart.java b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/CircuitPart.java
index 7e8f66b..d4fc1f5 100644
--- a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/CircuitPart.java
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/CircuitPart.java
@@ -289,6 +289,11 @@ public boolean getInput(Vec2 pos, ICircuit parent) {
 	@SideOnly(Side.CLIENT)
 	public abstract void renderPart(Vec2 pos, ICircuit parent, double x, double y, CircuitPartRenderer.EnumRenderType type);
 
+	@SideOnly(Side.CLIENT)
+	public boolean allowsDragPlacement() {
+		return false;
+	}
+
 	/** Gets called on a client update */
 	public void onChanged(Vec2 pos, ICircuit parent, int oldMeta) {
 		scheduleInputChange(pos, parent);
diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/part/PartTunnel.java b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/part/PartTunnel.java
index 0f9d6fe..4f3859d 100644
--- a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/part/PartTunnel.java
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/part/PartTunnel.java
@@ -1,5 +1,7 @@
 package moe.nightfall.vic.integratedcircuits.cp.part;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import moe.nightfall.vic.integratedcircuits.Config;
 import moe.nightfall.vic.integratedcircuits.Content;
 import moe.nightfall.vic.integratedcircuits.cp.CircuitData;
@@ -136,6 +138,23 @@ public Category getCategory() {
 		return Category.WIRE;
 	}
 
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void renderPart(Vec2 pos, ICircuit parent, double x, double y, CircuitPartRenderer.EnumRenderType type) {
+		Tessellator tes = Tessellator.instance;
+
+		RenderUtils.applyColorIRGBA(tes, Config.colorGreen);
+		CircuitPartRenderer.addQuad(x, y, 16, 4*16, 16, 16);
+
+		renderViaWire(pos, parent, x, y, type);
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public boolean allowsDragPlacement() {
+		return false;
+	}
+
 	@Override
 	public String getLocalizedName(Vec2 pos, ICircuit parent) {
 		String name = super.getLocalizedName(pos, parent);
diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/part/PartWire.java b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/part/PartWire.java
index af4d597..86630f1 100644
--- a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/part/PartWire.java
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/part/PartWire.java
@@ -33,19 +33,11 @@ public boolean getOutputToSide(Vec2 pos, ICircuit parent, ForgeDirection side) {
 		return getInput(pos, parent) && !getInputFromSide(pos, parent, side);
 	}
 
-	@Override
 	@SideOnly(Side.CLIENT)
-	// This renders BOTH WIRES AND TUNNELS
-	public void renderPart(Vec2 pos, ICircuit parent, double x, double y, CircuitPartRenderer.EnumRenderType type) {
+	public final void applyWireRenderColor(Vec2 pos, ICircuit parent, CircuitPartRenderer.EnumRenderType type) {
 		int color = this.getColor(pos, parent);
-		boolean tun = this instanceof PartTunnel;
 		Tessellator tes = Tessellator.instance;
 
-		if (tun) {
-			RenderUtils.applyColorIRGBA(tes, Config.colorGreen);
-			CircuitPartRenderer.addQuad(x, y, 16, 4*16, 16, 16);
-		}
-
 		if (type == CircuitPartRenderer.EnumRenderType.GUI) {
 			switch (color) {
 				case 1:
@@ -69,25 +61,45 @@ public void renderPart(Vec2 pos, ICircuit parent, double x, double y, CircuitPar
 			}
 		} else
 			RenderUtils.applyColorIRGBA(tes, Config.colorGreen, 0.4F);
+	}
+
+	@SideOnly(Side.CLIENT)
+	// Render wire with a via
+	public final void renderViaWire(Vec2 pos, ICircuit parent, double x, double y, CircuitPartRenderer.EnumRenderType type) {
+		applyWireRenderColor(pos, parent, type);
 
 		int ty = type == CircuitPartRenderer.EnumRenderType.WORLD_16x ? 3 * 16 : 0;
 
 		int con = CircuitPartRenderer.checkConnections(pos, parent, this);
-		if ((con & 12) == 12 && (con & ~12) == 0 && !tun)
-			CircuitPartRenderer.addQuad(x, y, 6 * 16, ty, 16, 16);
-		else if ((con & 3) == 3 && (con & ~3) == 0 && !tun)
-			CircuitPartRenderer.addQuad(x, y, 5 * 16, ty, 16, 16);
-		else {
-			if ((con & 8) > 0)
-				CircuitPartRenderer.addQuad(x, y, 2 * 16, ty, 16, 16);
-			if ((con & 4) > 0)
-				CircuitPartRenderer.addQuad(x, y, 4 * 16, ty, 16, 16);
-			if ((con & 2) > 0)
-				CircuitPartRenderer.addQuad(x, y, 1 * 16, ty, 16, 16);
-			if ((con & 1) > 0)
-				CircuitPartRenderer.addQuad(x, y, 3 * 16, ty, 16, 16);
-			CircuitPartRenderer.addQuad(x, y, 0, ty, 16, 16);
-		}
+		// Connections with nearby gates / wires
+		if ((con & 8) > 0)
+			CircuitPartRenderer.addQuad(x, y, 2 * 16, ty, 16, 16);
+		if ((con & 4) > 0)
+			CircuitPartRenderer.addQuad(x, y, 4 * 16, ty, 16, 16);
+		if ((con & 2) > 0)
+			CircuitPartRenderer.addQuad(x, y, 1 * 16, ty, 16, 16);
+		if ((con & 1) > 0)
+			CircuitPartRenderer.addQuad(x, y, 3 * 16, ty, 16, 16);
+		// The via (circle which looks like "through pcb")
+		CircuitPartRenderer.addQuad(x, y, 0, ty, 16, 16);
+	}
+
+	@Override
+	@SideOnly(Side.CLIENT)
+	public void renderPart(Vec2 pos, ICircuit parent, double x, double y, CircuitPartRenderer.EnumRenderType type) {
+		int con = CircuitPartRenderer.checkConnections(pos, parent, this);
+		if (con == 12 || con == 3) {
+			// Render straight line wire
+			applyWireRenderColor(pos, parent, type);
+
+			int ty = type == CircuitPartRenderer.EnumRenderType.WORLD_16x ? 3 * 16 : 0;
+
+			if (con == 12)
+				CircuitPartRenderer.addQuad(x, y, 6 * 16, ty, 16, 16);
+			else
+				CircuitPartRenderer.addQuad(x, y, 5 * 16, ty, 16, 16);
+		} else
+			renderViaWire(pos, parent, x, y, type);
 	}
 
 	@Override
@@ -112,6 +124,12 @@ public boolean canConnectToSide(Vec2 pos, ICircuit parent, ForgeDirection side)
 		return true;
 	}
 
+	@Override
+	@SideOnly(Side.CLIENT)
+	public boolean allowsDragPlacement() {
+		return true;
+	}
+
 	@Override
 	public void getCraftingCost(CraftingAmount cost, CircuitData parent, Vec2 pos) {
 		cost.add(new ItemAmount(Items.redstone, 0.05));
diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/net/pcb/PacketPCBChangeInput.java b/src/main/java/moe/nightfall/vic/integratedcircuits/net/pcb/PacketPCBChangeInput.java
index c2d7aeb..ba47294 100644
--- a/src/main/java/moe/nightfall/vic/integratedcircuits/net/pcb/PacketPCBChangeInput.java
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/net/pcb/PacketPCBChangeInput.java
@@ -76,7 +76,7 @@ public void process(EntityPlayer player, Side side) {
 		CircuitData data = te.getCircuitData();
 		
 		data.getProperties().setCon(con);
-		data.FixIO();
+		data.fixIO();
 		
 		if (input && side == Side.SERVER) {
 			data.updateInput();

From 13eeb15e6389ac4173c4c6b197c4f7660513f7cf Mon Sep 17 00:00:00 2001
From: Evgeniy Zhabotinsky <evg-zhabotinsky@yandex.ru>
Date: Wed, 20 Jan 2016 02:43:02 +0300
Subject: [PATCH 7/9] Added ability to mirror transparent latches and disable
 their outputs.

---
 .../cp/CircuitPartRenderer.java               |  10 ++++-
 .../cp/part/latch/PartTransparentLatch.java   |  35 ++++++++++++++++--
 .../textures/gui/sublogicpart.png             | Bin 4517 -> 4748 bytes
 3 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/CircuitPartRenderer.java b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/CircuitPartRenderer.java
index 961a576..b8fb8a4 100644
--- a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/CircuitPartRenderer.java
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/CircuitPartRenderer.java
@@ -60,7 +60,15 @@ public static void addQuad(double x, double y, double u, double v, double w, dou
 	}
 
 	public static void addQuad(double x, double y, double u, double v, double w, double h, double rotation) {
-		addQuad(x, y, u, v, w, h, w, h, 256, 256, rotation);
+		addQuad(x, y, u, v, w, h, rotation, false, false);
+	}
+
+	public static void addQuad(double x, double y, double u, double v, double w, double h, double rotation, boolean invX, boolean invY) {
+		addQuad(x, y,
+			invX ? u + w : u, invY ? v + h : v,
+			w, h,
+			invX ? -w : w, invY ? -h : h,
+			256, 256, rotation);
 	}
 
 	public static void addQuad(double x, double y, double u, double v, double w, double h, double w2, double h2,
diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/part/latch/PartTransparentLatch.java b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/part/latch/PartTransparentLatch.java
index 44c845d..088d39e 100644
--- a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/part/latch/PartTransparentLatch.java
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/part/latch/PartTransparentLatch.java
@@ -7,10 +7,22 @@
 import moe.nightfall.vic.integratedcircuits.cp.part.PartCPGate;
 import moe.nightfall.vic.integratedcircuits.misc.Vec2;
 import moe.nightfall.vic.integratedcircuits.misc.PropertyStitcher.BooleanProperty;
+import moe.nightfall.vic.integratedcircuits.misc.PropertyStitcher.IntProperty;
 import net.minecraftforge.common.util.ForgeDirection;
 
 public class PartTransparentLatch extends PartCPGate {
 	public final BooleanProperty PROP_OUT = new BooleanProperty("OUT", stitcher);
+	public final IntProperty PROP_CONFIG = new IntProperty("CONFIG", stitcher, 5);
+
+	@Override
+	public void onClick(Vec2 pos, ICircuit parent, int button, boolean ctrl) {
+		if (button == 0 && ctrl) {
+			cycleProperty(pos, parent, PROP_CONFIG);
+			scheduleInputChange(pos, parent);
+			notifyNeighbours(pos, parent);
+		}
+		super.onClick(pos, parent, button, ctrl);
+	}
 
 	@Override
 	public void onInputChange(Vec2 pos, ICircuit parent) {
@@ -19,7 +31,9 @@ public void onInputChange(Vec2 pos, ICircuit parent) {
 
 	@Override
 	public void onScheduledTick(Vec2 pos, ICircuit parent) {
-		if (getInputFromSide(pos, parent, toExternal(pos, parent, ForgeDirection.SOUTH))) {
+		int cfg = getProperty(pos, parent, PROP_CONFIG);
+		ForgeDirection writeSide = (cfg & 1) == 0 ? ForgeDirection.SOUTH : ForgeDirection.NORTH;
+		if (getInputFromSide(pos, parent, toExternal(pos, parent, writeSide))) {
 			setProperty(pos, parent, PROP_OUT,
 					getInputFromSide(pos, parent,
 						toExternal(pos, parent, ForgeDirection.WEST)));
@@ -30,16 +44,29 @@ public void onScheduledTick(Vec2 pos, ICircuit parent) {
 	@Override
 	public boolean getOutputToSide(Vec2 pos, ICircuit parent, ForgeDirection side) {
 		ForgeDirection s2 = toInternal(pos, parent, side);
-		if (s2 == ForgeDirection.NORTH || s2 == ForgeDirection.EAST)
+		int cfg = getProperty(pos, parent, PROP_CONFIG);
+		if ((s2 == ((cfg & 1) == 0 ? ForgeDirection.NORTH : ForgeDirection.SOUTH) && (cfg & 2) == 0)
+				|| (s2 == ForgeDirection.EAST && (cfg & 4) == 0))
 			return getProperty(pos, parent, PROP_OUT);
 		return false;
 	}
 
+	@Override
+	public boolean canConnectToSide(Vec2 pos, ICircuit parent, ForgeDirection side) {
+		ForgeDirection s2 = toInternal(pos, parent, side);
+		if (s2 == ForgeDirection.WEST)
+			return true;
+		int cfg = getProperty(pos, parent, PROP_CONFIG);
+		if (s2 == ForgeDirection.EAST)
+			return (cfg & 4) == 0;
+		return ((cfg & 2) == 0) || (((cfg & 1) == 0) == (s2 == ForgeDirection.SOUTH));
+	}
+
 	@Override
 	public void renderPart(Vec2 pos, ICircuit parent, double x, double y, CircuitPartRenderer.EnumRenderType type) {
 		CircuitPartRenderer.renderPartGate(pos, parent, this, x, y, type);
-
-		CircuitPartRenderer.addQuad(x, y, 9 * 16, 16, 16, 16, this.getRotation(pos, parent));
+		int cfg = getProperty(pos, parent, PROP_CONFIG);
+		CircuitPartRenderer.addQuad(x, y, 9 * 16, (1 + (cfg / 2)) * 16, 16, 16, this.getRotation(pos, parent), false, (cfg & 1) != 0);
 	}
 
 	@Override
diff --git a/src/main/resources/assets/integratedcircuits/textures/gui/sublogicpart.png b/src/main/resources/assets/integratedcircuits/textures/gui/sublogicpart.png
index e2204f03848ecc4973704f682c9641064240d7a1..abd94e5a283f8e64ebb820cda7b238ee294dc3a0 100644
GIT binary patch
literal 4748
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

literal 4517
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
B+ARP8


From 1ce2ee9903004cac2deb76f50d65c2102d017c76 Mon Sep 17 00:00:00 2001
From: Evgeniy Zhabotinsky <evg-zhabotinsky@yandex.ru>
Date: Wed, 20 Jan 2016 03:05:22 +0300
Subject: [PATCH 8/9] Added transparent latches to legacy loader

Just to be safe, they should "convert" properly anyway.
---
 .../cp/legacy/LegacyLoader.java                   |  7 +++++--
 ...cyLoader_1_Tunnels.java => LegacyLoader1.java} | 15 ++++++++++++++-
 ...ader_0_8.java => LegacyLoaderUnversioned.java} |  2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)
 rename src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/{LegacyLoader_1_Tunnels.java => LegacyLoader1.java} (77%)
 rename src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/{LegacyLoader_0_8.java => LegacyLoaderUnversioned.java} (99%)

diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/LegacyLoader.java b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/LegacyLoader.java
index f8b8ef0..569cb35 100644
--- a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/LegacyLoader.java
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/LegacyLoader.java
@@ -15,8 +15,11 @@ public abstract class LegacyLoader implements Comparable<LegacyLoader> {
 
 	private static final List<LegacyLoader> legacyLoaders = new ArrayList<LegacyLoader>();
 	static {
-		legacyLoaders.add(new LegacyLoader_0_8());
-		legacyLoaders.add(new LegacyLoader_1_Tunnels());
+		legacyLoaders.add(new LegacyLoaderUnversioned());
+		legacyLoaders.add(new LegacyLoader1());
+		/* TODO Fix all NBT transforms being done before all Transforms
+		 *  before all PostTransforms. Be careful until then.
+		 */
 		Collections.sort(legacyLoaders);
 	}
 
diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/LegacyLoader_1_Tunnels.java b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/LegacyLoader1.java
similarity index 77%
rename from src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/LegacyLoader_1_Tunnels.java
rename to src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/LegacyLoader1.java
index 1a4c4f3..90bad23 100644
--- a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/LegacyLoader_1_Tunnels.java
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/LegacyLoader1.java
@@ -14,16 +14,29 @@
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 
-public final class LegacyLoader_1_Tunnels extends LegacyLoader {
+public final class LegacyLoader1 extends LegacyLoader {
 	@Override
 	public int getVersion() {
 		return 1;
 	}
 
 	{
+		addTransformer(new PartTransparentLatchTransformer(), 18);
 		addTransformer(new PartTunnelTransformer(), 27);
 	}
 
+	private static class PartTransparentLatchTransformer extends PartTransformer {
+		protected final int oldBits = old.allocate(4 + 2 + 1);
+		protected final int newBits = transformed.allocate(4 + 2 + 1);
+		protected final int newConfig = transformed.allocate(3);
+
+		@Override
+		public void transformImpl() {
+			setInt(newBits, getInt(oldBits));
+			setInt(newConfig, 0);
+		}
+	}
+
 	private static class PartTunnelTransformer extends PartTransformer {
 		// The old PartTunnel property map
 		// PartCPGate:
diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/LegacyLoader_0_8.java b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/LegacyLoaderUnversioned.java
similarity index 99%
rename from src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/LegacyLoader_0_8.java
rename to src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/LegacyLoaderUnversioned.java
index 03fa229..bd6441b 100644
--- a/src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/LegacyLoader_0_8.java
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/cp/legacy/LegacyLoaderUnversioned.java
@@ -14,7 +14,7 @@
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 
-public final class LegacyLoader_0_8 extends LegacyLoader {
+public final class LegacyLoaderUnversioned extends LegacyLoader {
 	@Override
 	public int getVersion() {
 		return 0;

From 869ac47606c2418fd070b92a8d7d89db3befe1b9 Mon Sep 17 00:00:00 2001
From: Evgeniy Zhabotinsky <evg-zhabotinsky@yandex.ru>
Date: Wed, 3 Feb 2016 13:43:04 +0300
Subject: [PATCH 9/9] Allow replacing tunnels by tunnels. Even with the same
 color (clears connection).

---
 .../vic/integratedcircuits/client/gui/cad/PlaceHandler.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/moe/nightfall/vic/integratedcircuits/client/gui/cad/PlaceHandler.java b/src/main/java/moe/nightfall/vic/integratedcircuits/client/gui/cad/PlaceHandler.java
index 11818fe..572d2ae 100644
--- a/src/main/java/moe/nightfall/vic/integratedcircuits/client/gui/cad/PlaceHandler.java
+++ b/src/main/java/moe/nightfall/vic/integratedcircuits/client/gui/cad/PlaceHandler.java
@@ -11,6 +11,7 @@
 import moe.nightfall.vic.integratedcircuits.cp.part.PartCPGate;
 import moe.nightfall.vic.integratedcircuits.cp.part.PartNull;
 import moe.nightfall.vic.integratedcircuits.cp.part.PartWire;
+import moe.nightfall.vic.integratedcircuits.cp.part.PartTunnel;
 import moe.nightfall.vic.integratedcircuits.misc.RenderUtils;
 import moe.nightfall.vic.integratedcircuits.misc.Vec2;
 import moe.nightfall.vic.integratedcircuits.net.pcb.PacketPCBCache;
@@ -190,7 +191,7 @@ else if (parent.startX > parent.endX)
 					int newID = CircuitPart.getId(selectedPart.getPart());
 
 					Vec2 pos = new Vec2(parent.startX, parent.startY);
-					if (newID != parent.getCircuitData().getID(pos)) {
+					if (newID != parent.getCircuitData().getID(pos) || newID == CircuitPart.getId(PartTunnel.class)) {
 						CommonProxy.networkWrapper.sendToServer(new PacketPCBChangePart(!(selectedPart.getPart() instanceof PartNull), parent.tileentity.xCoord, parent.tileentity.yCoord, parent.tileentity.zCoord).add(pos, newID, selectedPart.getState()));
 					}
 				}