EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-25 02:04:44 +02:00
Code Issues Projects Releases Wiki Activity

Metrics

Browse Source
This commit is contained in:
MattBDev
2016-07-16 22:51:49 -04:00
parent 8b0e59209c
commit 8538170cba
17 changed files with 268 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Sponge/build.gradle
View File

@ -19,12 +19,18 @@ apply plugin: 'net.minecrell.vanilla.server.library'
dependencies {
compile project(':Core')
compile 'org.spongepowered:spongeapi:5.0.0-SNAPSHOT'
compile 'net.minecrell.mcstats:statslite-sponge:0.2.2'
}
sourceCompatibility = 1.8
targetCompatibility = 1.8
repositories {
maven {
name = 'minecrell'
url = 'http://repo.minecrell.net/releases'
}
maven {
name = 'forge'
url = 'http://files.minecraftforge.net/maven'
@ -51,9 +57,9 @@ processResources {
shadowJar {
dependencies {
include(dependency(':Core'))
//include(dependency('org.mcstats.sponge:metrics:R8-SNAPSHOT'))
include dependency('net.minecrell.mcstats:statslite-sponge')
}
//relocate 'org.mcstats', 'com.plotsquared.stats'
relocate 'net.minecrell.mcstats', 'com.plotsquared.util.mcstats'
archiveName = "${parent.name}-${project.name}-${parent.version}.jar"
destinationDir = file '../target'
}

18
Sponge/src/main/java/com/plotsquared/sponge/SpongeMain.java
View File

@ -41,7 +41,6 @@ import com.plotsquared.sponge.util.SpongeEconHandler;
import com.plotsquared.sponge.util.SpongeEventUtil;
import com.plotsquared.sponge.util.SpongeHybridUtils;
import com.plotsquared.sponge.util.SpongeInventoryUtil;
import com.plotsquared.sponge.util.SpongeMetrics;
import com.plotsquared.sponge.util.SpongeSchematicHandler;
import com.plotsquared.sponge.util.SpongeSetupUtils;
import com.plotsquared.sponge.util.SpongeTaskManager;
@ -51,6 +50,7 @@ import com.plotsquared.sponge.util.block.SpongeLocalQueue;
import com.plotsquared.sponge.uuid.SpongeLowerOfflineUUIDWrapper;
import com.plotsquared.sponge.uuid.SpongeOnlineUUIDWrapper;
import com.plotsquared.sponge.uuid.SpongeUUIDHandler;
import net.minecrell.mcstats.SpongeStatsLite;
import org.slf4j.Logger;
import org.spongepowered.api.Game;
import org.spongepowered.api.Server;
@ -59,6 +59,7 @@ import org.spongepowered.api.config.ConfigDir;
import org.spongepowered.api.entity.living.player.Player;
import org.spongepowered.api.event.Listener;
import org.spongepowered.api.event.game.state.GameAboutToStartServerEvent;
import org.spongepowered.api.event.game.state.GamePreInitializationEvent;
import org.spongepowered.api.plugin.Plugin;
import org.spongepowered.api.plugin.PluginContainer;
import org.spongepowered.api.profile.GameProfileManager;
@ -90,6 +91,9 @@ public class SpongeMain implements IPlotMain {
@Inject
private Game game;
@Inject
public SpongeStatsLite stats;
private Server server;
@Inject
@ -98,8 +102,7 @@ public class SpongeMain implements IPlotMain {
private GameProfileManager resolver;
// @Override
public Logger getLogger() {
private Logger getLogger() {
return this.logger;
}
@ -122,6 +125,12 @@ public class SpongeMain implements IPlotMain {
return THIS;
}
@Listener
public void onPreInitialize(GamePreInitializationEvent event) {
getLogger().info("The metrics section in PlotSquared is ignored in favor of the actual metrics reporter configurations.");
this.stats.start();
}
@Listener
public void onServerAboutToStart(GameAboutToStartServerEvent event) {
THIS = this;
@ -295,9 +304,6 @@ public class SpongeMain implements IPlotMain {
@Override
public void startMetrics() {
SpongeMetrics metrics = new SpongeMetrics(this.game, this.plugin);
metrics.start();
PS.log(C.PREFIX.s() + "&6Metrics enabled.");
}
@Override