From 3fc5a76d53fd1ac4e63b1578bcd5ec11983d92e3 Mon Sep 17 00:00:00 2001
From: WayofTime <wtime@live.ca>
Date: Tue, 29 Mar 2016 16:34:39 -0400
Subject: [PATCH] Tweaked Tartaric Gem interactions.

---
 .../bloodmagic/item/soul/ItemSoulGem.java         |  5 +++--
 .../WayofTime/bloodmagic/registry/ModRecipes.java | 15 +++++++++++++++
 .../WayofTime/bloodmagic/tile/TileSoulForge.java  |  4 ++--
 .../resources/assets/bloodmagic/lang/en_US.lang   |  6 ++++++
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java
index 09b59bd7..967a0d84 100644
--- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java
+++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java
@@ -215,7 +215,8 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I
     @Override
     public int getMaxWill(EnumDemonWillType type, ItemStack soulGemStack)
     {
-        if (!type.equals(getCurrentType(soulGemStack)))
+        EnumDemonWillType currentType = getCurrentType(soulGemStack);
+        if (!type.equals(currentType) && currentType != EnumDemonWillType.DEFAULT)
         {
             return 0;
         }
@@ -263,7 +264,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I
     @Override
     public double fillWill(EnumDemonWillType type, ItemStack stack, double fillAmount)
     {
-        if (!type.equals(getCurrentType(stack)))
+        if (!type.equals(getCurrentType(stack)) && this.getWill(getCurrentType(stack), stack) > 0)
         {
             return 0;
         }
diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java
index 82cd9bae..9aeedd45 100644
--- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java
+++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java
@@ -18,6 +18,7 @@ import WayofTime.bloodmagic.compress.BaseCompressionHandler;
 import WayofTime.bloodmagic.compress.StorageBlockCraftingManager;
 import WayofTime.bloodmagic.item.ItemComponent;
 import WayofTime.bloodmagic.item.ItemDemonCrystal;
+import WayofTime.bloodmagic.item.soul.ItemSoulGem;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
@@ -92,6 +93,20 @@ public class ModRecipes
 
         for (int i = 1; i < BlockBloodRune.names.length; i++)
             GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.bloodRune), new ItemStack(ModBlocks.bloodRune, 1, i)));
+
+        for (int i = 0; i < ItemSoulGem.names.length; i++)
+        {
+            for (int j = 0; j < ItemDemonCrystal.getNames().size(); j++)
+            {
+                ItemStack baseGemStack = new ItemStack(ModItems.soulGem, 1, i);
+                ItemStack newGemStack = new ItemStack(ModItems.soulGem, 1, i);
+
+                ItemStack crystalStack = new ItemStack(ModItems.itemDemonCrystal, 1, j);
+
+                ((ItemSoulGem) ModItems.soulGem).setCurrentType(((ItemDemonCrystal) ModItems.itemDemonCrystal).getType(crystalStack), newGemStack);
+                GameRegistry.addShapelessRecipe(newGemStack, baseGemStack, crystalStack);
+            }
+        }
     }
 
     public static void addAltarRecipes()
diff --git a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java
index 2e4310a9..5685fb56 100644
--- a/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java
+++ b/src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java
@@ -329,13 +329,13 @@ public class TileSoulForge extends TileInventory implements ITickable, IDemonWil
     @Override
     public boolean canFill(EnumDemonWillType type)
     {
-        return type.equals(EnumDemonWillType.DEFAULT);
+        return true;
     }
 
     @Override
     public boolean canDrain(EnumDemonWillType type)
     {
-        return type.equals(EnumDemonWillType.DEFAULT);
+        return true;
     }
 
     @Override
diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang
index 5423395e..c281e858 100644
--- a/src/main/resources/assets/bloodmagic/lang/en_US.lang
+++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang
@@ -340,6 +340,12 @@ tooltip.BloodMagic.fluid.capacity=Capacity
 tooltip.BloodMagic.ghost.everything=Everything
 tooltip.BloodMagic.ghost.amount=Ghost item amount: %d
 
+tooltip.BloodMagic.currentType.default=Contains: Default Will
+tooltip.BloodMagic.currentType.corrosive=Contains: Corrosive Will
+tooltip.BloodMagic.currentType.destructive=Contains: Destructive Will
+tooltip.BloodMagic.currentType.vengeful=Contains: Vengeful Will
+tooltip.BloodMagic.currentType.steadfast=Contains: Steadfast Will
+
 # Ritual
 ritual.BloodMagic.testRitual=Test Ritual
 ritual.BloodMagic.waterRitual=Ritual of the Full Spring