Add missing CPU recipes.

src/main/java/li/cil/oc2r/common/item/ItemGroup.java

@@ -66,6 +66,10 @@ public final class ItemGroup {
             output.accept(Items.INVENTORY_OPERATIONS_MODULE.get());
             output.accept(Items.BLOCK_OPERATIONS_MODULE.get());
             output.accept(Items.NETWORK_TUNNEL_MODULE.get());
+            output.accept(Items.SILICON.get());
+            output.accept(Items.SILICON_BLEND.get());
+            output.accept(Items.SILICON_WAFER.get());
+            output.accept(Items.RAW_SILICON_WAFER.get());
             output.accept(Items.TRANSISTOR.get());
             output.accept(Items.CIRCUIT_BOARD.get());
             //output.accept(Items.NETWORK_SWITCH.get());

src/main/java/li/cil/oc2r/common/item/Items.java

@@ -98,6 +98,10 @@ public final class Items {
     public static final RegistryObject<Item> NETWORK_TUNNEL_MODULE = register("network_tunnel_module", NetworkTunnelItem::new);
 
     public static final RegistryObject<Item> TRANSISTOR = register("transistor", ModItem::new);
+    public static final RegistryObject<Item> SILICON_BLEND = register("silicon_blend", ModItem::new);
+    public static final RegistryObject<Item> SILICON = register("silicon", ModItem::new);
+    public static final RegistryObject<Item> SILICON_WAFER = register("silicon_wafer", ModItem::new);
+    public static final RegistryObject<Item> RAW_SILICON_WAFER = register("raw_silicon_wafer", ModItem::new);
     public static final RegistryObject<Item> CIRCUIT_BOARD = register("circuit_board", ModItem::new);
 
     ///////////////////////////////////////////////////////////////////

src/main/java/li/cil/oc2r/data/ModItemModelProvider.java

@@ -33,6 +33,10 @@ public final class ModItemModelProvider extends ItemModelProvider {
         simple(Items.CPU_TIER_2);
         simple(Items.CPU_TIER_3);
         simple(Items.CPU_TIER_4);
+        simple(Items.SILICON);
+        simple(Items.SILICON_BLEND);
+        simple(Items.SILICON_WAFER);
+        simple(Items.RAW_SILICON_WAFER);
         simple(Items.HARD_DRIVE_SMALL, "item/hard_drive_base")
             .texture("layer1", "item/hard_drive_tint");
         simple(Items.HARD_DRIVE_MEDIUM, "item/hard_drive_base")

src/main/resources/assets/oc2r/lang/en_us.json

@@ -78,6 +78,16 @@
   "item.oc2r.circuit_board": "Circuit Board",
   "item.oc2r.circuit_board.desc": "Crafting material.",
 
+  "item.oc2r.silicon": "Silicon",
+  "item.oc2r.silicon.desc": "Crafting material.",
+  "item.oc2r.silicon_blend": "Silicon Blend",
+  "item.oc2r.silicon_blend.desc": "A mixture of sand and quartz from which silicon is cooked.",
+  "item.oc2r.silicon_wafer": "Silicon Wafer",
+  "item.oc2r.silicon_wafer.desc": "A wafer ready for processor construction.",
+  "item.oc2r.raw_silicon_wafer": "Raw Silicon Wafer",
+  "item.oc2r.raw_silicon_wafer.desc": "A wafer with small imperfections that must be cooked out.",
+
+
   "entity.oc2r.robot": "Robot",
 
   "gui.oc2r.computer.error.unknown": "Unknown Error",

src/main/resources/assets/oc2r/lang/ru_ru.json

@@ -95,10 +95,18 @@
   "item.oc2r.network_tunnel_card.desc": "Отсылает и принимает пакеты с привязанного устройства.",
   "item.oc2r.network_tunnel_module": "Сетевой туннельный модуль",
   "item.oc2r.network_tunnel_module.desc": "Отсылает и принимает пакеты с привязанного устройства.",
+  "item.oc2r.raw_silicon_wafer": "Raw Silicon Wafer",
+  "item.oc2r.raw_silicon_wafer.desc": "A wafer with small imperfections that must be cooked out.",
   "item.oc2r.redstone_interface_card": "Красная интерфейсная карта",
   "item.oc2r.redstone_interface_card.desc": "Подает и считывает редстоун сигналы от блока компьютера.",
   "item.oc2r.robot": "Робот",
   "item.oc2r.robot.desc": "Портативный компьютер. Используйте ключ, чтобы убрать его",
+  "item.oc2r.silicon": "Silicon",
+  "item.oc2r.silicon.desc": "Crafting material.",
+  "item.oc2r.silicon_blend": "Silicon Blend",
+  "item.oc2r.silicon_blend.desc": "A mixture of sand and quartz from which silicon is cooked.",
+  "item.oc2r.silicon_wafer": "Silicon Wafer",
+  "item.oc2r.silicon_wafer.desc": "A wafer ready for processor construction.",
   "item.oc2r.sound_card": "Звуковая карта",
   "item.oc2r.sound_card.desc": "Проигрывает разные звуки из своих высококачественных звуковых банков.",
   "item.oc2r.transistor": "Транзистор",

src/main/resources/assets/oc2r/lang/zh_cn.json

@@ -95,10 +95,18 @@
   "item.oc2r.network_tunnel_card.desc": "Sends and receives network packets to a linked device.",
   "item.oc2r.network_tunnel_module": "Network Tunnel Module",
   "item.oc2r.network_tunnel_module.desc": "Sends and receives network packets to a linked device.",
+  "item.oc2r.raw_silicon_wafer": "Raw Silicon Wafer",
+  "item.oc2r.raw_silicon_wafer.desc": "A wafer with small imperfections that must be cooked out.",
   "item.oc2r.redstone_interface_card": "红石卡",
   "item.oc2r.redstone_interface_card.desc": "Emits and reads redstone signals through the Computer.",
   "item.oc2r.robot": "机器人",
   "item.oc2r.robot.desc": "使用螺丝刀扳手或者兼容的扳手来添加或移除组件。",
+  "item.oc2r.silicon": "Silicon",
+  "item.oc2r.silicon.desc": "Crafting material.",
+  "item.oc2r.silicon_blend": "Silicon Blend",
+  "item.oc2r.silicon_blend.desc": "A mixture of sand and quartz from which silicon is cooked.",
+  "item.oc2r.silicon_wafer": "Silicon Wafer",
+  "item.oc2r.silicon_wafer.desc": "A wafer ready for processor construction.",
   "item.oc2r.sound_card": "声卡",
   "item.oc2r.sound_card.desc": "可以从其高度逼真的音库播放各种声音。",
   "item.oc2r.transistor": "晶体管",

src/main/resources/assets/oc2r/models/item/raw_silicon_wafer.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "oc2r:item/raw_silicon_wafer"
+  }
+}

src/main/resources/assets/oc2r/models/item/silicon.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "oc2r:item/silicon"
+  }
+}

src/main/resources/assets/oc2r/models/item/silicon_blend.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "oc2r:item/silicon_blend"
+  }
+}

src/main/resources/assets/oc2r/models/item/silicon_wafer.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "oc2r:item/silicon_wafer"
+  }
+}

src/main/resources/data/forge/tags/items/silicon.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "oc2r:silicon"
+  ]
+}

src/main/resources/data/oc2r/recipes/cpu_tier_1.json

@@ -0,0 +1,28 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "III",
+    "TST",
+    "CBC"
+  ],
+  "key": {
+    "I": {
+      "tag": "forge:ingots/iron"
+    },
+    "C": {
+      "tag": "forge:ingots/copper"
+    },
+    "T": {
+      "item": "oc2r:transistor"
+    },
+    "S": {
+      "item": "oc2r:silicon_wafer"
+    },
+    "B": {
+      "item": "oc2r:circuit_board"
+    }
+  },
+  "result": {
+    "item": "oc2r:cpu_tier_1"
+  }
+}

src/main/resources/data/oc2r/recipes/cpu_tier_2.json

@@ -0,0 +1,28 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "GGG",
+    "TST",
+    "CBC"
+  ],
+  "key": {
+    "G": {
+      "tag": "forge:ingots/gold"
+    },
+    "C": {
+      "tag": "forge:ingots/copper"
+    },
+    "T": {
+      "item": "oc2r:transistor"
+    },
+    "S": {
+      "item": "oc2r:silicon_wafer"
+    },
+    "B": {
+      "item": "oc2r:circuit_board"
+    }
+  },
+  "result": {
+    "item": "oc2r:cpu_tier_2"
+  }
+}

src/main/resources/data/oc2r/recipes/cpu_tier_3.json

@@ -0,0 +1,28 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "DDD",
+    "TST",
+    "GBG"
+  ],
+  "key": {
+    "D": {
+      "tag": "forge:gems/diamond"
+    },
+    "G": {
+      "tag": "forge:ingots/gold"
+    },
+    "T": {
+      "item": "oc2r:transistor"
+    },
+    "S": {
+      "item": "oc2r:silicon_wafer"
+    },
+    "B": {
+      "item": "oc2r:circuit_board"
+    }
+  },
+  "result": {
+    "item": "oc2r:cpu_tier_3"
+  }
+}

src/main/resources/data/oc2r/recipes/cpu_tier_4.json

@@ -0,0 +1,28 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "NNN",
+    "TST",
+    "GBG"
+  ],
+  "key": {
+    "N": {
+      "tag": "forge:gems/emerald"
+    },
+    "G": {
+      "tag": "forge:ingots/gold"
+    },
+    "T": {
+      "item": "oc2r:transistor"
+    },
+    "S": {
+      "item": "oc2r:silicon_wafer"
+    },
+    "B": {
+      "item": "oc2r:circuit_board"
+    }
+  },
+  "result": {
+    "item": "oc2r:cpu_tier_4"
+  }
+}

src/main/resources/data/oc2r/recipes/raw_silicon_wafer.json

@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "SSS"
+  ],
+  "key": {
+    "S": {
+      "tag": "forge:silicon"
+    }
+  },
+  "result": {
+    "item": "oc2r:raw_silicon_wafer",
+    "count": 1
+  }
+}

src/main/resources/data/oc2r/recipes/silicon.json

@@ -0,0 +1,9 @@
+{
+  "type": "minecraft:smelting",
+  "ingredient": {
+    "item": "oc2r:silicon_blend"
+  },
+  "result": "oc2r:silicon",
+  "experience": 0.1,
+  "cookingtime": 200
+}

src/main/resources/data/oc2r/recipes/silicon_blend.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "SQ ",
+    "QQ "
+  ],
+  "key": {
+    "S": {
+      "tag": "forge:sand"
+    },
+    "Q": {
+      "tag": "forge:gems/quartz"
+    }
+  },
+  "result": {
+    "item": "oc2r:silicon_blend",
+    "count": 4
+  }
+}

src/main/resources/data/oc2r/recipes/silicon_wafer.json

@@ -0,0 +1,9 @@
+{
+  "type": "minecraft:smelting",
+  "ingredient": {
+    "item": "oc2r:raw_silicon_wafer"
+  },
+  "result": "oc2r:silicon_wafer",
+  "experience": 0.1,
+  "cookingtime": 200
+}