Bstats Integration

TreeboMC · Dec 30, 2019 · 29d6522 · 29d6522
1 parent 77314f2
commit 29d6522
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.ShakeforProtein</groupId>
     <artifactId>TreeboTimed</artifactId>
-    <version>0.1.1</version>
+    <version>0.1.2</version>
     <packaging>jar</packaging>
 
     <name>TreeboTimed</name>
@@ -43,6 +43,29 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.1.0</version>
+                <!-- Do not include the <configuration>...</configuration> part if you are using Sponge! -->
+                <configuration>
+                    <relocations>
+                        <relocation>
+                            <pattern>org.bstats</pattern>
+                            <!-- Replace this with your package! -->
+                            <shadedPattern>me.shakeforprotein.treebotimed</shadedPattern>
+                        </relocation>
+                    </relocations>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
         <resources>
             <resource>
@@ -65,7 +88,10 @@
             <id>enginehub-maven</id>
             <url>http://maven.enginehub.org/repo/</url>
         </repository>
-
+        <repository>
+            <id>CodeMC</id>
+            <url>https://repo.codemc.org/repository/maven-public</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -86,5 +112,13 @@
             <artifactId>worldedit-bukkit</artifactId>
             <version>7.0.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.bstats</groupId>
+            <artifactId>bstats-bukkit</artifactId>
+            <version>1.5</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>
+
+
diff --git a/src/main/java/me/shakeforprotein/treebotimed/TreeboTimed.java b/src/main/java/me/shakeforprotein/treebotimed/TreeboTimed.java
@@ -3,6 +3,7 @@
 import com.sk89q.worldedit.WorldEdit;
 import me.shakeforprotein.treebotimed.Commands.*;
 import me.shakeforprotein.treebotimed.Listeners.PlaceSchem;
+import org.bstats.bukkit.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
@@ -44,11 +45,17 @@ public void onEnable() {
         this.getCommand("giveblueprint").setExecutor(new GiveBlueprint(this));
         this.getCommand("copyStone").setExecutor(new CopyStone());
         Bukkit.getPluginManager().registerEvents(new PlaceSchem(this), this);
-        setStoneQue();
+        if(getConfig().getBoolean("allowGenerateOres")) {
+            setStoneQue();
+        }
         if (getConfig().getBoolean("automaticPasting")) {
             setSchedule();
         }
-
+        if(getConfig().get("bstatsIntegration") != null) {
+            if (getConfig().getBoolean("bstatsIntegration")) {
+                Metrics metrics = new Metrics(this);
+            }
+        }
     }
 
     @Override
@@ -77,7 +84,8 @@ public boolean accept(File dir, String name) {
                     Bukkit.getScheduler().scheduleSyncRepeatingTask(this, new Runnable() {
                         @Override
                         public void run() {
-                            Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "pasteatorigin " + schematic.getAbsolutePath().replace(".scm", ""));
+                            //System.out.println(schematic.getAbsolutePath().replace(".scm", ""));
+                            Bukkit.dispatchCommand(Bukkit.getConsoleSender(), "pasteatorigin " + schematic.getName().replace(".scm", ""));
                         }
                     }, (interval * count), timespan);
                     count++;
@@ -94,7 +102,7 @@ public void run() {
                                 if (p.getLocation().getBlockX() > (x - 50) && p.getLocation().getBlockX() < (x + 50)) {
                                     if (p.getLocation().getBlockZ() > (z - 50) && p.getLocation().getBlockZ() < (z + 50)) {
                                         if (p.getLocation().getBlockY() > (y - 15) && p.getLocation().getBlockY() < (y + 50)) {
-                                            p.sendMessage(badge + " Resetting farm " + ChatColor.GOLD + schematic.getName().replace(".scm", "") + ChatColor.RESET + " in " + ChatColor.RED + ChatColor.BOLD + "ONE" + ChatColor.RESET + " Minute");
+                                            //p.sendMessage(badge + " Resetting farm " + ChatColor.GOLD + schematic.getName().replace(".scm", "") + ChatColor.RESET + " in " + ChatColor.RED + ChatColor.BOLD + "ONE" + ChatColor.RESET + " Minute");
                                         }
                                     }
                                 }

diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -1,6 +1,8 @@
 automaticPasting: true
+allowGenerateOres: false
 totalInterval: 30
 stoneRegenModifier: 40
+bstatsIntegration: true
 badge: '&3&l[&2Treebo Timed&3&l]&r'
 oreWeights:
   EMERALD_ORE: 100

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,18 +1,18 @@
 name: TreeboTimed
 version: ${project.version}
 main: me.shakeforprotein.treebotimed.TreeboTimed
-api-version: 1.15
+api-version: 1.13
 authors: [ShakeforProtein]
 depend: [WorldEdit, WorldGuard]
 
 permissions:
   treebotimed.doit:
     default: op
   treebotimed.admin:
-    default: false
+    default: op
   treebotimed.giveblueprint:
     description: Allows the use of giveBluprint command
-    default: false
+    default: op
 
 commands:
   giveblueprint: