diff --git a/dependencies.gradle b/dependencies.gradle index bc4aed37469..f637f27cf49 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -38,12 +38,12 @@ dependencies { api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") api("com.github.GTNewHorizons:NotEnoughItems:2.7.27-GTNH:dev") api("com.github.GTNewHorizons:NotEnoughIds:2.1.6:dev") - api("com.github.GTNewHorizons:GTNHLib:0.6.5:dev") + api("com.github.GTNewHorizons:GTNHLib:0.6.6:dev") api("com.github.GTNewHorizons:ModularUI:1.2.17:dev") api("com.github.GTNewHorizons:ModularUI2:2.2.0-1.7.10:dev") api("com.github.GTNewHorizons:waila:1.8.2:dev") - api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-532-GTNH:dev") - api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.27-gtnh:dev") + api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-533-GTNH:dev") + api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.28-gtnh:dev") api('com.github.GTNewHorizons:Yamcl:0.6.0:dev') api("com.github.GTNewHorizons:Postea:1.0.13:dev") @@ -58,7 +58,7 @@ dependencies { compileOnlyApi("com.github.GTNewHorizons:Avaritia:1.59:dev") - compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta29:api') { transitive = false } + compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta30:api') { transitive = false } compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.3.4:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:BuildCraft:7.1.42:dev") { transitive = false } compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.9.2:dev") { transitive = false } @@ -80,7 +80,7 @@ dependencies { compileOnly rfg.deobf("curse.maven:cofh-core-69162:2388751") compileOnly("com.github.GTNewHorizons:Nuclear-Control:2.6.7:dev") { transitive = false } compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false } - implementation("com.github.GTNewHorizons:Hodgepodge:2.6.22:dev") + implementation("com.github.GTNewHorizons:Hodgepodge:2.6.23:dev") compileOnly('com.github.GTNewHorizons:Botania:1.12.5-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:HoloInventory:2.5.0-GTNH:dev') { transitive = false } compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384") diff --git a/src/main/java/ggfab/mte/MTEAdvAssLine.java b/src/main/java/ggfab/mte/MTEAdvAssLine.java index aef1edb66cd..ea6606e9db8 100644 --- a/src/main/java/ggfab/mte/MTEAdvAssLine.java +++ b/src/main/java/ggfab/mte/MTEAdvAssLine.java @@ -754,7 +754,7 @@ public CheckRecipeResult checkProcessing() { for (ItemStack stack : tDataStickList) { GTRecipe.RecipeAssemblyLine recipe = findRecipe(stack); if (recipe == null) { - result = CheckRecipeResultRegistry.NO_RECIPE; + if (result == CheckRecipeResultRegistry.NO_DATA_STICKS) result = CheckRecipeResultRegistry.NO_RECIPE; continue; } if (recipe.mEUt > inputVoltage) { diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/MTEAssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/MTEAssemblyLine.java index 99b63d40898..d090cb1eac8 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/MTEAssemblyLine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/MTEAssemblyLine.java @@ -221,7 +221,7 @@ public CheckRecipeResult checkProcessing() { .findAssemblyLineRecipeFromDataStick(tDataStick, false); if (tLookupResult.getType() == AssemblyLineUtils.LookupResultType.INVALID_STICK) { - result = CheckRecipeResultRegistry.NO_RECIPE; + if (result == CheckRecipeResultRegistry.NO_DATA_STICKS) result = CheckRecipeResultRegistry.NO_RECIPE; continue; } @@ -231,7 +231,8 @@ public CheckRecipeResult checkProcessing() { if (tLookupResult.getType() != AssemblyLineUtils.LookupResultType.VALID_STACK_AND_VALID_HASH) { tRecipe = AssemblyLineUtils.processDataStick(tDataStick); if (tRecipe == null) { - result = CheckRecipeResultRegistry.NO_RECIPE; + if (result == CheckRecipeResultRegistry.NO_DATA_STICKS) + result = CheckRecipeResultRegistry.NO_RECIPE; continue; } } @@ -261,7 +262,7 @@ public CheckRecipeResult checkProcessing() { mInputHatches.size(), tRecipe.mFluidInputs.length); } - result = CheckRecipeResultRegistry.NO_RECIPE; + if (result == CheckRecipeResultRegistry.NO_DATA_STICKS) result = CheckRecipeResultRegistry.NO_RECIPE; continue; } @@ -301,13 +302,13 @@ public CheckRecipeResult checkProcessing() { // Check Inputs allign int[] itemConsumptions = GTRecipe.RecipeAssemblyLine.getItemConsumptionAmountArray(mInputBusses, tRecipe); if (itemConsumptions == null || itemConsumptions.length == 0) { - result = CheckRecipeResultRegistry.NO_RECIPE; + if (result == CheckRecipeResultRegistry.NO_DATA_STICKS) result = CheckRecipeResultRegistry.NO_RECIPE; continue; } currentParallel = (int) GTRecipe.RecipeAssemblyLine .maxParallelCalculatedByInputItems(mInputBusses, currentParallel, itemConsumptions, inputsFromME); if (currentParallel <= 0) { - result = CheckRecipeResultRegistry.NO_RECIPE; + if (result == CheckRecipeResultRegistry.NO_DATA_STICKS) result = CheckRecipeResultRegistry.NO_RECIPE; continue; } tStacks = itemConsumptions; @@ -324,7 +325,8 @@ public CheckRecipeResult checkProcessing() { tRecipe.mFluidInputs, fluidsFromME); if (currentParallel <= 0) { - result = CheckRecipeResultRegistry.NO_RECIPE; + if (result == CheckRecipeResultRegistry.NO_DATA_STICKS) + result = CheckRecipeResultRegistry.NO_RECIPE; continue; } tFluids = tRecipe.mFluidInputs; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEBlackHoleCompressor.java b/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEBlackHoleCompressor.java index c57d55f669c..f595e0b16d8 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEBlackHoleCompressor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/compressor/MTEBlackHoleCompressor.java @@ -495,6 +495,8 @@ private void searchAndDecrementCatalysts() { // Loop through all items and look for the Activation and Deactivation Catalysts // Deactivation resets stability to 100 and catalyzing cost to 1 + if (this.maxProgresstime() != 0) return; + for (MTEHatchInputBus bus : filterValidMTEs(mInputBusses)) { for (int i = 0; i < bus.getSizeInventory(); i++) { ItemStack inputItem = bus.getStackInSlot(i);