From 6c39053bdf64ac130daee2bf3b44ce1c025b4dbd Mon Sep 17 00:00:00 2001 From: Bryson Steck Date: Sun, 4 Jul 2021 21:23:50 -0600 Subject: fixed time formatting --- out/artifacts/Resurrection_jar/Resurrection.jar | Bin 1347919 -> 1348594 bytes src/net/brysonsteck/Resurrection/Resurrection.java | 2 +- .../Resurrection/commands/CommandAbout.java | 2 +- .../Resurrection/player/PlayerData.java | 4 ++-- .../brysonsteck/Resurrection/player/TimeCheck.java | 4 +++- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/out/artifacts/Resurrection_jar/Resurrection.jar b/out/artifacts/Resurrection_jar/Resurrection.jar index e5527d8..c078706 100644 Binary files a/out/artifacts/Resurrection_jar/Resurrection.jar and b/out/artifacts/Resurrection_jar/Resurrection.jar differ diff --git a/src/net/brysonsteck/Resurrection/Resurrection.java b/src/net/brysonsteck/Resurrection/Resurrection.java index 50aa642..e301d2b 100644 --- a/src/net/brysonsteck/Resurrection/Resurrection.java +++ b/src/net/brysonsteck/Resurrection/Resurrection.java @@ -137,7 +137,7 @@ public class Resurrection extends JavaPlugin implements Listener { // String[] array = ";bryzinga,false,0".split(";"); // System.out.println(array.length); - TimeCheck timeCheck = new TimeCheck((System.currentTimeMillis() + 86400000) - System.currentTimeMillis()); + TimeCheck timeCheck = new TimeCheck((System.currentTimeMillis() + 86212345) - System.currentTimeMillis()); System.out.println(timeCheck.formatTime()); } diff --git a/src/net/brysonsteck/Resurrection/commands/CommandAbout.java b/src/net/brysonsteck/Resurrection/commands/CommandAbout.java index aedf0be..1bf27fb 100644 --- a/src/net/brysonsteck/Resurrection/commands/CommandAbout.java +++ b/src/net/brysonsteck/Resurrection/commands/CommandAbout.java @@ -37,7 +37,7 @@ public class CommandAbout implements CommandExecutor { p.sendMessage(""); } p.sendMessage(ChatColor.YELLOW + "\u00a9 2021 Bryson Steck"); - p.sendMessage(ChatColor.YELLOW + "This plugin is licensed under the GNU Affero General Public License v3.0. Read more here: "); + p.sendMessage(ChatColor.YELLOW + "This plugin is licensed under the GNU Affero General Public License v3.0. Read more here: https://www.gnu.org/licenses/agpl-3.0.en.html"); p.sendMessage(ChatColor.YELLOW + "For more information on this plugin or to download it for yourself, visit the GitHub repository at https://github.com/brysonsteck/resurrection"); } else { System.out.println(aboutMessage); diff --git a/src/net/brysonsteck/Resurrection/player/PlayerData.java b/src/net/brysonsteck/Resurrection/player/PlayerData.java index 4201cb3..512c94f 100644 --- a/src/net/brysonsteck/Resurrection/player/PlayerData.java +++ b/src/net/brysonsteck/Resurrection/player/PlayerData.java @@ -13,7 +13,7 @@ public class PlayerData { public void saveData(String write) { try { - FileWriter writer = new FileWriter("playerData.resurrection"); + FileWriter writer = new FileWriter("plugins/playerData.resurrection"); writer.write(write); writer.close(); } catch (IOException e) { @@ -25,7 +25,7 @@ public class PlayerData { public void readData() { try { rawData = ""; - BufferedReader reader = new BufferedReader(new FileReader("playerData.resurrection")); + BufferedReader reader = new BufferedReader(new FileReader("plugins/playerData.resurrection")); String line = ""; String[] playerData; while (true) { diff --git a/src/net/brysonsteck/Resurrection/player/TimeCheck.java b/src/net/brysonsteck/Resurrection/player/TimeCheck.java index f1cf004..dc989ea 100644 --- a/src/net/brysonsteck/Resurrection/player/TimeCheck.java +++ b/src/net/brysonsteck/Resurrection/player/TimeCheck.java @@ -10,9 +10,11 @@ public class TimeCheck { } public String formatTime() { + long hours = TimeUnit.MILLISECONDS.toHours(millis); + String formattedTime = String.format("%d hrs, %d min, %d sec", TimeUnit.MILLISECONDS.toHours(millis), - TimeUnit.MILLISECONDS.toMinutes(millis), + TimeUnit.MILLISECONDS.toMinutes(millis) - TimeUnit.HOURS.toMinutes(TimeUnit.MILLISECONDS.toHours(millis)), TimeUnit.MILLISECONDS.toSeconds(millis) - TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(millis))); return formattedTime; -- cgit v1.2.3