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 00000000..10daa2f2 Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/items/Saltpeter.png differ diff --git a/src/main/resources/assets/bloodmagic/textures/items/Sulfur.png b/src/main/resources/assets/bloodmagic/textures/items/Sulfur.png new file mode 100644 index 00000000..a91b1f1d Binary files /dev/null and b/src/main/resources/assets/bloodmagic/textures/items/Sulfur.png differ