From 8792eb5d9b70cbb1dc0b444cfd8524dfb4a0aa0c Mon Sep 17 00:00:00 2001 From: miozune Date: Sat, 4 Feb 2023 03:19:50 +0900 Subject: Fix owner tooltip not being localized (#528) --- .../automation/GT_MetaTileEntity_ElectricAutoWorkbench.java | 2 +- .../automation/GT_MetaTileEntity_ElectricInventoryManager.java | 2 +- .../tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java | 2 +- .../tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java | 2 +- .../common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java | 2 +- .../tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java | 2 +- .../common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java | 2 +- .../tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java | 2 +- .../generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java | 2 +- .../generators/GregtechMetaTileEntityGeothermalGenerator.java | 2 +- .../tileentities/generators/GregtechMetaTileEntitySolarGenerator.java | 2 +- .../common/tileentities/generators/GregtechMetaTileEntity_RTG.java | 2 +- .../generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java | 2 +- .../tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java | 2 +- .../generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java | 2 +- .../generators/creative/GregtechMetaCreativeEnergyBuffer.java | 2 +- .../tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java | 2 +- .../common/tileentities/machines/basic/GregtechMetaCondensor.java | 2 +- .../tileentities/machines/basic/GregtechMetaGarbageCollector.java | 2 +- .../tileentities/machines/basic/GregtechMetaPollutionCreator.java | 2 +- .../tileentities/machines/basic/GregtechMetaPollutionDetector.java | 3 ++- .../machines/basic/GregtechMetaTileEntityChunkLoader.java | 2 +- .../machines/basic/GregtechMetaTileEntity_BasicWasher.java | 2 +- .../machines/basic/GregtechMetaTileEntity_ChemicalReactor.java | 2 +- .../machines/basic/GregtechMetaTileEntity_PocketFusion.java | 2 +- .../machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java | 2 +- .../machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java | 2 +- .../tileentities/machines/basic/GregtechMetaWirelessCharger.java | 2 +- .../tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java | 2 +- .../processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java | 2 +- .../multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java | 2 +- .../multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java | 2 +- .../multi/processing/GregtechMetaTileEntity_IndustrialChisel.java | 2 +- .../multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java | 2 +- .../processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java | 2 +- .../multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java | 2 +- .../processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java | 2 +- .../multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java | 2 +- .../processing/GregtechMetaTileEntity_IndustrialFluidHeater.java | 2 +- .../processing/GregtechMetaTileEntity_IndustrialForgeHammer.java | 2 +- .../multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java | 2 +- .../multi/processing/GregtechMetaTileEntity_IndustrialMixer.java | 2 +- .../GregtechMetaTileEntity_IndustrialMolecularTransformer.java | 3 ++- .../processing/GregtechMetaTileEntity_IndustrialMultiMachine.java | 2 +- .../multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java | 2 +- .../multi/processing/GregtechMetaTileEntity_IndustrialSifter.java | 2 +- .../multi/processing/GregtechMetaTileEntity_IndustrialSinter.java | 2 +- .../GregtechMetaTileEntity_IndustrialThermalCentrifuge.java | 2 +- .../processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java | 2 +- .../multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java | 2 +- .../multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java | 2 +- .../machines/multi/processing/GregtechMetaTileEntity_IsaMill.java | 2 +- .../machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java | 2 +- .../advanced/GregtechMetaTileEntity_Adv_DistillationTower.java | 2 +- .../multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java | 2 +- .../processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java | 2 +- .../processing/advanced/GregtechMetaTileEntity_Adv_HeatExchanger.java | 3 ++- .../processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java | 2 +- .../processing/steam/GregtechMetaTileEntity_SteamCompressor.java | 2 +- .../multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java | 2 +- .../tileentities/machines/multi/production/GT4Entity_AutoCrafter.java | 2 +- .../machines/multi/production/GT4Entity_ThermalBoiler.java | 2 +- .../machines/multi/production/GregtechMTE_ElementalDuplicator.java | 2 +- .../machines/multi/production/GregtechMTE_FrothFlotationCell.java | 2 +- .../machines/multi/production/GregtechMTE_NuclearReactor.java | 2 +- .../multi/production/GregtechMetaTileEntityGeneratorArray.java | 2 +- .../machines/multi/production/GregtechMetaTileEntityTreeFarm.java | 2 +- .../multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java | 2 +- .../machines/multi/production/GregtechMetaTileEntity_Cyclotron.java | 2 +- .../production/GregtechMetaTileEntity_IndustrialFishingPond.java | 2 +- .../production/GregtechMetaTileEntity_IndustrialRockBreaker.java | 2 +- .../multi/production/GregtechMetaTileEntity_LargeRocketEngine.java | 2 +- .../production/GregtechMetaTileEntity_LargeSemifluidGenerator.java | 2 +- .../multi/production/GregtechMetaTileEntity_MassFabricator.java | 2 +- .../machines/multi/production/GregtechMetaTileEntity_Refinery.java | 2 +- .../machines/multi/production/GregtechMetaTileEntity_SolarTower.java | 2 +- .../machines/multi/production/algae/GregtechMTE_AlgaePondBase.java | 2 +- .../multi/production/chemplant/GregtechMTE_ChemicalPlant.java | 2 +- .../production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java | 2 +- .../storage/GregtechMetaTileEntity_PowerSubStationController.java | 2 +- .../gregtech/common/tileentities/misc/GT_TileEntity_ComputerCube.java | 2 +- .../xmod/gregtech/common/tileentities/misc/TileEntitySolarHeater.java | 2 +- .../common/tileentities/redstone/GT_MetaTileEntity_RedstoneBase.java | 2 +- .../tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java | 2 +- .../tileentities/storage/GT_MetaTileEntity_ConnectableCrate.java | 2 +- .../common/tileentities/storage/GT_MetaTileEntity_TieredChest.java | 2 +- .../common/tileentities/storage/GT_MetaTileEntity_TieredTank.java | 4 ++-- .../common/tileentities/storage/GregtechMetaEnergyBuffer.java | 2 +- .../gregtech/common/tileentities/storage/GregtechMetaSafeBlock.java | 2 +- .../storage/creative/GT_MetaTileEntity_InfiniteItemHolder.java | 2 +- 90 files changed, 94 insertions(+), 91 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java index f02bf0193e..0fa6340fd1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java @@ -736,7 +736,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B public String[] getDescription() { return new String[] { "Automatic Crafting Table Mk III", // this.mDescription, - CORE.GT_Tooltip }; + CORE.GT_Tooltip.get() }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java index b7ff49716b..d5336b8e3d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java @@ -429,7 +429,7 @@ public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntit @Override public String[] getDescription() { - return new String[] { "It's simpler than you think. I promise.", this.mDescription, CORE.GT_Tooltip }; + return new String[] { "It's simpler than you think. I promise.", this.mDescription, CORE.GT_Tooltip.get() }; } /* diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java index f3c4bf0f18..7534c0035c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java @@ -625,7 +625,7 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi "Connect with pipes to insert items", "Consumes " + TESSERACT_ENERGY_COST + "EU/t for same dimension transfers", "Consumes " + TESSERACT_ENERGY_COST_DIMENSIONAL + "EU/t for cross dimensional transfers", - CORE.GT_Tooltip }; + CORE.GT_Tooltip.get() }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java index cfcdc5f6f9..b7742d2d4e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java @@ -493,7 +493,7 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic "Connect with pipes to extract items or fluids", "Outputs from the back face", "Consumes " + TESSERACT_ENERGY_COST + "EU/t for same dimension transfers", "Consumes " + TESSERACT_ENERGY_COST_DIMENSIONAL + "EU/t for cross dimensional transfers", - CORE.GT_Tooltip }; + CORE.GT_Tooltip.get() }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java index ed71bcabe7..43425ec88d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java @@ -51,7 +51,7 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { return new String[] { this.mDescription, "Produces " + getPollution() + " pollution/sec", "Consumes fuel only when temperature is less than 100C", "Fuel with burn time greater than 500 is more efficient.", "Doesn't explode if there's no water", - CORE.GT_Tooltip }; + CORE.GT_Tooltip.get() }; } public ITexture getOverlayIcon() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java index 00ce747e4f..1908b46d4d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Solar.java @@ -29,7 +29,7 @@ public class GT_MetaTileEntity_Boiler_Solar extends GT_MetaTileEntity_Boiler { @Override public String[] getDescription() { return new String[] { this.mDescription, "Produces " + (this.getPollution() * 20) + " pollution/sec", - CORE.GT_Tooltip }; + CORE.GT_Tooltip.get() }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java index 9b0548d95a..cbee852fea 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_RfConvertor.java @@ -52,7 +52,7 @@ public class GT_MetaTileEntity_RfConvertor extends GregtechMetaEnergyBuffer impl public String[] getDescription() { return new String[] { "Use Screwdriver to change voltage", "Hold Shift while using Screwdriver to change amperage", - EnumChatFormatting.DARK_AQUA + "Variable Output Voltage", CORE.GT_Tooltip }; + EnumChatFormatting.DARK_AQUA + "Variable Output Voltage", CORE.GT_Tooltip.get() }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java index 502cdd2d7e..9bbd0bf2a0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_SemiFluidGenerator.java @@ -71,7 +71,7 @@ public class GT_MetaTileEntity_SemiFluidGenerator extends GT_MetaTileEntity_Basi @Override public String[] getDescription() { return new String[] { this.mDescription, "Produces " + (this.getPollution()) + " pollution/sec", - "Fuel Efficiency: " + this.getEfficiency() + "%", CORE.GT_Tooltip }; + "Fuel Efficiency: " + this.getEfficiency() + "%", CORE.GT_Tooltip.get() }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java index cee2bbff15..d183e62db6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityDoubleFuelGeneratorBase.java @@ -42,7 +42,7 @@ public class GregtechMetaTileEntityDoubleFuelGeneratorBase extends GregtechRocke @Override public String[] getDescription() { return new String[] { this.mDescription, "Generates power at " + this.getEfficiency() + "% Efficiency per tick", - "Output Voltage: " + this.getOutputTier() + " EU/t", CORE.GT_Tooltip }; + "Output Voltage: " + this.getOutputTier() + " EU/t", CORE.GT_Tooltip.get() }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java index e116379aef..669c7787d4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntityGeothermalGenerator.java @@ -39,7 +39,7 @@ public class GregtechMetaTileEntityGeothermalGenerator extends GT_MetaTileEntity public String[] getDescription() { String aPollution = "Causes " + this.getPollution() + " Pollution per second"; return new String[] { this.mDescription, "Generates power at " + this.getEfficiency() + "% Efficiency per tick", - aPollution, CORE.GT_Tooltip }; + aPollution, CORE.GT_Tooltip.get() }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java index 7471a0edcc..c0d0e9e2a2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntitySolarGenerator.java @@ -37,7 +37,7 @@ public class GregtechMetaTileEntitySolarGenerator extends GregtechMetaSolarGener @Override public String[] getDescription() { return new String[] { this.mDescription, "Generates power at " + this.getEfficiency() + "% Efficiency per tick", - "Output Voltage: " + this.getOutputTier() + " EU/t", CORE.GT_Tooltip }; + "Output Voltage: " + this.getOutputTier() + " EU/t", CORE.GT_Tooltip.get() }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java index f32f9a8a76..bbae3b1549 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java @@ -175,7 +175,7 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator return new String[] { this.mDescription, "Fuel is measured in minecraft days (Check with Scanner)", "RTG changes output voltage depending on fuel", "Generates power at " + this.getEfficiency() + "% Efficiency per tick", - "Output Voltage: " + this.getOutputTier() + " EU/t", CORE.GT_Tooltip }; + "Output Voltage: " + this.getOutputTier() + " EU/t", CORE.GT_Tooltip.get() }; } public GregtechMetaTileEntity_RTG(int aID, String aName, String aNameRegional, int aTier) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java index 70bf88ec77..67e00342dd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_CombustionGenerator.java @@ -24,7 +24,7 @@ public class GT_MetaTileEntity_ULV_CombustionGenerator extends GT_MetaTileEntity @Override public String[] getDescription() { return new String[] { this.mDescription, "Produces " + (this.getPollution() * 20) + " pollution/sec", - "Fuel Efficiency: " + this.getEfficiency() + "%", CORE.GT_Tooltip }; + "Fuel Efficiency: " + this.getEfficiency() + "%", CORE.GT_Tooltip.get() }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java index c4d3340ac0..e085e4f1ba 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java @@ -26,7 +26,7 @@ public class GT_MetaTileEntity_ULV_GasTurbine extends GT_MetaTileEntity_GasTurbi @Override public String[] getDescription() { return new String[] { this.mDescription, "Produces " + (this.getPollution() * 20) + " pollution/sec", - "Fuel Efficiency: " + this.getEfficiency() + "%", CORE.GT_Tooltip }; + "Fuel Efficiency: " + this.getEfficiency() + "%", CORE.GT_Tooltip.get() }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java index a07e69e00c..7039fb288f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_SteamTurbine.java @@ -26,7 +26,7 @@ public class GT_MetaTileEntity_ULV_SteamTurbine extends GT_MetaTileEntity_SteamT @Override public String[] getDescription() { return new String[] { this.mDescription, "Produces " + (this.getPollution() * 20) + " pollution/sec", - "Fuel Efficiency: " + this.getEfficiency() + "%", CORE.GT_Tooltip }; + "Fuel Efficiency: " + this.getEfficiency() + "%", CORE.GT_Tooltip.get() }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java index 42fda63282..2419b9a720 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java @@ -51,7 +51,7 @@ public class GregtechMetaCreativeEnergyBuffer extends GregtechMetaEnergyBuffer { public String[] getDescription() { return new String[] { this.mDescription, "Use Screwdriver to change voltage", "Hold Shift while using Screwdriver to change amperage", EnumChatFormatting.GREEN + "CREATIVE MACHINE", - CORE.GT_Tooltip }; + CORE.GT_Tooltip.get() }; } /* diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java index c9d575cab1..76e83fca65 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java @@ -504,7 +504,7 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank "Can harvest 2 blocks above and below", "Radius: " + aSide + " each side (" + aRadius + "x3x" + aRadius + ")", "Has " + (this.mTier * 5) + "% chance for extra drops", "Holds " + this.getCapacity() + "L of Water", - CORE.GT_Tooltip }; + CORE.GT_Tooltip.get() }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java index c69ae51436..8ec6408ba3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java @@ -39,7 +39,7 @@ public class GregtechMetaCondensor extends GregtechMetaBoilerBase implements IAd @Override public String[] getDescription() { return new String[] { this.mDescription, "IC2 Steam + Water = Normal Steam.", - "Requires no power to run, although it's not very fast.", CORE.GT_Tooltip }; + "Requires no power to run, although it's not very fast.", CORE.GT_Tooltip.get() }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java index ec20c9c088..9818e0fc52 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaGarbageCollector.java @@ -35,7 +35,7 @@ public class GregtechMetaGarbageCollector extends GregtechMetaTileEntity { public String[] getDescription() { return new String[] { this.mDescription, "Can request the JVM to perform garbage collection", "Configurable to run once every 5 minute interval (5-180)", "This Machine has no recipe", - "Admin Tool, Limit one per world if possible", CORE.GT_Tooltip }; + "Admin Tool, Limit one per world if possible", CORE.GT_Tooltip.get() }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java index cde8d8ca4b..eaa0878cd8 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java @@ -38,7 +38,7 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity { @Override public String[] getDescription() { - return new String[] { this.mDescription, "A useful debug machine to create pollution.", CORE.GT_Tooltip }; + return new String[] { this.mDescription, "A useful debug machine to create pollution.", CORE.GT_Tooltip.get() }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java index 32e45dde15..bcb3abbc57 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java @@ -41,7 +41,8 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { @Override public String[] getDescription() { return new String[] { this.mDescription, "Right click to check pollution levels.", - "Configure with screwdriver to set redstone output amount.", "Does not use power.", CORE.GT_Tooltip }; + "Configure with screwdriver to set redstone output amount.", "Does not use power.", + CORE.GT_Tooltip.get() }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java index 92eebb96e7..b85ab6e9c5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java @@ -88,7 +88,7 @@ public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_BasicMa @Override public String[] getDescription() { return new String[] { "Loads " + getMaxChunksToLoadForTier(this.mTier) + " chunks when powered", "Consumes 2A", - "Behaves Identically to a Railcraft World Anchor", CORE.GT_Tooltip }; + "Behaves Identically to a Railcraft World Anchor", CORE.GT_Tooltip.get() }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java index e25db682b3..f7a326aead 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_BasicWasher.java @@ -50,7 +50,7 @@ public class GregtechMetaTileEntity_BasicWasher extends GT_MetaTileEntity_BasicM @Override public String[] getDescription() { - return new String[] { this.mDescription, "Grants no byproducts, but it is fast.", CORE.GT_Tooltip }; + return new String[] { this.mDescription, "Grants no byproducts, but it is fast.", CORE.GT_Tooltip.get() }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java index 26de52f7f4..c9f188f44f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java @@ -66,7 +66,7 @@ public class GregtechMetaTileEntity_ChemicalReactor extends GT_MetaTileEntity_Ba @Override public String[] getDescription() { - return new String[] { this.mDescription, "Because why not?", CORE.GT_Tooltip }; + return new String[] { this.mDescription, "Because why not?", CORE.GT_Tooltip.get() }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java index 51f24f6c5e..03618b587b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_PocketFusion.java @@ -53,7 +53,7 @@ public class GregtechMetaTileEntity_PocketFusion extends GT_MetaTileEntity_Delux public String[] getDescription() { return new String[] { this.mDescription, "Not Very Fast, but not very big either.", "Each side pair in/out puts to different slots.", "Top & Bottom Sides are Outputs.", - "Front & Back are Input Plasma 1.", "Sides are Input Plasma 2.", CORE.GT_Tooltip }; + "Front & Back are Input Plasma 1.", "Sides are Input Plasma 2.", CORE.GT_Tooltip.get() }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java index 96f780c36d..a69848059e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorColdTrap.java @@ -44,7 +44,7 @@ public class GregtechMetaTileEntity_ReactorColdTrap extends GT_MetaTileEntity_Ba @Override public String[] getDescription() { - return new String[] { this.mDescription, "Does not require ice cubes", CORE.GT_Tooltip }; + return new String[] { this.mDescription, "Does not require ice cubes", CORE.GT_Tooltip.get() }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java index 034cebc41c..042c670a6f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ReactorProcessingUnit.java @@ -44,7 +44,7 @@ public class GregtechMetaTileEntity_ReactorProcessingUnit extends GT_MetaTileEnt @Override public String[] getDescription() { - return new String[] { this.mDescription, CORE.GT_Tooltip }; + return new String[] { this.mDescription, CORE.GT_Tooltip.get() }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java index 5d4f755408..2bafaa1b03 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java @@ -50,7 +50,7 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity { "Local: Can supply several Amps to each player within " + this.mTier * 20 + "m.", "Mixed: Provides both 2A of long range and 1A per player locally.", "Mixed mode is more conservative of power and as a result only", - "Gets half the distances each singular mode gets.", CORE.GT_Tooltip }; + "Gets half the distances each singular mode gets.", CORE.GT_Tooltip.get() }; } public int getTier() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java index a5dd84c92d..f81ed30d39 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java @@ -98,7 +98,7 @@ public class GregtechMTE_TeslaTower extends GregtechMeta_MultiBlockBase