Merge remote-tracking branch 'origin/1.15' into 1.15

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

@@ -104,6 +104,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_ID = 1403;
 
     private BukkitImplAdapter bukkitAdapter;
     private BukkitServerInterface server;
@@ -228,7 +229,7 @@ public class WorldEditPlugin extends JavaPlugin { //implements TabCompleter
         }
 
         // Enable metrics
-        new Metrics(this);
+        new Metrics(this, BSTATS_ID);
         PaperLib.suggestPaper(this);
     }
 

worldedit-bukkit/src/main/java/org/bstats/bukkit/Metrics.java

@@ -70,16 +70,21 @@ public class Metrics {
     // The plugin
     private final Plugin plugin;
 
+    // The plugin id
+    private final int bstatsId;
+
     /**
      * Class constructor.
      *
      * @param plugin The plugin which stats should be submitted.
+     * @param bstatsId The ID of the plugin. It can be found in the url when you open the plugin on bStats.
      */
-    public Metrics(Plugin plugin) {
+    public Metrics(Plugin plugin, int bstatsId) {
         if (plugin == null) {
             throw new IllegalArgumentException("Plugin cannot be null!");
         }
         this.plugin = plugin;
+        this.bstatsId = bstatsId;
 
         // Get the config file
         File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats");
@@ -181,6 +186,7 @@ public class Metrics {
         String pluginVersion = plugin.getDescription().getVersion();
 
         data.addProperty("pluginName", pluginName); // Append the name of the plugin
+        data.addProperty("id", bstatsId); // Append the id of the plugin
         data.addProperty("pluginVersion", pluginVersion); // Append the version of the plugin
         data.add("customCharts", new JsonArray());