diff --git a/src/main/java/li/cil/oc2r/common/item/ItemGroup.java b/src/main/java/li/cil/oc2r/common/item/ItemGroup.java index 5ba1cd4d..e8aac524 100644 --- a/src/main/java/li/cil/oc2r/common/item/ItemGroup.java +++ b/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()); diff --git a/src/main/java/li/cil/oc2r/common/item/Items.java b/src/main/java/li/cil/oc2r/common/item/Items.java index 2c36fcf7..bb800c87 100644 --- a/src/main/java/li/cil/oc2r/common/item/Items.java +++ b/src/main/java/li/cil/oc2r/common/item/Items.java @@ -98,6 +98,10 @@ public final class Items { public static final RegistryObject NETWORK_TUNNEL_MODULE = register("network_tunnel_module", NetworkTunnelItem::new); public static final RegistryObject TRANSISTOR = register("transistor", ModItem::new); + public static final RegistryObject SILICON_BLEND = register("silicon_blend", ModItem::new); + public static final RegistryObject SILICON = register("silicon", ModItem::new); + public static final RegistryObject SILICON_WAFER = register("silicon_wafer", ModItem::new); + public static final RegistryObject RAW_SILICON_WAFER = register("raw_silicon_wafer", ModItem::new); public static final RegistryObject CIRCUIT_BOARD = register("circuit_board", ModItem::new); /////////////////////////////////////////////////////////////////// diff --git a/src/main/java/li/cil/oc2r/data/ModItemModelProvider.java b/src/main/java/li/cil/oc2r/data/ModItemModelProvider.java index 0663d9b0..00f8eb13 100644 --- a/src/main/java/li/cil/oc2r/data/ModItemModelProvider.java +++ b/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") diff --git a/src/main/resources/assets/oc2r/lang/en_us.json b/src/main/resources/assets/oc2r/lang/en_us.json index c990fe59..c2b1e57e 100644 --- a/src/main/resources/assets/oc2r/lang/en_us.json +++ b/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", diff --git a/src/main/resources/assets/oc2r/lang/ru_ru.json b/src/main/resources/assets/oc2r/lang/ru_ru.json index f2cdd051..67f2fbee 100644 --- a/src/main/resources/assets/oc2r/lang/ru_ru.json +++ b/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": "Транзистор", diff --git a/src/main/resources/assets/oc2r/lang/zh_cn.json b/src/main/resources/assets/oc2r/lang/zh_cn.json index 79700b04..1d614367 100644 --- a/src/main/resources/assets/oc2r/lang/zh_cn.json +++ b/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": "晶体管", diff --git a/src/main/resources/assets/oc2r/models/item/raw_silicon_wafer.json b/src/main/resources/assets/oc2r/models/item/raw_silicon_wafer.json new file mode 100644 index 00000000..a0f3cacf --- /dev/null +++ b/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" + } +} diff --git a/src/main/resources/assets/oc2r/models/item/silicon.json b/src/main/resources/assets/oc2r/models/item/silicon.json new file mode 100644 index 00000000..dae2affd --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/silicon.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/silicon" + } +} diff --git a/src/main/resources/assets/oc2r/models/item/silicon_blend.json b/src/main/resources/assets/oc2r/models/item/silicon_blend.json new file mode 100644 index 00000000..63d09e1d --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/silicon_blend.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/silicon_blend" + } +} diff --git a/src/main/resources/assets/oc2r/models/item/silicon_wafer.json b/src/main/resources/assets/oc2r/models/item/silicon_wafer.json new file mode 100644 index 00000000..213b2afb --- /dev/null +++ b/src/main/resources/assets/oc2r/models/item/silicon_wafer.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oc2r:item/silicon_wafer" + } +} diff --git a/src/main/resources/assets/oc2r/textures/item/raw_silicon_wafer.png b/src/main/resources/assets/oc2r/textures/item/raw_silicon_wafer.png new file mode 100644 index 00000000..4020ec0f Binary files /dev/null and b/src/main/resources/assets/oc2r/textures/item/raw_silicon_wafer.png differ diff --git a/src/main/resources/assets/oc2r/textures/item/silicon.png b/src/main/resources/assets/oc2r/textures/item/silicon.png new file mode 100644 index 00000000..af45d216 Binary files /dev/null and b/src/main/resources/assets/oc2r/textures/item/silicon.png differ diff --git a/src/main/resources/assets/oc2r/textures/item/silicon_blend.png b/src/main/resources/assets/oc2r/textures/item/silicon_blend.png new file mode 100644 index 00000000..02746485 Binary files /dev/null and b/src/main/resources/assets/oc2r/textures/item/silicon_blend.png differ diff --git a/src/main/resources/assets/oc2r/textures/item/silicon_wafer.png b/src/main/resources/assets/oc2r/textures/item/silicon_wafer.png new file mode 100644 index 00000000..4981567a Binary files /dev/null and b/src/main/resources/assets/oc2r/textures/item/silicon_wafer.png differ diff --git a/src/main/resources/data/forge/tags/items/silicon.json b/src/main/resources/data/forge/tags/items/silicon.json new file mode 100644 index 00000000..d566e40a --- /dev/null +++ b/src/main/resources/data/forge/tags/items/silicon.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "oc2r:silicon" + ] +} diff --git a/src/main/resources/data/oc2r/recipes/cpu_tier_1.json b/src/main/resources/data/oc2r/recipes/cpu_tier_1.json new file mode 100644 index 00000000..5aaf1a5b --- /dev/null +++ b/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" + } +} diff --git a/src/main/resources/data/oc2r/recipes/cpu_tier_2.json b/src/main/resources/data/oc2r/recipes/cpu_tier_2.json new file mode 100644 index 00000000..934b2abc --- /dev/null +++ b/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" + } +} diff --git a/src/main/resources/data/oc2r/recipes/cpu_tier_3.json b/src/main/resources/data/oc2r/recipes/cpu_tier_3.json new file mode 100644 index 00000000..0ccc5d31 --- /dev/null +++ b/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" + } +} diff --git a/src/main/resources/data/oc2r/recipes/cpu_tier_4.json b/src/main/resources/data/oc2r/recipes/cpu_tier_4.json new file mode 100644 index 00000000..919ae71f --- /dev/null +++ b/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" + } +} diff --git a/src/main/resources/data/oc2r/recipes/raw_silicon_wafer.json b/src/main/resources/data/oc2r/recipes/raw_silicon_wafer.json new file mode 100644 index 00000000..f52ce402 --- /dev/null +++ b/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 + } +} diff --git a/src/main/resources/data/oc2r/recipes/silicon.json b/src/main/resources/data/oc2r/recipes/silicon.json new file mode 100644 index 00000000..e09d10de --- /dev/null +++ b/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 +} diff --git a/src/main/resources/data/oc2r/recipes/silicon_blend.json b/src/main/resources/data/oc2r/recipes/silicon_blend.json new file mode 100644 index 00000000..1469857b --- /dev/null +++ b/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 + } +} diff --git a/src/main/resources/data/oc2r/recipes/silicon_wafer.json b/src/main/resources/data/oc2r/recipes/silicon_wafer.json new file mode 100644 index 00000000..55c041e6 --- /dev/null +++ b/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 +}