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

Author: rubensworks

CHANGELOG-1.21.1.md

@@ -1,8 +1,19 @@
 # Changelog for Minecraft 1.21.1
 All notable changes to this project will be documented in this file.
 
+<a name="1.21.1-1.4.1"></a>
+## [1.21.1-1.4.1](https://github.com/CyclopsMC/IntegratedCrafting/compare/1.21.1-1.4.0...1.21.1-1.4.1) - 2026-01-02 10:56:30
+
+
+### Added
+* Add translations through Crowdin (#165)
+
+### Fixed
+* Fix crafting storage not dropping when breaking crafting interfaces
+* Fix crafting job completion when using importers, Closes #170
+
 <a name="1.21.1-1.4.0"></a>
-## [1.21.1-1.4.0](https://github.com/CyclopsMC/IntegratedCrafting/compare/1.21.1-1.3.4...1.21.1-1.4.0) - 2025-12-31 14:44:30
+## [1.21.1-1.4.0](https://github.com/CyclopsMC/IntegratedCrafting/compare/1.21.1-1.3.4...1.21.1-1.4.0) - 2025-12-31 14:44:30 +0100
 
 
 ### Changed

gradle.properties

@@ -32,6 +32,6 @@ org.gradle.caching=true
 
 # Dependencies
 cyclopscore_version=1.25.5-871
-integrateddynamics_version=1.24.1-1455
+integrateddynamics_version=1.24.1-1463
 commoncapabilities_version=2.9.7-303
 integratedtunnels_version=1.8.30-534

resources/changelog/1.21.1-1.4.1.txt

@@ -0,0 +1,9 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.26.2 or higher.
+
+Additions:
+* Add translations through Crowdin (#165)
+
+Fixes:
+* Fix crafting storage not dropping when breaking crafting interfaces
+* Fix crafting job completion when using importers, Closes #170

src/main/java/org/cyclops/integratedcrafting/core/CraftingJobHandler.java

@@ -24,7 +24,6 @@
 import org.cyclops.integratedcrafting.IntegratedCrafting;
 import org.cyclops.integratedcrafting.api.crafting.*;
 import org.cyclops.integratedcrafting.api.network.ICraftingNetwork;
-import org.cyclops.integrateddynamics.api.ingredient.IIngredientComponentStorageObservable;
 import org.cyclops.integrateddynamics.api.network.INetwork;
 import org.cyclops.integrateddynamics.api.network.IPositionedAddonsNetworkIngredients;
 import org.cyclops.integrateddynamics.api.part.PartPos;
@@ -306,9 +305,8 @@ protected <T, M> void registerIngredientObserver(IngredientComponent<T, M> ingre
             IPositionedAddonsNetworkIngredients<T, M> ingredientsNetwork = CraftingHelpers
                     .getIngredientsNetworkChecked(network, ingredientComponent);
             ICraftingNetwork craftingNetwork = CraftingHelpers.getCraftingNetworkChecked(network);
-            PendingCraftingJobResultIndexObserver<T, M> observer = new PendingCraftingJobResultIndexObserver<>(ingredientComponent, this, craftingNetwork, ingredientsNetwork, network);
-            ingredientsNetwork.addObserver(observer);
-            ingredientsNetwork.scheduleObservation();
+            PendingCraftingJobResultIndexObserver<T, M> observer = new PendingCraftingJobResultIndexObserver<>(ingredientComponent, this, craftingNetwork);
+            ingredientsNetwork.registerInsertPreConsumer(observer);
             ingredientObservers.put(ingredientComponent, observer);
         }
         ingredientObserverCounters.put(ingredientComponent, count + 1);
@@ -321,10 +319,10 @@ protected <T, M> void unregisterIngredientObserver(IngredientComponent<T, M> ing
         if (count == 0) {
             IPositionedAddonsNetworkIngredients<T, M> ingredientsNetwork = CraftingHelpers
                     .getIngredientsNetworkChecked(network, ingredientComponent);
-            IIngredientComponentStorageObservable.IIndexChangeObserver<T, M> observer =
-                    (IIngredientComponentStorageObservable.IIndexChangeObserver<T, M>) ingredientObservers
+            PendingCraftingJobResultIndexObserver<T, M> observer =
+                    (PendingCraftingJobResultIndexObserver<T, M>) ingredientObservers
                             .remove(ingredientComponent);
-            ingredientsNetwork.removeObserver(observer);
+            ingredientsNetwork.unregisterInsertPreConsumer(observer);
         }
     }
 
@@ -347,14 +345,6 @@ public void markCraftingJobFinished(int craftingJobId) {
         craftingJob.setAmount(0);
     }
 
-    public void reRegisterObservers(INetwork network) {
-        for (Map.Entry<IngredientComponent<?, ?>, PendingCraftingJobResultIndexObserver<?, ?>> entry : ingredientObservers.entrySet()) {
-            IPositionedAddonsNetworkIngredients ingredientsNetwork = CraftingHelpers
-                    .getIngredientsNetworkChecked(network, entry.getKey());
-            ingredientsNetwork.addObserver(entry.getValue());
-        }
-    }
-
     public void onCraftingJobEntryFinished(ICraftingNetwork craftingNetwork, int craftingJobId) {
         CraftingJob craftingJob = this.allCraftingJobs.get(craftingJobId);
         craftingJob.setAmount(craftingJob.getAmount() - 1);
@@ -660,7 +650,7 @@ public <T, M> IngredientInstanceWrapper<T, M> beforeFlushIngredientToNetwork(Ing
         if (observer != null) {
             IIngredientCollectionMutable<T, M> instances = new IngredientCollectionPrototypeMap<>(instanceWrapper.getComponent());
             instances.add(instanceWrapper.getInstance());
-            return observer.addIngredient(instanceWrapper, channel);
+            return observer.addIngredient(instanceWrapper, channel, false);
         }
         return instanceWrapper;
     }