Brighten hopperhock hud, unify shift tooltip handling and fix the coloring for it

This commit is contained in:
Vincent Lee committed 2020-06-11 23:02:31 -05:00
1 parent cbc36366de
commit 00ec6f8b08
22 files changed
+77 -64

No files matched your search

@@ -8,6 +8,10 @@
*/
package vazkii.botania.client.core.handler;
import net.minecraft.client.gui.screen.Screen;
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.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.event.entity.player.ItemTooltipEvent;
@@ -19,6 +23,9 @@ import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.item.ItemKeepIvy;
import vazkii.botania.common.lib.LibMisc;
import java.util.List;
import java.util.function.Consumer;
@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = LibMisc.MOD_ID)
public final class TooltipHandler {
@@ -29,4 +36,17 @@ public final class TooltipHandler {
}
}
public static ITextComponent getShiftInfoTooltip() {
ITextComponent shift = new StringTextComponent("SHIFT").applyTextStyle(TextFormatting.AQUA);
return new TranslationTextComponent("botaniamisc.shiftinfo", shift).applyTextStyle(TextFormatting.GRAY);
}
public static void addOnShift(List<ITextComponent> tooltip, Runnable lambda) {
if (Screen.hasShiftDown()) {
lambda.run();
} else {
tooltip.add(getShiftInfoTooltip());
}
}
}
@@ -24,6 +24,7 @@ import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.items.IItemHandler;
@@ -242,12 +243,11 @@ public class SubTileHopperhock extends TileEntityFunctionalFlower {
public void renderHUD(Minecraft mc) {
super.renderHUD(mc);
int color = getColor();
String filter = I18n.format("botaniamisc.filter" + filterType);
int x = mc.getMainWindow().getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(filter) / 2;
int y = mc.getMainWindow().getScaledHeight() / 2 + 30;
mc.fontRenderer.drawStringWithShadow(filter, x, y, color);
mc.fontRenderer.drawStringWithShadow(filter, x, y, TextFormatting.GRAY.getColor());
RenderSystem.disableLighting();
}
@@ -29,6 +29,7 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.api.recipe.IElvenItem;
import vazkii.botania.client.core.handler.TooltipHandler;
import vazkii.botania.common.advancements.UseItemSuccessTrigger;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.lib.LibMisc;
@@ -66,11 +67,9 @@ public class ItemLexicon extends Item implements IElvenItem {
public void addInformation(ItemStack stack, World worldIn, List<ITextComponent> tooltip, ITooltipFlag flagIn) {
super.addInformation(stack, worldIn, tooltip, flagIn);
if (Screen.hasShiftDown()) {
TooltipHandler.addOnShift(tooltip, () -> {
tooltip.add(getEdition().applyTextStyle(TextFormatting.GRAY));
} else {
tooltip.add(new TranslationTextComponent("botaniamisc.shiftinfo"));
}
});
}
@Nonnull
@@ -36,6 +36,7 @@ import vazkii.botania.api.mana.ILens;
import vazkii.botania.api.mana.IManaUsingItem;
import vazkii.botania.api.mana.ManaItemHandler;
import vazkii.botania.client.core.handler.ItemsRemainingRenderHandler;
import vazkii.botania.client.core.handler.TooltipHandler;
import vazkii.botania.common.advancements.ManaGunTrigger;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.core.helper.ItemNBTHelper;
@@ -176,24 +177,24 @@ public class ItemManaGun extends Item implements IManaUsingItem {
@OnlyIn(Dist.CLIENT)
@Override
public void addInformation(ItemStack stack, World world, List<ITextComponent> stacks, ITooltipFlag flags) {
public void addInformation(ItemStack stack, World world, List<ITextComponent> tooltip, ITooltipFlag flags) {
boolean clip = hasClip(stack);
if (clip && !Screen.hasShiftDown()) {
stacks.add(new TranslationTextComponent("botaniamisc.shiftinfo"));
tooltip.add(TooltipHandler.getShiftInfoTooltip());
return;
}
ItemStack lens = getLens(stack);
if (!lens.isEmpty()) {
List<ITextComponent> tooltip = lens.getTooltip(Minecraft.getInstance().player, ITooltipFlag.TooltipFlags.NORMAL);
if (tooltip.size() > 1) {
stacks.addAll(tooltip.subList(1, tooltip.size()));
List<ITextComponent> lensTip = lens.getTooltip(Minecraft.getInstance().player, ITooltipFlag.TooltipFlags.NORMAL);
if (lensTip.size() > 1) {
tooltip.addAll(lensTip.subList(1, lensTip.size()));
}
}
if (clip) {
int pos = getClipPos(stack);
stacks.add(new TranslationTextComponent("botaniamisc.hasClip"));
tooltip.add(new TranslationTextComponent("botaniamisc.hasClip"));
for (int i = 0; i < CLIP_SLOTS; i++) {
ItemStack lensAt = getLensAtPos(stack, i);
@@ -206,7 +207,7 @@ public class ItemManaGun extends Item implements IManaUsingItem {
ITextComponent tip = new StringTextComponent(" - ").appendSibling(name);
tip.getStyle().setColor(i == pos ? TextFormatting.GREEN : TextFormatting.GRAY);
stacks.add(tip);
tooltip.add(tip);
}
}
}
@@ -33,6 +33,7 @@ import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.item.IPhantomInkable;
import vazkii.botania.api.mana.IManaUsingItem;
import vazkii.botania.api.mana.ManaItemHandler;
import vazkii.botania.client.core.handler.TooltipHandler;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.client.model.armor.ModelArmorManasteel;
import vazkii.botania.common.core.handler.ConfigHandler;
@@ -118,11 +119,7 @@ public class ItemManasteelArmor extends ArmorItem implements IManaUsingItem, IPh
@OnlyIn(Dist.CLIENT)
@Override
public void addInformation(ItemStack stack, World world, List<ITextComponent> list, ITooltipFlag flags) {
if (Screen.hasShiftDown()) {
addInformationAfterShift(stack, world, list, flags);
} else {
list.add(new TranslationTextComponent("botaniamisc.shiftinfo"));
}
TooltipHandler.addOnShift(list, () -> addInformationAfterShift(stack, world, list, flags));
}
@OnlyIn(Dist.CLIENT)
@@ -34,6 +34,7 @@ import net.minecraftforge.fml.common.Mod;
import vazkii.botania.api.item.ICosmeticAttachable;
import vazkii.botania.api.item.IPhantomInkable;
import vazkii.botania.client.core.handler.BaubleRenderHandler;
import vazkii.botania.client.core.handler.TooltipHandler;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.core.handler.EquipmentHandler;
import vazkii.botania.common.core.helper.ItemNBTHelper;
@@ -60,29 +61,25 @@ public abstract class ItemBauble extends Item implements ICosmeticAttachable, IP
@Override
@OnlyIn(Dist.CLIENT)
public void addInformation(ItemStack stack, World world, List<ITextComponent> stacks, ITooltipFlag flags) {
if (Screen.hasShiftDown()) {
addHiddenTooltip(stack, world, stacks, flags);
} else {
stacks.add(new TranslationTextComponent("botaniamisc.shiftinfo"));
}
public void addInformation(ItemStack stack, World world, List<ITextComponent> tooltip, ITooltipFlag flags) {
TooltipHandler.addOnShift(tooltip, () -> addHiddenTooltip(stack, world, tooltip, flags));
}
@OnlyIn(Dist.CLIENT)
public void addHiddenTooltip(ItemStack stack, World world, List<ITextComponent> stacks, ITooltipFlag flags) {
public void addHiddenTooltip(ItemStack stack, World world, List<ITextComponent> tooltip, ITooltipFlag flags) {
String key = vazkii.botania.client.core.helper.RenderHelper.getKeyDisplayString("key.curios.open.desc");
if (key != null) {
stacks.add(new TranslationTextComponent("botania.baubletooltip", key));
tooltip.add(new TranslationTextComponent("botania.baubletooltip", key));
}
ItemStack cosmetic = getCosmeticItem(stack);
if (!cosmetic.isEmpty()) {
stacks.add(new TranslationTextComponent("botaniamisc.hasCosmetic", cosmetic.getDisplayName()));
tooltip.add(new TranslationTextComponent("botaniamisc.hasCosmetic", cosmetic.getDisplayName()));
}
if (hasPhantomInk(stack)) {
stacks.add(new TranslationTextComponent("botaniamisc.hasPhantomInk"));
tooltip.add(new TranslationTextComponent("botaniamisc.hasPhantomInk"));
}
}
@@ -67,13 +67,13 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble {
@OnlyIn(Dist.CLIENT)
@Override
public void addHiddenTooltip(ItemStack stack, World world, List<ITextComponent> stacks, ITooltipFlag flags) {
public void addHiddenTooltip(ItemStack stack, World world, List<ITextComponent> tooltip, ITooltipFlag flags) {
if (variant == Variant.THINKING_HAND) {
stacks.add(new TranslationTextComponent("botaniamisc.cosmeticThinking").applyTextStyle(TextFormatting.GRAY));
tooltip.add(new TranslationTextComponent("botaniamisc.cosmeticThinking").applyTextStyle(TextFormatting.GRAY));
} else {
stacks.add(new TranslationTextComponent("botaniamisc.cosmeticBauble").applyTextStyle(TextFormatting.GRAY));
tooltip.add(new TranslationTextComponent("botaniamisc.cosmeticBauble").applyTextStyle(TextFormatting.GRAY));
}
super.addHiddenTooltip(stack, world, stacks, flags);
super.addHiddenTooltip(stack, world, tooltip, flags);
}
@Override
@@ -70,16 +70,16 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre
@OnlyIn(Dist.CLIENT)
@Override
public void addHiddenTooltip(ItemStack stack, World world, List<ITextComponent> list, ITooltipFlag adv) {
super.addHiddenTooltip(stack, world, list, adv);
public void addHiddenTooltip(ItemStack stack, World world, List<ITextComponent> tooltip, ITooltipFlag adv) {
super.addHiddenTooltip(stack, world, tooltip, adv);
Brew brew = getBrew(stack);
if (brew == ModBrews.fallbackBrew) {
list.add(new TranslationTextComponent("botaniamisc.notInfused").applyTextStyle(TextFormatting.LIGHT_PURPLE));
tooltip.add(new TranslationTextComponent("botaniamisc.notInfused").applyTextStyle(TextFormatting.LIGHT_PURPLE));
return;
}
list.add(new TranslationTextComponent("botaniamisc.brewOf", I18n.format(brew.getTranslationKey(stack))).applyTextStyle(TextFormatting.LIGHT_PURPLE));
tooltip.add(new TranslationTextComponent("botaniamisc.brewOf", I18n.format(brew.getTranslationKey(stack))).applyTextStyle(TextFormatting.LIGHT_PURPLE));
for (EffectInstance effect : brew.getPotionEffects(stack)) {
TextFormatting format = effect.getPotion().getEffectType().getColor();
ITextComponent cmp = new TranslationTextComponent(effect.getEffectName());
@@ -87,7 +87,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre
cmp.appendText(" ");
cmp.appendSibling(new TranslationTextComponent("botania.roman" + (effect.getAmplifier() + 1)));
}
list.add(cmp.applyTextStyle(format));
tooltip.add(cmp.applyTextStyle(format));
}
}
@@ -106,9 +106,9 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem {
@OnlyIn(Dist.CLIENT)
@Override
public void addHiddenTooltip(ItemStack stack, World world, List<ITextComponent> stacks, ITooltipFlag flags) {
super.addHiddenTooltip(stack, world, stacks, flags);
stacks.add(new TranslationTextComponent("botania.wings" + getVariant(stack)));
public void addHiddenTooltip(ItemStack stack, World world, List<ITextComponent> tooltip, ITooltipFlag flags) {
super.addHiddenTooltip(stack, world, tooltip, flags);
tooltip.add(new TranslationTextComponent("botania.wings" + getVariant(stack)));
}
private void updatePlayerFlyStatus(LivingUpdateEvent event) {
@@ -28,6 +28,7 @@ import net.minecraftforge.api.distmarker.OnlyIn;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.item.IRelic;
import vazkii.botania.client.core.handler.TooltipHandler;
import vazkii.botania.common.advancements.RelicBindTrigger;
import vazkii.botania.common.core.helper.ItemNBTHelper;
import vazkii.botania.common.item.ModItems;
@@ -59,28 +60,26 @@ public class ItemRelic extends Item implements IRelic {
}
@OnlyIn(Dist.CLIENT)
public void addBindInfo(List<ITextComponent> list, ItemStack stack) {
if (Screen.hasShiftDown()) {
public void addBindInfo(List<ITextComponent> tooltip, ItemStack stack) {
TooltipHandler.addOnShift(tooltip, () -> {
if (!hasUUID(stack)) {
list.add(new TranslationTextComponent("botaniamisc.relicUnbound"));
tooltip.add(new TranslationTextComponent("botaniamisc.relicUnbound"));
} else {
if (!getSoulbindUUID(stack).equals(Minecraft.getInstance().player.getUniqueID())) {
list.add(new TranslationTextComponent("botaniamisc.notYourSagittarius"));
tooltip.add(new TranslationTextComponent("botaniamisc.notYourSagittarius"));
} else {
list.add(new TranslationTextComponent("botaniamisc.relicSoulbound", Minecraft.getInstance().player.getName()));
tooltip.add(new TranslationTextComponent("botaniamisc.relicSoulbound", Minecraft.getInstance().player.getName()));
}
}
if (stack.getItem() == ModItems.dice) {
list.add(new StringTextComponent(""));
tooltip.add(new StringTextComponent(""));
String name = stack.getTranslationKey() + ".poem";
for (int i = 0; i < 4; i++) {
list.add(new TranslationTextComponent(name + i).applyTextStyles(TextFormatting.GRAY, TextFormatting.ITALIC));
tooltip.add(new TranslationTextComponent(name + i).applyTextStyles(TextFormatting.GRAY, TextFormatting.ITALIC));
}
}
} else {
list.add(new TranslationTextComponent("botaniamisc.shiftinfo"));
}
});
}
public boolean shouldDamageWrongPlayer() {
@@ -49,9 +49,9 @@ public abstract class ItemRelicBauble extends ItemBauble implements IRelic {
@OnlyIn(Dist.CLIENT)
@Override
public void addHiddenTooltip(ItemStack stack, World world, List<ITextComponent> stacks, ITooltipFlag flags) {
super.addHiddenTooltip(stack, world, stacks, flags);
dummy.addBindInfo(stacks, stack);
public void addHiddenTooltip(ItemStack stack, World world, List<ITextComponent> tooltip, ITooltipFlag flags) {
super.addHiddenTooltip(stack, world, tooltip, flags);
dummy.addBindInfo(tooltip, stack);
}
@Override