Merge branch 'master' into development

Conflicts:
	src/main/java/mekanism/common/multipart/PartSidedPipe.java
This commit is contained in:
Aidan C. Brady 2015-02-19 09:15:30 -05:00
commit f67c048e78

View file

@ -673,6 +673,30 @@ public final class MekanismUtils
return def * Math.pow(general.maxUpgradeMultiplier, numUpgrades/(float)Upgrade.ENERGY.getMax());
}
/**
* A better "isBlockIndirectlyGettingPowered()" that doesn't load chunks
* @param world - the world to perform the check in
* @param coord - the coordinate of the block performing the check
* @return if the block is indirectly getting powered by LOADED chunks
*/
public static boolean isGettingPowered(World world, Coord4D coord)
{
for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS)
{
Coord4D sideCoord = coord.getFromSide(side);
if(sideCoord.exists(world))
{
if(world.getIndirectPowerLevelTo(sideCoord.xCoord, sideCoord.yCoord, sideCoord.zCoord, side.ordinal()) > 0)
{
return true;
}
}
}
return false;
}
/**
* A better "isBlockIndirectlyGettingPowered()" that doesn't load chunks
* @param world - the world to perform the check in