diff options
| author | Techlone <techlone.mc@gmail.com> | 2017-04-16 02:20:26 +0500 |
|---|---|---|
| committer | Techlone <techlone.mc@gmail.com> | 2017-04-16 02:20:26 +0500 |
| commit | 2115280ab9ce3f66631072cb23b27b0dced10d13 (patch) | |
| tree | 87ef9e63a1372ee4b64c5c7b671f1468ef849f7c /src/main/java/gregtech/common/tileentities/storage | |
| parent | bd1ca056d63fe0ac2c3a8478c78183eafea92096 (diff) | |
| parent | 162d021fc8f33dbfac03b499a38ecbd3b1b73c03 (diff) | |
| download | GT5-Unofficial-2115280ab9ce3f66631072cb23b27b0dced10d13.tar.gz GT5-Unofficial-2115280ab9ce3f66631072cb23b27b0dced10d13.tar.bz2 GT5-Unofficial-2115280ab9ce3f66631072cb23b27b0dced10d13.zip | |
Merge remote-tracking branch 'remotes/JohannesGaessler/SteamProductionImprovement' into unstable
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/storage')
3 files changed, 16 insertions, 1 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 c9b57fc728..41beb1c8ec 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 @@ -25,8 +25,15 @@ public class GT_MetaTileEntity_Locker super(aName, aTier, 4, aDescription, aTextures);
}
+ public GT_MetaTileEntity_Locker(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
+ super(aName, aTier, 4, aDescription, aTextures);
+ }
+
public String[] getDescription() {
- return new String[]{this.mDescription, "Click with Screwdriver to change Style"};
+ 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;
}
public ITexture[][][] getTextureSet(ITexture[] aTextures) {
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 a5a0a11ac6..84c1d9e800 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 @@ -25,6 +25,10 @@ public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_TieredMach super(aName, aTier, 3, aDescription, aTextures); } + public GT_MetaTileEntity_QuantumChest(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + super(aName, aTier, 3, aDescription, aTextures); + } + @Override public boolean isSimpleMachine() { return true; 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 1be8e2ff6f..7d7868b2b5 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 @@ -19,6 +19,10 @@ public class GT_MetaTileEntity_QuantumTank super(aName, aTier, 3, aDescription, aTextures); } + public GT_MetaTileEntity_QuantumTank(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + super(aName, aTier, 3, aDescription, aTextures); + } + @Override public ITexture[][][] getTextureSet(ITexture[] aTextures) { return new ITexture[0][0][0]; |