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

Port to 1.11

Browse Source
This commit is contained in:
yueh
2016-12-08 12:42:00 +01:00
parent 589730bfad
commit ed9e6dd21c
262 changed files with 4027 additions and 3954 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/reporting/AbstractPartMonitor.java
+1 -1
View File
@@ -167,7 +167,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay implements
if( Platform.isWrench( player, eq, te.getPos() ) )
{
this.isLocked = !this.isLocked;
player.addChatMessage( ( this.isLocked ? PlayerMessages.isNowLocked : PlayerMessages.isNowUnlocked ).get() );
player.sendMessage( ( this.isLocked ? PlayerMessages.isNowLocked : PlayerMessages.isNowUnlocked ).get() );
this.getHost().markForUpdate();
}
else if( !this.isLocked )
src/main/java/appeng/parts/reporting/AbstractPartReporting.java
+1 -1
View File
@@ -235,7 +235,7 @@ public abstract class AbstractPartReporting extends AEBasePart implements IPartM
{
super.onPlacement( player, hand, held, side );
final byte rotation = (byte) ( MathHelper.floor_double( ( player.rotationYaw * 4F ) / 360F + 2.5D ) & 3 );
final byte rotation = (byte) ( MathHelper.floor( ( player.rotationYaw * 4F ) / 360F + 2.5D ) & 3 );
if( side == AEPartLocation.UP )
{
this.spin = rotation;
src/main/java/appeng/parts/reporting/PartConversionMonitor.java
+2 -2
View File
@@ -118,7 +118,7 @@ public class PartConversionMonitor extends AbstractPartMonitor
if( input.equals( targetStack ) )
{
final IAEItemStack insertItem = input.copy();
insertItem.setStackSize( targetStack.stackSize );
insertItem.setStackSize( targetStack.getCount() );
final IAEItemStack failedToInsert = Platform.poweredInsert( energy, cell, insertItem, new PlayerSource( player, this ) );
player.inventory.setInventorySlotContents( x, failedToInsert == null ? null : failedToInsert.getItemStack() );
}
@@ -167,7 +167,7 @@ public class PartConversionMonitor extends AbstractPartMonitor
{
final TileEntity te = this.getTile();
final List<ItemStack> list = Collections.singletonList( newItems );
Platform.spawnDrops( player.worldObj, te.getPos().offset( this.getSide().getFacing() ), list );
Platform.spawnDrops( player.world, te.getPos().offset( this.getSide().getFacing() ), list );
}
if( player.openContainer != null )
src/main/java/appeng/parts/reporting/PartPatternTerminal.java
+1 -1
View File
@@ -165,7 +165,7 @@ public class PartPatternTerminal extends AbstractPartTerminal
final ItemStack is = this.crafting.getStackInSlot( x );
if( is != null )
{
is.stackSize = 1;
is.setCount( 1 );
}
}
}