Fix #1712 1.11.2 Ferementer does not work when sappinessHigh

This commit is contained in:
Nedelosk committed 2017-06-23 20:23:38 +02:00
1 parent 2c6ed06574
commit d3c7280f3f
2 files changed
+10 -10

No files matched your search

@@ -36,7 +36,6 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.stats.AchievementList;
import net.minecraft.util.EnumHand;
import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
@@ -446,12 +445,8 @@ public class PluginArboriculture extends BlankForestryPlugin {
RecipeManagers.squeezerManager.addRecipe(10, EnumFruit.PLUM.getStack(), Fluids.JUICE.getFluid((int) Math.floor(juiceMultiplier * 0.5f)), mulch, mulchMultiplier * 3);
RecipeManagers.squeezerManager.addRecipe(10, EnumFruit.PAPAYA.getStack(), Fluids.JUICE.getFluid(juiceMultiplier * 3), mulch, (int) Math.floor(mulchMultiplier * 0.5f));
RecipeManagers.squeezerManager.addRecipe(10, EnumFruit.DATES.getStack(), Fluids.JUICE.getFluid((int) Math.floor(juiceMultiplier * 0.25)), mulch, mulchMultiplier);
NonNullList<ItemStack> saplings = NonNullList.create();
items.sapling.addCreativeItems(saplings, false);
for (ItemStack sapling : saplings) {
RecipeUtil.addFermenterRecipes(sapling, ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS);
}
RecipeUtil.addFermenterRecipes(new ItemStack(items.sapling, 1, OreDictionary.WILDCARD_VALUE), ForestryAPI.activeMode.getIntegerSetting("fermenter.yield.sapling"), Fluids.BIOMASS);
}
// Grafter
@@ -15,14 +15,16 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import forestry.api.recipes.IFermenterManager;
import forestry.api.recipes.IFermenterRecipe;
import forestry.core.utils.ItemStackUtil;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import forestry.api.recipes.IFermenterManager;
import forestry.api.recipes.IFermenterRecipe;
import forestry.core.utils.ItemStackUtil;
public class FermenterRecipeManager implements IFermenterManager {
private static final Set<IFermenterRecipe> recipes = new HashSet<>();
@@ -42,6 +44,9 @@ public class FermenterRecipeManager implements IFermenterManager {
@Nullable
public static IFermenterRecipe findMatchingRecipe(ItemStack res, FluidStack liqu) {
if(res.isEmpty()){
return null;
}
for (IFermenterRecipe recipe : recipes) {
if (matches(recipe, res, liqu)) {
return recipe;