tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Removed Wind Turbine bound checking

Browse source
This commit is contained in:
Aidan Brady 2013-07-07 12:17:51 -04:00
parent bc4a34c189
commit 540823ef4a
2 changed files with 1 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common/mekanism/generators/client/GuiWindTurbine.java
View file

@ -42,12 +42,6 @@ public class GuiWindTurbine extends GuiContainer
int size = 44; int size = 44;
if(!tileEntity.checkBounds())
{
size += 9;
fontRenderer.drawString(EnumColor.DARK_RED + "Invalid bounds", 51, size, 0x00CD00);
}
if(!tileEntity.worldObj.canBlockSeeTheSky(tileEntity.xCoord, tileEntity.yCoord+4, tileEntity.zCoord)) if(!tileEntity.worldObj.canBlockSeeTheSky(tileEntity.xCoord, tileEntity.yCoord+4, tileEntity.zCoord))
{ {
size += 9; size += 9;

36
common/mekanism/generators/common/TileEntityWindTurbine.java
View file

@ -4,7 +4,6 @@ import mekanism.api.Object3D;
import mekanism.common.ChargeUtils; import mekanism.common.ChargeUtils;
import mekanism.common.IBoundingBlock; import mekanism.common.IBoundingBlock;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.TileEntityBoundingBlock;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import dan200.computer.api.IComputerAccess; import dan200.computer.api.IComputerAccess;
@ -72,40 +71,7 @@ public class TileEntityWindTurbine extends TileEntityGenerator implements IBound
@Override @Override
public boolean canOperate() public boolean canOperate()
{ {
return electricityStored < MAX_ELECTRICITY && getMultiplier() > 0 && checkBounds(); return electricityStored < MAX_ELECTRICITY && getMultiplier() > 0;
}
public boolean checkBounds()
{
Object3D obj = new Object3D(xCoord, yCoord+4, zCoord);
for(int x = obj.xCoord-2; x <= obj.xCoord+2; x++)
{
for(int y = obj.yCoord-2; y <= obj.yCoord+2; y++)
{
for(int z = obj.zCoord-2; z <= obj.zCoord+2; z++)
{
if(worldObj.isAirBlock(x, y, z))
{
continue;
}
if(worldObj.getBlockTileEntity(x, y, z) instanceof TileEntityBoundingBlock)
{
TileEntityBoundingBlock tileEntity = (TileEntityBoundingBlock)worldObj.getBlockTileEntity(x, y, z);
if(tileEntity.mainX == xCoord && tileEntity.mainY == yCoord && tileEntity.mainZ == zCoord)
{
continue;
}
}
return false;
}
}
}
return true;
} }
@Override @Override