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

Added in Unbinding Ritual recipes (UnbindingRegistry.registerRecipe(outputItemStack, inputItemStack)) and automatic reversion of registered Binding Recipes. Renamed Binding Ritual class, updated ritual blacklist. Blood Magic, now with 8% more lightning!

Browse source
This commit is contained in:
Arcaratus 2015-05-11 21:38:16 -04:00
parent 1eefcda6ca
commit 9247e66f13
7 changed files with 177 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectSoulBound.java → src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectBinding.java
View file

@ -19,7 +19,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
public class RitualEffectSoulBound extends RitualEffect
public class RitualEffectBinding extends RitualEffect
{
@Override
public void performEffect(IMasterRitualStone ritualStone)

43
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectUnbinding.java
View file

@ -3,6 +3,7 @@ package WayofTime.alchemicalWizardry.common.rituals;
import WayofTime.alchemicalWizardry.ModBlocks;
import WayofTime.alchemicalWizardry.ModItems;
import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry;
import WayofTime.alchemicalWizardry.api.bindingRegistry.UnbindingRegistry;
import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable;
import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone;
import WayofTime.alchemicalWizardry.api.rituals.RitualComponent;
@ -95,15 +96,15 @@ public class RitualEffectUnbinding extends RitualEffect
{
ritualStone.setVar1(-1);
}
else if (UnbindingRegistry.isRequiredItemValid(itemStack))
{
ritualStone.setVar1(UnbindingRegistry.getIndexForItem(itemStack) + 9);
}
if (ritualStone.getVar1() > 0)
if (ritualStone.getVar1() > 0 && ritualStone.getVar1() <= 8)
{
item.setDead();
world.addWeatherEffect(new EntityLightningBolt(world, x, y + 1, z - 5));
world.addWeatherEffect(new EntityLightningBolt(world, x, y + 1, z + 5));
world.addWeatherEffect(new EntityLightningBolt(world, x - 5, y + 1, z));
world.addWeatherEffect(new EntityLightningBolt(world, x + 5, y + 1, z));
NBTTagCompound itemTag = itemStack.getTagCompound();
doLightning(world, x, y, z);
ItemStack[] inv = ((BoundArmour) itemStack.getItem()).getInternalInventory(itemStack);
if (inv != null)
@ -112,6 +113,7 @@ public class RitualEffectUnbinding extends RitualEffect
{
if (internalItem != null)
{
doLightning(world, x, y, z);
EntityItem newItem = new EntityItem(world, x + 0.5, y + 1, z + 0.5, internalItem.copy());
world.spawnEntityInWorld(newItem);
}
@ -126,11 +128,7 @@ public class RitualEffectUnbinding extends RitualEffect
} else if (ritualStone.getVar1() == -1)
{
item.setDead();
world.addWeatherEffect(new EntityLightningBolt(world, x, y + 1, z - 5));
world.addWeatherEffect(new EntityLightningBolt(world, x, y + 1, z + 5));
world.addWeatherEffect(new EntityLightningBolt(world, x - 5, y + 1, z));
world.addWeatherEffect(new EntityLightningBolt(world, x + 5, y + 1, z));
NBTTagCompound itemTag = itemStack.getTagCompound();
doLightning(world, x, y, z);
ItemStack[] inv = ((SigilOfHolding) itemStack.getItem()).getInternalInventory(itemStack);
if (inv != null)
@ -151,12 +149,21 @@ public class RitualEffectUnbinding extends RitualEffect
drain = true;
break;
}
else if (ritualStone.getVar1() >= 9)
{
item.setDead();
doLightning(world, x, y, z);
ItemStack spawnedItem = UnbindingRegistry.getOutputForIndex(ritualStone.getVar1() - 9);
EntityItem newItem = new EntityItem(world, x + 0.5, y + 1, z + 0.5, spawnedItem.copy());
world.spawnEntityInWorld(newItem);
ritualStone.setActive(false);
drain = true;
break;
}
}
if (drain)
{
if (drain) {
SoulNetworkHandler.syphonFromNetwork(owner, this.getCostPerRefresh());
}
}
@ -167,6 +174,14 @@ public class RitualEffectUnbinding extends RitualEffect
}
}
private void doLightning(World world, int x, int y, int z)
{
world.addWeatherEffect(new EntityLightningBolt(world, x, y + 1, z - 5));
world.addWeatherEffect(new EntityLightningBolt(world, x, y + 1, z + 5));
world.addWeatherEffect(new EntityLightningBolt(world, x - 5, y + 1, z));
world.addWeatherEffect(new EntityLightningBolt(world, x + 5, y + 1, z));
}
@Override
public int getCostPerRefresh()
{

1
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/container/ContainerTeleposer.java
View file

@ -52,7 +52,6 @@ public class ContainerTeleposer extends Container
{
ItemStack stackInSlot = slotObject.getStack();
stack = stackInSlot.copy();
System.out.println("Slots: " + slots);
if (stack.getItem() instanceof TelepositionFocus)
{