From c063037f89f0fd93945d2873624e0c949c925099 Mon Sep 17 00:00:00 2001 From: Sn0wStorm Date: Thu, 17 Jan 2019 17:28:58 +0100 Subject: [PATCH] Added number of recipes Chart --- resources/config/v13/de/config.yml | 4 ++-- src/com/dre/brewery/P.java | 22 +++++++++++++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/resources/config/v13/de/config.yml b/resources/config/v13/de/config.yml index df671fa..a09de94 100644 --- a/resources/config/v13/de/config.yml +++ b/resources/config/v13/de/config.yml @@ -230,7 +230,7 @@ recipes: 10: name: Fader Kaffee/Kaffee/Starker Kaffee ingredients: - - Ink_Sac,3/12 + - Cocoa_Beans/12 - Milk_Bucket/2 cookingtime: 2 color: BLACK @@ -534,4 +534,4 @@ words: - replace: -all to: '*rülps*' percentage: 3 - alcohol: 60 \ No newline at end of file + alcohol: 60 diff --git a/src/com/dre/brewery/P.java b/src/com/dre/brewery/P.java index 1a93e41..56ecde5 100644 --- a/src/com/dre/brewery/P.java +++ b/src/com/dre/brewery/P.java @@ -102,7 +102,7 @@ public class P extends JavaPlugin { 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", () -> { - Map map = new HashMap<>(); + Map map = new HashMap<>(5); int exc = 0; int good = 0; int norm = 0; @@ -129,6 +129,26 @@ public class P extends JavaPlugin { map.put("terrible", terr); return map; })); + metrics.addCustomChart(new Metrics.SimplePie("number_of_recipes", () -> { + int recipes = BIngredients.recipes.size(); + if (recipes < 7) { + return "Less than 7"; + } else if (recipes < 11) { + return "7-10"; + } else if (recipes == 11) { + // There are 11 default recipes, so show this as its own slice + return "11"; + } else if (recipes <= 31) { + if (recipes % 2 == 0) { + return recipes + "-" + (recipes + 1); + } else { + return (recipes - 1) + "-" + recipes; + } + } else { + return "More than 31"; + } + + })); } catch (Throwable e) { e.printStackTrace(); }