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

gradle.properties

@@ -2,7 +2,7 @@ mod_version=1.1.4
 minecraft_version=1.19.2
 forge_version=43.0.8
 cyclopscore_version=1.17.0-237
-integrateddynamics_version=1.19.2-1.19.0-644
+integrateddynamics_version=1.19.2-1.20.0-659
 release_type=release
 fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44
 

resources/changelog/1.18.2-1.1.5.txt

@@ -0,0 +1,6 @@
+As always, don't forget to backup your world before updating!
+Requires CyclopsCore version 1.13.4 or higher.
+
+Fixes:
+* Fix restarting jobs when resetting network, Closes #99
+

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

@@ -42,7 +42,10 @@ public PendingCraftingJobResultIndexObserver(IngredientComponent<T, M> ingredien
 
     @Override
     public void onChange(IIngredientComponentStorageObservable.StorageChangeEvent<T, M> event) {
-        if (event.getChangeType() == IIngredientComponentStorageObservable.Change.ADDITION) {
+        if (event.getChangeType() == IIngredientComponentStorageObservable.Change.ADDITION
+                // If we're still initializing the network, skip addition events.
+                // Otherwise, we could incorrectly mark running crafting jobs as finished.
+                && !event.isInitialChange()) {
             IIngredientCollection<T, M> addedIngredients = event.getInstances();
             IIngredientComponentStorage<T, M> ingredientsHayStack = null; // A mutable copy of addedIngredients (lazily created)
             IIngredientMatcher<T, M> matcher = ingredientComponent.getMatcher();

src/main/resources/META-INF/mods.toml

@@ -22,7 +22,7 @@ Craft stuff in Integrated Dynamics networks.
 [[dependencies.integratedcrafting]]
     modId="integrateddynamics"
     mandatory=true
-    versionRange="[1.19.0,)"
+    versionRange="[1.20.0,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.integratedcrafting]]