From d79be6d312299bc26358b828b2a00119c2eb080b Mon Sep 17 00:00:00 2001 From: WayofTime Date: Fri, 6 May 2016 17:51:39 -0400 Subject: [PATCH] Added saltpeter and sulfur, used for gunpowder creation and will be used for other things. --- .../WayofTime/bloodmagic/item/ItemComponent.java | 4 ++++ .../WayofTime/bloodmagic/registry/ModRecipes.java | 4 ++++ .../blockstates/item/ItemComponent.json | 10 ++++++++++ .../resources/assets/bloodmagic/lang/en_US.lang | 2 ++ .../bloodmagic/textures/items/Saltpeter.png | Bin 0 -> 258 bytes .../assets/bloodmagic/textures/items/Sulfur.png | Bin 0 -> 295 bytes 6 files changed, 20 insertions(+) create mode 100644 src/main/resources/assets/bloodmagic/textures/items/Saltpeter.png create mode 100644 src/main/resources/assets/bloodmagic/textures/items/Sulfur.png diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java index f0cbc3d8..82448e8c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java @@ -46,6 +46,8 @@ public class ItemComponent extends Item implements IVariantProvider public static final String SAND_GOLD = "goldSand"; public static final String SAND_COAL = "coalSand"; public static final String PLANT_OIL = "plantOil"; + public static final String SULFUR = "sulfur"; + public static final String SALTPETER = "saltpeter"; public ItemComponent() { @@ -83,6 +85,8 @@ public class ItemComponent extends Item implements IVariantProvider names.add(20, SAND_GOLD); names.add(21, SAND_COAL); names.add(22, PLANT_OIL); + names.add(23, SULFUR); + names.add(24, SALTPETER); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index b8e30c12..a1201f8e 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -291,6 +291,10 @@ public class ModRecipes AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Blocks.CLAY, 5), 200, 200, 1, Items.WATER_BUCKET, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY); AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Blocks.OBSIDIAN), 50, 50, 1, Items.WATER_BUCKET, Items.LAVA_BUCKET); + AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.SULFUR, 8), 0, 100, 0, Items.LAVA_BUCKET); + AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.SALTPETER, 4), 0, 100, 0, ItemComponent.getStack(ItemComponent.PLANT_OIL), ItemComponent.getStack(ItemComponent.PLANT_OIL), "dustCoal"); + AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Items.GUNPOWDER, 3), 0, 100, 0, ItemComponent.getStack(ItemComponent.SALTPETER), ItemComponent.getStack(ItemComponent.SULFUR), new ItemStack(Items.COAL, 1, 1)); + AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(ItemComponent.getStack(ItemComponent.SAND_COAL, 4), 100, 100, 1, new ItemStack(Items.COAL, 1, 0), new ItemStack(Items.COAL, 1, 0), Items.FLINT)); AlchemyTableRecipeRegistry.registerRecipe(ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC), 1000, 400, 1, "dustCoal", Items.GUNPOWDER, Items.REDSTONE, Items.SUGAR, ItemComponent.getStack(ItemComponent.PLANT_OIL), new ItemStack(Items.POTIONITEM)); diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemComponent.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemComponent.json index 3c5fc962..2c5d025a 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/item/ItemComponent.json +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemComponent.json @@ -120,6 +120,16 @@ "textures": { "layer0": "bloodmagic:items/PlantOil" } + }, + "sulfur": { + "textures": { + "layer0": "bloodmagic:items/Sulfur" + } + }, + "saltpeter": { + "textures": { + "layer0": "bloodmagic:items/Saltpeter" + } } } } diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index ffae5a3c..0b004dcb 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -91,6 +91,8 @@ item.BloodMagic.baseComponent.ironSand.name=Iron Sand item.BloodMagic.baseComponent.goldSand.name=Gold Sand item.BloodMagic.baseComponent.coalSand.name=Coal Sand item.BloodMagic.baseComponent.plantOil.name=Plant Oil +item.BloodMagic.baseComponent.sulfur.name=Sulfur +item.BloodMagic.baseComponent.saltpeter.name=Saltpeter item.BloodMagic.cuttingFluid.basicCuttingFluid.name=Basic Cutting Fluid item.BloodMagic.cuttingFluid.explosive.name=Explosive Powder diff --git a/src/main/resources/assets/bloodmagic/textures/items/Saltpeter.png b/src/main/resources/assets/bloodmagic/textures/items/Saltpeter.png new file mode 100644 index 0000000000000000000000000000000000000000..10daa2f24efb1ad38e4dfca94e17b4b90a39d29c GIT binary patch literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)0hmHZw3xc$aAl6yYrJ zh%9Dc;5!1sj8nDwq=AC$C7!;n>7Kz_*hmXa?LiwbMTj)m?ak)qPnOv5*Y*`l=+Af%UrR#jt zoiY={m7~W0(?j&FtJMfr4nJ@ErkR#;MwT(m+A>5>H=O_6MwNqD-7=GPjI@LR&mt978Nl@15++b;v-VHC~G& zvP-?-HLK1R^A9_=sT;6f+}k0&-AOZ6to73_4NYfh;UzDcCq$n4J!8Jh#3M4UGgjVb z>WbNTV(NbPN#~M{CM;F+_MO}~|5MX50hNq8+wE~3*K2HAv^$?1m^7D-Vb5(|28G_Q z0?}*3YuA-?KR;dCF}<7p%*vm6y_q&^Ss3!ZYkHhqu5)|Bq+_etCfQCEPEgzyzH-&O o{LC_@V+yM`8gl%&o&JhJr}*2