Skip to content

fix: make research placeholder use same math logic as stats #4320

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

Open
wants to merge 1 commit into
base: experimental
Choose a base branch
from
Open

fix: make research placeholder use same math logic as stats #4320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/io/github/thebusybiscuit/slimefun4/api/player/PlayerProfile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ public final void markDirty() {
return Optional.empty();
}

private int countNonEmptyResearches(@Nonnull Collection<Research> researches) {
public int countNonEmptyResearches(@Nonnull Collection<Research> researches) {
int count = 0;
for (Research research : researches) {
if (research.hasEnabledItems()) {
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/io/github/thebusybiscuit/slimefun4/integrations/PlaceholderAPIIntegration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,9 @@ public String onRequest(@Nullable OfflinePlayer p, @Nonnull String params) {
Optional<PlayerProfile> profile = PlayerProfile.find(p);

if (profile.isPresent()) {
Set<Research> set = profile.get().getResearches();
return String.valueOf(Math.round(((set.size() * 100.0F) / Slimefun.getRegistry().getResearches().size()) * 100.0F) / 100.0F);
int unlockedResearches = profile.get().countNonEmptyResearches(profile.get().getResearches());
int allResearches = profile.get().countNonEmptyResearches(Slimefun.getRegistry().getResearches());
return String.valueOf(Math.round(((unlockedResearches * 100.0F) / allResearches) * 100.0F) / 100.0F);
} else if (p instanceof Player player) {
return getProfilePlaceholder(player);
}
Expand Down
Loading