From 8d95d46c92e5d1915a2bc3c8f341a6ae7f2f033c Mon Sep 17 00:00:00 2001 From: Jackson Abney Date: Mon, 17 Jun 2024 17:30:48 -0800 Subject: [PATCH] Add missing CPU recipes. --- .../li/cil/oc2r/common/item/ItemGroup.java | 4 +++ .../java/li/cil/oc2r/common/item/Items.java | 4 +++ .../cil/oc2r/data/ModItemModelProvider.java | 4 +++ .../resources/assets/oc2r/lang/en_us.json | 10 +++++++ .../resources/assets/oc2r/lang/ru_ru.json | 8 +++++ .../resources/assets/oc2r/lang/zh_cn.json | 8 +++++ .../oc2r/models/item/raw_silicon_wafer.json | 6 ++++ .../assets/oc2r/models/item/silicon.json | 6 ++++ .../oc2r/models/item/silicon_blend.json | 6 ++++ .../oc2r/models/item/silicon_wafer.json | 6 ++++ .../oc2r/textures/item/raw_silicon_wafer.png | Bin 0 -> 236 bytes .../assets/oc2r/textures/item/silicon.png | Bin 0 -> 203 bytes .../oc2r/textures/item/silicon_blend.png | Bin 0 -> 342 bytes .../oc2r/textures/item/silicon_wafer.png | Bin 0 -> 179 bytes .../data/forge/tags/items/silicon.json | 6 ++++ .../data/oc2r/recipes/cpu_tier_1.json | 28 ++++++++++++++++++ .../data/oc2r/recipes/cpu_tier_2.json | 28 ++++++++++++++++++ .../data/oc2r/recipes/cpu_tier_3.json | 28 ++++++++++++++++++ .../data/oc2r/recipes/cpu_tier_4.json | 28 ++++++++++++++++++ .../data/oc2r/recipes/raw_silicon_wafer.json | 15 ++++++++++ .../resources/data/oc2r/recipes/silicon.json | 9 ++++++ .../data/oc2r/recipes/silicon_blend.json | 19 ++++++++++++ .../data/oc2r/recipes/silicon_wafer.json | 9 ++++++ 23 files changed, 232 insertions(+) create mode 100644 src/main/resources/assets/oc2r/models/item/raw_silicon_wafer.json create mode 100644 src/main/resources/assets/oc2r/models/item/silicon.json create mode 100644 src/main/resources/assets/oc2r/models/item/silicon_blend.json create mode 100644 src/main/resources/assets/oc2r/models/item/silicon_wafer.json create mode 100644 src/main/resources/assets/oc2r/textures/item/raw_silicon_wafer.png create mode 100644 src/main/resources/assets/oc2r/textures/item/silicon.png create mode 100644 src/main/resources/assets/oc2r/textures/item/silicon_blend.png create mode 100644 src/main/resources/assets/oc2r/textures/item/silicon_wafer.png create mode 100644 src/main/resources/data/forge/tags/items/silicon.json create mode 100644 src/main/resources/data/oc2r/recipes/cpu_tier_1.json create mode 100644 src/main/resources/data/oc2r/recipes/cpu_tier_2.json create mode 100644 src/main/resources/data/oc2r/recipes/cpu_tier_3.json create mode 100644 src/main/resources/data/oc2r/recipes/cpu_tier_4.json create mode 100644 src/main/resources/data/oc2r/recipes/raw_silicon_wafer.json create mode 100644 src/main/resources/data/oc2r/recipes/silicon.json create mode 100644 src/main/resources/data/oc2r/recipes/silicon_blend.json create mode 100644 src/main/resources/data/oc2r/recipes/silicon_wafer.json 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 0000000000000000000000000000000000000000..4020ec0facd653062f9cef108212db33c1aa8b6a GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!A4IP#}EtuyAu=n8WcEMSC$&s&itHGwOQ!+ zYJpAnzvl9ZRw!Kh9(hE|iDP$;=+-ddd_9YuQ=BZ*ckaw!a!V1t?P%no`IU9n{gUNZ zZk%-V-w@FgSh~=P;rpt52}b=&wH=+dAKTb%=Kp4CIAt7owUOsIkC4-22FX%}$Kj2J cKg9)P)7(uvnqTh_20Dhp)78&qol`;+0D$IC@&Et; literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..af45d216e99d37d9f4b9fa8714a701e3c394cf92 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!30ki#}EtuWQku5f?kUo{ycf~KR}IZhQ)Sq zXWKRgkIieg$V_SHlC!UEN#x*SpPwe-VBW&%HJO)fA>$<>qX4l&hSl62hAi18Q4-OO tH~r&n7%v+*7)T{HOldKB!pO|b&~{s4-J)-9w}5src)I$ztaD0e0stVmJAMEF literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..027464854c02668229eee902fc88bbcbac845620 GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!PlNHjv*HQ$r8UB1icnF}Z(U-0pbDK=f2|!};>-jfQ3oNem};=H$FdSl(>X@Q26v&2{~b z%O9&4*&NQbXEHFxJyobkSX9lZ9Ot-@XA|oZ&L=`M+$LOiSoiocxBJCrW5t7WxHbtM jVY_%k=+Xps9v+5j{qln$95GQqZ!>th`njxgN@xNA2!MZe literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4981567a995c9d4b3eca69121a6c807f4b6e0829 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucK@U$C#}EtuWQku5f?kUm*xB3v2dHsb6g*&P ztKwmtkfzY~DS+_;1CMin#SfFi47(J40%qkHWHD@AEXd~2<}g!(A@=hI1|A-U7uRJ4 UI%