Fix fluid containers

This commit is contained in:
Nedelosk committed 2017-01-25 20:58:11 +01:00
1 parent cdea827464
commit 923d3791cd
49 files changed
+397 -268

No files matched your search

+3 -6
View File
@@ -9,7 +9,7 @@ import binnie.core.gui.IBinnieGUID;
import binnie.core.item.ItemFieldKit;
import binnie.core.item.ItemGenesis;
import binnie.core.item.ModuleItems;
import binnie.core.liquid.FluidContainer;
import binnie.core.liquid.FluidContainerType;
import binnie.core.liquid.ItemFluidContainer;
import binnie.core.machines.MachineGroup;
import binnie.core.machines.storage.ModuleStorage;
@@ -69,8 +69,8 @@ public final class BinnieCore extends AbstractMod {
public void preInit(final FMLPreInitializationEvent evt) {
MinecraftForge.EVENT_BUS.register(Binnie.LIQUID);
Binnie.CONFIGURATION.registerConfiguration(ConfigurationMods.class, this);
for (final FluidContainer container : FluidContainer.values()) {
final Item item = new ItemFluidContainer(container);
for (FluidContainerType container : FluidContainerType.getBinnieContainers()) {
Item item = new ItemFluidContainer(container);
BinnieCore.proxy.registerItem(item);
}
this.preInit();
@@ -82,9 +82,6 @@ public final class BinnieCore extends AbstractMod {
for (final AbstractMod mod : getActiveMods()) {
NetworkRegistry.INSTANCE.registerGuiHandler(mod, new BinnieGUIHandler(mod));
}
//TODO RENDERING
// BinnieCore.multipassRenderID = RenderingRegistry.getNextAvailableRenderId();
// RenderingRegistry.registerBlockHandler(new MultipassBlockRenderer());
GameRegistry.registerTileEntity(TileEntityMetadata.class, "binnie.tile.metadata");
}
@@ -6,9 +6,9 @@ import net.minecraftforge.fluids.FluidStack;
public class BinnieContainerPermission implements IFluidContainerPermission {
private final FluidContainer container;
private final FluidContainerType container;
public BinnieContainerPermission(FluidContainer container) {
public BinnieContainerPermission(FluidContainerType container) {
this.container = container;
}
@@ -17,7 +17,7 @@ public class BinnieContainerPermission implements IFluidContainerPermission {
Fluid fluid = fluidStack.getFluid();
if(fluid instanceof BinnieFluid){
BinnieFluid binnie = (BinnieFluid) fluid;
return binnie.fluidType.canPlaceIn(container);
return binnie.getType().canPlaceIn(container);
}
return true;
}
@@ -7,7 +7,8 @@ import net.minecraftforge.fluids.FluidStack;
class BinnieFluid extends Fluid {
private final String name;
final IFluidType fluidType;
private final IFluidType fluidType;
private final int color;
@Override
public String getLocalizedName(FluidStack stack) {
@@ -17,13 +18,13 @@ class BinnieFluid extends Fluid {
public BinnieFluid(final IFluidType fluid) {
super(fluid.getIdentifier(), fluid.getStill(), fluid.getFlowing());
this.fluidType = fluid;
this.name = fluid.getName();
this.name = fluid.getDisplayName();
this.color = new Color(this.fluidType.getColour()).getRGB();
}
@Override
public int getColor() {
//use color to set the alpha to 1.0F
return new Color(this.fluidType.getColour()).getRGB();
return color;
}
public IFluidType getType() {
@@ -3,46 +3,41 @@ package binnie.core.liquid;
import binnie.core.BinnieCore;
import binnie.core.Mods;
import binnie.genetics.item.GeneticsItems;
import forestry.api.core.EnumContainerType;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidContainerRegistry;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.FluidUtil;
import net.minecraftforge.fluids.capability.IFluidHandler;
import javax.annotation.Nullable;
public enum FluidContainer {
Capsule,
Refractory,
Can,
Glass,
Cylinder;
public enum FluidContainerType {
CAPSULE,
REFARACTORY,
CAN,
GLASS,
CYLINDER;
// IIcon bottle;
// IIcon contents;
@Nullable
ItemFluidContainer item;
public int getMaxStackSize() {
return 16;
}
// @SideOnly(Side.CLIENT)
// public void updateIcons(final IIconRegister register) {
// this.bottle = BinnieCore.proxy.getIcon(register, (this == FluidContainer.Cylinder) ? "binniecore" : "forestry", "liquids/" + this.toString().toLowerCase() + ".bottle");
// this.contents = BinnieCore.proxy.getIcon(register, (this == FluidContainer.Cylinder) ? "binniecore" : "forestry", "liquids/" + this.toString().toLowerCase() + ".contents");
// }
//
// public IIcon getBottleIcon() {
// return this.bottle;
// }
//
// public IIcon getContentsIcon() {
// return this.contents;
// }
public static FluidContainerType[] getBinnieContainers(){
return new FluidContainerType[]{GLASS, CYLINDER};
}
public String getName() {
return this.name().toLowerCase();
}
public String getDisplayName() {
return BinnieCore.proxy.localise("item.container." + this.name().toLowerCase());
}
@@ -52,19 +47,19 @@ public enum FluidContainer {
public ItemStack getEmpty() {
switch (this) {
case Can: {
case CAN: {
return Mods.Forestry.stack("can");
}
case Capsule: {
case CAPSULE: {
return Mods.Forestry.stack("capsule");
}
case Glass: {
case GLASS: {
return new ItemStack(Items.GLASS_BOTTLE, 1, 0);
}
case Refractory: {
case REFARACTORY: {
return Mods.Forestry.stack("refractory");
}
case Cylinder: {
case CYLINDER: {
return GeneticsItems.Cylinder.get(1);
}
default: {
@@ -78,7 +73,7 @@ public enum FluidContainer {
ItemStack stack = getEmpty();
if (stack != null) {
stack = stack.copy();
IFluidHandler fluidHandler = FluidUtil.getFluidHandler(stack);
IFluidHandler fluidHandler = FluidUtil.getFluidHandler(stack);
if (fluidHandler != null) {
int fill = fluidHandler.fill(new FluidStack(fluid, Integer.MAX_VALUE), true);
if (fill > 0) {
@@ -93,8 +88,11 @@ public enum FluidContainer {
if (!this.isActive()) {
return;
}
final ItemStack filled = this.item.getContainer(fluid);
final ItemStack empty = this.getEmpty();
ItemStack filled = getFilled(FluidRegistry.getFluid(fluid.getIdentifier().toLowerCase()));
if(filled == null){
filled = item.getContainer(fluid);
}
ItemStack empty = this.getEmpty();
if (filled == null || empty == null || fluid.get(1000) == null) {
return;
}
@@ -0,0 +1,45 @@
package binnie.core.liquid;
import forestry.api.core.EnumContainerType;
import forestry.core.items.ItemFluidContainerForestry;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStackSimple;
public class FluidHandlerItemBinnie extends FluidHandlerItemStackSimple.Consumable {
private final FluidContainerType containerType;
public FluidHandlerItemBinnie(ItemStack container, FluidContainerType containerType) {
super(container, Fluid.BUCKET_VOLUME);
this.containerType = containerType;
}
private boolean contentsAllowed(FluidStack fluidStack) {
if (fluidStack == null) {
return false;
}
Fluid fluid = fluidStack.getFluid();
if (fluid == null) {
return false;
}
if(fluid instanceof BinnieFluid) {
BinnieFluid binnieFluid = (BinnieFluid) fluid;
return binnieFluid.getType().canPlaceIn(containerType);
}
return false;
}
@Override
public boolean canFillFluidType(FluidStack fluid) {
return contentsAllowed(fluid);
}
@Override
public boolean canDrainFluidType(FluidStack fluid) {
return contentsAllowed(fluid);
}
}
@@ -9,7 +9,7 @@ public interface IFluidType {
ResourceLocation getStill();
String getName();
String getDisplayName();
String getIdentifier();
@@ -21,7 +21,7 @@ public interface IFluidType {
int getTransparency();
boolean canPlaceIn(final FluidContainer p0);
boolean canPlaceIn(final FluidContainerType p0);
boolean showInCreative(final FluidContainer p0);
boolean showInCreative(final FluidContainerType p0);
}
@@ -4,9 +4,15 @@ import binnie.Binnie;
import binnie.extratrees.alcohol.AlcoholEffect;
import binnie.extratrees.alcohol.drink.DrinkManager;
import binnie.extratrees.alcohol.drink.IDrinkLiquid;
import forestry.api.core.EnumContainerType;
import forestry.api.core.IItemModelRegister;
import forestry.api.core.IModelManager;
import forestry.core.items.FluidHandlerItemForestry;
import forestry.core.items.IColoredItem;
import forestry.core.items.ItemFluidContainerForestry;
import net.minecraft.client.renderer.ItemMeshDefinition;
import net.minecraft.client.renderer.block.model.ModelBakery;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@@ -15,65 +21,50 @@ import net.minecraft.item.EnumAction;
import net.minecraft.item.Item;
import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.util.SoundCategory;
import net.minecraft.world.World;
import net.minecraftforge.client.model.ModelDynBucket;
import net.minecraftforge.client.model.ModelFluid;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.capability.IFluidHandler;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class ItemFluidContainer extends ItemFood implements IItemModelRegister, IColoredItem {
private FluidContainer container;
public static int LiquidExtraBee = 64;
public static int LiquidExtraTree = 128;
public static int LiquidJuice = 256;
public static int LiquidAlcohol = 384;
public static int LiquidSpirit = 512;
public static int LiquidLiqueuer = 640;
public static int LiquidGenetics = 768;
private static Map<Integer, String> idToFluid = new HashMap<>();
private static Map<String, Integer> fluidToID = new HashMap<>();
public class ItemFluidContainer extends ItemFood implements IItemModelRegister {
private final FluidContainerType container;
public static void registerFluid(final IFluidType fluid, final int id) {
ItemFluidContainer.idToFluid.put(id, fluid.getIdentifier().toLowerCase());
ItemFluidContainer.fluidToID.put(fluid.getIdentifier().toLowerCase(), id);
}
public ItemFluidContainer(final FluidContainer container) {
public ItemFluidContainer(final FluidContainerType container) {
super(0, false);
this.container = container;
container.item = this;
this.maxStackSize = container.getMaxStackSize();
this.setHasSubtypes(true);
this.setUnlocalizedName("container" + container.name());
this.setUnlocalizedName("container" + container.getName());
this.setCreativeTab(CreativeTabs.MATERIALS);
setRegistryName(container.name());
setRegistryName(container.getName());
}
private FluidStack getLiquid(final ItemStack stack) {
final String liquid = ItemFluidContainer.idToFluid.get(stack.getItemDamage());
return (liquid == null) ? null : Binnie.LIQUID.getFluidStack(liquid, 1000);
}
// @Override
// @SideOnly(Side.CLIENT)
// public void registerIcons(final IIconRegister register) {
// this.container.updateIcons(register);
// }
@Override
public String getItemStackDisplayName(final ItemStack itemstack) {
if (itemstack == null) {
return "???";
}
final FluidStack fluid = this.getLiquid(itemstack);
FluidStack fluid = getContained(itemstack);
if (fluid == null) {
return "Missing Fluid";
}
return fluid.getFluid().getLocalizedName(fluid) + " " + this.container.getName();
return fluid.getFluid().getLocalizedName(fluid) + " " + this.container.getDisplayName();
}
@Override
@@ -85,34 +76,30 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister,
if (!liquid.showInCreative(this.container)) {
continue;
}
itemList.add(this.getContainer(liquid));
itemList.add(getContainer(liquid));
}
}
protected FluidStack getContained(ItemStack itemStack) {
if (itemStack.stackSize != 1) {
itemStack = itemStack.copy();
itemStack.stackSize = 1;
}
IFluidHandler fluidHandler = new FluidHandlerItemBinnie(itemStack, container);
return fluidHandler.drain(Integer.MAX_VALUE, false);
}
public ItemStack getContainer(final IFluidType liquid) {
final int id = ItemFluidContainer.fluidToID.get(liquid.getIdentifier().toLowerCase());
final ItemStack itemstack = new ItemStack(this, 1, id);
return itemstack;
}
// @Override
// public IIcon getIcon(final ItemStack itemstack, final int j) {
// if (j > 0) {
// return this.container.getBottleIcon();
// }
// return this.container.getContentsIcon();
// }
@Override
public int getColorFromItemstack(ItemStack stack, int tintIndex) {
final FluidStack fluid = this.getLiquid(stack);
if (fluid == null) {
return 16777215;
ItemStack itemStack = new ItemStack(this);
IFluidHandler fluidHandler = new FluidHandlerItemBinnie(itemStack, container);
try{
if (fluidHandler.fill(new FluidStack(FluidRegistry.getFluid(liquid.getIdentifier()), Fluid.BUCKET_VOLUME), true) == Fluid.BUCKET_VOLUME) {
return itemStack;
}
if (tintIndex == 0 && fluid.getFluid() instanceof BinnieFluid) {
return ((BinnieFluid) fluid.getFluid()).fluidType.getContainerColour();
}catch(Exception e){
getClass();
}
return -1;
return container.getEmpty();
}
@Override
@@ -128,9 +115,9 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister,
}
@Override
protected void onFoodEaten(final ItemStack stack, final World world, final EntityPlayer player) {
protected void onFoodEaten(final ItemStack itemStack, final World world, final EntityPlayer player) {
if (!world.isRemote) {
final FluidStack fluid = this.getLiquid(stack);
FluidStack fluid = getContained(itemStack);
final IDrinkLiquid liquid = DrinkManager.getLiquid(fluid);
if (liquid != null) {
AlcoholEffect.makeDrunk(player, liquid.getABV() * fluid.amount);
@@ -145,12 +132,10 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister,
@Override
public EnumAction getItemUseAction(final ItemStack stack) {
return this.isDrinkable(stack) ? EnumAction.DRINK : EnumAction.NONE;
}
@Override
public void registerModel(Item item, IModelManager manager) {
manager.registerItemModel(item, 0);
if(isDrinkable(stack)){
return EnumAction.DRINK;
}
return EnumAction.NONE;
}
@Override
@@ -173,9 +158,38 @@ public class ItemFluidContainer extends ItemFood implements IItemModelRegister,
}
private boolean isDrinkable(final ItemStack stack) {
final FluidStack fluid = this.getLiquid(stack);
final FluidStack fluid = getContained(stack);
final IDrinkLiquid liquid = DrinkManager.getLiquid(fluid);
return liquid != null && liquid.isConsumable();
}
@SideOnly(Side.CLIENT)
@Override
public void registerModel(Item item, IModelManager manager) {
FluidContainerMeshDefinition meshDefinition = new FluidContainerMeshDefinition();
manager.registerItemModel(item, meshDefinition);
ModelBakery.registerItemVariants(item, meshDefinition.location);
}
@Override
public ICapabilityProvider initCapabilities(ItemStack stack, NBTTagCompound nbt){
return new FluidHandlerItemBinnie(stack, container);
}
@SideOnly(Side.CLIENT)
private class FluidContainerMeshDefinition implements ItemMeshDefinition{
final ModelResourceLocation location;
public FluidContainerMeshDefinition() {
this.location = new ModelResourceLocation(getRegistryName(), "inventory");
}
@Override
public ModelResourceLocation getModelLocation(ItemStack stack) {
return location;
}
}
}
@@ -19,30 +19,29 @@ public class ManagerLiquid extends ManagerBase {
public ManagerLiquid() {
this.fluids = new LinkedHashMap<>();
EnumContainerType.CAN.add(new BinnieContainerPermission(FluidContainer.Can));
EnumContainerType.CAPSULE.add(new BinnieContainerPermission(FluidContainer.Capsule));
EnumContainerType.REFRACTORY.add(new BinnieContainerPermission(FluidContainer.Refractory));
EnumContainerType.GLASS.add(new BinnieContainerPermission(FluidContainer.Glass));
EnumContainerType.CAN.add(new BinnieContainerPermission(FluidContainerType.CAN));
EnumContainerType.CAPSULE.add(new BinnieContainerPermission(FluidContainerType.CAPSULE));
EnumContainerType.REFRACTORY.add(new BinnieContainerPermission(FluidContainerType.REFARACTORY));
EnumContainerType.GLASS.add(new BinnieContainerPermission(FluidContainerType.GLASS));
}
public Collection<IFluidType> getFluidTypes() {
return this.fluids.values();
}
public void createLiquids(final IFluidType[] liquids, int startID) {
public void createLiquids(final IFluidType[] liquids) {
for (final IFluidType liquid : liquids) {
final BinnieFluid fluid = this.createLiquid(liquid, startID++);
final BinnieFluid fluid = this.createLiquid(liquid);
if (fluid == null) {
throw new RuntimeException("Liquid registered incorrectly - " + liquid.getIdentifier());
}
}
}
public BinnieFluid createLiquid(final IFluidType fluid, final int id) {
public BinnieFluid createLiquid(final IFluidType fluid) {
this.fluids.put(fluid.getIdentifier().toLowerCase(), fluid);
final BinnieFluid bFluid = new BinnieFluid(fluid);
FluidRegistry.registerFluid(bFluid);
ItemFluidContainer.registerFluid(fluid, id);
FluidRegistry.addBucketForFluid(bFluid);
return bFluid;
}
@@ -58,7 +57,7 @@ public class ManagerLiquid extends ManagerBase {
@Override
public void postInit() {
for (final IFluidType fluid : this.fluids.values()) {
for (final FluidContainer container : FluidContainer.values()) {
for (final FluidContainerType container : FluidContainerType.values()) {
if (container.isActive() && fluid.canPlaceIn(container)) {
container.registerContainerData(fluid);
}
@@ -2,7 +2,7 @@ package binnie.extrabees.liquids;
import binnie.Binnie;
import binnie.Constants;
import binnie.core.liquid.FluidContainer;
import binnie.core.liquid.FluidContainerType;
import binnie.core.liquid.ILiquidType;
import binnie.extrabees.ExtraBees;
import net.minecraft.util.ResourceLocation;
@@ -32,7 +32,7 @@ public enum ExtraBeeLiquid implements ILiquidType {
}
@Override
public String getName() {
public String getDisplayName() {
return ExtraBees.proxy.localise(this.toString().toLowerCase());
}
@@ -57,13 +57,13 @@ public enum ExtraBeeLiquid 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 || container == FluidContainer.Refractory;
public boolean showInCreative(final FluidContainerType container) {
return container == FluidContainerType.CAN || container == FluidContainerType.CAPSULE || container == FluidContainerType.REFARACTORY;
}
@Override
@@ -7,7 +7,7 @@ import binnie.core.liquid.ItemFluidContainer;
public class ModuleLiquids implements IInitializable {
@Override
public void preInit() {
Binnie.LIQUID.createLiquids(ExtraBeeLiquid.values(), ItemFluidContainer.LiquidExtraBee);
Binnie.LIQUID.createLiquids(ExtraBeeLiquid.values());
}
@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 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 {
@@ -1,18 +1,18 @@
package binnie.genetics.item;
import binnie.Binnie;
import binnie.core.liquid.FluidContainer;
import binnie.core.liquid.FluidContainerType;
import binnie.core.liquid.IFluidType;
import binnie.genetics.Genetics;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fluids.FluidStack;
public enum GeneticLiquid implements IFluidType {
GrowthMedium("Growth Medium", "growthMedium", 15460533),
GrowthMedium("Growth Medium", "growth.medium", 15460533),
Bacteria("Bacteria", "bacteria", 14203521),
BacteriaPoly("Polymerising Bacteria", "bacteriaPoly", 11443396),
BacteriaPoly("Polymerising Bacteria", "bacteria.poly", 11443396),
RawDNA("Raw DNA", "dna.raw", 15089129),
BacteriaVector("Bacteria Vector", "bacteriaVector", 15960958);
BacteriaVector("Bacteria Vector", "bacteria.vector", 15960958);
String name;
String ident;
@@ -34,16 +34,16 @@ public enum GeneticLiquid implements IFluidType {
@Override
public ResourceLocation getFlowing() {
return new ResourceLocation(Genetics.instance.getModID(), "blocks/liquids/" + this.ident);
return new ResourceLocation(Genetics.instance.getModID(), "blocks/liquids/" + this.ident.replace(".", "_"));
}
@Override
public ResourceLocation getStill() {
return new ResourceLocation(Genetics.instance.getModID(), "blocks/liquids/" + this.ident);
return new ResourceLocation(Genetics.instance.getModID(), "blocks/liquids/" + this.ident.replace(".", "_"));
}
@Override
public String getName() {
public String getDisplayName() {
return this.name;
}
@@ -73,12 +73,12 @@ public enum GeneticLiquid implements IFluidType {
}
@Override
public boolean canPlaceIn(final FluidContainer container) {
return this == GeneticLiquid.GrowthMedium || container == FluidContainer.Cylinder;
public boolean canPlaceIn(final FluidContainerType container) {
return this == GeneticLiquid.GrowthMedium || container == FluidContainerType.CYLINDER;
}
@Override
public boolean showInCreative(final FluidContainer container) {
return container == FluidContainer.Cylinder;
public boolean showInCreative(final FluidContainerType container) {
return container == FluidContainerType.CYLINDER;
}
}
@@ -58,7 +58,7 @@ public class ModuleItem implements IInitializable {
Genetics.proxy.registerItem(Genetics.registry);
Genetics.proxy.registerItem(Genetics.masterRegistry);
Binnie.LIQUID.createLiquids(GeneticLiquid.values(), ItemFluidContainer.LiquidGenetics);
Binnie.LIQUID.createLiquids(GeneticLiquid.values());
}
@Override
@@ -4,7 +4,7 @@ import binnie.Binnie;
import binnie.botany.api.EnumFlowerChromosome;
import binnie.core.BinnieCore;
import binnie.core.genetics.Tolerance;
import binnie.core.liquid.FluidContainer;
import binnie.core.liquid.FluidContainerType;
import forestry.api.apiculture.EnumBeeChromosome;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.EnumTolerance;
@@ -102,11 +102,11 @@ public class Acclimatiser {
addTemperatureItem(new ItemStack(Blocks.ICE), -0.75f);
addHumidityItem(new ItemStack(Items.WATER_BUCKET), 0.75f);
addHumidityItem(new ItemStack(Blocks.SAND), -0.15f);
addTemperatureItem(FluidContainer.Can.getFilled(FluidRegistry.LAVA), 0.75f);
addTemperatureItem(FluidContainer.Refractory.getFilled(FluidRegistry.LAVA), 0.75f);
addHumidityItem(FluidContainer.Can.getFilled(FluidRegistry.WATER), 0.75f);
addHumidityItem(FluidContainer.Refractory.getFilled(FluidRegistry.WATER), 0.75f);
addHumidityItem(FluidContainer.Capsule.getFilled(FluidRegistry.WATER), 0.75f);
addTemperatureItem(FluidContainerType.CAN.getFilled(FluidRegistry.LAVA), 0.75f);
addTemperatureItem(FluidContainerType.REFARACTORY.getFilled(FluidRegistry.LAVA), 0.75f);
addHumidityItem(FluidContainerType.CAN.getFilled(FluidRegistry.WATER), 0.75f);
addHumidityItem(FluidContainerType.REFARACTORY.getFilled(FluidRegistry.WATER), 0.75f);
addHumidityItem(FluidContainerType.CAPSULE.getFilled(FluidRegistry.WATER), 0.75f);
}
public static boolean canAcclimatise(final ItemStack stack, final List<ItemStack> acclimatisers) {
@@ -93,7 +93,7 @@ public class PackageInoculator extends GeneticMachine.PackageGeneticBase impleme
@Override
public String getTooltip() {
return GeneticLiquid.BacteriaVector.getName();
return GeneticLiquid.BacteriaVector.getDisplayName();
}
});
}