From 2763a6c964225254802b0186d5b95b48dd7f0983 Mon Sep 17 00:00:00 2001
From: DarkGuardsman <rseifert.phone@gmail.com>
Date: Sun, 21 Jul 2013 22:56:25 -0400
Subject: [PATCH] Cleanup and optimization

Removed some code that is no longer support in the core mod
Merged all ItemBlock classes into a simple class that will later be
moved to the core.
Optimized blockID and config
---
 .../fm/textures/models/pipes/milkPipe.png     | Bin 0 -> 816 bytes
 .../dark/fluid/common/FluidMech.java          |  42 +++++++++---------
 ...temBlockTank.java => ItemBlockHolder.java} |   4 +-
 .../machines/ItemBlockLiquidMachine.java      |  28 ------------
 .../machines/ItemBlockReleaseValve.java       |  28 ------------
 .../pump/TileEntityConstructionPump.java      |   6 ---
 .../common/pump/TileEntityStarterPump.java    |  10 +----
 7 files changed, 24 insertions(+), 94 deletions(-)
 create mode 100644 resources/assets/fm/textures/models/pipes/milkPipe.png
 rename src/minecraft/dark/fluid/common/machines/{ItemBlockTank.java => ItemBlockHolder.java} (85%)
 delete mode 100644 src/minecraft/dark/fluid/common/machines/ItemBlockLiquidMachine.java
 delete mode 100644 src/minecraft/dark/fluid/common/machines/ItemBlockReleaseValve.java

diff --git a/resources/assets/fm/textures/models/pipes/milkPipe.png b/resources/assets/fm/textures/models/pipes/milkPipe.png
new file mode 100644
index 0000000000000000000000000000000000000000..a30449fbf4eb33f9812148cecbd831a3c9317d8d
GIT binary patch
literal 816
zcmV-01JC@4P)<h;3K|Lk000e1NJLTq004jh001Be1^@s6+9Gfz00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf00v@9M??Vs0RI60
zpuMM)00007bV*G`2iyr42skM+$PSDE00N*%L_t(|UhSH_P8&fG$M<Z5EucvkDK+6M
z4K-HYAx%(fqNECMz)JuU0ue<K1qB6l+SsY-P@+g_5K>+N{Do(AV=b%u*u9(EJ>Shw
zI_-LN_T29LJ+r%ZFqtAk`u)CaKkj{!Epq<#Otx|MZnrC28_-u8Sw0&v^`Vo;XA$V*
zpnN`W0$5+$413A^{&O4l>|p_<(+FFprZhlZcx6R>|K;abvSsFjpx5ioN&pomDJp9T
z!1tMyhODBlQwa#xUT=^JATBU@GK|WvpEu&$_mfCJx~OoCVhgTyR3DJpKAhf%uiR3k
z0GzA=sDcmdyxk6a&q?wD0aY&~&W?bf;G%r~vf(5Hn5KIhbUzRzJ&0+$7aMz#Wr12?
zHqXktfSN<T2#iu6XMkjUW`Jh`_<#LHwlCiu$rjP=arXhf1OQO`iSkhdUIl<Bf#cyo
zjD`==*le{$qqQLWx*gE(g8?Kt^)bM_VsI6FpcDddfjUr=tOB;l=urgC#hKk^a9Ks*
zGWY<c0Bq(5a4G;~G9HT2;6Z@vxU7PiXFM86TXV4^g1~Og$^uBo%Pt^jv_z}DEEYN|
zGT3lIA72A#YcIc;-n(QSe8vo()tcj_1h~RS37}rkrGY6Q{6gRM$eINZfo}n*bsRo#
zYx9lxaj-4kAO00r`>SI2_}?^gL3l?#DkXrZ$=45c(!j$YKn;ZHH;Y;TMN=68P)vLh
zcNe=XfHIT!;3o~!vM_G~NZbX$VAPAL9!`D?asg+6Z16ci&8bWVi2LT*?gHXS$^g{m
zF>MYh|DIME0RVa+@&-RH=)TuOlygif0H49v(bohROk2AtF0(*sGeDUH;0sj<`h4gj
uDZ_lR0BR2J0%{HmpyrSXfYbjxBE%D25U)X?z9v)v0000<MNUMnLSTY^ms-sL

literal 0
HcmV?d00001

diff --git a/src/minecraft/dark/fluid/common/FluidMech.java b/src/minecraft/dark/fluid/common/FluidMech.java
index a4904daa..c68a5ede 100644
--- a/src/minecraft/dark/fluid/common/FluidMech.java
+++ b/src/minecraft/dark/fluid/common/FluidMech.java
@@ -21,7 +21,6 @@ import org.modstats.Modstats;
 
 import universalelectricity.prefab.TranslationHelper;
 import universalelectricity.prefab.network.PacketManager;
-import cpw.mods.fml.common.DummyModContainer;
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
@@ -43,9 +42,7 @@ import dark.fluid.common.item.ItemTools;
 import dark.fluid.common.machines.BlockReleaseValve;
 import dark.fluid.common.machines.BlockSink;
 import dark.fluid.common.machines.BlockTank;
-import dark.fluid.common.machines.ItemBlockLiquidMachine;
-import dark.fluid.common.machines.ItemBlockReleaseValve;
-import dark.fluid.common.machines.ItemBlockTank;
+import dark.fluid.common.machines.ItemBlockHolder;
 import dark.fluid.common.machines.TileEntityReleaseValve;
 import dark.fluid.common.machines.TileEntitySink;
 import dark.fluid.common.machines.TileEntityTank;
@@ -127,6 +124,7 @@ public class FluidMech extends ModPrefab
 	@EventHandler
 	public void preInit(FMLPreInitializationEvent event)
 	{
+		super.preInit(event);
 		/* LOGGER SETUP */
 		FMLog.setParent(FMLLog.getLogger());
 		FMLog.info("Initializing...");
@@ -143,11 +141,11 @@ public class FluidMech extends ModPrefab
 		/* BLOCK REGISTER CALLS */
 		GameRegistry.registerBlock(blockPipe, ItemBlockPipe.class, "lmPipe");
 		GameRegistry.registerBlock(blockGenPipe, ItemBlockPipe.class, "lmGenPipe");
-		GameRegistry.registerBlock(blockReleaseValve, ItemBlockReleaseValve.class, "eValve");
+		GameRegistry.registerBlock(blockReleaseValve, ItemBlockHolder.class, "eValve");
 		GameRegistry.registerBlock(blockRod, "mechRod");
 		GameRegistry.registerBlock(blockGenerator, "lmGen");
-		GameRegistry.registerBlock(blockMachine, ItemBlockLiquidMachine.class, "lmMachines");
-		GameRegistry.registerBlock(blockTank, ItemBlockTank.class, "lmTank");
+		GameRegistry.registerBlock(blockMachine, ItemBlockHolder.class, "lmMachines");
+		GameRegistry.registerBlock(blockTank, ItemBlockHolder.class, "lmTank");
 		GameRegistry.registerBlock(blockSink, "lmSink");
 		GameRegistry.registerBlock(blockDrain, "lmDrain");
 		GameRegistry.registerBlock(blockConPump, "lmConPump");
@@ -155,9 +153,9 @@ public class FluidMech extends ModPrefab
 	}
 
 	@EventHandler
-	public void Init(FMLInitializationEvent event)
+	public void init(FMLInitializationEvent event)
 	{
-
+		super.init(event);
 		/* LOGGER */
 		FMLog.info("Loading...");
 		proxy.Init();
@@ -167,7 +165,7 @@ public class FluidMech extends ModPrefab
 		GameRegistry.registerTileEntity(TileEntityGenericPipe.class, "lmGenPipeTile");
 		GameRegistry.registerTileEntity(TileEntityStarterPump.class, "lmPumpTile");
 		//GameRegistry.registerTileEntity(TileEntityRod.class, "lmRodTile");
-		GameRegistry.registerTileEntity(TileEntityReleaseValve.class, "lmeValve");
+		GameRegistry.registerTileEntity(TileEntityReleaseValve.class, "lmReleaseValve");
 		GameRegistry.registerTileEntity(TileEntityTank.class, "lmTank");
 		//GameRegistry.registerTileEntity(TileEntityGenerator.class, "lmGen");
 		GameRegistry.registerTileEntity(TileEntitySink.class, "lmSink");
@@ -192,8 +190,9 @@ public class FluidMech extends ModPrefab
 	}
 
 	@EventHandler
-	public void PostInit(FMLPostInitializationEvent event)
+	public void postInit(FMLPostInitializationEvent event)
 	{
+		super.postInit(event);
 		/* LOGGER */
 		FMLog.info("Finalizing...");
 		proxy.postInit();
@@ -288,17 +287,17 @@ public class FluidMech extends ModPrefab
 		Fluid waste = new Fluid("waste").setBlockID(FluidMech.CONFIGURATION.getBlock("WasteLiquid", BLOCK_ID_PREFIX++).getInt());
 
 		/* BLOCK DECLARATION -- CONFIG LOADER */
-		blockGenPipe = new BlockPipe(FluidMech.CONFIGURATION.getBlock("Pipes", BLOCK_ID_PREFIX).getInt());
-		blockMachine = new BlockPumpMachine(FluidMech.CONFIGURATION.getBlock("Machines", BLOCK_ID_PREFIX + 1).getInt());
-		blockRod = new BlockRod(FluidMech.CONFIGURATION.getBlock("MechRod", BLOCK_ID_PREFIX + 3).getInt());
-		blockGenerator = new BlockGenerator((FluidMech.CONFIGURATION.getBlock("Generator", BLOCK_ID_PREFIX + 4).getInt()));
-		blockReleaseValve = new BlockReleaseValve((FluidMech.CONFIGURATION.getBlock("ReleaseValve", BLOCK_ID_PREFIX + 5).getInt()));
-		blockTank = new BlockTank(FluidMech.CONFIGURATION.getBlock("Tank", BLOCK_ID_PREFIX + 6).getInt());
+		blockGenPipe = new BlockPipe(BLOCK_ID_PREFIX++);
+		blockMachine = new BlockPumpMachine(BLOCK_ID_PREFIX++);
+		blockRod = new BlockRod(BLOCK_ID_PREFIX++);
+		blockGenerator = new BlockGenerator(BLOCK_ID_PREFIX++);
+		blockReleaseValve = new BlockReleaseValve(BLOCK_ID_PREFIX++);
+		blockTank = new BlockTank(BLOCK_ID_PREFIX++);
 		blockWasteLiquid = new BlockFluidFinite(waste.getBlockID(), waste, Material.water);
-		blockSink = new BlockSink(FluidMech.CONFIGURATION.getBlock("Sink", BLOCK_ID_PREFIX + 8).getInt());
-		blockDrain = new BlockDrain(FluidMech.CONFIGURATION.getBlock("Drain", BLOCK_ID_PREFIX + 9).getInt());
-		blockConPump = new BlockConstructionPump(FluidMech.CONFIGURATION.getBlock("ConstructionPump", BLOCK_ID_PREFIX + 10).getInt());
-		blockPipe = new BlockPipe(FluidMech.CONFIGURATION.getBlock("RestrictedPipes", BLOCK_ID_PREFIX + 11).getInt());
+		blockSink = new BlockSink(BLOCK_ID_PREFIX++);
+		blockDrain = new BlockDrain(BLOCK_ID_PREFIX++);
+		blockConPump = new BlockConstructionPump(BLOCK_ID_PREFIX++);
+		blockPipe = new BlockPipe(BLOCK_ID_PREFIX++);
 
 		/* ITEM DECLARATION */
 		itemParts = new ItemParts(FluidMech.CONFIGURATION.getItem("Parts", ITEM_ID_PREFIX).getInt());
@@ -330,7 +329,6 @@ public class FluidMech extends ModPrefab
 
 	public static final CreativeTabs TabFluidMech = new CreativeTabs("Fluid Mechanics")
 	{
-
 		public ItemStack getIconItemStack()
 		{
 			return new ItemStack(blockPipe, 1, 4);
diff --git a/src/minecraft/dark/fluid/common/machines/ItemBlockTank.java b/src/minecraft/dark/fluid/common/machines/ItemBlockHolder.java
similarity index 85%
rename from src/minecraft/dark/fluid/common/machines/ItemBlockTank.java
rename to src/minecraft/dark/fluid/common/machines/ItemBlockHolder.java
index 5f28abd8..da621809 100644
--- a/src/minecraft/dark/fluid/common/machines/ItemBlockTank.java
+++ b/src/minecraft/dark/fluid/common/machines/ItemBlockHolder.java
@@ -4,10 +4,10 @@ import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 
-public class ItemBlockTank extends ItemBlock
+public class ItemBlockHolder extends ItemBlock
 {
 
-	public ItemBlockTank(int id)
+	public ItemBlockHolder(int id)
 	{
 		super(id);
 		this.setMaxDamage(0);
diff --git a/src/minecraft/dark/fluid/common/machines/ItemBlockLiquidMachine.java b/src/minecraft/dark/fluid/common/machines/ItemBlockLiquidMachine.java
deleted file mode 100644
index 749b7b32..00000000
--- a/src/minecraft/dark/fluid/common/machines/ItemBlockLiquidMachine.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package dark.fluid.common.machines;
-
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-
-public class ItemBlockLiquidMachine extends ItemBlock
-{
-
-	public ItemBlockLiquidMachine(int id)
-	{
-		super(id);
-		this.setMaxDamage(0);
-		this.setHasSubtypes(true);
-	}
-
-	@Override
-	public int getMetadata(int damage)
-	{
-		return damage;
-	}
-
-	@Override
-	public String getUnlocalizedName(ItemStack itemStack)
-	{
-		return Block.blocksList[this.getBlockID()].getUnlocalizedName() + "." + itemStack.getItemDamage();
-	}
-}
diff --git a/src/minecraft/dark/fluid/common/machines/ItemBlockReleaseValve.java b/src/minecraft/dark/fluid/common/machines/ItemBlockReleaseValve.java
deleted file mode 100644
index b3c17378..00000000
--- a/src/minecraft/dark/fluid/common/machines/ItemBlockReleaseValve.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package dark.fluid.common.machines;
-
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-
-public class ItemBlockReleaseValve extends ItemBlock
-{
-
-	public ItemBlockReleaseValve(int id)
-	{
-		super(id);
-		this.setMaxDamage(0);
-		this.setHasSubtypes(true);
-	}
-
-	@Override
-	public int getMetadata(int damage)
-	{
-		return damage;
-	}
-
-	@Override
-	public String getUnlocalizedName(ItemStack itemStack)
-	{
-		return Block.blocksList[this.getBlockID()].getUnlocalizedName() + "." + itemStack.getItemDamage();
-	}
-}
diff --git a/src/minecraft/dark/fluid/common/pump/TileEntityConstructionPump.java b/src/minecraft/dark/fluid/common/pump/TileEntityConstructionPump.java
index ee802bf6..07ea438d 100644
--- a/src/minecraft/dark/fluid/common/pump/TileEntityConstructionPump.java
+++ b/src/minecraft/dark/fluid/common/pump/TileEntityConstructionPump.java
@@ -25,12 +25,6 @@ public class TileEntityConstructionPump extends TileEntityRunnableMachine implem
 	private int liquidRequest = 5;
 	public int rotation = 0;
 
-	public TileEntityConstructionPump()
-	{
-		super(100);
-		// TODO Auto-generated constructor stub
-	}
-
 	@Override
 	public void initiate()
 	{
diff --git a/src/minecraft/dark/fluid/common/pump/TileEntityStarterPump.java b/src/minecraft/dark/fluid/common/pump/TileEntityStarterPump.java
index df621759..fb8467c1 100644
--- a/src/minecraft/dark/fluid/common/pump/TileEntityStarterPump.java
+++ b/src/minecraft/dark/fluid/common/pump/TileEntityStarterPump.java
@@ -35,12 +35,6 @@ public class TileEntityStarterPump extends TileEntityRunnableMachine implements
 	ForgeDirection wireConnection = ForgeDirection.EAST;
 	ForgeDirection pipeConnection = ForgeDirection.EAST;
 
-	public TileEntityStarterPump()
-	{
-		super(20);
-		// TODO Auto-generated constructor stub
-	}
-
 	/** gets the side connection for the wire and pipe */
 	public void getConnections()
 	{
@@ -119,7 +113,7 @@ public class TileEntityStarterPump extends TileEntityRunnableMachine implements
 	}
 
 	/** checks to see if this pump can pump the selected target block
-	 * 
+	 *
 	 * @param x y z - location of the block, use the tileEntities world
 	 * @return true if it can pump */
 	boolean canPump(Vector3 vec)
@@ -129,7 +123,7 @@ public class TileEntityStarterPump extends TileEntityRunnableMachine implements
 	}
 
 	/** drains the block(removes) at the location given
-	 * 
+	 *
 	 * @param loc - vector 3 location
 	 * @return true if the block was drained */
 	boolean drainBlock(Vector3 loc)