diff --git a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java index e4dd0c61..35b2035f 100644 --- a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java +++ b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java @@ -19,6 +19,8 @@ import binnie.extratrees.machines.fruitpress.FruitPressRecipes; import forestry.api.recipes.ISqueezerRecipe; import forestry.api.recipes.RecipeManagers; import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; @@ -87,9 +89,9 @@ public class ModuleAlcohol implements IInitializable { } for (final Alcohol alcohol : Alcohol.values()) { for (final String fermentLiquid : alcohol.fermentationLiquid) { - final FluidStack fluid = Binnie.Liquid.getFluidStack(fermentLiquid, 5); + final FluidStack fluid = Binnie.Liquid.getFluidStack(fermentLiquid, Fluid.BUCKET_VOLUME); if (fluid != null) { - BreweryRecipes.addRecipe(fluid, alcohol.get(5)); + BreweryRecipes.addRecipe(fluid, alcohol.get(Fluid.BUCKET_VOLUME)); } } } diff --git a/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java index c31af4de..5a3a1a9d 100644 --- a/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/binnie/extratrees/integration/jei/brewery/BreweryRecipeCategory.java @@ -11,6 +11,10 @@ import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; + +import java.util.List; public class BreweryRecipeCategory extends BlankRecipeCategory { private final IDrawableAnimated arrowAnimated; @@ -41,29 +45,51 @@ public class BreweryRecipeCategory extends BlankRecipeCategory> inputs = ingredients.getInputs(ItemStack.class); + itemStacks.set(0, inputs.get(0)); + + itemStacks.set(1, inputs.get(1)); + itemStacks.set(2, inputs.get(1)); + itemStacks.set(3, inputs.get(1)); + + itemStacks.set(4, inputs.get(2)); } } diff --git a/src/main/java/binnie/extratrees/machines/brewery/BrewedGrainRecipe.java b/src/main/java/binnie/extratrees/machines/brewery/BrewedGrainRecipe.java index e45cbe0f..870df1b9 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BrewedGrainRecipe.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BrewedGrainRecipe.java @@ -5,6 +5,7 @@ import binnie.core.util.OreDictionaryUtil; import binnie.extratrees.alcohol.Alcohol; import binnie.extratrees.item.ExtraTreeItems; import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import javax.annotation.Nonnull; @@ -13,7 +14,7 @@ import java.util.Collections; import java.util.List; public class BrewedGrainRecipe implements IBreweryRecipe { - public static final FluidStack WATER = Binnie.Liquid.getFluidStack("water", 5); + public static final FluidStack WATER = Binnie.Liquid.getFluidStack("water", Fluid.BUCKET_VOLUME); private final FluidStack output; private final int grainOreId; @@ -30,7 +31,7 @@ public class BrewedGrainRecipe implements IBreweryRecipe { } public BrewedGrainRecipe(Alcohol output, int grainOreId, @Nullable Integer ingredientOreId, @Nullable ItemStack specificYeast) { - this.output = output.get(5); + this.output = output.get(Fluid.BUCKET_VOLUME); this.grainOreId = grainOreId; this.ingredientOreId = ingredientOreId; if (specificYeast != null) { diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java index e1e31aff..0e9c6d35 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryLogic.java @@ -8,6 +8,7 @@ import binnie.core.machines.power.IProcess; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.relauncher.Side; @@ -50,12 +51,15 @@ public class BreweryLogic extends ComponentProcessSetCost implements IProcess, I if (this.currentCrafting == null) { return new ErrorState("Brewery Empty", "No liquid in Brewery"); } - if (!this.getUtil().spaceInTank(BreweryMachine.TANK_OUTPUT, 1000)) { + if (!this.getUtil().spaceInTank(BreweryMachine.TANK_OUTPUT, Fluid.BUCKET_VOLUME)) { return new ErrorState.TankSpace("No Space for Fermented Liquid", BreweryMachine.TANK_OUTPUT); } FluidStack outputFluid = this.getUtil().getFluid(BreweryMachine.TANK_OUTPUT); - if (outputFluid != null && !outputFluid.isFluidEqual(BreweryRecipes.getOutput(this.currentCrafting))) { - return new ErrorState.TankSpace("Different fluid in tank", BreweryMachine.TANK_OUTPUT); + if (outputFluid != null) { + FluidStack craftingOutputFluid = BreweryRecipes.getOutput(this.currentCrafting); + if (!outputFluid.isFluidEqual(craftingOutputFluid)) { + return new ErrorState.TankSpace("Different fluid in tank", BreweryMachine.TANK_OUTPUT); + } } return super.canProgress(); } @@ -64,8 +68,6 @@ public class BreweryLogic extends ComponentProcessSetCost implements IProcess, I protected void onFinishTask() { FluidStack output = BreweryRecipes.getOutput(this.currentCrafting); if (output != null) { - output = output.copy(); - output.amount = 1000; this.getUtil().fillTank(BreweryMachine.TANK_OUTPUT, output); this.currentCrafting = null; } @@ -74,8 +76,8 @@ public class BreweryLogic extends ComponentProcessSetCost implements IProcess, I @Override public void onUpdate() { super.onUpdate(); - if (this.canWork() == null && this.currentCrafting == null && this.getUtil().getTank(BreweryMachine.TANK_INPUT).getFluidAmount() >= 1000) { - final FluidStack stack = this.getUtil().drainTank(BreweryMachine.TANK_INPUT, 1000); + if (this.canWork() == null && this.currentCrafting == null && this.getUtil().getTank(BreweryMachine.TANK_INPUT).getFluidAmount() >= Fluid.BUCKET_VOLUME) { + final FluidStack stack = this.getUtil().drainTank(BreweryMachine.TANK_INPUT, Fluid.BUCKET_VOLUME); this.currentCrafting = this.getInputCrafting(); this.currentCrafting.inputFluid = stack; this.getUtil().removeIngredients(new int[]{0, 1, 2, 3, 4}, BreweryMachine.SLOTS_INVENTORY); diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipe.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipe.java index 1e20b33a..7b35ec16 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipe.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipe.java @@ -34,7 +34,7 @@ public class BreweryRecipe implements IBreweryRecipe { return null; } if (this.input.isFluidEqual(crafting.inputFluid)) { - return this.output; + return this.output.copy(); } return null; } diff --git a/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipes.java b/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipes.java index 18aeb1ba..82facedf 100644 --- a/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipes.java +++ b/src/main/java/binnie/extratrees/machines/brewery/BreweryRecipes.java @@ -41,8 +41,9 @@ public class BreweryRecipes { public static FluidStack getOutput(final FluidStack stack) { final BreweryCrafting crafting = new BreweryCrafting(stack, null, null, null); for (final IBreweryRecipe recipe : recipes) { - if (recipe.getOutput(crafting) != null) { - return recipe.getOutput(crafting); + FluidStack output = recipe.getOutput(crafting); + if (output != null) { + return output; } } return null; @@ -52,8 +53,9 @@ public class BreweryRecipes { public static FluidStack getOutput(final BreweryCrafting crafting) { if (crafting.inputFluid != null && crafting.yeast != null) { for (final IBreweryRecipe recipe : recipes) { - if (recipe.getOutput(crafting) != null) { - return recipe.getOutput(crafting); + FluidStack output = recipe.getOutput(crafting); + if (output != null) { + return output; } } }