2
2
3
3
import net .oceanias .opal .plugin .OPlugin ;
4
4
import net .oceanias .opal .utility .extension .OCommandSenderExtension ;
5
+ import net .oceanias .opal .utility .helper .ODurationHelper ;
5
6
import net .oceanias .opal .utility .helper .OTaskHelper ;
6
7
import java .time .Duration ;
7
- import java .util .List ;
8
8
import java .util .Map ;
9
9
import java .util .concurrent .ConcurrentHashMap ;
10
10
import org .bukkit .Sound ;
@@ -63,7 +63,7 @@ public void setCooldown(@NotNull final CommandSender sender, final boolean coold
63
63
}
64
64
65
65
public void showReminder (@ NotNull final CommandSender sender ) {
66
- final String message = "&fPlease wait &6" + formatDuration (getRemaining (sender )) + "&f." ;
66
+ final String message = "&fPlease wait &6" + ODurationHelper . formatFullDuration (getRemaining (sender )) + "&f." ;
67
67
68
68
if (sender instanceof ConsoleCommandSender ) {
69
69
sender .messageDSR (message );
@@ -112,31 +112,4 @@ public void withCooldown(final CommandSender sender, final Runnable execute) {
112
112
113
113
showReminder (sender );
114
114
}
115
-
116
- private static String formatDuration (@ NotNull final Duration duration ) {
117
- final List <Pair <String , Long >> units = List .of (
118
- Pair .of ("day" , duration .toDays ()),
119
- Pair .of ("hour" , duration .toHours () % 24 ),
120
- Pair .of ("minute" , duration .toMinutes () % 60 ),
121
- Pair .of ("second" , duration .toSeconds () % 60 )
122
- );
123
-
124
- final List <String > parts = units .stream ()
125
- .filter (unit -> unit .getRight () > 0 )
126
- .map (unit -> {
127
- final String extension = (unit .getRight () == 1L )
128
- ? ""
129
- : "s" ;
130
-
131
- return unit .getRight () + " " + unit .getLeft () + extension ;
132
- })
133
- .toList ();
134
-
135
- return switch (parts .size ()) {
136
- case 0 -> "less than a second" ;
137
- case 1 -> parts .get (0 );
138
- case 2 -> parts .get (0 ) + " and " + parts .get (1 );
139
- default -> String .join (", " , parts .subList (0 , parts .size () - 1 )) + ", and " + parts .getLast ();
140
- };
141
- }
142
115
}
0 commit comments