From 4c593760ba69e035db490b2ab2dd89cc839dcc2b Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Tue, 10 Dec 2019 11:10:53 +0100 Subject: [PATCH] [CI skip] Some minor changes to metrics --- .../core/services/CustomTextureService.java | 18 +++++++++++++++--- .../core/services/MetricsService.java | 18 +++++++++++++++++- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/CustomTextureService.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/CustomTextureService.java index e76d07403..a22dff4b0 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/CustomTextureService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/CustomTextureService.java @@ -1,7 +1,5 @@ package io.github.thebusybiscuit.slimefun4.core.services; -import java.util.Collection; - import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.plugin.Plugin; @@ -12,23 +10,37 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; public class CustomTextureService { private final Config config; + private boolean modified = false; public CustomTextureService(Plugin plugin) { this.config = new Config(plugin, "item-models.yml"); } - public void setup(Collection items) { + public void setup(Iterable items) { config.setDefaultValue("SLIMEFUN_GUIDE", 0); + for (SlimefunItem item : items) { if (item != null && item.getID() != null) { config.setDefaultValue(item.getID(), 0); + + if (config.getInt(item.getID()) != 0) { + modified = true; + } } } config.save(); } + public String getVersion() { + return config.getString("version"); + } + + public boolean isActive() { + return modified; + } + public int getModelData(String id) { return config.getInt(id); } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/MetricsService.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/MetricsService.java index 3ee9277bd..afb80ef5e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/MetricsService.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/services/MetricsService.java @@ -9,7 +9,23 @@ public class MetricsService extends Metrics { public MetricsService(SlimefunPlugin plugin) { super(plugin); - addCustomChart(new SimplePie("auto_updates", () -> SlimefunPlugin.getCfg().getBoolean("options.auto-update") ? "enabled": "disabled")); + addCustomChart(new SimplePie("auto_updates", () -> + SlimefunPlugin.getCfg().getBoolean("options.auto-update") ? "enabled": "disabled" + )); + + addCustomChart(new SimplePie("resourcepack", () -> { + String version = SlimefunPlugin.getItemTextureService().getVersion(); + + if (SlimefunPlugin.getItemTextureService().isActive()) { + return "Custom / Modified"; + } + else if (version != null) { + return version + " (Official)"; + } + else { + return "None"; + } + })); addCustomChart(new SimplePie("branch", () -> { if (plugin.getDescription().getVersion().startsWith("DEV - ")) {