diff --git a/gradle.properties b/gradle.properties index 9d6c9e9fa..8c7461cf6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,10 @@ mcversion=1.10.2 -forgeversion=12.18.1.2080 +forgeversion=12.18.1.2094 mcp_mappings=snapshot_20160525 -tesla_version=1.10.2-1.2.1.42 -jei_version=3.8.1.242 -ic2_version=2.6.38-ex110 +tesla_version=1.10.2-1.2.1.49 +jei_version=3.11.2.278 +ic2_version=2.6.76-ex110 version_major=5 version_minor=2 diff --git a/src/main/java/forestry/Forestry.java b/src/main/java/forestry/Forestry.java index be5c48dfb..61f0a27cd 100644 --- a/src/main/java/forestry/Forestry.java +++ b/src/main/java/forestry/Forestry.java @@ -12,20 +12,6 @@ package forestry; import java.io.File; -import forestry.plugins.compat.PluginIC2; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.common.Mod.EventHandler; -import net.minecraftforge.fml.common.event.FMLInitializationEvent; -import net.minecraftforge.fml.common.event.FMLInterModComms; -import net.minecraftforge.fml.common.event.FMLInterModComms.IMCEvent; -import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; -import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import net.minecraftforge.fml.common.event.FMLServerStartingEvent; -import net.minecraftforge.fml.common.network.NetworkRegistry; -import net.minecraftforge.fml.common.registry.GameRegistry; - import forestry.api.core.ForestryAPI; import forestry.core.EventHandlerCore; import forestry.core.climate.ClimateEventHandler; @@ -40,6 +26,19 @@ import forestry.core.network.PacketHandler; import forestry.core.proxy.Proxies; import forestry.core.worldgen.WorldGenerator; import forestry.plugins.PluginManager; +import forestry.plugins.compat.PluginIC2; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.common.Mod.EventHandler; +import net.minecraftforge.fml.common.event.FMLInitializationEvent; +import net.minecraftforge.fml.common.event.FMLInterModComms; +import net.minecraftforge.fml.common.event.FMLInterModComms.IMCEvent; +import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; +import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; +import net.minecraftforge.fml.common.event.FMLServerStartingEvent; +import net.minecraftforge.fml.common.network.NetworkRegistry; +import net.minecraftforge.fml.common.registry.GameRegistry; /** * Forestry Minecraft Mod @@ -53,7 +52,7 @@ import forestry.plugins.PluginManager; guiFactory = "forestry.core.config.ForestryGuiConfigFactory", acceptedMinecraftVersions = "[1.10]", dependencies = "required-after:Forge@[12.18.1.2080,);" - + "after:JEI@[3.8.0,);" + + "after:JEI@[3.11.2.278,);" + "after:" + PluginIC2.modId + ";") public class Forestry { diff --git a/src/main/java/forestry/api/recipes/ICarpenterRecipe.java b/src/main/java/forestry/api/recipes/ICarpenterRecipe.java index cb3e88b77..12a465ee6 100644 --- a/src/main/java/forestry/api/recipes/ICarpenterRecipe.java +++ b/src/main/java/forestry/api/recipes/ICarpenterRecipe.java @@ -8,7 +8,6 @@ package forestry.api.recipes; import javax.annotation.Nullable; import net.minecraft.item.ItemStack; - import net.minecraftforge.fluids.FluidStack; public interface ICarpenterRecipe extends IForestryRecipe { diff --git a/src/main/java/forestry/api/recipes/IDescriptiveRecipe.java b/src/main/java/forestry/api/recipes/IDescriptiveRecipe.java index 91e336b11..4fc8753ac 100644 --- a/src/main/java/forestry/api/recipes/IDescriptiveRecipe.java +++ b/src/main/java/forestry/api/recipes/IDescriptiveRecipe.java @@ -5,6 +5,9 @@ ******************************************************************************/ package forestry.api.recipes; +import javax.annotation.Nonnull; + +import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; /** @@ -30,4 +33,7 @@ public interface IDescriptiveRecipe extends IRecipe { */ Object[] getIngredients(); + @Nonnull + @Override + ItemStack getRecipeOutput(); } diff --git a/src/main/java/forestry/core/utils/JeiUtil.java b/src/main/java/forestry/core/utils/JeiUtil.java index 0a98da1c4..61c5539b8 100644 --- a/src/main/java/forestry/core/utils/JeiUtil.java +++ b/src/main/java/forestry/core/utils/JeiUtil.java @@ -1,5 +1,8 @@ package forestry.core.utils; +import java.util.ArrayList; +import java.util.List; + import mezz.jei.api.IModRegistry; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -8,9 +11,12 @@ import net.minecraftforge.oredict.OreDictionary; public class JeiUtil { public static void addDescription(IModRegistry registry, String itemKey, Item... items) { + List itemStacks = new ArrayList<>(); for (Item item : items) { - addDescription(registry, item, itemKey); + itemStacks.add(new ItemStack(item, 1, OreDictionary.WILDCARD_VALUE)); } + + registry.addDescription(itemStacks, "for.jei.description." + itemKey); } public static void addDescription(IModRegistry registry, Block... blocks) { diff --git a/src/main/java/forestry/factory/recipes/ISqueezerContainerRecipe.java b/src/main/java/forestry/factory/recipes/ISqueezerContainerRecipe.java index 94b7d53ff..251032a31 100644 --- a/src/main/java/forestry/factory/recipes/ISqueezerContainerRecipe.java +++ b/src/main/java/forestry/factory/recipes/ISqueezerContainerRecipe.java @@ -10,15 +10,17 @@ ******************************************************************************/ package forestry.factory.recipes; -import net.minecraft.item.ItemStack; +import javax.annotation.Nullable; import forestry.api.recipes.ISqueezerRecipe; +import net.minecraft.item.ItemStack; public interface ISqueezerContainerRecipe { ItemStack getEmptyContainer(); int getProcessingTime(); + @Nullable ItemStack getRemnants(); float getRemnantsChance(); diff --git a/src/main/java/forestry/factory/recipes/SqueezerContainerRecipe.java b/src/main/java/forestry/factory/recipes/SqueezerContainerRecipe.java index eded8487b..a5031e3bc 100644 --- a/src/main/java/forestry/factory/recipes/SqueezerContainerRecipe.java +++ b/src/main/java/forestry/factory/recipes/SqueezerContainerRecipe.java @@ -10,22 +10,23 @@ ******************************************************************************/ package forestry.factory.recipes; -import net.minecraft.item.ItemStack; - -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidUtil; +import javax.annotation.Nullable; import forestry.api.recipes.ISqueezerRecipe; import forestry.core.utils.ItemStackUtil; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidUtil; public class SqueezerContainerRecipe implements ISqueezerContainerRecipe { private final ItemStack emptyContainer; private final int processingTime; + @Nullable private final ItemStack remnants; private final float remnantsChance; - public SqueezerContainerRecipe(ItemStack emptyContainer, int processingTime, ItemStack remnants, float remnantsChance) { + public SqueezerContainerRecipe(ItemStack emptyContainer, int processingTime, @Nullable ItemStack remnants, float remnantsChance) { this.emptyContainer = emptyContainer; this.processingTime = processingTime; this.remnants = remnants; @@ -42,6 +43,7 @@ public class SqueezerContainerRecipe implements ISqueezerContainerRecipe { return processingTime; } + @Nullable @Override public ItemStack getRemnants() { return remnants; diff --git a/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java b/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java index c0538ef1f..7567af3e2 100644 --- a/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java +++ b/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java @@ -2,7 +2,7 @@ package forestry.factory.recipes.jei; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import java.awt.*; +import java.awt.Rectangle; import java.util.List; import forestry.core.gui.GuiForestry; @@ -58,9 +58,11 @@ import net.minecraft.item.ItemStack; @JEIPlugin public class FactoryJeiPlugin extends BlankModPlugin { + public static IJeiHelpers jeiHelpers; + @Override public void register(@Nonnull IModRegistry registry) { - IJeiHelpers jeiHelpers = registry.getJeiHelpers(); + jeiHelpers = registry.getJeiHelpers(); IGuiHelper guiHelper = jeiHelpers.getGuiHelper(); registry.addRecipeCategories( diff --git a/src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeCategory.java b/src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeCategory.java index 9b6307bf2..e0d365886 100644 --- a/src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeCategory.java +++ b/src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeCategory.java @@ -2,13 +2,9 @@ package forestry.factory.recipes.jei.bottler; import javax.annotation.Nonnull; -import net.minecraft.client.Minecraft; -import net.minecraft.util.ResourceLocation; - import forestry.core.recipes.jei.ForestryRecipeCategory; import forestry.core.recipes.jei.ForestryRecipeCategoryUid; import forestry.core.render.ForestryResource; - import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IDrawableAnimated; @@ -16,9 +12,11 @@ import mezz.jei.api.gui.IDrawableStatic; import mezz.jei.api.gui.IGuiFluidStackGroup; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.recipe.IRecipeWrapper; +import mezz.jei.api.ingredients.IIngredients; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; -public class BottlerRecipeCategory extends ForestryRecipeCategory { +public class BottlerRecipeCategory extends ForestryRecipeCategory { private static final int emptySlot = 0; private static final int outputSlot = 1; @@ -50,7 +48,7 @@ public class BottlerRecipeCategory extends ForestryRecipeCategory { } @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull BottlerRecipeWrapper recipeWrapper, @Nonnull IIngredients ingredients) { IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); IGuiFluidStackGroup guiFluidStacks = recipeLayout.getFluidStacks(); @@ -58,11 +56,9 @@ public class BottlerRecipeCategory extends ForestryRecipeCategory { guiItemStacks.init(outputSlot, false, 63, 38); guiFluidStacks.init(inputTank, true, 1, 1, 16, 58, 10000, false, tankOverlay); - - guiItemStacks.setFromRecipe(emptySlot, recipeWrapper.getInputs()); - guiItemStacks.setFromRecipe(outputSlot, recipeWrapper.getOutputs()); - - guiFluidStacks.set(inputTank, recipeWrapper.getFluidInputs()); + + guiItemStacks.set(ingredients); + guiFluidStacks.set(ingredients); } } diff --git a/src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeWrapper.java b/src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeWrapper.java index b9e030869..701f37e9e 100644 --- a/src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeWrapper.java +++ b/src/main/java/forestry/factory/recipes/jei/bottler/BottlerRecipeWrapper.java @@ -2,14 +2,12 @@ package forestry.factory.recipes.jei.bottler; import javax.annotation.Nonnull; import java.util.Collections; -import java.util.List; - -import net.minecraft.item.ItemStack; - -import net.minecraftforge.fluids.FluidStack; import forestry.core.recipes.jei.ForestryRecipeWrapper; import forestry.factory.recipes.BottlerRecipe; +import mezz.jei.api.ingredients.IIngredients; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; public class BottlerRecipeWrapper extends ForestryRecipeWrapper { @@ -17,22 +15,13 @@ public class BottlerRecipeWrapper extends ForestryRecipeWrapper { super(recipe); } - @Nonnull @Override - public List getFluidInputs() { - return Collections.singletonList(getRecipe().input); - } + public void getIngredients(@Nonnull IIngredients ingredients) { + BottlerRecipe recipe = getRecipe(); - @Nonnull - @Override - public List getInputs() { - return Collections.singletonList(getRecipe().empty); - } + ingredients.setInputs(ItemStack.class, Collections.singletonList(recipe.empty)); + ingredients.setInputs(FluidStack.class, Collections.singletonList(recipe.input)); - @Nonnull - @Override - public List getOutputs() { - return Collections.singletonList(getRecipe().filled); + ingredients.setOutput(ItemStack.class, recipe.filled); } - } diff --git a/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeCategory.java b/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeCategory.java index 53977ad43..f9760b33a 100644 --- a/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeCategory.java +++ b/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeCategory.java @@ -1,17 +1,15 @@ package forestry.factory.recipes.jei.carpenter; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.Collections; +import java.util.Arrays; import java.util.List; -import net.minecraft.client.Minecraft; -import net.minecraft.util.ResourceLocation; - +import forestry.api.recipes.ICarpenterRecipe; +import forestry.api.recipes.IDescriptiveRecipe; import forestry.core.recipes.jei.ForestryRecipeCategory; import forestry.core.recipes.jei.ForestryRecipeCategoryUid; import forestry.core.render.ForestryResource; - +import forestry.factory.recipes.jei.FactoryJeiPlugin; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.ICraftingGridHelper; import mezz.jei.api.gui.IDrawable; @@ -20,9 +18,14 @@ import mezz.jei.api.gui.IDrawableStatic; import mezz.jei.api.gui.IGuiFluidStackGroup; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.recipe.IRecipeWrapper; +import mezz.jei.api.ingredients.IIngredients; +import mezz.jei.api.recipe.IStackHelper; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.FluidStack; -public class CarpenterRecipeCategory extends ForestryRecipeCategory { +public class CarpenterRecipeCategory extends ForestryRecipeCategory { private static final int boxSlot = 0; private static final int craftOutputSlot = 1; @@ -59,7 +62,7 @@ public class CarpenterRecipeCategory extends ForestryRecipeCategory { } @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull CarpenterRecipeWrapper recipeWrapper, @Nonnull IIngredients ingredients) { IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); IGuiFluidStackGroup guiFluidStacks = recipeLayout.getFluidStacks(); @@ -75,17 +78,27 @@ public class CarpenterRecipeCategory extends ForestryRecipeCategory { } guiFluidStacks.init(inputTank, true, 141, 1, 16, 58, 10000, false, tankOverlay); - - CarpenterRecipeWrapper wrapper = (CarpenterRecipeWrapper) recipeWrapper; - guiItemStacks.set(boxSlot, wrapper.getRecipe().getBox()); - - craftingGridHelper.setOutput(guiItemStacks, wrapper.getOutputs()); - List inputs = new ArrayList<>(); - Collections.addAll(inputs, wrapper.getRecipe().getCraftingGridRecipe().getIngredients()); - craftingGridHelper.setInput(guiItemStacks, inputs, wrapper.getRecipe().getCraftingGridRecipe().getWidth(), wrapper.getRecipe().getCraftingGridRecipe().getHeight()); - - guiFluidStacks.set(inputTank, wrapper.getFluidInputs()); - + + ICarpenterRecipe recipe = recipeWrapper.getRecipe(); + ItemStack box = recipe.getBox(); + if (box != null) { + guiItemStacks.set(boxSlot, box); + } + + List outputs = ingredients.getOutputs(ItemStack.class); + craftingGridHelper.setOutput(guiItemStacks, outputs); + + IDescriptiveRecipe craftingGridRecipe = recipe.getCraftingGridRecipe(); + + List inputs = Arrays.asList(craftingGridRecipe.getIngredients()); + IStackHelper stackHelper = FactoryJeiPlugin.jeiHelpers.getStackHelper(); + List> craftInputs = stackHelper.expandRecipeItemStackInputs(inputs); + craftingGridHelper.setInputStacks(guiItemStacks, craftInputs, craftingGridRecipe.getWidth(), craftingGridRecipe.getHeight()); + + List> fluidInputs = ingredients.getInputs(FluidStack.class); + if (!fluidInputs.isEmpty()) { + guiFluidStacks.set(inputTank, fluidInputs.get(0)); + } } } diff --git a/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeWrapper.java b/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeWrapper.java index fddfaaed9..b27abdd54 100644 --- a/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeWrapper.java +++ b/src/main/java/forestry/factory/recipes/jei/carpenter/CarpenterRecipeWrapper.java @@ -1,16 +1,18 @@ package forestry.factory.recipes.jei.carpenter; import javax.annotation.Nonnull; -import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; -import net.minecraft.item.ItemStack; - -import net.minecraftforge.fluids.FluidStack; - import forestry.api.recipes.ICarpenterRecipe; +import forestry.api.recipes.IDescriptiveRecipe; import forestry.core.recipes.jei.ForestryRecipeWrapper; +import forestry.factory.recipes.jei.FactoryJeiPlugin; +import mezz.jei.api.ingredients.IIngredients; +import mezz.jei.api.recipe.IStackHelper; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; public class CarpenterRecipeWrapper extends ForestryRecipeWrapper { @@ -18,25 +20,26 @@ public class CarpenterRecipeWrapper extends ForestryRecipeWrapper inputs = new ArrayList<>(); - Collections.addAll(inputs, getRecipe().getCraftingGridRecipe().getIngredients()); - inputs.add(getRecipe().getBox()); - return inputs; - } + public void getIngredients(@Nonnull IIngredients ingredients) { + ICarpenterRecipe recipe = getRecipe(); + IDescriptiveRecipe craftingGridRecipe = recipe.getCraftingGridRecipe(); + Object[] inputs = craftingGridRecipe.getIngredients(); + IStackHelper stackHelper = FactoryJeiPlugin.jeiHelpers.getStackHelper(); - @Nonnull - @Override - public List getFluidInputs() { - return Collections.singletonList(getRecipe().getFluidResource()); - } + List> inputStacks = stackHelper.expandRecipeItemStackInputs(Arrays.asList(inputs)); + ItemStack box = recipe.getBox(); + if (box != null) { + inputStacks.add(Collections.singletonList(box)); + } + ingredients.setInputLists(ItemStack.class, inputStacks); - @Nonnull - @Override - public List getOutputs() { - return Collections.singletonList(getRecipe().getCraftingGridRecipe().getRecipeOutput()); - } + FluidStack fluidResource = recipe.getFluidResource(); + if (fluidResource != null) { + ingredients.setInputs(FluidStack.class, Collections.singletonList(fluidResource)); + } + ItemStack recipeOutput = craftingGridRecipe.getRecipeOutput(); + ingredients.setOutput(ItemStack.class, recipeOutput); + } } diff --git a/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeCategory.java b/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeCategory.java index 8b77ae10f..ee35d74c6 100644 --- a/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeCategory.java +++ b/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeCategory.java @@ -2,29 +2,28 @@ package forestry.factory.recipes.jei.centrifuge; import javax.annotation.Nonnull; import java.util.Comparator; +import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.PriorityQueue; import java.util.Queue; import java.util.Set; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - import forestry.core.recipes.jei.ForestryRecipeCategory; import forestry.core.recipes.jei.ForestryRecipeCategoryUid; import forestry.core.recipes.jei.ForestryTooltipCallback; import forestry.core.render.ForestryResource; - import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawableAnimated; import mezz.jei.api.gui.IDrawableStatic; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.recipe.IRecipeWrapper; +import mezz.jei.api.ingredients.IIngredients; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; -public class CentrifugeRecipeCategory extends ForestryRecipeCategory { +public class CentrifugeRecipeCategory extends ForestryRecipeCategory { private static final int[][] OUTPUTS = new int[][]{{0, 0}, {1, 0}, {2, 0}, {0, 1}, {1, 1}, {2, 1}, {0, 2}, {1, 2}, {2, 2}}; @@ -62,14 +61,16 @@ public class CentrifugeRecipeCategory extends ForestryRecipeCategory { } @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull CentrifugeRecipeWrapper recipeWrapper, @Nonnull IIngredients ingredients) { IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); guiItemStacks.init(inputSlot, true, 4, 18); - guiItemStacks.setFromRecipe(inputSlot, recipeWrapper.getInputs()); - CentrifugeRecipeWrapper centrifugeWrapper = (CentrifugeRecipeWrapper) recipeWrapper; + List> inputs = ingredients.getInputs(ItemStack.class); + guiItemStacks.set(inputSlot, inputs.get(0)); + ForestryTooltipCallback tooltip = new ForestryTooltipCallback(); - setResults(tooltip, centrifugeWrapper.getRecipe().getAllProducts(), guiItemStacks); + Map products = recipeWrapper.getRecipe().getAllProducts(); + setResults(tooltip, products, guiItemStacks); guiItemStacks.addTooltipCallback(tooltip); } diff --git a/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeWrapper.java b/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeWrapper.java index 9ad07cadb..02afc7387 100644 --- a/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeWrapper.java +++ b/src/main/java/forestry/factory/recipes/jei/centrifuge/CentrifugeRecipeWrapper.java @@ -1,11 +1,14 @@ package forestry.factory.recipes.jei.centrifuge; import javax.annotation.Nonnull; +import java.util.ArrayList; import java.util.Collections; -import java.util.List; +import java.util.Set; import forestry.api.recipes.ICentrifugeRecipe; import forestry.core.recipes.jei.ForestryRecipeWrapper; +import mezz.jei.api.ingredients.IIngredients; +import net.minecraft.item.ItemStack; public class CentrifugeRecipeWrapper extends ForestryRecipeWrapper { @@ -13,16 +16,13 @@ public class CentrifugeRecipeWrapper extends ForestryRecipeWrapper outputs = recipe.getAllProducts().keySet(); + ingredients.setOutputs(ItemStack.class, new ArrayList<>(outputs)); + } } diff --git a/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeCategory.java b/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeCategory.java index dbebeae6a..24f563e28 100644 --- a/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeCategory.java +++ b/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeCategory.java @@ -2,30 +2,28 @@ package forestry.factory.recipes.jei.fabricator; import javax.annotation.Nonnull; import java.util.ArrayList; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -import net.minecraftforge.fluids.Fluid; - +import forestry.api.recipes.IFabricatorRecipe; import forestry.api.recipes.IFabricatorSmeltingRecipe; import forestry.core.recipes.jei.ForestryRecipeCategory; import forestry.core.recipes.jei.ForestryRecipeCategoryUid; import forestry.core.render.ForestryResource; import forestry.factory.recipes.FabricatorSmeltingRecipeManager; - import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.ICraftingGridHelper; import mezz.jei.api.gui.IGuiFluidStackGroup; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.recipe.IRecipeWrapper; +import mezz.jei.api.ingredients.IIngredients; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; -public class FabricatorRecipeCategory extends ForestryRecipeCategory { +public class FabricatorRecipeCategory extends ForestryRecipeCategory { private static final int planSlot = 0; private static final int smeltingInputSlot = 1; @@ -51,7 +49,7 @@ public class FabricatorRecipeCategory extends ForestryRecipeCategory { } @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull FabricatorRecipeWrapper recipeWrapper, @Nonnull IIngredients ingredients) { IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); IGuiFluidStackGroup guiFluidStacks = recipeLayout.getFluidStacks(); @@ -69,25 +67,33 @@ public class FabricatorRecipeCategory extends ForestryRecipeCategory { } guiFluidStacks.init(inputTank, true, 6, 32, 16, 16, 2000, false, null); - - FabricatorRecipeWrapper wrapper = (FabricatorRecipeWrapper) recipeWrapper; - guiItemStacks.set(planSlot, wrapper.getRecipe().getPlan()); - + + IFabricatorRecipe recipe = recipeWrapper.getRecipe(); + + ItemStack plan = recipe.getPlan(); + if (plan != null) { + guiItemStacks.set(planSlot, plan); + } + List smeltingInput = new ArrayList<>(); - for (IFabricatorSmeltingRecipe s : getSmeltingInputs().get(wrapper.getRecipe().getLiquid().getFluid())) { + Fluid recipeFluid = recipe.getLiquid().getFluid(); + for (IFabricatorSmeltingRecipe s : getSmeltingInputs().get(recipeFluid)) { smeltingInput.add(s.getResource()); } if (!smeltingInput.isEmpty()) { guiItemStacks.set(smeltingInputSlot, smeltingInput); } - - craftingGridHelper.setOutput(guiItemStacks, wrapper.getOutputs()); - List inputs = new ArrayList<>(); - Collections.addAll(inputs, wrapper.getRecipe().getIngredients()); - craftingGridHelper.setInput(guiItemStacks, inputs, wrapper.getRecipe().getWidth(), wrapper.getRecipe().getHeight()); - - guiFluidStacks.set(inputTank, wrapper.getFluidInputs()); - + + List itemOutputs = ingredients.getOutputs(ItemStack.class); + craftingGridHelper.setOutput(guiItemStacks, itemOutputs); + + List> itemStackInputs = ingredients.getInputs(ItemStack.class); + craftingGridHelper.setInputStacks(guiItemStacks, itemStackInputs, recipe.getWidth(), recipe.getHeight()); + + List> fluidInputs = ingredients.getInputs(FluidStack.class); + if (!fluidInputs.isEmpty()) { + guiFluidStacks.set(inputTank, fluidInputs.get(0)); + } } private static Map> getSmeltingInputs() { diff --git a/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeWrapper.java b/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeWrapper.java index 0576ab440..13e27c5cf 100644 --- a/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeWrapper.java +++ b/src/main/java/forestry/factory/recipes/jei/fabricator/FabricatorRecipeWrapper.java @@ -1,16 +1,17 @@ package forestry.factory.recipes.jei.fabricator; import javax.annotation.Nonnull; -import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; -import net.minecraft.item.ItemStack; - -import net.minecraftforge.fluids.FluidStack; - import forestry.api.recipes.IFabricatorRecipe; import forestry.core.recipes.jei.ForestryRecipeWrapper; +import forestry.factory.recipes.jei.FactoryJeiPlugin; +import mezz.jei.api.ingredients.IIngredients; +import mezz.jei.api.recipe.IStackHelper; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; public class FabricatorRecipeWrapper extends ForestryRecipeWrapper { @@ -18,25 +19,17 @@ public class FabricatorRecipeWrapper extends ForestryRecipeWrapper inputs = new ArrayList<>(); - Collections.addAll(inputs, getRecipe().getIngredients()); - inputs.add(getRecipe().getPlan()); - return inputs; - } + public void getIngredients(@Nonnull IIngredients ingredients) { + IFabricatorRecipe recipe = getRecipe(); + IStackHelper stackHelper = FactoryJeiPlugin.jeiHelpers.getStackHelper(); - @Nonnull - @Override - public List getFluidInputs() { - return Collections.singletonList(getRecipe().getLiquid()); - } + Object[] itemInputs = recipe.getIngredients(); + List> itemStackInputs = stackHelper.expandRecipeItemStackInputs(Arrays.asList(itemInputs)); + ingredients.setInputLists(ItemStack.class, itemStackInputs); - @Nonnull - @Override - public List getOutputs() { - return Collections.singletonList(getRecipe().getRecipeOutput()); - } + ingredients.setInputs(FluidStack.class, Collections.singletonList(getRecipe().getLiquid())); + ingredients.setOutput(ItemStack.class, recipe.getRecipeOutput()); + } } diff --git a/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeCategory.java b/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeCategory.java index bb3a5bccf..dd2c0d911 100644 --- a/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeCategory.java +++ b/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeCategory.java @@ -1,19 +1,10 @@ package forestry.factory.recipes.jei.fermenter; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -import forestry.api.fuels.FermenterFuel; -import forestry.api.fuels.FuelManager; import forestry.core.recipes.jei.ForestryRecipeCategory; import forestry.core.recipes.jei.ForestryRecipeCategoryUid; import forestry.core.render.ForestryResource; - import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IDrawableAnimated; @@ -21,6 +12,9 @@ import mezz.jei.api.gui.IDrawableStatic; import mezz.jei.api.gui.IGuiFluidStackGroup; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.ingredients.IIngredients; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; public class FermenterRecipeCategory extends ForestryRecipeCategory { @@ -61,7 +55,7 @@ public class FermenterRecipeCategory extends ForestryRecipeCategory fuels = new ArrayList<>(); - for (FermenterFuel fuel : FuelManager.fermenterFuel.values()) { - fuels.add(fuel.getItem()); - } - guiItemStacks.set(fuelSlot, fuels); - - guiFluidStacks.set(inputTank, recipeWrapper.getFluidInputs()); - guiFluidStacks.set(outputTank, recipeWrapper.getFluidOutputs()); + + guiItemStacks.set(ingredients); + guiFluidStacks.set(ingredients); } } diff --git a/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeWrapper.java b/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeWrapper.java index 1b31818e3..87ea66d21 100644 --- a/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeWrapper.java +++ b/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeWrapper.java @@ -2,18 +2,18 @@ package forestry.factory.recipes.jei.fermenter; import javax.annotation.Nonnull; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; -import net.minecraft.item.ItemStack; - -import net.minecraftforge.fluids.FluidStack; - import forestry.api.fuels.FermenterFuel; import forestry.api.fuels.FuelManager; import forestry.api.recipes.IFermenterRecipe; import forestry.api.recipes.IVariableFermentable; import forestry.core.recipes.jei.ForestryRecipeWrapper; +import mezz.jei.api.ingredients.IIngredients; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; public class FermenterRecipeWrapper extends ForestryRecipeWrapper { @@ -25,39 +25,32 @@ public class FermenterRecipeWrapper extends ForestryRecipeWrapper inputs = new ArrayList<>(); + public void getIngredients(@Nonnull IIngredients ingredients) { + List fuelInputs = new ArrayList<>(); for (FermenterFuel fuel : FuelManager.fermenterFuel.values()) { - inputs.add(fuel.getItem()); + fuelInputs.add(fuel.getItem()); } - inputs.add(fermentable); - return inputs; + + ingredients.setInputLists(ItemStack.class, Arrays.asList( + Collections.singletonList(fermentable), + fuelInputs + )); + + FluidStack fluidInput = getRecipe().getFluidResource().copy(); + fluidInput.amount = getRecipe().getFermentationValue(); + ingredients.setInput(FluidStack.class, fluidInput); + + int amount = Math.round(getRecipe().getFermentationValue() * getRecipe().getModifier()); + if (fermentable.getItem() instanceof IVariableFermentable) { + amount *= ((IVariableFermentable) fermentable.getItem()).getFermentationModifier(fermentable); + } + FluidStack fluidOutput = new FluidStack(getRecipe().getOutput(), amount); + ingredients.setOutput(FluidStack.class, fluidOutput); } @Nonnull public ItemStack getFermentable() { return fermentable; } - - @Nonnull - @Override - public List getFluidInputs() { - FluidStack input = getRecipe().getFluidResource().copy(); - input.amount = getRecipe().getFermentationValue(); - return Collections.singletonList(input); - } - - @Nonnull - @Override - public List getFluidOutputs() { - int amount = Math.round(getRecipe().getFermentationValue() * getRecipe().getModifier()); - if (fermentable.getItem() instanceof IVariableFermentable) { - amount *= ((IVariableFermentable) fermentable.getItem()).getFermentationModifier(fermentable); - } - FluidStack output = new FluidStack(getRecipe().getOutput(), amount); - return Collections.singletonList(output); - } - } diff --git a/src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeCategory.java b/src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeCategory.java index 0ec09de83..c57719301 100644 --- a/src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeCategory.java +++ b/src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeCategory.java @@ -2,15 +2,9 @@ package forestry.factory.recipes.jei.moistener; import javax.annotation.Nonnull; -import net.minecraft.client.Minecraft; -import net.minecraft.util.ResourceLocation; - -import net.minecraftforge.fluids.FluidRegistry; - import forestry.core.recipes.jei.ForestryRecipeCategory; import forestry.core.recipes.jei.ForestryRecipeCategoryUid; import forestry.core.render.ForestryResource; - import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IDrawableAnimated; @@ -18,9 +12,11 @@ import mezz.jei.api.gui.IDrawableStatic; import mezz.jei.api.gui.IGuiFluidStackGroup; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.recipe.IRecipeWrapper; +import mezz.jei.api.ingredients.IIngredients; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; -public class MoistenerRecipeCategory extends ForestryRecipeCategory { +public class MoistenerRecipeCategory extends ForestryRecipeCategory { private static final int resourceSlot = 0; private static final int productSlot = 1; @@ -60,7 +56,7 @@ public class MoistenerRecipeCategory extends ForestryRecipeCategory { } @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull MoistenerRecipeWrapper recipeWrapper, @Nonnull IIngredients ingredients) { IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); IGuiFluidStackGroup guiFluidStacks = recipeLayout.getFluidStacks(); @@ -71,16 +67,9 @@ public class MoistenerRecipeCategory extends ForestryRecipeCategory { guiItemStacks.init(fuelProductSlot, false, 89, 21); guiFluidStacks.init(inputTank, true, 1, 1, 16, 58, 10000, false, tankOverlay); - - MoistenerRecipeWrapper wrapper = (MoistenerRecipeWrapper) recipeWrapper; - guiItemStacks.set(resourceSlot, wrapper.getRecipe().getResource()); - guiItemStacks.set(fuelItemSlot, wrapper.getFuel().getItem()); - - guiItemStacks.set(productSlot, wrapper.getRecipe().getProduct()); - guiItemStacks.set(fuelProductSlot, wrapper.getFuel().getProduct()); - - guiFluidStacks.set(inputTank, FluidRegistry.getFluidStack("water", 10000)); - + + guiItemStacks.set(ingredients); + guiFluidStacks.set(ingredients); } } diff --git a/src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeWrapper.java b/src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeWrapper.java index 423769ce3..0f3b562cf 100644 --- a/src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeWrapper.java +++ b/src/main/java/forestry/factory/recipes/jei/moistener/MoistenerRecipeWrapper.java @@ -4,11 +4,13 @@ import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; -import net.minecraft.item.ItemStack; - import forestry.api.fuels.MoistenerFuel; import forestry.api.recipes.IMoistenerRecipe; import forestry.core.recipes.jei.ForestryRecipeWrapper; +import mezz.jei.api.ingredients.IIngredients; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; public class MoistenerRecipeWrapper extends ForestryRecipeWrapper { @@ -20,26 +22,27 @@ public class MoistenerRecipeWrapper extends ForestryRecipeWrapper getInputs() { - List inputs = new ArrayList<>(); - inputs.add(getRecipe().getResource()); - if (fuel.getItem() != null) { - inputs.add(fuel.getItem()); - } - return inputs; - } + public void getIngredients(@Nonnull IIngredients ingredients) { + IMoistenerRecipe recipe = getRecipe(); - @Nonnull - @Override - public List getOutputs() { - List outputs = new ArrayList<>(); - outputs.add(getRecipe().getProduct()); - if (fuel.getProduct() != null) { - outputs.add(fuel.getProduct()); + List itemStackInputs = new ArrayList<>(); + itemStackInputs.add(recipe.getResource()); + ItemStack fuelItem = fuel.getItem(); + if (fuelItem != null) { + itemStackInputs.add(fuelItem); } - return outputs; + ingredients.setInputs(ItemStack.class, itemStackInputs); + + List itemStackOutputs = new ArrayList<>(); + itemStackOutputs.add(recipe.getProduct()); + ItemStack fuelProduct = fuel.getProduct(); + if (fuelProduct != null) { + itemStackOutputs.add(fuelProduct); + } + ingredients.setOutputs(ItemStack.class, itemStackOutputs); + + ingredients.setInput(FluidStack.class, new FluidStack(FluidRegistry.WATER, recipe.getTimePerItem() / 4)); } @Nonnull diff --git a/src/main/java/forestry/factory/recipes/jei/rainmaker/RainmakerRecipeCategory.java b/src/main/java/forestry/factory/recipes/jei/rainmaker/RainmakerRecipeCategory.java index f55ec7e30..ba10af716 100644 --- a/src/main/java/forestry/factory/recipes/jei/rainmaker/RainmakerRecipeCategory.java +++ b/src/main/java/forestry/factory/recipes/jei/rainmaker/RainmakerRecipeCategory.java @@ -1,21 +1,17 @@ package forestry.factory.recipes.jei.rainmaker; import javax.annotation.Nonnull; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; import forestry.core.recipes.jei.ForestryRecipeCategory; import forestry.core.recipes.jei.ForestryRecipeCategoryUid; - import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.recipe.IRecipeWrapper; +import mezz.jei.api.ingredients.IIngredients; +import net.minecraft.client.Minecraft; -public class RainmakerRecipeCategory extends ForestryRecipeCategory { +public class RainmakerRecipeCategory extends ForestryRecipeCategory { private static final int SLOT_INPUT_INDEX = 0; private final IDrawable slot; @@ -37,13 +33,9 @@ public class RainmakerRecipeCategory extends ForestryRecipeCategory { } @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull RainmakerRecipeWrapper recipeWrapper, @Nonnull IIngredients ingredients) { IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); guiItemStacks.init(SLOT_INPUT_INDEX, true, 0, 0); - if (recipeWrapper instanceof RainmakerRecipeWrapper) { - RainmakerRecipeWrapper rainmakerRecipeWrapper = (RainmakerRecipeWrapper) recipeWrapper; - List input = rainmakerRecipeWrapper.getInputs().get(SLOT_INPUT_INDEX); - guiItemStacks.set(SLOT_INPUT_INDEX, input); - } + guiItemStacks.set(ingredients); } } diff --git a/src/main/java/forestry/factory/recipes/jei/rainmaker/RainmakerRecipeWrapper.java b/src/main/java/forestry/factory/recipes/jei/rainmaker/RainmakerRecipeWrapper.java index 40f4dc30d..12c94dbbd 100644 --- a/src/main/java/forestry/factory/recipes/jei/rainmaker/RainmakerRecipeWrapper.java +++ b/src/main/java/forestry/factory/recipes/jei/rainmaker/RainmakerRecipeWrapper.java @@ -3,15 +3,13 @@ package forestry.factory.recipes.jei.rainmaker; import javax.annotation.Nonnull; import java.awt.Color; import java.util.Collections; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; import forestry.api.fuels.RainSubstrate; import forestry.core.utils.Translator; - +import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; public class RainmakerRecipeWrapper extends BlankRecipeWrapper { @Nonnull @@ -21,10 +19,9 @@ public class RainmakerRecipeWrapper extends BlankRecipeWrapper { this.substrate = substrate; } - @Nonnull @Override - public List> getInputs() { - return Collections.singletonList(Collections.singletonList(substrate.getItem())); + public void getIngredients(@Nonnull IIngredients ingredients) { + ingredients.setInputs(ItemStack.class, Collections.singletonList(substrate.getItem())); } @Override diff --git a/src/main/java/forestry/factory/recipes/jei/squeezer/AbstractSqueezerRecipeWrapper.java b/src/main/java/forestry/factory/recipes/jei/squeezer/AbstractSqueezerRecipeWrapper.java index 967c7115a..0894f5b12 100644 --- a/src/main/java/forestry/factory/recipes/jei/squeezer/AbstractSqueezerRecipeWrapper.java +++ b/src/main/java/forestry/factory/recipes/jei/squeezer/AbstractSqueezerRecipeWrapper.java @@ -1,11 +1,6 @@ package forestry.factory.recipes.jei.squeezer; import javax.annotation.Nonnull; -import java.util.List; - -import net.minecraft.item.ItemStack; - -import net.minecraftforge.fluids.FluidStack; import forestry.core.recipes.jei.ForestryRecipeWrapper; @@ -14,18 +9,6 @@ public abstract class AbstractSqueezerRecipeWrapper extends ForestryRecipeWra super(recipe); } - @Nonnull - @Override - public abstract List getInputs(); - - @Nonnull - @Override - public abstract List getFluidOutputs(); - - @Nonnull - @Override - public abstract List getOutputs(); - /** * @return Chance remnants will be produced by a single recipe cycle, from 0 to 1. */ diff --git a/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerContainerRecipeWrapper.java b/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerContainerRecipeWrapper.java index 149d7173b..ec6e351ba 100644 --- a/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerContainerRecipeWrapper.java +++ b/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerContainerRecipeWrapper.java @@ -2,14 +2,12 @@ package forestry.factory.recipes.jei.squeezer; import javax.annotation.Nonnull; import java.util.Collections; -import java.util.List; - -import net.minecraft.item.ItemStack; - -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; import forestry.factory.recipes.ISqueezerContainerRecipe; +import mezz.jei.api.ingredients.IIngredients; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidUtil; public class SqueezerContainerRecipeWrapper extends AbstractSqueezerRecipeWrapper { @@ -21,22 +19,19 @@ public class SqueezerContainerRecipeWrapper extends AbstractSqueezerRecipeWrappe this.filledContainer = filledContainer; } - @Nonnull @Override - public List getInputs() { - return Collections.singletonList(filledContainer); - } + public void getIngredients(@Nonnull IIngredients ingredients) { + ingredients.setInputs(ItemStack.class, Collections.singletonList(filledContainer)); - @Nonnull - @Override - public List getFluidOutputs() { - return Collections.singletonList(FluidContainerRegistry.getFluidForFilledItem(filledContainer)); - } + ItemStack remnants = getRecipe().getRemnants(); + if (remnants != null) { + ingredients.setOutput(ItemStack.class, remnants); + } - @Nonnull - @Override - public List getOutputs() { - return Collections.singletonList(getRecipe().getRemnants()); + FluidStack fluidContained = FluidUtil.getFluidContained(filledContainer); + if (fluidContained != null) { + ingredients.setOutput(FluidStack.class, fluidContained); + } } @Override diff --git a/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeCategory.java b/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeCategory.java index a5d19528a..f3247f662 100644 --- a/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeCategory.java +++ b/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeCategory.java @@ -1,17 +1,11 @@ package forestry.factory.recipes.jei.squeezer; import javax.annotation.Nonnull; -import java.util.List; - -import net.minecraft.client.Minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import forestry.core.recipes.jei.ForestryRecipeCategory; import forestry.core.recipes.jei.ForestryRecipeCategoryUid; import forestry.core.recipes.jei.ForestryTooltipCallback; import forestry.core.render.ForestryResource; - import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IDrawableAnimated; @@ -19,9 +13,11 @@ import mezz.jei.api.gui.IDrawableStatic; import mezz.jei.api.gui.IGuiFluidStackGroup; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; -import mezz.jei.api.recipe.IRecipeWrapper; +import mezz.jei.api.ingredients.IIngredients; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; -public class SqueezerRecipeCategory extends ForestryRecipeCategory { +public class SqueezerRecipeCategory extends ForestryRecipeCategory { private static final int[][] INPUTS = new int[][]{{0, 0}, {1, 0}, {2, 0}, {0, 1}, {1, 1}, {2, 1}, {0, 2}, {1, 2}, {2, 2}}; @@ -56,33 +52,22 @@ public class SqueezerRecipeCategory extends ForestryRecipeCategory { } @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull AbstractSqueezerRecipeWrapper recipeWrapper, @Nonnull IIngredients ingredients) { IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks(); IGuiFluidStackGroup guiFluidStacks = recipeLayout.getFluidStacks(); - - AbstractSqueezerRecipeWrapper wrapper = (AbstractSqueezerRecipeWrapper) recipeWrapper; - - float chance = wrapper.getRemnantsChance(); - guiFluidStacks.init(outputTank, false, 113, 2, 16, 58, 10000, false, tankOverlay); - guiFluidStacks.set(outputTank, wrapper.getFluidOutputs()); - - guiItemStacks.init(craftOutputSlot, false, 87, 43); - guiItemStacks.set(craftOutputSlot, wrapper.getOutputs()); - ForestryTooltipCallback tooltip = new ForestryTooltipCallback(); - tooltip.addChanceTooltip(craftOutputSlot, chance); - setIngredients(guiItemStacks, wrapper.getInputs()); - - guiItemStacks.addTooltipCallback(tooltip); - } - - private static void setIngredients(@Nonnull IGuiItemStackGroup guiItemStacks, @Nonnull List inputs) { - int i = 0; - for (ItemStack stack : inputs) { + for (int i = 0; i < INPUTS.length; i++) { guiItemStacks.init(craftInputSlot + i, true, 7 + INPUTS[i][0] * 18, 4 + INPUTS[i][1] * 18); - guiItemStacks.set(craftInputSlot + i, stack); - i++; } - } + guiItemStacks.init(craftOutputSlot, false, 87, 43); + guiFluidStacks.init(outputTank, false, 113, 2, 16, 58, 10000, false, tankOverlay); + ForestryTooltipCallback tooltip = new ForestryTooltipCallback(); + float chance = recipeWrapper.getRemnantsChance(); + tooltip.addChanceTooltip(craftOutputSlot, chance); + guiItemStacks.addTooltipCallback(tooltip); + + guiItemStacks.set(ingredients); + guiFluidStacks.set(ingredients); + } } diff --git a/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeWrapper.java b/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeWrapper.java index 4a0e1f756..b2e847906 100644 --- a/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeWrapper.java +++ b/src/main/java/forestry/factory/recipes/jei/squeezer/SqueezerRecipeWrapper.java @@ -1,41 +1,30 @@ package forestry.factory.recipes.jei.squeezer; import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import net.minecraft.item.ItemStack; - -import net.minecraftforge.fluids.FluidStack; +import java.util.Arrays; import forestry.api.recipes.ISqueezerRecipe; +import mezz.jei.api.ingredients.IIngredients; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; public class SqueezerRecipeWrapper extends AbstractSqueezerRecipeWrapper { public SqueezerRecipeWrapper(@Nonnull ISqueezerRecipe recipe) { super(recipe); } - - @Nonnull - @Override - public List getInputs() { - List inputs = new ArrayList<>(); - Collections.addAll(inputs, getRecipe().getResources()); - return inputs; - } - - @Nonnull - @Override - public List getFluidOutputs() { - return Collections.singletonList(getRecipe().getFluidOutput()); - } - @Nonnull @Override - public List getOutputs() { + public void getIngredients(@Nonnull IIngredients ingredients) { + ItemStack[] resources = getRecipe().getResources(); + ingredients.setInputs(ItemStack.class, Arrays.asList(resources)); + ItemStack remnants = getRecipe().getRemnants(); - return remnants == null ? Collections.emptyList() : Collections.singletonList(remnants); + if (remnants != null) { + ingredients.setOutput(ItemStack.class, remnants); + } + + ingredients.setOutput(FluidStack.class, getRecipe().getFluidOutput()); } @Override diff --git a/src/main/java/forestry/factory/recipes/jei/still/StillRecipeCategory.java b/src/main/java/forestry/factory/recipes/jei/still/StillRecipeCategory.java index 8166f6f43..4d72f36bf 100644 --- a/src/main/java/forestry/factory/recipes/jei/still/StillRecipeCategory.java +++ b/src/main/java/forestry/factory/recipes/jei/still/StillRecipeCategory.java @@ -2,20 +2,19 @@ package forestry.factory.recipes.jei.still; import javax.annotation.Nonnull; -import net.minecraft.client.Minecraft; -import net.minecraft.util.ResourceLocation; - import forestry.core.recipes.jei.ForestryRecipeCategory; import forestry.core.recipes.jei.ForestryRecipeCategoryUid; import forestry.core.render.ForestryResource; - import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IDrawableAnimated; import mezz.jei.api.gui.IDrawableStatic; import mezz.jei.api.gui.IGuiFluidStackGroup; import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; public class StillRecipeCategory extends ForestryRecipeCategory { @@ -49,14 +48,13 @@ public class StillRecipeCategory extends ForestryRecipeCategory { } @Override - public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper, @Nonnull IIngredients ingredients) { IGuiFluidStackGroup guiFluidStacks = recipeLayout.getFluidStacks(); guiFluidStacks.init(inputTank, true, 1, 1, 16, 58, 10000, false, tankOverlay); guiFluidStacks.init(outputTank, false, 91, 1, 16, 58, 10000, false, tankOverlay); - - guiFluidStacks.set(inputTank, recipeWrapper.getFluidInputs()); - guiFluidStacks.set(outputTank, recipeWrapper.getFluidOutputs()); + + guiFluidStacks.set(ingredients); } } diff --git a/src/main/java/forestry/factory/recipes/jei/still/StillRecipeWrapper.java b/src/main/java/forestry/factory/recipes/jei/still/StillRecipeWrapper.java index cef8730ac..2908abed8 100644 --- a/src/main/java/forestry/factory/recipes/jei/still/StillRecipeWrapper.java +++ b/src/main/java/forestry/factory/recipes/jei/still/StillRecipeWrapper.java @@ -2,12 +2,11 @@ package forestry.factory.recipes.jei.still; import javax.annotation.Nonnull; import java.util.Collections; -import java.util.List; - -import net.minecraftforge.fluids.FluidStack; import forestry.api.recipes.IStillRecipe; import forestry.core.recipes.jei.ForestryRecipeWrapper; +import mezz.jei.api.ingredients.IIngredients; +import net.minecraftforge.fluids.FluidStack; public class StillRecipeWrapper extends ForestryRecipeWrapper { @@ -15,16 +14,9 @@ public class StillRecipeWrapper extends ForestryRecipeWrapper { super(recipe); } - @Nonnull @Override - public List getFluidInputs() { - return Collections.singletonList(getRecipe().getInput()); + public void getIngredients(@Nonnull IIngredients ingredients) { + ingredients.setInputs(FluidStack.class, Collections.singletonList(getRecipe().getInput())); + ingredients.setOutput(FluidStack.class, getRecipe().getOutput()); } - - @Nonnull - @Override - public List getFluidOutputs() { - return Collections.singletonList(getRecipe().getOutput()); - } - }