mirror of
https://github.com/GTNewHorizons/ForestryMC.git
synced 2026-11-19 19:49:54 +00:00
Fix #949 Fluid not accepted by carpenter when some recipes are removed
This commit is contained in:
1 parent
0713e0ea9c
commit
90c9050e80
3 files changed
+21
-20
No files matched your search
@@ -32,7 +32,7 @@ import forestry.core.utils.StringUtil;
|
||||
*/
|
||||
public class FilteredTank extends StandardTank {
|
||||
|
||||
private final Set<Integer> filters; // FluidIDs
|
||||
private final Set<Integer> 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<Fluid> 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<Fluid> filters) {
|
||||
this.filters.clear();
|
||||
for (Fluid fluid : filters) {
|
||||
this.filters.add(fluid.getID());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -32,7 +32,7 @@ import forestry.core.utils.ItemStackUtil;
|
||||
public class CarpenterRecipeManager implements ICarpenterManager {
|
||||
|
||||
private static final Set<ICarpenterRecipe> recipes = new HashSet<>();
|
||||
public static final Set<Fluid> recipeFluids = new HashSet<>();
|
||||
private static final Set<Fluid> 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<Fluid> 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<ICarpenterRecipe> recipes() {
|
||||
return Collections.unmodifiableSet(recipes);
|
||||
|
||||
@@ -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();
|
||||
|
||||
Reference in new issue
Block a user