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

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)
{