From f82bd998288253230713cb146f6294be2d02260c Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Mon, 13 May 2019 11:44:19 +1000
Subject: + Added 5 lower Tier charging packs.

---
 src/Java/gtPlusPlus/core/item/ModItems.java                 | 13 +++++++++----
 .../gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java  |  3 +--
 .../gtPlusPlus/core/item/bauble/ElectricBaseBauble.java     |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/item')

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();
-- 
cgit