AMS wireframe textures, limiter GUI, mutliple fluid texture sheets

2026-01-25 10:32:49 +00:00 · 2017-11-24 10:39:54 +01:00 · 2017-11-24 10:39:54 +01:00 · 5e793f3e50
commit 5e793f3e50
parent f5d587e2e3
61 changed files with 3242 additions and 1274 deletions
--- a/assets/hbm/lang/de_DE.lang
+++ b/assets/hbm/lang/de_DE.lang
@ -36,6 +36,7 @@ hbmfluid.biogas=Biogas
 hbmfluid.biofuel=Biodiesel
 hbmfluid.sas3=Schrabidiumtrisulfat
 hbmfluid.nitan=NITAN© 100 Oktan Supertreibstoff
+hbmfluid.cryogel=Kryogel

 chem.TEST=Test
 chem.FP_HEAVYOIL=Schwerölverarbeitung
--- a/assets/hbm/lang/en_US.lang
+++ b/assets/hbm/lang/en_US.lang
@ -36,6 +36,7 @@ hbmfluid.biogas=Biogas
 hbmfluid.biofuel=Biofuel
 hbmfluid.sas3=Schrabidium Trisulfide
 hbmfluid.nitan=NITAN© 100 Octane Super Fuel
+hbmfluid.cryogel=Cryogel

 chem.TEST=Test
 chem.FP_HEAVYOIL=Heavy Oil Processing
--- a/assets/hbm/models/ams_base.obj
+++ b/assets/hbm/models/ams_base.obj
@ -73,6 +73,136 @@ v -0.229610 1.750000 -0.554328
 v -0.229610 2.000000 -0.554328
 v 0.750000 3.000000 0.750000
 v 0.750000 3.000000 -0.750000
+vt 0.259127 0.259128
+vt 0.544865 0.259127
+vt 0.544865 0.544865
+vt 0.695462 0.306750
+vt 0.743085 0.306750
+vt 0.743085 0.497242
+vt 0.306750 0.108530
+vt 0.497242 0.108530
+vt 0.108530 0.497242
+vt 0.108530 0.306751
+vt 0.497242 0.695462
+vt 0.306751 0.695462
+vt 0.259127 0.544865
+vt 0.695462 0.497242
+vt 0.043049 0.876806
+vt 0.013285 0.876806
+vt 0.013285 0.847042
+vt 0.328787 0.876806
+vt 0.328787 0.906570
+vt 0.043049 0.906570
+vt 0.328787 0.847042
+vt 0.358551 0.847042
+vt 0.358551 0.876806
+vt 0.043049 0.847042
+vt 0.043049 0.817277
+vt 0.328787 0.817277
+vt 0.328787 0.936335
+vt 0.414884 0.876806
+vt 0.385120 0.876806
+vt 0.385120 0.847042
+vt 0.700622 0.876806
+vt 0.700622 0.906570
+vt 0.414884 0.906570
+vt 0.700622 0.847042
+vt 0.730386 0.847042
+vt 0.730386 0.876806
+vt 0.414884 0.847042
+vt 0.414884 0.817277
+vt 0.700622 0.817277
+vt 0.700622 0.936335
+vt 0.060908 0.497242
+vt 0.037096 0.473431
+vt 0.037096 0.330562
+vt 0.060907 0.306751
+vt 0.306750 0.060908
+vt 0.497242 0.060907
+vt 0.497242 0.743085
+vt 0.306751 0.743085
+vt 0.330562 0.037096
+vt 0.330562 0.013285
+vt 0.473431 0.013285
+vt 0.473431 0.037096
+vt 0.473431 0.766897
+vt 0.330562 0.766897
+vt 0.766897 0.330562
+vt 0.766897 0.473431
+vt 0.960146 0.013285
+vt 0.960146 0.156153
+vt 0.817277 0.156153
+vt 0.473431 0.790708
+vt 0.330562 0.790708
+vt 0.790708 0.330562
+vt 0.790708 0.473431
+vt 0.013285 0.473431
+vt 0.013285 0.330562
+vt 0.370051 0.986715
+vt 0.347753 0.986715
+vt 0.347753 0.962904
+vt 0.325455 0.986715
+vt 0.325455 0.962904
+vt 0.303157 0.986715
+vt 0.303157 0.962904
+vt 0.280859 0.986715
+vt 0.280859 0.962904
+vt 0.258561 0.986715
+vt 0.258561 0.962904
+vt 0.236263 0.986715
+vt 0.236263 0.962904
+vt 0.213965 0.986715
+vt 0.213965 0.962904
+vt 0.191668 0.986715
+vt 0.191668 0.962904
+vt 0.169370 0.986715
+vt 0.169370 0.962904
+vt 0.147072 0.986715
+vt 0.147072 0.962904
+vt 0.817277 0.448983
+vt 0.849026 0.460208
+vt 0.817277 0.550007
+vt 0.124774 0.986715
+vt 0.124774 0.962904
+vt 0.817277 0.698391
+vt 0.850952 0.698391
+vt 0.817277 0.793637
+vt 0.102476 0.986715
+vt 0.102476 0.962904
+vt 0.817277 0.576576
+vt 0.850952 0.576576
+vt 0.817277 0.671822
+vt 0.080178 0.986715
+vt 0.080178 0.962904
+vt 0.817277 0.321391
+vt 0.849026 0.332615
+vt 0.817277 0.422414
+vt 0.057880 0.986715
+vt 0.057880 0.962904
+vt 0.817277 0.227623
+vt 0.884476 0.182722
+vt 0.929376 0.249921
+vt 0.035582 0.986715
+vt 0.013285 0.986715
+vt 0.013285 0.962904
+vt 0.035582 0.962904
+vt 0.043049 0.936335
+vt 0.414884 0.936335
+vt 0.817277 0.013285
+vt 0.370050 0.962904
+vt 0.920843 0.270521
+vt 0.862178 0.294821
+vt 0.905076 0.286288
+vt 0.884476 0.294821
+vt 0.841577 0.286288
+vt 0.825810 0.270521
+vt 0.817277 0.249921
+vt 0.825810 0.207022
+vt 0.841577 0.191256
+vt 0.862178 0.182722
+vt 0.905076 0.191256
+vt 0.920843 0.207023
+vt 0.929376 0.227623
 vn 0.000000 -1.000000 0.000000
 vn 1.000000 0.000000 0.000000
 vn 0.000000 0.316200 -0.948700
@ -102,127 +232,113 @@ vn -0.831500 0.000000 -0.555600
 vn -0.195100 0.000000 -0.980800
 vn -0.555600 0.000000 -0.831500
 s off
-f 3//1 4//1 2//1
-f 8//2 28//2 27//2
-f 7//3 8//3 4//3
-f 5//4 7//4 3//4
-f 6//5 5//5 1//5
-f 8//6 6//6 2//6
-f 12//7 11//7 9//7
-f 16//8 15//8 11//8
-f 14//2 13//2 15//2
-f 10//9 9//9 13//9
-f 11//1 15//1 13//1
-f 16//10 12//10 10//10
-f 20//9 19//9 17//9
-f 24//7 23//7 19//7
-f 22//8 21//8 23//8
-f 18//2 17//2 21//2
-f 19//1 23//1 21//1
-f 24//10 20//10 18//10
-f 26//10 30//10 29//10
-f 5//7 26//7 25//7
-f 7//8 25//8 28//8
-f 6//9 27//9 26//9
-f 29//9 33//9 36//9
-f 25//10 29//10 32//10
-f 27//10 31//10 30//10
-f 28//10 32//10 31//10
-f 35//10 36//10 33//10
-f 31//8 35//8 34//8
-f 32//7 36//7 35//7
-f 30//2 34//2 33//2
-f 40//11 42//11 41//11
-f 42//12 44//12 43//12
-f 44//13 46//13 45//13
-f 46//14 48//14 47//14
-f 48//15 50//15 49//15
-f 50//16 52//16 51//16
-f 52//17 54//17 53//17
-f 54//18 56//18 55//18
-f 56//19 58//19 57//19
-f 58//20 60//20 59//20
-f 27//21 31//21 71//21
-f 60//22 62//22 61//22
-f 32//23 28//23 72//23
-f 62//24 64//24 63//24
-f 29//21 25//21 38//21
-f 64//25 66//25 65//25
-f 26//23 30//23 37//23
-f 66//26 68//26 67//26
-f 60//10 52//10 44//10
-f 70//27 40//27 39//27
-f 68//28 70//28 69//28
-f 53//1 65//1 69//1
-f 1//1 3//1 2//1
-f 6//2 8//2 27//2
-f 3//3 7//3 4//3
-f 1//4 5//4 3//4
-f 2//5 6//5 1//5
-f 4//6 8//6 2//6
-f 10//7 12//7 9//7
-f 12//8 16//8 11//8
-f 16//2 14//2 15//2
-f 14//9 10//9 13//9
-f 9//1 11//1 13//1
-f 14//10 16//10 10//10
-f 18//9 20//9 17//9
-f 20//7 24//7 19//7
-f 24//8 22//8 23//8
-f 22//2 18//2 21//2
-f 17//1 19//1 21//1
-f 22//10 24//10 18//10
-f 25//10 26//10 29//10
-f 7//7 5//7 25//7
-f 8//8 7//8 28//8
-f 5//9 6//9 26//9
-f 32//9 29//9 36//9
-f 28//10 25//10 32//10
-f 26//10 27//10 30//10
-f 27//10 28//10 31//10
-f 34//10 35//10 33//10
-f 30//8 31//8 34//8
-f 31//7 32//7 35//7
-f 29//2 30//2 33//2
-f 39//11 40//11 41//11
-f 41//12 42//12 43//12
-f 43//13 44//13 45//13
-f 45//14 46//14 47//14
-f 47//15 48//15 49//15
-f 49//16 50//16 51//16
-f 51//17 52//17 53//17
-f 53//18 54//18 55//18
-f 55//19 56//19 57//19
-f 57//20 58//20 59//20
-f 59//22 60//22 61//22
-f 61//24 62//24 63//24
-f 63//25 64//25 65//25
-f 65//26 66//26 67//26
-f 44//10 42//10 68//10
-f 40//10 70//10 68//10
-f 68//10 66//10 64//10
-f 64//10 62//10 60//10
-f 60//10 58//10 52//10
-f 56//10 54//10 52//10
-f 52//10 50//10 48//10
-f 48//10 46//10 44//10
-f 42//10 40//10 68//10
-f 68//10 64//10 44//10
-f 58//10 56//10 52//10
-f 52//10 48//10 44//10
-f 44//10 64//10 60//10
-f 69//27 70//27 39//27
-f 67//28 68//28 69//28
-f 69//1 39//1 41//1
-f 41//1 43//1 45//1
-f 45//1 47//1 49//1
-f 49//1 51//1 53//1
-f 53//1 55//1 57//1
-f 57//1 59//1 53//1
-f 61//1 63//1 65//1
-f 65//1 67//1 69//1
-f 69//1 41//1 45//1
-f 45//1 49//1 69//1
-f 53//1 59//1 61//1
-f 61//1 65//1 53//1
-f 69//1 49//1 53//1
+f 3/1/1 4/2/1 2/3/1
+f 8/4/2 28/5/2 27/6/2
+f 7/7/3 8/8/3 4/2/3
+f 5/9/4 7/10/4 3/1/4
+f 6/11/5 5/12/5 1/13/5
+f 8/4/6 6/14/6 2/3/6
+f 12/15/7 11/16/7 9/17/7
+f 16/18/8 15/19/8 11/20/8
+f 14/21/2 13/22/2 15/23/2
+f 10/24/9 9/25/9 13/26/9
+f 11/20/1 15/19/1 13/27/1
+f 16/18/10 12/15/10 10/24/10
+f 20/28/9 19/29/9 17/30/9
+f 24/31/7 23/32/7 19/33/7
+f 22/34/8 21/35/8 23/36/8
+f 18/37/2 17/38/2 21/39/2
+f 19/33/1 23/32/1 21/40/1
+f 24/31/10 20/28/10 18/37/10
+f 26/41/10 30/42/10 29/43/10
+f 5/9/7 26/41/7 25/44/7
+f 7/7/8 25/45/8 28/46/8
+f 6/11/9 27/47/9 26/48/9
+f 29/49/9 33/50/9 36/51/9
+f 25/45/10 29/49/10 32/52/10
+f 27/47/10 31/53/10 30/54/10
+f 28/5/10 32/55/10 31/56/10
+f 35/57/10 36/58/10 33/59/10
+f 31/53/8 35/60/8 34/61/8
+f 32/55/7 36/62/7 35/63/7
+f 30/42/2 34/64/2 33/65/2
+f 40/66/11 42/67/11 41/68/11
+f 42/67/12 44/69/12 43/70/12
+f 44/69/13 46/71/13 45/72/13
+f 46/71/14 48/73/14 47/74/14
+f 48/73/15 50/75/15 49/76/15
+f 50/75/16 52/77/16 51/78/16
+f 52/77/17 54/79/17 53/80/17
+f 54/79/18 56/81/18 55/82/18
+f 56/81/19 58/83/19 57/84/19
+f 58/83/20 60/85/20 59/86/20
+f 27/87/21 31/88/21 71/89/21
+f 60/85/22 62/90/22 61/91/22
+f 32/92/23 28/93/23 72/94/23
+f 62/90/24 64/95/24 63/96/24
+f 29/97/21 25/98/21 38/99/21
+f 64/95/25 66/100/25 65/101/25
+f 26/102/23 30/103/23 37/104/23
+f 66/100/26 68/105/26 67/106/26
+f 60/107/10 52/108/10 44/109/10
+f 70/110/27 40/111/27 39/112/27
+f 68/105/28 70/110/28 69/113/28
+f 1/13/1 3/1/1 2/3/1
+f 6/14/2 8/4/2 27/6/2
+f 3/1/3 7/7/3 4/2/3
+f 1/13/4 5/9/4 3/1/4
+f 2/3/5 6/11/5 1/13/5
+f 4/2/6 8/4/6 2/3/6
+f 10/24/7 12/15/7 9/17/7
+f 12/15/8 16/18/8 11/20/8
+f 16/18/2 14/21/2 15/23/2
+f 14/21/9 10/24/9 13/26/9
+f 9/114/1 11/20/1 13/27/1
+f 14/21/10 16/18/10 10/24/10
+f 18/37/9 20/28/9 17/30/9
+f 20/28/7 24/31/7 19/33/7
+f 24/31/8 22/34/8 23/36/8
+f 22/34/2 18/37/2 21/39/2
+f 17/115/1 19/33/1 21/40/1
+f 22/34/10 24/31/10 18/37/10
+f 25/44/10 26/41/10 29/43/10
+f 7/10/7 5/9/7 25/44/7
+f 8/8/8 7/7/8 28/46/8
+f 5/12/9 6/11/9 26/48/9
+f 32/52/9 29/49/9 36/51/9
+f 28/46/10 25/45/10 32/52/10
+f 26/48/10 27/47/10 30/54/10
+f 27/6/10 28/5/10 31/56/10
+f 34/116/10 35/57/10 33/59/10
+f 30/54/8 31/53/8 34/61/8
+f 31/56/7 32/55/7 35/63/7
+f 29/43/2 30/42/2 33/65/2
+f 39/117/11 40/66/11 41/68/11
+f 41/68/12 42/67/12 43/70/12
+f 43/70/13 44/69/13 45/72/13
+f 45/72/14 46/71/14 47/74/14
+f 47/74/15 48/73/15 49/76/15
+f 49/76/16 50/75/16 51/78/16
+f 51/78/17 52/77/17 53/80/17
+f 53/80/18 54/79/18 55/82/18
+f 55/82/19 56/81/19 57/84/19
+f 57/84/20 58/83/20 59/86/20
+f 59/86/22 60/85/22 61/91/22
+f 61/91/24 62/90/24 63/96/24
+f 63/96/25 64/95/25 65/101/25
+f 65/101/26 66/100/26 67/106/26
+f 44/109/10 42/118/10 68/119/10
+f 40/120/10 70/121/10 68/119/10
+f 68/119/10 66/122/10 64/123/10
+f 64/123/10 62/124/10 60/107/10
+f 60/107/10 58/125/10 52/108/10
+f 56/126/10 54/127/10 52/108/10
+f 52/108/10 50/128/10 48/129/10
+f 48/129/10 46/130/10 44/109/10
+f 42/118/10 40/120/10 68/119/10
+f 68/119/10 64/123/10 44/109/10
+f 58/125/10 56/126/10 52/108/10
+f 52/108/10 48/129/10 44/109/10
+f 44/109/10 64/123/10 60/107/10
+f 69/113/27 70/110/27 39/112/27
+f 67/106/28 68/105/28 69/113/28
--- a/assets/hbm/models/ams_emitter.obj
+++ b/assets/hbm/models/ams_emitter.obj
--- a/assets/hbm/models/ams_limiter.obj
+++ b/assets/hbm/models/ams_limiter.obj
--- a/assets/hbm/textures/blocks/ams_base.png
+++ b/assets/hbm/textures/blocks/ams_base.png
--- a/assets/hbm/textures/blocks/ams_emitter.png
+++ b/assets/hbm/textures/blocks/ams_emitter.png
--- a/assets/hbm/textures/blocks/ams_limiter.png
+++ b/assets/hbm/textures/blocks/ams_limiter.png
--- a/assets/hbm/textures/blocks/ore_tikite.png
+++ b/assets/hbm/textures/blocks/ore_tikite.png
--- a/assets/hbm/textures/gui/fluids1.png
+++ b/assets/hbm/textures/gui/fluids1.png
--- a/assets/hbm/textures/gui/fluids2.png
+++ b/assets/hbm/textures/gui/fluids2.png
--- a/assets/hbm/textures/gui/gui_ams_base.png
+++ b/assets/hbm/textures/gui/gui_ams_base.png
--- a/assets/hbm/textures/gui/gui_ams_emitter.png
+++ b/assets/hbm/textures/gui/gui_ams_emitter.png
--- a/assets/hbm/textures/gui/gui_ams_limiter.png
+++ b/assets/hbm/textures/gui/gui_ams_limiter.png
--- a/assets/hbm/textures/gui/metal_dark.png
+++ b/assets/hbm/textures/gui/metal_dark.png
--- a/assets/hbm/textures/gui/metal_light.png
+++ b/assets/hbm/textures/gui/metal_light.png
--- a/assets/hbm/textures/items/plate_polymer.png
+++ b/assets/hbm/textures/items/plate_polymer.png
--- a/assets/hbm/textures/items/shimmer_sledge_original_hd.png
+++ b/assets/hbm/textures/items/shimmer_sledge_original_hd.png
--- a/assets/hbm/textures/models/ams_base.png
+++ b/assets/hbm/textures/models/ams_base.png
--- a/assets/hbm/textures/models/ams_emitter.png
+++ b/assets/hbm/textures/models/ams_emitter.png
--- a/assets/hbm/textures/models/ams_limiter.png
+++ b/assets/hbm/textures/models/ams_limiter.png
--- a/com/hbm/blocks/ModBlocks.java
+++ b/com/hbm/blocks/ModBlocks.java
@ -74,6 +74,8 @@ public class ModBlocks {
 	public static Block ore_oil;
 	public static Block ore_oil_empty;

+	public static Block ore_tikite;
+
 	public static Block block_uranium;
 	public static Block block_titanium;
 	public static Block block_sulfur;
@ -310,8 +312,11 @@ public class ModBlocks {
 	public static final int guiID_fwatz_multiblock = 33;

 	public static Block ams_base;
+	public static final int guiID_ams_base = 54;
 	public static Block ams_emitter;
+	public static final int guiID_ams_emitter = 55;
 	public static Block ams_limiter;
+	public static final int guiID_ams_limiter = 56;

 	public static Block machine_converter_he_rf;
 	public static final int guiID_converter_he_rf = 28;
@ -488,6 +493,8 @@ public class ModBlocks {
 		ore_oil = new BlockOre(Material.rock).setBlockName("ore_oil").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_oil");
 		ore_oil_empty = new BlockGeneric(Material.rock).setBlockName("ore_oil_empty").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_oil_empty");
 		
+		ore_tikite = new BlockGeneric(Material.rock).setBlockName("ore_tikite").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_tikite");
+		
 		block_uranium = new BlockGeneric(Material.iron).setBlockName("block_uranium").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_uranium");
 		block_titanium = new BlockGeneric(Material.iron).setBlockName("block_titanium").setCreativeTab(MainRegistry.tabBlock).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_titanium");
 		block_sulfur = new BlockGeneric(Material.iron).setBlockName("block_sulfur").setCreativeTab(MainRegistry.tabBlock).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":block_sulfur");
@ -828,6 +835,9 @@ public class ModBlocks {
 		GameRegistry.registerBlock(ore_nether_fire, ore_nether_fire.getUnlocalizedName());
 		GameRegistry.registerBlock(ore_nether_schrabidium, ItemSchrabidiumBlock.class, ore_nether_schrabidium.getUnlocalizedName());
 		
+		//End Ores
+		GameRegistry.registerBlock(ore_tikite, ore_tikite.getUnlocalizedName());
+		
 		//Blocks
 		GameRegistry.registerBlock(block_uranium, block_uranium.getUnlocalizedName());
 		GameRegistry.registerBlock(block_titanium, block_titanium.getUnlocalizedName());
--- a/com/hbm/blocks/machine/BlockAMSLimiter.java
+++ b/com/hbm/blocks/machine/BlockAMSLimiter.java
@ -2,12 +2,16 @@ package com.hbm.blocks.machine;

 import com.hbm.blocks.ModBlocks;
 import com.hbm.handler.MultiblockHandler;
+import com.hbm.main.MainRegistry;
 import com.hbm.tileentity.machine.TileEntityAMSLimiter;
+import com.hbm.tileentity.machine.TileEntityConverterHeRf;
 import com.hbm.tileentity.machine.TileEntityDummy;

+import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
 import net.minecraft.block.BlockContainer;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.MathHelper;
@ -38,6 +42,24 @@ public class BlockAMSLimiter extends BlockContainer {
 	public boolean renderAsNormalBlock() {
 		return false;
 	}
+	
+	@Override
+	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
+		if(world.isRemote)
+		{
+			return true;
+		} else if(!player.isSneaking())
+		{
+			TileEntityAMSLimiter entity = (TileEntityAMSLimiter) world.getTileEntity(x, y, z);
+			if(entity != null)
+			{
+				FMLNetworkHandler.openGui(player, MainRegistry.instance, ModBlocks.guiID_ams_limiter, world, x, y, z);
+			}
+			return true;
+		} else {
+			return false;
+		}
+	}

 	@Override
 	public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) {
--- a/com/hbm/handler/FluidTypeHandler.java
+++ b/com/hbm/handler/FluidTypeHandler.java
@ -3,67 +3,76 @@ package com.hbm.handler;
 public class FluidTypeHandler {
 	
 	public enum FluidType {
-		NONE		(0x888888, 8947848, 	0,	1, "hbmfluid.none"),
+		NONE		(0x888888, 8947848, 	0,	1,	1, "hbmfluid.none"),

-		WATER		(0x3333FF, 3355647, 	1,	1, "hbmfluid.water"),
-		STEAM		(0xe5e5e5, 15066597, 	9,	1, "hbmfluid.steam"),
-		COOLANT		(0xd8fcff, 14220543, 	2,	1, "hbmfluid.coolant"),
+		WATER		(0x3333FF, 3355647, 	1,	1,	1,  "hbmfluid.water"),
+		STEAM		(0xe5e5e5, 15066597, 	9,	1,	1,  "hbmfluid.steam"),
+		COOLANT		(0xd8fcff, 14220543, 	2,	1,	1,  "hbmfluid.coolant"),
 		
-		LAVA		(0xFF3300, 16724736, 	3,	1, "hbmfluid.lava"),
+		LAVA		(0xFF3300, 16724736, 	3,	1,	1,  "hbmfluid.lava"),
 		
-		DEUTERIUM	(0x0000FF, 255, 		4,	1, "hbmfluid.deuterium"),
-		TRITIUM		(0x000099, 153, 		5,	1, "hbmfluid.tritium"),
+		DEUTERIUM	(0x0000FF, 255, 		4,	1,	1,  "hbmfluid.deuterium"),
+		TRITIUM		(0x000099, 153, 		5,	1,	1,  "hbmfluid.tritium"),

-		OIL			(0x020202, 131586, 		6,	1, "hbmfluid.oil"),
-		HOTOIL		(0x300900, 3148032, 	8,	1, "hbmfluid.hotoil"),
+		OIL			(0x020202, 131586, 		6,	1,	1,  "hbmfluid.oil"),
+		HOTOIL		(0x300900, 3148032, 	8,	1,	1,  "hbmfluid.hotoil"),
 		
-		HEAVYOIL	(0x141312, 1315602,		2,	2, "hbmfluid.heavyoil"),
-		BITUMEN		(0x1f2426, 2040870,		3,	2, "hbmfluid.bitumen"),
-		SMEAR		(0x190f01, 1642241, 	7,	1, "hbmfluid.smear"),
-		HEATINGOIL	(0x211806, 2168838,		4,	2, "hbmfluid.heatingoil"),
+		HEAVYOIL	(0x141312, 1315602,		2,	2,	1,  "hbmfluid.heavyoil"),
+		BITUMEN		(0x1f2426, 2040870,		3,	2,	1,  "hbmfluid.bitumen"),
+		SMEAR		(0x190f01, 1642241, 	7,	1,	1,  "hbmfluid.smear"),
+		HEATINGOIL	(0x211806, 2168838,		4,	2,	1,  "hbmfluid.heatingoil"),
 		
-		RECLAIMED	(0x332b22, 3353378, 	8,	1, "hbmfluid.reclaimed"),
-		PETROIL		(0x44413d, 4473149, 	9,	1, "hbmfluid.petroil"),
+		RECLAIMED	(0x332b22, 3353378, 	8,	1,	1,  "hbmfluid.reclaimed"),
+		PETROIL		(0x44413d, 4473149, 	9,	1,	1,  "hbmfluid.petroil"),
 		
-		LUBRICANT	(0x606060, 6316128, 	10,	1, "hbmfluid.lubricant"),
+		LUBRICANT	(0x606060, 6316128, 	10,	1,	1,  "hbmfluid.lubricant"),
 		
-		NAPHTHA		(0x595744, 5855044,		5,	2, "hbmfluid.naphtha"),
-		DIESEL		(0xf2eed5, 15920853, 	11,	1, "hbmfluid.diesel"),
+		NAPHTHA		(0x595744, 5855044,		5,	2,	1,  "hbmfluid.naphtha"),
+		DIESEL		(0xf2eed5, 15920853, 	11,	1,	1,  "hbmfluid.diesel"),
 		
-		LIGHTOIL	(0x8c7451, 9204817,		6,	2, "hbmfluid.lightoil"),
-		KEROSENE	(0xffa5d2, 16754130, 	12,	1, "hbmfluid.kerosene"),
+		LIGHTOIL	(0x8c7451, 9204817,		6,	2,	1,  "hbmfluid.lightoil"),
+		KEROSENE	(0xffa5d2, 16754130, 	12,	1,	1,  "hbmfluid.kerosene"),
 		
-		GAS			(0xfffeed, 16776941, 	13,	1, "hbmfluid.gas"),
-		PETROLEUM	(0x7cb7c9, 8173513,		7,	2, "hbmfluid.petroleum"),
+		GAS			(0xfffeed, 16776941, 	13,	1,	1,  "hbmfluid.gas"),
+		PETROLEUM	(0x7cb7c9, 8173513,		7,	2,	1,  "hbmfluid.petroleum"),
 		
-		BIOGAS		(0xbfd37c, 12571516, 	12,	2, "hbmfluid.biogas"),
-		BIOFUEL		(0xeef274, 15659636,	13,	2, "hbmfluid.biofuel"),
+		BIOGAS		(0xbfd37c, 12571516, 	12,	2,	1,  "hbmfluid.biogas"),
+		BIOFUEL		(0xeef274, 15659636,	13,	2,	1,  "hbmfluid.biofuel"),

-		NITAN		(0x8018ad, 8394925, 	15,	2, "hbmfluid.nitan"),
+		NITAN		(0x8018ad, 8394925, 	15,	2,	1,  "hbmfluid.nitan"),
 		
-		UF6			(0xD1CEBE, 13749950, 	14,	1, "hbmfluid.uf6"),
-		PUF6		(0x4C4C4C, 5000268, 	15,	1, "hbmfluid.puf6"),
-		SAS3		(0x4ffffc, 5242876, 	14,	2, "hbmfluid.sas3"),
+		UF6			(0xD1CEBE, 13749950, 	14,	1,	1,  "hbmfluid.uf6"),
+		PUF6		(0x4C4C4C, 5000268, 	15,	1,	1,  "hbmfluid.puf6"),
+		SAS3		(0x4ffffc, 5242876, 	14,	2,	1,  "hbmfluid.sas3"),
 		
-		AMAT		(0x010101, 65793, 		0,	2, "hbmfluid.amat"),
-		ASCHRAB		(0xb50000, 11862016, 	1,	2, "hbmfluid.aschrab"),
+		AMAT		(0x010101, 65793, 		0,	2,	1,  "hbmfluid.amat"),
+		ASCHRAB		(0xb50000, 11862016, 	1,	2,	1,  "hbmfluid.aschrab"),

-		ACID		(0xfff7aa, 16775082, 	10,	2, "hbmfluid.acid"),
-		WATZ		(0x86653E, 8807742, 	11,	2, "hbmfluid.watz");
+		ACID		(0xfff7aa, 16775082, 	10,	2,	1,  "hbmfluid.acid"),
+		WATZ		(0x86653E, 8807742, 	11,	2,	1,  "hbmfluid.watz"),
+		CRYOGEL		(0x32ffff, 3342335, 	0,	1,	2,  "hbmfluid.cryogel");
 		

+		//Approximate HEX Color of the fluid, used for pipe rendering
 		private int color;
+		//Converted MS Access color code, used for item rendering
 		private int msa;
+		//X position of the fluid on the sheet, the "row"
 		private int textureX;
+		//Y position of the fluid on the sheet, the "column"
 		private int textureY;
+		//ID of the texture sheet the fluid is on
+		private int sheetID;
+		//Unlocalized string ID of the fluid
 		private String name;
 		
-		private FluidType(int color, int msa, int x, int y, String name) {
+		private FluidType(int color, int msa, int x, int y, int sheet, String name) {
 			this.color = color;
 			this.msa = msa;
 			this.textureX = x;
 			this.textureY = y;
 			this.name = name;
+			this.sheetID = sheet;
 		}

 		public int getColor() {
@ -78,6 +87,9 @@ public class FluidTypeHandler {
 		public int textureY() {
 			return this.textureY;
 		}
+		public int getSheetID() {
+			return this.sheetID;
+		}
 		public String getUnlocalizedName() {
 			return this.name;
 		}
@ -89,6 +101,15 @@ public class FluidTypeHandler {
 				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 String getName() {
 			return this.toString();
 		}
--- a/com/hbm/handler/GUIHandler.java
+++ b/com/hbm/handler/GUIHandler.java
@ -16,6 +16,7 @@ import com.hbm.tileentity.bomb.TileEntityNukeMike;
 import com.hbm.tileentity.bomb.TileEntityNukePrototype;
 import com.hbm.tileentity.bomb.TileEntityNukeTsar;
 import com.hbm.tileentity.bomb.TileEntityTestNuke;
+import com.hbm.tileentity.machine.TileEntityAMSLimiter;
 import com.hbm.tileentity.machine.TileEntityConverterHeRf;
 import com.hbm.tileentity.machine.TileEntityConverterRfHe;
 import com.hbm.tileentity.machine.TileEntityCoreAdvanced;
@ -488,6 +489,14 @@ public class GUIHandler implements IGuiHandler {
 					return new ContainerMachinePress(player.inventory, (TileEntityMachinePress) entity);
 				}
 			}
+
+			case ModBlocks.guiID_ams_limiter:
+			{
+				if(entity instanceof TileEntityAMSLimiter)
+				{
+					return new ContainerAMSLimiter(player.inventory, (TileEntityAMSLimiter) entity);
+				}
+			}
 		}
 		return null;
 	}
@ -916,6 +925,14 @@ public class GUIHandler implements IGuiHandler {
 						return new GUIMachinePress(player.inventory, (TileEntityMachinePress) entity);
 					}
 				}
+				
+				case ModBlocks.guiID_ams_limiter:
+				{
+					if(entity instanceof TileEntityAMSLimiter)
+					{
+						return new GUIAMSLimiter(player.inventory, (TileEntityAMSLimiter) entity);
+					}
+				}
 			}
 		} else {
 			//CLIENTONLY GUIS
--- a/com/hbm/inventory/FluidTank.java
+++ b/com/hbm/inventory/FluidTank.java
@ -22,7 +22,6 @@ public class FluidTank {
 	int fluid;
 	int maxFluid;
 	public int index;
-	public static ResourceLocation fluidTextures = new ResourceLocation(RefStrings.MODID + ":textures/gui/fluids2.png");
 	public static int x = 16;
 	public static int y = 100;
 	
@ -76,6 +75,11 @@ public class FluidTank {
 				return;
 			}
 			
+			if(slots[in].getItem() == ModItems.inf_water && this.type.name().equals(FluidType.WATER.name())) {
+				this.fluid = this.maxFluid;
+				return;
+			}
+			
 			if(FluidContainerRegistry.getFluidContent(slots[in], type) <= 0)
 				return;
 		} else {
@ -162,17 +166,24 @@ public class FluidTank {
 		if(x <= mouseX && x + width > mouseX && y < mouseY && y + height >= mouseY)
 			gui.drawFluidInfo(new String[] { I18n.format(this.type.getUnlocalizedName()), fluid + "/" + maxFluid + "mB" }, mouseX, mouseY);
 	}
+	
+	public ResourceLocation getSheet() {
+		return new ResourceLocation(RefStrings.MODID + ":textures/gui/fluids" + this.type.getSheetID() + ".png");
+	}

 	//Called by TE to save fillstate
 	public void writeToNBT(NBTTagCompound nbt, String s) {
 		nbt.setInteger(s, fluid);
-		nbt.setInteger(s + "_type", Arrays.asList(FluidType.values()).indexOf(type));
+		//nbt.setInteger(s + "_type", Arrays.asList(FluidType.values()).indexOf(type));
+		nbt.setString(s + "_type", type.getName());
 	}
 	
 	//Called by TE to load fillstate
 	public void readFromNBT(NBTTagCompound nbt, String s) {
 		fluid = nbt.getInteger(s);
 		type = FluidType.getEnum(nbt.getInteger(s + "_type"));
+		if(type.name().equals(FluidType.NONE.name()))
+			type = FluidType.getEnumFromName(nbt.getString(s + "_type"));
 	}

 }
--- a/com/hbm/inventory/container/ContainerAMSLimiter.java
+++ b/com/hbm/inventory/container/ContainerAMSLimiter.java
@ -0,0 +1,142 @@
+package com.hbm.inventory.container;
+
+import com.hbm.inventory.SlotMachineOutput;
+import com.hbm.tileentity.machine.TileEntityAMSLimiter;
+import com.hbm.tileentity.machine.TileEntityMachinePress;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ICrafting;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+public class ContainerAMSLimiter extends Container {
+
+private TileEntityAMSLimiter amsLmiter;
+
+	private int heat;
+	private int efficiency;
+	private int warning;
+	private int mode;
+	
+	public ContainerAMSLimiter(InventoryPlayer invPlayer, TileEntityAMSLimiter tedf) {
+		
+		amsLmiter = tedf;
+
+		//Fluid In
+		this.addSlotToContainer(new Slot(tedf, 0, 44, 17));
+		//Fluid Out
+		this.addSlotToContainer(new Slot(tedf, 1, 44, 53));
+		//Focus
+		this.addSlotToContainer(new Slot(tedf, 2, 80, 53));
+		//Battery
+		this.addSlotToContainer(new Slot(tedf, 3, 116, 53));
+		
+		for(int i = 0; i < 3; i++)
+		{
+			for(int j = 0; j < 9; j++)
+			{
+				this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
+			}
+		}
+		
+		for(int i = 0; i < 9; i++)
+		{
+			this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142));
+		}
+	}
+	
+	@Override
+    public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2)
+    {
+		ItemStack var3 = null;
+		Slot var4 = (Slot) this.inventorySlots.get(par2);
+		
+		if (var4 != null && var4.getHasStack())
+		{
+			ItemStack var5 = var4.getStack();
+			var3 = var5.copy();
+			
+            if (par2 <= 3) {
+				if (!this.mergeItemStack(var5, 4, this.inventorySlots.size(), true))
+				{
+					return null;
+				}
+			}
+			else
+				return null;
+			
+			if (var5.stackSize == 0)
+			{
+				var4.putStack((ItemStack) null);
+			}
+			else
+			{
+				var4.onSlotChanged();
+			}
+		}
+		
+		return var3;
+    }
+
+	@Override
+	public boolean canInteractWith(EntityPlayer player) {
+		return amsLmiter.isUseableByPlayer(player);
+	}
+	
+	@Override
+	public void detectAndSendChanges() {
+		super.detectAndSendChanges();
+		
+		for(int i = 0; i < this.crafters.size(); i++)
+		{
+			ICrafting par1 = (ICrafting)this.crafters.get(i);
+			
+			if(this.heat != this.amsLmiter.heat)
+			{
+				par1.sendProgressBarUpdate(this, 0, this.amsLmiter.heat);
+			}
+			
+			if(this.efficiency != this.amsLmiter.efficiency)
+			{
+				par1.sendProgressBarUpdate(this, 1, this.amsLmiter.efficiency);
+			}
+			
+			if(this.warning != this.amsLmiter.warning)
+			{
+				par1.sendProgressBarUpdate(this, 2, this.amsLmiter.warning);
+			}
+			
+			if(this.mode != this.amsLmiter.mode)
+			{
+				par1.sendProgressBarUpdate(this, 3, this.amsLmiter.mode);
+			}
+		}
+
+		this.heat = this.amsLmiter.heat;
+		this.efficiency = this.amsLmiter.efficiency;
+		this.warning = this.amsLmiter.warning;
+		this.mode = this.amsLmiter.mode;
+	}
+	
+	@Override
+	public void updateProgressBar(int i, int j) {
+		if(i == 0)
+		{
+			amsLmiter.heat = j;
+		}
+		if(i == 1)
+		{
+			amsLmiter.efficiency = j;
+		}
+		if(i == 2)
+		{
+			amsLmiter.warning = j;
+		}
+		if(i == 3)
+		{
+			amsLmiter.mode = j;
+		}
+	}
+}
--- a/com/hbm/inventory/gui/GUIAMSLimiter.java
+++ b/com/hbm/inventory/gui/GUIAMSLimiter.java
@ -0,0 +1,60 @@
+package com.hbm.inventory.gui;
+
+import org.lwjgl.opengl.GL11;
+
+import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.container.ContainerAMSLimiter;
+import com.hbm.inventory.container.ContainerMachinePress;
+import com.hbm.lib.RefStrings;
+import com.hbm.tileentity.machine.TileEntityAMSLimiter;
+import com.hbm.tileentity.machine.TileEntityMachinePress;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+
+public class GUIAMSLimiter extends GuiInfoContainer {
+
+	private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/gui_ams_limiter.png");
+	private TileEntityAMSLimiter limiter;
+	
+	public GUIAMSLimiter(InventoryPlayer invPlayer, TileEntityAMSLimiter tedf) {
+		super(new ContainerAMSLimiter(invPlayer, tedf));
+		limiter = tedf;
+		
+		this.xSize = 176;
+		this.ySize = 166;
+	}
+	
+	@Override
+	public void drawScreen(int mouseX, int mouseY, float f) {
+		super.drawScreen(mouseX, mouseY, f);
+
+		limiter.tank.renderTankInfo(this, mouseX, mouseY, guiLeft + 26, guiTop + 69 - 52, 16, 52);
+		this.drawElectricityInfo(this, mouseX, mouseY, guiLeft + 134, guiTop + 69 - 52, 16, 52, limiter.power, limiter.maxPower);
+	}
+
+	@Override
+	protected void drawGuiContainerForegroundLayer( int i, int j) {
+		String name = this.limiter.hasCustomInventoryName() ? this.limiter.getInventoryName() : I18n.format(this.limiter.getInventoryName());
+		
+		this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752);
+		this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
+	}
+	
+	@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);
+		Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
+		drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
+		
+		int i = (int) limiter.getPowerScaled(52);
+		drawTexturedModalRect(guiLeft + 134, guiTop + 69 - i, 192, 52 - i, 16, i);
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(limiter.tank.getSheet());
+
+		limiter.tank.renderTank(this, guiLeft + 26, guiTop + 69, limiter.tank.getTankType().textureX() * FluidTank.x, limiter.tank.getTankType().textureY() * FluidTank.y, 16, 52);
+	}
+}
--- a/com/hbm/inventory/gui/GUIFWatzCore.java
+++ b/com/hbm/inventory/gui/GUIFWatzCore.java
@ -59,10 +59,13 @@ public class GUIFWatzCore extends GuiInfoContainer {
 		int m = diFurnace.getSingularityType();
 		drawTexturedModalRect(guiLeft + 98, guiTop + 109, 240, 4 * m, 16, 4);
 		
-		Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures);
-
+		Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[0].getSheet());
 		diFurnace.tanks[0].renderTank(this, guiLeft + 8, guiTop + 88, diFurnace.tanks[0].getTankType().textureX() * FluidTank.x, diFurnace.tanks[0].getTankType().textureY() * FluidTank.y, 16, 70);
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[1].getSheet());
 		diFurnace.tanks[1].renderTank(this, guiLeft + 134, guiTop + 88, diFurnace.tanks[1].getTankType().textureX() * FluidTank.x, diFurnace.tanks[1].getTankType().textureY() * FluidTank.y, 16, 70);
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[2].getSheet());
 		diFurnace.tanks[2].renderTank(this, guiLeft + 152, guiTop + 88, diFurnace.tanks[2].getTankType().textureX() * FluidTank.x, diFurnace.tanks[2].getTankType().textureY() * FluidTank.y, 16, 70);
 	}
 }
--- a/com/hbm/inventory/gui/GUIFusionMultiblock.java
+++ b/com/hbm/inventory/gui/GUIFusionMultiblock.java
@ -56,10 +56,13 @@ public class GUIFusionMultiblock extends GuiInfoContainer {
 		if(diFurnace.isRunning())
 			drawTexturedModalRect(guiLeft + 80, guiTop + 18, 240, 0, 16, 16);
 		
-		Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures);
-
+		Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[0].getSheet());
 		diFurnace.tanks[0].renderTank(this, guiLeft + 8, guiTop + 88, diFurnace.tanks[0].getTankType().textureX() * FluidTank.x, diFurnace.tanks[0].getTankType().textureY() * FluidTank.y, 16, 70);
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[1].getSheet());
 		diFurnace.tanks[1].renderTank(this, guiLeft + 134, guiTop + 88, diFurnace.tanks[1].getTankType().textureX() * FluidTank.x, diFurnace.tanks[1].getTankType().textureY() * FluidTank.y, 16, 70);
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[2].getSheet());
 		diFurnace.tanks[2].renderTank(this, guiLeft + 152, guiTop + 88, diFurnace.tanks[2].getTankType().textureX() * FluidTank.x, diFurnace.tanks[2].getTankType().textureY() * FluidTank.y, 16, 70);
 	}
 }
--- a/com/hbm/inventory/gui/GUIMachineCMBFactory.java
+++ b/com/hbm/inventory/gui/GUIMachineCMBFactory.java
@ -55,9 +55,8 @@ public class GUIMachineCMBFactory extends GuiInfoContainer {
 		
 		int j1 = diFurnace.getProgressScaled(24);
 		drawTexturedModalRect(guiLeft + 101 + 9, guiTop + 34, 208, 0, j1 + 1, 16);
-
-		Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures);
-
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tank.getSheet());
 		diFurnace.tank.renderTank(this, guiLeft + 26, guiTop + 69, diFurnace.tank.getTankType().textureX() * FluidTank.x, diFurnace.tank.getTankType().textureY() * FluidTank.y, 16, 52);
 	}
 }
--- a/com/hbm/inventory/gui/GUIMachineChemplant.java
+++ b/com/hbm/inventory/gui/GUIMachineChemplant.java
@ -58,12 +58,17 @@ public class GUIMachineChemplant extends GuiInfoContainer {

 		int j = chemplant.getProgressScaled(90);
 		drawTexturedModalRect(guiLeft + 43, guiTop + 89, 0, 222, j, 18);
-
-		Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures);
-
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(chemplant.tanks[0].getSheet());
 		chemplant.tanks[0].renderTank(this, guiLeft + 8, guiTop + 52, chemplant.tanks[0].getTankType().textureX() * FluidTank.x, chemplant.tanks[0].getTankType().textureY() * FluidTank.y, 16, 34);
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(chemplant.tanks[1].getSheet());
 		chemplant.tanks[1].renderTank(this, guiLeft + 26, guiTop + 52, chemplant.tanks[1].getTankType().textureX() * FluidTank.x, chemplant.tanks[1].getTankType().textureY() * FluidTank.y, 16, 34);
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(chemplant.tanks[2].getSheet());
 		chemplant.tanks[2].renderTank(this, guiLeft + 134, guiTop + 52, chemplant.tanks[2].getTankType().textureX() * FluidTank.x, chemplant.tanks[2].getTankType().textureY() * FluidTank.y, 16, 34);
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(chemplant.tanks[3].getSheet());
 		chemplant.tanks[3].renderTank(this, guiLeft + 152, guiTop + 52, chemplant.tanks[3].getTankType().textureX() * FluidTank.x, chemplant.tanks[3].getTankType().textureY() * FluidTank.y, 16, 34);
 	}
 }
--- a/com/hbm/inventory/gui/GUIMachineCoal.java
+++ b/com/hbm/inventory/gui/GUIMachineCoal.java
@ -57,9 +57,8 @@ public class GUIMachineCoal extends GuiInfoContainer {
 		{
 			drawTexturedModalRect(guiLeft + 79, guiTop + 34, 208, 0, 18, 18);
 		}
-
-		Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures);
-
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tank.getSheet());
 		diFurnace.tank.renderTank(this, guiLeft + 8, guiTop + 69, diFurnace.tank.getTankType().textureX() * FluidTank.x, diFurnace.tank.getTankType().textureY() * FluidTank.y, 16, 52);
 	}
 }
--- a/com/hbm/inventory/gui/GUIMachineDiesel.java
+++ b/com/hbm/inventory/gui/GUIMachineDiesel.java
@ -57,9 +57,8 @@ public class GUIMachineDiesel extends GuiInfoContainer {
 		{
 			drawTexturedModalRect(guiLeft + 43 + 18 * 4, guiTop + 34, 208, 0, 18, 18);
 		}
-
-		Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures);
-
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tank.getSheet());
 		diFurnace.tank.renderTank(this, guiLeft + 80, guiTop + 69, diFurnace.tank.getTankType().textureX() * FluidTank.x, diFurnace.tank.getTankType().textureY() * FluidTank.y, 16, 52);
 	}
 }
--- a/com/hbm/inventory/gui/GUIMachineFluidTank.java
+++ b/com/hbm/inventory/gui/GUIMachineFluidTank.java
@ -51,9 +51,8 @@ public class GUIMachineFluidTank extends GuiInfoContainer {
 		
 		if(tank.dna())
 			drawTexturedModalRect(guiLeft + 152, guiTop + 53, 176, 0, 16, 16);
-
-		Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures);
-
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(tank.tank.getSheet());
 		tank.tank.renderTank(this, guiLeft + 71, guiTop + 69, tank.tank.getTankType().textureX() * FluidTank.x, tank.tank.getTankType().textureY() * FluidTank.y, 16, 52);
 		tank.tank.renderTank(this, guiLeft + 71 + 16, guiTop + 69, tank.tank.getTankType().textureX() * FluidTank.x, tank.tank.getTankType().textureY() * FluidTank.y, 16, 52);
 		tank.tank.renderTank(this, guiLeft + 71 + 32, guiTop + 69, tank.tank.getTankType().textureX() * FluidTank.x, tank.tank.getTankType().textureY() * FluidTank.y, 2, 52);
--- a/com/hbm/inventory/gui/GUIMachineGasFlare.java
+++ b/com/hbm/inventory/gui/GUIMachineGasFlare.java
@ -50,9 +50,8 @@ public class GUIMachineGasFlare extends GuiInfoContainer {

 		int j = (int)flare.getPowerScaled(52);
 		drawTexturedModalRect(guiLeft + 8, guiTop + 69 - j, 176, 52 - j, 16, j);
-
-		Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures);
-
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(flare.tank.getSheet());
 		flare.tank.renderTank(this, guiLeft + 80, guiTop + 69, flare.tank.getTankType().textureX() * FluidTank.x, flare.tank.getTankType().textureY() * FluidTank.y, 16, 52);
 		flare.tank.renderTank(this, guiLeft + 80 + 16, guiTop + 69, flare.tank.getTankType().textureX() * FluidTank.x, flare.tank.getTankType().textureY() * FluidTank.y, 16, 52);
 		flare.tank.renderTank(this, guiLeft + 80 + 32, guiTop + 69, flare.tank.getTankType().textureX() * FluidTank.x, flare.tank.getTankType().textureY() * FluidTank.y, 2, 52);
--- a/com/hbm/inventory/gui/GUIMachineGenerator.java
+++ b/com/hbm/inventory/gui/GUIMachineGenerator.java
@ -59,9 +59,10 @@ public class GUIMachineGenerator extends GuiInfoContainer {
 			drawTexturedModalRect(guiLeft + 98, guiTop + 88 - i, 208, 52 - i, 16, i);
 		}
 		
-		Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures);
-
+		Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[0].getSheet());
 		diFurnace.tanks[0].renderTank(this, guiLeft + 8, guiTop + 88, diFurnace.tanks[0].getTankType().textureX() * FluidTank.x, diFurnace.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52);
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[0].getSheet());
 		diFurnace.tanks[1].renderTank(this, guiLeft + 26, guiTop + 88, diFurnace.tanks[1].getTankType().textureX() * FluidTank.x, diFurnace.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52);
 	}
 }
--- a/com/hbm/inventory/gui/GUIMachineInserter.java
+++ b/com/hbm/inventory/gui/GUIMachineInserter.java
@ -50,10 +50,13 @@ public class GUIMachineInserter extends GuiInfoContainer {
 		Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
 		drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
 		
-		Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures);
-
+		Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[0].getSheet());
 		diFurnace.tanks[0].renderTank(this, guiLeft + 44, guiTop + 69, diFurnace.tanks[0].getTankType().textureX() * FluidTank.x, diFurnace.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52);
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[1].getSheet());
 		diFurnace.tanks[1].renderTank(this, guiLeft + 98, guiTop + 69, diFurnace.tanks[1].getTankType().textureX() * FluidTank.x, diFurnace.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52);
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[2].getSheet());
 		diFurnace.tanks[2].renderTank(this, guiLeft + 152, guiTop + 69, diFurnace.tanks[2].getTankType().textureX() * FluidTank.x, diFurnace.tanks[2].getTankType().textureY() * FluidTank.y, 16, 52);
 	}
 }
--- a/com/hbm/inventory/gui/GUIMachineOilWell.java
+++ b/com/hbm/inventory/gui/GUIMachineOilWell.java
@ -64,11 +64,12 @@ public class GUIMachineOilWell extends GuiInfoContainer {
 		if(l == 2)
 			drawTexturedModalRect(guiLeft + 44, guiTop + 90, 224, 52, 16, 16);
 		
-		Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures);
-
+		Minecraft.getMinecraft().getTextureManager().bindTexture(derrick.tanks[0].getSheet());
 		derrick.tanks[0].renderTank(this, guiLeft + 80, guiTop + 70, derrick.tanks[0].getTankType().textureX() * FluidTank.x, derrick.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52);
 		derrick.tanks[0].renderTank(this, guiLeft + 96, guiTop + 70, derrick.tanks[0].getTankType().textureX() * FluidTank.x, derrick.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52);
 		derrick.tanks[0].renderTank(this, guiLeft + 112, guiTop + 70, derrick.tanks[0].getTankType().textureX() * FluidTank.x, derrick.tanks[0].getTankType().textureY() * FluidTank.y, 2, 52);
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(derrick.tanks[1].getSheet());
 		derrick.tanks[1].renderTank(this, guiLeft + 80, guiTop + 124, derrick.tanks[1].getTankType().textureX() * FluidTank.x, derrick.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52);
 		derrick.tanks[1].renderTank(this, guiLeft + 96, guiTop + 124, derrick.tanks[1].getTankType().textureX() * FluidTank.x, derrick.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52);
 		derrick.tanks[1].renderTank(this, guiLeft + 112, guiTop + 124, derrick.tanks[1].getTankType().textureX() * FluidTank.x, derrick.tanks[1].getTankType().textureY() * FluidTank.y, 2, 52);
--- a/com/hbm/inventory/gui/GUIMachinePuF6Tank.java
+++ b/com/hbm/inventory/gui/GUIMachinePuF6Tank.java
@ -47,7 +47,7 @@ public class GUIMachinePuF6Tank extends GuiInfoContainer {
 		Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
 		drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
 		
-		Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures);
+		Minecraft.getMinecraft().getTextureManager().bindTexture(tank.tank.getSheet());
 		tank.tank.renderTank(this, guiLeft + 80, guiTop + 69, tank.tank.getTankType().textureX() * FluidTank.x, tank.tank.getTankType().textureY() * FluidTank.y, 16, 52);
 	}
 }
--- a/com/hbm/inventory/gui/GUIMachinePumpjack.java
+++ b/com/hbm/inventory/gui/GUIMachinePumpjack.java
@ -66,11 +66,12 @@ public class GUIMachinePumpjack extends GuiInfoContainer {
 		if(l == 2)
 			drawTexturedModalRect(guiLeft + 44, guiTop + 90, 224, 52, 16, 16);
 		
-		Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures);
-
+		Minecraft.getMinecraft().getTextureManager().bindTexture(derrick.tanks[0].getSheet());
 		derrick.tanks[0].renderTank(this, guiLeft + 80, guiTop + 70, derrick.tanks[0].getTankType().textureX() * FluidTank.x, derrick.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52);
 		derrick.tanks[0].renderTank(this, guiLeft + 96, guiTop + 70, derrick.tanks[0].getTankType().textureX() * FluidTank.x, derrick.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52);
 		derrick.tanks[0].renderTank(this, guiLeft + 112, guiTop + 70, derrick.tanks[0].getTankType().textureX() * FluidTank.x, derrick.tanks[0].getTankType().textureY() * FluidTank.y, 2, 52);
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(derrick.tanks[1].getSheet());
 		derrick.tanks[1].renderTank(this, guiLeft + 80, guiTop + 124, derrick.tanks[1].getTankType().textureX() * FluidTank.x, derrick.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52);
 		derrick.tanks[1].renderTank(this, guiLeft + 96, guiTop + 124, derrick.tanks[1].getTankType().textureX() * FluidTank.x, derrick.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52);
 		derrick.tanks[1].renderTank(this, guiLeft + 112, guiTop + 124, derrick.tanks[1].getTankType().textureX() * FluidTank.x, derrick.tanks[1].getTankType().textureY() * FluidTank.y, 2, 52);
--- a/com/hbm/inventory/gui/GUIMachineRefinery.java
+++ b/com/hbm/inventory/gui/GUIMachineRefinery.java
@ -54,14 +54,22 @@ public class GUIMachineRefinery extends GuiInfoContainer {

 		int j = (int)refinery.getPowerScaled(52);
 		drawTexturedModalRect(guiLeft + 8, guiTop + 70 - j, 176, 52 - j, 16, j);
-
-		Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures);
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(refinery.tanks[0].getSheet());
 		refinery.tanks[0].renderTank(this, guiLeft + 26, guiTop + 70, refinery.tanks[0].getTankType().textureX() * FluidTank.x, refinery.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52);
 		refinery.tanks[0].renderTank(this, guiLeft + 26 + 16, guiTop + 70, refinery.tanks[0].getTankType().textureX() * FluidTank.x, refinery.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52);
 		refinery.tanks[0].renderTank(this, guiLeft + 26 + 32, guiTop + 70, refinery.tanks[0].getTankType().textureX() * FluidTank.x, refinery.tanks[0].getTankType().textureY() * FluidTank.y, 2, 52);
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(refinery.tanks[1].getSheet());
 		refinery.tanks[1].renderTank(this, guiLeft + 80, guiTop + 70, refinery.tanks[1].getTankType().textureX() * FluidTank.x, refinery.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52);
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(refinery.tanks[2].getSheet());
 		refinery.tanks[2].renderTank(this, guiLeft + 98, guiTop + 70, refinery.tanks[2].getTankType().textureX() * FluidTank.x, refinery.tanks[2].getTankType().textureY() * FluidTank.y, 16, 52);
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(refinery.tanks[3].getSheet());
 		refinery.tanks[3].renderTank(this, guiLeft + 116, guiTop + 70, refinery.tanks[3].getTankType().textureX() * FluidTank.x, refinery.tanks[3].getTankType().textureY() * FluidTank.y, 16, 52);
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(refinery.tanks[4].getSheet());
 		refinery.tanks[4].renderTank(this, guiLeft + 134, guiTop + 70, refinery.tanks[4].getTankType().textureX() * FluidTank.x, refinery.tanks[4].getTankType().textureY() * FluidTank.y, 16, 52);
 	}
 }
--- a/com/hbm/inventory/gui/GUIMachineTurbofan.java
+++ b/com/hbm/inventory/gui/GUIMachineTurbofan.java
@ -58,9 +58,8 @@ public class GUIMachineTurbofan extends GuiInfoContainer {
 			int i = diFurnace.afterburner;
 			drawTexturedModalRect(guiLeft + 107, guiTop + 53, 176, (i - 1) * 16, 16, 16);
 		}
-
-		Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures);
-
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tank.getSheet());
 		diFurnace.tank.renderTank(this, guiLeft + 53, guiTop + 69, diFurnace.tank.getTankType().textureX() * FluidTank.x, diFurnace.tank.getTankType().textureY() * FluidTank.y, 16, 52);
 		diFurnace.tank.renderTank(this, guiLeft + 53 + 16, guiTop + 69, diFurnace.tank.getTankType().textureX() * FluidTank.x, diFurnace.tank.getTankType().textureY() * FluidTank.y, 16, 52);
 		diFurnace.tank.renderTank(this, guiLeft + 53 + 32, guiTop + 69, diFurnace.tank.getTankType().textureX() * FluidTank.x, diFurnace.tank.getTankType().textureY() * FluidTank.y, 2, 52);
--- a/com/hbm/inventory/gui/GUIMachineUF6Tank.java
+++ b/com/hbm/inventory/gui/GUIMachineUF6Tank.java
@ -46,7 +46,7 @@ public class GUIMachineUF6Tank extends GuiInfoContainer {
 		Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
 		drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
 		
-		Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures);
+		Minecraft.getMinecraft().getTextureManager().bindTexture(tank.tank.getSheet());
 		tank.tank.renderTank(this, guiLeft + 80, guiTop + 69, tank.tank.getTankType().textureX() * FluidTank.x, tank.tank.getTankType().textureY() * FluidTank.y, 16, 52);
 	}
 }
--- a/com/hbm/inventory/gui/GUIReactorMultiblock.java
+++ b/com/hbm/inventory/gui/GUIReactorMultiblock.java
@ -55,9 +55,10 @@ public class GUIReactorMultiblock extends GuiInfoContainer {
 		int l = diFurnace.getHeatScaled(142);
 		drawTexturedModalRect(guiLeft + 26, guiTop + 108, 0, 222, l, 16);	
 		
-		Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures);
-
+		Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[0].getSheet());
 		diFurnace.tanks[0].renderTank(this, guiLeft + 8, guiTop + 70, diFurnace.tanks[0].getTankType().textureX() * FluidTank.x, diFurnace.tanks[0].getTankType().textureY() * FluidTank.y, 16, 52);
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tanks[1].getSheet());
 		diFurnace.tanks[1].renderTank(this, guiLeft + 26, guiTop + 70, diFurnace.tanks[1].getTankType().textureX() * FluidTank.x, diFurnace.tanks[1].getTankType().textureY() * FluidTank.y, 16, 52);
 	}
 }
--- a/com/hbm/inventory/gui/GUIWatzCore.java
+++ b/com/hbm/inventory/gui/GUIWatzCore.java
@ -57,9 +57,8 @@ public class GUIWatzCore extends GuiInfoContainer {

 		int l = (int)diFurnace.getPowerScaled(70);
 		drawTexturedModalRect(guiLeft + 152, guiTop + 106 - 18 - l, 192, 70 - l, 16, l);
-
-		Minecraft.getMinecraft().getTextureManager().bindTexture(FluidTank.fluidTextures);
-
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(diFurnace.tank.getSheet());
 		diFurnace.tank.renderTank(this, guiLeft + 134, guiTop + 106 - 18, diFurnace.tank.getTankType().textureX() * FluidTank.x, diFurnace.tank.getTankType().textureY() * FluidTank.y, 16, 70);
 	}
 }
--- a/com/hbm/items/ModItems.java
+++ b/com/hbm/items/ModItems.java
@ -391,13 +391,6 @@ public class ModItems {
 	public static Item black_hole;
 	public static Item crystal_xen;
 	public static Item inf_water;
-	public static Item inf_coolant;
-	public static Item inf_deuterium;
-	public static Item inf_tritium;
-	public static Item inf_sulfur;
-	public static Item inf_diesel;
-	public static Item inf_antimatter;
-	public static Item inf_antischrabidium;

 	public static Item canister_empty;
 	public static Item canister_smear;
@ -1375,13 +1368,6 @@ public class ModItems {
 		pellet_antimatter = new ItemDrop().setUnlocalizedName("pellet_antimatter").setCreativeTab(MainRegistry.tabParts).setContainerItem(ModItems.cell_empty).setTextureName(RefStrings.MODID + ":pellet_antimatter");
 		crystal_xen = new ItemDrop().setUnlocalizedName("crystal_xen").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":crystal_xen");
 		inf_water = new Item().setUnlocalizedName("inf_water").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_water");
-		inf_coolant = new Item().setUnlocalizedName("inf_coolant").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_coolant");
-		inf_deuterium = new Item().setUnlocalizedName("inf_deuterium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_deuterium");
-		inf_tritium = new Item().setUnlocalizedName("inf_tritium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_tritium");
-		inf_sulfur = new Item().setUnlocalizedName("inf_sulfur").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_sulfur");
-		inf_diesel = new Item().setUnlocalizedName("inf_diesel").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_diesel");
-		inf_antimatter = new Item().setUnlocalizedName("inf_antimatter").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_antimatter");
-		inf_antischrabidium = new Item().setUnlocalizedName("inf_antischrabidium").setMaxStackSize(1).setCreativeTab(MainRegistry.tabParts).setTextureName(RefStrings.MODID + ":inf_antischrabidium");

 		stamp_stone_flat = new ItemBlades(5).setUnlocalizedName("stamp_stone_flat").setMaxStackSize(1).setCreativeTab(MainRegistry.tabMachine).setTextureName(RefStrings.MODID + ":stamp_stone_flat");
 		stamp_stone_plate = new ItemBlades(5).setUnlocalizedName("stamp_stone_plate").setMaxStackSize(1).setCreativeTab(MainRegistry.tabMachine).setTextureName(RefStrings.MODID + ":stamp_stone_plate");
@ -2449,13 +2435,6 @@ public class ModItems {
 		
 		//Infinite Tanks
 		GameRegistry.registerItem(inf_water, inf_water.getUnlocalizedName());
-		GameRegistry.registerItem(inf_coolant, inf_coolant.getUnlocalizedName());
-		GameRegistry.registerItem(inf_deuterium, inf_deuterium.getUnlocalizedName());
-		GameRegistry.registerItem(inf_tritium, inf_tritium.getUnlocalizedName());
-		GameRegistry.registerItem(inf_sulfur, inf_sulfur.getUnlocalizedName());
-		GameRegistry.registerItem(inf_diesel, inf_diesel.getUnlocalizedName());
-		GameRegistry.registerItem(inf_antimatter, inf_antimatter.getUnlocalizedName());
-		GameRegistry.registerItem(inf_antischrabidium, inf_antischrabidium.getUnlocalizedName());
 		
 		//Large Tanks
 		GameRegistry.registerItem(tank_waste, tank_waste.getUnlocalizedName());
--- a/com/hbm/items/food/ItemEnergy.java
+++ b/com/hbm/items/food/ItemEnergy.java
@ -2,6 +2,7 @@ package com.hbm.items.food;

 import java.util.List;

+import com.hbm.explosion.ExplosionLarge;
 import com.hbm.items.ModItems;
 import com.hbm.main.MainRegistry;

@ -59,7 +60,7 @@ public class ItemEnergy extends Item {
        	}
        	if(this == ModItems.chocolate_milk)
        	{
-        		p_77654_2_.createExplosion(null, p_77654_3_.posX, p_77654_3_.posY, p_77654_3_.posZ, 50, true);
+        		ExplosionLarge.explode(p_77654_2_, p_77654_3_.posX, p_77654_3_.posY, p_77654_3_.posZ, 50, true, false, false);
        	}
        	if(this == ModItems.bottle_nuka)
        	{
@ -181,11 +182,12 @@ public class ItemEnergy extends Item {
    @Override
 	public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_)
    {
-    	if(!(this == ModItems.can_creature || this == ModItems.can_mrsugar || this == ModItems.can_overcharge || this == ModItems.can_redbomb || this == ModItems.can_smart))
+    	if(!(this == ModItems.can_creature || this == ModItems.can_mrsugar || this == ModItems.can_overcharge || this == ModItems.can_redbomb || this == ModItems.can_smart || this == ModItems.chocolate_milk))
    		if(!p_77659_3_.inventory.hasItem(ModItems.bottle_opener))
    			return p_77659_1_;
    	
    	p_77659_3_.setItemInUse(p_77659_1_, this.getMaxItemUseDuration(p_77659_1_));
+    	
    	return p_77659_1_;
    }
    
--- a/com/hbm/lib/HbmWorldGen.java
+++ b/com/hbm/lib/HbmWorldGen.java
@ -38,6 +38,8 @@ public class HbmWorldGen implements IWorldGenerator {
 			generateNether(world, rand, chunkX * 16, chunkZ * 16);
 		case 0:
 			generateSurface(world, rand, chunkX * 16, chunkZ * 16);
+		case 1:
+			generateEnd(world, rand, chunkX * 16, chunkZ * 16);
 		}

 	}
@ -461,4 +463,16 @@ public class HbmWorldGen implements IWorldGenerator {
 		}
 	}

+	private void generateEnd(World world, Random rand, int i, int j) {
+
+		for (int k = 0; k < 8; k++)
+		{
+			int randPosX = i + rand.nextInt(16);
+			int randPosY = rand.nextInt(127);
+			int randPosZ = j + rand.nextInt(16);
+			
+			(new WorldGenMinable(ModBlocks.ore_tikite, 6, Blocks.end_stone)).generate(world, rand, randPosX, randPosY, randPosZ);
+		}
+	}
+
 }
--- a/com/hbm/main/CraftingManager.java
+++ b/com/hbm/main/CraftingManager.java
@ -1050,6 +1050,7 @@ public class CraftingManager {
 		GameRegistry.addRecipe(new ItemStack(ModItems.pellet_antimatter, 1), new Object[] { "###", "###", "###", '#', ModItems.cell_antimatter });
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.fluid_tank_empty, 8), new Object[] { "121", "1 1", "121", '1', "plateAluminum", '2', "plateIron" }));
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.fluid_barrel_empty, 2), new Object[] { "121", "1 1", "121", '1', "plateSteel", '2', "plateAluminum" }));
+		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.inf_water, 1), new Object[] { "222", "1 1", "222", '1', Items.water_bucket, '2', "plateAluminum" }));
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.powder_desh_mix, 1), new Object[] { ModItems.powder_actinium_tiny, ModItems.powder_actinium_tiny, ModItems.powder_lanthanium_tiny, ModItems.powder_lanthanium_tiny, ModItems.powder_cerium_tiny, ModItems.powder_cobalt_tiny, ModItems.powder_lithium_tiny, ModItems.powder_neodymium_tiny, ModItems.powder_niobium_tiny });
 		GameRegistry.addShapelessRecipe(new ItemStack(ModItems.powder_desh_mix, 9), new Object[] { ModItems.powder_actinium, ModItems.powder_actinium, ModItems.powder_lanthanium, ModItems.powder_lanthanium, ModItems.powder_cerium, ModItems.powder_cobalt, ModItems.powder_lithium, ModItems.powder_neodymium, ModItems.powder_niobium });
 		
--- a/com/hbm/main/MainRegistry.java
+++ b/com/hbm/main/MainRegistry.java
@ -174,6 +174,9 @@ import com.hbm.tileentity.deco.TileEntityRotationTester;
 import com.hbm.tileentity.deco.TileEntityTestContainer;
 import com.hbm.tileentity.deco.TileEntityTestRender;
 import com.hbm.tileentity.deco.TileEntityYellowBarrel;
+import com.hbm.tileentity.machine.TileEntityAMSBase;
+import com.hbm.tileentity.machine.TileEntityAMSEmitter;
+import com.hbm.tileentity.machine.TileEntityAMSLimiter;
 import com.hbm.tileentity.machine.TileEntityConverterHeRf;
 import com.hbm.tileentity.machine.TileEntityConverterRfHe;
 import com.hbm.tileentity.machine.TileEntityCoreAdvanced;
@ -517,6 +520,9 @@ public class MainRegistry
 		GameRegistry.registerTileEntity(TileEntityCrateIron.class, "tileentity_crate_iron");
 		GameRegistry.registerTileEntity(TileEntityCrateSteel.class, "tileentity_crate_steel");
 		GameRegistry.registerTileEntity(TileEntityMachinePress.class, "tileentity_press");
+		GameRegistry.registerTileEntity(TileEntityAMSBase.class, "tileentity_ams_base");
+		GameRegistry.registerTileEntity(TileEntityAMSEmitter.class, "tileentity_ams_emitter");
+		GameRegistry.registerTileEntity(TileEntityAMSLimiter.class, "tileentity_ams_limiter");

 	    EntityRegistry.registerModEntity(EntityRocket.class, "entity_rocket", 0, this, 250, 1, true);
 	    EntityRegistry.registerModEntity(EntityNukeExplosion.class, "entity_nuke_explosion", 1, this, 250, 1, true);
--- a/com/hbm/main/ResourceManager.java
+++ b/com/hbm/main/ResourceManager.java
@ -67,6 +67,11 @@ public class ResourceManager {
 	//Press
 	public static final ResourceLocation press_body_tex = new ResourceLocation(RefStrings.MODID, "textures/models/press_body.png");
 	public static final ResourceLocation press_head_tex = new ResourceLocation(RefStrings.MODID, "textures/models/press_head.png");
+	
+	//Anti Mass Spectrometer
+	public static final ResourceLocation ams_base_tex = new ResourceLocation(RefStrings.MODID, "textures/models/ams_base.png");
+	public static final ResourceLocation ams_emitter_tex = new ResourceLocation(RefStrings.MODID, "textures/models/ams_emitter.png");
+	public static final ResourceLocation ams_limiter_tex = new ResourceLocation(RefStrings.MODID, "textures/models/ams_limiter.png");

 	////Obj Items
 	
--- a/com/hbm/render/entity/RenderSmallNukeAlt.java
+++ b/com/hbm/render/entity/RenderSmallNukeAlt.java
@ -42,7 +42,7 @@ public class RenderSmallNukeAlt extends Render {

 	@Override
 	public void doRender(Entity p_76986_1_, double p_76986_2_, double p_76986_4_, double p_76986_6_, float p_76986_8_, float p_76986_9_) {
-		if(((EntityNukeCloudSmall)p_76986_1_).getDataWatcher().getWatchableObjectShort(17) > 100)
+		if(((EntityNukeCloudSmall)p_76986_1_).age > 100)
 		{
 			this.renderMush((EntityNukeCloudSmall)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
 			this.renderCloud((EntityNukeCloudSmall)p_76986_1_, p_76986_2_, p_76986_4_, p_76986_6_, p_76986_8_, p_76986_9_);
@ -58,7 +58,7 @@ public class RenderSmallNukeAlt extends Render {
        GL11.glTranslatef((float)p_76986_2_, (float)p_76986_4_, (float)p_76986_6_);
        GL11.glDisable(GL11.GL_LIGHTING);
        GL11.glDisable(GL11.GL_CULL_FACE);
-        if(p_76986_1_.getDataWatcher().getWatchableObjectShort(17) < 150)
+        if(p_76986_1_.age < 150)
        {
        	//GL11.glTranslatef(0.0F, -60F + ((p_76986_1_.age - 100) * 60 / 50), 0.0F);
        	GL11.glTranslatef(0.0F, p_76986_1_.height, 0.0F);
@ -81,7 +81,7 @@ public class RenderSmallNukeAlt extends Render {
        {
        	scale += 0.02;
        }*/
-        GL11.glScalef(p_76986_1_.getDataWatcher().getWatchableObjectShort(18), 1.0F, p_76986_1_.getDataWatcher().getWatchableObjectShort(18));
+        GL11.glScalef(p_76986_1_.scale, 1.0F, p_76986_1_.scale);
        GL11.glScalef(50F, 25.0F, 50F);
        
        bindTexture(ringBigTexture);
@ -97,7 +97,7 @@ public class RenderSmallNukeAlt extends Render {
        GL11.glDisable(GL11.GL_CULL_FACE);
    	GL11.glTranslatef(0.0F, 18F, 0.0F);
    	//ring += 0.1F;
-        GL11.glScalef(p_76986_1_.getDataWatcher().getWatchableObjectShort(19) * 10, 30F, p_76986_1_.getDataWatcher().getWatchableObjectShort(19) * 10);
+        GL11.glScalef(p_76986_1_.ring * 10, 30F, p_76986_1_.ring * 10);
        
        bindTexture(ringTexture);
        ringModel.renderAll();
@ -108,13 +108,13 @@ public class RenderSmallNukeAlt extends Render {

        Tessellator tessellator = Tessellator.instance;
 		RenderHelper.disableStandardItemLighting();
-        float f1 = (p_76986_1_.getDataWatcher().getWatchableObjectShort(17) + 2.0F) / 200.0F;
+        float f1 = (p_76986_1_.age + 2.0F) / 200.0F;
        float f2 = 0.0F;
        int count = 250;
        
-        if(p_76986_1_.getDataWatcher().getWatchableObjectShort(17) < 250)
+        if(p_76986_1_.age < 250)
        {
-        	count = p_76986_1_.getDataWatcher().getWatchableObjectShort(17) * 3;
+        	count = p_76986_1_.age * 3;
        }

        if (f1 > 0.8F)
--- a/com/hbm/render/tileentity/RenderAMSBase.java
+++ b/com/hbm/render/tileentity/RenderAMSBase.java
@ -20,7 +20,7 @@ public class RenderAMSBase extends TileEntitySpecialRenderer {
        GL11.glDisable(GL11.GL_CULL_FACE);
 		GL11.glRotatef(180, 0F, 1F, 0F);

-        bindTexture(ResourceManager.turbofan_blades_tex);
+        bindTexture(ResourceManager.ams_base_tex);
        
        ResourceManager.ams_base.renderAll();

--- a/com/hbm/render/tileentity/RenderAMSEmitter.java
+++ b/com/hbm/render/tileentity/RenderAMSEmitter.java
@ -24,7 +24,7 @@ public class RenderAMSEmitter extends TileEntitySpecialRenderer {
        GL11.glDisable(GL11.GL_CULL_FACE);
 		GL11.glRotatef(180, 0F, 1F, 0F);

-        bindTexture(ResourceManager.turbofan_blades_tex);
+        bindTexture(ResourceManager.ams_emitter_tex);
        
        ResourceManager.ams_emitter.renderAll();

--- a/com/hbm/render/tileentity/RenderAMSLimiter.java
+++ b/com/hbm/render/tileentity/RenderAMSLimiter.java
@ -32,7 +32,7 @@ public class RenderAMSLimiter extends TileEntitySpecialRenderer {
 			GL11.glRotatef(0, 0F, 1F, 0F); break;
 		}

-        bindTexture(ResourceManager.turbofan_blades_tex);
+        bindTexture(ResourceManager.ams_limiter_tex);
        
        ResourceManager.ams_limiter.renderAll();

--- a/com/hbm/tileentity/machine/TileEntityAMSLimiter.java
+++ b/com/hbm/tileentity/machine/TileEntityAMSLimiter.java
@ -1,11 +1,275 @@
 package com.hbm.tileentity.machine;

+import java.util.ArrayList;
+import java.util.List;
+
+import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.interfaces.IConsumer;
+import com.hbm.interfaces.IFluidAcceptor;
+import com.hbm.interfaces.IFluidContainer;
+import com.hbm.interfaces.IFluidSource;
+import com.hbm.inventory.FluidTank;
+import com.hbm.items.ModItems;
+import com.hbm.items.special.ItemBattery;
+import com.hbm.lib.Library;
+import com.hbm.packet.AuxElectricityPacket;
+import com.hbm.packet.PacketDispatcher;
+
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.ISidedInventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.AxisAlignedBB;

-public class TileEntityAMSLimiter extends TileEntity {
+public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory, IConsumer, IFluidContainer, IFluidAcceptor {
+
+	private ItemStack slots[];
+
+	public long power = 0;
+	public static final long maxPower = 1000000;
+	public int efficiency = 0;
+	public static final long maxEfficiency = 100;
+	public int heat = 0;
+	public static final long maxHeat = 2500;
+	public int age = 0;
+	public int warning = 0;
+	public int mode = 0;
+	public FluidTank tank;
+
+	private static final int[] slots_top = new int[] { 0 };
+	private static final int[] slots_bottom = new int[] { 0 };
+	private static final int[] slots_side = new int[] { 0 };
+	
+	private String customName;
+	
+	public TileEntityAMSLimiter() {
+		slots = new ItemStack[4];
+		tank = new FluidTank(FluidType.COOLANT, 64000, 0);
+	}
+
+	@Override
+	public int getSizeInventory() {
+		return slots.length;
+	}
+
+	@Override
+	public ItemStack getStackInSlot(int i) {
+		return slots[i];
+	}
+
+	@Override
+	public ItemStack getStackInSlotOnClosing(int i) {
+		if(slots[i] != null)
+		{
+			ItemStack itemStack = slots[i];
+			slots[i] = null;
+			return itemStack;
+		} else {
+		return null;
+		}
+	}
+
+	@Override
+	public void setInventorySlotContents(int i, ItemStack itemStack) {
+		slots[i] = itemStack;
+		if(itemStack != null && itemStack.stackSize > getInventoryStackLimit())
+		{
+			itemStack.stackSize = getInventoryStackLimit();
+		}
+	}
+
+	@Override
+	public String getInventoryName() {
+		return this.hasCustomInventoryName() ? this.customName : "container.amsLimiter";
+	}
+
+	@Override
+	public boolean hasCustomInventoryName() {
+		return this.customName != null && this.customName.length() > 0;
+	}
+	
+	public void setCustomName(String name) {
+		this.customName = name;
+	}
+
+	@Override
+	public int getInventoryStackLimit() {
+		return 64;
+	}
+
+	@Override
+	public boolean isUseableByPlayer(EntityPlayer player) {
+		if(worldObj.getTileEntity(xCoord, yCoord, zCoord) != this)
+		{
+			return false;
+		}else{
+			return player.getDistanceSq(xCoord + 0.5D, yCoord + 0.5D, zCoord + 0.5D) <=128;
+		}
+	}
+	
+	@Override
+	public void openInventory() {}
+	@Override
+	public void closeInventory() {}
+
+	@Override
+	public boolean isItemValidForSlot(int i, ItemStack stack) {
+		
+		return false;
+	}
+	
+	@Override
+	public ItemStack decrStackSize(int i, int j) {
+		if(slots[i] != null)
+		{
+			if(slots[i].stackSize <= j)
+			{
+				ItemStack itemStack = slots[i];
+				slots[i] = null;
+				return itemStack;
+			}
+			ItemStack itemStack1 = slots[i].splitStack(j);
+			if (slots[i].stackSize == 0)
+			{
+				slots[i] = null;
+			}
+			
+			return itemStack1;
+		} else {
+			return null;
+		}
+	}
+	
+	@Override
+	public void readFromNBT(NBTTagCompound nbt) {
+		super.readFromNBT(nbt);
+		NBTTagList list = nbt.getTagList("items", 10);
+
+		power = nbt.getLong("power");
+		tank.readFromNBT(nbt, "coolant");
+		efficiency = nbt.getInteger("efficiency");
+		heat = nbt.getInteger("heat");
+		slots = new ItemStack[getSizeInventory()];
+		
+		for(int i = 0; i < list.tagCount(); i++)
+		{
+			NBTTagCompound nbt1 = list.getCompoundTagAt(i);
+			byte b0 = nbt1.getByte("slot");
+			if(b0 >= 0 && b0 < slots.length)
+			{
+				slots[b0] = ItemStack.loadItemStackFromNBT(nbt1);
+			}
+		}
+	}
+	
+	@Override
+	public void writeToNBT(NBTTagCompound nbt) {
+		super.writeToNBT(nbt);
+		nbt.setLong("power", power);
+		tank.writeToNBT(nbt, "coolant");
+		nbt.setInteger("power", efficiency);
+		nbt.setInteger("power", heat);
+		NBTTagList list = new NBTTagList();
+		
+		for(int i = 0; i < slots.length; i++)
+		{
+			if(slots[i] != null)
+			{
+				NBTTagCompound nbt1 = new NBTTagCompound();
+				nbt1.setByte("slot", (byte)i);
+				slots[i].writeToNBT(nbt1);
+				list.appendTag(nbt1);
+			}
+		}
+		nbt.setTag("items", list);
+	}
+	
+	@Override
+	public int[] getAccessibleSlotsFromSide(int p_94128_1_)
+    {
+        return p_94128_1_ == 0 ? slots_bottom : (p_94128_1_ == 1 ? slots_top : slots_side);
+    }
+
+	@Override
+	public boolean canInsertItem(int i, ItemStack itemStack, int j) {
+		return this.isItemValidForSlot(i, itemStack);
+	}
+
+	@Override
+	public boolean canExtractItem(int i, ItemStack itemStack, int j) {
+		return false;
+	}
+	
+	@Override
+	public void updateEntity() {
+
+		if (!worldObj.isRemote) {
+			
+			tank.setType(0, 1, slots);
+			tank.updateTank(xCoord, yCoord, zCoord);
+
+			power = Library.chargeTEFromItems(slots, 3, power, maxPower);
+			
+			PacketDispatcher.wrapper.sendToAll(new AuxElectricityPacket(xCoord, yCoord, zCoord, power));
+		}
+	}
+	
+	public long getPowerScaled(long i) {
+		return (power * i) / maxPower;
+	}
+
+	@Override
+	public void setPower(long i) {
+		power = i;
+		
+	}
+
+	@Override
+	public long getPower() {
+		return power;
+		
+	}
+
+	@Override
+	public long getMaxPower() {
+		return maxPower;
+	}
+
+	@Override
+	public void setAFluidFill(int i, FluidType type) {
+		if(type.name().equals(tank.getTankType().name()))
+			tank.setFill(i);
+	}
+
+	@Override
+	public int getAFluidFill(FluidType type) {
+		if(type.name().equals(tank.getTankType().name()))
+			return tank.getFill();
+		else
+			return 0;
+	}
+
+	@Override
+	public int getMaxAFluidFill(FluidType type) {
+		if(type.name().equals(tank.getTankType().name()))
+			return tank.getMaxFill();
+		else
+			return 0;
+	}
+
+	@Override
+	public void setFillstate(int fill, int index) {
+			tank.setFill(fill);
+	}
+
+	@Override
+	public void setType(FluidType type, int index) {
+			tank.setTankType(type);
+	}
 	
 	@Override
 	public AxisAlignedBB getRenderBoundingBox() {
--- a/com/hbm/tileentity/machine/TileEntityFWatzCore.java
+++ b/com/hbm/tileentity/machine/TileEntityFWatzCore.java
@ -299,38 +299,38 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory,
 					
 					boolean isWorking = false;

-					if(i == 1 && tanks[1].getFill() - 750 >= 0 && tanks[2].getFill() - 750 >= 0) {
+					if(i == 1 && tanks[1].getFill() - 75 >= 0 && tanks[2].getFill() - 75 >= 0) {
 						tanks[0].setFill(tanks[0].getFill() - 150);
-						tanks[1].setFill(tanks[1].getFill() - 750);
-						tanks[2].setFill(tanks[2].getFill() - 750);
+						tanks[1].setFill(tanks[1].getFill() - 75);
+						tanks[2].setFill(tanks[2].getFill() - 75);
 						power += 500000;
 						isWorking = true;
 					}
-					if(i == 2 && tanks[1].getFill() - 750 >= 0 && tanks[2].getFill() - 350 >= 0) {
+					if(i == 2 && tanks[1].getFill() - 75 >= 0 && tanks[2].getFill() - 35 >= 0) {
 						tanks[0].setFill(tanks[0].getFill() - 75);
-						tanks[1].setFill(tanks[1].getFill() - 350);
-						tanks[2].setFill(tanks[2].getFill() - 300);
+						tanks[1].setFill(tanks[1].getFill() - 35);
+						tanks[2].setFill(tanks[2].getFill() - 30);
 						power += 250000;
 						isWorking = true;
 					}
-					if(i == 3 && tanks[1].getFill() - 750 >= 0 && tanks[2].getFill() - 1400 >= 0) {
+					if(i == 3 && tanks[1].getFill() - 75 >= 0 && tanks[2].getFill() - 140 >= 0) {
 						tanks[0].setFill(tanks[0].getFill() - 300);
-						tanks[1].setFill(tanks[1].getFill() - 750);
-						tanks[2].setFill(tanks[2].getFill() - 1400);
+						tanks[1].setFill(tanks[1].getFill() - 75);
+						tanks[2].setFill(tanks[2].getFill() - 140);
 						power += 1000000;
 						isWorking = true;
 					}
-					if(i == 4 && tanks[1].getFill() - 1000 >= 0 && tanks[2].getFill() - 1000 >= 0) {
+					if(i == 4 && tanks[1].getFill() - 100 >= 0 && tanks[2].getFill() - 100 >= 0) {
 						tanks[0].setFill(tanks[0].getFill() - 100);
-						tanks[1].setFill(tanks[1].getFill() - 1000);
-						tanks[2].setFill(tanks[2].getFill() - 1000);
+						tanks[1].setFill(tanks[1].getFill() - 100);
+						tanks[2].setFill(tanks[2].getFill() - 100);
 						power += 1000000;
 						isWorking = true;
 					}
-					if(i == 5 && tanks[1].getFill() - 150 >= 0 && tanks[2].getFill() - 150 >= 0) {
+					if(i == 5 && tanks[1].getFill() - 15 >= 0 && tanks[2].getFill() - 15 >= 0) {
 						tanks[0].setFill(tanks[0].getFill() - 150);
-						tanks[1].setFill(tanks[1].getFill() - 150);
-						tanks[2].setFill(tanks[2].getFill() - 150);
+						tanks[1].setFill(tanks[1].getFill() - 15);
+						tanks[2].setFill(tanks[2].getFill() - 15);
 						power += 10000000;
 						isWorking = true;
 					}
@ -360,7 +360,7 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory,
 		if(this.isRunning() && (tanks[1].getFill() <= 0 || tanks[2].getFill() <= 0 || !hasFuse() || getSingularityType() == 0) || cooldown || !this.isStructureValid(worldObj))
 			this.emptyPlasma();
 		
-		if(!this.isRunning() && tanks[1].getFill() >= 1000 && tanks[2].getFill() >= 1000 && hasFuse() && getSingularityType() > 0 && !cooldown && this.isStructureValid(worldObj))
+		if(!this.isRunning() && tanks[1].getFill() >= 100 && tanks[2].getFill() >= 100 && hasFuse() && getSingularityType() > 0 && !cooldown && this.isStructureValid(worldObj))
 			this.fillPlasma();

 		PacketDispatcher.wrapper.sendToAll(new AuxElectricityPacket(xCoord, yCoord, zCoord, power));
--- a/com/hbm/tileentity/machine/TileEntityMachineDeuterium.java
+++ b/com/hbm/tileentity/machine/TileEntityMachineDeuterium.java
@ -283,9 +283,6 @@ public class TileEntityMachineDeuterium extends TileEntity implements ISidedInve
 					slots[2] = null;
 				}
 			}
-			if (slots[2] != null && slots[2].getItem() == ModItems.inf_sulfur) {
-				sulfur = maxFill;
-			}

 			if (slots[1] != null && slots[1].getItem() == Items.water_bucket && water + 250 <= maxFill) {
 				water += 250;
--- a/com/hbm/tileentity/machine/TileEntityMachineDiesel.java
+++ b/com/hbm/tileentity/machine/TileEntityMachineDiesel.java
@ -32,7 +32,7 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento
 	public long power;
 	public int soundCycle = 0;
 	public static final long maxPower = 50000;
-	public int powerCap = 15000;
+	public long powerCap = 50000;
 	public int age = 0;
 	public List<IConsumer> list = new ArrayList();
 	public FluidTank tank;
@ -152,7 +152,7 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento
 		NBTTagList list = nbt.getTagList("items", 10);

 		this.power = nbt.getLong("powerTime");
-		this.powerCap = nbt.getInteger("powerCap");
+		this.powerCap = nbt.getLong("powerCap");
 		tank.readFromNBT(nbt, "fuel");
 		slots = new ItemStack[getSizeInventory()];

@ -169,7 +169,7 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento
 	public void writeToNBT(NBTTagCompound nbt) {
 		super.writeToNBT(nbt);
 		nbt.setLong("powerTime", power);
-		nbt.setInteger("powerCap", powerCap);
+		nbt.setLong("powerCap", powerCap);
 		tank.writeToNBT(nbt, "fuel");
 		NBTTagList list = new NBTTagList();

@ -225,9 +225,15 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento
 			tank.setType(3, 4, slots);
 			tank.loadTank(0, 1, slots);
 			tank.updateTank(xCoord, yCoord, zCoord);
+
+			FluidType type = tank.getTankType();
+			if(type.name().equals(FluidType.NITAN.name()))
+				powerCap = maxPower * 10;
+			else
+				powerCap = maxPower;
 			
 			// Battery Item
-			power = Library.chargeItemsFromTE(slots, 2, power, maxPower);
+			power = Library.chargeItemsFromTE(slots, 2, power, powerCap);

 			generate();

@ -248,7 +254,7 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento
 		if(type.name().equals(FluidType.BIOFUEL.name()))
 			return 400;
 		if(type.name().equals(FluidType.NITAN.name()))
-			return 2500;
+			return 5000;
 		return 0;
 	}

--- a/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java
+++ b/com/hbm/tileentity/machine/TileEntityMachineIGenerator.java
@ -387,8 +387,11 @@ public class TileEntityMachineIGenerator extends TileEntity implements ISidedInv
 			}
 		}
 		
-		if (slots[13] != null && slots[13].getItem() == ModItems.inf_diesel)
+		if (slots[13] != null && slots[13].getItem() == ModItems.fluid_barrel_infinite) {
 			this.fuel = TileEntityMachineIGenerator.maxFuel;
+			this.lubricant = TileEntityMachineIGenerator.maxLubricant;
+			this.water = TileEntityMachineIGenerator.maxWater;
+		}
 	}
 	
 	public void doLubeTask() {