Reformatting with Vindex's magic

This commit is contained in:
WayofTime 2015-12-31 13:50:38 -05:00
parent 67a9d5c1e9
commit e8d1ff4997
18 changed files with 421 additions and 414 deletions

View file

@ -37,13 +37,13 @@ public class ItemBindable extends Item implements IBindable
public static boolean syphonNetwork(ItemStack stack, EntityPlayer player, int lpUsed) public static boolean syphonNetwork(ItemStack stack, EntityPlayer player, int lpUsed)
{ {
if (player == null) return false; if (player == null)
return false;
if (!player.worldObj.isRemote) if (!player.worldObj.isRemote)
{ {
return NetworkHelper.syphonAndDamage(NetworkHelper.getSoulNetwork(player, player.worldObj), lpUsed); return NetworkHelper.syphonAndDamage(NetworkHelper.getSoulNetwork(player, player.worldObj), lpUsed);
} } else
else
{ {
double posX = player.posX; double posX = player.posX;
double posY = player.posY; double posY = player.posY;
@ -77,10 +77,10 @@ public class ItemBindable extends Item implements IBindable
user.attackEntityFrom(BloodMagicAPI.getDamageSource(), 0F); // Emulate an attack user.attackEntityFrom(BloodMagicAPI.getDamageSource(), 0F); // Emulate an attack
user.setHealth(user.getHealth() - 1); user.setHealth(user.getHealth() - 1);
if (user.getHealth() <= 0.0005f) user.onDeath(BloodMagicAPI.getDamageSource()); if (user.getHealth() <= 0.0005f)
user.onDeath(BloodMagicAPI.getDamageSource());
} }
} } else if (lpSyphoned >= 100)
else if (lpSyphoned >= 100)
{ {
if (!user.capabilities.isCreativeMode) if (!user.capabilities.isCreativeMode)
{ {

View file

@ -78,7 +78,8 @@ public class ItemBoundTool extends ItemBindable
// if (!world.isRemote) // if (!world.isRemote)
{ {
if (player.isSneaking()) setActivated(stack, !getActivated(stack)); if (player.isSneaking())
setActivated(stack, !getActivated(stack));
// if (getActivated(stack) && ItemBindable.syphonBatteries(stack, // if (getActivated(stack) && ItemBindable.syphonBatteries(stack,
// player, getLPUsed())) // player, getLPUsed()))
// return stack; // return stack;
@ -88,7 +89,8 @@ public class ItemBoundTool extends ItemBindable
if (!player.isSneaking() && getActivated(stack)) if (!player.isSneaking() && getActivated(stack))
{ {
BoundToolEvent.Charge event = new BoundToolEvent.Charge(player, stack); BoundToolEvent.Charge event = new BoundToolEvent.Charge(player, stack);
if (MinecraftForge.EVENT_BUS.post(event)) return event.result; if (MinecraftForge.EVENT_BUS.post(event))
return event.result;
player.setItemInUse(stack, this.getMaxItemUseDuration(stack)); player.setItemInUse(stack, this.getMaxItemUseDuration(stack));
beingHeldDown = true; beingHeldDown = true;
@ -122,7 +124,8 @@ public class ItemBoundTool extends ItemBindable
{ {
int i = this.getMaxItemUseDuration(stack) - timeLeft; int i = this.getMaxItemUseDuration(stack) - timeLeft;
BoundToolEvent.Release event = new BoundToolEvent.Release(playerIn, stack, i); BoundToolEvent.Release event = new BoundToolEvent.Release(playerIn, stack, i);
if (MinecraftForge.EVENT_BUS.post(event)) return; if (MinecraftForge.EVENT_BUS.post(event))
return;
i = event.charge; i = event.charge;
@ -167,8 +170,10 @@ public class ItemBoundTool extends ItemBindable
if (StatCollector.canTranslate(tooltipBase + "desc")) if (StatCollector.canTranslate(tooltipBase + "desc"))
tooltip.add(TextHelper.localizeEffect(tooltipBase + "desc")); tooltip.add(TextHelper.localizeEffect(tooltipBase + "desc"));
if (getActivated(stack)) tooltip.add(TextHelper.localize("tooltip.BloodMagic.activated")); if (getActivated(stack))
else tooltip.add(TextHelper.localize("tooltip.BloodMagic.deactivated")); tooltip.add(TextHelper.localize("tooltip.BloodMagic.activated"));
else
tooltip.add(TextHelper.localize("tooltip.BloodMagic.deactivated"));
super.addInformation(stack, player, tooltip, advanced); super.addInformation(stack, player, tooltip, advanced);
} }

View file

@ -49,16 +49,17 @@ public class ItemLavaCrystal extends ItemBindable implements IFuelHandler
if (syphonNetwork(fuel, getLPUsed())) if (syphonNetwork(fuel, getLPUsed()))
{ {
return 1; return 1;
} } else
else
{ {
NBTTagCompound tag = fuel.getTagCompound(); NBTTagCompound tag = fuel.getTagCompound();
if (tag == null || MinecraftServer.getServer() == null || MinecraftServer.getServer().getConfigurationManager() == null) if (tag == null || MinecraftServer.getServer() == null || MinecraftServer.getServer().getConfigurationManager() == null)
return 0; return 0;
if (Strings.isNullOrEmpty(((ItemLavaCrystal) fuelItem).getBindableOwner(fuel))) return 0; if (Strings.isNullOrEmpty(((ItemLavaCrystal) fuelItem).getBindableOwner(fuel)))
else hurtPlayer(PlayerHelper.getPlayerFromUUID(getBindableOwner(fuel)), getLPUsed()); return 0;
else
hurtPlayer(PlayerHelper.getPlayerFromUUID(getBindableOwner(fuel)), getLPUsed());
return 0; return 0;
} }

View file

@ -30,7 +30,8 @@ public class ItemSigilBloodLight extends ItemSigilBase
@Override @Override
public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos blockPos, EnumFacing side, float hitX, float hitY, float hitZ) public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, BlockPos blockPos, EnumFacing side, float hitX, float hitY, float hitZ)
{ {
if (world.isRemote) return false; if (world.isRemote)
return false;
if (BindableHelper.checkAndSetItemOwner(stack, player) && ItemBindable.syphonNetwork(stack, player, getLPUsed())) if (BindableHelper.checkAndSetItemOwner(stack, player) && ItemBindable.syphonNetwork(stack, player, getLPUsed()))
{ {

View file

@ -32,7 +32,8 @@ public class ItemSigilLava extends ItemSigilBase
if (movingobjectposition != null) if (movingobjectposition != null)
{ {
ItemStack ret = net.minecraftforge.event.ForgeEventFactory.onBucketUse(player, world, stack, movingobjectposition); ItemStack ret = net.minecraftforge.event.ForgeEventFactory.onBucketUse(player, world, stack, movingobjectposition);
if (ret != null) return ret; if (ret != null)
return ret;
if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)
{ {
@ -118,12 +119,10 @@ public class ItemSigilLava extends ItemSigilBase
if (!world.isAirBlock(blockPos) && world.getBlockState(blockPos).getBlock().getMaterial().isSolid()) if (!world.isAirBlock(blockPos) && world.getBlockState(blockPos).getBlock().getMaterial().isSolid())
{ {
return false; return false;
} } else if ((world.getBlockState(blockPos).getBlock() == Blocks.lava || world.getBlockState(blockPos).getBlock() == Blocks.flowing_lava) && world.getBlockState(blockPos).getBlock().getMetaFromState(world.getBlockState(blockPos)) == 0)
else if ((world.getBlockState(blockPos).getBlock() == Blocks.lava || world.getBlockState(blockPos).getBlock() == Blocks.flowing_lava) && world.getBlockState(blockPos).getBlock().getMetaFromState(world.getBlockState(blockPos)) == 0)
{ {
return false; return false;
} } else
else
{ {
world.setBlockState(blockPos, Blocks.lava.getBlockState().getBaseState(), 3); world.setBlockState(blockPos, Blocks.lava.getBlockState().getBaseState(), 3);
return true; return true;

View file

@ -29,8 +29,10 @@ public class ItemSigilToggleable extends ItemSigilBase
public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced) public void addInformation(ItemStack stack, EntityPlayer player, List<String> tooltip, boolean advanced)
{ {
super.addInformation(stack, player, tooltip, advanced); super.addInformation(stack, player, tooltip, advanced);
if (getActivated(stack)) tooltip.add(TextHelper.localize("tooltip.BloodMagic.activated")); if (getActivated(stack))
else tooltip.add(TextHelper.localize("tooltip.BloodMagic.deactivated")); tooltip.add(TextHelper.localize("tooltip.BloodMagic.activated"));
else
tooltip.add(TextHelper.localize("tooltip.BloodMagic.deactivated"));
} }
@Override @Override
@ -38,8 +40,10 @@ public class ItemSigilToggleable extends ItemSigilBase
{ {
if (!world.isRemote && !isUnusable(stack)) if (!world.isRemote && !isUnusable(stack))
{ {
if (player.isSneaking()) setActivated(stack, !getActivated(stack)); if (player.isSneaking())
if (getActivated(stack) && ItemBindable.syphonNetwork(stack, player, getLPUsed())) return stack; setActivated(stack, !getActivated(stack));
if (getActivated(stack) && ItemBindable.syphonNetwork(stack, player, getLPUsed()))
return stack;
} }
return stack; return stack;

View file

@ -29,7 +29,8 @@ public class ItemSigilVoid extends ItemSigilBase
if (movingobjectposition != null) if (movingobjectposition != null)
{ {
ItemStack ret = net.minecraftforge.event.ForgeEventFactory.onBucketUse(player, world, stack, movingobjectposition); ItemStack ret = net.minecraftforge.event.ForgeEventFactory.onBucketUse(player, world, stack, movingobjectposition);
if (ret != null) return ret; if (ret != null)
return ret;
if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)
{ {
@ -56,8 +57,7 @@ public class ItemSigilVoid extends ItemSigilBase
return stack; return stack;
} }
} }
} } else
else
{ {
return stack; return stack;
} }

View file

@ -32,7 +32,8 @@ public class ItemSigilWater extends ItemSigilBase
if (movingobjectposition != null) if (movingobjectposition != null)
{ {
ItemStack ret = net.minecraftforge.event.ForgeEventFactory.onBucketUse(player, world, stack, movingobjectposition); ItemStack ret = net.minecraftforge.event.ForgeEventFactory.onBucketUse(player, world, stack, movingobjectposition);
if (ret != null) return ret; if (ret != null)
return ret;
if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK)
{ {
@ -119,12 +120,10 @@ public class ItemSigilWater extends ItemSigilBase
if (!world.isAirBlock(blockPos) && world.getBlockState(blockPos).getBlock().getMaterial().isSolid()) if (!world.isAirBlock(blockPos) && world.getBlockState(blockPos).getBlock().getMaterial().isSolid())
{ {
return false; return false;
} } else if ((world.getBlockState(blockPos).getBlock() == Blocks.water || world.getBlockState(blockPos).getBlock() == Blocks.flowing_water) && world.getBlockState(blockPos).getBlock().getMetaFromState(world.getBlockState(blockPos)) == 0)
else if ((world.getBlockState(blockPos).getBlock() == Blocks.water || world.getBlockState(blockPos).getBlock() == Blocks.flowing_water) && world.getBlockState(blockPos).getBlock().getMetaFromState(world.getBlockState(blockPos)) == 0)
{ {
return false; return false;
} } else
else
{ {
return true; return true;
} }
@ -139,8 +138,7 @@ public class ItemSigilWater extends ItemSigilBase
if (!worldIn.isAirBlock(pos) && !flag) if (!worldIn.isAirBlock(pos) && !flag)
{ {
return false; return false;
} } else
else
{ {
if (worldIn.provider.doesWaterVaporize()) if (worldIn.provider.doesWaterVaporize())
{ {
@ -153,8 +151,7 @@ public class ItemSigilWater extends ItemSigilBase
{ {
worldIn.spawnParticle(EnumParticleTypes.SMOKE_LARGE, (double) i + Math.random(), (double) j + Math.random(), (double) k + Math.random(), 0.0D, 0.0D, 0.0D, 0); worldIn.spawnParticle(EnumParticleTypes.SMOKE_LARGE, (double) i + Math.random(), (double) j + Math.random(), (double) k + Math.random(), 0.0D, 0.0D, 0.0D, 0);
} }
} } else
else
{ {
if (!worldIn.isRemote && flag && !material.isLiquid()) if (!worldIn.isRemote && flag && !material.isLiquid())
{ {

View file

@ -35,7 +35,7 @@ public class ModPotions
boost = new PotionBloodMagic("Boost", new ResourceLocation("boost") boost = new PotionBloodMagic("Boost", new ResourceLocation("boost")
// new ResourceLocation(resourceLocation + // new ResourceLocation(resourceLocation +
// boost.getName().toLowerCase()) // boost.getName().toLowerCase())
, false, 0, 0, 0); , false, 0, 0, 0);
whirlwind = new PotionBloodMagic("Whirlwind", new ResourceLocation("whirlwind"), false, 0, 0, 0); whirlwind = new PotionBloodMagic("Whirlwind", new ResourceLocation("whirlwind"), false, 0, 0, 0);
planarBinding = new PotionBloodMagic("Planar Binding", new ResourceLocation("planarBinding"), false, 0, 0, 0); planarBinding = new PotionBloodMagic("Planar Binding", new ResourceLocation("planarBinding"), false, 0, 0, 0);
// heavyHeart = new PotionBloodMagic("Heavy Heart", new // heavyHeart = new PotionBloodMagic("Heavy Heart", new

View file

@ -43,7 +43,7 @@ public class RitualGreenGrove extends Ritual
AreaDescriptor growingRange = getBlockRange(GROW_RANGE); AreaDescriptor growingRange = getBlockRange(GROW_RANGE);
for(BlockPos newPos : growingRange.getContainedPositions(masterRitualStone.getPos())) for (BlockPos newPos : growingRange.getContainedPositions(masterRitualStone.getPos()))
{ {
IBlockState state = world.getBlockState(newPos); IBlockState state = world.getBlockState(newPos);
Block block = state.getBlock(); Block block = state.getBlock();