Merge pull request #25 from FTBTeam/dev

Dev

Author: MichaelHillcox

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).
 
+## [3.2.2]
+
+### Fixed
+* Fixed error in JEI loot crate handling code causing broken loot crate display and/or crashes
+
 ## [3.2.1]
 
 ### Changed

common/src/main/java/dev/ftb/mods/ftbxmodcompat/ftbquests/jei/LootCrateCategory.java

@@ -19,7 +19,6 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.crafting.Ingredient;
 
 import java.util.List;
 
@@ -84,7 +83,7 @@ public void setRecipe(IRecipeLayoutBuilder builder, WrappedLootCrate recipe, IFo
 		for (int slot = 0; slot < Math.min(WrappedLootCrate.ITEMS, recipe.outputs.size()); slot++) {
 			int finalSlot = slot;
 			builder.addSlot(RecipeIngredientRole.OUTPUT, (slot % WrappedLootCrate.ITEMSX) * 18, (slot / WrappedLootCrate.ITEMSX) * 18 + 36)
-					.addIngredients(() -> Ingredient.class, recipe.outputIngredients())
+					.addIngredients(recipe.outputIngredients().get(slot))
 					.addTooltipCallback((recipeSlotView, tooltip) -> recipeSlotView.getDisplayedIngredient()
 							.flatMap(ingr -> ingr.getIngredient(VanillaTypes.ITEM_STACK)).ifPresent(stack -> {
 								if (ItemStack.isSameItemSameComponents(stack, recipe.outputs.get(finalSlot))) {

gradle.properties

@@ -6,7 +6,7 @@ enabled_platforms=fabric,neoforge
 
 archives_base_name=ftb-xmod-compat
 readable_name=FTB XMod Compat
-mod_version=3.2.1
+mod_version=3.2.2
 maven_group=dev.ftb.mods
 curseforge_id=889915