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

More changes

Browse source
This commit is contained in:
WayofTime 2014-02-19 17:03:56 -05:00
parent 9aaa65feb4
commit d5ba110323
56 changed files with 1250 additions and 618 deletions
Download patch file Download diff file Expand all files Collapse all files

16
1.7.2/java/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java
View file

@ -71,10 +71,10 @@ public class EnergyBattery extends Item implements ArmourUpgrade, IBindable
EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
World world = par3EntityPlayer.worldObj;
if (par3EntityPlayer instanceof FakePlayer || par3EntityPlayer instanceof EntityPlayerMP)
{
return par1ItemStack;
}
// if (par3EntityPlayer instanceof FakePlayer || par3EntityPlayer instanceof EntityPlayerMP)
// {
// return par1ItemStack;
// }
if (world != null)
{
@ -85,10 +85,10 @@ public class EnergyBattery extends Item implements ArmourUpgrade, IBindable
SpellHelper.sendIndexedParticleToAllAround(world, posX, posY, posZ, 20, world.provider.dimensionId, 4, posX, posY, posZ);
}
if (!(par3EntityPlayer.getClass().equals(EntityPlayerMP.class)))
{
return par1ItemStack;
}
// if (!(par3EntityPlayer.getClass().equals(EntityPlayerMP.class)))
// {
// return par1ItemStack;
// }

5
1.7.2/java/WayofTime/alchemicalWizardry/common/items/EnergyItems.java
View file

@ -382,6 +382,11 @@ public class EnergyItems extends Item implements IBindable
world.setItemData(ownerName, data);
}
if(data.currentEssence>=maximum)
{
return;
}
data.currentEssence = Math.min(maximum, data.currentEssence + amount);
data.markDirty();
}

2
1.7.2/java/WayofTime/alchemicalWizardry/common/items/ItemSpellEffectBlock.java
View file

@ -41,7 +41,7 @@ public class ItemSpellEffectBlock extends ItemBlock
break;
case 3:
name = "water";
name = "earth";
break;
default:

10
1.7.2/java/WayofTime/alchemicalWizardry/common/items/ItemSpellModifierBlock.java
View file

@ -26,18 +26,22 @@ public class ItemSpellModifierBlock extends ItemBlock
{
case 0:
{
name = "power";
name = "default";
break;
}
case 1:
{
name = "efficiency";
name = "offensive";
break;
}
case 2:
name = "potency";
name = "defensive";
break;
case 3:
name = "environmental";
break;
default:

2
1.7.2/java/WayofTime/alchemicalWizardry/common/items/sigil/DivinationSigil.java
View file

@ -68,7 +68,7 @@ public class DivinationSigil extends Item implements ArmourUpgrade
//PacketDispatcher.sendPacketToServer(PacketHandler.getPacket(ownerName));
int currentEssence = EnergyItems.getCurrentEssence(ownerName);
par3EntityPlayer.addChatMessage(new ChatComponentText("Current Essence: " + 0));
par3EntityPlayer.addChatMessage(new ChatComponentText("Current Essence: " + EnergyItems.getCurrentEssence(ownerName)));
return par1ItemStack;
}