diff options
Diffstat (limited to 'src/Java/gtPlusPlus/xmod')
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() { if (mCasingName.contains("gt.blockcasings")) { mCasingName = ItemList.Casing_RobustTungstenSteel.get(1).getDisplayName(); @@ -54,6 +59,7 @@ extends GregtechMeta_MultiBlockBase { "1x Energy Hatch (Any casing)", mCasingName+"s for the rest (16 at least!)", getPollutionTooltip(), + getMachineTooltip(), CORE.GT_Tooltip}; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java index 30e68e041c..9406fa5589 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java @@ -77,6 +77,11 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase { } @Override + public String getMachineType() { + return "Assembler, Disassembler, Autocrafter"; + } + + @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new GT4Entity_AutoCrafter(this.mName); } @@ -126,7 +131,8 @@ public class GT4Entity_AutoCrafter extends GregtechMeta_MultiBlockBase { "Size: 3x3x3 (Hollow)", "1x Input Bus", "1x Input Hatch", "1x Output Bus", "1x Output Hatch", "1x Muffler Hatch", "1x Maintenance Hatch", "1x Energy Hatch", "Hatches & Busses can be placed anywhere", "Rest is Autocrafter Frame", - "--------------------------------------", getPollutionTooltip(), CORE.GT_Tooltip }; + "--------------------------------------", getPollutionTooltip(), + getMachineTooltip(), CORE.GT_Tooltip }; } @Override diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java index 8b2bfcf4c9..9d327bdf47 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java @@ -58,6 +58,11 @@ extends GregtechMeta_MultiBlockBase } @Override + public String getMachineType() { + return "Boiler"; + } + + @Override public int getDamageToComponent(ItemStack aStack){ Logger.INFO("Trying to damage component."); return ItemList.Component_LavaFilter.get(1L).getClass().isInstance(aStack) ? 1 : 0; @@ -185,6 +190,7 @@ extends GregtechMeta_MultiBlockBase "Use 2 Output Hatches by default, change one to a Bus if filtering Lava", "Consult user manual for more information", getPollutionTooltip(), + getMachineTooltip(), CORE.GT_Tooltip}; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java index a17680cb1b..a7594579bf 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java @@ -32,6 +32,11 @@ extends GregtechMeta_MultiBlockBase } @Override + public String getMachineType() { + return "Reactor"; + } + + @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new GregtechMTE_FastNeutronReactor(this.mName); @@ -177,6 +182,7 @@ extends GregtechMeta_MultiBlockBase "------------------------------------------", "Consult user manual for more information", getPollutionTooltip(), + getMachineTooltip(), CORE.GT_Tooltip}; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java index 2f1e452ee3..13572195b1 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java @@ -55,6 +55,11 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase { } @Override + public String getMachineType() { + return "Reactor"; + } + + @Override public String[] getDescription() { return new String[]{ "Controller Block for the Liquid Fluoride Thorium Reactor.", @@ -74,6 +79,7 @@ public class GregtechMTE_NuclearReactor extends GregtechMeta_MultiBlockBase { "Input Li2BeF4 and a molten salt as fuel.", "LiFBeF2ThF4UF4, LiFBeF2ZrF4UF4 or LiFBeF2ZrF4U235", getPollutionTooltip(), + getMachineTooltip(), CORE.GT_Tooltip}; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java index a854647a56..b6e671070e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java @@ -38,6 +38,11 @@ public class GregtechMetaTileEntityGeneratorArray extends GregtechMeta_MultiBloc } @Override + public String getMachineType() { + return "Processing Array"; + } + + @Override public String[] getDescription() { return new String[]{ "Controller Block for the Generator Array", @@ -50,6 +55,7 @@ public class GregtechMetaTileEntityGeneratorArray extends GregtechMeta_MultiBloc "Robust Tungstensteel Machine Casings for the rest (16 at least!)", "Place up to 16 Single Block GT Generators into the Controller Inventory", getPollutionTooltip(), + getMachineTooltip(), CORE.GT_Tooltip}; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java index 2ef4cb4dff..da5949b1b9 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java @@ -49,6 +49,11 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase } @Override + public String getMachineType() { + return "Tree Farm"; + } + + @Override public String[] getDescription() { return new String[]{ "THIS MULTIBLOCK IS DISABLED - DO NOT BUILD", @@ -65,6 +70,7 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase "1x Energy Hatch (anywhere)", "1x Maintenance Hatch (anywhere)", getPollutionTooltip(), + getMachineTooltip(), CORE.GT_Tooltip }; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java index bdfc7b9058..16c567354d 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java @@ -49,6 +49,11 @@ extends GregtechMeta_MultiBlockBase { } @Override + public String getMachineType() { + return "Alloy Smelter"; + } + + @Override public String[] getDescription() { return new String[]{ "Controller Block for the Alloy Blast Smelter", //Outputs 144mb fluid for every inputStack.stackSize; Time to use those hot metals. @@ -66,6 +71,7 @@ extends GregtechMeta_MultiBlockBase { "1x Fluid Input Hatch (optional, top layer)", "Blast Smelter Casings for the rest", getPollutionTooltip(), + getMachineTooltip(), CORE.GT_Tooltip}; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java index a11f9b9d24..1ca6e1c8df 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java @@ -44,6 +44,11 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas super(aName); } + @Override + public String getMachineType() { + return "Particle Accelerator"; + } + public int tier(){ return 5; } @@ -263,6 +268,7 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas "1-16 Energy Hatches", "All Hatches must be IV or better", getPollutionTooltip(), + getMachineTooltip(), CORE.GT_Tooltip}; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java index f43c077dd8..4a4cc96193 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java @@ -58,6 +58,11 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends GregtechMeta_M } @Override + public String getMachineType() { + return "Fish Trap"; + } + + @Override public String[] getDescription() { return new String[] { "Controller Block for the Fishing Pond", "Size: 9x3x9 [WxHxL] (open)", "X X", "X X", "XXXXXXXXX", "Put a numbered circuit into the input bus.", "Circuit 14 for Fish", @@ -65,6 +70,7 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends GregtechMeta_M "1x Output Bus (Any casing)", "1x Input Bus (Any casing)", "1x Input Hatch (Any casing, fill with water)", "1x Maintenance Hatch (Any casing)", "1x Energy Hatch (Any casing)", "Aquatic Casings for the rest", getPollutionTooltip(), + getMachineTooltip(), CORE.GT_Tooltip }; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java index 945267f9cf..61ec7b3b32 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java @@ -82,6 +82,11 @@ public class GregtechMetaTileEntity_MassFabricator extends GregtechMeta_MultiBlo } @Override + public String getMachineType() { + return "Mass Fabricator"; + } + + @Override public String[] getDescription() { return new String[]{ "Controller Block for the Matter Fabricator", @@ -102,6 +107,7 @@ public class GregtechMetaTileEntity_MassFabricator extends GregtechMeta_MultiBlo "24x IC2 Reinforced Glass for the walls", "Matter Fabricator Casings for the edges & top (40 at least!)", getPollutionTooltip(), + getMachineTooltip(), CORE.GT_Tooltip}; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java index aa66eebddb..77440c0069 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java @@ -38,6 +38,11 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase } @Override + public String getMachineType() { + return "Fuel Refinery"; + } + + @Override public String[] getDescription() { return new String[]{ "Controller Block for the Fission Fuel Processing Unit", @@ -53,6 +58,7 @@ public class GregtechMetaTileEntity_Refinery extends GregtechMeta_MultiBlockBase "1x ZPM or better Muffler (One of base platform)", "1x Energy Hatch (One of base platform)", getPollutionTooltip(), + getMachineTooltip(), CORE.GT_Tooltip }; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java index 1c859433d8..d5194d7a60 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_MultiTank.java @@ -45,6 +45,11 @@ extends GregtechMeta_MultiBlockBase { private int maximumFluidStorage = 128000; private FluidStack internalStorageTank = null; private final NBTTagCompound internalCraftingComponentsTag = new NBTTagCompound(); + + @Override + public String getMachineType() { + return "Fluid Tank"; + } @Override public String[] getExtraInfoData() { @@ -213,6 +218,7 @@ extends GregtechMeta_MultiBlockBase { "1x Energy Hatch (anywhere)", "1x Maintenance Hatch (anywhere)", "Multitank Exterior Casings for the rest (16 at least!)", + getMachineTooltip(), CORE.GT_Tooltip }; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java index 16951cb515..d0ba0b44ab 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java @@ -57,6 +57,11 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe } @Override + public String getMachineType() { + return "Energy Buffer"; + } + + @Override public String[] getDescription() { return new String[]{ "[BUG] GUI does not work until structure is assembled correctly. (Do Not Report issue)", @@ -67,6 +72,7 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe "Size(WxHxD): External 5xHx5, Sub-Station External Casings", "Size(WxHxD): Internal 3x(H-2)x3, Vanadium Redox Power Cells", "Read '"+BookHandler.ItemBookWritten_MultiPowerStorage.getDisplayName()+"' for more info.", + getMachineTooltip(), CORE.GT_Tooltip}; } |