From e94dc3a719fb7281dc6a050b694cbf6f9a544c81 Mon Sep 17 00:00:00 2001 From: pjht Date: Sun, 18 Mar 2018 13:36:43 -0500 Subject: [PATCH] Add items for more realistic crafting of IC's and PCB's --- src/main/java/com/pjht/ssspcore/SSSPCore.java | 4 ++-- .../java/com/pjht/ssspcore/item/ModItems.java | 12 ++++++++++- .../resources/assets/ssspcore/lang/en_us.lang | 19 ++++++++++-------- .../ssspcore/models/item/boric_acid.json | 6 ++++++ .../assets/ssspcore/models/item/boron.json | 6 ++++++ .../ssspcore/models/item/brine_bucket.json | 6 ++++++ .../ssspcore/models/item/clorine_bottle.json | 6 ++++++ .../ssspcore/models/item/ferric_acid.json | 6 ++++++ .../models/item/hydrocloric_acid.json | 6 ++++++ .../ssspcore/models/item/hydrogen_bottle.json | 6 ++++++ .../ssspcore/models/item/phosphoric_acid.json | 6 ++++++ .../assets/ssspcore/models/item/salt.json | 6 ++++++ .../assets/ssspcore/recipes/boric_acid.json | 1 + .../assets/ssspcore/recipes/brine_bucket.json | 1 + .../ssspcore/recipes/clorine_bottle.json | 1 + .../assets/ssspcore/recipes/ferric_acid.json | 18 +++++++++++++++++ .../ssspcore/recipes/hydrocloric_acid.json | 18 +++++++++++++++++ .../ssspcore/recipes/hydrogen_bottle.json | 1 + .../ssspcore/textures/items/boric_acid.png | Bin 0 -> 1351 bytes .../ssspcore/textures/items/brine_bucket.png | Bin 0 -> 429 bytes .../textures/items/clorine_bottle.png | Bin 0 -> 285 bytes .../ssspcore/textures/items/ferric_acid.png | Bin 0 -> 252 bytes .../textures/items/hydrocloric_acid.png | Bin 0 -> 281 bytes .../textures/items/hydrogen_bottle.png | Bin 0 -> 274 bytes .../textures/items/phosphoric_acid.png | Bin 0 -> 275 bytes 25 files changed, 118 insertions(+), 11 deletions(-) create mode 100644 src/main/resources/assets/ssspcore/models/item/boric_acid.json create mode 100644 src/main/resources/assets/ssspcore/models/item/boron.json create mode 100644 src/main/resources/assets/ssspcore/models/item/brine_bucket.json create mode 100644 src/main/resources/assets/ssspcore/models/item/clorine_bottle.json create mode 100644 src/main/resources/assets/ssspcore/models/item/ferric_acid.json create mode 100644 src/main/resources/assets/ssspcore/models/item/hydrocloric_acid.json create mode 100644 src/main/resources/assets/ssspcore/models/item/hydrogen_bottle.json create mode 100644 src/main/resources/assets/ssspcore/models/item/phosphoric_acid.json create mode 100644 src/main/resources/assets/ssspcore/models/item/salt.json create mode 100644 src/main/resources/assets/ssspcore/recipes/boric_acid.json create mode 100644 src/main/resources/assets/ssspcore/recipes/brine_bucket.json create mode 100644 src/main/resources/assets/ssspcore/recipes/clorine_bottle.json create mode 100644 src/main/resources/assets/ssspcore/recipes/ferric_acid.json create mode 100644 src/main/resources/assets/ssspcore/recipes/hydrocloric_acid.json create mode 100644 src/main/resources/assets/ssspcore/recipes/hydrogen_bottle.json create mode 100644 src/main/resources/assets/ssspcore/textures/items/boric_acid.png create mode 100644 src/main/resources/assets/ssspcore/textures/items/brine_bucket.png create mode 100644 src/main/resources/assets/ssspcore/textures/items/clorine_bottle.png create mode 100644 src/main/resources/assets/ssspcore/textures/items/ferric_acid.png create mode 100644 src/main/resources/assets/ssspcore/textures/items/hydrocloric_acid.png create mode 100644 src/main/resources/assets/ssspcore/textures/items/hydrogen_bottle.png create mode 100644 src/main/resources/assets/ssspcore/textures/items/phosphoric_acid.png diff --git a/src/main/java/com/pjht/ssspcore/SSSPCore.java b/src/main/java/com/pjht/ssspcore/SSSPCore.java index 05dcdb4..e710606 100644 --- a/src/main/java/com/pjht/ssspcore/SSSPCore.java +++ b/src/main/java/com/pjht/ssspcore/SSSPCore.java @@ -5,6 +5,7 @@ import com.pjht.ssspcore.item.ModItems; import com.pjht.ssspcore.proxy.CommonProxy; import net.minecraft.block.Block; +import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraftforge.client.event.ModelRegistryEvent; import net.minecraftforge.event.RegistryEvent; @@ -14,7 +15,6 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.common.registry.GameRegistry; @Mod(modid = SSSPCore.modId, name = SSSPCore.name, version = SSSPCore.version) public class SSSPCore { @@ -47,7 +47,7 @@ public class SSSPCore { @Mod.EventHandler public void postInit(FMLPostInitializationEvent event) { - + Items.WATER_BUCKET.setContainerItem(null); } @Mod.EventBusSubscriber diff --git a/src/main/java/com/pjht/ssspcore/item/ModItems.java b/src/main/java/com/pjht/ssspcore/item/ModItems.java index 2689149..92a92fb 100644 --- a/src/main/java/com/pjht/ssspcore/item/ModItems.java +++ b/src/main/java/com/pjht/ssspcore/item/ModItems.java @@ -21,6 +21,16 @@ public class ModItems { registerItem("housing"); registerItem("blank_pcb"); registerItem("blank_pcb_blueprint"); + registerItem("phosphoric_acid"); + registerItem("salt"); + registerItem("boron"); + registerItem("brine_bucket"); + registerItem("hydrogen_bottle"); + registerItem("clorine_bottle"); + registerItem("hydrocloric_acid"); + registerItem("boric_acid"); + registerItem("ferric_acid"); + //NEXT ITEM HERE } public static void register(IForgeRegistry registry) { @@ -54,4 +64,4 @@ public class ModItems { } } } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/ssspcore/lang/en_us.lang b/src/main/resources/assets/ssspcore/lang/en_us.lang index d830aab..95469c3 100644 --- a/src/main/resources/assets/ssspcore/lang/en_us.lang +++ b/src/main/resources/assets/ssspcore/lang/en_us.lang @@ -1,20 +1,23 @@ -# Items item.ingot_copper.name=Copper Ingot item.raw_silicon.name=Raw Silicon item.silicon_wafer.name=Silicon Wafer item.coke.name=Coke -item.blank_blueprint.name=Blank Blueprint item.blank_chip.name=Blank Chip -item.blueprint.name=Blueprint -item.chip.name=Chip +item.blank_blueprint.name=Blank Blueprint item.housing.name=Housing item.ic.name=IC item.plastic.name=Plastic item.blank_pcb.name=Blank PCB item.blank_pcb_blueprint.name=Blank PCB Blueprint -# Blocks tile.ore_copper.name=Copper Ore tile.pedestal.name=Pedestal - -# Creative Tabs -itemGroup.ssspcore=SSSP Core \ No newline at end of file +itemGroup.ssspcore=SSSP Core +item.phosphoric_acid.name=Phosphoric Acid Bottle +item.salt.name=Salt +item.boron.name=Boron +item.brine_bucket.name=Brine Bucket +item.hydrogen_bottle.name=Hydrogen Bottle +item.clorine_bottle.name=Clorine Bottle +item.hydrocloric_acid.name=Hydrocloric Acid Bottle +item.boric_acid.name=Boric Acid +item.ferric_acid.name=Ferric Acid Bottle diff --git a/src/main/resources/assets/ssspcore/models/item/boric_acid.json b/src/main/resources/assets/ssspcore/models/item/boric_acid.json new file mode 100644 index 0000000..489faad --- /dev/null +++ b/src/main/resources/assets/ssspcore/models/item/boric_acid.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ssspcore:items/boric_acid" + } +} diff --git a/src/main/resources/assets/ssspcore/models/item/boron.json b/src/main/resources/assets/ssspcore/models/item/boron.json new file mode 100644 index 0000000..5408c0b --- /dev/null +++ b/src/main/resources/assets/ssspcore/models/item/boron.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ssspcore:items/boron" + } +} diff --git a/src/main/resources/assets/ssspcore/models/item/brine_bucket.json b/src/main/resources/assets/ssspcore/models/item/brine_bucket.json new file mode 100644 index 0000000..18911c0 --- /dev/null +++ b/src/main/resources/assets/ssspcore/models/item/brine_bucket.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ssspcore:items/brine_bucket" + } +} diff --git a/src/main/resources/assets/ssspcore/models/item/clorine_bottle.json b/src/main/resources/assets/ssspcore/models/item/clorine_bottle.json new file mode 100644 index 0000000..ab15612 --- /dev/null +++ b/src/main/resources/assets/ssspcore/models/item/clorine_bottle.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ssspcore:items/clorine_bottle" + } +} diff --git a/src/main/resources/assets/ssspcore/models/item/ferric_acid.json b/src/main/resources/assets/ssspcore/models/item/ferric_acid.json new file mode 100644 index 0000000..6f29c7e --- /dev/null +++ b/src/main/resources/assets/ssspcore/models/item/ferric_acid.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ssspcore:items/ferric_acid" + } +} diff --git a/src/main/resources/assets/ssspcore/models/item/hydrocloric_acid.json b/src/main/resources/assets/ssspcore/models/item/hydrocloric_acid.json new file mode 100644 index 0000000..4757d0b --- /dev/null +++ b/src/main/resources/assets/ssspcore/models/item/hydrocloric_acid.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ssspcore:items/hydrocloric_acid" + } +} diff --git a/src/main/resources/assets/ssspcore/models/item/hydrogen_bottle.json b/src/main/resources/assets/ssspcore/models/item/hydrogen_bottle.json new file mode 100644 index 0000000..714c687 --- /dev/null +++ b/src/main/resources/assets/ssspcore/models/item/hydrogen_bottle.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ssspcore:items/hydrogen_bottle" + } +} diff --git a/src/main/resources/assets/ssspcore/models/item/phosphoric_acid.json b/src/main/resources/assets/ssspcore/models/item/phosphoric_acid.json new file mode 100644 index 0000000..02e85b1 --- /dev/null +++ b/src/main/resources/assets/ssspcore/models/item/phosphoric_acid.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ssspcore:items/phosphoric_acid" + } +} diff --git a/src/main/resources/assets/ssspcore/models/item/salt.json b/src/main/resources/assets/ssspcore/models/item/salt.json new file mode 100644 index 0000000..b68bdc1 --- /dev/null +++ b/src/main/resources/assets/ssspcore/models/item/salt.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ssspcore:items/salt" + } +} diff --git a/src/main/resources/assets/ssspcore/recipes/boric_acid.json b/src/main/resources/assets/ssspcore/recipes/boric_acid.json new file mode 100644 index 0000000..05fa7bc --- /dev/null +++ b/src/main/resources/assets/ssspcore/recipes/boric_acid.json @@ -0,0 +1 @@ +{"type":"minecraft:crafting_shapeless","ingredients":[{"item":"ssspcore:hydrocloric_acid"},{"item":"ssspcore:boron"}],"result":{"item":"ssspcore:boric_acid"}} diff --git a/src/main/resources/assets/ssspcore/recipes/brine_bucket.json b/src/main/resources/assets/ssspcore/recipes/brine_bucket.json new file mode 100644 index 0000000..14338ed --- /dev/null +++ b/src/main/resources/assets/ssspcore/recipes/brine_bucket.json @@ -0,0 +1 @@ +{"type":"minecraft:crafting_shapeless","ingredients":[{"item":"ssspcore:salt"},{"item":"minecraft:water_bucket"}],"result":{"item":"ssspcore:brine_bucket"}} \ No newline at end of file diff --git a/src/main/resources/assets/ssspcore/recipes/clorine_bottle.json b/src/main/resources/assets/ssspcore/recipes/clorine_bottle.json new file mode 100644 index 0000000..d891a49 --- /dev/null +++ b/src/main/resources/assets/ssspcore/recipes/clorine_bottle.json @@ -0,0 +1 @@ +{"type":"minecraft:crafting_shapeless","ingredients":[{"item":"ssspcore:brine_bucket"},{"item":"minecraft:redstone"},{"item":"minecraft:glass_bottle"},{"item":"minecraft:glass_bottle"},{"item":"minecraft:glass_bottle"},{"item":"minecraft:glass_bottle"}],"result":{"item":"ssspcore:clorine_bottle","count":4}} diff --git a/src/main/resources/assets/ssspcore/recipes/ferric_acid.json b/src/main/resources/assets/ssspcore/recipes/ferric_acid.json new file mode 100644 index 0000000..ac357db --- /dev/null +++ b/src/main/resources/assets/ssspcore/recipes/ferric_acid.json @@ -0,0 +1,18 @@ +{ + "type":"minecraft:crafting_shapeless", + "ingredients":[ + { + "item":"minecraft:iron_nugget" + }, + { + "item":"ssspcore:clorine_bottle" + }, + { + "item":"minecraft:potion", + "nbt":{"Potion":"minecraft:water"} + } + ], + "result":{ + "item":"ssspcore:ferric_acid" + } +} diff --git a/src/main/resources/assets/ssspcore/recipes/hydrocloric_acid.json b/src/main/resources/assets/ssspcore/recipes/hydrocloric_acid.json new file mode 100644 index 0000000..65f494f --- /dev/null +++ b/src/main/resources/assets/ssspcore/recipes/hydrocloric_acid.json @@ -0,0 +1,18 @@ +{ + "type":"minecraft:crafting_shapeless", + "ingredients":[ + { + "item":"ssspcore:hydrogen_bottle" + }, + { + "item":"ssspcore:clorine_bottle" + }, + { + "item":"minecraft:potion", + "nbt":{"Potion":"minecraft:water"} + } + ], + "result":{ + "item":"ssspcore:hydrocloric_acid" + } +} diff --git a/src/main/resources/assets/ssspcore/recipes/hydrogen_bottle.json b/src/main/resources/assets/ssspcore/recipes/hydrogen_bottle.json new file mode 100644 index 0000000..237cd49 --- /dev/null +++ b/src/main/resources/assets/ssspcore/recipes/hydrogen_bottle.json @@ -0,0 +1 @@ +{"type":"minecraft:crafting_shapeless","ingredients":[{"item":"minecraft:water_bucket"},{"item":"minecraft:redstone"},{"item":"minecraft:glass_bottle"},{"item":"minecraft:glass_bottle"},{"item":"minecraft:glass_bottle"},{"item":"minecraft:glass_bottle"}],"result":{"item":"ssspcore:hydrogen_bottle","count":4}} \ No newline at end of file diff --git a/src/main/resources/assets/ssspcore/textures/items/boric_acid.png b/src/main/resources/assets/ssspcore/textures/items/boric_acid.png new file mode 100644 index 0000000000000000000000000000000000000000..988bea873cd37562b66f58ad5efe172c60164715 GIT binary patch literal 1351 zcmV-N1-SZ&P)Hg1+lHrgWSWcKdPn90sKGrRqvPeo9CG3uKX#J{(IASm?@+di}}l?o-=)F3E6 zwD^Ni=!>T7nL9I?X}YoAW$t|Qo$sD|?zw001?ah|SeB6#0T!CBEf+H4bBB+JJu8re zhoBb*p;u8ID_yBf0ya+zcePvJL&AGs+11_tpRKn>9TgyPA7ZoSs0)aX0r00)%XR^J z`jH<$>RKN5V(7OqK*TS4xZz{h!*f1C3ECFkK$#7nA@pGN!$;%jYv zwjAKwmYb0gKL(K8-kPtb5${A?tlI~wzMrJ6wTdBr=Y%%%EaEMQ&o}4FQ^DA)s*}Z> z!FI&AHCpoWI|RUqx?7s@$8!5^Q=anY%X@i5{QA6kNcMelpE>R6eCYFpmMsVT zrI(b06~u#xf1yS}_UGdMvD``!0~u->P=lA4?YN`hilQ z|3tHka)7T{2CGqwjZfMwx$5irQN_*|e4l)UHmiYuz74Yp1t^#>hrJ3-SOXDcC_o0^ z7T9R1gAN8V6s;5)ieI5-7aQlmJn}lUna#nz!j%5V$X|o`xX!dHWQRV27P1=rj;t2b zW$~+pTw@bIek?ZvKPDL<64`^#UNTAck#RBsB6*5DP4<%UA_FqU$I>2EH_cM;u)Q~SI+rg`Rn{L z_AC5qq~L$#SMj%U$6Cz0vP{G5Y*=%5RT^yu;}-DInZ=349rJPVM6C3K^oO)8y(fJr{l>k`ead~!ea?NsT>_Ci%bnxC;Vy6= zb6>{xYV#Ue-+LB$7`JEXmTRm^AtP)R9u{)KHsMiWGV&)32xCG~*nyU<>-!d;FP=Re z4r3qYr~6#KE>;1F`>_J_P5xC?ROxV(DIHdCO*p$HRQI@7^PwV@Pvuf+ z5K}u-6REM(K@W$srgorh0{i?O)v0c>QtHxU-hBdD(>iYJ4b2sIOVX2K8m~4gmYVA5 zh^QEb$V`rCQ-|7ZS{nuL-t>?3n=-o(6I(7vocj#GzCZEo`!3>+v;dYIfPu#&ZWzzX z2i^rZ^Mu;6+rb@?NPG+6)c5T6zxpzGe*M(x+{AON=PiJ>H#?ob-|uwRK0yDg0B4PV z0id6JRRdfL?*IS*=}AOER5%gsP{B^aFbsVYZN`xf4oo0%@4rm_dOB&GKw^`~!a7Jv z949rShf143WA|CIWy^lgPY*c9*?}Vt)O9UCdF1T(b<;G`wpIei(@E@?m6z9NS*_k= zqm6X(H_7PmfAe8wYYc4LLa7{?%1~SvKm@#ZxSdY-FnhyVYtio-uJxcmPfwn!xB~PjG+tfW^}SRaN!azI4pu zD1Z}#TmVHzVh`sDT}W``5I7-_N7(Hm2Xs*|t7e0MLo5D0e*?ESj-HO}4FdoG002ov JPDHLkV1hPx$XGugsR5%gEQaet=KoEU4E+~)?1qe|3v}s&Mh$GNZkOpxEP|_iOBH{>18Xv$H zKyFe-9Khf*5{MAjj-B0QXVI)SA5qXSQnYX8&AffHG4S8vtuqjYq2hY2R%3`bj#v5v z%WA-b`Q0rk93RwXf{=B+`m`)I=O1BC?dhja&DYc05@p5(w zG072*$7(bh88<#VAggaZ-CwF z8(?b_D$ukL@aGcyy}sd^&E|rDU4g44LeXlqxMa?0_W|YW8<6Us6DtD5)$4VPx#*GWV{R5%f1U>In?h|d8J)6D-rfBt~s&8N2vJ_r9`Rf|;+WayJ8PyW9>wI9R; z17R~q1{oO{4D~E91=#36%NrS9zPQ8i<|6}x&VqB;l;9UTckbN(xqDgv@7lHNKQ5I_ zxFm=b$7uj449>qd2b=Sl*_#2EE3g^>(tP5zJcGOXeYit#8G>N|Nb}B{iVPN_4;er- zGQegCh5@f$y+YPQkd0vgOb5E{vVXV2q)=#_2B4_I!@+6*x@{mn$p7f#AagO2Cd@Ky j(dOpnhEqLEAIUTT#ivyD4ikQc00000NkvXXu0mjfFkN-f literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ssspcore/textures/items/ferric_acid.png b/src/main/resources/assets/ssspcore/textures/items/ferric_acid.png new file mode 100644 index 0000000000000000000000000000000000000000..5fddeb6843db6842e7dad9af550baa094066e2c1 GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|wt2cZhFAzD zCrD%*=s3^FfBDRR`}%(k56>>&&SS^^KOwX`R3PQWWOe_4`)#+%A7NomGKI}U$%rp(-YuBrIOln3J0UDlYHvufrB&Phsb57lR+ z1xV;joY+_>*;Dp5si3&{a6rEz!==V`l4)FK&IUXOmP$@nlt}#W>Z@euPA;iBeqh+P~Y&M1`XYBq;=KiV!`hdaH)z4*}Q$iB}3A$iC literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ssspcore/textures/items/hydrocloric_acid.png b/src/main/resources/assets/ssspcore/textures/items/hydrocloric_acid.png new file mode 100644 index 0000000000000000000000000000000000000000..f4315426cd16a523d47d99fda4fbf9a71e42dbf3 GIT binary patch literal 281 zcmV+!0p|XRP)Px#(@8`@R5%gEQb7vBFc92|A1Ge)1kZZ*(v$D-AO6If>&&SS^^KOwX`R3PQWWOe_4`)#+%A7NomGKI}U$%rp(-YuBrIOln3J0UDlYHvufrB&LCGF5w;U- z4~tnhSs6$#lXN>QB9O}ABith4lOWsrxV=r09Lp1DJ!JCW;bBfFI#KxV z-{0zPM2fbf(U_Bz6J)#o+1c=d#Wzp$Pz;&1Y`_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/ssspcore/textures/items/phosphoric_acid.png b/src/main/resources/assets/ssspcore/textures/items/phosphoric_acid.png new file mode 100644 index 0000000000000000000000000000000000000000..1a860ba6140e4907de960287985b1108698171b2 GIT binary patch literal 275 zcmV+u0qp*XP)Px#%}GQ-R5%f1U>In?h|d8J)6D-rfBt~s&8N2vJ_r9`Rf|;+WayJ8PyW9>wI9R; z17R~q1{oO{4D~E91=#36%NrS9zPQ8i<|6}x&VqB;l;9UTckbMOkcwTqc7bVZs+q6} zk|KuTCzxhX7`%Kf592bteZ8H*&CLx%JysXMG>eNqgc~3%>WS4W7$zcXMs@+rBy^Wx zxZu^RS1`3i(HI86bfMc0vKbq|X#h6G*u=0JfNmRz4+=zdagc!+fe5n&TjIeMjWG3O Z(*V