Upstream/BlueMap
1
0
Fork 0
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git synced 2024-11-25 12:05:13 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'base'

Browse Source
This commit is contained in:
Blue (Lukas Rieger) 2020-08-21 11:42:18 +02:00
commit af938c8f14
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BlueMapBukkit/build.gradle
View File

@ -11,7 +11,7 @@ repositories {
dependencies { dependencies {
shadow "org.spigotmc:spigot-api:1.16.2-R0.1-SNAPSHOT" shadow "org.spigotmc:spigot-api:1.16.2-R0.1-SNAPSHOT"
compile group: 'org.bstats', name: 'bstats-bukkit-lite', version: '1.7' compile group: 'org.bstats', name: 'bstats-bukkit-lite', version: '1.5'
compile (project(':BlueMapCommon')) { compile (project(':BlueMapCommon')) {
//exclude dependencies provided by bukkit //exclude dependencies provided by bukkit

4
BlueMapBukkit/src/main/java/de/bluecolored/bluemap/bukkit/BukkitPlugin.java
View File

@ -85,7 +85,6 @@ public BukkitPlugin() {
@Override @Override
public void onEnable() { public void onEnable() {
new MetricsLite(this, 5912);
//save world so the level.dat is present on new worlds //save world so the level.dat is present on new worlds
Logger.global.logInfo("Saving all worlds once, to make sure the level.dat is present..."); Logger.global.logInfo("Saving all worlds once, to make sure the level.dat is present...");
@ -137,6 +136,9 @@ public void onEnable() {
this.pluginInstance.unload(); this.pluginInstance.unload();
} }
}); });
//init bstats
new MetricsLite(this);
} }
@Override @Override

2
BlueMapSponge/build.gradle
View File

@ -1,7 +1,7 @@
dependencies { dependencies {
shadow "org.spongepowered:spongeapi:7.2.0" shadow "org.spongepowered:spongeapi:7.2.0"
compile group: 'org.bstats', name: 'bstats-sponge-lite', version: '1.7' compile group: 'org.bstats', name: 'bstats-sponge-lite', version: '1.5'
compile (project(':BlueMapCommon')) { compile (project(':BlueMapCommon')) {
//exclude dependencies provided by sponge //exclude dependencies provided by sponge

9
BlueMapSponge/src/main/java/de/bluecolored/bluemap/sponge/SpongePlugin.java
View File

@ -75,6 +75,10 @@ public class SpongePlugin implements ServerInterface {
@ConfigDir(sharedRoot = false) @ConfigDir(sharedRoot = false)
private Path configurationDir; private Path configurationDir;
@Inject
@SuppressWarnings("unused")
private MetricsLite2 metrics;
private Plugin pluginInstance; private Plugin pluginInstance;
private SpongeCommands commands; private SpongeCommands commands;
@ -85,7 +89,7 @@ public class SpongePlugin implements ServerInterface {
private List<SpongePlayer> onlinePlayerList; private List<SpongePlayer> onlinePlayerList;
@Inject @Inject
public SpongePlugin(org.slf4j.Logger logger, MetricsLite2.Factory bstatsFactory) { public SpongePlugin(org.slf4j.Logger logger) {
Logger.global = new Slf4jLogger(logger); Logger.global = new Slf4jLogger(logger);
this.onlinePlayerMap = new ConcurrentHashMap<>(); this.onlinePlayerMap = new ConcurrentHashMap<>();
@ -93,9 +97,6 @@ public SpongePlugin(org.slf4j.Logger logger, MetricsLite2.Factory bstatsFactory)
this.pluginInstance = new Plugin("sponge", this); this.pluginInstance = new Plugin("sponge", this);
this.commands = new SpongeCommands(pluginInstance); this.commands = new SpongeCommands(pluginInstance);
//init bstats metrics
bstatsFactory.make(5911);
} }
@Listener @Listener

2
gradle.properties
View File

@ -1,6 +1,6 @@
org.gradle.jvmargs=-Xmx3G org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false org.gradle.daemon=false
coreVersion=0.10.2 coreVersion=0.10.3
targetVersion=mc1.16 targetVersion=mc1.16