diff --git a/api/forestry b/api/forestry index d3508a7a4..8cccb7b2a 160000 --- a/api/forestry +++ b/api/forestry @@ -1 +1 @@ -Subproject commit d3508a7a4e4ad6ab1062c7f18c0d29c8c0f14fd3 +Subproject commit 8cccb7b2aa78304a38ff987d805667e8a3eccdf4 diff --git a/src/main/java/forestry/factory/DummyManagers.java b/src/main/java/forestry/factory/DummyManagers.java index cff2f1c81..c0463c194 100644 --- a/src/main/java/forestry/factory/DummyManagers.java +++ b/src/main/java/forestry/factory/DummyManagers.java @@ -28,6 +28,8 @@ import forestry.api.recipes.ICentrifugeRecipe; import forestry.api.recipes.ICraftingProvider; import forestry.api.recipes.IFabricatorManager; import forestry.api.recipes.IFabricatorRecipe; +import forestry.api.recipes.IFabricatorSmeltingManager; +import forestry.api.recipes.IFabricatorSmeltingRecipe; import forestry.api.recipes.IFermenterManager; import forestry.api.recipes.IFermenterRecipe; import forestry.api.recipes.IForestryRecipe; @@ -101,6 +103,14 @@ public class DummyManagers { } } + public static class DummyFabricatorSmeltingManager extends DummyCraftingProvider implements IFabricatorSmeltingManager { + + @Override + public void addSmelting(ItemStack resource, FluidStack molten, int meltingPoint) { + + } + } + public static class DummyFermenterManager extends DummyCraftingProvider implements IFermenterManager { @Override diff --git a/src/main/java/forestry/factory/recipes/FabricatorRecipe.java b/src/main/java/forestry/factory/recipes/FabricatorRecipe.java index 1d6c2827a..337c06929 100644 --- a/src/main/java/forestry/factory/recipes/FabricatorRecipe.java +++ b/src/main/java/forestry/factory/recipes/FabricatorRecipe.java @@ -38,6 +38,7 @@ public class FabricatorRecipe implements IFabricatorRecipe { } @Override + @Deprecated public boolean matches(@Nullable ItemStack plan, ItemStack[][] resources) { if (this.plan != null && !ItemStackUtil.isCraftingEquivalent(this.plan, plan)) { return false; diff --git a/src/main/java/forestry/factory/recipes/FabricatorRecipeManager.java b/src/main/java/forestry/factory/recipes/FabricatorRecipeManager.java index 3171396e6..ee4b966b2 100644 --- a/src/main/java/forestry/factory/recipes/FabricatorRecipeManager.java +++ b/src/main/java/forestry/factory/recipes/FabricatorRecipeManager.java @@ -22,13 +22,13 @@ import net.minecraftforge.fluids.FluidStack; import forestry.api.recipes.IFabricatorManager; import forestry.api.recipes.IFabricatorRecipe; +import forestry.api.recipes.RecipeManagers; import forestry.core.recipes.ShapedRecipeCustom; import forestry.core.utils.ItemStackUtil; public class FabricatorRecipeManager implements IFabricatorManager { private static final Set recipes = new HashSet<>(); - public static final Set smeltings = new HashSet<>(); @Override public void addRecipe(ItemStack plan, FluidStack molten, ItemStack result, Object[] pattern) { @@ -38,10 +38,7 @@ public class FabricatorRecipeManager implements IFabricatorManager { @Override public void addSmelting(ItemStack resource, FluidStack molten, int meltingPoint) { - if (resource == null || molten == null) { - return; - } - smeltings.add(new FabricatorSmeltingRecipe(resource, molten, meltingPoint)); + RecipeManagers.fabricatorSmeltingManager.addSmelting(resource, molten, meltingPoint); } public static IFabricatorRecipe findMatchingRecipe(ItemStack plan, FluidStack liquid, ItemStack[] resources) { @@ -73,34 +70,6 @@ public class FabricatorRecipeManager implements IFabricatorManager { return false; } - public static FabricatorSmeltingRecipe findMatchingSmelting(ItemStack resource) { - if (resource == null) { - return null; - } - - for (FabricatorSmeltingRecipe smelting : smeltings) { - if (ItemStackUtil.isCraftingEquivalent(smelting.getResource(), resource)) { - return smelting; - } - } - - return null; - } - - public static FabricatorSmeltingRecipe findMatchingSmelting(FluidStack product) { - if (product == null) { - return null; - } - - for (FabricatorSmeltingRecipe smelting : smeltings) { - if (smelting.matches(product)) { - return smelting; - } - } - - return null; - } - @Override public boolean addRecipe(IFabricatorRecipe recipe) { return recipes.add(recipe); diff --git a/src/main/java/forestry/factory/recipes/FabricatorSmeltingRecipe.java b/src/main/java/forestry/factory/recipes/FabricatorSmeltingRecipe.java index 913fff63e..c446720c0 100644 --- a/src/main/java/forestry/factory/recipes/FabricatorSmeltingRecipe.java +++ b/src/main/java/forestry/factory/recipes/FabricatorSmeltingRecipe.java @@ -14,7 +14,9 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -public class FabricatorSmeltingRecipe { +import forestry.api.recipes.IFabricatorSmeltingRecipe; + +public class FabricatorSmeltingRecipe implements IFabricatorSmeltingRecipe { private final ItemStack resource; private final FluidStack product; @@ -33,10 +35,6 @@ public class FabricatorSmeltingRecipe { this.meltingPoint = meltingPoint; } - public boolean matches(FluidStack product) { - return this.product.isFluidEqual(product); - } - public ItemStack getResource() { return resource; } diff --git a/src/main/java/forestry/factory/recipes/FabricatorSmeltingRecipeManager.java b/src/main/java/forestry/factory/recipes/FabricatorSmeltingRecipeManager.java new file mode 100644 index 000000000..b1b84a623 --- /dev/null +++ b/src/main/java/forestry/factory/recipes/FabricatorSmeltingRecipeManager.java @@ -0,0 +1,92 @@ +/******************************************************************************* + * Copyright (c) 2011-2014 SirSengir. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Lesser Public License v3 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/lgpl-3.0.txt + * + * Various Contributors including, but not limited to: + * SirSengir (original work), CovertJaguar, Player, Binnie, MysteriousAges + ******************************************************************************/ +package forestry.factory.recipes; + +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.FluidStack; + +import forestry.api.recipes.IFabricatorSmeltingManager; +import forestry.api.recipes.IFabricatorSmeltingRecipe; +import forestry.core.utils.ItemStackUtil; + +public class FabricatorSmeltingRecipeManager implements IFabricatorSmeltingManager { + public static final Set recipes = new HashSet<>(); + + public static IFabricatorSmeltingRecipe findMatchingSmelting(ItemStack resource) { + if (resource == null) { + return null; + } + + for (IFabricatorSmeltingRecipe smelting : recipes) { + if (ItemStackUtil.isCraftingEquivalent(smelting.getResource(), resource)) { + return smelting; + } + } + + return null; + } + + public static IFabricatorSmeltingRecipe findMatchingSmelting(FluidStack product) { + if (product == null) { + return null; + } + + for (IFabricatorSmeltingRecipe smelting : recipes) { + if (smelting.getProduct().isFluidEqual(product)) { + return smelting; + } + } + + return null; + } + + @Override + public void addSmelting(ItemStack resource, FluidStack molten, int meltingPoint) { + if (resource == null || molten == null) { + return; + } + addRecipe(new FabricatorSmeltingRecipe(resource, molten, meltingPoint)); + } + + @Override + public boolean addRecipe(IFabricatorSmeltingRecipe recipe) { + return recipes.add(recipe); + } + + @Override + public boolean removeRecipe(IFabricatorSmeltingRecipe recipe) { + return recipes.remove(recipe); + } + + @Override + public Collection recipes() { + return Collections.unmodifiableSet(recipes); + } + + @Override + public Map getRecipes() { + HashMap recipeList = new HashMap<>(); + + for (IFabricatorSmeltingRecipe recipe : recipes) { + recipeList.put(new Object[]{recipe.getResource()}, new Object[]{recipe.getProduct()}); + } + + return recipeList; + } +} diff --git a/src/main/java/forestry/factory/recipes/nei/NEIHandlerFabricator.java b/src/main/java/forestry/factory/recipes/nei/NEIHandlerFabricator.java index 00217265c..b58b8b9f2 100644 --- a/src/main/java/forestry/factory/recipes/nei/NEIHandlerFabricator.java +++ b/src/main/java/forestry/factory/recipes/nei/NEIHandlerFabricator.java @@ -28,14 +28,14 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import forestry.api.recipes.IFabricatorRecipe; +import forestry.api.recipes.IFabricatorSmeltingRecipe; import forestry.api.recipes.RecipeManagers; import forestry.core.recipes.nei.INBTMatchingCachedRecipe; import forestry.core.recipes.nei.NEIUtils; import forestry.core.recipes.nei.PositionedFluidTank; import forestry.core.recipes.nei.RecipeHandlerBase; import forestry.factory.gui.GuiFabricator; -import forestry.factory.recipes.FabricatorRecipeManager; -import forestry.factory.recipes.FabricatorSmeltingRecipe; +import forestry.factory.recipes.FabricatorSmeltingRecipeManager; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; @@ -57,7 +57,7 @@ public class NEIHandlerFabricator extends RecipeHandlerBase { if (recipe.getLiquid() != null) { this.tank = new PositionedFluidTank(recipe.getLiquid(), 2000, new Rectangle(21, 37, 16, 16)); List smeltingInput = new ArrayList<>(); - for (FabricatorSmeltingRecipe s : getSmeltingInputs().get(recipe.getLiquid().getFluid())) { + for (IFabricatorSmeltingRecipe s : getSmeltingInputs().get(recipe.getLiquid().getFluid())) { smeltingInput.add(s.getResource()); } if (!smeltingInput.isEmpty()) { @@ -244,7 +244,7 @@ public class NEIHandlerFabricator extends RecipeHandlerBase { super.provideItemTooltip(guiRecipe, itemStack, currenttip, crecipe, relMouse); if (new Rectangle(20, 9, 18, 18).contains(relMouse)) { - for (FabricatorSmeltingRecipe smelting : FabricatorRecipeManager.smeltings) { + for (IFabricatorSmeltingRecipe smelting : FabricatorSmeltingRecipeManager.recipes) { if (NEIServerUtils.areStacksSameTypeCrafting(smelting.getResource(), itemStack) && smelting.getProduct() != null) { currenttip.add(EnumChatFormatting.GRAY.toString() + NEIUtils.translate("handler.forestry.fabricator.worth") + " " + smelting.getProduct().amount + " mB"); } @@ -254,12 +254,12 @@ public class NEIHandlerFabricator extends RecipeHandlerBase { return currenttip; } - private static Map> getSmeltingInputs() { - Map> smeltingInputs = new HashMap<>(); - for (FabricatorSmeltingRecipe smelting : FabricatorRecipeManager.smeltings) { + private static Map> getSmeltingInputs() { + Map> smeltingInputs = new HashMap<>(); + for (IFabricatorSmeltingRecipe smelting : FabricatorSmeltingRecipeManager.recipes) { Fluid fluid = smelting.getProduct().getFluid(); if (!smeltingInputs.containsKey(fluid)) { - smeltingInputs.put(fluid, new ArrayList()); + smeltingInputs.put(fluid, new ArrayList()); } smeltingInputs.get(fluid).add(smelting); } diff --git a/src/main/java/forestry/factory/tiles/TileFabricator.java b/src/main/java/forestry/factory/tiles/TileFabricator.java index b2aead687..97adf4e8a 100644 --- a/src/main/java/forestry/factory/tiles/TileFabricator.java +++ b/src/main/java/forestry/factory/tiles/TileFabricator.java @@ -28,6 +28,7 @@ import net.minecraftforge.fluids.FluidTankInfo; import forestry.api.core.ForestryAPI; import forestry.api.recipes.IFabricatorRecipe; +import forestry.api.recipes.IFabricatorSmeltingRecipe; import forestry.core.config.Constants; import forestry.core.fluids.Fluids; import forestry.core.fluids.TankManager; @@ -47,7 +48,7 @@ import forestry.core.utils.InventoryUtil; import forestry.core.utils.ItemStackUtil; import forestry.core.utils.SlotUtil; import forestry.factory.recipes.FabricatorRecipeManager; -import forestry.factory.recipes.FabricatorSmeltingRecipe; +import forestry.factory.recipes.FabricatorSmeltingRecipeManager; public class TileFabricator extends TilePowered implements ICrafter, ILiquidTankTile, ISidedInventory { @@ -150,7 +151,7 @@ public class TileFabricator extends TilePowered implements ICrafter, ILiquidTank if (!moltenTank.isEmpty()) { // Remove smelt if we have gone below melting point - FabricatorSmeltingRecipe smelt = FabricatorRecipeManager.findMatchingSmelting(moltenTank.getFluid()); + IFabricatorSmeltingRecipe smelt = FabricatorSmeltingRecipeManager.findMatchingSmelting(moltenTank.getFluid()); if (smelt != null && heat < smelt.getMeltingPoint()) { moltenTank.drain(5, true); } @@ -167,7 +168,7 @@ public class TileFabricator extends TilePowered implements ICrafter, ILiquidTank return; } - FabricatorSmeltingRecipe smelt = FabricatorRecipeManager.findMatchingSmelting(smeltResource); + IFabricatorSmeltingRecipe smelt = FabricatorSmeltingRecipeManager.findMatchingSmelting(smeltResource); if (smelt == null || smelt.getMeltingPoint() > heat) { return; } @@ -297,7 +298,7 @@ public class TileFabricator extends TilePowered implements ICrafter, ILiquidTank public boolean hasWork() { IInventoryAdapter inventory = getInternalInventory(); ItemStack itemToMelt = inventory.getStackInSlot(SLOT_METAL); - FabricatorSmeltingRecipe smelting = FabricatorRecipeManager.findMatchingSmelting(itemToMelt); + IFabricatorSmeltingRecipe smelting = FabricatorSmeltingRecipeManager.findMatchingSmelting(itemToMelt); if (smelting != null && moltenTank.fill(smelting.getProduct(), false) > 0) { return true; } @@ -314,12 +315,12 @@ public class TileFabricator extends TilePowered implements ICrafter, ILiquidTank private int getMeltingPoint() { if (moltenTank.getFluidAmount() > 0) { - FabricatorSmeltingRecipe smelt = FabricatorRecipeManager.findMatchingSmelting(moltenTank.getFluid()); + IFabricatorSmeltingRecipe smelt = FabricatorSmeltingRecipeManager.findMatchingSmelting(moltenTank.getFluid()); if (smelt != null) { return smelt.getMeltingPoint(); } } else if (this.getStackInSlot(SLOT_METAL) != null) { - FabricatorSmeltingRecipe smelt = FabricatorRecipeManager.findMatchingSmelting(this.getStackInSlot(SLOT_METAL)); + IFabricatorSmeltingRecipe smelt = FabricatorSmeltingRecipeManager.findMatchingSmelting(this.getStackInSlot(SLOT_METAL)); if (smelt != null) { return smelt.getMeltingPoint(); } @@ -413,13 +414,13 @@ public class TileFabricator extends TilePowered implements ICrafter, ILiquidTank @Override public boolean canSlotAccept(int slotIndex, ItemStack itemStack) { if (slotIndex == SLOT_METAL) { - return FabricatorRecipeManager.findMatchingSmelting(itemStack) != null; + return FabricatorSmeltingRecipeManager.findMatchingSmelting(itemStack) != null; } else if (slotIndex == SLOT_PLAN) { return FabricatorRecipeManager.isPlan(itemStack); } else if (SlotUtil.isSlotInRange(slotIndex, SLOT_INVENTORY_1, SLOT_INVENTORY_COUNT)) { if (FabricatorRecipeManager.isPlan(itemStack)) { return false; - } else if (FabricatorRecipeManager.findMatchingSmelting(itemStack) != null) { + } else if (FabricatorSmeltingRecipeManager.findMatchingSmelting(itemStack) != null) { return false; } } diff --git a/src/main/java/forestry/plugins/PluginFactory.java b/src/main/java/forestry/plugins/PluginFactory.java index 44a7d1e1a..d2521d507 100644 --- a/src/main/java/forestry/plugins/PluginFactory.java +++ b/src/main/java/forestry/plugins/PluginFactory.java @@ -54,6 +54,7 @@ import forestry.factory.network.PacketWorktableMemoryUpdate; import forestry.factory.recipes.CarpenterRecipeManager; import forestry.factory.recipes.CentrifugeRecipeManager; import forestry.factory.recipes.FabricatorRecipeManager; +import forestry.factory.recipes.FabricatorSmeltingRecipeManager; import forestry.factory.recipes.FermenterRecipeManager; import forestry.factory.recipes.MoistenerRecipeManager; import forestry.factory.recipes.SqueezerRecipeManager; @@ -94,6 +95,7 @@ public class PluginFactory extends ForestryPlugin { RecipeManagers.carpenterManager = new CarpenterRecipeManager(), RecipeManagers.centrifugeManager = new CentrifugeRecipeManager(), RecipeManagers.fabricatorManager = new FabricatorRecipeManager(), + RecipeManagers.fabricatorSmeltingManager = new FabricatorSmeltingRecipeManager(), RecipeManagers.fermenterManager = new FermenterRecipeManager(), RecipeManagers.moistenerManager = new MoistenerRecipeManager(), RecipeManagers.squeezerManager = new SqueezerRecipeManager(), @@ -116,6 +118,7 @@ public class PluginFactory extends ForestryPlugin { RecipeManagers.carpenterManager = new DummyManagers.DummyCarpenterManager(), RecipeManagers.centrifugeManager = new DummyManagers.DummyCentrifugeManager(), RecipeManagers.fabricatorManager = new DummyManagers.DummyFabricatorManager(), + RecipeManagers.fabricatorSmeltingManager = new DummyManagers.DummyFabricatorSmeltingManager(), RecipeManagers.fermenterManager = new DummyManagers.DummyFermenterManager(), RecipeManagers.moistenerManager = new DummyManagers.DummyMoistenerManager(), RecipeManagers.squeezerManager = new DummyManagers.DummySqueezerManager(), @@ -370,9 +373,9 @@ public class PluginFactory extends ForestryPlugin { // FABRICATOR - RecipeManagers.fabricatorManager.addSmelting(new ItemStack(Blocks.glass), Fluids.GLASS.getFluid(1000), 1000); - RecipeManagers.fabricatorManager.addSmelting(new ItemStack(Blocks.glass_pane), Fluids.GLASS.getFluid(375), 1000); - RecipeManagers.fabricatorManager.addSmelting(new ItemStack(Blocks.sand), Fluids.GLASS.getFluid(1000), 3000); + RecipeManagers.fabricatorSmeltingManager.addSmelting(new ItemStack(Blocks.glass), Fluids.GLASS.getFluid(1000), 1000); + RecipeManagers.fabricatorSmeltingManager.addSmelting(new ItemStack(Blocks.glass_pane), Fluids.GLASS.getFluid(375), 1000); + RecipeManagers.fabricatorSmeltingManager.addSmelting(new ItemStack(Blocks.sand), Fluids.GLASS.getFluid(1000), 3000); // / CARPENTER RecipeManagers.carpenterManager.addRecipe(50, Fluids.SEEDOIL.getFluid(250), null, ForestryItem.impregnatedCasing.getItemStack(),