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

Update MCP Mappings to stable_32

Browse Source 
Some mapping updates are just straight up weird. 20170516 -> isBlockSolid, 20170517 -> causesDownwardCurrent
This commit is contained in:
Gunther De Wachter
2017-07-03 06:54:45 +02:00
parent 780ce89ac3
commit 890eef1803
67 changed files with 213 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/CableBusContainer.java
+2 -2
View File
@@ -419,7 +419,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
for( AxisAlignedBB bb : boxes )
{
bb = bb.expand( 0.002, 0.002, 0.002 );
if( bb.isVecInside( pos ) )
if( bb.contains( pos ) )
{
return new SelectedPart( p, side );
}
@@ -442,7 +442,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
for( AxisAlignedBB bb : boxes )
{
bb = bb.expand( 0.01, 0.01, 0.01 );
if( bb.isVecInside( pos ) )
if( bb.contains( pos ) )
{
return new SelectedPart( p, side );
}
src/main/java/appeng/parts/automation/PartAnnihilationPlane.java
+3 -3
View File
@@ -313,7 +313,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
{
if( !entityItem.isDead )
{
final IAEItemStack overflow = this.storeItemStack( entityItem.getEntityItem() );
final IAEItemStack overflow = this.storeItemStack( entityItem.getItem() );
return this.handleOverflow( entityItem, overflow );
}
@@ -367,11 +367,11 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
return true;
}
final int oldStackSize = entityItem.getEntityItem().getCount();
final int oldStackSize = entityItem.getItem().getCount();
final int newStackSize = (int) overflow.getStackSize();
final boolean changed = oldStackSize != newStackSize;
entityItem.getEntityItem().setCount( newStackSize );
entityItem.getItem().setCount( newStackSize );
return changed;
}
src/main/java/appeng/parts/p2p/PartP2PRFPower.java
+1 -1
View File
@@ -170,7 +170,7 @@ package appeng.parts.p2p;
// if( !this.cachedTarget )
// {
// TileEntity self = this.getTile();
// TileEntity te = self.getworld().getTileEntity( self.xCoord + this.side.offsetX, self.yCoord + this.side.offsetY, self.zCoord + this.side.offsetZ );
// TileEntity te = self.getworld().getTileEntity( self.x + this.side.offsetX, self.y + this.side.offsetY, self.z + this.side.offsetZ );
// this.outputTarget = te instanceof IEnergyReceiver ? (IEnergyReceiver) te : null;
// this.cachedTarget = true;
// }