ui improvements + sexier nametag logo
This commit is contained in:
parent
d7e8e10160
commit
30070313cf
2595
logs/latest.log
2595
logs/latest.log
File diff suppressed because it is too large
Load Diff
|
@ -424,13 +424,40 @@ public abstract class Render<T extends Entity>
|
|||
b0 = -10;
|
||||
}
|
||||
|
||||
if (entityIn instanceof AbstractClientPlayer) {
|
||||
String username = ((AbstractClientPlayer) entityIn).getGameProfile().getId().toString();
|
||||
|
||||
if (!SocketClient.isUser(username)) {
|
||||
|
||||
int i = fontrenderer.getStringWidth(str) / 2;
|
||||
|
||||
GlStateManager.disableTexture2D();
|
||||
worldrenderer.begin(7, DefaultVertexFormats.POSITION_COLOR);
|
||||
worldrenderer.pos((double)(-i - 1), (double)(-1 + b0), 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
|
||||
worldrenderer.pos((double)(-i - 1), (double)(8 + b0), 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
|
||||
worldrenderer.pos((double)(i + 1), (double)(8 + b0), 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
|
||||
worldrenderer.pos((double)(i + 1), (double)(-1 + b0), 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
|
||||
worldrenderer.pos((double) (-i - 1), (double) (-1 + b0), 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
|
||||
worldrenderer.pos((double) (-i - 1), (double) (8 + b0), 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
|
||||
worldrenderer.pos((double) (i + 1), (double) (8 + b0), 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
|
||||
worldrenderer.pos((double) (i + 1), (double) (-1 + b0), 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
|
||||
tessellator.draw();
|
||||
GlStateManager.enableTexture2D();
|
||||
fontrenderer.drawString(str, -fontrenderer.getStringWidth(str) / 2, b0, 553648127);
|
||||
GlStateManager.enableDepth();
|
||||
GlStateManager.depthMask(true);
|
||||
fontrenderer.drawString(str, -fontrenderer.getStringWidth(str) / 2, b0, -1);
|
||||
GlStateManager.enableLighting();
|
||||
GlStateManager.disableBlend();
|
||||
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
GlStateManager.popMatrix();
|
||||
} else {
|
||||
if(!Settings.socketLogo) return;
|
||||
|
||||
int i = fontrenderer.getStringWidth(str) / 2;
|
||||
|
||||
GlStateManager.disableTexture2D();
|
||||
worldrenderer.begin(7, DefaultVertexFormats.POSITION_COLOR);
|
||||
worldrenderer.pos((double) (-i - 14), (double) (-1 + b0), 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
|
||||
worldrenderer.pos((double) (-i - 11), (double) (8 + b0), 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
|
||||
worldrenderer.pos((double) (i + 1), (double) (8 + b0), 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
|
||||
worldrenderer.pos((double) (i + 1), (double) (-1 + b0), 0.0D).color(0.0F, 0.0F, 0.0F, 0.25F).endVertex();
|
||||
tessellator.draw();
|
||||
GlStateManager.enableTexture2D();
|
||||
fontrenderer.drawString(str, -fontrenderer.getStringWidth(str) / 2, b0, 553648127);
|
||||
|
@ -443,6 +470,8 @@ public abstract class Render<T extends Entity>
|
|||
GlStateManager.popMatrix();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public RenderManager getRenderManager()
|
||||
{
|
||||
|
|
|
@ -49,13 +49,22 @@ public class MenuModCheckbox extends MenuCheckbox {
|
|||
GlStateManager.color(1, 1, 1);
|
||||
|
||||
if (backgroundColor == getColor(DrawType.BACKGROUND, ButtonState.ACTIVE)) {
|
||||
RoundedUtils.drawGradientRound(x + 2, y + 2, width - 3, height - 3, 3, Athena.INSTANCE.getThemeManager().getTheme().getFirstColor(), Athena.INSTANCE.getThemeManager().getTheme().getFirstColor(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor());
|
||||
|
||||
RoundedUtils.drawRoundedRect(x, y, x + width, y + height, 4, Athena.INSTANCE.getThemeManager().getTheme().getFirstColor().getRGB());
|
||||
RoundedUtils.drawRoundedRect(x + 3, y + 3, x + width - 3, y + height - 3, 4, Color.BLACK.getRGB());
|
||||
|
||||
// RoundedUtils.drawGradientRound(x + 2, y + 2, width - 3, height - 3, 3, Athena.INSTANCE.getThemeManager().getTheme().getFirstColor(), Athena.INSTANCE.getThemeManager().getTheme().getFirstColor(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor());
|
||||
} else if (backgroundColor == getColor(DrawType.BACKGROUND, ButtonState.HOVER)) {
|
||||
RoundedUtils.drawRoundedGradientOutlineCorner(x + 3, y + 2, x + width - 4, y + height - 5, 1, 6, Athena.INSTANCE.getThemeManager().getTheme().getFirstColor().brighter().getRGB(), Athena.INSTANCE.getThemeManager().getTheme().getFirstColor().brighter().getRGB(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor().brighter().getRGB(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor().brighter().getRGB());
|
||||
RoundedUtils.drawRoundedRect(x, y, x + width, y + height, 4, Athena.INSTANCE.getThemeManager().getTheme().getSecondColor().getRGB());
|
||||
} else if (backgroundColor == getColor(DrawType.BACKGROUND, ButtonState.HOVERACTIVE)) {
|
||||
RoundedUtils.drawGradientRound(x + 2, y + 2, width - 3, height - 3, 3, Athena.INSTANCE.getThemeManager().getTheme().getFirstColor().darker(), Athena.INSTANCE.getThemeManager().getTheme().getFirstColor().darker(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor().darker(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor().darker());
|
||||
|
||||
RoundedUtils.drawRoundedRect(x, y, x + width, y + height, 4, Athena.INSTANCE.getThemeManager().getTheme().getSecondColor().getRGB());
|
||||
RoundedUtils.drawRoundedRect(x + 3, y + 3, x + width - 3, y + height - 3, 4, Color.BLACK.getRGB());
|
||||
|
||||
// RoundedUtils.drawGradientRound(x + 2, y + 2, width - 3, height - 3, 3, Athena.INSTANCE.getThemeManager().getTheme().getFirstColor().darker(), Athena.INSTANCE.getThemeManager().getTheme().getFirstColor().darker(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor().darker(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor().darker());
|
||||
} else {
|
||||
RoundedUtils.drawRoundedGradientOutlineCorner(x + 2, y, x + width - 2, y + height - 3, 1, 6, Athena.INSTANCE.getThemeManager().getTheme().getFirstColor().getRGB(), Athena.INSTANCE.getThemeManager().getTheme().getFirstColor().getRGB(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor().getRGB(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor().getRGB());
|
||||
RoundedUtils.drawRoundedRect(x, y, x + width, y + height, 4, Athena.INSTANCE.getThemeManager().getTheme().getThirdColor().getRGB());
|
||||
// RoundedUtils.drawRoundedGradientOutlineCorner(x + 2, y, x + width - 2, y + height - 3, 1, 6, Athena.INSTANCE.getThemeManager().getTheme().getFirstColor().getRGB(), Athena.INSTANCE.getThemeManager().getTheme().getFirstColor().getRGB(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor().getRGB(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor().getRGB());
|
||||
}
|
||||
|
||||
/*drawHorizontalLine(x, y, width + 1, 1, lineColor);
|
||||
|
|
|
@ -101,7 +101,9 @@ public class MenuModSlider extends MenuSlider {
|
|||
linePos += minOffset;
|
||||
}
|
||||
|
||||
RoundedUtils.drawGradientRound(x + 1, y + 1, linePos, height - 1, 6,Athena.INSTANCE.getThemeManager().getTheme().getFirstColor(), Athena.INSTANCE.getThemeManager().getTheme().getFirstColor(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor(), Athena.INSTANCE.getThemeManager().getTheme().getSecondColor());
|
||||
DrawUtils.drawRoundedRect(x + 1, y + 1, x + linePos, y + height - 1, 6, Athena.INSTANCE.getThemeManager().getTheme().getFirstColor().getRGB());
|
||||
|
||||
// RoundedUtils.drawRoundedRect(x + 1, y + 1, linePos, height - 1, 6 ,Athena.INSTANCE.getThemeManager().getTheme().getFirstColor().getRGB());
|
||||
//rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + 1, y + 1, linePos, height - 1, backgroundColor);
|
||||
|
||||
int cursorPos = linePos;
|
||||
|
@ -111,9 +113,11 @@ public class MenuModSlider extends MenuSlider {
|
|||
cursorPos = cursorWidth;
|
||||
}
|
||||
|
||||
rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + cursorPos - cursorWidth, y, cursorWidth + 2, height + 1, linePopupColor);
|
||||
rip.athena.client.gui.framework.draw.DrawImpl.drawRect(x + 1 + cursorPos - cursorWidth, y + 1, cursorWidth, height - 1, Athena.INSTANCE.getThemeManager().getPrimaryTheme().getTextColor());
|
||||
drawText(">", x + 3 + cursorPos - (cursorWidth / 2) - getStringWidth(">") / 2, y + height / 2 - getStringHeight(">") / 2, textColor);
|
||||
DrawUtils.drawRoundedRect(x + cursorPos - cursorWidth, y + 1, x + cursorPos, y + height - 1, 6, -1);
|
||||
|
||||
// DrawUtils.drawRoundedRect(x + cursorPos - cursorWidth, y, x + cursorWidth + 2, y + height + 1, 4, linePopupColor);
|
||||
// DrawUtils.drawRoundedRect(x + 1 + cursorPos - cursorWidth, y + 1, cursorWidth, height - 1, 4, Athena.INSTANCE.getThemeManager().getPrimaryTheme().getTextColor());
|
||||
// drawText(">", x + 3 + cursorPos - (cursorWidth / 2) - getStringWidth(">") / 2, y + height / 2 - getStringHeight(">") / 2, textColor);
|
||||
if(wantToDrag || (mouseDown && lastState == ButtonState.HOVER)) {
|
||||
if(mouseDown) {
|
||||
wantToDrag = true;
|
||||
|
|
|
@ -5,6 +5,7 @@ import rip.athena.client.gui.framework.MenuPriority;
|
|||
import rip.athena.client.gui.framework.draw.ButtonState;
|
||||
import rip.athena.client.gui.framework.draw.DrawType;
|
||||
import org.lwjgl.input.Mouse;
|
||||
import rip.athena.client.utils.animations.simple.SimpleAnimation;
|
||||
|
||||
import java.awt.*;
|
||||
import java.math.RoundingMode;
|
||||
|
@ -18,6 +19,9 @@ import java.text.DecimalFormat;
|
|||
|
||||
public class MenuSlider extends MenuComponent {
|
||||
protected boolean isFloat = false;
|
||||
|
||||
protected SimpleAnimation valueAnim;
|
||||
|
||||
protected float value;
|
||||
protected float minValue;
|
||||
protected float maxValue;
|
||||
|
|
Loading…
Reference in New Issue