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

Inscriber Recipe Handler, + Fixed Potential ME Chest Crash.

Browse Source
This commit is contained in:
AlgorithmX2
2014-03-13 13:26:55 -05:00
parent 9e14101240
commit 67be86a19a
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes/handlers/Inscribe.java
+6 -3
View File
@@ -105,10 +105,13 @@ public class Inscribe implements ICraftHandler, IWebsiteSeralizer
o += h.getName( output ) + "\n"; o += h.getName( output ) + "\n";
if ( plateB != null ) if ( plateA != null )
o += h.getName( plateB ) + "\n"; o += h.getName( plateA )+"\n";
o += h.getName( plateA ); o += h.getName(imprintable);
if ( plateB != null )
o += "\n"+h.getName( plateB );
return o; return o;
} }
tile/storage/TileChest.java
+20 -15
View File
@@ -356,26 +356,31 @@ public class TileChest extends AENetworkPowerTile implements IMEChest, IFluidHan
{ {
if ( !isCached ) if ( !isCached )
{ {
icell = null;
fcell = null;
ItemStack is = inv.getStackInSlot( 1 ); ItemStack is = inv.getStackInSlot( 1 );
if ( is != null ) if ( is != null )
{ {
isCached = true; isCached = true;
cellHandler = AEApi.instance().registries().cell().getHander( is ); cellHandler = AEApi.instance().registries().cell().getHander( is );
if ( cellHandler != null )
double power = 1.0; {
double power = 1.0;
IMEInventoryHandler<IAEItemStack> itemCell = cellHandler.getCellInventory( is, StorageChannel.ITEMS );
IMEInventoryHandler<IAEFluidStack> fluidCell = cellHandler.getCellInventory( is, StorageChannel.FLUIDS ); IMEInventoryHandler<IAEItemStack> itemCell = cellHandler.getCellInventory( is, StorageChannel.ITEMS );
IMEInventoryHandler<IAEFluidStack> fluidCell = cellHandler.getCellInventory( is, StorageChannel.FLUIDS );
if ( itemCell != null )
power += cellHandler.cellIdleDrain( is, itemCell ); if ( itemCell != null )
else if ( fluidCell != null ) power += cellHandler.cellIdleDrain( is, itemCell );
power += cellHandler.cellIdleDrain( is, fluidCell ); else if ( fluidCell != null )
power += cellHandler.cellIdleDrain( is, fluidCell );
gridProxy.setIdlePowerUsage( power );
gridProxy.setIdlePowerUsage( power );
icell = wrap( itemCell );
fcell = wrap( fluidCell ); icell = wrap( itemCell );
fcell = wrap( fluidCell );
}
} }
} }