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 0000000..988bea8 Binary files /dev/null and b/src/main/resources/assets/ssspcore/textures/items/boric_acid.png differ diff --git a/src/main/resources/assets/ssspcore/textures/items/brine_bucket.png b/src/main/resources/assets/ssspcore/textures/items/brine_bucket.png new file mode 100644 index 0000000..8adf7e2 Binary files /dev/null and b/src/main/resources/assets/ssspcore/textures/items/brine_bucket.png differ diff --git a/src/main/resources/assets/ssspcore/textures/items/clorine_bottle.png b/src/main/resources/assets/ssspcore/textures/items/clorine_bottle.png new file mode 100644 index 0000000..a388286 Binary files /dev/null and b/src/main/resources/assets/ssspcore/textures/items/clorine_bottle.png differ 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 0000000..5fddeb6 Binary files /dev/null and b/src/main/resources/assets/ssspcore/textures/items/ferric_acid.png differ 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 0000000..f431542 Binary files /dev/null and b/src/main/resources/assets/ssspcore/textures/items/hydrocloric_acid.png differ diff --git a/src/main/resources/assets/ssspcore/textures/items/hydrogen_bottle.png b/src/main/resources/assets/ssspcore/textures/items/hydrogen_bottle.png new file mode 100644 index 0000000..a78ad2e Binary files /dev/null and b/src/main/resources/assets/ssspcore/textures/items/hydrogen_bottle.png differ 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 0000000..1a860ba Binary files /dev/null and b/src/main/resources/assets/ssspcore/textures/items/phosphoric_acid.png differ