diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/GuideSettings.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/GuideSettings.java index 98377f427..f11fdf4d0 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/GuideSettings.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/GuideSettings.java @@ -357,7 +357,12 @@ public final class GuideSettings { String info = entry.getKey(); if (!info.startsWith("&")) { - info = SlimefunPlugin.getLocal().getMessage(p, "guide.credits.roles." + info); + String[] segments = info.split(","); + info = SlimefunPlugin.getLocal().getMessage(p, "guide.credits.roles." + segments[0]); + + if (segments.length == 2) { + info += " &7(" + SlimefunPlugin.getLocal().getMessage(p, "languages." + segments[1]) + ")"; + } } if (entry.getValue() > 0) { diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/GitHubService.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/GitHubService.java index 00266c38f..487472e1f 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/GitHubService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/GitHubService.java @@ -45,13 +45,16 @@ public class GitHubService { } private void addDefaultContributors() { - Contributor thebusybiscuit = new Contributor("TheBusyBiscuit", "https://github.com/TheBusyBiscuit"); - thebusybiscuit.setContribution("&4Original Creator", 0); - contributors.put(thebusybiscuit.getName(), thebusybiscuit); - Contributor fuffles = new Contributor("Fuffles_"); fuffles.setContribution("&dSkull Texture Artist", 0); contributors.put(fuffles.getName(), fuffles); + + addTranslator("TheBusyBiscuit", "de"); + } + + private void addTranslator(String name, String language) { + Contributor contributor = contributors.computeIfAbsent(name, user -> new Contributor(user, "https://github.com/" + user)); + contributor.setContribution("translator," + language, 0); } public void connect(boolean logging) { diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/ContributionsConnector.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/ContributionsConnector.java index d6c8f49eb..147391229 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/ContributionsConnector.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/ContributionsConnector.java @@ -22,7 +22,9 @@ public class ContributionsConnector extends GitHubConnector { "ImgBotApp", "imgbot", "imgbot[bot]", - "github-actions[bot]" + "github-actions[bot]", + "gitlocalize-app", + "gitlocalize-app[bot]" ); // Matches a GitHub name with a Minecraft name. diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/Contributor.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/Contributor.java index 8217a30a3..7b0e80406 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/Contributor.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/Contributor.java @@ -77,6 +77,10 @@ public class Contributor { list.sort(Comparator.comparingInt(entry -> -entry.getValue())); return list; } + + public int getContributions(String role) { + return contributions.getOrDefault(role, 0); + } /** * Returns this Creator's head texture. diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubTask.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubTask.java index ae374d3e4..d3c8e1bbe 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubTask.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/github/GitHubTask.java @@ -1,5 +1,6 @@ package io.github.thebusybiscuit.slimefun4.core.services.github; +import java.io.IOException; import java.util.HashMap; import java.util.Map; import java.util.Optional;