mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-18 19:39:37 +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
@@ -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() {
|
||||
|
||||
+29
-31
@@ -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);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user