From 5ef76cffca8ac3e12afbdae483b37191bb7ecee7 Mon Sep 17 00:00:00 2001 From: mezz Date: Wed, 22 Jun 2016 16:19:40 -0700 Subject: [PATCH] Fix invalid recipes warning when BoP plugin is enabled --- gradle.properties | 2 +- .../recipes/jei/ForestryRecipeCategory.java | 3 +- .../forestry/core/recipes/jei/JEIUtils.java | 72 ------------------- .../factory/recipes/FermenterRecipe.java | 4 ++ .../factory/recipes/jei/FactoryJeiPlugin.java | 2 +- .../fermenter/FermenterRecipeCategory.java | 13 ++-- .../jei/fermenter/FermenterRecipeMaker.java | 19 +++-- .../plugins/compat/PluginBiomesOPlenty.java | 49 +++++++------ 8 files changed, 50 insertions(+), 114 deletions(-) delete mode 100644 src/main/java/forestry/core/recipes/jei/JEIUtils.java diff --git a/gradle.properties b/gradle.properties index ae39ce8c9..31790585c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,4 +7,4 @@ ic2_version=2.5.5-ex19 version_major=5 version_minor=0 -version_patch=20 +version_patch=21 diff --git a/src/main/java/forestry/core/recipes/jei/ForestryRecipeCategory.java b/src/main/java/forestry/core/recipes/jei/ForestryRecipeCategory.java index d6a2f1ffe..d85ccfb7e 100644 --- a/src/main/java/forestry/core/recipes/jei/ForestryRecipeCategory.java +++ b/src/main/java/forestry/core/recipes/jei/ForestryRecipeCategory.java @@ -6,8 +6,9 @@ import forestry.core.utils.Translator; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.recipe.BlankRecipeCategory; +import mezz.jei.api.recipe.IRecipeWrapper; -public abstract class ForestryRecipeCategory extends BlankRecipeCategory { +public abstract class ForestryRecipeCategory extends BlankRecipeCategory { @Nonnull private final IDrawable background; @Nonnull diff --git a/src/main/java/forestry/core/recipes/jei/JEIUtils.java b/src/main/java/forestry/core/recipes/jei/JEIUtils.java deleted file mode 100644 index 3a984bde3..000000000 --- a/src/main/java/forestry/core/recipes/jei/JEIUtils.java +++ /dev/null @@ -1,72 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2011-2014 SirSengir. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Lesser Public License v3 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/lgpl-3.0.txt - * - * Various Contributors including, but not limited to: - * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges - ******************************************************************************/ -package forestry.core.recipes.jei; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; - -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidBlock; -import net.minecraftforge.fluids.IFluidContainerItem; - -public class JEIUtils { - - public static List getItemVariations(ItemStack base) { - List variations = new ArrayList<>(); - base.getItem().getSubItems(base.getItem(), null, variations); - Iterator itr = variations.iterator(); - ItemStack stack; - while (itr.hasNext()) { - stack = itr.next(); - if (!base.isItemEqual(stack) || !stack.hasTagCompound()) { - itr.remove(); - } - } - if (variations.isEmpty()) { - return Collections.singletonList(base); - } - return variations; - } - - public static FluidStack getFluidStack(ItemStack stack) { - if (stack != null) { - FluidStack fluidStack = null; - if (stack.getItem() instanceof IFluidContainerItem) { - fluidStack = ((IFluidContainerItem) stack.getItem()).getFluid(stack); - } - if (fluidStack == null) { - fluidStack = FluidContainerRegistry.getFluidForFilledItem(stack); - } - if (fluidStack == null && Block.getBlockFromItem(stack.getItem()) instanceof IFluidBlock) { - Fluid fluid = ((IFluidBlock) Block.getBlockFromItem(stack.getItem())).getFluid(); - if (fluid != null) { - fluidStack = new FluidStack(fluid, Fluid.BUCKET_VOLUME); - } - } - return fluidStack; - } - return null; - } - - public static boolean areFluidsSameType(FluidStack fluidStack1, FluidStack fluidStack2) { - if (fluidStack1 == null || fluidStack2 == null) { - return false; - } - return fluidStack1.getFluid() == fluidStack2.getFluid(); - } -} diff --git a/src/main/java/forestry/factory/recipes/FermenterRecipe.java b/src/main/java/forestry/factory/recipes/FermenterRecipe.java index a39d458ea..60dfb8e50 100644 --- a/src/main/java/forestry/factory/recipes/FermenterRecipe.java +++ b/src/main/java/forestry/factory/recipes/FermenterRecipe.java @@ -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!"); diff --git a/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java b/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java index 74262a07f..03d432f7b 100644 --- a/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java +++ b/src/main/java/forestry/factory/recipes/jei/FactoryJeiPlugin.java @@ -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()); 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 08de4b87e..504bd527f 100644 --- a/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeCategory.java +++ b/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeCategory.java @@ -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 { 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 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()); } } diff --git a/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeMaker.java b/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeMaker.java index 30888cfe2..920d1bbce 100644 --- a/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeMaker.java +++ b/src/main/java/forestry/factory/recipes/jei/fermenter/FermenterRecipeMaker.java @@ -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 getFermenterRecipes() { + public static List getFermenterRecipes(IStackHelper stackHelper) { List 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; diff --git a/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java b/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java index 5481da891..5e1a4c857 100644 --- a/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java +++ b/src/main/java/forestry/plugins/compat/PluginBiomesOPlenty.java @@ -14,14 +14,18 @@ import java.util.ArrayList; import java.util.List; import net.minecraft.block.Block; +import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.event.FMLInterModComms; +import net.minecraftforge.fml.common.registry.ForgeRegistries; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import forestry.api.core.ForestryAPI; +import forestry.api.farming.Farmables; import forestry.api.recipes.RecipeManagers; import forestry.api.storage.BackpackManager; import forestry.core.PluginCore; @@ -31,6 +35,8 @@ import forestry.core.recipes.RecipeUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.Log; import forestry.core.utils.ModUtil; +import forestry.farming.logic.FarmableBasicAgricraft; +import forestry.farming.logic.FarmableGE; import forestry.plugins.BlankForestryPlugin; import forestry.plugins.ForestryPlugin; import forestry.plugins.ForestryPluginUids; @@ -43,8 +49,6 @@ public class PluginBiomesOPlenty extends BlankForestryPlugin { private static Block saplings; private static Block colorizedSaplings; private static Item food; - private static Item misc; - private static ItemStack persimmon; private static int amount; @Override @@ -61,12 +65,9 @@ public class PluginBiomesOPlenty extends BlankForestryPlugin { public void doInit() { super.doInit(); - saplings = GameRegistry.findBlock(BoP, "saplings"); - colorizedSaplings = GameRegistry.findBlock(BoP, "colorizedSaplings"); - food = GameRegistry.findItem(BoP, "food"); - if (food != null) { - persimmon = new ItemStack(food, 1, 8); - } + saplings = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(BoP, "saplings")); + colorizedSaplings = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(BoP, "colorizedSaplings")); + food = ForgeRegistries.ITEMS.getValue(new ResourceLocation(BoP, "food")); if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.APICULTURE)) { addFlowers(); @@ -98,21 +99,21 @@ public class PluginBiomesOPlenty extends BlankForestryPlugin { } for (String key : saplingItemKeys) { - Item saplingItem = GameRegistry.findItem(BoP, key); + Item saplingItem = ForgeRegistries.ITEMS.getValue(new ResourceLocation(BoP, key)); String saplingName = ItemStackUtil.getItemNameFromRegistryAsString(saplingItem); if (saplingName != null) { FMLInterModComms.sendMessage(Constants.MOD_ID, "add-farmable-sapling", String.format("farmArboreal@%s.-1", saplingName)); } } - - if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING) && saplings != null && persimmon != null) { - //TODO BoP for 1.9: Add farmables + + //TODO BoP for 1.9: Add farmables +// if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING) && saplings != null && persimmon != null) { // Farmables.farmables.put("farmArboreal", new FarmableGenericSapling(saplings, 15, persimmon)); - } +// } - Block boPTurnip = GameRegistry.findBlock(BoP, "turnip"); + Block boPTurnip = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(BoP, "turnip")); if (ForestryAPI.enabledPlugins.contains(ForestryPluginUids.FARMING) && boPTurnip != null) { - Item boPTurnipSeeds = GameRegistry.findItem(BoP, "turnipSeeds"); + Item boPTurnipSeeds = ForgeRegistries.ITEMS.getValue(new ResourceLocation(BoP, "turnipSeeds")); ItemStack boPTurnipSeedStack = new ItemStack(boPTurnipSeeds, 1, 0); if (boPTurnipSeeds != null) { //TODO BoP for 1.9: Add farmable saplings @@ -130,11 +131,11 @@ public class PluginBiomesOPlenty extends BlankForestryPlugin { private static void addFermenterRecipes() { int saplingYield = ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.sapling"); - if (saplings != null) { + if (saplings != Blocks.AIR) { RecipeUtil.addFermenterRecipes(new ItemStack(saplings, 1, OreDictionary.WILDCARD_VALUE), saplingYield, Fluids.BIOMASS); } - if (colorizedSaplings != null) { + if (colorizedSaplings != Blocks.AIR) { RecipeUtil.addFermenterRecipes(new ItemStack(colorizedSaplings, 1, OreDictionary.WILDCARD_VALUE), saplingYield, Fluids.BIOMASS); } } @@ -142,20 +143,18 @@ public class PluginBiomesOPlenty extends BlankForestryPlugin { private static void addSqueezerRecipes() { ItemStack mulch = new ItemStack(PluginCore.items.mulch); - misc = GameRegistry.findItem(BoP, "misc"); - if (misc != null) { - ItemStack pinecone = new ItemStack(misc, 1, 13); - if (pinecone != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{pinecone}, Fluids.SEED_OIL.getFluid(3 * amount)); - } + Item pinecone = ForgeRegistries.ITEMS.getValue(new ResourceLocation(BoP, "pinecone")); + if (pinecone != null) { + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(pinecone)}, Fluids.SEED_OIL.getFluid(3 * amount)); } if (food != null) { RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(food)}, Fluids.JUICE.getFluid(50), mulch, 5); } + Item persimmon = ForgeRegistries.ITEMS.getValue(new ResourceLocation(BoP, "persimmon")); if (persimmon != null) { - RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{persimmon}, Fluids.JUICE.getFluid(200), mulch, 20); + RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[]{new ItemStack(persimmon)}, Fluids.JUICE.getFluid(200), mulch, 20); } } @@ -234,7 +233,7 @@ public class PluginBiomesOPlenty extends BlankForestryPlugin { private static void addBlocksToBackpack(String backpackUid, String... blockNames) { for (String blockName : blockNames) { - Block block = GameRegistry.findBlock(BoP, blockName); + Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(BoP, blockName)); if (block != null) { ItemStack blockStack = new ItemStack(block, 1, OreDictionary.WILDCARD_VALUE); BackpackManager.backpackInterface.getBackpack(backpackUid).addValidItem(blockStack);