Create Distillery and Fruit Press Recipe Api

This commit is contained in:
Nedelosk committed 2017-08-03 21:10:23 +02:00
1 parent f7b1805e95
commit e6547caacc
51 files changed
+504 -202

No files matched your search

@@ -50,6 +50,8 @@ import binnie.extratrees.kitchen.ModuleKitchen;
import binnie.extratrees.machines.DummyManagers;
import binnie.extratrees.machines.ModuleMachine;
import binnie.extratrees.machines.brewery.recipes.BreweryRecipeManager;
import binnie.extratrees.machines.distillery.recipes.DistilleryRecipeManager;
import binnie.extratrees.machines.fruitpress.recipes.FruitPressRecipeManager;
import binnie.extratrees.machines.lumbermill.recipes.LumbermillRecipeManager;
import binnie.extratrees.proxy.Proxy;
@@ -151,12 +153,16 @@ public class ExtraTrees extends AbstractMod {
public void setupAPI() {
ExtraTreesRecipeManager.breweryManager = new BreweryRecipeManager();
ExtraTreesRecipeManager.lumbermillManager = new LumbermillRecipeManager();
ExtraTreesRecipeManager.fruitPressManager = new FruitPressRecipeManager();
ExtraTreesRecipeManager.distilleryManager = new DistilleryRecipeManager();
}
@Override
public void disabledSetupAPI() {
ExtraTreesRecipeManager.breweryManager = new DummyManagers.DummyBreweryManager();
ExtraTreesRecipeManager.lumbermillManager = new DummyManagers.DummyLumbermillManager();
ExtraTreesRecipeManager.fruitPressManager = new DummyManagers.DummyFruitPressManager();
ExtraTreesRecipeManager.distilleryManager = new DummyManagers.DummyDistilleryManager();
}
@Override
@@ -27,11 +27,11 @@ import binnie.extratrees.alcohol.drink.DrinkManager;
import binnie.extratrees.alcohol.drink.ItemDrink;
import binnie.extratrees.api.recipes.ExtraTreesRecipeManager;
import binnie.extratrees.api.recipes.IBreweryManager;
import binnie.extratrees.api.recipes.IDistilleryManager;
import binnie.extratrees.api.recipes.IFruitPressManager;
import binnie.extratrees.item.ExtraTreeItems;
import binnie.extratrees.item.Food;
import binnie.extratrees.machines.distillery.DistilleryLogic;
import binnie.extratrees.machines.distillery.DistilleryRecipes;
import binnie.extratrees.machines.fruitpress.FruitPressRecipes;
public class ModuleAlcohol implements IInitializable {
public ItemDrink drink;
@@ -72,6 +72,7 @@ public class ModuleAlcohol implements IInitializable {
@Override
public void postInit() {
IBreweryManager breweryManager = ExtraTreesRecipeManager.breweryManager;
IFruitPressManager fruitPressManager = ExtraTreesRecipeManager.fruitPressManager;
ItemStack wax = Mods.Forestry.stack("beeswax");
ItemStack waxCast = Mods.Forestry.stackWildcard("wax_cast");
for (Glassware glassware : Glassware.values()) {
@@ -99,7 +100,7 @@ public class ModuleAlcohol implements IInitializable {
if (Objects.equals(output.getFluid().getName(), "seedoil")) {
amount *= 2;
}
FruitPressRecipes.addRecipe(stack, juice.get(amount));
fruitPressManager.addRecipe(stack, juice.get(amount));
}
}
}
@@ -156,13 +157,15 @@ public class ModuleAlcohol implements IInitializable {
final int outAmount2 = inAmount * 2 / 5;
final int outAmount3 = inAmount / 5;
DistilleryRecipes.addRecipe(source.get(inAmount), singleDistilled.get(outAmount1), 0);
DistilleryRecipes.addRecipe(source.get(inAmount), doubleDistilled.get(outAmount2), 1);
DistilleryRecipes.addRecipe(source.get(inAmount), tripleDistilled.get(outAmount3), 2);
IDistilleryManager distilleryManager = ExtraTreesRecipeManager.distilleryManager;
DistilleryRecipes.addRecipe(singleDistilled.get(inAmount), doubleDistilled.get(outAmount2), 0);
DistilleryRecipes.addRecipe(singleDistilled.get(inAmount), tripleDistilled.get(outAmount3), 1);
distilleryManager.addRecipe(source.get(inAmount), singleDistilled.get(outAmount1), 0);
distilleryManager.addRecipe(source.get(inAmount), doubleDistilled.get(outAmount2), 1);
distilleryManager.addRecipe(source.get(inAmount), tripleDistilled.get(outAmount3), 2);
DistilleryRecipes.addRecipe(doubleDistilled.get(inAmount), tripleDistilled.get(outAmount2), 0);
distilleryManager.addRecipe(singleDistilled.get(inAmount), doubleDistilled.get(outAmount2), 0);
distilleryManager.addRecipe(singleDistilled.get(inAmount), tripleDistilled.get(outAmount3), 1);
distilleryManager.addRecipe(doubleDistilled.get(inAmount), tripleDistilled.get(outAmount2), 0);
}
}
@@ -8,4 +8,8 @@ public class ExtraTreesRecipeManager {
public static IBreweryManager breweryManager;
@Nullable
public static ILumbermillManager lumbermillManager;
@Nullable
public static IFruitPressManager fruitPressManager;
@Nullable
public static IDistilleryManager distilleryManager;
}
@@ -0,0 +1,14 @@
package binnie.extratrees.api.recipes;
import java.util.Collection;
import net.minecraftforge.fluids.FluidStack;
import binnie.core.api.ICraftingManager;
public interface IDistilleryManager extends ICraftingManager<IDistilleryRecipe> {
void addRecipe(FluidStack input, FluidStack output, int level);
Collection<IDistilleryRecipe> recipes(int level);
}
@@ -0,0 +1,14 @@
package binnie.extratrees.api.recipes;
import net.minecraftforge.fluids.FluidStack;
import binnie.core.api.IBinnieRecipe;
public interface IDistilleryRecipe extends IBinnieRecipe {
FluidStack getInput();
FluidStack getOutput();
int getLevel();
}
@@ -0,0 +1,12 @@
package binnie.extratrees.api.recipes;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import binnie.core.api.ICraftingManager;
public interface IFruitPressManager extends ICraftingManager<IFruitPressRecipe> {
void addRecipe(ItemStack input, FluidStack output);
}
@@ -0,0 +1,14 @@
package binnie.extratrees.api.recipes;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import binnie.core.api.IBinnieRecipe;
public interface IFruitPressRecipe extends IBinnieRecipe {
ItemStack getInput();
FluidStack getOutput();
}
@@ -1,7 +1,7 @@
@ParametersAreNonnullByDefault
@FieldsAreNonnullByDefault
@MethodsReturnNonnullByDefault
package binnie.extratrees.integration.jei.distillery.brewery;
package binnie.extratrees.api.recipes;
import javax.annotation.ParametersAreNonnullByDefault;
@@ -15,9 +15,9 @@ import binnie.extratrees.gui.database.WindowArboristDatabase;
import binnie.extratrees.gui.database.WindowLepidopteristDatabase;
import binnie.extratrees.kitchen.craftgui.WindowBottleRack;
import binnie.extratrees.machines.brewery.window.WindowBrewery;
import binnie.extratrees.machines.designer.WindowDesigner;
import binnie.extratrees.machines.distillery.WindowDistillery;
import binnie.extratrees.machines.fruitpress.WindowPress;
import binnie.extratrees.machines.designer.window.WindowDesigner;
import binnie.extratrees.machines.distillery.window.WindowDistillery;
import binnie.extratrees.machines.fruitpress.window.WindowPress;
import binnie.extratrees.machines.lumbermill.window.WindowLumbermill;
public enum ExtraTreesGUID implements IBinnieGUID {
@@ -13,8 +13,8 @@ import binnie.extratrees.block.decor.FenceDescription;
import binnie.extratrees.block.decor.FenceType;
import binnie.extratrees.integration.jei.brewery.BreweryRecipeCategory;
import binnie.extratrees.integration.jei.brewery.BreweryRecipeMaker;
import binnie.extratrees.integration.jei.distillery.brewery.DistilleryRecipeCategory;
import binnie.extratrees.integration.jei.distillery.brewery.DistilleryRecipeMaker;
import binnie.extratrees.integration.jei.distillery.DistilleryRecipeCategory;
import binnie.extratrees.integration.jei.distillery.DistilleryRecipeMaker;
import binnie.extratrees.integration.jei.fruitpress.FruitPressRecipeCategory;
import binnie.extratrees.integration.jei.fruitpress.FruitPressRecipeMaker;
import binnie.extratrees.integration.jei.lumbermill.LumbermillRecipeCategory;
@@ -1,4 +1,4 @@
package binnie.extratrees.integration.jei.distillery.brewery;
package binnie.extratrees.integration.jei.distillery;
import net.minecraft.client.Minecraft;
@@ -0,0 +1,29 @@
package binnie.extratrees.integration.jei.distillery;
import java.util.ArrayList;
import java.util.List;
import net.minecraftforge.fluids.FluidStack;
import binnie.extratrees.api.recipes.ExtraTreesRecipeManager;
import binnie.extratrees.api.recipes.IDistilleryRecipe;
public class DistilleryRecipeMaker {
public static List<DistilleryRecipeWrapper> create() {
List<DistilleryRecipeWrapper> recipes = new ArrayList<>();
if(ExtraTreesRecipeManager.distilleryManager == null){
return recipes;
}
for (int level = 0; level < 3; level++) {
for (IDistilleryRecipe recipe : ExtraTreesRecipeManager.distilleryManager.recipes(level)) {
FluidStack input = recipe.getInput();
FluidStack output = recipe.getOutput();
recipes.add(new DistilleryRecipeWrapper(level, input, output));
}
}
return recipes;
}
}
@@ -1,4 +1,4 @@
package binnie.extratrees.integration.jei.distillery.brewery;
package binnie.extratrees.integration.jei.distillery;
import net.minecraft.client.Minecraft;
@@ -9,7 +9,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import binnie.core.gui.CraftGUI;
import binnie.core.gui.geometry.Point;
import binnie.extratrees.machines.distillery.ControlDistilleryProgress;
import binnie.extratrees.machines.distillery.window.ControlDistilleryProgress;
import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.BlankRecipeWrapper;
@@ -1,26 +0,0 @@
package binnie.extratrees.integration.jei.distillery.brewery;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair;
import net.minecraftforge.fluids.FluidStack;
import binnie.extratrees.machines.distillery.DistilleryRecipes;
public class DistilleryRecipeMaker {
public static List<DistilleryRecipeWrapper> create() {
List<DistilleryRecipeWrapper> recipes = new ArrayList<>();
for (int level = 0; level < 3; level++) {
for (Pair<FluidStack, FluidStack> entry : DistilleryRecipes.getRecipes(level)) {
FluidStack input = entry.getKey();
FluidStack output = entry.getValue();
recipes.add(new DistilleryRecipeWrapper(level, input, output));
}
}
return recipes;
}
}
@@ -0,0 +1,9 @@
@ParametersAreNonnullByDefault
@FieldsAreNonnullByDefault
@MethodsReturnNonnullByDefault
package binnie.extratrees.integration.jei.distillery;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -4,22 +4,25 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import binnie.extratrees.machines.fruitpress.FruitPressRecipes;
import binnie.extratrees.api.recipes.ExtraTreesRecipeManager;
import binnie.extratrees.api.recipes.IFruitPressRecipe;
public class FruitPressRecipeMaker {
public static List<FruitPressRecipeWrapper> create() {
List<FruitPressRecipeWrapper> recipes = new ArrayList<>();
Collection<Pair<ItemStack, FluidStack>> recipePairs = FruitPressRecipes.getRecipes();
for (Pair<ItemStack, FluidStack> recipePair : recipePairs) {
ItemStack fruit = recipePair.getKey();
FluidStack juice = recipePair.getValue();
if(ExtraTreesRecipeManager.fruitPressManager == null){
return recipes;
}
Collection<IFruitPressRecipe> fruitPressRecipes = ExtraTreesRecipeManager.fruitPressManager.recipes();
for (IFruitPressRecipe recipe : fruitPressRecipes) {
ItemStack fruit = recipe.getInput();
FluidStack juice = recipe.getOutput();
recipes.add(new FruitPressRecipeWrapper(fruit, juice));
}
@@ -13,6 +13,10 @@ import binnie.core.api.IBinnieRecipe;
import binnie.core.api.ICraftingManager;
import binnie.extratrees.api.recipes.IBreweryManager;
import binnie.extratrees.api.recipes.IBreweryRecipe;
import binnie.extratrees.api.recipes.IDistilleryManager;
import binnie.extratrees.api.recipes.IDistilleryRecipe;
import binnie.extratrees.api.recipes.IFruitPressManager;
import binnie.extratrees.api.recipes.IFruitPressRecipe;
import binnie.extratrees.api.recipes.ILumbermillManager;
import binnie.extratrees.api.recipes.ILumbermillRecipe;
@@ -63,4 +67,22 @@ public class DummyManagers {
}
}
public static class DummyFruitPressManager extends DummyCraftingManager<IFruitPressRecipe> implements IFruitPressManager {
@Override
public void addRecipe(ItemStack input, FluidStack output) {
}
}
public static class DummyDistilleryManager extends DummyCraftingManager<IDistilleryRecipe> implements IDistilleryManager {
@Override
public void addRecipe(FluidStack input, FluidStack output, int level) {
}
@Override
public Set<IDistilleryRecipe> recipes(int level) {
return ImmutableSet.of();
}
}
}
@@ -0,0 +1,9 @@
@ParametersAreNonnullByDefault
@FieldsAreNonnullByDefault
@MethodsReturnNonnullByDefault
package binnie.extratrees.machines.brewery.recipes;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -0,0 +1,9 @@
@ParametersAreNonnullByDefault
@FieldsAreNonnullByDefault
@MethodsReturnNonnullByDefault
package binnie.extratrees.machines.brewery.window;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -5,6 +5,9 @@ import binnie.core.machines.Machine;
import binnie.core.machines.inventory.ComponentInventorySlots;
import binnie.extratrees.core.ExtraTreesGUID;
import binnie.extratrees.machines.ExtraTreeMachine;
import binnie.extratrees.machines.designer.window.ComponentDesignerRecipe;
import binnie.extratrees.machines.designer.window.SlotValidatorBeeswax;
import binnie.extratrees.machines.designer.window.SlotValidatorPlanks;
public abstract class PackageDesigner extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation {
DesignerType type;
@@ -1,4 +1,4 @@
package binnie.extratrees.machines.designer;
package binnie.extratrees.machines.designer.window;
import javax.annotation.Nullable;
import java.util.Map;
@@ -20,6 +20,8 @@ import binnie.extratrees.api.IDesign;
import binnie.extratrees.api.IDesignMaterial;
import binnie.extratrees.carpentry.EnumDesign;
import binnie.extratrees.machines.ExtraTreesErrorCode;
import binnie.extratrees.machines.designer.Designer;
import binnie.extratrees.machines.designer.DesignerType;
public class ComponentDesignerRecipe extends ComponentRecipe implements IComponentRecipe, INetwork.GuiNBT, IErrorStateSource {
public DesignerType type;
@@ -1,4 +1,4 @@
package binnie.extratrees.machines.designer;
package binnie.extratrees.machines.designer.window;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -1,4 +1,4 @@
package binnie.extratrees.machines.designer;
package binnie.extratrees.machines.designer.window;
import java.util.ArrayList;
import java.util.HashMap;
@@ -1,9 +1,10 @@
package binnie.extratrees.machines.designer;
package binnie.extratrees.machines.designer.window;
import net.minecraft.item.ItemStack;
import binnie.core.machines.inventory.SlotValidator;
import binnie.extratrees.machines.ModuleMachine;
import binnie.extratrees.machines.designer.DesignerType;
public class SlotValidatorBeeswax extends SlotValidator {
DesignerType type;
@@ -1,9 +1,10 @@
package binnie.extratrees.machines.designer;
package binnie.extratrees.machines.designer.window;
import net.minecraft.item.ItemStack;
import binnie.core.machines.inventory.SlotValidator;
import binnie.extratrees.api.IDesignMaterial;
import binnie.extratrees.machines.designer.DesignerType;
public class SlotValidatorPlanks extends SlotValidator {
DesignerType type;
@@ -1,4 +1,4 @@
package binnie.extratrees.machines.designer;
package binnie.extratrees.machines.designer.window;
import javax.annotation.Nullable;
@@ -26,6 +26,8 @@ import binnie.core.gui.window.Panel;
import binnie.core.machines.Machine;
import binnie.core.util.I18N;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.machines.designer.Designer;
import binnie.extratrees.machines.designer.DesignerType;
public class WindowDesigner extends Window {
ControlTextEdit textEdit;
@@ -0,0 +1,9 @@
@ParametersAreNonnullByDefault
@FieldsAreNonnullByDefault
@MethodsReturnNonnullByDefault
package binnie.extratrees.machines.designer.window;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -17,6 +17,7 @@ import binnie.core.machines.power.ComponentProcessSetCost;
import binnie.core.machines.power.IProcess;
import binnie.core.util.I18N;
import binnie.extratrees.machines.ExtraTreesErrorCode;
import binnie.extratrees.machines.distillery.recipes.DistilleryRecipeManager;
public class DistilleryLogic extends ComponentProcessSetCost implements IProcess, INetwork.SendGuiNBT, INetwork.ReceiveGuiNBT {
public static final int INPUT_FLUID_AMOUNT = Fluid.BUCKET_VOLUME;
@@ -82,7 +83,7 @@ public class DistilleryLogic extends ComponentProcessSetCost implements IProcess
FluidStack fluidInOutputTank = this.getUtil().getFluid(DistilleryMachine.TANK_OUTPUT);
if (fluidInOutputTank != null) {
FluidStack inputFluid = this.getUtil().getFluid(DistilleryMachine.TANK_INPUT);
FluidStack recipeOutput = DistilleryRecipes.getOutput(inputFluid, this.level);
FluidStack recipeOutput = DistilleryRecipeManager.getOutput(inputFluid, this.level);
if (recipeOutput != null && !recipeOutput.isFluidEqual(fluidInOutputTank)) {
return new ErrorState(CoreErrorCode.TANK_DIFFRENT_FLUID, DistilleryMachine.TANK_OUTPUT);
}
@@ -93,7 +94,7 @@ public class DistilleryLogic extends ComponentProcessSetCost implements IProcess
@Override
protected void onFinishTask() {
final FluidStack output = DistilleryRecipes.getOutput(this.currentFluid, this.level);
final FluidStack output = DistilleryRecipeManager.getOutput(this.currentFluid, this.level);
if (output != null) {
this.getUtil().fillTank(DistilleryMachine.TANK_OUTPUT, output);
}
@@ -150,7 +151,7 @@ public class DistilleryLogic extends ComponentProcessSetCost implements IProcess
if (this.currentFluid == null) {
return I18N.localise("extratrees.machine.machine.distillery.tooltips.empty");
}
FluidStack output = DistilleryRecipes.getOutput(this.currentFluid, this.level);
FluidStack output = DistilleryRecipeManager.getOutput(this.currentFluid, this.level);
if (output == null) {
return I18N.localise("extratrees.machine.machine.distillery.tooltips.empty");
}
@@ -13,6 +13,8 @@ import binnie.core.machines.power.ComponentPowerReceptor;
import binnie.extratrees.core.ExtraTreeTexture;
import binnie.extratrees.core.ExtraTreesGUID;
import binnie.extratrees.machines.ExtraTreeMachine;
import binnie.extratrees.machines.distillery.window.TankValidatorDistilleryInput;
import binnie.extratrees.machines.distillery.window.TankValidatorDistilleryOutput;
public class DistilleryMachine extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation {
public static final int TANK_INPUT = 0;
@@ -1,70 +0,0 @@
package binnie.extratrees.machines.distillery;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.tuple.Pair;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
public class DistilleryRecipes {
private static final int LEVELS = 3;
private static final List<Map<Fluid, Pair<FluidStack, FluidStack>>> recipes = new ArrayList<>();
static {
for(int i = 0;i < LEVELS;i++) {
recipes.add(new HashMap<>());
}
}
@Nullable
public static FluidStack getOutput(@Nullable final FluidStack fluid, final int level) {
if (fluid != null) {
Map<Fluid, Pair<FluidStack, FluidStack>> recipesForLevel = recipes.get(level);
Pair<FluidStack, FluidStack> recipe = recipesForLevel.get(fluid.getFluid());
if (recipe != null) {
return recipe.getValue().copy();
}
}
return null;
}
public static boolean isValidInputLiquid(final FluidStack fluid) {
for (int i = 0; i < LEVELS; ++i) {
Map<Fluid, Pair<FluidStack, FluidStack>> recipesForLevel = recipes.get(i);
Pair<FluidStack, FluidStack> recipe = recipesForLevel.get(fluid.getFluid());
if (recipe.getKey().isFluidEqual(fluid)) {
return true;
}
}
return false;
}
public static boolean isValidOutputLiquid(final FluidStack fluid) {
for (int i = 0; i < LEVELS; ++i) {
Map<Fluid, Pair<FluidStack, FluidStack>> recipesForLevel = recipes.get(i);
for (final Pair<FluidStack, FluidStack> recipe : recipesForLevel.values()) {
if (recipe.getValue().isFluidEqual(fluid)) {
return true;
}
}
}
return false;
}
public static void addRecipe(final FluidStack input, final FluidStack output, final int level) {
Map<Fluid, Pair<FluidStack, FluidStack>> recipesForLevel = recipes.get(level);
recipesForLevel.put(input.getFluid(), Pair.of(input, output));
}
public static Collection<Pair<FluidStack, FluidStack>> getRecipes(int level) {
Map<Fluid, Pair<FluidStack, FluidStack>> recipesForLevel = recipes.get(level);
return Collections.unmodifiableCollection(recipesForLevel.values());
}
}
@@ -0,0 +1,32 @@
package binnie.extratrees.machines.distillery.recipes;
import net.minecraftforge.fluids.FluidStack;
import binnie.extratrees.api.recipes.IDistilleryRecipe;
public class DistilleryRecipe implements IDistilleryRecipe {
private final FluidStack input;
private final FluidStack output;
private final int level;
public DistilleryRecipe(FluidStack input, FluidStack output, int level) {
this.input = input;
this.output = output;
this.level = level;
}
@Override
public FluidStack getOutput() {
return output;
}
@Override
public FluidStack getInput() {
return input;
}
@Override
public int getLevel() {
return level;
}
}
@@ -0,0 +1,91 @@
package binnie.extratrees.machines.distillery.recipes;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import binnie.extratrees.api.recipes.IDistilleryManager;
import binnie.extratrees.api.recipes.IDistilleryRecipe;
public class DistilleryRecipeManager implements IDistilleryManager {
private static final int LEVELS = 3;
private static final List<Map<Fluid, IDistilleryRecipe>> recipes = new ArrayList<>();
private static final List<IDistilleryRecipe> recipeList = new ArrayList<>();
static {
for(int i = 0;i < LEVELS;i++) {
recipes.add(new HashMap<>());
}
}
@Nullable
public static FluidStack getOutput(@Nullable final FluidStack fluid, final int level) {
if (fluid != null) {
Map<Fluid, IDistilleryRecipe> recipesForLevel = recipes.get(level);
IDistilleryRecipe recipe = recipesForLevel.get(fluid.getFluid());
if (recipe != null) {
return recipe.getOutput().copy();
}
}
return null;
}
public static boolean isValidInputLiquid(final FluidStack fluid) {
for (int i = 0; i < LEVELS; ++i) {
Map<Fluid, IDistilleryRecipe> recipesForLevel = recipes.get(i);
IDistilleryRecipe recipe = recipesForLevel.get(fluid.getFluid());
if (recipe.getInput().isFluidEqual(fluid)) {
return true;
}
}
return false;
}
public static boolean isValidOutputLiquid(final FluidStack fluid) {
for (int i = 0; i < LEVELS; ++i) {
Map<Fluid, IDistilleryRecipe> recipesForLevel = recipes.get(i);
for (IDistilleryRecipe recipe : recipesForLevel.values()) {
if (recipe.getOutput().isFluidEqual(fluid)) {
return true;
}
}
}
return false;
}
@Override
public boolean addRecipe(IDistilleryRecipe recipe) {
Fluid input = recipe.getInput().getFluid();
recipes.get(recipe.getLevel()).put(input, recipe);
recipeList.add(recipe);
return true;
}
@Override
public boolean removeRecipe(IDistilleryRecipe recipe) {
Fluid input = recipe.getInput().getFluid();
recipes.get(recipe.getLevel()).remove(input, recipe.getOutput());
return recipeList.remove(recipe);
}
public void addRecipe(FluidStack input, FluidStack output, int level) {
addRecipe(new DistilleryRecipe(input, output, level));
}
public Collection<IDistilleryRecipe> recipes(int level) {
Map<Fluid, IDistilleryRecipe> recipesForLevel = recipes.get(level);
return Collections.unmodifiableCollection(recipesForLevel.values());
}
@Override
public Collection<IDistilleryRecipe> recipes() {
return recipeList;
}
}
@@ -0,0 +1,9 @@
@ParametersAreNonnullByDefault
@FieldsAreNonnullByDefault
@MethodsReturnNonnullByDefault
package binnie.extratrees.machines.distillery.recipes;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,4 +1,4 @@
package binnie.extratrees.machines.distillery;
package binnie.extratrees.machines.distillery.window;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.nbt.NBTTagCompound;
@@ -21,6 +21,7 @@ import binnie.core.gui.resource.Texture;
import binnie.core.gui.resource.minecraft.StandardTexture;
import binnie.core.machines.Machine;
import binnie.extratrees.core.ExtraTreeTexture;
import binnie.extratrees.machines.distillery.DistilleryLogic;
public class ControlDistilleryProgress extends ControlProgressBase {
public static final Texture DISTILLERY_BASE = new StandardTexture(43, 0, 58, 66, ExtraTreeTexture.GUI);
@@ -1,14 +1,15 @@
package binnie.extratrees.machines.distillery;
package binnie.extratrees.machines.distillery.window;
import net.minecraftforge.fluids.FluidStack;
import binnie.core.machines.inventory.TankValidator;
import binnie.core.util.I18N;
import binnie.extratrees.machines.distillery.recipes.DistilleryRecipeManager;
public class TankValidatorDistilleryInput extends TankValidator {
@Override
public boolean isValid(final FluidStack itemStack) {
return DistilleryRecipes.isValidInputLiquid(itemStack);
return DistilleryRecipeManager.isValidInputLiquid(itemStack);
}
@Override
@@ -1,14 +1,15 @@
package binnie.extratrees.machines.distillery;
package binnie.extratrees.machines.distillery.window;
import net.minecraftforge.fluids.FluidStack;
import binnie.core.machines.inventory.TankValidator;
import binnie.core.util.I18N;
import binnie.extratrees.machines.distillery.recipes.DistilleryRecipeManager;
public class TankValidatorDistilleryOutput extends TankValidator {
@Override
public boolean isValid(final FluidStack itemStack) {
return DistilleryRecipes.isValidOutputLiquid(itemStack);
return DistilleryRecipeManager.isValidOutputLiquid(itemStack);
}
@Override
@@ -1,4 +1,4 @@
package binnie.extratrees.machines.distillery;
package binnie.extratrees.machines.distillery.window;
import javax.annotation.Nullable;
@@ -17,6 +17,8 @@ import binnie.core.gui.minecraft.control.ControlLiquidTank;
import binnie.core.gui.minecraft.control.ControlPlayerInventory;
import binnie.core.machines.Machine;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.machines.distillery.DistilleryLogic;
import binnie.extratrees.machines.distillery.DistilleryMachine;
public class WindowDistillery extends Window {
public WindowDistillery(final EntityPlayer player, final IInventory inventory, final Side side) {
@@ -0,0 +1,9 @@
@ParametersAreNonnullByDefault
@FieldsAreNonnullByDefault
@MethodsReturnNonnullByDefault
package binnie.extratrees.machines.distillery.window;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -8,6 +8,7 @@ import binnie.core.machines.errors.ErrorState;
import binnie.core.machines.power.ComponentProcessSetCost;
import binnie.core.machines.power.IProcess;
import binnie.extratrees.machines.ExtraTreesErrorCode;
import binnie.extratrees.machines.fruitpress.recipes.FruitPressRecipeManager;
public class FruitPressLogic extends ComponentProcessSetCost implements IProcess {
public static final int PROCESS_ENERGY = 1000;
@@ -34,7 +35,7 @@ public class FruitPressLogic extends ComponentProcessSetCost implements IProcess
return new ErrorState(CoreErrorCode.NO_SPACE_TANK, FruitPressMachine.TANK_OUTPUT);
}
FluidStack fluidOutputTank = this.getUtil().getFluid(FruitPressMachine.TANK_OUTPUT);
FluidStack recipeOutput = FruitPressRecipes.getOutput(this.getUtil().getStack(FruitPressMachine.SLOT_CURRENT));
FluidStack recipeOutput = FruitPressRecipeManager.getOutput(this.getUtil().getStack(FruitPressMachine.SLOT_CURRENT));
if (fluidOutputTank != null && !fluidOutputTank.isFluidEqual(recipeOutput)) {
return new ErrorState(CoreErrorCode.TANK_DIFFRENT_FLUID, FruitPressMachine.TANK_OUTPUT);
}
@@ -53,7 +54,7 @@ public class FruitPressLogic extends ComponentProcessSetCost implements IProcess
@Override
public void onUpdate() {
super.onUpdate();
final FluidStack output = FruitPressRecipes.getOutput(this.getUtil().getStack(FruitPressMachine.SLOT_CURRENT));
final FluidStack output = FruitPressRecipeManager.getOutput(this.getUtil().getStack(FruitPressMachine.SLOT_CURRENT));
if (output == null) {
return;
}
@@ -13,6 +13,7 @@ import binnie.core.machines.power.ComponentPowerReceptor;
import binnie.extratrees.core.ExtraTreeTexture;
import binnie.extratrees.core.ExtraTreesGUID;
import binnie.extratrees.machines.ExtraTreeMachine;
import binnie.extratrees.machines.fruitpress.window.SlotValidatorSqueezable;
public class FruitPressMachine extends ExtraTreeMachine.PackageExtraTreeMachine implements IMachineInformation {
public static final int SLOT_FRUIT = 0;
@@ -1,51 +0,0 @@
package binnie.extratrees.machines.fruitpress;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
import javax.annotation.Nullable;
import java.util.Collection;
import java.util.Map;
import org.apache.commons.lang3.tuple.Pair;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
public class FruitPressRecipes {
//Map<input fruit item, Pair<input fruit, output fluid>>
private static Multimap<Item, Pair<ItemStack, FluidStack>> pressRecipes = ArrayListMultimap.create();
public static boolean isInput(final ItemStack itemstack) {
return getOutput(itemstack) != null;
}
@Nullable
public static FluidStack getOutput(final ItemStack itemstack) {
if (itemstack.isEmpty()) {
return null;
}
Item item = itemstack.getItem();
for (final Map.Entry<ItemStack, FluidStack> entry : FruitPressRecipes.pressRecipes.get(item)) {
if (itemstack.isItemEqual(entry.getKey())) {
return entry.getValue();
}
}
return null;
}
public static void addRecipe(final ItemStack stack, final FluidStack fluid) {
if (getOutput(stack) != null) {
return;
}
Item item = stack.getItem();
FruitPressRecipes.pressRecipes.put(item, Pair.of(stack, fluid));
}
public static Collection<Pair<ItemStack, FluidStack>> getRecipes() {
return pressRecipes.values();
}
}
@@ -0,0 +1,27 @@
package binnie.extratrees.machines.fruitpress.recipes;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import binnie.extratrees.api.recipes.IFruitPressRecipe;
public class FruitPressRecipe implements IFruitPressRecipe{
private final ItemStack input;
private final FluidStack output;
public FruitPressRecipe(ItemStack input, FluidStack output) {
this.input = input;
this.output = output;
}
@Override
public FluidStack getOutput() {
return output;
}
@Override
public ItemStack getInput() {
return input;
}
}
@@ -0,0 +1,64 @@
package binnie.extratrees.machines.fruitpress.recipes;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
import javax.annotation.Nullable;
import java.util.Collection;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import binnie.extratrees.api.recipes.IFruitPressManager;
import binnie.extratrees.api.recipes.IFruitPressRecipe;
public class FruitPressRecipeManager implements IFruitPressManager {
//Map<input fruit item, Pair<input fruit, output fluid>>
private static Multimap<Item, IFruitPressRecipe> recipes = ArrayListMultimap.create();
public static boolean isInput(final ItemStack itemstack) {
return getOutput(itemstack) != null;
}
@Nullable
public static FluidStack getOutput(final ItemStack itemstack) {
if (itemstack.isEmpty()) {
return null;
}
Item item = itemstack.getItem();
for (IFruitPressRecipe recipe : FruitPressRecipeManager.recipes.get(item)) {
if (itemstack.isItemEqual(recipe.getInput())) {
return recipe.getOutput();
}
}
return null;
}
public void addRecipe(final ItemStack stack, final FluidStack fluid) {
if (getOutput(stack) != null) {
return;
}
Item item = stack.getItem();
FruitPressRecipeManager.recipes.put(item, new FruitPressRecipe(stack, fluid));
}
@Override
public boolean addRecipe(IFruitPressRecipe recipe) {
Item item = recipe.getInput().getItem();
return recipes.put(item, recipe);
}
@Override
public boolean removeRecipe(IFruitPressRecipe recipe) {
Item item = recipe.getInput().getItem();
return recipes.get(item).remove(recipe);
}
@Override
public Collection<IFruitPressRecipe> recipes() {
return recipes.values();
}
}
@@ -0,0 +1,9 @@
@ParametersAreNonnullByDefault
@FieldsAreNonnullByDefault
@MethodsReturnNonnullByDefault
package binnie.extratrees.machines.fruitpress.recipes;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -1,4 +1,4 @@
package binnie.extratrees.machines.fruitpress;
package binnie.extratrees.machines.fruitpress.window;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.inventory.IInventory;
@@ -23,6 +23,8 @@ import binnie.core.gui.renderer.RenderUtil;
import binnie.core.gui.resource.Texture;
import binnie.core.gui.resource.minecraft.StandardTexture;
import binnie.extratrees.core.ExtraTreeTexture;
import binnie.extratrees.machines.fruitpress.FruitPressMachine;
import binnie.extratrees.machines.fruitpress.recipes.FruitPressRecipeManager;
public class ControlFruitPressProgress extends ControlProgressBase {
private static final Texture PressTexture = new StandardTexture(6, 0, 24, 52, ExtraTreeTexture.GUI);
@@ -56,10 +58,10 @@ public class ControlFruitPressProgress extends ControlProgressBase {
return;
}
final ItemStack input = slotFromInventory.getStack();
if (input.isEmpty() || FruitPressRecipes.getOutput(input) == null) {
if (input.isEmpty() || FruitPressRecipeManager.getOutput(input) == null) {
return;
}
FluidStack fluid = FruitPressRecipes.getOutput(input);
FluidStack fluid = FruitPressRecipeManager.getOutput(input);
RenderUtil.drawFluid(new Point(4, 52), fluid);
RenderUtil.drawItem(new Point(4, 52), input);
}
@@ -1,9 +1,10 @@
package binnie.extratrees.machines.fruitpress;
package binnie.extratrees.machines.fruitpress.window;
import net.minecraft.item.ItemStack;
import binnie.core.machines.inventory.SlotValidator;
import binnie.core.util.I18N;
import binnie.extratrees.machines.fruitpress.recipes.FruitPressRecipeManager;
public class SlotValidatorSqueezable extends SlotValidator {
public SlotValidatorSqueezable() {
@@ -12,7 +13,7 @@ public class SlotValidatorSqueezable extends SlotValidator {
@Override
public boolean isValid(final ItemStack itemStack) {
return FruitPressRecipes.isInput(itemStack);
return FruitPressRecipeManager.isInput(itemStack);
}
@Override
@@ -1,4 +1,4 @@
package binnie.extratrees.machines.fruitpress;
package binnie.extratrees.machines.fruitpress.window;
import javax.annotation.Nullable;
@@ -20,6 +20,8 @@ import binnie.core.gui.minecraft.control.ControlPlayerInventory;
import binnie.core.gui.minecraft.control.ControlSlot;
import binnie.core.machines.Machine;
import binnie.extratrees.ExtraTrees;
import binnie.extratrees.machines.fruitpress.FruitPressLogic;
import binnie.extratrees.machines.fruitpress.FruitPressMachine;
public class WindowPress extends Window {
public WindowPress(final EntityPlayer player, final IInventory inventory, final Side side) {
@@ -0,0 +1,9 @@
@ParametersAreNonnullByDefault
@FieldsAreNonnullByDefault
@MethodsReturnNonnullByDefault
package binnie.extratrees.machines.fruitpress.window;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -0,0 +1,9 @@
@ParametersAreNonnullByDefault
@FieldsAreNonnullByDefault
@MethodsReturnNonnullByDefault
package binnie.extratrees.machines.lumbermill.recipes;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
@@ -0,0 +1,9 @@
@ParametersAreNonnullByDefault
@FieldsAreNonnullByDefault
@MethodsReturnNonnullByDefault
package binnie.extratrees.machines.lumbermill.window;
import javax.annotation.ParametersAreNonnullByDefault;
import binnie.core.util.FieldsAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;