diff --git a/src/main/java/forestry/core/fluids/tanks/FilteredTank.java b/src/main/java/forestry/core/fluids/tanks/FilteredTank.java index 9e7e2d715..c595aa4c5 100644 --- a/src/main/java/forestry/core/fluids/tanks/FilteredTank.java +++ b/src/main/java/forestry/core/fluids/tanks/FilteredTank.java @@ -32,7 +32,7 @@ import forestry.core.utils.StringUtil; */ public class FilteredTank extends StandardTank { - private final Set filters; // FluidIDs + private final Set filters = new HashSet<>(); // FluidIDs public FilteredTank(int capacity, Fluid... filters) { this(capacity, Arrays.asList(filters), null); @@ -44,15 +44,13 @@ public class FilteredTank extends StandardTank { public FilteredTank(int capacity, Collection filters, TileEntity tile) { super(capacity, tile); - this.filters = new HashSet<>(); - for (Fluid fluid : filters) { - addFilter(fluid); - } + setFilters(filters); } - public void addFilter(Fluid filter) { - if (!accepts(filter)) { - filters.add(filter.getID()); + public void setFilters(Collection filters) { + this.filters.clear(); + for (Fluid fluid : filters) { + this.filters.add(fluid.getID()); } } diff --git a/src/main/java/forestry/factory/recipes/CarpenterRecipeManager.java b/src/main/java/forestry/factory/recipes/CarpenterRecipeManager.java index 994e4cf27..54f14727f 100644 --- a/src/main/java/forestry/factory/recipes/CarpenterRecipeManager.java +++ b/src/main/java/forestry/factory/recipes/CarpenterRecipeManager.java @@ -32,7 +32,7 @@ import forestry.core.utils.ItemStackUtil; public class CarpenterRecipeManager implements ICarpenterManager { private static final Set recipes = new HashSet<>(); - public static final Set recipeFluids = new HashSet<>(); + private static final Set recipeFluids = new HashSet<>(); @Override public void addRecipe(ItemStack box, ItemStack product, Object materials[]) { @@ -97,11 +97,6 @@ public class CarpenterRecipeManager implements ICarpenterManager { @Override public boolean addRecipe(ICarpenterRecipe recipe) { - FluidStack fluidStack = recipe.getFluidResource(); - if (fluidStack != null) { - recipeFluids.add(fluidStack.getFluid()); - } - return recipes.add(recipe); } @@ -109,14 +104,23 @@ public class CarpenterRecipeManager implements ICarpenterManager { public boolean removeRecipe(ICarpenterRecipe recipe) { boolean removed = recipes.remove(recipe); if (removed) { - FluidStack fluidStack = recipe.getFluidResource(); - if (fluidStack != null) { - recipeFluids.remove(fluidStack.getFluid()); - } + recipeFluids.clear(); } return removed; } + public static Set getRecipeFluids() { + if (recipeFluids.isEmpty()) { + for (ICarpenterRecipe recipe : recipes) { + FluidStack fluidStack = recipe.getFluidResource(); + if (fluidStack != null) { + recipeFluids.add(fluidStack.getFluid()); + } + } + } + return Collections.unmodifiableSet(recipeFluids); + } + @Override public Set recipes() { return Collections.unmodifiableSet(recipes); diff --git a/src/main/java/forestry/factory/tiles/TileCarpenter.java b/src/main/java/forestry/factory/tiles/TileCarpenter.java index 6af5f2e01..6a520c14a 100644 --- a/src/main/java/forestry/factory/tiles/TileCarpenter.java +++ b/src/main/java/forestry/factory/tiles/TileCarpenter.java @@ -12,7 +12,6 @@ package forestry.factory.tiles; import javax.annotation.Nullable; import java.io.IOException; -import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -68,7 +67,7 @@ public class TileCarpenter extends TilePowered implements ISidedInventory, ILiqu public TileCarpenter() { super(GuiId.CarpenterGUI, "carpenter", 1100, 4000); setEnergyPerWorkCycle(ENERGY_PER_WORK_CYCLE); - resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, CarpenterRecipeManager.recipeFluids); + resourceTank = new FilteredTank(Constants.PROCESSOR_TANK_CAPACITY, CarpenterRecipeManager.getRecipeFluids()); craftingInventory = new InventoryAdapterTile<>(this, 10, "CraftItems"); craftPreviewInventory = new InventoryCraftResult();