Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature: Show Custom Scoreboard outside SkyBlock #1881

Merged
merged 43 commits into from
Sep 9, 2024
Merged

Feature: Show Custom Scoreboard outside SkyBlock #1881

merged 43 commits into from
Sep 9, 2024

Conversation

j10a1n15
Copy link
Contributor

@j10a1n15 j10a1n15 commented May 24, 2024 •
edited by hannibal002
Loading

What

This Pull Request adds the functionality to use the Custom Scoreboard outside of SkyBlock but only on Hypixel, if it is added to the Dropdown. But there's a catch: You aren't able to use your own lines, it's just the normal outside lines + custom Title & Footer.
This one also adds the option to not use custom lines when using the Custom Scoreboard inside SkyBlock.

Images

grafik
grafik

Changelog New Features

  • Allowed the use of the Custom Scoreboard outside of SkyBlock, but only on Hypixel. - j10a1n15
  • Added an option to disable custom lines in the Custom Scoreboard. - j10a1n15

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 1, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Jun 1, 2024

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@j10a1n15
use custom lines
d3bc617 
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
@j10a1n15
Merge branch 'beta' into feature/scoreboard-outside-skyblock
6bcc56d
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 1, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Jun 1, 2024

Conflicts have been resolved! 🎉

@CalMWolfs CalMWolfs self-requested a review June 5, 2024 02:45
@github-actions GitHub Actions
Copy link

github-actions bot commented Jun 8, 2024

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 8, 2024
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 8, 2024
@github-actions GitHub Actions
Copy link

github-actions bot commented Jun 8, 2024

Conflicts have been resolved! 🎉

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 12, 2024
@github-actions GitHub Actions
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 12, 2024
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

@github-actions GitHub Actions
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Jun 13, 2024
@github-actions GitHub Actions
Copy link

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

@github-actions github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Aug 23, 2024
@j10a1n15
Merge branch 'refs/heads/beta' into feature/scoreboard-outside-skyblock
68d9d78 
# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/features/gui/customscoreboard/DisplayConfig.java
#	src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
@github-actions github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Aug 23, 2024
@github-actions GitHub Actions
Copy link

Conflicts have been resolved! 🎉

@j10a1n15
Merge branch 'beta' into feature/scoreboard-outside-skyblock
f8124e4
@j10a1n15
fix migrator
0c4c4c7 
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
@j10a1n15
Merge branch 'refs/heads/beta' into feature/scoreboard-outside-skyblock
4434d20
@j10a1n15
fix config migrator
a2a14e5 
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
@j10a1n15
Merge branch 'beta' into feature/scoreboard-outside-skyblock
79a08a3
@j10a1n15
fix migrator
8aebef0 
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
@jani270 jani270 added the Soon This Pull Request will be merged within the next couple of betas label Aug 26, 2024
hannibal002
hannibal002 requested changes Aug 31, 2024
View reviewed changes
Copy link
Owner

@hannibal002 hannibal002 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works fine on Hypixel (outside SB), but it breaks down (doesn't update anymore) when joining another server.
I see the Hypixel lobby data while on gomme hd server
image

@j10a1n15
Copy link
Contributor Author

Works fine on Hypixel (outside SB), but it breaks down (doesn't update anymore) when joining another server.

I see the Hypixel lobby data while on gomme hd server

image

It looks like the ScoreboardData isn't updated anymore when in other servers
Not sure why, but I'll look into it tomorrow

@j10a1n15
Merge branch 'beta' into feature/scoreboard-outside-skyblock
cd5a2fd
@j10a1n15
fixed cache thingy working outside of skyblock
dfc82a2 
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
@j10a1n15
fix
d7ac8d2 
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
@j10a1n15
Merge branch 'beta' into feature/scoreboard-outside-skyblock
5cfac98
@j10a1n15
clarify scoreboard outside
fcee8e5 
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
@j10a1n15
formatting
4700e02 
Signed-off-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com>
@j10a1n15
Merge branch 'beta' into feature/scoreboard-outside-skyblock
048bf30
@hannibal002 hannibal002 merged commit 2b4011e into hannibal002:beta Sep 9, 2024
4 checks passed
@github-actions github-actions bot removed the Soon This Pull Request will be merged within the next couple of betas label Sep 9, 2024
@j10a1n15 j10a1n15 deleted the feature/scoreboard-outside-skyblock branch September 9, 2024 14:08
MTOnline69 pushed a commit to MTOnline69/SkyHanni that referenced this pull request Sep 11, 2024
@j10a1n15 @CalMWolfs
@hannibal002 @MTOnline69
Feature: Show Custom Scoreboard outside SkyBlock (hannibal002#1881)
10a7e85 
Co-authored-by: Cal <cwolfson58@gmail.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CalMWolfs CalMWolfs CalMWolfs approved these changes

@hannibal002 hannibal002 Awaiting requested review from hannibal002

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Version 0.27
Development

Successfully merging this pull request may close these issues.
4 participants
@j10a1n15 @hannibal002 @CalMWolfs @jani270