aboutsummaryrefslogtreecommitdiff
path: root/src/Java
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java10
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java5
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java8
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java6
32 files changed, 195 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index 09bda70681..8706f572d6 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -47,6 +47,7 @@ import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.fluids.FluidStack;
public abstract class GregtechMeta_MultiBlockBase
@@ -98,6 +99,12 @@ GT_MetaTileEntity_MultiBlockBase {
return new GUI_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(), "MultiblockDisplay.png");
}
}
+
+ public abstract String getMachineType();
+
+ public String getMachineTooltip() {
+ return "Machine Type: " + EnumChatFormatting.YELLOW + getMachineType() + EnumChatFormatting.RESET;
+ }
public String[] getExtraInfoData() {
return new String[0];
@@ -106,7 +113,7 @@ GT_MetaTileEntity_MultiBlockBase {
@Override
public String[] getInfoData() {
- ArrayList mInfo = new ArrayList<String>();
+ ArrayList<String> mInfo = new ArrayList<String>();
if (!this.getMetaName().equals("")) {
mInfo.add(this.getMetaName());
}
@@ -129,6 +136,7 @@ GT_MetaTileEntity_MultiBlockBase {
long minutes = TimeUnit.SECONDS.toMinutes(seconds) - (TimeUnit.SECONDS.toHours(seconds) * 60);
long second = TimeUnit.SECONDS.toSeconds(seconds) - (TimeUnit.SECONDS.toMinutes(seconds) *60);
+ mInfo.add(getMachineTooltip());
mInfo.add("Progress: " + Integer.toString((this.mProgresstime / 20)) +" / "+ Integer.toString((this.mMaxProgresstime / 20)) + " secs");
mInfo.add("Efficiency: " + Float.toString((this.mEfficiency / 100.0F)) + "%");
mInfo.add("Problems: " + Integer.toString((this.getIdealStatus() - this.getRepairStatus())));
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java
index e11063831d..339290f8dd 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java
@@ -45,6 +45,11 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase {
}
@Override
+ public String getMachineType() {
+ return "Packager";
+ }
+
+ @Override
public boolean hasSlotInGUI() {
return true;
}
@@ -69,6 +74,7 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase {
"1x Muffler (anywhere)",
"Supply Depot. Casings for the rest (10 at least!)",
getPollutionTooltip(),
+ getMachineTooltip(),
CORE.GT_Tooltip
};
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java
index 54b5fee8d5..56cc88d6f2 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java
@@ -71,6 +71,11 @@ public class GregtechMTE_TeslaTower extends GregtechMeta_MultiBlockBase {
}
@Override
+ public String getMachineType() {
+ return "Weaponized Lighting Rod";
+ }
+
+ @Override
public boolean hasSlotInGUI() {
return false;
}
@@ -90,6 +95,7 @@ public class GregtechMTE_TeslaTower extends GregtechMeta_MultiBlockBase {
"1x Maintenance Hatch (One of base casings)",
"1x " + VN[getMinTier()] + "+ Energy Hatch (Any bottom layer casing)",
getPollutionTooltip(),
+ getMachineTooltip(),
CORE.GT_Tooltip};
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java
index 2512a37eb4..86b4af1d1f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java
@@ -44,6 +44,11 @@ extends GregtechMeta_MultiBlockBase {
}
@Override
+ public String getMachineType() {
+ return "Centrifuge";
+ }
+
+ @Override
public String[] getDescription() {
return new String[]{
"Controller Block for the Industrial Centrifuge",
@@ -62,6 +67,7 @@ extends GregtechMeta_MultiBlockBase {
"1x Energy Hatch [Blue]",
"Centrifuge Casings for the rest (10 at least)",
getPollutionTooltip(),
+ getMachineTooltip(),
CORE.GT_Tooltip};
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java
index 5d40da5ecd..236a071988 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java
@@ -40,6 +40,11 @@ extends GregtechMeta_MultiBlockBase {
}
@Override
+ public String getMachineType() {
+ return "Coke Oven";
+ }
+
+ @Override
public String[] getDescription() {
return new String[]{"Processes Logs and Coal into Charcoal and Coal Coke.",
"Controller Block for the Industrial Coke Oven",
@@ -58,6 +63,7 @@ extends GregtechMeta_MultiBlockBase {
"1x Muffler Hatch (top middle)",
"Structural Coke Oven Casings for the rest",
getPollutionTooltip(),
+ getMachineTooltip(),
CORE.GT_Tooltip};
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java
index cae7d74034..694b9fb883 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java
@@ -37,6 +37,11 @@ extends GregtechMeta_MultiBlockBase {
}
@Override
+ public String getMachineType() {
+ return "Cutting Machine";
+ }
+
+ @Override
public String[] getDescription() {
return new String[]{
"Controller Block for the Industrial Cutting Factory",
@@ -52,6 +57,7 @@ extends GregtechMeta_MultiBlockBase {
"1x Maintenance Hatch (back centered)",
"Cutting Factory Frames for the rest (32 at least!)",
getPollutionTooltip(),
+ getMachineTooltip(),
CORE.GT_Tooltip
};
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java
index 30c62e216d..c16be4c45a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java
@@ -33,6 +33,11 @@ extends GregtechMeta_MultiBlockBase {
}
@Override
+ public String getMachineType() {
+ return "Electrolyzer";
+ }
+
+ @Override
public String[] getDescription() {
return new String[]{"Controller Block for the Industrial Electrolyzer",
"180% faster than using single block machines of the same voltage",
@@ -49,6 +54,7 @@ extends GregtechMeta_MultiBlockBase {
"1x Muffler (anywhere)",
"Electrolyzer Casings for the rest (10 at least!)",
getPollutionTooltip(),
+ getMachineTooltip(),
CORE.GT_Tooltip};
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java
index 8929c82060..e225b70dbc 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java
@@ -44,6 +44,11 @@ extends GregtechMeta_MultiBlockBase {
}
@Override
+ public String getMachineType() {
+ return "Extruder";
+ }
+
+ @Override
public String[] getDescription() {
return new String[]{"Controller Block for the Material Extruder",
"250% faster than using single block machines of the same voltage",
@@ -61,6 +66,7 @@ extends GregtechMeta_MultiBlockBase {
"1x Maintenance Hatch (Back Center)",
"Inconel Reinforced Casings for the rest (28 at least!)",
getPollutionTooltip(),
+ getMachineTooltip(),
CORE.GT_Tooltip};
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java
index 72653a8baf..a6baa8f1fc 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java
@@ -43,6 +43,11 @@ extends GregtechMeta_MultiBlockBase {
}
@Override
+ public String getMachineType() {
+ return "Macerator/Pulverizer";
+ }
+
+ @Override
public String[] getDescription() {
return new String[]{
"Controller Block for the Industrial Maceration Stack",
@@ -60,6 +65,7 @@ extends GregtechMeta_MultiBlockBase {
"1x Muffler Hatch (Any casing)",
"Maceration Stack Casings for the rest (26 at least!)",
getPollutionTooltip(),
+ getMachineTooltip(),
CORE.GT_Tooltip};
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java
index 0ad6bb7565..d777525cb6 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java
@@ -50,6 +50,11 @@ extends GregtechMeta_MultiBlockBase {
}
@Override
+ public String getMachineType() {
+ return "Mixer";
+ }
+
+ @Override
public String[] getDescription() {
if (mCasingName.toLowerCase().contains(".name")) {
@@ -73,6 +78,7 @@ extends GregtechMeta_MultiBlockBase {
mCasingName+"s for the rest (16 at least!)",
mCasingName2+"s for the internal blocks (2)",
getPollutionTooltip(),
+ getMachineTooltip(),
CORE.GT_Tooltip};
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java
index 648ac5a4a6..649aa508ea 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java
@@ -65,6 +65,11 @@ extends GregtechMeta_MultiBlockBase {
}
@Override
+ public String getMachineType() {
+ return "Nine in One";
+ }
+
+ @Override
public String[] getDescription() {
return new String[]{"Controller Block for the Industrial Multi-Machine",
"250% faster than using single block machines of the same voltage",
@@ -75,6 +80,7 @@ extends GregtechMeta_MultiBlockBase {
"6 Multi-Use casings required (Minimum)",
"Read Multi-Machine Manual for extra information",
getPollutionTooltip(),
+ getMachineTooltip(),
CORE.GT_Tooltip};
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java
index 4a2c9b47a0..76ed97993b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java
@@ -43,6 +43,11 @@ extends GregtechMeta_MultiBlockBase {
}
@Override
+ public String getMachineType() {
+ return "Bending Machine";
+ }
+
+ @Override
public String[] getDescription() {
return new String[]{"Controller Block for the Material Press",
"500% faster than using single block machines of the same voltage",
@@ -58,6 +63,7 @@ extends GregtechMeta_MultiBlockBase {
"1x Muffler Hatch (anywhere)",
"Material Press Machine Casings for the rest (16 at least!)",
getPollutionTooltip(),
+ getMachineTooltip(),
CORE.GT_Tooltip};
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java
index d6896cd630..a7e62d67ad 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java
@@ -40,6 +40,11 @@ extends GregtechMeta_MultiBlockBase {
}
@Override
+ public String getMachineType() {
+ return "Sifter";
+ }
+
+ @Override
public String[] getDescription() {
return new String[]{
"Controller Block for the Industrial Sifter",
@@ -57,6 +62,7 @@ extends GregtechMeta_MultiBlockBase {
"18x Sieve Grate (Top and Middle 3x3)",
"Sieve Casings for the rest (35 min)",
getPollutionTooltip(),
+ getMachineTooltip(),
CORE.GT_Tooltip};
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java
index 87e03df208..9b01f6caf0 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java
@@ -37,6 +37,11 @@ extends GregtechMeta_MultiBlockBase {
}
@Override
+ public String getMachineType() {
+ return "Thermal Centrifuge";
+ }
+
+ @Override
public String[] getDescription() {
return new String[]{
"Controller Block for the Industrial Thermal Centrifuge",
@@ -52,6 +57,7 @@ extends GregtechMeta_MultiBlockBase {
"Thermal processing Casings for the rest (8 at least!)",
"Noise Hazard Sign Blocks also count as valid casings",
getPollutionTooltip(),
+ getMachineTooltip(),
CORE.GT_Tooltip
};
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java
index 10bc913a93..7af9ca1249 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java
@@ -52,6 +52,11 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends GregtechMeta
return (IMetaTileEntity) new GregtechMetaTileEntity_IndustrialVacuumFreezer(this.mName);
}
+ @Override
+ public String getMachineType() {
+ return "Vacuum Freezer";
+ }
+
public String[] getDescription() {
if (mCasingName.toLowerCase().contains(".name")) {
@@ -75,6 +80,7 @@ public class GregtechMetaTileEntity_IndustrialVacuumFreezer extends GregtechMeta
"1x Energy Hatch (Any casing)",
mCasingName+"s for the rest (10 at least!)",
getPollutionTooltip(),
+ getMachineTooltip(),
CORE.GT_Tooltip};
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java
index 6c7f8f26a8..bff82400ca 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java
@@ -46,6 +46,11 @@ extends GregtechMeta_MultiBlockBase {
}
@Override
+ public String getMachineType() {
+ return "Ore Washer, Chemical Bath";
+ }
+
+ @Override
public String[] getDescription() {
return new String[]{
"Controller Block for the Industrial Ore Washing Plant",
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java
index 5fa0f3e8de..b223e0711b 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java
@@ -38,6 +38,11 @@ extends GregtechMeta_MultiBlockBase {
}
@Override
+ public String getMachineType() {
+ return "Wiremill";
+ }
+
+ @Override
public String[] getDescription() {
return new String[]{
"Controller Block for the Industrial Wire Factory",
@@ -51,6 +56,7 @@ extends GregtechMeta_MultiBlockBase {
"1x Maintenance Hatch (back centered)",
"Wire Factory Casings for the rest (32 at least!)",
getPollutionTooltip(),
+ getMachineTooltip(),
CORE.GT_Tooltip
};
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
index f6d613fe88..93f1023043 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
@@ -63,6 +63,11 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase
mHatchName = ItemUtils.getLocalizedNameOfBlock(GregTech_API.sBlockMachines, 968);
}
+ @Override
+ public String getMachineType() {
+ return "Blast Furnace";
+ }
+
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
return new GregtechMetaTileEntity_Adv_EBF(this.mName);
}
@@ -100,6 +105,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase
"Each 1800K over the min. Heat Capacity allows for one upgraded overclock",
"Upgraded overclocks reduce recipe time to 25% and increase EU/t to 400%",
getPollutionTooltip(),
+ getMachineTooltip(),
CORE.GT_Tooltip};
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java
index 492a60346a..530fc61b09 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java
@@ -39,6 +39,11 @@ extends GregtechMeta_MultiBlockBase {
return new GregtechMetaTileEntity_Adv_Implosion(this.mName);
}
+ @Override
+ public String getMachineType() {
+ return "Implosion Compressor";
+ }
+
public String[] getDescription() { <