diff --git a/.gitignore b/.gitignore index 0cad4be2d..44b9e6d00 100644 --- a/.gitignore +++ b/.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/* diff --git a/src/minecraft/biomesoplenty/ClientProxy.java b/src/minecraft/biomesoplenty/ClientProxy.java index ac988eabd..b98eba3b0 100644 --- a/src/minecraft/biomesoplenty/ClientProxy.java +++ b/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; diff --git a/src/minecraft/biomesoplenty/api/Liquids.java b/src/minecraft/biomesoplenty/api/Liquids.java index 0ea20c438..09b60ae26 100644 --- a/src/minecraft/biomesoplenty/api/Liquids.java +++ b/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; diff --git a/src/minecraft/biomesoplenty/configuration/BOPLiquids.java b/src/minecraft/biomesoplenty/configuration/BOPLiquids.java index 0ee2c67d8..f3d5181bc 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPLiquids.java +++ b/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; diff --git a/src/minecraft/biomesoplenty/helpers/BOPLiquidHelper.java b/src/minecraft/biomesoplenty/helpers/BOPLiquidHelper.java index 409dff5cb..ae08a8ce9 100644 --- a/src/minecraft/biomesoplenty/helpers/BOPLiquidHelper.java +++ b/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; diff --git a/src/minecraft/biomesoplenty/liquids/BlockFluidLiquidPoison.java b/src/minecraft/biomesoplenty/liquids/BlockFluidLiquidPoison.java index 76a9a817b..c2d57544d 100644 --- a/src/minecraft/biomesoplenty/liquids/BlockFluidLiquidPoison.java +++ b/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; diff --git a/src/minecraft/biomesoplenty/liquids/BlockFluidSpringWater.java b/src/minecraft/biomesoplenty/liquids/BlockFluidSpringWater.java index 626576769..aeba16eb7 100644 --- a/src/minecraft/biomesoplenty/liquids/BlockFluidSpringWater.java +++ b/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; diff --git a/src/minecraft/biomesoplenty/liquids/LiquidPoisonFluid.java b/src/minecraft/biomesoplenty/liquids/LiquidPoisonFluid.java index 9ebdf8fbf..1395dd289 100644 --- a/src/minecraft/biomesoplenty/liquids/LiquidPoisonFluid.java +++ b/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 { diff --git a/src/minecraft/biomesoplenty/liquids/SpringWaterFluid.java b/src/minecraft/biomesoplenty/liquids/SpringWaterFluid.java index ea4e0dd5c..f56e12900 100644 --- a/src/minecraft/biomesoplenty/liquids/SpringWaterFluid.java +++ b/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 { diff --git a/src/minecraft/biomesoplenty/ftfluidsapi/BlockFluidBase.java b/src/minecraft/net/minecraftforge/fluids/BlockFluidBase.java similarity index 99% rename from src/minecraft/biomesoplenty/ftfluidsapi/BlockFluidBase.java rename to src/minecraft/net/minecraftforge/fluids/BlockFluidBase.java index 7687318b2..529a6b2c2 100644 --- a/src/minecraft/biomesoplenty/ftfluidsapi/BlockFluidBase.java +++ b/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; diff --git a/src/minecraft/biomesoplenty/ftfluidsapi/BlockFluidClassic.java b/src/minecraft/net/minecraftforge/fluids/BlockFluidClassic.java similarity index 99% rename from src/minecraft/biomesoplenty/ftfluidsapi/BlockFluidClassic.java rename to src/minecraft/net/minecraftforge/fluids/BlockFluidClassic.java index fce2132ce..60a1958f7 100644 --- a/src/minecraft/biomesoplenty/ftfluidsapi/BlockFluidClassic.java +++ b/src/minecraft/net/minecraftforge/fluids/BlockFluidClassic.java @@ -1,5 +1,5 @@ -package biomesoplenty.ftfluidsapi; +package net.minecraftforge.fluids; import java.util.Random; diff --git a/src/minecraft/biomesoplenty/ftfluidsapi/BlockFluidFinite.java b/src/minecraft/net/minecraftforge/fluids/BlockFluidFinite.java similarity index 99% rename from src/minecraft/biomesoplenty/ftfluidsapi/BlockFluidFinite.java rename to src/minecraft/net/minecraftforge/fluids/BlockFluidFinite.java index f631492e7..1d0e4b945 100644 --- a/src/minecraft/biomesoplenty/ftfluidsapi/BlockFluidFinite.java +++ b/src/minecraft/net/minecraftforge/fluids/BlockFluidFinite.java @@ -1,5 +1,5 @@ -package biomesoplenty.ftfluidsapi; +package net.minecraftforge.fluids; import java.util.Random; diff --git a/src/minecraft/biomesoplenty/ftfluidsapi/Fluid.java b/src/minecraft/net/minecraftforge/fluids/Fluid.java similarity index 99% rename from src/minecraft/biomesoplenty/ftfluidsapi/Fluid.java rename to src/minecraft/net/minecraftforge/fluids/Fluid.java index 627dfa9f2..ea841af85 100644 --- a/src/minecraft/biomesoplenty/ftfluidsapi/Fluid.java +++ b/src/minecraft/net/minecraftforge/fluids/Fluid.java @@ -1,5 +1,5 @@ -package biomesoplenty.ftfluidsapi; +package net.minecraftforge.fluids; import java.util.Locale; diff --git a/src/minecraft/biomesoplenty/ftfluidsapi/FluidContainerRegistry.java b/src/minecraft/net/minecraftforge/fluids/FluidContainerRegistry.java similarity index 99% rename from src/minecraft/biomesoplenty/ftfluidsapi/FluidContainerRegistry.java rename to src/minecraft/net/minecraftforge/fluids/FluidContainerRegistry.java index 20ddf0dd9..c94880e32 100644 --- a/src/minecraft/biomesoplenty/ftfluidsapi/FluidContainerRegistry.java +++ b/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; diff --git a/src/minecraft/biomesoplenty/ftfluidsapi/FluidEvent.java b/src/minecraft/net/minecraftforge/fluids/FluidEvent.java similarity index 98% rename from src/minecraft/biomesoplenty/ftfluidsapi/FluidEvent.java rename to src/minecraft/net/minecraftforge/fluids/FluidEvent.java index a6f324335..328ba706b 100644 --- a/src/minecraft/biomesoplenty/ftfluidsapi/FluidEvent.java +++ b/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; diff --git a/src/minecraft/biomesoplenty/ftfluidsapi/FluidIdMapPacket.java b/src/minecraft/net/minecraftforge/fluids/FluidIdMapPacket.java similarity index 97% rename from src/minecraft/biomesoplenty/ftfluidsapi/FluidIdMapPacket.java rename to src/minecraft/net/minecraftforge/fluids/FluidIdMapPacket.java index 14f1e3c60..7859c61d4 100644 --- a/src/minecraft/biomesoplenty/ftfluidsapi/FluidIdMapPacket.java +++ b/src/minecraft/net/minecraftforge/fluids/FluidIdMapPacket.java @@ -1,5 +1,5 @@ -package biomesoplenty.ftfluidsapi; +package net.minecraftforge.fluids; import java.util.Map; diff --git a/src/minecraft/biomesoplenty/ftfluidsapi/FluidRegistry.java b/src/minecraft/net/minecraftforge/fluids/FluidRegistry.java similarity index 99% rename from src/minecraft/biomesoplenty/ftfluidsapi/FluidRegistry.java rename to src/minecraft/net/minecraftforge/fluids/FluidRegistry.java index 199e6ec54..34bd87fc1 100644 --- a/src/minecraft/biomesoplenty/ftfluidsapi/FluidRegistry.java +++ b/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; diff --git a/src/minecraft/biomesoplenty/ftfluidsapi/FluidStack.java b/src/minecraft/net/minecraftforge/fluids/FluidStack.java similarity index 99% rename from src/minecraft/biomesoplenty/ftfluidsapi/FluidStack.java rename to src/minecraft/net/minecraftforge/fluids/FluidStack.java index 20f8aa9b4..ede8942b1 100644 --- a/src/minecraft/biomesoplenty/ftfluidsapi/FluidStack.java +++ b/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; diff --git a/src/minecraft/biomesoplenty/ftfluidsapi/FluidTank.java b/src/minecraft/net/minecraftforge/fluids/FluidTank.java similarity index 99% rename from src/minecraft/biomesoplenty/ftfluidsapi/FluidTank.java rename to src/minecraft/net/minecraftforge/fluids/FluidTank.java index 12e9e4359..ee39fa515 100644 --- a/src/minecraft/biomesoplenty/ftfluidsapi/FluidTank.java +++ b/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; diff --git a/src/minecraft/biomesoplenty/ftfluidsapi/FluidTankInfo.java b/src/minecraft/net/minecraftforge/fluids/FluidTankInfo.java similarity index 93% rename from src/minecraft/biomesoplenty/ftfluidsapi/FluidTankInfo.java rename to src/minecraft/net/minecraftforge/fluids/FluidTankInfo.java index 49d0c6ff3..8443f1452 100644 --- a/src/minecraft/biomesoplenty/ftfluidsapi/FluidTankInfo.java +++ b/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. diff --git a/src/minecraft/biomesoplenty/ftfluidsapi/IFluidBlock.java b/src/minecraft/net/minecraftforge/fluids/IFluidBlock.java similarity index 96% rename from src/minecraft/biomesoplenty/ftfluidsapi/IFluidBlock.java rename to src/minecraft/net/minecraftforge/fluids/IFluidBlock.java index 80ec3a234..5d66980a6 100644 --- a/src/minecraft/biomesoplenty/ftfluidsapi/IFluidBlock.java +++ b/src/minecraft/net/minecraftforge/fluids/IFluidBlock.java @@ -1,5 +1,5 @@ -package biomesoplenty.ftfluidsapi; +package net.minecraftforge.fluids; import net.minecraft.world.World; diff --git a/src/minecraft/biomesoplenty/ftfluidsapi/IFluidContainerItem.java b/src/minecraft/net/minecraftforge/fluids/IFluidContainerItem.java similarity index 98% rename from src/minecraft/biomesoplenty/ftfluidsapi/IFluidContainerItem.java rename to src/minecraft/net/minecraftforge/fluids/IFluidContainerItem.java index 9b60f00fb..c3ab9924a 100644 --- a/src/minecraft/biomesoplenty/ftfluidsapi/IFluidContainerItem.java +++ b/src/minecraft/net/minecraftforge/fluids/IFluidContainerItem.java @@ -1,5 +1,5 @@ -package biomesoplenty.ftfluidsapi; +package net.minecraftforge.fluids; import net.minecraft.item.ItemStack; diff --git a/src/minecraft/biomesoplenty/ftfluidsapi/IFluidHandler.java b/src/minecraft/net/minecraftforge/fluids/IFluidHandler.java similarity index 98% rename from src/minecraft/biomesoplenty/ftfluidsapi/IFluidHandler.java rename to src/minecraft/net/minecraftforge/fluids/IFluidHandler.java index e34d3ea74..17e96343e 100644 --- a/src/minecraft/biomesoplenty/ftfluidsapi/IFluidHandler.java +++ b/src/minecraft/net/minecraftforge/fluids/IFluidHandler.java @@ -1,5 +1,5 @@ -package biomesoplenty.ftfluidsapi; +package net.minecraftforge.fluids; import net.minecraftforge.common.ForgeDirection; diff --git a/src/minecraft/biomesoplenty/ftfluidsapi/IFluidTank.java b/src/minecraft/net/minecraftforge/fluids/IFluidTank.java similarity index 97% rename from src/minecraft/biomesoplenty/ftfluidsapi/IFluidTank.java rename to src/minecraft/net/minecraftforge/fluids/IFluidTank.java index 12fa1920c..f88564857 100644 --- a/src/minecraft/biomesoplenty/ftfluidsapi/IFluidTank.java +++ b/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. diff --git a/src/minecraft/biomesoplenty/ftfluidsapi/ItemFluidContainer.java b/src/minecraft/net/minecraftforge/fluids/ItemFluidContainer.java similarity index 99% rename from src/minecraft/biomesoplenty/ftfluidsapi/ItemFluidContainer.java rename to src/minecraft/net/minecraftforge/fluids/ItemFluidContainer.java index 637595722..5503cf423 100644 --- a/src/minecraft/biomesoplenty/ftfluidsapi/ItemFluidContainer.java +++ b/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; diff --git a/src/minecraft/biomesoplenty/ftfluidsapi/RenderBlockFluid.java b/src/minecraft/net/minecraftforge/fluids/RenderBlockFluid.java similarity index 99% rename from src/minecraft/biomesoplenty/ftfluidsapi/RenderBlockFluid.java rename to src/minecraft/net/minecraftforge/fluids/RenderBlockFluid.java index 5ed700f96..971d62fbb 100644 --- a/src/minecraft/biomesoplenty/ftfluidsapi/RenderBlockFluid.java +++ b/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; diff --git a/src/minecraft/biomesoplenty/ftfluidsapi/TileFluidHandler.java b/src/minecraft/net/minecraftforge/fluids/TileFluidHandler.java similarity index 97% rename from src/minecraft/biomesoplenty/ftfluidsapi/TileFluidHandler.java rename to src/minecraft/net/minecraftforge/fluids/TileFluidHandler.java index 5781af617..988c80f66 100644 --- a/src/minecraft/biomesoplenty/ftfluidsapi/TileFluidHandler.java +++ b/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;