lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Tweaked Tartaric Gem interactions.

Browse source
This commit is contained in:
WayofTime 2016-03-29 16:34:39 -04:00
parent 39dbaea109
commit 3fc5a76d53
4 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java
View file

@ -215,7 +215,8 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I
@Override @Override
public int getMaxWill(EnumDemonWillType type, ItemStack soulGemStack) 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; return 0;
} }
@ -263,7 +264,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I
@Override @Override
public double fillWill(EnumDemonWillType type, ItemStack stack, double fillAmount) 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; return 0;
} }

15
src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java
View file

@ -18,6 +18,7 @@ import WayofTime.bloodmagic.compress.BaseCompressionHandler;
import WayofTime.bloodmagic.compress.StorageBlockCraftingManager; import WayofTime.bloodmagic.compress.StorageBlockCraftingManager;
import WayofTime.bloodmagic.item.ItemComponent; import WayofTime.bloodmagic.item.ItemComponent;
import WayofTime.bloodmagic.item.ItemDemonCrystal; import WayofTime.bloodmagic.item.ItemDemonCrystal;
import WayofTime.bloodmagic.item.soul.ItemSoulGem;
import net.minecraft.init.Blocks; import net.minecraft.init.Blocks;
import net.minecraft.init.Items; import net.minecraft.init.Items;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -92,6 +93,20 @@ public class ModRecipes
for (int i = 1; i < BlockBloodRune.names.length; i++) for (int i = 1; i < BlockBloodRune.names.length; i++)
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModBlocks.bloodRune), new ItemStack(ModBlocks.bloodRune, 1, 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() public static void addAltarRecipes()

4
src/main/java/WayofTime/bloodmagic/tile/TileSoulForge.java
View file

@ -329,13 +329,13 @@ public class TileSoulForge extends TileInventory implements ITickable, IDemonWil
@Override @Override
public boolean canFill(EnumDemonWillType type) public boolean canFill(EnumDemonWillType type)
{ {
return type.equals(EnumDemonWillType.DEFAULT); return true;
} }
@Override @Override
public boolean canDrain(EnumDemonWillType type) public boolean canDrain(EnumDemonWillType type)
{ {
return type.equals(EnumDemonWillType.DEFAULT); return true;
} }
@Override @Override

6
src/main/resources/assets/bloodmagic/lang/en_US.lang
View file

@ -340,6 +340,12 @@ tooltip.BloodMagic.fluid.capacity=Capacity
tooltip.BloodMagic.ghost.everything=Everything tooltip.BloodMagic.ghost.everything=Everything
tooltip.BloodMagic.ghost.amount=Ghost item amount: %d 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
ritual.BloodMagic.testRitual=Test Ritual ritual.BloodMagic.testRitual=Test Ritual
ritual.BloodMagic.waterRitual=Ritual of the Full Spring ritual.BloodMagic.waterRitual=Ritual of the Full Spring