From ec2ddbd4271ef038ce75c11d90395e5f10e2f28e Mon Sep 17 00:00:00 2001 From: WayofTime Date: Thu, 5 May 2016 15:46:09 -0400 Subject: [PATCH] Added more alchemy recipes --- changelog.txt | 1 + .../bloodmagic/item/alchemy/ItemCuttingFluid.java | 4 ++++ .../WayofTime/bloodmagic/registry/ModRecipes.java | 14 +++++++++----- .../blockstates/item/ItemCuttingFluid.json | 5 +++++ .../resources/assets/bloodmagic/lang/en_US.lang | 1 + .../bloodmagic/textures/items/ExplosivePowder.png | Bin 0 -> 484 bytes 6 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/bloodmagic/textures/items/ExplosivePowder.png diff --git a/changelog.txt b/changelog.txt index b0790631..b54a3b8b 100644 --- a/changelog.txt +++ b/changelog.txt @@ -5,6 +5,7 @@ Version 2.0.0-36 - Changed the Item Routing system so that it used capabilities instead - Updated the Alchemy Table recipe system so that it can provide better custom recipes. - Added some more recipes (like rudimentary ore doubling) to the alchemy table. +- Added Explosive Powder, which is used to reduce cobblestone into gravel and gravel into sand (64 uses) ------------------------------------------------------ Version 2.0.0-35 diff --git a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java index babbdc62..a4652c5c 100644 --- a/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java +++ b/src/main/java/WayofTime/bloodmagic/item/alchemy/ItemCuttingFluid.java @@ -29,6 +29,7 @@ public class ItemCuttingFluid extends Item implements IVariantProvider, ICustomA private static ArrayList names = new ArrayList(); public static final String BASIC = "basicCuttingFluid"; + public static final String EXPLOSIVE = "explosive"; public ItemCuttingFluid() { @@ -53,6 +54,7 @@ public class ItemCuttingFluid extends Item implements IVariantProvider, ICustomA private void buildItemList() { names.add(0, BASIC); + names.add(1, EXPLOSIVE); } @Override @@ -105,6 +107,8 @@ public class ItemCuttingFluid extends Item implements IVariantProvider, ICustomA { case 0: return 16; + case 1: + return 64; default: return 1; } diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 4a83bad4..b8e30c12 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -283,9 +283,10 @@ public class ModRecipes AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Items.FLINT, 2), 0, 20, 0, Blocks.GRAVEL, Items.FLINT); AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Items.LEATHER, 4), 100, 200, 1, Items.ROTTEN_FLESH, Items.ROTTEN_FLESH, Items.ROTTEN_FLESH, Items.ROTTEN_FLESH, Items.FLINT, Items.WATER_BUCKET); + AlchemyTableRecipeRegistry.registerRecipe(ItemCuttingFluid.getStack(ItemCuttingFluid.EXPLOSIVE), 500, 200, 1, Items.GUNPOWDER, Items.GUNPOWDER, "dustCoal"); + AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Items.BREAD), 100, 200, 1, Items.WHEAT, Items.SUGAR); AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Blocks.GRASS), 200, 200, 1, Blocks.DIRT, new ItemStack(Items.DYE, 1, 15), Items.WHEAT_SEEDS); - AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Blocks.SAND, 2), 50, 50, 1, "cobblestone", Items.GUNPOWDER); AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Items.CLAY_BALL, 4), 50, 100, 2, Items.WATER_BUCKET, "sand"); 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); @@ -297,9 +298,12 @@ public class ModRecipes AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(ItemComponent.getStack(ItemComponent.SAND_IRON, 2), 400, 200, 1, "oreIron", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC))); AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(ItemComponent.getStack(ItemComponent.SAND_GOLD, 2), 400, 200, 1, "oreGold", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC))); - AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.PLANT_OIL), 100, 100, 1, Items.CARROT, Items.CARROT, Items.CARROT, new ItemStack(Items.DYE, 15)); - AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.PLANT_OIL), 100, 100, 1, Items.POTATO, Items.POTATO, new ItemStack(Items.DYE, 15)); - AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.PLANT_OIL), 100, 100, 1, Items.WHEAT, Items.WHEAT, new ItemStack(Items.DYE, 15)); - AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.PLANT_OIL), 100, 100, 1, Items.BEETROOT, Items.BEETROOT, Items.BEETROOT, new ItemStack(Items.DYE, 15)); + AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(new ItemStack(Blocks.GRAVEL), 50, 50, 1, "cobblestone", ItemCuttingFluid.getStack(ItemCuttingFluid.EXPLOSIVE))); + AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(new ItemStack(Blocks.SAND), 50, 50, 1, Blocks.GRAVEL, ItemCuttingFluid.getStack(ItemCuttingFluid.EXPLOSIVE))); + + AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.PLANT_OIL), 100, 100, 1, Items.CARROT, Items.CARROT, Items.CARROT, new ItemStack(Items.DYE, 1, 15)); + AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.PLANT_OIL), 100, 100, 1, Items.POTATO, Items.POTATO, new ItemStack(Items.DYE, 1, 15)); + AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.PLANT_OIL), 100, 100, 1, Items.WHEAT, Items.WHEAT, new ItemStack(Items.DYE, 1, 15)); + AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.PLANT_OIL), 100, 100, 1, Items.BEETROOT, Items.BEETROOT, Items.BEETROOT, new ItemStack(Items.DYE, 1, 15)); } } diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemCuttingFluid.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemCuttingFluid.json index caeb0464..fbd1ac61 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/item/ItemCuttingFluid.json +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemCuttingFluid.json @@ -9,6 +9,11 @@ "basiccuttingfluid": { "textures": { "layer0": "bloodmagic:items/BasicCuttingFluid" + } + }, + "explosive": { + "textures": { + "layer0": "bloodmagic:items/ExplosivePowder" } } } diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 80105cce..ffae5a3c 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -93,6 +93,7 @@ item.BloodMagic.baseComponent.coalSand.name=Coal Sand item.BloodMagic.baseComponent.plantOil.name=Plant Oil item.BloodMagic.cuttingFluid.basicCuttingFluid.name=Basic Cutting Fluid +item.BloodMagic.cuttingFluid.explosive.name=Explosive Powder item.BloodMagic.demonCrystal.crystalDefault.name=Demon Will Crystal item.BloodMagic.demonCrystal.crystalCorrosive.name=Corrosive Will Crystal diff --git a/src/main/resources/assets/bloodmagic/textures/items/ExplosivePowder.png b/src/main/resources/assets/bloodmagic/textures/items/ExplosivePowder.png new file mode 100644 index 0000000000000000000000000000000000000000..6a7b7938e9cd4aa55168f30411ecd8d1de9dbcab GIT binary patch literal 484 zcmVi92ngfBrH>7+i#2(dZ3+;AWo>M1MKi`x4!yTzs ztFpL1E3rO(Xkq7z_qzn#N=@`8xxEUavR@N#?l#gu`LA5-<-l6bgA3i^8>l aP3i+106BKj5+Sbu0000