diff --git a/pom.xml b/pom.xml index 6e78139..00fbaf8 100644 --- a/pom.xml +++ b/pom.xml @@ -76,6 +76,13 @@ 2.0-SNAPSHOT + + org.bstats + bstats-bukkit + 3.0.0 + compile + + org.jetbrains annotations @@ -127,6 +134,10 @@ com.tchristofferson com.gmail.artemis.the.gr8.tchristofferson + + org.bstats + com.gmail.artemis.the.gr8.bstats + diff --git a/src/main/java/com/gmail/artemis/the/gr8/playerstats/Main.java b/src/main/java/com/gmail/artemis/the/gr8/playerstats/Main.java index d0105ee..b56e38b 100644 --- a/src/main/java/com/gmail/artemis/the/gr8/playerstats/Main.java +++ b/src/main/java/com/gmail/artemis/the/gr8/playerstats/Main.java @@ -13,6 +13,7 @@ import com.gmail.artemis.the.gr8.playerstats.statistic.RequestManager; import com.gmail.artemis.the.gr8.playerstats.statistic.StatManager; import com.gmail.artemis.the.gr8.playerstats.utils.OfflinePlayerHandler; import net.kyori.adventure.platform.bukkit.BukkitAudiences; +import org.bstats.bukkit.Metrics; import org.bukkit.Bukkit; import org.bukkit.command.PluginCommand; import org.bukkit.plugin.java.JavaPlugin; @@ -32,6 +33,8 @@ public final class Main extends JavaPlugin { @Override public void onEnable() { //TODO fix (move these two into initializeMainClasses also, and remove all the Main.get... methods) + Metrics metrics = new Metrics(this, 15923); + //first get an instance of all the classes that need to be passed along to different classes ConfigHandler config = new ConfigHandler(this); OfflinePlayerHandler offlinePlayerHandler = new OfflinePlayerHandler(); diff --git a/src/main/java/com/gmail/artemis/the/gr8/playerstats/api/PlayerStats.java b/src/main/java/com/gmail/artemis/the/gr8/playerstats/api/PlayerStats.java index 024f1de..b4c2586 100644 --- a/src/main/java/com/gmail/artemis/the/gr8/playerstats/api/PlayerStats.java +++ b/src/main/java/com/gmail/artemis/the/gr8/playerstats/api/PlayerStats.java @@ -50,7 +50,7 @@ public interface PlayerStats { Adventure's TextComponents, you can call this method to turn any stat-result into a String. @return a String representation of this TextComponent, without color and style, but with line-breaks*/ default String statResultComponentToString(TextComponent statResult) { - return LegacyComponentSerializer.builder().hexColors().build().serialize(statResult); + return LegacyComponentSerializer.builder().hexColors().useUnusualXRepeatedCharacterHexFormat().build().serialize(statResult); } /** Get a formatted player-statistic of Statistic.Type UNTYPED. diff --git a/src/main/java/com/gmail/artemis/the/gr8/playerstats/api/PlayerStatsAPI.java b/src/main/java/com/gmail/artemis/the/gr8/playerstats/api/PlayerStatsAPI.java index 43c7ce8..82951ba 100644 --- a/src/main/java/com/gmail/artemis/the/gr8/playerstats/api/PlayerStatsAPI.java +++ b/src/main/java/com/gmail/artemis/the/gr8/playerstats/api/PlayerStatsAPI.java @@ -4,6 +4,7 @@ import com.gmail.artemis.the.gr8.playerstats.enums.Target; import com.gmail.artemis.the.gr8.playerstats.models.StatRequest; import com.gmail.artemis.the.gr8.playerstats.statistic.RequestManager; import com.gmail.artemis.the.gr8.playerstats.statistic.StatManager; +import com.gmail.artemis.the.gr8.playerstats.utils.MyLogger; import net.kyori.adventure.text.TextComponent; import org.bukkit.Material; import org.bukkit.Statistic; @@ -79,6 +80,7 @@ public final class PlayerStatsAPI implements PlayerStats { @Nullable Material material, @Nullable EntityType entity, @Nullable String playerName) throws NullPointerException { StatRequest request = requestManager.generateRequest(selection, statistic, material, entity, playerName); if (requestManager.validateAPIRequest(request)) { + MyLogger.logMsg("API is being called! We are calculating a " + selection + "for " + statistic); switch (selection) { case PLAYER -> { int stat = statManager.getPlayerStat(request); diff --git a/src/main/java/com/gmail/artemis/the/gr8/playerstats/msg/msgutils/EasterEggProvider.java b/src/main/java/com/gmail/artemis/the/gr8/playerstats/msg/msgutils/EasterEggProvider.java index 3bd77b3..7a66f1a 100644 --- a/src/main/java/com/gmail/artemis/the/gr8/playerstats/msg/msgutils/EasterEggProvider.java +++ b/src/main/java/com/gmail/artemis/the/gr8/playerstats/msg/msgutils/EasterEggProvider.java @@ -51,7 +51,7 @@ public final class EasterEggProvider { } case "46dd0c5a-2b51-4ee6-80e8-29deca6dedc1" -> { if (sillyNumberIsBetween(sillyNumber, 0, 20)) { - playerName = "fire demon"; + playerName = "fire demon"; } else if (sillyNumberIsBetween(sillyNumber, 69, 69)) { playerName = "best admin";