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

Massive rework of configs, items and blocks.

Browse source 
I redone where the items/blocsks are stored and how the configs are
handled to clean up it and give space. You can change the config line to
AWWayofTime if you want to keep the compatibility with old configs. Now
you reference the blocks from the ModBlocks and Items from the ModItems.
This commit is contained in:
Fenn 2014-01-17 21:05:38 +00:00
parent 8601e9faff
commit e3644f2d2b
304 changed files with 3941 additions and 5108 deletions
Download patch file Download diff file Expand all files Collapse all files

22
BM_src/WayofTime/alchemicalWizardry/common/items/sigil/AirSigil.java
View file

@ -1,20 +1,19 @@
package WayofTime.alchemicalWizardry.common.items.sigil;
import java.util.List;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
public class AirSigil extends EnergyItems implements ArmourUpgrade
{
import java.util.List;
public class AirSigil extends EnergyItems implements ArmourUpgrade {
private int energyUsed;
public AirSigil(int id)
@ -66,7 +65,7 @@ public class AirSigil extends EnergyItems implements ArmourUpgrade
par3EntityPlayer.motionX = vec.xCoord * wantedVelocity;
par3EntityPlayer.motionY = vec.yCoord * wantedVelocity;
par3EntityPlayer.motionZ = vec.zCoord * wantedVelocity;
par2World.playSoundEffect((double)((float)par3EntityPlayer.posX + 0.5F), (double)((float)par3EntityPlayer.posY + 0.5F), (double)((float)par3EntityPlayer.posZ + 0.5F), "random.fizz", 0.5F, 2.6F + (par2World.rand.nextFloat() - par2World.rand.nextFloat()) * 0.8F);
par2World.playSoundEffect((double) ((float) par3EntityPlayer.posX + 0.5F), (double) ((float) par3EntityPlayer.posY + 0.5F), (double) ((float) par3EntityPlayer.posZ + 0.5F), "random.fizz", 0.5F, 2.6F + (par2World.rand.nextFloat() - par2World.rand.nextFloat()) * 0.8F);
par3EntityPlayer.fallDistance = 0;
if (!par3EntityPlayer.capabilities.isCreativeMode)
@ -74,8 +73,7 @@ public class AirSigil extends EnergyItems implements ArmourUpgrade
if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{
}
}
else
} else
{
return par1ItemStack;
}

21
BM_src/WayofTime/alchemicalWizardry/common/items/sigil/DivinationSigil.java
View file

@ -1,7 +1,12 @@
package WayofTime.alchemicalWizardry.common.items.sigil;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.PacketHandler;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@ -10,16 +15,10 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.PacketHandler;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class DivinationSigil extends Item implements ArmourUpgrade
{
import java.util.List;
public class DivinationSigil extends Item implements ArmourUpgrade {
public DivinationSigil(int par1)
{
super(par1);

34
BM_src/WayofTime/alchemicalWizardry/common/items/sigil/ItemBloodLightSigil.java
View file

@ -1,21 +1,21 @@
package WayofTime.alchemicalWizardry.common.items.sigil;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ModBlocks;
import WayofTime.alchemicalWizardry.common.entity.projectile.EntityBloodLightProjectile;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.entity.projectile.EntityBloodLightProjectile;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class ItemBloodLightSigil extends EnergyItems
{
import java.util.List;
public class ItemBloodLightSigil extends EnergyItems {
private int tickDelay = 100;
public ItemBloodLightSigil(int id)
@ -59,32 +59,32 @@ public class ItemBloodLightSigil extends EnergyItems
if (par7 == 0 && par3World.isAirBlock(par4, par5 - 1, par6))
{
par3World.setBlock(par4, par5 - 1, par6, AlchemicalWizardry.blockBloodLight.blockID);
par3World.setBlock(par4, par5 - 1, par6, ModBlocks.blockBloodLight.blockID);
}
if (par7 == 1 && par3World.isAirBlock(par4, par5 + 1, par6))
{
par3World.setBlock(par4, par5 + 1, par6, AlchemicalWizardry.blockBloodLight.blockID);
par3World.setBlock(par4, par5 + 1, par6, ModBlocks.blockBloodLight.blockID);
}
if (par7 == 2 && par3World.isAirBlock(par4, par5, par6 - 1))
{
par3World.setBlock(par4, par5, par6 - 1 , AlchemicalWizardry.blockBloodLight.blockID);
par3World.setBlock(par4, par5, par6 - 1, ModBlocks.blockBloodLight.blockID);
}
if (par7 == 3 && par3World.isAirBlock(par4, par5, par6 + 1))
{
par3World.setBlock(par4, par5, par6 + 1 , AlchemicalWizardry.blockBloodLight.blockID);
par3World.setBlock(par4, par5, par6 + 1, ModBlocks.blockBloodLight.blockID);
}
if (par7 == 4 && par3World.isAirBlock(par4 - 1, par5, par6))
{
par3World.setBlock(par4 - 1, par5, par6, AlchemicalWizardry.blockBloodLight.blockID);
par3World.setBlock(par4 - 1, par5, par6, ModBlocks.blockBloodLight.blockID);
}
if (par7 == 5 && par3World.isAirBlock(par4 + 1, par5, par6))
{
par3World.setBlock(par4 + 1, par5, par6, AlchemicalWizardry.blockBloodLight.blockID);
par3World.setBlock(par4 + 1, par5, par6, ModBlocks.blockBloodLight.blockID);
}
return true;
@ -123,7 +123,7 @@ public class ItemBloodLightSigil extends EnergyItems
return;
}
EntityPlayer par3EntityPlayer = (EntityPlayer)par3Entity;
EntityPlayer par3EntityPlayer = (EntityPlayer) par3Entity;
if (par1ItemStack.stackTagCompound == null)
{
@ -134,7 +134,7 @@ public class ItemBloodLightSigil extends EnergyItems
{
if (par2World.getWorldTime() % tickDelay == par1ItemStack.stackTagCompound.getInteger("worldTimeDelay") && par3Entity instanceof EntityPlayer)
{
EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer)par3Entity, getEnergyUsed());
EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3Entity, getEnergyUsed());
}
}

52
BM_src/WayofTime/alchemicalWizardry/common/items/sigil/LavaSigil.java
View file

@ -1,7 +1,11 @@
package WayofTime.alchemicalWizardry.common.items.sigil;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.items.EnergyBattery;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.player.EntityPlayer;
@ -13,16 +17,13 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumMovingObjectType;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.items.EnergyBattery;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class LavaSigil extends ItemBucket implements ArmourUpgrade
{
/** field for checking if the bucket has been filled. */
import java.util.List;
public class LavaSigil extends ItemBucket implements ArmourUpgrade {
/**
* field for checking if the bucket has been filled.
*/
private int isFull = Block.lavaMoving.blockID;
private int energyUsed;
@ -76,17 +77,16 @@ public class LavaSigil extends ItemBucket implements ArmourUpgrade
}
float f = 1.0F;
double d0 = par3EntityPlayer.prevPosX + (par3EntityPlayer.posX - par3EntityPlayer.prevPosX) * (double)f;
double d1 = par3EntityPlayer.prevPosY + (par3EntityPlayer.posY - par3EntityPlayer.prevPosY) * (double)f + 1.62D - (double)par3EntityPlayer.yOffset;
double d2 = par3EntityPlayer.prevPosZ + (par3EntityPlayer.posZ - par3EntityPlayer.prevPosZ) * (double)f;
double d0 = par3EntityPlayer.prevPosX + (par3EntityPlayer.posX - par3EntityPlayer.prevPosX) * (double) f;
double d1 = par3EntityPlayer.prevPosY + (par3EntityPlayer.posY - par3EntityPlayer.prevPosY) * (double) f + 1.62D - (double) par3EntityPlayer.yOffset;
double d2 = par3EntityPlayer.prevPosZ + (par3EntityPlayer.posZ - par3EntityPlayer.prevPosZ) * (double) f;
boolean flag = this.isFull == 0;
MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(par2World, par3EntityPlayer, flag);
if (movingobjectposition == null)
{
return par1ItemStack;
}
else
} else
{
if (movingobjectposition.typeOfHit == EnumMovingObjectType.TILE)
{
@ -102,8 +102,7 @@ public class LavaSigil extends ItemBucket implements ArmourUpgrade
if (this.isFull == 0)
{
//Empty
}
else
} else
{
if (movingobjectposition.sideHit == 0)
{
@ -147,8 +146,7 @@ public class LavaSigil extends ItemBucket implements ArmourUpgrade
if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{
}
}
else
} else
{
return par1ItemStack;
}
@ -168,16 +166,13 @@ public class LavaSigil extends ItemBucket implements ArmourUpgrade
if (this.isFull <= 0)
{
return false;
}
else if (!par1World.isAirBlock(par8, par9, par10) && par1World.getBlockMaterial(par8, par9, par10).isSolid())
} else if (!par1World.isAirBlock(par8, par9, par10) && par1World.getBlockMaterial(par8, par9, par10).isSolid())
{
return false;
}
else if ((par1World.getBlockId(par8, par9, par10) == Block.lavaMoving.blockID || par1World.getBlockId(par8, par9, par10) == Block.lavaStill.blockID) && par1World.getBlockMetadata(par8, par9, par10) == 0)
} else if ((par1World.getBlockId(par8, par9, par10) == Block.lavaMoving.blockID || par1World.getBlockId(par8, par9, par10) == Block.lavaStill.blockID) && par1World.getBlockMetadata(par8, par9, par10) == 0)
{
return false;
}
else
} else
{
par1World.setBlock(par8, par9, par10, this.isFull, 0, 3);
return true;
@ -196,7 +191,7 @@ public class LavaSigil extends ItemBucket implements ArmourUpgrade
//Heals the player using the item. If the player is at full health, or if the durability cannot be used any more,
//the item is not used.
// protected void damagePlayer(World world, EntityPlayer player, int damage)
// protected void damagePlayer(World world, EntityPlayer player, int damage)
// {
// if (world != null)
// {
@ -258,8 +253,7 @@ public class LavaSigil extends ItemBucket implements ArmourUpgrade
}
return true;
}
else
} else
{
return true;
}

32
BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfElementalAffinity.java
View file

@ -1,7 +1,9 @@
package WayofTime.alchemicalWizardry.common.items.sigil;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@ -11,17 +13,15 @@ import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class SigilOfElementalAffinity extends EnergyItems
{
import java.util.List;
public class SigilOfElementalAffinity extends EnergyItems {
@SideOnly(Side.CLIENT)
private static Icon activeIcon;
@SideOnly(Side.CLIENT)
private static Icon passiveIcon;
public SigilOfElementalAffinity(int id)
{
super(id);
@ -42,8 +42,7 @@ public class SigilOfElementalAffinity extends EnergyItems
if (par1ItemStack.stackTagCompound.getBoolean("isActive"))
{
par3List.add("Activated");
}
else
} else
{
par3List.add("Deactivated");
}
@ -74,8 +73,7 @@ public class SigilOfElementalAffinity extends EnergyItems
if (tag.getBoolean("isActive"))
{
return this.activeIcon;
}
else
} else
{
return this.passiveIcon;
}
@ -88,8 +86,7 @@ public class SigilOfElementalAffinity extends EnergyItems
if (par1 == 1)
{
return this.activeIcon;
}
else
} else
{
return this.passiveIcon;
}
@ -116,7 +113,7 @@ public class SigilOfElementalAffinity extends EnergyItems
if (tag.getBoolean("isActive"))
{
par1ItemStack.setItemDamage(1);
tag.setInteger("worldTimeDelay", (int)(par2World.getWorldTime() - 1) % 200);
tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200);
par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.waterBreathing.id, 2, 0, true));
par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.fireResistance.id, 2, 0, true));
@ -128,8 +125,7 @@ public class SigilOfElementalAffinity extends EnergyItems
{
}
}
}
else
} else
{
par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage());
}
@ -145,7 +141,7 @@ public class SigilOfElementalAffinity extends EnergyItems
return;
}
EntityPlayer par3EntityPlayer = (EntityPlayer)par3Entity;
EntityPlayer par3EntityPlayer = (EntityPlayer) par3Entity;
if (par1ItemStack.stackTagCompound == null)
{

97
BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfGrowth.java
View file

@ -1,14 +1,11 @@
package WayofTime.alchemicalWizardry.common.items.sigil;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.BlockCocoa;
import net.minecraft.block.BlockCrops;
import net.minecraft.block.BlockDirectional;
import net.minecraft.block.BlockMushroom;
import net.minecraft.block.BlockSapling;
import net.minecraft.block.BlockStem;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.*;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@ -21,14 +18,10 @@ import net.minecraftforge.common.IPlantable;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.Event.Result;
import net.minecraftforge.event.entity.player.BonemealEvent;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade
{
import java.util.List;
public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade {
private static Icon activeIcon;
private static Icon passiveIcon;
private int tickDelay = 100;
@ -54,8 +47,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade
if (par1ItemStack.stackTagCompound.getBoolean("isActive"))
{
par3List.add("Activated");
}
else
} else
{
par3List.add("Deactivated");
}
@ -86,8 +78,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade
if (tag.getBoolean("isActive"))
{
return this.activeIcon;
}
else
} else
{
return this.passiveIcon;
}
@ -100,8 +91,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade
if (par1 == 1)
{
return this.activeIcon;
}
else
} else
{
return this.passiveIcon;
}
@ -149,14 +139,13 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade
if (tag.getBoolean("isActive"))
{
par1ItemStack.setItemDamage(1);
tag.setInteger("worldTimeDelay", (int)(par2World.getWorldTime() - 1) % tickDelay);
tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % tickDelay);
if (!par3EntityPlayer.capabilities.isCreativeMode)
{
EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed());
}
}
else
} else
{
par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage());
}
@ -172,7 +161,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade
return;
}
EntityPlayer par3EntityPlayer = (EntityPlayer)par3Entity;
EntityPlayer par3EntityPlayer = (EntityPlayer) par3Entity;
if (par1ItemStack.stackTagCompound == null)
{
@ -183,14 +172,14 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade
{
if (par2World.getWorldTime() % tickDelay == par1ItemStack.stackTagCompound.getInteger("worldTimeDelay") && par3Entity instanceof EntityPlayer)
{
EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer)par3Entity, getEnergyUsed());
EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3Entity, getEnergyUsed());
}
int range = 5;
int verticalRange = 2;
int posX = (int)Math.round(par3Entity.posX - 0.5f);
int posY = (int)par3Entity.posY;
int posZ = (int)Math.round(par3Entity.posZ - 0.5f);
int posX = (int) Math.round(par3Entity.posX - 0.5f);
int posY = (int) par3Entity.posY;
int posZ = (int) Math.round(par3Entity.posZ - 0.5f);
for (int ix = posX - range; ix <= posX + range; ix++)
{
@ -235,15 +224,14 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade
{
if (!par1World.isRemote)
{
if ((double)par1World.rand.nextFloat() < 0.45D)
if ((double) par1World.rand.nextFloat() < 0.45D)
{
((BlockSapling)Block.sapling).markOrGrowMarked(par1World, par2, par3, par4, par1World.rand);
((BlockSapling) Block.sapling).markOrGrowMarked(par1World, par2, par3, par4, par1World.rand);
}
}
return true;
}
else if (l != Block.mushroomBrown.blockID && l != Block.mushroomRed.blockID)
} else if (l != Block.mushroomBrown.blockID && l != Block.mushroomRed.blockID)
{
if (l != Block.melonStem.blockID && l != Block.pumpkinStem.blockID)
{
@ -252,18 +240,16 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade
if (par1World.getBlockMetadata(par2, par3, par4) == 7)
{
return false;
}
else
} else
{
if (!par1World.isRemote)
{
((BlockCrops)Block.blocksList[l]).fertilize(par1World, par2, par3, par4);
((BlockCrops) Block.blocksList[l]).fertilize(par1World, par2, par3, par4);
}
return true;
}
}
else
} else
{
int i1;
int j1;
@ -278,8 +264,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade
if (k1 >= 2)
{
return false;
}
else
} else
{
if (!par1World.isRemote)
{
@ -289,12 +274,10 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade
return true;
}
}
else if (l != Block.grass.blockID)
} else if (l != Block.grass.blockID)
{
return false;
}
else
} else
{
if (!par1World.isRemote)
{
@ -326,8 +309,7 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade
{
par1World.setBlock(j1, k1, l1, Block.tallGrass.blockID, 1, 3);
}
}
else
} else
{
ForgeHooks.plantGrass(par1World, j1, k1, l1);
}
@ -338,28 +320,25 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade
return true;
}
}
}
else if (par1World.getBlockMetadata(par2, par3, par4) == 7)
} else if (par1World.getBlockMetadata(par2, par3, par4) == 7)
{
return false;
}
else
} else
{
if (!par1World.isRemote)
{
((BlockStem)Block.blocksList[l]).fertilizeStem(par1World, par2, par3, par4);
((BlockStem) Block.blocksList[l]).fertilizeStem(par1World, par2, par3, par4);
}
return true;
}
}
else
} else
{
if (!par1World.isRemote)
{
if ((double)par1World.rand.nextFloat() < 0.4D)
if ((double) par1World.rand.nextFloat() < 0.4D)
{
((BlockMushroom)Block.blocksList[l]).fertilizeMushroom(par1World, par2, par3, par4, par1World.rand);
((BlockMushroom) Block.blocksList[l]).fertilizeMushroom(par1World, par2, par3, par4, par1World.rand);
}
}
@ -372,9 +351,9 @@ public class SigilOfGrowth extends EnergyItems implements ArmourUpgrade
{
int range = 5;
int verticalRange = 2;
int posX = (int)Math.round(player.posX - 0.5f);
int posY = (int)player.posY;
int posZ = (int)Math.round(player.posZ - 0.5f);
int posX = (int) Math.round(player.posX - 0.5f);
int posY = (int) player.posY;
int posZ = (int) Math.round(player.posZ - 0.5f);
for (int ix = posX - range; ix <= posX + range; ix++)
{

34
BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHaste.java
View file

@ -1,7 +1,10 @@
package WayofTime.alchemicalWizardry.common.items.sigil;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@ -10,18 +13,15 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class SigilOfHaste extends EnergyItems implements ArmourUpgrade
{
import java.util.List;
public class SigilOfHaste extends EnergyItems implements ArmourUpgrade {
@SideOnly(Side.CLIENT)
private static Icon activeIcon;
@SideOnly(Side.CLIENT)
private static Icon passiveIcon;
public SigilOfHaste(int id)
{
super(id);
@ -41,8 +41,7 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade
if (par1ItemStack.stackTagCompound.getBoolean("isActive"))
{
par3List.add("Activated");
}
else
} else
{
par3List.add("Deactivated");
}
@ -73,8 +72,7 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade
if (tag.getBoolean("isActive"))
{
return this.activeIcon;
}
else
} else
{
return this.passiveIcon;
}
@ -87,8 +85,7 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade
if (par1 == 1)
{
return this.activeIcon;
}
else
} else
{
return this.passiveIcon;
}
@ -115,7 +112,7 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade
if (tag.getBoolean("isActive"))
{
par1ItemStack.setItemDamage(1);
tag.setInteger("worldTimeDelay", (int)(par2World.getWorldTime() - 1) % 200);
tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200);
par3EntityPlayer.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionBoost.id, 3, 1));
//par3EntityPlayer.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionProjProt.id, 2, 2));
@ -127,8 +124,7 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade
{
}
}
}
else
} else
{
par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage());
}
@ -144,7 +140,7 @@ public class SigilOfHaste extends EnergyItems implements ArmourUpgrade
return;
}
EntityPlayer par3EntityPlayer = (EntityPlayer)par3Entity;
EntityPlayer par3EntityPlayer = (EntityPlayer) par3Entity;
if (par1ItemStack.stackTagCompound == null)
{

46
BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfHolding.java
View file

@ -1,8 +1,10 @@
package WayofTime.alchemicalWizardry.common.items.sigil;
import java.util.ArrayList;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ModItems;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@ -11,13 +13,11 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class SigilOfHolding extends EnergyItems
{
import java.util.ArrayList;
import java.util.List;
public class SigilOfHolding extends EnergyItems {
private int invSize = 4;
public static List<Integer> allowedSigils = new ArrayList();
@ -241,8 +241,7 @@ public class SigilOfHolding extends EnergyItems
if (inv[i] != null)
{
filledSlots++;
}
else
} else
{
break;
}
@ -258,8 +257,7 @@ public class SigilOfHolding extends EnergyItems
if (getSelectedSlot(itemStack) + 1 < filledSlots)
{
itemTag.setInteger("selectedSlot", itemTag.getInteger("selectedSlot") + 1);
}
else
} else
{
itemTag.setInteger("selectedSlot", 0);
}
@ -303,7 +301,7 @@ public class SigilOfHolding extends EnergyItems
return false;
}
for (Integer i: allowedSigils)
for (Integer i : allowedSigils)
{
if (i.intValue() == itemID)
{
@ -335,16 +333,16 @@ public class SigilOfHolding extends EnergyItems
public static void initiateSigilOfHolding()
{
allowedSigils.add(new Integer(AlchemicalWizardry.waterSigil.itemID));
allowedSigils.add(new Integer(AlchemicalWizardry.lavaSigil.itemID));
allowedSigils.add(new Integer(AlchemicalWizardry.voidSigil.itemID));
allowedSigils.add(new Integer(AlchemicalWizardry.airSigil.itemID));
allowedSigils.add(new Integer(AlchemicalWizardry.sigilOfTheFastMiner.itemID));
allowedSigils.add(new Integer(AlchemicalWizardry.divinationSigil.itemID));
allowedSigils.add(new Integer(AlchemicalWizardry.sigilOfElementalAffinity.itemID));
allowedSigils.add(new Integer(AlchemicalWizardry.growthSigil.itemID));
allowedSigils.add(new Integer(AlchemicalWizardry.sigilOfHaste.itemID));
allowedSigils.add(new Integer(AlchemicalWizardry.sigilOfWind.itemID));
allowedSigils.add(new Integer(ModItems.waterSigil.itemID));
allowedSigils.add(new Integer(ModItems.lavaSigil.itemID));
allowedSigils.add(new Integer(ModItems.voidSigil.itemID));
allowedSigils.add(new Integer(ModItems.airSigil.itemID));
allowedSigils.add(new Integer(ModItems.sigilOfTheFastMiner.itemID));
allowedSigils.add(new Integer(ModItems.divinationSigil.itemID));
allowedSigils.add(new Integer(ModItems.sigilOfElementalAffinity.itemID));
allowedSigils.add(new Integer(ModItems.growthSigil.itemID));
allowedSigils.add(new Integer(ModItems.sigilOfHaste.itemID));
allowedSigils.add(new Integer(ModItems.sigilOfWind.itemID));
}
public ItemStack getCurrentItem(ItemStack sigilItemStack)

39
BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfMagnetism.java
View file

@ -1,7 +1,10 @@
package WayofTime.alchemicalWizardry.common.items.sigil;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
@ -11,14 +14,10 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade
{
import java.util.List;
public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade {
private static Icon activeIcon;
private static Icon passiveIcon;
private int tickDelay = 300;
@ -44,8 +43,7 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade
if (par1ItemStack.stackTagCompound.getBoolean("isActive"))
{
par3List.add("Activated");
}
else
} else
{
par3List.add("Deactivated");
}
@ -76,8 +74,7 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade
if (tag.getBoolean("isActive"))
{
return this.activeIcon;
}
else
} else
{
return this.passiveIcon;
}
@ -90,8 +87,7 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade
if (par1 == 1)
{
return this.activeIcon;
}
else
} else
{
return this.passiveIcon;
}
@ -135,14 +131,13 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade
if (tag.getBoolean("isActive"))
{
par1ItemStack.setItemDamage(1);
tag.setInteger("worldTimeDelay", (int)(par2World.getWorldTime() - 1) % tickDelay);
tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % tickDelay);
if (!par3EntityPlayer.capabilities.isCreativeMode)
{
EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed());
}
}
else
} else
{
par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage());
}
@ -158,7 +153,7 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade
return;
}
EntityPlayer par3EntityPlayer = (EntityPlayer)par3Entity;
EntityPlayer par3EntityPlayer = (EntityPlayer) par3Entity;
if (par1ItemStack.stackTagCompound == null)
{
@ -169,13 +164,13 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade
{
if (par2World.getWorldTime() % tickDelay == par1ItemStack.stackTagCompound.getInteger("worldTimeDelay") && par3Entity instanceof EntityPlayer)
{
EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer)par3Entity, getEnergyUsed());
EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3Entity, getEnergyUsed());
}
int range = 5;
int verticalRange = 5;
float posX = Math.round(par3Entity.posX);
float posY = (float)(par3Entity.posY - par3Entity.getEyeHeight());
float posY = (float) (par3Entity.posY - par3Entity.getEyeHeight());
float posZ = Math.round(par3Entity.posZ);
List<EntityItem> entities = par3EntityPlayer.worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(posX - 0.5f, posY - 0.5f, posZ - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f).expand(range, verticalRange, range));
@ -197,7 +192,7 @@ public class SigilOfMagnetism extends EnergyItems implements ArmourUpgrade
int range = 5;
int verticalRange = 5;
float posX = Math.round(player.posX);
float posY = (float)(player.posY - player.getEyeHeight());
float posY = (float) (player.posY - player.getEyeHeight());
float posZ = Math.round(player.posZ);
List<EntityItem> entities = player.worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(posX - 0.5f, posY - 0.5f, posZ - 0.5f, posX + 0.5f, posY + 0.5f, posZ + 0.5f).expand(range, verticalRange, range));

52
BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheBridge.java
View file

@ -1,7 +1,11 @@
package WayofTime.alchemicalWizardry.common.items.sigil;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.ModBlocks;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.Entity;
@ -10,14 +14,10 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade
{
import java.util.List;
public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade {
private static Icon activeIcon;
private static Icon passiveIcon;
private int tickDelay = 200;
@ -43,8 +43,7 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade
if (par1ItemStack.stackTagCompound.getBoolean("isActive"))
{
par3List.add("Activated");
}
else
} else
{
par3List.add("Deactivated");
}
@ -75,8 +74,7 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade
if (tag.getBoolean("isActive"))
{
return this.activeIcon;
}
else
} else
{
return this.passiveIcon;
}
@ -89,8 +87,7 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade
if (par1 == 1)
{
return this.activeIcon;
}
else
} else
{
return this.passiveIcon;
}
@ -134,14 +131,13 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade
if (tag.getBoolean("isActive"))
{
par1ItemStack.setItemDamage(1);
tag.setInteger("worldTimeDelay", (int)(par2World.getWorldTime() - 1) % tickDelay);
tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % tickDelay);
if (!par3EntityPlayer.capabilities.isCreativeMode)
{
EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed());
}
}
else
} else
{
par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage());
}
@ -157,7 +153,7 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade
return;
}
EntityPlayer par3EntityPlayer = (EntityPlayer)par3Entity;
EntityPlayer par3EntityPlayer = (EntityPlayer) par3Entity;
if (par1ItemStack.stackTagCompound == null)
{
@ -168,7 +164,7 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade
{
if (par2World.getWorldTime() % tickDelay == par1ItemStack.stackTagCompound.getInteger("worldTimeDelay") && par3Entity instanceof EntityPlayer)
{
EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer)par3Entity, this.getLPUsed(par1ItemStack));
EnergyItems.syphonBatteries(par1ItemStack, (EntityPlayer) par3Entity, this.getLPUsed(par1ItemStack));
this.setLPUsed(par1ItemStack, 0);
}
@ -194,9 +190,9 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade
verticalOffset--;
}
int posX = (int)Math.round(par3Entity.posX - 0.5f);
int posY = (int)par3Entity.posY;
int posZ = (int)Math.round(par3Entity.posZ - 0.5f);
int posX = (int) Math.round(par3Entity.posX - 0.5f);
int posY = (int) par3Entity.posY;
int posZ = (int) Math.round(par3Entity.posZ - 0.5f);
int incremented = 0;
for (int ix = posX - range; ix <= posX + range; ix++)
@ -210,7 +206,7 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade
if (par2World.isAirBlock(ix, posY + verticalOffset, iz))
{
par2World.setBlock(ix, posY + verticalOffset, iz, AlchemicalWizardry.spectralBlock.blockID, 0, 3);
par2World.setBlock(ix, posY + verticalOffset, iz, ModBlocks.spectralBlock.blockID, 0, 3);
if (par2World.rand.nextInt(2) == 0)
{
@ -273,9 +269,9 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade
verticalOffset--;
}
int posX = (int)Math.round(player.posX - 0.5f);
int posY = (int)player.posY;
int posZ = (int)Math.round(player.posZ - 0.5f);
int posX = (int) Math.round(player.posX - 0.5f);
int posY = (int) player.posY;
int posZ = (int) Math.round(player.posZ - 0.5f);
//int incremented = 0;
@ -290,7 +286,7 @@ public class SigilOfTheBridge extends EnergyItems implements ArmourUpgrade
if (world.isAirBlock(ix, posY + verticalOffset, iz))
{
world.setBlock(ix, posY + verticalOffset, iz, AlchemicalWizardry.spectralBlock.blockID, 0, 3);
world.setBlock(ix, posY + verticalOffset, iz, ModBlocks.spectralBlock.blockID, 0, 3);
}
}
}

34
BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfTheFastMiner.java
View file

@ -1,7 +1,10 @@
package WayofTime.alchemicalWizardry.common.items.sigil;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@ -11,18 +14,15 @@ import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade
{
import java.util.List;
public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade {
@SideOnly(Side.CLIENT)
private static Icon activeIcon;
@SideOnly(Side.CLIENT)
private static Icon passiveIcon;
public SigilOfTheFastMiner(int id)
{
super(id);
@ -42,8 +42,7 @@ public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade
if (par1ItemStack.stackTagCompound.getBoolean("isActive"))
{
par3List.add("Activated");
}
else
} else
{
par3List.add("Deactivated");
}
@ -74,8 +73,7 @@ public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade
if (tag.getBoolean("isActive"))
{
return this.activeIcon;
}
else
} else
{
return this.passiveIcon;
}
@ -88,8 +86,7 @@ public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade
if (par1 == 1)
{
return this.activeIcon;
}
else
} else
{
return this.passiveIcon;
}
@ -116,7 +113,7 @@ public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade
if (tag.getBoolean("isActive"))
{
par1ItemStack.setItemDamage(1);
tag.setInteger("worldTimeDelay", (int)(par2World.getWorldTime() - 1) % 200);
tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200);
par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.digSpeed.id, 2, 1, true));
//Test with added health boost
@ -127,8 +124,7 @@ public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade
{
}
}
}
else
} else
{
par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage());
}
@ -144,7 +140,7 @@ public class SigilOfTheFastMiner extends EnergyItems implements ArmourUpgrade
return;
}
EntityPlayer par3EntityPlayer = (EntityPlayer)par3Entity;
EntityPlayer par3EntityPlayer = (EntityPlayer) par3Entity;
if (par1ItemStack.stackTagCompound == null)
{

34
BM_src/WayofTime/alchemicalWizardry/common/items/sigil/SigilOfWind.java
View file

@ -1,7 +1,10 @@
package WayofTime.alchemicalWizardry.common.items.sigil;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@ -10,18 +13,15 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class SigilOfWind extends EnergyItems implements ArmourUpgrade
{
import java.util.List;
public class SigilOfWind extends EnergyItems implements ArmourUpgrade {
@SideOnly(Side.CLIENT)
private static Icon activeIcon;
@SideOnly(Side.CLIENT)
private static Icon passiveIcon;
public SigilOfWind(int id)
{
super(id);
@ -41,8 +41,7 @@ public class SigilOfWind extends EnergyItems implements ArmourUpgrade
if (par1ItemStack.stackTagCompound.getBoolean("isActive"))
{
par3List.add("Activated");
}
else
} else
{
par3List.add("Deactivated");
}
@ -73,8 +72,7 @@ public class SigilOfWind extends EnergyItems implements ArmourUpgrade
if (tag.getBoolean("isActive"))
{
return this.activeIcon;
}
else
} else
{
return this.passiveIcon;
}
@ -87,8 +85,7 @@ public class SigilOfWind extends EnergyItems implements ArmourUpgrade
if (par1 == 1)
{
return this.activeIcon;
}
else
} else
{
return this.passiveIcon;
}
@ -115,7 +112,7 @@ public class SigilOfWind extends EnergyItems implements ArmourUpgrade
if (tag.getBoolean("isActive"))
{
par1ItemStack.setItemDamage(1);
tag.setInteger("worldTimeDelay", (int)(par2World.getWorldTime() - 1) % 200);
tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200);
par3EntityPlayer.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionProjProt.id, 2, 1));
//par3EntityPlayer.addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionProjProt.id, 2, 2));
@ -127,8 +124,7 @@ public class SigilOfWind extends EnergyItems implements ArmourUpgrade
{
}
}
}
else
} else
{
par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage());
}
@ -144,7 +140,7 @@ public class SigilOfWind extends EnergyItems implements ArmourUpgrade
return;
}
EntityPlayer par3EntityPlayer = (EntityPlayer)par3Entity;
EntityPlayer par3EntityPlayer = (EntityPlayer) par3Entity;
if (par1ItemStack.stackTagCompound == null)
{

37
BM_src/WayofTime/alchemicalWizardry/common/items/sigil/VoidSigil.java
View file

@ -1,7 +1,11 @@
package WayofTime.alchemicalWizardry.common.items.sigil;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.items.EnergyBattery;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.material.MaterialLiquid;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.player.EntityPlayer;
@ -13,17 +17,13 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.FillBucketEvent;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.items.EnergyBattery;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class VoidSigil extends ItemBucket implements ArmourUpgrade
{
import java.util.List;
public class VoidSigil extends ItemBucket implements ArmourUpgrade {
private int isFull;
private int energyUsed;
public VoidSigil(int id)
{
super(id, 0);
@ -71,7 +71,7 @@ public class VoidSigil extends ItemBucket implements ArmourUpgrade
return this.energyUsed;
}
// protected void damagePlayer(World world, EntityPlayer player, int damage)
// protected void damagePlayer(World world, EntityPlayer player, int damage)
// {
// if (world != null)
// {
@ -133,8 +133,7 @@ public class VoidSigil extends ItemBucket implements ArmourUpgrade
}
return true;
}
else
} else
{
return true;
}
@ -151,17 +150,16 @@ public class VoidSigil extends ItemBucket implements ArmourUpgrade
}
float f = 1.0F;
double d0 = par3EntityPlayer.prevPosX + (par3EntityPlayer.posX - par3EntityPlayer.prevPosX) * (double)f;
double d1 = par3EntityPlayer.prevPosY + (par3EntityPlayer.posY - par3EntityPlayer.prevPosY) * (double)f + 1.62D - (double)par3EntityPlayer.yOffset;
double d2 = par3EntityPlayer.prevPosZ + (par3EntityPlayer.posZ - par3EntityPlayer.prevPosZ) * (double)f;
double d0 = par3EntityPlayer.prevPosX + (par3EntityPlayer.posX - par3EntityPlayer.prevPosX) * (double) f;
double d1 = par3EntityPlayer.prevPosY + (par3EntityPlayer.posY - par3EntityPlayer.prevPosY) * (double) f + 1.62D - (double) par3EntityPlayer.yOffset;
double d2 = par3EntityPlayer.prevPosZ + (par3EntityPlayer.posZ - par3EntityPlayer.prevPosZ) * (double) f;
boolean flag = this.isFull == 0;
MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(par2World, par3EntityPlayer, flag);
if (movingobjectposition == null)
{
return par1ItemStack;
}
else
} else
{
FillBucketEvent event = new FillBucketEvent(par3EntityPlayer, par1ItemStack, par2World, movingobjectposition);
@ -197,8 +195,7 @@ public class VoidSigil extends ItemBucket implements ArmourUpgrade
if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{
}
}
else
} else
{
return par1ItemStack;
}

50
BM_src/WayofTime/alchemicalWizardry/common/items/sigil/WaterSigil.java
View file

@ -1,7 +1,10 @@
package WayofTime.alchemicalWizardry.common.items.sigil;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.player.EntityPlayer;
@ -13,15 +16,13 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumMovingObjectType;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.items.EnergyItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class WaterSigil extends ItemBucket implements ArmourUpgrade
{
/** field for checking if the bucket has been filled. */
import java.util.List;
public class WaterSigil extends ItemBucket implements ArmourUpgrade {
/**
* field for checking if the bucket has been filled.
*/
private int isFull = Block.waterMoving.blockID;
private int energyUsed;
@ -83,17 +84,16 @@ public class WaterSigil extends ItemBucket implements ArmourUpgrade
}
float f = 1.0F;
double d0 = par3EntityPlayer.prevPosX + (par3EntityPlayer.posX - par3EntityPlayer.prevPosX) * (double)f;
double d1 = par3EntityPlayer.prevPosY + (par3EntityPlayer.posY - par3EntityPlayer.prevPosY) * (double)f + 1.62D - (double)par3EntityPlayer.yOffset;
double d2 = par3EntityPlayer.prevPosZ + (par3EntityPlayer.posZ - par3EntityPlayer.prevPosZ) * (double)f;
double d0 = par3EntityPlayer.prevPosX + (par3EntityPlayer.posX - par3EntityPlayer.prevPosX) * (double) f;
double d1 = par3EntityPlayer.prevPosY + (par3EntityPlayer.posY - par3EntityPlayer.prevPosY) * (double) f + 1.62D - (double) par3EntityPlayer.yOffset;
double d2 = par3EntityPlayer.prevPosZ + (par3EntityPlayer.posZ - par3EntityPlayer.prevPosZ) * (double) f;
boolean flag = this.isFull == 0;
MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(par2World, par3EntityPlayer, flag);
if (movingobjectposition == null)
{
return par1ItemStack;
}
else
} else
{
if (movingobjectposition.typeOfHit == EnumMovingObjectType.TILE)
{
@ -109,8 +109,7 @@ public class WaterSigil extends ItemBucket implements ArmourUpgrade
if (this.isFull == 0)
{
//Empty
}
else
} else
{
if (movingobjectposition.sideHit == 0)
{
@ -154,8 +153,7 @@ public class WaterSigil extends ItemBucket implements ArmourUpgrade
if (!EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()))
{
}
}
else
} else
{
return par1ItemStack;
}
@ -175,16 +173,13 @@ public class WaterSigil extends ItemBucket implements ArmourUpgrade
if (this.isFull <= 0)
{
return false;
}
else if (!par1World.isAirBlock(par8, par9, par10) && par1World.getBlockMaterial(par8, par9, par10).isSolid())
} else if (!par1World.isAirBlock(par8, par9, par10) && par1World.getBlockMaterial(par8, par9, par10).isSolid())
{
return false;
}
else if ((par1World.getBlockId(par8, par9, par10) == Block.waterMoving.blockID || par1World.getBlockId(par8, par9, par10) == Block.waterStill.blockID) && par1World.getBlockMetadata(par8, par9, par10) == 0)
} else if ((par1World.getBlockId(par8, par9, par10) == Block.waterMoving.blockID || par1World.getBlockId(par8, par9, par10) == Block.waterStill.blockID) && par1World.getBlockMetadata(par8, par9, par10) == 0)
{
return false;
}
else
} else
{
if (par1World.provider.isHellWorld)
{
@ -192,10 +187,9 @@ public class WaterSigil extends ItemBucket implements ArmourUpgrade
for (int l = 0; l < 8; ++l)
{
par1World.spawnParticle("largesmoke", (double)par8 + Math.random(), (double)par9 + Math.random(), (double)par10 + Math.random(), 0.0D, 0.0D, 0.0D);
par1World.spawnParticle("largesmoke", (double) par8 + Math.random(), (double) par9 + Math.random(), (double) par10 + Math.random(), 0.0D, 0.0D, 0.0D);
}
}
else
} else
{
par1World.setBlock(par8, par9, par10, this.isFull, 0, 3);
}