From 65962d36895febf54bddf00e348c1234831fe6e3 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Thu, 26 Sep 2019 12:58:35 +0200 Subject: [PATCH] Added more bStats Charts --- .../mrCookieSlime/Slimefun/Setup/Files.java | 4 +- .../Slimefun/Setup/MiscSetup.java | 2 - .../Slimefun/Setup/SlimefunMetrics.java | 27 ++ .../Slimefun/Setup/WikiSetup.java | 242 ------------------ .../Slimefun/SlimefunPlugin.java | 4 +- src/plugin.yml | 2 +- 6 files changed, 32 insertions(+), 249 deletions(-) create mode 100644 src/me/mrCookieSlime/Slimefun/Setup/SlimefunMetrics.java delete mode 100644 src/me/mrCookieSlime/Slimefun/Setup/WikiSetup.java diff --git a/src/me/mrCookieSlime/Slimefun/Setup/Files.java b/src/me/mrCookieSlime/Slimefun/Setup/Files.java index 7df6b97b4..8e9ec784f 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/Files.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/Files.java @@ -18,9 +18,9 @@ public final class Files { Slimefun.getLogger().log(Level.WARNING, "###############################################"); Slimefun.getLogger().log(Level.WARNING, "############## = - INFO - = #################"); Slimefun.getLogger().log(Level.WARNING, "###############################################"); - Slimefun.getLogger().log(Level.WARNING, " "); + Slimefun.getLogger().log(Level.WARNING, " "); Slimefun.getLogger().log(Level.WARNING, "Slimefun Warning:"); - Slimefun.getLogger().log(Level.WARNING, " "); + Slimefun.getLogger().log(Level.WARNING, " "); Slimefun.getLogger().log(Level.WARNING, "Slimefun has detected that your Files are either"); Slimefun.getLogger().log(Level.WARNING, "outdated or do not exist. We generated new Files"); Slimefun.getLogger().log(Level.WARNING, "instead otherwise Slimefun would not work. If you"); diff --git a/src/me/mrCookieSlime/Slimefun/Setup/MiscSetup.java b/src/me/mrCookieSlime/Slimefun/Setup/MiscSetup.java index c859aaeaf..04083a37c 100644 --- a/src/me/mrCookieSlime/Slimefun/Setup/MiscSetup.java +++ b/src/me/mrCookieSlime/Slimefun/Setup/MiscSetup.java @@ -318,8 +318,6 @@ public final class MiscSetup { Slimefun.addYoutubeVideo("SOLAR_GENERATOR_2", "https://youtu.be/kOopBkiRzjs"); Slimefun.addYoutubeVideo("SOLAR_GENERATOR_3", "https://youtu.be/kOopBkiRzjs"); Slimefun.addYoutubeVideo("SOLAR_GENERATOR_4", "https://youtu.be/kOopBkiRzjs"); - - WikiSetup.setup(); } } diff --git a/src/me/mrCookieSlime/Slimefun/Setup/SlimefunMetrics.java b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunMetrics.java new file mode 100644 index 000000000..5adec35de --- /dev/null +++ b/src/me/mrCookieSlime/Slimefun/Setup/SlimefunMetrics.java @@ -0,0 +1,27 @@ +package me.mrCookieSlime.Slimefun.Setup; + +import org.bstats.bukkit.Metrics; + +import me.mrCookieSlime.Slimefun.SlimefunPlugin; + +public class SlimefunMetrics extends Metrics { + + public SlimefunMetrics(SlimefunPlugin plugin) { + super(plugin); + + addCustomChart(new SimplePie("auto_updates", () -> SlimefunPlugin.getCfg().getBoolean("options.auto-update") ? "enabled": "disabled")); + + addCustomChart(new SimplePie("branch", () -> { + if (plugin.getDescription().getVersion().startsWith("DEV - ")) { + return "master"; + } + else if (plugin.getDescription().getVersion().startsWith("RC - ")) { + return "stable"; + } + else { + return "Unknown"; + } + })); + } + +} diff --git a/src/me/mrCookieSlime/Slimefun/Setup/WikiSetup.java b/src/me/mrCookieSlime/Slimefun/Setup/WikiSetup.java deleted file mode 100644 index cd1750ce2..000000000 --- a/src/me/mrCookieSlime/Slimefun/Setup/WikiSetup.java +++ /dev/null @@ -1,242 +0,0 @@ -package me.mrCookieSlime.Slimefun.Setup; - -import me.mrCookieSlime.Slimefun.api.Slimefun; - -/** - * Setups the official Wiki links. - * - * @since 4.1.2 - */ -public final class WikiSetup { - - private WikiSetup() {} - - /** - * Setups the official Wiki links. - */ - public static void setup() { - - // Weapons - Slimefun.addOfficialWikiPage("GRANDMAS_WALKING_STICK", "Walking-Sticks"); - Slimefun.addOfficialWikiPage("GRANDPAS_WALKING_STICK", "Walking-Sticks"); - Slimefun.addOfficialWikiPage("SWORD_OF_BEHEADING", "Sword-of-Beheading"); - Slimefun.addOfficialWikiPage("BLADE_OF_VAMPIRES", "Blade-of-Vampires"); - Slimefun.addOfficialWikiPage("SEISMIC_AXE", "Seismic-Axe"); - Slimefun.addOfficialWikiPage("SOULBOUND_SWORD", "Soulbound-Weapons"); - Slimefun.addOfficialWikiPage("SOULBOUND_BOW", "Soulbound-Weapons"); - Slimefun.addOfficialWikiPage("EXPLOSIVE_BOW", "Special-Bows"); - Slimefun.addOfficialWikiPage("ICY_BOW", "Special-Bows"); - - // Various Items - Slimefun.addOfficialWikiPage("PORTABLE_CRAFTER", "Portable-Crafter"); - Slimefun.addOfficialWikiPage("PORTABLE_DUSTBIN", "Portable-Dustbin"); - Slimefun.addOfficialWikiPage("ENDER_BACKPACK", "Ender-Backpack"); - Slimefun.addOfficialWikiPage("RAG", "Medical-Supplies"); - Slimefun.addOfficialWikiPage("BANDAGE", "Medical-Supplies"); - Slimefun.addOfficialWikiPage("SPLINT", "Medical-Supplies"); - Slimefun.addOfficialWikiPage("VITAMINS", "Medical-Supplies"); - Slimefun.addOfficialWikiPage("MEDICINE", "Medical-Supplies"); - Slimefun.addOfficialWikiPage("SMALL_BACKPACK", "Backpacks"); - Slimefun.addOfficialWikiPage("MEDIUM_BACKPACK", "Backpacks"); - Slimefun.addOfficialWikiPage("LARGE_BACKPACK", "Backpacks"); - Slimefun.addOfficialWikiPage("WOVEN_BACKPACK", "Backpacks"); - Slimefun.addOfficialWikiPage("GILDED_BACKPACK", "Backpacks"); - Slimefun.addOfficialWikiPage("BOUND_BACKPACK", "Backpacks"); - Slimefun.addOfficialWikiPage("COOLER", "Cooler"); - - // Basic Machines - Slimefun.addOfficialWikiPage("ENHANCED_CRAFTING_TABLE", "Enhanced-Crafting-Table"); - Slimefun.addOfficialWikiPage("GRIND_STONE", "Grind-Stone"); - Slimefun.addOfficialWikiPage("ARMOR_FORGE", "Armor-Forge"); - Slimefun.addOfficialWikiPage("ORE_CRUSHER", "Ore-Crusher"); - Slimefun.addOfficialWikiPage("COMPRESSOR", "Compressor"); - Slimefun.addOfficialWikiPage("SMELTERY", "Smeltery"); - Slimefun.addOfficialWikiPage("PRESSURE_CHAMBER", "Pressure-Chamber"); - Slimefun.addOfficialWikiPage("MAGIC_WORKBENCH", "Magic-Workbench"); - Slimefun.addOfficialWikiPage("ORE_WASHER", "Ore-Washer"); - Slimefun.addOfficialWikiPage("SAW_MILL", "Saw-Mill"); - Slimefun.addOfficialWikiPage("DIGITAL_MINER", "Digital-Miners"); - Slimefun.addOfficialWikiPage("ADVANCED_DIGITAL_MINER", "Digital-Miners"); - Slimefun.addOfficialWikiPage("JUICER", "Juicer"); - Slimefun.addOfficialWikiPage("COMPOSTER", "Composter"); - Slimefun.addOfficialWikiPage("CRUCIBLE", "Crucible"); - Slimefun.addOfficialWikiPage("ENHANCED_FURNACE", "Enhanced-Furnaces"); - Slimefun.addOfficialWikiPage("ENHANCED_FURNACE_2", "Enhanced-Furnaces"); - Slimefun.addOfficialWikiPage("ENHANCED_FURNACE_3", "Enhanced-Furnaces"); - Slimefun.addOfficialWikiPage("ENHANCED_FURNACE_4", "Enhanced-Furnaces"); - Slimefun.addOfficialWikiPage("ENHANCED_FURNACE_5", "Enhanced-Furnaces"); - Slimefun.addOfficialWikiPage("ENHANCED_FURNACE_6", "Enhanced-Furnaces"); - Slimefun.addOfficialWikiPage("ENHANCED_FURNACE_7", "Enhanced-Furnaces"); - Slimefun.addOfficialWikiPage("ENHANCED_FURNACE_8", "Enhanced-Furnaces"); - Slimefun.addOfficialWikiPage("ENHANCED_FURNACE_9", "Enhanced-Furnaces"); - Slimefun.addOfficialWikiPage("ENHANCED_FURNACE_10", "Enhanced-Furnaces"); - Slimefun.addOfficialWikiPage("ENHANCED_FURNACE_11", "Enhanced-Furnaces"); - Slimefun.addOfficialWikiPage("REINFORCED_FURNACE", "Enhanced-Furnaces"); - Slimefun.addOfficialWikiPage("CARBONADO_EDGED_FURNACE", "Enhanced-Furnaces"); - - // Tools - Slimefun.addOfficialWikiPage("GOLD_PAN", "Gold-Pan"); - Slimefun.addOfficialWikiPage("GRAPPLING_HOOK", "Grappling-Hook"); - Slimefun.addOfficialWikiPage("SMELTERS_PICKAXE", "Smelters-Pickaxe"); - Slimefun.addOfficialWikiPage("LUMBER_AXE", "Lumber-Axe"); - Slimefun.addOfficialWikiPage("PICKAXE_OF_CONTAINMENT", "Pickaxe-Of-Containment"); - Slimefun.addOfficialWikiPage("HERCULES_PICKAXE", "Hercules-Pickaxe"); - Slimefun.addOfficialWikiPage("EXPLOSIVE_PICKAXE", "Explosive-Pickaxe"); - Slimefun.addOfficialWikiPage("PICKAXE_OF_THE_SEEKER", "Pickaxe-Of-The-Seeker"); - Slimefun.addOfficialWikiPage("PICKAXE_OF_VEIN_MINING", "Pickaxe-Of-Vein-Mining"); - Slimefun.addOfficialWikiPage("SOULBOUND_PICKAXE", "Soulbound-Tools"); - Slimefun.addOfficialWikiPage("SOULBOUND_AXE", "Soulbound-Tools"); - Slimefun.addOfficialWikiPage("SOULBOUND_SHOVEL", "Soulbound-Tools"); - Slimefun.addOfficialWikiPage("SOULBOUND_HOE", "Soulbound-Tools"); - - // Food - Slimefun.addOfficialWikiPage("FORTUNE_COOKIE", "Fortune-Cookie"); - Slimefun.addOfficialWikiPage("BEEF_JERKY", "Beef-Jerky"); - Slimefun.addOfficialWikiPage("MAGIC_SUGAR", "Magic-Sugar"); - Slimefun.addOfficialWikiPage("MONSTER_JERKY", "Monster-Jerky"); - Slimefun.addOfficialWikiPage("APPLE_JUICE", "Juices"); - Slimefun.addOfficialWikiPage("CARROT_JUICE", "Juices"); - Slimefun.addOfficialWikiPage("MELON_JUICE", "Juices"); - Slimefun.addOfficialWikiPage("PUMPKIN_JUICE", "Juices"); - Slimefun.addOfficialWikiPage("GOLDEN_APPLE_JUICE", "Juices"); - - // Armor - Slimefun.addOfficialWikiPage("CHAIN_HELMET", "Chain-Armor"); - Slimefun.addOfficialWikiPage("CHAIN_CHESTPLATE", "Chain-Armor"); - Slimefun.addOfficialWikiPage("CHAIN_LEGGINGS", "Chain-Armor"); - Slimefun.addOfficialWikiPage("CHAIN_BOOTS", "Chain-Armor"); - - Slimefun.addOfficialWikiPage("DAMASCUS_STEEL_HELMET", "Damascus-Steel-Armor"); - Slimefun.addOfficialWikiPage("DAMASCUS_STEEL_CHESTPLATE", "Damascus-Steel-Armor"); - Slimefun.addOfficialWikiPage("DAMASCUS_STEEL_LEGGINGS", "Damascus-Steel-Armor"); - Slimefun.addOfficialWikiPage("DAMASCUS_STEEL_BOOTS", "Damascus-Steel-Armor"); - - Slimefun.addOfficialWikiPage("GOLD_12K_HELMET", "Gold-Armor"); - Slimefun.addOfficialWikiPage("GOLD_12K_CHESTPLATE", "Gold-Armor"); - Slimefun.addOfficialWikiPage("GOLD_12K_LEGGINGS", "Gold-Armor"); - Slimefun.addOfficialWikiPage("GOLD_12K_BOOTS", "Gold-Armor"); - - Slimefun.addOfficialWikiPage("REINFORCED_ALLOY_HELMET", "Reinforced-Armor"); - Slimefun.addOfficialWikiPage("REINFORCED_ALLOY_CHESTPLATE", "Reinforced-Armor"); - Slimefun.addOfficialWikiPage("REINFORCED_ALLOY_LEGGINGS", "Reinforced-Armor"); - Slimefun.addOfficialWikiPage("REINFORCED_ALLOY_BOOTS", "Reinforced-Armor"); - - Slimefun.addOfficialWikiPage("GILDED_IRON_HELMET", "Gilded-Iron-Armor"); - Slimefun.addOfficialWikiPage("GILDED_IRON_CHESTPLATE", "Gilded-Iron-Armor"); - Slimefun.addOfficialWikiPage("GILDED_IRON_LEGGINGS", "Gilded-Iron-Armor"); - Slimefun.addOfficialWikiPage("GILDED_IRON_BOOTS", "Gilded-Iron-Armor"); - - Slimefun.addOfficialWikiPage("SCUBA_HELMET", "Hazmat-Suit"); - Slimefun.addOfficialWikiPage("HAZMAT_CHESTPLATE", "Hazmat-Suit"); - Slimefun.addOfficialWikiPage("HAZMAT_LEGGINGS", "Hazmat-Suit"); - Slimefun.addOfficialWikiPage("RUBBER_BOOTS", "Hazmat-Suit"); - - Slimefun.addOfficialWikiPage("CACTUS_HELMET", "Cactus-Armor"); - Slimefun.addOfficialWikiPage("CACTUS_CHESTPLATE", "Cactus-Armor"); - Slimefun.addOfficialWikiPage("CACTUS_LEGGINGS", "Cactus-Armor"); - Slimefun.addOfficialWikiPage("CACTUS_BOOTS", "Cactus-Armor"); - - // Resources - Slimefun.addOfficialWikiPage("COPPER_INGOT", "Ingots"); - Slimefun.addOfficialWikiPage("TIN_INGOT", "Ingots"); - Slimefun.addOfficialWikiPage("SILVER_INGOT", "Ingots"); - Slimefun.addOfficialWikiPage("LEAD_INGOT", "Ingots"); - Slimefun.addOfficialWikiPage("ALUMINUM_INGOT", "Ingots"); - Slimefun.addOfficialWikiPage("ZINC_INGOT", "Ingots"); - Slimefun.addOfficialWikiPage("MAGNESIUM_INGOT", "Ingots"); - Slimefun.addOfficialWikiPage("GOLD_4K", "Ingots"); - Slimefun.addOfficialWikiPage("GOLD_6K", "Ingots"); - Slimefun.addOfficialWikiPage("GOLD_8K", "Ingots"); - Slimefun.addOfficialWikiPage("GOLD_10K", "Ingots"); - Slimefun.addOfficialWikiPage("GOLD_12K", "Ingots"); - Slimefun.addOfficialWikiPage("GOLD_14K", "Ingots"); - Slimefun.addOfficialWikiPage("GOLD_16K", "Ingots"); - Slimefun.addOfficialWikiPage("GOLD_18K", "Ingots"); - Slimefun.addOfficialWikiPage("GOLD_20K", "Ingots"); - Slimefun.addOfficialWikiPage("GOLD_22K", "Ingots"); - Slimefun.addOfficialWikiPage("GOLD_24K", "Ingots"); - Slimefun.addOfficialWikiPage("GOLD_24K", "Ingots"); - Slimefun.addOfficialWikiPage("BLISTERING_INGOT", "Ingots"); - Slimefun.addOfficialWikiPage("BLISTERING_INGOT_2", "Ingots"); - Slimefun.addOfficialWikiPage("BLISTERING_INGOT_3", "Ingots"); - Slimefun.addOfficialWikiPage("REINFORCED_ALLOY_INGOT", "Ingots"); - Slimefun.addOfficialWikiPage("HARDENED_METAL", "Ingots"); - Slimefun.addOfficialWikiPage("GILDED_IRON", "Ingots"); - Slimefun.addOfficialWikiPage("REDSTONE_ALLOY_INGOT", "Ingots"); - Slimefun.addOfficialWikiPage("FERROSILICON", "Ingots"); - Slimefun.addOfficialWikiPage("DAMASCUS_STEEL_INGOT", "Ingots"); - Slimefun.addOfficialWikiPage("STEEL_INGOT", "Ingots"); - Slimefun.addOfficialWikiPage("ALUMINUM_BRONZE_INGOT", "Ingots"); - Slimefun.addOfficialWikiPage("ALUMINUM_BRASS_INGOT", "Ingots"); - Slimefun.addOfficialWikiPage("CORINTHIAN_BRONZE_INGOT", "Ingots"); - Slimefun.addOfficialWikiPage("BRASS_INGOT", "Ingots"); - Slimefun.addOfficialWikiPage("BRONZE_INGOT", "Ingots"); - Slimefun.addOfficialWikiPage("BILLON_INGOT", "Ingots"); - Slimefun.addOfficialWikiPage("DURALUMIN_INGOT", "Ingots"); - Slimefun.addOfficialWikiPage("NICKEL_INGOT", "Ingots"); - Slimefun.addOfficialWikiPage("COBALT_INGOT", "Ingots"); - Slimefun.addOfficialWikiPage("SOLDER_INGOT", "Ingots"); - - Slimefun.addOfficialWikiPage("IRON_DUST", "Dusts"); - Slimefun.addOfficialWikiPage("GOLD_DUST", "Dusts"); - Slimefun.addOfficialWikiPage("ALUMINUM_DUST", "Dusts"); - Slimefun.addOfficialWikiPage("ZINC_DUST", "Dusts"); - Slimefun.addOfficialWikiPage("TIN_DUST", "Dusts"); - Slimefun.addOfficialWikiPage("COPPER_DUST", "Dusts"); - Slimefun.addOfficialWikiPage("MAGNESIUM_DUST", "Dusts"); - Slimefun.addOfficialWikiPage("LEAD_DUST", "Dusts"); - Slimefun.addOfficialWikiPage("SILVER_DUST", "Dusts"); - - Slimefun.addOfficialWikiPage("SYNTHETIC_DIAMOND", "Valuables"); - Slimefun.addOfficialWikiPage("SYNTHETIC_SAPPHIRE", "Valuables"); - Slimefun.addOfficialWikiPage("SYNTHETIC_EMERALD", "Valuables"); - Slimefun.addOfficialWikiPage("RAW_CARBONADO", "Valuables"); - Slimefun.addOfficialWikiPage("CARBONADO", "Valuables"); - Slimefun.addOfficialWikiPage("CARBON_CHUNK", "Valuables"); - Slimefun.addOfficialWikiPage("SULFATE", "Valuables"); - Slimefun.addOfficialWikiPage("CARBON", "Valuables"); - Slimefun.addOfficialWikiPage("COMPRESSED_CARBON", "Valuables"); - Slimefun.addOfficialWikiPage("SILICON", "Valuables"); - - Slimefun.addOfficialWikiPage("BUCKET_OF_OIL", "Oil"); - Slimefun.addOfficialWikiPage("BUCKET_OF_FUEL", "Oil"); - Slimefun.addOfficialWikiPage("URANIUM", "Radioactive-Materials"); - Slimefun.addOfficialWikiPage("NEPTUNIUM", "Radioactive-Materials"); - Slimefun.addOfficialWikiPage("PLUTONIUM", "Radioactive-Materials"); - Slimefun.addOfficialWikiPage("BOOSTED_URANIUM", "Radioactive-Materials"); - Slimefun.addOfficialWikiPage("BLISTERING_INGOT", "Radioactive-Materials"); - Slimefun.addOfficialWikiPage("BLISTERING_INGOT_2", "Radioactive-Materials"); - Slimefun.addOfficialWikiPage("BLISTERING_INGOT_3", "Radioactive-Materials"); - - // Energy & Electricity - Slimefun.addOfficialWikiPage("ENERGY_REGULATOR", "Energy-Regulator"); - Slimefun.addOfficialWikiPage("CHARGING_BENCH", "Charging-Station"); - Slimefun.addOfficialWikiPage("SMALL_CAPACITOR", "Energy-Capacitor"); - Slimefun.addOfficialWikiPage("MEDIUM_CAPACITOR", "Energy-Capacitor"); - Slimefun.addOfficialWikiPage("BIG_CAPACITOR", "Energy-Capacitor"); - Slimefun.addOfficialWikiPage("LARGE_CAPACITOR", "Energy-Capacitor"); - Slimefun.addOfficialWikiPage("CARBONADO_EDGED_CAPACITOR", "Energy-Capacitor"); - Slimefun.addOfficialWikiPage("ELECTRIC_FURNACE", "Electric-Furnace"); - Slimefun.addOfficialWikiPage("ELECTRIC_FURNACE_2", "Electric-Furnace"); - Slimefun.addOfficialWikiPage("ELECTRIC_FURNACE_3", "Electric-Furnace"); - Slimefun.addOfficialWikiPage("ELECTRIC_GOLD_PAN", "Electric-Gold-Pan"); - Slimefun.addOfficialWikiPage("ELECTRIC_GOLD_PAN_2", "Electric-Gold-Pan"); - Slimefun.addOfficialWikiPage("ELECTRIC_GOLD_PAN_3", "Electric-Gold-Pan"); - Slimefun.addOfficialWikiPage("SOLAR_GENERATOR", "Solar-Generator"); - Slimefun.addOfficialWikiPage("SOLAR_GENERATOR_2", "Solar-Generator"); - Slimefun.addOfficialWikiPage("SOLAR_GENERATOR_3", "Solar-Generator"); - Slimefun.addOfficialWikiPage("SOLAR_GENERATOR_4", "Solar-Generator"); - Slimefun.addOfficialWikiPage("AUTO_ENCHANTER", "Auto-Enchanter"); - Slimefun.addOfficialWikiPage("AUTO_DISENCHANTER", "Auto-Disenchanter"); - - //Cargo Management - Slimefun.addOfficialWikiPage("CARGO_MOTOR", "Cargo-Motor"); - Slimefun.addOfficialWikiPage("CARGO_MANAGER", "Cargo-Manager"); - Slimefun.addOfficialWikiPage("CARGO_NODE", "Cargo-Nodes"); - Slimefun.addOfficialWikiPage("CARGO_INPUT", "Cargo-Nodes"); - Slimefun.addOfficialWikiPage("CARGO_OUTPUT", "Cargo-Nodes"); - Slimefun.addOfficialWikiPage("CARGO_OUTPUT_ADVANCED", "Cargo-Nodes"); - Slimefun.addOfficialWikiPage("TRASH_CAN", "Trash-Can"); - } - -} diff --git a/src/me/mrCookieSlime/Slimefun/SlimefunPlugin.java b/src/me/mrCookieSlime/Slimefun/SlimefunPlugin.java index 35e65c17f..b0ba445a4 100644 --- a/src/me/mrCookieSlime/Slimefun/SlimefunPlugin.java +++ b/src/me/mrCookieSlime/Slimefun/SlimefunPlugin.java @@ -3,7 +3,6 @@ package me.mrCookieSlime.Slimefun; import java.io.File; import java.util.logging.Level; -import org.bstats.bukkit.Metrics; import org.bukkit.Bukkit; import org.bukkit.World; import org.bukkit.entity.Player; @@ -36,6 +35,7 @@ import me.mrCookieSlime.Slimefun.Setup.MiscSetup; import me.mrCookieSlime.Slimefun.Setup.ResearchSetup; import me.mrCookieSlime.Slimefun.Setup.SlimefunLocalization; import me.mrCookieSlime.Slimefun.Setup.SlimefunManager; +import me.mrCookieSlime.Slimefun.Setup.SlimefunMetrics; import me.mrCookieSlime.Slimefun.Setup.SlimefunSetup; import me.mrCookieSlime.Slimefun.ancient_altar.AncientAltarListener; import me.mrCookieSlime.Slimefun.api.BlockStorage; @@ -161,7 +161,7 @@ public final class SlimefunPlugin extends JavaPlugin { gps = new GPSNetwork(); // Setting up bStats - new Metrics(this); + new SlimefunMetrics(this); // Setting up the Auto-Updater Updater updater; diff --git a/src/plugin.yml b/src/plugin.yml index 3381857ba..6b8c2730e 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -2,7 +2,7 @@ name: Slimefun version: ${project.version} author: The Slimefun 4 Community description: Slimefun basically turns your entire Server into a FTB modpack without installing a single mod -website: http://TheBusyBiscuit.github.io/ +website: https://github.com/TheBusyBiscuit/Slimefun4 main: me.mrCookieSlime.Slimefun.SlimefunPlugin softdepend: [CS-CoreLib, PlaceholderAPI]