Merge branch 'master' into master

src/main/java/com/hbm/blocks/machine/MachineCatalyticCracker.java

@@ -2,7 +2,8 @@ package com.hbm.blocks.machine;
 
 import com.hbm.blocks.BlockDummyable;
 import com.hbm.handler.MultiblockHandlerXR;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.items.ModItems;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.oil.TileEntityMachineCatalyticCracker;
@@ -69,7 +70,7 @@ public class MachineCatalyticCracker extends BlockDummyable {
 						player.addChatComponentMessage(new ChatComponentTranslation("hbmfluid." + cracker.tanks[i].getTankType().getName().toLowerCase()).appendSibling(new ChatComponentText(": " + cracker.tanks[i].getFill() + "/" + cracker.tanks[i].getMaxFill() + "mB")));
 				} else {
 					
-					FluidType type = FluidType.values()[player.getHeldItem().getItemDamage()];
+					FluidType type = Fluids.fromID(player.getHeldItem().getItemDamage());
 					cracker.tanks[0].setTankType(type);
 					cracker.markDirty();
 					player.addChatComponentMessage(new ChatComponentText(EnumChatFormatting.YELLOW + "Changed type to " + type + "!"));

src/main/java/com/hbm/blocks/machine/MachineChungus.java

@@ -1,8 +1,9 @@
 package com.hbm.blocks.machine;
 
 import com.hbm.blocks.BlockDummyable;
-import com.hbm.handler.FluidTypeHandler.FluidType;
 import com.hbm.handler.MultiblockHandlerXR;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.TileEntityChungus;
 
@@ -55,35 +56,27 @@ public class MachineChungus extends BlockDummyable {
 					world.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "hbm:block.chungusLever", 1.5F, 1.0F);
 					
 					if(!world.isRemote) {
-						switch(entity.tanks[0].getTankType()) {
+						FluidType type = entity.tanks[0].getTankType();
-						case STEAM:
+						if(type == Fluids.STEAM) {
-							entity.tanks[0].setTankType(FluidType.HOTSTEAM);
+							entity.tanks[0].setTankType(Fluids.HOTSTEAM);
-							entity.tanks[1].setTankType(FluidType.STEAM);
+							entity.tanks[1].setTankType(Fluids.STEAM);
 							entity.tanks[0].setFill(entity.tanks[0].getFill() / 10);
 							entity.tanks[1].setFill(0);
-							break;
+						} else if(type == Fluids.HOTSTEAM) {
-							
+							entity.tanks[0].setTankType(Fluids.SUPERHOTSTEAM);
-						case HOTSTEAM:
+							entity.tanks[1].setTankType(Fluids.HOTSTEAM);
-							entity.tanks[0].setTankType(FluidType.SUPERHOTSTEAM);
-							entity.tanks[1].setTankType(FluidType.HOTSTEAM);
 							entity.tanks[0].setFill(entity.tanks[0].getFill() / 10);
 							entity.tanks[1].setFill(0);
-							break;
+						} else if(type == Fluids.SUPERHOTSTEAM) {
-							
+							entity.tanks[0].setTankType(Fluids.ULTRAHOTSTEAM);
-						case SUPERHOTSTEAM:
+							entity.tanks[1].setTankType(Fluids.SUPERHOTSTEAM);
-							entity.tanks[0].setTankType(FluidType.ULTRAHOTSTEAM);
-							entity.tanks[1].setTankType(FluidType.SUPERHOTSTEAM);
 							entity.tanks[0].setFill(entity.tanks[0].getFill() / 10);
 							entity.tanks[1].setFill(0);
-							break;
+						} else {
-							
+							entity.tanks[0].setTankType(Fluids.STEAM);
-						default:
+							entity.tanks[1].setTankType(Fluids.SPENTSTEAM);
-						case ULTRAHOTSTEAM:
-							entity.tanks[0].setTankType(FluidType.STEAM);
-							entity.tanks[1].setTankType(FluidType.SPENTSTEAM);
 							entity.tanks[0].setFill(Math.min(entity.tanks[0].getFill() * 1000, entity.tanks[0].getMaxFill()));
 							entity.tanks[1].setFill(0);
-							break;
 						}
 						
 						entity.markDirty();

src/main/java/com/hbm/blocks/machine/MachineFractionTower.java

@@ -1,7 +1,8 @@
 package com.hbm.blocks.machine;
 
 import com.hbm.blocks.BlockDummyable;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.items.ModItems;
 import com.hbm.tileentity.TileEntityProxyCombo;
 import com.hbm.tileentity.machine.oil.TileEntityMachineFractionTower;
@@ -71,7 +72,7 @@ public class MachineFractionTower extends BlockDummyable {
 					if(world.getTileEntity(pos[0], pos[1] - 3, pos[2]) instanceof TileEntityMachineFractionTower) {
 						player.addChatComponentMessage(new ChatComponentText(EnumChatFormatting.RED + "You can only change the type in the bottom segment!"));
 					} else {
-						FluidType type = FluidType.values()[player.getHeldItem().getItemDamage()];
+						FluidType type = Fluids.fromID(player.getHeldItem().getItemDamage());
 						frac.tanks[0].setTankType(type);
 						frac.markDirty();
 						player.addChatComponentMessage(new ChatComponentText(EnumChatFormatting.YELLOW + "Changed type to " + type + "!"));

src/main/java/com/hbm/crafting/ArmorRecipes.java

@@ -2,7 +2,7 @@ package com.hbm.crafting;
 
 import com.hbm.blocks.ModBlocks;
 import com.hbm.config.GeneralConfig;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.inventory.OreDictManager;
 import static com.hbm.inventory.OreDictManager.*;
 import com.hbm.items.ModItems;
@@ -79,7 +79,7 @@ public class ArmorRecipes {
 		CraftingManager.addShapelessAuto(new ItemStack(ModItems.ajro_boots, 1), new Object[] { ModItems.ajr_boots, KEY_RED, KEY_BLACK });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.bj_helmet, 1), new Object[] { "SBS", " C ", " I ", 'S', Items.string, 'B', new ItemStack(Blocks.wool, 1, 15), 'C', ModItems.circuit_targeting_tier4, 'I', STAR.ingot() });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.bj_plate, 1), new Object[] { "N N", "MSM", "NCN", 'N', ModItems.plate_armor_lunar, 'M', ModItems.motor_desh, 'S', ModItems.starmetal_plate, 'C', ModItems.circuit_targeting_tier5 });
-		CraftingManager.addRecipeAuto(new ItemStack(ModItems.bj_plate_jetpack, 1), new Object[] { "NFN", "TPT", "ICI", 'N', ModItems.plate_armor_lunar, 'F', ModItems.fins_quad_titanium, 'T', new ItemStack(ModItems.fluid_tank_full, 1, FluidType.XENON.ordinal()), 'P', ModItems.bj_plate, 'I', ModItems.mp_thruster_10_xenon, 'C', ModItems.crystal_phosphorus });
+		CraftingManager.addRecipeAuto(new ItemStack(ModItems.bj_plate_jetpack, 1), new Object[] { "NFN", "TPT", "ICI", 'N', ModItems.plate_armor_lunar, 'F', ModItems.fins_quad_titanium, 'T', new ItemStack(ModItems.fluid_tank_full, 1, FluidTypeTheOldOne.XENON.ordinal()), 'P', ModItems.bj_plate, 'I', ModItems.mp_thruster_10_xenon, 'C', ModItems.crystal_phosphorus });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.bj_legs, 1), new Object[] { "MBM", "NSN", "N N", 'N', ModItems.plate_armor_lunar, 'M', ModItems.motor_desh, 'S', ModItems.starmetal_legs, 'B', ModBlocks.block_starmetal });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.bj_boots, 1), new Object[] { "N N", "BSB", 'N', ModItems.plate_armor_lunar, 'S', ModItems.starmetal_boots, 'B', ModBlocks.block_starmetal });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.hev_helmet, 1), new Object[] { "PPC", "PBP", "IFI", 'P', ModItems.plate_armor_hev, 'C', ModItems.circuit_targeting_tier4, 'B', ModItems.titanium_helmet, 'I', ModItems.plate_polymer, 'F', ModItems.gas_mask_filter });

src/main/java/com/hbm/crafting/WeaponRecipes.java

@@ -1,7 +1,7 @@
 package com.hbm.crafting;
 
 import com.hbm.blocks.ModBlocks;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.inventory.OreDictManager;
 import static com.hbm.inventory.OreDictManager.*;
 import com.hbm.items.ModItems;
@@ -136,7 +136,7 @@ public class WeaponRecipes {
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_b92), new Object[] { "DDD", "SSC", "  R", 'D', ModItems.plate_dineutronium, 'S', STAR.ingot(), 'C', ModItems.circuit_targeting_tier6, 'R', ModItems.gun_revolver_schrabidium });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_b93), new Object[] { "PCE", "SEB", "PCE", 'P', ModItems.plate_dineutronium, 'C', ModItems.weaponized_starblaster_cell, 'E', ModItems.component_emitter, 'B', ModItems.gun_b92, 'S', ModItems.singularity_spark });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_b92_ammo, 1), new Object[] { "PSP", "ESE", "PSP", 'P', STEEL.plate(), 'S', STAR.ingot(), 'E', ModItems.powder_spark_mix });
-		CraftingManager.addShapelessAuto(new ItemStack(ModItems.weaponized_starblaster_cell, 1), new Object[] { new ItemStack(ModItems.fluid_tank_full, 1, FluidType.ACID.getID()), GunB92Cell.getFullCell(), ModItems.wire_copper });
+		CraftingManager.addShapelessAuto(new ItemStack(ModItems.weaponized_starblaster_cell, 1), new Object[] { new ItemStack(ModItems.fluid_tank_full, 1, FluidTypeTheOldOne.ACID.getID()), GunB92Cell.getFullCell(), ModItems.wire_copper });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_uzi, 1), new Object[] { "SMS", " PB", " P ", 'S', STEEL.ingot(), 'M', ModItems.mechanism_rifle_2, 'P', STEEL.plate(), 'B', ModItems.bolt_dura_steel });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_uzi_silencer, 1), new Object[] { "P  ", " P ", "  U", 'P', POLYMER.ingot(), 'U', ModItems.gun_uzi });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.gun_uzi_saturnite, 1), new Object[] { "SMS", " PB", " P ", 'S', BIGMT.ingot(), 'M', ModItems.mechanism_rifle_2, 'P', BIGMT.plate(), 'B', ModItems.bolt_tungsten });
@@ -216,7 +216,7 @@ public class WeaponRecipes {
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.assembly_calamity, 12), new Object[] { " I ", "GCG", " P ", 'I', PB.ingot(), 'G', ModItems.cordite, 'C', ModItems.casing_50, 'P', ModItems.primer_50 });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.assembly_actionexpress, 12), new Object[] { " I", "GC", " P", 'I', PB.ingot(), 'G', ModItems.cordite, 'C', ModItems.casing_50, 'P', ModItems.primer_50 });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.assembly_nuke, 1), new Object[] { " WP", "SEP", " WP", 'W', ModItems.wire_aluminium, 'P', STEEL.plate(), 'S', ModItems.hull_small_steel, 'E', ModItems.ingot_semtex });
-		CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_dart, 16), new Object[] { "IPI", "ICI", "IPI", 'I', ModItems.plate_polymer, 'P', IRON.plate(), 'C', new ItemStack(ModItems.fluid_tank_lead_full, 1, FluidType.WATZ.ordinal()) });
+		CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_dart, 16), new Object[] { "IPI", "ICI", "IPI", 'I', ModItems.plate_polymer, 'P', IRON.plate(), 'C', new ItemStack(ModItems.fluid_tank_lead_full, 1, FluidTypeTheOldOne.WATZ.ordinal()) });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_dart_nerf, 16), new Object[] { "I", "I", 'I', ModItems.plate_polymer });
 		
 		//Folly shells
@@ -307,7 +307,7 @@ public class WeaponRecipes {
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_fuel_vaporizer, 1), new Object[] { "PSP", "SNS", "PSP", 'P', P_WHITE.ingot(), 'S', ModItems.crystal_sulfur, 'N', ModItems.ammo_fuel_napalm });
 		
 		//Fire Extingusisher Tanks
-		CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_fireext, 1), new Object[] { " P ", "BDB", " P ", 'P', STEEL.plate(), 'B', ModItems.bolt_tungsten, 'D', new ItemStack(ModItems.fluid_tank_full, 1, FluidType.WATER.ordinal()) });
+		CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_fireext, 1), new Object[] { " P ", "BDB", " P ", 'P', STEEL.plate(), 'B', ModItems.bolt_tungsten, 'D', new ItemStack(ModItems.fluid_tank_full, 1, FluidTypeTheOldOne.WATER.ordinal()) });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_fireext_foam, 1), new Object[] { " N ", "NFN", " N ", 'N', KNO.dust(), 'F', ModItems.ammo_fireext });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.ammo_fireext_sand, 1), new Object[] { "NNN", "NFN", "NNN", 'N', ModBlocks.sand_boron, 'F', ModItems.ammo_fireext });
 
@@ -339,7 +339,7 @@ public class WeaponRecipes {
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_mirv, 1), new Object[] { "GGG", "GCG", "GGG", 'G', ModItems.grenade_smart, 'C', ModItems.grenade_generic });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_breach, 1), new Object[] { "G", "G", "P", 'G', ModItems.grenade_smart, 'P', BIGMT.plate() });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_burst, 1), new Object[] { "GGG", "GCG", "GGG", 'G', ModItems.grenade_breach, 'C', ModItems.grenade_generic });
-		CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_cloud), new Object[] { "SPS", "CAC", "SPS", 'S', S.dust(), 'P', ModItems.powder_poison, 'C', CU.dust(), 'A', new ItemStack(ModItems.fluid_tank_full, 1, FluidType.ACID.getID()) });
+		CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_cloud), new Object[] { "SPS", "CAC", "SPS", 'S', S.dust(), 'P', ModItems.powder_poison, 'C', CU.dust(), 'A', new ItemStack(ModItems.fluid_tank_full, 1, FluidTypeTheOldOne.ACID.getID()) });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_pink_cloud), new Object[] { " S ", "ECE", " E ", 'S', ModItems.powder_spark_mix, 'E', ModItems.powder_magic, 'C', ModItems.grenade_cloud });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.nuclear_waste_pearl), new Object[] { "WWW", "WFW", "WWW", 'W', ModItems.nuclear_waste_tiny, 'F', ModBlocks.block_fallout });
 		//CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_nuke), new Object[] { "CGC", "CGC", "PAP", 'C', ModBlocks.det_charge, 'G', ModItems.grenade_mk2, 'P', ALLOY.plate(), 'A', Blocks.anvil });

src/main/java/com/hbm/handler/FluidTypeHandler.java

@@ -5,103 +5,113 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.FluidType.FluidTrait;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.render.util.EnumSymbol;
 
 public class FluidTypeHandler {
 	
-	public static enum FluidTrait {
+	@Deprecated //you might spot this deprecated annotation and thing "oh goodie, that's something for me to remove and replace!"
-		AMAT,
+	//no.
-		CORROSIVE,
+	//if you tough any of this i promise you will regret being born
-		CORROSIVE_2,
+	//deprecated means "avoid using in the future" not "fuck with this with your heart's content"
-		LEAD_CONTAINER,
+	//hands off. if you can read this, close this class now.
-		NO_CONTAINER,
+	public static class FluidTypeTheOldOne extends com.hbm.inventory.fluid.FluidType {
-		NO_ID;
-	}
 
-	public static enum FluidType {
+		/*WATER			= new FluidType (0x3333FF,	1,	1,	1,	0,	0,	0,	EnumSymbol.NONE,		"hbmfluid.water"),
-		NONE			(0x888888,	0,	1,	1,	0,	0,	0,	EnumSymbol.NONE,		"hbmfluid.none"),
+		STEAM			= new FluidType (0xe5e5e5,	9,	2,	1,	3,	0,	0,	EnumSymbol.NONE,		"hbmfluid.steam", 100),
+		HOTSTEAM		= new FluidType (0xE7D6D6,	1,	1,	2,	4,	0,	0,	EnumSymbol.NONE,		"hbmfluid.hotsteam", 300),
+		SUPERHOTSTEAM	= new FluidType (0xE7B7B7,	2,	1,	2,	4,	0,	0,	EnumSymbol.NONE,		"hbmfluid.superhotsteam", 450),
+		ULTRAHOTSTEAM	= new FluidType (0xE39393,	13,	1,	2,	4,	0,	0,	EnumSymbol.NONE,		"hbmfluid.ultrahotsteam", 600),
+		COOLANT			= new FluidType (0xd8fcff,	2,	1,	1,	1,	0,	0,	EnumSymbol.NONE,		"hbmfluid.coolant"),
 		
-		WATER			(0x3333FF,	1,	1,	1,	0,	0,	0,	EnumSymbol.NONE,		"hbmfluid.water"),
+		LAVA			= new FluidType (0xFF3300,	3,	1,	1,	4,	0,	0,	EnumSymbol.NOWATER,		"hbmfluid.lava", 1200),
-		STEAM			(0xe5e5e5,	9,	2,	1,	3,	0,	0,	EnumSymbol.NONE,		"hbmfluid.steam", 100),
-		HOTSTEAM		(0xE7D6D6,	1,	1,	2,	4,	0,	0,	EnumSymbol.NONE,		"hbmfluid.hotsteam", 300),
-		SUPERHOTSTEAM	(0xE7B7B7,	2,	1,	2,	4,	0,	0,	EnumSymbol.NONE,		"hbmfluid.superhotsteam", 450),
-		ULTRAHOTSTEAM	(0xE39393,	13,	1,	2,	4,	0,	0,	EnumSymbol.NONE,		"hbmfluid.ultrahotsteam", 600),
-		COOLANT			(0xd8fcff,	2,	1,	1,	1,	0,	0,	EnumSymbol.NONE,		"hbmfluid.coolant"),
 		
-		LAVA			(0xFF3300,	3,	1,	1,	4,	0,	0,	EnumSymbol.NOWATER,		"hbmfluid.lava", 1200),
+		DEUTERIUM		= new FluidType (0x0000FF,	4,	1,	1,	3,	4,	0,	EnumSymbol.NONE,		"hbmfluid.deuterium"),
+		TRITIUM			= new FluidType (0x000099,	5,	1,	1,	3,	4,	0,	EnumSymbol.RADIATION,	"hbmfluid.tritium"),
 
-		DEUTERIUM		(0x0000FF,	4,	1,	1,	3,	4,	0,	EnumSymbol.NONE,		"hbmfluid.deuterium"),
+		OIL				= new FluidType (0x020202,	6,	1,	1,	2,	1,	0,	EnumSymbol.NONE,		"hbmfluid.oil"),
-		TRITIUM			(0x000099,	5,	1,	1,	3,	4,	0,	EnumSymbol.RADIATION,	"hbmfluid.tritium"),
+		HOTOIL			= new FluidType (0x300900,	8,	2,	1,	2,	3,	0,	EnumSymbol.NONE,		"hbmfluid.hotoil", 350),
 		
-		OIL				(0x020202,	6,	1,	1,	2,	1,	0,	EnumSymbol.NONE,		"hbmfluid.oil"),
+		HEAVYOIL		= new FluidType (0x141312,	2,	2,	1,	2,	1,	0,	EnumSymbol.NONE,		"hbmfluid.heavyoil"),
-		HOTOIL			(0x300900,	8,	2,	1,	2,	3,	0,	EnumSymbol.NONE,		"hbmfluid.hotoil", 350),
+		BITUMEN			= new FluidType (0x1f2426,	3,	2,	1,	2,	0,	0,	EnumSymbol.NONE,		"hbmfluid.bitumen"),
+		SMEAR			= new FluidType (0x190f01,	7,	1,	1,	2,	1,	0,	EnumSymbol.NONE,		"hbmfluid.smear"),
+		HEATINGOIL		= new FluidType (0x211806,	4,	2,	1,	2,	2,	0,	EnumSymbol.NONE,		"hbmfluid.heatingoil"),
 		
-		HEAVYOIL		(0x141312,	2,	2,	1,	2,	1,	0,	EnumSymbol.NONE,		"hbmfluid.heavyoil"),
+		RECLAIMED		= new FluidType (0x332b22,	8,	1,	1,	2,	2,	0,	EnumSymbol.NONE,		"hbmfluid.reclaimed"),
-		BITUMEN			(0x1f2426,	3,	2,	1,	2,	0,	0,	EnumSymbol.NONE,		"hbmfluid.bitumen"),
+		PETROIL			= new FluidType (0x44413d,	9,	1,	1,	1,	3,	0,	EnumSymbol.NONE,		"hbmfluid.petroil"),
-		SMEAR			(0x190f01,	7,	1,	1,	2,	1,	0,	EnumSymbol.NONE,		"hbmfluid.smear"),
-		HEATINGOIL		(0x211806,	4,	2,	1,	2,	2,	0,	EnumSymbol.NONE,		"hbmfluid.heatingoil"),
 		
-		RECLAIMED		(0x332b22,	8,	1,	1,	2,	2,	0,	EnumSymbol.NONE,		"hbmfluid.reclaimed"),
+		LUBRICANT		= new FluidType (0x606060,	10,	1,	1,	2,	1,	0,	EnumSymbol.NONE,		"hbmfluid.lubricant"),
-		PETROIL			(0x44413d,	9,	1,	1,	1,	3,	0,	EnumSymbol.NONE,		"hbmfluid.petroil"),
 		
-		LUBRICANT		(0x606060,	10,	1,	1,	2,	1,	0,	EnumSymbol.NONE,		"hbmfluid.lubricant"),
+		NAPHTHA			= new FluidType (0x595744,	5,	2,	1,	2,	1,	0,	EnumSymbol.NONE,		"hbmfluid.naphtha"),
+		DIESEL			= new FluidType (0xf2eed5,	11,	1,	1,	1,	2,	0,	EnumSymbol.NONE,		"hbmfluid.diesel"),
 		
-		NAPHTHA			(0x595744,	5,	2,	1,	2,	1,	0,	EnumSymbol.NONE,		"hbmfluid.naphtha"),
+		LIGHTOIL		= new FluidType (0x8c7451,	6,	2,	1,	1,	2,	0,	EnumSymbol.NONE,		"hbmfluid.lightoil"),
-		DIESEL			(0xf2eed5,	11,	1,	1,	1,	2,	0,	EnumSymbol.NONE,		"hbmfluid.diesel"),
+		KEROSENE		= new FluidType (0xffa5d2,	12,	1,	1,	1,	2,	0,	EnumSymbol.NONE,		"hbmfluid.kerosene"),
 		
-		LIGHTOIL		(0x8c7451,	6,	2,	1,	1,	2,	0,	EnumSymbol.NONE,		"hbmfluid.lightoil"),
+		GAS				= new FluidType (0xfffeed,	13,	1,	1,	1,	4,	1,	EnumSymbol.NONE,		"hbmfluid.gas"),
-		KEROSENE		(0xffa5d2,	12,	1,	1,	1,	2,	0,	EnumSymbol.NONE,		"hbmfluid.kerosene"),
+		PETROLEUM		= new FluidType (0x7cb7c9,	7,	2,	1,	1,	4,	1,	EnumSymbol.NONE,		"hbmfluid.petroleum"),
+		LPG				= new FluidType (0x4747EA,	5,	2,	2,	1,	3,	1,	EnumSymbol.NONE,		"hbmfluid.lpg"),
 		
-		GAS				(0xfffeed,	13,	1,	1,	1,	4,	1,	EnumSymbol.NONE,		"hbmfluid.gas"),
+		BIOGAS			= new FluidType (0xbfd37c,	12,	2,	1,	1,	4,	1,	EnumSymbol.NONE,		"hbmfluid.biogas"),
-		PETROLEUM		(0x7cb7c9,	7,	2,	1,	1,	4,	1,	EnumSymbol.NONE,		"hbmfluid.petroleum"),
+		BIOFUEL			= new FluidType (0xeef274,	13,	2,	1,	1,	2,	0,	EnumSymbol.NONE,		"hbmfluid.biofuel"),
-		LPG				(0x4747EA,	5,	2,	2,	1,	3,	1,	EnumSymbol.NONE,		"hbmfluid.lpg"),
 
-		BIOGAS			(0xbfd37c,	12,	2,	1,	1,	4,	1,	EnumSymbol.NONE,		"hbmfluid.biogas"),
+		NITAN			= new FluidType (0x8018ad,	15,	2,	1,	2,	4,	1,	EnumSymbol.NONE,		"hbmfluid.nitan"),
-		BIOFUEL			(0xeef274,	13,	2,	1,	1,	2,	0,	EnumSymbol.NONE,		"hbmfluid.biofuel"),
 		
-		NITAN			(0x8018ad,	15,	2,	1,	2,	4,	1,	EnumSymbol.NONE,		"hbmfluid.nitan"),
+		UF6				= new FluidType (0xD1CEBE,	14,	1,	1,	4,	0,	2,	EnumSymbol.RADIATION,	"hbmfluid.uf6", FluidTrait.CORROSIVE),
+		PUF6			= new FluidType (0x4C4C4C,	15,	1,	1,	4,	0,	4,	EnumSymbol.RADIATION,	"hbmfluid.puf6", FluidTrait.CORROSIVE, FluidTrait.LEAD_CONTAINER),
+		SAS3			= new FluidType (0x4ffffc,	14,	2,	1,	5,	0,	4,	EnumSymbol.RADIATION,	"hbmfluid.sas3", FluidTrait.CORROSIVE, FluidTrait.LEAD_CONTAINER),
+		SCHRABIDIC		= new FluidType (0x006B6B,	14,	1,	2,	5,	0,	5,	EnumSymbol.ACID,		"hbmfluid.schrabidic", FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER),
 		
-		UF6				(0xD1CEBE,	14,	1,	1,	4,	0,	2,	EnumSymbol.RADIATION,	"hbmfluid.uf6", FluidTrait.CORROSIVE),
+		AMAT			= new FluidType (0x010101,	0,	2,	1,	5,	0,	5,	EnumSymbol.ANTIMATTER,	"hbmfluid.amat", FluidTrait.AMAT),
-		PUF6			(0x4C4C4C,	15,	1,	1,	4,	0,	4,	EnumSymbol.RADIATION,	"hbmfluid.puf6", FluidTrait.CORROSIVE, FluidTrait.LEAD_CONTAINER),
+		ASCHRAB			= new FluidType (0xb50000,	1,	2,	1,	5,	0,	5,	EnumSymbol.ANTIMATTER,	"hbmfluid.aschrab", FluidTrait.AMAT),
-		SAS3			(0x4ffffc,	14,	2,	1,	5,	0,	4,	EnumSymbol.RADIATION,	"hbmfluid.sas3", FluidTrait.CORROSIVE, FluidTrait.LEAD_CONTAINER),
-		SCHRABIDIC		(0x006B6B,	14,	1,	2,	5,	0,	5,	EnumSymbol.ACID,		"hbmfluid.schrabidic", FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER),
 
-		AMAT			(0x010101,	0,	2,	1,	5,	0,	5,	EnumSymbol.ANTIMATTER,	"hbmfluid.amat", FluidTrait.AMAT),
+		ACID			= new FluidType (0xfff7aa,	10,	2,	1,	3,	0,	3,	EnumSymbol.OXIDIZER,	"hbmfluid.acid", FluidTrait.CORROSIVE),
-		ASCHRAB			(0xb50000,	1,	2,	1,	5,	0,	5,	EnumSymbol.ANTIMATTER,	"hbmfluid.aschrab", FluidTrait.AMAT),
+		WATZ			= new FluidType (0x86653E,	11,	2,	1,	4,	0,	3,	EnumSymbol.ACID,		"hbmfluid.watz", FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER),
+		CRYOGEL			= new FluidType (0x32ffff,	0,	1,	2,	2,	0,	0,	EnumSymbol.CROYGENIC,	"hbmfluid.cryogel", -170),
 		
-		ACID			(0xfff7aa,	10,	2,	1,	3,	0,	3,	EnumSymbol.OXIDIZER,	"hbmfluid.acid", FluidTrait.CORROSIVE),
+		HYDROGEN		= new FluidType (0x4286f4,	3,	1,	2,	3,	4,	0,	EnumSymbol.CROYGENIC,	"hbmfluid.hydrogen"),
-		WATZ			(0x86653E,	11,	2,	1,	4,	0,	3,	EnumSymbol.ACID,		"hbmfluid.watz", FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER),
+		OXYGEN			= new FluidType (0x98bdf9,	4,	1,	2,	3,	0,	0,	EnumSymbol.CROYGENIC,	"hbmfluid.oxygen"),
-		CRYOGEL			(0x32ffff,	0,	1,	2,	2,	0,	0,	EnumSymbol.CROYGENIC,	"hbmfluid.cryogel", -170),
+		XENON			= new FluidType (0xba45e8,	5,	1,	2,	0,	0,	0,	EnumSymbol.ASPHYXIANT,	"hbmfluid.xenon"),
+		BALEFIRE		= new FluidType (0x28e02e,	6,	1,	2,	4,	4,	3,	EnumSymbol.RADIATION,	"hbmfluid.balefire", 1500, FluidTrait.CORROSIVE, FluidTrait.LEAD_CONTAINER),
 		
-		HYDROGEN		(0x4286f4,	3,	1,	2,	3,	4,	0,	EnumSymbol.CROYGENIC,	"hbmfluid.hydrogen"),
+		MERCURY			= new FluidType (0x808080,	7,	1,	2,	2,	0,	0,	EnumSymbol.NONE,		"hbmfluid.mercury"),
-		OXYGEN			(0x98bdf9,	4,	1,	2,	3,	0,	0,	EnumSymbol.CROYGENIC,	"hbmfluid.oxygen"),
+		PAIN			= new FluidType (0x938541,	15,	1,	2,	2,	0,	1,	EnumSymbol.ACID,		"hbmfluid.pain", 300, FluidTrait.CORROSIVE),
-		XENON			(0xba45e8,	5,	1,	2,	0,	0,	0,	EnumSymbol.ASPHYXIANT,	"hbmfluid.xenon"),
-		BALEFIRE		(0x28e02e,	6,	1,	2,	4,	4,	3,	EnumSymbol.RADIATION,	"hbmfluid.balefire", 1500, FluidTrait.CORROSIVE, FluidTrait.LEAD_CONTAINER),
 
-		MERCURY			(0x808080,	7,	1,	2,	2,	0,	0,	EnumSymbol.NONE,		"hbmfluid.mercury"),
+		WASTEFLUID		= new FluidType (0x544400,	0,	2,	2,	2,	0,	1,	EnumSymbol.RADIATION,	"hbmfluid.wastefluid", FluidTrait.LEAD_CONTAINER),
-		PAIN			(0x938541,	15,	1,	2,	2,	0,	1,	EnumSymbol.ACID,		"hbmfluid.pain", 300, FluidTrait.CORROSIVE),
+		WASTEGAS		= new FluidType (0xB8B8B8,	1,	2,	2,	2,	0,	1,	EnumSymbol.RADIATION,	"hbmfluid.wastegas", FluidTrait.LEAD_CONTAINER),
 
-		WASTEFLUID		(0x544400,	0,	2,	2,	2,	0,	1,	EnumSymbol.RADIATION,	"hbmfluid.wastefluid", FluidTrait.LEAD_CONTAINER),
+		GASOLINE		= new FluidType (0x445772,	2,	2,	2,	1,	2,	0,	EnumSymbol.NONE,		"hbmfluid.gasoline"),
-		WASTEGAS		(0xB8B8B8,	1,	2,	2,	2,	0,	1,	EnumSymbol.RADIATION,	"hbmfluid.wastegas", FluidTrait.LEAD_CONTAINER),
+		SPENTSTEAM		= new FluidType (0x445772,	3,	2,	2,	2,	0,	0,	EnumSymbol.NONE,		"hbmfluid.spentsteam"),
+		FRACKSOL		= new FluidType (0x798A6B,	4,	2,	2,	1,	3,	3,	EnumSymbol.ACID,		"hbmfluid.fracksol", FluidTrait.CORROSIVE),
 		
-		GASOLINE		(0x445772,	2,	2,	2,	1,	2,	0,	EnumSymbol.NONE,		"hbmfluid.gasoline"),
+		PLASMA_DT		= new FluidType (0xF7AFDE,	8,	1,	2,	0,	4,	0,	EnumSymbol.RADIATION,	"hbmfluid.plasma_dt", 3250, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID),
-		SPENTSTEAM		(0x445772,	3,	2,	2,	2,	0,	0,	EnumSymbol.NONE,		"hbmfluid.spentsteam"),
+		PLASMA_HD		= new FluidType (0xF0ADF4,	9,	1,	2,	0,	4,	0,	EnumSymbol.RADIATION,	"hbmfluid.plasma_hd", 2500, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID),
-		FRACKSOL		(0x798A6B,	4,	2,	2,	1,	3,	3,	EnumSymbol.ACID,		"hbmfluid.fracksol", FluidTrait.CORROSIVE),
+		PLASMA_HT		= new FluidType (0xD1ABF2,	10,	1,	2,	0,	4,	0,	EnumSymbol.RADIATION,	"hbmfluid.plasma_ht", 3000, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID),
+		PLASMA_XM		= new FluidType (0xC6A5FF,	11,	1,	2,	0,	4,	1,	EnumSymbol.RADIATION,	"hbmfluid.plasma_xm", 4250, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID),
+		PLASMA_BF		= new FluidType (0xA7F1A3,	12,	1,	2,	4,	5,	4,	EnumSymbol.ANTIMATTER,	"hbmfluid.plasma_bf", 8500, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID),
+		PLASMA_DH3		= new FluidType (0xFF83AA,	6,	2,	2,	0,	4,	0,	EnumSymbol.RADIATION,	"hbmfluid.plasma_dh3", 3480, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID),
 
-		PLASMA_DT		(0xF7AFDE,	8,	1,	2,	0,	4,	0,	EnumSymbol.RADIATION,	"hbmfluid.plasma_dt", 3250, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID),
+		HELIUM3			= new FluidType (0xFCF0C4,	7,	2,	2,	3,	4,	0,	EnumSymbol.ASPHYXIANT,	"hbmfluid.helium3"),
-		PLASMA_HD		(0xF0ADF4,	9,	1,	2,	0,	4,	0,	EnumSymbol.RADIATION,	"hbmfluid.plasma_hd", 2500, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID),
+		DEATH			= new FluidType (0x717A88,	8,	2,	2,	2,	0,	1,	EnumSymbol.ACID,		"hbmfluid.death", 300, FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER),
-		PLASMA_HT		(0xD1ABF2,	10,	1,	2,	0,	4,	0,	EnumSymbol.RADIATION,	"hbmfluid.plasma_ht", 3000, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID),
+		ETHANOL			= new FluidType (0xe0ffff,	9,	2,	2,	2,	3,	0,	EnumSymbol.NONE,		"hbmfluid.ethanol"),
-		PLASMA_XM		(0xC6A5FF,	11,	1,	2,	0,	4,	1,	EnumSymbol.RADIATION,	"hbmfluid.plasma_xm", 4250, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID),
+		HEAVYWATER		= new FluidType (0x00a0b0,	10,	2,	2,	1,	0,	0,	EnumSymbol.NONE,		"hbmfluid.heavywater"),
-		PLASMA_BF		(0xA7F1A3,	12,	1,	2,	4,	5,	4,	EnumSymbol.ANTIMATTER,	"hbmfluid.plasma_bf", 8500, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID),
+		CARBONDIOXIDE	= new FluidType (0x747474,	11,	2,	2,	3,	0,	0,	EnumSymbol.ASPHYXIANT,	"hbmfluid.carbondioxide");*/
-		PLASMA_DH3		(0xFF83AA,	6,	2,	2,	0,	4,	0,	EnumSymbol.RADIATION,	"hbmfluid.plasma_dh3", 3480, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID),
 				
-		HELIUM3			(0xFCF0C4,	7,	2,	2,	3,	4,	0,	EnumSymbol.ASPHYXIANT,	"hbmfluid.helium3"),
+		public static FluidType NONE = Fluids.NONE, WATER = Fluids.WATER, STEAM = Fluids.STEAM, HOTSTEAM = Fluids.HOTSTEAM,
-		DEATH			(0x717A88,	8,	2,	2,	2,	0,	1,	EnumSymbol.ACID,		"hbmfluid.death", 300, FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER),
+				SUPERHOTSTEAM = Fluids.SUPERHOTSTEAM, ULTRAHOTSTEAM = Fluids.ULTRAHOTSTEAM, COOLANT = Fluids.COOLANT, LAVA = Fluids.LAVA, DEUTERIUM = Fluids.DEUTERIUM,
-		ETHANOL			(0xe0ffff,	9,	2,	2,	2,	3,	0,	EnumSymbol.NONE,		"hbmfluid.ethanol"),
+				TRITIUM = Fluids.TRITIUM, OIL = Fluids.OIL, HOTOIL = Fluids.HOTOIL, HEAVYOIL = Fluids.HEAVYOIL, BITUMEN = Fluids.BITUMEN, SMEAR = Fluids.SMEAR,
-		HEAVYWATER		(0x00a0b0,	10,	2,	2,	1,	0,	0,	EnumSymbol.NONE,		"hbmfluid.heavywater"),
+				HEATINGOIL = Fluids.HEATINGOIL, RECLAIMED = Fluids.RECLAIMED, PETROIL = Fluids.PETROIL, LUBRICANT = Fluids.LUBRICANT, NAPHTHA = Fluids.NAPHTHA,
-		CARBONDIOXIDE	(0x747474,	11,	2,	2,	3,	0,	0,	EnumSymbol.ASPHYXIANT,	"hbmfluid.carbondioxide");
+				DIESEL = Fluids.DIESEL, LIGHTOIL = Fluids.LIGHTOIL, KEROSENE = Fluids.KEROSENE, GAS = Fluids.GAS, PETROLEUM = Fluids.PETROLEUM, LPG = Fluids.LPG,
+				BIOGAS = Fluids.BIOGAS, BIOFUEL = Fluids.BIOFUEL, NITAN = Fluids.NITAN, UF6 = Fluids.UF6, PUF6 = Fluids.PUF6, SAS3 = Fluids.SAS3, SCHRABIDIC = Fluids.SCHRABIDIC,
+				AMAT = Fluids.AMAT, ASCHRAB = Fluids.ASCHRAB, ACID = Fluids.ACID, WATZ = Fluids.WATZ, CRYOGEL = Fluids.CRYOGEL, HYDROGEN = Fluids.HYDROGEN, OXYGEN = Fluids.OXYGEN,
+				XENON = Fluids.XENON, BALEFIRE = Fluids.BALEFIRE, MERCURY = Fluids.MERCURY, PAIN = Fluids.PAIN, WASTEFLUID = Fluids.WASTEFLUID, WASTEGAS = Fluids.WASTEGAS,
+				GASOLINE = Fluids.GASOLINE, SPENTSTEAM = Fluids.SPENTSTEAM, FRACKSOL = Fluids.FRACKSOL, PLASMA_DT = Fluids.PLASMA_DT, PLASMA_HD = Fluids.PLASMA_HD,
+				PLASMA_HT = Fluids.PLASMA_HT, PLASMA_XM = Fluids.PLASMA_XM, PLASMA_BF = Fluids.PLASMA_BF, PLASMA_DH3 = Fluids.PLASMA_DH3, HELIUM3 = Fluids.HELIUM3,
+				DEATH = Fluids.DEATH, ETHANOL = Fluids.ETHANOL, HEAVYWATER = Fluids.HEAVYWATER, CARBONDIOXIDE = Fluids.CARBONDIOXIDE;
 
-		//Approximate HEX Color of the fluid, used for pipe rendering
+		/*//Approximate HEX Color of the fluid, used for pipe rendering
 		private int color;
 		//X position of the fluid on the sheet, the "row"
 		private int textureX;
@@ -123,99 +133,30 @@ public class FluidTypeHandler {
 		public int reactivity;
 		public EnumSymbol symbol;
 		public int temperature;
-		public List<FluidTrait> traits = new ArrayList();
+		public List<FluidTrait> traits = new ArrayList();*/
 		
-		private FluidType(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name) {
+		private FluidTypeTheOldOne(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name) {
 			this(color, x, y, sheet, p, f, r, symbol, name, 0, new FluidTrait[0]);
 		}
 		
-		private FluidType(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, FluidTrait... traits) {
+		private FluidTypeTheOldOne(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, FluidTrait... traits) {
 			this(color, x, y, sheet, p, f, r, symbol, name, 0, traits);
 		}
 		
-		private FluidType(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, int temperature) {
+		private FluidTypeTheOldOne(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, int temperature) {
 			this(color, x, y, sheet, p, f, r, symbol, name, temperature, new FluidTrait[0]);
 		}
 		
-		private FluidType(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, int temperature, FluidTrait... traits) {
+		private FluidTypeTheOldOne(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, int temperature, FluidTrait... traits) {
-			this.color = color;
+			super(color, x, y, sheet, p, f, r, symbol, name, temperature, traits);
-			this.textureX = x;
-			this.textureY = y;
-			this.name = name;
-			this.sheetID = sheet;
-			this.poison = p;
-			this.flammability = f;
-			this.reactivity = r;
-			this.symbol = symbol;
-			this.temperature = temperature;
-			Collections.addAll(this.traits, traits);
 		}
 		
-		public int getColor() {
+		/*public static com.hbm.inventory.fluid.FluidType[] values() {
-			return this.color;
+			return Fluids.metaOrder.toArray(new com.hbm.inventory.fluid.FluidType[0]);
-		}
-		public int getMSAColor() {
-			return this.color;
-		}
-		public int textureX() {
-			return this.textureX;
-		}
-		public int textureY() {
-			return this.textureY;
-		}
-		public int getSheetID() {
-			return this.sheetID;
-		}
-		public String getUnlocalizedName() {
-			return this.name;
-		}
-		
-		public static FluidType getEnum(int i) {
-			if(i < FluidType.values().length)
-				return FluidType.values()[i];
-			else
-				return FluidType.NONE;
-		}
-		
-		public static FluidType getEnumFromName(String s) {
-			
-			for(int i = 0; i < FluidType.values().length; i++)
-				if(FluidType.values()[i].getName().equals(s))
-					return FluidType.values()[i];
-			
-			return FluidType.NONE;
-		}
-		
-		public int getID() {
-			return Arrays.asList(FluidType.values()).indexOf(this);
-		}
-		
-		public String getName() {
-			return this.toString();
-		}
-		
-		public boolean isHot() {
-			return this.temperature >= 100;
-		}
-		
-		public boolean isCorrosive() {
-			return this.traits.contains(FluidTrait.CORROSIVE) || this.traits.contains(FluidTrait.CORROSIVE_2);
-		}
-		
-		public boolean isAntimatter() {
-			return this.traits.contains(FluidTrait.AMAT);
-		}
-		
-		public boolean hasNoContainer() {
-			return this.traits.contains(FluidTrait.NO_CONTAINER);
 		}
 		
 		public boolean needsLeadContainer() {
 			return this.traits.contains(FluidTrait.LEAD_CONTAINER);
-		}
+		}*/
-		
-		public boolean hasNoID() {
-			return this.traits.contains(FluidTrait.NO_ID);
-		}
 	};
 }

src/main/java/com/hbm/handler/nei/CrystallizerRecipeHandler.java

@@ -6,7 +6,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.inventory.gui.GUICrystallizer;
 import com.hbm.inventory.recipes.CrystallizerRecipes;
 import com.hbm.inventory.recipes.MachineRecipes;
@@ -31,7 +31,7 @@ public class CrystallizerRecipeHandler extends TemplateRecipeHandler {
 
 		public RecipeSet(Object input, ItemStack result) {
 			this.input = new PositionedStack(input, 75, 24);
-			this.acid = new PositionedStack(ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, FluidType.ACID.ordinal()), TileEntityMachineCrystallizer.acidRequired), 39, 24);
+			this.acid = new PositionedStack(ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.ACID.ordinal()), TileEntityMachineCrystallizer.acidRequired), 39, 24);
 			this.result = new PositionedStack(result, 135, 24);
 		}
 
@@ -126,7 +126,7 @@ public class CrystallizerRecipeHandler extends TemplateRecipeHandler {
 		for (Map.Entry<Object, Object> recipe : recipes.entrySet()) {
 			
 			if(NEIServerUtils.areStacksSameTypeCrafting(ingredient, ItemFluidIcon.addQuantity(
-							new ItemStack(ModItems.fluid_icon, 1, FluidType.ACID.ordinal()), TileEntityMachineCrystallizer.acidRequired))) {
+							new ItemStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.ACID.ordinal()), TileEntityMachineCrystallizer.acidRequired))) {
 				
 				if(recipe.getKey() instanceof ItemStack) {
 					this.arecipes.add(new RecipeSet(recipe.getKey(), (ItemStack)recipe.getValue()));

src/main/java/com/hbm/interfaces/IFluidAcceptor.java

@@ -1,6 +1,6 @@
 package com.hbm.interfaces;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.inventory.fluid.FluidType;
 
 public interface IFluidAcceptor extends IFluidContainer {
 	

src/main/java/com/hbm/interfaces/IFluidContainer.java

@@ -2,8 +2,8 @@ package com.hbm.interfaces;
 
 import java.util.List;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
 import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
 
 public interface IFluidContainer {
 

src/main/java/com/hbm/interfaces/IFluidDuct.java

@@ -1,6 +1,6 @@
 package com.hbm.interfaces;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.inventory.fluid.FluidType;
 
 public interface IFluidDuct {
 	

src/main/java/com/hbm/interfaces/IFluidSource.java

@@ -2,7 +2,7 @@ package com.hbm.interfaces;
 
 import java.util.List;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.inventory.fluid.FluidType;
 
 public interface IFluidSource extends IFluidContainer {
 	

src/main/java/com/hbm/interfaces/IPartiallyFillable.java

@@ -1,6 +1,6 @@
 package com.hbm.interfaces;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.inventory.fluid.FluidType;
 
 import net.minecraft.item.ItemStack;
 

src/main/java/com/hbm/inventory/FluidContainer.java

@@ -1,6 +1,6 @@
 package com.hbm.inventory;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.inventory.fluid.FluidType;
 
 import net.minecraft.item.ItemStack;
 

src/main/java/com/hbm/inventory/FluidContainerRegistry.java

@@ -4,7 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.hbm.blocks.ModBlocks;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.items.ModItems;
 
 import net.minecraft.init.Items;
@@ -16,61 +17,61 @@ public class FluidContainerRegistry {
 	public static List<FluidContainer> allContainers = new ArrayList<FluidContainer>();
 	
 	public static void register() {
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(Items.water_bucket), new ItemStack(Items.bucket), FluidType.WATER, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(Items.water_bucket), new ItemStack(Items.bucket), Fluids.WATER, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(Items.lava_bucket), new ItemStack(Items.bucket), FluidType.LAVA, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(Items.lava_bucket), new ItemStack(Items.bucket), Fluids.LAVA, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.bucket_mud), new ItemStack(Items.bucket), FluidType.WATZ, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.bucket_mud), new ItemStack(Items.bucket), Fluids.WATZ, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.bucket_schrabidic_acid), new ItemStack(Items.bucket), FluidType.SCHRABIDIC, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.bucket_schrabidic_acid), new ItemStack(Items.bucket), Fluids.SCHRABIDIC, 1000));
 
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_oil), new ItemStack(ModItems.canister_empty), FluidType.OIL, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_oil), new ItemStack(ModItems.canister_empty), Fluids.OIL, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_smear), new ItemStack(ModItems.canister_empty), FluidType.SMEAR, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_smear), new ItemStack(ModItems.canister_empty), Fluids.SMEAR, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_heavyoil), new ItemStack(ModItems.canister_empty), FluidType.HEAVYOIL, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_heavyoil), new ItemStack(ModItems.canister_empty), Fluids.HEAVYOIL, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_bitumen), new ItemStack(ModItems.canister_empty), FluidType.BITUMEN, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_bitumen), new ItemStack(ModItems.canister_empty), Fluids.BITUMEN, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_heatingoil), new ItemStack(ModItems.canister_empty), FluidType.HEATINGOIL, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_heatingoil), new ItemStack(ModItems.canister_empty), Fluids.HEATINGOIL, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_reoil), new ItemStack(ModItems.canister_empty), FluidType.RECLAIMED, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_reoil), new ItemStack(ModItems.canister_empty), Fluids.RECLAIMED, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_petroil), new ItemStack(ModItems.canister_empty), FluidType.PETROIL, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_petroil), new ItemStack(ModItems.canister_empty), Fluids.PETROIL, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_canola), new ItemStack(ModItems.canister_empty), FluidType.LUBRICANT, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_canola), new ItemStack(ModItems.canister_empty), Fluids.LUBRICANT, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_naphtha), new ItemStack(ModItems.canister_empty), FluidType.NAPHTHA, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_naphtha), new ItemStack(ModItems.canister_empty), Fluids.NAPHTHA, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_fuel), new ItemStack(ModItems.canister_empty), FluidType.DIESEL, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_fuel), new ItemStack(ModItems.canister_empty), Fluids.DIESEL, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_lightoil), new ItemStack(ModItems.canister_empty), FluidType.LIGHTOIL, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_lightoil), new ItemStack(ModItems.canister_empty), Fluids.LIGHTOIL, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_kerosene), new ItemStack(ModItems.canister_empty), FluidType.KEROSENE, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_kerosene), new ItemStack(ModItems.canister_empty), Fluids.KEROSENE, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_biofuel), new ItemStack(ModItems.canister_empty), FluidType.BIOFUEL, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_biofuel), new ItemStack(ModItems.canister_empty), Fluids.BIOFUEL, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_ethanol), new ItemStack(ModItems.canister_empty), FluidType.ETHANOL, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_ethanol), new ItemStack(ModItems.canister_empty), Fluids.ETHANOL, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_gasoline), new ItemStack(ModItems.canister_empty), FluidType.GASOLINE, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_gasoline), new ItemStack(ModItems.canister_empty), Fluids.GASOLINE, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_fracksol), new ItemStack(ModItems.canister_empty), FluidType.FRACKSOL, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_fracksol), new ItemStack(ModItems.canister_empty), Fluids.FRACKSOL, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_NITAN), new ItemStack(ModItems.canister_empty), FluidType.NITAN, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.canister_NITAN), new ItemStack(ModItems.canister_empty), Fluids.NITAN, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_full), new ItemStack(ModItems.gas_empty), FluidType.GAS, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_full), new ItemStack(ModItems.gas_empty), Fluids.GAS, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_petroleum), new ItemStack(ModItems.gas_empty), FluidType.PETROLEUM, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_petroleum), new ItemStack(ModItems.gas_empty), Fluids.PETROLEUM, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_lpg), new ItemStack(ModItems.gas_empty), FluidType.LPG, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_lpg), new ItemStack(ModItems.gas_empty), Fluids.LPG, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_biogas), new ItemStack(ModItems.gas_empty), FluidType.BIOGAS, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.gas_biogas), new ItemStack(ModItems.gas_empty), Fluids.BIOGAS, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.red_barrel), new ItemStack(ModItems.tank_steel), FluidType.DIESEL, 10000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.red_barrel), new ItemStack(ModItems.tank_steel), Fluids.DIESEL, 10000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.pink_barrel), new ItemStack(ModItems.tank_steel), FluidType.KEROSENE, 10000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.pink_barrel), new ItemStack(ModItems.tank_steel), Fluids.KEROSENE, 10000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.lox_barrel), new ItemStack(ModItems.tank_steel), FluidType.OXYGEN, 10000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.lox_barrel), new ItemStack(ModItems.tank_steel), Fluids.OXYGEN, 10000));
 
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.ore_oil), null, FluidType.OIL, 250));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.ore_oil), null, Fluids.OIL, 250));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.ore_gneiss_gas), null, FluidType.PETROLEUM, 250));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModBlocks.ore_gneiss_gas), null, Fluids.PETROLEUM, 250));
 
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_deuterium), new ItemStack(ModItems.cell_empty), FluidType.DEUTERIUM, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_deuterium), new ItemStack(ModItems.cell_empty), Fluids.DEUTERIUM, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_tritium), new ItemStack(ModItems.cell_empty), FluidType.TRITIUM, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_tritium), new ItemStack(ModItems.cell_empty), Fluids.TRITIUM, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_uf6), new ItemStack(ModItems.cell_empty), FluidType.UF6, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_uf6), new ItemStack(ModItems.cell_empty), Fluids.UF6, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_puf6), new ItemStack(ModItems.cell_empty), FluidType.PUF6, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_puf6), new ItemStack(ModItems.cell_empty), Fluids.PUF6, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_antimatter), new ItemStack(ModItems.cell_empty), FluidType.AMAT, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_antimatter), new ItemStack(ModItems.cell_empty), Fluids.AMAT, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_anti_schrabidium), new ItemStack(ModItems.cell_empty), FluidType.ASCHRAB, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_anti_schrabidium), new ItemStack(ModItems.cell_empty), Fluids.ASCHRAB, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_sas3), new ItemStack(ModItems.cell_empty), FluidType.SAS3, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.cell_sas3), new ItemStack(ModItems.cell_empty), Fluids.SAS3, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.bottle_mercury), new ItemStack(Items.glass_bottle), FluidType.MERCURY, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.bottle_mercury), new ItemStack(Items.glass_bottle), Fluids.MERCURY, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.nugget_mercury), null, FluidType.MERCURY, 125));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.nugget_mercury), null, Fluids.MERCURY, 125));
 
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 1), new ItemStack(ModItems.tank_waste, 1, 0), FluidType.WATZ, 8000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 1), new ItemStack(ModItems.tank_waste, 1, 0), Fluids.WATZ, 8000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 2), new ItemStack(ModItems.tank_waste, 1, 1), FluidType.WATZ, 8000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 2), new ItemStack(ModItems.tank_waste, 1, 1), Fluids.WATZ, 8000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 3), new ItemStack(ModItems.tank_waste, 1, 2), FluidType.WATZ, 8000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 3), new ItemStack(ModItems.tank_waste, 1, 2), Fluids.WATZ, 8000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 4), new ItemStack(ModItems.tank_waste, 1, 3), FluidType.WATZ, 8000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 4), new ItemStack(ModItems.tank_waste, 1, 3), Fluids.WATZ, 8000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 5), new ItemStack(ModItems.tank_waste, 1, 4), FluidType.WATZ, 8000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 5), new ItemStack(ModItems.tank_waste, 1, 4), Fluids.WATZ, 8000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 6), new ItemStack(ModItems.tank_waste, 1, 5), FluidType.WATZ, 8000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 6), new ItemStack(ModItems.tank_waste, 1, 5), Fluids.WATZ, 8000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 7), new ItemStack(ModItems.tank_waste, 1, 6), FluidType.WATZ, 8000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 7), new ItemStack(ModItems.tank_waste, 1, 6), Fluids.WATZ, 8000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 8), new ItemStack(ModItems.tank_waste, 1, 7), FluidType.WATZ, 8000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.tank_waste, 1, 8), new ItemStack(ModItems.tank_waste, 1, 7), Fluids.WATZ, 8000));
 
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.particle_hydrogen), new ItemStack(ModItems.particle_empty), FluidType.HYDROGEN, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.particle_hydrogen), new ItemStack(ModItems.particle_empty), Fluids.HYDROGEN, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.particle_amat), new ItemStack(ModItems.particle_empty), FluidType.AMAT, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.particle_amat), new ItemStack(ModItems.particle_empty), Fluids.AMAT, 1000));
-		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.particle_aschrab), new ItemStack(ModItems.particle_empty), FluidType.ASCHRAB, 1000));
+		FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.particle_aschrab), new ItemStack(ModItems.particle_empty), Fluids.ASCHRAB, 1000));
 		
 		for(int i = 1; i < FluidType.values().length; i++) {
 			
@@ -79,13 +80,13 @@ public class FluidContainerRegistry {
 			if(type.hasNoContainer())
 				continue;
 
-			FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.fluid_tank_lead_full, 1, i), new ItemStack(ModItems.fluid_tank_lead_empty), FluidType.getEnum(i), 1000));
+			FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.fluid_tank_lead_full, 1, i), new ItemStack(ModItems.fluid_tank_lead_empty), Fluids.fromID(i), 1000));
 			
 			if(type.needsLeadContainer())
 				continue;
 			
-			FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.fluid_tank_full, 1, i), new ItemStack(ModItems.fluid_tank_empty), FluidType.getEnum(i), 1000));
+			FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.fluid_tank_full, 1, i), new ItemStack(ModItems.fluid_tank_empty), Fluids.fromID(i), 1000));
-			FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.fluid_barrel_full, 1, i), new ItemStack(ModItems.fluid_barrel_empty), FluidType.getEnum(i), 16000));
+			FluidContainerRegistry.registerContainer(new FluidContainer(new ItemStack(ModItems.fluid_barrel_full, 1, i), new ItemStack(ModItems.fluid_barrel_empty), Fluids.fromID(i), 16000));
 		}
 	}
 	
@@ -93,7 +94,7 @@ public class FluidContainerRegistry {
 		allContainers.add(con);
 	}
 	
-	public static int getFluidContent(ItemStack stack, FluidType type) {
+	public static int getFluidContent(ItemStack stack, com.hbm.inventory.fluid.FluidType type) {
 		
 		if(stack == null)
 			return 0;
@@ -114,7 +115,7 @@ public class FluidContainerRegistry {
 	public static FluidType getFluidType(ItemStack stack) {
 		
 		if(stack == null)
-			return FluidType.NONE;
+			return Fluids.NONE;
 		
 		ItemStack sta = stack.copy();
 		sta.stackSize = 1;
@@ -124,7 +125,7 @@ public class FluidContainerRegistry {
 				return container.type;
 		}
 
-		return FluidType.NONE;
+		return Fluids.NONE;
 	}
 	
 	public static ItemStack getFullContainer(ItemStack stack, FluidType type) {

src/main/java/com/hbm/inventory/FluidStack.java

@@ -1,6 +1,6 @@
 package com.hbm.inventory;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.inventory.fluid.FluidType;
 
 public class FluidStack {
 	

src/main/java/com/hbm/inventory/FluidTank.java

@@ -4,9 +4,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.hbm.handler.ArmorModHandler;
-import com.hbm.handler.FluidTypeHandler.FluidTrait;
-import com.hbm.handler.FluidTypeHandler.FluidType;
 import com.hbm.interfaces.IPartiallyFillable;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.FluidType.FluidTrait;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.inventory.gui.GuiInfoContainer;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemFluidIdentifier;
@@ -44,7 +45,7 @@ public class FluidTank {
 	
 	public void setTankType(FluidType type) {
 		
-		if(this.type.name().equals(type.name()))
+		if(this.type == type)
 			return;
 		
 		this.type = type;
@@ -85,26 +86,26 @@ public class FluidTank {
 	//Fills tank from canisters
 	public void loadTank(int in, int out, ItemStack[] slots) {
 		
-		FluidType inType = FluidType.NONE;
+		FluidType inType = Fluids.NONE;
 		if(slots[in] != null) {
 			
 			//TODO: add IPartiallyFillable case for unloading
 			
 			inType = FluidContainerRegistry.getFluidType(slots[in]);
 			
-			if(slots[in].getItem() == ModItems.fluid_barrel_infinite && type != FluidType.NONE) {
+			if(slots[in].getItem() == ModItems.fluid_barrel_infinite && type != Fluids.NONE) {
 				this.fluid = this.maxFluid;
 				return;
 			}
 			
-			if(slots[in].getItem() == ModItems.inf_water && this.type.name().equals(FluidType.WATER.name())) {
+			if(slots[in].getItem() == ModItems.inf_water && this.type == Fluids.WATER) {
 				this.fluid += 50;
 				if(this.fluid > this.maxFluid)
 					this.fluid = this.maxFluid;
 				return;
 			}
 			
-			if(slots[in].getItem() == ModItems.inf_water_mk2 && this.type.name().equals(FluidType.WATER.name())) {
+			if(slots[in].getItem() == ModItems.inf_water_mk2 && this.type == Fluids.WATER) {
 				this.fluid += 500;
 				if(this.fluid > this.maxFluid)
 					this.fluid = this.maxFluid;
@@ -117,7 +118,7 @@ public class FluidTank {
 			return;
 		}
 		
-		if(slots[in] != null && inType.name().equals(type.name()) && fluid + FluidContainerRegistry.getFluidContent(slots[in], type) <= maxFluid) {
+		if(slots[in] != null && inType.getName().equals(type.getName()) && fluid + FluidContainerRegistry.getFluidContent(slots[in], type) <= maxFluid) {
 			if(slots[out] == null) {
 				fluid += FluidContainerRegistry.getFluidContent(slots[in], type);
 				slots[out] = FluidContainerRegistry.getEmptyContainer(slots[in]);
@@ -181,14 +182,14 @@ public class FluidTank {
 				return;
 			}
 			
-			if(slots[in].getItem() == ModItems.inf_water && this.type.name().equals(FluidType.WATER.name())) {
+			if(slots[in].getItem() == ModItems.inf_water && this.type.getName().equals(Fluids.WATER.name())) {
 				this.fluid -= 50;
 				if(this.fluid < 0)
 					this.fluid = 0;
 				return;
 			}
 			
-			if(slots[in].getItem() == ModItems.inf_water_mk2 && this.type.name().equals(FluidType.WATER.name())) {
+			if(slots[in].getItem() == ModItems.inf_water_mk2 && this.type.getName().equals(Fluids.WATER.name())) {
 				this.fluid -= 500;
 				if(this.fluid < 0)
 					this.fluid = 0;
@@ -232,7 +233,7 @@ public class FluidTank {
 		
 		if(slots[in] != null && slots[out] == null && slots[in].getItem() instanceof ItemFluidIdentifier) {
 			FluidType newType = ItemFluidIdentifier.getType(slots[in]);
-			if(!type.name().equals(newType.name())) {
+			if(!type.getName().equals(newType.getName())) {
 				type = newType;
 				slots[out] = slots[in].copy();
 				slots[in] = null;
@@ -303,7 +304,7 @@ public class FluidTank {
 		if(max > 0)
 			maxFluid = nbt.getInteger(s + "_max");
 		type = FluidType.getEnum(nbt.getInteger(s + "_type"));
-		if(type.name().equals(FluidType.NONE.name()))
+		if(type.getName().equals(Fluids.NONE.name()))
 			type = FluidType.getEnumFromName(nbt.getString(s + "_type"));
 	}
 

src/main/java/com/hbm/inventory/container/ContainerMachineCyclotron.java

@@ -1,6 +1,6 @@
 package com.hbm.inventory.container;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.inventory.FluidContainerRegistry;
 import com.hbm.inventory.SlotMachineOutput;
 import com.hbm.inventory.SlotUpgrade;
@@ -84,11 +84,11 @@ public class ContainerMachineCyclotron extends Container {
 					if(!this.mergeItemStack(stack, 13, 14, true))
 						return null;
 					
-				} else if(FluidContainerRegistry.getFluidContent(stack, FluidType.COOLANT) > 0) {
+				} else if(FluidContainerRegistry.getFluidContent(stack, FluidTypeTheOldOne.COOLANT) > 0) {
 					if(!this.mergeItemStack(stack, 11, 12, true))
 						return null;
 					
-				} else if(FluidContainerRegistry.getFullContainer(stack, FluidType.AMAT) != null) {
+				} else if(FluidContainerRegistry.getFullContainer(stack, FluidTypeTheOldOne.AMAT) != null) {
 					if(!this.mergeItemStack(stack, 9, 10, true))
 						return null;
 					

src/main/java/com/hbm/inventory/container/ContainerReactorZirnox.java

@@ -1,6 +1,6 @@
 package com.hbm.inventory.container;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.inventory.FluidContainerRegistry;
 import com.hbm.inventory.SlotMachineOutput;
 import com.hbm.items.machine.ItemZirnoxRod;
@@ -78,11 +78,11 @@ public class ContainerReactorZirnox extends Container {
 				}
 			} else {
 
-				if(FluidContainerRegistry.getFluidContent(stack, FluidType.CARBONDIOXIDE) > 0) {
+				if(FluidContainerRegistry.getFluidContent(stack, FluidTypeTheOldOne.CARBONDIOXIDE) > 0) {
 					if(!this.mergeItemStack(stack, 24, 25, true))
 						return null;
 
-				} else if(FluidContainerRegistry.getFluidContent(stack, FluidType.WATER) > 0) {
+				} else if(FluidContainerRegistry.getFluidContent(stack, FluidTypeTheOldOne.WATER) > 0) {
 					if(!this.mergeItemStack(stack, 25, 26, true))
 						return null;
 

src/main/java/com/hbm/inventory/fluid/FluidType.java

@@ -1,7 +1,6 @@
 package com.hbm.inventory.fluid;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -67,6 +66,7 @@ public class FluidType {
 	public int getColor() {
 		return this.color;
 	}
+	@Deprecated
 	public int getMSAColor() {
 		return this.color;
 	}
@@ -83,6 +83,10 @@ public class FluidType {
 		return this.name;
 	}
 	
+	public String name() {
+		return getName();
+	}
+	
 	public String getName() {
 		return this.toString();
 	}
@@ -107,14 +111,60 @@ public class FluidType {
 		return this.traits.contains(FluidTrait.NO_ID);
 	}
 	
+	public boolean needsLeadContainer() {
+		return this.traits.contains(FluidTrait.LEAD_CONTAINER);
+	}
+
+	/**
+	 * Called when the tile entity is broken, effectively voiding the fluids.
+	 * @param te
+	 * @param tank
+	 */
 	public void onTankBroken(TileEntity te, FluidTank tank) { }
+	/**
+	 * Called by the tile entity's update loop. Also has an arg for the fluid tank for possible tanks using child-classes that are shielded or treated differently.
+	 * @param te
+	 * @param tank
+	 */
 	public void onTankUpdate(TileEntity te, FluidTank tank) { }
+	/**
+	 * For when the tile entity is releasing this fluid into the world, either by an overflow or (by proxy) when broken.
+	 * @param te
+	 * @param tank
+	 * @param overflowAmount
+	 */
+	public void onFluidRelease(TileEntity te, FluidTank tank, int overflowAmount) { }
+	//public void onFluidTransmit(FluidNetwork net) { }
 	
 	public static enum FluidTrait {
 		AMAT,
 		CORROSIVE,
 		CORROSIVE_2,
 		NO_CONTAINER,
+		LEAD_CONTAINER,
 		NO_ID;
 	}
+	
+	//shitty wrapper delegates, go!
+	//only used for compatibility purposes, these will be removed soon
+	//don't use these, dumbfuck
+	@Deprecated //reason: use the fucking registry you dumbass this isn't a fucking enum anymore, we don't sell lists of all our instances here
+	public static FluidType[] values() {
+		return Fluids.metaOrder.toArray(new FluidType[0]);
+	}
+	@Deprecated //reason: not an enum, asshole, use the registry
+	public static FluidType getEnum(int i) {
+		return Fluids.fromID(i);
+	}
+	@Deprecated //reason: the more time you waste reading this the less time is there for you to use that fucking registry already
+	public static FluidType getEnumFromName(String s) {
+		for(int i = 0; i < FluidType.values().length; i++)
+			if(FluidType.values()[i].getName().equals(s))
+				return FluidType.values()[i];
+		return Fluids.NONE;
+	}
+	@Deprecated //reason: not an enum, again, fuck you
+	public int ordinal() {
+		return this.getID();
+	}
 }

src/main/java/com/hbm/inventory/fluid/Fluids.java

@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-import com.google.common.collect.HashBiMap;
 import com.hbm.inventory.fluid.FluidType.FluidTrait;
 import com.hbm.render.util.EnumSymbol;
 
@@ -62,12 +61,18 @@ public class Fluids {
 	public static FluidType PLASMA_DT;
 	public static FluidType PLASMA_HD;
 	public static FluidType PLASMA_HT;
+	public static FluidType PLASMA_DH3;
 	public static FluidType PLASMA_XM;
 	public static FluidType PLASMA_BF;
 	public static FluidType CARBONDIOXIDE;
+	public static FluidType HELIUM3;
+	public static FluidType DEATH;
+	public static FluidType ETHANOL;
+	public static FluidType HEAVYWATER;
 
-	public static final HashMap<Integer, FluidType> idMapping = new HashMap();
+	private static final HashMap<Integer, FluidType> idMapping = new HashMap();
-	public static final List<FluidType> metaOrder = new ArrayList();
+	private static final HashMap<String, FluidType> nameMapping = new HashMap();
+	protected static final List<FluidType> metaOrder = new ArrayList();
 	
 	public static void init() {
 		
@@ -140,6 +145,11 @@ public class Fluids {
 		PLASMA_BF =			new FluidType(0xA7F1A3, 12, 1, 2, 4, 5, 4, EnumSymbol.ANTIMATTER, "hbmfluid.plasma_bf", 8500, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID);
 		// v v v v v v v v
 		CARBONDIOXIDE =		new FluidType(0x404040, 6, 2, 2, 3, 0, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.carbondioxide");
+		PLASMA_DH3 =		new FluidType(0xFF83AA, 6, 2, 2, 0, 4, 0, EnumSymbol.RADIATION, "hbmfluid.plasma_dh3", 3480, FluidTrait.NO_CONTAINER, FluidTrait.NO_ID);
+		HELIUM3 =			new FluidType(0xFCF0C4, 7, 2, 2, 3, 4, 0, EnumSymbol.ASPHYXIANT, "hbmfluid.helium3");
+		DEATH =				new FluidType(0x717A88, 8, 2, 2, 2, 0, 1, EnumSymbol.ACID, "hbmfluid.death", 300, FluidTrait.CORROSIVE_2, FluidTrait.LEAD_CONTAINER);
+		ETHANOL =			new FluidType(0xe0ffff, 9, 2, 2, 2, 3, 0, EnumSymbol.NONE, "hbmfluid.ethanol");
+		HEAVYWATER =		new FluidType(0x00a0b0, 10, 2, 2, 1, 0, 0, EnumSymbol.NONE, "hbmfluid.heavywater");
 		// ^ ^ ^ ^ ^ ^ ^ ^
 		//ADD NEW FLUIDS HERE
 		//AND DON'T FORGET THE META DOWN HERE
@@ -149,6 +159,7 @@ public class Fluids {
 		metaOrder.add(NONE);
 		//vanilla
 		metaOrder.add(WATER);
+		metaOrder.add(HEAVYWATER);
 		metaOrder.add(LAVA);
 		//steams
 		metaOrder.add(STEAM);
@@ -162,6 +173,7 @@ public class Fluids {
 		metaOrder.add(CRYOGEL);
 		//pure elements, cyogenic gasses
 		metaOrder.add(HYDROGEN);
+		metaOrder.add(HELIUM3);
 		metaOrder.add(OXYGEN);
 		metaOrder.add(DEUTERIUM);
 		metaOrder.add(TRITIUM);
@@ -184,6 +196,7 @@ public class Fluids {
 		metaOrder.add(GAS);
 		metaOrder.add(PETROLEUM);
 		metaOrder.add(LPG);
+		metaOrder.add(ETHANOL);
 		metaOrder.add(BIOGAS);
 		metaOrder.add(BIOFUEL);
 		metaOrder.add(GASOLINE);
@@ -196,6 +209,7 @@ public class Fluids {
 		metaOrder.add(SAS3);
 		metaOrder.add(SCHRABIDIC);
 		metaOrder.add(PAIN);
+		metaOrder.add(DEATH);
 		metaOrder.add(WATZ);
 		//solutions and working fluids
 		metaOrder.add(FRACKSOL);
@@ -209,13 +223,61 @@ public class Fluids {
 		metaOrder.add(PLASMA_DT);
 		metaOrder.add(PLASMA_HD);
 		metaOrder.add(PLASMA_HT);
+		metaOrder.add(PLASMA_DH3);
 		metaOrder.add(PLASMA_XM);
 		metaOrder.add(PLASMA_BF);
+		
+		if(idMapping.size() != metaOrder.size()) {
+			throw new IllegalStateException("A severe error has occoured during NTM's fluid registering process! The MetaOrder and Mappings are inconsistent! Mapping size: " + idMapping.size()+ " / MetaOrder size: " + metaOrder.size());
+		}
 	}
 	
-	public static int registerSelf(FluidType fluid) {
+	protected static int registerSelf(FluidType fluid) {
 		int id = idMapping.size();
 		idMapping.put(id, fluid);
+		nameMapping.put(fluid.getName(), fluid);
 		return id;
 	}
+	
+	public static FluidType fromID(int id) {
+		FluidType fluid = idMapping.get(id);
+		
+		if(fluid == null)
+			fluid = Fluids.NONE;
+		
+		return fluid;
+	}
+	
+	public static FluidType fromName(String name) {
+		FluidType fluid = nameMapping.get(name);
+		
+		if(fluid == null)
+			fluid = Fluids.NONE;
+		
+		return fluid;
+	}
+	
+	public static FluidType[] getAll() {
+		return getInOrder(false);
+	}
+	
+	public static FluidType[] getInNiceOrder() {
+		return getInOrder(true);
+	}
+	
+	private static FluidType[] getInOrder(final boolean nice) {
+		FluidType[] all = new FluidType[idMapping.size()];
+		
+		for(int i = 0; i < all.length; i++) {
+			FluidType type = nice ? metaOrder.get(i) : idMapping.get(i);
+			
+			if(type == null) {
+				throw new IllegalStateException("A severe error has occoured with NTM's fluid system! Fluid of the ID " + i + " has returned NULL in the registry!");
+			}
+			
+			all[i] = type;
+		}
+		
+		return all;
+	}
 }

src/main/java/com/hbm/inventory/gui/GUIMachineBoiler.java

@@ -2,7 +2,7 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerMachineBoiler;
 import com.hbm.lib.RefStrings;
@@ -58,7 +58,7 @@ public class GUIMachineBoiler extends GuiInfoContainer {
 				"  of boiling points reached" };
 		this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 16, 16, 16, guiLeft - 8, guiTop + 36 + 16, text1);
 		
-		if(dud.tanks[1].getTankType().name().equals(FluidType.NONE.name())) {
+		if(dud.tanks[1].getTankType().name().equals(FluidTypeTheOldOne.NONE.name())) {
 			
 			String[] text2 = new String[] { "Error: Liquid can not be boiled!" };
 			this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 32, 16, 16, guiLeft - 8, guiTop + 36 + 16 + 32, text2);
@@ -94,7 +94,7 @@ public class GUIMachineBoiler extends GuiInfoContainer {
 		this.drawInfoPanel(guiLeft - 16, guiTop + 36, 16, 16, 2);
 		this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 16, 16, 16, 3);
 		
-		if(dud.tanks[1].getTankType().name().equals(FluidType.NONE.name())) {
+		if(dud.tanks[1].getTankType().name().equals(FluidTypeTheOldOne.NONE.name())) {
 			this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 32, 16, 16, 6);
 		}
 		

src/main/java/com/hbm/inventory/gui/GUIMachineBoilerElectric.java

@@ -2,7 +2,7 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerMachineBoilerElectric;
 import com.hbm.lib.RefStrings;
@@ -52,7 +52,7 @@ public class GUIMachineBoilerElectric extends GuiInfoContainer {
 				"  of boiling points reached" };
 		this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 16, 16, 16, guiLeft - 8, guiTop + 36 + 16, text1);
 		
-		if(diFurnace.tanks[1].getTankType().name().equals(FluidType.NONE.name())) {
+		if(diFurnace.tanks[1].getTankType().name().equals(FluidTypeTheOldOne.NONE.name())) {
 			
 			String[] text2 = new String[] { "Error: Liquid can not be boiled!" };
 			this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 32, 16, 16, guiLeft - 8, guiTop + 36 + 16 + 32, text2);
@@ -93,7 +93,7 @@ public class GUIMachineBoilerElectric extends GuiInfoContainer {
 		this.drawInfoPanel(guiLeft - 16, guiTop + 36, 16, 16, 2);
 		this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 16, 16, 16, 3);
 		
-		if(dud.tanks[1].getTankType().name().equals(FluidType.NONE.name())) {
+		if(dud.tanks[1].getTankType().name().equals(FluidTypeTheOldOne.NONE.name())) {
 			this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 32, 16, 16, 6);
 		}
 		

src/main/java/com/hbm/inventory/gui/GUIMachineDiesel.java

@@ -7,9 +7,10 @@ import java.util.Map.Entry;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerMachineDiesel;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityMachineDiesel;
 import com.hbm.util.I18nUtil;

src/main/java/com/hbm/inventory/gui/GUIMachineLargeTurbine.java

@@ -2,7 +2,7 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerMachineLargeTurbine;
 import com.hbm.lib.RefStrings;
@@ -33,7 +33,7 @@ public class GUIMachineLargeTurbine extends GuiInfoContainer {
 		turbine.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 62, guiTop + 69 - 52, 16, 52);
 		turbine.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 69 - 52, 16, 52);
 		
-		if(turbine.tanks[1].getTankType().name().equals(FluidType.NONE.name())) {
+		if(turbine.tanks[1].getTankType().name().equals(FluidTypeTheOldOne.NONE.name())) {
 			
 			String[] text2 = new String[] { "Error: Invalid fluid!" };
 			this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 32, 16, 16, guiLeft - 8, guiTop + 36 + 16 + 32, text2);
@@ -56,23 +56,23 @@ public class GUIMachineLargeTurbine extends GuiInfoContainer {
 		Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
 		drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
 
-		if(turbine.tanks[0].getTankType().name().equals(FluidType.STEAM.name())) {
+		if(turbine.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.STEAM.name())) {
 			drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 0, 14, 14);
 		}
-		if(turbine.tanks[0].getTankType().name().equals(FluidType.HOTSTEAM.name())) {
+		if(turbine.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.HOTSTEAM.name())) {
 			drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 14, 14, 14);
 		}
-		if(turbine.tanks[0].getTankType().name().equals(FluidType.SUPERHOTSTEAM.name())) {
+		if(turbine.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.SUPERHOTSTEAM.name())) {
 			drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 28, 14, 14);
 		}
-		if(turbine.tanks[0].getTankType().name().equals(FluidType.ULTRAHOTSTEAM.name())) {
+		if(turbine.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.ULTRAHOTSTEAM.name())) {
 			drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 42, 14, 14);
 		}
 
 		int i = (int)turbine.getPowerScaled(34);
 		drawTexturedModalRect(guiLeft + 123, guiTop + 69 - i, 176, 34 - i, 7, i);
 		
-		if(turbine.tanks[1].getTankType().name().equals(FluidType.NONE.name())) {
+		if(turbine.tanks[1].getTankType().name().equals(FluidTypeTheOldOne.NONE.name())) {
 			this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 32, 16, 16, 6);
 		}
 		

src/main/java/com/hbm/inventory/gui/GUIMachineSelenium.java

@@ -6,9 +6,10 @@ import java.util.Map.Entry;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerMachineSelenium;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.lib.RefStrings;
 import com.hbm.tileentity.machine.TileEntityMachineDiesel;
 import com.hbm.tileentity.machine.TileEntityMachineSeleniumEngine;

src/main/java/com/hbm/inventory/gui/GUIMachineTurbine.java

@@ -2,7 +2,7 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerMachineTurbine;
 import com.hbm.lib.RefStrings;
@@ -33,7 +33,7 @@ public class GUIMachineTurbine extends GuiInfoContainer {
 		diFurnace.tanks[0].renderTankInfo(this, mouseX, mouseY, guiLeft + 62, guiTop + 69 - 52, 16, 52);
 		diFurnace.tanks[1].renderTankInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 69 - 52, 16, 52);
 		
-		if(diFurnace.tanks[1].getTankType().name().equals(FluidType.NONE.name())) {
+		if(diFurnace.tanks[1].getTankType().name().equals(FluidTypeTheOldOne.NONE.name())) {
 			
 			String[] text2 = new String[] { "Error: Invalid fluid!" };
 			this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 32, 16, 16, guiLeft - 8, guiTop + 36 + 16 + 32, text2);
@@ -56,23 +56,23 @@ public class GUIMachineTurbine extends GuiInfoContainer {
 		Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
 		drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
 
-		if(diFurnace.tanks[0].getTankType().name().equals(FluidType.STEAM.name())) {
+		if(diFurnace.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.STEAM.name())) {
 			drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 0, 14, 14);
 		}
-		if(diFurnace.tanks[0].getTankType().name().equals(FluidType.HOTSTEAM.name())) {
+		if(diFurnace.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.HOTSTEAM.name())) {
 			drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 14, 14, 14);
 		}
-		if(diFurnace.tanks[0].getTankType().name().equals(FluidType.SUPERHOTSTEAM.name())) {
+		if(diFurnace.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.SUPERHOTSTEAM.name())) {
 			drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 28, 14, 14);
 		}
-		if(diFurnace.tanks[0].getTankType().name().equals(FluidType.ULTRAHOTSTEAM.name())) {
+		if(diFurnace.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.ULTRAHOTSTEAM.name())) {
 			drawTexturedModalRect(guiLeft + 99, guiTop + 18, 183, 42, 14, 14);
 		}
 
 		int i = (int)diFurnace.getPowerScaled(34);
 		drawTexturedModalRect(guiLeft + 123, guiTop + 69 - i, 176, 34 - i, 7, i);
 		
-		if(diFurnace.tanks[1].getTankType().name().equals(FluidType.NONE.name())) {
+		if(diFurnace.tanks[1].getTankType().name().equals(FluidTypeTheOldOne.NONE.name())) {
 			this.drawInfoPanel(guiLeft - 16, guiTop + 36 + 32, 16, 16, 6);
 		}
 		

src/main/java/com/hbm/inventory/gui/GUIRBMKBoiler.java

@@ -3,6 +3,8 @@ package com.hbm.inventory.gui;
 import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerRBMKBoiler;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.lib.RefStrings;
 import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;
@@ -57,7 +59,6 @@ public class GUIRBMKBoiler extends GuiInfoContainer {
 		this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
 	}
 
-	@SuppressWarnings("incomplete-switch") //shut up
 	@Override
 	protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
@@ -74,11 +75,10 @@ public class GUIRBMKBoiler extends GuiInfoContainer {
 		
 		drawTexturedModalRect(guiLeft + 91, guiTop + 65 - j, 190, 24 - j, 4, j);
 		
-		switch(boiler.steam.getTankType()) {
+		FluidType type = boiler.steam.getTankType();
-		case STEAM: drawTexturedModalRect(guiLeft + 36, guiTop + 24, 194, 0, 14, 58); break;
+		if(type == Fluids.STEAM) drawTexturedModalRect(guiLeft + 36, guiTop + 24, 194, 0, 14, 58);
-		case HOTSTEAM: drawTexturedModalRect(guiLeft + 36, guiTop + 24, 208, 0, 14, 58); break;
+		if(type == Fluids.HOTSTEAM) drawTexturedModalRect(guiLeft + 36, guiTop + 24, 208, 0, 14, 58);
-		case SUPERHOTSTEAM: drawTexturedModalRect(guiLeft + 36, guiTop + 24, 222, 0, 14, 58); break;
+		if(type == Fluids.SUPERHOTSTEAM) drawTexturedModalRect(guiLeft + 36, guiTop + 24, 222, 0, 14, 58);
-		case ULTRAHOTSTEAM: drawTexturedModalRect(guiLeft + 36, guiTop + 24, 236, 0, 14, 58); break;
+		if(type == Fluids.ULTRAHOTSTEAM) drawTexturedModalRect(guiLeft + 36, guiTop + 24, 236, 0, 14, 58);
-		}
 	}
 }

src/main/java/com/hbm/inventory/gui/GUIRBMKConsole.java

@@ -8,7 +8,7 @@ import org.apache.commons.lang3.math.NumberUtils;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.lib.RefStrings;
 import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;
@@ -276,13 +276,13 @@ public class GUIRBMKConsole extends GuiScreen {
 				int fs = (int)Math.ceil((col.data.getInteger("steam")) * 8 / col.data.getDouble("maxSteam"));
 				drawTexturedModalRect(guiLeft + x + 6, guiTop + y + size - fs - 1, 46, 191 - fs, 3, fs);
 
-				if(col.data.getShort("type") == FluidType.STEAM.ordinal())
+				if(col.data.getShort("type") == FluidTypeTheOldOne.STEAM.ordinal())
 					drawTexturedModalRect(guiLeft + x + 4, guiTop + y + 1, 44, 183, 2, 2);
-				if(col.data.getShort("type") == FluidType.HOTSTEAM.ordinal())
+				if(col.data.getShort("type") == FluidTypeTheOldOne.HOTSTEAM.ordinal())
 					drawTexturedModalRect(guiLeft + x + 4, guiTop + y + 3, 44, 185, 2, 2);
-				if(col.data.getShort("type") == FluidType.SUPERHOTSTEAM.ordinal())
+				if(col.data.getShort("type") == FluidTypeTheOldOne.SUPERHOTSTEAM.ordinal())
 					drawTexturedModalRect(guiLeft + x + 4, guiTop + y + 5, 44, 187, 2, 2);
-				if(col.data.getShort("type") == FluidType.ULTRAHOTSTEAM.ordinal())
+				if(col.data.getShort("type") == FluidTypeTheOldOne.ULTRAHOTSTEAM.ordinal())
 					drawTexturedModalRect(guiLeft + x + 4, guiTop + y + 7, 44, 189, 2, 2);
 				
 				break;

src/main/java/com/hbm/inventory/gui/GUIReactorMultiblock.java

@@ -4,6 +4,8 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.container.ContainerReactorMultiblock;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.lib.RefStrings;
 import com.hbm.packet.AuxButtonPacket;
 import com.hbm.packet.PacketDispatcher;
@@ -27,7 +29,6 @@ public class GUIReactorMultiblock extends GuiInfoContainer {
 		this.ySize = 222;
 	}
 	
-	@SuppressWarnings("incomplete-switch")
 	@Override
 	public void drawScreen(int mouseX, int mouseY, float f) {
 		super.drawScreen(mouseX, mouseY, f);
@@ -71,18 +72,16 @@ public class GUIReactorMultiblock extends GuiInfoContainer {
 		
 		String s = "0";
 		
-		switch(diFurnace.tanks[2].getTankType()) {
+		FluidType type = diFurnace.tanks[2].getTankType();
-		case STEAM: s = "1x"; break;
+		if(type == Fluids.STEAM) s = "1x";
-		case HOTSTEAM:s = "10x"; break;
+		if(type == Fluids.HOTSTEAM) s = "10x";
-		case SUPERHOTSTEAM: s = "100x"; break;
+		if(type == Fluids.SUPERHOTSTEAM) s = "100x";
-		}
 		
 		String[] text4 = new String[] { "Steam compression switch",
 				"Current compression level: " + s};
 		this.drawCustomInfoStat(mouseX, mouseY, guiLeft + 63, guiTop + 107, 14, 18, mouseX, mouseY, text4);
 	}
 
-	@SuppressWarnings("incomplete-switch")
 	protected void mouseClicked(int x, int y, int i) {
     	super.mouseClicked(x, y, i);
     	
@@ -108,11 +107,10 @@ public class GUIReactorMultiblock extends GuiInfoContainer {
 			mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
 			int c = 0;
 			
-			switch(diFurnace.tanks[2].getTankType()) {
+			FluidType type = diFurnace.tanks[2].getTankType();
-			case STEAM: c = 0; break;
+			if(type == Fluids.STEAM) c = 0;
-			case HOTSTEAM: c = 1; break;
+			if(type == Fluids.HOTSTEAM) c = 1;
-			case SUPERHOTSTEAM: c = 2; break;
+			if(type == Fluids.SUPERHOTSTEAM) c = 2;
-			}
 			
     		PacketDispatcher.wrapper.sendToServer(new AuxButtonPacket(diFurnace.xCoord, diFurnace.yCoord, diFurnace.zCoord, c, 1));
     	}
@@ -126,7 +124,6 @@ public class GUIReactorMultiblock extends GuiInfoContainer {
 		this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
 	}
 
-	@SuppressWarnings("incomplete-switch")
 	@Override
 	protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
@@ -152,11 +149,11 @@ public class GUIReactorMultiblock extends GuiInfoContainer {
 		else
 			drawTexturedModalRect(guiLeft + 50, guiTop + 17, 230, 50 + (s - 8) * 18, 22, 18);
 
-		switch(diFurnace.tanks[2].getTankType()) {
+		
-		case STEAM: drawTexturedModalRect(guiLeft + 63, guiTop + 107, 176, 18, 14, 18); break;
+		FluidType type = diFurnace.tanks[2].getTankType();
-		case HOTSTEAM: drawTexturedModalRect(guiLeft + 63, guiTop + 107, 190, 18, 14, 18); break;
+		if(type == Fluids.STEAM) drawTexturedModalRect(guiLeft + 63, guiTop + 107, 176, 18, 14, 18);
-		case SUPERHOTSTEAM: drawTexturedModalRect(guiLeft + 63, guiTop + 107, 204, 18, 14, 18); break;
+		if(type == Fluids.HOTSTEAM) drawTexturedModalRect(guiLeft + 63, guiTop + 107, 190, 18, 14, 18);
-		}
+		if(type == Fluids.SUPERHOTSTEAM) drawTexturedModalRect(guiLeft + 63, guiTop + 107, 204, 18, 14, 18);
 		
 		if(diFurnace.hasHullHeat()) {
 			int i = diFurnace.getHullHeatScaled(88);
@@ -181,10 +178,8 @@ public class GUIReactorMultiblock extends GuiInfoContainer {
 			
 			int offset = 234;
 			
-			switch(diFurnace.tanks[2].getTankType()) {
+			if(type == Fluids.HOTSTEAM) offset += 4;
-			case HOTSTEAM: offset += 4; break;
+			if(type == Fluids.SUPERHOTSTEAM) offset += 8;
-			case SUPERHOTSTEAM: offset += 8; break;
-			}
 			
 			drawTexturedModalRect(guiLeft + 80, guiTop + 108, 0, offset, i, 4);
 		}

src/main/java/com/hbm/inventory/gui/GUIReactorZirnox.java

@@ -4,7 +4,6 @@ import org.lwjgl.opengl.GL11;
 
 import com.hbm.inventory.container.ContainerReactorZirnox;
 import com.hbm.lib.RefStrings;
-import com.hbm.packet.AuxButtonPacket;
 import com.hbm.packet.NBTControlPacket;
 import com.hbm.packet.PacketDispatcher;
 import com.hbm.tileentity.machine.TileEntityReactorZirnox;
@@ -43,20 +42,16 @@ public class GUIReactorZirnox extends GuiInfoContainer {
 		String[] info = new String[] { "CO2 transfers heat from the core", "to the water. This will boil", "the water into steam.", "Water Consumption Rate:", "100 mB/t", "2000 mB/s" };
 		this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36, 16, 16, guiLeft - 8, guiTop + 36 + 16, info);
 
-		String[] info2 = new String[] { "Pressure can be reduced by",
+		String[] info2 = new String[] { "Pressure can be reduced by", "reducing the amount of CO2", "in the reactor." };
-				"reducing the amount of CO2",
-				"in the reactor." };
 		this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 16, 16, 16, guiLeft - 8, guiTop + 36 + 16, info2);
 
 		if(zirnox.water.getFill() <= 0) {
-			String[] warn1 = new String[] { "Error: Water is required for",
+			String[] warn1 = new String[] { "Error: Water is required for", "the reactor to function properly!" };
-					"the reactor to function properly!" };
 			this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 32, 16, 16, guiLeft - 8, guiTop + 36 + 32 + 16, warn1);
 		}
 
 		if(zirnox.carbonDioxide.getFill() < 4000) {
-			String[] warn2 = new String[] { "Error: CO2 is required for",
+			String[] warn2 = new String[] { "Error: CO2 is required for", "the reactor to function properly!" };
-					"the reactor to function properly!" };
 			this.drawCustomInfoStat(mouseX, mouseY, guiLeft - 16, guiTop + 36 + 32 + 16, 16, 16, guiLeft - 8, guiTop + 36 + 32 + 16, warn2);
 		}
 
@@ -67,7 +62,6 @@ public class GUIReactorZirnox extends GuiInfoContainer {
 
 		NBTTagCompound control = new NBTTagCompound();
 
-
 		if(guiLeft + 144 <= x && guiLeft + 144 + 14 > x && guiTop + 35 < y && guiTop + 35 + 14 >= y) {
 			control.setBoolean("control", true);
 

src/main/java/com/hbm/inventory/gui/GUISILEX.java

@@ -2,7 +2,7 @@ package com.hbm.inventory.gui;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.inventory.container.ContainerSILEX;
 import com.hbm.lib.RefStrings;
 import com.hbm.packet.AuxButtonPacket;
@@ -67,7 +67,7 @@ public class GUISILEX extends GuiInfoContainer {
 		
 		if(silex.tank.getFill() > 0) {
 			
-			if(silex.tank.getTankType() == FluidType.ACID || silex.fluidConversion.containsKey(silex.tank.getTankType())) {
+			if(silex.tank.getTankType() == FluidTypeTheOldOne.ACID || silex.fluidConversion.containsKey(silex.tank.getTankType())) {
 				drawTexturedModalRect(guiLeft + 43, guiTop + 53, 176, 118, 54, 9);
 			} else {
 				drawTexturedModalRect(guiLeft + 43, guiTop + 53, 176, 109, 54, 9);
@@ -81,6 +81,6 @@ public class GUISILEX extends GuiInfoContainer {
 		drawTexturedModalRect(guiLeft + 26, guiTop + 124 - f, 176, 109 - f, 16, f);
 
 		int i = silex.getFluidScaled(52);
-		drawTexturedModalRect(guiLeft + 44, guiTop + 54, 176, silex.tank.getTankType() == FluidType.ACID ? 43 : 50, i, 7);
+		drawTexturedModalRect(guiLeft + 44, guiTop + 54, 176, silex.tank.getTankType() == FluidTypeTheOldOne.ACID ? 43 : 50, i, 7);
 	}
 }

src/main/java/com/hbm/inventory/gui/GUIScreenTemplateFolder.java

@@ -7,7 +7,7 @@ import java.util.List;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.inventory.recipes.AssemblerRecipes;
 import com.hbm.inventory.recipes.MachineRecipes;
 import com.hbm.items.ModItems;
@@ -66,8 +66,8 @@ public class GUIScreenTemplateFolder extends GuiScreen {
 				allStacks.add(new ItemStack(ModItems.siren_track, 1, i));
 			}
 			// Fluid IDs
-			for(int i = 1; i < FluidType.values().length; i++) {
+			for(int i = 1; i < FluidTypeTheOldOne.values().length; i++) {
-				if(!FluidType.values()[i].hasNoID()) {
+				if(!FluidTypeTheOldOne.values()[i].hasNoID()) {
 					allStacks.add(new ItemStack(ModItems.fluid_identifier, 1, i));
 				}
 			}

src/main/java/com/hbm/inventory/recipes/AssemblerRecipes.java

@@ -20,7 +20,7 @@ import com.google.gson.JsonObject;
 import com.google.gson.stream.JsonWriter;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.config.GeneralConfig;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.inventory.OreDictManager;
 import static com.hbm.inventory.OreDictManager.*;
 import com.hbm.inventory.RecipesCommon;
@@ -165,7 +165,7 @@ public class AssemblerRecipes {
 		makeRecipe(new ComparableStack(ModItems.entanglement_kit, 1), new AStack[] {new ComparableStack(ModItems.coil_magnetized_tungsten, 6), new OreDictStack(PB.plate(), 16), new OreDictStack(OreDictManager.getReflector(), 4), new ComparableStack(ModItems.singularity_counter_resonant, 1), new ComparableStack(ModItems.singularity_super_heated, 1), new ComparableStack(ModItems.powder_power, 4), },200);
 		makeRecipe(new ComparableStack(ModItems.dysfunctional_reactor, 1), new AStack[] {new OreDictStack(STEEL.plate(), 15), new OreDictStack(PB.ingot(), 5), new ComparableStack(ModItems.rod_quad_empty, 10), new OreDictStack("dyeBrown", 3), },200);
 		makeRecipe(new ComparableStack(ModItems.missile_assembly, 1), new AStack[] {new ComparableStack(ModItems.hull_small_steel, 1), new ComparableStack(ModItems.hull_small_aluminium, 4), new OreDictStack(STEEL.ingot(), 2), new OreDictStack(TI.plate(), 6), new ComparableStack(ModItems.wire_aluminium, 6), new ComparableStack(ModItems.canister_kerosene, 3), new ComparableStack(ModItems.circuit_targeting_tier1, 1), },200);
-		makeRecipe(new ComparableStack(ModItems.missile_carrier, 1), new AStack[] {new ComparableStack(ModItems.fluid_barrel_full, 16, FluidType.KEROSENE.ordinal()), new ComparableStack(ModItems.thruster_medium, 4), new ComparableStack(ModItems.thruster_large, 1), new ComparableStack(ModItems.hull_big_titanium, 6), new ComparableStack(ModItems.hull_big_steel, 2), new ComparableStack(ModItems.hull_small_aluminium, 12), new OreDictStack(TI.plate(), 24), new ComparableStack(ModItems.plate_polymer, 128), new ComparableStack(ModBlocks.det_cord, 8), new ComparableStack(ModItems.circuit_targeting_tier3, 12), new ComparableStack(ModItems.circuit_targeting_tier4, 3), },4800);
+		makeRecipe(new ComparableStack(ModItems.missile_carrier, 1), new AStack[] {new ComparableStack(ModItems.fluid_barrel_full, 16, FluidTypeTheOldOne.KEROSENE.ordinal()), new ComparableStack(ModItems.thruster_medium, 4), new ComparableStack(ModItems.thruster_large, 1), new ComparableStack(ModItems.hull_big_titanium, 6), new ComparableStack(ModItems.hull_big_steel, 2), new ComparableStack(ModItems.hull_small_aluminium, 12), new OreDictStack(TI.plate(), 24), new ComparableStack(ModItems.plate_polymer, 128), new ComparableStack(ModBlocks.det_cord, 8), new ComparableStack(ModItems.circuit_targeting_tier3, 12), new ComparableStack(ModItems.circuit_targeting_tier4, 3), },4800);
 		makeRecipe(new ComparableStack(ModItems.warhead_generic_small, 1), new AStack[] {new OreDictStack(TI.plate(), 5), new OreDictStack(STEEL.plate(), 3), new ComparableStack(Blocks.tnt, 2), },100);
 		makeRecipe(new ComparableStack(ModItems.warhead_generic_medium, 1), new AStack[] {new OreDictStack(TI.plate(), 8), new OreDictStack(STEEL.plate(), 5), new ComparableStack(Blocks.tnt, 4), },150);
 		makeRecipe(new ComparableStack(ModItems.warhead_generic_large, 1), new AStack[] {new OreDictStack(TI.plate(), 15), new OreDictStack(STEEL.plate(), 8), new ComparableStack(Blocks.tnt, 8), },200);
@@ -191,15 +191,15 @@ public class AssemblerRecipes {
 		makeRecipe(new ComparableStack(ModItems.thruster_medium, 1), new AStack[] {new ComparableStack(ModItems.thruster_small, 1), new OreDictStack(STEEL.plate(), 2), new ComparableStack(ModItems.hull_small_steel, 1), new ComparableStack(ModItems.hull_big_steel, 1), new ComparableStack(ModItems.wire_copper, 4), },150);
 		makeRecipe(new ComparableStack(ModItems.thruster_large, 1), new AStack[] {new ComparableStack(ModItems.thruster_medium, 1), new OreDictStack(STEEL.plate(), 4), new ComparableStack(ModItems.hull_big_steel, 2), new ComparableStack(ModItems.wire_red_copper, 4), },200);
 		makeRecipe(new ComparableStack(ModItems.thruster_nuclear, 1), new AStack[] {new ComparableStack(ModItems.thruster_large, 1), new ComparableStack(ModItems.tank_steel, 2), new ComparableStack(ModBlocks.deco_pipe_quad, 3), new ComparableStack(ModItems.board_copper, 6), new ComparableStack(ModItems.motor, 1), new ComparableStack(ModItems.circuit_targeting_tier4, 2), new ComparableStack(ModBlocks.reactor_research, 1), },600);
-		makeRecipe(new ComparableStack(ModItems.sat_base, 1), new AStack[] {new ComparableStack(ModItems.thruster_large, 1), new OreDictStack(STEEL.plate(), 6), new ComparableStack(ModItems.plate_desh, 4), new ComparableStack(ModItems.hull_big_titanium, 3), new ComparableStack(ModItems.fluid_barrel_full, 1, FluidType.KEROSENE.ordinal()), new ComparableStack(ModItems.photo_panel, 24), new ComparableStack(ModItems.board_copper, 12), new ComparableStack(ModItems.circuit_gold, 6), new ComparableStack(ModItems.battery_lithium_cell_6, 1), },500);
+		makeRecipe(new ComparableStack(ModItems.sat_base, 1), new AStack[] {new ComparableStack(ModItems.thruster_large, 1), new OreDictStack(STEEL.plate(), 6), new ComparableStack(ModItems.plate_desh, 4), new ComparableStack(ModItems.hull_big_titanium, 3), new ComparableStack(ModItems.fluid_barrel_full, 1, FluidTypeTheOldOne.KEROSENE.ordinal()), new ComparableStack(ModItems.photo_panel, 24), new ComparableStack(ModItems.board_copper, 12), new ComparableStack(ModItems.circuit_gold, 6), new ComparableStack(ModItems.battery_lithium_cell_6, 1), },500);
 		makeRecipe(new ComparableStack(ModItems.sat_head_mapper, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 4), new OreDictStack(STEEL.plate(), 6), new ComparableStack(ModItems.hull_small_steel, 3), new ComparableStack(ModItems.plate_desh, 2), new ComparableStack(ModItems.circuit_gold, 2), new ComparableStack(ModItems.plate_polymer, 12), new OreDictStack(REDSTONE.dust(), 6), new ComparableStack(Items.diamond, 1), new ComparableStack(Blocks.glass_pane, 6), },400);
 		makeRecipe(new ComparableStack(ModItems.sat_head_scanner, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 6), new OreDictStack(TI.plate(), 32), new ComparableStack(ModItems.plate_desh, 6), new ComparableStack(ModItems.magnetron, 6), new ComparableStack(ModItems.coil_advanced_torus, 2), new ComparableStack(ModItems.circuit_gold, 6), new ComparableStack(ModItems.plate_polymer, 6), new ComparableStack(Items.diamond, 1), },400);
 		makeRecipe(new ComparableStack(ModItems.sat_head_radar, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 4), new OreDictStack(TI.plate(), 32), new ComparableStack(ModItems.magnetron, 12), new ComparableStack(ModItems.plate_polymer, 16), new ComparableStack(ModItems.wire_red_copper, 16), new ComparableStack(ModItems.coil_gold, 3), new ComparableStack(ModItems.circuit_gold, 5), new ComparableStack(Items.diamond, 1), },400);
 		makeRecipe(new ComparableStack(ModItems.sat_head_laser, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 12), new OreDictStack(W.ingot(), 16), new OreDictStack(POLYMER.ingot(), 6), new ComparableStack(ModItems.plate_polymer, 16), new ComparableStack(ModItems.board_copper, 24), new ComparableStack(ModItems.circuit_targeting_tier5, 2), new OreDictStack(REDSTONE.dust(), 16), new ComparableStack(Items.diamond, 5), new ComparableStack(Blocks.glass_pane, 16), },450);
 		makeRecipe(new ComparableStack(ModItems.sat_head_resonator, 1), new AStack[] {new OreDictStack(STEEL.ingot(), 32), new OreDictStack(POLYMER.ingot(), 48), new ComparableStack(ModItems.plate_polymer, 8), new ComparableStack(ModItems.crystal_xen, 1), new OreDictStack(STAR.ingot(), 7), new ComparableStack(ModItems.circuit_targeting_tier5, 6), new ComparableStack(ModItems.circuit_targeting_tier6, 2), },1000);
-		makeRecipe(new ComparableStack(ModItems.sat_foeq, 1), new AStack[] {new OreDictStack(STEEL.plate(), 8), new OreDictStack(TI.plate(), 12), new ComparableStack(ModItems.plate_desh, 8), new ComparableStack(ModItems.hull_big_titanium, 3), new ComparableStack(ModItems.fluid_barrel_full, 1, FluidType.HYDROGEN.ordinal()), new ComparableStack(ModItems.photo_panel, 16), new ComparableStack(ModItems.thruster_nuclear, 1), new ComparableStack(ModItems.ingot_uranium_fuel, 6), new ComparableStack(ModItems.circuit_targeting_tier5, 6), new ComparableStack(ModItems.magnetron, 3), new ComparableStack(ModItems.battery_lithium_cell_6, 1), },1200);
+		makeRecipe(new ComparableStack(ModItems.sat_foeq, 1), new AStack[] {new OreDictStack(STEEL.plate(), 8), new OreDictStack(TI.plate(), 12), new ComparableStack(ModItems.plate_desh, 8), new ComparableStack(ModItems.hull_big_titanium, 3), new ComparableStack(ModItems.fluid_barrel_full, 1, FluidTypeTheOldOne.HYDROGEN.ordinal()), new ComparableStack(ModItems.photo_panel, 16), new ComparableStack(ModItems.thruster_nuclear, 1), new ComparableStack(ModItems.ingot_uranium_fuel, 6), new ComparableStack(ModItems.circuit_targeting_tier5, 6), new ComparableStack(ModItems.magnetron, 3), new ComparableStack(ModItems.battery_lithium_cell_6, 1), },1200);
-		makeRecipe(new ComparableStack(ModItems.sat_miner, 1), new AStack[] {new OreDictStack(BIGMT.plate(), 24), new ComparableStack(ModItems.plate_desh, 8), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.drill_titanium, 2), new ComparableStack(ModItems.circuit_targeting_tier4, 2), new ComparableStack(ModItems.fluid_barrel_full, 1, FluidType.KEROSENE.ordinal()), new ComparableStack(ModItems.thruster_small, 1), new ComparableStack(ModItems.photo_panel, 12), new ComparableStack(ModItems.centrifuge_element, 4), new ComparableStack(ModItems.magnetron, 3), new ComparableStack(ModItems.plate_polymer, 12), new ComparableStack(ModItems.battery_lithium_cell_6, 1), },600);
+		makeRecipe(new ComparableStack(ModItems.sat_miner, 1), new AStack[] {new OreDictStack(BIGMT.plate(), 24), new ComparableStack(ModItems.plate_desh, 8), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.drill_titanium, 2), new ComparableStack(ModItems.circuit_targeting_tier4, 2), new ComparableStack(ModItems.fluid_barrel_full, 1, FluidTypeTheOldOne.KEROSENE.ordinal()), new ComparableStack(ModItems.thruster_small, 1), new ComparableStack(ModItems.photo_panel, 12), new ComparableStack(ModItems.centrifuge_element, 4), new ComparableStack(ModItems.magnetron, 3), new ComparableStack(ModItems.plate_polymer, 12), new ComparableStack(ModItems.battery_lithium_cell_6, 1), },600);
-		makeRecipe(new ComparableStack(ModItems.sat_lunar_miner, 1), new AStack[] {new ComparableStack(ModItems.ingot_meteorite, 24), new ComparableStack(ModItems.plate_desh, 4), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.drill_titanium, 2), new ComparableStack(ModItems.circuit_targeting_tier4, 2), new ComparableStack(ModItems.fluid_barrel_full, 1, FluidType.KEROSENE.ordinal()), new ComparableStack(ModItems.thruster_small, 1), new ComparableStack(ModItems.photo_panel, 12), new ComparableStack(ModItems.magnetron, 3), new ComparableStack(ModItems.plate_polymer, 12), new ComparableStack(ModItems.battery_lithium_cell_6, 1), },600);
+		makeRecipe(new ComparableStack(ModItems.sat_lunar_miner, 1), new AStack[] {new ComparableStack(ModItems.ingot_meteorite, 24), new ComparableStack(ModItems.plate_desh, 4), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.drill_titanium, 2), new ComparableStack(ModItems.circuit_targeting_tier4, 2), new ComparableStack(ModItems.fluid_barrel_full, 1, FluidTypeTheOldOne.KEROSENE.ordinal()), new ComparableStack(ModItems.thruster_small, 1), new ComparableStack(ModItems.photo_panel, 12), new ComparableStack(ModItems.magnetron, 3), new ComparableStack(ModItems.plate_polymer, 12), new ComparableStack(ModItems.battery_lithium_cell_6, 1), },600);
 		makeRecipe(new ComparableStack(ModItems.chopper_head, 1), new AStack[] {new ComparableStack(ModBlocks.reinforced_glass, 2), new ComparableStack(ModBlocks.fwatz_computer, 1), new OreDictStack(CMB.ingot(), 22), new ComparableStack(ModItems.wire_magnetized_tungsten, 4), },300);
 		makeRecipe(new ComparableStack(ModItems.chopper_gun, 1), new AStack[] {new OreDictStack(CMB.plate(), 4), new OreDictStack(CMB.ingot(), 2), new ComparableStack(ModItems.wire_tungsten, 6), new ComparableStack(ModItems.coil_magnetized_tungsten, 1), new ComparableStack(ModItems.motor, 1), },150);
 		makeRecipe(new ComparableStack(ModItems.chopper_torso, 1), new AStack[] {new OreDictStack(CMB.ingot(), 26), new ComparableStack(ModBlocks.fwatz_computer, 1), new ComparableStack(ModItems.wire_magnetized_tungsten, 4), new ComparableStack(ModItems.motor, 2), new ComparableStack(ModItems.chopper_blades, 2), },350);

src/main/java/com/hbm/inventory/recipes/ChemplantRecipes.java

@@ -4,12 +4,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.hbm.blocks.ModBlocks;
-import com.hbm.handler.FluidTypeHandler.FluidType;
 import com.hbm.inventory.FluidStack;
 import static com.hbm.inventory.OreDictManager.*;
 import com.hbm.inventory.RecipesCommon.AStack;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.inventory.RecipesCommon.OreDictStack;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.items.ModItems;
 
 import net.minecraft.init.Blocks;
@@ -69,157 +69,157 @@ public class ChemplantRecipes {
 	
 	public static void registerFuelProcessing() {
 		recipes.add(new ChemRecipe("FP_HEAVYOIL", 50)
-				.inputFluids(new FluidStack(1000, FluidType.HEAVYOIL))
+				.inputFluids(new FluidStack(1000, Fluids.HEAVYOIL))
 				.outputFluids(
-						new FluidStack(RefineryRecipes.heavy_frac_bitu * 10, FluidType.BITUMEN),
+						new FluidStack(RefineryRecipes.heavy_frac_bitu * 10, Fluids.BITUMEN),
-						new FluidStack(RefineryRecipes.heavy_frac_smear * 10, FluidType.SMEAR)
+						new FluidStack(RefineryRecipes.heavy_frac_smear * 10, Fluids.SMEAR)
 						));
 		recipes.add(new ChemRecipe("FP_SMEAR", 50)
-				.inputFluids(new FluidStack(1000, FluidType.SMEAR))
+				.inputFluids(new FluidStack(1000, Fluids.SMEAR))
 				.outputFluids(
-						new FluidStack(RefineryRecipes.smear_frac_heat * 10, FluidType.HEATINGOIL),
+						new FluidStack(RefineryRecipes.smear_frac_heat * 10, Fluids.HEATINGOIL),
-						new FluidStack(RefineryRecipes.smear_frac_lube * 10, FluidType.LUBRICANT)
+						new FluidStack(RefineryRecipes.smear_frac_lube * 10, Fluids.LUBRICANT)
 						));
 		recipes.add(new ChemRecipe("FP_NAPHTHA", 50)
-				.inputFluids(new FluidStack(1000, FluidType.NAPHTHA))
+				.inputFluids(new FluidStack(1000, Fluids.NAPHTHA))
 				.outputFluids(
-						new FluidStack(RefineryRecipes.napht_frac_heat * 10, FluidType.HEATINGOIL),
+						new FluidStack(RefineryRecipes.napht_frac_heat * 10, Fluids.HEATINGOIL),
-						new FluidStack(RefineryRecipes.napht_frac_diesel * 10, FluidType.DIESEL)
+						new FluidStack(RefineryRecipes.napht_frac_diesel * 10, Fluids.DIESEL)
 						));
 		recipes.add(new ChemRecipe("FP_LIGHTOIL", 50)
-				.inputFluids(new FluidStack(1000, FluidType.LIGHTOIL))
+				.inputFluids(new FluidStack(1000, Fluids.LIGHTOIL))
 				.outputFluids(
-						new FluidStack(RefineryRecipes.light_frac_diesel * 10, FluidType.DIESEL),
+						new FluidStack(RefineryRecipes.light_frac_diesel * 10, Fluids.DIESEL),
-						new FluidStack(RefineryRecipes.light_frac_kero * 10, FluidType.KEROSENE)
+						new FluidStack(RefineryRecipes.light_frac_kero * 10, Fluids.KEROSENE)
 						));
 		recipes.add(new ChemRecipe("FR_REOIL", 30)
-				.inputFluids(new FluidStack(1000, FluidType.SMEAR))
+				.inputFluids(new FluidStack(1000, Fluids.SMEAR))
-				.outputFluids(new FluidStack(800, FluidType.RECLAIMED)));
+				.outputFluids(new FluidStack(800, Fluids.RECLAIMED)));
 		recipes.add(new ChemRecipe("FR_PETROIL", 30)
 				.inputFluids(
-						new FluidStack(800, FluidType.RECLAIMED),
+						new FluidStack(800, Fluids.RECLAIMED),
-						new FluidStack(200, FluidType.LUBRICANT))
+						new FluidStack(200, Fluids.LUBRICANT))
-				.outputFluids(new FluidStack(1000, FluidType.PETROIL)));
+				.outputFluids(new FluidStack(1000, Fluids.PETROIL)));
 	}
 	
 	public static void registerFuelCracking() {
 		recipes.add(new ChemRecipe("FC_BITUMEN", 100)
 				.inputFluids(
-						new FluidStack(1200, FluidType.BITUMEN),
+						new FluidStack(1200, Fluids.BITUMEN),
-						new FluidStack(2400, FluidType.STEAM))
+						new FluidStack(2400, Fluids.STEAM))
 				.outputFluids(
-						new FluidStack(1000, FluidType.OIL),
+						new FluidStack(1000, Fluids.OIL),
-						new FluidStack(200, FluidType.PETROLEUM)));
+						new FluidStack(200, Fluids.PETROLEUM)));
 		recipes.add(new ChemRecipe("FC_I_NAPHTHA", 150)
 				.inputFluids(
-						new FluidStack(1400, FluidType.SMEAR),
+						new FluidStack(1400, Fluids.SMEAR),
-						new FluidStack(800, FluidType.WATER))
+						new FluidStack(800, Fluids.WATER))
-				.outputFluids(new FluidStack(800, FluidType.NAPHTHA)));
+				.outputFluids(new FluidStack(800, Fluids.NAPHTHA)));
 		recipes.add(new ChemRecipe("FC_GAS_PETROLEUM", 100)
 				.inputFluids(
-						new FluidStack(1800, FluidType.GAS),
+						new FluidStack(1800, Fluids.GAS),
-						new FluidStack(1200, FluidType.WATER))
+						new FluidStack(1200, Fluids.WATER))
-				.outputFluids(new FluidStack(800, FluidType.PETROLEUM)));
+				.outputFluids(new FluidStack(800, Fluids.PETROLEUM)));
 		recipes.add(new ChemRecipe("FC_DIESEL_KEROSENE", 150)
 				.inputFluids(
-						new FluidStack(1200, FluidType.DIESEL),
+						new FluidStack(1200, Fluids.DIESEL),
-						new FluidStack(2000, FluidType.STEAM))
+						new FluidStack(2000, Fluids.STEAM))
-				.outputFluids(new FluidStack(400, FluidType.KEROSENE)));
+				.outputFluids(new FluidStack(400, Fluids.KEROSENE)));
 		recipes.add(new ChemRecipe("FC_KEROSENE_PETROLEUM", 150)
 				.inputFluids(
-						new FluidStack(1400, FluidType.KEROSENE),
+						new FluidStack(1400, Fluids.KEROSENE),
-						new FluidStack(2000, FluidType.STEAM))
+						new FluidStack(2000, Fluids.STEAM))
-				.outputFluids(new FluidStack(800, FluidType.PETROLEUM)));
+				.outputFluids(new FluidStack(800, Fluids.PETROLEUM)));
 	}
 	
 	public static void registerCoalCracking() {
 		recipes.add(new ChemRecipe("CC_OIL", 150)
 				.inputItems(new OreDictStack(COAL.dust(), 8), new ComparableStack(ModItems.oil_tar, 4))
-				.inputFluids(new FluidStack(1400, FluidType.STEAM))
+				.inputFluids(new FluidStack(1400, Fluids.STEAM))
-				.outputFluids(new FluidStack(2000, FluidType.OIL)));
+				.outputFluids(new FluidStack(2000, Fluids.OIL)));
 		recipes.add(new ChemRecipe("CC_I", 200)
 				.inputItems(new OreDictStack(COAL.dust(), 6), new ComparableStack(ModItems.oil_tar, 4))
-				.inputFluids(new FluidStack(1800, FluidType.WATER))
+				.inputFluids(new FluidStack(1800, Fluids.WATER))
-				.outputFluids(new FluidStack(1600, FluidType.SMEAR)));
+				.outputFluids(new FluidStack(1600, Fluids.SMEAR)));
 		recipes.add(new ChemRecipe("CC_HEATING", 250)
 				.inputItems(new OreDictStack(COAL.dust(), 6), new ComparableStack(ModItems.oil_tar, 4))
-				.inputFluids(new FluidStack(2000, FluidType.STEAM))
+				.inputFluids(new FluidStack(2000, Fluids.STEAM))
-				.outputFluids(new FluidStack(1800, FluidType.HEATINGOIL)));
+				.outputFluids(new FluidStack(1800, Fluids.HEATINGOIL)));
 		recipes.add(new ChemRecipe("CC_HEAVY", 200)
 				.inputItems(new OreDictStack(COAL.dust(), 8), new ComparableStack(ModItems.oil_tar, 4))
-				.inputFluids(new FluidStack(1400, FluidType.WATER))
+				.inputFluids(new FluidStack(1400, Fluids.WATER))
-				.outputFluids(new FluidStack(1800, FluidType.HEAVYOIL)));
+				.outputFluids(new FluidStack(1800, Fluids.HEAVYOIL)));
 		recipes.add(new ChemRecipe("CC_NAPHTHA", 300)
 				.inputItems(new OreDictStack(COAL.dust(), 8), new ComparableStack(ModItems.oil_tar, 4))
-				.inputFluids(new FluidStack(2400, FluidType.STEAM))
+				.inputFluids(new FluidStack(2400, Fluids.STEAM))
-				.outputFluids(new FluidStack(2000, FluidType.NAPHTHA)));
+				.outputFluids(new FluidStack(2000, Fluids.NAPHTHA)));
 	}
 	
 	public static void registerSolidFuel() {
 		recipes.add(new ChemRecipe("SF_OIL", 20)
-				.inputFluids(new FluidStack(350, FluidType.OIL))
+				.inputFluids(new FluidStack(350, Fluids.OIL))
 				.outputItems(new ItemStack(ModItems.oil_tar, 1), new ItemStack(ModItems.oil_tar, 1)));
 		recipes.add(new ChemRecipe("SF_HEAVYOIL", 20)
-				.inputFluids(new FluidStack(250, FluidType.HEAVYOIL))
+				.inputFluids(new FluidStack(250, Fluids.HEAVYOIL))
 				.outputItems(new ItemStack(ModItems.oil_tar, 1), new ItemStack(ModItems.oil_tar, 1)));
 		recipes.add(new ChemRecipe("SF_SMEAR", 20)
-				.inputFluids(new FluidStack(200, FluidType.SMEAR))
+				.inputFluids(new FluidStack(200, Fluids.SMEAR))
 				.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));
 		recipes.add(new ChemRecipe("SF_HEATINGOIL", 20)
-				.inputFluids(new FluidStack(100, FluidType.HEATINGOIL))
+				.inputFluids(new FluidStack(100, Fluids.HEATINGOIL))
 				.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));
 		recipes.add(new ChemRecipe("SF_RECLAIMED", 20)
-				.inputFluids(new FluidStack(200, FluidType.RECLAIMED))
+				.inputFluids(new FluidStack(200, Fluids.RECLAIMED))
 				.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));
 		recipes.add(new ChemRecipe("SF_PETROIL", 20)
-				.inputFluids(new FluidStack(250, FluidType.PETROIL))
+				.inputFluids(new FluidStack(250, Fluids.PETROIL))
 				.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));
 		recipes.add(new ChemRecipe("SF_LUBRICANT", 20)
-				.inputFluids(new FluidStack(250, FluidType.LUBRICANT))
+				.inputFluids(new FluidStack(250, Fluids.LUBRICANT))
 				.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));
 		recipes.add(new ChemRecipe("SF_NAPHTHA", 20)
-				.inputFluids(new FluidStack(300, FluidType.NAPHTHA))
+				.inputFluids(new FluidStack(300, Fluids.NAPHTHA))
 				.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));
 		recipes.add(new ChemRecipe("SF_DIESEL", 20)
-				.inputFluids(new FluidStack(400, FluidType.DIESEL))
+				.inputFluids(new FluidStack(400, Fluids.DIESEL))
 				.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));
 		recipes.add(new ChemRecipe("SF_LIGHTOIL", 20)
-				.inputFluids(new FluidStack(450, FluidType.LIGHTOIL))
+				.inputFluids(new FluidStack(450, Fluids.LIGHTOIL))
 				.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));
 		recipes.add(new ChemRecipe("SF_KEROSENE", 20)
-				.inputFluids(new FluidStack(550, FluidType.KEROSENE))
+				.inputFluids(new FluidStack(550, Fluids.KEROSENE))
 				.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));
 		recipes.add(new ChemRecipe("SF_GAS", 20)
-				.inputFluids(new FluidStack(750, FluidType.GAS))
+				.inputFluids(new FluidStack(750, Fluids.GAS))
 				.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));
 		recipes.add(new ChemRecipe("SF_PETROLEUM", 20)
-				.inputFluids(new FluidStack(600, FluidType.PETROLEUM))
+				.inputFluids(new FluidStack(600, Fluids.PETROLEUM))
 				.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));
 		recipes.add(new ChemRecipe("SF_BIOGAS", 20)
-				.inputFluids(new FluidStack(3500, FluidType.BIOGAS))
+				.inputFluids(new FluidStack(3500, Fluids.BIOGAS))
 				.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));
 		recipes.add(new ChemRecipe("SF_BIOFUEL", 20)
-				.inputFluids(new FluidStack(1500, FluidType.BIOFUEL))
+				.inputFluids(new FluidStack(1500, Fluids.BIOFUEL))
 				.outputItems(new ItemStack(ModItems.solid_fuel, 1), new ItemStack(ModItems.solid_fuel, 1)));;
 	}
 
 	public static void registerOtherOil() {
 		recipes.add(new ChemRecipe("BP_BIOGAS", 200)
 				.inputItems(new ComparableStack(ModItems.biomass, 16))
-				.outputFluids(new FluidStack(4000, FluidType.BIOGAS)));
+				.outputFluids(new FluidStack(4000, Fluids.BIOGAS)));
 		recipes.add(new ChemRecipe("BP_BIOFUEL", 100)
-				.inputFluids(new FluidStack(2000, FluidType.BIOGAS))
+				.inputFluids(new FluidStack(2000, Fluids.BIOGAS))
-				.outputFluids(new FluidStack(1000, FluidType.BIOFUEL)));
+				.outputFluids(new FluidStack(1000, Fluids.BIOFUEL)));
 		recipes.add(new ChemRecipe("LPG", 100)
-				.inputFluids(new FluidStack(2000, FluidType.PETROLEUM))
+				.inputFluids(new FluidStack(2000, Fluids.PETROLEUM))
-				.outputFluids(new FluidStack(1000, FluidType.LPG)));
+				.outputFluids(new FluidStack(1000, Fluids.LPG)));
 		recipes.add(new ChemRecipe("OIL_SAND", 200)
 				.inputItems(new ComparableStack(ModBlocks.ore_oil_sand, 16), new ComparableStack(ModItems.oil_tar, 1))
 				.outputItems(new ItemStack(Blocks.sand, 4), new ItemStack(Blocks.sand, 4), new ItemStack(Blocks.sand, 4), new ItemStack(Blocks.sand, 4))
-				.outputFluids(new FluidStack(1000, FluidType.BITUMEN)));
+				.outputFluids(new FluidStack(1000, Fluids.BITUMEN)));
 		recipes.add(new ChemRecipe("ASPHALT", 100)
 				.inputItems(new ComparableStack(Blocks.gravel, 2), new ComparableStack(Blocks.sand, 6))
-				.inputFluids(new FluidStack(1000, FluidType.BITUMEN))
+				.inputFluids(new FluidStack(1000, Fluids.BITUMEN))
 				.outputItems(new ItemStack(ModBlocks.asphalt, 4), new ItemStack(ModBlocks.asphalt, 4), new ItemStack(ModBlocks.asphalt, 4), new ItemStack(ModBlocks.asphalt, 4)));
 	}
 	

src/main/java/com/hbm/inventory/recipes/FusionRecipes.java

@@ -1,77 +1,82 @@
 package com.hbm.inventory.recipes;
 
 import java.util.HashMap;
+import java.util.Map.Entry;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.items.ModItems;
 
 import net.minecraft.item.ItemStack;
 
 public class FusionRecipes {
 	
-	public static int getByproductChance(FluidType plasma) {
+	public static HashMap<FluidType, Integer> chances = new HashMap();
-		
+	static {
-		switch(plasma) {
+		chances.put(Fluids.PLASMA_DT, 1200);
-		case PLASMA_DT: return 1200;
+		chances.put(Fluids.PLASMA_DH3, 600);
-		case PLASMA_DH3: return 600;
+		chances.put(Fluids.PLASMA_HD, 1200);
-		case PLASMA_HD: return 1200;
+		chances.put(Fluids.PLASMA_HT, 1200);
-		case PLASMA_HT: return 1200;
+		chances.put(Fluids.PLASMA_XM, 1200);
-		case PLASMA_XM: return 2400;
+		chances.put(Fluids.PLASMA_BF, 150);
-		case PLASMA_BF: return 150;
-		default: return 0;
 	}
+	
+	public static int getByproductChance(FluidType plasma) {
+		Integer chance = chances.get(plasma);
+		return chance != null ? chance : 0;
+	}
+	
+	public static HashMap<FluidType, Integer> levels = new HashMap();
+	static {
+		levels.put(Fluids.PLASMA_DT, 1);
+		levels.put(Fluids.PLASMA_DH3, 2);
+		levels.put(Fluids.PLASMA_HD, 1);
+		levels.put(Fluids.PLASMA_HT, 1);
+		levels.put(Fluids.PLASMA_XM, 3);
+		levels.put(Fluids.PLASMA_BF, 4);
 	}
 	
 	public static int getBreedingLevel(FluidType plasma) {
-		
+		Integer level = levels.get(plasma);
-		switch(plasma) {
+		return level != null ? level : 0;
-		case PLASMA_DT: return 1;
-		case PLASMA_DH3: return 2;
-		case PLASMA_HD: return 1;
-		case PLASMA_HT: return 1;
-		case PLASMA_XM: return 3; 
-		case PLASMA_BF: return 4;
-		default: return 0;
 	}
+	
+	public static HashMap<FluidType, ItemStack> byproducts = new HashMap();
+	static {
+		byproducts.put(Fluids.PLASMA_DT, new ItemStack(ModItems.pellet_charged));
+		byproducts.put(Fluids.PLASMA_DH3, new ItemStack(ModItems.pellet_charged));
+		byproducts.put(Fluids.PLASMA_HD, new ItemStack(ModItems.pellet_charged));
+		byproducts.put(Fluids.PLASMA_HT, new ItemStack(ModItems.pellet_charged));
+		byproducts.put(Fluids.PLASMA_XM, new ItemStack(ModItems.powder_chlorophyte));
+		byproducts.put(Fluids.PLASMA_BF, new ItemStack(ModItems.powder_balefire));
 	}
 	
 	public static ItemStack getByproduct(FluidType plasma) {
-		
+		ItemStack byproduct = byproducts.get(plasma);
-		switch(plasma) {
+		return byproduct != null ? byproduct.copy() : null;
-		case PLASMA_DT: return new ItemStack(ModItems.pellet_charged);
-		case PLASMA_DH3: return new ItemStack(ModItems.pellet_charged);
-		case PLASMA_HD: return new ItemStack(ModItems.pellet_charged);
-		case PLASMA_HT: return new ItemStack(ModItems.pellet_charged);
-		case PLASMA_XM: return new ItemStack(ModItems.powder_chlorophyte);
-		case PLASMA_BF: return new ItemStack(ModItems.powder_balefire);
-		default: return null;
 	}
+	
+	public static HashMap<FluidType, Integer> steamprod = new HashMap();
+	static {
+		steamprod.put(Fluids.PLASMA_DT, 30);
+		steamprod.put(Fluids.PLASMA_DH3, 50);
+		steamprod.put(Fluids.PLASMA_HD, 20);
+		steamprod.put(Fluids.PLASMA_HT, 25);
+		steamprod.put(Fluids.PLASMA_XM, 60);
+		steamprod.put(Fluids.PLASMA_BF, 160);
 	}
 	
 	public static int getSteamProduction(FluidType plasma) {
-		
+		Integer steam = steamprod.get(plasma);
-		switch(plasma) {
+		return steam != null ? steam : 0;
-		case PLASMA_DT: return 30;
-		case PLASMA_DH3: return 50;
-		case PLASMA_HD: return 20;
-		case PLASMA_HT: return 25;
-		case PLASMA_XM: return 60; 
-		case PLASMA_BF: return 160;
-		default: return 0;
-		}
 	}
 	
 	public static HashMap<ItemStack, ItemStack> getRecipes() {
 		
 		HashMap<ItemStack, ItemStack> map = new HashMap();
-
+		for(Entry<FluidType, ItemStack> entry : byproducts.entrySet()) {
-		map.put(new ItemStack(ModItems.fluid_icon, 1, FluidType.PLASMA_DT.ordinal()), getByproduct(FluidType.PLASMA_DT));
+			map.put(new ItemStack(ModItems.fluid_icon, 1, entry.getKey().getID()), entry.getValue().copy());
-		map.put(new ItemStack(ModItems.fluid_icon, 1, FluidType.PLASMA_DH3.ordinal()), getByproduct(FluidType.PLASMA_DH3));
+		}
-		map.put(new ItemStack(ModItems.fluid_icon, 1, FluidType.PLASMA_HD.ordinal()), getByproduct(FluidType.PLASMA_HD));
-		map.put(new ItemStack(ModItems.fluid_icon, 1, FluidType.PLASMA_HT.ordinal()), getByproduct(FluidType.PLASMA_HT));
-		map.put(new ItemStack(ModItems.fluid_icon, 1, FluidType.PLASMA_XM.ordinal()), getByproduct(FluidType.PLASMA_XM));
-		map.put(new ItemStack(ModItems.fluid_icon, 1, FluidType.PLASMA_BF.ordinal()), getByproduct(FluidType.PLASMA_BF));
-		
 		return map;
 	}
 

src/main/java/com/hbm/inventory/recipes/GasCentrifugeRecipes.java

@@ -5,7 +5,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemFluidIcon;
 
@@ -14,7 +16,7 @@ import net.minecraft.item.ItemStack;
 public class GasCentrifugeRecipes {
 	
 	public static enum PseudoFluidType {
-		NONE	(0,		0,		"NONE",		"Empty",				false,	null),
+		NONE	(0,		0,		"NONE",		"Empty",				false,	(ItemStack)null),
 		
 		NUF6 	(400,	300,	"LEUF6",	"Natural UF6",			false,	new ItemStack(ModItems.nugget_u238, 1)),
 		LEUF6 	(300,	200,	"MEUF6",	"Low Enriched UF6",		false,	new ItemStack(ModItems.nugget_u238, 1), new ItemStack(ModItems.fluorite, 1)),
@@ -69,39 +71,30 @@ public class GasCentrifugeRecipes {
 	public static List<ItemStack> getGasCentOutputs(FluidType fluid) {
 		List<ItemStack> outputs = new ArrayList(4);
 		
-		switch(fluid) {
+		if(fluid == Fluids.UF6) {
-		case UF6:
 			outputs.add(new ItemStack(ModItems.nugget_u238, 11));
 			outputs.add(new ItemStack(ModItems.nugget_u235, 1)); 
 			outputs.add(new ItemStack(ModItems.fluorite, 4));
-			return outputs;
+		} else if(fluid == Fluids.PUF6) {
-		case PUF6:
 			outputs.add(new ItemStack(ModItems.nugget_pu238, 3));
 			outputs.add(new ItemStack(ModItems.nugget_pu_mix, 6));
 			outputs.add(new ItemStack(ModItems.fluorite, 3));
-			return outputs;
-		default:
-			return null;
 		}
+		return outputs;
 	}
 	
 	public static int getQuantityRequired(FluidType fluid) {
-		switch(fluid) {
+		if(fluid == Fluids.UF6) return 1200;
-		case UF6:
+		if(fluid == Fluids.PUF6)return 900;
-			return 1200;
-		case PUF6:
-			return 900;
-		default:
 		return 0;
 	}
-	}
 	
 	public static Map<Object, Object[]> getGasCentrifugeRecipes() {
 		Map<Object, Object[]> recipes = new HashMap<Object, Object[]>();
 
 		for(int i = 0; i < FluidType.values().length; i++) {
-			if(getGasCentOutputs(FluidType.getEnum(i)) != null) {
+			if(getGasCentOutputs(Fluids.fromID(i)) != null) {
-				List<ItemStack> out = getGasCentOutputs(FluidType.getEnum(i));
+				List<ItemStack> out = getGasCentOutputs(Fluids.fromID(i));
 				ItemStack[] outputs = new ItemStack[4];
 				
 				for(int j = 0; j < out.size(); j++) {
@@ -112,7 +105,7 @@ public class GasCentrifugeRecipes {
 						outputs[j] = new ItemStack(ModItems.nothing);
 				
 				ItemStack input = new ItemStack(ModItems.fluid_icon, 1, i);
-				ItemFluidIcon.addQuantity(input, getQuantityRequired(FluidType.getEnum(i)));
+				ItemFluidIcon.addQuantity(input, getQuantityRequired(Fluids.fromID(i)));
 				
 				recipes.put(input, outputs);
 			}

src/main/java/com/hbm/inventory/recipes/MachineRecipes.java

@@ -8,11 +8,13 @@ import java.util.List;
 import java.util.Map;
 import com.hbm.blocks.ModBlocks;
 import com.hbm.config.GeneralConfig;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.Spaghetti;
 import com.hbm.inventory.FluidContainer;
 import com.hbm.inventory.FluidContainerRegistry;
 import com.hbm.inventory.FluidStack;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemChemistryTemplate;
 import com.hbm.items.machine.ItemFluidIcon;
@@ -154,29 +156,23 @@ public class MachineRecipes {
 	}
 	
 	//return: FluidType, amount produced, amount required, heat required (°C * 100)
-	@SuppressWarnings("incomplete-switch")
 	public static Object[] getBoilerOutput(FluidType type) {
 		
-		switch(type) {
+		if(type == Fluids.WATER) return new Object[] { Fluids.STEAM, 500, 5, 10000 };
-		case WATER: return new Object[] { FluidType.STEAM, 500, 5, 10000 };
+		if(type == Fluids.STEAM) return new Object[] { Fluids.HOTSTEAM, 5, 50, 30000 };
-		case STEAM: return new Object[] { FluidType.HOTSTEAM, 5, 50, 30000 };
+		if(type == Fluids.HOTSTEAM) return new Object[] { Fluids.SUPERHOTSTEAM, 5, 50, 45000 };
-		case HOTSTEAM: return new Object[] { FluidType.SUPERHOTSTEAM, 5, 50, 45000 };
+		if(type == Fluids.OIL) return new Object[] { Fluids.HOTOIL, 5, 5, 35000 };
-		case OIL: return new Object[] { FluidType.HOTOIL, 5, 5, 35000 };
-		}
 		
 		return null;
 	}
 	
 	//return: FluidType, amount produced, amount required, HE produced
-	@SuppressWarnings("incomplete-switch")
 	public static Object[] getTurbineOutput(FluidType type) {
 		
-		switch(type) {
+		if(type == Fluids.STEAM) return new Object[] { Fluids.SPENTSTEAM, 5, 500, 50 };
-		case STEAM: return new Object[] { FluidType.SPENTSTEAM, 5, 500, 50 };
+		if(type == Fluids.HOTSTEAM) return new Object[] { Fluids.STEAM, 50, 5, 100 };
-		case HOTSTEAM: return new Object[] { FluidType.STEAM, 50, 5, 100 };
+		if(type == Fluids.SUPERHOTSTEAM) return new Object[] { Fluids.HOTSTEAM, 50, 5, 150 };
-		case SUPERHOTSTEAM: return new Object[] { FluidType.HOTSTEAM, 50, 5, 150 };
+		if(type == Fluids.ULTRAHOTSTEAM) return new Object[] { Fluids.SUPERHOTSTEAM, 50, 5, 250 };
-		case ULTRAHOTSTEAM: return new Object[] { FluidType.SUPERHOTSTEAM, 50, 5, 250 };
-		}
 		
 		return null;
 	}
@@ -1137,7 +1133,7 @@ public class MachineRecipes {
         	FluidStack[] fluidIn = MachineRecipes.getFluidInputFromTempate(inputs[6]);
         	for(int j = 0; j < fluidIn.length; j++)
         		if(fluidIn[j] != null)
-        			inputs[j] = ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, Arrays.asList(FluidType.values()).indexOf(fluidIn[j].type)), fluidIn[j].fill);
+        			inputs[j] = ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, Arrays.asList(FluidTypeTheOldOne.values()).indexOf(fluidIn[j].type)), fluidIn[j].fill);
         	
         	ItemStack[] listOut = MachineRecipes.getChemOutputFromTempate(inputs[6]);
         	for(int j = 0; j < listOut.length; j++)
@@ -1147,7 +1143,7 @@ public class MachineRecipes {
         	FluidStack[] fluidOut = MachineRecipes.getFluidOutputFromTempate(inputs[6]);
         	for(int j = 0; j < fluidOut.length; j++)
         		if(fluidOut[j] != null)
-        			outputs[j] = ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, Arrays.asList(FluidType.values()).indexOf(fluidOut[j].type)), fluidOut[j].fill);
+        			outputs[j] = ItemFluidIcon.addQuantity(new ItemStack(ModItems.fluid_icon, 1, Arrays.asList(FluidTypeTheOldOne.values()).indexOf(fluidOut[j].type)), fluidOut[j].fill);
         	
         	for(int j = 0; j < inputs.length; j++)
         		if(inputs[j] == null)
@@ -1167,8 +1163,8 @@ public class MachineRecipes {
 
 		Map<Object, Object> recipes = new HashMap<Object, Object>();
 		
-		for(int i = 0; i < FluidType.values().length; i++) {
+		for(int i = 0; i < FluidTypeTheOldOne.values().length; i++) {
-			Object[] outs = getBoilerOutput(FluidType.getEnum(i));
+			Object[] outs = getBoilerOutput(FluidTypeTheOldOne.getEnum(i));
 			
 			if(outs != null) {
 
@@ -1176,7 +1172,7 @@ public class MachineRecipes {
 				in.stackTagCompound = new NBTTagCompound();
 				in.stackTagCompound.setInteger("fill", (Integer) outs[2]);
 				
-				ItemStack out = new ItemStack(ModItems.fluid_icon, 1, ((FluidType)outs[0]).getID());
+				ItemStack out = new ItemStack(ModItems.fluid_icon, 1, ((FluidTypeTheOldOne)outs[0]).getID());
 				out.stackTagCompound = new NBTTagCompound();
 				out.stackTagCompound.setInteger("fill", (Integer) outs[1]);
 				
@@ -1386,248 +1382,248 @@ public class MachineRecipes {
 		
 		switch(ItemChemistryTemplate.EnumChemistryTemplate.getEnum(stack.getItemDamage())) {
         case FP_HEAVYOIL:
-			input[0] = new FluidStack(1000, FluidType.HEAVYOIL);
+			input[0] = new FluidStack(1000, FluidTypeTheOldOne.HEAVYOIL);
 			break;
         case FP_SMEAR:
-			input[0] = new FluidStack(1000, FluidType.SMEAR);
+			input[0] = new FluidStack(1000, FluidTypeTheOldOne.SMEAR);
 			break;
         case FP_NAPHTHA:
-			input[0] = new FluidStack(1000, FluidType.NAPHTHA);
+			input[0] = new FluidStack(1000, FluidTypeTheOldOne.NAPHTHA);
 			break;
         case FP_LIGHTOIL:
-			input[0] = new FluidStack(1000, FluidType.LIGHTOIL);
+			input[0] = new FluidStack(1000, FluidTypeTheOldOne.LIGHTOIL);
 			break;
         case FR_REOIL:
-			input[0] = new FluidStack(1000, FluidType.SMEAR);
+			input[0] = new FluidStack(1000, FluidTypeTheOldOne.SMEAR);
 			break;
         case FR_PETROIL:
-			input[0] = new FluidStack(800, FluidType.RECLAIMED);
+			input[0] = new FluidStack(800, FluidTypeTheOldOne.RECLAIMED);
-			input[1] = new FluidStack(200, FluidType.LUBRICANT);
+			input[1] = new FluidStack(200, FluidTypeTheOldOne.LUBRICANT);
 			break;
         case FC_BITUMEN:
-			input[0] = new FluidStack(1200, FluidType.BITUMEN);
+			input[0] = new FluidStack(1200, FluidTypeTheOldOne.BITUMEN);
-			input[1] = new FluidStack(2400, FluidType.STEAM);
+			input[1] = new FluidStack(2400, FluidTypeTheOldOne.STEAM);
 			break;
         case FC_I_NAPHTHA:
-			input[0] = new FluidStack(1400, FluidType.SMEAR);
+			input[0] = new FluidStack(1400, FluidTypeTheOldOne.SMEAR);
-			input[1] = new FluidStack(800, FluidType.WATER);
+			input[1] = new FluidStack(800, FluidTypeTheOldOne.WATER);
 			break;
         case FC_GAS_PETROLEUM:
-			input[0] = new FluidStack(1800, FluidType.GAS);
+			input[0] = new FluidStack(1800, FluidTypeTheOldOne.GAS);
-			input[1] = new FluidStack(1200, FluidType.WATER);
+			input[1] = new FluidStack(1200, FluidTypeTheOldOne.WATER);
 			break;
         case FC_DIESEL_KEROSENE:
-			input[0] = new FluidStack(1200, FluidType.DIESEL);
+			input[0] = new FluidStack(1200, FluidTypeTheOldOne.DIESEL);
-			input[1] = new FluidStack(2000, FluidType.STEAM);
+			input[1] = new FluidStack(2000, FluidTypeTheOldOne.STEAM);
 			break;
         case FC_KEROSENE_PETROLEUM:
-			input[0] = new FluidStack(1400, FluidType.KEROSENE);
+			input[0] = new FluidStack(1400, FluidTypeTheOldOne.KEROSENE);
-			input[1] = new FluidStack(2000, FluidType.STEAM);
+			input[1] = new FluidStack(2000, FluidTypeTheOldOne.STEAM);
 			break;
         case CC_I:
-			input[0] = new FluidStack(1800, FluidType.WATER);
+			input[0] = new FluidStack(1800, FluidTypeTheOldOne.WATER);
 			break;
         case CC_OIL:
-			input[0] = new FluidStack(1400, FluidType.STEAM);
+			input[0] = new FluidStack(1400, FluidTypeTheOldOne.STEAM);
 			break;
         case CC_HEATING:
-			input[0] = new FluidStack(2000, FluidType.STEAM);
+			input[0] = new FluidStack(2000, FluidTypeTheOldOne.STEAM);
 			break;
         case CC_HEAVY:
-			input[0] = new FluidStack(1400, FluidType.WATER);
+			input[0] = new FluidStack(1400, FluidTypeTheOldOne.WATER);
 			break;
         case CC_NAPHTHA:
-			input[0] = new FluidStack(2400, FluidType.STEAM);
+			input[0] = new FluidStack(2400, FluidTypeTheOldOne.STEAM);
 			break;
         case ASPHALT:
-			input[0] = new FluidStack(1000, FluidType.BITUMEN);
+			input[0] = new FluidStack(1000, FluidTypeTheOldOne.BITUMEN);
 			break;
         case CONCRETE:
-			input[0] = new FluidStack(2000, FluidType.WATER);
+			input[0] = new FluidStack(2000, FluidTypeTheOldOne.WATER);
 			break;
         case CONCRETE_ASBESTOS:
-			input[0] = new FluidStack(2000, FluidType.WATER);
+			input[0] = new FluidStack(2000, FluidTypeTheOldOne.WATER);
 			break;
         case COOLANT:
-			input[0] = new FluidStack(1800, FluidType.WATER);
+			input[0] = new FluidStack(1800, FluidTypeTheOldOne.WATER);
 			break;
         case CRYOGEL:
-			input[0] = new FluidStack(1800, FluidType.COOLANT);
+			input[0] = new FluidStack(1800, FluidTypeTheOldOne.COOLANT);
 			break;
         case DESH:
         	if(GeneralConfig.enableBabyMode) {
-				input[0] = new FluidStack(200, FluidType.LIGHTOIL);
+				input[0] = new FluidStack(200, FluidTypeTheOldOne.LIGHTOIL);
         	} else {
-				input[0] = new FluidStack(200, FluidType.MERCURY);
+				input[0] = new FluidStack(200, FluidTypeTheOldOne.MERCURY);
-				input[1] = new FluidStack(200, FluidType.LIGHTOIL);
+				input[1] = new FluidStack(200, FluidTypeTheOldOne.LIGHTOIL);
         	}
 			break;
         case PEROXIDE:
-			input[0] = new FluidStack(1000, FluidType.WATER);
+			input[0] = new FluidStack(1000, FluidTypeTheOldOne.WATER);
         	break;
         case CIRCUIT_4:
-			input[0] = new FluidStack(400, FluidType.ACID);
+			input[0] = new FluidStack(400, FluidTypeTheOldOne.ACID);
-			input[1] = new FluidStack(200, FluidType.PETROLEUM);
+			input[1] = new FluidStack(200, FluidTypeTheOldOne.PETROLEUM);
         	break;
         case CIRCUIT_5:
-			input[0] = new FluidStack(800, FluidType.ACID);
+			input[0] = new FluidStack(800, FluidTypeTheOldOne.ACID);
-			input[1] = new FluidStack(200, FluidType.MERCURY);
+			input[1] = new FluidStack(200, FluidTypeTheOldOne.MERCURY);
         	break;
         case SF_OIL:
-			input[0] = new FluidStack(350, FluidType.OIL);
+			input[0] = new FluidStack(350, FluidTypeTheOldOne.OIL);
         	break;
         case SF_HEAVYOIL:
-			input[0] = new FluidStack(250, FluidType.HEAVYOIL);
+			input[0] = new FluidStack(250, FluidTypeTheOldOne.HEAVYOIL);
         	break;
         case SF_SMEAR:
-			input[0] = new FluidStack(200, FluidType.SMEAR);
+			input[0] = new FluidStack(200, FluidTypeTheOldOne.SMEAR);
         	break;
         case SF_HEATINGOIL:
-			input[0] = new FluidStack(100, FluidType.HEATINGOIL);
+			input[0] = new FluidStack(100, FluidTypeTheOldOne.HEATINGOIL);
         	break;
         case SF_RECLAIMED:
-			input[0] = new FluidStack(200, FluidType.RECLAIMED);
+			input[0] = new FluidStack(200, FluidTypeTheOldOne.RECLAIMED);
         	break;
         case SF_PETROIL:
-			input[0] = new FluidStack(250, FluidType.PETROIL);
+			input[0] = new FluidStack(250, FluidTypeTheOldOne.PETROIL);
         	break;
     	case SF_LUBRICANT:
-			input[0] = new FluidStack(250, FluidType.LUBRICANT);
+			input[0] = new FluidStack(250, FluidTypeTheOldOne.LUBRICANT);
         	break;
     	case SF_NAPHTHA:
-			input[0] = new FluidStack(300, FluidType.NAPHTHA);
+			input[0] = new FluidStack(300, FluidTypeTheOldOne.NAPHTHA);
         	break;
     	case SF_DIESEL:
-			input[0] = new FluidStack(400, FluidType.DIESEL);
+			input[0] = new FluidStack(400, FluidTypeTheOldOne.DIESEL);
         	break;
     	case SF_LIGHTOIL:
-			input[0] = new FluidStack(450, FluidType.LIGHTOIL);
+			input[0] = new FluidStack(450, FluidTypeTheOldOne.LIGHTOIL);
         	break;
     	case SF_KEROSENE:
-			input[0] = new FluidStack(550, FluidType.KEROSENE);
+			input[0] = new FluidStack(550, FluidTypeTheOldOne.KEROSENE);
         	break;
     	case SF_GAS:
-			input[0] = new FluidStack(750, FluidType.GAS);
+			input[0] = new FluidStack(750, FluidTypeTheOldOne.GAS);
         	break;
     	case SF_PETROLEUM:
-			input[0] = new FluidStack(600, FluidType.PETROLEUM);
+			input[0] = new FluidStack(600, FluidTypeTheOldOne.PETROLEUM);
         	break;
     	case SF_BIOGAS:
-			input[0] = new FluidStack(3500, FluidType.BIOGAS);
+			input[0] = new FluidStack(3500, FluidTypeTheOldOne.BIOGAS);
         	break;
     	case SF_BIOFUEL:
-			input[0] = new FluidStack(1500, FluidType.BIOFUEL);
+			input[0] = new FluidStack(1500, FluidTypeTheOldOne.BIOFUEL);
         	break;
         case POLYMER:
-			input[0] = new FluidStack(600, FluidType.PETROLEUM);
+			input[0] = new FluidStack(600, FluidTypeTheOldOne.PETROLEUM);
         	break;
         case DEUTERIUM:
-			input[0] = new FluidStack(4000, FluidType.WATER);
+			input[0] = new FluidStack(4000, FluidTypeTheOldOne.WATER);
         	break;
         case STEAM:
-			input[0] = new FluidStack(1000, FluidType.WATER);
+			input[0] = new FluidStack(1000, FluidTypeTheOldOne.WATER);
         	break;
         case LPG:
-			input[0] = new FluidStack(2000, FluidType.PETROLEUM);
+			input[0] = new FluidStack(2000, FluidTypeTheOldOne.PETROLEUM);
         	break;
         case BP_BIOFUEL:
-			input[0] = new FluidStack(2000, FluidType.BIOGAS);
+			input[0] = new FluidStack(2000, FluidTypeTheOldOne.BIOGAS);
         	break;
         case YELLOWCAKE:
-			input[0] = new FluidStack(500, FluidType.ACID);
+			input[0] = new FluidStack(500, FluidTypeTheOldOne.ACID);
         	break;
         case UF6:
-			input[0] = new FluidStack(1000, FluidType.WATER);
+			input[0] = new FluidStack(1000, FluidTypeTheOldOne.WATER);
         	break;
         case PUF6:
-			input[0] = new FluidStack(1000, FluidType.WATER);
+			input[0] = new FluidStack(1000, FluidTypeTheOldOne.WATER);
         	break;
         case SAS3:
-			input[0] = new FluidStack(2000, FluidType.ACID);
+			input[0] = new FluidStack(2000, FluidTypeTheOldOne.ACID);
         	break;
         case NITAN:
-			input[0] = new FluidStack(600, FluidType.KEROSENE);
+			input[0] = new FluidStack(600, FluidTypeTheOldOne.KEROSENE);
-			input[1] = new FluidStack(200, FluidType.MERCURY);
+			input[1] = new FluidStack(200, FluidTypeTheOldOne.MERCURY);
         	break;
         case OIL_SAND:
-			input[0] = new FluidStack(400, FluidType.BITUMEN);
+			input[0] = new FluidStack(400, FluidTypeTheOldOne.BITUMEN);
         	break;
         case CORDITE:
-			input[0] = new FluidStack(200, FluidType.HEATINGOIL);
+			input[0] = new FluidStack(200, FluidTypeTheOldOne.HEATINGOIL);
         	break;
         case KEVLAR:
-			input[0] = new FluidStack(100, FluidType.PETROLEUM);
+			input[0] = new FluidStack(100, FluidTypeTheOldOne.PETROLEUM);
         	break;
         case SOLID_FUEL:
-			input[0] = new FluidStack(200, FluidType.PETROLEUM);
+			input[0] = new FluidStack(200, FluidTypeTheOldOne.PETROLEUM);
         	break;
     	case ELECTROLYSIS:
-			input[0] = new FluidStack(8000, FluidType.WATER);
+			input[0] = new FluidStack(8000, FluidTypeTheOldOne.WATER);
         	break;
     	case XENON:
-			input[0] = new FluidStack(0, FluidType.NONE);
+			input[0] = new FluidStack(0, FluidTypeTheOldOne.NONE);
         	break;
     	case XENON_OXY:
-			input[0] = new FluidStack(250, FluidType.OXYGEN);
+			input[0] = new FluidStack(250, FluidTypeTheOldOne.OXYGEN);
         	break;
     	case SATURN:
-			input[0] = new FluidStack(100, FluidType.ACID);
+			input[0] = new FluidStack(100, FluidTypeTheOldOne.ACID);
-			input[1] = new FluidStack(50, FluidType.MERCURY);
+			input[1] = new FluidStack(50, FluidTypeTheOldOne.MERCURY);
         	break;
     	case BALEFIRE:
-			input[0] = new FluidStack(6000, FluidType.KEROSENE);
+			input[0] = new FluidStack(6000, FluidTypeTheOldOne.KEROSENE);
         	break;
     	case SCHRABIDIC:
-			input[0] = new FluidStack(8000, FluidType.SAS3);
+			input[0] = new FluidStack(8000, FluidTypeTheOldOne.SAS3);
-			input[1] = new FluidStack(6000, FluidType.ACID);
+			input[1] = new FluidStack(6000, FluidTypeTheOldOne.ACID);
         	break;
     	case SCHRABIDATE:
-			input[0] = new FluidStack(250, FluidType.SCHRABIDIC);
+			input[0] = new FluidStack(250, FluidTypeTheOldOne.SCHRABIDIC);
         	break;
     	case COLTAN_CLEANING:
-			input[0] = new FluidStack(250, FluidType.ACID);
+			input[0] = new FluidStack(250, FluidTypeTheOldOne.ACID);
-			input[1] = new FluidStack(500, FluidType.HYDROGEN);
+			input[1] = new FluidStack(500, FluidTypeTheOldOne.HYDROGEN);
         	break;
     	case COLTAN_PAIN:
-			input[0] = new FluidStack(1000, FluidType.GAS);
+			input[0] = new FluidStack(1000, FluidTypeTheOldOne.GAS);
-			input[1] = new FluidStack(500, FluidType.OXYGEN);
+			input[1] = new FluidStack(500, FluidTypeTheOldOne.OXYGEN);
         	break;
     	case COLTAN_CRYSTAL:
-			input[0] = new FluidStack(1000, FluidType.PAIN);
+			input[0] = new FluidStack(1000, FluidTypeTheOldOne.PAIN);
-			input[1] = new FluidStack(500, FluidType.ACID);
+			input[1] = new FluidStack(500, FluidTypeTheOldOne.ACID);
         	break;
 		case VIT_LIQUID:
-			input[0] = new FluidStack(1000, FluidType.WASTEFLUID);
+			input[0] = new FluidStack(1000, FluidTypeTheOldOne.WASTEFLUID);
 			break;
 		case VIT_GAS:
-			input[0] = new FluidStack(1000, FluidType.WASTEGAS);
+			input[0] = new FluidStack(1000, FluidTypeTheOldOne.WASTEGAS);
 			break;
 		case TEL:
-			input[0] = new FluidStack(100, FluidType.PETROLEUM);
+			input[0] = new FluidStack(100, FluidTypeTheOldOne.PETROLEUM);
-			input[1] = new FluidStack(1000, FluidType.STEAM);
+			input[1] = new FluidStack(1000, FluidTypeTheOldOne.STEAM);
 			break;
 		case GASOLINE:
-			input[0] = new FluidStack(10000, FluidType.PETROIL);
+			input[0] = new FluidStack(10000, FluidTypeTheOldOne.PETROIL);
 			break;
 		case FRACKSOL:
-			input[0] = new FluidStack(100, FluidType.PETROLEUM);
+			input[0] = new FluidStack(100, FluidTypeTheOldOne.PETROLEUM);
-			input[1] = new FluidStack(1000, FluidType.WATER);
+			input[1] = new FluidStack(1000, FluidTypeTheOldOne.WATER);
 			break;
 		case OSMIRIDIUM_DEATH:
-			input[0] = new FluidStack(1000, FluidType.ACID);
+			input[0] = new FluidStack(1000, FluidTypeTheOldOne.ACID);
         	break;
 		case METH:
-			input[0] = new FluidStack(400, FluidType.LUBRICANT);
+			input[0] = new FluidStack(400, FluidTypeTheOldOne.LUBRICANT);
-			input[1] = new FluidStack(400, FluidType.ACID);
+			input[1] = new FluidStack(400, FluidTypeTheOldOne.ACID);
 			break;
 		case CO2:
-			input[0] = new FluidStack(1000, FluidType.GAS);
+			input[0] = new FluidStack(1000, FluidTypeTheOldOne.GAS);
 			break;
 		case HEAVY_ELECTROLYSIS:
-			input[0] = new FluidStack(8000, FluidType.HEAVYWATER);
+			input[0] = new FluidStack(8000, FluidTypeTheOldOne.HEAVYWATER);
 			break;
 		case DUCRETE:
-			input[0] = new FluidStack(2000, FluidType.WATER);
+			input[0] = new FluidStack(2000, FluidTypeTheOldOne.WATER);
 		default:
 			break;
 		}
@@ -1813,152 +1809,152 @@ public class MachineRecipes {
 		
 		switch(ItemChemistryTemplate.EnumChemistryTemplate.getEnum(stack.getItemDamage())) {
         case FP_HEAVYOIL:
-			output[0] = new FluidStack(RefineryRecipes.heavy_frac_bitu * 10, FluidType.BITUMEN);
+			output[0] = new FluidStack(RefineryRecipes.heavy_frac_bitu * 10, FluidTypeTheOldOne.BITUMEN);
-			output[1] = new FluidStack(RefineryRecipes.heavy_frac_smear * 10, FluidType.SMEAR);
+			output[1] = new FluidStack(RefineryRecipes.heavy_frac_smear * 10, FluidTypeTheOldOne.SMEAR);
 			break;
         case FP_SMEAR:
-			output[0] = new FluidStack(RefineryRecipes.smear_frac_heat * 10, FluidType.HEATINGOIL);
+			output[0] = new FluidStack(RefineryRecipes.smear_frac_heat * 10, FluidTypeTheOldOne.HEATINGOIL);
-			output[1] = new FluidStack(RefineryRecipes.smear_frac_lube * 10, FluidType.LUBRICANT);
+			output[1] = new FluidStack(RefineryRecipes.smear_frac_lube * 10, FluidTypeTheOldOne.LUBRICANT);
 			break;
         case FP_NAPHTHA:
-			output[0] = new FluidStack(RefineryRecipes.napht_frac_heat * 10, FluidType.HEATINGOIL);
+			output[0] = new FluidStack(RefineryRecipes.napht_frac_heat * 10, FluidTypeTheOldOne.HEATINGOIL);
-			output[1] = new FluidStack(RefineryRecipes.napht_frac_diesel * 10, FluidType.DIESEL);
+			output[1] = new FluidStack(RefineryRecipes.napht_frac_diesel * 10, FluidTypeTheOldOne.DIESEL);
 			break;
         case FP_LIGHTOIL:
-			output[0] = new FluidStack(RefineryRecipes.light_frac_diesel * 10, FluidType.DIESEL);
+			output[0] = new FluidStack(RefineryRecipes.light_frac_diesel * 10, FluidTypeTheOldOne.DIESEL);
-			output[1] = new FluidStack(RefineryRecipes.light_frac_kero * 10, FluidType.KEROSENE);
+			output[1] = new FluidStack(RefineryRecipes.light_frac_kero * 10, FluidTypeTheOldOne.KEROSENE);
 			break;
         case FR_REOIL:
-			output[0] = new FluidStack(800, FluidType.RECLAIMED);
+			output[0] = new FluidStack(800, FluidTypeTheOldOne.RECLAIMED);
 			break;
         case FR_PETROIL:
-			output[0] = new FluidStack(1000, FluidType.PETROIL);
+			output[0] = new FluidStack(1000, FluidTypeTheOldOne.PETROIL);
 			break;
         case FC_BITUMEN:
-			output[0] = new FluidStack(1000, FluidType.OIL);
+			output[0] = new FluidStack(1000, FluidTypeTheOldOne.OIL);
-			output[1] = new FluidStack(200, FluidType.PETROLEUM);
+			output[1] = new FluidStack(200, FluidTypeTheOldOne.PETROLEUM);
 			break;
         case FC_I_NAPHTHA:
-			output[0] = new FluidStack(800, FluidType.NAPHTHA);
+			output[0] = new FluidStack(800, FluidTypeTheOldOne.NAPHTHA);
 			break;
         case FC_GAS_PETROLEUM:
-			output[0] = new FluidStack(800, FluidType.PETROLEUM);
+			output[0] = new FluidStack(800, FluidTypeTheOldOne.PETROLEUM);
 			break;
         case FC_DIESEL_KEROSENE:
-			output[0] = new FluidStack(400, FluidType.KEROSENE);
+			output[0] = new FluidStack(400, FluidTypeTheOldOne.KEROSENE);
 			break;
         case FC_KEROSENE_PETROLEUM:
-			output[0] = new FluidStack(800, FluidType.PETROLEUM);
+			output[0] = new FluidStack(800, FluidTypeTheOldOne.PETROLEUM);
 			break;
         case CC_OIL:
-			output[0] = new FluidStack(2000, FluidType.OIL);
+			output[0] = new FluidStack(2000, FluidTypeTheOldOne.OIL);
 			break;
         case CC_I:
-			output[0] = new FluidStack(1600, FluidType.SMEAR);
+			output[0] = new FluidStack(1600, FluidTypeTheOldOne.SMEAR);
 			break;
         case CC_HEATING:
-			output[0] = new FluidStack(1800, FluidType.HEATINGOIL);
+			output[0] = new FluidStack(1800, FluidTypeTheOldOne.HEATINGOIL);
 			break;
         case CC_HEAVY:
-			output[0] = new FluidStack(1800, FluidType.HEAVYOIL);
+			output[0] = new FluidStack(1800, FluidTypeTheOldOne.HEAVYOIL);
 			break;
         case CC_NAPHTHA:
-			output[0] = new FluidStack(2000, FluidType.NAPHTHA);
+			output[0] = new FluidStack(2000, FluidTypeTheOldOne.NAPHTHA);
 			break;
         case COOLANT:
-			output[0] = new FluidStack(2000, FluidType.COOLANT);
+			output[0] = new FluidStack(2000, FluidTypeTheOldOne.COOLANT);
 			break;
         case CRYOGEL:
-			output[0] = new FluidStack(2000, FluidType.CRYOGEL);
+			output[0] = new FluidStack(2000, FluidTypeTheOldOne.CRYOGEL);
 			break;
         case PEROXIDE:
-			output[0] = new FluidStack(800, FluidType.ACID);
+			output[0] = new FluidStack(800, FluidTypeTheOldOne.ACID);
 			break;
         case DEUTERIUM:
-			output[0] = new FluidStack(500, FluidType.DEUTERIUM);
+			output[0] = new FluidStack(500, FluidTypeTheOldOne.DEUTERIUM);
         	break;
         case STEAM:
-			output[0] = new FluidStack(1000, FluidType.STEAM);
+			output[0] = new FluidStack(1000, FluidTypeTheOldOne.STEAM);
         	break;
         case BP_BIOGAS:
-			output[0] = new FluidStack(4000, FluidType.BIOGAS);
+			output[0] = new FluidStack(4000, FluidTypeTheOldOne.BIOGAS);
         	break;
         case BP_BIOFUEL:
-			output[0] = new FluidStack(1000, FluidType.BIOFUEL);
+			output[0] = new FluidStack(1000, FluidTypeTheOldOne.BIOFUEL);
         	break;
         case LPG:
-			output[0] = new FluidStack(1000, FluidType.LPG);
+			output[0] = new FluidStack(1000, FluidTypeTheOldOne.LPG);
         	break;
         case UF6:
-			output[0] = new FluidStack(1200, FluidType.UF6);
+			output[0] = new FluidStack(1200, FluidTypeTheOldOne.UF6);
         	break;
         case PUF6:
-			output[0] = new FluidStack(900, FluidType.PUF6);
+			output[0] = new FluidStack(900, FluidTypeTheOldOne.PUF6);
         	break;
         case SAS3:
-			output[0] = new FluidStack(1000, FluidType.SAS3);
+			output[0] = new FluidStack(1000, FluidTypeTheOldOne.SAS3);
         	break;
         case NITAN:
-			output[0] = new FluidStack(1000, FluidType.NITAN);
+			output[0] = new FluidStack(1000, FluidTypeTheOldOne.NITAN);
         	break;
         case OIL_SAND:
-			output[0] = new FluidStack(1000, FluidType.BITUMEN);
+			output[0] = new FluidStack(1000, FluidTypeTheOldOne.BITUMEN);
         	break;
         case DYN_SCHRAB:
-			output[0] = new FluidStack(50, FluidType.WATZ);
+			output[0] = new FluidStack(50, FluidTypeTheOldOne.WATZ);
         	break;
         case DYN_EUPH:
-			output[0] = new FluidStack(100, FluidType.WATZ);
+			output[0] = new FluidStack(100, FluidTypeTheOldOne.WATZ);
         	break;
         case DYN_DNT:
-			output[0] = new FluidStack(150, FluidType.WATZ);
+			output[0] = new FluidStack(150, FluidTypeTheOldOne.WATZ);
         	break;
         case ELECTROLYSIS:
-			output[0] = new FluidStack(400, FluidType.HYDROGEN);
+			output[0] = new FluidStack(400, FluidTypeTheOldOne.HYDROGEN);
-			output[1] = new FluidStack(400, FluidType.OXYGEN);
+			output[1] = new FluidStack(400, FluidTypeTheOldOne.OXYGEN);
         	break;
         case XENON:
-			output[0] = new FluidStack(50, FluidType.XENON);
+			output[0] = new FluidStack(50, FluidTypeTheOldOne.XENON);
         	break;
         case XENON_OXY:
-			output[0] = new FluidStack(50, FluidType.XENON);
+			output[0] = new FluidStack(50, FluidTypeTheOldOne.XENON);
         	break;
         case BALEFIRE:
-			output[0] = new FluidStack(8000, FluidType.BALEFIRE);
+			output[0] = new FluidStack(8000, FluidTypeTheOldOne.BALEFIRE);
         	break;
         case SCHRABIDIC:
-			output[0] = new FluidStack(16000, FluidType.SCHRABIDIC);
+			output[0] = new FluidStack(16000, FluidTypeTheOldOne.SCHRABIDIC);
         	break;
         case COLTAN_CLEANING:
-			output[0] = new FluidStack(500, FluidType.WATER);
+			output[0] = new FluidStack(500, FluidTypeTheOldOne.WATER);
         	break;
         case COLTAN_PAIN:
-			output[0] = new FluidStack(1000, FluidType.PAIN);
+			output[0] = new FluidStack(1000, FluidTypeTheOldOne.PAIN);
         	break;
         case COLTAN_CRYSTAL:
-			output[0] = new FluidStack(250, FluidType.WATER);
+			output[0] = new FluidStack(250, FluidTypeTheOldOne.WATER);
         	break;
         case GASOLINE:
-			output[0] = new FluidStack(12000, FluidType.GASOLINE);
+			output[0] = new FluidStack(12000, FluidTypeTheOldOne.GASOLINE);
         	break;
         case FRACKSOL:
-			output[0] = new FluidStack(1000, FluidType.FRACKSOL);
+			output[0] = new FluidStack(1000, FluidTypeTheOldOne.FRACKSOL);
         	break;
         case HELIUM3:
-			output[0] = new FluidStack(1000, FluidType.HELIUM3);
+			output[0] = new FluidStack(1000, FluidTypeTheOldOne.HELIUM3);
         	break;
         case OSMIRIDIUM_DEATH:
-			output[0] = new FluidStack(1000, FluidType.DEATH);
+			output[0] = new FluidStack(1000, FluidTypeTheOldOne.DEATH);
         	break;
         case ETHANOL:
-			output[0] = new FluidStack(1000, FluidType.ETHANOL);
+			output[0] = new FluidStack(1000, FluidTypeTheOldOne.ETHANOL);
         	break;
         case CO2:
-        	output[0] = new FluidStack(1000, FluidType.CARBONDIOXIDE);
+        	output[0] = new FluidStack(1000, FluidTypeTheOldOne.CARBONDIOXIDE);
         	break;
         case HEAVY_ELECTROLYSIS:
-        	output[0] = new FluidStack(400, FluidType.DEUTERIUM);
+        	output[0] = new FluidStack(400, FluidTypeTheOldOne.DEUTERIUM);
-			output[1] = new FluidStack(400, FluidType.OXYGEN);
+			output[1] = new FluidStack(400, FluidTypeTheOldOne.OXYGEN);
         	break;
 		default:
 			break;
@@ -1972,7 +1968,7 @@ public class MachineRecipes {
 		
 		for(FluidContainer con : FluidContainerRegistry.allContainers) {
 			if(con != null) {
-				ItemStack fluid = new ItemStack(ModItems.fluid_icon, 1, Arrays.asList(FluidType.values()).indexOf(con.type));
+				ItemStack fluid = new ItemStack(ModItems.fluid_icon, 1, Arrays.asList(FluidTypeTheOldOne.values()).indexOf(con.type));
 				fluid.stackTagCompound = new NBTTagCompound();
 				fluid.stackTagCompound.setInteger("fill", con.content);
 				map.put(fluid, con.fullContainer);

src/main/java/com/hbm/inventory/recipes/RefineryRecipes.java

@@ -3,7 +3,9 @@ package com.hbm.inventory.recipes;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemFluidIcon;
 import com.hbm.util.Tuple.Quartet;
@@ -45,30 +47,30 @@ public class RefineryRecipes {
 
 		Map<Object, Object[]> recipes = new HashMap<Object, Object[]>();
 		
-		recipes.put(ItemFluidIcon.make(FluidType.HOTOIL, 1000),
+		recipes.put(ItemFluidIcon.make(Fluids.HOTOIL, 1000),
 				new ItemStack[] {
-						ItemFluidIcon.make(FluidType.HEAVYOIL, oil_frac_heavy * 10),
+						ItemFluidIcon.make(Fluids.HEAVYOIL, oil_frac_heavy * 10),
-						ItemFluidIcon.make(FluidType.NAPHTHA, oil_frac_naph * 10),
+						ItemFluidIcon.make(Fluids.NAPHTHA, oil_frac_naph * 10),
-						ItemFluidIcon.make(FluidType.LIGHTOIL, oil_frac_light * 10),
+						ItemFluidIcon.make(Fluids.LIGHTOIL, oil_frac_light * 10),
-						ItemFluidIcon.make(FluidType.PETROLEUM, oil_frac_petro * 10),
+						ItemFluidIcon.make(Fluids.PETROLEUM, oil_frac_petro * 10),
 						new ItemStack(ModItems.sulfur, 1) });
 		
 		return recipes;
 	}
 	
 	public static void registerFractions() {
-		fractions.put(FluidType.HEAVYOIL,	new Quartet(FluidType.BITUMEN,		FluidType.SMEAR,		heavy_frac_bitu,	heavy_frac_smear));
+		fractions.put(FluidTypeTheOldOne.HEAVYOIL,	new Quartet(FluidTypeTheOldOne.BITUMEN,		FluidTypeTheOldOne.SMEAR,		heavy_frac_bitu,	heavy_frac_smear));
-		fractions.put(FluidType.SMEAR,		new Quartet(FluidType.HEATINGOIL,	FluidType.LUBRICANT,	smear_frac_heat,	smear_frac_lube));
+		fractions.put(FluidTypeTheOldOne.SMEAR,		new Quartet(FluidTypeTheOldOne.HEATINGOIL,	FluidTypeTheOldOne.LUBRICANT,	smear_frac_heat,	smear_frac_lube));
-		fractions.put(FluidType.NAPHTHA,	new Quartet(FluidType.HEATINGOIL,	FluidType.DIESEL,		napht_frac_heat,	napht_frac_diesel));
+		fractions.put(FluidTypeTheOldOne.NAPHTHA,	new Quartet(FluidTypeTheOldOne.HEATINGOIL,	FluidTypeTheOldOne.DIESEL,		napht_frac_heat,	napht_frac_diesel));
-		fractions.put(FluidType.LIGHTOIL,	new Quartet(FluidType.DIESEL,		FluidType.KEROSENE,		light_frac_diesel,	light_frac_kero));
+		fractions.put(FluidTypeTheOldOne.LIGHTOIL,	new Quartet(FluidTypeTheOldOne.DIESEL,		FluidTypeTheOldOne.KEROSENE,		light_frac_diesel,	light_frac_kero));
 	}
 	
 	public static void registerCracking() {
-		cracking.put(FluidType.BITUMEN,		new Quartet(FluidType.OIL,			FluidType.PETROLEUM,	bitumen_crack_oil,	bitumen_crack_petro));
+		cracking.put(FluidTypeTheOldOne.BITUMEN,		new Quartet(FluidTypeTheOldOne.OIL,			FluidTypeTheOldOne.PETROLEUM,	bitumen_crack_oil,	bitumen_crack_petro));
-		cracking.put(FluidType.SMEAR,		new Quartet(FluidType.NAPHTHA,		FluidType.PETROLEUM,	smear_crack_napht,	smear_crack_petro));
+		cracking.put(FluidTypeTheOldOne.SMEAR,		new Quartet(FluidTypeTheOldOne.NAPHTHA,		FluidTypeTheOldOne.PETROLEUM,	smear_crack_napht,	smear_crack_petro));
-		cracking.put(FluidType.GAS,			new Quartet(FluidType.PETROLEUM,	FluidType.NONE,			gas_crack_petro,	0));
+		cracking.put(FluidTypeTheOldOne.GAS,			new Quartet(FluidTypeTheOldOne.PETROLEUM,	FluidTypeTheOldOne.NONE,			gas_crack_petro,	0));
-		cracking.put(FluidType.DIESEL,		new Quartet(FluidType.KEROSENE,		FluidType.PETROLEUM,	diesel_crack_kero,	diesel_crack_petro));
+		cracking.put(FluidTypeTheOldOne.DIESEL,		new Quartet(FluidTypeTheOldOne.KEROSENE,		FluidTypeTheOldOne.PETROLEUM,	diesel_crack_kero,	diesel_crack_petro));
-		cracking.put(FluidType.KEROSENE,	new Quartet(FluidType.PETROLEUM,	FluidType.NONE,			kero_crack_petro,	0));
+		cracking.put(FluidTypeTheOldOne.KEROSENE,	new Quartet(FluidTypeTheOldOne.PETROLEUM,	FluidTypeTheOldOne.NONE,			kero_crack_petro,	0));
 	}
 	
 	public static Quartet<FluidType, FluidType, Integer, Integer> getFractions(FluidType oil) {

src/main/java/com/hbm/inventory/recipes/SILEXRecipes.java

@@ -6,7 +6,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.inventory.RecipesCommon.ComparableStack;
 import com.hbm.items.ModItems;
 import com.hbm.items.special.ItemWasteLong;
@@ -26,7 +26,7 @@ public class SILEXRecipes {
 	
 	public static void register() {
 
-		itemTranslation.put(new ComparableStack(ModItems.fluid_icon, 1, FluidType.UF6.ordinal()), new ComparableStack(ModItems.ingot_uranium));
+		itemTranslation.put(new ComparableStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.UF6.ordinal()), new ComparableStack(ModItems.ingot_uranium));
 		dictTranslation.put("dustUranium", "ingotUranium");
 		recipes.put("ingotUranium", new SILEXRecipe(900, 100)
 				.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_u235), 1))
@@ -43,7 +43,7 @@ public class SILEXRecipes {
 				.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_am242), 6))
 				);
 
-		itemTranslation.put(new ComparableStack(ModItems.fluid_icon, 1, FluidType.PUF6.ordinal()), new ComparableStack(ModItems.ingot_plutonium));
+		itemTranslation.put(new ComparableStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.PUF6.ordinal()), new ComparableStack(ModItems.ingot_plutonium));
 		dictTranslation.put("dustPlutonium", "ingotPlutonium");
 		recipes.put("ingotPlutonium", new SILEXRecipe(900, 100)
 				.addOut(new WeightedRandomObject(new ItemStack(ModItems.nugget_pu238), 3))
@@ -76,7 +76,7 @@ public class SILEXRecipes {
 				.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_cobalt), 3))
 				);
 
-		recipes.put(new ComparableStack(ModItems.fluid_icon, 1, FluidType.DEATH.ordinal()), new SILEXRecipe(1000, 1000)
+		recipes.put(new ComparableStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.DEATH.ordinal()), new SILEXRecipe(1000, 1000)
 				.addOut(new WeightedRandomObject(new ItemStack(ModItems.powder_impure_osmiridium), 1))
 				);
 		

src/main/java/com/hbm/items/ModItems.java

@@ -5,9 +5,9 @@ import com.hbm.handler.BucketHandler;
 import com.hbm.handler.ToolAbility;
 import com.hbm.handler.ToolAbility.LuckAbility;
 import com.hbm.handler.WeaponAbility;
-import com.hbm.handler.FluidTypeHandler.FluidType;
 import com.hbm.handler.guncfg.*;
 import com.hbm.interfaces.ICustomWarhead.SaltedFuel.HalfLifeType;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.items.armor.*;
 import com.hbm.items.bomb.*;
 import com.hbm.items.food.*;
@@ -5226,10 +5226,10 @@ public class ModItems {
 
 		australium_iii = new ArmorAustralium(MainRegistry.aMatAus3, 9, 1).setUnlocalizedName("australium_iii").setMaxStackSize(1).setTextureName(RefStrings.MODID + ":australium_iii");
 		
-		jetpack_boost = new JetpackBooster(FluidType.BALEFIRE, 32000).setUnlocalizedName("jetpack_boost").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_boost");
+		jetpack_boost = new JetpackBooster(Fluids.BALEFIRE, 32000).setUnlocalizedName("jetpack_boost").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_boost");
-		jetpack_break = new JetpackBreak(FluidType.KEROSENE, 12000).setUnlocalizedName("jetpack_break").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_break");
+		jetpack_break = new JetpackBreak(Fluids.KEROSENE, 12000).setUnlocalizedName("jetpack_break").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_break");
-		jetpack_fly = new JetpackRegular(FluidType.KEROSENE, 12000).setUnlocalizedName("jetpack_fly").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_fly");
+		jetpack_fly = new JetpackRegular(Fluids.KEROSENE, 12000).setUnlocalizedName("jetpack_fly").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_fly");
-		jetpack_vector = new JetpackVectorized(FluidType.KEROSENE, 16000).setUnlocalizedName("jetpack_vector").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_vector");
+		jetpack_vector = new JetpackVectorized(Fluids.KEROSENE, 16000).setUnlocalizedName("jetpack_vector").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":jetpack_vector");
 		wings_murk = new WingsMurk(MainRegistry.aMatCobalt).setUnlocalizedName("wings_murk").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wings_murk");
 		wings_limp = new WingsMurk(MainRegistry.aMatCobalt).setUnlocalizedName("wings_limp").setCreativeTab(CreativeTabs.tabCombat).setMaxStackSize(1).setTextureName(RefStrings.MODID + ":wings_limp");
 

src/main/java/com/hbm/items/armor/JetpackBase.java

@@ -3,8 +3,8 @@ package com.hbm.items.armor;
 import java.util.List;
 
 import com.hbm.handler.ArmorModHandler;
-import com.hbm.handler.FluidTypeHandler.FluidType;
 import com.hbm.interfaces.IPartiallyFillable;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.render.model.ModelJetPack;
 import com.hbm.util.ArmorUtil;
 import com.hbm.util.I18nUtil;

src/main/java/com/hbm/items/armor/JetpackBooster.java

@@ -3,7 +3,7 @@ package com.hbm.items.armor;
 import java.util.List;
 
 import com.hbm.extprop.HbmPlayerProps;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
 

src/main/java/com/hbm/items/armor/JetpackBreak.java

@@ -3,7 +3,7 @@ package com.hbm.items.armor;
 import java.util.List;
 
 import com.hbm.extprop.HbmPlayerProps;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
 

src/main/java/com/hbm/items/armor/JetpackRegular.java

@@ -3,7 +3,7 @@ package com.hbm.items.armor;
 import java.util.List;
 
 import com.hbm.extprop.HbmPlayerProps;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
 

src/main/java/com/hbm/items/armor/JetpackVectorized.java

@@ -3,7 +3,7 @@ package com.hbm.items.armor;
 import java.util.List;
 
 import com.hbm.extprop.HbmPlayerProps;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.packet.AuxParticlePacketNT;
 import com.hbm.packet.PacketDispatcher;
 

src/main/java/com/hbm/items/machine/ItemFluidDuct.java

@@ -3,7 +3,7 @@ package com.hbm.items.machine;
 import java.util.List;
 
 import com.hbm.blocks.ModBlocks;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.tileentity.conductor.TileEntityFluidDuct;
 
 import cpw.mods.fml.relauncher.Side;
@@ -32,7 +32,7 @@ public class ItemFluidDuct extends Item {
 	@SideOnly(Side.CLIENT)
     public void getSubItems(Item item, CreativeTabs tabs, List list)
     {
-        for (int i = 1; i < FluidType.values().length; ++i)
+        for (int i = 1; i < FluidTypeTheOldOne.values().length; ++i)
         {
             list.add(new ItemStack(item, 1, i));
         }
@@ -47,7 +47,7 @@ public class ItemFluidDuct extends Item {
     public String getItemStackDisplayName(ItemStack stack)
     {
         String s = ("" + StatCollector.translateToLocal(this.getUnlocalizedName() + ".name")).trim();
-        String s1 = ("" + StatCollector.translateToLocal(FluidType.getEnum(stack.getItemDamage()).getUnlocalizedName())).trim();
+        String s1 = ("" + StatCollector.translateToLocal(FluidTypeTheOldOne.getEnum(stack.getItemDamage()).getUnlocalizedName())).trim();
 
         if (s1 != null)
         {
@@ -89,7 +89,7 @@ public class ItemFluidDuct extends Item {
         }
         else
         {
-            int j = FluidType.getEnum(stack.getItemDamage()).getMSAColor();
+            int j = FluidTypeTheOldOne.getEnum(stack.getItemDamage()).getMSAColor();
 
             if (j < 0)
             {
@@ -150,7 +150,7 @@ public class ItemFluidDuct extends Item {
             world.setBlock(x, y, z, ModBlocks.fluid_duct);
             
             if(world.getTileEntity(x, y, z) instanceof TileEntityFluidDuct) {
-            	((TileEntityFluidDuct)world.getTileEntity(x, y, z)).type = FluidType.getEnum(stack.getItemDamage());
+            	((TileEntityFluidDuct)world.getTileEntity(x, y, z)).type = FluidTypeTheOldOne.getEnum(stack.getItemDamage());
             }
             
             world.playSoundEffect(x, y, z, "hbm:block.pipePlaced", 1.0F, 0.65F + world.rand.nextFloat() * 0.2F);

src/main/java/com/hbm/items/machine/ItemFluidIcon.java

@@ -1,7 +1,8 @@
 package com.hbm.items.machine;
 
 import java.util.List;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.items.ModItems;
 
 import cpw.mods.fml.relauncher.Side;
@@ -28,7 +29,7 @@ public class ItemFluidIcon extends Item {
 	@SideOnly(Side.CLIENT)
     public void getSubItems(Item item, CreativeTabs tabs, List list)
     {
-        for (int i = 0; i < FluidType.values().length; ++i)
+        for (int i = 0; i < FluidTypeTheOldOne.values().length; ++i)
         {
             list.add(new ItemStack(item, 1, i));
         }
@@ -66,7 +67,7 @@ public class ItemFluidIcon extends Item {
 
     public String getItemStackDisplayName(ItemStack stack)
     {
-        String s = (I18n.format(FluidType.getEnum(stack.getItemDamage()).getUnlocalizedName())).trim();
+        String s = (I18n.format(FluidTypeTheOldOne.getEnum(stack.getItemDamage()).getUnlocalizedName())).trim();
 
         if (s != null)
         {
@@ -100,7 +101,7 @@ public class ItemFluidIcon extends Item {
 	@Override
 	@SideOnly(Side.CLIENT)
 	public int getColorFromItemStack(ItemStack stack, int p_82790_2_) {
-		int j = FluidType.getEnum(stack.getItemDamage()).getMSAColor();
+		int j = FluidTypeTheOldOne.getEnum(stack.getItemDamage()).getMSAColor();
 
 		if (j < 0) {
 			j = 16777215;

src/main/java/com/hbm/items/machine/ItemFluidIdentifier.java

@@ -4,8 +4,10 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.IFluidDuct;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.items.ModItems;
 import com.hbm.tileentity.conductor.TileEntityFluidDuct;
 import com.hbm.util.I18nUtil;
@@ -55,8 +57,8 @@ public class ItemFluidIdentifier extends Item {
 	@SideOnly(Side.CLIENT)
 	public void getSubItems(Item item, CreativeTabs tabs, List list) {
 		
-		for(int i = 0; i < FluidType.values().length; ++i) {
+		for(int i = 0; i < FluidTypeTheOldOne.values().length; ++i) {
-			if(!FluidType.values()[i].hasNoID()) {
+			if(!FluidTypeTheOldOne.values()[i].hasNoID()) {
 				list.add(new ItemStack(item, 1, i));
 			}
 		}
@@ -71,7 +73,7 @@ public class ItemFluidIdentifier extends Item {
 		list.add(EnumChatFormatting.YELLOW + I18nUtil.resolveKey("info.templatefolder", I18nUtil.resolveKey(ModItems.template_folder.getUnlocalizedName() + ".name")));
 		list.add("");
 		list.add(I18nUtil.resolveKey(getUnlocalizedName() + ".info"));
-		list.add("   " + I18n.format(FluidType.getEnum(stack.getItemDamage()).getUnlocalizedName()));
+		list.add("   " + I18n.format(Fluids.fromID(stack.getItemDamage()).getUnlocalizedName()));
 		list.add("");
 		list.add(I18nUtil.resolveKey(getUnlocalizedName() + ".usage0"));
 		list.add(I18nUtil.resolveKey(getUnlocalizedName() + ".usage1"));
@@ -80,9 +82,9 @@ public class ItemFluidIdentifier extends Item {
 
 	public static FluidType getType(ItemStack stack) {
 		if(stack != null && stack.getItem() instanceof ItemFluidIdentifier)
-			return FluidType.getEnum(stack.getItemDamage());
+			return Fluids.fromID(stack.getItemDamage());
 		else
-			return FluidType.NONE;
+			return Fluids.NONE;
 	}
 
 	@Override
@@ -91,7 +93,7 @@ public class ItemFluidIdentifier extends Item {
 		if(te instanceof TileEntityFluidDuct) {
 			if(!world.isRemote) {
 				TileEntityFluidDuct duct = (TileEntityFluidDuct) te;
-				FluidType type = FluidType.getEnum(stack.getItemDamage());
+				FluidType type = Fluids.fromID(stack.getItemDamage());
 				if (player.isSneaking()) markDuctsRecursively(world, x, y, z, type);
 				else duct.type = type;
 			}
@@ -158,7 +160,7 @@ public class ItemFluidIdentifier extends Item {
 		if(p_82790_2_ == 0) {
 			return 16777215;
 		} else {
-			int j = FluidType.getEnum(stack.getItemDamage()).getMSAColor();
+			int j = Fluids.fromID(stack.getItemDamage()).getColor();
 
 			if(j < 0) {
 				j = 16777215;

src/main/java/com/hbm/items/machine/ItemFluidTank.java

@@ -1,7 +1,8 @@
 package com.hbm.items.machine;
 
 import java.util.List;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.items.ModItems;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -25,9 +26,9 @@ public class ItemFluidTank extends Item {
 	@SideOnly(Side.CLIENT)
 	public void getSubItems(Item item, CreativeTabs tabs, List list) {
 		
-		for(int i = 1; i < FluidType.values().length; i++) {
+		for(int i = 1; i < FluidTypeTheOldOne.values().length; i++) {
 			
-			FluidType type = FluidType.values()[i];
+			FluidType type = FluidTypeTheOldOne.values()[i];
 			
 			if(type.hasNoContainer())
 				continue;
@@ -45,7 +46,7 @@ public class ItemFluidTank extends Item {
 
 	public String getItemStackDisplayName(ItemStack stack) {
 		String s = ("" + StatCollector.translateToLocal(this.getUnlocalizedName() + ".name")).trim();
-		String s1 = ("" + StatCollector.translateToLocal(FluidType.getEnum(stack.getItemDamage()).getUnlocalizedName())).trim();
+		String s1 = ("" + StatCollector.translateToLocal(FluidTypeTheOldOne.getEnum(stack.getItemDamage()).getUnlocalizedName())).trim();
 
 		if(s1 != null) {
 			s = s + " " + s1;
@@ -85,7 +86,7 @@ public class ItemFluidTank extends Item {
 		if(p_82790_2_ == 0) {
 			return 16777215;
 		} else {
-			int j = FluidType.getEnum(stack.getItemDamage()).getMSAColor();
+			int j = FluidTypeTheOldOne.getEnum(stack.getItemDamage()).getMSAColor();
 
 			if(j < 0) {
 				j = 16777215;

src/main/java/com/hbm/items/special/ItemStarterKit.java

@@ -3,7 +3,7 @@ package com.hbm.items.special;
 import java.util.List;
 
 import com.hbm.blocks.ModBlocks;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemBattery;
 import com.hbm.items.machine.ItemBreedingRod.BreedingRodType;
@@ -200,7 +200,7 @@ public class ItemStarterKit extends Item {
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.pellet_rtg_weak, 1));
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.cell_empty, 32));
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.rod_empty, 32));
-			player.inventory.addItemStackToInventory(new ItemStack(ModItems.fluid_barrel_full, 4, FluidType.COOLANT.getID()));
+			player.inventory.addItemStackToInventory(new ItemStack(ModItems.fluid_barrel_full, 4, FluidTypeTheOldOne.COOLANT.getID()));
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.radaway_strong, 4));
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.radx, 4));
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.pill_iodine, 1));
@@ -249,8 +249,8 @@ public class ItemStarterKit extends Item {
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.reactor_core, 1));
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.cell_empty, 32));
 			player.inventory.addItemStackToInventory(new ItemStack(ModItems.rod_empty, 64));
-			player.inventory.addItemStackToInventory(new ItemStack(ModItems.fluid_barrel_full, 16, FluidType.WATER.getID()));
+			player.inventory.addItemStackToInventory(new ItemStack(ModItems.fluid_barrel_full, 16, FluidTypeTheOldOne.WATER.getID()));
-			player.inventory.addItemStackToInventory(new ItemStack(ModItems.fluid_barrel_full, 8, FluidType.COOLANT.getID()));
+			player.inventory.addItemStackToInventory(new ItemStack(ModItems.fluid_barrel_full, 8, FluidTypeTheOldOne.COOLANT.getID()));
 			player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_assembler, 1));
 			player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_chemplant, 3));
 			player.inventory.addItemStackToInventory(new ItemStack(ModBlocks.machine_gascent, 2));

src/main/java/com/hbm/items/special/ItemSyringe.java

@@ -7,7 +7,7 @@ import com.hbm.config.VersatileConfig;
 import com.hbm.explosion.ExplosionLarge;
 import com.hbm.extprop.HbmLivingProps;
 import com.hbm.handler.ArmorModHandler;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.IPartiallyFillable;
 import com.hbm.items.ModItems;
 import com.hbm.items.weapon.ItemGunBase;
@@ -285,7 +285,7 @@ public class ItemSyringe extends Item {
 
 				IPartiallyFillable fillable = (IPartiallyFillable) jetpack.getItem();
 				
-				if(fillable.getType(jetpack) != FluidType.KEROSENE)
+				if(fillable.getType(jetpack) != FluidTypeTheOldOne.KEROSENE)
 					return stack;
 				
 				int fill = Math.min(fillable.getFill(jetpack) + 1000, fillable.getMaxFill(jetpack));

src/main/java/com/hbm/lib/Library.java

@@ -10,11 +10,12 @@ import com.hbm.blocks.ModBlocks;
 import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids;
 import com.hbm.entity.mob.EntityHunterChopper;
 import com.hbm.entity.projectile.EntityChopperMine;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidDuct;
 import com.hbm.interfaces.IFluidSource;
 import com.hbm.interfaces.Spaghetti;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.items.ModItems;
 import com.hbm.tileentity.TileEntityProxyBase;
 import com.hbm.tileentity.TileEntityProxyInventory;

src/main/java/com/hbm/main/CraftingManager.java

@@ -7,7 +7,7 @@ import com.hbm.blocks.ModBlocks;
 import com.hbm.config.GeneralConfig;
 import com.hbm.crafting.*;
 import com.hbm.crafting.handlers.*;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.inventory.OreDictManager;
 
 import static com.hbm.inventory.OreDictManager.*;
@@ -401,7 +401,7 @@ public class CraftingManager {
 		addRecipeAuto(new ItemStack(ModBlocks.barbed_wire, 16), new Object[] { "AIA", "I I", "AIA", 'A', ModItems.wire_aluminium, 'I', IRON.ingot() });
 		addRecipeAuto(new ItemStack(ModBlocks.barbed_wire_fire, 8), new Object[] { "BBB", "BIB", "BBB", 'B', ModBlocks.barbed_wire, 'I', P_RED.dust() });
 		addRecipeAuto(new ItemStack(ModBlocks.barbed_wire_poison, 8), new Object[] { "BBB", "BIB", "BBB", 'B', ModBlocks.barbed_wire, 'I', ModItems.powder_poison });
-		addRecipeAuto(new ItemStack(ModBlocks.barbed_wire_acid, 8), new Object[] { "BBB", "BIB", "BBB", 'B', ModBlocks.barbed_wire, 'I', new ItemStack(ModItems.fluid_tank_full, 1, FluidType.ACID.getID()) });
+		addRecipeAuto(new ItemStack(ModBlocks.barbed_wire_acid, 8), new Object[] { "BBB", "BIB", "BBB", 'B', ModBlocks.barbed_wire, 'I', new ItemStack(ModItems.fluid_tank_full, 1, FluidTypeTheOldOne.ACID.getID()) });
 		addRecipeAuto(new ItemStack(ModBlocks.barbed_wire_wither, 8), new Object[] { "BBB", "BIB", "BBB", 'B', ModBlocks.barbed_wire, 'I', new ItemStack(Items.skull, 1, 1) });
 		addRecipeAuto(new ItemStack(ModBlocks.barbed_wire_ultradeath, 4), new Object[] { "BCB", "CIC", "BCB", 'B', ModBlocks.barbed_wire, 'C', ModItems.powder_cloud, 'I', ModItems.nuclear_waste });
 
@@ -505,8 +505,8 @@ public class CraftingManager {
 		addRecipeAuto(ItemBattery.getFullBattery(ModItems.battery_su_l), new Object[] { " W ", "RPR", "CPC", 'W', ModItems.wire_copper, 'P', Items.paper, 'R', REDSTONE.dust(), 'C', COAL.dust() });
 		addShapelessAuto(ItemBattery.getFullBattery(ModItems.battery_potato), new Object[] { Items.potato, ModItems.wire_aluminium, ModItems.wire_copper });
 		addShapelessAuto(ItemBattery.getFullBattery(ModItems.battery_potatos), new Object[] { ItemBattery.getFullBattery(ModItems.battery_potato), ModItems.turret_chip, REDSTONE.dust() });
-		addRecipeAuto(ItemBattery.getEmptyBattery(ModItems.battery_steam), new Object[] { "PMP", "ISI", "PCP", 'P', CU.plate(), 'M', ModItems.motor, 'C', ModItems.coil_tungsten, 'S', new ItemStack(ModItems.fluid_tank_full, 1, FluidType.WATER.getID()), 'I', ModItems.plate_polymer });
+		addRecipeAuto(ItemBattery.getEmptyBattery(ModItems.battery_steam), new Object[] { "PMP", "ISI", "PCP", 'P', CU.plate(), 'M', ModItems.motor, 'C', ModItems.coil_tungsten, 'S', new ItemStack(ModItems.fluid_tank_full, 1, FluidTypeTheOldOne.WATER.getID()), 'I', ModItems.plate_polymer });
-		addRecipeAuto(ItemBattery.getEmptyBattery(ModItems.battery_steam_large), new Object[] { "MPM", "ISI", "CPC", 'P', ModItems.board_copper, 'M', ModItems.motor, 'C', ModItems.coil_tungsten, 'S', new ItemStack(ModItems.fluid_barrel_full, 1, FluidType.WATER.getID()), 'I', POLYMER.ingot() });
+		addRecipeAuto(ItemBattery.getEmptyBattery(ModItems.battery_steam_large), new Object[] { "MPM", "ISI", "CPC", 'P', ModItems.board_copper, 'M', ModItems.motor, 'C', ModItems.coil_tungsten, 'S', new ItemStack(ModItems.fluid_barrel_full, 1, FluidTypeTheOldOne.WATER.getID()), 'I', POLYMER.ingot() });
 
 		addRecipeAuto(new ItemStack(ModItems.battery_sc_uranium), new Object[] { "NBN", "PCP", "NBN", 'N', GOLD.nugget(), 'B', U238.billet(), 'P', PB.plate(), 'C', ModItems.thermo_element });
 		addRecipeAuto(new ItemStack(ModItems.battery_sc_technetium), new Object[] { "NBN", "PCP", "NBN", 'N', GOLD.nugget(), 'B', TC99.billet(), 'P', PB.plate(), 'C', ModItems.battery_sc_uranium });
@@ -571,7 +571,7 @@ public class CraftingManager {
 		addRecipeAuto(new ItemStack(ModItems.singularity_spark, 1), new Object[] { "XBX", "ACA", "XBX", 'X', ModItems.plate_dineutronium, 'A', ModItems.singularity_counter_resonant, 'B', ModItems.singularity_super_heated, 'C', ModItems.black_hole });
 		addRecipeAuto(new ItemStack(ModItems.ams_core_sing, 1), new Object[] { "EAE", "ASA", "EAE", 'E', ModItems.plate_euphemium, 'A', ModItems.cell_anti_schrabidium, 'S', ModItems.singularity });
 		addRecipeAuto(new ItemStack(ModItems.ams_core_wormhole, 1), new Object[] { "DPD", "PSP", "DPD", 'D', ModItems.plate_dineutronium, 'P', ModItems.powder_spark_mix, 'S', ModItems.singularity });
-		addRecipeAuto(new ItemStack(ModItems.ams_core_eyeofharmony, 1), new Object[] { "ALA", "LSL", "ALA", 'A', ModItems.plate_dalekanium, 'L', new ItemStack(ModItems.fluid_barrel_full, 1, FluidType.LAVA.getID()), 'S', ModItems.black_hole });
+		addRecipeAuto(new ItemStack(ModItems.ams_core_eyeofharmony, 1), new Object[] { "ALA", "LSL", "ALA", 'A', ModItems.plate_dalekanium, 'L', new ItemStack(ModItems.fluid_barrel_full, 1, FluidTypeTheOldOne.LAVA.getID()), 'S', ModItems.black_hole });
 		addRecipeAuto(new ItemStack(ModItems.ams_core_thingy), new Object[] { "NSN", "NGN", "G G", 'N', GOLD.nugget(), 'G', GOLD.ingot(), 'S', ModItems.battery_spark_cell_10000 });
 		addRecipeAuto(new ItemStack(ModItems.photo_panel), new Object[] { " G ", "IPI", " C ", 'G', KEY_ANYPANE, 'I', ModItems.plate_polymer, 'P', NETHERQUARTZ.dust(), 'C', ModItems.circuit_aluminium });
 		addRecipeAuto(new ItemStack(ModBlocks.machine_satlinker), new Object[] { "PSP", "SCS", "PSP", 'P', STEEL.plate(), 'S', STAR.ingot(), 'C', ModItems.sat_chip });
@@ -640,7 +640,7 @@ public class CraftingManager {
 		addShapelessAuto(new ItemStack(Items.paper, 1), new Object[] { new ItemStack(ModItems.assembly_template, 1, OreDictionary.WILDCARD_VALUE) });
 		addShapelessAuto(new ItemStack(Items.paper, 1), new Object[] { new ItemStack(ModItems.chemistry_template, 1, OreDictionary.WILDCARD_VALUE) });
 
-        for (int i = 1; i < FluidType.values().length; ++i)
+        for (int i = 1; i < FluidTypeTheOldOne.values().length; ++i)
         {
     		addShapelessAuto(new ItemStack(ModItems.fluid_duct, 1, i), new Object[] { new ItemStack(ModBlocks.fluid_duct, 1), new ItemStack(ModItems.fluid_identifier, 1, i) });
     		
@@ -732,7 +732,7 @@ public class CraftingManager {
 		addRecipeAuto(new ItemStack(ModItems.upgrade_smelter, 1), new Object[] { "PHP", "CUC", "DTD", 'P', CU.plate(), 'H', Blocks.hopper, 'C', ModItems.coil_tungsten, 'U', ModItems.upgrade_template, 'D', ModItems.coil_copper, 'T', ModBlocks.machine_transformer });
 		addRecipeAuto(new ItemStack(ModItems.upgrade_shredder, 1), new Object[] { "PHP", "CUC", "DTD", 'P', ModItems.motor, 'H', Blocks.hopper, 'C', ModItems.blades_advanced_alloy, 'U', ModItems.upgrade_smelter, 'D', TI.plate(), 'T', ModBlocks.machine_transformer });
 		addRecipeAuto(new ItemStack(ModItems.upgrade_centrifuge, 1), new Object[] { "PHP", "PUP", "DTD", 'P', ModItems.centrifuge_element, 'H', Blocks.hopper, 'U', ModItems.upgrade_shredder, 'D', POLYMER.ingot(), 'T', ModBlocks.machine_transformer });
-		addRecipeAuto(new ItemStack(ModItems.upgrade_crystallizer, 1), new Object[] { "PHP", "CUC", "DTD", 'P', new ItemStack(ModItems.fluid_barrel_full, 1, FluidType.ACID.ordinal()), 'H', ModItems.circuit_targeting_tier4, 'C', ModBlocks.barrel_steel, 'U', ModItems.upgrade_centrifuge, 'D', ModItems.motor, 'T', ModBlocks.machine_transformer });
+		addRecipeAuto(new ItemStack(ModItems.upgrade_crystallizer, 1), new Object[] { "PHP", "CUC", "DTD", 'P', new ItemStack(ModItems.fluid_barrel_full, 1, FluidTypeTheOldOne.ACID.ordinal()), 'H', ModItems.circuit_targeting_tier4, 'C', ModBlocks.barrel_steel, 'U', ModItems.upgrade_centrifuge, 'D', ModItems.motor, 'T', ModBlocks.machine_transformer });
 		addRecipeAuto(new ItemStack(ModItems.upgrade_screm, 1), new Object[] { "SUS", "SCS", "SUS", 'S', STEEL.plate(), 'U', ModItems.upgrade_template, 'C', ModItems.crystal_xen });
 		addRecipeAuto(new ItemStack(ModItems.upgrade_gc_speed, 1), new Object[] {"TCT", "HUH", "TCT", 'T', ModItems.nugget_bismuth, 'C', ModItems.coil_copper, 'H', ModItems.coil_tungsten, 'U', ModItems.upgrade_template});
 		

src/main/java/com/hbm/main/MainRegistry.java

@@ -62,13 +62,14 @@ import com.hbm.entity.particle.*;
 import com.hbm.entity.projectile.*;
 import com.hbm.entity.qic.EntitySPV;
 import com.hbm.handler.*;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.handler.imc.IMCCentrifuge;
 import com.hbm.handler.imc.IMCCrystallizer;
 import com.hbm.handler.imc.IMCHandler;
 import com.hbm.handler.radiation.ChunkRadiationManager;
 import com.hbm.hazard.HazardRegistry;
 import com.hbm.inventory.*;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.inventory.recipes.*;
 import com.hbm.inventory.recipes.anvil.AnvilRecipes;
 import com.hbm.items.ModItems;
@@ -261,6 +262,7 @@ public class MainRegistry {
 		loadConfig(PreEvent);
 		HbmPotion.init();
 		
+		Fluids.init();
 		ModBlocks.mainRegistry();
 		ModItems.mainRegistry();
 		proxy.registerRenderInfo();
@@ -784,7 +786,7 @@ public class MainRegistry {
 
 		achSacrifice = new Achievement("achievement.sacrifice", "sacrifice", -3, 1, ModItems.burnt_bark, null).initIndependentStat().setSpecial().registerStat();
 		achImpossible = new Achievement("achievement.impossible", "impossible", 18, 10, ModItems.nothing, null).initIndependentStat().setSpecial().registerStat();
-		achTOB = new Achievement("achievement.tasteofblood", "tasteofblood", 3, 10, new ItemStack(ModItems.fluid_icon, 1, FluidType.ASCHRAB.getID()), null).initIndependentStat().setSpecial().registerStat();
+		achTOB = new Achievement("achievement.tasteofblood", "tasteofblood", 3, 10, new ItemStack(ModItems.fluid_icon, 1, FluidTypeTheOldOne.ASCHRAB.getID()), null).initIndependentStat().setSpecial().registerStat();
 		achFreytag = new Achievement("achievement.freytag", "freytag", 0, -4, ModItems.gun_mp40, null).initIndependentStat().setSpecial().registerStat();
 		achPotato = new Achievement("achievement.potato", "potato", -2, -2, ModItems.battery_potatos, null).initIndependentStat().setSpecial().registerStat();
 		achC44 = new Achievement("achievement.c44", "c44", 2, -4, ModItems.gun_revolver_pip, null).initIndependentStat().setSpecial().registerStat();

src/main/java/com/hbm/packet/AuxButtonPacket.java

@@ -2,7 +2,8 @@ package com.hbm.packet;
 
 import com.hbm.config.MobConfig;
 import com.hbm.entity.mob.EntityDuck;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.items.weapon.ItemMissile.PartSize;
 import com.hbm.tileentity.TileEntityMachineBase;
 import com.hbm.tileentity.TileEntityTickingBase;
@@ -104,13 +105,13 @@ public class AuxButtonPacket implements IMessage {
 						reactor.rods = m.value;
 					
 					if(m.id == 1) {
-						FluidType type = FluidType.STEAM;
+						FluidType type = FluidTypeTheOldOne.STEAM;
 						int fill = reactor.tanks[2].getFill();
 						
 						switch(m.value) {
-						case 0: type = FluidType.HOTSTEAM; fill = (int)Math.floor(fill / 10D); break;
+						case 0: type = FluidTypeTheOldOne.HOTSTEAM; fill = (int)Math.floor(fill / 10D); break;
-						case 1: type = FluidType.SUPERHOTSTEAM; fill = (int)Math.floor(fill / 10D); break;
+						case 1: type = FluidTypeTheOldOne.SUPERHOTSTEAM; fill = (int)Math.floor(fill / 10D); break;
-						case 2: type = FluidType.STEAM; fill = (int)Math.floor(fill * 100); break;
+						case 2: type = FluidTypeTheOldOne.STEAM; fill = (int)Math.floor(fill * 100); break;
 						}
 						
 						if(fill > reactor.tanks[2].getMaxFill())

src/main/java/com/hbm/packet/TEFluidPacket.java

@@ -1,8 +1,9 @@
 package com.hbm.packet;
 
 import java.util.Arrays;
-import com.hbm.handler.FluidTypeHandler.FluidType;
 import com.hbm.interfaces.IFluidContainer;
+import com.hbm.inventory.fluid.FluidType;
+
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
@@ -19,10 +20,7 @@ public class TEFluidPacket implements IMessage {
 	int index;
 	int type;
 
-	public TEFluidPacket()
+	public TEFluidPacket() { }
-	{
-		
-	}
 
 	public TEFluidPacket(int x, int y, int z, int fill, int index, FluidType type)
 	{

src/main/java/com/hbm/packet/TEFluidPipePacket.java

@@ -1,6 +1,6 @@
 package com.hbm.packet;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.tileentity.conductor.TileEntityFluidDuct;
 
 import cpw.mods.fml.common.network.simpleimpl.IMessage;

src/main/java/com/hbm/render/tileentity/RenderBAT9000.java

@@ -2,7 +2,8 @@ package com.hbm.render.tileentity;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.main.ResourceManager;
 import com.hbm.render.util.DiamondPronter;
 import com.hbm.render.util.EnumSymbol;
@@ -33,7 +34,7 @@ public class RenderBAT9000 extends TileEntitySpecialRenderer {
 		
 		FluidType type = bat.tank.getTankType();
 		
-		if(type != null && type != FluidType.NONE) {
+		if(type != null && type != Fluids.NONE) {
 
 			RenderHelper.disableStandardItemLighting();
 			GL11.glPushMatrix();

src/main/java/com/hbm/render/tileentity/RenderChemplant.java

@@ -2,7 +2,7 @@ package com.hbm.render.tileentity;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.main.ResourceManager;
 import com.hbm.render.loader.HmfController;
 import com.hbm.tileentity.machine.TileEntityMachineChemplant;
@@ -77,7 +77,7 @@ public class RenderChemplant extends TileEntitySpecialRenderer {
         GL11.glPushMatrix();
 		GL11.glTranslated(-0.625, 0, 0.625);
 		
-		if(!chem.tanks[0].getTankType().name().equals(FluidType.NONE.name()) && chem.isProgressing)
+		if(!chem.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.NONE.name()) && chem.isProgressing)
 			GL11.glRotatef(-rotation, 0F, 1F, 0F);
 		else
 			GL11.glRotatef(-45, 0F, 1F, 0F);
@@ -88,7 +88,7 @@ public class RenderChemplant extends TileEntitySpecialRenderer {
         GL11.glPushMatrix();
 		GL11.glTranslated(0.625, 0, 0.625);
 		
-		if(!chem.tanks[1].getTankType().name().equals(FluidType.NONE.name()) && chem.isProgressing)
+		if(!chem.tanks[1].getTankType().name().equals(FluidTypeTheOldOne.NONE.name()) && chem.isProgressing)
 			GL11.glRotatef(rotation, 0F, 1F, 0F);
 		else
 			GL11.glRotatef(45, 0F, 1F, 0F);
@@ -114,7 +114,7 @@ public class RenderChemplant extends TileEntitySpecialRenderer {
         int color = 0;
 
         GL11.glDisable(GL11.GL_LIGHTING);
-        if(!chem.tanks[0].getTankType().name().equals(FluidType.NONE.name())) {
+        if(!chem.tanks[0].getTankType().name().equals(FluidTypeTheOldOne.NONE.name())) {
             GL11.glPushMatrix();
 	        
 	        if(chem.isProgressing)
@@ -138,7 +138,7 @@ public class RenderChemplant extends TileEntitySpecialRenderer {
 	        GL11.glPopMatrix();
         }
 
-        if(!chem.tanks[1].getTankType().name().equals(FluidType.NONE.name())) {
+        if(!chem.tanks[1].getTankType().name().equals(FluidTypeTheOldOne.NONE.name())) {
 	        GL11.glPushMatrix();
 	        
 	        if(chem.isProgressing)

src/main/java/com/hbm/render/tileentity/RenderFluidBarrel.java

@@ -2,7 +2,8 @@ package com.hbm.render.tileentity;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.render.util.DiamondPronter;
 import com.hbm.render.util.EnumSymbol;
 import com.hbm.tileentity.machine.TileEntityBarrel;
@@ -25,7 +26,7 @@ public class RenderFluidBarrel extends TileEntitySpecialRenderer {
 			TileEntityBarrel barrel = (TileEntityBarrel)te;
 			FluidType type = barrel.tank.getTankType();
 			
-			if(type != FluidType.NONE) {
+			if(type != Fluids.NONE) {
 				
 				RenderHelper.disableStandardItemLighting();
 				GL11.glPushMatrix();

src/main/java/com/hbm/render/tileentity/RenderTurretBase.java

@@ -2,7 +2,7 @@ package com.hbm.render.tileentity;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.lib.Library;
 import com.hbm.main.ResourceManager;
 import com.hbm.tileentity.turret.TileEntityTurretBaseNT;

src/main/java/com/hbm/render/tileentity/RenderTurretBrandon.java

@@ -2,7 +2,8 @@ package com.hbm.render.tileentity;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.main.ResourceManager;
 import com.hbm.tileentity.turret.TileEntityTurretBrandon;
 
@@ -23,7 +24,7 @@ public class RenderTurretBrandon extends RenderTurretBase {
 		GL11.glEnable(GL11.GL_CULL_FACE);
 		GL11.glShadeModel(GL11.GL_SMOOTH);
 		
-		this.renderConnectors(turret, true, false, FluidType.NONE);
+		this.renderConnectors(turret, true, false, Fluids.NONE);
 
 		bindTexture(ResourceManager.turret_base_tex);
 		ResourceManager.turret_chekhov.renderPart("Base");

src/main/java/com/hbm/render/tileentity/RenderTurretChekhov.java

@@ -2,7 +2,7 @@ package com.hbm.render.tileentity;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.main.ResourceManager;
 import com.hbm.tileentity.turret.TileEntityTurretChekhov;
 
@@ -23,7 +23,7 @@ public class RenderTurretChekhov extends RenderTurretBase {
 		GL11.glEnable(GL11.GL_CULL_FACE);
 		GL11.glShadeModel(GL11.GL_SMOOTH);
 		
-		this.renderConnectors(turret, true, false, FluidType.NONE);
+		this.renderConnectors(turret, true, false, FluidTypeTheOldOne.NONE);
 
 		bindTexture(ResourceManager.turret_base_tex);
 		ResourceManager.turret_chekhov.renderPart("Base");

src/main/java/com/hbm/render/tileentity/RenderTurretFriendly.java

@@ -2,7 +2,7 @@ package com.hbm.render.tileentity;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.main.ResourceManager;
 import com.hbm.tileentity.turret.TileEntityTurretChekhov;
 
@@ -23,7 +23,7 @@ public class RenderTurretFriendly extends RenderTurretBase {
 		GL11.glEnable(GL11.GL_CULL_FACE);
 		GL11.glShadeModel(GL11.GL_SMOOTH);
 		
-		this.renderConnectors(turret, true, false, FluidType.NONE);
+		this.renderConnectors(turret, true, false, FluidTypeTheOldOne.NONE);
 
 		bindTexture(ResourceManager.turret_base_friendly_tex);
 		ResourceManager.turret_chekhov.renderPart("Base");

src/main/java/com/hbm/render/tileentity/RenderTurretHoward.java

@@ -2,7 +2,7 @@ package com.hbm.render.tileentity;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.main.ResourceManager;
 import com.hbm.tileentity.turret.TileEntityTurretHoward;
 
@@ -23,7 +23,7 @@ public class RenderTurretHoward extends RenderTurretBase {
 		GL11.glEnable(GL11.GL_CULL_FACE);
 		GL11.glShadeModel(GL11.GL_SMOOTH);
 		
-		this.renderConnectors(turret, true, false, FluidType.NONE);
+		this.renderConnectors(turret, true, false, FluidTypeTheOldOne.NONE);
 
 		bindTexture(ResourceManager.turret_base_tex);
 		ResourceManager.turret_chekhov.renderPart("Base");

src/main/java/com/hbm/render/tileentity/RenderTurretHowardDamaged.java

@@ -2,7 +2,7 @@ package com.hbm.render.tileentity;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.main.ResourceManager;
 import com.hbm.tileentity.turret.TileEntityTurretHowardDamaged;
 

src/main/java/com/hbm/render/tileentity/RenderTurretJeremy.java

@@ -2,7 +2,7 @@ package com.hbm.render.tileentity;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.main.ResourceManager;
 import com.hbm.tileentity.turret.TileEntityTurretJeremy;
 
@@ -23,7 +23,7 @@ public class RenderTurretJeremy extends RenderTurretBase {
 		GL11.glEnable(GL11.GL_CULL_FACE);
 		GL11.glShadeModel(GL11.GL_SMOOTH);
 		
-		this.renderConnectors(turret, true, false, FluidType.NONE);
+		this.renderConnectors(turret, true, false, FluidTypeTheOldOne.NONE);
 
 		bindTexture(ResourceManager.turret_base_tex);
 		ResourceManager.turret_chekhov.renderPart("Base");

src/main/java/com/hbm/render/tileentity/RenderTurretMaxwell.java

@@ -2,7 +2,7 @@ package com.hbm.render.tileentity;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.main.ResourceManager;
 import com.hbm.render.util.BeamPronter;
 import com.hbm.render.util.BeamPronter.EnumBeamType;
@@ -27,7 +27,7 @@ public class RenderTurretMaxwell extends RenderTurretBase {
 		GL11.glEnable(GL11.GL_CULL_FACE);
 		GL11.glShadeModel(GL11.GL_SMOOTH);
 		
-		this.renderConnectors(turret, true, false, FluidType.NONE);
+		this.renderConnectors(turret, true, false, FluidTypeTheOldOne.NONE);
 
 		bindTexture(ResourceManager.turret_base_tex);
 		ResourceManager.turret_chekhov.renderPart("Base");

src/main/java/com/hbm/render/tileentity/RenderTurretRichard.java

@@ -2,7 +2,7 @@ package com.hbm.render.tileentity;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.main.ResourceManager;
 import com.hbm.tileentity.turret.TileEntityTurretRichard;
 
@@ -23,7 +23,7 @@ public class RenderTurretRichard extends RenderTurretBase {
 		GL11.glEnable(GL11.GL_CULL_FACE);
 		GL11.glShadeModel(GL11.GL_SMOOTH);
 		
-		this.renderConnectors(turret, true, false, FluidType.NONE);
+		this.renderConnectors(turret, true, false, FluidTypeTheOldOne.NONE);
 
 		bindTexture(ResourceManager.turret_base_tex);
 		ResourceManager.turret_chekhov.renderPart("Base");

src/main/java/com/hbm/render/tileentity/RenderTurretTauon.java

@@ -2,7 +2,7 @@ package com.hbm.render.tileentity;
 
 import org.lwjgl.opengl.GL11;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.main.ResourceManager;
 import com.hbm.render.util.BeamPronter;
 import com.hbm.render.util.BeamPronter.EnumBeamType;
@@ -27,7 +27,7 @@ public class RenderTurretTauon extends RenderTurretBase {
 		GL11.glEnable(GL11.GL_CULL_FACE);
 		GL11.glShadeModel(GL11.GL_SMOOTH);
 		
-		this.renderConnectors(turret, true, false, FluidType.NONE);
+		this.renderConnectors(turret, true, false, FluidTypeTheOldOne.NONE);
 
 		bindTexture(ResourceManager.turret_base_tex);
 		ResourceManager.turret_chekhov.renderPart("Base");

src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java

@@ -2,9 +2,9 @@ package com.hbm.tileentity;
 
 import java.util.List;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
 
 import api.hbm.energy.IEnergyConnector;
 import api.hbm.energy.IEnergyUser;

src/main/java/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java

@@ -4,11 +4,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.hbm.entity.missile.EntityMissileCustom;
-import com.hbm.handler.FluidTypeHandler.FluidType;
 import com.hbm.handler.MissileStruct;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.items.ModItems;
 import com.hbm.items.weapon.ItemCustomMissile;
 import com.hbm.items.weapon.ItemMissile;
@@ -57,8 +58,8 @@ public class TileEntityCompactLauncher extends TileEntity implements ISidedInven
 	public TileEntityCompactLauncher() {
 		slots = new ItemStack[8];
 		tanks = new FluidTank[2];
-		tanks[0] = new FluidTank(FluidType.NONE, 25000, 0);
+		tanks[0] = new FluidTank(Fluids.NONE, 25000, 0);
-		tanks[1] = new FluidTank(FluidType.NONE, 25000, 1);
+		tanks[1] = new FluidTank(Fluids.NONE, 25000, 1);
 	}
 
 	@Override
@@ -425,19 +426,19 @@ public class TileEntityCompactLauncher extends TileEntity implements ISidedInven
 		
 		switch((FuelType)fuselage.attributes[0]) {
 			case KEROSENE:
-				tanks[0].setTankType(FluidType.KEROSENE);
+				tanks[0].setTankType(Fluids.KEROSENE);
-				tanks[1].setTankType(FluidType.ACID);
+				tanks[1].setTankType(Fluids.ACID);
 				break;
 			case HYDROGEN:
-				tanks[0].setTankType(FluidType.HYDROGEN);
+				tanks[0].setTankType(Fluids.HYDROGEN);
-				tanks[1].setTankType(FluidType.OXYGEN);
+				tanks[1].setTankType(Fluids.OXYGEN);
 				break;
 			case XENON:
-				tanks[0].setTankType(FluidType.XENON);
+				tanks[0].setTankType(Fluids.XENON);
 				break;
 			case BALEFIRE:
-				tanks[0].setTankType(FluidType.BALEFIRE);
+				tanks[0].setTankType(Fluids.BALEFIRE);
-				tanks[1].setTankType(FluidType.ACID);
+				tanks[1].setTankType(Fluids.ACID);
 				break;
 			default: break;
 		}

src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchTable.java

@@ -4,11 +4,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.hbm.entity.missile.EntityMissileCustom;
-import com.hbm.handler.FluidTypeHandler.FluidType;
 import com.hbm.handler.MissileStruct;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.items.ModItems;
 import com.hbm.items.weapon.ItemCustomMissile;
 import com.hbm.items.weapon.ItemMissile;
@@ -56,8 +57,8 @@ public class TileEntityLaunchTable extends TileEntity implements ISidedInventory
 	public TileEntityLaunchTable() {
 		slots = new ItemStack[8];
 		tanks = new FluidTank[2];
-		tanks[0] = new FluidTank(FluidType.NONE, 100000, 0);
+		tanks[0] = new FluidTank(Fluids.NONE, 100000, 0);
-		tanks[1] = new FluidTank(FluidType.NONE, 100000, 1);
+		tanks[1] = new FluidTank(Fluids.NONE, 100000, 1);
 		padSize = PartSize.SIZE_10;
 		height = 10;
 	}
@@ -402,19 +403,19 @@ public class TileEntityLaunchTable extends TileEntity implements ISidedInventory
 		
 		switch((FuelType)fuselage.attributes[0]) {
 			case KEROSENE:
-				tanks[0].setTankType(FluidType.KEROSENE);
+				tanks[0].setTankType(Fluids.KEROSENE);
-				tanks[1].setTankType(FluidType.ACID);
+				tanks[1].setTankType(Fluids.ACID);
 				break;
 			case HYDROGEN:
-				tanks[0].setTankType(FluidType.HYDROGEN);
+				tanks[0].setTankType(Fluids.HYDROGEN);
-				tanks[1].setTankType(FluidType.OXYGEN);
+				tanks[1].setTankType(Fluids.OXYGEN);
 				break;
 			case XENON:
-				tanks[0].setTankType(FluidType.XENON);
+				tanks[0].setTankType(Fluids.XENON);
 				break;
 			case BALEFIRE:
-				tanks[0].setTankType(FluidType.BALEFIRE);
+				tanks[0].setTankType(Fluids.BALEFIRE);
-				tanks[1].setTankType(FluidType.ACID);
+				tanks[1].setTankType(Fluids.ACID);
 				break;
 			default: break;
 		}

src/main/java/com/hbm/tileentity/conductor/TileEntityFluidDuct.java

@@ -5,8 +5,9 @@ import java.util.Arrays;
 import java.util.List;
 
 import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids;
-import com.hbm.handler.FluidTypeHandler.FluidType;
 import com.hbm.interfaces.IFluidDuct;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.lib.Library;
 import com.hbm.packet.PacketDispatcher;
 import com.hbm.packet.TEFluidPipePacket;
@@ -21,7 +22,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 public class TileEntityFluidDuct extends TileEntity implements IFluidDuct {
 	
 	public ForgeDirection[] connections = new ForgeDirection[6];
-	public FluidType type = FluidType.NONE;
+	public FluidType type = Fluids.NONE;
 	public List<UnionOfTileEntitiesAndBooleansForFluids> uoteab = new ArrayList<UnionOfTileEntitiesAndBooleansForFluids>();
 	
 	public TileEntityFluidDuct() {

src/main/java/com/hbm/tileentity/conductor/TileEntityGasDuct.java

@@ -4,8 +4,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids;
-import com.hbm.handler.FluidTypeHandler.FluidType;
 import com.hbm.interfaces.IFluidDuct;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.lib.Library;
 
 import cpw.mods.fml.relauncher.Side;
@@ -17,59 +18,60 @@ import net.minecraftforge.common.util.ForgeDirection;
 public class TileEntityGasDuct extends TileEntity implements IFluidDuct {
 
 	public ForgeDirection[] connections = new ForgeDirection[6];
-	public FluidType type = FluidType.GAS;
+	public FluidType type = Fluids.GAS;
 	public List<UnionOfTileEntitiesAndBooleansForFluids> uoteab = new ArrayList<UnionOfTileEntitiesAndBooleansForFluids>();
 
-	public TileEntityGasDuct() {
-		
-	}
-	
 	@Override
 	public void updateEntity() {
-		
-		//if(!worldObj.isRemote)
-		//	PacketDispatcher.wrapper.sendToAll(new TEFluidPipePacket(xCoord, yCoord, zCoord, type));
-		
 		this.updateConnections();
 	}
 
 	public void updateConnections() {
-		if(Library.checkFluidConnectables(this.worldObj, xCoord, yCoord + 1, zCoord, type)) connections[0] = ForgeDirection.UP;
+		if(Library.checkFluidConnectables(this.worldObj, xCoord, yCoord + 1, zCoord, type))
-		else connections[0] = null;
+			connections[0] = ForgeDirection.UP;
+		else
+			connections[0] = null;
 
-		if(Library.checkFluidConnectables(this.worldObj, xCoord, yCoord - 1, zCoord, type)) connections[1] = ForgeDirection.DOWN;
+		if(Library.checkFluidConnectables(this.worldObj, xCoord, yCoord - 1, zCoord, type))
-		else connections[1] = null;
+			connections[1] = ForgeDirection.DOWN;
+		else
+			connections[1] = null;
 
-		if(Library.checkFluidConnectables(this.worldObj, xCoord, yCoord, zCoord - 1, type)) connections[2] = ForgeDirection.NORTH;
+		if(Library.checkFluidConnectables(this.worldObj, xCoord, yCoord, zCoord - 1, type))
-		else connections[2] = null;
+			connections[2] = ForgeDirection.NORTH;
+		else
+			connections[2] = null;
 
-		if(Library.checkFluidConnectables(this.worldObj, xCoord + 1, yCoord, zCoord, type)) connections[3] = ForgeDirection.EAST;
+		if(Library.checkFluidConnectables(this.worldObj, xCoord + 1, yCoord, zCoord, type))
-		else connections[3] = null;
+			connections[3] = ForgeDirection.EAST;
+		else
+			connections[3] = null;
 
-		if(Library.checkFluidConnectables(this.worldObj, xCoord, yCoord, zCoord + 1, type)) connections[4] = ForgeDirection.SOUTH;
+		if(Library.checkFluidConnectables(this.worldObj, xCoord, yCoord, zCoord + 1, type))
-		else connections[4] = null;
+			connections[4] = ForgeDirection.SOUTH;
+		else
+			connections[4] = null;
 
-		if(Library.checkFluidConnectables(this.worldObj, xCoord - 1, yCoord, zCoord, type)) connections[5] = ForgeDirection.WEST;
+		if(Library.checkFluidConnectables(this.worldObj, xCoord - 1, yCoord, zCoord, type))
-		else connections[5] = null;
+			connections[5] = ForgeDirection.WEST;
+		else
+			connections[5] = null;
 	}
 
 	@Override
-	public void readFromNBT(NBTTagCompound nbt)
+	public void readFromNBT(NBTTagCompound nbt) {
-    {
 		super.readFromNBT(nbt);
-		type = FluidType.GAS;
+		type = Fluids.GAS;
 	}
 
 	@Override
-	public void writeToNBT(NBTTagCompound nbt)
+	public void writeToNBT(NBTTagCompound nbt) {
-    {
 		super.writeToNBT(nbt);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public double getMaxRenderDistanceSquared()
+	public double getMaxRenderDistanceSquared() {
-	{
 		return 65536.0D;
 	}
 

src/main/java/com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java

@@ -4,13 +4,15 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.IFluidDuct;
+import com.hbm.inventory.fluid.FluidType;
+
 import net.minecraft.tileentity.TileEntity;
 
 public class TileEntityGasDuctSolid extends TileEntity implements IFluidDuct {
 
-	public FluidType type = FluidType.GAS;
+	public FluidType type = FluidTypeTheOldOne.GAS;
 	public List<UnionOfTileEntitiesAndBooleansForFluids> uoteab = new ArrayList<UnionOfTileEntitiesAndBooleansForFluids>();
 
 	@Override

src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuct.java

@@ -4,8 +4,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.IFluidDuct;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.lib.Library;
 
 import cpw.mods.fml.relauncher.Side;
@@ -17,7 +18,7 @@ import net.minecraftforge.common.util.ForgeDirection;
 public class TileEntityOilDuct extends TileEntity implements IFluidDuct {
 	
 	public ForgeDirection[] connections = new ForgeDirection[6];
-	public FluidType type = FluidType.OIL;
+	public FluidType type = FluidTypeTheOldOne.OIL;
 	public List<UnionOfTileEntitiesAndBooleansForFluids> uoteab = new ArrayList<UnionOfTileEntitiesAndBooleansForFluids>();
 	
 	public TileEntityOilDuct() {
@@ -57,7 +58,7 @@ public class TileEntityOilDuct extends TileEntity implements IFluidDuct {
 	public void readFromNBT(NBTTagCompound nbt)
     {
 		super.readFromNBT(nbt);
-		type = FluidType.OIL;
+		type = FluidTypeTheOldOne.OIL;
     }
 
     @Override

src/main/java/com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java

@@ -4,14 +4,15 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.hbm.calc.UnionOfTileEntitiesAndBooleansForFluids;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.IFluidDuct;
+import com.hbm.inventory.fluid.FluidType;
 
 import net.minecraft.tileentity.TileEntity;
 
 public class TileEntityOilDuctSolid extends TileEntity implements IFluidDuct {
 
-	public FluidType type = FluidType.OIL;
+	public FluidType type = FluidTypeTheOldOne.OIL;
 	public List<UnionOfTileEntitiesAndBooleansForFluids> uoteab = new ArrayList<UnionOfTileEntitiesAndBooleansForFluids>();
 
 	@Override

src/main/java/com/hbm/tileentity/machine/TileEntityAMSBase.java

@@ -4,10 +4,12 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemCatalyst;
 import com.hbm.items.machine.ItemSatChip;
@@ -60,10 +62,10 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IF
 	public TileEntityAMSBase() {
 		slots = new ItemStack[16];
 		tanks = new FluidTank[4];
-		tanks[0] = new FluidTank(FluidType.COOLANT, 8000, 0);
+		tanks[0] = new FluidTank(FluidTypeTheOldOne.COOLANT, 8000, 0);
-		tanks[1] = new FluidTank(FluidType.CRYOGEL, 8000, 1);
+		tanks[1] = new FluidTank(FluidTypeTheOldOne.CRYOGEL, 8000, 1);
-		tanks[2] = new FluidTank(FluidType.DEUTERIUM, 8000, 2);
+		tanks[2] = new FluidTank(FluidTypeTheOldOne.DEUTERIUM, 8000, 2);
-		tanks[3] = new FluidTank(FluidType.TRITIUM, 8000, 3);
+		tanks[3] = new FluidTank(FluidTypeTheOldOne.TRITIUM, 8000, 3);
 	}
 
 	@Override
@@ -390,30 +392,19 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IF
 	}
 	
 	private int getCoolingStrength(FluidType type) {
-		switch(type) {
+		
-		case WATER:
+		if(type == FluidTypeTheOldOne.WATER) return 5;
-			return 5;
+		if(type == FluidTypeTheOldOne.OIL) return 15;
-		case OIL:
+		if(type == FluidTypeTheOldOne.COOLANT) return this.heat / 250;
-			return 15;
+		if(type == FluidTypeTheOldOne.CRYOGEL) return this.heat > heat/2 ? 25 : 5;
-		case COOLANT:
-			return this.heat / 250;
-		case CRYOGEL:
-			return this.heat > heat/2 ? 25 : 5;
-		default:
 		return 0;
 	}
-	}
 	
 	private int getFuelPower(FluidType type) {
-		switch(type) {
+		if(type == Fluids.DEUTERIUM) return 50;
-		case DEUTERIUM:
+		if(type == Fluids.TRITIUM) return 75;
-			return 50;
-		case TRITIUM:
-			return 75;
-		default:
 		return 0;
 	}
-	}
 	
 	private float calcField(int a, int b, int c, int d) {
 		return (float)(a + b + c + d) * (a * 25 + b * 25 + c * 25 + d  * 25) / 40000;

src/main/java/com/hbm/tileentity/machine/TileEntityAMSEmitter.java

@@ -5,10 +5,11 @@ import java.util.List;
 import java.util.Random;
 
 import com.hbm.explosion.ExplosionLarge;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.items.ModItems;
 import com.hbm.lib.Library;
 import com.hbm.packet.AuxElectricityPacket;
@@ -51,7 +52,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory,
 	
 	public TileEntityAMSEmitter() {
 		slots = new ItemStack[4];
-		tank = new FluidTank(FluidType.COOLANT, 16000, 0);
+		tank = new FluidTank(FluidTypeTheOldOne.COOLANT, 16000, 0);
 	}
 
 	@Override
@@ -229,7 +230,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory,
 					warning = 1;
 				}
 				
-				if(tank.getTankType().name().equals(FluidType.CRYOGEL.name())) {
+				if(tank.getTankType().name().equals(FluidTypeTheOldOne.CRYOGEL.name())) {
 					
 					if(tank.getFill() >= 15) {
 						if(heat > 0)
@@ -249,7 +250,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory,
 					} else {
 						heat += efficiency;
 					}
-				} else if(tank.getTankType().name().equals(FluidType.COOLANT.name())) {
+				} else if(tank.getTankType().name().equals(FluidTypeTheOldOne.COOLANT.name())) {
 					
 					if(tank.getFill() >= 15) {
 						if(heat > 0)
@@ -269,7 +270,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory,
 					} else {
 						heat += efficiency;
 					}
-				} else if(tank.getTankType().name().equals(FluidType.WATER.name())) {
+				} else if(tank.getTankType().name().equals(FluidTypeTheOldOne.WATER.name())) {
 					
 					if(tank.getFill() >= 45) {
 						if(heat > 0)
@@ -330,7 +331,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory,
 				warning = 3;
 			}
 
-			tank.setTankType(FluidType.CRYOGEL);
+			tank.setTankType(FluidTypeTheOldOne.CRYOGEL);
 			tank.setFill(tank.getMaxFill());
 
 			PacketDispatcher.wrapper.sendToAllAround(new AuxElectricityPacket(xCoord, yCoord, zCoord, power), new TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 50));

src/main/java/com/hbm/tileentity/machine/TileEntityAMSLimiter.java

@@ -6,10 +6,11 @@ import java.util.Random;
 
 import com.hbm.entity.particle.EntityGasFlameFX;
 import com.hbm.explosion.ExplosionLarge;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.items.ModItems;
 import com.hbm.lib.Library;
 import com.hbm.packet.AuxElectricityPacket;
@@ -53,7 +54,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory,
 	
 	public TileEntityAMSLimiter() {
 		slots = new ItemStack[4];
-		tank = new FluidTank(FluidType.COOLANT, 8000, 0);
+		tank = new FluidTank(FluidTypeTheOldOne.COOLANT, 8000, 0);
 	}
 
 	@Override
@@ -231,7 +232,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory,
 					warning = 1;
 				}
 				
-				if(tank.getTankType().name().equals(FluidType.CRYOGEL.name())) {
+				if(tank.getTankType().name().equals(FluidTypeTheOldOne.CRYOGEL.name())) {
 					
 					if(tank.getFill() >= 5) {
 						if(heat > 0)
@@ -251,7 +252,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory,
 					} else {
 						heat += efficiency;
 					}
-				} else if(tank.getTankType().name().equals(FluidType.COOLANT.name())) {
+				} else if(tank.getTankType().name().equals(FluidTypeTheOldOne.COOLANT.name())) {
 					
 					if(tank.getFill() >= 5) {
 						if(heat > 0)
@@ -271,7 +272,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory,
 					} else {
 						heat += efficiency;
 					}
-				} else if(tank.getTankType().name().equals(FluidType.WATER.name())) {
+				} else if(tank.getTankType().name().equals(FluidTypeTheOldOne.WATER.name())) {
 					
 					if(tank.getFill() >= 15) {
 						if(heat > 0)
@@ -344,7 +345,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory,
 				warning = 3;
 			}
 			
-			tank.setTankType(FluidType.CRYOGEL);
+			tank.setTankType(FluidTypeTheOldOne.CRYOGEL);
 			tank.setFill(tank.getMaxFill());
 
 			PacketDispatcher.wrapper.sendToAllAround(new AuxElectricityPacket(xCoord, yCoord, zCoord, power), new TargetPoint(worldObj.provider.dimensionId, xCoord, yCoord, zCoord, 50));

src/main/java/com/hbm/tileentity/machine/TileEntityBarrel.java

@@ -4,11 +4,13 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.hbm.blocks.ModBlocks;
-import com.hbm.handler.FluidTypeHandler.FluidTrait;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
-import com.hbm.handler.FluidTypeHandler.FluidType;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidSource;
 import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.FluidType.FluidTrait;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.lib.Library;
 import com.hbm.main.ModEventHandler;
 import com.hbm.tileentity.TileEntityMachineBase;
@@ -28,12 +30,12 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc
 
 	public TileEntityBarrel() {
 		super(6);
-		tank = new FluidTank(FluidType.NONE, 0, 0);
+		tank = new FluidTank(FluidTypeTheOldOne.NONE, 0, 0);
 	}
 
 	public TileEntityBarrel(int capacity) {
 		super(6);
-		tank = new FluidTank(FluidType.NONE, capacity, 0);
+		tank = new FluidTank(FluidTypeTheOldOne.NONE, capacity, 0);
 	}
 
 	@Override
@@ -73,7 +75,7 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc
 		Block b = this.getBlockType();
 		
 		//for when you fill antimatter into a matter tank
-		if(b != ModBlocks.barrel_antimatter && tank.getTankType().traits.contains(FluidTrait.AMAT)) {
+		if(b != ModBlocks.barrel_antimatter && tank.getTankType().isAntimatter()) {
 			worldObj.func_147480_a(xCoord, yCoord, zCoord, false);
 			worldObj.newExplosion(null, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 5, true, true);
 		}
@@ -106,7 +108,7 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc
 		}
 		
 		//For when Tom's firestorm hits a barrel full of water
-		if(tank.getTankType() == FluidType.WATER && ModEventHandler.fire > 0) {
+		if(tank.getTankType() == Fluids.WATER && ModEventHandler.fire > 0) {
 			int light = this.worldObj.getSavedLightValue(EnumSkyBlock.Sky, this.xCoord, this.yCoord, this.zCoord);
 			
 			if(light > 7) {

src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java

@@ -5,10 +5,11 @@ import java.util.List;
 import java.util.Random;
 
 import com.hbm.blocks.BlockDummyable;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidSource;
 import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.recipes.MachineRecipes;
 import com.hbm.lib.Library;
 import com.hbm.packet.NBTPacket;
@@ -39,8 +40,8 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl
 	public TileEntityChungus() {
 		
 		tanks = new FluidTank[2];
-		tanks[0] = new FluidTank(FluidType.STEAM, 1000000000, 0);
+		tanks[0] = new FluidTank(FluidTypeTheOldOne.STEAM, 1000000000, 0);
-		tanks[1] = new FluidTank(FluidType.SPENTSTEAM, 1000000000, 1);
+		tanks[1] = new FluidTank(FluidTypeTheOldOne.SPENTSTEAM, 1000000000, 1);
 	}
 
 	@Override
@@ -50,7 +51,7 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl
 			
 			Object[] outs = MachineRecipes.getTurbineOutput(tanks[0].getTankType());
 			
-			tanks[1].setTankType((FluidType) outs[0]);
+			tanks[1].setTankType((FluidTypeTheOldOne) outs[0]);
 			
 			int processMax = (int) Math.ceil(tanks[0].getFill() / (Integer)outs[2]);				//the maximum amount of cycles total
 			int processSteam = tanks[0].getFill() / (Integer)outs[2];								//the maximum amount of cycles depending on steam
@@ -118,7 +119,7 @@ public class TileEntityChungus extends TileEntity implements IFluidAcceptor, IFl
 	public void networkUnpack(NBTTagCompound data) {
 		this.power = data.getLong("power");
 		this.turnTimer = data.getInteger("operational");
-		this.tanks[0].setTankType(FluidType.values()[data.getInteger("type")]);
+		this.tanks[0].setTankType(FluidTypeTheOldOne.values()[data.getInteger("type")]);
 	}
 	
 	@Override

src/main/java/com/hbm/tileentity/machine/TileEntityCondenser.java

@@ -4,10 +4,11 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.hbm.blocks.BlockDummyable;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidSource;
 import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.lib.Library;
 import com.hbm.main.ModEventHandler;
 
@@ -27,8 +28,8 @@ public class TileEntityCondenser extends TileEntity implements IFluidAcceptor, I
 	
 	public TileEntityCondenser() {
 		tanks = new FluidTank[2];
-		tanks[0] = new FluidTank(FluidType.SPENTSTEAM, 100, 0);
+		tanks[0] = new FluidTank(FluidTypeTheOldOne.SPENTSTEAM, 100, 0);
-		tanks[1] = new FluidTank(FluidType.WATER, 100, 1);
+		tanks[1] = new FluidTank(FluidTypeTheOldOne.WATER, 100, 1);
 	}
 	
 	@Override

src/main/java/com/hbm/tileentity/machine/TileEntityCore.java

@@ -4,8 +4,10 @@ import java.util.List;
 
 import com.hbm.entity.effect.EntityCloudFleijaRainbow;
 import com.hbm.entity.logic.EntityNukeExplosionMK3;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
+import com.hbm.inventory.fluid.Fluids;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemCatalyst;
 import com.hbm.lib.Library;
@@ -30,8 +32,8 @@ public class TileEntityCore extends TileEntityMachineBase {
 	public TileEntityCore() {
 		super(3);
 		tanks = new FluidTank[2];
-		tanks[0] = new FluidTank(FluidType.DEUTERIUM, 128000, 0);
+		tanks[0] = new FluidTank(FluidTypeTheOldOne.DEUTERIUM, 128000, 0);
-		tanks[1] = new FluidTank(FluidType.TRITIUM, 128000, 1);
+		tanks[1] = new FluidTank(FluidTypeTheOldOne.TRITIUM, 128000, 1);
 	}
 
 	@Override
@@ -97,8 +99,8 @@ public class TileEntityCore extends TileEntityMachineBase {
 	
 	public void networkUnpack(NBTTagCompound data) {
 
-		tanks[0].setTankType(FluidType.getEnum(data.getInteger("tank0")));
+		tanks[0].setTankType(FluidTypeTheOldOne.getEnum(data.getInteger("tank0")));
-		tanks[1].setTankType(FluidType.getEnum(data.getInteger("tank1")));
+		tanks[1].setTankType(FluidTypeTheOldOne.getEnum(data.getInteger("tank1")));
 		tanks[0].setFill(data.getInteger("fill0"));
 		tanks[1].setFill(data.getInteger("fill1"));
 		field = data.getInteger("field");
@@ -172,33 +174,28 @@ public class TileEntityCore extends TileEntityMachineBase {
 	}
 	
 	public float getFuelEfficiency(FluidType type) {
-		
+		if(type == Fluids.HYDROGEN)
-		switch(type) {
-
-		case HYDROGEN:
 			return 1.0F;
-		case DEUTERIUM:
+		if(type == Fluids.DEUTERIUM)
 			return 1.5F;
-		case TRITIUM:
+		if(type == Fluids.TRITIUM)
 			return 1.7F;
-		case OXYGEN:
+		if(type == Fluids.OXYGEN)
 			return 1.2F;
-		case ACID:
+		if(type == Fluids.ACID)
 			return 1.4F;
-		case XENON:
+		if(type == Fluids.XENON)
 			return 1.5F;
-		case SAS3:
+		if(type == Fluids.SAS3)
 			return 2.0F;
-		case BALEFIRE:
+		if(type == Fluids.BALEFIRE)
 			return 2.5F;
-		case AMAT:
+		if(type == Fluids.AMAT)
 			return 2.2F;
-		case ASCHRAB:
+		if(type == Fluids.ASCHRAB)
 			return 2.7F;
-		default:
 		return 0;
 	}
-	}
 	
 	//TODO: move stats to the AMSCORE class
 	public int getCore() {

src/main/java/com/hbm/tileentity/machine/TileEntityCoreEmitter.java

@@ -3,9 +3,10 @@ package com.hbm.tileentity.machine;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.lib.ModDamageSource;
 import com.hbm.tileentity.TileEntityMachineBase;
 
@@ -38,7 +39,7 @@ public class TileEntityCoreEmitter extends TileEntityMachineBase implements IEne
 
 	public TileEntityCoreEmitter() {
 		super(0);
-		tank = new FluidTank(FluidType.CRYOGEL, 64000, 0);
+		tank = new FluidTank(FluidTypeTheOldOne.CRYOGEL, 64000, 0);
 	}
 
 	@Override

src/main/java/com/hbm/tileentity/machine/TileEntityCoreInjector.java

@@ -3,9 +3,10 @@ package com.hbm.tileentity.machine;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.tileentity.TileEntityMachineBase;
 
 import cpw.mods.fml.relauncher.Side;
@@ -25,8 +26,8 @@ public class TileEntityCoreInjector extends TileEntityMachineBase implements IFl
 	public TileEntityCoreInjector() {
 		super(4);
 		tanks = new FluidTank[2];
-		tanks[0] = new FluidTank(FluidType.DEUTERIUM, 128000, 0);
+		tanks[0] = new FluidTank(FluidTypeTheOldOne.DEUTERIUM, 128000, 0);
-		tanks[1] = new FluidTank(FluidType.TRITIUM, 128000, 1);
+		tanks[1] = new FluidTank(FluidTypeTheOldOne.TRITIUM, 128000, 1);
 	}
 
 	@Override

src/main/java/com/hbm/tileentity/machine/TileEntityCoreReceiver.java

@@ -3,9 +3,10 @@ package com.hbm.tileentity.machine;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.lib.Library;
 import com.hbm.tileentity.TileEntityMachineBase;
 
@@ -28,7 +29,7 @@ public class TileEntityCoreReceiver extends TileEntityMachineBase implements IEn
 
 	public TileEntityCoreReceiver() {
 		super(0);
-		tank = new FluidTank(FluidType.CRYOGEL, 64000, 0);
+		tank = new FluidTank(FluidTypeTheOldOne.CRYOGEL, 64000, 0);
 	}
 
 	@Override

src/main/java/com/hbm/tileentity/machine/TileEntityDeuteriumExtractor.java

@@ -3,10 +3,11 @@ package com.hbm.tileentity.machine;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidSource;
 import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.lib.Library;
 import com.hbm.packet.AuxElectricityPacket;
 import com.hbm.packet.PacketDispatcher;
@@ -28,8 +29,8 @@ public class TileEntityDeuteriumExtractor extends TileEntityMachineBase implemen
 	public TileEntityDeuteriumExtractor() {
 		super(0);
 		tanks = new FluidTank[2];
-		tanks[0] = new FluidTank(FluidType.WATER, 1000, 0);
+		tanks[0] = new FluidTank(FluidTypeTheOldOne.WATER, 1000, 0);
-		tanks[1] = new FluidTank(FluidType.HEAVYWATER, 100, 0);
+		tanks[1] = new FluidTank(FluidTypeTheOldOne.HEAVYWATER, 100, 0);
 	}
 
 	@Override

src/main/java/com/hbm/tileentity/machine/TileEntityDeuteriumTower.java

@@ -1,7 +1,7 @@
 package com.hbm.tileentity.machine;
 
 import com.hbm.blocks.BlockDummyable;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.inventory.FluidTank;
 
 import cpw.mods.fml.relauncher.Side;
@@ -15,11 +15,11 @@ public class TileEntityDeuteriumTower extends TileEntityDeuteriumExtractor {
 
 	public TileEntityDeuteriumTower() {
 		tanks = new FluidTank[2];
-		tanks[0] = new FluidTank(FluidType.WATER, 50000, 0);
+		tanks[0] = new FluidTank(FluidTypeTheOldOne.WATER, 50000, 0);
-		tanks[1] = new FluidTank(FluidType.HEAVYWATER, 5000, 0);
+		tanks[1] = new FluidTank(FluidTypeTheOldOne.HEAVYWATER, 5000, 0);
 	}
 
-	public void fillFluidInit(FluidType type) {
+	public void fillFluidInit(FluidTypeTheOldOne type) {
 		
 		int offsetX = 0;
 		int offsetZ = 0;

src/main/java/com/hbm/tileentity/machine/TileEntityFWatzCore.java

@@ -4,11 +4,12 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.interfaces.IReactor;
 import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.items.ModItems;
 import com.hbm.lib.Library;
 import com.hbm.packet.AuxElectricityPacket;
@@ -43,9 +44,9 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory,
 	public TileEntityFWatzCore() {
 		slots = new ItemStack[7];
 		tanks = new FluidTank[3];
-		tanks[0] = new FluidTank(FluidType.COOLANT, 128000, 0);
+		tanks[0] = new FluidTank(FluidTypeTheOldOne.COOLANT, 128000, 0);
-		tanks[1] = new FluidTank(FluidType.AMAT, 64000, 1);
+		tanks[1] = new FluidTank(FluidTypeTheOldOne.AMAT, 64000, 1);
-		tanks[2] = new FluidTank(FluidType.ASCHRAB, 64000, 2);
+		tanks[2] = new FluidTank(FluidTypeTheOldOne.ASCHRAB, 64000, 2);
 	}
 	@Override
 	public int getSizeInventory() {

src/main/java/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java

@@ -4,11 +4,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.hbm.blocks.ModBlocks;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.interfaces.IReactor;
 import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.items.ModItems;
 import com.hbm.lib.Library;
 import com.hbm.packet.AuxElectricityPacket;
@@ -37,9 +38,9 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve
 	public TileEntityFusionMultiblock() {
 		slots = new ItemStack[12];
 		tanks = new FluidTank[3];
-		tanks[0] = new FluidTank(FluidType.WATER, 128000, 0);
+		tanks[0] = new FluidTank(FluidTypeTheOldOne.WATER, 128000, 0);
-		tanks[1] = new FluidTank(FluidType.DEUTERIUM, 64000, 1);
+		tanks[1] = new FluidTank(FluidTypeTheOldOne.DEUTERIUM, 64000, 1);
-		tanks[2] = new FluidTank(FluidType.TRITIUM, 64000, 2);
+		tanks[2] = new FluidTank(FluidTypeTheOldOne.TRITIUM, 64000, 2);
 	}
 	@Override
 	public int getSizeInventory() {

src/main/java/com/hbm/tileentity/machine/TileEntityITER.java

@@ -5,10 +5,11 @@ import java.util.List;
 
 import com.hbm.blocks.ModBlocks;
 import com.hbm.blocks.machine.MachineITER;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidSource;
 import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.recipes.BreederRecipes;
 import com.hbm.inventory.recipes.FusionRecipes;
 import com.hbm.inventory.recipes.BreederRecipes.BreederRecipe;
@@ -51,9 +52,9 @@ public class TileEntityITER extends TileEntityMachineBase implements IEnergyUser
 	public TileEntityITER() {
 		super(5);
 		tanks = new FluidTank[2];
-		tanks[0] = new FluidTank(FluidType.WATER, 1280000, 0);
+		tanks[0] = new FluidTank(FluidTypeTheOldOne.WATER, 1280000, 0);
-		tanks[1] = new FluidTank(FluidType.ULTRAHOTSTEAM, 128000, 1);
+		tanks[1] = new FluidTank(FluidTypeTheOldOne.ULTRAHOTSTEAM, 128000, 1);
-		plasma = new FluidTank(FluidType.PLASMA_DT, 16000, 2);
+		plasma = new FluidTank(FluidTypeTheOldOne.PLASMA_DT, 16000, 2);
 	}
 
 	@Override

src/main/java/com/hbm/tileentity/machine/TileEntityMachineBAT9000.java

@@ -1,7 +1,6 @@
 package com.hbm.tileentity.machine;
 
-import com.hbm.handler.FluidTypeHandler.FluidTrait;
+import com.hbm.inventory.fluid.FluidType;
-import com.hbm.handler.FluidTypeHandler.FluidType;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
@@ -21,7 +20,7 @@ public class TileEntityMachineBAT9000 extends TileEntityBarrel {
 	@Override
 	public void checkFluidInteraction() {
 		
-		if(tank.getTankType().traits.contains(FluidTrait.AMAT)) {
+		if(tank.getTankType().isAntimatter()) {
 			worldObj.func_147480_a(xCoord, yCoord, zCoord, false);
 			worldObj.newExplosion(null, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 10, true, true);
 		}

src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoiler.java

@@ -5,11 +5,12 @@ import java.util.List;
 
 import com.hbm.blocks.ModBlocks;
 import com.hbm.blocks.machine.MachineBoiler;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.interfaces.IFluidSource;
 import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.recipes.MachineRecipes;
 import com.hbm.lib.Library;
 import com.hbm.packet.AuxGaugePacket;
@@ -47,8 +48,8 @@ public class TileEntityMachineBoiler extends TileEntity implements ISidedInvento
 	public TileEntityMachineBoiler() {
 		slots = new ItemStack[7];
 		tanks = new FluidTank[2];
-		tanks[0] = new FluidTank(FluidType.WATER, 8000, 0);
+		tanks[0] = new FluidTank(FluidTypeTheOldOne.WATER, 8000, 0);
-		tanks[1] = new FluidTank(FluidType.STEAM, 8000, 1);
+		tanks[1] = new FluidTank(FluidTypeTheOldOne.STEAM, 8000, 1);
 	}
 
 	@Override
@@ -235,9 +236,9 @@ public class TileEntityMachineBoiler extends TileEntity implements ISidedInvento
 			Object[] outs = MachineRecipes.getBoilerOutput(tanks[0].getTankType());
 			
 			if(outs == null) {
-				tanks[1].setTankType(FluidType.NONE);
+				tanks[1].setTankType(FluidTypeTheOldOne.NONE);
 			} else {
-				tanks[1].setTankType((FluidType) outs[0]);
+				tanks[1].setTankType((FluidTypeTheOldOne) outs[0]);
 			}
 			
 			tanks[1].unloadTank(5, 6, slots);

src/main/java/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java

@@ -5,11 +5,12 @@ import java.util.List;
 
 import com.hbm.blocks.ModBlocks;
 import com.hbm.blocks.machine.MachineBoiler;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.interfaces.IFluidSource;
 import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.recipes.MachineRecipes;
 import com.hbm.lib.Library;
 import com.hbm.packet.AuxElectricityPacket;
@@ -49,8 +50,8 @@ public class TileEntityMachineBoilerElectric extends TileEntity implements ISide
 	public TileEntityMachineBoilerElectric() {
 		slots = new ItemStack[7];
 		tanks = new FluidTank[2];
-		tanks[0] = new FluidTank(FluidType.WATER, 16000, 0);
+		tanks[0] = new FluidTank(FluidTypeTheOldOne.WATER, 16000, 0);
-		tanks[1] = new FluidTank(FluidType.STEAM, 16000, 1);
+		tanks[1] = new FluidTank(FluidTypeTheOldOne.STEAM, 16000, 1);
 	}
 
 	@Override
@@ -245,9 +246,9 @@ public class TileEntityMachineBoilerElectric extends TileEntity implements ISide
 			Object[] outs = MachineRecipes.getBoilerOutput(tanks[0].getTankType());
 			
 			if(outs == null) {
-				tanks[1].setTankType(FluidType.NONE);
+				tanks[1].setTankType(FluidTypeTheOldOne.NONE);
 			} else {
-				tanks[1].setTankType((FluidType) outs[0]);
+				tanks[1].setTankType((FluidTypeTheOldOne) outs[0]);
 			}
 			
 			tanks[1].unloadTank(5, 6, slots);

src/main/java/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java

@@ -3,10 +3,11 @@ package com.hbm.tileentity.machine;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.items.ModItems;
 import com.hbm.lib.Library;
 import com.hbm.packet.AuxElectricityPacket;
@@ -43,7 +44,7 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv
 	
 	public TileEntityMachineCMBFactory() {
 		slots = new ItemStack[6];
-		tank = new FluidTank(FluidType.WATZ, 8000, 0);
+		tank = new FluidTank(FluidTypeTheOldOne.WATZ, 8000, 0);
 	}
 
 	@Override

src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java

@@ -4,13 +4,14 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.interfaces.IFluidSource;
 import com.hbm.inventory.FluidStack;
 import com.hbm.inventory.FluidTank;
 import com.hbm.inventory.UpgradeManager;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.recipes.MachineRecipes;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemChemistryTemplate;
@@ -62,10 +63,10 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve
 	public TileEntityMachineChemplant() {
 		slots = new ItemStack[21];
 		tanks = new FluidTank[4];
-		tanks[0] = new FluidTank(FluidType.NONE, 24000, 0);
+		tanks[0] = new FluidTank(FluidTypeTheOldOne.NONE, 24000, 0);
-		tanks[1] = new FluidTank(FluidType.NONE, 24000, 1);
+		tanks[1] = new FluidTank(FluidTypeTheOldOne.NONE, 24000, 1);
-		tanks[2] = new FluidTank(FluidType.NONE, 24000, 2);
+		tanks[2] = new FluidTank(FluidTypeTheOldOne.NONE, 24000, 2);
-		tanks[3] = new FluidTank(FluidType.NONE, 24000, 3);
+		tanks[3] = new FluidTank(FluidTypeTheOldOne.NONE, 24000, 3);
 	}
 
 	@Override
@@ -540,10 +541,10 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve
 			FluidStack[] inputs = MachineRecipes.getFluidInputFromTempate(slots[4]);
 			FluidStack[] outputs = MachineRecipes.getFluidOutputFromTempate(slots[4]);
 
-			tanks[0].setTankType(inputs[0] == null ? FluidType.NONE : inputs[0].type);
+			tanks[0].setTankType(inputs[0] == null ? FluidTypeTheOldOne.NONE : inputs[0].type);
-			tanks[1].setTankType(inputs[1] == null ? FluidType.NONE : inputs[1].type);
+			tanks[1].setTankType(inputs[1] == null ? FluidTypeTheOldOne.NONE : inputs[1].type);
-			tanks[2].setTankType(outputs[0] == null ? FluidType.NONE : outputs[0].type);
+			tanks[2].setTankType(outputs[0] == null ? FluidTypeTheOldOne.NONE : outputs[0].type);
-			tanks[3].setTankType(outputs[1] == null ? FluidType.NONE : outputs[1].type);
+			tanks[3].setTankType(outputs[1] == null ? FluidTypeTheOldOne.NONE : outputs[1].type);
 		}
 	}
 	

src/main/java/com/hbm/tileentity/machine/TileEntityMachineCoal.java

@@ -14,11 +14,12 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.hbm.blocks.machine.MachineCoal;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidContainer;
 import com.hbm.inventory.FluidContainerRegistry;
 import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.items.ModItems;
 import com.hbm.lib.Library;
 import com.hbm.packet.AuxElectricityPacket;
@@ -46,7 +47,7 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory
 	
 	public TileEntityMachineCoal() {
 		slots = new ItemStack[4];
-		tank = new FluidTank(FluidType.WATER, 5000, 0);
+		tank = new FluidTank(FluidTypeTheOldOne.WATER, 5000, 0);
 	}
 
 	@Override
@@ -118,7 +119,7 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory
 	@Override
 	public boolean isItemValidForSlot(int i, ItemStack stack) {
 		if(i == 0)
-			if(FluidContainerRegistry.getFluidContent(stack, FluidType.WATER) > 0)
+			if(FluidContainerRegistry.getFluidContent(stack, FluidTypeTheOldOne.WATER) > 0)
 				return true;
 		if(i == 2)
 			if(stack.getItem() instanceof IBatteryItem)

src/main/java/com/hbm/tileentity/machine/TileEntityMachineCrystallizer.java

@@ -4,9 +4,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.hbm.blocks.BlockDummyable;
-import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.handler.FluidTypeHandler.FluidTypeTheOldOne;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.fluid.FluidType;
 import com.hbm.inventory.recipes.CrystallizerRecipes;
 import com.hbm.items.ModItems;
 import com.hbm.items.machine.ItemMachineUpgrade;
@@ -39,7 +40,7 @@ public class TileEntityMachineCrystallizer extends TileEntityMachineBase impleme
 
 	public TileEntityMachineCrystallizer() {
 		super(7);
-		tank = new FluidTank(FluidType.ACID, 8000, 0);
+		tank = new FluidTank(FluidTypeTheOldOne.ACID, 8000, 0);
 	}
 
 	@Override