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

rubensworks · rubensworks · commit 186d06f1287c · 2025-12-31T15:20:57.000+01:00
diff --git a/CHANGELOG-1.20.1.md b/CHANGELOG-1.20.1.md
@@ -1,8 +1,17 @@
 # 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.15"></a>
+## [1.20.1-1.6.15](/compare/1.20.1-1.6.14...1.20.1-1.6.15) - 2025-12-31 15:10:58
+
+
+### Changed
+* Update to new crafting storage in Integrated Crafting
+
+Required for CyclopsMC/IntegratedCrafting#112
+
 <a name="1.20.1-1.6.14"></a>
-## [1.20.1-1.6.14](/compare/1.20.1-1.6.13...1.20.1-1.6.14) - 2025-11-24 16:50:13
+## [1.20.1-1.6.14](/compare/1.20.1-1.6.13...1.20.1-1.6.14) - 2025-11-24 16:50:13 +0100
 
 
 ### Fixed
diff --git a/CHANGELOG-1.21.1.md b/CHANGELOG-1.21.1.md
@@ -1,8 +1,20 @@
 # 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.22"></a>
+## [1.21.1-1.6.22](https://github.com/CyclopsMC/IntegratedTerminals/compare/1.21.1-1.6.21...1.21.1-1.6.22) - 2025-12-31 15:15:47
+
+
+### Added
+* Add translations through Crowdin (#187)
+
+### Changed
+* Update to new crafting storage in Integrated Crafting
+
+Required for CyclopsMC/IntegratedCrafting#112
+
 <a name="1.21.1-1.6.21"></a>
-## [1.21.1-1.6.21](https://github.com/CyclopsMC/IntegratedTerminals/compare/1.21.1-1.6.20...1.21.1-1.6.21) - 2025-11-24 16:52:10
+## [1.21.1-1.6.21](https://github.com/CyclopsMC/IntegratedTerminals/compare/1.21.1-1.6.20...1.21.1-1.6.21) - 2025-11-24 16:52:10 +0100
 
 
 ### Fixed
diff --git a/gradle.properties b/gradle.properties
@@ -32,7 +32,7 @@ org.gradle.caching=true
 
 # Dependencies
 cyclopscore_version=1.25.5-871
-integrateddynamics_version=1.24.1-1419
+integrateddynamics_version=1.24.1-1455
 integratedterminalscompat_version=1.0.0-137
-integratedcrafting_version=1.1.13-412
+integratedcrafting_version=1.1.13-430
 commoncapabilities_version=2.9.7-303
diff --git a/resources/changelog/1.20.1-1.6.15.txt b/resources/changelog/1.20.1-1.6.15.txt
@@ -0,0 +1,7 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.19.4 or higher.
+
+Changes:
+* Update to new crafting storage in Integrated Crafting
+
+Required for CyclopsMC/IntegratedCrafting#112
diff --git a/resources/changelog/1.21.1-1.6.22.txt b/resources/changelog/1.21.1-1.6.22.txt
@@ -0,0 +1,10 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.25.1 or higher.
+
+Additions:
+* Add translations through Crowdin (#187)
+
+Changes:
+* Update to new crafting storage in Integrated Crafting
+
+Required for CyclopsMC/IntegratedCrafting#112
diff --git a/src/main/java/org/cyclops/integratedterminals/api/terminalstorage/crafting/ITerminalCraftingPlan.java b/src/main/java/org/cyclops/integratedterminals/api/terminalstorage/crafting/ITerminalCraftingPlan.java
@@ -43,9 +43,9 @@ public interface ITerminalCraftingPlan<I> {
     public long getCraftingQuantity();
 
     /**
-     * @return The ingredients that will be used from storage.
+     * @return The ingredients within the storage buffer.
      */
-    public List<IPrototypedIngredient<?, ?>> getStorageIngredients();
+    public List<IPrototypedIngredient<?, ?>> getBufferedIngredients();
 
     /**
      * @return The ingredients that were missing for 1 job amount.
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
@@ -23,7 +23,7 @@ public class TerminalCraftingPlanStatic<I> implements ITerminalCraftingPlan<I> {
     private final List<IPrototypedIngredient<?, ?>> outputs;
     private TerminalCraftingJobStatus status;
     private final long craftingQuantity;
-    private final List<IPrototypedIngredient<?, ?>> storageIngredients;
+    private final List<IPrototypedIngredient<?, ?>> bufferedIngredients;
     private final List<List<IPrototypedIngredient<?, ?>>> lastMissingIngredients;
     private TerminalCraftingPlanStatic.Label label;
     @Nullable
@@ -38,7 +38,7 @@ public TerminalCraftingPlanStatic(I id,
                                       List<IPrototypedIngredient<?, ?>> outputs,
                                       TerminalCraftingJobStatus status,
                                       long craftingQuantity,
-                                      List<IPrototypedIngredient<?, ?>> storageIngredients,
+                                      List<IPrototypedIngredient<?, ?>> bufferedIngredients,
                                       List<List<IPrototypedIngredient<?, ?>>> lastMissingIngredients,
                                       TerminalCraftingPlanStatic.Label label,
                                       long tickDuration,
@@ -49,7 +49,7 @@ public TerminalCraftingPlanStatic(I id,
         this.outputs = outputs;
         this.status = status;
         this.craftingQuantity = craftingQuantity;
-        this.storageIngredients = storageIngredients;
+        this.bufferedIngredients = bufferedIngredients;
         this.lastMissingIngredients = lastMissingIngredients;
         this.label = label;
         this.unlocalizedLabelOverride = null;
@@ -84,8 +84,8 @@ public long getCraftingQuantity() {
     }
 
     @Override
-    public List<IPrototypedIngredient<?, ?>> getStorageIngredients() {
-        return storageIngredients;
+    public List<IPrototypedIngredient<?,?>> getBufferedIngredients() {
+        return bufferedIngredients;
     }
 
     @Override
@@ -231,7 +231,7 @@ protected static <I> void groupDependenciesByPrototype(IndexedEntries indexedEnt
         }
 
         // Determine storage ingredients
-        for (IPrototypedIngredient<?, ?> output : plan.getStorageIngredients()) {
+        for (IPrototypedIngredient<?, ?> output : plan.getBufferedIngredients()) {
             TerminalCraftingPlanFlatStatic.Entry entry = indexedEntries.get(output);
             long quantity = IndexedEntries.getQuantity(output);
             entry.setQuantityInStorage(entry.getQuantityInStorage() + quantity);
@@ -269,9 +269,9 @@ public static <I> void serialize(ValueOutput valueOutput, TerminalCraftingPlanSt
 
         valueOutput.putLong("craftingQuantity", plan.getCraftingQuantity());
 
-        ValueOutput.ValueOutputList storageIngredients = valueOutput.childrenList("storageIngredients");
-        for (IPrototypedIngredient<?, ?> storageIngredient : plan.getStorageIngredients()) {
-            IPrototypedIngredient.serialize(storageIngredients.addChild(), (PrototypedIngredient) storageIngredient);
+        ValueOutput.ValueOutputList bufferedIngredients = valueOutput.childrenList("bufferedIngredients");
+        for (IPrototypedIngredient<?, ?> storageIngredient : plan.getBufferedIngredients()) {
+            IPrototypedIngredient.serialize(bufferedIngredients.addChild(), (PrototypedIngredient) storageIngredient);
         }
 
         ValueOutput.ValueOutputList lastMissingIngredients = valueOutput.childrenList("lastMissingIngredients");
@@ -315,9 +315,9 @@ public static <I> TerminalCraftingPlanStatic<I> deserialize(ValueInput valueInpu
 
         long craftingQuantity = valueInput.getLong("craftingQuantity").orElseThrow();
 
-        List<IPrototypedIngredient<?, ?>> storageIngredients = Lists.newArrayList();
-        for (ValueInput storageIngredient : valueInput.childrenList("storageIngredients").orElseThrow()) {
-            storageIngredients.add(IPrototypedIngredient.deserialize(storageIngredient));
+        List<IPrototypedIngredient<?, ?>> bufferedIngredients = Lists.newArrayList();
+        for (ValueInput storageIngredient : valueInput.childrenList("bufferedIngredients").orElseThrow()) {
+            bufferedIngredients.add(IPrototypedIngredient.deserialize(storageIngredient));
         }
 
         List<List<IPrototypedIngredient<?, ?>>> lastMissingIngredients = Lists.newArrayList();
@@ -339,7 +339,7 @@ public static <I> TerminalCraftingPlanStatic<I> deserialize(ValueInput valueInpu
 
         String initiatorName = valueInput.getStringOr("initiatorName", null);
 
-        TerminalCraftingPlanStatic<I> plan = new TerminalCraftingPlanStatic<>(id, dependencies, outputs, status, craftingQuantity, storageIngredients,
+        TerminalCraftingPlanStatic<I> plan = new TerminalCraftingPlanStatic<>(id, dependencies, outputs, status, craftingQuantity, bufferedIngredients,
                 lastMissingIngredients, label, tickDuration, channel, initiatorName);
         if (unlocalizedLabelOverride != null) {
             plan.unlocalizedLabelOverride = unlocalizedLabelOverride;
diff --git a/src/main/java/org/cyclops/integratedterminals/client/gui/container/component/GuiCraftingPlan.java b/src/main/java/org/cyclops/integratedterminals/client/gui/container/component/GuiCraftingPlan.java
@@ -309,14 +309,14 @@ public static List<GuiCraftingPlan.Element> getElements(ITerminalCraftingPlan<?>
 
     protected static void addElements(@Nullable Element parent, int indent, ITerminalCraftingPlan<?> craftingPlan, List<GuiCraftingPlan.Element> elements) {
         boolean valid = craftingPlan.getStatus().isValid()
-                || (!craftingPlan.getStorageIngredients().isEmpty() || !craftingPlan.getDependencies().isEmpty());
+                || (!craftingPlan.getBufferedIngredients().isEmpty() || !craftingPlan.getDependencies().isEmpty());
         int elementId = Objects.hash(craftingPlan.getId()) * 100;
         Element currentElement = new Element(
                 elementId++,
                 indent,
-                (List) craftingPlan.getOutputs()
+                craftingPlan.getOutputs()
                     .stream()
-                    .map(Collections::singletonList)
+                    .map(i -> Collections.singletonList((IPrototypedIngredient) i))
                     .collect(Collectors.toList()),
                 0,
                 valid ? craftingPlan.getCraftingQuantity() : 0,
@@ -330,7 +330,7 @@ protected static void addElements(@Nullable Element parent, int indent, ITermina
         if (craftingPlan.getStatus() == TerminalCraftingJobStatus.PENDING_INPUTS) {
             // Add last missing ingredients
             for (List<IPrototypedIngredient<?, ?>> lastMissingIngredient : craftingPlan.getLastMissingIngredients()) {
-                List outputs = Collections.singletonList(lastMissingIngredient
+                List<List<IPrototypedIngredient>> outputs = Collections.singletonList(lastMissingIngredient
                         .stream()
                         .map(prototypedIngredient -> {
                             IIngredientMatcher matcher = prototypedIngredient.getComponent().getMatcher();
@@ -343,9 +343,9 @@ protected static void addElements(@Nullable Element parent, int indent, ITermina
                         0, 0, craftingPlan.getCraftingQuantity(), TerminalCraftingJobStatus.INVALID.getColor(), TerminalCraftingJobStatus.INVALID)));
             }
         } else if (craftingPlan.getStatus() != TerminalCraftingJobStatus.CRAFTING) {
-            for (IPrototypedIngredient storageIngredient : craftingPlan.getStorageIngredients()) {
-                elements.add(currentElement.addChild(new Element(elementId++, indent + 1, Collections.singletonList(Collections.singletonList(storageIngredient)),
-                        storageIngredient.getComponent().getMatcher().getQuantity(storageIngredient.getPrototype()),
+            for (IPrototypedIngredient bufferedIngredient : craftingPlan.getBufferedIngredients()) {
+                elements.add(currentElement.addChild(new Element(elementId++, indent + 1, Collections.singletonList(Collections.singletonList(bufferedIngredient)),
+                        bufferedIngredient.getComponent().getMatcher().getQuantity(bufferedIngredient.getPrototype()),
                         0, 0, TerminalCraftingJobStatus.FINISHED.getColor(), TerminalCraftingJobStatus.FINISHED)));
             }
         }
@@ -377,11 +377,11 @@ public static class Element {
 
         private boolean enabled;
 
-        public Element(int id, int indent, List<List<IPrototypedIngredient<?, ?>>> outputs, long storageQuantity, long craftQuantity,
+        public Element(int id, int indent, List<List<IPrototypedIngredient>> outputs, long storageQuantity, long craftQuantity,
                        long missingQuantity, int color, TerminalCraftingJobStatus status) {
             this.id = id;
             this.indent = indent;
-            this.outputs = outputs;
+            this.outputs = (List) outputs;
             this.storageQuantity = storageQuantity;
             this.craftQuantity = craftQuantity;
             this.missingQuantity = missingQuantity;
diff --git a/src/main/java/org/cyclops/integratedterminals/modcompat/integratedcrafting/TerminalCraftingPlanCraftingJobDependencyGraph.java b/src/main/java/org/cyclops/integratedterminals/modcompat/integratedcrafting/TerminalCraftingPlanCraftingJobDependencyGraph.java
@@ -22,15 +22,15 @@ public TerminalCraftingPlanCraftingJobDependencyGraph(int id,
                                                           List<IPrototypedIngredient<?, ?>> outputs,
                                                           TerminalCraftingJobStatus status,
                                                           long craftingQuantity,
-                                                          List<IPrototypedIngredient<?, ?>> storageIngredients,
+                                                          List<IPrototypedIngredient<?, ?>> bufferedIngredients,
                                                           List<List<IPrototypedIngredient<?, ?>>> lastMissingIngredients,
                                                           TerminalCraftingPlanStatic.Label label,
                                                           long tickDuration,
                                                           int channel,
                                                           @Nullable String initiatorName,
                                                           CraftingJobDependencyGraph craftingJobDependencyGraph) {
-        super(id, dependencies, outputs, status, craftingQuantity, storageIngredients, lastMissingIngredients,
-                label, tickDuration, channel, initiatorName);
+        super(id, dependencies, outputs, status, craftingQuantity, bufferedIngredients,
+                lastMissingIngredients, label, tickDuration, channel, initiatorName);
         this.craftingJobDependencyGraph = craftingJobDependencyGraph;
     }
 
diff --git a/src/main/java/org/cyclops/integratedterminals/modcompat/integratedcrafting/TerminalStorageTabIngredientCraftingHandlerCraftingNetwork.java b/src/main/java/org/cyclops/integratedterminals/modcompat/integratedcrafting/TerminalStorageTabIngredientCraftingHandlerCraftingNetwork.java
@@ -116,7 +116,7 @@ protected static ITerminalCraftingPlan<Integer> newCraftingPlan(CraftingJob craf
                     CraftingHelpers.multiplyPrototypedIngredients(recipeOutputs, craftingJob.getAmount()),
                     TerminalCraftingJobStatus.UNSTARTED,
                     craftingJob.getAmount(),
-                    IntegratedCraftingHelpers.getPrototypesFromIngredients(craftingJob.getIngredientsStorage()),
+                    IntegratedCraftingHelpers.getPrototypesFromIngredients(craftingJob.getIngredientsStorageBuffer()),
                     Collections.emptyList(),
                     TerminalCraftingPlanStatic.Label.VALID,
                     -1,
@@ -130,12 +130,11 @@ protected static ITerminalCraftingPlan<Integer> newCraftingPlan(CraftingJob craf
                     CraftingHelpers.multiplyPrototypedIngredients(recipeOutputs, craftingJob.getAmount()),
                     TerminalCraftingJobStatus.UNSTARTED,
                     craftingJob.getAmount(),
-                    IntegratedCraftingHelpers.getPrototypesFromIngredients(craftingJob.getIngredientsStorage()),
+                    IntegratedCraftingHelpers.getPrototypesFromIngredients(craftingJob.getIngredientsStorageBuffer()),
                     Collections.emptyList(),
                     TerminalCraftingPlanStatic.Label.VALID,
                     -1,
-                    craftingJob.getChannel(),
-                    null);
+                    craftingJob.getChannel(), null);
         }
     }
 
@@ -162,8 +161,7 @@ protected static ITerminalCraftingPlan<Integer> newCraftingPlanUnknown(UnknownCr
                 Collections.emptyList(),
                 TerminalCraftingPlanStatic.Label.INCOMPLETE,
                 -1,
-                -1,
-                null);
+                -1, null);
     }
 
     protected static ITerminalCraftingPlan<Integer> newCraftingPlanFailed(FailedCraftingRecipeException exception, CraftingJobDependencyGraph dependencyGraph) {
@@ -190,8 +188,7 @@ protected static ITerminalCraftingPlan<Integer> newCraftingPlanFailed(FailedCraf
                 Collections.emptyList(),
                 TerminalCraftingPlanStatic.Label.INCOMPLETE,
                 -1,
-                -1,
-                null);
+                -1, null);
     }
 
     protected static ITerminalCraftingPlan<Integer> newCraftingPlanErrorRecursive(List<IRecipeDefinition> childRecipes) {
@@ -209,8 +206,7 @@ protected static ITerminalCraftingPlan<Integer> newCraftingPlanErrorRecursive(Li
                 Collections.emptyList(),
                 TerminalCraftingPlanStatic.Label.RECURSION,
                 -1,
-                -1,
-                null);
+                -1, null);
     }
 
     @Override
@@ -220,7 +216,7 @@ public void startCraftingJob(INetwork network, int channel, ITerminalCraftingPla
                 && craftingPlan.getStatus() == TerminalCraftingJobStatus.UNSTARTED) {
             CraftingJobDependencyGraph craftingJobDependencyGraph = ((TerminalCraftingPlanCraftingJobDependencyGraph) craftingPlan).getCraftingJobDependencyGraph();
             try {
-                CraftingHelpers.scheduleCraftingJobs(CraftingHelpers.getCraftingNetworkChecked(network), craftingJobDependencyGraph, true, player.getUUID());
+                CraftingHelpers.scheduleCraftingJobs(CraftingHelpers.getCraftingNetworkChecked(network), CraftingHelpers.getNetworkStorageGetter(network, channel, false), craftingJobDependencyGraph, true, player.getUUID());
             } catch (UnavailableCraftingInterfacesException e) {
                 throw new CraftingJobStartException("gui.integratedterminals.terminal_storage.craftingplan.label.failed.insufficient_crafting_interfaces");
             }
@@ -240,8 +236,7 @@ protected static ITerminalCraftingPlan<Integer> newErroredCraftingJob() {
                 Collections.emptyList(),
                 TerminalCraftingPlanStatic.Label.ERROR,
                 -1,
-                -1,
-                null);
+                -1, null);
     }
 
     protected static ITerminalCraftingPlan<Integer> newActiveCraftingJob(ICraftingNetwork craftingNetwork, int channel,
@@ -361,12 +356,11 @@ protected static ITerminalCraftingPlan<Integer> newActiveCraftingJob(ICraftingNe
                 pendingOutputs,
                 jobStatus,
                 craftingJob.getAmount(),
-                IntegratedCraftingHelpers.getPrototypesFromIngredients(craftingJob.getIngredientsStorage()),
+                IntegratedCraftingHelpers.getPrototypesFromIngredients(craftingJob.getIngredientsStorageBuffer()),
                 lastMissingIngredients,
                 TerminalCraftingPlanStatic.Label.RUNNING,
                 craftingNetwork.getRunningTicks(craftingJob),
-                craftingJob.getChannel(),
-                uuidToName(craftingJob.getInitiatorUuid()));
+                craftingJob.getChannel(), uuidToName(craftingJob.getInitiatorUuid()));
     }
 
     @Nullable
@@ -439,7 +433,7 @@ public ITerminalCraftingPlan<Integer> deserializeCraftingPlan(ValueInput valueIn
                             planStatic.getOutputs(),
                             planStatic.getStatus(),
                             planStatic.getCraftingQuantity(),
-                            planStatic.getStorageIngredients(),
+                            planStatic.getBufferedIngredients(),
                             planStatic.getLastMissingIngredients(),
                             planStatic.getLabel(),
                             planStatic.getTickDuration(),
diff --git a/src/main/resources/assets/cyclopscore/integratedterminals/pt_br.json b/src/main/resources/assets/cyclopscore/integratedterminals/pt_br.json
