exituser/Brewery
1
0
Fork 0
mirror of https://github.com/exituser/Brewery.git synced 2026-09-17 07:49:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #407 from TheBusyBiscuit/update/bstats

Browse Source 
Updated bStats to v2
This commit is contained in:
Sn0wStorm
2021-06-07 14:01:53 +02:00
committed by GitHub
parent 323e19eac0 09a82b3272
commit 42cf677803
2 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/dre/brewery/P.java
+16 -15
View File
@@ -16,6 +16,7 @@ import com.dre.brewery.utility.BUtil;
import com.dre.brewery.utility.LegacyUtil;
import org.apache.commons.lang.math.NumberUtils;
import org.bstats.bukkit.Metrics;
import org.bstats.charts.*;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Material;
@@ -286,12 +287,12 @@ public class P extends JavaPlugin {
private void setupMetrics() {
try {
Metrics metrics = new Metrics(this);
metrics.addCustomChart(new Metrics.SingleLineChart("drunk_players", BPlayer::numDrunkPlayers));
metrics.addCustomChart(new Metrics.SingleLineChart("brews_in_existence", () -> brewsCreated));
metrics.addCustomChart(new Metrics.SingleLineChart("barrels_built", () -> Barrel.barrels.size()));
metrics.addCustomChart(new Metrics.SingleLineChart("cauldrons_boiling", () -> BCauldron.bcauldrons.size()));
metrics.addCustomChart(new Metrics.AdvancedPie("brew_quality", () -> {
Metrics metrics = new Metrics(this, 3494);
metrics.addCustomChart(new SingleLineChart("drunk_players", BPlayer::numDrunkPlayers));
metrics.addCustomChart(new SingleLineChart("brews_in_existence", () -> brewsCreated));
metrics.addCustomChart(new SingleLineChart("barrels_built", Barrel.barrels::size));
metrics.addCustomChart(new SingleLineChart("cauldrons_boiling", BCauldron.bcauldrons::size));
metrics.addCustomChart(new AdvancedPie("brew_quality", () -> {
Map<String, Integer> map = new HashMap<>(8);
map.put("excellent", exc);
map.put("good", good);
@@ -300,14 +301,14 @@ public class P extends JavaPlugin {
map.put("terrible", terr);
return map;
}));
metrics.addCustomChart(new Metrics.AdvancedPie("brews_created", () -> {
metrics.addCustomChart(new AdvancedPie("brews_created", () -> {
Map<String, Integer> map = new HashMap<>(4);
map.put("by command", brewsCreatedCmd);
map.put("brewing", brewsCreated - brewsCreatedCmd);
return map;
}));
metrics.addCustomChart(new Metrics.SimplePie("number_of_recipes", () -> {
metrics.addCustomChart(new SimplePie("number_of_recipes", () -> {
int recipes = BRecipe.getAllRecipes().size();
if (recipes < 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) {
return "disabled";
}
@@ -356,7 +357,7 @@ public class P extends JavaPlugin {
return "More than 20";
}
}));
metrics.addCustomChart(new Metrics.SimplePie("v2_mc_version", () -> {
metrics.addCustomChart(new SimplePie("v2_mc_version", () -> {
String mcv = Bukkit.getBukkitVersion();
mcv = mcv.substring(0, mcv.indexOf('.', 2));
int index = mcv.indexOf('-');
@@ -370,7 +371,7 @@ public class P extends JavaPlugin {
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);
String mcv = Bukkit.getBukkitVersion();
mcv = mcv.substring(0, mcv.indexOf('.', 2));
@@ -389,9 +390,9 @@ public class P extends JavaPlugin {
map.put(getDescription().getVersion(), innerMap);
return map;
}));
metrics.addCustomChart(new Metrics.SimplePie("language", () -> language));
metrics.addCustomChart(new Metrics.SimplePie("config_scramble", () -> BConfig.enableEncode ? "enabled" : "disabled"));
metrics.addCustomChart(new Metrics.SimplePie("config_lore_color", () -> {
metrics.addCustomChart(new SimplePie("language", () -> language));
metrics.addCustomChart(new SimplePie("config_scramble", () -> BConfig.enableEncode ? "enabled" : "disabled"));
metrics.addCustomChart(new SimplePie("config_lore_color", () -> {
if (BConfig.colorInBarrels) {
if (BConfig.colorInBrewer) {
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.alwaysShowAlc) {
return "both";