From 744feffc540dc8bf7163d434ab3dfcf3866d0413 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Wed, 13 Apr 2016 14:50:42 -0400 Subject: [PATCH] Added the recipe for the ritual tinkerer and modified the recipe for the bloodstone blocks. --- changelog.txt | 1 + .../WayofTime/bloodmagic/registry/ModRecipes.java | 3 ++- .../blockstates/item/ItemRitualReader.json | 2 +- .../resources/assets/bloodmagic/lang/en_US.lang | 1 + .../bloodmagic/textures/items/RitualTinkerer.png | Bin 0 -> 505 bytes 5 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/bloodmagic/textures/items/RitualTinkerer.png diff --git a/changelog.txt b/changelog.txt index 55c46539..07337eed 100644 --- a/changelog.txt +++ b/changelog.txt @@ -9,6 +9,7 @@ Version 2.0.0-32 - Updated for Forge 12.16.0.1859 - Did some work on the Sentient Bow to start adding abilities to it - Fixed the Speed and Jump rituals so that they correctly update the player's motion. +- Implemented the "Ritual Tinkerer" and added its recipe. ------------------------------------------------------ Version 2.0.0-31 diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 768fa030..22e0fa9a 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -51,7 +51,7 @@ public class ModRecipes GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ritualDiviner), "dfd", "ase", "dwd", 'f', EnumRuneType.FIRE.getScribeStack(), 'a', EnumRuneType.AIR.getScribeStack(), 'w', EnumRuneType.WATER.getScribeStack(), 'e', EnumRuneType.EARTH.getScribeStack(), 'd', "gemDiamond", 's', "stickWood")); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.ritualDiviner, 1, 1), " S ", "tdt", " S ", 'S', new ItemStack(ModItems.slate, 1, 3), 't', EnumRuneType.DUSK.getScribeStack(), 'd', new ItemStack(ModItems.ritualDiviner))); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.bloodStoneBrick, 1, 1), "aa", "aa", 'a', new ItemStack(ModBlocks.bloodStoneBrick))); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.bloodStoneBrick), "stone", new ItemStack(ModItems.bloodShard))); + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.bloodStoneBrick, 16), "stone", new ItemStack(ModItems.bloodShard))); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.activationCrystal, 1, 1), new ItemStack(Items.nether_star), OrbRegistry.getOrbStack(ModItems.orbArchmage)); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.soulSnare, 4, 0), "sis", "iri", "sis", 's', new ItemStack(Items.string), 'i', "ingotIron", 'r', "dustRedstone")); @@ -92,6 +92,7 @@ public class ModRecipes GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.pathBlock, 4, 7), new ItemStack(ModBlocks.pathBlock, 1, 6), new ItemStack(ModBlocks.pathBlock, 1, 6), new ItemStack(ModBlocks.pathBlock, 1, 6), new ItemStack(ModBlocks.pathBlock, 1, 6))); GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModItems.experienceTome), "ses", "lbl", "gog", 'o', OrbRegistry.getOrbStack(ModItems.orbMagician), 'e', Blocks.lapis_block, 'l', new ItemStack(ModItems.slate, 1, 2), 'b', Items.enchanted_book, 's', Items.string, 'g', "ingotGold")); + GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModItems.ritualReader), "gog", "isi", " s ", 's', new ItemStack(ModItems.slate, 1, 3), 'g', "blockGlass", 'i', "ingotGold", 'o', OrbRegistry.getOrbStack(ModItems.orbMaster))); for (int i = 1; i < BlockBloodRune.names.length; i++) GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.bloodRune), new ItemStack(ModBlocks.bloodRune, 1, i))); diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemRitualReader.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemRitualReader.json index ecd76486..6178c0a9 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/item/ItemRitualReader.json +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemRitualReader.json @@ -8,7 +8,7 @@ "type": { "normal": { "textures": { - "layer0": "bloodmagic:items/ItemRouterFilterExact" + "layer0": "bloodmagic:items/RitualTinkerer" } } } diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 4aa5d6a6..1de7f6ca 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -130,6 +130,7 @@ item.BloodMagic.altarMaker.name=Altar Maker item.BloodMagic.ritualDivinernormal.name=Ritual Diviner item.BloodMagic.ritualDivinerdusk.name=Ritual Diviner [Dusk] item.BloodMagic.ritualDivinerdawn.name=Ritual Diviner [Dawn] +item.BloodMagic.ritualReader.name=Ritual Tinkerer item.BloodMagic.arcaneAshes.name=Arcane Ashes item.BloodMagic.upgradeTome.name=Living Armour Upgrade Tome diff --git a/src/main/resources/assets/bloodmagic/textures/items/RitualTinkerer.png b/src/main/resources/assets/bloodmagic/textures/items/RitualTinkerer.png new file mode 100644 index 0000000000000000000000000000000000000000..37baf9eea60574f51227440a236abc553c0af723 GIT binary patch literal 505 zcmVVGd000McNliru-wF>CG6EoRB-sD}0ftFL zK~y-)t&+VI%5wSyQ5s4B}BC)uHhJcXclnkl)!v5e)hv$LwdtZ29RJEn1TX-Ee z5;{J|KR=7{<%dc}BlQV1-NI!*m6n!f?0YHt+U+c#9Vtz>D3{y|15CZ16iv4%PWc|d zR!!2;{)kn}D_e6rno^D28`2om3l(XI`?|0wzqdwy@Jv!y#M%_d_Lb0{9keh10aWH{?MRD00000NkvXXu0mjfH+I|; literal 0 HcmV?d00001