Use lithium cell for Li-ion battery. Closes #1840

src/main/resources/data/techreborn/recipes/assembling_machine/advanced_circuit.json

@@ -0,0 +1,19 @@
+{
+  "type": "techreborn:assembling_machine",
+  "power": 20,
+  "time": 200,
+  "ingredients": [
+    {
+      "item": "techreborn:silicon_plate"
+    },
+    {
+      "item": "techreborn:insulated_gold_cable",
+      "count": 2
+    }
+  ],
+  "results": [
+    {
+      "item": "techreborn:advanced_circuit"
+    }
+  ]
+}

src/main/resources/data/techreborn/recipes/assembling_machine/electronic_circuit.json

@@ -0,0 +1,19 @@
+{
+  "type": "techreborn:assembling_machine",
+  "power": 20,
+  "time": 200,
+  "ingredients": [
+    {
+      "item": "techreborn:silicon_plate"
+    },
+    {
+      "item": "techreborn:insulated_copper_cable",
+      "count": 2
+    }
+  ],
+  "results": [
+    {
+      "item": "techreborn:electronic_circuit"
+    }
+  ]
+}

src/main/resources/data/techreborn/recipes/assembling_machine/lithium_ion_battery.json

@@ -0,0 +1,23 @@
+{
+  "type": "techreborn:assembling_machine",
+  "power": 20,
+  "time": 200,
+  "ingredients": [
+    {
+      "count": 2,
+      "tag": "c:aluminum_plate"
+    },
+    {
+      "item": "techreborn:cell",
+      "count": 2,
+      "nbt": {
+        "fluid": "techreborn:lithium"
+      }
+    }
+  ],
+  "results": [
+    {
+      "item": "techreborn:lithium_ion_battery"
+    }
+  ]
+}

src/main/resources/data/techreborn/recipes/crafting_table/battery/lithium_ion_battery.json

@@ -1,22 +0,0 @@
-{
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    " C ",
-    "PFP",
-    "PFP"
-  ],
-  "key": {
-    "C": {
-      "item": "techreborn:insulated_gold_cable"
-    },
-    "P": {
-      "tag": "c:aluminum_plate"
-    },
-    "F": {
-      "item": "techreborn:cell"
-    }
-  },
-  "result": {
-    "item": "techreborn:lithium_ion_battery"
-  }
-}

src/main/resources/data/techreborn/recipes/crafting_table/machine/assembling_machine.json

@@ -0,0 +1,28 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"pattern": [
+		"EDE",
+		"CFC",
+		"EPE"
+	],
+	"key": {
+		"C": {
+			"item": "techreborn:advanced_circuit"
+		},
+		"F": {
+			"item": "techreborn:advanced_machine_frame"
+		},
+		"E": {
+			"tag": "c:electrum_plate"
+		},
+		"P": {
+			"item": "minecraft:piston"
+		},
+		"D": {
+			"item": "techreborn:digital_display"
+		}
+	},
+	"result": {
+		"item": "techreborn:assembly_machine"
+	}
+}

src/main/resources/data/techreborn/recipes/crafting_table/parts/data_storage_core.json

@@ -13,7 +13,7 @@
       "item": "techreborn:electronic_circuit"
     },
     "E": {
-      "item": "techreborn:emerald_plate"
+      "tag": "c:peridot_plate"
     },
     "G": {
       "item": "minecraft:glowstone_dust"

src/main/resources/data/techreborn/recipes/crafting_table/parts/digital_display.json

@@ -7,7 +7,7 @@
   ],
   "key": {
     "A": {
-      "tag": "c:aluminum_ingot"
+      "tag": "c:aluminum_plate"
     },
     "D": {
       "item": "minecraft:ink_sac"