fix: ensure JEI is called from the main thread for loot crate rebuilding

FTBTeam/FTB-Mods-Issues#1438
FTBTeam · Dec 31, 2024 · d236455 · d236455
1 parent 00d6378
commit d236455
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [21.1.2]
+
+### Fixed
+* Fixed threading bug with JEI integration
+
 ## [21.1.1]
 
 ### Added

diff --git a/.../src/main/java/dev/ftb/mods/ftbxmodcompat/ftbquests/jei/LootCrateRecipeManagerPlugin.java b/.../src/main/java/dev/ftb/mods/ftbxmodcompat/ftbquests/jei/LootCrateRecipeManagerPlugin.java
@@ -9,6 +9,7 @@
 import mezz.jei.api.recipe.RecipeType;
 import mezz.jei.api.recipe.advanced.IRecipeManagerPlugin;
 import mezz.jei.api.recipe.category.IRecipeCategory;
+import net.minecraft.client.Minecraft;
 import net.minecraft.world.item.ItemStack;
 
 import java.util.List;
@@ -19,12 +20,16 @@ public enum LootCrateRecipeManagerPlugin implements IRecipeManagerPlugin {
     private final WrappedLootCrateCache cache = new WrappedLootCrateCache(
             crates -> {
                 if (FTBQuestsJEIIntegration.runtime != null && !crates.isEmpty()) {
-                    FTBQuestsJEIIntegration.runtime.getIngredientManager().removeIngredientsAtRuntime(VanillaTypes.ITEM_STACK, crates);
+                    Minecraft.getInstance().tell(() ->
+                            FTBQuestsJEIIntegration.runtime.getIngredientManager().removeIngredientsAtRuntime(VanillaTypes.ITEM_STACK, crates)
+                    );
                 }
             },
             crates -> {
                 if (FTBQuestsJEIIntegration.runtime != null && !crates.isEmpty()) {
-                    FTBQuestsJEIIntegration.runtime.getIngredientManager().addIngredientsAtRuntime(VanillaTypes.ITEM_STACK, crates);
+                    Minecraft.getInstance().tell(() ->
+                            FTBQuestsJEIIntegration.runtime.getIngredientManager().addIngredientsAtRuntime(VanillaTypes.ITEM_STACK, crates)
+                    );
                 }
             }
     );

diff --git a/...ain/java/dev/ftb/mods/ftbxmodcompat/ftbquests/recipemod_common/WrappedLootCrateCache.java b/...ain/java/dev/ftb/mods/ftbxmodcompat/ftbquests/recipemod_common/WrappedLootCrateCache.java
@@ -34,7 +34,7 @@ public List<WrappedLootCrate> getWrappedLootCrates() {
     }
 
     private void rebuildWrappedLootCrateCache() {
-        preRebuild.accept(crateStacks);
+        preRebuild.accept(List.copyOf(crateStacks));
 
         wrappedLootCratesCache.clear();
         crateStacks.clear();
@@ -49,7 +49,7 @@ private void rebuildWrappedLootCrateCache() {
             }
         }
 
-        postRebuild.accept(crateStacks);
+        postRebuild.accept(List.copyOf(crateStacks));
     }
 
     public void refresh() {

diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ enabled_platforms=fabric,neoforge
 
 archives_base_name=ftb-xmod-compat
 readable_name=FTB XMod Compat
-mod_version=21.1.1
+mod_version=21.1.2
 maven_group=dev.ftb.mods
 curseforge_id=889915