From 98d48087378df69674fba88bbf066ff85cbe2fdb Mon Sep 17 00:00:00 2001 From: Andre601 <11576465+Andre601@users.noreply.github.com> Date: Tue, 18 May 2021 10:25:26 +0200 Subject: [PATCH] Remove Metrics from Velocity module (Not supported yet) --- .../oneversionremake/velocity/VelocityCore.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/velocity/src/main/java/com/andre601/oneversionremake/velocity/VelocityCore.java b/velocity/src/main/java/com/andre601/oneversionremake/velocity/VelocityCore.java index 7e1cbd7..1f41aad 100644 --- a/velocity/src/main/java/com/andre601/oneversionremake/velocity/VelocityCore.java +++ b/velocity/src/main/java/com/andre601/oneversionremake/velocity/VelocityCore.java @@ -35,8 +35,6 @@ import com.velocitypowered.api.plugin.annotation.DataDirectory; import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.server.ServerPing; -import org.bstats.charts.DrilldownPie; -import org.bstats.velocity.Metrics; import org.slf4j.LoggerFactory; import java.nio.file.Path; @@ -48,17 +46,13 @@ public class VelocityCore implements PluginCore{ private final ProxyServer proxy; private final Path path; - private final Metrics.Factory factory; - private OneVersionRemake core; - @Inject - public VelocityCore(ProxyServer proxy, @DataDirectory Path path, Metrics.Factory factory){ + @Inject // TODO: Re-Add Metrics.Factory factory once Velocity 2 supports it + public VelocityCore(ProxyServer proxy, @DataDirectory Path path){ this.logger = new VelocityLogger(LoggerFactory.getLogger("OneVersionRemake")); this.proxy = proxy; this.path = path; - - this.factory = factory; } @Subscribe @@ -86,9 +80,11 @@ public void loadEventListeners(){ @Override public void loadMetrics(){ - Metrics metrics = factory.make(this, 10341); + // TODO: Re-Add Metrics once available for Velocity 2 + //Metrics metrics = factory.make(this, 10341); + + //metrics.addCustomChart(new DrilldownPie("allowed_protocols", () -> core.getPieMap())); - metrics.addCustomChart(new DrilldownPie("allowed_protocols", () -> core.getPieMap())); } @Override