From f1327dbdc140272dd25c020ee518008056e766ff Mon Sep 17 00:00:00 2001 From: johni0702 Date: Wed, 10 Jun 2015 18:48:48 +0200 Subject: [PATCH] Add method to TooltipRenderer which accepts Color instead of ARGB int --- .../eu/crushedpixel/replaymod/events/GuiEventHandler.java | 4 ++-- .../eu/crushedpixel/replaymod/gui/GuiPlayerOverview.java | 6 +++--- .../eu/crushedpixel/replaymod/gui/elements/GuiDropdown.java | 2 +- .../replaymod/gui/elements/GuiKeyframeTimeline.java | 2 +- .../replaymod/gui/elements/GuiTexturedButton.java | 4 +++- .../eu/crushedpixel/replaymod/gui/elements/GuiTimeline.java | 2 +- .../crushedpixel/replaymod/gui/online/GuiReplayCenter.java | 2 +- .../replaymod/gui/replayviewer/GuiReplayViewer.java | 2 +- .../eu/crushedpixel/replaymod/utils/TooltipRenderer.java | 6 ++++++ 9 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/events/GuiEventHandler.java b/src/main/java/eu/crushedpixel/replaymod/events/GuiEventHandler.java index 2e284e11..0863fb55 100755 --- a/src/main/java/eu/crushedpixel/replaymod/events/GuiEventHandler.java +++ b/src/main/java/eu/crushedpixel/replaymod/events/GuiEventHandler.java @@ -85,12 +85,12 @@ public class GuiEventHandler { if(replayCount == 0) { if(editorButton.isMouseOver()) { Point mouse = MouseUtils.getMousePos(); - ReplayMod.tooltipRenderer.drawTooltip(mouse.getX(), mouse.getY(), I18n.format("replaymod.gui.morereplays"), e.gui, Color.RED.getRGB()); + ReplayMod.tooltipRenderer.drawTooltip(mouse.getX(), mouse.getY(), I18n.format("replaymod.gui.morereplays"), e.gui, Color.RED); } } else if(!VersionValidator.isValid) { if(editorButton.isMouseOver()) { Point mouse = MouseUtils.getMousePos(); - ReplayMod.tooltipRenderer.drawTooltip(mouse.getX(), mouse.getY(), I18n.format("replaymod.gui.java"), e.gui, Color.RED.getRGB()); + ReplayMod.tooltipRenderer.drawTooltip(mouse.getX(), mouse.getY(), I18n.format("replaymod.gui.java"), e.gui, Color.RED); } } } diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/GuiPlayerOverview.java b/src/main/java/eu/crushedpixel/replaymod/gui/GuiPlayerOverview.java index 2954efdd..f573a012 100755 --- a/src/main/java/eu/crushedpixel/replaymod/gui/GuiPlayerOverview.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/GuiPlayerOverview.java @@ -278,15 +278,15 @@ public class GuiPlayerOverview extends GuiScreen implements GuiReplayOverlay.NoO rememberHidden.drawButton(mc, mouseX, mouseY); if(hideAllBox.isMouseOver()) { - ReplayMod.tooltipRenderer.drawTooltip(mouseX, mouseY, I18n.format("replaymod.gui.playeroverview.hideall"), this, Color.WHITE.getRGB()); + ReplayMod.tooltipRenderer.drawTooltip(mouseX, mouseY, I18n.format("replaymod.gui.playeroverview.hideall"), this, Color.WHITE); } if(showAllBox.isMouseOver()) { - ReplayMod.tooltipRenderer.drawTooltip(mouseX, mouseY, I18n.format("replaymod.gui.playeroverview.showall"), this, Color.WHITE.getRGB()); + ReplayMod.tooltipRenderer.drawTooltip(mouseX, mouseY, I18n.format("replaymod.gui.playeroverview.showall"), this, Color.WHITE); } if(rememberHidden.isMouseOver()) { - ReplayMod.tooltipRenderer.drawTooltip(mouseX, mouseY, I18n.format("replaymod.gui.playeroverview.remembersettings.description"), this, Color.WHITE.getRGB()); + ReplayMod.tooltipRenderer.drawTooltip(mouseX, mouseY, I18n.format("replaymod.gui.playeroverview.remembersettings.description"), this, Color.WHITE); } //this is necessary to reset the GL parameters for further GUI rendering diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiDropdown.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiDropdown.java index 6a6df588..a8924b03 100755 --- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiDropdown.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiDropdown.java @@ -127,7 +127,7 @@ public class GuiDropdown extends GuiTextField { } if(drawHover) { - ReplayMod.tooltipRenderer.drawTooltip(hoverPos.getX(), hoverPos.getY(), hoverText, null, Color.WHITE.getRGB()); + ReplayMod.tooltipRenderer.drawTooltip(hoverPos.getX(), hoverPos.getY(), hoverText, null, Color.WHITE); } } } diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiKeyframeTimeline.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiKeyframeTimeline.java index 1935492c..ce969939 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiKeyframeTimeline.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiKeyframeTimeline.java @@ -195,7 +195,7 @@ public class GuiKeyframeTimeline extends GuiTimeline { if(MouseUtils.isMouseWithinBounds(keyframeX - 2, this.positionY + BORDER_TOP + 10 + 1, 5, 5)) { Point mouse = MouseUtils.getMousePos(); - ReplayMod.tooltipRenderer.drawTooltip(mouse.getX(), mouse.getY(), marker.getName(), null, Color.WHITE.getRGB()); + ReplayMod.tooltipRenderer.drawTooltip(mouse.getX(), mouse.getY(), marker.getName(), null, Color.WHITE); drawn = true; } diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiTexturedButton.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiTexturedButton.java index 383ff7a9..ba47b1a1 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiTexturedButton.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiTexturedButton.java @@ -7,6 +7,8 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; +import java.awt.*; + public class GuiTexturedButton extends GuiButton implements GuiElement { private final ResourceLocation texture; private final int u, v; @@ -62,7 +64,7 @@ public class GuiTexturedButton extends GuiButton implements GuiElement { public void drawOverlay(Minecraft mc, int mouseX, int mouseY) { hovered = isHovering(mouseX, mouseY); if(hovered && hoverText != null) { - ReplayMod.tooltipRenderer.drawTooltip(mouseX, mouseY, hoverText, null, 0xffffffff); + ReplayMod.tooltipRenderer.drawTooltip(mouseX, mouseY, hoverText, null, Color.WHITE); } } diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiTimeline.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiTimeline.java index ac4253f6..a602398e 100644 --- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiTimeline.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiTimeline.java @@ -165,7 +165,7 @@ public class GuiTimeline extends Gui implements GuiElement { if (mouseTime != -1) { long sec = mouseTime / 1000; String timestamp = String.format("%02d:%02ds", sec / 60, sec % 60); - ReplayMod.tooltipRenderer.drawTooltip(mouseX, mouseY, timestamp, null, Color.WHITE.getRGB()); + ReplayMod.tooltipRenderer.drawTooltip(mouseX, mouseY, timestamp, null, Color.WHITE); } } diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiReplayCenter.java b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiReplayCenter.java index 4c92bcba..2308a3e0 100755 --- a/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiReplayCenter.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/online/GuiReplayCenter.java @@ -317,7 +317,7 @@ public class GuiReplayCenter extends GuiScreen implements GuiYesNoCallback { if(((favButton.isMouseOver() && !favButton.enabled) || (likeButton.isMouseOver() && !likeButton.enabled) || (dislikeButton.isMouseOver() && !dislikeButton.enabled ))&& currentList.selected != -1) { - ReplayMod.tooltipRenderer.drawTooltip(mouseX, mouseY, I18n.format("replaymod.gui.center.downloadrequired"), this, Color.RED.getRGB()); + ReplayMod.tooltipRenderer.drawTooltip(mouseX, mouseY, I18n.format("replaymod.gui.center.downloadrequired"), this, Color.RED); } this.drawCenteredString(fontRendererObj, I18n.format("replaymod.gui.replaycenter"), this.width / 2, 5, Color.WHITE.getRGB()); diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/replayviewer/GuiReplayViewer.java b/src/main/java/eu/crushedpixel/replaymod/gui/replayviewer/GuiReplayViewer.java index e03b2dfa..fe1627f3 100755 --- a/src/main/java/eu/crushedpixel/replaymod/gui/replayviewer/GuiReplayViewer.java +++ b/src/main/java/eu/crushedpixel/replaymod/gui/replayviewer/GuiReplayViewer.java @@ -170,7 +170,7 @@ public class GuiReplayViewer extends GuiScreen implements GuiYesNoCallback { if(uploadButton.isMouseOver() && !uploadButton.enabled && loadButton.enabled) { if(currentFileUploaded) { - ReplayMod.tooltipRenderer.drawTooltip(mouseX, mouseY, I18n.format("replaymod.gui.viewer.alreadyuploaded"), this, Color.RED.getRGB()); + ReplayMod.tooltipRenderer.drawTooltip(mouseX, mouseY, I18n.format("replaymod.gui.viewer.alreadyuploaded"), this, Color.RED); } } } diff --git a/src/main/java/eu/crushedpixel/replaymod/utils/TooltipRenderer.java b/src/main/java/eu/crushedpixel/replaymod/utils/TooltipRenderer.java index 8ce28334..e0070451 100644 --- a/src/main/java/eu/crushedpixel/replaymod/utils/TooltipRenderer.java +++ b/src/main/java/eu/crushedpixel/replaymod/utils/TooltipRenderer.java @@ -5,10 +5,16 @@ import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiScreen; import org.lwjgl.util.Point; +import java.awt.Color; + public class TooltipRenderer extends Gui { private final Minecraft mc = Minecraft.getMinecraft(); + public void drawTooltip(int x, int y, String text, GuiScreen parent, Color textColor) { + drawTooltip(x, y, text, parent, textColor.getRGB()); + } + public void drawTooltip(int x, int y, String text, GuiScreen parent, int textColor) { drawTooltip(x, y, StringUtils.splitStringInMultipleRows(text, 250), parent, textColor); }