diff options
| author | Glease <4586901+Glease@users.noreply.github.com> | 2022-09-26 17:07:53 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-26 11:07:53 +0200 |
| commit | 20db9be281370e0342cde0e0f73bf96fa0eb1d26 (patch) | |
| tree | b6ed152813e044de9ba5c80a44005372f5309fc9 /src/main | |
| parent | 0de6a0a582d5df4ecc65f96f77d2a8a03760560b (diff) | |
| download | GT5-Unofficial-20db9be281370e0342cde0e0f73bf96fa0eb1d26.tar.gz GT5-Unofficial-20db9be281370e0342cde0e0f73bf96fa0eb1d26.tar.bz2 GT5-Unofficial-20db9be281370e0342cde0e0f73bf96fa0eb1d26.zip | |
Add chemical formula to ore tooltip (#1413)
* Add chemical formula to ore tooltip
* Spotless apply for branch feature/ore-tooltip for #1413 (#1414)
Co-authored-by: Glease <4586901+Glease@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java | 7 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_Item_Ores.java | 10 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java index 93aa9992ea..ae41933c1c 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java @@ -39,6 +39,7 @@ import net.minecraft.world.World; public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements ITileEntityProvider { private static final String DOT_NAME = ".name"; + private static final String DOT_TOOLTIP = ".tooltip"; public static ThreadLocal<GT_TileEntity_Ores> mTemporaryTileEntity = new ThreadLocal<>(); public static boolean FUCKING_LOCK = false; public static boolean tHideOres; @@ -66,11 +67,17 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements ? getLocalizedNameFormat(GregTech_API.sGeneratedMaterials[i]) : getLocalizedName(GregTech_API.sGeneratedMaterials[i])); GT_LanguageManager.addStringLocalization( + getUnlocalizedName() + "." + (i + (j * 1000)) + DOT_TOOLTIP, + GregTech_API.sGeneratedMaterials[i].getToolTip()); + GT_LanguageManager.addStringLocalization( getUnlocalizedName() + "." + ((i + 16000) + (j * 1000)) + DOT_NAME, "Small " + (GT_LanguageManager.i18nPlaceholder ? getLocalizedNameFormat(GregTech_API.sGeneratedMaterials[i]) : getLocalizedName(GregTech_API.sGeneratedMaterials[i]))); + GT_LanguageManager.addStringLocalization( + getUnlocalizedName() + "." + ((i + 16000) + (j * 1000)) + DOT_TOOLTIP, + GregTech_API.sGeneratedMaterials[i].getToolTip()); if ((GregTech_API.sGeneratedMaterials[i].mTypes & 0x8) != 0 && !aBlockedOres.contains(GregTech_API.sGeneratedMaterials[i])) { GT_OreDictUnificator.registerOre( diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Ores.java b/src/main/java/gregtech/common/blocks/GT_Item_Ores.java index bcf088a621..117e6ae1c6 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Ores.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Ores.java @@ -2,11 +2,14 @@ package gregtech.common.blocks; import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import org.apache.commons.lang3.StringUtils; public class GT_Item_Ores extends ItemBlock { public GT_Item_Ores(Block block) { @@ -83,4 +86,11 @@ public class GT_Item_Ores extends ItemBlock { } return true; } + + @Override + public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) { + String formula = StatCollector.translateToLocal( + field_150939_a.getUnlocalizedName() + '.' + getDamage(aStack) + ".tooltip"); + if (!StringUtils.isBlank(formula)) aList.add(formula); + } } |