Throw exception if some JEI API methods are called from the wrong thread

gradle.properties

@@ -1,5 +1,5 @@
 mcversion=1.12.2
-forgeversion=14.23.0.2501
+forgeversion=14.23.0.2529
 mcp_mappings=snapshot_20170918
 curse_project_id=238222
 

src/main/java/mezz/jei/ingredients/IngredientRegistry.java

@@ -155,6 +155,7 @@ public List<ItemStack> getPotionIngredients() {
 
 	@Override
 	public <V> void addIngredientsAtRuntime(Class<V> ingredientClass, List<V> ingredients) {
+		ErrorUtil.assertMainThread();
 		addIngredientsAtRuntime(ingredientClass, ingredients, Internal.getIngredientFilter());
 	}
 
@@ -183,6 +184,7 @@ public <V> void addIngredientsAtRuntime(Class<V> ingredientClass, List<V> ingred
 
 	@Override
 	public <V> void removeIngredientsAtRuntime(Class<V> ingredientClass, List<V> ingredients) {
+		ErrorUtil.assertMainThread();
 		removeIngredientsAtRuntime(ingredientClass, ingredients, Internal.getIngredientFilter());
 	}
 

src/main/java/mezz/jei/recipes/RecipeRegistry.java

@@ -178,6 +178,7 @@ public <V> IFocus<V> createFocus(IFocus.Mode mode, V ingredient) {
 	@Override
 	public void addRecipe(Object recipe) {
 		ErrorUtil.checkNotNull(recipe, "recipe");
+		ErrorUtil.assertMainThread();
 
 		addRecipe(recipe, recipe.getClass(), null);
 	}
@@ -186,6 +187,7 @@ public void addRecipe(Object recipe) {
 	public void addRecipe(IRecipeWrapper recipe, String recipeCategoryUid) {
 		ErrorUtil.checkNotNull(recipe, "recipe");
 		ErrorUtil.checkNotNull(recipeCategoryUid, "recipeCategoryUid");
+		ErrorUtil.assertMainThread();
 
 		IRecipeCategory recipeCategory = getRecipeCategory(recipeCategoryUid);
 		if (recipeCategory == null) {
@@ -282,6 +284,7 @@ public Ingredients getIngredients(IRecipeWrapper recipeWrapper) {
 	@Override
 	public void removeRecipe(Object recipe) {
 		ErrorUtil.checkNotNull(recipe, "recipe");
+		ErrorUtil.assertMainThread();
 
 		List<IRecipeHandler<Object>> recipeHandlers1 = getRecipeHandlers(recipe.getClass());
 		for (IRecipeHandler<Object> recipeHandler : recipeHandlers1) {
@@ -312,6 +315,7 @@ private <T> void removeRecipe(T recipe, String recipeCategoryUid) {
 	public void removeRecipe(IRecipeWrapper recipe, String recipeCategoryUid) {
 		ErrorUtil.checkNotNull(recipe, "recipe");
 		ErrorUtil.checkNotNull(recipeCategoryUid, "recipeCategoryUid");
+		ErrorUtil.assertMainThread();
 
 		hideRecipe(recipe);
 	}
@@ -670,13 +674,15 @@ public <T extends IRecipeWrapper> IRecipeLayoutDrawable createRecipeLayoutDrawab
 	@Override
 	public void hideRecipe(IRecipeWrapper recipe) {
 		ErrorUtil.checkNotNull(recipe, "recipe");
+		ErrorUtil.assertMainThread();
 		hiddenRecipes.add(recipe);
 		recipeCategoriesVisibleCache.clear();
 	}
 
 	@Override
 	public void unhideRecipe(IRecipeWrapper recipe) {
 		ErrorUtil.checkNotNull(recipe, "recipe");
+		ErrorUtil.assertMainThread();
 		hiddenRecipes.remove(recipe);
 		recipeCategoriesVisibleCache.clear();
 	}

src/main/java/mezz/jei/util/ErrorUtil.java

@@ -13,6 +13,7 @@
 import mezz.jei.api.recipe.IRecipeWrapper;
 import mezz.jei.ingredients.Ingredients;
 import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
@@ -203,4 +204,12 @@ public static void checkIsValidIngredient(@Nullable Object ingredient, String na
 			throw new IllegalArgumentException("Invalid ingredient found. Parameter Name: " + name + " Class: " + ingredient.getClass() + " Object: " + ingredient);
 		}
 	}
+
+	@SuppressWarnings("ConstantConditions")
+	public static void assertMainThread() {
+		Minecraft minecraft = Minecraft.getMinecraft();
+		if (minecraft != null && !minecraft.isCallingFromMinecraftThread()) {
+			throw new IllegalStateException("A JEI API method is being called by another mod from the wrong thread. It must be called on the main thread.");
+		}
+	}
 }