Add icons and recipes, and clean up spaces

3 files changed, 48 insertions, 34 deletions

diff --git a/src/main/java/common/Recipes.java b/src/main/java/common/Recipes.java
index 87b495cf1a..d93b40b47f 100644
--- a/src/main/java/common/Recipes.java
+++ b/src/main/java/common/Recipes.java
@@ -427,6 +427,28 @@ public class Recipes {
 				'L', OrePrefixes.block.get(Materials.Lapis)
 		};
 		GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 0), lcBase_recipe);
+		
+		// Empty Capacitor
+		final Object[] lcEmpty_recipe = {
+				"SLS", "L L", "SLS",
+				'S', OrePrefixes.screw.get(Materials.Lapis),
+				'L', OrePrefixes.plate.get(Materials.Lapis)
+		};
+		GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6), lcEmpty_recipe);
+		
+		// EV Capacitor
+		final Object[] lcEV_recipe = {
+				"SLS", "LCL", "SLS",
+				'S', OrePrefixes.screw.get(Materials.Lapis),
+				'L', OrePrefixes.plate.get(Materials.Lapis),
+				'C', GT_ModHandler.getIC2Item("lapotronCrystal", 1L, GT_Values.W)
+		};
+		GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 7), lcEV_recipe);
+		
+		//EV cap alt recipe
+		GT_Values.RA.addAssemblerRecipe(new ItemStack[] {(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6)), GT_ModHandler.getIC2Item("lapotronCrystal", 1L, GT_Values.W), GT_Utility.getIntegratedCircuit(7)}, null, new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 7), 200, 480);
+		
+		// IV Capacitor
 		final Object[] lcIV_recipe = {
 				"SLS", "LOL", "SLS",
 				'S', OrePrefixes.screw.get(Materials.Lapis),
@@ -435,6 +457,9 @@ public class Recipes {
 		};
 		GT_ModHandler.addCraftingRecipe(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 1), lcIV_recipe);
 
+		//IV cap alt recipe
+		GT_Values.RA.addAssemblerRecipe(new ItemStack[] {(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6)), ItemList.Energy_LapotronicOrb.get(1L), GT_Utility.getIntegratedCircuit(1)}, null, new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 1), 200, 1920);
+		
 		// LuV Capacitor
 		GT_Values.RA.addAssemblylineRecipe(
 				new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 1), 288000,
@@ -458,6 +483,7 @@ public class Recipes {
 				},
 				new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 2), 2000, 100000
 		);
+		
 		// ZPM Capacitor
 		GT_Values.RA.addAssemblylineRecipe(
 				new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 2), 288000,
@@ -482,6 +508,7 @@ public class Recipes {
 				},
 				new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 3), 2000, 100000
 		);
+		
 		// UV Capacitor
 		GT_Values.RA.addAssemblylineRecipe(
 				new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 3), 288000,
@@ -506,6 +533,7 @@ public class Recipes {
 				},
 				new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4), 2000, 200000
 		);
+		
 		// Ultimate Capacitor
 		GT_Values.RA.addAssemblylineRecipe(
 				new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 4), 288000,
@@ -534,9 +562,13 @@ public class Recipes {
 		);
 
 		// Capacitor recycling
+		GT_Values.RA.addUnboxingRecipe(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 7),
+				GT_ModHandler.getIC2Item("lapotronCrystal", 1L, 26),
+				new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6),
+				1200, 32);
 		GT_Values.RA.addUnboxingRecipe(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 1),
 				ItemList.Energy_LapotronicOrb.get(1L),
-				GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Lapis, 4),
+				new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 6),
 				1200, 32);
 		GT_Values.RA.addUnboxingRecipe(new ItemStack(Blocks.lscLapotronicEnergyUnit, 1, 2),
 				ItemList.Energy_LapotronicOrb2.get(1L),
@@ -596,7 +628,6 @@ public class Recipes {
 	}*/
 
 	private static void registerRecipes_Cosmetics() {
-
 		// Hex Tiles
 		final ItemStack[] hexTiles = {
 				GT_Utility.getIntegratedCircuit(6),
diff --git a/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java b/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java
index ad64612247..75de60a308 100644
--- a/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java
+++ b/src/main/java/common/blocks/Block_LapotronicEnergyUnit.java
@@ -19,6 +19,10 @@ public class Block_LapotronicEnergyUnit extends BaseGTUpdateableBlock {
 	private IIcon iconBaseSide;
 	private IIcon iconBaseTop;
 	
+	private IIcon iconLapoEmptySide;
+	private IIcon iconLapoEmptyTop;
+	private IIcon iconLapoEVSide;
+	private IIcon iconLapoEVTop;
 	private IIcon iconLapoIVSide;
 	private IIcon iconLapoIVTop;
 	private IIcon iconLapoLuVSide;
@@ -50,6 +54,11 @@ public class Block_LapotronicEnergyUnit extends BaseGTUpdateableBlock {
 		iconBaseSide = ir.registerIcon("kekztech:LSCBase_side");
 		iconBaseTop = ir.registerIcon("kekztech:LSCBase_top");
 		
+		
+		iconLapoEmptySide = ir.registerIcon("kekztech:LapotronicEnergyUnit6_side");
+		iconLapoEmptyTop = ir.registerIcon("kekztech:LapotronicEnergyUnit6_top");
+		iconLapoEVSide = ir.registerIcon("kekztech:LapotronicEnergyUnit7_side");
+		iconLapoEVTop = ir.registerIcon("kekztech:LapotronicEnergyUnit7_top");
 		iconLapoIVSide = ir.registerIcon("kekztech:LapotronicEnergyUnit1_side");
 		iconLapoIVTop = ir.registerIcon("kekztech:LapotronicEnergyUnit1_top");
 		iconLapoLuVSide = ir.registerIcon("kekztech:LapotronicEnergyUnit2_side");
@@ -89,8 +98,8 @@ public class Block_LapotronicEnergyUnit extends BaseGTUpdateableBlock {
 		case 3: return (side < 2) ? iconLapoZPMTop : iconLapoZPMSide;
 		case 4: return (side < 2) ? iconLapoUVTop : iconLapoUVSide;
 		case 5: return (side < 2) ? iconUltimateTop : iconUltimateSide;
-		case 6: return (side < 2) ? iconBaseTop : iconBaseSide;//temp
-		case 7: return (side < 2) ? iconLapoIVTop : iconLapoIVSide;//temp
+		case 6: return (side < 2) ? iconLapoEmptyTop : iconLapoEmptySide;
+		case 7: return (side < 2) ? iconLapoEVTop : iconLapoEVSide;
 		default: return iconUltimateTop;
 		}
 	}
diff --git a/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java b/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java
index 48c82812b9..aa9cdf42a1 100644
--- a/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java
+++ b/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java
@@ -233,17 +233,6 @@ public class GTMTE_LapotronicSuperCapacitor extends GT_MetaTileEntity_MultiBlock
 					final int meta = thisController.getMetaIDOffset(offset.x(), offset.y(), offset.z());
 					if(thisController.getBlockOffset(offset.x(), offset.y(), offset.z()) == LSC_PART && (meta > 0)) {
 						// Add capacity
-						/*if(meta <= 4){
-							final long c = (long) (100000000L * Math.pow(10, meta - 1));
-							tempCapacity = tempCapacity.add(BigInteger.valueOf(c));
-							capacity = capacity.add(BigInteger.valueOf(c));
-						} else if(meta <= 5){
-							tempCapacity = tempCapacity.add(BigInteger.valueOf((long) (100000000L * Math.pow(10, 3))));
-							capacity = capacity.add(MAX_LONG);
-						}*/
-						
-						
-						
 						switch(meta - 1) {
 						case 1: tempCapacity = tempCapacity.add(BigInteger.valueOf(100000000L)); capacity = capacity.add(BigInteger.valueOf(100000000L)); break;
 						case 2: tempCapacity = tempCapacity.add(BigInteger.valueOf(1000000000L)); capacity = capacity.add(BigInteger.valueOf(1000000000L)); break;
@@ -253,8 +242,7 @@ public class GTMTE_LapotronicSuperCapacitor extends GT_MetaTileEntity_MultiBlock
 						case 6: tempCapacity = tempCapacity.add(BigInteger.valueOf(0L)); capacity = capacity.add(BigInteger.valueOf(0L)); break;
 						case 7: tempCapacity = tempCapacity.add(BigInteger.valueOf(10000000L)); capacity = capacity.add(BigInteger.valueOf(10000000L)); break;
 						default: break; 
-						}
-						
+						}			
 						capacitors[meta - 1]++;
 					} else if(thisController.getBlockOffset(offset.x(), offset.y(), offset.z()).getUnlocalizedName().equals(glassNameBorosilicate)){
 						firstGlassHeight = Y;
@@ -309,15 +297,9 @@ public class GTMTE_LapotronicSuperCapacitor extends GT_MetaTileEntity_MultiBlock
 		final int colourCorrectedMeta = firstGlassMeta > 5 ? 0 : firstGlassMeta;
 		for(int highestCapacitor = capacitors.length - 1; highestCapacitor >= 0; highestCapacitor--){
 			if(capacitors[highestCapacitor] > 0){
-				/*if(colourCorrectedMeta < highestCapacitor){
-					formationChecklist = false;
-				}
-				break;*/
-				
-				//if glass < cap
 				switch (highestCapacitor) {
-				case 0:
-					break;
+				case 0://For the empty/EV/IV caps, any BS glass works
+					break; 
 				case 1:
 					if(colourCorrectedMeta < highestCapacitor){
 						formationChecklist = false;
@@ -358,14 +340,7 @@ public class GTMTE_LapotronicSuperCapacitor extends GT_MetaTileEntity_MultiBlock
 
 		// Calculate total capacity
 		capacity = BigInteger.ZERO;
-		for(int i = 0; i < capacitors.length; i++){
-			/*if(i <= 3){
-				final long c = (long) (100000000L * Math.pow(10, i));
-				capacity = capacity.add(BigInteger.valueOf(c).multiply(BigInteger.valueOf(capacitors[i])));
-			} else {
-				capacity = capacity.add(MAX_LONG.multiply(BigInteger.valueOf(capacitors[i])));
-			}*/
-						
+		for(int i = 0; i < capacitors.length; i++){	
 			switch(i) {
 			case 0: capacity = capacity.add(BigInteger.valueOf(100000000L).multiply(BigInteger.valueOf(capacitors[i]))); break;
 			case 1: capacity = capacity.add(BigInteger.valueOf(1000000000L).multiply(BigInteger.valueOf(capacitors[i]))); break;
@@ -376,7 +351,6 @@ public class GTMTE_LapotronicSuperCapacitor extends GT_MetaTileEntity_MultiBlock
 			case 6: capacity = capacity.add(BigInteger.valueOf(10000000L).multiply(BigInteger.valueOf(capacitors[i]))); break;
 			default: break; 
 			}
-			
 		}
 		// Calculate how much energy to void each tick
 		passiveDischargeAmount = new BigDecimal(tempCapacity).multiply(PASSIVE_DISCHARGE_FACTOR_PER_TICK).toBigInteger();