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

Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

Browse Source 
Conflicts:
	items/tools/powered/ToolMassCannon.java
This commit is contained in:
AlgorithmX2
2014-06-16 00:51:51 -05:00
parent 472d5cb1c0 730200ed8d
commit 1632d2d72e
13 changed files with 72 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
items/storage/ItemBasicStorageCell.java
+6
View File
@@ -34,6 +34,7 @@ public class ItemBasicStorageCell extends AEBaseItem implements IStorageCell, II
final MaterialType component;
final int totalBytes;
final int perType;
final double idleDrain;
public ItemBasicStorageCell(MaterialType whichCell, int Kilobytes) {
@@ -47,18 +48,23 @@ public class ItemBasicStorageCell extends AEBaseItem implements IStorageCell, II
{
case Cell1kPart:
idleDrain = 0.5;
perType = 8;
break;
case Cell4kPart:
idleDrain = 1.0;
perType = 32;
break;
case Cell16kPart:
idleDrain = 1.5;
perType = 128;
break;
case Cell64kPart:
idleDrain = 2.0;
perType = 512;
break;
default:
idleDrain = 0.0;
perType = 8;
}
}
items/tools/powered/ToolMassCannon.java
+2 -2
View File
@@ -123,7 +123,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
double d0 = p.prevPosX + (p.posX - p.prevPosX) * (double) f;
double d1 = p.prevPosY + (p.posY - p.prevPosY) * (double) f + 1.62D - (double) p.yOffset;
double d2 = p.prevPosZ + (p.posZ - p.prevPosZ) * (double) f;
Vec3 vec3 = w.getWorldVec3Pool().getVecFromPool( d0, d1, d2 );
Vec3 vec3 = Vec3.createVectorHelper( d0, d1, d2 );
float f3 = MathHelper.cos( -f2 * 0.017453292F - (float) Math.PI );
float f4 = MathHelper.sin( -f2 * 0.017453292F - (float) Math.PI );
float f5 = -MathHelper.cos( -f1 * 0.017453292F );
@@ -214,7 +214,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
}
}
Vec3 Srec = w.getWorldVec3Pool().getVecFromPool( d0, d1, d2 );
Vec3 Srec = Vec3.createVectorHelper( d0, d1, d2 );
MovingObjectPosition pos = w.rayTraceBlocks( vec3, vec31, true );
if ( entity != null && pos != null && pos.hitVec.squareDistanceTo( Srec ) > Closeest )
{