aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorglowredman <35727266+glowredman@users.noreply.github.com>2023-04-18 21:40:35 +0200
committerglowredman <35727266+glowredman@users.noreply.github.com>2023-04-18 21:40:35 +0200
commitc2869bc333831fae3286dc29db3a0d16f87be097 (patch)
treedc4f0c49c9d565fdaceac532c89a239ac3857279 /src/main/java
parentadd08df72fecfd3752ab542772929d243e673ba4 (diff)
downloadGT5-Unofficial-c2869bc333831fae3286dc29db3a0d16f87be097.tar.gz
GT5-Unofficial-c2869bc333831fae3286dc29db3a0d16f87be097.tar.bz2
GT5-Unofficial-c2869bc333831fae3286dc29db3a0d16f87be097.zip
Use `mDescriptionArray`
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java23
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_CreativeData.java24
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java11
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java28
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java23
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java38
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java34
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyTunnel.java23
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Holder.java23
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputData.java26
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputDataItems.java16
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputElemental.java7
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java27
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataItems.java31
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputElemental.java4
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OverflowElemental.java42
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Param.java25
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ParamText.java4
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Rack.java23
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java5
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_WirelessMulti.java21
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java3
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java3
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java6
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_BuckConverter.java26
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DataReader.java21
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPollutor.java26
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java29
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java30
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_MicroController.java4
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_OwnerDetector.java31
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java4
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java4
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java4
34 files changed, 283 insertions, 366 deletions
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<String, GT_MetaTileEntity_Hatch_Capacitor.CapacitorComponent> 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<QuantumDataPacket> {
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<T extends DataPacket
public short id = -1;
protected GT_MetaTileEntity_Hatch_DataConnector(int aID, String aName, String aNameRegional, int aTier,
- String descr) {
+ String[] descr) {
super(aID, aName, aNameRegional, aTier, 0, descr);
TT_Utility.setTier(aTier, this);
}
- protected GT_MetaTileEntity_Hatch_DataConnector(String aName, int aTier, String aDescription,
+ protected GT_MetaTileEntity_Hatch_DataConnector(String aName, int aTier, String[] aDescription,
ITexture[][][] aTextures) {
super(aName, aTier, 0, aDescription, aTextures);
}
@@ -194,12 +193,6 @@ public abstract class GT_MetaTileEntity_Hatch_DataConnector<T extends DataPacket
}
@Override
- public String[] getDescription() {
- return new String[] { CommonValues.TEC_MARK_EM, "Text description shouldn't be seen, report to Tec",
- "High speed fibre optics connector.", EnumChatFormatting.AQUA + "Must be painted to work" };
- }
-
- @Override
public byte getColorization() {
return getBaseMetaTileEntity().getColorization();
}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java
index b1980e2852..1aca68d6a4 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java
@@ -23,24 +23,27 @@ public class GT_MetaTileEntity_Hatch_DynamoMulti extends GT_MetaTileEntity_Hatch
public final int Amperes;
public GT_MetaTileEntity_Hatch_DynamoMulti(int aID, String aName, String aNameRegional, int aTier, int aAmp) {
- super(aID, aName, aNameRegional, aTier, 0, translateToLocal("gt.blockmachines.hatch.dynamomulti.desc.0")); // Multiple
- // Ampere
- // Energy
- // Extractor
- // for
- // Multiblocks
+ super(
+ aID,
+ aName,
+ aNameRegional,
+ aTier,
+ 0,
+ new String[] { CommonValues.TEC_MARK_GENERAL,
+ translateToLocal("gt.blockmachines.hatch.dynamomulti.desc.0") }); // Multiple Ampere Energy
+ // Extractor for Multiblocks
Amperes = aAmp;
TT_Utility.setTier(aTier, this);
}
- public GT_MetaTileEntity_Hatch_DynamoMulti(String aName, int aTier, int aAmp, String aDescription,
+ public GT_MetaTileEntity_Hatch_DynamoMulti(String aName, int aTier, int aAmp, String[] aDescription,
ITexture[][][] aTextures) {
super(aName, aTier, 0, aDescription, aTextures);
Amperes = aAmp;
}
public GT_MetaTileEntity_Hatch_DynamoMulti(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;
}
@@ -107,7 +110,7 @@ public class GT_MetaTileEntity_Hatch_DynamoMulti extends GT_MetaTileEntity_Hatch
@Override
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
- return new GT_MetaTileEntity_Hatch_DynamoMulti(mName, mTier, Amperes, mDescription, mTextures);
+ return new GT_MetaTileEntity_Hatch_DynamoMulti(mName, mTier, Amperes, mDescriptionArray, mTextures);
}
@Override
@@ -119,11 +122,4 @@ public class GT_MetaTileEntity_Hatch_DynamoMulti 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
- // "Amperes Out: "+ EnumChatFormatting.AQUA+Amperes+" A"
- };
- }
}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java
index bd0882a28a..bebd89bcc6 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoTunnel.java
@@ -33,12 +33,18 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc
aNameRegional,
aTier,
0,
- translateToLocal("gt.blockmachines.hatch.dynamotunnel.desc.0"),
+ new String[] { CommonValues.TEC_MARK_GENERAL,
+ translateToLocal("gt.blockmachines.hatch.dynamotunnel.desc.0"),
+ translateToLocal("gt.blockmachines.hatch.dynamotunnel.desc.1") + ": "
+ + EnumChatFormatting.YELLOW
+ + GT_Utility.formatNumbers(aAmp * V[aTier])
+ + EnumChatFormatting.RESET
+ + " EU/t" },
aAmp); // Energy extracting terminal for Multiblocks
TT_Utility.setTier(aTier, this);
}
- public GT_MetaTileEntity_Hatch_DynamoTunnel(String aName, int aTier, int aAmp, String aDescription,
+ public GT_MetaTileEntity_Hatch_DynamoTunnel(String aName, int aTier, int aAmp, String[] aDescription,
ITexture[][][] aTextures) {
super(aName, aTier, aAmp, aDescription, aTextures);
}
@@ -110,7 +116,7 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc
@Override
public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
- return new GT_MetaTileEntity_Hatch_DynamoTunnel(mName, mTier, Amperes, mDescription, mTextures);
+ return new GT_MetaTileEntity_Hatch_DynamoTunnel(mName, mTier, Amperes, mDescriptionArray, mTextures);
}
@Override
@@ -124,17 +130,6 @@ public class GT_MetaTileEntity_Hatch_DynamoTunnel extends GT_MetaTileEntity_Hatc
}
@Override
- public String[] getDescription() {
- return new String[] { CommonValues.TEC_MARK_GENERAL, mDescription, // TODO NOT PASS DESCRIPTION
- translateToLocal("gt.blockmachines.hatch.dynamotunnel.desc.1") + ": "
- + EnumChatFormatting.YELLOW
- + GT_Utility.formatNumbers(Amperes * maxEUOutput())
- + EnumChatFormatting.RESET
- + " EU/t" // Throughput
- };
- }
-
- @Override
public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
if (aBaseMetaTileEntity.isServerSide()) {
byte Tick = (byte) (aTick % 20);
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
index e0216a5060..86f5f75de4 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_ElementalContainer.java
@@ -60,11 +60,27 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
protected GT_MetaTileEntity_Hatch_ElementalContainer(int aID, String aName, String aNameRegional, int aTier,
String descr) {
- super(aID, aName, aNameRegional, aTier, 0, descr);
+ super(
+ aID,
+ aName,
+ aNameRegional,
+ aTier,
+ 0,
+ new String[] { TEC_MARK_EM, descr,
+ translateToLocal("tt.base.emhatch.desc.0") + " "
+ + EnumChatFormatting.AQUA
+ + GT_Utility.formatNumbers(aTier * aTier >> 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);
}
@@ -324,24 +340,6 @@ public abstract class GT_MetaTileEntity_Hatch_ElementalContainer extends GT_Meta
}
@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()) {
TecTech.anomalyHandler.addAnomaly(getBaseMetaTileEntity(), (overflowMatter + content.getMass()) * 16D);
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
@@ -122,17 +128,6 @@ public class GT_MetaTileEntity_Hatch_EnergyTunnel extends GT_MetaTileEntity_Hatc
}
@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,