mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-22 13:09:47 +00:00
Fix fluid containers
This commit is contained in:
1 parent
cdea827464
commit
923d3791cd
49 files changed
+397
-268
No files matched your search
@@ -2,7 +2,7 @@ package binnie.extratrees.alcohol;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.Constants;
|
||||
import binnie.core.liquid.FluidContainer;
|
||||
import binnie.core.liquid.FluidContainerType;
|
||||
import binnie.core.liquid.IFluidType;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
@@ -36,7 +36,7 @@ public enum Liqueur implements IFluidType, ICocktailLiquid {
|
||||
}
|
||||
|
||||
Liqueur(final String name, final int colour, final double transparency, final double abv) {
|
||||
this(name + " Liqueur", "liqueur" + name, colour, transparency, abv);
|
||||
this(name + " Liqueur", "liqueur." + name.toLowerCase(), colour, transparency, abv);
|
||||
}
|
||||
|
||||
Liqueur(final String name, final String ident, final int colour, final double transparency, final double abv) {
|
||||
@@ -53,13 +53,13 @@ public enum Liqueur implements IFluidType, ICocktailLiquid {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canPlaceIn(final FluidContainer container) {
|
||||
public boolean canPlaceIn(final FluidContainerType container) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean showInCreative(final FluidContainer container) {
|
||||
return container == FluidContainer.Glass;
|
||||
public boolean showInCreative(final FluidContainerType container) {
|
||||
return container == FluidContainerType.GLASS;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -73,7 +73,7 @@ public enum Liqueur implements IFluidType, ICocktailLiquid {
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
public String getDisplayName() {
|
||||
return this.name;
|
||||
}
|
||||
|
||||
@@ -99,7 +99,7 @@ public enum Liqueur implements IFluidType, ICocktailLiquid {
|
||||
|
||||
@Override
|
||||
public String getTooltip(final int ratio) {
|
||||
return ratio + " Part" + ((ratio > 1) ? "s " : " ") + this.getName();
|
||||
return ratio + " Part" + ((ratio > 1) ? "s " : " ") + this.getDisplayName();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user