fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow Visual/Non Visual Boxes to differ for Custom Collsion / Buses.

Browse Source
This commit is contained in:
AlgorithmX2
2014-01-31 11:11:50 -06:00
parent dd37b28190
commit 8460cffd6c
13 changed files with 58 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parts/BusCollisionHelper.java
+16 -2
View File
@@ -2,6 +2,7 @@ package appeng.parts;
import java.util.List;
import net.minecraft.entity.Entity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraftforge.common.ForgeDirection;
import appeng.api.parts.IPartCollsionHelper;
@@ -15,15 +16,22 @@ public class BusCollisionHelper implements IPartCollsionHelper
final private ForgeDirection y;
final private ForgeDirection z;
public BusCollisionHelper(List<AxisAlignedBB> boxes, ForgeDirection x, ForgeDirection y, ForgeDirection z) {
final private Entity entity;
final private boolean isVisual;
public BusCollisionHelper(List<AxisAlignedBB> boxes, ForgeDirection x, ForgeDirection y, ForgeDirection z, Entity e, boolean visual) {
this.boxes = boxes;
this.x = x;
this.y = y;
this.z = z;
entity = e;
isVisual = visual;
}
public BusCollisionHelper(List<AxisAlignedBB> boxes, ForgeDirection s) {
public BusCollisionHelper(List<AxisAlignedBB> boxes, ForgeDirection s, Entity e, boolean visual) {
this.boxes = boxes;
entity = e;
isVisual = visual;
switch (s)
{
@@ -66,6 +74,12 @@ public class BusCollisionHelper implements IPartCollsionHelper
}
}
@Override
public boolean isBBCollision()
{
return !isVisual;
}
@Override
public void addBox(double minX, double minY, double minZ, double maxX, double maxY, double maxZ)
{
parts/CableBusContainer.java
+5 -6
View File
@@ -366,13 +366,13 @@ public class CableBusContainer implements AEMultiTile, ICableBusContainer
return null;
}
public Iterable<AxisAlignedBB> getSelectedBoundingBoxsFromPool(boolean ignoreCableConnections)
public Iterable<AxisAlignedBB> getSelectedBoundingBoxsFromPool(boolean ignoreCableConnections, Entity e, boolean visual)
{
List<AxisAlignedBB> boxes = new LinkedList<AxisAlignedBB>();
for (ForgeDirection s : ForgeDirection.values())
{
IPartCollsionHelper bch = new BusCollisionHelper( boxes, s );
IPartCollsionHelper bch = new BusCollisionHelper( boxes, s, e, visual );
IPart part = getPart( s );
if ( part != null )
@@ -543,8 +543,7 @@ public class CableBusContainer implements AEMultiTile, ICableBusContainer
if ( part != null )
{
setSide( s );
BusCollisionHelper bch = new BusCollisionHelper( boxes, BusRenderHelper.instance.ax, BusRenderHelper.instance.ay,
BusRenderHelper.instance.az );
BusCollisionHelper bch = new BusCollisionHelper( boxes, BusRenderHelper.instance.ax, BusRenderHelper.instance.ay, BusRenderHelper.instance.az, null, true );
part.getBoxes( bch );
}
}
@@ -937,7 +936,7 @@ public class CableBusContainer implements AEMultiTile, ICableBusContainer
{
List<AxisAlignedBB> boxes = new LinkedList<AxisAlignedBB>();
IPartCollsionHelper bch = new BusCollisionHelper( boxes, side );
IPartCollsionHelper bch = new BusCollisionHelper( boxes, side, null, true );
p.getBoxes( bch );
for (AxisAlignedBB bb : boxes)
{
@@ -957,7 +956,7 @@ public class CableBusContainer implements AEMultiTile, ICableBusContainer
{
List<AxisAlignedBB> boxes = new LinkedList<AxisAlignedBB>();
IPartCollsionHelper bch = new BusCollisionHelper( boxes, side );
IPartCollsionHelper bch = new BusCollisionHelper( boxes, side, null, true );
p.getBoxes( bch );
for (AxisAlignedBB bb : boxes)
{
parts/networking/PartDenseCable.java
+11 -7
View File
@@ -95,7 +95,11 @@ public class PartDenseCable extends PartCable
@Override
public void getBoxes(IPartCollsionHelper bch)
{
bch.addBox( 3.0, 3.0, 3.0, 13.0, 13.0, 13.0 );
boolean noLadder = !bch.isBBCollision();
double min = noLadder ? 3.0 : 4.9;
double max = noLadder ? 13.0 : 11.1;
bch.addBox( min, min, min, max, max, max );
if ( Platform.isServer() )
{
@@ -113,22 +117,22 @@ public class PartDenseCable extends PartCable
switch (of)
{
case DOWN:
bch.addBox( 3.0, 0.0, 3.0, 13.0, 3.0, 13.0 );
bch.addBox( min, 0.0, min, max, min, max );
break;
case EAST:
bch.addBox( 13.0, 3.0, 3.0, 16.0, 13.0, 13.0 );
bch.addBox( max, min, min, 16.0, max, max );
break;
case NORTH:
bch.addBox( 3.0, 3.0, 0.0, 13.0, 13.0, 3.0 );
bch.addBox( min, min, 0.0, max, max, min );
break;
case SOUTH:
bch.addBox( 3.0, 3.0, 13.0, 13.0, 13.0, 16.0 );
bch.addBox( min, min, max, max, max, 16.0 );
break;
case UP:
bch.addBox( 3.0, 13.0, 3.0, 13.0, 16.0, 13.0 );
bch.addBox( min, max, min, max, 16.0, max );
break;
case WEST:
bch.addBox( 0.0, 3.0, 3.0, 3.0, 13.0, 13.0 );
bch.addBox( 0.0, min, min, min, max, max );
break;
default:
continue;