diff options
author | Techlone <techlone.mc@gmail.com> | 2017-04-27 20:18:38 +0500 |
---|---|---|
committer | Techlone <techlone.mc@gmail.com> | 2017-04-27 20:18:38 +0500 |
commit | 19a5320f00219af99749c33119ed9d04b4febdba (patch) | |
tree | f04774d4f8e60885b1395885af4032e9849b0386 /src/main/java/gregtech/common/tileentities/storage | |
parent | f55959dd926afd78125cbd6c2efa24fc4165d2cd (diff) | |
parent | cff6b44a84db895c8ef0555baf2c1e8d09b370e5 (diff) | |
download | GT5-Unofficial-19a5320f00219af99749c33119ed9d04b4febdba.tar.gz GT5-Unofficial-19a5320f00219af99749c33119ed9d04b4febdba.tar.bz2 GT5-Unofficial-19a5320f00219af99749c33119ed9d04b4febdba.zip |
Merge remote-tracking branch 'remotes/JohannesGaessler/SteamProductionImprovement' into unstable
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/storage')
3 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java index 41beb1c8ec..22e9a23843 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java +++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java @@ -30,10 +30,10 @@ public class GT_MetaTileEntity_Locker }
public String[] getDescription() {
- String[] desc = new String[mDescription.length + 1];
- System.arraycopy(mDescription, 0, desc, 0, mDescription.length);
- desc[mDescription.length] = "Click with Screwdriver to change Style";
- return desc;
+ String[] desc = new String[mDescriptionArray.length + 1];
+ System.arraycopy(mDescriptionArray, 0, desc, 0, mDescriptionArray.length);
+ desc[mDescriptionArray.length] = "Click with Screwdriver to change Style";
+ return desc;
}
public ITexture[][][] getTextureSet(ITexture[] aTextures) {
@@ -57,7 +57,7 @@ public class GT_MetaTileEntity_Locker }
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
- return new GT_MetaTileEntity_Locker(this.mName, this.mTier, this.mDescription, this.mTextures);
+ return new GT_MetaTileEntity_Locker(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
}
public boolean isSimpleMachine() {
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java index 84c1d9e800..2bfc81caf4 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java +++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java @@ -51,7 +51,7 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_TieredMach @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_QuantumChest(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_QuantumChest(mName, mTier, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java index 7d7868b2b5..015ea7ab4b 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java +++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java @@ -126,7 +126,7 @@ public class GT_MetaTileEntity_QuantumTank @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_QuantumTank(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_QuantumTank(mName, mTier, mDescriptionArray, mTextures); } @Override |