diff --git a/src/main/java/forestry/factory/recipes/FabricatorSmeltingRecipeManager.java b/src/main/java/forestry/factory/recipes/FabricatorSmeltingRecipeManager.java index 647eb38a8..2c06d0cb3 100644 --- a/src/main/java/forestry/factory/recipes/FabricatorSmeltingRecipeManager.java +++ b/src/main/java/forestry/factory/recipes/FabricatorSmeltingRecipeManager.java @@ -16,14 +16,18 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; +import net.minecraft.item.ItemStack; + +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + import forestry.api.recipes.IFabricatorSmeltingManager; import forestry.api.recipes.IFabricatorSmeltingRecipe; import forestry.core.utils.ItemStackUtil; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; public class FabricatorSmeltingRecipeManager implements IFabricatorSmeltingManager { public static final Set recipes = new HashSet<>(); + private static final Set recipeFluids = new HashSet<>(); @Nullable public static IFabricatorSmeltingRecipe findMatchingSmelting(ItemStack resource) { @@ -59,4 +63,16 @@ public class FabricatorSmeltingRecipeManager implements IFabricatorSmeltingManag public Collection recipes() { return Collections.unmodifiableSet(recipes); } + + public static Set getRecipeFluids() { + if (recipeFluids.isEmpty()) { + for (IFabricatorSmeltingRecipe recipe : recipes) { + FluidStack fluidStack = recipe.getProduct(); + if (fluidStack != null) { + recipeFluids.add(fluidStack.getFluid()); + } + } + } + return Collections.unmodifiableSet(recipeFluids); + } } diff --git a/src/main/java/forestry/factory/tiles/TileFabricator.java b/src/main/java/forestry/factory/tiles/TileFabricator.java index e1ca5651b..331139f77 100755 --- a/src/main/java/forestry/factory/tiles/TileFabricator.java +++ b/src/main/java/forestry/factory/tiles/TileFabricator.java @@ -29,6 +29,7 @@ import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; + import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -37,7 +38,6 @@ import forestry.api.recipes.IFabricatorRecipe; import forestry.api.recipes.IFabricatorSmeltingRecipe; import forestry.core.errors.EnumErrorCode; import forestry.core.fluids.FilteredTank; -import forestry.core.fluids.Fluids; import forestry.core.fluids.TankManager; import forestry.core.inventory.IInventoryAdapter; import forestry.core.inventory.InventoryAdapter; @@ -72,7 +72,7 @@ public class TileFabricator extends TilePowered implements ISlotPickupWatcher, I craftingInventory = new InventoryGhostCrafting<>(this, InventoryGhostCrafting.SLOT_CRAFTING_COUNT); setInternalInventory(new InventoryFabricator(this)); - moltenTank = new FilteredTank(8 * Fluid.BUCKET_VOLUME, false, false).setFilters(Fluids.GLASS.getFluid()); + moltenTank = new FilteredTank(8 * Fluid.BUCKET_VOLUME, false, false).setFilters(FabricatorSmeltingRecipeManager.getRecipeFluids()); tankManager = new TankManager(this, moltenTank); }