aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/item
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2019-05-13 11:44:19 +1000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2019-05-13 11:44:19 +1000
commitf82bd998288253230713cb146f6294be2d02260c (patch)
tree7173d20629efaa13a201c0ce2c6bfad39796a204 /src/Java/gtPlusPlus/core/item
parentd30f18947a5c5e275ef7f17323ac837939cb0135 (diff)
downloadGT5-Unofficial-f82bd998288253230713cb146f6294be2d02260c.tar.gz
GT5-Unofficial-f82bd998288253230713cb146f6294be2d02260c.tar.bz2
GT5-Unofficial-f82bd998288253230713cb146f6294be2d02260c.zip
+ Added 5 lower Tier charging packs.
Diffstat (limited to 'src/Java/gtPlusPlus/core/item')
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java13
-rw-r--r--src/Java/gtPlusPlus/core/item/bauble/BatteryPackBaseBauble.java3
-rw-r--r--src/Java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java2
3 files changed, 11 insertions, 7 deletions
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();