Rework of the IC Workbench

src/main/resources/assets/projectred/lang/en_US.lang

@@ -602,3 +602,39 @@ item.projectred.fabrication.icblueprint.name=IC Blueprint
 item.projectred.fabrication.icchip.name=IC Chip
 item.projectred.fabrication.icchip|0.name=IC Chip
 item.projectred.fabrication.icchip|1.name=Creative Mode IC Chip
+gui.projectred.fabrication.debug=Debug
+gui.projectred.fabrication.insulated_wires=Insulated wires
+gui.projectred.fabrication.bundled_cables=Bundled cables
+gui.projectred.fabrication.ios=IOs
+gui.projectred.fabrication.primitives=Primitives
+gui.projectred.fabrication.timing_and_clocks=Timing and Clocks
+gui.projectred.fabrication.latches=Latches
+gui.projectred.fabrication.misc=Misc
+gui.projectred.fabrication.reset_view=Reset View
+gui.projectred.fabrication.detail=Detail
+gui.projectred.fabrication.copy=Copy
+gui.projectred.fabrication.cut=Cut
+gui.projectred.fabrication.paste=Paste
+gui.projectred.fabrication.erase=Erase
+gui.projectred.fabrication.io_simple=Simple IO
+gui.projectred.fabrication.io_analog=Analog IO
+gui.projectred.fabrication.io_bundled=Bundled IO
+gui.projectred.fabrication.rotate=Rotate
+gui.projectred.fabrication.configure=Configure
+gui.projectred.fabrication.frequency=Frequency
+gui.projectred.fabrication.state=State
+gui.projectred.fabrication.max=Max
+gui.projectred.fabrication.inc=Inc
+gui.projectred.fabrication.dec=Dec
+gui.projectred.fabrication.timer_interval=Interval
+gui.projectred.fabrication.import_string=Import string from clipboard
+gui.projectred.fabrication.export_string=Export string to clipboard
+gui.projectred.fabrication.export_success=Blueprint exported to clipboard!
+gui.projectred.fabrication.invalid_string=Not a valid blueprint string
+gui.projectred.fabrication.clipboard_unavailable=Can't access system clipboard
+gui.projectred.fabrication.im_ex_port=Im-/Export Blueprint Strings
+
+
+tile.projectred.integration.icblock.name=IC Workbench/Printer
+tile.projectred.integration.icblock|0.name=IC Workbench
+tile.projectred.integration.icblock|1.name=IC Printer

src/main/scala/mrtjp/projectred/fabrication/fmpgatepart.scala → src/main/scala/mrtjp/projectred/fabrication/FMPCircuitGate.scala

@@ -10,7 +10,17 @@ import codechicken.lib.gui.GuiDraw
 import codechicken.lib.render.{CCRenderState, TextureUtils}
 import codechicken.lib.vec._
 import mrtjp.core.math.MathLib
-import mrtjp.projectred.fabrication.IIOCircuitPart._
+import mrtjp.projectred.fabrication.ItemICBlueprint.{
+  getConnModes,
+  getICName,
+  hasICInside
+}
+import mrtjp.projectred.fabrication.circuitparts.io.TIOCircuitPart.{
+  Analog,
+  Bundled,
+  NoConn,
+  Simple
+}
 import mrtjp.projectred.integration
 import mrtjp.projectred.integration._
 import mrtjp.projectred.transmission.BundledCommons._
@@ -296,7 +306,6 @@ class RenderCircuitGate extends GateRenderer[CircuitGatePart] {
   )
 
   override def prepareInv(stack: ItemStack) {
-    import ItemICBlueprint._
     if (hasICInside(stack)) {
       name = getICName(stack)
       val cm = getConnModes(stack)

src/main/scala/mrtjp/projectred/fabrication/tileicprinter.scala → src/main/scala/mrtjp/projectred/fabrication/ICPrinter.scala

@@ -6,7 +6,6 @@
 package mrtjp.projectred.fabrication
 
 import java.util.{ArrayList => JAList, List => JList}
-
 import codechicken.lib.data.{MCDataInput, MCDataOutput}
 import codechicken.lib.gui.GuiDraw
 import codechicken.lib.render.uv.{
@@ -27,6 +26,15 @@ import mrtjp.core.world.WorldLib
 import mrtjp.projectred.ProjectRedCore.log
 import mrtjp.projectred.core.PartDefs
 import mrtjp.projectred.core.libmc.PRResources
+import mrtjp.projectred.fabrication.circuitparts.GateICPart
+import mrtjp.projectred.fabrication.circuitparts.wire.{
+  AlloyWireICPart,
+  BundledCableICPart,
+  ButtonICPart,
+  InsulatedWireICPart,
+  LeverICPart,
+  TorchICPart
+}
 import mrtjp.projectred.integration.ComponentStore
 import mrtjp.projectred.transmission.WireDef
 import net.minecraft.client.renderer.RenderBlocks
@@ -465,7 +473,7 @@ object TileICPrinter {
       getOrCacheComponents(stack).foreach(add(_, 0.25))
     }
 
-    import mrtjp.projectred.fabrication.{ICGateDefinition => gd}
+    import mrtjp.projectred.fabrication.circuitparts.{ICGateDefinition => gd}
 
     for (part <- ic.parts.values) part match {
       case p: TorchICPart     => add(new ItemStack(Blocks.redstone_torch), 0.25)

src/main/scala/mrtjp/projectred/fabrication/tileicworkbench.scala → src/main/scala/mrtjp/projectred/fabrication/ICWorkbench.scala

@@ -21,6 +21,7 @@ import mrtjp.core.world.WorldLib
 import mrtjp.projectred.ProjectRedFabrication
 import mrtjp.projectred.api.IScrewdriver
 import mrtjp.projectred.fabrication.ItemICBlueprint._
+import mrtjp.projectred.fabrication.gui.GuiICWorkbench
 import net.minecraft.block.material.Material
 import net.minecraft.client.renderer.texture.IIconRegister
 import net.minecraft.entity.item.EntityItem
@@ -138,9 +139,7 @@ class TileICWorkbench extends TileICMachine with NetWorldCircuit {
     case 2 => circuit.readDesc(in)
     case 3 => readPartStream(in)
     case 4 => readICStream(in)
-    case 5 =>
-      if (!hasBP) new IntegratedCircuit().readDesc(in)
-      else { circuit.readDesc(in); sendICDesc() }
+    case 5 => circuit.name = in.readString()
     case _ => super.read(in, key)
   }
 
@@ -159,9 +158,9 @@ class TileICWorkbench extends TileICMachine with NetWorldCircuit {
     }
   }
 
-  def sendNewICToServer(ic: IntegratedCircuit) {
+  def sendICNameToServer(name: String) {
     val stream = writeStream(5)
-    ic.writeDesc(stream)
+    stream.writeString(name)
     stream.sendToServer()
   }
 
@@ -209,7 +208,7 @@ class TileICWorkbench extends TileICMachine with NetWorldCircuit {
         sendHasBPUpdate()
       } else if (hasBP && player.isSneaking) {
         val stack = new ItemStack(ProjectRedFabrication.itemICBlueprint)
-        if (circuit.nonEmpty) {
+        if (circuit.parts.nonEmpty) {
           saveIC(circuit, stack)
           circuit.clear()
           sendICDesc()
@@ -245,7 +244,8 @@ class TileICWorkbench extends TileICMachine with NetWorldCircuit {
     super.onBlockRemoval()
     if (hasBP) {
       val stack = new ItemStack(ProjectRedFabrication.itemICBlueprint)
-      if (circuit.nonEmpty) saveIC(circuit, stack)
+      if (circuit.parts.nonEmpty)
+        saveIC(circuit, stack)
       WorldLib.dropItem(world, x, y, z, stack)
     }
   }