Add 'conversion time', fix sound not working

RhythmicSys · RhythmicSys · commit 575fde2b17b8 · 2022-10-30T20:02:54.000-07:00
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>ADHDMC</groupId>
     <artifactId>VillagerInfo</artifactId>
-    <version>2.3</version>
+    <version>2.4</version>
     <packaging>jar</packaging>
 
     <name>VillagerInfo</name>
diff --git a/src/main/java/adhdmc/villagerinfo/Config/ConfigValidator.java b/src/main/java/adhdmc/villagerinfo/Config/ConfigValidator.java
@@ -11,13 +11,17 @@
 
 public class ConfigValidator {
 
-    public static Sound configSound = null;
-    public static int configTime = 0;
+    private static Sound configSound = null;
+    private static int configTime = 0;
+    private static float soundVolume = 0;
+    private static float soundPitch = 0;
 
 
     public static void configValidator() {
         configSound = null;
         configTime = 0;
+        soundVolume = 0;
+        soundPitch =  0;
         FileConfiguration config = VillagerInfo.getInstance().getConfig();
         try {
             configSound = Sound.valueOf(config.getString("sound", "BLOCK_AMETHYST_BLOCK_BREAK").toUpperCase(Locale.ROOT));
@@ -31,7 +35,37 @@ public static void configValidator() {
         } else {
             configTime = config.getInt("highlight-time");
         }
+        if (0 < config.getDouble("sound-volume") && config.getDouble("sound-volume") < 2) {
+            soundVolume = (float) config.getDouble("sound-volume");
+        } else {
+            VillagerInfo.getInstance().getLogger().warning("Configuration Error: 'sound-volume' must be between 0.0 and 2.0. " +
+                    "Setting to 0.5 until a valid number is provided");
+            soundVolume = 0.5F;
+        }
+        if (0 < config.getDouble("sound-pitch") && config.getDouble("sound-pitch") < 2) {
+            soundPitch = (float) config.getDouble("sound-pitch");
+        } else {
+            VillagerInfo.getInstance().getLogger().warning("Configuration Error: 'sound-pitch' must be between 0.0 and 2.0. " +
+                    "Setting to 1.5 until a valid number is provided");
+            soundPitch = 1.5F;
+        }
         ToggleSetting.reloadToggles();
         Message.reloadLocale();
     }
+
+    public static float getSoundPitch() {
+        return soundPitch;
+    }
+
+    public static float getSoundVolume() {
+        return soundVolume;
+    }
+
+    public static int getConfigTime() {
+        return configTime;
+    }
+
+    public static Sound getConfigSound() {
+        return configSound;
+    }
 }
diff --git a/src/main/java/adhdmc/villagerinfo/Config/Defaults.java b/src/main/java/adhdmc/villagerinfo/Config/Defaults.java
@@ -17,6 +17,8 @@ public static void localeDefaults() {
         locale.addDefault("help-toggle", "<#4dd5ff> • /vill toggle\n<grey>Toggles the ability to receive villager information on or off.");
         locale.addDefault("help-reload", "<#4dd5ff> • /vill reload\n<grey>Reloads the plugin, applies config values");
         locale.addDefault("not-a-player", "<red>Sorry, you must be a player to use this command");
+        locale.addDefault("zombie-villager-conversion-time", "<green>TIME UNTIL CONVERTED: \n<aqua> • <time>");
+        locale.addDefault("villager-age", "<green>TIME UNTIL ADULT: \n<aqua> • <age>");
         locale.addDefault("villager-profession", "<green>PROFESSION:\n<aqua> • <profession>");
         locale.addDefault("villager-jobsite-msg", "<green>JOB SITE:\n<aqua> • <jobsitelocation>");
         locale.addDefault("villager-last-worked-msg", "<green>LAST WORKED AT WORKSTATION:\n<aqua> • <worktime>");
@@ -29,6 +31,7 @@ public static void localeDefaults() {
         locale.addDefault("none-msg", "<grey>NONE");
         locale.addDefault("never-msg", "<grey>NEVER");
         locale.addDefault("empty-msg", "\n • <grey>EMPTY");
+        locale.addDefault("no-information", "<grey>No information to display on this villager");
         locale.addDefault("hour", "h, ");
         locale.addDefault("minute", "m, ");
         locale.addDefault("second", "s");
@@ -41,6 +44,7 @@ public static void localeDefaults() {
     public static void configDefaults() {
         FileConfiguration config = VillagerInfo.getInstance().getConfig();
         config.addDefault("baby-age", true);
+        config.addDefault("zombie-conversion", true);
         config.addDefault("profession", true);
         config.addDefault("job-site", true);
         config.addDefault("last-worked", true);
@@ -52,6 +56,8 @@ public static void configDefaults() {
         config.addDefault("highlight-workstation", true);
         config.addDefault("sound-toggle", true);
         config.addDefault("sound", "BLOCK_AMETHYST_BLOCK_BREAK");
+        config.addDefault("sound-volume", 0.5);
+        config.addDefault("sound-pitch", 1.5);
         config.addDefault("highlight-time", 10);
     }
 
diff --git a/src/main/java/adhdmc/villagerinfo/Config/Message.java b/src/main/java/adhdmc/villagerinfo/Config/Message.java
@@ -17,6 +17,7 @@ public enum Message {
     NOT_A_PLAYER("<red>Sorry, you must be a player to use this command"),
 
     // Villager Info
+    ZOMBIE_VILLAGER_CONVERSION_TIME("<green>TIME UNTIL CONVERTED: \n<aqua> • <time>"),
     VILLAGER_AGE("<green>TIME UNTIL ADULT: \n<aqua> • <age>"),
     VILLAGER_PROFESSION("<green>PROFESSION:\n<aqua> • <profession>"),
     VILLAGER_JOBSITE("<green>JOB SITE:\n<aqua> • <jobsitelocation>"),
@@ -30,6 +31,7 @@ public enum Message {
 
     // Fillers
     NONE("<grey>NONE"), NEVER("<grey>NEVER"), EMPTY("\n • <grey>EMPTY"),
+    NO_INFORMATION("<grey>No information to display on this villager"),
 
     // Time
     HOUR("h, "), MINUTE("m, "), SECOND("s"), AGO(" Ago"),
@@ -60,6 +62,7 @@ public static void reloadLocale() {
         HELP_RELOAD.setMessage(locale.getString("help-reload", "<#4dd5ff> • /vill reload\n<grey>Reloads the plugin, applies config values"));
         NOT_A_PLAYER.setMessage(locale.getString("not-a-player", "<red>Sorry, you must be a player to use this command"));
         // Villager Info
+        ZOMBIE_VILLAGER_CONVERSION_TIME.setMessage(locale.getString("zombie-villager-conversion-time", "<green>TIME UNTIL CONVERTED: \n<aqua> • <time>"));
         VILLAGER_AGE.setMessage(locale.getString("villager-age", "<green>TIME UNTIL ADULT: \n<aqua> • <age>"));
         VILLAGER_PROFESSION.setMessage(locale.getString("villager-profession", "<green>PROFESSION:\n<aqua> • <profession>"));
         VILLAGER_JOBSITE.setMessage(locale.getString("villager-jobsite-msg", "<green>JOB SITE:\n<aqua> • <jobsitelocation>"));
@@ -74,6 +77,8 @@ public static void reloadLocale() {
         NONE.setMessage(locale.getString("none-msg", "<grey>NONE"));
         NEVER.setMessage(locale.getString("never-msg", "<grey>NEVER"));
         EMPTY.setMessage(locale.getString("empty-msg", "\n • <grey>EMPTY"));
+        NO_INFORMATION.setMessage(locale.getString("no-information", "<grey>No information to display on this villager"));
+
         // Time
         HOUR.setMessage(locale.getString("hour", "h, "));
         MINUTE.setMessage(locale.getString("minute", "m, "));
diff --git a/src/main/java/adhdmc/villagerinfo/Config/ToggleSetting.java b/src/main/java/adhdmc/villagerinfo/Config/ToggleSetting.java
@@ -5,6 +5,7 @@
 
 public enum ToggleSetting {
     BABY_AGE(true),
+    ZOMBIE_CONVERSION(true),
     PROFESSION(true),
     JOB_SITE(true),
     LAST_WORKED(true),
@@ -25,6 +26,7 @@ public enum ToggleSetting {
     public static void reloadToggles() {
         FileConfiguration config = VillagerInfo.getInstance().getConfig();
         BABY_AGE.setEnabled(config.getBoolean("baby-age", true));
+        ZOMBIE_CONVERSION.setEnabled(config.getBoolean("zombie-conversion", true));
         PROFESSION.setEnabled(config.getBoolean("profession", true));
         JOB_SITE.setEnabled(config.getBoolean("job-site", true));
         LAST_WORKED.setEnabled(config.getBoolean("last-worked", true));
diff --git a/src/main/java/adhdmc/villagerinfo/VillagerHandling/HighlightHandling.java b/src/main/java/adhdmc/villagerinfo/VillagerHandling/HighlightHandling.java
@@ -35,7 +35,7 @@ public static void villagerJobsiteHighlight(PersistentDataContainer villPDC, UUI
             killFallingBlock(villUUID);
             villPDC.set(VillagerInfo.HIGHLIGHT_STATUS, PersistentDataType.BYTE, (byte)0);
             VILLAGER_PDC.put(villUUID, villPDC);
-        }, 20L * ConfigValidator.configTime);
+        }, 20L * ConfigValidator.getConfigTime());
     }
 
     /**
diff --git a/src/main/java/adhdmc/villagerinfo/VillagerHandling/VillagerHandler.java b/src/main/java/adhdmc/villagerinfo/VillagerHandling/VillagerHandler.java
@@ -1,5 +1,6 @@
 package adhdmc.villagerinfo.VillagerHandling;
 
+import adhdmc.villagerinfo.Config.ConfigValidator;
 import adhdmc.villagerinfo.Config.Message;
 import adhdmc.villagerinfo.Config.Perms;
 import adhdmc.villagerinfo.Config.ToggleSetting;
@@ -120,7 +121,12 @@ private void processVillager(Player player, Villager villager) {
         }
         //Messages
         Component prefix = miniMessage.deserialize(Message.PREFIX.getMessage());
+        player.playSound(player.getLocation(), ConfigValidator.getConfigSound(), ConfigValidator.getSoundVolume(), ConfigValidator.getSoundPitch());
         player.sendMessage(prefix);
+        if (messageList.size() == 0) {
+            player.sendMessage(miniMessage.deserialize(Message.NO_INFORMATION.getMessage()));
+            return;
+        }
         for (Component component : messageList) {
             player.sendMessage(component);
         }
@@ -129,27 +135,38 @@ private void processVillager(Player player, Villager villager) {
     private void processZombieVillager(Player player, ZombieVillager zombieVillager) {
         ArrayList<Component> messageList = new ArrayList<>();
         boolean isAdult = zombieVillager.isAdult();
-        //time until adult
-        if (ToggleSetting.BABY_AGE.isEnabled() && !isAdult) {
-           messageList.add(timeTillAdult(zombieVillager));
-        }
         //profession
         if (ToggleSetting.PROFESSION.isEnabled() && isAdult) {
             messageList.add(villagerProfession(zombieVillager.getVillagerProfession()));
         }
+        //time until converted
+        if (ToggleSetting.ZOMBIE_CONVERSION.isEnabled() && zombieVillager.isConverting()) {
+            messageList.add(timeTillConverted(zombieVillager));
+        }
         //reputation
         // TODO: wait for Reputation API to be added for Zombie Villagers or use PDC to calculate reputation NBT by hand
         //if (ToggleSetting.REPUTATION.isEnabled()) {
         //    messageList.add(villagerPlayerReputation(zombieVillager.getReputation(player.getUniqueId())));
         //}
         //Messages
         Component prefix = miniMessage.deserialize(Message.PREFIX.getMessage());
+        player.playSound(player.getLocation(), ConfigValidator.getConfigSound(), ConfigValidator.getSoundVolume(), ConfigValidator.getSoundPitch());
         player.sendMessage(prefix);
+        if (messageList.size() == 0) {
+            player.sendMessage(miniMessage.deserialize(Message.NO_INFORMATION.getMessage()));
+            return;
+        }
         for (Component component : messageList) {
             player.sendMessage(component);
         }
     }
 
+    private Component timeTillConverted(ZombieVillager zombieVillager){
+            long converstionTime = zombieVillager.getConversionTime();
+            String timeCalc = timeMath(converstionTime);
+            return miniMessage.deserialize(Message.ZOMBIE_VILLAGER_CONVERSION_TIME.getMessage(), Placeholder.unparsed("time", timeCalc));
+    }
+
     /**
      * Checks and returns formatted 'time till adult' message component
      * @param ageable Clicked Villager
@@ -159,6 +176,9 @@ private Component timeTillAdult(Ageable ageable) {
         Component timeTillAdultFinal;
         long age = ageable.getAge();
         age = age * -1;
+        if (age == 0) {
+            return null;
+        }
         String timeCalc = timeMath(age);
         timeTillAdultFinal = miniMessage.deserialize(Message.VILLAGER_AGE.getMessage(), Placeholder.unparsed("age", timeCalc));
         return timeTillAdultFinal;
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
@@ -3,6 +3,7 @@
 #Information Toggles
 #True to enable the information to display when requested, false for it not to display
 baby-age: true
+zombie-conversion: true
 profession: true
 job-site: true
 last-worked: true
@@ -14,6 +15,9 @@ reputation: true
 highlight-workstation: true
 sound-toggle: true
 #Sound must be from this list https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/Sound.html
+#Volume and pitch can range from 0.0-2.0
 sound: BLOCK_AMETHYST_BLOCK_BREAK
+sound-volume: 0.5
+sound-pitch: 1.5
 #Length of time to highlight the villager's workstation (if enabled)
 highlight-time: 10

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public static void villagerJobsiteHighlight(PersistentDataContainer villPDC, UUI`
`35`	`35`	`killFallingBlock(villUUID);`
`36`	`36`	`villPDC.set(VillagerInfo.HIGHLIGHT_STATUS, PersistentDataType.BYTE, (byte)0);`
`37`	`37`	`VILLAGER_PDC.put(villUUID, villPDC);`
`38`		`- }, 20L * ConfigValidator.configTime);`
	`38`	`+ }, 20L * ConfigValidator.getConfigTime());`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`/**`