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

v5.5.5 Beta #6

Browse source 
*Fixed Dynamic Tanks!
This commit is contained in:
Aidan Brady 2013-04-30 23:07:16 -04:00
parent bc1a52d06f
commit 174a7b09e8
2 changed files with 47 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/minecraft/mekanism/api/Object3D.java
View file

@ -52,6 +52,15 @@ public class Object3D
nbtTags.setInteger("dimensionId", dimensionId);
}
public Object3D translate(int x, int y, int z)
{
xCoord += x;
yCoord += y;
zCoord += z;
return this;
}
public Object3D getFromSide(ForgeDirection side)
{
return new Object3D(xCoord+side.offsetX, yCoord+side.offsetY, zCoord+side.offsetZ, dimensionId);

27
src/minecraft/mekanism/common/TankUpdateProtocol.java
View file

@ -44,8 +44,10 @@ public class TankUpdateProtocol
int origX = tile.xCoord, origY = tile.yCoord, origZ = tile.zCoord;
boolean isCorner = true;
boolean isHollowPrism = true;
boolean isHollow = true;
boolean tooBig = false;
boolean rightBlocks = true;
boolean rightFrame = true;
Set<Object3D> locations = new HashSet<Object3D>();
@ -147,34 +149,34 @@ public class TankUpdateProtocol
{
if(!isViableNode(origX+x, origY+y, origZ+z))
{
isHollowPrism = false;
rightBlocks = false;
break;
}
else if(isFrame(new Object3D(origX+x, origY+y, origZ+z), origX+xmin, origX+xmax, origY+ymin, origY+ymax, origZ+zmin, origZ+zmax) && !isValidFrame(origX+x, origY+y, origZ+z))
else if(isFrame(Object3D.get(tile).translate(x, y, z), origX+xmin, origX+xmax, origY+ymin, origY+ymax, origZ+zmin, origZ+zmax) && !isValidFrame(origX+x, origY+y, origZ+z))
{
isHollowPrism = false;
rightFrame = false;
break;
}
else {
locations.add(new Object3D(origX+x, origY+y, origZ+z));
locations.add(Object3D.get(tile).translate(x, y, z));
}
}
else {
if(!isAir(origX+x, origY+y, origZ+z))
{
isHollowPrism = false;
isHollow = false;
break;
}
volume++;
}
}
if(!isHollowPrism)
if(!isHollow || !rightBlocks || !rightFrame)
{
break;
}
}
if(!isHollowPrism)
if(!isHollow || !rightBlocks || !rightFrame)
{
break;
}
@ -182,7 +184,9 @@ public class TankUpdateProtocol
}
}
if(!tooBig && isHollowPrism && isCorner && volume > 0 && volume <= 4096 && locations.size() >= 9)
if(volume > 0 && volume <= 4096 && locations.size() >= 9)
{
if(!tooBig && rightBlocks && rightFrame && isHollow && isCorner)
{
SynchronizedTankData structure = new SynchronizedTankData();
structure.locations = locations;
@ -190,7 +194,7 @@ public class TankUpdateProtocol
structure.volHeight = Math.abs(ymax-ymin)+1;
structure.volWidth = Math.abs(zmax-zmin)+1;
structure.volume = volume;
structure.renderLocation = new Object3D(origX+1, origY+1, origZ+1);
structure.renderLocation = Object3D.get(tile).translate(1, 1, 1);
for(Object3D obj : structure.locations)
{
@ -204,7 +208,7 @@ public class TankUpdateProtocol
}
}
if(structure.locations.contains(Object3D.get(pointer)) && isCorrectCorner(new Object3D(origX, origY, origZ), origX+xmin, origY+ymin, origZ+zmin))
if(structure.locations.contains(Object3D.get(pointer)) && isCorrectCorner(Object3D.get(tile), origX+xmin, origY+ymin, origZ+zmin))
{
structureFound = structure;
return;
@ -213,6 +217,7 @@ public class TankUpdateProtocol
pointerNotPartOf = true;
}
}
}
iteratedNodes.add((TileEntityDynamicTank)tile);