aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/gregtech/common
diff options
context:
space:
mode:
authorAlexdoru <57050655+Alexdoru@users.noreply.github.com>2024-10-14 14:46:59 +0200
committerGitHub <noreply@github.com>2024-10-14 12:46:59 +0000
commite6c8d35894d561e6aea1cfb7450f00a70c9e01d8 (patch)
tree700dec83ddcd7f7b9b8f0b90cad30cc2cb33b38f /src/main/java/gtPlusPlus/xmod/gregtech/common
parentd3a4a52483aa8b069925dc55fd680f965b59f133 (diff)
downloadGT5-Unofficial-e6c8d35894d561e6aea1cfb7450f00a70c9e01d8.tar.gz
GT5-Unofficial-e6c8d35894d561e6aea1cfb7450f00a70c9e01d8.tar.bz2
GT5-Unofficial-e6c8d35894d561e6aea1cfb7450f00a70c9e01d8.zip
Multi ToolTip unification (#3343)
Co-authored-by: chochem <40274384+chochem@users.noreply.github.com> Co-authored-by: GDCloud <gdcloudstrike@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common')
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCentrifuge.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCokeOven.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCuttingMachine.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialExtruder.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialFluidHeater.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialForgeHammer.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMixer.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMolecularTransformer.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialPlatePress.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialSifter.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWashPlant.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWireMill.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTENuclearSaltProcessingPlant.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTESpargeTower.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEndustrialElectrolyzer.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvDistillationTower.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvEBF.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvFusionMk4.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvFusionMk5.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvHeatExchanger.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvImplosionCompressor.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCentrifuge.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWaterPump.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAlloyBlastSmelter.java7
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAutoCrafter.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeSemifluidGenerator.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTENuclearReactor.java6
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEQuantumForceTransformer.java9
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTESolarTower.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEThermalBoiler.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/MTEAlgaePondBase.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/MTEMegaAlloyBlastSmelter.java18
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java5
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java6
59 files changed, 74 insertions, 238 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java
index 387475d4f2..ae487fadb6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/MTEAmazonPackager.java
@@ -99,7 +99,6 @@ public class MTEAmazonPackager extends GTPPMultiBlockBase<MTEAmazonPackager> imp
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Amazon Warehouse")
.addInfo("This Multiblock is used for EXTREME packaging requirements")
.addInfo("Can be configured with a screwdriver to work as an Unpackager")
.addInfo("Dust Schematics are inserted into the input busses")
@@ -109,7 +108,6 @@ public class MTEAmazonPackager extends GTPPMultiBlockBase<MTEAmazonPackager> imp
.addInfo("Only uses 75% of the EU/t normally required")
.addInfo("Processes 16 items per voltage tier")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 3, 3, true)
.addController("Front center")
.addCasingInfoMin("Supply Depot Casings", 10, false)
@@ -118,7 +116,7 @@ public class MTEAmazonPackager extends GTPPMultiBlockBase<MTEAmazonPackager> imp
.addEnergyHatch("Any casing", 1)
.addMaintenanceHatch("Any casing", 1)
.addMufflerHatch("Any casing", 1)
- .toolTipFinisher("GT++");
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java
index 031e8cfe11..3b626fee5c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java
@@ -35,7 +35,6 @@ import gregtech.api.util.MultiblockTooltipBuilder;
import gregtech.api.util.OverclockCalculator;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
public class MTEIndustrialAlloySmelter extends GTPPMultiBlockBase<MTEIndustrialAlloySmelter>
@@ -116,13 +115,11 @@ public class MTEIndustrialAlloySmelter extends GTPPMultiBlockBase<MTEIndustrialA
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Alloy Smelter")
.addInfo("Gains one parallel per voltage tier")
.addInfo("Gains one multiplier per coil tier")
.addInfo("Parallel = Tier * Coil Tier")
.addInfo("Gains 5% speed bonus per coil tier")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 5, 3, true)
.addController("Bottom center")
.addCasingInfoMin("Inconel Reinforced Casings", 8, false)
@@ -133,7 +130,7 @@ public class MTEIndustrialAlloySmelter extends GTPPMultiBlockBase<MTEIndustrialA
.addEnergyHatch("Any Inconel Reinforced Casing", 1)
.addMaintenanceHatch("Any Inconel Reinforced Casing", 1)
.addMufflerHatch("Any Inconel Reinforced Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java
index 28e32e1ab7..95a6c68df1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialArcFurnace.java
@@ -47,7 +47,6 @@ import gregtech.api.util.GTUtility;
import gregtech.api.util.MultiblockTooltipBuilder;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -88,13 +87,11 @@ public class MTEIndustrialArcFurnace extends GTPPMultiBlockBase<MTEIndustrialArc
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for Industrial Arc Furnace")
.addInfo("250% faster than using single block machines of the same voltage")
.addInfo("Processes 8 * voltage tier * W items")
.addInfo("Right-click controller with a Screwdriver to change modes")
.addInfo("Max Size required to process Plasma recipes")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.addController("Top center")
.addStructureInfo("Size: nxnx3 [WxHxL] (Hollow)")
.addStructureInfo("n can be 3, 5 or 7")
@@ -106,7 +103,7 @@ public class MTEIndustrialArcFurnace extends GTPPMultiBlockBase<MTEIndustrialArc
.addEnergyHatch("Any Casing", 1)
.addMaintenanceHatch("Any Casing", 1)
.addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCentrifuge.java
index b840cd9a08..02015b20eb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCentrifuge.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCentrifuge.java
@@ -35,7 +35,6 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.recipe.GTPPRecipeMaps;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
@@ -74,13 +73,11 @@ public class MTEIndustrialCentrifuge extends GTPPMultiBlockBase<MTEIndustrialCen
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Centrifuge")
.addInfo("125% faster than using single block machines of the same voltage")
.addInfo("Disable animations with a screwdriver")
.addInfo("Only uses 90% of the EU/t normally required")
.addInfo("Processes six items per voltage tier")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 3, 3, true)
.addController("Front Center")
.addCasingInfoMin("Centrifuge Casings", 6, false)
@@ -91,7 +88,7 @@ public class MTEIndustrialCentrifuge extends GTPPMultiBlockBase<MTEIndustrialCen
.addEnergyHatch("Any Casing", 1)
.addMaintenanceHatch("Any Casing", 1)
.addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java
index d68fe3f8c7..214d118a60 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialChisel.java
@@ -39,7 +39,6 @@ import gregtech.api.util.GTUtility;
import gregtech.api.util.MultiblockTooltipBuilder;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchChiselBus;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
@@ -84,7 +83,6 @@ public class MTEIndustrialChisel extends GTPPMultiBlockBase<MTEIndustrialChisel>
.addInfo("If no target is provided for common buses, the result of the first chisel is used")
.addInfo("Speed: +200% | EU Usage: 75% | Parallel: Tier x 16")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 3, 3, true)
.addController("Front center")
.addCasingInfoMin("Sturdy Printer Casing", 6, false)
@@ -93,7 +91,7 @@ public class MTEIndustrialChisel extends GTPPMultiBlockBase<MTEIndustrialChisel>
.addEnergyHatch("Any casing", 1)
.addMaintenanceHatch("Any casing", 1)
.addMufflerHatch("Any casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCokeOven.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCokeOven.java
index afca39266c..0921d8f3ea 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCokeOven.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCokeOven.java
@@ -32,7 +32,6 @@ import gregtech.api.util.MultiblockTooltipBuilder;
import gtPlusPlus.api.recipe.GTPPRecipeMaps;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -67,12 +66,10 @@ public class MTEIndustrialCokeOven extends GTPPMultiBlockBase<MTEIndustrialCokeO
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
.addInfo("Processes Logs and Coal into Charcoal and Coal Coke.")
- .addInfo("Controller Block for the Industrial Coke Oven")
.addInfo("Gain 4% energy discount per voltage tier")
.addInfo("Process 12x materials with Heat Resistant Casings")
.addInfo("Or 24x materials with Heat Proof Casings")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 3, 3, true)
.addController("Front middle at bottom")
.addCasingInfoMin("Structural Coke Oven Casings", 8, false)
@@ -84,7 +81,7 @@ public class MTEIndustrialCokeOven extends GTPPMultiBlockBase<MTEIndustrialCokeO
.addEnergyHatch("Any Structural Coke Oven Casing", 1)
.addMaintenanceHatch("Any Structural Coke Oven Casing", 1)
.addMufflerHatch("Any Structural Coke Oven Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCuttingMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCuttingMachine.java
index cd488cd6af..2652479801 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCuttingMachine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialCuttingMachine.java
@@ -48,7 +48,6 @@ import gregtech.api.util.GTUtility;
import gregtech.api.util.MultiblockTooltipBuilder;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -86,12 +85,10 @@ public class MTEIndustrialCuttingMachine extends GTPPMultiBlockBase<MTEIndustria
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Cutting Factory")
.addInfo("200% faster than using single block machines of the same voltage")
.addInfo("Only uses 75% of the EU/t normally required")
.addInfo("Processes four items per voltage tier")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 3, 5, true)
.addController("Front Center")
.addCasingInfoMin("Cutting Factory Frames", 14, false)
@@ -101,7 +98,7 @@ public class MTEIndustrialCuttingMachine extends GTPPMultiBlockBase<MTEIndustria
.addEnergyHatch("Any Casing", 1)
.addMaintenanceHatch("Any Casing", 1)
.addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java
index 8b63f34edb..96eaf9c33f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialDehydrator.java
@@ -51,7 +51,6 @@ import gregtech.api.util.OverclockCalculator;
import gtPlusPlus.api.recipe.GTPPRecipeMaps;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -95,7 +94,6 @@ public class MTEIndustrialDehydrator extends GTPPMultiBlockBase<MTEIndustrialDeh
.addInfo("Each 1800K over the min. Heat Capacity allows for one upgraded overclock")
.addInfo("Upgraded overclocks reduce recipe time to 25% and increase EU/t to 400%")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 5, 3, true)
.addController("Bottom Center")
.addCasingInfoMin(mCasingName, 5, false)
@@ -106,7 +104,7 @@ public class MTEIndustrialDehydrator extends GTPPMultiBlockBase<MTEIndustrialDeh
.addEnergyHatch("Any Casing", 1)
.addMaintenanceHatch("Any Casing", 1)
.addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialExtruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialExtruder.java
index 69b7330901..7badb903f1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialExtruder.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialExtruder.java
@@ -30,7 +30,6 @@ import gregtech.api.util.GTUtility;
import gregtech.api.util.MultiblockTooltipBuilder;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -61,14 +60,12 @@ public class MTEIndustrialExtruder extends GTPPMultiBlockBase<MTEIndustrialExtru
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Material Extruder")
.addInfo("250% faster than using single block machines of the same voltage")
.addInfo("Processes four items per voltage tier")
.addInfo("Extrusion Shape for recipe goes in the Input Bus")
.addInfo("Each Input Bus can have a different shape!")
.addInfo("You can use several input buses per multiblock")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 3, 5, true)
.addController("Front Center")
.addCasingInfoMin("Inconel Reinforced Casings", 14, false)
@@ -77,7 +74,7 @@ public class MTEIndustrialExtruder extends GTPPMultiBlockBase<MTEIndustrialExtru
.addEnergyHatch("Any Casing", 1)
.addMaintenanceHatch("Any Casing", 1)
.addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialFluidHeater.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialFluidHeater.java
index 8dd62202b3..364b8195e1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialFluidHeater.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialFluidHeater.java
@@ -31,7 +31,6 @@ import gregtech.api.util.GTUtility;
import gregtech.api.util.MultiblockTooltipBuilder;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -63,12 +62,10 @@ public class MTEIndustrialFluidHeater extends GTPPMultiBlockBase<MTEIndustrialFl
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Fluid Heater")
.addInfo("120% faster than using single block machines of the same voltage")
.addInfo("Only uses 90% of the EU/t normally required")
.addInfo("Processes eight items per voltage tier")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(5, 6, 5, true)
.addController("Front Center")
.addCasingInfoMin("Top/Bottom layer: Multi-use Casings", 34, false)
@@ -80,7 +77,7 @@ public class MTEIndustrialFluidHeater extends GTPPMultiBlockBase<MTEIndustrialFl
.addEnergyHatch("Any Multi-use Casing", 1)
.addMaintenanceHatch("Any Multi-use Casing", 1)
.addMufflerHatch("Any Multi-use Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialForgeHammer.java
index a8bf12bfa0..8176db29d6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialForgeHammer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialForgeHammer.java
@@ -46,7 +46,6 @@ import gregtech.api.util.GTUtility;
import gregtech.api.util.MultiblockTooltipBuilder;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -80,7 +79,6 @@ public class MTEIndustrialForgeHammer extends GTPPMultiBlockBase<MTEIndustrialFo
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Forge Hammer")
.addInfo("Speed: +100% | EU Usage: 100% | Parallel: Tier x Anvil Tier x 8")
.addInfo("T1 - Vanilla Anvil");
if (Railcraft.isModLoaded()) {
@@ -95,7 +93,6 @@ public class MTEIndustrialForgeHammer extends GTPPMultiBlockBase<MTEIndustrialFo
}
tt.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 3, 3, true)
.addController("Front Center")
.addCasingInfoMin("Forge Casing", 6, false)
@@ -107,7 +104,7 @@ public class MTEIndustrialForgeHammer extends GTPPMultiBlockBase<MTEIndustrialFo
.addMaintenanceHatch("Any Casing", 1)
.addMufflerHatch("Any Casing", 1)
.addOtherStructurePart("Anvil", "In the center of 3x3x3 structure", 2)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java
index 4df9c8ce78..7896dfb73c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMacerator.java
@@ -48,7 +48,6 @@ import gregtech.api.util.MultiblockTooltipBuilder;
import gregtech.common.tileentities.machines.IDualInputHatch;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
@@ -98,12 +97,10 @@ public class MTEIndustrialMacerator extends GTPPMultiBlockBase<MTEIndustrialMace
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller block for the Industrial Maceration Stack")
.addInfo("60% faster than using single block machines of the same voltage")
.addInfo("Maximum of n*tier parallels, LV = Tier 1, MV = Tier 2, etc.")
.addInfo("n=2 initially. n=8 after inserting Maceration Upgrade Chip.")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 6, 3, true)
.addController("Bottom center")
.addCasingInfoMin("Maceration Stack Casings (After upgrade)", 26, false)
@@ -113,7 +110,7 @@ public class MTEIndustrialMacerator extends GTPPMultiBlockBase<MTEIndustrialMace
.addMaintenanceHatch("Any casing", 1)
.addOutputBus("One per layer except bottom layer", 2)
.addMufflerHatch("Any casing except bottom layer", 2)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMixer.java
index 3526146ab6..9d62d6a420 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMixer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMixer.java
@@ -36,7 +36,6 @@ import gregtech.api.util.MultiblockTooltipBuilder;
import gtPlusPlus.api.recipe.GTPPRecipeMaps;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -86,11 +85,9 @@ public class MTEIndustrialMixer extends GTPPMultiBlockBase<MTEIndustrialMixer> i
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Mixer")
.addInfo("250% faster than using single block machines of the same voltage")
.addInfo("Processes eight recipes per voltage tier")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 4, 3, false)
.addController("Second Layer Center")
.addCasingInfoMin(mCasingName, 6, false)
@@ -102,7 +99,7 @@ public class MTEIndustrialMixer extends GTPPMultiBlockBase<MTEIndustrialMixer> i
.addEnergyHatch("Any Casing", 1)
.addMaintenanceHatch("Any Casing", 1)
.addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMolecularTransformer.java
index 818ab3674a..d6cef05649 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMolecularTransformer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMolecularTransformer.java
@@ -29,7 +29,6 @@ import gregtech.api.util.MultiblockTooltipBuilder;
import gtPlusPlus.api.recipe.GTPPRecipeMaps;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -65,7 +64,6 @@ public class MTEIndustrialMolecularTransformer extends GTPPMultiBlockBase<MTEInd
.addInfo("Changes the structure of items to produce new ones")
.addInfo("Maximum 1x of each bus/hatch.")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(7, 7, 7, false)
.addController("Top Center")
.addCasingInfoMin("Robust Tungstensteel Machine Casing", 40, false)
@@ -80,7 +78,7 @@ public class MTEIndustrialMolecularTransformer extends GTPPMultiBlockBase<MTEInd
.addEnergyHatch("Any Robust Tungstensteel Machine Casing", 1)
.addMaintenanceHatch("Any Robust Tungstensteel Machine Casing", 1)
.addMufflerHatch("Any Robust Tungstensteel Machine Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java
index f4df2c3c1c..24a245833f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java
@@ -64,7 +64,6 @@ import gregtech.common.tileentities.machines.MTEHatchCraftingInputME;
import gregtech.common.tileentities.machines.MTEHatchInputME;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchSolidifier;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
@@ -130,7 +129,6 @@ public class MTEIndustrialMultiMachine extends GTPPMultiBlockBase<MTEIndustrialM
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Multi-Machine")
.addInfo(EnumChatFormatting.RED + "DEPRECATED! This machine will be removed in the next major update.")
.addInfo(EnumChatFormatting.RED + "A variety of multiblocks have been added to replace these machines!")
.addInfo("250% faster than using single block machines of the same voltage")
@@ -144,7 +142,6 @@ public class MTEIndustrialMultiMachine extends GTPPMultiBlockBase<MTEIndustrialM
EnumChatFormatting.AQUA + "You can use Solidifier Hatch to solidify multiple liquids."
+ EnumChatFormatting.RESET)
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 3, 3, true)
.addController("Front Center")
.addCasingInfoMin("Multi-Use Casings", 6, false)
@@ -155,7 +152,7 @@ public class MTEIndustrialMultiMachine extends GTPPMultiBlockBase<MTEIndustrialM
.addEnergyHatch("Any Casing", 1)
.addMaintenanceHatch("Any Casing", 1)
.addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialPlatePress.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialPlatePress.java
index 75d3e6df6f..20f56c56cb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialPlatePress.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialPlatePress.java
@@ -43,7 +43,6 @@ import gregtech.api.util.GTUtility;
import gregtech.api.util.MultiblockTooltipBuilder;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -82,13 +81,11 @@ public class MTEIndustrialPlatePress extends GTPPMultiBlockBase<MTEIndustrialPla
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for Advanced Bending & Forming")
.addInfo("500% faster than using single block machines of the same voltage")
.addInfo("Processes four items per voltage tier")
.addInfo("Circuit for recipe goes in the Input Bus")
.addInfo("Each Input Bus can have a different Circuit/Shape!")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 3, 3, true)
.addController("Front Center")
.addCasingInfoMin("Material Press Machine Casings", 6, false)
@@ -97,7 +94,7 @@ public class MTEIndustrialPlatePress extends GTPPMultiBlockBase<MTEIndustrialPla
.addEnergyHatch("Any Casing", 1)
.addMaintenanceHatch("Any Casing", 1)
.addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialSifter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialSifter.java
index d79c6150e7..2e8d742135 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialSifter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialSifter.java
@@ -36,7 +36,6 @@ import gregtech.api.util.GTUtility;
import gregtech.api.util.MultiblockTooltipBuilder;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -67,12 +66,10 @@ public class MTEIndustrialSifter extends GTPPMultiBlockBase<MTEIndustrialSifter>
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Sifter")
.addInfo("400% faster than single-block machines of the same voltage")
.addInfo("Only uses 75% of the EU/t normally required")
.addInfo("Processes four items per voltage tier")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(5, 3, 5, false)
.addController("Bottom Center")
.addCasingInfoMin("Sieve Grate", 18, false)
@@ -84,7 +81,7 @@ public class MTEIndustrialSifter extends GTPPMultiBlockBase<MTEIndustrialSifter>
.addEnergyHatch("Any Casing", 1)
.addMaintenanceHatch("Any Casing", 1)
.addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java
index f9a366d66c..f4ca5361d9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialThermalCentrifuge.java
@@ -34,7 +34,6 @@ import gregtech.api.util.GTUtility;
import gregtech.api.util.MultiblockTooltipBuilder;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -66,12 +65,10 @@ public class MTEIndustrialThermalCentrifuge extends GTPPMultiBlockBase<MTEIndust
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Thermal Centrifuge")
.addInfo("150% faster than using single block machines of the same voltage")
.addInfo("Only uses 80% of the EU/t normally required")
.addInfo("Processes eight items per voltage tier")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 2, 3, false)
.addController("Front Center")
.addCasingInfoMin("Thermal Processing Casings/Noise Hazard Sign Blocks", 8, false)
@@ -80,7 +77,7 @@ public class MTEIndustrialThermalCentrifuge extends GTPPMultiBlockBase<MTEIndust
.addEnergyHatch("Bottom Casing", 1)
.addMaintenanceHatch("Bottom Casing", 1)
.addMufflerHatch("Bottom Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java
index 563b844574..1a20e07ab6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialVacuumFreezer.java
@@ -39,7 +39,6 @@ import gregtech.api.util.shutdown.ShutDownReasonRegistry;
import gtPlusPlus.api.recipe.GTPPRecipeMaps;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTEHatchCustomFluidBase;
@@ -89,7 +88,6 @@ public class MTEIndustrialVacuumFreezer extends GTPPMultiBlockBase<MTEIndustrial
.addInfo("Consumes 10L of " + mCryoFuelName + "/s during operation")
.addInfo("Constructed exactly the same as a normal Vacuum Freezer")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 3, 3, true)
.addController("Front Center")
.addCasingInfoMin(mCasingName, 10, false)
@@ -101,7 +99,7 @@ public class MTEIndustrialVacuumFreezer extends GTPPMultiBlockBase<MTEIndustrial
.addMufflerHatch("Any Casing", 1)
.addMaintenanceHatch("Any Casing", 1)
.addOtherStructurePart(mHatchName, "Any Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWashPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWashPlant.java
index 89a1b0c102..6db9b8466e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWashPlant.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWashPlant.java
@@ -66,7 +66,6 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.recipe.GTPPRecipeMaps;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
@@ -109,7 +108,6 @@ public class MTEIndustrialWashPlant extends GTPPMultiBlockBase<MTEIndustrialWash
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Wash Plant")
.addInfo("Can be configured with a screwdriver to also do Simple Washer and process Chemical Bathing")
.addInfo("400% faster than using single block machines of the same voltage")
.addInfo("Processes four item per voltage tier")
@@ -117,7 +115,6 @@ public class MTEIndustrialWashPlant extends GTPPMultiBlockBase<MTEIndustrialWash
.addInfo("Need to be filled with water.")
.addInfo("Will automatically fill water from input hatch.")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(5, 3, 7, true)
.addController("Front Center")
.addCasingInfoMin("Wash Plant Casings", 40, false)
@@ -128,7 +125,7 @@ public class MTEIndustrialWashPlant extends GTPPMultiBlockBase<MTEIndustrialWash
.addEnergyHatch("Any Casing", 1)
.addMaintenanceHatch("Any Casing", 1)
.addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWireMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWireMill.java
index 8ceb3e8162..215db1a745 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWireMill.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialWireMill.java
@@ -34,7 +34,6 @@ import gregtech.api.util.GTUtility;
import gregtech.api.util.MultiblockTooltipBuilder;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -65,12 +64,10 @@ public class MTEIndustrialWireMill extends GTPPMultiBlockBase<MTEIndustrialWireM
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Wire Factory")
.addInfo("200% faster than using single block machines of the same voltage")
.addInfo("Only uses 75% of the EU/t normally required")
.addInfo("Processes four items per voltage tier")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 3, 5, true)
.addController("Front Center")
.addCasingInfoMin("Wire Factory Casings", 14, false)
@@ -79,7 +76,7 @@ public class MTEIndustrialWireMill extends GTPPMultiBlockBase<MTEIndustrialWireM
.addEnergyHatch("Any Casing", 1)
.addMaintenanceHatch("Any Casing", 1)
.addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java
index 5634b5f1d6..667582d60b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIsaMill.java
@@ -53,7 +53,6 @@ import gtPlusPlus.api.recipe.GTPPRecipeMaps;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
import gtPlusPlus.core.item.chemistry.general.ItemGenericChemBase;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.EntityUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -86,10 +85,8 @@ public class MTEIsaMill extends GTPPMultiBlockBase<MTEIsaMill> implements ISurvi
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Large Grinding Machine")
.addInfo("Grind ores.")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 3, 7, false)
.addController("Front Center")
.addCasingInfoMin("IsaMill Exterior Casing", 40, false)
@@ -102,7 +99,7 @@ public class MTEIsaMill extends GTPPMultiBlockBase<MTEIsaMill> implements ISurvi
.addEnergyHatch("Any Casing", 1)
.addMaintenanceHatch("Any Casing", 1)
.addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTENuclearSaltProcessingPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTENuclearSaltProcessingPlant.java
index 86e1c9e624..e74045dfe9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTENuclearSaltProcessingPlant.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTENuclearSaltProcessingPlant.java
@@ -33,7 +33,6 @@ import gregtech.api.util.MultiblockTooltipBuilder;
import gtPlusPlus.api.recipe.GTPPRecipeMaps;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
public class MTENuclearSaltProcessingPlant extends GTPPMultiBlockBase<MTENuclearSaltProcessingPlant>
@@ -75,7 +74,6 @@ public class MTENuclearSaltProcessingPlant extends GTPPMultiBlockBase<MTENuclear
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Nuclear Salt Processing Plant")
.addInfo("Processes depleted nuclear salts that come from the LFTR")
.addInfo("Handles the recipes of the Reactor Processor Unit and Cold Trap")
.addInfo("Only Thermally Insulated Casings can be replaced with hatches")
@@ -85,7 +83,6 @@ public class MTENuclearSaltProcessingPlant extends GTPPMultiBlockBase<MTENuclear
.addInfo("150% faster than using single block machines of the same voltage")
.addInfo("Processes two items per voltage tier")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 3, 3, true)
.addController("Front Center")
.addCasingInfoMin("IV Machine Casing", 58, false)
@@ -97,7 +94,7 @@ public class MTENuclearSaltProcessingPlant extends GTPPMultiBlockBase<MTENuclear
.addMufflerHatch("Top Side, 2 Required", 4)
.addEnergyHatch("Bottom Side, 2 Required", 5)
.addMaintenanceHatch("Back Side, Opposite of Controller", 6)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTESpargeTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTESpargeTower.java
index e401e907bb..f8e60dd677 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTESpargeTower.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTESpargeTower.java
@@ -48,7 +48,6 @@ import gregtech.api.util.MultiblockTooltipBuilder;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.recipe.GTPPRecipeMaps;
import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
@@ -130,12 +129,10 @@ public class MTESpargeTower extends GTPPMultiBlockBase<MTESpargeTower> implement
protected MultiblockTooltipBuilder createTooltip() {
final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType("Gas Sparge Tower")
- .addInfo("Controller block for the Sparging Tower")
.addInfo("Runs gases through depleted molten salts to extract precious fluids")
.addInfo("Works the same way as the Distillation Tower, but with a fixed height of 8")
.addInfo("Fluids are only put out at the correct height")
.addInfo("The correct height equals the slot number in the NEI recipe")
- .addSeparator()
.beginStructureBlock(3, 8, 3, true)
.addController("Front bottom")
.addOtherStructurePart("Sparge Tower Exterior Casing", "45 (minimum)")
@@ -143,7 +140,7 @@ public class MTESpargeTower extends GTPPMultiBlockBase<MTESpargeTower> implement
.addMaintenanceHatch("Any casing", 1, 2, 3)
.addInputHatch("2x Input Hatches (Any bottom layer casing)", 1)
.addOutputHatch("6x Output Hatches (At least one per layer except bottom layer)", 2, 3)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEndustrialElectrolyzer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEndustrialElectrolyzer.java
index e59717127d..1a24320762 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEndustrialElectrolyzer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEndustrialElectrolyzer.java
@@ -30,7 +30,6 @@ import gregtech.api.util.MultiblockTooltipBuilder;
import gtPlusPlus.api.recipe.GTPPRecipeMaps;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -62,12 +61,10 @@ public class MTEndustrialElectrolyzer extends GTPPMultiBlockBase<MTEndustrialEle
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Electrolyzer")
.addInfo("180% faster than using single block machines of the same voltage")
.addInfo("Only uses 90% of the EU/t normally required")
.addInfo("Processes two items per voltage tier")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 3, 3, true)
.addController("Front Center")
.addCasingInfoMin("Electrolyzer Casings", 6, false)
@@ -78,7 +75,7 @@ public class MTEndustrialElectrolyzer extends GTPPMultiBlockBase<MTEndustrialEle
.addEnergyHatch("Any Casing", 1)
.addMaintenanceHatch("Any Casing", 1)
.addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvDistillationTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvDistillationTower.java
index c74eb89a07..c602e8f41f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvDistillationTower.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvDistillationTower.java
@@ -54,7 +54,6 @@ import gregtech.api.util.GTUtility;
import gregtech.api.util.MultiblockTooltipBuilder;
import gregtech.common.tileentities.machines.MTEHatchOutputME;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -176,7 +175,6 @@ public class MTEAdvDistillationTower extends GTPPMultiBlockBase<MTEAdvDistillati
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Advanced Distillation Tower")
.addInfo("Use 85% less energy in distillery mode")
.addInfo("250%/100% faster in DT/distillery mode")
.addInfo("Right click the controller with screwdriver to change mode.")
@@ -185,7 +183,6 @@ public class MTEAdvDistillationTower extends GTPPMultiBlockBase<MTEAdvDistillati
.addInfo("Distillery Mode: Tower Tier * (4*InputTier)")
.addInfo("Distillery Mode require a full height tower")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.addCasingInfoMin("Clean Stainless Steel Machine Casing", 7, false)
.addInputBus("Bottom Casing", 1)
.addOutputBus("Bottom Casing", 1)
@@ -194,7 +191,7 @@ public class MTEAdvDistillationTower extends GTPPMultiBlockBase<MTEAdvDistillati
.addEnergyHatch("Any Casing", 1)
.addOutputHatch("One per layer except bottom", 2)
.addMufflerHatch("Top Casing", 3)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvEBF.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvEBF.java
index 3645556583..dccf03487e 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvEBF.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvEBF.java
@@ -53,7 +53,6 @@ import gregtech.api.util.OverclockCalculator;
import gregtech.api.util.shutdown.ShutDownReasonRegistry;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTEHatchCustomFluidBase;
@@ -100,7 +99,6 @@ public class MTEAdvEBF extends GTPPMultiBlockBase<MTEAdvEBF> implements ISurviva
.addInfo("Consumes 10L of " + mHotFuelName + " per second during operation")
.addInfo("Constructed exactly the same as a normal EBF")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.addController("Bottom center")
.addCasingInfoMin(mCasingName, 8, false)
.addInputHatch("Any Casing", 1)
@@ -111,7 +109,7 @@ public class MTEAdvEBF extends GTPPMultiBlockBase<MTEAdvEBF> implements ISurviva
.addMufflerHatch("Any Casing", 1)
.addMaintenanceHatch("Any Casing", 1)
.addOtherStructurePart(mHatchName, "Any Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvFusionMk4.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvFusionMk4.java
index 7c2735c6e1..4477c3b7bc 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvFusionMk4.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvFusionMk4.java
@@ -21,7 +21,6 @@ import gregtech.api.util.AdvancedFusionOverclockDescriber;
import gregtech.api.util.MultiblockTooltipBuilder;
import gregtech.common.tileentities.machines.multi.MTEFusionComputer;
import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
public class MTEAdvFusionMk4 extends MTEFusionComputer {
@@ -44,12 +43,10 @@ public class MTEAdvFusionMk4 extends MTEFusionComputer {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType("Fusion Reactor")
.addInfo("HARNESSING THE POWER OF A BLUE GIANT")
- .addInfo("Controller block for the Fusion Reactor Mk IV")
.addInfo("131072EU/t and 320M EU capacity per Energy Hatch")
.addInfo("If the recipe has a startup cost greater than the")
.addInfo("number of energy hatches * cap, you can't do it")
.addInfo("Performs 4/4 overclocks")
- .addSeparator()
.beginStructureBlock(15, 3, 15, false)
.addController("See diagram when placed")
.addCasingInfoMin("Fusion Machine Casings MK III", 79, false)
@@ -59,7 +56,7 @@ public class MTEAdvFusionMk4 extends MTEFusionComputer {
.addInputHatch("2-16, Specified casings", 1)
.addOutputHatch("1-16, Specified casings", 3)
.addStructureInfo("ALL Hatches must be UHV or better")
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvFusionMk5.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvFusionMk5.java
index 52928268cf..a7d7529f34 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvFusionMk5.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvFusionMk5.java
@@ -21,7 +21,6 @@ import gregtech.api.util.AdvancedFusionOverclockDescriber;
import gregtech.api.util.MultiblockTooltipBuilder;
import gregtech.common.tileentities.machines.multi.MTEFusionComputer;
import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
public class MTEAdvFusionMk5 extends MTEFusionComputer {
@@ -44,12 +43,10 @@ public class MTEAdvFusionMk5 extends MTEFusionComputer {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType("Fusion Reactor")
.addInfo("HARNESSING THE POWER OF A NEUTRON STAR")
- .addInfo("Controller block for the Fusion Reactor Mk V")
.addInfo("524,288EU/t and 1.28B EU capacity per Energy Hatch")
.addInfo("If the recipe has a startup cost greater than the")
.addInfo("number of energy hatches * cap, you can't do it")
.addInfo("Performs 4/4 overclocks")
- .addSeparator()
.beginStructureBlock(15, 3, 15, false)
.addController("See diagram when placed")
.addCasingInfoMin("Fusion Machine Casings MK IV", 79, false)
@@ -59,7 +56,7 @@ public class MTEAdvFusionMk5 extends MTEFusionComputer {
.addInputHatch("2-16, Specified casings", 1)
.addOutputHatch("1-16, Specified casings", 3)
.addStructureInfo("ALL Hatches must be UEV or better")
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvHeatExchanger.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvHeatExchanger.java
index 5ebf5d1659..06314e2f1b 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvHeatExchanger.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvHeatExchanger.java
@@ -41,7 +41,6 @@ import gregtech.common.tileentities.machines.MTEHatchInputME;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.block.base.BasicBlock.BlockTypes;
import gtPlusPlus.core.block.base.BlockBaseModular;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.material.MaterialsAlloy;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -106,7 +105,6 @@ public class MTEAdvHeatExchanger extends GTPPMultiBlockBase<MTEAdvHeatExchanger>
protected MultiblockTooltipBuilder createTooltip() {
final MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the XL Heat Exchanger")
.addInfo("More complicated than a Fusion Reactor. Seriously")
.addInfo("But you know this by now, right?")
.addInfo("Works as fast as 32 Large Heat Exchangers")
@@ -118,7 +116,6 @@ public class MTEAdvHeatExchanger extends GTPPMultiBlockBase<MTEAdvHeatExchanger>
.addInfo("Lava: 32,000 L/s, maximum 64,000 L/s, max output 5,120,000 SH Steam/s")
.addInfo("A circuit in the controller lowers the SH Steam threshold and efficiency")
.addInfo("3.75% reduction and 1.5% efficiency loss per circuit config over 1")
- .addSeparator()
.beginStructureBlock(5, 9, 5, false)
.addController("Front bottom")
.addCasingInfoMin("Reinforced Heat Exchanger Casing", 90, false)
@@ -128,7 +125,7 @@ public class MTEAdvHeatExchanger extends GTPPMultiBlockBase<MTEAdvHeatExchanger>
.addInputHatch("Distilled water, any bottom layer casing", 1)
.addOutputHatch("Cold fluid, top center", 3)
.addOutputHatch("Steam/SH Steam, any bottom layer casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvImplosionCompressor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvImplosionCompressor.java
index 5590185fb7..6c06f20514 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvImplosionCompressor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/MTEAdvImplosionCompressor.java
@@ -27,7 +27,6 @@ import gregtech.api.recipe.RecipeMaps;
import gregtech.api.util.GTUtility;
import gregtech.api.util.MultiblockTooltipBuilder;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -62,7 +61,6 @@ public class MTEAdvImplosionCompressor extends GTPPMultiBlockBase<MTEAdvImplosio
.addInfo("Speed: +100% | EU Usage: 100% | Parallel: ((Tier/2)+1)")
.addInfo("Constructed exactly the same as a normal Implosion Compressor")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 3, 3, true)
.addController("Front center")
.addCasingInfoMin("Robust TungstenSteel Casing", 10, false)
@@ -71,7 +69,7 @@ public class MTEAdvImplosionCompressor extends GTPPMultiBlockBase<MTEAdvImplosio
.addEnergyHatch("Any casing", 1)
.addMaintenanceHatch("Any casing", 1)
.addMufflerHatch("Any casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCentrifuge.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCentrifuge.java
index fa2bc634d8..740a71e589 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCentrifuge.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCentrifuge.java
@@ -2,7 +2,6 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.s
import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
import static gregtech.api.GregTechAPI.*;
-import static gregtech.api.enums.GTValues.AuthorEvgenWarGold;
import static gregtech.api.enums.HatchElement.OutputHatch;
import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
@@ -34,6 +33,7 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
import gregtech.api.enums.SoundResource;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
@@ -326,12 +326,10 @@ public class MTESteamCentrifuge extends MTESteamMultiBase<MTESteamCentrifuge> im
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Steam Separator")
.addInfo("25% faster than using single block steam machines of the same pressure")
.addInfo("Only consumes steam at 62.5% of the L/s normally required")
.addInfo("Processes up to 8 items at once")
.addInfo(HIGH_PRESSURE_TOOLTIP_NOTICE)
- .addSeparator()
.beginStructureBlock(5, 5, 5, false)
.addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1)
.addOutputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1)
@@ -355,8 +353,7 @@ public class MTESteamCentrifuge extends MTESteamMultiBase<MTESteamCentrifuge> im
.addStructureInfo(EnumChatFormatting.GOLD + "8x" + EnumChatFormatting.GRAY + " Steel Gear Box Casing")
.addStructureInfo(EnumChatFormatting.GOLD + "3x" + EnumChatFormatting.GRAY + " Steel Firebox Casing")
.addStructureInfo(EnumChatFormatting.GOLD + "4x" + EnumChatFormatting.GRAY + " Steel Pipe Casing")
- .addStructureInfo("")
- .toolTipFinisher(AuthorEvgenWarGold);
+ .toolTipFinisher(GTValues.AuthorEvgenWarGold);
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java
index 1ead5a5ce3..bd20334bf5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java
@@ -53,7 +53,6 @@ import gregtech.api.util.MultiblockTooltipBuilder;
import gregtech.api.util.OverclockCalculator;
import gregtech.common.blocks.BlockCasings1;
import gregtech.common.blocks.BlockCasings2;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTESteamMultiBase;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
@@ -270,12 +269,10 @@ public class MTESteamCompressor extends MTESteamMultiBase<MTESteamCompressor> im
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Steam Squasher")
.addInfo("25% faster than using single block steam machines of the same pressure")
.addInfo("Only consumes steam at 62.5% of the L/s normally required")
.addInfo("Processes up to 8 items at once")
.addInfo(HIGH_PRESSURE_TOOLTIP_NOTICE)
- .addSeparator()
.beginStructureBlock(3, 3, 4, false)
.addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1)
.addOutputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1)
@@ -292,8 +289,7 @@ public class MTESteamCompressor extends MTESteamMultiBase<MTESteamCompressor> im
.addStructureInfo(EnumChatFormatting.BLUE + "High Pressure " + EnumChatFormatting.DARK_PURPLE + "Tier")
.addStructureInfo(
EnumChatFormatting.GOLD + "25-30x" + EnumChatFormatting.GRAY + " Solid Steel Machine Casing")
- .addStructureInfo("")
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java
index 2b06c12ece..67f2d7c139 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java
@@ -5,7 +5,6 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
import static gregtech.api.GregTechAPI.sBlockCasings1;
import static gregtech.api.GregTechAPI.sBlockCasings2;
-import static gregtech.api.enums.GTValues.AuthorEvgenWarGold;
import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
import java.util.ArrayList;
@@ -37,6 +36,7 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
import gregtech.api.enums.SoundResource;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
@@ -320,12 +320,10 @@ public class MTESteamForgeHammer extends MTESteamMultiBase<MTESteamForgeHammer>
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Steam Presser")
.addInfo("25% faster than using single block steam machines of the same pressure")
.addInfo("Only consumes steam at 62.5% of the L/s normally required")
.addInfo("Processes up to 8 items at once")
.addInfo(HIGH_PRESSURE_TOOLTIP_NOTICE)
- .addSeparator()
.beginStructureBlock(6, 5, 5, false)
.addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1)
.addOutputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1)
@@ -351,8 +349,7 @@ public class MTESteamForgeHammer extends MTESteamMultiBase<MTESteamForgeHammer>
+ " Steel Block"
+ EnumChatFormatting.RED
+ " from GregTech")
- .addStructureInfo("")
- .toolTipFinisher(AuthorEvgenWarGold);
+ .toolTipFinisher(GTValues.AuthorEvgenWarGold);
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java
index 7f126efd14..6b3e8b437f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java
@@ -52,7 +52,6 @@ import gregtech.api.util.MultiblockTooltipBuilder;
import gregtech.api.util.OverclockCalculator;
import gregtech.common.blocks.BlockCasings1;
import gregtech.common.blocks.BlockCasings2;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.MTESteamMultiBase;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
@@ -269,12 +268,10 @@ public class MTESteamMacerator extends MTESteamMultiBase<MTESteamMacerator> impl
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Steam Grinder")
.addInfo("25% faster than using single block steam machines of the same pressure")
.addInfo("Only consumes steam at 62.5% of the L/s normally required")
.addInfo("Processes up to 8 items at once")
.addInfo(HIGH_PRESSURE_TOOLTIP_NOTICE)
- .addSeparator()
.beginStructureBlock(3, 3, 3, false)
.addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1)
.addOutputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1)
@@ -291,8 +288,7 @@ public class MTESteamMacerator extends MTESteamMultiBase<MTESteamMacerator> impl
.addStructureInfo(EnumChatFormatting.BLUE + "High Pressure " + EnumChatFormatting.DARK_PURPLE + "Tier")
.addStructureInfo(
EnumChatFormatting.GOLD + "14-22x" + EnumChatFormatting.GRAY + " Solid Steel Machine Casing")
- .addStructureInfo("")
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java
index 44fd98c06d..a2c4dbd7ec 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java
@@ -6,7 +6,6 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
import static gregtech.api.GregTechAPI.sBlockCasings1;
import static gregtech.api.GregTechAPI.sBlockCasings2;
-import static gregtech.api.enums.GTValues.AuthorEvgenWarGold;
import static gregtech.api.enums.HatchElement.InputHatch;
import static gregtech.api.enums.HatchElement.OutputHatch;
import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
@@ -40,6 +39,7 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
import gregtech.api.enums.SoundResource;
import gregtech.api.enums.Textures;
import gregtech.api.interfaces.ITexture;
@@ -322,12 +322,10 @@ public class MTESteamMixer extends MTESteamMultiBase<MTESteamMixer> implements I
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Steam Blender")
.addInfo("25% faster than using single block steam machines of the same pressure")
.addInfo("Only consumes steam at 62.5% of the L/s normally required")
.addInfo("Processes up to 8 items at once")
.addInfo(HIGH_PRESSURE_TOOLTIP_NOTICE)
- .addSeparator()
.beginStructureBlock(7, 6, 7, false)
.addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1)
.addInputHatch(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1)
@@ -352,8 +350,7 @@ public class MTESteamMixer extends MTESteamMultiBase<MTESteamMixer> implements I
.addStructureInfo(EnumChatFormatting.GOLD + "2x" + EnumChatFormatting.GRAY + " Steel Gear Box Casing")
.addStructureInfo(EnumChatFormatting.GOLD + "2x" + EnumChatFormatting.GRAY + " Steel Pipe Casing")
.addStructureInfo(EnumChatFormatting.GOLD + "8x" + EnumChatFormatting.GRAY + " Block of Iron")
- .addStructureInfo("")
- .toolTipFinisher(AuthorEvgenWarGold);
+ .toolTipFinisher(GTValues.AuthorEvgenWarGold);
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java
index 575db34e79..8257a4a65a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java
@@ -2,7 +2,6 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing.s
import static com.gtnewhorizon.structurelib.structure.StructureUtility.*;
import static gregtech.api.GregTechAPI.*;
-import static gregtech.api.enums.GTValues.AuthorEvgenWarGold;
import static gregtech.api.enums.HatchElement.InputHatch;
import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
@@ -40,6 +39,7 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
import gregtech.api.enums.SoundResource;
import gregtech.api.enums.Textures;
import gregtech.api.gui.modularui.GTUITextures;
@@ -345,12 +345,10 @@ public class MTESteamWasher extends MTESteamMultiBase<MTESteamWasher> implements
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Steam Purifier")
.addInfo("25% faster than using single block steam machines of the same pressure")
.addInfo("Only consumes steam at 62.5% of the L/s normally required")
.addInfo("Processes up to 8 items at once")
.addInfo(HIGH_PRESSURE_TOOLTIP_NOTICE)
- .addSeparator()
.beginStructureBlock(5, 5, 5, false)
.addInputBus(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1)
.addInputHatch(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1)
@@ -374,8 +372,7 @@ public class MTESteamWasher extends MTESteamMultiBase<MTESteamWasher> implements
.addStructureInfo(EnumChatFormatting.GOLD + "24x" + EnumChatFormatting.GRAY + " Any Glass")
.addStructureInfo(EnumChatFormatting.GOLD + "12x" + EnumChatFormatting.GRAY + " Steel Pipe Casing")
.addStructureInfo(EnumChatFormatting.GOLD + "8x" + EnumChatFormatting.GRAY + " Steel Gear Box Casing")
- .addStructureInfo("")
- .toolTipFinisher(AuthorEvgenWarGold);
+ .toolTipFinisher(GTValues.AuthorEvgenWarGold);
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWaterPump.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWaterPump.java
index f8a8384bf1..8765866b68 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWaterPump.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWaterPump.java
@@ -4,7 +4,6 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock;
import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain;
import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass;
import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose;
-import static gregtech.api.enums.GTValues.AuthorEvgenWarGold;
import static gregtech.api.enums.HatchElement.OutputHatch;
import static gregtech.api.util.GTStructureUtility.buildHatchAdder;
import static gregtech.api.util.GTStructureUtility.ofFrame;
@@ -34,6 +33,7 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
import gregtech.api.enums.Materials;
import gregtech.api.enums.SoundResource;
import gregtech.api.enums.Textures;
@@ -233,7 +233,6 @@ public class MTESteamWaterPump extends MTESteamMultiBase<MTESteamWaterPump> impl
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Water Pump")
.addInfo("Pumps Water based on humidity")
.addInfo("Has 2 tiers: Bronze and Steel")
.addInfo("Steel tier extracts 2x Water")
@@ -254,7 +253,6 @@ public class MTESteamWaterPump extends MTESteamMultiBase<MTESteamWaterPump> impl
+ EnumChatFormatting.RED
+ " of Steam."
+ EnumChatFormatting.RESET)
- .addSeparator()
.beginStructureBlock(3, 3, 5, false)
.addOutputHatch(EnumChatFormatting.GOLD + "1" + EnumChatFormatting.GRAY + " Any casing", 1)
.addStructureInfo(
@@ -271,8 +269,7 @@ public class MTESteamWaterPump extends MTESteamMultiBase<MTESteamWaterPump> impl
.addStructureInfo(EnumChatFormatting.BLUE + "Tier " + EnumChatFormatting.DARK_PURPLE + 2)
.addStructureInfo(EnumChatFormatting.GOLD + "10" + EnumChatFormatting.GRAY + " Steel Frame Box")
.addStructureInfo(EnumChatFormatting.GOLD + "9 " + EnumChatFormatting.GRAY + " Wooden Casing")
- .addStructureInfo("")
- .toolTipFinisher(AuthorEvgenWarGold);
+ .toolTipFinisher(GTValues.AuthorEvgenWarGold);
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAlloyBlastSmelter.java
index 970f975a70..d47953daba 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAlloyBlastSmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAlloyBlastSmelter.java
@@ -37,7 +37,6 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.recipe.GTPPRecipeMaps;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -79,12 +78,10 @@ public class MTEAlloyBlastSmelter extends GTPPMultiBlockBase<MTEAlloyBlastSmelte
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Alloy Blast Smelter")
- .addInfo("Allows Complex GT++ alloys to be created")
+ .addInfo("Allows Complex alloys to be created")
.addInfo("Accepts only one Energy Hatch")
.addInfo("Circuit for recipe goes in the Input Bus or GUI slot")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 4, 3, true)
.addController("Bottom Center")
.addCasingInfoMin("Blast Smelter Casings", 5, false)
@@ -95,7 +92,7 @@ public class MTEAlloyBlastSmelter extends GTPPMultiBlockBase<MTEAlloyBlastSmelte
.addEnergyHatch("Any Casing", 1)
.addMaintenanceHatch("Any Casing", 1)
.addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAutoCrafter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAutoCrafter.java
index 2fb4a7b5c7..3a216b20ef 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAutoCrafter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEAutoCrafter.java
@@ -31,7 +31,6 @@ import gregtech.api.util.GTUtility;
import gregtech.api.util.MultiblockTooltipBuilder;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
public class MTEAutoCrafter extends GTPPMultiBlockBase<MTEAutoCrafter> implements ISurvivalConstructable {
@@ -91,7 +90,6 @@ public class MTEAutoCrafter extends GTPPMultiBlockBase<MTEAutoCrafter> implement
.addInfo("200% faster than using single block machines of the same voltage")
.addInfo("Processes two items per voltage tier")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 3, 3, true)
.addController("Front Center")
.addCasingInfoRange("Bulk Production Frame", 10, 25, false)
@@ -101,7 +99,7 @@ public class MTEAutoCrafter extends GTPPMultiBlockBase<MTEAutoCrafter> implement
.addEnergyHatch("Any Casing", 1)
.addMaintenanceHatch("Any Casing", 1)
.addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java
index 6952dd5c24..fed3767cce 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTECyclotron.java
@@ -40,7 +40,6 @@ import gtPlusPlus.api.recipe.GTPPRecipeMaps;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
import gtPlusPlus.core.item.chemistry.IonParticles;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -179,7 +178,6 @@ public class MTECyclotron extends GTPPMultiBlockBase<MTECyclotron> implements IS
.addInfo("Cyclotron Machine Casings around Cyclotron Coil Blocks")
.addInfo("All Hatches must be IV or better")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.addCasingInfoMin("Cyclotron Machine Casings", 40, false)
.addCasingInfoMin("Cyclotron Coil", 32, false)
.addInputBus("Any Casing", 1)
@@ -189,7 +187,7 @@ public class MTECyclotron extends GTPPMultiBlockBase<MTECyclotron> implements IS
.addEnergyHatch("Any Casing", 1)
.addMaintenanceHatch("Any Casing", 1)
.addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java
index 32ea79cc55..0901c027d5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEElementalDuplicator.java
@@ -37,7 +37,6 @@ import gregtech.api.util.GTUtility;
import gregtech.api.util.MultiblockTooltipBuilder;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchElementalDataOrbHolder;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -78,7 +77,6 @@ public class MTEElementalDuplicator extends GTPPMultiBlockBase<MTEElementalDupli
.addInfo("Requires circuit 1-16 in your Data Orb Repository")
.addInfo("depending on what Data Orb you want to prioritize")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(9, 6, 9, true)
.addController("Top Center")
.addCasingInfoMin("Elemental Confinement Shell", 138, false)
@@ -95,7 +93,7 @@ public class MTEElementalDuplicator extends GTPPMultiBlockBase<MTEElementalDupli
.addEnergyHatch("Any 1 dot hint", 1)
.addMaintenanceHatch("Any 1 dot hint", 1)
.addMufflerHatch("Any 1 dot hint", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java
index bbcbfc1322..ff530a9ff9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEFrothFlotationCell.java
@@ -44,7 +44,6 @@ import gregtech.api.util.MultiblockTooltipBuilder;
import gtPlusPlus.api.recipe.GTPPRecipeMaps;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -80,7 +79,6 @@ public class MTEFrothFlotationCell extends GTPPMultiBlockBase<MTEFrothFlotationC
.addInfo("Process that milled ore!")
.addInfo("You can only ever process one type of material per controller")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(7, 9, 7, true)
.addController("Front Center")
.addCasingInfoMin("Inconel Reinforced Casing", 68, false)
@@ -90,7 +88,7 @@ public class MTEFrothFlotationCell extends GTPPMultiBlockBase<MTEFrothFlotationC
.addOutputHatch("Bottom Casing", 1)
.addEnergyHatch("Bottom Casing", 1)
.addMaintenanceHatch("Bottom Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java
index 7d42c94f3e..8c72a027e6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialFishingPond.java
@@ -50,7 +50,6 @@ import gregtech.api.util.ReflectionUtil;
import gtPlusPlus.api.recipe.GTPPRecipeMaps;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
@@ -101,7 +100,6 @@ public class MTEIndustrialFishingPond extends GTPPMultiBlockBase<MTEIndustrialFi
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Fishing Pond")
.addInfo("Can process (Tier + 1) * 2 recipes")
.addInfo("Put a numbered circuit into the input bus.")
.addInfo("Circuit " + FISH_MODE + " for Fish")
@@ -110,7 +108,6 @@ public class MTEIndustrialFishingPond extends GTPPMultiBlockBase<MTEIndustrialFi
.addInfo("Need to be filled with water.")
.addInfo("Will automatically fill water from input hatch.")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(9, 3, 9, true)
.addController("Front Center")
.addCasingInfoMin("Aquatic Casings", 64, false)
@@ -120,7 +117,7 @@ public class MTEIndustrialFishingPond extends GTPPMultiBlockBase<MTEIndustrialFi
.addEnergyHatch("Any Casing", 1)
.addMaintenanceHatch("Any Casing", 1)
.addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java
index ee62f45ef8..ac993e73e5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java
@@ -46,7 +46,6 @@ import gregtech.api.util.OverclockCalculator;
import gregtech.api.util.ParallelHelper;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -84,13 +83,11 @@ public class MTEIndustrialRockBreaker extends GTPPMultiBlockBase<MTEIndustrialRo
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Industrial Rock Breaker")
.addInfo("Speed: +200% | EU Usage: 75% | Parallel: Tier x 8")
.addInfo("Circuit goes in the GUI slot")
.addInfo("1 = cobble, 2 = stone, 3 = obsidian")
.addInfo("Needs Water and Lava in input hatch")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 4, 3, true)
.addController("Bottom Center")
.addCasingInfoMin(casingBaseName, 9, false)
@@ -101,7 +98,7 @@ public class MTEIndustrialRockBreaker extends GTPPMultiBlockBase<MTEIndustrialRo
.addEnergyHatch(anyBaseCasing, 1)
.addMaintenanceHatch(anyBaseCasing, 1)
.addMufflerHatch(anyBaseCasing, 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java
index b9e1d7858c..59ef34d5f2 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeRocketEngine.java
@@ -45,7 +45,6 @@ import gregtech.api.util.shutdown.ShutDownReasonRegistry;
import gtPlusPlus.api.recipe.GTPPRecipeMaps;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.item.chemistry.RocketFuels;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.material.MaterialMisc;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.METHatchAirIntake;
@@ -98,7 +97,6 @@ public class MTELargeRocketEngine extends GTPPMultiBlockBase<MTELargeRocketEngin
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Large Rocket Engine")
.addInfo("Generating Power from Rocket Fuels - Supports TecTech Multi-Amp Dynamos!")
.addInfo("Supply GT++ Rocket Fuels and 1000L of " + mLubricantName + " per hour")
.addInfo("Produces as much energy as you put fuel in, with optional boosting")
@@ -115,7 +113,6 @@ public class MTELargeRocketEngine extends GTPPMultiBlockBase<MTELargeRocketEngin
.addInfo("- 50% of max fuel efficiency at 69k or 207k EU/t output energy")
.addInfo("- 25% of max fuel efficiency at 98k or 294k EU/t output energy")
.addInfo("formula: x = input of energy (30000^(1/3)/ x^(1/3)) * (80000^(1/3)/ x^(1/3))")
- .addSeparator()
.beginStructureBlock(3, 3, 10, false)
.addController("Front Center")
.addCasingInfoMin(mCasingName, 64, false)
@@ -126,7 +123,7 @@ public class MTELargeRocketEngine extends GTPPMultiBlockBase<MTELargeRocketEngin
.addMaintenanceHatch("Any Block Touching Inconel Reinforced Casing", 1)
.addDynamoHatch("Top center line", 2)
.addMufflerHatch("Back Center", 3)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeSemifluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeSemifluidGenerator.java
index 9b4dc8ee47..c28973e457 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeSemifluidGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTELargeSemifluidGenerator.java
@@ -41,7 +41,6 @@ import gregtech.api.util.GTRecipe;
import gregtech.api.util.MultiblockTooltipBuilder;
import gtPlusPlus.api.recipe.GTPPRecipeMaps;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
public class MTELargeSemifluidGenerator extends GTPPMultiBlockBase<MTELargeSemifluidGenerator>
@@ -67,14 +66,12 @@ public class MTELargeSemifluidGenerator extends GTPPMultiBlockBase<MTELargeSemif
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Large Semifluid Generator")
.addInfo("Engine Intake Casings must not be obstructed in front (only air blocks)")
.addInfo("Supply Semifluid Fuels and 2000L of Lubricant per hour to run.")
.addInfo("Supply 80L of Oxygen per second to boost output (optional).")
.addInfo("Default: Produces 2048EU/t at 100% efficiency")
.addInfo("Boosted: Produces 6144EU/t at 150% efficiency")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 3, 4, false)
.addController("Front Center")
.addCasingInfoMin("Stable Titanium Machine Casing", 16, false)
@@ -84,7 +81,7 @@ public class MTELargeSemifluidGenerator extends GTPPMultiBlockBase<MTELargeSemif
.addMaintenanceHatch("Any Casing", 1)
.addMufflerHatch("Any Casing", 1)
.addDynamoHatch("Back Center", 2)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java
index 913a54eea5..7a4eefb0a3 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEMassFabricator.java
@@ -58,7 +58,6 @@ import gregtech.common.config.MachineStats;
import gtPlusPlus.api.recipe.GTPPRecipeMaps;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
@@ -105,13 +104,11 @@ public class MTEMassFabricator extends GTPPMultiBlockBase<MTEMassFabricator> imp
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Matter Fabricator")
.addInfo("Speed: +0% | EU Usage: 80%")
.addInfo("Parallel: Scrap = 64 | UU = 8 * Tier")
.addInfo("Produces UU-A, UU-M & Scrap")
.addInfo("Change mode with screwdriver")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(5, 4, 5, true)
.addController("Front Center")
.addCasingInfoMin(mCasingName3, 9, false)
@@ -124,7 +121,7 @@ public class MTEMassFabricator extends GTPPMultiBlockBase<MTEMassFabricator> imp
.addEnergyHatch("Any Casing", 1)
.addMaintenanceHatch("Any Casing", 1)
.addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTENuclearReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTENuclearReactor.java
index 31caefe8f2..5be5801097 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTENuclearReactor.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTENuclearReactor.java
@@ -49,7 +49,6 @@ import gregtech.api.util.OverclockCalculator;
import gregtech.api.util.shutdown.ShutDownReasonRegistry;
import gtPlusPlus.api.recipe.GTPPRecipeMaps;
import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.material.MaterialsElements;
import gtPlusPlus.core.material.nuclear.MaterialsNuclides;
import gtPlusPlus.core.util.math.MathUtils;
@@ -89,7 +88,7 @@ public class MTENuclearReactor extends GTPPMultiBlockBase<MTENuclearReactor> imp
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Liquid Fluoride Thorium Reactor.")
+ .addInfo("Controller Block for the Liquid Fluoride Thorium Reactor")
.addInfo("Produces energy and new elements from Radioactive Beta Decay!")
.addInfo("Input LFTB and a molten salt as fuel, and match the 4 Buffered Dynamo Hatches:")
.addInfo("LFTR Fuel 1 (4 EV Hatches), LFTR Fuel 2 (4 IV Hatches), LFTR Fuel 3 (4 LuV Hatches)")
@@ -97,7 +96,6 @@ public class MTENuclearReactor extends GTPPMultiBlockBase<MTENuclearReactor> imp
.addInfo("Outputs U233 every 10 seconds, on average, while the reactor is running")
.addInfo("Check NEI to see the other 3 outputs - they differ between fuels")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(7, 4, 7, true)
.addController("Bottom Center")
.addCasingInfoMin("Hastelloy-N Reactor Casing", 27, false)
@@ -110,7 +108,7 @@ public class MTENuclearReactor extends GTPPMultiBlockBase<MTENuclearReactor> imp
.addStructureInfo("All other hatches must be IV+ tier.")
.addStructureInfo("4x Output Hatches or 1x Output Hatch (ME), 1+ Input Hatches")
.addStructureInfo("4x Dynamo Hatches, 4x Mufflers")
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEQuantumForceTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEQuantumForceTransformer.java
index 05a65afaf2..4d1a55a7bb 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEQuantumForceTransformer.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEQuantumForceTransformer.java
@@ -244,7 +244,6 @@ public class MTEQuantumForceTransformer extends MTEExtendedPowerMultiBlockBase<M
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType("Quantum Force Transformer")
- .addInfo("Controller Block for the Quantum Force Transformer")
.addInfo("Allows Complex chemical lines to be performed instantly in one step")
.addInfo("Every recipe requires a catalyst, each catalyst adds 1 parallel and lasts forever")
.addInfo("Accepts TecTech Energy and Laser Hatches")
@@ -262,7 +261,6 @@ public class MTEQuantumForceTransformer extends MTEExtendedPowerMultiBlockBase<M
.addInfo("Pulse Manipulators: Recipe Tier Allowed (check NEI for the tier of each recipe)")
.addInfo("Shielding Cores: Focusing Tier (equal to or higher than recipe tier to allow focus)")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(15, 21, 15, true)
.addController("Bottom Center")
.addCasingInfoMin("Bulk Production Frame", 80, false)
@@ -287,12 +285,7 @@ public class MTEQuantumForceTransformer extends MTEExtendedPowerMultiBlockBase<M
+ "Right"
+ EnumChatFormatting.GRAY
+ " side of Controller")
- .toolTipFinisher(
- GTValues.AuthorBlueWeabo + EnumChatFormatting.RESET
- + EnumChatFormatting.GREEN
- + " + Steelux"
- + EnumChatFormatting.RESET
- + " - [GT++]");
+ .toolTipFinisher(GTValues.AuthorBlueWeabo, EnumChatFormatting.GREEN + "Steelux");
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.java
index 9b28387849..5f5735a777 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTERefinery.java
@@ -32,7 +32,6 @@ import gregtech.api.util.MultiblockTooltipBuilder;
import gtPlusPlus.api.recipe.GTPPRecipeMaps;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
public class MTERefinery extends GTPPMultiBlockBase<MTERefinery> implements ISurvivalConstructable {
@@ -64,7 +63,6 @@ public class MTERefinery extends GTPPMultiBlockBase<MTERefinery> implements ISur
.addInfo("Only one Energy Hatch is allowed per Processing Unit")
.addInfo("All recipe times in this multi are very long, watch out!")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 9, 3, false)
.addController("Bottom Center")
.addCasingInfoMin("Hastelloy-X Structural Block", 7, false)
@@ -79,7 +77,7 @@ public class MTERefinery extends GTPPMultiBlockBase<MTERefinery> implements ISur
.addStructureInfo("Muffler's Tier must be IV+")
.addStructureInfo("2-4x Input Hatches, 1-2x Output Hatches")
.addStructureInfo("1x Muffler, 1x Maintenance Hatch, 1x Energy Hatch")
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTESolarTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTESolarTower.java
index 31ed44d5a3..d76a8993df 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTESolarTower.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTESolarTower.java
@@ -41,7 +41,6 @@ import gregtech.api.util.GTUtility;
import gregtech.api.util.MultiblockTooltipBuilder;
import gtPlusPlus.api.recipe.GTPPRecipeMaps;
import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.material.MaterialMisc;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
@@ -99,7 +98,6 @@ public class MTESolarTower extends GTPPMultiBlockBase<MTESolarTower> implements
.addInfo("Bonus: 1 ring = +1, 2 rings = +2, 3 rings = +4, 4 rings = +8, 5 rings = +16")
.addInfo("Total number of reflectors based on how many rings are built:")
.addInfo("1 ring = 36, 2 rings = 88, 3 rings = 156, 4 rings = 240, 5 rings = 340")
- .addSeparator()
.beginVariableStructureBlock(15, 31, 28, 28, 15, 31, false)
.addController("Top Middle")
.addCasingInfoMin("Structural Solar Casing", 229, false)
@@ -109,7 +107,7 @@ public class MTESolarTower extends GTPPMultiBlockBase<MTESolarTower> implements
.addInputHatch("Any 2 dot hint(min 1)", 2)
.addOutputHatch("Any 2 dot hint(min 1)", 2)
.addMaintenanceHatch("Any 2 dot hint", 2)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEThermalBoiler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEThermalBoiler.java
index b98d6ab662..ff4dfc2658 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEThermalBoiler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEThermalBoiler.java
@@ -46,7 +46,6 @@ import gregtech.api.util.ParallelHelper;
import gtPlusPlus.api.recipe.GTPPRecipeMaps;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -280,7 +279,6 @@ public class MTEThermalBoiler extends GTPPMultiBlockBase<MTEThermalBoiler> imple
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Thermal Boiler Controller")
.addInfo("Converts Water & Heat into Steam")
.addInfo("Filters raw materials from lava")
.addInfo("Explodes if water is not supplied")
@@ -295,7 +293,7 @@ public class MTEThermalBoiler extends GTPPMultiBlockBase<MTEThermalBoiler> imple
.addOutputHatch("Any Casing", 1)
.addMaintenanceHatch("Any Casing", 1)
.addMufflerHatch("Any Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java
index 5478014c62..caecbaea92 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTETreeFarm.java
@@ -77,7 +77,6 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.recipe.GTPPRecipeMaps;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.Configuration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.util.minecraft.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GTPPMultiBlockBase;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
@@ -119,7 +118,6 @@ public class MTETreeFarm extends GTPPMultiBlockBase<MTETreeFarm> implements ISur
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller block for the Tree Growth Simulator")
.addInfo("Farms and harvests trees using EU")
.addInfo("Place a sapling in the controller slot")
.addInfo("Place a tool in an input bus")
@@ -135,7 +133,6 @@ public class MTETreeFarm extends GTPPMultiBlockBase<MTETreeFarm> implements ISur
.addInfo("Energy input tier multiplies output further")
.addInfo("Output multiplier is equal to: 2*tier^2 - 2*tier + 5")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(3, 3, 3, true)
.addController("Front center")
.addCasingInfoMin(mCasingName, 8, false)
@@ -146,7 +143,7 @@ public class MTETreeFarm extends GTPPMultiBlockBase<MTETreeFarm> implements ISur
.addEnergyHatch("Any casing", 1)
.addMaintenanceHatch("Any casing", 1)
.addMufflerHatch("Any casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/MTEAlgaePondBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/MTEAlgaePondBase.java
index 01369df1f3..8024078aa6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/MTEAlgaePondBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/algae/MTEAlgaePondBase.java
@@ -99,14 +99,12 @@ public class MTEAlgaePondBase extends GTPPMultiBlockBase<MTEAlgaePondBase> imple
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
.addInfo("Grows Algae!")
- .addInfo("Controller Block for the Algae Farm")
.addInfo("Provide compost to boost production by one tier")
.addInfo("Does not require power or maintenance")
.addInfo("All Machine Casings must be the same tier, this dictates machine speed.")
.addInfo("Requires one Input Hatch that matches the tier of the Casings")
.addInfo("Fill Input Hatch with Water to fill the inside of the multiblock.")
.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(9, 3, 9, true)
.addController("Front Center")
.addCasingInfoMin("Machine Casings", 64, true)
@@ -114,7 +112,7 @@ public class MTEAlgaePondBase extends GTPPMultiBlockBase<MTEAlgaePondBase> imple
.addInputBus("Any Casing", 1)
.addOutputBus("Any Casing", 1)
.addInputHatch("Any Casing", 1)
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java
index f678f084fc..63941f2139 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/MTEChemicalPlant.java
@@ -132,10 +132,8 @@ public class MTEChemicalPlant extends GTPPMultiBlockBase<MTEChemicalPlant> imple
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the Chemical Plant")
.addInfo("Heavy Industry, now right at your doorstep!")
.addInfo("Please read the user manual for more information on construction and usage")
- .addSeparator()
.addController("Bottom Center")
.addStructureHint("Catalyst Housing", 1)
.addInputBus("Bottom Casing", 1)
@@ -148,7 +146,7 @@ public class MTEChemicalPlant extends GTPPMultiBlockBase<MTEChemicalPlant> imple
.addSubChannelUsage("machine", "tier machine casing")
.addSubChannelUsage("coil", "heating coil blocks")
.addSubChannelUsage("pipe", "pipe casing blocks")
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/MTEMegaAlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/MTEMegaAlloyBlastSmelter.java
index 8e97ae11f3..3d35af461d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/MTEMegaAlloyBlastSmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/MTEMegaAlloyBlastSmelter.java
@@ -284,7 +284,6 @@ public class MTEMegaAlloyBlastSmelter extends MTEExtendedPowerMultiBlockBase<MTE
protected MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType("Fluid Alloy Cooker")
- .addInfo("Controller block for the Mega Alloy Blast Smelter")
.addInfo(
"Runs the same recipes as the normal ABS, except with up to " + EnumChatFormatting.BOLD
+ EnumChatFormatting.UNDERLINE
@@ -315,16 +314,10 @@ public class MTEMegaAlloyBlastSmelter extends MTEExtendedPowerMultiBlockBase<MTE
+ EnumChatFormatting.RESET
+ EnumChatFormatting.GRAY)
.beginStructureBlock(11, 20, 11, false)
- .addStructureInfo("This structure is too complex! See schematic for details.")
.addMaintenanceHatch("Around the controller", 2)
.addOtherStructurePart("Input Bus, Output Bus, Input Hatch, Output Bus, Energy Hatch", "Bottom Casing", 1)
.addMufflerHatch("1 in the center of the top layer", 3)
- .toolTipFinisher(
- EnumChatFormatting.AQUA + "MadMan310 "
- + EnumChatFormatting.GRAY
- + "via "
- + EnumChatFormatting.RED
- + "GT++");
+ .toolTipFinisher(EnumChatFormatting.AQUA + "MadMan310");
return tt;
}
@@ -342,7 +335,12 @@ public class MTEMegaAlloyBlastSmelter extends MTEExtendedPowerMultiBlockBase<MTE
.getEUCapacity();
}
- return new String[] { "------------ Critical Information ------------",
+ return new String[] {
+ EnumChatFormatting.STRIKETHROUGH + "------------"
+ + EnumChatFormatting.RESET
+ + " Critical Information "
+ + EnumChatFormatting.STRIKETHROUGH
+ + "------------",
StatCollector.translateToLocal("GT5U.multiblock.Progress") + ": "
+ EnumChatFormatting.GREEN
+ GTUtility.formatNumbers(mProgresstime)
@@ -383,7 +381,7 @@ public class MTEMegaAlloyBlastSmelter extends MTEExtendedPowerMultiBlockBase<MTE
"Parallels: " + EnumChatFormatting.BLUE + paras + EnumChatFormatting.RESET,
"Speed Bonus: " + EnumChatFormatting.BLUE + moreSpeed + "%" + EnumChatFormatting.RESET,
"Energy Discount: " + EnumChatFormatting.BLUE + lessEnergy + "%" + EnumChatFormatting.RESET,
- "-----------------------------------------" };
+ EnumChatFormatting.STRIKETHROUGH + "-----------------------------------------" };
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java
index fa9d60fb11..0a305bcf1f 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java
@@ -52,7 +52,6 @@ import gregtech.api.util.shutdown.ShutDownReasonRegistry;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.minecraft.BlockPos;
import gtPlusPlus.core.block.ModBlocks;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.MTEHatchTurbine;
@@ -149,7 +148,6 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT
protected final MultiblockTooltipBuilder createTooltip() {
MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
tt.addMachineType(getMachineType())
- .addInfo("Controller Block for the XL " + getTurbineType() + " Turbine")
.addInfo("Runs as fast as 16 Large Turbines of the same type, takes the space of 12")
.addInfo("Right-click with screwdriver to enable loose fit")
.addInfo("Optimal flow will increase or decrease depending on fitting")
@@ -162,7 +160,6 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT
.addInfo("Efficiency = ((FuelValue / 200,000)^2) / (EU per Turbine)");
}
tt.addPollutionAmount(getPollutionPerSecond(null))
- .addSeparator()
.beginStructureBlock(7, 9, 7, false)
.addController("Top Middle")
.addCasingInfoMin(getCasingName(), 360, false)
@@ -178,7 +175,7 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT
if (requiresMufflers()) {
tt.addMufflerHatch("Any 7 dot hint (x4)", 7);
}
- tt.toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ tt.toolTipFinisher();
return tt;
}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
index 241b970ae8..0cbf255fa5 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java
@@ -70,7 +70,6 @@ import gregtech.api.util.MultiblockTooltipBuilder;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.config.ASMConfiguration;
-import gtPlusPlus.core.lib.GTPPCore;
import gtPlusPlus.core.util.MovingAverageLong;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.math.MathUtils;
@@ -128,14 +127,13 @@ public class GregtechMetaTileEntity_PowerSubStationController
.addInfo("Hatches can be placed nearly anywhere")
.addInfo("HV Energy/Dynamo Hatches are the lowest tier you can use")
.addInfo("Supports voltages >= UHV using MAX tier components.")
- .addSeparator()
.addController("Bottom Center")
.addCasingInfoMin("Sub-Station External Casings", 10, false)
.addDynamoHatch("Any Casing", 1)
.addEnergyHatch("Any Casing", 1)
.addSubChannelUsage("capacitor", "Vanadium Capacitor Cell Tier")
.addSubChannelUsage("height", "Height of structure")
- .toolTipFinisher(GTPPCore.GT_Tooltip_Builder.get());
+ .toolTipFinisher();
return tt;
}
@@ -704,7 +702,7 @@ public class GregtechMetaTileEntity_PowerSubStationController
+ errorCode
+ EnumChatFormatting.RESET
+ "]",
- "----------------------", "Stats for Nerds",
+ EnumChatFormatting.STRIKETHROUGH + "----------------------", "Stats for Nerds",
"Average Input: " + EnumChatFormatting.BLUE
+ GTUtility.formatNumbers(this.getAverageEuAdded())
+ EnumChatFormatting.RESET