add bStats and fix package naming convention

xGinko · Dec 27, 2022 · 6f67c70 · 6f67c70
1 parent 1329941
commit 6f67c70
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 26 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.xGinko</groupId>
     <artifactId>BetterWorldStats</artifactId>
-    <version>1.3</version>
+    <version>1.3.1</version>
     <packaging>jar</packaging>
 
     <name>BetterWorldStats</name>
@@ -38,6 +38,12 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.bstats</pattern>
+                                    <shadedPattern>me.xginko.betterworldstats.bstats</shadedPattern>
+                                </relocation>
+                            </relocations>
                             <createDependencyReducedPom>false</createDependencyReducedPom>
                             <minimizeJar>true</minimizeJar>
                         </configuration>
@@ -79,16 +85,25 @@
             <version>1.12.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
+        <!-- PlaceholderAPI -->
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
             <version>2.11.2</version>
             <scope>provided</scope>
         </dependency>
+        <!-- reflections used for auto-lang feature -->
         <dependency>
             <groupId>org.reflections</groupId>
             <artifactId>reflections</artifactId>
             <version>0.10.2</version>
         </dependency>
+        <!-- bStats -->
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bukkit</artifactId>
+            <version>3.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/...ko/BetterWorldStats/BetterWorldStats.java → ...ko/betterworldstats/BetterWorldStats.java b/...ko/BetterWorldStats/BetterWorldStats.java → ...ko/betterworldstats/BetterWorldStats.java
@@ -1,9 +1,10 @@
-package me.xGinko.BetterWorldStats;
+package me.xGinko.betterworldstats;
 
-import me.xGinko.BetterWorldStats.commands.BetterWSCmd;
-import me.xGinko.BetterWorldStats.commands.WorldStatsCmd;
-import me.xGinko.BetterWorldStats.config.ConfigCache;
-import me.xGinko.BetterWorldStats.config.LanguageCache;
+import me.xGinko.betterworldstats.commands.BetterWSCmd;
+import me.xGinko.betterworldstats.commands.WorldStatsCmd;
+import me.xGinko.betterworldstats.config.ConfigCache;
+import me.xGinko.betterworldstats.config.LanguageCache;
+import org.bstats.bukkit.Metrics;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -51,6 +52,11 @@ public void onEnable() {
         logger.info(ChatColor.AQUA + "Registering commands");
         getCommand("betterws").setExecutor(new BetterWSCmd());
         getCommand("worldstats").setExecutor(new WorldStatsCmd());
+
+        // Metrics
+        logger.info("Loading Metrics");
+        new Metrics(this, 17204);
+
         logger.info(ChatColor.AQUA + "Done.");
     }
 

diff --git a/...Ginko/BetterWorldStats/PAPIExpansion.java → ...Ginko/betterworldstats/PAPIExpansion.java b/...Ginko/BetterWorldStats/PAPIExpansion.java → ...Ginko/betterworldstats/PAPIExpansion.java
@@ -1,7 +1,7 @@
-package me.xGinko.BetterWorldStats;
+package me.xGinko.betterworldstats;
 
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
-import me.xGinko.BetterWorldStats.config.ConfigCache;
+import me.xGinko.betterworldstats.config.ConfigCache;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/...etterWorldStats/commands/BetterWSCmd.java → ...etterworldstats/commands/BetterWSCmd.java b/...etterWorldStats/commands/BetterWSCmd.java → ...etterworldstats/commands/BetterWSCmd.java
@@ -1,7 +1,7 @@
-package me.xGinko.BetterWorldStats.commands;
+package me.xGinko.betterworldstats.commands;
 
-import me.xGinko.BetterWorldStats.commands.subcommands.ReloadCmd;
-import me.xGinko.BetterWorldStats.commands.subcommands.VersionCmd;
+import me.xGinko.betterworldstats.commands.subcommands.ReloadCmd;
+import me.xGinko.betterworldstats.commands.subcommands.VersionCmd;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;

diff --git a/...BetterWorldStats/commands/SubCommand.java → ...betterworldstats/commands/SubCommand.java b/...BetterWorldStats/commands/SubCommand.java → ...betterworldstats/commands/SubCommand.java
@@ -1,4 +1,4 @@
-package me.xGinko.BetterWorldStats.commands;
+package me.xGinko.betterworldstats.commands;
 
 import org.bukkit.command.CommandSender;
 

diff --git a/...terWorldStats/commands/WorldStatsCmd.java → ...terworldstats/commands/WorldStatsCmd.java b/...terWorldStats/commands/WorldStatsCmd.java → ...terworldstats/commands/WorldStatsCmd.java
@@ -1,8 +1,8 @@
-package me.xGinko.BetterWorldStats.commands;
+package me.xGinko.betterworldstats.commands;
 
 import me.clip.placeholderapi.PlaceholderAPI;
-import me.xGinko.BetterWorldStats.BetterWorldStats;
-import me.xGinko.BetterWorldStats.config.ConfigCache;
+import me.xGinko.betterworldstats.BetterWorldStats;
+import me.xGinko.betterworldstats.config.ConfigCache;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;

diff --git a/...Stats/commands/subcommands/ReloadCmd.java → ...stats/commands/subcommands/ReloadCmd.java b/...Stats/commands/subcommands/ReloadCmd.java → ...stats/commands/subcommands/ReloadCmd.java
@@ -1,7 +1,7 @@
-package me.xGinko.BetterWorldStats.commands.subcommands;
+package me.xGinko.betterworldstats.commands.subcommands;
 
-import me.xGinko.BetterWorldStats.BetterWorldStats;
-import me.xGinko.BetterWorldStats.commands.SubCommand;
+import me.xGinko.betterworldstats.BetterWorldStats;
+import me.xGinko.betterworldstats.commands.SubCommand;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.jetbrains.annotations.NotNull;

diff --git a/...tats/commands/subcommands/VersionCmd.java → ...tats/commands/subcommands/VersionCmd.java b/...tats/commands/subcommands/VersionCmd.java → ...tats/commands/subcommands/VersionCmd.java
@@ -1,7 +1,7 @@
-package me.xGinko.BetterWorldStats.commands.subcommands;
+package me.xGinko.betterworldstats.commands.subcommands;
 
-import me.xGinko.BetterWorldStats.BetterWorldStats;
-import me.xGinko.BetterWorldStats.commands.SubCommand;
+import me.xGinko.betterworldstats.BetterWorldStats;
+import me.xGinko.betterworldstats.commands.SubCommand;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 

diff --git a/.../BetterWorldStats/config/ConfigCache.java → .../betterworldstats/config/ConfigCache.java b/.../BetterWorldStats/config/ConfigCache.java → .../betterworldstats/config/ConfigCache.java
@@ -1,6 +1,6 @@
-package me.xGinko.BetterWorldStats.config;
+package me.xGinko.betterworldstats.config;
 
-import me.xGinko.BetterWorldStats.BetterWorldStats;
+import me.xGinko.betterworldstats.BetterWorldStats;
 import org.bukkit.configuration.file.FileConfiguration;
 
 import java.io.File;

diff --git a/...etterWorldStats/config/LanguageCache.java → ...etterworldstats/config/LanguageCache.java b/...etterWorldStats/config/LanguageCache.java → ...etterworldstats/config/LanguageCache.java
@@ -1,6 +1,6 @@
-package me.xGinko.BetterWorldStats.config;
+package me.xGinko.betterworldstats.config;
 
-import me.xGinko.BetterWorldStats.BetterWorldStats;
+import me.xGinko.betterworldstats.BetterWorldStats;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: BetterWorldStats
 version: ${project.version}
-main: me.xGinko.BetterWorldStats.BetterWorldStats
+main: me.xGinko.betterworldstats.BetterWorldStats
 prefix: BetterWorldStats
 authors: [ xGinko ]
 softdepend: [ PlaceholderAPI ]