+ Added 5 lower Tier charging packs.

10 files changed, 102 insertions, 19 deletions

diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
index c6fcc83d01..dd7f0866ab 100644
--- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java
@@ -36,10 +36,15 @@ public class COMPAT_Baubles {
 		ModItems.itemPersonalHealingDevice = new ItemHealingDevice();
 
 		try {
-			ModItems.itemChargePack1 = new BatteryPackBaseBauble(6);
-			ModItems.itemChargePack2 = new BatteryPackBaseBauble(7);
-			ModItems.itemChargePack3 = new BatteryPackBaseBauble(8);
-			ModItems.itemChargePack4 = new BatteryPackBaseBauble(9);		
+			ModItems.itemChargePack_Low_1 = new BatteryPackBaseBauble(1);
+			ModItems.itemChargePack_Low_2 = new BatteryPackBaseBauble(2);
+			ModItems.itemChargePack_Low_3 = new BatteryPackBaseBauble(3);
+			ModItems.itemChargePack_Low_4 = new BatteryPackBaseBauble(4);
+			ModItems.itemChargePack_Low_5 = new BatteryPackBaseBauble(5);			
+			ModItems.itemChargePack_High_1 = new BatteryPackBaseBauble(6);
+			ModItems.itemChargePack_High_2 = new BatteryPackBaseBauble(7);
+			ModItems.itemChargePack_High_3 = new BatteryPackBaseBauble(8);
+			ModItems.itemChargePack_High_4 = new BatteryPackBaseBauble(9);		
 		}
 		catch (Throwable t) {
 			t.printStackTrace();
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index e504c1c2b4..9b32c55d2d 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -333,10 +333,15 @@ public final class ModItems {
 	public static IonParticles itemIonParticleBase;
 	public static StandardBaseParticles itemStandarParticleBase;
 
-	public static BatteryPackBaseBauble itemChargePack1;
-	public static BatteryPackBaseBauble itemChargePack2;
-	public static BatteryPackBaseBauble itemChargePack3;
-	public static BatteryPackBaseBauble itemChargePack4;
+	public static BatteryPackBaseBauble itemChargePack_Low_1;
+	public static BatteryPackBaseBauble itemChargePack_Low_2;
+	public static BatteryPackBaseBauble itemChargePack_Low_3;
+	public static BatteryPackBaseBauble itemChargePack_Low_4;
+	public static BatteryPackBaseBauble itemChargePack_Low_5;
+	public static BatteryPackBaseBauble itemChargePack_High_1;
+	public static BatteryPackBaseBauble itemChargePack_High_2;
+	public static BatteryPackBaseBauble itemChargePack_High_3;
+	public static BatteryPackBaseBauble itemChargePack_High_4;
 
 	public static DebugScanner itemDebugScanner;
 
diff --git a/src/Java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java b/src/Java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java
index 2d9b35ac63..2e40d86473 100644
--- a/src/Java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java
+++ b/src/Java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java
@@ -242,8 +242,7 @@ public class BatteryPackBaseBauble extends ElectricBaseBauble {
 
 	@Override
 	public String getTextureNameForBauble() {
-		// TODO Auto-generated method stub
-		return null;
+		return "chargepack/"+mTier;
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java b/src/Java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java
index fb490285e9..8472549e8d 100644
--- a/src/Java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java
+++ b/src/Java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java
@@ -42,7 +42,7 @@ public abstract class ElectricBaseBauble extends BaseBauble implements IElectric
 		mTier = aTier;
 		maxValueEU = aMaxEU;
 		this.setUnlocalizedName(aUnlocalName);
-		this.setTextureName(getTextureNameForBauble());
+		this.setTextureName(CORE.MODID + ":" + getTextureNameForBauble());
 		this.setMaxDamage(27);
 		this.setMaxStackSize(1);
 		this.setNoRepair();
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index c00e15a007..e264a680fc 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -373,16 +373,16 @@ public class RECIPES_GREGTECH {
 
 		ItemStack[] aChargeResearch = new ItemStack[] {
 				ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore7", 1),
-				ItemUtils.getSimpleStack(ModItems.itemChargePack1, 1),
-				ItemUtils.getSimpleStack(ModItems.itemChargePack2, 1),
-				ItemUtils.getSimpleStack(ModItems.itemChargePack3, 1),
+				ItemUtils.getSimpleStack(ModItems.itemChargePack_High_1, 1),
+				ItemUtils.getSimpleStack(ModItems.itemChargePack_High_2, 1),
+				ItemUtils.getSimpleStack(ModItems.itemChargePack_High_3, 1),
 		};
 
 		ItemStack[] aChargeOutputs = new ItemStack[] {
-				ItemUtils.getSimpleStack(ModItems.itemChargePack1, 1),
-				ItemUtils.getSimpleStack(ModItems.itemChargePack2, 1),
-				ItemUtils.getSimpleStack(ModItems.itemChargePack3, 1),
-				ItemUtils.getSimpleStack(ModItems.itemChargePack4, 1),			
+				ItemUtils.getSimpleStack(ModItems.itemChargePack_High_1, 1),
+				ItemUtils.getSimpleStack(ModItems.itemChargePack_High_2, 1),
+				ItemUtils.getSimpleStack(ModItems.itemChargePack_High_3, 1),
+				ItemUtils.getSimpleStack(ModItems.itemChargePack_High_4, 1),			
 		};
 
 		ItemStack[] aBufferCoreInputs = new ItemStack[] {
@@ -719,7 +719,7 @@ public class RECIPES_GREGTECH {
 				0,
 				20 * 300,
 				8000);
-		
+
 
 
 		//Strontium processing
@@ -1388,6 +1388,80 @@ public class RECIPES_GREGTECH {
 		}, null, ItemUtils.simpleMetaStack(ModItems.itemGenericToken, 4, 1), 10*20*4, 1960);
 
 
+
+
+
+		//Low tier Charge Packs
+
+		final ItemStack[] aPackBatteries = new ItemStack[] {
+				ItemList.Battery_RE_LV_Lithium.get(GTNH ? 8 : 4),
+				ItemList.Battery_RE_MV_Lithium.get(GTNH ? 8 : 4),
+				ItemList.Battery_RE_HV_Lithium.get(GTNH ? 8 : 4),
+				GregtechItemList.Battery_RE_EV_Lithium.get(GTNH ? 8 : 4),
+				ItemList.Energy_LapotronicOrb.get(GTNH ? 8 : 4),
+		};
+		final ItemStack[] aPackPlates = new ItemStack[] {
+				CI.getPlate(1, GTNH ? 6 : 3),
+				CI.getPlate(2, GTNH ? 12 : 6),
+				CI.getPlate(3, GTNH ? 18 : 9),
+				CI.getPlate(4, GTNH ? 24 : 12),
+				CI.getPlate(5, GTNH ? 30 : 15),
+		};
+		final ItemStack[] aPackWire = new ItemStack[] {
+				CI.getTieredComponent(OrePrefixes.wireGt02, 1, GTNH ? 16 : 8),
+				CI.getTieredComponent(OrePrefixes.wireGt04, 2, GTNH ? 16 : 8),
+				CI.getTieredComponent(OrePrefixes.wireGt08, 3, GTNH ? 14 : 7),
+				CI.getTieredComponent(OrePrefixes.wireGt12, 4, GTNH ? 12 : 6),
+				CI.getTieredComponent(OrePrefixes.wireGt16, 5, GTNH ? 12 : 6),
+		};
+		final ItemStack[] aPackCircuit = new ItemStack[] {
+				CI.getTieredComponent(OrePrefixes.circuit, 1, GTNH ? 4 : 2),
+				CI.getTieredComponent(OrePrefixes.circuit, 2, GTNH ? 4 : 2),
+				CI.getTieredComponent(OrePrefixes.circuit, 3, GTNH ? 8 : 4),
+				CI.getTieredComponent(OrePrefixes.circuit, 4, GTNH ? 8 : 4),
+				CI.getTieredComponent(OrePrefixes.circuit, 5, GTNH ? 12 : 6),
+		};
+		final ItemStack[] aPackRing = new ItemStack[] {
+				CI.getTieredComponent(OrePrefixes.ring, 1, GTNH ? 20 : 10),
+				CI.getTieredComponent(OrePrefixes.ring, 2, GTNH ? 20 : 10),
+				CI.getTieredComponent(OrePrefixes.ring, 3, GTNH ? 20 : 10),
+				CI.getTieredComponent(OrePrefixes.ring, 4, GTNH ? 20 : 10),
+				CI.getTieredComponent(OrePrefixes.ring, 5, GTNH ? 20 : 10),
+		};
+		final ItemStack[] aPackOutput = new ItemStack[] {
+				ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_1),
+				ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_2),
+				ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_3),
+				ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_4),
+				ItemUtils.getSimpleStack(ModItems.itemChargePack_Low_5)				
+		};
+		
+		for (int i = 1; i < 6; i++) {
+			
+			int aAS = i-1;
+			
+			CORE.RA.addSixSlotAssemblingRecipe(
+					new ItemStack[] { 
+							aPackPlates[aAS],
+							aPackRing[aAS], 
+							aPackWire[aAS],
+							aPackCircuit[aAS],
+							aPackBatteries[aAS],
+							CI.getSensor(i, GTNH ? 4 : 2),
+							},
+					CI.getTieredFluid(i, (144 * (GTNH ? 4 : 2))), 
+					aPackOutput[aAS],
+					30 * 20 * i, 
+					(int) GT_Values.V[i]);
+		}
+		
+
+		
+
+
+
+
+
 	}
 
 	private static boolean addAR(final ItemStack inputA, final ItemStack inputB, final FluidStack inputFluidA,
diff --git a/src/resources/assets/miscutils/textures/items/chargepack/1.png b/src/resources/assets/miscutils/textures/items/chargepack/1.png
new file mode 100644
index 0000000000..9039d443c3
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/chargepack/1.png
diff --git a/src/resources/assets/miscutils/textures/items/chargepack/2.png b/src/resources/assets/miscutils/textures/items/chargepack/2.png
new file mode 100644
index 0000000000..7023e7ce82
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/chargepack/2.png
diff --git a/src/resources/assets/miscutils/textures/items/chargepack/3.png b/src/resources/assets/miscutils/textures/items/chargepack/3.png
new file mode 100644
index 0000000000..4d787e7aa8
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/chargepack/3.png
diff --git a/src/resources/assets/miscutils/textures/items/chargepack/4.png b/src/resources/assets/miscutils/textures/items/chargepack/4.png
new file mode 100644
index 0000000000..9320de0611
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/chargepack/4.png
diff --git a/src/resources/assets/miscutils/textures/items/chargepack/5.png b/src/resources/assets/miscutils/textures/items/chargepack/5.png
new file mode 100644
index 0000000000..ab8771c89c
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/chargepack/5.png