mirror of
https://github.com/DieReicheErethons/Brewery.git
synced 2024-09-29 04:07:30 +02:00
Merge pull request #407 from TheBusyBiscuit/update/bstats
Updated bStats to v2
This commit is contained in:
commit
42cf677803
16
pom.xml
16
pom.xml
@ -56,13 +56,13 @@
|
|||||||
<configuration>
|
<configuration>
|
||||||
<artifactSet>
|
<artifactSet>
|
||||||
<includes>
|
<includes>
|
||||||
<include>org.bstats:bstats-bukkit</include>
|
<include>org.bstats:*</include>
|
||||||
</includes>
|
</includes>
|
||||||
</artifactSet>
|
</artifactSet>
|
||||||
<relocations>
|
<relocations>
|
||||||
<relocation>
|
<relocation>
|
||||||
<pattern>org.bstats.bukkit</pattern>
|
<pattern>org.bstats</pattern>
|
||||||
<shadedPattern>com.dre.brewery.integration</shadedPattern>
|
<shadedPattern>com.dre.brewery.integration.bstats</shadedPattern>
|
||||||
</relocation>
|
</relocation>
|
||||||
</relocations>
|
</relocations>
|
||||||
</configuration>
|
</configuration>
|
||||||
@ -98,7 +98,7 @@
|
|||||||
<repositories>
|
<repositories>
|
||||||
<repository>
|
<repository>
|
||||||
<id>md_5-public</id>
|
<id>md_5-public</id>
|
||||||
<url>http://repo.md-5.net/content/groups/public/</url>
|
<url>https://repo.md-5.net/content/groups/public/</url>
|
||||||
</repository>
|
</repository>
|
||||||
<repository>
|
<repository>
|
||||||
<id>spigot-repo</id>
|
<id>spigot-repo</id>
|
||||||
@ -106,12 +106,12 @@
|
|||||||
</repository>
|
</repository>
|
||||||
<repository>
|
<repository>
|
||||||
<id>vault-repo</id>
|
<id>vault-repo</id>
|
||||||
<url>http://nexus.hc.to/content/repositories/pub_releases</url>
|
<url>https://nexus.hc.to/content/repositories/pub_releases</url>
|
||||||
</repository>
|
</repository>
|
||||||
<repository>
|
<repository>
|
||||||
<!-- WorldEdit, WorldGuard -->
|
<!-- WorldEdit, WorldGuard -->
|
||||||
<id>sk89q-repo</id>
|
<id>sk89q-repo</id>
|
||||||
<url>http://maven.sk89q.com/repo/</url>
|
<url>https://maven.sk89q.com/repo/</url>
|
||||||
</repository>
|
</repository>
|
||||||
<repository>
|
<repository>
|
||||||
<!-- GriefPrevention, SlimeFun, Towny, Brewery -->
|
<!-- GriefPrevention, SlimeFun, Towny, Brewery -->
|
||||||
@ -128,7 +128,7 @@
|
|||||||
<url>https://repo.minebench.de/</url>
|
<url>https://repo.minebench.de/</url>
|
||||||
</repository>
|
</repository>
|
||||||
<repository>
|
<repository>
|
||||||
<!-- bStats -->
|
<!-- BlockLocker -->
|
||||||
<id>CodeMC</id>
|
<id>CodeMC</id>
|
||||||
<url>https://repo.codemc.org/repository/maven-public</url>
|
<url>https://repo.codemc.org/repository/maven-public</url>
|
||||||
</repository>
|
</repository>
|
||||||
@ -297,7 +297,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.bstats</groupId>
|
<groupId>org.bstats</groupId>
|
||||||
<artifactId>bstats-bukkit</artifactId>
|
<artifactId>bstats-bukkit</artifactId>
|
||||||
<version>1.5</version>
|
<version>2.2.1</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -16,6 +16,7 @@ import com.dre.brewery.utility.BUtil;
|
|||||||
import com.dre.brewery.utility.LegacyUtil;
|
import com.dre.brewery.utility.LegacyUtil;
|
||||||
import org.apache.commons.lang.math.NumberUtils;
|
import org.apache.commons.lang.math.NumberUtils;
|
||||||
import org.bstats.bukkit.Metrics;
|
import org.bstats.bukkit.Metrics;
|
||||||
|
import org.bstats.charts.*;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
@ -286,12 +287,12 @@ public class P extends JavaPlugin {
|
|||||||
|
|
||||||
private void setupMetrics() {
|
private void setupMetrics() {
|
||||||
try {
|
try {
|
||||||
Metrics metrics = new Metrics(this);
|
Metrics metrics = new Metrics(this, 3494);
|
||||||
metrics.addCustomChart(new Metrics.SingleLineChart("drunk_players", BPlayer::numDrunkPlayers));
|
metrics.addCustomChart(new SingleLineChart("drunk_players", BPlayer::numDrunkPlayers));
|
||||||
metrics.addCustomChart(new Metrics.SingleLineChart("brews_in_existence", () -> brewsCreated));
|
metrics.addCustomChart(new SingleLineChart("brews_in_existence", () -> brewsCreated));
|
||||||
metrics.addCustomChart(new Metrics.SingleLineChart("barrels_built", () -> Barrel.barrels.size()));
|
metrics.addCustomChart(new SingleLineChart("barrels_built", Barrel.barrels::size));
|
||||||
metrics.addCustomChart(new Metrics.SingleLineChart("cauldrons_boiling", () -> BCauldron.bcauldrons.size()));
|
metrics.addCustomChart(new SingleLineChart("cauldrons_boiling", BCauldron.bcauldrons::size));
|
||||||
metrics.addCustomChart(new Metrics.AdvancedPie("brew_quality", () -> {
|
metrics.addCustomChart(new AdvancedPie("brew_quality", () -> {
|
||||||
Map<String, Integer> map = new HashMap<>(8);
|
Map<String, Integer> map = new HashMap<>(8);
|
||||||
map.put("excellent", exc);
|
map.put("excellent", exc);
|
||||||
map.put("good", good);
|
map.put("good", good);
|
||||||
@ -300,14 +301,14 @@ public class P extends JavaPlugin {
|
|||||||
map.put("terrible", terr);
|
map.put("terrible", terr);
|
||||||
return map;
|
return map;
|
||||||
}));
|
}));
|
||||||
metrics.addCustomChart(new Metrics.AdvancedPie("brews_created", () -> {
|
metrics.addCustomChart(new AdvancedPie("brews_created", () -> {
|
||||||
Map<String, Integer> map = new HashMap<>(4);
|
Map<String, Integer> map = new HashMap<>(4);
|
||||||
map.put("by command", brewsCreatedCmd);
|
map.put("by command", brewsCreatedCmd);
|
||||||
map.put("brewing", brewsCreated - brewsCreatedCmd);
|
map.put("brewing", brewsCreated - brewsCreatedCmd);
|
||||||
return map;
|
return map;
|
||||||
}));
|
}));
|
||||||
|
|
||||||
metrics.addCustomChart(new Metrics.SimplePie("number_of_recipes", () -> {
|
metrics.addCustomChart(new SimplePie("number_of_recipes", () -> {
|
||||||
int recipes = BRecipe.getAllRecipes().size();
|
int recipes = BRecipe.getAllRecipes().size();
|
||||||
if (recipes < 7) {
|
if (recipes < 7) {
|
||||||
return "Less than 7";
|
return "Less than 7";
|
||||||
@ -339,7 +340,7 @@ public class P extends JavaPlugin {
|
|||||||
|
|
||||||
}));
|
}));
|
||||||
|
|
||||||
metrics.addCustomChart(new Metrics.SimplePie("wakeups", () -> {
|
metrics.addCustomChart(new SimplePie("wakeups", () -> {
|
||||||
if (!BConfig.enableHome) {
|
if (!BConfig.enableHome) {
|
||||||
return "disabled";
|
return "disabled";
|
||||||
}
|
}
|
||||||
@ -356,7 +357,7 @@ public class P extends JavaPlugin {
|
|||||||
return "More than 20";
|
return "More than 20";
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
metrics.addCustomChart(new Metrics.SimplePie("v2_mc_version", () -> {
|
metrics.addCustomChart(new SimplePie("v2_mc_version", () -> {
|
||||||
String mcv = Bukkit.getBukkitVersion();
|
String mcv = Bukkit.getBukkitVersion();
|
||||||
mcv = mcv.substring(0, mcv.indexOf('.', 2));
|
mcv = mcv.substring(0, mcv.indexOf('.', 2));
|
||||||
int index = mcv.indexOf('-');
|
int index = mcv.indexOf('-');
|
||||||
@ -370,7 +371,7 @@ public class P extends JavaPlugin {
|
|||||||
return "undef";
|
return "undef";
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
metrics.addCustomChart(new Metrics.DrilldownPie("plugin_mc_version", () -> {
|
metrics.addCustomChart(new DrilldownPie("plugin_mc_version", () -> {
|
||||||
Map<String, Map<String, Integer>> map = new HashMap<>(3);
|
Map<String, Map<String, Integer>> map = new HashMap<>(3);
|
||||||
String mcv = Bukkit.getBukkitVersion();
|
String mcv = Bukkit.getBukkitVersion();
|
||||||
mcv = mcv.substring(0, mcv.indexOf('.', 2));
|
mcv = mcv.substring(0, mcv.indexOf('.', 2));
|
||||||
@ -389,9 +390,9 @@ public class P extends JavaPlugin {
|
|||||||
map.put(getDescription().getVersion(), innerMap);
|
map.put(getDescription().getVersion(), innerMap);
|
||||||
return map;
|
return map;
|
||||||
}));
|
}));
|
||||||
metrics.addCustomChart(new Metrics.SimplePie("language", () -> language));
|
metrics.addCustomChart(new SimplePie("language", () -> language));
|
||||||
metrics.addCustomChart(new Metrics.SimplePie("config_scramble", () -> BConfig.enableEncode ? "enabled" : "disabled"));
|
metrics.addCustomChart(new SimplePie("config_scramble", () -> BConfig.enableEncode ? "enabled" : "disabled"));
|
||||||
metrics.addCustomChart(new Metrics.SimplePie("config_lore_color", () -> {
|
metrics.addCustomChart(new SimplePie("config_lore_color", () -> {
|
||||||
if (BConfig.colorInBarrels) {
|
if (BConfig.colorInBarrels) {
|
||||||
if (BConfig.colorInBrewer) {
|
if (BConfig.colorInBrewer) {
|
||||||
return "both";
|
return "both";
|
||||||
@ -406,7 +407,7 @@ public class P extends JavaPlugin {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
metrics.addCustomChart(new Metrics.SimplePie("config_always_show", () -> {
|
metrics.addCustomChart(new SimplePie("config_always_show", () -> {
|
||||||
if (BConfig.alwaysShowQuality) {
|
if (BConfig.alwaysShowQuality) {
|
||||||
if (BConfig.alwaysShowAlc) {
|
if (BConfig.alwaysShowAlc) {
|
||||||
return "both";
|
return "both";
|
||||||
|
Loading…
Reference in New Issue
Block a user