diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BlockBloodRune.java b/src/main/java/wayoftime/bloodmagic/common/block/BlockBloodRune.java index 470ba08a..fc5f537b 100644 --- a/src/main/java/wayoftime/bloodmagic/common/block/BlockBloodRune.java +++ b/src/main/java/wayoftime/bloodmagic/common/block/BlockBloodRune.java @@ -11,6 +11,7 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.ItemStack; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; @@ -39,7 +40,7 @@ public class BlockBloodRune extends Block implements IBloodRune public void addInformation(ItemStack stack, @Nullable IBlockReader world, List tooltip, ITooltipFlag flag) { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.decoration.safe")); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.decoration.safe").mergeStyle(TextFormatting.GRAY)); super.addInformation(stack, world, tooltip, flag); } } diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemActivationCrystal.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemActivationCrystal.java index 430f5823..8d3244d0 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemActivationCrystal.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemActivationCrystal.java @@ -8,6 +8,7 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -29,14 +30,14 @@ public class ItemActivationCrystal extends Item implements IBindable @OnlyIn(Dist.CLIENT) public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.activationcrystal." + type.name().toLowerCase())); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.activationcrystal." + type.name().toLowerCase()).mergeStyle(TextFormatting.GRAY)); if (!stack.hasTag()) return; Binding binding = getBinding(stack); if (binding != null) - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentOwner", binding.getOwnerName())); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentOwner", binding.getOwnerName()).mergeStyle(TextFormatting.GRAY)); super.addInformation(stack, world, tooltip, flag); } diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemArcaneAshes.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemArcaneAshes.java index dd4cde28..bb7f4844 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemArcaneAshes.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemArcaneAshes.java @@ -13,6 +13,7 @@ import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -32,7 +33,7 @@ public class ItemArcaneAshes extends Item @OnlyIn(Dist.CLIENT) public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.arcaneAshes")); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.arcaneAshes").mergeStyle(TextFormatting.GRAY)); } @Override diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemBase.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemBase.java index 35b45aa2..f2b157c9 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemBase.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemBase.java @@ -6,6 +6,7 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -42,7 +43,7 @@ public class ItemBase extends Item public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { if (!desc.isEmpty()) - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic." + desc)); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic." + desc).mergeStyle(TextFormatting.GRAY)); } } \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemBindableBase.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemBindableBase.java index 9dd810c5..5dcb6d1d 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemBindableBase.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemBindableBase.java @@ -6,6 +6,7 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -29,6 +30,6 @@ public class ItemBindableBase extends Item implements IBindable Binding binding = getBinding(stack); if (binding != null) - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentOwner", binding.getOwnerName())); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentOwner", binding.getOwnerName()).mergeStyle(TextFormatting.GRAY)); } } \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemBloodOrb.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemBloodOrb.java index 08189f4a..198e16c5 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemBloodOrb.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemBloodOrb.java @@ -13,6 +13,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvents; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -80,11 +81,11 @@ public class ItemBloodOrb extends ItemBindableBase implements IBloodOrb, IForgeI @OnlyIn(Dist.CLIENT) public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.orb.desc")); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.orb.desc").mergeStyle(TextFormatting.GRAY)); BloodOrb orb = getOrb(stack); if (flag.isAdvanced() && orb != null) - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.orb.owner", stack.getItem().getRegistryName())); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.orb.owner", stack.getItem().getRegistryName()).mergeStyle(TextFormatting.GRAY)); super.addInformation(stack, world, tooltip, flag); } diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemBloodProvider.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemBloodProvider.java index 75641069..8f466ec1 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemBloodProvider.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemBloodProvider.java @@ -75,7 +75,7 @@ public class ItemBloodProvider extends Item @OnlyIn(Dist.CLIENT) public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.add(new TranslationTextComponent(tooltipBase + "desc").mergeStyle(TextFormatting.ITALIC)); + tooltip.add(new TranslationTextComponent(tooltipBase + "desc").mergeStyle(TextFormatting.ITALIC).mergeStyle(TextFormatting.GRAY)); super.addInformation(stack, world, tooltip, flag); } diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemDemonWillGauge.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemDemonWillGauge.java index 704c8ada..c44fe1aa 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemDemonWillGauge.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemDemonWillGauge.java @@ -8,6 +8,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -27,7 +28,7 @@ public class ItemDemonWillGauge extends Item implements IDemonWillViewer @OnlyIn(Dist.CLIENT) public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.willGauge")); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.willGauge").mergeStyle(TextFormatting.GRAY)); } @Override diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemExperienceBook.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemExperienceBook.java index 9fc4f06d..3c5bb6ba 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemExperienceBook.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemExperienceBook.java @@ -12,6 +12,7 @@ import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; import net.minecraft.util.SoundEvents; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -38,15 +39,15 @@ public class ItemExperienceBook extends Item @OnlyIn(Dist.CLIENT) public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.experienceTome")); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.experienceTome").mergeStyle(TextFormatting.GRAY)); if (!stack.hasTag()) return; double storedExp = getStoredExperience(stack); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.experienceTome.exp", (int) storedExp)); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.experienceTome.expLevel", (int) getLevelForExperience(storedExp))); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.experienceTome.exp", (int) storedExp).mergeStyle(TextFormatting.GRAY)); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.experienceTome.expLevel", getLevelForExperience(storedExp)).mergeStyle(TextFormatting.GRAY)); } @Override diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemInscriptionTool.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemInscriptionTool.java index 2b2c7f74..6d31a984 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemInscriptionTool.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemInscriptionTool.java @@ -12,6 +12,7 @@ import net.minecraft.item.ItemUseContext; import net.minecraft.util.ActionResultType; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -61,6 +62,6 @@ public class ItemInscriptionTool extends Item @OnlyIn(Dist.CLIENT) public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.add(new TranslationTextComponent(TextHelper.localizeEffect("tooltip.bloodmagic.inscriber.desc"))); + tooltip.add(new TranslationTextComponent(TextHelper.localizeEffect("tooltip.bloodmagic.inscriber.desc")).mergeStyle(TextFormatting.GRAY)); } } diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemRitualReader.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemRitualReader.java index bae5f453..04bfbae6 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemRitualReader.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemRitualReader.java @@ -21,6 +21,7 @@ import net.minecraft.util.math.RayTraceContext.FluidMode; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -58,7 +59,7 @@ public class ItemRitualReader extends Item return; EnumRitualReaderState state = this.getState(stack); - tooltip.add(new TranslationTextComponent(tooltipBase + "currentState", TextHelper.localizeEffect(tooltipBase + state.toString().toLowerCase()))); + tooltip.add(new TranslationTextComponent(tooltipBase + "currentState", TextHelper.localizeEffect(tooltipBase + state.toString().toLowerCase())).mergeStyle(TextFormatting.GRAY)); tooltip.add(new StringTextComponent("")); @@ -66,10 +67,10 @@ public class ItemRitualReader extends Item if (sneaking) { - tooltip.add(new TranslationTextComponent(tooltipBase + "desc." + state.toString().toLowerCase())); + tooltip.add(new TranslationTextComponent(tooltipBase + "desc." + state.toString().toLowerCase()).mergeStyle(TextFormatting.GRAY)); } else { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.extraInfo")); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.extraInfo").mergeStyle(TextFormatting.GRAY)); } super.addInformation(stack, world, tooltip, flag); diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemSacrificialDagger.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemSacrificialDagger.java index e305c0fd..cc312150 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemSacrificialDagger.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemSacrificialDagger.java @@ -15,6 +15,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvents; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -43,7 +44,7 @@ public class ItemSacrificialDagger extends Item public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { // tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.sacrificialDagger.desc")))); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sacrificialdagger.desc")); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sacrificialdagger.desc").mergeStyle(TextFormatting.GRAY)); // if (stack.getItemDamage() == 1) // list.add(TextHelper.localizeEffect("tooltip.bloodmagic.sacrificialDagger.creative")); diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemSentientScythe.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemSentientScythe.java index e4775974..b9d6c59c 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemSentientScythe.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemSentientScythe.java @@ -42,6 +42,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.Difficulty; import net.minecraft.world.World; @@ -615,8 +616,8 @@ public class ItemSentientScythe extends HoeItem implements IDemonWillWeapon, IMu if (!stack.hasTag()) return; - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sentientAxe.desc")); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentType." + getCurrentType(stack).name().toLowerCase())); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sentientAxe.desc").mergeStyle(TextFormatting.GRAY)); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentType." + getCurrentType(stack).name().toLowerCase()).mergeStyle(TextFormatting.GRAY)); } @Override diff --git a/src/main/java/wayoftime/bloodmagic/common/item/ItemThrowingDagger.java b/src/main/java/wayoftime/bloodmagic/common/item/ItemThrowingDagger.java index 9319f1d2..38370400 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/ItemThrowingDagger.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/ItemThrowingDagger.java @@ -110,7 +110,7 @@ public class ItemThrowingDagger extends Item @OnlyIn(Dist.CLIENT) public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.throwing_dagger.desc").mergeStyle(TextFormatting.ITALIC)); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.throwing_dagger.desc").mergeStyle(TextFormatting.ITALIC).mergeStyle(TextFormatting.GRAY)); super.addInformation(stack, world, tooltip, flag); } diff --git a/src/main/java/wayoftime/bloodmagic/common/item/arc/ItemARCToolBase.java b/src/main/java/wayoftime/bloodmagic/common/item/arc/ItemARCToolBase.java index 96aeec6a..7867c6b5 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/arc/ItemARCToolBase.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/arc/ItemARCToolBase.java @@ -6,6 +6,7 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -34,10 +35,10 @@ public class ItemARCToolBase extends Item implements IARCTool @OnlyIn(Dist.CLIENT) public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.arctool.uses", stack.getMaxDamage() - stack.getDamage())); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.arctool.uses", stack.getMaxDamage() - stack.getDamage()).mergeStyle(TextFormatting.GRAY)); if (getAdditionalOutputChanceMultiplier(stack) != 1) - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.arctool.additionaldrops", ChatUtil.DECIMAL_FORMAT.format(getAdditionalOutputChanceMultiplier(stack)))); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.arctool.additionaldrops", ChatUtil.DECIMAL_FORMAT.format(getAdditionalOutputChanceMultiplier(stack))).mergeStyle(TextFormatting.GRAY)); super.addInformation(stack, world, tooltip, flag); } diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilBase.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilBase.java index f7d8567c..b33d4c1c 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilBase.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilBase.java @@ -37,7 +37,7 @@ public class ItemSigilBase extends ItemSigil @OnlyIn(Dist.CLIENT) public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.add(new TranslationTextComponent(tooltipBase + "desc").mergeStyle(TextFormatting.ITALIC)); + tooltip.add(new TranslationTextComponent(tooltipBase + "desc").mergeStyle(TextFormatting.ITALIC).mergeStyle(TextFormatting.GRAY)); // if (TextHelper.canTranslate(tooltipBase + "desc")) // tooltip.addAll(Arrays.asList(WordUtils.wrap(TextHelper.localizeEffect(tooltipBase // + "desc"), 30, "/cut", false).split("/cut"))); diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilHolding.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilHolding.java index 29d75dfd..c372b8c7 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilHolding.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilHolding.java @@ -83,7 +83,7 @@ public class ItemSigilHolding extends ItemSigilBase implements IKeybindable, IAl public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { super.addInformation(stack, world, tooltip, flag); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sigil.holding.press", new TranslationTextComponent(KeyBindings.OPEN_HOLDING.getKey().getTranslationKey()).mergeStyle(TextFormatting.ITALIC))); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sigil.holding.press", new TranslationTextComponent(KeyBindings.OPEN_HOLDING.getKey().getTranslationKey()).mergeStyle(TextFormatting.ITALIC)).mergeStyle(TextFormatting.GRAY)); if (!stack.hasTag()) return; diff --git a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilToggleableBase.java b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilToggleableBase.java index bc1c5c1f..8c57b170 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilToggleableBase.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/sigil/ItemSigilToggleableBase.java @@ -6,6 +6,7 @@ import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -35,7 +36,7 @@ public class ItemSigilToggleableBase extends ItemSigilToggleable// implements IM return; tooltip.add(new TranslationTextComponent("tooltip.bloodmagic." + (getActivated(stack) ? "activated" - : "deactivated"))); + : "deactivated")).mergeStyle(TextFormatting.GRAY)); } // @Override diff --git a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemMonsterSoul.java b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemMonsterSoul.java index f49a47fe..5cf684d0 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemMonsterSoul.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemMonsterSoul.java @@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.NonNullList; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -36,7 +37,7 @@ public class ItemMonsterSoul extends Item implements IDemonWill { if (!stack.hasTag()) return; - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.will", ChatUtil.DECIMAL_FORMAT.format(getWill(getType(stack), stack)))); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.will", ChatUtil.DECIMAL_FORMAT.format(getWill(getType(stack), stack))).mergeStyle(TextFormatting.GRAY)); super.addInformation(stack, world, tooltip, flag); } diff --git a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientAxe.java b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientAxe.java index 6858f553..13c3ccd7 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientAxe.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientAxe.java @@ -28,6 +28,7 @@ import net.minecraft.potion.Effects; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.Difficulty; import net.minecraft.world.World; @@ -302,8 +303,8 @@ public class ItemSentientAxe extends AxeItem implements IDemonWillWeapon, IMulti if (!stack.hasTag()) return; - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sentientAxe.desc")); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentType." + getCurrentType(stack).name().toLowerCase())); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sentientAxe.desc").mergeStyle(TextFormatting.GRAY)); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentType." + getCurrentType(stack).name().toLowerCase()).mergeStyle(TextFormatting.GRAY)); } @Override diff --git a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientPickaxe.java b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientPickaxe.java index 93ef29e3..471eb2d5 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientPickaxe.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientPickaxe.java @@ -28,6 +28,7 @@ import net.minecraft.potion.Effects; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.Difficulty; import net.minecraft.world.World; @@ -301,8 +302,8 @@ public class ItemSentientPickaxe extends PickaxeItem implements IDemonWillWeapon return; // tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.sentientSword.desc")))); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sentientPickaxe.desc")); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentType." + getCurrentType(stack).name().toLowerCase())); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sentientPickaxe.desc").mergeStyle(TextFormatting.GRAY)); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentType." + getCurrentType(stack).name().toLowerCase()).mergeStyle(TextFormatting.GRAY)); } @Override diff --git a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientShovel.java b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientShovel.java index 581c9c5f..dce46373 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientShovel.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientShovel.java @@ -28,6 +28,7 @@ import net.minecraft.potion.Effects; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.Difficulty; import net.minecraft.world.World; @@ -302,8 +303,8 @@ public class ItemSentientShovel extends ShovelItem implements IDemonWillWeapon, return; // tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.sentientSword.desc")))); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sentientShovel.desc")); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentType." + getCurrentType(stack).name().toLowerCase())); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sentientShovel.desc").mergeStyle(TextFormatting.GRAY)); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentType." + getCurrentType(stack).name().toLowerCase()).mergeStyle(TextFormatting.GRAY)); } @Override diff --git a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientSword.java b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientSword.java index a30995e3..c39ba1ed 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientSword.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSentientSword.java @@ -27,6 +27,7 @@ import net.minecraft.potion.Effects; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.Difficulty; import net.minecraft.world.World; @@ -295,8 +296,8 @@ public class ItemSentientSword extends SwordItem implements IDemonWillWeapon, IM return; // tooltip.addAll(Arrays.asList(TextHelper.cutLongString(TextHelper.localizeEffect("tooltip.bloodmagic.sentientSword.desc")))); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sentientSword.desc")); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentType." + getCurrentType(stack).name().toLowerCase())); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.sentientSword.desc").mergeStyle(TextFormatting.GRAY)); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentType." + getCurrentType(stack).name().toLowerCase()).mergeStyle(TextFormatting.GRAY)); } @Override diff --git a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulGem.java b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulGem.java index fc799373..1bbfbf24 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulGem.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulGem.java @@ -15,6 +15,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -77,9 +78,9 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMultiWillTool return; EnumDemonWillType type = this.getCurrentType(stack); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.soulGem." + name)); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.will", ChatUtil.DECIMAL_FORMAT.format(getWill(type, stack)))); - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentType." + getCurrentType(stack).name().toLowerCase())); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.soulGem." + name).mergeStyle(TextFormatting.GRAY)); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.will", ChatUtil.DECIMAL_FORMAT.format(getWill(type, stack))).mergeStyle(TextFormatting.GRAY)); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.currentType." + getCurrentType(stack).name().toLowerCase()).mergeStyle(TextFormatting.GRAY)); super.addInformation(stack, world, tooltip, flag); } diff --git a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulSnare.java b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulSnare.java index c2cf5273..2de6557d 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulSnare.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/soul/ItemSoulSnare.java @@ -12,6 +12,7 @@ import net.minecraft.util.Hand; import net.minecraft.util.SoundCategory; import net.minecraft.util.SoundEvents; import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; import net.minecraft.util.text.TranslationTextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -64,7 +65,7 @@ public class ItemSoulSnare extends Item @OnlyIn(Dist.CLIENT) public void addInformation(ItemStack stack, World world, List tooltip, ITooltipFlag flag) { - tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.soulSnare.desc")); + tooltip.add(new TranslationTextComponent("tooltip.bloodmagic.soulSnare.desc").mergeStyle(TextFormatting.GRAY)); super.addInformation(stack, world, tooltip, flag); } diff --git a/src/main/java/wayoftime/bloodmagic/core/living/ILivingContainer.java b/src/main/java/wayoftime/bloodmagic/core/living/ILivingContainer.java index 3f663fff..0e6db181 100644 --- a/src/main/java/wayoftime/bloodmagic/core/living/ILivingContainer.java +++ b/src/main/java/wayoftime/bloodmagic/core/living/ILivingContainer.java @@ -51,9 +51,9 @@ public interface ILivingContainer boolean sneaking = Screen.hasShiftDown(); // if (!InputUtil.isKeyPressed(MinecraftClient.getInstance().getWindow().getHandle(), 340) || k.getNextRequirement(v) == 0) if (!sneaking || k.getNextRequirement(v.intValue()) == 0) - tooltip.add(new TranslationTextComponent("%s %s", new TranslationTextComponent(k.getTranslationKey()), new TranslationTextComponent("enchantment.level." + k.getLevel(v.intValue())))); + tooltip.add(new TranslationTextComponent("%s %s", new TranslationTextComponent(k.getTranslationKey()), new TranslationTextComponent("enchantment.level." + k.getLevel(v.intValue()))).mergeStyle(TextFormatting.GRAY)); else - tooltip.add(new TranslationTextComponent("%s %s", new TranslationTextComponent(k.getTranslationKey()), (": " + v.intValue() + "/" + k.getNextRequirement(v.intValue())))); + tooltip.add(new TranslationTextComponent("%s %s", new TranslationTextComponent(k.getTranslationKey()), (": " + v.intValue() + "/" + k.getNextRequirement(v.intValue()))).mergeStyle(TextFormatting.GRAY)); }); } }