Moved the forge fluids API in an appropriate package.
This commit is contained in:
parent
6527afb90a
commit
0fabcdd564
|
@ -17,7 +17,14 @@ conf/*
|
||||||
bin/*
|
bin/*
|
||||||
|
|
||||||
src/minecraft/cpw/*
|
src/minecraft/cpw/*
|
||||||
src/minecraft/net/*
|
src/minecraft/net/minecraft/*
|
||||||
|
src/minecraft/net/minecraftforge/classloading/*
|
||||||
|
src/minecraft/net/minecraftforge/common/*
|
||||||
|
src/minecraft/net/minecraftforge/client/*
|
||||||
|
src/minecraft/net/minecraftforge/event/*
|
||||||
|
src/minecraft/net/minecraftforge/liquids/*
|
||||||
|
src/minecraft/net/minecraftforge/oredict/*
|
||||||
|
src/minecraft/net/minecraftforge/transformers/*
|
||||||
src/minecraft/paulscode/*
|
src/minecraft/paulscode/*
|
||||||
src/minecraft/ibxm/*
|
src/minecraft/ibxm/*
|
||||||
|
|
||||||
|
|
|
@ -8,6 +8,8 @@ import net.minecraft.client.particle.EntityFX;
|
||||||
import net.minecraft.client.renderer.RenderBlocks;
|
import net.minecraft.client.renderer.RenderBlocks;
|
||||||
import net.minecraft.client.renderer.Tessellator;
|
import net.minecraft.client.renderer.Tessellator;
|
||||||
import net.minecraft.client.renderer.entity.RenderSnowball;
|
import net.minecraft.client.renderer.entity.RenderSnowball;
|
||||||
|
import net.minecraftforge.fluids.FluidRegistry;
|
||||||
|
import net.minecraftforge.fluids.RenderBlockFluid;
|
||||||
|
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
|
@ -15,8 +17,6 @@ import biomesoplenty.api.Items;
|
||||||
import biomesoplenty.blocks.renderers.FoliageRenderer;
|
import biomesoplenty.blocks.renderers.FoliageRenderer;
|
||||||
import biomesoplenty.blocks.renderers.PlantsRenderer;
|
import biomesoplenty.blocks.renderers.PlantsRenderer;
|
||||||
import biomesoplenty.blocks.renderers.SmallBlockRenderer;
|
import biomesoplenty.blocks.renderers.SmallBlockRenderer;
|
||||||
import biomesoplenty.ftfluidsapi.FluidRegistry;
|
|
||||||
import biomesoplenty.ftfluidsapi.RenderBlockFluid;
|
|
||||||
import biomesoplenty.items.projectiles.EntityDart;
|
import biomesoplenty.items.projectiles.EntityDart;
|
||||||
import biomesoplenty.items.projectiles.EntityMudball;
|
import biomesoplenty.items.projectiles.EntityMudball;
|
||||||
import biomesoplenty.items.projectiles.RenderDart;
|
import biomesoplenty.items.projectiles.RenderDart;
|
||||||
|
|
|
@ -2,8 +2,8 @@ package biomesoplenty.api;
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
|
import net.minecraftforge.fluids.Fluid;
|
||||||
import net.minecraftforge.liquids.LiquidStack;
|
import net.minecraftforge.liquids.LiquidStack;
|
||||||
import biomesoplenty.ftfluidsapi.Fluid;
|
|
||||||
|
|
||||||
import com.google.common.base.Optional;
|
import com.google.common.base.Optional;
|
||||||
|
|
||||||
|
|
|
@ -3,11 +3,11 @@ package biomesoplenty.configuration;
|
||||||
import net.minecraft.block.material.Material;
|
import net.minecraft.block.material.Material;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||||
|
import net.minecraftforge.fluids.FluidRegistry;
|
||||||
import net.minecraftforge.liquids.LiquidDictionary;
|
import net.minecraftforge.liquids.LiquidDictionary;
|
||||||
import net.minecraftforge.liquids.LiquidStack;
|
import net.minecraftforge.liquids.LiquidStack;
|
||||||
import biomesoplenty.api.Liquids;
|
import biomesoplenty.api.Liquids;
|
||||||
import biomesoplenty.ftfluidsapi.FluidContainerRegistry;
|
|
||||||
import biomesoplenty.ftfluidsapi.FluidRegistry;
|
|
||||||
import biomesoplenty.items.ItemBOPBucket;
|
import biomesoplenty.items.ItemBOPBucket;
|
||||||
import biomesoplenty.liquids.BlockFluidLiquidPoison;
|
import biomesoplenty.liquids.BlockFluidLiquidPoison;
|
||||||
import biomesoplenty.liquids.BlockFluidSpringWater;
|
import biomesoplenty.liquids.BlockFluidSpringWater;
|
||||||
|
|
|
@ -8,8 +8,8 @@ import net.minecraftforge.client.event.TextureStitchEvent;
|
||||||
import net.minecraftforge.event.Event.Result;
|
import net.minecraftforge.event.Event.Result;
|
||||||
import net.minecraftforge.event.ForgeSubscribe;
|
import net.minecraftforge.event.ForgeSubscribe;
|
||||||
import net.minecraftforge.event.entity.player.FillBucketEvent;
|
import net.minecraftforge.event.entity.player.FillBucketEvent;
|
||||||
|
import net.minecraftforge.fluids.FluidRegistry;
|
||||||
import biomesoplenty.api.Liquids;
|
import biomesoplenty.api.Liquids;
|
||||||
import biomesoplenty.ftfluidsapi.FluidRegistry;
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
|
|
|
@ -10,9 +10,9 @@ import net.minecraft.potion.PotionEffect;
|
||||||
import net.minecraft.util.Icon;
|
import net.minecraft.util.Icon;
|
||||||
import net.minecraft.world.IBlockAccess;
|
import net.minecraft.world.IBlockAccess;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import biomesoplenty.ftfluidsapi.BlockFluidClassic;
|
import net.minecraftforge.fluids.BlockFluidClassic;
|
||||||
import biomesoplenty.ftfluidsapi.Fluid;
|
import net.minecraftforge.fluids.Fluid;
|
||||||
import biomesoplenty.ftfluidsapi.FluidStack;
|
import net.minecraftforge.fluids.FluidStack;
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
|
|
|
@ -13,13 +13,13 @@ import net.minecraft.potion.PotionEffect;
|
||||||
import net.minecraft.util.Icon;
|
import net.minecraft.util.Icon;
|
||||||
import net.minecraft.world.IBlockAccess;
|
import net.minecraft.world.IBlockAccess;
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
import net.minecraftforge.fluids.BlockFluidClassic;
|
||||||
|
import net.minecraftforge.fluids.Fluid;
|
||||||
|
import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||||
|
import net.minecraftforge.fluids.FluidStack;
|
||||||
import biomesoplenty.BiomesOPlenty;
|
import biomesoplenty.BiomesOPlenty;
|
||||||
import biomesoplenty.api.Liquids;
|
import biomesoplenty.api.Liquids;
|
||||||
import biomesoplenty.api.Potions;
|
import biomesoplenty.api.Potions;
|
||||||
import biomesoplenty.ftfluidsapi.BlockFluidClassic;
|
|
||||||
import biomesoplenty.ftfluidsapi.Fluid;
|
|
||||||
import biomesoplenty.ftfluidsapi.FluidContainerRegistry;
|
|
||||||
import biomesoplenty.ftfluidsapi.FluidStack;
|
|
||||||
import cpw.mods.fml.relauncher.Side;
|
import cpw.mods.fml.relauncher.Side;
|
||||||
import cpw.mods.fml.relauncher.SideOnly;
|
import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package biomesoplenty.liquids;
|
package biomesoplenty.liquids;
|
||||||
|
|
||||||
import biomesoplenty.ftfluidsapi.Fluid;
|
import net.minecraftforge.fluids.Fluid;
|
||||||
|
|
||||||
public class LiquidPoisonFluid extends Fluid
|
public class LiquidPoisonFluid extends Fluid
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package biomesoplenty.liquids;
|
package biomesoplenty.liquids;
|
||||||
|
|
||||||
import biomesoplenty.ftfluidsapi.Fluid;
|
import net.minecraftforge.fluids.Fluid;
|
||||||
|
|
||||||
public class SpringWaterFluid extends Fluid
|
public class SpringWaterFluid extends Fluid
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
package biomesoplenty.ftfluidsapi;
|
package net.minecraftforge.fluids;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
package biomesoplenty.ftfluidsapi;
|
package net.minecraftforge.fluids;
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
package biomesoplenty.ftfluidsapi;
|
package net.minecraftforge.fluids;
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
package biomesoplenty.ftfluidsapi;
|
package net.minecraftforge.fluids;
|
||||||
|
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
package biomesoplenty.ftfluidsapi;
|
package net.minecraftforge.fluids;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
package biomesoplenty.ftfluidsapi;
|
package net.minecraftforge.fluids;
|
||||||
|
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
import net.minecraftforge.common.MinecraftForge;
|
import net.minecraftforge.common.MinecraftForge;
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
package biomesoplenty.ftfluidsapi;
|
package net.minecraftforge.fluids;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
package biomesoplenty.ftfluidsapi;
|
package net.minecraftforge.fluids;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
package biomesoplenty.ftfluidsapi;
|
package net.minecraftforge.fluids;
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
package biomesoplenty.ftfluidsapi;
|
package net.minecraftforge.fluids;
|
||||||
|
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
package biomesoplenty.ftfluidsapi;
|
package net.minecraftforge.fluids;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Wrapper class used to encapsulate information about an IFluidTank.
|
* Wrapper class used to encapsulate information about an IFluidTank.
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
package biomesoplenty.ftfluidsapi;
|
package net.minecraftforge.fluids;
|
||||||
|
|
||||||
import net.minecraft.world.World;
|
import net.minecraft.world.World;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
package biomesoplenty.ftfluidsapi;
|
package net.minecraftforge.fluids;
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
package biomesoplenty.ftfluidsapi;
|
package net.minecraftforge.fluids;
|
||||||
|
|
||||||
import net.minecraftforge.common.ForgeDirection;
|
import net.minecraftforge.common.ForgeDirection;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
package biomesoplenty.ftfluidsapi;
|
package net.minecraftforge.fluids;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A tank is the unit of interaction with Fluid inventories.
|
* A tank is the unit of interaction with Fluid inventories.
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
package biomesoplenty.ftfluidsapi;
|
package net.minecraftforge.fluids;
|
||||||
|
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
package biomesoplenty.ftfluidsapi;
|
package net.minecraftforge.fluids;
|
||||||
|
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.client.renderer.RenderBlocks;
|
import net.minecraft.client.renderer.RenderBlocks;
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
package biomesoplenty.ftfluidsapi;
|
package net.minecraftforge.fluids;
|
||||||
|
|
||||||
import net.minecraft.nbt.NBTTagCompound;
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
Loading…
Reference in New Issue