From 8a2b1456256e802bd5b9c6ea6edb5380fcfda915 Mon Sep 17 00:00:00 2001 From: pjht Date: Sat, 10 Mar 2018 18:25:50 -0600 Subject: [PATCH 1/2] Add silicon wafer and recipe --- src/main/java/com/pjht/ssspcore/item/ModItems.java | 3 +++ src/main/resources/assets/ssspcore/lang/en_us.lang | 1 + .../assets/ssspcore/models/item/raw_silicon.json | 2 +- .../assets/ssspcore/models/item/silicon_wafer.json | 6 ++++++ .../resources/assets/ssspcore/recipes/silicon.json | 13 ------------- .../assets/ssspcore/recipes/silicon_wafer.json | 11 +++++++++++ .../items/{silicon.png => raw_silicon.png} | Bin 7 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 src/main/resources/assets/ssspcore/models/item/silicon_wafer.json delete mode 100644 src/main/resources/assets/ssspcore/recipes/silicon.json create mode 100644 src/main/resources/assets/ssspcore/recipes/silicon_wafer.json rename src/main/resources/assets/ssspcore/textures/items/{silicon.png => raw_silicon.png} (100%) diff --git a/src/main/java/com/pjht/ssspcore/item/ModItems.java b/src/main/java/com/pjht/ssspcore/item/ModItems.java index e2656f5..c64c5ee 100644 --- a/src/main/java/com/pjht/ssspcore/item/ModItems.java +++ b/src/main/java/com/pjht/ssspcore/item/ModItems.java @@ -7,11 +7,13 @@ import net.minecraftforge.registries.IForgeRegistry; public class ModItems { public static ItemOre ingotCopper = new ItemOre("ingot_copper", "ingotCopper"); public static ItemOre rawSilicon = new ItemOre("raw_silicon","itemSilicon"); + public static ItemBase siliconWafer = new ItemBase("silicon_wafer"); public static ItemFuel coke = new ItemFuel("coke","itemCoke", 1000); public static void register(IForgeRegistry registry) { registry.registerAll( ingotCopper, rawSilicon, + siliconWafer, coke ); } @@ -19,6 +21,7 @@ public class ModItems { public static void registerModels() { ingotCopper.registerItemModel(); rawSilicon.registerItemModel(); + siliconWafer.registerItemModel(); coke.registerItemModel(); } } diff --git a/src/main/resources/assets/ssspcore/lang/en_us.lang b/src/main/resources/assets/ssspcore/lang/en_us.lang index 4e88d97..f75723c 100644 --- a/src/main/resources/assets/ssspcore/lang/en_us.lang +++ b/src/main/resources/assets/ssspcore/lang/en_us.lang @@ -1,6 +1,7 @@ # Items item.ingot_copper.name=Copper Ingot item.raw_silicon.name=Raw Silicon +item.silicon_wafer.name=Silicon Wafer item.coke.name=Coke # Blocks diff --git a/src/main/resources/assets/ssspcore/models/item/raw_silicon.json b/src/main/resources/assets/ssspcore/models/item/raw_silicon.json index 184abda..57b8f29 100644 --- a/src/main/resources/assets/ssspcore/models/item/raw_silicon.json +++ b/src/main/resources/assets/ssspcore/models/item/raw_silicon.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "ssspcore:items/silicon" + "layer0": "ssspcore:items/raw_silicon" } } \ No newline at end of file diff --git a/src/main/resources/assets/ssspcore/models/item/silicon_wafer.json b/src/main/resources/assets/ssspcore/models/item/silicon_wafer.json new file mode 100644 index 0000000..af587f5 --- /dev/null +++ b/src/main/resources/assets/ssspcore/models/item/silicon_wafer.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ssspcore:items/silicon_wafer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ssspcore/recipes/silicon.json b/src/main/resources/assets/ssspcore/recipes/silicon.json deleted file mode 100644 index 23d1f01..0000000 --- a/src/main/resources/assets/ssspcore/recipes/silicon.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "ingredients": [ - { - "item": "minecraft:sand", - "item": "ssspcore:coke" - } - ], - "result": { - "item": "ssspcore:silicon", - "count": 2 - } -} \ No newline at end of file diff --git a/src/main/resources/assets/ssspcore/recipes/silicon_wafer.json b/src/main/resources/assets/ssspcore/recipes/silicon_wafer.json new file mode 100644 index 0000000..ffd22ac --- /dev/null +++ b/src/main/resources/assets/ssspcore/recipes/silicon_wafer.json @@ -0,0 +1,11 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "ssspcore:raw_silicon" + } + ], + "result": { + "item": "ssspcore:silicon_wafer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ssspcore/textures/items/silicon.png b/src/main/resources/assets/ssspcore/textures/items/raw_silicon.png similarity index 100% rename from src/main/resources/assets/ssspcore/textures/items/silicon.png rename to src/main/resources/assets/ssspcore/textures/items/raw_silicon.png From 15370e5c7115b5f8032fc188d752fe2854b60579 Mon Sep 17 00:00:00 2001 From: pjht Date: Sun, 11 Mar 2018 08:52:18 -0500 Subject: [PATCH 2/2] Add texture --- .../ssspcore/textures/items/silicon_wafer.png | Bin 0 -> 553 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/assets/ssspcore/textures/items/silicon_wafer.png diff --git a/src/main/resources/assets/ssspcore/textures/items/silicon_wafer.png b/src/main/resources/assets/ssspcore/textures/items/silicon_wafer.png new file mode 100644 index 0000000000000000000000000000000000000000..d3a686b1e5038ebcdf9b6c901b0865597f905f3a GIT binary patch literal 553 zcmV+^0@nSBP)iO zDWcYj&;_(z2k#sPg8@>C$fdwoi^bx{0e4vZT&*Ofgi;GiF8KTZAB-_@&cQnm>nxh4 zfr!95htt!AV)gO+@>0UCGQlw=G;ITC9jvwR-YHSjv|2y}7>#HkGyD+ROz5f^xW76u@(uUV{&KYgns%~0& z^ZFIc?Ru@=E4`P>9fZihvS!eeP>DkbLHDEz0KsTHfw{fD77ebHUV#Xt_BqgklF){+ z=(;UJO2n#y$#@KNcXJ~pQvrKTlByMX1{ly@1!u~q4T8Bj8IAic&<4RG%%Z|st6^%J z*h*_PK&s<;;2_DT&tLj3{Ml^!F4PLy%>(aIq{6_U?v$y2)em^@addp#6L8#ZHnLYh zc7|$+RH2expgRJh)jNO>M<1Ua<%cA_f~s;^ovo#R=M1Lr r-oJdA9$r^=heU>80B@($XRq@;HZX^%-=tmo00000NkvXXu0mjfbx#9~ literal 0 HcmV?d00001