Merge remote-tracking branch 'origin/master-1.21-lts' into master-1.21

rubensworks · rubensworks · commit d6707f87276e · 2026-02-17T11:51:53.000+01:00
diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml
@@ -45,8 +45,8 @@ jobs:
       - name: 'Build'
         run: ./gradlew build --no-daemon
         env:
-          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
-          MAVEN_KEY: ${{ secrets.MAVEN_KEY }}
+          MAVEN_USERNAME: ${{ github.actor }}
+          MAVEN_KEY: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_USER: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: 'Warmup for game test server'
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,7 @@ repo/*
 out/*
 keystore.jks
 .idea
+logs/
 
 # Ignore mac-specific file(s)
 .DS_Store
diff --git a/CHANGELOG-1.19.2.md b/CHANGELOG-1.19.2.md
@@ -1,8 +1,15 @@
 # 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.16"></a>
+## [1.19.2-1.6.16](/compare/1.19.2-1.6.15...1.19.2-1.6.16) - 2026-02-17 11:41:13
+
+
+### Added
+* Show ingredient alternatives in flat crafting plan, Closes #189
+
 <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
+## [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 +0100
 
 
 ### Changed
diff --git a/CHANGELOG-1.20.1.md b/CHANGELOG-1.20.1.md
@@ -1,8 +1,15 @@
 # Changelog for Minecraft 1.20.1
 All notable changes to this project will be documented in this file.
 
+<a name="1.20.1-1.6.18"></a>
+## [1.20.1-1.6.18](/compare/1.20.1-1.6.17...1.20.1-1.6.18) - 2026-02-17 11:43:36
+
+
+### Changed
+* Show ingredient alternatives in flat crafting plan, Closes #189
+
 <a name="1.20.1-1.6.17"></a>
-## [1.20.1-1.6.17](/compare/1.20.1-1.6.16...1.20.1-1.6.17) - 2026-01-17 14:26:49
+## [1.20.1-1.6.17](/compare/1.20.1-1.6.16...1.20.1-1.6.17) - 2026-01-17 14:26:49 +0100
 
 
 ### Changed
diff --git a/CHANGELOG-1.21.1.md b/CHANGELOG-1.21.1.md
@@ -1,8 +1,15 @@
 # Changelog for Minecraft 1.21.1
 All notable changes to this project will be documented in this file.
 
+<a name="1.21.1-1.6.25"></a>
+## [1.21.1-1.6.25](https://github.com/CyclopsMC/IntegratedTerminals/compare/1.21.1-1.6.24...1.21.1-1.6.25) - 2026-02-17 11:45:52
+
+
+### Changed
+* Show ingredient alternatives in flat crafting plan, Closes #189
+
 <a name="1.21.1-1.6.24"></a>
-## [1.21.1-1.6.24](https://github.com/CyclopsMC/IntegratedTerminals/compare/1.21.1-1.6.23...1.21.1-1.6.24) - 2026-01-17 14:27:49
+## [1.21.1-1.6.24](https://github.com/CyclopsMC/IntegratedTerminals/compare/1.21.1-1.6.23...1.21.1-1.6.24) - 2026-01-17 14:27:49 +0100
 
 
 ### Changed
diff --git a/resources/changelog/1.19.2-1.6.16.txt b/resources/changelog/1.19.2-1.6.16.txt
@@ -0,0 +1,5 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.19.4 or higher.
+
+Additions:
+* Show ingredient alternatives in flat crafting plan, Closes #189
diff --git a/resources/changelog/1.20.1-1.6.18.txt b/resources/changelog/1.20.1-1.6.18.txt
@@ -0,0 +1,5 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.19.4 or higher.
+
+Changes:
+* Show ingredient alternatives in flat crafting plan, Closes #189
diff --git a/resources/changelog/1.21.1-1.6.25.txt b/resources/changelog/1.21.1-1.6.25.txt
@@ -0,0 +1,5 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.25.1 or higher.
+
+Changes:
+* Show ingredient alternatives in flat crafting plan, Closes #189
diff --git a/src/main/java/org/cyclops/integratedterminals/api/terminalstorage/crafting/ITerminalCraftingPlanFlat.java b/src/main/java/org/cyclops/integratedterminals/api/terminalstorage/crafting/ITerminalCraftingPlanFlat.java
@@ -68,9 +68,16 @@ public static interface IEntry {
 
         /**
          * @return The entry instance.
+         * @deprecated Use {@link #getInstances()} instead. TODO: rm in next major
          */
+        @Deprecated
         public IPrototypedIngredient<?, ?> getInstance();
 
+        /**
+         * @return The alternative entry instances for this entry. Never empty.
+         */
+        public List<IPrototypedIngredient<?, ?>> getInstances();
+
         /**
          * @return The number of instances to craft.
          */
diff --git a/src/main/java/org/cyclops/integratedterminals/api/terminalstorage/crafting/TerminalCraftingPlanFlatStatic.java b/src/main/java/org/cyclops/integratedterminals/api/terminalstorage/crafting/TerminalCraftingPlanFlatStatic.java
@@ -173,27 +173,44 @@ public static <I> TerminalCraftingPlanFlatStatic<I> deserialize(ValueInput value
 
     public static class Entry implements ITerminalCraftingPlanFlat.IEntry {
 
-        private final IPrototypedIngredient<?, ?> instance;
+        private final List<IPrototypedIngredient<?, ?>> instances;
         private long quantityToCraft;
         private long quantityCrafting;
         private long quantityInStorage;
         private long quantityMissing;
 
-        public Entry(IPrototypedIngredient<?, ?> instance, long quantityToCraft, long quantityCrafting, long quantityInStorage, long quantityMissing) {
-            this.instance = instance;
+        public Entry(List<IPrototypedIngredient<?, ?>> instances, long quantityToCraft, long quantityCrafting, long quantityInStorage, long quantityMissing) {
+            this.instances = instances;
             this.quantityToCraft = quantityToCraft;
             this.quantityCrafting = quantityCrafting;
             this.quantityInStorage = quantityInStorage;
             this.quantityMissing = quantityMissing;
         }
 
+        public Entry(List<IPrototypedIngredient<?, ?>> instances) {
+            this(instances, 0, 0, 0, 0);
+        }
+
+        /**
+         * @deprecated Use {@link #Entry(List)} instead. TODO: rm in next major
+         */
+        @Deprecated
         public Entry(IPrototypedIngredient<?, ?> instance) {
-            this(instance, 0, 0, 0, 0);
+            this(List.of(instance), 0, 0, 0, 0);
         }
 
+        /**
+         * @deprecated Use {@link #getInstances()} instead. TODO: rm in next major
+         */
         @Override
+        @Deprecated
         public IPrototypedIngredient<?, ?> getInstance() {
-            return instance;
+            return instances.get(0);
+        }
+
+        @Override
+        public List<IPrototypedIngredient<?, ?>> getInstances() {
+            return instances;
         }
 
         @Override
@@ -233,21 +250,27 @@ public void setQuantityMissing(long quantityMissing) {
         }
 
         public static void serialize(ValueOutput valueOutput, Entry entry) {
-            IPrototypedIngredient.serialize(valueOutput.child("instance"), entry.getInstance());
+            ValueOutput.ValueOutputList instances = valueOutput.childrenList("instances");
+            for (IPrototypedIngredient<?, ?> instance : entry.getInstances()) {
+                IPrototypedIngredient.serialize(instances.addChild(), instance);
+            }
             valueOutput.putLong("quantityToCraft", entry.getQuantityToCraft());
             valueOutput.putLong("quantityCrafting", entry.getQuantityCrafting());
             valueOutput.putLong("quantityInStorage", entry.getQuantityInStorage());
             valueOutput.putLong("quantityMissing", entry.getQuantityMissing());
         }
 
         public static TerminalCraftingPlanFlatStatic.Entry deserialize(ValueInput valueInput) {
-            IPrototypedIngredient<?, ?> instance = IPrototypedIngredient.deserialize(valueInput.child("instance").orElseThrow());
+            List<IPrototypedIngredient<?, ?>> instances = Lists.newArrayList();
+            for (ValueInput instance : valueInput.childrenList("instances").orElseThrow()) {
+                instances.add(IPrototypedIngredient.deserialize(instance));
+            }
             long quantityToCraft = valueInput.getLong("quantityToCraft").orElseThrow();
             long quantityCrafting = valueInput.getLong("quantityCrafting").orElseThrow();
             long quantityInStorage = valueInput.getLong("quantityInStorage").orElseThrow();
             long quantityMissing = valueInput.getLong("quantityMissing").orElseThrow();
 
-            return new TerminalCraftingPlanFlatStatic.Entry(instance, quantityToCraft, quantityCrafting, quantityInStorage, quantityMissing);
+            return new TerminalCraftingPlanFlatStatic.Entry(instances, quantityToCraft, quantityCrafting, quantityInStorage, quantityMissing);
         }
 
     }
diff --git a/src/main/java/org/cyclops/integratedterminals/api/terminalstorage/crafting/TerminalCraftingPlanStatic.java b/src/main/java/org/cyclops/integratedterminals/api/terminalstorage/crafting/TerminalCraftingPlanStatic.java
@@ -175,25 +175,64 @@ public ITerminalCraftingPlanFlat<I> flatten() {
     }
 
     public static class IndexedEntries {
-        private final Map<IPrototypedIngredient<?, ?>, TerminalCraftingPlanFlatStatic.Entry> indexedEntries;
+        /**
+         * Entries indexed by a canonical list of prototype ingredients.
+         * <p>
+         * Each key is a list of {@link IPrototypedIngredient} where:
+         * <ul>
+         *     <li>Every element has quantity 1.</li>
+         *     <li>Every element uses the exact-match-no-quantity condition.</li>
+         * </ul>
+         * The original (possibly non-normalized) alternatives list is stored inside the
+         * {@link TerminalCraftingPlanFlatStatic.Entry} for rendering purposes.
+         */
+        private final Map<List<IPrototypedIngredient<?, ?>>, TerminalCraftingPlanFlatStatic.Entry> indexedEntries;
 
         public IndexedEntries() {
             this.indexedEntries = Maps.newHashMap();
         }
 
-        public TerminalCraftingPlanFlatStatic.Entry get(IPrototypedIngredient<?, ?> prototypedIngredient) {
-            IPrototypedIngredient<?, ?> prototype = getPrototype(prototypedIngredient);
-            return indexedEntries.computeIfAbsent(prototype, k -> new TerminalCraftingPlanFlatStatic.Entry(new PrototypedIngredient(prototypedIngredient.getComponent(), prototype.getPrototype(), prototypedIngredient.getCondition())));
+        /**
+         * Get (or create) the entry corresponding to the given list of alternative ingredients.
+         *
+         * @param prototypedIngredients A non-empty list of alternatives.
+         * @return The corresponding flat plan entry.
+         */
+        public TerminalCraftingPlanFlatStatic.Entry get(List<IPrototypedIngredient<?, ?>> prototypedIngredients) {
+            List<IPrototypedIngredient<?, ?>> key = getPrototypes(prototypedIngredients);
+            return indexedEntries.computeIfAbsent(key,
+                    k -> new TerminalCraftingPlanFlatStatic.Entry(k));
         }
 
-        protected <T, M> IPrototypedIngredient<T, M> getPrototype(IPrototypedIngredient<T, M> prototypedIngredient) {
-            IIngredientMatcher<T, M> matcher = prototypedIngredient.getComponent().getMatcher();
-            return new PrototypedIngredient(prototypedIngredient.getComponent(), matcher.withQuantity(prototypedIngredient.getPrototype(), 1L), matcher.getExactMatchNoQuantityCondition());
+        /**
+         * Build a canonical list of prototype ingredients for the given alternatives.
+         * Quantities are normalized to 1 and the exact-match-no-quantity condition is used.
+         */
+        protected List<IPrototypedIngredient<?, ?>> getPrototypes(List<IPrototypedIngredient<?, ?>> prototypedIngredients) {
+            List<IPrototypedIngredient<?, ?>> result = new ArrayList<>(prototypedIngredients.size());
+            for (IPrototypedIngredient<?, ?> ingredient : prototypedIngredients) {
+                IIngredientMatcher matcher = ingredient.getComponent().getMatcher();
+                result.add(new PrototypedIngredient(
+                        ingredient.getComponent(),
+                        matcher.withQuantity(ingredient.getPrototype(), 1L),
+                        matcher.getExactMatchNoQuantityCondition()));
+            }
+            return result;
         }
 
-        public static long getQuantity(IPrototypedIngredient<?, ?> prototypedIngredient) {
-            IIngredientMatcher matcher = prototypedIngredient.getComponent().getMatcher();
-            return matcher.getQuantity(prototypedIngredient.getPrototype());
+        /**
+         * Get the quantity associated with the given alternatives list.
+         * <p>
+         * This is derived from the first element, which is consistent with prior behaviour
+         * when only a single prototype was available.
+         */
+        public static long getQuantity(List<IPrototypedIngredient<?, ?>> prototypedIngredients) {
+            if (prototypedIngredients.isEmpty()) {
+                return 0;
+            }
+            IPrototypedIngredient<?, ?> first = prototypedIngredients.get(0);
+            IIngredientMatcher matcher = first.getComponent().getMatcher();
+            return matcher.getQuantity(first.getPrototype());
         }
 
         public Collection<TerminalCraftingPlanFlatStatic.Entry> getEntries() {
@@ -210,8 +249,9 @@ protected static <I> void groupDependenciesByPrototype(IndexedEntries indexedEnt
 
         // Determine outputs that are invalid or will be crafted
         for (IPrototypedIngredient<?, ?> output : plan.getOutputs()) {
-            TerminalCraftingPlanFlatStatic.Entry entry = indexedEntries.get(output);
-            long quantity = IndexedEntries.getQuantity(output);
+            List<IPrototypedIngredient<?, ?>> outputs = List.of(output);
+            TerminalCraftingPlanFlatStatic.Entry entry = indexedEntries.get(outputs);
+            long quantity = IndexedEntries.getQuantity(outputs);
 
             if (plan.getStatus() == TerminalCraftingJobStatus.ERROR
                     || plan.getStatus() == TerminalCraftingJobStatus.INVALID
@@ -236,16 +276,16 @@ protected static <I> void groupDependenciesByPrototype(IndexedEntries indexedEnt
 
         // Determine storage ingredients
         for (IPrototypedIngredient<?, ?> output : plan.getBufferedIngredients()) {
-            TerminalCraftingPlanFlatStatic.Entry entry = indexedEntries.get(output);
-            long quantity = IndexedEntries.getQuantity(output);
+            List<IPrototypedIngredient<?, ?>> outputs = List.of(output);
+            TerminalCraftingPlanFlatStatic.Entry entry = indexedEntries.get(outputs);
+            long quantity = IndexedEntries.getQuantity(outputs);
             entry.setQuantityInStorage(entry.getQuantityInStorage() + quantity);
         }
 
         // Determine missing ingredients
         for (List<IPrototypedIngredient<?, ?>> outputVariants : plan.getLastMissingIngredients()) {
-            IPrototypedIngredient<?, ?> output = outputVariants.stream().findFirst().get();
-            TerminalCraftingPlanFlatStatic.Entry entry = indexedEntries.get(output);
-            long quantity = IndexedEntries.getQuantity(output);
+            TerminalCraftingPlanFlatStatic.Entry entry = indexedEntries.get(outputVariants);
+            long quantity = IndexedEntries.getQuantity(outputVariants);
             entry.setQuantityMissing(entry.getQuantityMissing() + quantity * plan.getCraftingQuantity());
         }
 
diff --git a/src/main/java/org/cyclops/integratedterminals/client/gui/container/component/GuiCraftingPlanFlat.java b/src/main/java/org/cyclops/integratedterminals/client/gui/container/component/GuiCraftingPlanFlat.java
@@ -98,6 +98,10 @@ public void setFirstRow(int firstRow) {
         this.firstRow = Math.max(0, firstRow);
     }
 
+    protected int getTick() {
+        return (int) Minecraft.getInstance().level.getGameTime() / TICK_DELAY;
+    }
+
     @Override
     public void renderWidget(GuiGraphics guiGraphics, int p_268034_, int p_268009_, float p_268085_) {
 
@@ -129,15 +133,19 @@ private void drawElement(GuiGraphics guiGraphics, Element element, int x, int y,
 
         int xOriginal = x;
 
-        // Draw instance
-        IPrototypedIngredient<?, ?> output = element.getInstance();
-        IngredientComponent<?, ?> ingredientComponent = output.getComponent();
-        long quantity = ((IngredientComponent) ingredientComponent).getMatcher().getQuantity(output.getPrototype());
-        int finalX = x;
-        int finalY = y;
-        ingredientComponent.getCapability(Capabilities.IngredientComponentTerminalStorageHandler.INGREDIENT)
-                .ifPresent(h -> h.getClient().drawInstance(guiGraphics, output.getPrototype(), quantity,
-                        "", this.parentGui, layer, partialTick, finalX, finalY, mouseX, mouseY, null));
+        // Draw instance (rotate over alternatives if present)
+        List<IPrototypedIngredient<?, ?>> instances = element.getInstances();
+        if (!instances.isEmpty()) {
+            int tick = getTick();
+            IPrototypedIngredient<?, ?> output = instances.get(tick % instances.size());
+            IngredientComponent<?, ?> ingredientComponent = output.getComponent();
+            long quantity = ((IngredientComponent) ingredientComponent).getMatcher().getQuantity(output.getPrototype());
+            int finalX = x;
+            int finalY = y;
+            ingredientComponent.getCapability(Capabilities.IngredientComponentTerminalStorageHandler.INGREDIENT)
+                    .ifPresent(h -> h.getClient().drawInstance(guiGraphics, output.getPrototype(), quantity,
+                            "", this.parentGui, layer, partialTick, finalX, finalY, mouseX, mouseY, null));
+        }
 
         x = xOriginal + width - 50;
         if (layer == ContainerScreenTerminalStorage.DrawLayer.BACKGROUND) {
@@ -251,7 +259,7 @@ public static List<GuiCraftingPlanFlat.Element> getElements(ITerminalCraftingPla
 
     protected static void addElements(ITerminalCraftingPlanFlat.IEntry craftingPlan, List<GuiCraftingPlanFlat.Element> elements) {
         elements.add(new Element(
-                craftingPlan.getInstance(),
+                craftingPlan.getInstances(),
                 craftingPlan.getQuantityInStorage(),
                 craftingPlan.getQuantityToCraft(),
                 craftingPlan.getQuantityCrafting(),
@@ -270,23 +278,23 @@ protected void updateWidgetNarration(NarrationElementOutput p_259858_) {
 
     public static class Element {
 
-        private final IPrototypedIngredient<?, ?> instance;
+        private final List<IPrototypedIngredient<?, ?>> instances;
         private final long storageQuantity;
         private final long toCraftQuantity;
         private final long craftingQuantity;
         private final long missingQuantity;
 
-        public Element(IPrototypedIngredient<?, ?> instance,
+        public Element(List<IPrototypedIngredient<?, ?>> instances,
                        long storageQuantity, long toCraftQuantity, long craftingQuantity, long missingQuantity) {
-            this.instance = instance;
+            this.instances = instances;
             this.storageQuantity = storageQuantity;
             this.toCraftQuantity = toCraftQuantity;
             this.craftingQuantity = craftingQuantity;
             this.missingQuantity = missingQuantity;
         }
 
-        public IPrototypedIngredient<?, ?> getInstance() {
-            return instance;
+        public List<IPrototypedIngredient<?, ?>> getInstances() {
+            return instances;
         }
 
         public long getStorageQuantity() {
