Merge branch 'master' of https://github.com/ted80/BiomesOPlenty

.gitignore

@@ -17,7 +17,14 @@ conf/*
 bin/*
 
 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/ibxm/*
 

src/minecraft/biomesoplenty/ClientProxy.java

@@ -8,6 +8,8 @@ import net.minecraft.client.particle.EntityFX;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.RenderSnowball;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.RenderBlockFluid;
 
 import org.lwjgl.opengl.GL11;
 
@@ -15,8 +17,6 @@ import biomesoplenty.api.Items;
 import biomesoplenty.blocks.renderers.FoliageRenderer;
 import biomesoplenty.blocks.renderers.PlantsRenderer;
 import biomesoplenty.blocks.renderers.SmallBlockRenderer;
-import biomesoplenty.ftfluidsapi.FluidRegistry;
-import biomesoplenty.ftfluidsapi.RenderBlockFluid;
 import biomesoplenty.items.projectiles.EntityDart;
 import biomesoplenty.items.projectiles.EntityMudball;
 import biomesoplenty.items.projectiles.RenderDart;

src/minecraft/biomesoplenty/api/Liquids.java

@@ -2,8 +2,8 @@ package biomesoplenty.api;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
+import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.liquids.LiquidStack;
-import biomesoplenty.ftfluidsapi.Fluid;
 
 import com.google.common.base.Optional;
 

src/minecraft/biomesoplenty/configuration/BOPLiquids.java

@@ -3,11 +3,11 @@ package biomesoplenty.configuration;
 import net.minecraft.block.material.Material;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidContainerRegistry;
+import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.liquids.LiquidDictionary;
 import net.minecraftforge.liquids.LiquidStack;
 import biomesoplenty.api.Liquids;
-import biomesoplenty.ftfluidsapi.FluidContainerRegistry;
-import biomesoplenty.ftfluidsapi.FluidRegistry;
 import biomesoplenty.items.ItemBOPBucket;
 import biomesoplenty.liquids.BlockFluidLiquidPoison;
 import biomesoplenty.liquids.BlockFluidSpringWater;

src/minecraft/biomesoplenty/helpers/BOPLiquidHelper.java

@@ -8,8 +8,8 @@ import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.event.Event.Result;
 import net.minecraftforge.event.ForgeSubscribe;
 import net.minecraftforge.event.entity.player.FillBucketEvent;
+import net.minecraftforge.fluids.FluidRegistry;
 import biomesoplenty.api.Liquids;
-import biomesoplenty.ftfluidsapi.FluidRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/minecraft/biomesoplenty/liquids/BlockFluidLiquidPoison.java

@@ -10,9 +10,9 @@ import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.Icon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import biomesoplenty.ftfluidsapi.BlockFluidClassic;
-import biomesoplenty.ftfluidsapi.Fluid;
-import biomesoplenty.ftfluidsapi.FluidStack;
+import net.minecraftforge.fluids.BlockFluidClassic;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/minecraft/biomesoplenty/liquids/BlockFluidSpringWater.java

@@ -13,13 +13,13 @@ import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.Icon;
 import net.minecraft.world.IBlockAccess;
 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.api.Liquids;
 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.SideOnly;
 

src/minecraft/biomesoplenty/liquids/LiquidPoisonFluid.java

@@ -1,6 +1,6 @@
 package biomesoplenty.liquids;
 
-import biomesoplenty.ftfluidsapi.Fluid;
+import net.minecraftforge.fluids.Fluid;
 
 public class LiquidPoisonFluid extends Fluid 
 {

src/minecraft/biomesoplenty/liquids/SpringWaterFluid.java

@@ -1,6 +1,6 @@
 package biomesoplenty.liquids;
 
-import biomesoplenty.ftfluidsapi.Fluid;
+import net.minecraftforge.fluids.Fluid;
 
 public class SpringWaterFluid extends Fluid 
 {

src/minecraft/net/minecraftforge/fluids/BlockFluidBase.java

@@ -1,5 +1,5 @@
 
-package biomesoplenty.ftfluidsapi;
+package net.minecraftforge.fluids;
 
 import java.util.HashMap;
 import java.util.Map;

src/minecraft/net/minecraftforge/fluids/BlockFluidClassic.java

@@ -1,5 +1,5 @@
 
-package biomesoplenty.ftfluidsapi;
+package net.minecraftforge.fluids;
 
 import java.util.Random;
 

src/minecraft/net/minecraftforge/fluids/BlockFluidFinite.java

@@ -1,5 +1,5 @@
 
-package biomesoplenty.ftfluidsapi;
+package net.minecraftforge.fluids;
 
 import java.util.Random;
 

src/minecraft/net/minecraftforge/fluids/Fluid.java

@@ -1,5 +1,5 @@
 
-package biomesoplenty.ftfluidsapi;
+package net.minecraftforge.fluids;
 
 import java.util.Locale;
 

src/minecraft/net/minecraftforge/fluids/FluidContainerRegistry.java

@@ -1,5 +1,5 @@
 
-package biomesoplenty.ftfluidsapi;
+package net.minecraftforge.fluids;
 
 import java.util.Arrays;
 import java.util.HashMap;

src/minecraft/net/minecraftforge/fluids/FluidEvent.java

@@ -1,5 +1,5 @@
 
-package biomesoplenty.ftfluidsapi;
+package net.minecraftforge.fluids;
 
 import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;

src/minecraft/net/minecraftforge/fluids/FluidIdMapPacket.java

@@ -1,5 +1,5 @@
 
-package biomesoplenty.ftfluidsapi;
+package net.minecraftforge.fluids;
 
 import java.util.Map;
 

src/minecraft/net/minecraftforge/fluids/FluidRegistry.java

@@ -1,5 +1,5 @@
 
-package biomesoplenty.ftfluidsapi;
+package net.minecraftforge.fluids;
 
 import java.util.HashMap;
 import java.util.Map;

src/minecraft/net/minecraftforge/fluids/FluidStack.java

@@ -1,5 +1,5 @@
 
-package biomesoplenty.ftfluidsapi;
+package net.minecraftforge.fluids;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;

src/minecraft/net/minecraftforge/fluids/FluidTank.java

@@ -1,5 +1,5 @@
 
-package biomesoplenty.ftfluidsapi;
+package net.minecraftforge.fluids;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;

src/minecraft/net/minecraftforge/fluids/FluidTankInfo.java

@@ -1,5 +1,5 @@
 
-package biomesoplenty.ftfluidsapi;
+package net.minecraftforge.fluids;
 
 /**
  * Wrapper class used to encapsulate information about an IFluidTank.

src/minecraft/net/minecraftforge/fluids/IFluidBlock.java

@@ -1,5 +1,5 @@
 
-package biomesoplenty.ftfluidsapi;
+package net.minecraftforge.fluids;
 
 import net.minecraft.world.World;
 

src/minecraft/net/minecraftforge/fluids/IFluidContainerItem.java

@@ -1,5 +1,5 @@
 
-package biomesoplenty.ftfluidsapi;
+package net.minecraftforge.fluids;
 
 import net.minecraft.item.ItemStack;
 

src/minecraft/net/minecraftforge/fluids/IFluidHandler.java

@@ -1,5 +1,5 @@
 
-package biomesoplenty.ftfluidsapi;
+package net.minecraftforge.fluids;
 
 import net.minecraftforge.common.ForgeDirection;
 

src/minecraft/net/minecraftforge/fluids/IFluidTank.java

@@ -1,5 +1,5 @@
 
-package biomesoplenty.ftfluidsapi;
+package net.minecraftforge.fluids;
 
 /**
  * A tank is the unit of interaction with Fluid inventories.

src/minecraft/net/minecraftforge/fluids/ItemFluidContainer.java

@@ -1,5 +1,5 @@
 
-package biomesoplenty.ftfluidsapi;
+package net.minecraftforge.fluids;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

src/minecraft/net/minecraftforge/fluids/RenderBlockFluid.java

@@ -1,5 +1,5 @@
 
-package biomesoplenty.ftfluidsapi;
+package net.minecraftforge.fluids;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;

src/minecraft/net/minecraftforge/fluids/TileFluidHandler.java

@@ -1,5 +1,5 @@
 
-package biomesoplenty.ftfluidsapi;
+package net.minecraftforge.fluids;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;