Merge branch 'master' into HIP-minirework

GTNewHorizons · Dec 16, 2024 · dc966ae · dc966ae
2 parents 6b02c44 + e910890
commit dc966ae
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaSmeltery.java b/src/main/java/goodgenerator/blocks/tileEntity/MTELargeEssentiaSmeltery.java
@@ -220,7 +220,11 @@ public String[] getStructureDescription(ItemStack itemStack) {
     @Override
     public String[] getInfoData() {
         String[] info = super.getInfoData();
-        info[8] = "Node Power: " + EnumChatFormatting.RED
+        info[8] = "Parallel: " + EnumChatFormatting.YELLOW
+            + Math.round(this.mParallel)
+            + EnumChatFormatting.RESET
+            + " Node Power: "
+            + EnumChatFormatting.RED
             + this.nodePower
             + EnumChatFormatting.RESET
             + " Purification Efficiency: "

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/MTEScanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/MTEScanner.java
@@ -349,22 +349,24 @@ else if (stackItemDamage == 2 && aStack.toString()
             if (ItemList.Tool_DataStick.isStackEqual(getSpecialSlot(), false, true)) {
                 for (GTRecipe.RecipeAssemblyLine tRecipe : GTRecipe.RecipeAssemblyLine.sAssemblylineRecipes) {
                     if (GTUtility.areStacksEqual(tRecipe.mResearchItem, aStack, true)) {
-                        boolean failScanner = true;
+                        GTRecipe matchingRecipe = null;
+
                         for (GTRecipe scannerRecipe : scannerFakeRecipes.getAllRecipes()) {
                             if (GTUtility.areStacksEqual(scannerRecipe.mInputs[0], aStack, true)) {
-                                failScanner = false;
+                                matchingRecipe = scannerRecipe;
                                 break;
                             }
                         }
-                        if (failScanner) {
+
+                        if (matchingRecipe == null || aStack.stackSize < matchingRecipe.mInputs[0].stackSize) {
                             return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
                         }
 
                         this.mOutputItems[0] = GTUtility.copyAmount(1, getSpecialSlot());
 
                         // Use Assline Utils
                         if (AssemblyLineUtils.setAssemblyLineRecipeOnDataStick(this.mOutputItems[0], tRecipe)) {
-                            aStack.stackSize -= 1;
+                            aStack.stackSize -= matchingRecipe.mInputs[0].stackSize;
                             calculateOverclockedNess(30, tRecipe.mResearchTime);
                             // In case recipe is too OP for that machine
                             if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1)