Skip to content

Commit

Permalink
Fixed horizontal support beams replacing blocks when placed.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kittychanley
Kittychanley committed May 22, 2016
1 parent 99b8735 commit d3e3e5c
Showing 1 changed file with 80 additions and 41 deletions.
121 changes: 80 additions & 41 deletions src/Common/com/bioxx/tfc/Blocks/BlockWoodSupport.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,61 +98,100 @@ public static int[] getSupportsInRangeDir(World world, int x, int y, int z, int
int s = 0; boolean foundSV = false; boolean foundSH = true;
int e = 0; boolean foundEV = false; boolean foundEH = true;
int w = 0; boolean foundWV = false; boolean foundWH = true;
for(int i = 1; i <= range; i++)
boolean clearNorthPath = true;
boolean clearSouthPath = true;
boolean clearEastPath = true;
boolean clearWestPath = true;

for (int i = 1; i <= range; i++)
{
if(!foundEV)
if (!foundEV)
{
if(!checkConnection)
e++;
else if(checkConnection && !TFCBlocks.isBlockHSupport(world.getBlock(x+i, y, z)) && !TFCBlocks.isBlockVSupport(world.getBlock(x+i, y, z)))
if (!checkConnection)
{
if (world.isAirBlock(x + i, y, z) || TFCBlocks.isBlockVSupport(world.getBlock(x + i, y, z)))
e++;
else
clearEastPath = false;
}
else if (checkConnection && !TFCBlocks.isBlockHSupport(world.getBlock(x + i, y, z)) && !TFCBlocks.isBlockVSupport(world.getBlock(x + i, y, z)))
foundEH = false;
else e++;
if(TFCBlocks.isBlockVSupport(world.getBlock(x+i, y, z)) && (e >= 0 || i == 1))
if(scanVert(world, x+i, y, z))
else
e++;
if (clearEastPath && TFCBlocks.isBlockVSupport(world.getBlock(x + i, y, z)) && (e >= 0 || i == 1))
{
if (scanVert(world, x + i, y, z))
foundEV = true;
else e -= 50;
else
e -= 50;
}
}
if(!foundWV)
if (!foundWV)
{
if(!checkConnection)
w++;
else if(checkConnection && !TFCBlocks.isBlockHSupport(world.getBlock(x-i, y, z)) && !TFCBlocks.isBlockVSupport(world.getBlock(x-i, y, z)))
if (!checkConnection)
{
if (world.isAirBlock(x - i, y, z) || TFCBlocks.isBlockVSupport(world.getBlock(x - i, y, z)))
w++;
else
clearWestPath = false;
}
else if (checkConnection && !TFCBlocks.isBlockHSupport(world.getBlock(x - i, y, z)) && !TFCBlocks.isBlockVSupport(world.getBlock(x - i, y, z)))
foundWH = false;
else w++;
if(TFCBlocks.isBlockVSupport(world.getBlock(x-i, y, z)) && (w >= 0 || i == 1))
if(scanVert(world, x-i, y, z))
else
w++;
if (clearWestPath && TFCBlocks.isBlockVSupport(world.getBlock(x - i, y, z)) && (w >= 0 || i == 1))
{
if (scanVert(world, x - i, y, z))
foundWV = true;
else w -= 50;
else
w -= 50;
}
}
if(!foundSV)
if (!foundSV)
{
if(!checkConnection)
s++;
else if(checkConnection && !TFCBlocks.isBlockHSupport(world.getBlock(x, y, z+i)) && !TFCBlocks.isBlockVSupport(world.getBlock(x, y, z+i)))
foundSH = false;
else s++;
if (!checkConnection)
{
if (world.isAirBlock(x, y, z + i) || TFCBlocks.isBlockVSupport(world.getBlock(x, y, z + i)))
s++;
else
clearSouthPath = false;

if(TFCBlocks.isBlockVSupport(world.getBlock(x, y, z+i)) && (s >= 0 || i == 1))
if(scanVert(world, x, y, z+i))
}
else if (checkConnection && !TFCBlocks.isBlockHSupport(world.getBlock(x, y, z + i)) && !TFCBlocks.isBlockVSupport(world.getBlock(x, y, z + i)))
foundSH = false;
else
s++;
if (clearSouthPath && TFCBlocks.isBlockVSupport(world.getBlock(x, y, z + i)) && (s >= 0 || i == 1))
{
if (scanVert(world, x, y, z + i))
foundSV = true;
}
}
if(!foundNV)
if (!foundNV)
{
if(!checkConnection)
n++;
else if(checkConnection && !TFCBlocks.isBlockHSupport(world.getBlock(x, y, z-i)) && !TFCBlocks.isBlockVSupport(world.getBlock(x, y, z-i)))
if (!checkConnection)
{
if (world.isAirBlock(x, y, z - i) || TFCBlocks.isBlockVSupport(world.getBlock(x, y, z - i)))
n++;
else
clearNorthPath = false;
}
else if (checkConnection && !TFCBlocks.isBlockHSupport(world.getBlock(x, y, z - i)) && !TFCBlocks.isBlockVSupport(world.getBlock(x, y, z - i)))
foundNH = false;
else n++;

if(TFCBlocks.isBlockVSupport(world.getBlock(x, y, z-i)) && (n >= 0 || i == 1))
if(scanVert(world, x, y, z-i))
else
n++;
if (clearNorthPath && TFCBlocks.isBlockVSupport(world.getBlock(x, y, z - i)) && (n >= 0 || i == 1))
{
if (scanVert(world, x, y, z - i))
foundNV = true;
}
}
}
if(foundEV && foundEH && foundWV && foundWH)
return new int[]{0, 0, 0, 0, w, e};
if(foundSV && foundSH && foundNV && foundNH)
return new int[]{0, 0, n, s, 0, 0};

if (foundEV && foundEH && foundWV && foundWH)
return new int[] { 0, 0, 0, 0, w, e };
if (foundSV && foundSH && foundNV && foundNH)
return new int[] { 0, 0, n, s, 0, 0 };
return null;
}

Expand Down Expand Up @@ -376,7 +415,7 @@ public boolean shouldSideBeRendered(IBlockAccess par1iBlockAccess, int par2, int
}

@Override
public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase entity, ItemStack is)
public void onBlockPlacedBy(World world, int i, int j, int k, EntityLivingBase entity, ItemStack is)
{
super.onBlockPlacedBy(world, i, j, k, entity, is);
//if(!world.isRemote)
Expand All @@ -397,8 +436,8 @@ public void onNeighborBlockChange(World world, int i, int j, int k, Block l)
{
//if the block directly beneath the support is not solid or a support then break the support
if(!world.getBlock(i, j-1, k).isOpaqueCube() && !TFCBlocks.isBlockVSupport(world.getBlock(i, j-1, k)))
{
harvestBlock(world, null, i, j, k, meta);
{
harvestBlock(world, null, i, j, k, meta);
world.setBlockToAir(i, j, k);
}
}
Expand All @@ -407,7 +446,7 @@ else if(isHorizontal)//Horizontal Beam
boolean b1 = !isSupportConnected(world,i,j,k);
if( b1)
{
harvestBlock(world, null, i, j, k, meta);
harvestBlock(world, null, i, j, k, meta);
world.setBlockToAir(i, j, k);
}
else if(TFCBlocks.isBlockVSupport(world.getBlock(i, j-1, k)))
Expand Down

0 comments on commit d3e3e5c

Please sign in to comment.