mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-20 20:22:35 +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 binnie.extratrees.ExtraTrees;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
@@ -12,35 +12,35 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public enum Alcohol implements IFluidType, ICocktailLiquid {
|
||||
Apple("ciderApple", 16432700, 0.3, 0.05),
|
||||
Apricot("wineApricot", 15781686, 0.3, 0.1),
|
||||
Banana("wineBanana", 14993485, 0.3, 0.1),
|
||||
Cherry("wineCherry", 11207702, 0.3, 0.1),
|
||||
Elderberry("wineElderberry", 9764865, 0.3, 0.1),
|
||||
Peach("ciderPeach", 15361563, 0.3, 0.05),
|
||||
Pear("ciderPear", 15061095, 0.3, 0.05),
|
||||
Plum("winePlum", 12063752, 0.3, 0.1),
|
||||
Carrot("wineCarrot", 16219394, 0.3, 0.1),
|
||||
WhiteWine("wineWhite", 15587989, 0.1, 0.1),
|
||||
RedWine("wineRed", 7670539, 0.2, 0.1),
|
||||
SparklingWine("wineSparkling", 16709566, 0.1, 0.1),
|
||||
Agave("wineAgave", 13938276, 0.2, 0.1),
|
||||
Potato("fermentedPotatoes", 12028240, 0.8, 0.1),
|
||||
Citrus("wineCitrus", 16776960, 0.2, 0.1),
|
||||
Cranberry("wineCranberry", 11599874, 0.2, 0.1),
|
||||
Pineapple("winePineapple", 14724150, 0.2, 0.1),
|
||||
Tomato("wineTomato", 12458521, 0.2, 0.1),
|
||||
Apple("cider.apple", 16432700, 0.3, 0.05),
|
||||
Apricot("wine.apricot", 15781686, 0.3, 0.1),
|
||||
Banana("wine.banana", 14993485, 0.3, 0.1),
|
||||
Cherry("wine.cherry", 11207702, 0.3, 0.1),
|
||||
Elderberry("wine.elderberry", 9764865, 0.3, 0.1),
|
||||
Peach("cider.peach", 15361563, 0.3, 0.05),
|
||||
Pear("ciderpear", 15061095, 0.3, 0.05),
|
||||
Plum("wine.plum", 12063752, 0.3, 0.1),
|
||||
Carrot("wine.carrot", 16219394, 0.3, 0.1),
|
||||
WhiteWine("wine.white", 15587989, 0.1, 0.1),
|
||||
RedWine("wine.red", 7670539, 0.2, 0.1),
|
||||
SparklingWine("wine.sparkling", 16709566, 0.1, 0.1),
|
||||
Agave("wine.agave", 13938276, 0.2, 0.1),
|
||||
Potato("fermented.potatoes", 12028240, 0.8, 0.1),
|
||||
Citrus("wine.citrus", 16776960, 0.2, 0.1),
|
||||
Cranberry("wine.cranberry", 11599874, 0.2, 0.1),
|
||||
Pineapple("wine.pineapple", 14724150, 0.2, 0.1),
|
||||
Tomato("wine.tomato", 12458521, 0.2, 0.1),
|
||||
Fruit("juice", 16432700, 0.2, 0.1),
|
||||
Ale("beerAle", 12991009, 0.7, 0.05),
|
||||
Lager("beerLager", 15301637, 0.7, 0.05),
|
||||
WheatBeer("beerWheat", 14380552, 0.7, 0.05),
|
||||
RyeBeer("beerRye", 10836007, 0.7, 0.05),
|
||||
CornBeer("beerCorn", 13411364, 0.7, 0.05),
|
||||
Stout("beerStout", 5843201, 0.8, 0.05),
|
||||
Barley("mashGrain", 12991009, 0.9, 0.05),
|
||||
Wheat("mashWheat", 12991009, 0.9, 0.05),
|
||||
Rye("mashRye", 10836007, 0.9, 0.05),
|
||||
Corn("mashCorn", 13411364, 0.9, 0.05);
|
||||
Ale("beer.ale", 12991009, 0.7, 0.05),
|
||||
Lager("beer.lager", 15301637, 0.7, 0.05),
|
||||
WheatBeer("beer.wheat", 14380552, 0.7, 0.05),
|
||||
RyeBeer("beer.rye", 10836007, 0.7, 0.05),
|
||||
CornBeer("beer.corn", 13411364, 0.7, 0.05),
|
||||
Stout("beer.stout", 5843201, 0.8, 0.05),
|
||||
Barley("mash.grain", 12991009, 0.9, 0.05),
|
||||
Wheat("mash.wheat", 12991009, 0.9, 0.05),
|
||||
Rye("mash.rye", 10836007, 0.9, 0.05),
|
||||
Corn("mash.corn", 13411364, 0.9, 0.05);
|
||||
|
||||
List<String> fermentationLiquid;
|
||||
String fermentationSolid;
|
||||
@@ -68,7 +68,7 @@ public enum Alcohol implements IFluidType, ICocktailLiquid {
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return this.getName();
|
||||
return this.getDisplayName();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -82,7 +82,7 @@ public enum Alcohol implements IFluidType, ICocktailLiquid {
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
public String getDisplayName() {
|
||||
return ExtraTrees.proxy.localise("fluid.alcohol." + this.name().toLowerCase());
|
||||
}
|
||||
|
||||
@@ -108,17 +108,17 @@ public enum Alcohol 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
|
||||
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
|
||||
|
||||
@@ -72,7 +72,7 @@ public enum Cocktail {
|
||||
|
||||
public static void registerIngredient(final ICocktailIngredient ingredient) {
|
||||
Cocktail.cocktailIngredients.put(ingredient.getIdentifier().toLowerCase(), ingredient);
|
||||
DrinkManager.registerDrinkLiquid(ingredient.getIdentifier().toLowerCase(), new DrinkLiquid(ingredient.getName(), ingredient.getColour(), ingredient.getTransparency(), ingredient.getABV()));
|
||||
DrinkManager.registerDrinkLiquid(ingredient.getIdentifier().toLowerCase(), new DrinkLiquid(ingredient.getDisplayName(), ingredient.getColour(), ingredient.getTransparency(), ingredient.getABV()));
|
||||
}
|
||||
|
||||
public static ICocktailIngredient getIngredient(final String name2) {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package binnie.extratrees.alcohol;
|
||||
|
||||
public interface ICocktailIngredient {
|
||||
String getName();
|
||||
String getDisplayName();
|
||||
|
||||
String getIdentifier();
|
||||
|
||||
|
||||
@@ -2,31 +2,31 @@ 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;
|
||||
|
||||
public enum Juice implements IFluidType, ICocktailLiquid {
|
||||
Apple("Apple Juice", "juiceApple", 16763442, 0.7, "Apple"),
|
||||
Apricot("Apricot Juice", "juiceApricot", 16758046, 0.6, "Apricot"),
|
||||
Banana("Banana Juice", "juiceBanana", 15324291, 0.6, "Banana"),
|
||||
Cherry("Cherry Juice", "juiceCherry", 13044511, 0.6, "Cherry"),
|
||||
Elderberry("Elderberry Juice", "juiceElderberry", 4204073, 0.6, "Elderberry"),
|
||||
Lemon("Lemon Juice", "juiceLemon", 14604882, 0.7, "Lemon"),
|
||||
Lime("Lime Juice", "juiceLime", 12177007, 0.6, "Lime"),
|
||||
Orange("Orange Juice", "juiceOrange", 16359983, 0.8, "Orange"),
|
||||
Peach("Peach Juice", "juicePeach", 16434525, 0.7, "Peach"),
|
||||
Plum("Plum Juice", "juicePlum", 10559249, 0.7, "Plum"),
|
||||
Carrot("Carrot Juice", "juiceCarrot", 16485911, 0.7, "Carrot"),
|
||||
Tomato("Tomato Juice", "juiceTomato", 12731438, 0.7, "Tomato"),
|
||||
Cranberry("Cranberry Juice", "juiceCranberry", 12920629, 0.7, "Cranberry"),
|
||||
Grapefruit("Grapefruit Juice", "juiceGrapefruit", 15897173, 0.6, "Grapefruit"),
|
||||
Olive("Olive Oil", "juiceOlive", 16042240, 0.6, "Olive"),
|
||||
Pineapple("Pineapple Juice", "juicePineapple", 15189319, 0.6, "Pineapple"),
|
||||
Pear("Pear Juice", "juicePear", 14204773, 0.6, "Pear"),
|
||||
WhiteGrape("White Grape Juice", "juiceWhiteGrape", 16507769, 0.6, "WhiteGrape"),
|
||||
RedGrape("Red Grape Juice", "juiceRedGrape", 9775412, 0.6, "RedGrape");
|
||||
Apple("Apple Juice", "juice.apple", 16763442, 0.7, "Apple"),
|
||||
Apricot("Apricot Juice", "juice.apricot", 16758046, 0.6, "Apricot"),
|
||||
Banana("Banana Juice", "juice.banana", 15324291, 0.6, "Banana"),
|
||||
Cherry("Cherry Juice", "juice.cherry", 13044511, 0.6, "Cherry"),
|
||||
Elderberry("Elderberry Juice", "juice.elderberry", 4204073, 0.6, "Elderberry"),
|
||||
Lemon("Lemon Juice", "juice.lemon", 14604882, 0.7, "Lemon"),
|
||||
Lime("Lime Juice", "juice.lime", 12177007, 0.6, "Lime"),
|
||||
Orange("Orange Juice", "juice.orange", 16359983, 0.8, "Orange"),
|
||||
Peach("Peach Juice", "juice.peach", 16434525, 0.7, "Peach"),
|
||||
Plum("Plum Juice", "juice.plum", 10559249, 0.7, "Plum"),
|
||||
Carrot("Carrot Juice", "juice.carrot", 16485911, 0.7, "Carrot"),
|
||||
Tomato("Tomato Juice", "juice.tomato", 12731438, 0.7, "Tomato"),
|
||||
Cranberry("Cranberry Juice", "juice.cranberry", 12920629, 0.7, "Cranberry"),
|
||||
Grapefruit("Grapefruit Juice", "juice.grapefruit", 15897173, 0.6, "Grapefruit"),
|
||||
Olive("Olive Oil", "juice.olive", 16042240, 0.6, "Olive"),
|
||||
Pineapple("Pineapple Juice", "juice.pineapple", 15189319, 0.6, "Pineapple"),
|
||||
Pear("Pear Juice", "juice.pear", 14204773, 0.6, "Pear"),
|
||||
WhiteGrape("White Grape Juice", "juice.white.grape", 16507769, 0.6, "WhiteGrape"),
|
||||
RedGrape("Red Grape Juice", "juice.red.grape", 9775412, 0.6, "RedGrape");
|
||||
|
||||
String name;
|
||||
String ident;
|
||||
@@ -53,13 +53,13 @@ public enum Juice 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;
|
||||
}
|
||||
|
||||
|
||||
@@ -74,7 +74,7 @@ public enum Juice implements IFluidType, ICocktailLiquid {
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
public String getDisplayName() {
|
||||
return this.name;
|
||||
}
|
||||
|
||||
@@ -100,7 +100,7 @@ public enum Juice 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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,13 +36,13 @@ public enum MiscFluid 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
|
||||
@@ -56,7 +56,7 @@ public enum MiscFluid implements IFluidType, ICocktailLiquid {
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
public String getDisplayName() {
|
||||
return this.name;
|
||||
}
|
||||
|
||||
@@ -82,7 +82,7 @@ public enum MiscFluid 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
|
||||
|
||||
@@ -41,10 +41,10 @@ public class ModuleAlcohol implements IInitializable {
|
||||
this.drink = new ItemDrink();
|
||||
ExtraTrees.proxy.registerItem(drink);
|
||||
//BinnieCore.proxy.registerCustomItemRenderer(ExtraTrees.drink, new CocktailRenderer());
|
||||
Binnie.LIQUID.createLiquids(Juice.values(), ItemFluidContainer.LiquidJuice);
|
||||
Binnie.LIQUID.createLiquids(Alcohol.values(), ItemFluidContainer.LiquidAlcohol);
|
||||
Binnie.LIQUID.createLiquids(Spirit.values(), ItemFluidContainer.LiquidSpirit);
|
||||
Binnie.LIQUID.createLiquids(Liqueur.values(), ItemFluidContainer.LiquidLiqueuer);
|
||||
Binnie.LIQUID.createLiquids(Juice.values());
|
||||
Binnie.LIQUID.createLiquids(Alcohol.values());
|
||||
Binnie.LIQUID.createLiquids(Spirit.values());
|
||||
Binnie.LIQUID.createLiquids(Liqueur.values());
|
||||
for (final Juice juice : Juice.values()) {
|
||||
Cocktail.registerIngredient(juice);
|
||||
}
|
||||
|
||||
@@ -2,39 +2,39 @@ 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;
|
||||
|
||||
public enum Spirit implements IFluidType, ICocktailLiquid {
|
||||
NeutralSpirit("Neutral Spirit", "spiritNeutral", 16777215, 0.05, 0.8),
|
||||
NeutralSpirit("Neutral Spirit", "spirit.neutral", 16777215, 0.05, 0.8),
|
||||
Vodka("Vodka", "vodka", 16053751, 0.05, 0.4),
|
||||
WhiteRum("White Rum", "rumWhite", 15132132, 0.05, 0.4),
|
||||
DarkRum("Dark Rum", "rumDark", 11018752, 0.4, 0.4),
|
||||
WhiteRum("White Rum", "rum.white", 15132132, 0.05, 0.4),
|
||||
DarkRum("Dark Rum", "rum.dark", 11018752, 0.4, 0.4),
|
||||
Whiskey("Whiskey", "whiskey", 13594368, 0.2, 0.4),
|
||||
CornWhiskey("Bourbon", "whiskeyCorn", 9835009, 0.2, 0.4),
|
||||
RyeWhiskey("Rye Whiskey", "whiskeyRye", 16085800, 0.2, 0.4),
|
||||
WheatWhiskey("Wheat Whiskey", "whiskeyWheat", 14976530, 0.2, 0.4),
|
||||
FortifiedWine("Fortified Wine", "wineFortified", 15569439, 0.2, 0.2),
|
||||
CornWhiskey("Bourbon", "whiskey.corn", 9835009, 0.2, 0.4),
|
||||
RyeWhiskey("Rye Whiskey", "whiskey.rye", 16085800, 0.2, 0.4),
|
||||
WheatWhiskey("Wheat Whiskey", "whiskey.wheat", 14976530, 0.2, 0.4),
|
||||
FortifiedWine("Fortified Wine", "wine.fortified", 15569439, 0.2, 0.2),
|
||||
Tequila("Tequila", "tequila", 16116160, 0.05, 0.4),
|
||||
Brandy("Brandy", "brandyGrape", 16228128, 0.2, 0.4),
|
||||
AppleBrandy("Apple Brandy", "brandyApple", 14985790, 0.2, 0.4),
|
||||
PearBrandy("Pear Brandy", "brandyPear", 16696883, 0.2, 0.4),
|
||||
ApricotBrandy("Apricot Brandy", "brandyApricot", 13336387, 0.2, 0.4),
|
||||
PlumBrandy("Plum Brandy", "brandyPlum", 9511697, 0.2, 0.4),
|
||||
CherryBrandy("Cherry Brandy", "brandyCherry", 8588062, 0.2, 0.4),
|
||||
ElderberryBrandy("Elderberry Brandy", "brandyElderberry", 12462919, 0.2, 0.4),
|
||||
CitrusBrandy("Citrus Brandy", "brandyCitrus", 13336387, 0.2, 0.4),
|
||||
FruitBrandy("Fruit Brandy", "brandyFruit", 14985790, 0.2, 0.4),
|
||||
Cachaca("Cachaca", "spiritSugarcane", 15331535, 0.1, 0.4),
|
||||
Gin("Gin", "spiritGin", 16185078, 0.05, 0.4),
|
||||
AppleLiquor("Apple Liquor", "liquorApple", 13421772, 0.05, 0.4),
|
||||
PearLiquor("Pear Liquor", "liquorPear", 13421772, 0.05, 0.4),
|
||||
CherryLiquor("Cherry Liquor", "liquorCherry", 13421772, 0.05, 0.4),
|
||||
ElderberryLiquor("Elderberry Liquor", "liquorElderberry", 13421772, 0.05, 0.4),
|
||||
ApricotLiquor("Apricot Liquor", "liquorApricot", 13421772, 0.05, 0.4),
|
||||
FruitLiquor("Fruit Liquor", "liquorFruit", 13421772, 0.05, 0.4);
|
||||
Brandy("Brandy", "brandy.grape", 16228128, 0.2, 0.4),
|
||||
AppleBrandy("Apple Brandy", "brandy.apple", 14985790, 0.2, 0.4),
|
||||
PearBrandy("Pear Brandy", "brandy.pear", 16696883, 0.2, 0.4),
|
||||
ApricotBrandy("Apricot Brandy", "brandy.apricot", 13336387, 0.2, 0.4),
|
||||
PlumBrandy("Plum Brandy", "brandy.plum", 9511697, 0.2, 0.4),
|
||||
CherryBrandy("Cherry Brandy", "brandy.cherry", 8588062, 0.2, 0.4),
|
||||
ElderberryBrandy("Elderberry Brandy", "brandy.elderberry", 12462919, 0.2, 0.4),
|
||||
CitrusBrandy("Citrus Brandy", "brandy.citrus", 13336387, 0.2, 0.4),
|
||||
FruitBrandy("Fruit Brandy", "brandy.fruit", 14985790, 0.2, 0.4),
|
||||
Cachaca("Cachaca", "spirit.sugarcane", 15331535, 0.1, 0.4),
|
||||
Gin("Gin", "spirit.gin", 16185078, 0.05, 0.4),
|
||||
AppleLiquor("Apple Liquor", "liquor.apple", 13421772, 0.05, 0.4),
|
||||
PearLiquor("Pear Liquor", "liquor.pear", 13421772, 0.05, 0.4),
|
||||
CherryLiquor("Cherry Liquor", "liquor.cherry", 13421772, 0.05, 0.4),
|
||||
ElderberryLiquor("Elderberry Liquor", "liquor.elderberry", 13421772, 0.05, 0.4),
|
||||
ApricotLiquor("Apricot Liquor", "liquor.apricot", 13421772, 0.05, 0.4),
|
||||
FruitLiquor("Fruit Liquor", "liquor.fruit", 13421772, 0.05, 0.4);
|
||||
|
||||
String name;
|
||||
String ident;
|
||||
@@ -56,13 +56,13 @@ public enum Spirit 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
|
||||
@@ -76,7 +76,7 @@ public enum Spirit implements IFluidType, ICocktailLiquid {
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
public String getDisplayName() {
|
||||
return this.name;
|
||||
}
|
||||
|
||||
@@ -102,7 +102,7 @@ public enum Spirit 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
|
||||
|
||||
@@ -66,6 +66,11 @@ public enum EnumETLog implements IWoodType {
|
||||
public String getName() {
|
||||
return name().toLowerCase();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return getName();
|
||||
}
|
||||
|
||||
public String getDisplayName() {
|
||||
return this.name;
|
||||
|
||||
@@ -2,6 +2,7 @@ package binnie.extratrees.carpentry;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.core.block.TileEntityMetadata;
|
||||
import binnie.core.models.ModelMutlipass;
|
||||
import binnie.extratrees.ExtraTrees;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
|
||||
@@ -101,12 +101,14 @@ public class CarpentryInterface implements ICarpentryInterface {
|
||||
return null;
|
||||
}
|
||||
for (final Map.Entry<Integer, IDesignMaterial> entry : CarpentryInterface.woodMap.entrySet()) {
|
||||
final ItemStack key = entry.getValue().getStack();
|
||||
if (key == null) {
|
||||
continue;
|
||||
}
|
||||
if (key.isItemEqual(stack)) {
|
||||
return entry.getValue();
|
||||
for(boolean fireproof : new boolean[]{true, false}){
|
||||
final ItemStack key = entry.getValue().getStack(fireproof);
|
||||
if (key == null) {
|
||||
continue;
|
||||
}
|
||||
if (key.isItemEqual(stack)) {
|
||||
return entry.getValue();
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
|
||||
@@ -2,7 +2,7 @@ package binnie.extratrees.item;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.Constants;
|
||||
import binnie.core.liquid.FluidContainer;
|
||||
import binnie.core.liquid.FluidContainerType;
|
||||
import binnie.core.liquid.ILiquidType;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
@@ -35,7 +35,7 @@ public enum ExtraTreeLiquid implements ILiquidType {
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
public String getDisplayName() {
|
||||
return this.name;
|
||||
}
|
||||
|
||||
@@ -60,13 +60,13 @@ public enum ExtraTreeLiquid implements ILiquidType {
|
||||
}
|
||||
|
||||
@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.Can || container == FluidContainer.Capsule;
|
||||
public boolean showInCreative(final FluidContainerType container) {
|
||||
return container == FluidContainerType.CAN || container == FluidContainerType.CAPSULE;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -44,7 +44,7 @@ public class ModuleItems implements IInitializable {
|
||||
itemDictionaryLepi = new ItemMothDatabase();
|
||||
ExtraTrees.proxy.registerItem(itemDictionaryLepi);
|
||||
}
|
||||
Binnie.LIQUID.createLiquids(ExtraTreeLiquid.values(), ItemFluidContainer.LiquidExtraTree);
|
||||
Binnie.LIQUID.createLiquids(ExtraTreeLiquid.values());
|
||||
itemFood = new ItemETFood();
|
||||
ExtraTrees.proxy.registerItem(itemFood);
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@ package binnie.extratrees.machines;
|
||||
|
||||
import binnie.core.machines.inventory.SlotValidator;
|
||||
import binnie.extratrees.api.IDesignMaterial;
|
||||
import forestry.core.models.baker.ModelBaker;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class Validators {
|
||||
|
||||
Reference in new issue
Block a user