From 642e511cdd20963ed041a2f9bdaee7f1468fc424 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 9 Oct 2016 16:30:52 +0200 Subject: [PATCH] Fixed items with colored tooltip are uncolored in grid, fixes #446 --- .../gui/grid/stack/ClientStackItem.java | 15 ++++++++++++++- .../java/refinedstorage/tile/TileConstructor.java | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/main/java/refinedstorage/gui/grid/stack/ClientStackItem.java b/src/main/java/refinedstorage/gui/grid/stack/ClientStackItem.java index 5b01f9003..08fb9bc0b 100755 --- a/src/main/java/refinedstorage/gui/grid/stack/ClientStackItem.java +++ b/src/main/java/refinedstorage/gui/grid/stack/ClientStackItem.java @@ -6,9 +6,11 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.common.network.ByteBufUtils; import refinedstorage.gui.GuiBase; +import java.util.List; import java.util.Locale; public class ClientStackItem implements IClientStack { @@ -48,7 +50,18 @@ public class ClientStackItem implements IClientStack { @Override public String getTooltip() { - return Strings.join(stack.getTooltip(Minecraft.getMinecraft().thePlayer, Minecraft.getMinecraft().gameSettings.advancedItemTooltips), "\n"); + List lines = stack.getTooltip(Minecraft.getMinecraft().thePlayer, Minecraft.getMinecraft().gameSettings.advancedItemTooltips); + + // From GuiScreen#renderToolTip + for (int i = 0; i < lines.size(); ++i) { + if (i == 0) { + lines.set(i, stack.getRarity().rarityColor + lines.get(i)); + } else { + lines.set(i, TextFormatting.GRAY + lines.get(i)); + } + } + + return Strings.join(lines, "\n"); } @Override diff --git a/src/main/java/refinedstorage/tile/TileConstructor.java b/src/main/java/refinedstorage/tile/TileConstructor.java index e94609599..f6643506b 100755 --- a/src/main/java/refinedstorage/tile/TileConstructor.java +++ b/src/main/java/refinedstorage/tile/TileConstructor.java @@ -84,7 +84,7 @@ public class TileConstructor extends TileMultipartNode implements IComparable, I worldObj.setBlockState(front, state, 1 | 2); - // From ItemBlock.onItemUse + // From ItemBlock#onItemUse SoundType blockSound = block.getBlock().getSoundType(state, worldObj, pos, null); worldObj.playSound(null, front, blockSound.getPlaceSound(), SoundCategory.BLOCKS, (blockSound.getVolume() + 1.0F) / 2.0F, blockSound.getPitch() * 0.8F); } else if (upgrades.hasUpgrade(ItemUpgrade.TYPE_CRAFTING)) {