Merge remote-tracking branch 'origin/master-1.19-lts' into master-1.20-lts

Author: rubensworks

CHANGELOG-1.19.2.md

@@ -1,8 +1,18 @@
 # Changelog for Minecraft 1.19.2
 All notable changes to this project will be documented in this file.
 
+<a name="1.19.2-1.6.15"></a>
+## [1.19.2-1.6.15](/compare/1.19.2-1.6.14...1.19.2-1.6.15) - 2026-01-17 14:24:55
+
+
+### Changed
+* Use a different icon for showin to-craft items
+
+### Fixed
+* Fix flattened plans showing too high counts on parallelized plans, Closes #190
+
 <a name="1.19.2-1.6.14"></a>
-## [1.19.2-1.6.14](/compare/1.19.2-1.6.13...1.19.2-1.6.14) - 2025-11-24 16:49:25
+## [1.19.2-1.6.14](/compare/1.19.2-1.6.13...1.19.2-1.6.14) - 2025-11-24 16:49:25 +0100
 
 
 ### Fixed

resources/changelog/1.19.2-1.6.15.txt

@@ -0,0 +1,8 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.19.4 or higher.
+
+Changes:
+* Use a different icon for showin to-craft items
+
+Fixes:
+* Fix flattened plans showing too high counts on parallelized plans, Closes #190

src/main/java/org/cyclops/integratedterminals/api/terminalstorage/crafting/TerminalCraftingPlanStatic.java

@@ -10,9 +10,7 @@
 import org.cyclops.commoncapabilities.api.ingredient.PrototypedIngredient;
 
 import javax.annotation.Nullable;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author rubensworks
@@ -141,7 +139,8 @@ public void setError(String unlocalizedError) {
     public ITerminalCraftingPlanFlat<I> flatten() {
         // Group dependencies by prototype
         IndexedEntries indexedEntries = new IndexedEntries();
-        groupDependenciesByPrototype(indexedEntries, this);
+        Set<I> handledPlans = new HashSet<>();
+        groupDependenciesByPrototype(indexedEntries, handledPlans, this);
 
         // Make plan
         TerminalCraftingPlanFlatStatic<I> planFlat = new TerminalCraftingPlanFlatStatic<>(
@@ -203,7 +202,13 @@ public Collection<TerminalCraftingPlanFlatStatic.Entry> getEntries() {
         }
     }
 
-    protected static <I> void groupDependenciesByPrototype(IndexedEntries indexedEntries, ITerminalCraftingPlan<I> plan) {
+    protected static <I> void groupDependenciesByPrototype(IndexedEntries indexedEntries, Set<I> handledPlans, ITerminalCraftingPlan<I> plan) {
+        // Since jobs can have multiple dependents due to job splitting, we only consider each job once during flattening.
+        if (handledPlans.contains(plan.getId())) {
+            return;
+        }
+        handledPlans.add(plan.getId());
+
         // Determine outputs that are invalid or will be crafted
         for (IPrototypedIngredient<?, ?> output : plan.getOutputs()) {
             TerminalCraftingPlanFlatStatic.Entry entry = indexedEntries.get(output);
@@ -221,7 +226,6 @@ protected static <I> void groupDependenciesByPrototype(IndexedEntries indexedEnt
             if (plan.getStatus() == TerminalCraftingJobStatus.QUEUEING
                     || plan.getStatus() == TerminalCraftingJobStatus.PENDING_DEPENDENCIES
                     || plan.getStatus() == TerminalCraftingJobStatus.PENDING_INPUTS
-                    || plan.getStatus() == TerminalCraftingJobStatus.CRAFTING
                     || plan.getStatus() == TerminalCraftingJobStatus.UNSTARTED) {
                 entry.setQuantityToCraft(entry.getQuantityToCraft() + quantity);
             }
@@ -248,7 +252,7 @@ protected static <I> void groupDependenciesByPrototype(IndexedEntries indexedEnt
 
         // Recurse into dependencies
         for (ITerminalCraftingPlan<I> dependency : plan.getDependencies()) {
-            groupDependenciesByPrototype(indexedEntries, dependency);
+            groupDependenciesByPrototype(indexedEntries, handledPlans, dependency);
         }
     }
 

src/main/java/org/cyclops/integratedterminals/client/gui/container/component/GuiCraftingPlanFlat.java

@@ -12,6 +12,7 @@
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
 import net.minecraft.world.level.block.Blocks;
 import org.apache.commons.lang3.time.DurationFormatUtils;
 import org.cyclops.commoncapabilities.api.ingredient.IPrototypedIngredient;
@@ -158,7 +159,7 @@ private void drawElement(GuiGraphics guiGraphics, Element element, int x, int y,
                 moved++;
             }
             if (element.getToCraftQuantity() > 0) {
-                renderItem(guiGraphics, new ItemStack(Blocks.CRAFTING_TABLE), x, y, 0.45F);
+                renderItem(guiGraphics, new ItemStack(Items.PAINTING), x, y, 0.45F);
                 RenderHelpers.drawScaledString(guiGraphics.pose(), guiGraphics.bufferSource(), Minecraft.getInstance().font, L10NHelpers.localize("gui.integratedterminals.terminal_storage.to_craft", element.getToCraftQuantity()), x + 9, y + 1, 0.5F, 16777215, true, Font.DisplayMode.NORMAL);
                 y += 8;
                 moved++;