signal switches

assets/mods/basegame/crafting/items.json

@@ -6,5 +6,9 @@
   "item@basegame:32": { /* cherry bomb */
     "workbench": "",
     "ingredients": [[1, 1, "item@basegame:31", 1, "item@basegame:25"]] /* 1 gunpowder, 1 clay ball */
+  },
+  "item@basegame:34": { /* signal switch */
+    "workbench": "",
+    "ingredients": [[2, 1, "item@basegame:112", 1, "$ROCK", 1, "$WOOD"]] /* 1 copper ingot, 1 rock, 1 planks */
   }
 }

assets/mods/basegame/crafting/tools.json

@@ -57,5 +57,9 @@
   "item@basegame:21": { /* steel sledgehammer */
     "workbench": "basiccrafting,metalworking",
     "ingredients": [[1, 6, "item@basegame:26", 2, "item@basegame:18"]] /* 6 bars, 2 sticks */
+  },
+  "item@basegame:9": { /* wire cutter */
+    "workbench": "basiccrafting,metalworking",
+    "ingredients": [[1, 1, "item@basegame:112", 1, "item@basegame:113"]] /* 1 copper ingot, 1 iron ingot */
   }
 }

assets/mods/basegame/crafting/wires.json

@@ -0,0 +1,22 @@
+{
+  "wire@basegame:8192": { /* signal wire red */
+    "workbench": "",
+    "ingredients": [
+      [10, 1, "item@basegame:112"], /* 1 copper */
+      [1, 1, "$SIGNALWIRE"] /* 1 other signal wire */
+    ]
+  },
+  "wire@basegame:8193": { /* signal wire green */
+    "workbench": "",
+    "ingredients": [
+      [10, 1, "item@basegame:112"], /* 1 copper */
+      [1, 1, "$SIGNALWIRE"] /* 1 other signal wire */
+    ]  },
+  "wire@basegame:8194": { /* signal wire blue */
+    "workbench": "",
+    "ingredients": [
+      [10, 1, "item@basegame:112"], /* 1 copper */
+      [1, 1, "$SIGNALWIRE"] /* 1 other signal wire */
+    ]
+  }
+}

assets/mods/basegame/items/itemid.csv

@@ -6,7 +6,7 @@ id;classname;tags
 5;net.torvald.terrarum.modulebasegame.gameitems.ItemTikiTorch;FIXTURE,LIGHT
 6;net.torvald.terrarum.modulebasegame.gameitems.ItemStorageChest;FIXTURE,STORAGE
 7;net.torvald.terrarum.modulebasegame.gameitems.WireGraphDebugger;TOOL,WIRE
-8;net.torvald.terrarum.modulebasegame.gameitems.ItemLogicSignalEmitter;FIXTURE
+8;net.torvald.terrarum.modulebasegame.gameitems.ItemLogicSignalEmitter;FIXTURE,SIGNAL
 9;net.torvald.terrarum.modulebasegame.gameitems.WireCutterAll;TOOL,WIRE
 10;net.torvald.terrarum.modulebasegame.gameitems.ItemTypewriter;FIXTURE,PRINTING
 11;net.torvald.terrarum.modulebasegame.gameitems.ItemWallCalendar;FIXTURE
@@ -32,6 +32,7 @@ id;classname;tags
 31;net.torvald.terrarum.modulebasegame.gameitems.ItemGunpowder;POWDER,EXPLOSIVE
 32;net.torvald.terrarum.modulebasegame.gameitems.ItemCherryBomb;EXPLOSIVE,THROWABLE
 33;net.torvald.terrarum.modulebasegame.gameitems.ItemTorch;FIXTURE,LIGHT
+34;net.torvald.terrarum.modulebasegame.gameitems.ItemSignalSwitchManual;FIXTURE,SIGNAL
 
 # ingots
 26;net.torvald.terrarum.modulebasegame.gameitems.IngotSteel;INGOT

assets/mods/basegame/locales/en/items.json

@@ -37,6 +37,7 @@
   "ITEM_INGOT_ZINC": "Zinc Ingot",
   "ITEM_JUKEBOX": "Jukebox",
   "ITEM_LOGIC_SIGNAL_EMITTER": "Logic Signal Emitter",
+  "ITEM_LOGIC_SIGNAL_SWITCH": "Logic Signal Switch",
   "ITEM_LOGS_BIRCH": "Birch Logs",
   "ITEM_LOGS_EBONY": "Ebony Logs",
   "ITEM_LOGS_OAK": "Oak Logs",

assets/mods/basegame/locales/koKR/items.json

@@ -37,6 +37,7 @@
   "ITEM_INGOT_ZINC": "아연괴",
   "ITEM_JUKEBOX": "주크박스",
   "ITEM_LOGIC_SIGNAL_EMITTER": "신호발생기",
+  "ITEM_LOGIC_SIGNAL_SWITCH": "신호 스위치",
   "ITEM_LOGS_BIRCH": "백단 통나무",
   "ITEM_LOGS_EBONY": "흑단 통나무",
   "ITEM_LOGS_OAK": "통나무",

assets/mods/basegame/wires/wires.csv

@@ -1,11 +1,11 @@
-id;drop;name;renderclass;accept;inputcount;inputtype;outputtype;javaclass;inventoryimg;branching
-8192;8192;WIRE_RED;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,0,4;1
-8193;8193;WIRE_GREEN;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,1,4;1
-8194;8194;WIRE_BLUE;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,2,4;1
-#8195;8195;WIRE_BUNDLE;signal;digital_3bits;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,0,0;1
-8196;8196;WIRE_POWER_LOW;power;power_low;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,3,4;1
-8197;8197;WIRE_POWER_HIGH;power;power_high;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,4,4;1
-8198;8198;WIRE_ETHERNET;network;10base2;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,5,4;1
+id;drop;name;renderclass;accept;inputcount;inputtype;outputtype;javaclass;inventoryimg;branching;tags
+8192;8192;WIRE_RED;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,0,4;1;"SIGNALWIRE"
+8193;8193;WIRE_GREEN;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,1,4;1;"SIGNALWIRE"
+8194;8194;WIRE_BLUE;signal;digital_bit;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,2,4;1;"SIGNALWIRE"
+#8195;8195;WIRE_BUNDLE;signal;digital_3bits;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,0,0;1;"SIGNALWIRE"
+8196;8196;WIRE_POWER_LOW;power;power_low;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,3,4;1;"POWERWIRE_LOW"
+8197;8197;WIRE_POWER_HIGH;power;power_high;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,4,4;1;"POWERWIRE_HIGH"
+8198;8198;WIRE_ETHERNET;network;10base2;3;N/A;N/A;net.torvald.terrarum.modulebasegame.gameitems.WirePieceSignalWire;basegame.items,5,4;1;"ETHERNETWIRE"
 
 
 # accept: which wiretype (defined elsewhere) the wires acceps. Use comma to separate multiple. N/A for electronic components (aka not wires)