Add energy cell tiers up to MAX voltage, make lowest cell EV tier

Renamed cells to the voltage tiers
Added textures for new cells, adjusted existing textures. Texture
colors are vaguely similar to pump/robot arm colors

Legacy power stations will have 1.8 billion EU storage

6 files changed, 44 insertions, 41 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index afbf68d8a6..2b9860ef1c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -167,9 +167,12 @@ public enum GregtechItemList implements GregtechItemContainer {
 	
 	//Power Substation
 	Casing_Vanadium_Redox,
-	Casing_Vanadium_Redox_T2,
-	Casing_Vanadium_Redox_T3,
-	Casing_Vanadium_Redox_T4,
+    Casing_Vanadium_Redox_IV,
+	Casing_Vanadium_Redox_LuV,
+	Casing_Vanadium_Redox_ZPM,
+	Casing_Vanadium_Redox_UV,
+	Casing_Vanadium_Redox_MAX,
+
 	Casing_Power_SubStation, 
 	
 	//Cyclotron
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
index e80d9e2110..8dd52c7074 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
@@ -31,9 +31,9 @@ extends GregtechMetaCasingBlocksAbstract {
 		@Override
 		public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
 			int meta = aStack.getItemDamage();
-			long capacity = 0;
-			if (meta == 7) {
-				capacity = GregtechMetaTileEntity_PowerSubStationController.getCapacityFromCellTier(3);
+			int tier = GregtechMetaTileEntity_PowerSubStationController.getCellTier(field_150939_a, meta);
+			if (tier > 0) {
+				long capacity = GregtechMetaTileEntity_PowerSubStationController.getCapacityFromCellTier(tier);
 				aList.add("Energy Storage: " + GT_Utility.formatNumbers(capacity));
 			}
 			super.addInformation(aStack, aPlayer, aList, aF3_H);
@@ -52,7 +52,7 @@ extends GregtechMetaCasingBlocksAbstract {
 		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Wash Plant Casing");
 		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Industrial Sieve Casing");
 		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Large Sieve Grate");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Vanadium Redox Power Cell");
+		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Vanadium Redox Power Cell (EV)");
 		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Sub-Station External Casing"); 
 		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Cyclotron Coil");
 		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Cyclotron Outer Casing");
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
index f13a0b786e..7baa8ec36a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java
@@ -31,17 +31,9 @@ extends GregtechMetaCasingBlocksAbstract {
 		@Override
 		public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
 			int meta = aStack.getItemDamage();
-			long capacity = 0;
-			switch (meta) {
-				case 4:
-				case 5:
-				case 6:
-					capacity = GregtechMetaTileEntity_PowerSubStationController.getCapacityFromCellTier(meta);
-					break;
-				default:
-					break;
-			}
-			if (capacity > 0) {
+			int tier = GregtechMetaTileEntity_PowerSubStationController.getCellTier(field_150939_a, meta);
+			if (tier > 0) {
+				long capacity = GregtechMetaTileEntity_PowerSubStationController.getCapacityFromCellTier(tier);
 				aList.add("Energy Storage: " + GT_Utility.formatNumbers(capacity));
 			}
 			super.addInformation(aStack, aPlayer, aList, aF3_H);
@@ -57,11 +49,11 @@ extends GregtechMetaCasingBlocksAbstract {
 		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Inconel Reinforced Casing");
 		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Multi-Use Casing");
 		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Trinium Plated Mining Platform Casing");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Vanadium Redox Cell (Lapotron Fortified)");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Vanadium Redox Cell (Naquadah Doped)");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Vanadium Redox Cell (Neutronium Laced)");
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Placeholder");;
-		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Placeholder");
+		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Vanadium Redox Power Cell (IV)");
+		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Vanadium Redox Power Cell (LuV)");
+		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Vanadium Redox Power Cell (ZPM)");
+		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Vanadium Redox Power Cell (UV)");;
+		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Vanadium Redox Power Cell (MAX)");
 		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Placeholder");
 		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Placeholder");
 		GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Placeholder");
@@ -73,9 +65,11 @@ extends GregtechMetaCasingBlocksAbstract {
 		GregtechItemList.Casing_Extruder.set(new ItemStack(this, 1, 1));
 		GregtechItemList.Casing_Multi_Use.set(new ItemStack(this, 1, 2));
 		GregtechItemList.Casing_BedrockMiner.set(new ItemStack(this, 1, 3));
-		GregtechItemList.Casing_Vanadium_Redox_T2.set(new ItemStack(this, 1, 4));
-		GregtechItemList.Casing_Vanadium_Redox_T3.set(new ItemStack(this, 1, 5));
-		GregtechItemList.Casing_Vanadium_Redox_T4.set(new ItemStack(this, 1, 6));
+		GregtechItemList.Casing_Vanadium_Redox_IV.set(new ItemStack(this, 1, 4));
+		GregtechItemList.Casing_Vanadium_Redox_LuV.set(new ItemStack(this, 1, 5));
+		GregtechItemList.Casing_Vanadium_Redox_ZPM.set(new ItemStack(this, 1, 6));
+		GregtechItemList.Casing_Vanadium_Redox_UV.set(new ItemStack(this, 1, 7));
+		GregtechItemList.Casing_Vanadium_Redox_MAX.set(new ItemStack(this, 1, 8));
 		//GregtechItemList.Casing_WashPlant.set(new ItemStack(this, 1, 4));
 		//GregtechItemList.Casing_Sifter.set(new ItemStack(this, 1, 5));
 		//GregtechItemList.Casing_SifterGrate.set(new ItemStack(this, 1, 6));
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
index d6844a1eed..e83ce098c8 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
@@ -20,18 +20,20 @@ public class CasingTextureHandler3 {
 				//Trinium Plated Mining Platform Casing
 				return TexturesGtBlock.Casing_Staballoy_Firebox.getIcon();
 			case 4:
-				//Vanadium Redox T2
+				//Vanadium Redox IV
 				return TexturesGtBlock.Casing_Redox_2.getIcon();
 			case 5:
-				//Vanadium Redox T3
+				//Vanadium Redox LuV
 				return TexturesGtBlock.Casing_Redox_3.getIcon();
 			case 6:
-				//Vanadium Redox T4
+				//Vanadium Redox ZPM
 				return TexturesGtBlock.Casing_Redox_4.getIcon();
 			case 7:
-				return TexturesGtBlock._PlaceHolder.getIcon();
+				//Vanadium Redox UV
+				return TexturesGtBlock.Casing_Redox_5.getIcon();
 			case 8:
-				return TexturesGtBlock._PlaceHolder.getIcon();
+				//Vanadium Redox MAX
+				return TexturesGtBlock.Casing_Redox_6.getIcon();
 			case 9:
 				return TexturesGtBlock._PlaceHolder.getIcon();
 			case 10:
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
index 0f8c8d44c5..0c187480bb 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
@@ -168,6 +168,10 @@ public class TexturesGtBlock {
 	public static final CustomIcon Casing_Redox_2 = new CustomIcon("redox/redox2");
 	public static final CustomIcon Casing_Redox_3 = new CustomIcon("redox/redox3");
 	public static final CustomIcon Casing_Redox_4 = new CustomIcon("redox/redox4");
+	public static final CustomIcon Casing_Redox_5 = new CustomIcon("redox/redox5");
+	public static final CustomIcon Casing_Redox_6 = new CustomIcon("redox/redox6");
+	public static final CustomIcon Casing_Redox_7 = new CustomIcon("redox/redox7");
+	public static final CustomIcon Casing_Redox_8 = new CustomIcon("redox/redox8");
 
 	//Centrifuge Casing
 	private static final CustomIcon Internal_Casing_Centrifuge = new CustomIcon("TileEntities/MACHINE_CASING_CENTRIFUGE");
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
index 2aa30a0c30..4746dc2728 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
@@ -109,15 +109,15 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe
 		Logger.INFO("Power Sub-Station problem: " + msg);
 	}
 
-	private int getCellTier(Block aBlock, int aMeta) {
+	public static int getCellTier(Block aBlock, int aMeta) {
 		if (aBlock == ModBlocks.blockCasings2Misc && aMeta == 7) {
-			return 3;
-		} else if (aBlock == ModBlocks.blockCasings3Misc && aMeta == 4) {
 			return 4;
- 		} else if (aBlock == ModBlocks.blockCasings3Misc && aMeta == 5) {
+		} else if (aBlock == ModBlocks.blockCasings3Misc && aMeta == 4) {
 			return 5;
-		} else if (aBlock == ModBlocks.blockCasings3Misc && aMeta == 6) {
+ 		} else if (aBlock == ModBlocks.blockCasings3Misc && aMeta == 5) {
 			return 6;
+		} else if (aBlock == ModBlocks.blockCasings3Misc && aMeta == 6) {
+			return 7;
 		} else {
 			return -1;
 		}
@@ -282,15 +282,15 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe
 		return true;
 	}
 
-	// Define storage capacity of smallest cell tier (HV) and compute higher tiers from it
-	private static final long CELL_TIER_HV_CAPACITY = 10 * 1000 * 1000; // one lapotron crystal
+	// Define storage capacity of smallest cell tier (EV) and compute higher tiers from it
+	private static final long CELL_TIER_EV_CAPACITY = 100 * 1000 * 1000; // one lapotronic orb
 	private static final long CELL_TIER_MULTIPLIER = 4; // each tier's capacity is this many times the previous tier
 
 	public static long getCapacityFromCellTier(int aOverallCellTier) {
 		// Use integer math instead of `Math.pow` to avoid range/precision errors
-		if (aOverallCellTier < 3) return 0;
-		aOverallCellTier -= 3;
-		long capacity = CELL_TIER_HV_CAPACITY;
+		if (aOverallCellTier < 4) return 0;
+		aOverallCellTier -= 4;
+		long capacity = CELL_TIER_EV_CAPACITY;
 		while (aOverallCellTier > 0) {
 			capacity *= CELL_TIER_MULTIPLIER;
 			aOverallCellTier--;