From 40ae175246909c01c20205e4a67b6888b3856b9d Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Wed, 9 Aug 2017 18:41:25 +1000 Subject: $ Fixed mDescriptions for .08 compat. --- .../common/tileentities/storage/shelving/GT4Entity_Shelf.java | 6 +----- .../tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java | 4 ++-- .../common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java | 4 ++-- .../tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java | 4 ++-- .../common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java | 4 ++-- 5 files changed, 9 insertions(+), 13 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java index d435ad2b8b..adb5f622f6 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf.java @@ -24,10 +24,6 @@ public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric { super(aName, 0, aDescription, aTextures); } - public GT4Entity_Shelf(final String aName, final String[] aDescription, final ITexture[][][] aTextures) { - super(aName, 0, aDescription, aTextures); - } - @Override public boolean isSimpleMachine() { return true; @@ -125,7 +121,7 @@ public class GT4Entity_Shelf extends GT_MetaTileEntity_BasicHull_NonElectric { @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT4Entity_Shelf(this.mName, this.mDescriptionArray, this.mTextures); + return new GT4Entity_Shelf(this.mName, this.mDescription, this.mTextures); } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java index be9bba7097..676ba4b92e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Compartment.java @@ -23,13 +23,13 @@ public class GT4Entity_Shelf_Compartment extends GT4Entity_Shelf { super(aID, aName, aNameRegional, aDescription); } - public GT4Entity_Shelf_Compartment(String mName, String[] mDescriptionArray, ITexture[][][] mTextures) { + public GT4Entity_Shelf_Compartment(String mName, String mDescriptionArray, ITexture[][][] mTextures) { super(mName, mDescriptionArray, mTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT4Entity_Shelf_Compartment(this.mName, this.mDescriptionArray, this.mTextures); + return new GT4Entity_Shelf_Compartment(this.mName, this.mDescription, this.mTextures); } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java index b1edf6d0f3..07da58ffad 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Desk.java @@ -15,13 +15,13 @@ public class GT4Entity_Shelf_Desk extends GT4Entity_Shelf { super(aID, aName, aNameRegional, aDescription); } - public GT4Entity_Shelf_Desk(String mName, String[] mDescriptionArray, ITexture[][][] mTextures) { + public GT4Entity_Shelf_Desk(String mName, String mDescriptionArray, ITexture[][][] mTextures) { super(mName, mDescriptionArray, mTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT4Entity_Shelf_Desk(this.mName, this.mDescriptionArray, this.mTextures); + return new GT4Entity_Shelf_Desk(this.mName, this.mDescription, this.mTextures); } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java index 0e29c0181b..b707df5a2d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_FileCabinet.java @@ -13,13 +13,13 @@ public class GT4Entity_Shelf_FileCabinet extends GT4Entity_Shelf { super(aID, aName, aNameRegional, aDescription); } - public GT4Entity_Shelf_FileCabinet(String mName, String[] mDescriptionArray, ITexture[][][] mTextures) { + public GT4Entity_Shelf_FileCabinet(String mName, String mDescriptionArray, ITexture[][][] mTextures) { super(mName, mDescriptionArray, mTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT4Entity_Shelf_FileCabinet(this.mName, this.mDescriptionArray, this.mTextures); + return new GT4Entity_Shelf_FileCabinet(this.mName, this.mDescription, this.mTextures); } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java index a8a53aeb12..b2262cd19b 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/shelving/GT4Entity_Shelf_Iron.java @@ -13,13 +13,13 @@ public class GT4Entity_Shelf_Iron extends GT4Entity_Shelf { super(aID, aName, aNameRegional, aDescription); } - public GT4Entity_Shelf_Iron(String mName, String[] mDescriptionArray, ITexture[][][] mTextures) { + public GT4Entity_Shelf_Iron(String mName, String mDescriptionArray, ITexture[][][] mTextures) { super(mName, mDescriptionArray, mTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT4Entity_Shelf_Iron(this.mName, this.mDescriptionArray, this.mTextures); + return new GT4Entity_Shelf_Iron(this.mName, this.mDescription, this.mTextures); } @Override -- cgit