Bump bStats version and update 7.1.0 changelog

CHANGELOG.txt

@@ -1,16 +1,10 @@
-7.1.0 Release Candidate 1
+7.1.0
 - Improve the expression parser by compiling expressions for performance
 - Made ItemMaterial accessible via the API
 - Added CommandSender adapters to the BukkitAdapter class
 - Added legacy data values to the info tool, and expressions
 - Improve messages when running the wrong WorldEdit version for the MC version
 - Fixed an issue where other plugins could send bad data to clients using the WorldEdit API
-Fixes from 7.1.0 Beta 1:
-- Fixed regen on Spigot modifying world name to plugins hooking WorldEdit
-- Fixed the Java Garbage Collector sometimes breaking regen
-- Fixed translation string for "//redo"
-
-7.1.0 Beta 1
 - Significant memory optimisations. Many operations will now require less RAM.
 - Added WorldEdit-CLI, a tool to run headless WorldEdit from the commandline (see https://matthewmiller.dev/blog/introducing-worldeditcli/)
 - Allowed most WorldEdit commands to be run from the console

worldedit-bukkit/build.gradle.kts

@@ -29,7 +29,7 @@ dependencies {
     "implementation"("io.papermc:paperlib:1.0.2")
     "compileOnly"("com.sk89q:dummypermscompat:1.10")
     "implementation"("org.apache.logging.log4j:log4j-slf4j-impl:2.8.1")
-    "implementation"("org.bstats:bstats-bukkit:1.5")
+    "implementation"("org.bstats:bstats-bukkit:1.7")
     "testCompile"("org.mockito:mockito-core:1.9.0-rc1")
 }
 
@@ -60,7 +60,7 @@ tasks.named<ShadowJar>("shadowJar") {
         include(dependency("org.apache.logging.log4j:log4j-slf4j-impl"))
         include(dependency("org.antlr:antlr4-runtime"))
         relocate("org.bstats", "com.sk89q.worldedit.bukkit.bstats") {
-            include(dependency("org.bstats:bstats-bukkit:1.5"))
+            include(dependency("org.bstats:bstats-bukkit:1.7"))
         }
         relocate("io.papermc.lib", "com.sk89q.worldedit.bukkit.paperlib") {
             include(dependency("io.papermc:paperlib:1.0.2"))

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java

@@ -98,6 +98,7 @@ public class WorldEditPlugin extends JavaPlugin implements TabCompleter {
     private static final Logger log = LoggerFactory.getLogger(WorldEditPlugin.class);
     public static final String CUI_PLUGIN_CHANNEL = "worldedit:cui";
     private static WorldEditPlugin INSTANCE;
+    private static final int BSTATS_PLUGIN_ID = 3328;
 
     private BukkitImplAdapter bukkitAdapter;
     private BukkitServerInterface server;
@@ -156,7 +157,7 @@ public class WorldEditPlugin extends JavaPlugin implements TabCompleter {
         }
 
         // Enable metrics
-        new Metrics(this);
+        new Metrics(this, BSTATS_PLUGIN_ID);
         PaperLib.suggestPaper(this);
     }
 

worldedit-sponge/build.gradle.kts

@@ -15,7 +15,7 @@ dependencies {
     compile(project(":worldedit-core"))
     compile(project(":worldedit-libs:sponge"))
     compile("org.spongepowered:spongeapi:7.1.0")
-    compile("org.bstats:bstats-sponge:1.5")
+    compile("org.bstats:bstats-sponge:1.7")
     testCompile("org.mockito:mockito-core:1.9.0-rc1")
 }
 
@@ -35,7 +35,7 @@ tasks.named<Jar>("jar") {
 tasks.named<ShadowJar>("shadowJar") {
     dependencies {
         relocate ("org.bstats", "com.sk89q.worldedit.sponge.bstats") {
-            include(dependency("org.bstats:bstats-sponge:1.5"))
+            include(dependency("org.bstats:bstats-sponge:1.7"))
         }
     }
 }

worldedit-sponge/src/main/java/com/sk89q/worldedit/sponge/SpongeWorldEdit.java

@@ -80,10 +80,10 @@ public class SpongeWorldEdit {
     @Inject
     private Logger logger;
 
-    @Inject
     private Metrics2 metrics;
 
     public static final String MOD_ID = "worldedit";
+    private static final int BSTATS_PLUGIN_ID = 3329;
 
     private SpongePermissionsProvider provider;
 
@@ -109,8 +109,10 @@ public class SpongeWorldEdit {
     @Inject @ConfigDir(sharedRoot = false)
     private File workingDir;
 
-    public SpongeWorldEdit() {
+    @Inject
+    public SpongeWorldEdit(Metrics2.Factory metricsFactory) {
         inst = this;
+        metrics = metricsFactory.make(BSTATS_PLUGIN_ID);
     }
 
     @Listener