diff --git a/gradle.properties b/gradle.properties index b375aea35..14d250666 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ aebuild=7 aegroup=appeng aebasename=appliedenergistics2 trousers=trousers_edition -trousersversion=v49q +trousersversion=v49r ######################################################### # Versions # ######################################################### diff --git a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java index bd8b42dd5..ec0dd4f15 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java @@ -26,6 +26,7 @@ import java.util.concurrent.Future; import javax.annotation.Nonnull; +import appeng.parts.reporting.PartExpandedProcessingPatternTerminal; import com.google.common.collect.ImmutableSet; import net.minecraft.entity.player.EntityPlayer; @@ -345,11 +346,15 @@ public class ContainerCraftConfirm extends AEBaseContainer originalGui = GuiBridge.GUI_PATTERN_TERMINAL; } + if( ah instanceof PartExpandedProcessingPatternTerminal ) + { + originalGui = GuiBridge.GUI_EXPANDED_PROCESSING_PATTERN_TERMINAL; + } + if( this.result != null && !this.isSimulation() ) { final ICraftingGrid cc = this.getGrid().getCache( ICraftingGrid.class ); - final ICraftingLink g = cc.submitJob( this.result, null, this.getSelectedCpu() == -1 ? null : this.cpus.get( this.getSelectedCpu() ).getCpu(), true, - this.getActionSrc() ); + final ICraftingLink g = cc.submitJob( this.result, null, this.getSelectedCpu() == -1 ? null : this.cpus.get( this.getSelectedCpu() ).getCpu(), true, this.getActionSrc() ); this.setAutoStart( false ); if( g != null && originalGui != null && this.getOpenContext() != null ) { diff --git a/src/main/java/appeng/helpers/PatternHelper.java b/src/main/java/appeng/helpers/PatternHelper.java index ea99a9bbf..c8eb73405 100644 --- a/src/main/java/appeng/helpers/PatternHelper.java +++ b/src/main/java/appeng/helpers/PatternHelper.java @@ -47,7 +47,9 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable itemList; - if (details.canSubstitute()) { - final List substitutes = details.getSubstituteInputs(x); - itemList = new ArrayList<>(substitutes.size()); + if( details.canSubstitute() ) + { + final List substitutes = details.getSubstituteInputs( x ); + itemList = new ArrayList<>( substitutes.size() ); - for (IAEItemStack stack : substitutes) { - itemList.addAll(this.inventory.getItemList().findFuzzy(stack, - FuzzyMode.IGNORE_ALL)); + for( IAEItemStack stack : substitutes ) + { + itemList.addAll( this.inventory.getItemList().findFuzzy( stack, FuzzyMode.IGNORE_ALL ) ); } } else { itemList = new ArrayList<>(1);