mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-20 20:12:19 +00:00
Fix invalid recipes warning when BoP plugin is enabled
This commit is contained in:
1 parent
9284f84645
commit
5ef76cffca
8 files changed
+50
-114
No files matched your search
@@ -29,6 +29,10 @@ public class FermenterRecipe implements IFermenterRecipe {
|
||||
if (resource == null) {
|
||||
throw new NullPointerException("Fermenter Resource cannot be null!");
|
||||
}
|
||||
|
||||
if (resource.getItem() == null) {
|
||||
throw new NullPointerException("Fermenter Resource item cannot be null!");
|
||||
}
|
||||
|
||||
if (output == null) {
|
||||
throw new NullPointerException("Fermenter Output cannot be null!");
|
||||
|
||||
@@ -92,7 +92,7 @@ public class FactoryJeiPlugin extends BlankModPlugin {
|
||||
registry.addRecipes(CarpenterRecipeMaker.getCarpenterRecipes());
|
||||
registry.addRecipes(CentrifugeRecipeMaker.getCentrifugeRecipe());
|
||||
registry.addRecipes(FabricatorRecipeMaker.getFabricatorRecipes());
|
||||
registry.addRecipes(FermenterRecipeMaker.getFermenterRecipes());
|
||||
registry.addRecipes(FermenterRecipeMaker.getFermenterRecipes(jeiHelpers.getStackHelper()));
|
||||
registry.addRecipes(MoistenerRecipeMaker.getMoistenerRecipes());
|
||||
registry.addRecipes(RainmakerRecipeMaker.getRecipes());
|
||||
registry.addRecipes(SqueezerRecipeMaker.getSqueezerRecipes());
|
||||
|
||||
@@ -23,7 +23,7 @@ import mezz.jei.api.gui.IGuiItemStackGroup;
|
||||
import mezz.jei.api.gui.IRecipeLayout;
|
||||
import mezz.jei.api.recipe.IRecipeWrapper;
|
||||
|
||||
public class FermenterRecipeCategory extends ForestryRecipeCategory {
|
||||
public class FermenterRecipeCategory extends ForestryRecipeCategory<FermenterRecipeWrapper> {
|
||||
|
||||
private static final int resourceSlot = 0;
|
||||
private static final int fuelSlot = 1;
|
||||
@@ -62,7 +62,7 @@ public class FermenterRecipeCategory extends ForestryRecipeCategory {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) {
|
||||
public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull FermenterRecipeWrapper recipeWrapper) {
|
||||
IGuiItemStackGroup guiItemStacks = recipeLayout.getItemStacks();
|
||||
IGuiFluidStackGroup guiFluidStacks = recipeLayout.getFluidStacks();
|
||||
|
||||
@@ -72,18 +72,15 @@ public class FermenterRecipeCategory extends ForestryRecipeCategory {
|
||||
guiFluidStacks.init(inputTank, true, 1, 1, 16, 58, 3000, false, tankOverlay);
|
||||
guiFluidStacks.init(outputTank, false, 91, 1, 16, 58, 3000, false, tankOverlay);
|
||||
|
||||
FermenterRecipeWrapper wrapper = (FermenterRecipeWrapper) recipeWrapper;
|
||||
|
||||
guiItemStacks.set(resourceSlot, wrapper.getFermentable());
|
||||
guiItemStacks.set(resourceSlot, recipeWrapper.getFermentable());
|
||||
List<ItemStack> fuels = new ArrayList<>();
|
||||
for (FermenterFuel fuel : FuelManager.fermenterFuel.values()) {
|
||||
fuels.add(fuel.item);
|
||||
}
|
||||
guiItemStacks.set(fuelSlot, fuels);
|
||||
|
||||
guiFluidStacks.set(inputTank, wrapper.getFluidInputs());
|
||||
guiFluidStacks.set(outputTank, wrapper.getFluidOutputs());
|
||||
|
||||
guiFluidStacks.set(inputTank, recipeWrapper.getFluidInputs());
|
||||
guiFluidStacks.set(outputTank, recipeWrapper.getFluidOutputs());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -8,22 +8,29 @@ import net.minecraft.item.ItemStack;
|
||||
import forestry.api.recipes.IFermenterRecipe;
|
||||
import forestry.api.recipes.IVariableFermentable;
|
||||
import forestry.api.recipes.RecipeManagers;
|
||||
import forestry.core.recipes.jei.JEIUtils;
|
||||
import forestry.core.utils.Log;
|
||||
import forestry.factory.recipes.jei.FactoryJeiPlugin;
|
||||
|
||||
import mezz.jei.api.recipe.IStackHelper;
|
||||
|
||||
public class FermenterRecipeMaker {
|
||||
|
||||
private FermenterRecipeMaker() {
|
||||
}
|
||||
|
||||
public static List<FermenterRecipeWrapper> getFermenterRecipes() {
|
||||
public static List<FermenterRecipeWrapper> getFermenterRecipes(IStackHelper stackHelper) {
|
||||
List<FermenterRecipeWrapper> recipes = new ArrayList<>();
|
||||
for (IFermenterRecipe recipe : RecipeManagers.fermenterManager.recipes()) {
|
||||
if (recipe.getResource() != null && recipe.getResource().getItem() instanceof IVariableFermentable) {
|
||||
for (ItemStack stack : JEIUtils.getItemVariations(recipe.getResource())) {
|
||||
recipes.add(new FermenterRecipeWrapper(recipe, stack));
|
||||
if (recipe.getResource() != null) {
|
||||
if (recipe.getResource().getItem() instanceof IVariableFermentable) {
|
||||
for (ItemStack stack : stackHelper.getSubtypes(recipe.getResource())) {
|
||||
recipes.add(new FermenterRecipeWrapper(recipe, stack));
|
||||
}
|
||||
} else {
|
||||
recipes.add(new FermenterRecipeWrapper(recipe, recipe.getResource()));
|
||||
}
|
||||
} else {
|
||||
recipes.add(new FermenterRecipeWrapper(recipe, recipe.getResource()));
|
||||
Log.error("Null resource for recipe");
|
||||
}
|
||||
}
|
||||
return recipes;
|
||||
|
||||
Reference in new issue
Block a user