diff --git a/src/dark/core/prefab/tilenetwork/fluid/FluidCraftingHandler.java b/src/dark/core/prefab/tilenetwork/fluid/FluidCraftingHandler.java index 03b48b01..0ac9b145 100644 --- a/src/dark/core/prefab/tilenetwork/fluid/FluidCraftingHandler.java +++ b/src/dark/core/prefab/tilenetwork/fluid/FluidCraftingHandler.java @@ -4,15 +4,16 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import com.builtbroken.common.Pair; -import com.builtbroken.common.Triple; - import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; + +import com.builtbroken.common.Pair; +import com.builtbroken.common.Triple; + import dark.core.prefab.helpers.FluidHelper; import dark.core.prefab.tilenetwork.fluid.FluidRecipeInfo.SimpleFluidRecipe; diff --git a/src/dark/core/prefab/tilenetwork/fluid/FluidRecipeInfo.java b/src/dark/core/prefab/tilenetwork/fluid/FluidRecipeInfo.java index 30367e44..9458b47c 100644 --- a/src/dark/core/prefab/tilenetwork/fluid/FluidRecipeInfo.java +++ b/src/dark/core/prefab/tilenetwork/fluid/FluidRecipeInfo.java @@ -1,13 +1,13 @@ package dark.core.prefab.tilenetwork.fluid; -import com.builtbroken.common.Pair; -import com.builtbroken.common.Triple; - import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; +import com.builtbroken.common.Pair; +import com.builtbroken.common.Triple; + /** Used to store more complex info, than A + B = C, on two FluidStack mixing behavior * * @author DarkGuardsman */ diff --git a/src/dark/fluid/client/render/RenderBoiler.java b/src/dark/fluid/client/render/RenderBoiler.java index dde99201..82ecbb9b 100644 --- a/src/dark/fluid/client/render/RenderBoiler.java +++ b/src/dark/fluid/client/render/RenderBoiler.java @@ -32,7 +32,7 @@ public class RenderBoiler extends RenderTileMachine } @Override - public void renderTileEntityAt(TileEntity tileEntity, double d, double d1, double d2, float d3) + public void renderModel(TileEntity tileEntity, double d, double d1, double d2, float d3) { GL11.glPushMatrix(); diff --git a/src/dark/fluid/client/render/RenderConstructionPump.java b/src/dark/fluid/client/render/RenderConstructionPump.java index 4f81395e..de396b7a 100644 --- a/src/dark/fluid/client/render/RenderConstructionPump.java +++ b/src/dark/fluid/client/render/RenderConstructionPump.java @@ -25,9 +25,9 @@ public class RenderConstructionPump extends RenderTileMachine } @Override - public void renderTileEntityAt(TileEntity tileEntity, double d, double d1, double d2, float d3) + public void renderModel(TileEntity tileEntity, double d, double d1, double d2, float d3) { - bindTextureByName(this.getTexture(0, 0)); + bindTexture(this.getTexture(0, 0)); GL11.glPushMatrix(); GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.45F, (float) d2 + 0.5F); GL11.glScalef(1.0F, -1F, -1F); diff --git a/src/dark/fluid/client/render/RenderFurnace.java b/src/dark/fluid/client/render/RenderFurnace.java index 8da548af..d3fa80ca 100644 --- a/src/dark/fluid/client/render/RenderFurnace.java +++ b/src/dark/fluid/client/render/RenderFurnace.java @@ -24,7 +24,7 @@ public class RenderFurnace extends RenderTileMachine } @Override - public void renderTileEntityAt(TileEntity te, double d, double d1, double d2, float d3) + public void renderModel(TileEntity te, double d, double d1, double d2, float d3) { bindTextureByName(FluidMech.instance.PREFIX, ModPrefab.MODEL_DIRECTORY + "Furnace.png"); GL11.glPushMatrix(); diff --git a/src/dark/fluid/client/render/RenderGearPiston.java b/src/dark/fluid/client/render/RenderGearPiston.java index 4933770b..17e9803c 100644 --- a/src/dark/fluid/client/render/RenderGearPiston.java +++ b/src/dark/fluid/client/render/RenderGearPiston.java @@ -57,7 +57,7 @@ public class RenderGearPiston extends RenderTileMachine } @Override - public void renderTileEntityAt(TileEntity var1, double d, double d1, double d2, float d3) + public void renderModel(TileEntity var1, double d, double d1, double d2, float d3) { this.renderTileEntityAt(((TileEntitySteamPiston) var1), d, d1, d2, d3); diff --git a/src/dark/fluid/client/render/RenderPipe.java b/src/dark/fluid/client/render/RenderPipe.java index 4bb599de..8e6b6175 100644 --- a/src/dark/fluid/client/render/RenderPipe.java +++ b/src/dark/fluid/client/render/RenderPipe.java @@ -70,7 +70,7 @@ public class RenderPipe extends RenderTileMachine public void render(int blockID, int meta, boolean[] side) { - bindTextureByName(this.getTexture(blockID, meta)); + bindTexture(this.getTexture(blockID, meta)); if (side[0]) { SixPipe.renderBottom(); @@ -99,7 +99,7 @@ public class RenderPipe extends RenderTileMachine } @Override - public void renderTileEntityAt(TileEntity tileEntity, double var2, double var4, double var6, float var8) + public void renderModel(TileEntity tileEntity, double var2, double var4, double var6, float var8) { this.renderAModelAt(tileEntity, var2, var4, var6, var8); } diff --git a/src/dark/fluid/client/render/RenderPump.java b/src/dark/fluid/client/render/RenderPump.java index 2643f4d5..2b4a8edd 100644 --- a/src/dark/fluid/client/render/RenderPump.java +++ b/src/dark/fluid/client/render/RenderPump.java @@ -28,7 +28,7 @@ public class RenderPump extends RenderTileMachine { int meta = te.worldObj.getBlockMetadata(te.xCoord, te.yCoord, te.zCoord); - bindTextureByName(this.getTexture(te.getBlockType().blockID, te.getBlockMetadata())); + bindTexture(this.getTexture(te.getBlockType().blockID, te.getBlockMetadata())); GL11.glPushMatrix(); GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); GL11.glScalef(1.0F, -1F, -1F); @@ -54,7 +54,7 @@ public class RenderPump extends RenderTileMachine } @Override - public void renderTileEntityAt(TileEntity tileEntity, double var2, double var4, double var6, float var8) + public void renderModel(TileEntity tileEntity, double var2, double var4, double var6, float var8) { if (tileEntity instanceof TileEntityStarterPump) { diff --git a/src/dark/fluid/client/render/RenderReleaseValve.java b/src/dark/fluid/client/render/RenderReleaseValve.java index dbd5a3c9..ea5ab89e 100644 --- a/src/dark/fluid/client/render/RenderReleaseValve.java +++ b/src/dark/fluid/client/render/RenderReleaseValve.java @@ -38,7 +38,7 @@ public class RenderReleaseValve extends RenderTileMachine { ents = ((TileEntityReleaseValve) te).connected; } - bindTextureByName(this.getTexture(te.getBlockType().blockID, te.getBlockMetadata())); + bindTexture(this.getTexture(te.getBlockType().blockID, te.getBlockMetadata())); if (ents[0] != null) SixPipe.renderBottom(); if (ents[1] != null) @@ -65,7 +65,7 @@ public class RenderReleaseValve extends RenderTileMachine } @Override - public void renderTileEntityAt(TileEntity tileEntity, double var2, double var4, double var6, float var8) + public void renderModel(TileEntity tileEntity, double var2, double var4, double var6, float var8) { this.renderAModelAt(tileEntity, var2, var4, var6, var8); } diff --git a/src/dark/fluid/client/render/RenderSink.java b/src/dark/fluid/client/render/RenderSink.java index 0543f0d7..d6791126 100644 --- a/src/dark/fluid/client/render/RenderSink.java +++ b/src/dark/fluid/client/render/RenderSink.java @@ -49,7 +49,7 @@ public class RenderSink extends RenderTileMachine { int meta = te.worldObj.getBlockMetadata(te.xCoord, te.yCoord, te.zCoord); - bindTextureByName(this.getTexture(te.getBlockType().blockID, te.getBlockMetadata())); + bindTexture(this.getTexture(te.getBlockType().blockID, te.getBlockMetadata())); GL11.glPushMatrix(); GL11.glTranslatef((float) d + 0.5F, (float) d1 + 1.5F, (float) d2 + 0.5F); GL11.glScalef(1.0F, -1F, -1F); @@ -75,7 +75,7 @@ public class RenderSink extends RenderTileMachine } @Override - public void renderTileEntityAt(TileEntity tileEntity, double var2, double var4, double var6, float var8) + public void renderModel(TileEntity tileEntity, double var2, double var4, double var6, float var8) { this.renderAModelAt((TileEntitySink) tileEntity, var2, var4, var6, var8); } diff --git a/src/dark/fluid/client/render/RenderTank.java b/src/dark/fluid/client/render/RenderTank.java index ccd4de9f..628894d0 100644 --- a/src/dark/fluid/client/render/RenderTank.java +++ b/src/dark/fluid/client/render/RenderTank.java @@ -125,4 +125,11 @@ public class RenderTank extends RenderTileMachine } return new ResourceLocation(texture); } + + @Override + public void renderModel(TileEntity tileEntity, double x, double y, double z, float size) + { + // TODO Auto-generated method stub + + } } \ No newline at end of file diff --git a/src/dark/fluid/common/FluidMech.java b/src/dark/fluid/common/FluidMech.java index dd2e9407..cc77b05a 100644 --- a/src/dark/fluid/common/FluidMech.java +++ b/src/dark/fluid/common/FluidMech.java @@ -128,8 +128,8 @@ public class FluidMech extends ModPrefab } CONFIGURATION.load(); - FMRecipeLoader.blockWasteLiquid = ModObjectRegistry.createNewFluidBlock(this.PREFIX, FluidMech.CONFIGURATION, new Fluid(WASTE_FLUID_NAME).setUnlocalizedName("fluid.waste.name").setDensity(1300).setViscosity(1800)); - FMRecipeLoader.blockOilLiquid = ModObjectRegistry.createNewFluidBlock(this.PREFIX, FluidMech.CONFIGURATION, new Fluid(OIL_FLUID_NAME).setUnlocalizedName("fluid.oil.name").setDensity(1500).setViscosity(4700)); + FMRecipeLoader.blockWasteLiquid = ModObjectRegistry.createNewFluidBlock(FluidMech.MOD_ID, FluidMech.CONFIGURATION, new Fluid(WASTE_FLUID_NAME).setUnlocalizedName("fluid.waste.name").setDensity(1300).setViscosity(1800)); + FMRecipeLoader.blockOilLiquid = ModObjectRegistry.createNewFluidBlock(FluidMech.MOD_ID, FluidMech.CONFIGURATION, new Fluid(OIL_FLUID_NAME).setUnlocalizedName("fluid.oil.name").setDensity(1500).setViscosity(4700)); FMRecipeLoader.blockPipe = ModObjectRegistry.createNewBlock("FMBlockPipe", FluidMech.MOD_ID, BlockPipe.class, ItemBlockPipe.class); FMRecipeLoader.blockPumpMachine = ModObjectRegistry.createNewBlock("FMBlockPump", FluidMech.MOD_ID, BlockPumpMachine.class, ItemBlockHolder.class); diff --git a/src/dark/fluid/common/machines/BlockBoiler.java b/src/dark/fluid/common/machines/BlockBoiler.java index f2e734e3..22015302 100644 --- a/src/dark/fluid/common/machines/BlockBoiler.java +++ b/src/dark/fluid/common/machines/BlockBoiler.java @@ -3,13 +3,14 @@ package dark.fluid.common.machines; import java.util.List; import java.util.Set; -import com.builtbroken.common.Pair; - import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; + +import com.builtbroken.common.Pair; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.fluid.common.BlockFM; diff --git a/src/dark/fluid/common/machines/BlockReleaseValve.java b/src/dark/fluid/common/machines/BlockReleaseValve.java index ca18825a..34e4ce38 100644 --- a/src/dark/fluid/common/machines/BlockReleaseValve.java +++ b/src/dark/fluid/common/machines/BlockReleaseValve.java @@ -3,14 +3,15 @@ package dark.fluid.common.machines; import java.util.Random; import java.util.Set; -import com.builtbroken.common.Pair; - import net.minecraft.block.material.Material; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; + +import com.builtbroken.common.Pair; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.fluid.common.BlockFM; diff --git a/src/dark/fluid/common/machines/BlockSink.java b/src/dark/fluid/common/machines/BlockSink.java index 20ded469..c743ee8e 100644 --- a/src/dark/fluid/common/machines/BlockSink.java +++ b/src/dark/fluid/common/machines/BlockSink.java @@ -2,8 +2,6 @@ package dark.fluid.common.machines; import java.util.Set; -import com.builtbroken.common.Pair; - import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -13,6 +11,9 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import universalelectricity.prefab.tile.TileEntityAdvanced; + +import com.builtbroken.common.Pair; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.core.prefab.helpers.FluidHelper; diff --git a/src/dark/fluid/common/machines/BlockTank.java b/src/dark/fluid/common/machines/BlockTank.java index 8b2458a4..18c6dbb5 100644 --- a/src/dark/fluid/common/machines/BlockTank.java +++ b/src/dark/fluid/common/machines/BlockTank.java @@ -3,8 +3,6 @@ package dark.fluid.common.machines; import java.util.List; import java.util.Set; -import com.builtbroken.common.Pair; - import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -13,6 +11,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.Configuration; + +import com.builtbroken.common.Pair; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.api.ColorCode.IColorCoded; diff --git a/src/dark/fluid/common/pipes/BlockPipe.java b/src/dark/fluid/common/pipes/BlockPipe.java index a5a4baa1..67c61b1c 100644 --- a/src/dark/fluid/common/pipes/BlockPipe.java +++ b/src/dark/fluid/common/pipes/BlockPipe.java @@ -3,8 +3,6 @@ package dark.fluid.common.pipes; import java.util.List; import java.util.Set; -import com.builtbroken.common.Pair; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; @@ -15,6 +13,9 @@ import net.minecraft.world.World; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.IFluidTank; + +import com.builtbroken.common.Pair; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.api.ColorCode; diff --git a/src/dark/fluid/common/pump/BlockConstructionPump.java b/src/dark/fluid/common/pump/BlockConstructionPump.java index f3c98aa7..d832fd99 100644 --- a/src/dark/fluid/common/pump/BlockConstructionPump.java +++ b/src/dark/fluid/common/pump/BlockConstructionPump.java @@ -3,8 +3,6 @@ package dark.fluid.common.pump; import java.util.List; import java.util.Set; -import com.builtbroken.common.Pair; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -18,6 +16,9 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; + +import com.builtbroken.common.Pair; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.core.prefab.tilenetwork.fluid.FluidNetworkHelper; diff --git a/src/dark/fluid/common/pump/BlockDrain.java b/src/dark/fluid/common/pump/BlockDrain.java index be559bc3..73fcc2ea 100644 --- a/src/dark/fluid/common/pump/BlockDrain.java +++ b/src/dark/fluid/common/pump/BlockDrain.java @@ -2,8 +2,6 @@ package dark.fluid.common.pump; import java.util.Set; -import com.builtbroken.common.Pair; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.EntityLivingBase; @@ -16,6 +14,9 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; + +import com.builtbroken.common.Pair; + import dark.fluid.common.BlockFM; import dark.fluid.common.FluidMech; diff --git a/src/dark/fluid/common/pump/BlockPumpMachine.java b/src/dark/fluid/common/pump/BlockPumpMachine.java index 6fbc6091..b7f6e59a 100644 --- a/src/dark/fluid/common/pump/BlockPumpMachine.java +++ b/src/dark/fluid/common/pump/BlockPumpMachine.java @@ -3,8 +3,6 @@ package dark.fluid.common.pump; import java.util.List; import java.util.Set; -import com.builtbroken.common.Pair; - import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; @@ -12,6 +10,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; + +import com.builtbroken.common.Pair; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.fluid.client.render.BlockRenderHelper; diff --git a/src/dark/fluid/common/pump/TileEntityConstructionPump.java b/src/dark/fluid/common/pump/TileEntityConstructionPump.java index 182a7f40..e1f057f3 100644 --- a/src/dark/fluid/common/pump/TileEntityConstructionPump.java +++ b/src/dark/fluid/common/pump/TileEntityConstructionPump.java @@ -3,8 +3,6 @@ package dark.fluid.common.pump; import java.util.ArrayList; import java.util.List; -import com.builtbroken.common.Pair; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -17,6 +15,9 @@ import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import universalelectricity.core.vector.Vector3; import universalelectricity.core.vector.VectorHelper; + +import com.builtbroken.common.Pair; + import dark.api.fluid.IDrain; import dark.api.fluid.INetworkPipe; import dark.api.parts.ITileConnector; diff --git a/src/dark/fluid/common/pump/TileEntityDrain.java b/src/dark/fluid/common/pump/TileEntityDrain.java index 184159d4..f0521fcd 100644 --- a/src/dark/fluid/common/pump/TileEntityDrain.java +++ b/src/dark/fluid/common/pump/TileEntityDrain.java @@ -6,8 +6,6 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import com.builtbroken.common.Pair; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; @@ -18,6 +16,9 @@ import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import universalelectricity.core.vector.Vector3; + +import com.builtbroken.common.Pair; + import dark.api.fluid.IDrain; import dark.core.prefab.helpers.FluidHelper; import dark.fluid.common.prefab.TileEntityFluidDevice; diff --git a/src/dark/fluid/common/pump/TileEntityStarterPump.java b/src/dark/fluid/common/pump/TileEntityStarterPump.java index faf76539..5cda5db9 100644 --- a/src/dark/fluid/common/pump/TileEntityStarterPump.java +++ b/src/dark/fluid/common/pump/TileEntityStarterPump.java @@ -3,8 +3,6 @@ package dark.fluid.common.pump; import java.util.Iterator; import java.util.Set; -import com.builtbroken.common.Pair; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -13,6 +11,9 @@ import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import universalelectricity.core.vector.Vector3; + +import com.builtbroken.common.Pair; + import dark.api.IToolReadOut; import dark.api.fluid.IDrain; import dark.api.parts.ITileConnector; diff --git a/src/dark/mech/common/machines/BlockMechanicalGenerator.java b/src/dark/mech/common/machines/BlockMechanicalGenerator.java index 9c5fab05..86014887 100644 --- a/src/dark/mech/common/machines/BlockMechanicalGenerator.java +++ b/src/dark/mech/common/machines/BlockMechanicalGenerator.java @@ -3,8 +3,6 @@ package dark.mech.common.machines; import java.util.ArrayList; import java.util.Set; -import com.builtbroken.common.Pair; - import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -13,6 +11,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; + +import com.builtbroken.common.Pair; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.fluid.client.render.BlockRenderHelper; diff --git a/src/dark/mech/common/machines/BlockRod.java b/src/dark/mech/common/machines/BlockRod.java index 2ef78ef7..6ed5a59f 100644 --- a/src/dark/mech/common/machines/BlockRod.java +++ b/src/dark/mech/common/machines/BlockRod.java @@ -2,8 +2,6 @@ package dark.mech.common.machines; import java.util.Set; -import com.builtbroken.common.Pair; - import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -13,6 +11,9 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; + +import com.builtbroken.common.Pair; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.fluid.client.render.BlockRenderHelper; diff --git a/src/dark/mech/common/machines/BlockSteamPiston.java b/src/dark/mech/common/machines/BlockSteamPiston.java index 1d8b5e78..28227d05 100644 --- a/src/dark/mech/common/machines/BlockSteamPiston.java +++ b/src/dark/mech/common/machines/BlockSteamPiston.java @@ -3,13 +3,14 @@ package dark.mech.common.machines; import java.util.Random; import java.util.Set; -import com.builtbroken.common.Pair; - import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; + +import com.builtbroken.common.Pair; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.fluid.common.BlockFM;