Skip to content

Commit

Permalink
feat: Added bStats Metrics
Browse files Browse the repository at this point in the history
  • Loading branch information
GeorgeV220 committed Jan 30, 2023
1 parent a57db4c commit 93b91b1
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 2 deletions.
9 changes: 9 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ allprojects {
compileOnly "com.georgev22.library:yaml:${libraryVersion}:all"
compileOnly "com.georgev22.library:minecraft:${libraryVersion}"

compileOnly "org.bstats:bstats-bukkit:3.0.0"
compileOnly "org.bstats:bstats-bungeecord:3.0.0"
compileOnly "org.bstats:bstats-velocity:3.0.0"
compileOnly "org.bstats:bstats-sponge:3.0.0"

compileOnly 'org.apache.logging.log4j:log4j-api:2.19.0'
compileOnly 'net.kyori:adventure-api:4.12.0'
Expand Down Expand Up @@ -115,6 +119,11 @@ dependencies {
implementation "com.georgev22.library:yaml:${libraryVersion}:all"
implementation "com.georgev22.library:minecraft:${libraryVersion}"

implementation "org.bstats:bstats-bukkit:3.0.0"
implementation "org.bstats:bstats-bungeecord:3.0.0"
implementation "org.bstats:bstats-velocity:3.0.0"
implementation "org.bstats:bstats-sponge:3.0.0"

implementation 'co.aikar:acf-paper:0.5.1-G-1.0-SNAPSHOT'
implementation 'co.aikar:acf-bungee:0.5.1-G-1.0-SNAPSHOT'
implementation 'co.aikar:acf-velocity:0.5.1-G-1.0-SNAPSHOT'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import com.georgev22.skinoverlay.utilities.interfaces.SkinOverlayImpl;
import com.georgev22.skinoverlay.utilities.player.PlayerObject;
import com.georgev22.skinoverlay.utilities.player.PlayerObjectBukkit;
import org.bstats.bukkit.Metrics;
import org.bukkit.Bukkit;
import org.bukkit.plugin.java.JavaPlugin;

Expand Down Expand Up @@ -70,6 +71,8 @@ public void onEnable() {
BukkitMinecraftUtils.registerListeners(this, new PlayerListeners(), new DeveloperInformListener());
if (OptionsUtil.PROXY.getBooleanValue())
Bukkit.getServer().getMessenger().registerIncomingPluginChannel(this, "skinoverlay:bungee", new PlayerListeners());
if(OptionsUtil.METRICS.getBooleanValue())
new Metrics(this, 17474);
}

public void onDisable() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.georgev22.skinoverlay.listeners.bungee.DeveloperInformListener;
import com.georgev22.skinoverlay.listeners.bungee.PlayerListeners;
import com.georgev22.skinoverlay.utilities.BungeeCordPluginMessageUtils;
import com.georgev22.skinoverlay.utilities.OptionsUtil;
import com.georgev22.skinoverlay.utilities.interfaces.SkinOverlayImpl;
import com.georgev22.skinoverlay.utilities.player.PlayerObject;
import com.georgev22.skinoverlay.utilities.player.PlayerObjectBungee;
Expand All @@ -22,6 +23,7 @@
import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.plugin.Plugin;
import net.md_5.bungee.connection.InitialHandler;
import org.bstats.bungeecord.Metrics;
import org.jetbrains.annotations.NotNull;

import java.io.File;
Expand Down Expand Up @@ -95,6 +97,8 @@ protected <T> GameProfile getGameProfile0(@NotNull PlayerObject playerObject) {
SkinOverlay.getInstance().setupCommands();
BungeeMinecraftUtils.registerListeners(this, new PlayerListeners(), new DeveloperInformListener());
getProxy().registerChannel("skinoverlay:bungee");
if(OptionsUtil.METRICS.getBooleanValue())
new Metrics(this, 17475);
enabled = true;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
import com.georgev22.skinoverlay.handler.handlers.SkinHandler_Sponge;
import com.georgev22.skinoverlay.listeners.sponge.DeveloperInformListener;
import com.georgev22.skinoverlay.listeners.sponge.PlayerListeners;
import com.georgev22.skinoverlay.utilities.OptionsUtil;
import com.georgev22.skinoverlay.utilities.interfaces.SkinOverlayImpl;
import com.georgev22.skinoverlay.utilities.player.PlayerObject;
import com.georgev22.skinoverlay.utilities.player.PlayerObjectSponge;
import com.google.common.collect.Lists;
import com.google.inject.Inject;
import org.apache.logging.log4j.Logger;
import org.bstats.sponge.Metrics;
import org.jetbrains.annotations.NotNull;
import org.spongepowered.api.Server;
import org.spongepowered.api.Sponge;
Expand Down Expand Up @@ -51,18 +53,20 @@ public class SkinOverlaySponge implements SkinOverlayImpl {
private final Logger logger;
private final PluginManager pluginManager;
private final PluginContainer pluginContainer;
private final Metrics.Factory metricsFactory;
private static SkinOverlaySponge skinOverlaySponge;

private Server server;
private int tick = 0;
private boolean isEnabled;

@Inject
public SkinOverlaySponge(Logger logger, PluginContainer container, @ConfigDir(sharedRoot = false) @NotNull Path configDir) {
public SkinOverlaySponge(Logger logger, PluginContainer container, @ConfigDir(sharedRoot = false) @NotNull Path configDir, Metrics.Factory metricsFactory) {
this.logger = logger;
this.pluginContainer = container;
this.dataFolder = new File(configDir.toUri());
this.pluginManager = Sponge.pluginManager();
this.metricsFactory = metricsFactory;
skinOverlaySponge = this;
onInit();
}
Expand Down Expand Up @@ -104,6 +108,8 @@ public void onLoad() {
public void onEnable() {
SkinOverlay.getInstance().setSkinHandler(new SkinHandler_Sponge());
SkinOverlay.getInstance().onEnable();
if(OptionsUtil.METRICS.getBooleanValue())
metricsFactory.make(17578);
this.isEnabled = true;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import com.georgev22.skinoverlay.handler.SkinHandler;
import com.georgev22.skinoverlay.listeners.velocity.DeveloperInformListener;
import com.georgev22.skinoverlay.listeners.velocity.PlayerListeners;
import com.georgev22.skinoverlay.utilities.OptionsUtil;
import com.georgev22.skinoverlay.utilities.VelocityPluginMessageUtils;
import com.georgev22.skinoverlay.utilities.interfaces.SkinOverlayImpl;
import com.georgev22.skinoverlay.utilities.player.PlayerObject;
Expand All @@ -27,6 +28,7 @@
import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.api.proxy.ProxyServer;
import com.velocitypowered.api.scheduler.ScheduledTask;
import org.bstats.velocity.Metrics;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;

Expand Down Expand Up @@ -60,6 +62,8 @@ public class SkinOverlayVelocity implements SkinOverlayImpl {

private final Plugin pluginAnnotation;

private final Metrics.Factory metricsFactory;

private ScheduledTask scheduledTask;

private int tick = 0;
Expand All @@ -74,14 +78,15 @@ public static SkinOverlayVelocity getInstance() {

@Contract(pure = true)
@Inject
public SkinOverlayVelocity(@NotNull ProxyServer server, @NotNull Logger logger, @DataDirectory @NotNull Path dataDirectory) {
public SkinOverlayVelocity(@NotNull ProxyServer server, @NotNull Logger logger, @DataDirectory @NotNull Path dataDirectory, Metrics.Factory metricsFactory) {
VelocityMinecraftUtils.setServer(server);
instance = this;
this.server = server;
this.logger = logger;
this.dataDirectory = dataDirectory;
this.dataFolder = dataDirectory.toFile();
this.pluginAnnotation = this.getClass().getAnnotation(Plugin.class);
this.metricsFactory = metricsFactory;
}

@Subscribe
Expand Down Expand Up @@ -138,6 +143,8 @@ protected <T> GameProfile getGameProfile0(@NotNull PlayerObject playerObject) {
SkinOverlay.getInstance().onEnable();
SkinOverlay.getInstance().setupCommands();
VelocityMinecraftUtils.registerListeners(this, new DeveloperInformListener(), new PlayerListeners());
if(OptionsUtil.METRICS.getBooleanValue())
metricsFactory.make(this,17476);
enabled = true;
}

Expand Down

0 comments on commit 93b91b1

Please sign in to comment.