From c015e3421fad88714f7844945c91f231a618434b Mon Sep 17 00:00:00 2001 From: WayofTime Date: Fri, 8 Jan 2016 11:06:07 -0500 Subject: [PATCH] Fixed toggleable sigils not binding. --- changelog.txt | 3 +++ .../WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java | 1 + src/main/java/WayofTime/bloodmagic/registry/ModPotions.java | 2 ++ src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java | 3 ++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index 11a465ca..2a82d0bc 100644 --- a/changelog.txt +++ b/changelog.txt @@ -14,6 +14,9 @@ Version 2.0.0-4 - Added the Soul Sword, which will be powered by consuming souls - Added a Lesser Soul Gem in order to hold onto more souls - SSSSSSSSoooooooouuuuuuulllllllllsssssss + - Added Soul Forge block + +- Fixed binding of togglable sigils ------------------------------------------------------ Version 2.0.0-3 diff --git a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java index af57e736..a17a8310 100644 --- a/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java +++ b/src/main/java/WayofTime/bloodmagic/item/sigil/ItemSigilToggleable.java @@ -37,6 +37,7 @@ public class ItemSigilToggleable extends ItemSigilBase @Override public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + BindableHelper.checkAndSetItemOwner(stack, player); if (!world.isRemote && !isUnusable(stack)) { if (player.isSneaking()) diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModPotions.java b/src/main/java/WayofTime/bloodmagic/registry/ModPotions.java index 292a8d52..b2ec15f3 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModPotions.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModPotions.java @@ -15,6 +15,7 @@ public class ModPotions public static Potion heavyHeart; public static Potion whirlwind; public static Potion planarBinding; + public static Potion soulSnare; public static void init() { @@ -37,6 +38,7 @@ public class ModPotions , false, 0, 0, 0); whirlwind = new PotionBloodMagic("Whirlwind", new ResourceLocation("whirlwind"), false, 0, 0, 0); planarBinding = new PotionBloodMagic("Planar Binding", new ResourceLocation("planarBinding"), false, 0, 0, 0); + soulSnare = new PotionBloodMagic("Soul Snare", new ResourceLocation("soulSnare"), false, 0, 0, 0); // heavyHeart = new PotionBloodMagic("Heavy Heart", new // ResourceLocation(resourceLocation + // heavyHeart.getName().toLowerCase()), true, 0, 0, 0); diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 44468e40..a2d99671 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -160,6 +160,7 @@ public class ModRecipes public static void addSoulForgeRecipes() { - SoulForgeRecipeRegistry.registerRecipe(new ItemStack(Items.diamond), 1, 0.5, new ItemStack(Items.redstone), new ItemStack(Items.redstone), new ItemStack(Items.redstone)); + SoulForgeRecipeRegistry.registerRecipe(new ItemStack(ModItems.soulGem), 1, 1, "dustRedstone", "gemDiamond", "blockGlass", "dyeBlue"); + SoulForgeRecipeRegistry.registerRecipe(new ItemStack(ModItems.soulSword), 0, 0, new ItemStack(ModItems.soulGem), new ItemStack(Items.iron_sword)); } }