From 0ed0eb9d5fe1d9ae3df7529ae04af42801c0d570 Mon Sep 17 00:00:00 2001 From: PrototypeTrousers Date: Mon, 28 Feb 2022 23:10:26 -0300 Subject: [PATCH 1/3] better logging --- src/main/java/appeng/crafting/CraftingJob.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/appeng/crafting/CraftingJob.java b/src/main/java/appeng/crafting/CraftingJob.java index 4c2b0d854..1fc555aef 100644 --- a/src/main/java/appeng/crafting/CraftingJob.java +++ b/src/main/java/appeng/crafting/CraftingJob.java @@ -167,7 +167,7 @@ public class CraftingJob implements Runnable, ICraftingJob } craftingTreeWatch.stop(); - this.logCraftingJob( "real", craftingTreeWatch ); + this.logCraftingJob( "real, success", craftingTreeWatch ); } catch( final CraftBranchFailure e ) { @@ -199,7 +199,7 @@ public class CraftingJob implements Runnable, ICraftingJob else { craftingTreeWatch.stop(); - this.logCraftingJob( "real", craftingTreeWatch ); + this.logCraftingJob( "real, failed", craftingTreeWatch ); } } catch( final CraftBranchFailure e1 ) @@ -266,12 +266,13 @@ public class CraftingJob implements Runnable, ICraftingJob AELog.craftingDebug( "crafting job now active" ); } } - - if( Thread.interrupted() ) - { - throw new InterruptedException(); - } } + + if( Thread.interrupted() ) + { + throw new InterruptedException(); + } + this.incTime++; } From 056fcc38189fb25bdbdd46985e290a5324e49fc2 Mon Sep 17 00:00:00 2001 From: PrototypeTrousers Date: Mon, 28 Feb 2022 23:16:13 -0300 Subject: [PATCH 2/3] switch to extractable instead of cached item list --- src/main/java/appeng/crafting/MECraftingInventory.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/main/java/appeng/crafting/MECraftingInventory.java b/src/main/java/appeng/crafting/MECraftingInventory.java index 842e668f6..88bd0f9ae 100644 --- a/src/main/java/appeng/crafting/MECraftingInventory.java +++ b/src/main/java/appeng/crafting/MECraftingInventory.java @@ -139,14 +139,7 @@ public class MECraftingInventory implements IMEInventory this.localCache = new ItemListIgnoreCrafting<>( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() ); for( final IAEItemStack is : target.getStorageList() ) { - if( src.player().isPresent() ) - { - this.localCache.add( target.extractItems( is, Actionable.SIMULATE, src ) ); - } - else - { - this.localCache.add( is ); - } + this.localCache.add( target.extractItems( is, Actionable.SIMULATE, src ) ); } this.par = null; From 8f40478695553e824a6c6eae819ce8acb0d07a57 Mon Sep 17 00:00:00 2001 From: PrototypeTrousers Date: Mon, 28 Feb 2022 23:06:49 -0300 Subject: [PATCH 3/3] version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 94fb943af..d883906be 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ aebuild=7 aegroup=appeng aebasename=appliedenergistics2 extended=extended_life -extendedversion=v50f +extendedversion=v50g ######################################################### # Versions # #########################################################