From c2869bc333831fae3286dc29db3a0d16f87be097 Mon Sep 17 00:00:00 2001 From: glowredman <35727266+glowredman@users.noreply.github.com> Date: Tue, 18 Apr 2023 21:40:35 +0200 Subject: Use `mDescriptionArray` --- .../hatch/GT_MetaTileEntity_Hatch_Capacitor.java | 23 ++++++------ .../GT_MetaTileEntity_Hatch_CreativeData.java | 24 ++++++------- .../GT_MetaTileEntity_Hatch_DataConnector.java | 11 ++---- .../hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java | 28 +++++++-------- .../GT_MetaTileEntity_Hatch_DynamoTunnel.java | 23 +++++------- ...GT_MetaTileEntity_Hatch_ElementalContainer.java | 38 ++++++++++---------- .../hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java | 34 ++++++++---------- .../GT_MetaTileEntity_Hatch_EnergyTunnel.java | 23 +++++------- .../hatch/GT_MetaTileEntity_Hatch_Holder.java | 23 ++++++------ .../hatch/GT_MetaTileEntity_Hatch_InputData.java | 26 ++++++-------- .../GT_MetaTileEntity_Hatch_InputDataItems.java | 16 +++------ .../GT_MetaTileEntity_Hatch_InputElemental.java | 7 ++-- .../hatch/GT_MetaTileEntity_Hatch_OutputData.java | 27 ++++++-------- .../GT_MetaTileEntity_Hatch_OutputDataItems.java | 31 ++++++++-------- .../GT_MetaTileEntity_Hatch_OutputElemental.java | 4 +-- .../GT_MetaTileEntity_Hatch_OverflowElemental.java | 42 +++++++++++----------- .../hatch/GT_MetaTileEntity_Hatch_Param.java | 25 ++++++------- .../hatch/GT_MetaTileEntity_Hatch_ParamText.java | 4 +-- .../hatch/GT_MetaTileEntity_Hatch_Rack.java | 23 ++++++------ .../hatch/GT_MetaTileEntity_Hatch_Uncertainty.java | 5 +-- .../GT_MetaTileEntity_Hatch_WirelessMulti.java | 21 +++-------- .../multi/GT_MetaTileEntity_EM_switch.java | 3 +- .../multi/GT_MetaTileEntity_EM_transformer.java | 3 +- .../multi/GT_MetaTileEntity_TM_microwave.java | 6 ++-- .../single/GT_MetaTileEntity_BuckConverter.java | 26 ++++++-------- .../single/GT_MetaTileEntity_DataReader.java | 21 ++++++----- .../single/GT_MetaTileEntity_DebugPollutor.java | 26 +++++++------- .../GT_MetaTileEntity_DebugPowerGenerator.java | 29 +++++++-------- .../GT_MetaTileEntity_DebugStructureWriter.java | 30 +++++++--------- .../single/GT_MetaTileEntity_MicroController.java | 4 +-- .../single/GT_MetaTileEntity_OwnerDetector.java | 31 +++++++--------- .../single/GT_MetaTileEntity_TT_Transformer.java | 4 +-- .../single/GT_MetaTileEntity_TeslaCoil.java | 4 +-- .../single/GT_MetaTileEntity_WetTransformer.java | 4 +-- 34 files changed, 283 insertions(+), 366 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java index ca0ef296f8..99e35f57f3 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java @@ -43,11 +43,18 @@ public class GT_MetaTileEntity_Hatch_Capacitor extends GT_MetaTileEntity_Hatch i private static Map componentBinds = new HashMap<>(); public GT_MetaTileEntity_Hatch_Capacitor(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, 16, ""); + super( + aID, + aName, + aNameRegional, + aTier, + 16, + new String[] { CommonValues.THETA_MOVEMENT, translateToLocal("gt.blockmachines.hatch.capacitor.desc.0"), + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.capacitor.desc.1") }); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_Capacitor(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_Capacitor(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 16, aDescription, aTextures); } @@ -76,7 +83,7 @@ public class GT_MetaTileEntity_Hatch_Capacitor extends GT_MetaTileEntity_Hatch i @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_Capacitor(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_Capacitor(mName, mTier, mDescriptionArray, mTextures); } @Override @@ -120,16 +127,6 @@ public class GT_MetaTileEntity_Hatch_Capacitor extends GT_MetaTileEntity_Hatch i return getBaseMetaTileEntity().isActive() ? 0 : mInventory.length; } - @Override - public String[] getDescription() { - return new String[] { CommonValues.THETA_MOVEMENT, translateToLocal("gt.blockmachines.hatch.capacitor.desc.0"), // For - // Tesla - // Tower - EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.capacitor.desc.1") // Stores 'nergy! - // (for a while) - }; - } - public long[] getCapacitors() { long tier = -1; long tCurrent = 0; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeData.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeData.java index f40c4d0ae1..bbca09fda4 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeData.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeData.java @@ -24,18 +24,25 @@ import gregtech.api.util.GT_Utility; public class GT_MetaTileEntity_Hatch_CreativeData extends GT_MetaTileEntity_Hatch_DataConnector { public GT_MetaTileEntity_Hatch_CreativeData(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, ""); + super( + aID, + aName, + aNameRegional, + aTier, + new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.debug.tt.data.desc.0"), + translateToLocal("gt.blockmachines.debug.tt.data.desc.1"), + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.debug.tt.data.desc.2") }); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_CreativeData(String aName, int aTier, String aDescription, + public GT_MetaTileEntity_Hatch_CreativeData(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_CreativeData(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_CreativeData(mName, mTier, mDescriptionArray, mTextures); } @Override @@ -122,15 +129,4 @@ public class GT_MetaTileEntity_Hatch_CreativeData extends GT_MetaTileEntity_Hatc } } } - - @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.debug.tt.data.desc.0"), // Quantum - // Data - // Output - translateToLocal("gt.blockmachines.debug.tt.data.desc.1"), // High speed fibre optics connector. - EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.debug.tt.data.desc.2") // Must be painted - // to work - }; - } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java index bec0fde90e..1f1f359bb8 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java @@ -16,7 +16,6 @@ import org.apache.commons.lang3.reflect.FieldUtils; import com.github.technus.tectech.mechanics.dataTransport.DataPacket; import com.github.technus.tectech.mechanics.pipe.IConnectsToDataPipe; -import com.github.technus.tectech.util.CommonValues; import com.github.technus.tectech.util.TT_Utility; import cpw.mods.fml.relauncher.Side; @@ -45,12 +44,12 @@ public abstract class GT_MetaTileEntity_Hatch_DataConnector> 4), + translateToLocal("tt.base.emhatch.desc.1") + " " + + EnumChatFormatting.AQUA + + TT_Utility.formatNumberShortExp(aTier * aTier >> 4), + translateToLocal("tt.base.emhatch.desc.2"), translateToLocal("tt.base.emhatch.desc.3"), + translateToLocal("tt.base.emhatch.desc.4"), translateToLocal("tt.base.emhatch.desc.5"), + translateToLocal("tt.base.emhatch.desc.6"), + EnumChatFormatting.AQUA + translateToLocal("tt.base.emhatch.desc.7") }); TT_Utility.setTier(aTier, this); } - protected GT_MetaTileEntity_Hatch_ElementalContainer(String aName, int aTier, String aDescription, + protected GT_MetaTileEntity_Hatch_ElementalContainer(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); } @@ -323,24 +339,6 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta purgeOverflow(); } - @Override - public String[] getDescription() { - return new String[] { TEC_MARK_EM, mDescription, - translateToLocal("tt.base.emhatch.desc.0") + " " - + EnumChatFormatting.AQUA - + GT_Utility.formatNumbers(getMaxStacksCount()), // Max stacks amount: - translateToLocal("tt.base.emhatch.desc.1") + " " - + EnumChatFormatting.AQUA - + TT_Utility.formatNumberShortExp(getMaxStackSize()), // Stack capacity: - translateToLocal("tt.base.emhatch.desc.2"), // Place Overflow Hatch behind,on top or below - translateToLocal("tt.base.emhatch.desc.3"), // to provide overflow protection while this block - translateToLocal("tt.base.emhatch.desc.4"), // is not attached to multi block. - translateToLocal("tt.base.emhatch.desc.5"), // Transport range can be extended in straight - translateToLocal("tt.base.emhatch.desc.6"), // line up to 15 blocks with quantum tunnels. - EnumChatFormatting.AQUA + translateToLocal("tt.base.emhatch.desc.7") // Must be painted to work - }; - } - @Override public void onRemoval() { if (isValidMetaTileEntity(this) && getBaseMetaTileEntity().isActive()) { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java index 659c3843eb..7e12f9b86d 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java @@ -25,24 +25,30 @@ public class GT_MetaTileEntity_Hatch_EnergyMulti extends GT_MetaTileEntity_Hatch public final int Amperes; public GT_MetaTileEntity_Hatch_EnergyMulti(int aID, String aName, String aNameRegional, int aTier, int aAmp) { - super(aID, aName, aNameRegional, aTier, 0, translateToLocal("gt.blockmachines.hatch.energymulti.desc.0")); // Multiple - // Ampere - // Energy - // Injector - // for - // Multiblocks + super( + aID, + aName, + aNameRegional, + aTier, + 0, + new String[] { CommonValues.TEC_MARK_GENERAL, + translateToLocal("gt.blockmachines.hatch.energymulti.desc.0"), + translateToLocal("gt.blockmachines.hatch.energymulti.desc.1") + ": " + + EnumChatFormatting.AQUA + + GT_Utility.formatNumbers(aAmp) + + " A" }); // Multiple Ampere Energy Injector for Multiblocks Amperes = aAmp; TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_EnergyMulti(String aName, int aTier, int aAmp, String aDescription, + public GT_MetaTileEntity_Hatch_EnergyMulti(String aName, int aTier, int aAmp, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); Amperes = aAmp; } public GT_MetaTileEntity_Hatch_EnergyMulti(int aID, String aName, String aNameRegional, int aTier, int i, - String description, int aAmp) { + String[] description, int aAmp) { super(aID, aName, aNameRegional, aTier, 0, description); Amperes = aAmp; } @@ -114,7 +120,7 @@ public class GT_MetaTileEntity_Hatch_EnergyMulti extends GT_MetaTileEntity_Hatch @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_EnergyMulti(mName, mTier, Amperes, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_EnergyMulti(mName, mTier, Amperes, mDescriptionArray, mTextures); } @Override @@ -126,14 +132,4 @@ public class GT_MetaTileEntity_Hatch_EnergyMulti extends GT_MetaTileEntity_Hatch public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { return false; } - - @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_GENERAL, mDescription, - translateToLocal("gt.blockmachines.hatch.energymulti.desc.1") + ": " - + EnumChatFormatting.AQUA - + GT_Utility.formatNumbers(maxAmperesIn()) - + " A" // Amperes In - }; - } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java index 0107a28fa3..bcfe4fa33e 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java @@ -31,12 +31,18 @@ public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatc aNameRegional, aTier, 0, - translateToLocal("gt.blockmachines.hatch.energytunnel.desc.0"), + new String[] { CommonValues.TEC_MARK_GENERAL, + translateToLocal("gt.blockmachines.hatch.energytunnel.desc.0"), + translateToLocal("gt.blockmachines.hatch.energytunnel.desc.1") + ": " + + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(aAmp * V[aTier]) + + EnumChatFormatting.RESET + + " EU/t" }, aAmp); // Energy injecting terminal for Multiblocks TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_EnergyTunnel(String aName, int aTier, int aAmp, String aDescription, + public GT_MetaTileEntity_Hatch_EnergyTunnel(String aName, int aTier, int aAmp, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aAmp, aDescription, aTextures); } @@ -108,7 +114,7 @@ public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatc @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_EnergyTunnel(mName, mTier, Amperes, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_EnergyTunnel(mName, mTier, Amperes, mDescriptionArray, mTextures); } @Override @@ -121,17 +127,6 @@ public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatc return false; } - @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_GENERAL, mDescription, - translateToLocal("gt.blockmachines.hatch.energytunnel.desc.1") + ": " - + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(Amperes * maxEUInput()) - + EnumChatFormatting.RESET - + " EU/t" // Throughput - }; - } - @Override public boolean canConnect(byte side) { return isInputFacing(side); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java index d830f69b17..3bf191f25a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java @@ -37,11 +37,18 @@ public class GT_MetaTileEntity_Hatch_Holder extends GT_MetaTileEntity_Hatch impl private static Textures.BlockIcons.CustomIcon EM_H_ACTIVE; public GT_MetaTileEntity_Hatch_Holder(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, 1, ""); + super( + aID, + aName, + aNameRegional, + aTier, + 1, + new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.holder.desc.0"), + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.holder.desc.1") }); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_Holder(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_Holder(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 1, aDescription, aTextures); } @@ -65,7 +72,7 @@ public class GT_MetaTileEntity_Hatch_Holder extends GT_MetaTileEntity_Hatch impl @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_Holder(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_Holder(mName, mTier, mDescriptionArray, mTextures); } @Override @@ -117,16 +124,6 @@ public class GT_MetaTileEntity_Hatch_Holder extends GT_MetaTileEntity_Hatch impl return 1; } - @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.holder.desc.0"), // For - // Research - // Station - EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.holder.desc.1") // Advanced Holding - // Mechanism! - }; - } - @Override public boolean useModularUI() { return true; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputData.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputData.java index 804a6d0f9a..564d963737 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputData.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputData.java @@ -22,17 +22,24 @@ public class GT_MetaTileEntity_Hatch_InputData extends GT_MetaTileEntity_Hatch_D private boolean delDelay = true; public GT_MetaTileEntity_Hatch_InputData(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, ""); + super( + aID, + aName, + aNameRegional, + aTier, + new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.datain.desc.0"), + translateToLocal("gt.blockmachines.hatch.datain.desc.1"), + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.datain.desc.2") }); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_InputData(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_InputData(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_InputData(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_InputData(mName, mTier, mDescriptionArray, mTextures); } @Override @@ -83,19 +90,6 @@ public class GT_MetaTileEntity_Hatch_InputData extends GT_MetaTileEntity_Hatch_D } } - @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.datain.desc.0"), // Quantum - // Data - // Input - // for - // Multiblocks - translateToLocal("gt.blockmachines.hatch.datain.desc.1"), // High speed fibre optics connector. - EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.datain.desc.2") // Must be painted to - // work - }; - } - @Override public void moveAround(IGregTechTileEntity aBaseMetaTileEntity) { if (delDelay) { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputDataItems.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputDataItems.java index 9bc7cd60d5..eb5bc72bb2 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputDataItems.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputDataItems.java @@ -44,7 +44,7 @@ public class GT_MetaTileEntity_Hatch_InputDataItems extends GT_MetaTileEntity_Ha TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_InputDataItems(String aName, int aTier, String aDescription, + public GT_MetaTileEntity_Hatch_InputDataItems(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -79,7 +79,7 @@ public class GT_MetaTileEntity_Hatch_InputDataItems extends GT_MetaTileEntity_Ha @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_InputDataItems(this.mName, this.mTier, mDescription, this.mTextures); + return new GT_MetaTileEntity_Hatch_InputDataItems(this.mName, this.mTier, mDescriptionArray, this.mTextures); } @Override @@ -220,15 +220,9 @@ public class GT_MetaTileEntity_Hatch_InputDataItems extends GT_MetaTileEntity_Ha @Override public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.datainass.desc.0"), // ItemStack - // Data - // Input - // for - // Multiblocks - translateToLocal("gt.blockmachines.hatch.datainass.desc.1"), // High speed fibre optics connector. - EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.datainass.desc.2") // Must be painted - // to work - }; + return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.datainass.desc.0"), + translateToLocal("gt.blockmachines.hatch.datainass.desc.1"), + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.datainass.desc.2") }; } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java index 97f6ad358b..b24aacf5c5 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java @@ -14,19 +14,18 @@ import gregtech.api.metatileentity.MetaTileEntity; public class GT_MetaTileEntity_Hatch_InputElemental extends GT_MetaTileEntity_Hatch_ElementalContainer { public GT_MetaTileEntity_Hatch_InputElemental(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, translateToLocal("gt.blockmachines.emin.desc")); // Elemental Input for - // Multiblocks + super(aID, aName, aNameRegional, aTier, translateToLocal("gt.blockmachines.emin.desc")); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_InputElemental(String aName, int aTier, String aDescription, + public GT_MetaTileEntity_Hatch_InputElemental(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_InputElemental(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_InputElemental(mName, mTier, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java index 0ea3844522..eca97750dd 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java @@ -23,17 +23,25 @@ import gregtech.api.util.GT_Utility; public class GT_MetaTileEntity_Hatch_OutputData extends GT_MetaTileEntity_Hatch_DataConnector { public GT_MetaTileEntity_Hatch_OutputData(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, ""); + super( + aID, + aName, + aNameRegional, + aTier, + new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.dataout.desc.0"), + translateToLocal("gt.blockmachines.hatch.dataout.desc.1"), + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.dataout.desc.2") }); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_OutputData(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_OutputData(String aName, int aTier, String[] aDescription, + ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_OutputData(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_OutputData(mName, mTier, mDescriptionArray, mTextures); } @Override @@ -81,19 +89,6 @@ public class GT_MetaTileEntity_Hatch_OutputData extends GT_MetaTileEntity_Hatch_ q = null; } - @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.dataout.desc.0"), // Quantum - // Data - // Output - // for - // Multiblocks - translateToLocal("gt.blockmachines.hatch.dataout.desc.1"), // High speed fibre optics connector. - EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.dataout.desc.2") // Must be painted - // to work - }; - } - @Override public IConnectsToDataPipe getNext(IConnectsToDataPipe source /* ==this */) { IGregTechTileEntity base = getBaseMetaTileEntity(); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataItems.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataItems.java index ed68426152..83a575f155 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataItems.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataItems.java @@ -22,11 +22,18 @@ public class GT_MetaTileEntity_Hatch_OutputDataItems extends GT_MetaTileEntity_Hatch_DataConnector { public GT_MetaTileEntity_Hatch_OutputDataItems(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, ""); + super( + aID, + aName, + aNameRegional, + aTier, + new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.dataoutass.desc.0"), + translateToLocal("gt.blockmachines.hatch.dataoutass.desc.1"), + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.dataoutass.desc.2") }); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_OutputDataItems(String aName, int aTier, String aDescription, + public GT_MetaTileEntity_Hatch_OutputDataItems(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -43,7 +50,11 @@ public class GT_MetaTileEntity_Hatch_OutputDataItems @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_OutputDataItems(this.mName, this.mTier, this.mDescription, this.mTextures); + return new GT_MetaTileEntity_Hatch_OutputDataItems( + this.mName, + this.mTier, + this.mDescriptionArray, + this.mTextures); } @Override @@ -124,18 +135,4 @@ public class GT_MetaTileEntity_Hatch_OutputDataItems } return null; } - - @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.dataoutass.desc.0"), // ItemStack - // Data - // Output - // for - // Multiblocks - translateToLocal("gt.blockmachines.hatch.dataoutass.desc.1"), // High speed fibre optics connector. - EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.dataoutass.desc.2") // Must be - // painted to - // work - }; - } } diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java index 01b52a3649..1a26c6b88a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java @@ -22,14 +22,14 @@ public class GT_MetaTileEntity_Hatch_OutputElemental extends GT_MetaTileEntity_H TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_OutputElemental(String aName, int aTier, String aDescription, + public GT_MetaTileEntity_Hatch_OutputElemental(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_OutputElemental(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_OutputElemental(mName, mTier, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java index 1ef4097992..fe8af4f2ee 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java @@ -54,17 +54,31 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity public GT_MetaTileEntity_Hatch_OverflowElemental(int aID, String aName, String aNameRegional, int aTier, double max) { - super(aID, aName, aNameRegional, aTier, 0, translateToLocal("gt.blockmachines.hatch.emmuffler.desc.0")); // Disposes - // excess - // elemental - // Matter + super( + aID, + aName, + aNameRegional, + aTier, + 0, + new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.emmuffler.desc.0"), + translateToLocal("gt.blockmachines.hatch.emmuffler.desc.1") + ": " + + EnumChatFormatting.AQUA + + TT_Utility.formatNumberShortExp(max) + + " " + + translateToLocal("tt.keyword.unit.mass"), + translateToLocal("gt.blockmachines.hatch.emmuffler.desc.2") + ": " + + EnumChatFormatting.AQUA + + TT_Utility.formatNumberShortExp(max / (float) (30 - aTier)) + + " " + + translateToLocal("tt.keyword.unit.massFlux"), + translateToLocal("gt.blockmachines.hatch.emmuffler.desc.3") }); overflowMatter = max / 2; overflowMax = max; overflowDisperse = overflowMax / (float) (30 - aTier); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_OverflowElemental(String aName, int aTier, double max, String aDescription, + public GT_MetaTileEntity_Hatch_OverflowElemental(String aName, int aTier, double max, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); overflowMatter = max / 2; @@ -100,22 +114,6 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity new GT_RenderedTexture(MufflerEMidle) }; } - @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_EM, mDescription, - translateToLocal("gt.blockmachines.hatch.emmuffler.desc.1") + ": " - + EnumChatFormatting.AQUA - + TT_Utility.formatNumberShortExp(overflowMax) - + " " - + translateToLocal("tt.keyword.unit.mass"), - translateToLocal("gt.blockmachines.hatch.emmuffler.desc.2") + ": " - + EnumChatFormatting.AQUA - + TT_Utility.formatNumberShortExp(overflowDisperse) - + " " - + translateToLocal("tt.keyword.unit.massFlux"), - translateToLocal("gt.blockmachines.hatch.emmuffler.desc.3") }; - } - @Override public boolean isSimpleMachine() { return true; @@ -138,7 +136,7 @@ public class GT_MetaTileEntity_Hatch_OverflowElemental extends GT_MetaTileEntity @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_OverflowElemental(mName, mTier, overflowMax, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_OverflowElemental(mName, mTier, overflowMax, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java index 03acc689b1..8651c3bb37 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java @@ -58,11 +58,21 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch imple private String clientLocale = "en_US"; public GT_MetaTileEntity_Hatch_Param(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, 0, ""); + super( + aID, + aName, + aNameRegional, + aTier, + 0, + new String[] { CommonValues.TEC_MARK_GENERAL, + EnumChatFormatting.DARK_RED + + "Deprecated; Now you can set parameter by clicking LED on multiblock GUI.", + EnumChatFormatting.DARK_RED + + "If it doesn't work, try removing Parametrizer from multiblock structure." }); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_Param(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_Param(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); } @@ -86,7 +96,7 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch imple @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity iGregTechTileEntity) { - return new GT_MetaTileEntity_Hatch_Param(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_Param(mName, mTier, mDescriptionArray, mTextures); } @Override @@ -211,15 +221,6 @@ public class GT_MetaTileEntity_Hatch_Param extends GT_MetaTileEntity_Hatch imple return true; } - @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_GENERAL, - EnumChatFormatting.DARK_RED - + "Deprecated; Now you can set parameter by clicking LED on multiblock GUI.", - EnumChatFormatting.DARK_RED - + "If it doesn't work, try removing Parametrizer from multiblock structure.", }; - } - @Override public boolean useModularUI() { return true; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ParamText.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ParamText.java index 905c912c24..eb6690d0a9 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ParamText.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ParamText.java @@ -46,13 +46,13 @@ public class GT_MetaTileEntity_Hatch_ParamText extends GT_MetaTileEntity_Hatch_P super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_Hatch_ParamText(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_ParamText(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity iGregTechTileEntity) { - return new GT_MetaTileEntity_Hatch_ParamText(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_ParamText(mName, mTier, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java index 9b4f0ee12c..e55af0dc60 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java @@ -59,11 +59,18 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch implem private String clientLocale = "en_US"; public GT_MetaTileEntity_Hatch_Rack(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, 4, ""); + super( + aID, + aName, + aNameRegional, + aTier, + 4, + new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.rack.desc.0"), + EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.rack.desc.1") }); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_Rack(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_Rack(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 4, aDescription, aTextures); } @@ -103,7 +110,7 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch implem @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_Rack(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_Rack(mName, mTier, mDescriptionArray, mTextures); } @Override @@ -257,16 +264,6 @@ public class GT_MetaTileEntity_Hatch_Rack extends GT_MetaTileEntity_Hatch implem return heat > 500 || getBaseMetaTileEntity().isActive() ? 0 : mInventory.length; } - @Override - public String[] getDescription() { - return new String[] { CommonValues.TEC_MARK_EM, translateToLocal("gt.blockmachines.hatch.rack.desc.0"), // 4 - // Slot - // Rack - EnumChatFormatting.AQUA + translateToLocal("gt.blockmachines.hatch.rack.desc.1") // Holds Computer - // Components - }; - } - @Override public boolean isGivingInformation() { return true; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java index 13e24b73ad..9dbc33e9e2 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java @@ -67,7 +67,8 @@ public class GT_MetaTileEntity_Hatch_Uncertainty extends GT_MetaTileEntity_Hatch regenerate(); } - public GT_MetaTileEntity_Hatch_Uncertainty(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_Uncertainty(String aName, int aTier, String[] aDescription, + ITexture[][][] aTextures) { super(aName, aTier, 0, aDescription, aTextures); regenerate(); } @@ -106,7 +107,7 @@ public class GT_MetaTileEntity_Hatch_Uncertainty extends GT_MetaTileEntity_Hatch @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity iGregTechTileEntity) { - return new GT_MetaTileEntity_Hatch_Uncertainty(mName, mTier, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_Uncertainty(mName, mTier, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessMulti.java index 1eec70c086..a8900e3f17 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessMulti.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessMulti.java @@ -8,7 +8,6 @@ import static com.gtnewhorizon.gtnhlib.util.AnimatedTooltipHandler.BOLD; import static com.gtnewhorizon.gtnhlib.util.AnimatedTooltipHandler.GRAY; import static gregtech.api.enums.GT_Values.AuthorColen; import static gregtech.api.enums.GT_Values.V; -import static net.minecraft.util.StatCollector.translateToLocal; import java.math.BigInteger; @@ -40,17 +39,14 @@ public class GT_MetaTileEntity_Hatch_WirelessMulti extends GT_MetaTileEntity_Hat aNameRegional, aTier, 0, - translateToLocal("gt.blockmachines.hatch.energymulti.desc.0"), // Multiple - // Ampere - // Energy - // Injector - // for - // Multiblocks + new String[] { GRAY + "Stores energy globally in a network, up to 2^(2^31) EU.", + GRAY + "Does not connect to wires. This block withdraws EU from the network.", + AuthorColen + GRAY + BOLD + " & " + BLUE + BOLD + "Cloud" }, aAmp); TT_Utility.setTier(aTier, this); } - public GT_MetaTileEntity_Hatch_WirelessMulti(String aName, int aTier, int aAmp, String aDescription, + public GT_MetaTileEntity_Hatch_WirelessMulti(String aName, int aTier, int aAmp, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aAmp, aDescription, aTextures); } @@ -146,7 +142,7 @@ public class GT_MetaTileEntity_Hatch_WirelessMulti extends GT_MetaTileEntity_Hat @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Hatch_WirelessMulti(mName, mTier, Amperes, mDescription, mTextures); + return new GT_MetaTileEntity_Hatch_WirelessMulti(mName, mTier, Amperes, mDescriptionArray, mTextures); } @Override @@ -159,13 +155,6 @@ public class GT_MetaTileEntity_Hatch_WirelessMulti extends GT_MetaTileEntity_Hat return false; } - @Override - public String[] getDescription() { - return new String[] { GRAY + "Stores energy globally in a network, up to 2^(2^31) EU.", - GRAY + "Does not connect to wires. This block withdraws EU from the network.", - AuthorColen + GRAY + BOLD + " & " + BLUE + BOLD + "Cloud" }; - } - @Override public ConnectionType getConnectionType() { return ConnectionType.WIRELESS; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java index d5b97d3afc..1596f337df 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java @@ -218,7 +218,8 @@ public class GT_MetaTileEntity_EM_switch extends GT_MetaTileEntity_MultiblockBas // be configured .addSeparator().beginStructureBlock(3, 3, 3, false) .addController(translateToLocal("tt.keyword.Structure.FrontCenter")) // Controller: Front center - .addCasingInfo(translateToLocal("gt.blockcasingsTT.1.name"), 0) // 0x Computer Casing (minimum) + .addCasingInfoMin(translateToLocal("gt.blockcasingsTT.1.name"), 0, false) // 0x Computer Casing + // (minimum) .addOtherStructurePart( translateToLocal("gt.blockcasingsTT.3.name"), translateToLocal("tt.keyword.Structure.Center")) // Advanced Computer Casing: Center diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java index ff8f3c088a..373edc4f09 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java @@ -131,7 +131,8 @@ public class GT_MetaTileEntity_EM_transformer extends GT_MetaTileEntity_Multiblo // running .addSeparator().beginStructureBlock(3, 3, 3, false) .addController(translateToLocal("tt.keyword.Structure.FrontCenter")) // Controller: Front center - .addCasingInfo(translateToLocal("gt.blockcasingsTT.0.name"), 5) // 5x High Power Casing (minimum) + .addCasingInfoMin(translateToLocal("gt.blockcasingsTT.0.name"), 5, false) // 5x High Power Casing + // (minimum) .addOtherStructurePart( translateToLocal("tt.keyword.Structure.SuperconductingCoilBlock"), translateToLocal("tt.keyword.Structure.Center")) // SuperconductingCoilBlock: Center diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java index fe64fa7470..f665c6f975 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java @@ -235,8 +235,10 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock