diff --git a/gradle.properties b/gradle.properties index c68babf75..38bc3f436 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ aebuild=7 aegroup=appeng aebasename=appliedenergistics2 extended=extended_life -extendedversion=v0.52.10 +extendedversion=v0.52.11 ######################################################### # Versions # ######################################################### diff --git a/src/main/java/appeng/core/sync/packets/PacketInformPlayer.java b/src/main/java/appeng/core/sync/packets/PacketInformPlayer.java index 69ae59af3..80e42138b 100644 --- a/src/main/java/appeng/core/sync/packets/PacketInformPlayer.java +++ b/src/main/java/appeng/core/sync/packets/PacketInformPlayer.java @@ -33,10 +33,10 @@ public class PacketInformPlayer extends AppEngPacket } } - public PacketInformPlayer( IAEItemStack extra, IAEItemStack result, InfoType type ) throws IOException + public PacketInformPlayer( IAEItemStack expected, IAEItemStack actual, InfoType type ) throws IOException { - this.reportedItem = extra; - this.actualItem = result; + this.reportedItem = expected; + this.actualItem = actual; this.type = type; final ByteBuf data = Unpooled.buffer(); diff --git a/src/main/java/appeng/crafting/CraftingTreeNode.java b/src/main/java/appeng/crafting/CraftingTreeNode.java index 4abf3f039..25da82284 100644 --- a/src/main/java/appeng/crafting/CraftingTreeNode.java +++ b/src/main/java/appeng/crafting/CraftingTreeNode.java @@ -360,21 +360,21 @@ public class CraftingTreeNode { for( final IAEItemStack i : this.used ) { - final IAEItemStack ex = storage.extractItems( i, Actionable.MODULATE, src ); + final IAEItemStack actuallyExtracted = storage.extractItems( i, Actionable.MODULATE, src ); - if( ex == null || ex.getStackSize() != i.getStackSize() ) + if( actuallyExtracted == null || actuallyExtracted.getStackSize() != i.getStackSize() ) { if( src.player().isPresent() ) { try { - if( ex == null ) + if( actuallyExtracted == null ) { NetworkHandler.instance().sendTo( new PacketInformPlayer( i, null, PacketInformPlayer.InfoType.NO_ITEMS_EXTRACTED ), (EntityPlayerMP) src.player().get() ); } else { - NetworkHandler.instance().sendTo( new PacketInformPlayer( ex, i, PacketInformPlayer.InfoType.PARTIAL_ITEM_EXTRACTION ), (EntityPlayerMP) src.player().get() ); + NetworkHandler.instance().sendTo( new PacketInformPlayer( i, actuallyExtracted, PacketInformPlayer.InfoType.PARTIAL_ITEM_EXTRACTION ), (EntityPlayerMP) src.player().get() ); } } catch( IOException e ) @@ -385,7 +385,7 @@ public class CraftingTreeNode throw new CraftBranchFailure( i, i.getStackSize() ); } - craftingCPUCluster.addStorage( ex ); + craftingCPUCluster.addStorage( actuallyExtracted ); } if( this.howManyEmitted > 0 ) diff --git a/src/main/java/appeng/crafting/CraftingTreeProcess.java b/src/main/java/appeng/crafting/CraftingTreeProcess.java index efb7b5fac..99d170e6a 100644 --- a/src/main/java/appeng/crafting/CraftingTreeProcess.java +++ b/src/main/java/appeng/crafting/CraftingTreeProcess.java @@ -251,7 +251,7 @@ public class CraftingTreeProcess { final IAEItemStack stack = entry.getKey().request( inv, entry.getValue() * amountOfTimes, src ); - if( stack.getItem().hasContainerItem( stack.getDefinition() ) ) + if( this.details.isCraftable() && stack.getItem().hasContainerItem( stack.getDefinition() ) ) { final ItemStack is = Platform.getContainerItem( stack.createItemStack() ); final IAEItemStack o = AEItemStack.fromItemStack( is ); diff --git a/src/main/java/appeng/crafting/MECraftingInventory.java b/src/main/java/appeng/crafting/MECraftingInventory.java index 89a8c6232..ac9c26172 100644 --- a/src/main/java/appeng/crafting/MECraftingInventory.java +++ b/src/main/java/appeng/crafting/MECraftingInventory.java @@ -318,11 +318,11 @@ public class MECraftingInventory implements IMEInventory { if( result == null ) { - NetworkHandler.instance().sendTo( new PacketInformPlayer( extra, null, PacketInformPlayer.InfoType.NO_ITEMS_EXTRACTED ), (EntityPlayerMP) src.player().get() ); + NetworkHandler.instance().sendTo( new PacketInformPlayer( null, extra, PacketInformPlayer.InfoType.NO_ITEMS_EXTRACTED ), (EntityPlayerMP) src.player().get() ); } else { - NetworkHandler.instance().sendTo( new PacketInformPlayer( extra, result, PacketInformPlayer.InfoType.PARTIAL_ITEM_EXTRACTION ), (EntityPlayerMP) src.player().get() ); + NetworkHandler.instance().sendTo( new PacketInformPlayer( result, extra, PacketInformPlayer.InfoType.PARTIAL_ITEM_EXTRACTION ), (EntityPlayerMP) src.player().get() ); } } catch( IOException e )