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

3
BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualComponent.java
View file

@ -1,7 +1,6 @@
package WayofTime.alchemicalWizardry.common.rituals;
public class RitualComponent
{
public class RitualComponent {
private int x;
private int y;
private int z;

10
BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffect.java
View file

@ -1,16 +1,8 @@
package WayofTime.alchemicalWizardry.common.rituals;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.PacketDispatcher;
public abstract class RitualEffect
{
public abstract class RitualEffect {
public abstract void performEffect(TEMasterStone ritualStone);
public abstract int getCostPerRefresh();

23
BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAnimalGrowth.java
View file

@ -1,29 +1,25 @@
package WayofTime.alchemicalWizardry.common.rituals;
import java.util.Iterator;
import java.util.List;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import net.minecraft.entity.EntityAgeable;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
public class RitualEffectAnimalGrowth extends RitualEffect
{
import java.util.Iterator;
import java.util.List;
public class RitualEffectAnimalGrowth extends RitualEffect {
@Override
public void performEffect(TEMasterStone ritualStone)
{
String owner = ritualStone.getOwner();
World worldSave = MinecraftServer.getServer().worldServers[0];
LifeEssenceNetwork data = (LifeEssenceNetwork)worldSave.loadItemData(LifeEssenceNetwork.class, owner);
LifeEssenceNetwork data = (LifeEssenceNetwork) worldSave.loadItemData(LifeEssenceNetwork.class, owner);
if (data == null)
{
@ -43,7 +39,7 @@ public class RitualEffectAnimalGrowth extends RitualEffect
}
int d0 = 2;
AxisAlignedBB axisalignedbb = AxisAlignedBB.getAABBPool().getAABB((double)x, (double)y + 1, (double)z, (double)(x + 1), (double)(y + 3), (double)(z + 1)).expand(d0, 0, d0);
AxisAlignedBB axisalignedbb = AxisAlignedBB.getAABBPool().getAABB((double) x, (double) y + 1, (double) z, (double) (x + 1), (double) (y + 3), (double) (z + 1)).expand(d0, 0, d0);
List list = world.getEntitiesWithinAABB(EntityAgeable.class, axisalignedbb);
Iterator iterator1 = list.iterator();
EntityAgeable entity;
@ -52,7 +48,7 @@ public class RitualEffectAnimalGrowth extends RitualEffect
while (iterator1.hasNext())
{
entity = (EntityAgeable)iterator1.next();
entity = (EntityAgeable) iterator1.next();
entityCount++;
}
@ -66,15 +62,14 @@ public class RitualEffectAnimalGrowth extends RitualEffect
}
entityOwner.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
}
else
} else
{
Iterator iterator2 = list.iterator();
entityCount = 0;
while (iterator2.hasNext())
{
entity = (EntityAgeable)iterator2.next();
entity = (EntityAgeable) iterator2.next();
if (entity.getGrowingAge() < 0)
{

58
BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectBiomeChanger.java
View file

@ -1,7 +1,7 @@
package WayofTime.alchemicalWizardry.common.rituals;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.ModBlocks;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import WayofTime.alchemicalWizardry.common.tileEntity.TEPlinth;
import net.minecraft.block.Block;
@ -18,14 +18,13 @@ import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.chunk.Chunk;
public class RitualEffectBiomeChanger extends RitualEffect
{
public class RitualEffectBiomeChanger extends RitualEffect {
@Override
public void performEffect(TEMasterStone ritualStone)
{
String owner = ritualStone.getOwner();
World worldSave = MinecraftServer.getServer().worldServers[0];
LifeEssenceNetwork data = (LifeEssenceNetwork)worldSave.loadItemData(LifeEssenceNetwork.class, owner);
LifeEssenceNetwork data = (LifeEssenceNetwork) worldSave.loadItemData(LifeEssenceNetwork.class, owner);
if (data == null)
{
@ -64,8 +63,7 @@ public class RitualEffectBiomeChanger extends RitualEffect
}
entityOwner.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
}
else
} else
{
boolean[][] boolList = new boolean[range * 2 + 1][range * 2 + 1];
@ -95,7 +93,7 @@ public class RitualEffectBiomeChanger extends RitualEffect
int id = world.getBlockId(x - range + i - 1, y + 1, z - range + j);
Block block = Block.blocksList[id];
if (!AlchemicalWizardry.largeBloodStoneBrick.equals(block) && !AlchemicalWizardry.bloodStoneBrick.equals(block))
if (!ModBlocks.largeBloodStoneBrick.equals(block) && !ModBlocks.bloodStoneBrick.equals(block))
{
boolList[i - 1][j] = true;
isReady = false;
@ -107,7 +105,7 @@ public class RitualEffectBiomeChanger extends RitualEffect
int id = world.getBlockId(x - range + i, y + 1, z - range + j - 1);
Block block = Block.blocksList[id];
if (!AlchemicalWizardry.largeBloodStoneBrick.equals(block) && !AlchemicalWizardry.bloodStoneBrick.equals(block))
if (!ModBlocks.largeBloodStoneBrick.equals(block) && !ModBlocks.bloodStoneBrick.equals(block))
{
boolList[i][j - 1] = true;
isReady = false;
@ -119,7 +117,7 @@ public class RitualEffectBiomeChanger extends RitualEffect
int id = world.getBlockId(x - range + i + 1, y + 1, z - range + j);
Block block = Block.blocksList[id];
if (!AlchemicalWizardry.largeBloodStoneBrick.equals(block) && !AlchemicalWizardry.bloodStoneBrick.equals(block))
if (!ModBlocks.largeBloodStoneBrick.equals(block) && !ModBlocks.bloodStoneBrick.equals(block))
{
boolList[i + 1][j] = true;
isReady = false;
@ -131,7 +129,7 @@ public class RitualEffectBiomeChanger extends RitualEffect
int id = world.getBlockId(x - range + i, y + 1, z - range + j + 1);
Block block = Block.blocksList[id];
if (!AlchemicalWizardry.largeBloodStoneBrick.equals(block) && !AlchemicalWizardry.bloodStoneBrick.equals(block))
if (!ModBlocks.largeBloodStoneBrick.equals(block) && !ModBlocks.bloodStoneBrick.equals(block))
{
boolList[i][j + 1] = true;
isReady = false;
@ -163,7 +161,7 @@ public class RitualEffectBiomeChanger extends RitualEffect
continue;
}
TEPlinth tilePlinth = (TEPlinth)tileEntity;
TEPlinth tilePlinth = (TEPlinth) tileEntity;
ItemStack itemStack = tilePlinth.getStackInSlot(0);
if (itemStack != null)
@ -178,64 +176,52 @@ public class RitualEffectBiomeChanger extends RitualEffect
{
humidity -= 0.1f;
isItemConsumed = true;
}
else if (item.itemID == (Block.blockLapis.blockID))
} else if (item.itemID == (Block.blockLapis.blockID))
{
humidity += 0.4f;
isItemConsumed = true;
}
else if (item.itemID == (Block.sand.blockID))
} else if (item.itemID == (Block.sand.blockID))
{
humidity -= 0.1f;
isItemConsumed = true;
}
else if (item.itemID == (Block.sandStone.blockID))
} else if (item.itemID == (Block.sandStone.blockID))
{
humidity -= 0.2f;
isItemConsumed = true;
}
else if (item.itemID == (Block.netherrack.blockID))
} else if (item.itemID == (Block.netherrack.blockID))
{
humidity -= 0.4f;
isItemConsumed = true;
}
else if (item.itemID == (Block.coalBlock.blockID))
} else if (item.itemID == (Block.coalBlock.blockID))
{
temperature += 0.2f;
isItemConsumed = true;
}
else if (item.itemID == (Block.ice.blockID))
} else if (item.itemID == (Block.ice.blockID))
{
temperature -= 0.4f;
isItemConsumed = true;
}
else if (item.itemID == (Block.blockSnow.blockID))
} else if (item.itemID == (Block.blockSnow.blockID))
{
temperature -= 0.2f;
isItemConsumed = true;
}
}
else if (item.equals(Item.dyePowder) && itemStack.getItemDamage() == 4)
} else if (item.equals(Item.dyePowder) && itemStack.getItemDamage() == 4)
{
humidity += 0.1f;
isItemConsumed = true;
}
else if (item.equals(Item.bucketLava))
} else if (item.equals(Item.bucketLava))
{
temperature += 0.4f;
isItemConsumed = true;
}
else if (item.equals(Item.bucketWater))
} else if (item.equals(Item.bucketWater))
{
humidity += 0.2f;
isItemConsumed = true;
}
else if (item.equals(Item.coal))
} else if (item.equals(Item.coal))
{
temperature += 0.1f;
isItemConsumed = true;
}
else if (item.equals(Item.snowball))
} else if (item.equals(Item.snowball))
{
temperature -= 0.1f;
isItemConsumed = true;
@ -304,7 +290,7 @@ public class RitualEffectBiomeChanger extends RitualEffect
moduZ = moduZ + 16;
}
byteArray[moduZ * 16 + moduX] = (byte)biomeID;
byteArray[moduZ * 16 + moduX] = (byte) biomeID;
chunk.setBiomeArray(byteArray);
//world.setBlock(x-range+i, y+1, z-range+j, Block.blockClay.blockID);
}

22
BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectContainment.java
View file

@ -1,11 +1,9 @@
package WayofTime.alchemicalWizardry.common.rituals;
import java.util.Iterator;
import java.util.List;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import cpw.mods.fml.common.network.PacketDispatcher;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
@ -13,16 +11,17 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.PacketDispatcher;
public class RitualEffectContainment extends RitualEffect
{
import java.util.Iterator;
import java.util.List;
public class RitualEffectContainment extends RitualEffect {
@Override
public void performEffect(TEMasterStone ritualStone)
{
String owner = ritualStone.getOwner();
World worldSave = MinecraftServer.getServer().worldServers[0];
LifeEssenceNetwork data = (LifeEssenceNetwork)worldSave.loadItemData(LifeEssenceNetwork.class, owner);
LifeEssenceNetwork data = (LifeEssenceNetwork) worldSave.loadItemData(LifeEssenceNetwork.class, owner);
if (data == null)
{
@ -46,11 +45,10 @@ public class RitualEffectContainment extends RitualEffect
}
entityOwner.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
}
else
} else
{
int d0 = 5;
AxisAlignedBB axisalignedbb = AxisAlignedBB.getAABBPool().getAABB((double)x, (double)y, (double)z, (double)(x + 1), (double)(y + 1), (double)(z + 1)).expand(d0, d0, d0);
AxisAlignedBB axisalignedbb = AxisAlignedBB.getAABBPool().getAABB((double) x, (double) y, (double) z, (double) (x + 1), (double) (y + 1), (double) (z + 1)).expand(d0, d0, d0);
List list = world.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb);
Iterator iterator = list.iterator();
EntityLivingBase livingEntity;
@ -58,7 +56,7 @@ public class RitualEffectContainment extends RitualEffect
while (iterator.hasNext())
{
livingEntity = (EntityLivingBase)iterator.next();
livingEntity = (EntityLivingBase) iterator.next();
if (livingEntity instanceof EntityPlayer)
{
@ -78,7 +76,7 @@ public class RitualEffectContainment extends RitualEffect
if (world.rand.nextInt(10) == 0)
{
PacketDispatcher.sendPacketToAllPlayers(TEAltar.getParticlePacket(livingEntity.posX, livingEntity.posY, livingEntity.posZ, (short)1));
PacketDispatcher.sendPacketToAllPlayers(TEAltar.getParticlePacket(livingEntity.posX, livingEntity.posY, livingEntity.posZ, (short) 1));
}
livingEntity.fallDistance = 0;

31
BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectCrushing.java
View file

@ -1,13 +1,9 @@
package WayofTime.alchemicalWizardry.common.rituals;
import java.util.ArrayList;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.ModBlocks;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import net.minecraft.block.Block;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
@ -17,17 +13,16 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.server.MinecraftServer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class RitualEffectCrushing extends RitualEffect
{
import java.util.ArrayList;
public class RitualEffectCrushing extends RitualEffect {
@Override
public void performEffect(TEMasterStone ritualStone)
{
String owner = ritualStone.getOwner();
World worldSave = MinecraftServer.getServer().worldServers[0];
LifeEssenceNetwork data = (LifeEssenceNetwork)worldSave.loadItemData(LifeEssenceNetwork.class, owner);
LifeEssenceNetwork data = (LifeEssenceNetwork) worldSave.loadItemData(LifeEssenceNetwork.class, owner);
if (data == null)
{
@ -51,9 +46,8 @@ public class RitualEffectCrushing extends RitualEffect
if (tile instanceof IInventory)
{
tileEntity = (IInventory)tile;
}
else
tileEntity = (IInventory) tile;
} else
{
return;
}
@ -73,8 +67,7 @@ public class RitualEffectCrushing extends RitualEffect
}
entityOwner.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
}
else
} else
{
//boolean flag = false;
for (int j = -3; j < 0; j++)
@ -89,7 +82,7 @@ public class RitualEffectCrushing extends RitualEffect
if (block != null)
{
if ((block.equals(AlchemicalWizardry.ritualStone) || block.equals(AlchemicalWizardry.blockMasterStone)))
if ((block.equals(ModBlocks.ritualStone) || block.equals(ModBlocks.blockMasterStone)))
{
continue;
}
@ -114,8 +107,7 @@ public class RitualEffectCrushing extends RitualEffect
{
tileEntity.setInventorySlotContents(n, copyStack);
copyStack.stackSize = 0;
}
else
} else
{
if (itemStack.getItem().equals(copyStack.getItem()))
{
@ -128,8 +120,7 @@ public class RitualEffectCrushing extends RitualEffect
copyStack.stackSize = 0;
itemStack.stackSize = itemSize + copySize;
tileEntity.setInventorySlotContents(n, itemStack);
}
else
} else
{
copyStack.stackSize = itemSize + copySize - maxSize;
itemStack.stackSize = maxSize;

12
BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFeatheredEarth.java
View file

@ -1,12 +1,7 @@
package WayofTime.alchemicalWizardry.common.rituals;
import java.util.Iterator;
import java.util.List;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import net.minecraft.entity.EntityAgeable;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.player.EntityPlayer;
@ -16,6 +11,8 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
import java.util.List;
public class RitualEffectFeatheredEarth extends RitualEffect //Nullifies all fall damage in the area of effect
{
@Override
@ -23,7 +20,7 @@ public class RitualEffectFeatheredEarth extends RitualEffect //Nullifies all fal
{
String owner = ritualStone.getOwner();
World worldSave = MinecraftServer.getServer().worldServers[0];
LifeEssenceNetwork data = (LifeEssenceNetwork)worldSave.loadItemData(LifeEssenceNetwork.class, owner);
LifeEssenceNetwork data = (LifeEssenceNetwork) worldSave.loadItemData(LifeEssenceNetwork.class, owner);
if (data == null)
{
@ -67,8 +64,7 @@ public class RitualEffectFeatheredEarth extends RitualEffect //Nullifies all fal
}
entityOwner.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
}
else
} else
{
for (EntityLivingBase entity : entities)
{

23
BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFeatheredKnife.java
View file

@ -1,8 +1,5 @@
package WayofTime.alchemicalWizardry.common.rituals;
import java.util.Iterator;
import java.util.List;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
@ -12,11 +9,12 @@ import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
public class RitualEffectFeatheredKnife extends RitualEffect
{
import java.util.Iterator;
import java.util.List;
public class RitualEffectFeatheredKnife extends RitualEffect {
public final int timeDelay = 20;
public final int amount = 100;
@ -25,7 +23,7 @@ public class RitualEffectFeatheredKnife extends RitualEffect
{
String owner = ritualStone.getOwner();
World worldSave = MinecraftServer.getServer().worldServers[0];
LifeEssenceNetwork data = (LifeEssenceNetwork)worldSave.loadItemData(LifeEssenceNetwork.class, owner);
LifeEssenceNetwork data = (LifeEssenceNetwork) worldSave.loadItemData(LifeEssenceNetwork.class, owner);
if (data == null)
{
@ -59,7 +57,7 @@ public class RitualEffectFeatheredKnife extends RitualEffect
{
if (world.getBlockTileEntity(x + i, y + k, z + j) instanceof TEAltar)
{
tileAltar = (TEAltar)world.getBlockTileEntity(x + i, y + k, z + j);
tileAltar = (TEAltar) world.getBlockTileEntity(x + i, y + k, z + j);
testFlag = true;
}
}
@ -74,7 +72,7 @@ public class RitualEffectFeatheredKnife extends RitualEffect
//tileAltar = (TEAltar)world.getBlockTileEntity(x,y-1,z);
int d0 = 15;
int vertRange = 20;
AxisAlignedBB axisalignedbb = AxisAlignedBB.getAABBPool().getAABB((double)x, (double)y, (double)z, (double)(x + 1), (double)(y + 1), (double)(z + 1)).expand(d0, vertRange, d0);
AxisAlignedBB axisalignedbb = AxisAlignedBB.getAABBPool().getAABB((double) x, (double) y, (double) z, (double) (x + 1), (double) (y + 1), (double) (z + 1)).expand(d0, vertRange, d0);
List list = world.getEntitiesWithinAABB(EntityPlayer.class, axisalignedbb);
Iterator iterator1 = list.iterator();
EntityPlayer entity;
@ -83,7 +81,7 @@ public class RitualEffectFeatheredKnife extends RitualEffect
while (iterator1.hasNext())
{
entity = (EntityPlayer)iterator1.next();
entity = (EntityPlayer) iterator1.next();
if (entity.getClass().equals(EntityPlayerMP.class) || entity.getClass().equals(EntityPlayer.class))
{
@ -101,15 +99,14 @@ public class RitualEffectFeatheredKnife extends RitualEffect
}
entityOwner.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
}
else
} else
{
Iterator iterator2 = list.iterator();
entityCount = 0;
while (iterator2.hasNext())
{
entity = (EntityPlayer)iterator2.next();
entity = (EntityPlayer) iterator2.next();
//entity = (EntityPlayer)iterator1.next();
if (entity.getClass().equals(EntityPlayerMP.class) || entity.getClass().equals(EntityPlayer.class))

14
BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFlight.java
View file

@ -1,12 +1,8 @@
package WayofTime.alchemicalWizardry.common.rituals;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
@ -14,14 +10,15 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
public class RitualEffectFlight extends RitualEffect
{
import java.util.List;
public class RitualEffectFlight extends RitualEffect {
@Override
public void performEffect(TEMasterStone ritualStone)
{
String owner = ritualStone.getOwner();
World worldSave = MinecraftServer.getServer().worldServers[0];
LifeEssenceNetwork data = (LifeEssenceNetwork)worldSave.loadItemData(LifeEssenceNetwork.class, owner);
LifeEssenceNetwork data = (LifeEssenceNetwork) worldSave.loadItemData(LifeEssenceNetwork.class, owner);
if (data == null)
{
@ -64,8 +61,7 @@ public class RitualEffectFlight extends RitualEffect
}
entityOwner.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
}
else
} else
{
for (EntityPlayer entity : entities)
{

12
BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectGrowth.java
View file

@ -3,6 +3,7 @@ package WayofTime.alchemicalWizardry.common.rituals;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import cpw.mods.fml.common.network.PacketDispatcher;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
@ -10,16 +11,14 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.World;
import net.minecraftforge.common.IPlantable;
import cpw.mods.fml.common.network.PacketDispatcher;
public class RitualEffectGrowth extends RitualEffect
{
public class RitualEffectGrowth extends RitualEffect {
@Override
public void performEffect(TEMasterStone ritualStone)
{
String owner = ritualStone.getOwner();
World worldSave = MinecraftServer.getServer().worldServers[0];
LifeEssenceNetwork data = (LifeEssenceNetwork)worldSave.loadItemData(LifeEssenceNetwork.class, owner);
LifeEssenceNetwork data = (LifeEssenceNetwork) worldSave.loadItemData(LifeEssenceNetwork.class, owner);
if (data == null)
{
@ -43,8 +42,7 @@ public class RitualEffectGrowth extends RitualEffect
}
entityOwner.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
}
else
} else
{
if (world.getWorldTime() % 20 != 0)
{
@ -63,7 +61,7 @@ public class RitualEffectGrowth extends RitualEffect
if (block instanceof IPlantable)
{
{
PacketDispatcher.sendPacketToAllPlayers(TEAltar.getParticlePacket(x + i, y + 2, z + j, (short)3));
PacketDispatcher.sendPacketToAllPlayers(TEAltar.getParticlePacket(x + i, y + 2, z + j, (short) 3));
block.updateTick(world, x + i, y + 2, z + j, world.rand);
flag = true;
}

30
BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectHealing.java
View file

@ -1,24 +1,19 @@
package WayofTime.alchemicalWizardry.common.rituals;
import java.util.Iterator;
import java.util.List;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import net.minecraft.entity.EntityAgeable;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
public class RitualEffectHealing extends RitualEffect
{
import java.util.Iterator;
import java.util.List;
public class RitualEffectHealing extends RitualEffect {
public final int timeDelay = 50;
//public final int amount = 10;
@ -27,7 +22,7 @@ public class RitualEffectHealing extends RitualEffect
{
String owner = ritualStone.getOwner();
World worldSave = MinecraftServer.getServer().worldServers[0];
LifeEssenceNetwork data = (LifeEssenceNetwork)worldSave.loadItemData(LifeEssenceNetwork.class, owner);
LifeEssenceNetwork data = (LifeEssenceNetwork) worldSave.loadItemData(LifeEssenceNetwork.class, owner);
if (data == null)
{
@ -53,7 +48,7 @@ public class RitualEffectHealing extends RitualEffect
//tileAltar = (TEAltar)world.getBlockTileEntity(x,y-1,z);
int d0 = 10;
int vertRange = 10;
AxisAlignedBB axisalignedbb = AxisAlignedBB.getAABBPool().getAABB((double)x, (double)y, (double)z, (double)(x + 1), (double)(y + 1), (double)(z + 1)).expand(d0, vertRange, d0);
AxisAlignedBB axisalignedbb = AxisAlignedBB.getAABBPool().getAABB((double) x, (double) y, (double) z, (double) (x + 1), (double) (y + 1), (double) (z + 1)).expand(d0, vertRange, d0);
List list = world.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb);
Iterator iterator1 = list.iterator();
EntityLivingBase entity;
@ -62,13 +57,12 @@ public class RitualEffectHealing extends RitualEffect
while (iterator1.hasNext())
{
entity = (EntityLivingBase)iterator1.next();
entity = (EntityLivingBase) iterator1.next();
if (entity instanceof EntityPlayer)
{
entityCount += 10;
}
else
} else
{
entityCount++;
}
@ -84,15 +78,14 @@ public class RitualEffectHealing extends RitualEffect
}
entityOwner.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
}
else
} else
{
Iterator iterator2 = list.iterator();
entityCount = 0;
while (iterator2.hasNext())
{
entity = (EntityLivingBase)iterator2.next();
entity = (EntityLivingBase) iterator2.next();
if (entity.getHealth() + 0.1f < entity.getMaxHealth())
{
@ -105,8 +98,7 @@ public class RitualEffectHealing extends RitualEffect
if (entity instanceof EntityPlayer)
{
entityCount += 10;
}
else
} else
{
entityCount++;
}

20
BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectInterdiction.java
View file

@ -1,8 +1,5 @@
package WayofTime.alchemicalWizardry.common.rituals;
import java.util.Iterator;
import java.util.List;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import net.minecraft.entity.EntityLivingBase;
@ -13,14 +10,16 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
public class RitualEffectInterdiction extends RitualEffect
{
import java.util.Iterator;
import java.util.List;
public class RitualEffectInterdiction extends RitualEffect {
@Override
public void performEffect(TEMasterStone ritualStone)
{
String owner = ritualStone.getOwner();
World worldSave = MinecraftServer.getServer().worldServers[0];
LifeEssenceNetwork data = (LifeEssenceNetwork)worldSave.loadItemData(LifeEssenceNetwork.class, owner);
LifeEssenceNetwork data = (LifeEssenceNetwork) worldSave.loadItemData(LifeEssenceNetwork.class, owner);
if (data == null)
{
@ -44,12 +43,11 @@ public class RitualEffectInterdiction extends RitualEffect
}
entityOwner.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
}
else
} else
{
int d0 = 5;
AxisAlignedBB axisalignedbb = AxisAlignedBB.getAABBPool().getAABB((double)x, (double)y, (double)z, (double)(x + 1), (double)(y + 1), (double)(z + 1)).expand(d0, d0, d0);
axisalignedbb.maxY = Math.min((double)world.getHeight(), (double)(y + 1 + d0));
AxisAlignedBB axisalignedbb = AxisAlignedBB.getAABBPool().getAABB((double) x, (double) y, (double) z, (double) (x + 1), (double) (y + 1), (double) (z + 1)).expand(d0, d0, d0);
axisalignedbb.maxY = Math.min((double) world.getHeight(), (double) (y + 1 + d0));
List list = world.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb);
Iterator iterator = list.iterator();
EntityLivingBase entityplayer;
@ -57,7 +55,7 @@ public class RitualEffectInterdiction extends RitualEffect
while (iterator.hasNext())
{
entityplayer = (EntityLivingBase)iterator.next();
entityplayer = (EntityLivingBase) iterator.next();
if (!(entityplayer.getEntityName().equals(owner)))
{

29
BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectJumping.java
View file

@ -1,11 +1,10 @@
package WayofTime.alchemicalWizardry.common.rituals;
import java.util.Iterator;
import java.util.List;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.PacketHandler;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
@ -13,17 +12,17 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
public class RitualEffectJumping extends RitualEffect
{
import java.util.Iterator;
import java.util.List;
public class RitualEffectJumping extends RitualEffect {
@Override
public void performEffect(TEMasterStone ritualStone)
{
String owner = ritualStone.getOwner();
World worldSave = MinecraftServer.getServer().worldServers[0];
LifeEssenceNetwork data = (LifeEssenceNetwork)worldSave.loadItemData(LifeEssenceNetwork.class, owner);
LifeEssenceNetwork data = (LifeEssenceNetwork) worldSave.loadItemData(LifeEssenceNetwork.class, owner);
if (data == null)
{
@ -47,11 +46,10 @@ public class RitualEffectJumping extends RitualEffect
}
entityOwner.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
}
else
} else
{
int d0 = 0;
AxisAlignedBB axisalignedbb = AxisAlignedBB.getAABBPool().getAABB((double)x, (double)y + 1, (double)z, (double)(x + 1), (double)(y + 2), (double)(z + 1)).expand(d0, d0, d0);
AxisAlignedBB axisalignedbb = AxisAlignedBB.getAABBPool().getAABB((double) x, (double) y + 1, (double) z, (double) (x + 1), (double) (y + 2), (double) (z + 1)).expand(d0, d0, d0);
List list = world.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb);
Iterator iterator = list.iterator();
EntityLivingBase entityplayer;
@ -59,17 +57,16 @@ public class RitualEffectJumping extends RitualEffect
while (iterator.hasNext())
{
entityplayer = (EntityLivingBase)iterator.next();
entityplayer = (EntityLivingBase) iterator.next();
if (entityplayer instanceof EntityPlayer)
{
PacketDispatcher.sendPacketToPlayer(PacketHandler.getPlayerVelocitySettingPacket(entityplayer.motionX, 1.5, entityplayer.motionZ), (Player)entityplayer);
PacketDispatcher.sendPacketToPlayer(PacketHandler.getPlayerVelocitySettingPacket(entityplayer.motionX, 1.5, entityplayer.motionZ), (Player) entityplayer);
entityplayer.motionY = 1.5;
entityplayer.fallDistance = 0;
flag = true;
}
else
//if (!(entityplayer.getEntityName().equals(owner)))
} else
//if (!(entityplayer.getEntityName().equals(owner)))
{
// double xDif = entityplayer.posX - xCoord;
// double yDif = entityplayer.posY - (yCoord + 1);

12
BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectLava.java
View file

@ -3,22 +3,21 @@ package WayofTime.alchemicalWizardry.common.rituals;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import cpw.mods.fml.common.network.PacketDispatcher;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.PacketDispatcher;
public class RitualEffectLava extends RitualEffect
{
public class RitualEffectLava extends RitualEffect {
@Override
public void performEffect(TEMasterStone ritualStone)
{
String owner = ritualStone.getOwner();
World worldSave = MinecraftServer.getServer().worldServers[0];
LifeEssenceNetwork data = (LifeEssenceNetwork)worldSave.loadItemData(LifeEssenceNetwork.class, owner);
LifeEssenceNetwork data = (LifeEssenceNetwork) worldSave.loadItemData(LifeEssenceNetwork.class, owner);
if (data == null)
{
@ -44,12 +43,11 @@ public class RitualEffectLava extends RitualEffect
}
entityOwner.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
}
else
} else
{
for (int i = 0; i < 10; i++)
{
PacketDispatcher.sendPacketToAllPlayers(TEAltar.getParticlePacket(x, y, z, (short)3));
PacketDispatcher.sendPacketToAllPlayers(TEAltar.getParticlePacket(x, y, z, (short) 3));
}
world.setBlock(x, y + 1, z, Block.lavaMoving.blockID, 0, 3);

35
BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectLeap.java
View file

@ -1,11 +1,10 @@
package WayofTime.alchemicalWizardry.common.rituals;
import java.util.Iterator;
import java.util.List;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.PacketHandler;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
@ -13,17 +12,17 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
public class RitualEffectLeap extends RitualEffect
{
import java.util.Iterator;
import java.util.List;
public class RitualEffectLeap extends RitualEffect {
@Override
public void performEffect(TEMasterStone ritualStone)
{
String owner = ritualStone.getOwner();
World worldSave = MinecraftServer.getServer().worldServers[0];
LifeEssenceNetwork data = (LifeEssenceNetwork)worldSave.loadItemData(LifeEssenceNetwork.class, owner);
LifeEssenceNetwork data = (LifeEssenceNetwork) worldSave.loadItemData(LifeEssenceNetwork.class, owner);
if (data == null)
{
@ -47,12 +46,11 @@ public class RitualEffectLeap extends RitualEffect
}
entityOwner.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
}
else
} else
{
int direction = ritualStone.getDirection();
int d0 = 2;
AxisAlignedBB axisalignedbb = AxisAlignedBB.getAABBPool().getAABB((double)x, (double)y - 1, (double)z, (double)(x + 1), (double)(y + 2), (double)(z + 1)).expand(d0, 0, d0);
AxisAlignedBB axisalignedbb = AxisAlignedBB.getAABBPool().getAABB((double) x, (double) y - 1, (double) z, (double) (x + 1), (double) (y + 2), (double) (z + 1)).expand(d0, 0, d0);
List list = world.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb);
Iterator iterator = list.iterator();
EntityLivingBase entityplayer;
@ -60,7 +58,7 @@ public class RitualEffectLeap extends RitualEffect
while (iterator.hasNext())
{
entityplayer = (EntityLivingBase)iterator.next();
entityplayer = (EntityLivingBase) iterator.next();
if (entityplayer instanceof EntityPlayer)
{
@ -70,26 +68,25 @@ public class RitualEffectLeap extends RitualEffect
switch (direction)
{
case 1:
PacketDispatcher.sendPacketToPlayer(PacketHandler.getPlayerVelocitySettingPacket(0, 1.2, -3.0), (Player)entityplayer);
PacketDispatcher.sendPacketToPlayer(PacketHandler.getPlayerVelocitySettingPacket(0, 1.2, -3.0), (Player) entityplayer);
break;
case 2:
PacketDispatcher.sendPacketToPlayer(PacketHandler.getPlayerVelocitySettingPacket(3.0, 1.2, 0), (Player)entityplayer);
PacketDispatcher.sendPacketToPlayer(PacketHandler.getPlayerVelocitySettingPacket(3.0, 1.2, 0), (Player) entityplayer);
break;
case 3:
PacketDispatcher.sendPacketToPlayer(PacketHandler.getPlayerVelocitySettingPacket(0, 1.2, 3.0), (Player)entityplayer);
PacketDispatcher.sendPacketToPlayer(PacketHandler.getPlayerVelocitySettingPacket(0, 1.2, 3.0), (Player) entityplayer);
break;
case 4:
PacketDispatcher.sendPacketToPlayer(PacketHandler.getPlayerVelocitySettingPacket(-3.0, 1.2, 0), (Player)entityplayer);
PacketDispatcher.sendPacketToPlayer(PacketHandler.getPlayerVelocitySettingPacket(-3.0, 1.2, 0), (Player) entityplayer);
break;
}
flag = true;
}
else
//if (!(entityplayer.getEntityName().equals(owner)))
} else
//if (!(entityplayer.getEntityName().equals(owner)))
{
// double xDif = entityplayer.posX - xCoord;
// double yDif = entityplayer.posY - (yCoord + 1);

8
BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectMagnetic.java
View file

@ -12,14 +12,13 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.world.World;
import net.minecraftforge.oredict.OreDictionary;
public class RitualEffectMagnetic extends RitualEffect
{
public class RitualEffectMagnetic extends RitualEffect {
@Override
public void performEffect(TEMasterStone ritualStone)
{
String owner = ritualStone.getOwner();
World worldSave = MinecraftServer.getServer().worldServers[0];
LifeEssenceNetwork data = (LifeEssenceNetwork)worldSave.loadItemData(LifeEssenceNetwork.class, owner);
LifeEssenceNetwork data = (LifeEssenceNetwork) worldSave.loadItemData(LifeEssenceNetwork.class, owner);
if (data == null)
{
@ -48,8 +47,7 @@ public class RitualEffectMagnetic extends RitualEffect
}
entityOwner.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
}
else
} else
{
int xRep = 0;
int yRep = 0;

58
BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectSoulBound.java
View file

@ -1,13 +1,11 @@
package WayofTime.alchemicalWizardry.common.rituals;
import java.util.Iterator;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.ModItems;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import thaumcraft.api.ItemApi;
import cpw.mods.fml.common.network.PacketDispatcher;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
@ -18,17 +16,18 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.registry.GameRegistry;
import thaumcraft.api.ItemApi;
public class RitualEffectSoulBound extends RitualEffect
{
import java.util.Iterator;
import java.util.List;
public class RitualEffectSoulBound extends RitualEffect {
@Override
public void performEffect(TEMasterStone ritualStone)
{
String owner = ritualStone.getOwner();
World worldSave = MinecraftServer.getServer().worldServers[0];
LifeEssenceNetwork data = (LifeEssenceNetwork)worldSave.loadItemData(LifeEssenceNetwork.class, owner);
LifeEssenceNetwork data = (LifeEssenceNetwork) worldSave.loadItemData(LifeEssenceNetwork.class, owner);
if (data == null)
{
@ -52,20 +51,19 @@ public class RitualEffectSoulBound extends RitualEffect
}
entityOwner.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
}
else
} else
{
if (ritualStone.getVar1() == 0)
{
int d0 = 0;
AxisAlignedBB axisalignedbb = AxisAlignedBB.getAABBPool().getAABB((double)x, (double)y + 1, (double)z, (double)(x + 1), (double)(y + 2), (double)(z + 1)).expand(d0, d0, d0);
AxisAlignedBB axisalignedbb = AxisAlignedBB.getAABBPool().getAABB((double) x, (double) y + 1, (double) z, (double) (x + 1), (double) (y + 2), (double) (z + 1)).expand(d0, d0, d0);
List list = world.getEntitiesWithinAABB(EntityItem.class, axisalignedbb);
Iterator iterator = list.iterator();
EntityItem item;
while (iterator.hasNext())
{
item = (EntityItem)iterator.next();
item = (EntityItem) iterator.next();
// double xDif = item.posX - (xCoord+0.5);
// double yDif = item.posY - (yCoord+1);
// double zDif = item.posZ - (zCoord+0.5);
@ -83,49 +81,44 @@ public class RitualEffectSoulBound extends RitualEffect
itemGoggles = ItemApi.getItem("itemGoggles", 0);
}
if (itemStack.itemID == AlchemicalWizardry.apprenticeBloodOrb.itemID)
if (itemStack.itemID == ModItems.apprenticeBloodOrb.itemID)
{
ritualStone.setVar1(AlchemicalWizardry.energyBlaster.itemID);
ritualStone.setVar1(ModItems.energyBlaster.itemID);
world.addWeatherEffect(new EntityLightningBolt(world, x, y + 1, z));
ritualStone.setCooldown(ritualStone.getCooldown() - 1);
item.setDead();
return;
}
else if (itemStack.itemID == Item.swordDiamond.itemID)
} else if (itemStack.itemID == Item.swordDiamond.itemID)
{
ritualStone.setVar1(AlchemicalWizardry.energySword.itemID);
ritualStone.setVar1(ModItems.energySword.itemID);
world.addWeatherEffect(new EntityLightningBolt(world, x, y + 1, z));
ritualStone.setCooldown(ritualStone.getCooldown() - 1);
item.setDead();
return;
}
else if (itemStack.itemID == Item.pickaxeDiamond.itemID)
} else if (itemStack.itemID == Item.pickaxeDiamond.itemID)
{
ritualStone.setVar1(AlchemicalWizardry.boundPickaxe.itemID);
ritualStone.setVar1(ModItems.boundPickaxe.itemID);
world.addWeatherEffect(new EntityLightningBolt(world, x, y + 1, z));
ritualStone.setCooldown(ritualStone.getCooldown() - 1);
item.setDead();
return;
}
else if (itemStack.itemID == Item.axeDiamond.itemID)
} else if (itemStack.itemID == Item.axeDiamond.itemID)
{
ritualStone.setVar1(AlchemicalWizardry.boundAxe.itemID);
ritualStone.setVar1(ModItems.boundAxe.itemID);
world.addWeatherEffect(new EntityLightningBolt(world, x, y + 1, z));
ritualStone.setCooldown(ritualStone.getCooldown() - 1);
item.setDead();
return;
}
else if (itemStack.itemID == Item.shovelDiamond.itemID)
} else if (itemStack.itemID == Item.shovelDiamond.itemID)
{
ritualStone.setVar1(AlchemicalWizardry.boundShovel.itemID);
ritualStone.setVar1(ModItems.boundShovel.itemID);
world.addWeatherEffect(new EntityLightningBolt(world, x, y + 1, z));
ritualStone.setCooldown(ritualStone.getCooldown() - 1);
item.setDead();
return;
}
else if (itemGoggles != null && itemGoggles.isItemEqual(itemStack))
} else if (itemGoggles != null && itemGoggles.isItemEqual(itemStack))
{
ritualStone.setVar1(AlchemicalWizardry.sanguineHelmet.itemID);
ritualStone.setVar1(ModItems.sanguineHelmet.itemID);
world.addWeatherEffect(new EntityLightningBolt(world, x, y + 1, z));
ritualStone.setCooldown(ritualStone.getCooldown() - 1);
item.setDead();
@ -134,14 +127,13 @@ public class RitualEffectSoulBound extends RitualEffect
if (world.rand.nextInt(10) == 0)
{
PacketDispatcher.sendPacketToAllPlayers(TEAltar.getParticlePacket(item.posX, item.posY, item.posZ, (short)1));
PacketDispatcher.sendPacketToAllPlayers(TEAltar.getParticlePacket(item.posX, item.posY, item.posZ, (short) 1));
}
}
data.currentEssence = currentEssence - this.getCostPerRefresh();
data.markDirty();
}
else
} else
{
ritualStone.setCooldown(ritualStone.getCooldown() - 1);

14
BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectSummonMeteor.java
View file

@ -1,13 +1,9 @@
package WayofTime.alchemicalWizardry.common.rituals;
import java.util.List;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.entity.projectile.EntityMeteor;
import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorRegistry;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
@ -16,14 +12,15 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
public class RitualEffectSummonMeteor extends RitualEffect
{
import java.util.List;
public class RitualEffectSummonMeteor extends RitualEffect {
@Override
public void performEffect(TEMasterStone ritualStone)
{
String owner = ritualStone.getOwner();
World worldSave = MinecraftServer.getServer().worldServers[0];
LifeEssenceNetwork data = (LifeEssenceNetwork)worldSave.loadItemData(LifeEssenceNetwork.class, owner);
LifeEssenceNetwork data = (LifeEssenceNetwork) worldSave.loadItemData(LifeEssenceNetwork.class, owner);
if (data == null)
{
@ -52,8 +49,7 @@ public class RitualEffectSummonMeteor extends RitualEffect
}
entityOwner.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
}
else
} else
{
List<EntityItem> entities = world.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(x, y + 1, z, x + 1, y + 2, z + 1));

60
BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectUnbinding.java
View file

@ -1,8 +1,13 @@
package WayofTime.alchemicalWizardry.common.rituals;
import java.util.Iterator;
import java.util.List;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.ModBlocks;
import WayofTime.alchemicalWizardry.common.ModItems;
import WayofTime.alchemicalWizardry.common.items.BoundArmour;
import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import cpw.mods.fml.common.network.PacketDispatcher;
import net.minecraft.block.Block;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.item.EntityItem;
@ -14,22 +19,17 @@ import net.minecraft.potion.PotionEffect;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.items.BoundArmour;
import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import cpw.mods.fml.common.network.PacketDispatcher;
public class RitualEffectUnbinding extends RitualEffect
{
import java.util.Iterator;
import java.util.List;
public class RitualEffectUnbinding extends RitualEffect {
@Override
public void performEffect(TEMasterStone ritualStone)
{
String owner = ritualStone.getOwner();
World worldSave = MinecraftServer.getServer().worldServers[0];
LifeEssenceNetwork data = (LifeEssenceNetwork)worldSave.loadItemData(LifeEssenceNetwork.class, owner);
LifeEssenceNetwork data = (LifeEssenceNetwork) worldSave.loadItemData(LifeEssenceNetwork.class, owner);
if (data == null)
{
@ -53,18 +53,17 @@ public class RitualEffectUnbinding extends RitualEffect
}
entityOwner.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
}
else
} else
{
int d0 = 0;
AxisAlignedBB axisalignedbb = AxisAlignedBB.getAABBPool().getAABB((double)x, (double)y + 1, (double)z, (double)(x + 1), (double)(y + 2), (double)(z + 1)).expand(d0, d0, d0);
AxisAlignedBB axisalignedbb = AxisAlignedBB.getAABBPool().getAABB((double) x, (double) y + 1, (double) z, (double) (x + 1), (double) (y + 2), (double) (z + 1)).expand(d0, d0, d0);
List list = world.getEntitiesWithinAABB(EntityItem.class, axisalignedbb);
Iterator iterator = list.iterator();
EntityItem item;
while (iterator.hasNext())
{
item = (EntityItem)iterator.next();
item = (EntityItem) iterator.next();
// double xDif = item.posX - (xCoord+0.5);
// double yDif = item.posY - (yCoord+1);
// double zDif = item.posZ - (zCoord+0.5);
@ -75,23 +74,19 @@ public class RitualEffectUnbinding extends RitualEffect
continue;
}
if (itemStack.itemID == AlchemicalWizardry.boundHelmet.itemID)
if (itemStack.itemID == ModItems.boundHelmet.itemID)
{
ritualStone.setVar1(5);
}
else if (itemStack.itemID == AlchemicalWizardry.boundPlate.itemID)
} else if (itemStack.itemID == ModItems.boundPlate.itemID)
{
ritualStone.setVar1(8);
}
else if (itemStack.itemID == AlchemicalWizardry.boundLeggings.itemID)
} else if (itemStack.itemID == ModItems.boundLeggings.itemID)
{
ritualStone.setVar1(7);
}
else if (itemStack.itemID == AlchemicalWizardry.boundBoots.itemID)
} else if (itemStack.itemID == ModItems.boundBoots.itemID)
{
ritualStone.setVar1(4);
}
else if (itemStack.itemID == AlchemicalWizardry.sigilOfHolding.itemID)
} else if (itemStack.itemID == ModItems.sigilOfHolding.itemID)
{
ritualStone.setVar1(-1);
}
@ -104,7 +99,7 @@ public class RitualEffectUnbinding extends RitualEffect
world.addWeatherEffect(new EntityLightningBolt(world, x - 5, y + 1, z));
world.addWeatherEffect(new EntityLightningBolt(world, x + 5, y + 1, z));
NBTTagCompound itemTag = itemStack.stackTagCompound;
ItemStack[] inv = ((BoundArmour)itemStack.getItem()).getInternalInventory(itemStack);
ItemStack[] inv = ((BoundArmour) itemStack.getItem()).getInternalInventory(itemStack);
if (inv != null)
{
@ -118,12 +113,11 @@ public class RitualEffectUnbinding extends RitualEffect
}
}
EntityItem newItem = new EntityItem(world, x + 0.5, y + 1, z + 0.5, new ItemStack(Block.blocksList[AlchemicalWizardry.bloodSocket.blockID], ritualStone.getVar1()));
EntityItem newItem = new EntityItem(world, x + 0.5, y + 1, z + 0.5, new ItemStack(Block.blocksList[ModBlocks.bloodSocket.blockID], ritualStone.getVar1()));
world.spawnEntityInWorld(newItem);
ritualStone.setActive(false);
break;
}
else if (ritualStone.getVar1() == -1)
} else if (ritualStone.getVar1() == -1)
{
item.setDead();
world.addWeatherEffect(new EntityLightningBolt(world, x, y + 1, z - 5));
@ -131,7 +125,7 @@ public class RitualEffectUnbinding extends RitualEffect
world.addWeatherEffect(new EntityLightningBolt(world, x - 5, y + 1, z));
world.addWeatherEffect(new EntityLightningBolt(world, x + 5, y + 1, z));
NBTTagCompound itemTag = itemStack.stackTagCompound;
ItemStack[] inv = ((SigilOfHolding)itemStack.getItem()).getInternalInventory(itemStack);
ItemStack[] inv = ((SigilOfHolding) itemStack.getItem()).getInternalInventory(itemStack);
if (inv != null)
{
@ -145,7 +139,7 @@ public class RitualEffectUnbinding extends RitualEffect
}
}
EntityItem newItem = new EntityItem(world, x + 0.5, y + 1, z + 0.5, new ItemStack(AlchemicalWizardry.sigilOfHolding.itemID, 1, 0));
EntityItem newItem = new EntityItem(world, x + 0.5, y + 1, z + 0.5, new ItemStack(ModItems.sigilOfHolding.itemID, 1, 0));
world.spawnEntityInWorld(newItem);
ritualStone.setActive(false);
break;
@ -153,7 +147,7 @@ public class RitualEffectUnbinding extends RitualEffect
if (world.rand.nextInt(10) == 0)
{
PacketDispatcher.sendPacketToAllPlayers(TEAltar.getParticlePacket(item.posX, item.posY, item.posZ, (short)1));
PacketDispatcher.sendPacketToAllPlayers(TEAltar.getParticlePacket(item.posX, item.posY, item.posZ, (short) 1));
}
}

12
BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectWater.java
View file

@ -3,21 +3,20 @@ package WayofTime.alchemicalWizardry.common.rituals;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import cpw.mods.fml.common.network.PacketDispatcher;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.PacketDispatcher;
public class RitualEffectWater extends RitualEffect
{
public class RitualEffectWater extends RitualEffect {
public void performEffect(TEMasterStone ritualStone)
{
String owner = ritualStone.getOwner();
World worldSave = MinecraftServer.getServer().worldServers[0];
LifeEssenceNetwork data = (LifeEssenceNetwork)worldSave.loadItemData(LifeEssenceNetwork.class, owner);
LifeEssenceNetwork data = (LifeEssenceNetwork) worldSave.loadItemData(LifeEssenceNetwork.class, owner);
if (data == null)
{
@ -43,12 +42,11 @@ public class RitualEffectWater extends RitualEffect
}
entityOwner.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
}
else
} else
{
for (int i = 0; i < 10; i++)
{
PacketDispatcher.sendPacketToAllPlayers(TEAltar.getParticlePacket(x, y, z, (short)3));
PacketDispatcher.sendPacketToAllPlayers(TEAltar.getParticlePacket(x, y, z, (short) 3));
}
world.setBlock(x, y + 1, z, Block.waterMoving.blockID, 0, 3);

25
BM_src/WayofTime/alchemicalWizardry/common/rituals/RitualEffectWellOfSuffering.java
View file

@ -1,12 +1,8 @@
package WayofTime.alchemicalWizardry.common.rituals;
import java.util.Iterator;
import java.util.List;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import net.minecraft.entity.EntityAgeable;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
@ -15,11 +11,11 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
public class RitualEffectWellOfSuffering extends RitualEffect
{
import java.util.Iterator;
import java.util.List;
public class RitualEffectWellOfSuffering extends RitualEffect {
public final int timeDelay = 25;
public final int amount = 10;
@ -28,7 +24,7 @@ public class RitualEffectWellOfSuffering extends RitualEffect
{
String owner = ritualStone.getOwner();
World worldSave = MinecraftServer.getServer().worldServers[0];
LifeEssenceNetwork data = (LifeEssenceNetwork)worldSave.loadItemData(LifeEssenceNetwork.class, owner);
LifeEssenceNetwork data = (LifeEssenceNetwork) worldSave.loadItemData(LifeEssenceNetwork.class, owner);
if (data == null)
{
@ -62,7 +58,7 @@ public class RitualEffectWellOfSuffering extends RitualEffect
{
if (world.getBlockTileEntity(x + i, y + k, z + j) instanceof TEAltar)
{
tileAltar = (TEAltar)world.getBlockTileEntity(x + i, y + k, z + j);
tileAltar = (TEAltar) world.getBlockTileEntity(x + i, y + k, z + j);
testFlag = true;
}
}
@ -77,7 +73,7 @@ public class RitualEffectWellOfSuffering extends RitualEffect
//tileAltar = (TEAltar)world.getBlockTileEntity(x,y-1,z);
int d0 = 10;
int vertRange = 5;
AxisAlignedBB axisalignedbb = AxisAlignedBB.getAABBPool().getAABB((double)x, (double)y, (double)z, (double)(x + 1), (double)(y + 1), (double)(z + 1)).expand(d0, vertRange, d0);
AxisAlignedBB axisalignedbb = AxisAlignedBB.getAABBPool().getAABB((double) x, (double) y, (double) z, (double) (x + 1), (double) (y + 1), (double) (z + 1)).expand(d0, vertRange, d0);
List list = world.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb);
Iterator iterator1 = list.iterator();
EntityLivingBase entity;
@ -86,7 +82,7 @@ public class RitualEffectWellOfSuffering extends RitualEffect
while (iterator1.hasNext())
{
entity = (EntityLivingBase)iterator1.next();
entity = (EntityLivingBase) iterator1.next();
entityCount++;
}
@ -100,15 +96,14 @@ public class RitualEffectWellOfSuffering extends RitualEffect
}
entityOwner.addPotionEffect(new PotionEffect(Potion.confusion.id, 80));
}
else
} else
{
Iterator iterator2 = list.iterator();
entityCount = 0;
while (iterator2.hasNext())
{
entity = (EntityLivingBase)iterator2.next();
entity = (EntityLivingBase) iterator2.next();
if (entity instanceof EntityPlayer)
{

32
BM_src/WayofTime/alchemicalWizardry/common/rituals/Rituals.java
View file

@ -1,16 +1,15 @@
package WayofTime.alchemicalWizardry.common.rituals;
import java.util.ArrayList;
import java.util.List;
import WayofTime.alchemicalWizardry.common.block.RitualStone;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraftforge.oredict.OreDictionary;
public class Rituals
{
import java.util.ArrayList;
import java.util.List;
public class Rituals {
private List<RitualComponent> components;
private int crystalLevel;
private int actCost;
@ -57,8 +56,7 @@ public class Rituals
if (ritual <= ritualList.size())
{
return ritualList.get(ritual - 1).crystalLevel <= crystalLevel;
}
else
} else
{
return false;
}
@ -112,12 +110,13 @@ public class Rituals
//
// return true;
}
/**
1 - NORTH
2 - EAST
3 - SOUTH
4 - WEST
*/
* 1 - NORTH
* 2 - EAST
* 3 - SOUTH
* 4 - WEST
*/
public static boolean checkDirectionOfRitualValid(World world, int x, int y, int z, int ritualID, int direction)
{
List<RitualComponent> ritual = Rituals.getRitualList(ritualID);
@ -895,8 +894,7 @@ public class Rituals
if (ritualID <= ritualList.size())
{
return ritualList.get(ritualID - 1).actCost;
}
else
} else
{
return 0;
}
@ -985,8 +983,7 @@ public class Rituals
if (ritualID <= ritualList.size())
{
return ritualList.get(ritualID - 1).obtainComponents();
}
else
} else
{
return null;
}
@ -1060,8 +1057,7 @@ public class Rituals
if (ritualList.get(id) != null)
{
return ritualList.get(id).getRitualName();
}
else
} else
{
return "";
}