From f1857f2a6448636844b10cf7c8767f2dc296711e Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Fri, 20 Sep 2013 12:04:08 -0400 Subject: [PATCH] Cleanup --- src/dark/api/fluid/INetworkPipe.java | 7 +++---- src/dark/fluid/common/FluidMech.java | 16 +++++++--------- src/dark/fluid/common/machines/BlockTank.java | 3 +-- .../common/machines/TileEntityReleaseValve.java | 2 +- .../fluid/common/machines/TileEntityTank.java | 7 ++----- src/dark/fluid/common/pipes/BlockPipe.java | 2 -- src/dark/fluid/common/pipes/ItemBlockPipe.java | 2 +- src/dark/fluid/common/pipes/TileEntityPipe.java | 5 ++--- .../common/prefab/TileEntityFluidStorage.java | 2 -- src/dark/fluid/common/pump/BlockDrain.java | 2 +- 10 files changed, 18 insertions(+), 30 deletions(-) diff --git a/src/dark/api/fluid/INetworkPipe.java b/src/dark/api/fluid/INetworkPipe.java index f92ebb11..7ceda05d 100644 --- a/src/dark/api/fluid/INetworkPipe.java +++ b/src/dark/api/fluid/INetworkPipe.java @@ -1,7 +1,6 @@ package dark.api.fluid; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; /** A machine that acts as one with the liquid network using the networks pressure for some function @@ -10,19 +9,19 @@ import net.minecraftforge.fluids.FluidStack; public interface INetworkPipe extends INetworkFluidPart { /** Gets the parts max pressure limit it can handle - * + * * Note this is not recommended max limit by rather actual breaking point of the part */ public double getMaxPressure(ForgeDirection side); /** Max flow rate of liquid flow this part from the side for the liquid type that his part will * allow - * + * * @return limit in bucket parts(1/1000 of a bucket) */ public int getMaxFlowRate(FluidStack stack, ForgeDirection side); /** Called when the pressure on the machine goes beyond max limits. Suggest doing random chance * of damage or break too simulate real chances of pipe going beyond designed limits - * + * * @param damageAllowed - can this tileEntity cause grief damage * @return true if the device over pressured and destroyed itself */ public boolean onOverPressure(Boolean damageAllowed); diff --git a/src/dark/fluid/common/FluidMech.java b/src/dark/fluid/common/FluidMech.java index 58dd4fdb..9454d70d 100644 --- a/src/dark/fluid/common/FluidMech.java +++ b/src/dark/fluid/common/FluidMech.java @@ -4,8 +4,6 @@ import java.io.File; import java.util.Arrays; import java.util.logging.Logger; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.ItemStack; import net.minecraftforge.common.Configuration; import net.minecraftforge.fluids.Fluid; @@ -129,13 +127,13 @@ public class FluidMech extends ModPrefab 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.blockPipe = ModObjectRegistry.createNewBlock("FMBlockPipe",FluidMech.MOD_ID, BlockPipe.class, ItemBlockPipe.class); - FMRecipeLoader.blockPumpMachine = ModObjectRegistry.createNewBlock("FMBlockPump",FluidMech.MOD_ID, BlockPumpMachine.class, ItemBlockHolder.class); - FMRecipeLoader.blockReleaseValve = ModObjectRegistry.createNewBlock("FMBlockReleaseValve",FluidMech.MOD_ID, BlockReleaseValve.class, ItemBlockHolder.class); - FMRecipeLoader.blockTank = ModObjectRegistry.createNewBlock("FMBlockTank",FluidMech.MOD_ID, BlockTank.class, ItemBlockPipe.class); - FMRecipeLoader.blockSink = ModObjectRegistry.createNewBlock("FMBlockSink",FluidMech.MOD_ID, BlockSink.class, ItemBlockHolder.class); - FMRecipeLoader.blockDrain = ModObjectRegistry.createNewBlock("FMBlockDrain",FluidMech.MOD_ID, BlockDrain.class, ItemBlockHolder.class); - FMRecipeLoader.blockConPump = ModObjectRegistry.createNewBlock("FMBlockConstructionPump",FluidMech.MOD_ID, BlockConstructionPump.class, ItemBlockHolder.class); + FMRecipeLoader.blockPipe = ModObjectRegistry.createNewBlock("FMBlockPipe", FluidMech.MOD_ID, BlockPipe.class, ItemBlockPipe.class); + FMRecipeLoader.blockPumpMachine = ModObjectRegistry.createNewBlock("FMBlockPump", FluidMech.MOD_ID, BlockPumpMachine.class, ItemBlockHolder.class); + FMRecipeLoader.blockReleaseValve = ModObjectRegistry.createNewBlock("FMBlockReleaseValve", FluidMech.MOD_ID, BlockReleaseValve.class, ItemBlockHolder.class); + FMRecipeLoader.blockTank = ModObjectRegistry.createNewBlock("FMBlockTank", FluidMech.MOD_ID, BlockTank.class, ItemBlockPipe.class); + FMRecipeLoader.blockSink = ModObjectRegistry.createNewBlock("FMBlockSink", FluidMech.MOD_ID, BlockSink.class, ItemBlockHolder.class); + FMRecipeLoader.blockDrain = ModObjectRegistry.createNewBlock("FMBlockDrain", FluidMech.MOD_ID, BlockDrain.class, ItemBlockHolder.class); + FMRecipeLoader.blockConPump = ModObjectRegistry.createNewBlock("FMBlockConstructionPump", FluidMech.MOD_ID, BlockConstructionPump.class, ItemBlockHolder.class); CONFIGURATION.save(); } diff --git a/src/dark/fluid/common/machines/BlockTank.java b/src/dark/fluid/common/machines/BlockTank.java index 2f1a3244..36e3f59b 100644 --- a/src/dark/fluid/common/machines/BlockTank.java +++ b/src/dark/fluid/common/machines/BlockTank.java @@ -14,7 +14,6 @@ import net.minecraftforge.common.Configuration; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.api.ColorCode.IColorCoded; -import dark.api.parts.INetworkPart; import dark.core.prefab.helpers.FluidHelper; import dark.core.prefab.helpers.Pair; import dark.fluid.client.render.BlockRenderHelper; @@ -26,7 +25,7 @@ public class BlockTank extends BlockFM public BlockTank() { - super(BlockTank.class, "FluidTank",Material.rock); + super(BlockTank.class, "FluidTank", Material.rock); this.setHardness(1f); this.setResistance(5f); } diff --git a/src/dark/fluid/common/machines/TileEntityReleaseValve.java b/src/dark/fluid/common/machines/TileEntityReleaseValve.java index 9d0021b7..0ec80eaf 100644 --- a/src/dark/fluid/common/machines/TileEntityReleaseValve.java +++ b/src/dark/fluid/common/machines/TileEntityReleaseValve.java @@ -12,8 +12,8 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import universalelectricity.core.vector.Vector3; import dark.api.ColorCode; -import dark.api.IToolReadOut; import dark.api.ColorCode.IColorCoded; +import dark.api.IToolReadOut; import dark.api.fluid.INetworkPipe; import dark.api.parts.ITileConnector; import dark.core.prefab.helpers.ConnectionHelper; diff --git a/src/dark/fluid/common/machines/TileEntityTank.java b/src/dark/fluid/common/machines/TileEntityTank.java index 6f3c6245..8f4b851c 100644 --- a/src/dark/fluid/common/machines/TileEntityTank.java +++ b/src/dark/fluid/common/machines/TileEntityTank.java @@ -15,7 +15,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; @@ -24,7 +23,6 @@ import net.minecraftforge.fluids.IFluidTank; import org.bouncycastle.util.Arrays; -import universalelectricity.core.vector.Vector3; import universalelectricity.prefab.network.IPacketReceiver; import com.google.common.io.ByteArrayDataInput; @@ -32,8 +30,8 @@ import com.google.common.io.ByteArrayDataInput; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import dark.api.ColorCode; -import dark.api.IToolReadOut; import dark.api.ColorCode.IColorCoded; +import dark.api.IToolReadOut; import dark.api.fluid.INetworkFluidPart; import dark.api.fluid.INetworkPipe; import dark.core.common.DarkMain; @@ -42,7 +40,6 @@ import dark.core.prefab.helpers.FluidHelper; import dark.core.prefab.tilenetwork.NetworkTileEntities; import dark.core.prefab.tilenetwork.fluid.NetworkFluidContainers; import dark.core.prefab.tilenetwork.fluid.NetworkFluidTiles; -import dark.fluid.common.FMRecipeLoader; import dark.fluid.common.prefab.TileEntityFluidStorage; public class TileEntityTank extends TileEntityFluidStorage implements IFluidHandler, IToolReadOut, IColorCoded, INetworkFluidPart, IPacketReceiver @@ -223,7 +220,7 @@ public class TileEntityTank extends TileEntityFluidStorage implements IFluidHand } /** Checks to make sure the connection is valid to the tileEntity - * + * * @param tileEntity - the tileEntity being checked * @param side - side the connection is too */ public void validateConnectionSide(TileEntity tileEntity, ForgeDirection side) diff --git a/src/dark/fluid/common/pipes/BlockPipe.java b/src/dark/fluid/common/pipes/BlockPipe.java index a7cc2d12..9b43f9d6 100644 --- a/src/dark/fluid/common/pipes/BlockPipe.java +++ b/src/dark/fluid/common/pipes/BlockPipe.java @@ -1,6 +1,5 @@ package dark.fluid.common.pipes; -import java.awt.Color; import java.util.List; import java.util.Set; @@ -21,7 +20,6 @@ import dark.api.ColorCode.IColorCoded; import dark.core.prefab.helpers.FluidHelper; import dark.core.prefab.helpers.Pair; import dark.fluid.common.BlockFM; -import dark.fluid.common.FMRecipeLoader; public class BlockPipe extends BlockFM { diff --git a/src/dark/fluid/common/pipes/ItemBlockPipe.java b/src/dark/fluid/common/pipes/ItemBlockPipe.java index 12fe2b96..74e9e698 100644 --- a/src/dark/fluid/common/pipes/ItemBlockPipe.java +++ b/src/dark/fluid/common/pipes/ItemBlockPipe.java @@ -7,7 +7,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import dark.api.ColorCode.IColorCoded; -import dark.fluid.common.FMRecipeLoader; public class ItemBlockPipe extends ItemBlock { @@ -31,6 +30,7 @@ public class ItemBlockPipe extends ItemBlock return Block.blocksList[this.getBlockID()].getUnlocalizedName() + "." + itemStack.getItemDamage(); } + @Override public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ, int metadata) { if (super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata)) diff --git a/src/dark/fluid/common/pipes/TileEntityPipe.java b/src/dark/fluid/common/pipes/TileEntityPipe.java index 8924625e..9507e1f1 100644 --- a/src/dark/fluid/common/pipes/TileEntityPipe.java +++ b/src/dark/fluid/common/pipes/TileEntityPipe.java @@ -40,7 +40,6 @@ import dark.core.network.PacketHandler; import dark.core.prefab.helpers.FluidHelper; import dark.core.prefab.tilenetwork.NetworkTileEntities; import dark.core.prefab.tilenetwork.fluid.NetworkPipes; -import dark.fluid.common.FMRecipeLoader; import dark.fluid.common.pipes.BlockPipe.PipeData; public class TileEntityPipe extends TileEntityAdvanced implements IFluidHandler, IToolReadOut, IColorCoded, INetworkPipe, IPacketReceiver @@ -208,7 +207,7 @@ public class TileEntityPipe extends TileEntityAdvanced implements IFluidHandler, } /** Checks to make sure the connection is valid to the tileEntity - * + * * @param tileEntity - the tileEntity being checked * @param side - side the connection is too * @return */ @@ -343,7 +342,7 @@ public class TileEntityPipe extends TileEntityAdvanced implements IFluidHandler, } /** Calculates flow rate based on viscosity & temp of the fluid as all other factors are know - * + * * @param fluid - fluidStack * @param temp = tempature of the fluid * @param pressure - pressure difference of were the fluid is flowing too. diff --git a/src/dark/fluid/common/prefab/TileEntityFluidStorage.java b/src/dark/fluid/common/prefab/TileEntityFluidStorage.java index 4423d402..2c25e42e 100644 --- a/src/dark/fluid/common/prefab/TileEntityFluidStorage.java +++ b/src/dark/fluid/common/prefab/TileEntityFluidStorage.java @@ -2,7 +2,6 @@ package dark.fluid.common.prefab; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -11,7 +10,6 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; -import universalelectricity.core.vector.Vector3; import dark.api.ColorCode.IColorCoded; import dark.core.prefab.helpers.FluidHelper; diff --git a/src/dark/fluid/common/pump/BlockDrain.java b/src/dark/fluid/common/pump/BlockDrain.java index e2ef52ea..9c16d06f 100644 --- a/src/dark/fluid/common/pump/BlockDrain.java +++ b/src/dark/fluid/common/pump/BlockDrain.java @@ -26,7 +26,7 @@ public class BlockDrain extends BlockFM public BlockDrain() { - super(BlockDrain.class, "FluidDrain",Material.iron); + super(BlockDrain.class, "FluidDrain", Material.iron); } @Override