updates to hyperlib

Author: hyperdefined

pom.xml

@@ -64,12 +64,8 @@
                 <configuration>
                     <relocations>
                         <relocation>
-                            <pattern>org.bstats</pattern>
-                            <shadedPattern>lol.hyper.timebar.bstats</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>lol.hyper.githubreleaseapi</pattern>
-                            <shadedPattern>lol.hyper.timebar.updater</shadedPattern>
+                            <pattern>lol.hyper.hyperlib</pattern>
+                            <shadedPattern>lol.hyper.timebar.hyperlib</shadedPattern>
                         </relocation>
                     </relocations>
                 </configuration>
@@ -116,7 +112,7 @@
         <dependency>
             <groupId>com.github.hyperdefined</groupId>
             <artifactId>hyperlib</artifactId>
-            <version>1.0.2</version>
+            <version>1.0.9</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

src/main/java/lol/hyper/timebar/TimeBar.java

@@ -18,16 +18,16 @@
 package lol.hyper.timebar;
 
 import lol.hyper.hyperlib.HyperLib;
-import lol.hyper.hyperlib.bstats.bStats;
-import lol.hyper.hyperlib.releases.modrinth.ModrinthPlugin;
-import lol.hyper.hyperlib.releases.modrinth.ModrinthRelease;
+import lol.hyper.hyperlib.bstats.HyperStats;
+import lol.hyper.hyperlib.releases.HyperUpdater;
 import lol.hyper.hyperlib.utils.TextUtils;
 import lol.hyper.timebar.commands.CommandTimeBar;
 import lol.hyper.timebar.events.PlayerJoinLeave;
 import lol.hyper.timebar.events.WorldChange;
 import lol.hyper.timebar.papi.TimeBarExpansion;
 import lol.hyper.timebar.tracker.WorldTimeTracker;
 import net.kyori.adventure.bossbar.BossBar;
+import net.kyori.adventure.text.logger.slf4j.ComponentLogger;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.configuration.ConfigurationSection;
@@ -38,14 +38,13 @@
 
 import java.io.File;
 import java.util.*;
-import java.util.logging.Logger;
 
 public final class TimeBar extends JavaPlugin {
 
     public final File configFile = new File(this.getDataFolder(), "config.yml");
     public final File realisticSeasonsConfigFile = new File(this.getDataFolder(), "realisticseasons.yml");
     public final File advancedSeasonsConfigFile = new File(this.getDataFolder(), "advancedseasons.yml");
-    public final Logger logger = this.getLogger();
+    public final ComponentLogger logger = this.getComponentLogger();
     public FileConfiguration config;
     public FileConfiguration realisticSeasonsConfig;
     public FileConfiguration advancedSeasonsConfig;
@@ -68,7 +67,7 @@ public void onEnable() {
         hyperLib = new HyperLib(this);
         hyperLib.setup();
 
-        bStats bstats = new bStats(hyperLib, 10674);
+        HyperStats bstats = new HyperStats(hyperLib, 10674);
         bstats.setup();
 
         textUtils = new TextUtils(hyperLib);
@@ -80,7 +79,7 @@ public void onEnable() {
             if (expansion.register()) {
                 logger.info("Successfully registered placeholders!");
             } else {
-                logger.warning("Unable to register placeholders!");
+                logger.warn("Unable to register placeholders!");
             }
         }
         if (Bukkit.getPluginManager().getPlugin("RealisticSeasons") != null) {
@@ -102,27 +101,11 @@ public void onEnable() {
         Bukkit.getServer().getPluginManager().registerEvents(playerJoinLeave, this);
         Bukkit.getServer().getPluginManager().registerEvents(worldChange, this);
 
-        Bukkit.getAsyncScheduler().runNow(this, scheduledTask -> {
-            ModrinthPlugin modrinthPlugin = new ModrinthPlugin("3w9zYjq5");
-            modrinthPlugin.get();
-
-            ModrinthRelease release = modrinthPlugin.getReleaseByVersion(this.getPluginMeta().getVersion());
-            if (release == null) {
-                logger.warning("You are running a version not published.");
-            } else {
-                int buildsBehind = modrinthPlugin.buildsVersionsBehind(release);
-                if (buildsBehind > 0) {
-                    ModrinthRelease latest = modrinthPlugin.getLatestRelease();
-                    if (latest != null) {
-                        logger.info("You are " + buildsBehind + " versions behind. Please update!");
-                        logger.info("The latest version is " + latest.getVersion());
-                        logger.info(latest.getVersionPage());
-                    }
-                } else {
-                    logger.info("Yay! You are running the latest version.");
-                }
-            }
-        });
+        HyperUpdater updater = new HyperUpdater(hyperLib);
+        updater.setGitHub("hyperdefined", "TimeBar");
+        updater.setModrinth("3w9zYjq5");
+        updater.setHangar("TimeBar", "paper");
+        updater.check();
 
         for (WorldTimeTracker worldTimeTracker : worldTimeTrackers) {
             worldTimeTracker.startTimer();
@@ -136,17 +119,17 @@ public void loadConfig() {
         config = YamlConfiguration.loadConfiguration(configFile);
         int CONFIG_VERSION = 5;
         if (config.getInt("config-version") != CONFIG_VERSION) {
-            logger.warning("You configuration is out of date! Some features may not work!");
+            logger.warn("You configuration is out of date! Some features may not work!");
             // don't feel like adding a config updater
             if (config.getInt("config-version") == 3) {
-                logger.warning("The configuration system has changed for this version. Please delete your configs and restart the server.");
+                logger.warn("The configuration system has changed for this version. Please delete your configs and restart the server.");
             }
         }
 
         // make sure there are worlds on the list
         ConfigurationSection worldsSection = config.getConfigurationSection("worlds");
         if (worldsSection == null) {
-            logger.severe("No worlds section found in config! Plugin is unable to function.");
+            logger.error("No worlds section found in config! Plugin is unable to function.");
             Bukkit.getPluginManager().disablePlugin(this);
             return;
         }
@@ -157,7 +140,7 @@ public void loadConfig() {
             World mainWorld = Bukkit.getWorld(worldName);
             // skip if the world is invalid
             if (mainWorld == null) {
-                logger.warning(worldName + " is not a valid world, skipping. If it is a valid world, wait for your server to load then try '/timebar reload'");
+                logger.warn("{} is not a valid world, skipping. If it is a valid world, wait for your server to load then try '/timebar reload'", worldName);
                 continue;
             }
             // these are the worlds to display the timebar based on this world
@@ -168,7 +151,7 @@ public void loadConfig() {
                 if (world != null) {
                     displayWorlds.add(world);
                 } else {
-                    logger.warning(worldName + " is not a valid world, skipping. If it is a valid world, wait for your server to load then try '/timebar reload'");
+                    logger.warn("{} is not a valid world, skipping. If it is a valid world, wait for your server to load then try '/timebar reload'", worldName);
                 }
             }
 
@@ -186,7 +169,7 @@ public void loadConfig() {
             try {
                 bossBarColor = BossBar.Color.valueOf(color);
             } catch (IllegalArgumentException exception) {
-                logger.warning(color + " is not a valid bossbar color. Defaulting to blue.");
+                logger.warn("{} is not a valid bossbar color. Defaulting to blue.", color);
                 bossBarColor = BossBar.Color.BLUE;
             }
         }
@@ -198,7 +181,7 @@ public void loadConfig() {
             realisticSeasonsConfig = YamlConfiguration.loadConfiguration(realisticSeasonsConfigFile);
             int REALISTIC_SEASONS_CONFIG_VERSION = 4;
             if (realisticSeasonsConfig.getInt("config-version") != REALISTIC_SEASONS_CONFIG_VERSION) {
-                logger.warning("Your /plugins/TimeBar/realisticseasons.yml configuration is out of date! Some features may not work!");
+                logger.warn("Your /plugins/TimeBar/realisticseasons.yml configuration is out of date! Some features may not work!");
             }
         }
         if (advancedSeasons) {
@@ -208,7 +191,7 @@ public void loadConfig() {
             advancedSeasonsConfig = YamlConfiguration.loadConfiguration(advancedSeasonsConfigFile);
             int ADVANCED_SEASONS_CONFIG_VERSION = 1;
             if (advancedSeasonsConfig.getInt("config-version") != ADVANCED_SEASONS_CONFIG_VERSION) {
-                logger.warning("Your /plugins/TimeBar/advancedseasons.yml configuration is out of date! Some features may not work!");
+                logger.warn("Your /plugins/TimeBar/advancedseasons.yml configuration is out of date! Some features may not work!");
             }
         }
     }

src/main/java/lol/hyper/timebar/commands/CommandTimeBar.java

@@ -35,7 +35,7 @@
 
 public class CommandTimeBar implements TabExecutor {
 
-    private final TimeBar timeBar;;
+    private final TimeBar timeBar;
 
     public CommandTimeBar(TimeBar timeBar) {
         this.timeBar = timeBar;
@@ -44,7 +44,7 @@ public CommandTimeBar(TimeBar timeBar) {
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
         if (args.length == 0) {
-            sender.sendMessage(Component.text("TimeBar version " + timeBar.getDescription().getVersion() + ". Created by hyperdefined.", NamedTextColor.GREEN));
+            sender.sendMessage(Component.text("TimeBar version " + timeBar.getPluginMeta().getVersion() + ". Created by hyperdefined.", NamedTextColor.GREEN));
             return true;
         }
 
@@ -137,7 +137,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
     }
 
     @Override
-    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, String[] args) {
+    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, String @NotNull [] args) {
         return Arrays.asList("reload", "on", "off");
     }
 }

src/main/java/lol/hyper/timebar/timers/AdvancedSeasonsTask.java

@@ -51,9 +51,9 @@ public void run() {
             return;
         }
         if (api == null) {
-            worldTimeTracker.timeBar.logger.severe("Unable to hook into AdvancedSeasonsAPI!");
-            worldTimeTracker.timeBar.logger.severe("Canceling AdvancedSeasonsTask, please try /timebar reload.");
-            worldTimeTracker.timeBar.logger.severe("If you keep seeing this issue, please file an issue on GitHub!");
+            worldTimeTracker.timeBar.logger.error("Unable to hook into AdvancedSeasonsAPI!");
+            worldTimeTracker.timeBar.logger.error("Canceling AdvancedSeasonsTask, please try /timebar reload.");
+            worldTimeTracker.timeBar.logger.error("If you keep seeing this issue, please file an issue on GitHub!");
             worldTimeTracker.stopTimer();
             return;
         }
@@ -66,14 +66,14 @@ public void run() {
         String timeOfDay = getTimeOfDay(time);
         String currentSeason = api.getSeason(world);
         if (currentSeason == null) {
-            worldTimeTracker.timeBar.logger.severe("Unable to read season information from world " + world.getName());
-            worldTimeTracker.timeBar.logger.severe("This world is not setup with AdvancedSeasons, canceling...");
+            worldTimeTracker.timeBar.logger.error("Unable to read season information from world {}", world.getName());
+            worldTimeTracker.timeBar.logger.error("This world is not setup with AdvancedSeasons, canceling...");
             this.cancel();
             return;
         }
         String seasonFromConfig = worldTimeTracker.timeBar.advancedSeasonsConfig.getString("seasons." + currentSeason);
         if (seasonFromConfig == null) {
-            worldTimeTracker.timeBar.logger.warning("seasons." + currentSeason + " does not exist in advancedseasons.yml, using default season names...");
+            worldTimeTracker.timeBar.logger.warn("seasons.{} does not exist in advancedseasons.yml, using default season names...", currentSeason);
             seasonFromConfig = currentSeason;
         }
 
@@ -86,14 +86,13 @@ public void run() {
         String colorConfig = worldTimeTracker.timeBar.advancedSeasonsConfig.getString("colors." + currentSeason.toUpperCase(Locale.ROOT));
         // load from config first
         BossBar.Color color = worldTimeTracker.timeBar.bossBarColor;
-        ;
         if (colorConfig != null) {
             // see if the color is valid
             try {
                 color = BossBar.Color.valueOf(colorConfig);
             } catch (IllegalArgumentException exception) {
                 // if the color is not valid, fall back
-                worldTimeTracker.timeBar.logger.warning(colorConfig + " is not a valid color for TimeBar.");
+                worldTimeTracker.timeBar.logger.warn("{} is not a valid color for TimeBar.", colorConfig);
             }
         }
 
@@ -142,7 +141,7 @@ public void run() {
     private String parseTitle(String timeOfDay, int dayCount, String season, int temp, float progress) {
         String title = worldTimeTracker.timeBar.advancedSeasonsConfig.getString("timebar-title");
         if (title == null) {
-            worldTimeTracker.timeBar.logger.severe("timebar-title is not set! Using default.");
+            worldTimeTracker.timeBar.logger.error("timebar-title is not set! Using default.");
             title = "{TIME} (Day {DAYCOUNT}) {SEASON} - {TEMP}";
         }