From e6547caacce1bb18e8c20bfd2420ca00028f4593 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Thu, 3 Aug 2017 21:10:23 +0200 Subject: [PATCH] Create Distillery and Fruit Press Recipe Api --- .../java/binnie/extratrees/ExtraTrees.java | 6 ++ .../extratrees/alcohol/ModuleAlcohol.java | 21 +++-- .../api/recipes/ExtraTreesRecipeManager.java | 4 + .../api/recipes/IDistilleryManager.java | 14 +++ .../api/recipes/IDistilleryRecipe.java | 14 +++ .../api/recipes/IFruitPressManager.java | 12 +++ .../api/recipes/IFruitPressRecipe.java | 14 +++ .../brewery => api/recipes}/package-info.java | 2 +- .../extratrees/core/ExtraTreesGUID.java | 6 +- .../integration/jei/ExtraTreesJeiPlugin.java | 4 +- .../DistilleryRecipeCategory.java | 2 +- .../jei/distillery/DistilleryRecipeMaker.java | 29 ++++++ .../DistilleryRecipeWrapper.java | 4 +- .../brewery/DistilleryRecipeMaker.java | 26 ------ .../jei/distillery/package-info.java | 9 ++ .../jei/fruitpress/FruitPressRecipeMaker.java | 17 ++-- .../extratrees/machines/DummyManagers.java | 22 +++++ .../brewery/recipes/package-info.java | 9 ++ .../machines/brewery/window/package-info.java | 9 ++ .../machines/designer/PackageDesigner.java | 3 + .../{ => window}/ComponentDesignerRecipe.java | 4 +- .../{ => window}/ControlRecipeSlot.java | 2 +- .../{ => window}/ControlTileSelect.java | 2 +- .../{ => window}/SlotValidatorBeeswax.java | 3 +- .../{ => window}/SlotValidatorPlanks.java | 3 +- .../designer/{ => window}/WindowDesigner.java | 4 +- .../designer/window/package-info.java | 9 ++ .../machines/distillery/DistilleryLogic.java | 7 +- .../distillery/DistilleryMachine.java | 2 + .../distillery/DistilleryRecipes.java | 70 -------------- .../distillery/recipes/DistilleryRecipe.java | 32 +++++++ .../recipes/DistilleryRecipeManager.java | 91 +++++++++++++++++++ .../distillery/recipes/package-info.java | 9 ++ .../ControlDistilleryProgress.java | 3 +- .../TankValidatorDistilleryInput.java | 5 +- .../TankValidatorDistilleryOutput.java | 5 +- .../{ => window}/WindowDistillery.java | 4 +- .../distillery/window/package-info.java | 9 ++ .../machines/fruitpress/FruitPressLogic.java | 5 +- .../fruitpress/FruitPressMachine.java | 1 + .../fruitpress/FruitPressRecipes.java | 51 ----------- .../fruitpress/recipes/FruitPressRecipe.java | 27 ++++++ .../recipes/FruitPressRecipeManager.java | 64 +++++++++++++ .../fruitpress/recipes/package-info.java | 9 ++ .../ControlFruitPressProgress.java | 8 +- .../{ => window}/SlotValidatorSqueezable.java | 5 +- .../fruitpress/{ => window}/WindowPress.java | 4 +- .../fruitpress/window/package-info.java | 9 ++ .../lumbermill/recipes/package-info.java | 9 ++ .../lumbermill/window/package-info.java | 9 ++ .../gui/analyst/AnalystPageProduce.java | 14 +-- 51 files changed, 504 insertions(+), 202 deletions(-) create mode 100644 src/main/java/binnie/extratrees/api/recipes/IDistilleryManager.java create mode 100644 src/main/java/binnie/extratrees/api/recipes/IDistilleryRecipe.java create mode 100644 src/main/java/binnie/extratrees/api/recipes/IFruitPressManager.java create mode 100644 src/main/java/binnie/extratrees/api/recipes/IFruitPressRecipe.java rename src/main/java/binnie/extratrees/{integration/jei/distillery/brewery => api/recipes}/package-info.java (79%) rename src/main/java/binnie/extratrees/integration/jei/distillery/{brewery => }/DistilleryRecipeCategory.java (97%) create mode 100644 src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeMaker.java rename src/main/java/binnie/extratrees/integration/jei/distillery/{brewery => }/DistilleryRecipeWrapper.java (89%) delete mode 100644 src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeMaker.java create mode 100644 src/main/java/binnie/extratrees/integration/jei/distillery/package-info.java create mode 100644 src/main/java/binnie/extratrees/machines/brewery/recipes/package-info.java create mode 100644 src/main/java/binnie/extratrees/machines/brewery/window/package-info.java rename src/main/java/binnie/extratrees/machines/designer/{ => window}/ComponentDesignerRecipe.java (96%) rename src/main/java/binnie/extratrees/machines/designer/{ => window}/ControlRecipeSlot.java (96%) rename src/main/java/binnie/extratrees/machines/designer/{ => window}/ControlTileSelect.java (99%) rename src/main/java/binnie/extratrees/machines/designer/{ => window}/SlotValidatorBeeswax.java (84%) rename src/main/java/binnie/extratrees/machines/designer/{ => window}/SlotValidatorPlanks.java (84%) rename src/main/java/binnie/extratrees/machines/designer/{ => window}/WindowDesigner.java (95%) create mode 100644 src/main/java/binnie/extratrees/machines/designer/window/package-info.java delete mode 100644 src/main/java/binnie/extratrees/machines/distillery/DistilleryRecipes.java create mode 100644 src/main/java/binnie/extratrees/machines/distillery/recipes/DistilleryRecipe.java create mode 100644 src/main/java/binnie/extratrees/machines/distillery/recipes/DistilleryRecipeManager.java create mode 100644 src/main/java/binnie/extratrees/machines/distillery/recipes/package-info.java rename src/main/java/binnie/extratrees/machines/distillery/{ => window}/ControlDistilleryProgress.java (96%) rename src/main/java/binnie/extratrees/machines/distillery/{ => window}/TankValidatorDistilleryInput.java (67%) rename src/main/java/binnie/extratrees/machines/distillery/{ => window}/TankValidatorDistilleryOutput.java (67%) rename src/main/java/binnie/extratrees/machines/distillery/{ => window}/WindowDistillery.java (92%) create mode 100644 src/main/java/binnie/extratrees/machines/distillery/window/package-info.java delete mode 100644 src/main/java/binnie/extratrees/machines/fruitpress/FruitPressRecipes.java create mode 100644 src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipe.java create mode 100644 src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipeManager.java create mode 100644 src/main/java/binnie/extratrees/machines/fruitpress/recipes/package-info.java rename src/main/java/binnie/extratrees/machines/fruitpress/{ => window}/ControlFruitPressProgress.java (89%) rename src/main/java/binnie/extratrees/machines/fruitpress/{ => window}/SlotValidatorSqueezable.java (70%) rename src/main/java/binnie/extratrees/machines/fruitpress/{ => window}/WindowPress.java (93%) create mode 100644 src/main/java/binnie/extratrees/machines/fruitpress/window/package-info.java create mode 100644 src/main/java/binnie/extratrees/machines/lumbermill/recipes/package-info.java create mode 100644 src/main/java/binnie/extratrees/machines/lumbermill/window/package-info.java diff --git a/src/main/java/binnie/extratrees/ExtraTrees.java b/src/main/java/binnie/extratrees/ExtraTrees.java index ee52d196..ee228fc5 100644 --- a/src/main/java/binnie/extratrees/ExtraTrees.java +++ b/src/main/java/binnie/extratrees/ExtraTrees.java @@ -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 diff --git a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java index 8fa76875..298b3dab 100644 --- a/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java +++ b/src/main/java/binnie/extratrees/alcohol/ModuleAlcohol.java @@ -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); } } diff --git a/src/main/java/binnie/extratrees/api/recipes/ExtraTreesRecipeManager.java b/src/main/java/binnie/extratrees/api/recipes/ExtraTreesRecipeManager.java index 86c2367c..340e9b9c 100644 --- a/src/main/java/binnie/extratrees/api/recipes/ExtraTreesRecipeManager.java +++ b/src/main/java/binnie/extratrees/api/recipes/ExtraTreesRecipeManager.java @@ -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; } diff --git a/src/main/java/binnie/extratrees/api/recipes/IDistilleryManager.java b/src/main/java/binnie/extratrees/api/recipes/IDistilleryManager.java new file mode 100644 index 00000000..96391360 --- /dev/null +++ b/src/main/java/binnie/extratrees/api/recipes/IDistilleryManager.java @@ -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 { + + void addRecipe(FluidStack input, FluidStack output, int level); + + Collection recipes(int level); +} diff --git a/src/main/java/binnie/extratrees/api/recipes/IDistilleryRecipe.java b/src/main/java/binnie/extratrees/api/recipes/IDistilleryRecipe.java new file mode 100644 index 00000000..c28df629 --- /dev/null +++ b/src/main/java/binnie/extratrees/api/recipes/IDistilleryRecipe.java @@ -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(); +} diff --git a/src/main/java/binnie/extratrees/api/recipes/IFruitPressManager.java b/src/main/java/binnie/extratrees/api/recipes/IFruitPressManager.java new file mode 100644 index 00000000..c348909c --- /dev/null +++ b/src/main/java/binnie/extratrees/api/recipes/IFruitPressManager.java @@ -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 { + + void addRecipe(ItemStack input, FluidStack output); +} diff --git a/src/main/java/binnie/extratrees/api/recipes/IFruitPressRecipe.java b/src/main/java/binnie/extratrees/api/recipes/IFruitPressRecipe.java new file mode 100644 index 00000000..2499f8ac --- /dev/null +++ b/src/main/java/binnie/extratrees/api/recipes/IFruitPressRecipe.java @@ -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(); +} diff --git a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/package-info.java b/src/main/java/binnie/extratrees/api/recipes/package-info.java similarity index 79% rename from src/main/java/binnie/extratrees/integration/jei/distillery/brewery/package-info.java rename to src/main/java/binnie/extratrees/api/recipes/package-info.java index 494f06e5..012f5f41 100644 --- a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/package-info.java +++ b/src/main/java/binnie/extratrees/api/recipes/package-info.java @@ -1,7 +1,7 @@ @ParametersAreNonnullByDefault @FieldsAreNonnullByDefault @MethodsReturnNonnullByDefault -package binnie.extratrees.integration.jei.distillery.brewery; +package binnie.extratrees.api.recipes; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java b/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java index c4a8090c..ff0ecf66 100644 --- a/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java +++ b/src/main/java/binnie/extratrees/core/ExtraTreesGUID.java @@ -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 { diff --git a/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java b/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java index 645432f1..af21d6ad 100644 --- a/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java +++ b/src/main/java/binnie/extratrees/integration/jei/ExtraTreesJeiPlugin.java @@ -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; diff --git a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeCategory.java b/src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeCategory.java similarity index 97% rename from src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeCategory.java rename to src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeCategory.java index 2145d4bc..d964ac38 100644 --- a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeCategory.java +++ b/src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeCategory.java @@ -1,4 +1,4 @@ -package binnie.extratrees.integration.jei.distillery.brewery; +package binnie.extratrees.integration.jei.distillery; import net.minecraft.client.Minecraft; diff --git a/src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeMaker.java b/src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeMaker.java new file mode 100644 index 00000000..380402e8 --- /dev/null +++ b/src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeMaker.java @@ -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 create() { + List 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; + } +} diff --git a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeWrapper.java b/src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeWrapper.java similarity index 89% rename from src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeWrapper.java rename to src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeWrapper.java index a29641d7..0111fd9f 100644 --- a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeWrapper.java +++ b/src/main/java/binnie/extratrees/integration/jei/distillery/DistilleryRecipeWrapper.java @@ -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; diff --git a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeMaker.java b/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeMaker.java deleted file mode 100644 index 77339b3d..00000000 --- a/src/main/java/binnie/extratrees/integration/jei/distillery/brewery/DistilleryRecipeMaker.java +++ /dev/null @@ -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 create() { - List recipes = new ArrayList<>(); - - for (int level = 0; level < 3; level++) { - for (Pair entry : DistilleryRecipes.getRecipes(level)) { - FluidStack input = entry.getKey(); - FluidStack output = entry.getValue(); - recipes.add(new DistilleryRecipeWrapper(level, input, output)); - } - } - - return recipes; - } -} diff --git a/src/main/java/binnie/extratrees/integration/jei/distillery/package-info.java b/src/main/java/binnie/extratrees/integration/jei/distillery/package-info.java new file mode 100644 index 00000000..1c06f9df --- /dev/null +++ b/src/main/java/binnie/extratrees/integration/jei/distillery/package-info.java @@ -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; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeMaker.java b/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeMaker.java index f656de45..5c9ff66a 100644 --- a/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeMaker.java +++ b/src/main/java/binnie/extratrees/integration/jei/fruitpress/FruitPressRecipeMaker.java @@ -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 create() { List recipes = new ArrayList<>(); - Collection> recipePairs = FruitPressRecipes.getRecipes(); - for (Pair recipePair : recipePairs) { - ItemStack fruit = recipePair.getKey(); - FluidStack juice = recipePair.getValue(); + if(ExtraTreesRecipeManager.fruitPressManager == null){ + return recipes; + } + + Collection fruitPressRecipes = ExtraTreesRecipeManager.fruitPressManager.recipes(); + for (IFruitPressRecipe recipe : fruitPressRecipes) { + ItemStack fruit = recipe.getInput(); + FluidStack juice = recipe.getOutput(); recipes.add(new FruitPressRecipeWrapper(fruit, juice)); } diff --git a/src/main/java/binnie/extratrees/machines/DummyManagers.java b/src/main/java/binnie/extratrees/machines/DummyManagers.java index 8c137cdc..cc888496 100644 --- a/src/main/java/binnie/extratrees/machines/DummyManagers.java +++ b/src/main/java/binnie/extratrees/machines/DummyManagers.java @@ -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 implements IFruitPressManager { + @Override + public void addRecipe(ItemStack input, FluidStack output) { + + } + } + + public static class DummyDistilleryManager extends DummyCraftingManager implements IDistilleryManager { + @Override + public void addRecipe(FluidStack input, FluidStack output, int level) { + } + + @Override + public Set recipes(int level) { + return ImmutableSet.of(); + } + } } diff --git a/src/main/java/binnie/extratrees/machines/brewery/recipes/package-info.java b/src/main/java/binnie/extratrees/machines/brewery/recipes/package-info.java new file mode 100644 index 00000000..50fc9fd1 --- /dev/null +++ b/src/main/java/binnie/extratrees/machines/brewery/recipes/package-info.java @@ -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; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/brewery/window/package-info.java b/src/main/java/binnie/extratrees/machines/brewery/window/package-info.java new file mode 100644 index 00000000..8d6db0a9 --- /dev/null +++ b/src/main/java/binnie/extratrees/machines/brewery/window/package-info.java @@ -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; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/designer/PackageDesigner.java b/src/main/java/binnie/extratrees/machines/designer/PackageDesigner.java index 4390de06..69e309c4 100644 --- a/src/main/java/binnie/extratrees/machines/designer/PackageDesigner.java +++ b/src/main/java/binnie/extratrees/machines/designer/PackageDesigner.java @@ -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; diff --git a/src/main/java/binnie/extratrees/machines/designer/ComponentDesignerRecipe.java b/src/main/java/binnie/extratrees/machines/designer/window/ComponentDesignerRecipe.java similarity index 96% rename from src/main/java/binnie/extratrees/machines/designer/ComponentDesignerRecipe.java rename to src/main/java/binnie/extratrees/machines/designer/window/ComponentDesignerRecipe.java index 50abb92c..9d73b729 100644 --- a/src/main/java/binnie/extratrees/machines/designer/ComponentDesignerRecipe.java +++ b/src/main/java/binnie/extratrees/machines/designer/window/ComponentDesignerRecipe.java @@ -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; diff --git a/src/main/java/binnie/extratrees/machines/designer/ControlRecipeSlot.java b/src/main/java/binnie/extratrees/machines/designer/window/ControlRecipeSlot.java similarity index 96% rename from src/main/java/binnie/extratrees/machines/designer/ControlRecipeSlot.java rename to src/main/java/binnie/extratrees/machines/designer/window/ControlRecipeSlot.java index 24cebf0e..8d307dab 100644 --- a/src/main/java/binnie/extratrees/machines/designer/ControlRecipeSlot.java +++ b/src/main/java/binnie/extratrees/machines/designer/window/ControlRecipeSlot.java @@ -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; diff --git a/src/main/java/binnie/extratrees/machines/designer/ControlTileSelect.java b/src/main/java/binnie/extratrees/machines/designer/window/ControlTileSelect.java similarity index 99% rename from src/main/java/binnie/extratrees/machines/designer/ControlTileSelect.java rename to src/main/java/binnie/extratrees/machines/designer/window/ControlTileSelect.java index de668ec6..0c3bf5a9 100644 --- a/src/main/java/binnie/extratrees/machines/designer/ControlTileSelect.java +++ b/src/main/java/binnie/extratrees/machines/designer/window/ControlTileSelect.java @@ -1,4 +1,4 @@ -package binnie.extratrees.machines.designer; +package binnie.extratrees.machines.designer.window; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/binnie/extratrees/machines/designer/SlotValidatorBeeswax.java b/src/main/java/binnie/extratrees/machines/designer/window/SlotValidatorBeeswax.java similarity index 84% rename from src/main/java/binnie/extratrees/machines/designer/SlotValidatorBeeswax.java rename to src/main/java/binnie/extratrees/machines/designer/window/SlotValidatorBeeswax.java index 5a220c45..9c5fded5 100644 --- a/src/main/java/binnie/extratrees/machines/designer/SlotValidatorBeeswax.java +++ b/src/main/java/binnie/extratrees/machines/designer/window/SlotValidatorBeeswax.java @@ -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; diff --git a/src/main/java/binnie/extratrees/machines/designer/SlotValidatorPlanks.java b/src/main/java/binnie/extratrees/machines/designer/window/SlotValidatorPlanks.java similarity index 84% rename from src/main/java/binnie/extratrees/machines/designer/SlotValidatorPlanks.java rename to src/main/java/binnie/extratrees/machines/designer/window/SlotValidatorPlanks.java index e353f7cc..43f39b91 100644 --- a/src/main/java/binnie/extratrees/machines/designer/SlotValidatorPlanks.java +++ b/src/main/java/binnie/extratrees/machines/designer/window/SlotValidatorPlanks.java @@ -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; diff --git a/src/main/java/binnie/extratrees/machines/designer/WindowDesigner.java b/src/main/java/binnie/extratrees/machines/designer/window/WindowDesigner.java similarity index 95% rename from src/main/java/binnie/extratrees/machines/designer/WindowDesigner.java rename to src/main/java/binnie/extratrees/machines/designer/window/WindowDesigner.java index 6ec00471..6dfaf6bc 100644 --- a/src/main/java/binnie/extratrees/machines/designer/WindowDesigner.java +++ b/src/main/java/binnie/extratrees/machines/designer/window/WindowDesigner.java @@ -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; diff --git a/src/main/java/binnie/extratrees/machines/designer/window/package-info.java b/src/main/java/binnie/extratrees/machines/designer/window/package-info.java new file mode 100644 index 00000000..6a2e6b16 --- /dev/null +++ b/src/main/java/binnie/extratrees/machines/designer/window/package-info.java @@ -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; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/distillery/DistilleryLogic.java b/src/main/java/binnie/extratrees/machines/distillery/DistilleryLogic.java index f9cbeaad..0f0d9781 100644 --- a/src/main/java/binnie/extratrees/machines/distillery/DistilleryLogic.java +++ b/src/main/java/binnie/extratrees/machines/distillery/DistilleryLogic.java @@ -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"); } diff --git a/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java b/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java index f6292248..ad26c8dd 100644 --- a/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java +++ b/src/main/java/binnie/extratrees/machines/distillery/DistilleryMachine.java @@ -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; diff --git a/src/main/java/binnie/extratrees/machines/distillery/DistilleryRecipes.java b/src/main/java/binnie/extratrees/machines/distillery/DistilleryRecipes.java deleted file mode 100644 index b29e6f81..00000000 --- a/src/main/java/binnie/extratrees/machines/distillery/DistilleryRecipes.java +++ /dev/null @@ -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>> 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> recipesForLevel = recipes.get(level); - Pair 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> recipesForLevel = recipes.get(i); - Pair 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> recipesForLevel = recipes.get(i); - for (final Pair 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> recipesForLevel = recipes.get(level); - recipesForLevel.put(input.getFluid(), Pair.of(input, output)); - } - - public static Collection> getRecipes(int level) { - Map> recipesForLevel = recipes.get(level); - return Collections.unmodifiableCollection(recipesForLevel.values()); - } -} diff --git a/src/main/java/binnie/extratrees/machines/distillery/recipes/DistilleryRecipe.java b/src/main/java/binnie/extratrees/machines/distillery/recipes/DistilleryRecipe.java new file mode 100644 index 00000000..fa889e60 --- /dev/null +++ b/src/main/java/binnie/extratrees/machines/distillery/recipes/DistilleryRecipe.java @@ -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; + } +} diff --git a/src/main/java/binnie/extratrees/machines/distillery/recipes/DistilleryRecipeManager.java b/src/main/java/binnie/extratrees/machines/distillery/recipes/DistilleryRecipeManager.java new file mode 100644 index 00000000..a995dec9 --- /dev/null +++ b/src/main/java/binnie/extratrees/machines/distillery/recipes/DistilleryRecipeManager.java @@ -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> recipes = new ArrayList<>(); + private static final List 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 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 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 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 recipes(int level) { + Map recipesForLevel = recipes.get(level); + return Collections.unmodifiableCollection(recipesForLevel.values()); + } + + @Override + public Collection recipes() { + return recipeList; + } +} diff --git a/src/main/java/binnie/extratrees/machines/distillery/recipes/package-info.java b/src/main/java/binnie/extratrees/machines/distillery/recipes/package-info.java new file mode 100644 index 00000000..0e1aef8d --- /dev/null +++ b/src/main/java/binnie/extratrees/machines/distillery/recipes/package-info.java @@ -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; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/distillery/ControlDistilleryProgress.java b/src/main/java/binnie/extratrees/machines/distillery/window/ControlDistilleryProgress.java similarity index 96% rename from src/main/java/binnie/extratrees/machines/distillery/ControlDistilleryProgress.java rename to src/main/java/binnie/extratrees/machines/distillery/window/ControlDistilleryProgress.java index d1ed511b..60e743c2 100644 --- a/src/main/java/binnie/extratrees/machines/distillery/ControlDistilleryProgress.java +++ b/src/main/java/binnie/extratrees/machines/distillery/window/ControlDistilleryProgress.java @@ -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); diff --git a/src/main/java/binnie/extratrees/machines/distillery/TankValidatorDistilleryInput.java b/src/main/java/binnie/extratrees/machines/distillery/window/TankValidatorDistilleryInput.java similarity index 67% rename from src/main/java/binnie/extratrees/machines/distillery/TankValidatorDistilleryInput.java rename to src/main/java/binnie/extratrees/machines/distillery/window/TankValidatorDistilleryInput.java index 2c468768..ccd55b92 100644 --- a/src/main/java/binnie/extratrees/machines/distillery/TankValidatorDistilleryInput.java +++ b/src/main/java/binnie/extratrees/machines/distillery/window/TankValidatorDistilleryInput.java @@ -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 diff --git a/src/main/java/binnie/extratrees/machines/distillery/TankValidatorDistilleryOutput.java b/src/main/java/binnie/extratrees/machines/distillery/window/TankValidatorDistilleryOutput.java similarity index 67% rename from src/main/java/binnie/extratrees/machines/distillery/TankValidatorDistilleryOutput.java rename to src/main/java/binnie/extratrees/machines/distillery/window/TankValidatorDistilleryOutput.java index 16c3d044..6f6a7e53 100644 --- a/src/main/java/binnie/extratrees/machines/distillery/TankValidatorDistilleryOutput.java +++ b/src/main/java/binnie/extratrees/machines/distillery/window/TankValidatorDistilleryOutput.java @@ -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 diff --git a/src/main/java/binnie/extratrees/machines/distillery/WindowDistillery.java b/src/main/java/binnie/extratrees/machines/distillery/window/WindowDistillery.java similarity index 92% rename from src/main/java/binnie/extratrees/machines/distillery/WindowDistillery.java rename to src/main/java/binnie/extratrees/machines/distillery/window/WindowDistillery.java index 3e83ab21..d80b9b2a 100644 --- a/src/main/java/binnie/extratrees/machines/distillery/WindowDistillery.java +++ b/src/main/java/binnie/extratrees/machines/distillery/window/WindowDistillery.java @@ -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) { diff --git a/src/main/java/binnie/extratrees/machines/distillery/window/package-info.java b/src/main/java/binnie/extratrees/machines/distillery/window/package-info.java new file mode 100644 index 00000000..941d86e5 --- /dev/null +++ b/src/main/java/binnie/extratrees/machines/distillery/window/package-info.java @@ -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; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressLogic.java b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressLogic.java index 17bb6e04..d4208751 100644 --- a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressLogic.java +++ b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressLogic.java @@ -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; } diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java index 5a391323..cd1b1fb5 100644 --- a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java +++ b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressMachine.java @@ -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; diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressRecipes.java b/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressRecipes.java deleted file mode 100644 index 57f74b1e..00000000 --- a/src/main/java/binnie/extratrees/machines/fruitpress/FruitPressRecipes.java +++ /dev/null @@ -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> - private static Multimap> 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 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> getRecipes() { - return pressRecipes.values(); - } -} diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipe.java b/src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipe.java new file mode 100644 index 00000000..847e86fd --- /dev/null +++ b/src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipe.java @@ -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; + } +} diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipeManager.java b/src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipeManager.java new file mode 100644 index 00000000..b5625669 --- /dev/null +++ b/src/main/java/binnie/extratrees/machines/fruitpress/recipes/FruitPressRecipeManager.java @@ -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> + private static Multimap 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 recipes() { + return recipes.values(); + } +} diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/recipes/package-info.java b/src/main/java/binnie/extratrees/machines/fruitpress/recipes/package-info.java new file mode 100644 index 00000000..a5417437 --- /dev/null +++ b/src/main/java/binnie/extratrees/machines/fruitpress/recipes/package-info.java @@ -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; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/ControlFruitPressProgress.java b/src/main/java/binnie/extratrees/machines/fruitpress/window/ControlFruitPressProgress.java similarity index 89% rename from src/main/java/binnie/extratrees/machines/fruitpress/ControlFruitPressProgress.java rename to src/main/java/binnie/extratrees/machines/fruitpress/window/ControlFruitPressProgress.java index 4345ea29..4ac2f5ae 100644 --- a/src/main/java/binnie/extratrees/machines/fruitpress/ControlFruitPressProgress.java +++ b/src/main/java/binnie/extratrees/machines/fruitpress/window/ControlFruitPressProgress.java @@ -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); } diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/SlotValidatorSqueezable.java b/src/main/java/binnie/extratrees/machines/fruitpress/window/SlotValidatorSqueezable.java similarity index 70% rename from src/main/java/binnie/extratrees/machines/fruitpress/SlotValidatorSqueezable.java rename to src/main/java/binnie/extratrees/machines/fruitpress/window/SlotValidatorSqueezable.java index dc6ac1de..effb7b21 100644 --- a/src/main/java/binnie/extratrees/machines/fruitpress/SlotValidatorSqueezable.java +++ b/src/main/java/binnie/extratrees/machines/fruitpress/window/SlotValidatorSqueezable.java @@ -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 diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/WindowPress.java b/src/main/java/binnie/extratrees/machines/fruitpress/window/WindowPress.java similarity index 93% rename from src/main/java/binnie/extratrees/machines/fruitpress/WindowPress.java rename to src/main/java/binnie/extratrees/machines/fruitpress/window/WindowPress.java index a7172afa..84e10c1f 100644 --- a/src/main/java/binnie/extratrees/machines/fruitpress/WindowPress.java +++ b/src/main/java/binnie/extratrees/machines/fruitpress/window/WindowPress.java @@ -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) { diff --git a/src/main/java/binnie/extratrees/machines/fruitpress/window/package-info.java b/src/main/java/binnie/extratrees/machines/fruitpress/window/package-info.java new file mode 100644 index 00000000..ecc673c9 --- /dev/null +++ b/src/main/java/binnie/extratrees/machines/fruitpress/window/package-info.java @@ -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; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/recipes/package-info.java b/src/main/java/binnie/extratrees/machines/lumbermill/recipes/package-info.java new file mode 100644 index 00000000..420ceef3 --- /dev/null +++ b/src/main/java/binnie/extratrees/machines/lumbermill/recipes/package-info.java @@ -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; \ No newline at end of file diff --git a/src/main/java/binnie/extratrees/machines/lumbermill/window/package-info.java b/src/main/java/binnie/extratrees/machines/lumbermill/window/package-info.java new file mode 100644 index 00000000..0bb19a4a --- /dev/null +++ b/src/main/java/binnie/extratrees/machines/lumbermill/window/package-info.java @@ -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; \ No newline at end of file diff --git a/src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java b/src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java index f7aae3fb..b3123508 100644 --- a/src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java +++ b/src/main/java/binnie/genetics/gui/analyst/AnalystPageProduce.java @@ -26,8 +26,8 @@ import binnie.core.gui.minecraft.control.ControlItemDisplay; import binnie.core.util.UniqueFluidStackSet; import binnie.core.util.UniqueItemStackSet; import binnie.extratrees.machines.brewery.recipes.BreweryRecipeManager; -import binnie.extratrees.machines.distillery.DistilleryRecipes; -import binnie.extratrees.machines.fruitpress.FruitPressRecipes; +import binnie.extratrees.machines.distillery.recipes.DistilleryRecipeManager; +import binnie.extratrees.machines.fruitpress.recipes.FruitPressRecipeManager; import binnie.genetics.gui.analyst.bee.AnalystPageProducts; public abstract class AnalystPageProduce extends ControlAnalystPage { @@ -127,8 +127,8 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { public Collection getAllFluids(ItemStack stack) { List products = new ArrayList<>(); products.addAll(getSqueezerFluid(stack)); - if (FruitPressRecipes.getOutput(stack) != null) { - products.add(FruitPressRecipes.getOutput(stack)); + if (FruitPressRecipeManager.getOutput(stack) != null) { + products.add(FruitPressRecipeManager.getOutput(stack)); } return products; } @@ -152,9 +152,9 @@ public abstract class AnalystPageProduce extends ControlAnalystPage { protected Collection getAllProducts(FluidStack stack) { Collection fluids = new UniqueFluidStackSet(); fluids.add(BreweryRecipeManager.getOutput(stack)); - fluids.add(DistilleryRecipes.getOutput(stack, 0)); - fluids.add(DistilleryRecipes.getOutput(stack, 1)); - fluids.add(DistilleryRecipes.getOutput(stack, 2)); + fluids.add(DistilleryRecipeManager.getOutput(stack, 0)); + fluids.add(DistilleryRecipeManager.getOutput(stack, 1)); + fluids.add(DistilleryRecipeManager.getOutput(stack, 2)); return fluids; }