Filtered tanks accept multiple fluids. Tooltip lists all accepted fluids

This commit is contained in:
mezz committed 2014-09-18 02:04:28 -07:00
1 parent 07b5e04513
commit 240fdedaeb
2 files changed
+41 -22

No files matched your search

@@ -14,7 +14,10 @@ import forestry.core.gui.tooltips.ToolTipLine;
import net.minecraft.item.EnumRarity;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import java.util.Arrays;
import java.util.Collection;
/**
*
@@ -22,15 +25,19 @@ import net.minecraftforge.fluids.FluidStack;
*/
public class FilteredTank extends StandardTank {
private final Fluid filter;
private Collection<Fluid> filters;
public FilteredTank(int capacity, Fluid filter) {
this(capacity, filter, null);
public FilteredTank(int capacity, Fluid... filters) {
this(capacity, Arrays.asList(filters), null);
}
public FilteredTank(int capacity, Fluid filter, TileEntity tile) {
public FilteredTank(int capacity, Collection<Fluid> filters) {
this(capacity, filters, null);
}
public FilteredTank(int capacity, Collection<Fluid> filters, TileEntity tile) {
super(capacity, tile);
this.filter = filter;
this.filters = filters;
}
@Override
@@ -40,30 +47,37 @@ public class FilteredTank extends StandardTank {
return 0;
}
public Fluid getFilter() {
return filter;
}
public boolean accepts(Fluid fluid) {
return filters.contains(fluid);
}
public boolean liquidMatchesFilter(FluidStack resource) {
if (resource == null || filter == null)
if (resource == null || filters == null)
return false;
return resource.getFluid() == filter;
return filters.contains(resource.getFluid());
}
@Override
protected void refreshTooltip() {
if (hasFluid()) {
super.refreshTooltip();
return;
}
toolTip.clear();
int amount = 0;
if (filter != null) {
EnumRarity rarity = filter.getRarity();
if (rarity == null)
rarity = EnumRarity.common;
ToolTipLine name = new ToolTipLine(filter.getLocalizedName(), rarity.rarityColor);
name.setSpacing(2);
toolTip.add(name);
if (getFluid() != null)
amount = getFluid().amount;
}
for (Fluid filter : filters) {
EnumRarity rarity = filter.getRarity();
if (rarity == null)
rarity = EnumRarity.common;
FluidStack filterFluidStack = FluidRegistry.getFluidStack(filter.getName(), 0);
ToolTipLine name = new ToolTipLine(filter.getLocalizedName(filterFluidStack), rarity.rarityColor);
name.setSpacing(2);
toolTip.add(name);
if (getFluid() != null)
amount = getFluid().amount;
}
toolTip.add(new ToolTipLine(String.format("%,d", amount) + " / " + String.format("%,d", getCapacity())));
}
@@ -111,15 +111,20 @@ public class StandardTank extends FluidTank {
return toolTip;
}
protected boolean hasFluid() {
FluidStack fluid = getFluid();
return fluid != null && fluid.amount > 0 && fluid.getFluid() != null;
}
protected void refreshTooltip() {
toolTip.clear();
int amount = 0;
if (getFluid() != null && getFluid().amount > 0 && getFluid().getFluid() != null) {
if (hasFluid()) {
Fluid fluidType = getFluidType();
EnumRarity rarity = fluidType.getRarity();
if (rarity == null)
rarity = EnumRarity.common;
ToolTipLine fluidName = new ToolTipLine(fluidType.getLocalizedName(), rarity.rarityColor);
ToolTipLine fluidName = new ToolTipLine(fluidType.getLocalizedName(getFluid()), rarity.rarityColor);
fluidName.setSpacing(2);
toolTip.add(fluidName);
amount = getFluid().amount;