From 40bd96d21ca9a938d7d3af4e37a8605666380190 Mon Sep 17 00:00:00 2001 From: PrototypeTrousers Date: Fri, 21 Jan 2022 18:05:39 -0300 Subject: [PATCH] tweak crafting job size again null check --- gradle.properties | 2 +- .../implementations/ContainerPartOreDictStorageBus.java | 5 +++++ src/main/java/appeng/crafting/CraftingTreeProcess.java | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 377ae390c..33bbfd84c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ aebuild=7 aegroup=appeng aebasename=appliedenergistics2 extended=extended_life -extendedversion=v49u +extendedversion=v49v ######################################################### # Versions # ######################################################### diff --git a/src/main/java/appeng/container/implementations/ContainerPartOreDictStorageBus.java b/src/main/java/appeng/container/implementations/ContainerPartOreDictStorageBus.java index a9c02c7c7..21c7d674d 100644 --- a/src/main/java/appeng/container/implementations/ContainerPartOreDictStorageBus.java +++ b/src/main/java/appeng/container/implementations/ContainerPartOreDictStorageBus.java @@ -48,6 +48,11 @@ public class ContainerPartOreDictStorageBus extends AEBaseContainer { final IMEInventory cellInv = this.part.getInternalHandler(); + if( cellInv == null ) + { + return; + } + Set oreIDs = new HashSet<>(); for( IAEItemStack itemStack : cellInv.getAvailableItems( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() ) ) diff --git a/src/main/java/appeng/crafting/CraftingTreeProcess.java b/src/main/java/appeng/crafting/CraftingTreeProcess.java index 06574fad7..c6ff5cf1c 100644 --- a/src/main/java/appeng/crafting/CraftingTreeProcess.java +++ b/src/main/java/appeng/crafting/CraftingTreeProcess.java @@ -252,7 +252,7 @@ public class CraftingTreeProcess pro.dive( job ); } - job.addBytes( this.crafts + 8 + this.bytes ); + job.addBytes( this.crafts * 8 + this.bytes ); } IAEItemStack getAmountCrafted( IAEItemStack what2 )