From 816e377ebabf241b26f2675e4bebb76bd4030c4f Mon Sep 17 00:00:00 2001 From: Rseifert Date: Wed, 10 Apr 2013 03:37:15 -0400 Subject: [PATCH] Cleanup --- src/minecraft/fluidmech/common/FluidMech.java | 2 -- .../fluidmech/common/block/liquids/BlockGas.java | 8 +------- .../fluidmech/common/machines/pipes/TileEntityPipe.java | 2 -- .../fluidmech/common/pump/BlockConstructionPump.java | 1 - .../fluidmech/common/pump/TileEntityConstructionPump.java | 1 - .../fluidmech/common/pump/path/LiquidPathFinder.java | 4 ---- .../fluidmech/common/telepipe/INetworkConnector.java | 5 ++--- .../fluidmech/common/telepipe/TileEntityEndPipe.java | 7 ++++--- src/minecraft/hydraulic/api/IDrain.java | 2 +- 9 files changed, 8 insertions(+), 24 deletions(-) diff --git a/src/minecraft/fluidmech/common/FluidMech.java b/src/minecraft/fluidmech/common/FluidMech.java index 578875adc..b59dd6e48 100644 --- a/src/minecraft/fluidmech/common/FluidMech.java +++ b/src/minecraft/fluidmech/common/FluidMech.java @@ -88,8 +88,6 @@ public class FluidMech extends DummyModContainer public static final String MOD_ID = "Fluid_Mechanics"; public static final String MOD_NAME = "Fluid Mechanics"; public static final String VERSION = MAJOR_VERSION + "." + MINOR_VERSION + "." + REVIS_VERSION + "." + BUILD_VERSION; - public static final String DEPENDENCIES = "after:UniversalElectricity;after:AtomicScience"; - public static final boolean USE_METADATA = true; // @NetworkMod public static final boolean USES_CLIENT = true; diff --git a/src/minecraft/fluidmech/common/block/liquids/BlockGas.java b/src/minecraft/fluidmech/common/block/liquids/BlockGas.java index a9319ab38..aeff1d28d 100644 --- a/src/minecraft/fluidmech/common/block/liquids/BlockGas.java +++ b/src/minecraft/fluidmech/common/block/liquids/BlockGas.java @@ -1,15 +1,8 @@ package fluidmech.common.block.liquids; -import static net.minecraftforge.common.ForgeDirection.UP; - import java.util.Random; -import universalelectricity.core.vector.Vector3; -import universalelectricity.core.vector.VectorHelper; - import net.minecraft.block.Block; -import net.minecraft.block.BlockStairs; -import net.minecraft.block.BlockStep; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EnumCreatureType; @@ -17,6 +10,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.Explosion; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; +import universalelectricity.core.vector.Vector3; /** * Block prefab for gas that will spread and decay in the world as time goes on. Useful for filling diff --git a/src/minecraft/fluidmech/common/machines/pipes/TileEntityPipe.java b/src/minecraft/fluidmech/common/machines/pipes/TileEntityPipe.java index 0f69b5ef6..f7cb6fd84 100644 --- a/src/minecraft/fluidmech/common/machines/pipes/TileEntityPipe.java +++ b/src/minecraft/fluidmech/common/machines/pipes/TileEntityPipe.java @@ -13,7 +13,6 @@ import java.io.IOException; import java.util.Random; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.INetworkManager; import net.minecraft.network.packet.Packet; @@ -24,7 +23,6 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.ILiquidTank; import net.minecraftforge.liquids.ITankContainer; import net.minecraftforge.liquids.LiquidContainerRegistry; -import net.minecraftforge.liquids.LiquidDictionary; import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.liquids.LiquidTank; diff --git a/src/minecraft/fluidmech/common/pump/BlockConstructionPump.java b/src/minecraft/fluidmech/common/pump/BlockConstructionPump.java index e9f7bdfe1..c171a1e54 100644 --- a/src/minecraft/fluidmech/common/pump/BlockConstructionPump.java +++ b/src/minecraft/fluidmech/common/pump/BlockConstructionPump.java @@ -4,7 +4,6 @@ import hydraulic.fluidnetwork.HydraulicNetworkHelper; import java.util.List; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; diff --git a/src/minecraft/fluidmech/common/pump/TileEntityConstructionPump.java b/src/minecraft/fluidmech/common/pump/TileEntityConstructionPump.java index 40f794397..e8d88d236 100644 --- a/src/minecraft/fluidmech/common/pump/TileEntityConstructionPump.java +++ b/src/minecraft/fluidmech/common/pump/TileEntityConstructionPump.java @@ -7,7 +7,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.ILiquidTank; import net.minecraftforge.liquids.ITankContainer; -import net.minecraftforge.liquids.LiquidContainerData; import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.liquids.LiquidTank; diff --git a/src/minecraft/fluidmech/common/pump/path/LiquidPathFinder.java b/src/minecraft/fluidmech/common/pump/path/LiquidPathFinder.java index 4e26497f9..594974878 100644 --- a/src/minecraft/fluidmech/common/pump/path/LiquidPathFinder.java +++ b/src/minecraft/fluidmech/common/pump/path/LiquidPathFinder.java @@ -3,14 +3,10 @@ package fluidmech.common.pump.path; import hydraulic.helpers.FluidHelper; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Set; -import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.liquids.LiquidStack; import universalelectricity.core.vector.Vector3; /** diff --git a/src/minecraft/fluidmech/common/telepipe/INetworkConnector.java b/src/minecraft/fluidmech/common/telepipe/INetworkConnector.java index b5bab56bf..da322ac34 100644 --- a/src/minecraft/fluidmech/common/telepipe/INetworkConnector.java +++ b/src/minecraft/fluidmech/common/telepipe/INetworkConnector.java @@ -1,10 +1,9 @@ package fluidmech.common.telepipe; -import java.util.List; - -import hydraulic.api.IPipeConnection; import hydraulic.fluidnetwork.IFluidNetworkPart; +import java.util.List; + /** * Used by IFluidNetworkPart to signal this block is remotely connected to another network. It will * cause that network to seak out all other connected network and try to merge them diff --git a/src/minecraft/fluidmech/common/telepipe/TileEntityEndPipe.java b/src/minecraft/fluidmech/common/telepipe/TileEntityEndPipe.java index 941b97504..c62256430 100644 --- a/src/minecraft/fluidmech/common/telepipe/TileEntityEndPipe.java +++ b/src/minecraft/fluidmech/common/telepipe/TileEntityEndPipe.java @@ -1,5 +1,9 @@ package fluidmech.common.telepipe; +import hydraulic.api.ColorCode; +import hydraulic.fluidnetwork.HydraulicNetwork; +import hydraulic.prefab.tile.TileEntityFluidDevice; + import java.util.HashMap; import java.util.List; @@ -9,9 +13,6 @@ import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.liquids.ILiquidTank; import net.minecraftforge.liquids.LiquidContainerRegistry; import net.minecraftforge.liquids.LiquidStack; -import hydraulic.api.ColorCode; -import hydraulic.fluidnetwork.HydraulicNetwork; -import hydraulic.prefab.tile.TileEntityFluidDevice; public class TileEntityEndPipe extends TileEntityFluidDevice implements INetworkConnector { diff --git a/src/minecraft/hydraulic/api/IDrain.java b/src/minecraft/hydraulic/api/IDrain.java index d5840e387..81d7ab3cd 100644 --- a/src/minecraft/hydraulic/api/IDrain.java +++ b/src/minecraft/hydraulic/api/IDrain.java @@ -1,9 +1,9 @@ package hydraulic.api; -import fluidmech.common.pump.TileEntityConstructionPump; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.liquids.ITankContainer; import net.minecraftforge.liquids.LiquidStack; +import fluidmech.common.pump.TileEntityConstructionPump; /** * Interface to make or use the TileEntityDrain. In real life a drain would do nothing but act as an