Skip to content

Commit

Permalink
Update: draggable scoreboard
Browse files Browse the repository at this point in the history
  • Loading branch information
@valekatoz
valekatoz committed Mar 4, 2024
1 parent 62c726f commit 162887b
Show file tree
Hide file tree
Showing 2 changed files with 265 additions and 105 deletions.
137 changes: 32 additions & 105 deletions src/main/java/net/kore/modules/render/ModernInterfaces.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,15 @@
import com.google.common.collect.Lists;
import com.mojang.realmsclient.gui.ChatFormatting;
import net.kore.Kore;
import net.kore.events.GuiChatEvent;
import net.kore.events.ScoreboardRenderEvent;
import net.kore.modules.Module;
import net.kore.settings.BooleanSetting;
import net.kore.settings.ModeSetting;
import net.kore.settings.NumberSetting;
import net.kore.ui.hud.DraggableComponent;
import net.kore.ui.hud.impl.GuesserHud;
import net.kore.ui.hud.impl.ScoreboardHud;
import net.kore.utils.StencilUtils;
import net.kore.utils.font.Fonts;
import net.kore.utils.render.shader.BlurUtils;
Expand All @@ -27,6 +32,9 @@

public class ModernInterfaces extends Module
{
public static ModeSetting defaultPosition;
public NumberSetting scoreboardX;
public NumberSetting scoreboardY;
public BooleanSetting customScoreboard;
public BooleanSetting customFont;
public BooleanSetting outline;
Expand All @@ -43,6 +51,9 @@ public ModernInterfaces() {
super("Modern Interfaces", Category.RENDER);
this.setToggled(true);
this.customScoreboard = new BooleanSetting("Custom Scoreboard", true);
this.scoreboardX = new NumberSetting("scoreboardX", (double) new ScaledResolution(Kore.mc).getScaledWidth() /2, -100000.0, 100000.0, 1.0E-5, a -> true);
this.scoreboardY = new NumberSetting("scoreboardY", (double) new ScaledResolution(Kore.mc).getScaledHeight() /2, -100000.0, 100000.0, 1.0E-5, a -> true);
defaultPosition = new ModeSetting("Position", "Default", new String[] { "Default", "Custom"});
this.customFont = new BooleanSetting("Scoreboard Font", true) {
@Override
public boolean isHidden() {
Expand Down Expand Up @@ -85,7 +96,7 @@ public boolean isHidden() {

this.addSettings("Client", this.customButtons, roundedButton, this.buttonLine, this.lineLocation);
this.addSettings("Chat", this.customChat, this.customChatFont);
this.addSettings("Scoreboard", this.customScoreboard, this.customFont, this.outline, this.hideLobby, this.blurStrength);
this.addSettings("Scoreboard", this.customScoreboard, this.customFont, this.outline, this.hideLobby, this.blurStrength, defaultPosition, this.scoreboardX, this.scoreboardY);
}

@Override
Expand All @@ -95,120 +106,36 @@ public void assign()
}

@SubscribeEvent
public void onDraw(final ScoreboardRenderEvent event) {
if (!this.isToggled() || !this.customScoreboard.isEnabled()) {
public void onChatEvent(final GuiChatEvent event) {
if (!this.isToggled()) {
return;
}
event.setCanceled(true);
this.renderScoreboard(event.objective, event.resolution, this.customFont.isEnabled());
}

private void renderScoreboard(final ScoreObjective p_180475_1_, final ScaledResolution p_180475_2_, final boolean customFont) {
final Scoreboard scoreboard = p_180475_1_.getScoreboard();
Collection<Score> collection = (Collection<Score>)scoreboard.getSortedScores(p_180475_1_);
final List<Score> list = collection.stream().filter(p_apply_1_ -> p_apply_1_.getPlayerName() != null && !p_apply_1_.getPlayerName().startsWith("#")).collect(Collectors.toList());
if (list.size() > 15) {
collection = (Collection<Score>) Lists.newArrayList(Iterables.skip((Iterable)list, collection.size() - 15));
}
else {
collection = list;
}
float width = this.getStringWidth(p_180475_1_.getDisplayName(), customFont);
final int fontHeight = customFont ? (Fonts.getPrimary().getHeight() + 2) : Kore.mc.fontRendererObj.FONT_HEIGHT;
for (final Score score : collection) {
final ScorePlayerTeam scoreplayerteam = scoreboard.getPlayersTeam(score.getPlayerName());
final String s = ScorePlayerTeam.formatPlayerName((Team)scoreplayerteam, score.getPlayerName()) + ": " + EnumChatFormatting.RED + score.getScorePoints();
width = Math.max(width, this.getStringWidth(s, customFont));
}
final float i1 = (float)(collection.size() * fontHeight);
final float arrayHeight = Kore.clickGui.getHeight();
float j1 = p_180475_2_.getScaledHeight() / 2.0f + i1 / 3.0f;
if (Kore.clickGui.arrayList.isEnabled()) {
j1 = Math.max(j1, arrayHeight + 40.0f + (collection.size() * fontHeight - fontHeight - 3));
}
final float k1 = 3.0f;
final float l1 = p_180475_2_.getScaledWidth() - width - k1;
final float m = p_180475_2_.getScaledWidth() - k1 + 2.0f;
int blur = 0;
final String selected = this.blurStrength.getSelected();
switch (selected) {
case "Low": {
blur = 7;
break;
}
case "High": {
blur = 25;
break;
}
}
if (blur > 0 && !this.outline.isEnabled()) {
for (float i2 = 0.5f; i2 < 3.0f; i2 += 0.5f) {
RenderUtils.drawRoundedRect2(l1 - 2.0f - i2, j1 - collection.size() * fontHeight - fontHeight - 3.0f + i2, m - (l1 - 2.0f), fontHeight * (collection.size() + 1) + 4, 5.0, new Color(20, 20, 20, 40).getRGB());
final DraggableComponent component = ScoreboardHud.scoreboardHud;

if (event instanceof GuiChatEvent.MouseClicked) {
if (component.isHovered(event.mouseX, event.mouseY)) {
defaultPosition.setSelected("Custom");
component.startDragging();
}
}
StencilUtils.initStencil();
StencilUtils.bindWriteStencilBuffer();
RenderUtils.drawRoundedRect2(l1 - 2.0f, j1 - collection.size() * fontHeight - fontHeight - 3.0f, m - (l1 - 2.0f), fontHeight * (collection.size() + 1) + 4, 5.0, new Color(21, 21, 21, 50).getRGB());
StencilUtils.bindReadStencilBuffer(1);
BlurUtils.renderBlurredBackground((float)blur, (float)p_180475_2_.getScaledWidth(), (float)p_180475_2_.getScaledHeight(), l1 - 2.0f, j1 - collection.size() * fontHeight - fontHeight - 3.0f, m - (l1 - 2.0f), (float)(fontHeight * (collection.size() + 1) + 4));
StencilUtils.uninitStencil();
if (this.outline.isEnabled()) {
this.drawBorderedRoundedRect(l1 - 2.0f, j1 - collection.size() * fontHeight - fontHeight - 3.0f, m - (l1 - 2.0f), (float)(fontHeight * (collection.size() + 1) + 4), 5.0f, 2.5f);
else if (event instanceof GuiChatEvent.MouseReleased) {
component.stopDragging();
}
else {
RenderUtils.drawRoundedRect2(l1 - 2.0f, j1 - collection.size() * fontHeight - fontHeight - 3.0f, m - (l1 - 2.0f), fontHeight * (collection.size() + 1) + 4, 5.0, new Color(21, 21, 21, 50).getRGB());
else if (event instanceof GuiChatEvent.Closed) {
component.stopDragging();
}
int i3 = 0;
for (final Score score2 : collection) {
++i3;
final ScorePlayerTeam scoreplayerteam2 = scoreboard.getPlayersTeam(score2.getPlayerName());
String s2 = ScorePlayerTeam.formatPlayerName((Team)scoreplayerteam2, score2.getPlayerName());
if (s2.contains(Kore.fancy + "ewww.hypixel.ne\ud83c\udf82" + Kore.fancy + "et") && Kore.clickGui.waterMark.isEnabled()) {
s2 = s2.replaceAll(Kore.fancy + "ewww.hypixel.ne\ud83c\udf82" + Kore.fancy + "et", "Kore Client");
}
final float k2 = j1 - i3 * fontHeight;
final Matcher matcher = Pattern.compile("[0-9][0-9]/[0-9][0-9]/[0-9][0-9]").matcher(s2);
if (this.hideLobby.isEnabled() && matcher.find()) {
s2 = ChatFormatting.GRAY + matcher.group();
}
final boolean flag = s2.equals("Kore Client");
if (flag) {
if (customFont) {
Fonts.getPrimary().drawSmoothCenteredStringWithShadow(s2, l1 + width / 2.0f, k2, Kore.themeManager.getSecondaryColor().getRGB());
}
else {
Kore.mc.fontRendererObj.drawString(s2, (int)(l1 + width / 2.0f - Kore.mc.fontRendererObj.getStringWidth(s2) / 2), (int)k2, Kore.themeManager.getSecondaryColor().getRGB());
}
}
else {
this.drawString(s2, l1, k2, 553648127, customFont);
}
if (i3 == collection.size()) {
final String s3 = p_180475_1_.getDisplayName();
this.drawString(s3, l1 + width / 2.0f - this.getStringWidth(s3, customFont) / 2.0f, k2 - fontHeight, Color.white.getRGB(), customFont);
}
}
GlStateManager.color(1.0f, 1.0f, 1.0f);
}
else if (event instanceof GuiChatEvent.DrawChatEvent) {

private void drawBorderedRoundedRect(final float x, final float y, final float width, final float height, final float radius, final float linewidth) {
RenderUtils.drawRoundedRect(x, y, x + width, y + height, radius, new Color(21, 21, 21, 50).getRGB());
RenderUtils.drawGradientOutlinedRoundedRect(x, y, width, height, radius, linewidth, Kore.themeManager.getSecondaryColor(0).getRGB(), Kore.themeManager.getSecondaryColor(3).getRGB(), Kore.themeManager.getSecondaryColor(6).getRGB(), Kore.themeManager.getSecondaryColor(9).getRGB());
}

private void drawString(String s, final float x, final float y, final int color, final boolean customFont) {
if (Kore.nickHider.isToggled() && s.contains(Kore.mc.getSession().getUsername())) {
s = s.replaceAll(Kore.mc.getSession().getUsername(), Kore.nickHider.nick.getValue());
}
if (customFont) {
Fonts.getPrimary().drawSmoothStringWithShadow(s, x, y, Color.white.getRGB());
}
else {
Kore.mc.fontRendererObj.drawString(s, (int)x, (int)y, color);
}
}

private float getStringWidth(final String s, final boolean customFont) {
return customFont ? ((float)Fonts.getPrimary().getStringWidth(s)) : ((float)Kore.mc.fontRendererObj.getStringWidth(s));
@SubscribeEvent
public void onDraw(final ScoreboardRenderEvent event) {
if (!this.isToggled() || !this.customScoreboard.isEnabled()) {
return;
}
event.setCanceled(true);
ScoreboardHud.scoreboardHud.drawScreen(event.objective, event.resolution, this.customFont.isEnabled());
}
}
Loading

0 comments on commit 162887b

Please sign in to comment.