From 648ef2070ebcd4fb037580dbf3e8271e219dfc4a Mon Sep 17 00:00:00 2001 From: Jascha Starke Date: Fri, 10 Apr 2015 23:02:32 +0200 Subject: [PATCH] Spigot 1.8.3-Update + Moved Metrics + Temporary disabled Worldedit-Integration --- pom.xml | 22 +++++++++++++++++++ .../limitedcreative/FeatureMetrics.java | 15 ++++++------- .../limitedcreative/ModBlockStates.java | 7 +++--- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index b195c45..8c23e65 100644 --- a/pom.xml +++ b/pom.xml @@ -66,6 +66,11 @@ md5 http://repo.md-5.net/content/groups/public/ + + + Plugin Metrics + http://repo.mcstats.org/content/repositories/public + @@ -128,6 +133,13 @@ coreprotect 2.0.8 + + + org.mcstats.bukkit + metrics + R7 + compile + @@ -146,6 +158,9 @@ de.jaschastarke.maven.AnnotationProcessor + + **/de/jaschastarke/minecraft/limitedcreative/blockstate/worldedit/* + @@ -196,6 +211,7 @@ de.jaschastarke:plib + org.mcstats.*:* @@ -207,6 +223,12 @@ + + + org.mcstats + de.jaschastarke.minecraft.limitedcreative.metrics + + diff --git a/src/main/java/de/jaschastarke/minecraft/limitedcreative/FeatureMetrics.java b/src/main/java/de/jaschastarke/minecraft/limitedcreative/FeatureMetrics.java index b3c3d11..66f1895 100644 --- a/src/main/java/de/jaschastarke/minecraft/limitedcreative/FeatureMetrics.java +++ b/src/main/java/de/jaschastarke/minecraft/limitedcreative/FeatureMetrics.java @@ -3,11 +3,10 @@ package de.jaschastarke.minecraft.limitedcreative; import java.io.IOException; import org.bukkit.event.Listener; +import org.mcstats.Metrics; import de.jaschastarke.bukkit.lib.CoreModule; import de.jaschastarke.bukkit.tools.stats.IStatistics; -import de.jaschastarke.bukkit.tools.stats.MCStatsMetrics; -import de.jaschastarke.bukkit.tools.stats.MCStatsMetrics.Graph; import de.jaschastarke.bukkit.tools.stats.PiwikStatistics; import de.jaschastarke.modularize.IModule; import de.jaschastarke.modularize.ModuleEntry; @@ -18,7 +17,7 @@ public class FeatureMetrics extends CoreModule implements Liste super(plugin); } private IStatistics metric; - private MCStatsMetrics mcstats = null; + private Metrics mcstats = null; @Override public void onEnable() { @@ -26,12 +25,12 @@ public class FeatureMetrics extends CoreModule implements Liste metric = new PiwikStatistics(plugin); if (mcstats == null) { try { - mcstats = new MCStatsMetrics(plugin); + mcstats = new Metrics(plugin); - Graph moduleGraph = mcstats.createGraph("Module Usage"); + Metrics.Graph moduleGraph = mcstats.createGraph("Module Usage"); for (final ModuleEntry mod : plugin.getModules()) { if (mod.getModule() instanceof CoreModule) { - moduleGraph.addPlotter(new MCStatsMetrics.Plotter(((CoreModule) mod.getModule()).getName()) { + moduleGraph.addPlotter(new Metrics.Plotter(((CoreModule) mod.getModule()).getName()) { @Override public int getValue() { return mod.getState() == ModuleState.ENABLED ? 1 : 0; @@ -39,9 +38,9 @@ public class FeatureMetrics extends CoreModule implements Liste }); } } - Graph depGraph = mcstats.createGraph("Dependencies"); + Metrics.Graph depGraph = mcstats.createGraph("Dependencies"); for (final String dep : plugin.getDescription().getSoftDepend()) { - depGraph.addPlotter(new MCStatsMetrics.Plotter(dep) { + depGraph.addPlotter(new Metrics.Plotter(dep) { @Override public int getValue() { return plugin.getServer().getPluginManager().isPluginEnabled(dep) ? 1 : 0; diff --git a/src/main/java/de/jaschastarke/minecraft/limitedcreative/ModBlockStates.java b/src/main/java/de/jaschastarke/minecraft/limitedcreative/ModBlockStates.java index 62f86bd..370cfd5 100644 --- a/src/main/java/de/jaschastarke/minecraft/limitedcreative/ModBlockStates.java +++ b/src/main/java/de/jaschastarke/minecraft/limitedcreative/ModBlockStates.java @@ -17,7 +17,7 @@ import de.jaschastarke.minecraft.limitedcreative.blockstate.HangingListener; import de.jaschastarke.minecraft.limitedcreative.blockstate.PlayerListener; import de.jaschastarke.minecraft.limitedcreative.blockstate.SyncronizedModel; import de.jaschastarke.minecraft.limitedcreative.blockstate.ThreadedModel; -import de.jaschastarke.minecraft.limitedcreative.blockstate.worldedit.LCEditSessionFactory; +//import de.jaschastarke.minecraft.limitedcreative.blockstate.worldedit.LCEditSessionFactory; import de.jaschastarke.modularize.IModule; import de.jaschastarke.modularize.ModuleEntry; @@ -77,11 +77,12 @@ public class ModBlockStates extends CoreModule { new BukkitRunnable() { @Override public void run() { - try { + getLog().warn("WorldEdit Integration is not Supported in this Version! Lookout for updates!"); + /*try { LCEditSessionFactory.initFactory(ModBlockStates.this); } catch (Exception e) { getLog().warn(plugin.getLocale().trans("block_state.warning.worldedit_sessionfactory_failed", e.getMessage())); - } + }*/ } }.runTaskLater(plugin, 1L); }