DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add method to TooltipRenderer which accepts Color instead of ARGB int

Browse Source
This commit is contained in:
johni0702
2015-06-10 18:48:48 +02:00
parent 05cc37adcc
commit f1327dbdc1
9 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/eu/crushedpixel/replaymod/events/GuiEventHandler.java
View File

@@ -85,12 +85,12 @@ public class GuiEventHandler {
if(replayCount == 0) { if(replayCount == 0) {
if(editorButton.isMouseOver()) { if(editorButton.isMouseOver()) {
Point mouse = MouseUtils.getMousePos(); 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) { } else if(!VersionValidator.isValid) {
if(editorButton.isMouseOver()) { if(editorButton.isMouseOver()) {
Point mouse = MouseUtils.getMousePos(); 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);
} }
} }
} }

6
src/main/java/eu/crushedpixel/replaymod/gui/GuiPlayerOverview.java
View File

@@ -278,15 +278,15 @@ public class GuiPlayerOverview extends GuiScreen implements GuiReplayOverlay.NoO
rememberHidden.drawButton(mc, mouseX, mouseY); rememberHidden.drawButton(mc, mouseX, mouseY);
if(hideAllBox.isMouseOver()) { 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()) { 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()) { 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 //this is necessary to reset the GL parameters for further GUI rendering

2
src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiDropdown.java
View File

@@ -127,7 +127,7 @@ public class GuiDropdown<T> extends GuiTextField {
} }
if(drawHover) { 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);
} }
} }
} }

2
src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiKeyframeTimeline.java
View File

@@ -195,7 +195,7 @@ public class GuiKeyframeTimeline extends GuiTimeline {
if(MouseUtils.isMouseWithinBounds(keyframeX - 2, this.positionY + BORDER_TOP + 10 + 1, 5, 5)) { if(MouseUtils.isMouseWithinBounds(keyframeX - 2, this.positionY + BORDER_TOP + 10 + 1, 5, 5)) {
Point mouse = MouseUtils.getMousePos(); 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; drawn = true;
} }

4
src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiTexturedButton.java
View File

@@ -7,6 +7,8 @@ import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import java.awt.*;
public class GuiTexturedButton extends GuiButton implements GuiElement { public class GuiTexturedButton extends GuiButton implements GuiElement {
private final ResourceLocation texture; private final ResourceLocation texture;
private final int u, v; 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) { public void drawOverlay(Minecraft mc, int mouseX, int mouseY) {
hovered = isHovering(mouseX, mouseY); hovered = isHovering(mouseX, mouseY);
if(hovered && hoverText != null) { if(hovered && hoverText != null) {
ReplayMod.tooltipRenderer.drawTooltip(mouseX, mouseY, hoverText, null, 0xffffffff); ReplayMod.tooltipRenderer.drawTooltip(mouseX, mouseY, hoverText, null, Color.WHITE);
} }
} }

2
src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiTimeline.java
View File

@@ -165,7 +165,7 @@ public class GuiTimeline extends Gui implements GuiElement {
if (mouseTime != -1) { if (mouseTime != -1) {
long sec = mouseTime / 1000; long sec = mouseTime / 1000;
String timestamp = String.format("%02d:%02ds", sec / 60, sec % 60); 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);
} }
} }

2
src/main/java/eu/crushedpixel/replaymod/gui/online/GuiReplayCenter.java
View File

@@ -317,7 +317,7 @@ public class GuiReplayCenter extends GuiScreen implements GuiYesNoCallback {
if(((favButton.isMouseOver() && !favButton.enabled) || (likeButton.isMouseOver() && !likeButton.enabled) if(((favButton.isMouseOver() && !favButton.enabled) || (likeButton.isMouseOver() && !likeButton.enabled)
|| (dislikeButton.isMouseOver() && !dislikeButton.enabled ))&& currentList.selected != -1) { || (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()); this.drawCenteredString(fontRendererObj, I18n.format("replaymod.gui.replaycenter"), this.width / 2, 5, Color.WHITE.getRGB());

2
src/main/java/eu/crushedpixel/replaymod/gui/replayviewer/GuiReplayViewer.java
View File

@@ -170,7 +170,7 @@ public class GuiReplayViewer extends GuiScreen implements GuiYesNoCallback {
if(uploadButton.isMouseOver() && !uploadButton.enabled && loadButton.enabled) { if(uploadButton.isMouseOver() && !uploadButton.enabled && loadButton.enabled) {
if(currentFileUploaded) { 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);
} }
} }
} }

6
src/main/java/eu/crushedpixel/replaymod/utils/TooltipRenderer.java
View File

@@ -5,10 +5,16 @@ import net.minecraft.client.gui.Gui;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;
import org.lwjgl.util.Point; import org.lwjgl.util.Point;
import java.awt.Color;
public class TooltipRenderer extends Gui { public class TooltipRenderer extends Gui {
private final Minecraft mc = Minecraft.getMinecraft(); 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) { public void drawTooltip(int x, int y, String text, GuiScreen parent, int textColor) {
drawTooltip(x, y, StringUtils.splitStringInMultipleRows(text, 250), parent, textColor); drawTooltip(x, y, StringUtils.splitStringInMultipleRows(text, 250), parent, textColor);
} }