File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 5555import java .net .URI ;
5656import java .nio .file .Files ;
5757import java .nio .file .Path ;
58- import java .util .ArrayList ;
59- import java .util .HashSet ;
60- import java .util .List ;
61- import java .util .Set ;
58+ import java .util .*;
6259import java .util .concurrent .CancellationException ;
6360import java .util .concurrent .CompletableFuture ;
6461import java .util .function .Consumer ;
@@ -264,6 +261,7 @@ public static void cleanGameFiles(Profile profile) {
264261 var versions = repository .getVersions ();
265262
266263 Set <String > activeAssets = versions .parallelStream ()
264+ .filter (Objects ::nonNull )
267265 .map (Version ::getAssetIndex )
268266 .distinct ()
269267 .flatMap (idx -> {
@@ -289,8 +287,8 @@ public static void cleanGameFiles(Profile profile) {
289287 versions .forEach (v -> unusedFolders .add (repository .getRunDirectory (v .getId ()).resolve (path )));
290288 }
291289
292- versions .forEach ( v -> {
293- try (var walker = Files .walk (repository . getRunDirectory ( v . getId ()) , 1 )) {
290+ versions .stream (). map ( v -> repository . getRunDirectory ( v . getId ())). distinct (). forEach ( runDir -> {
291+ try (var walker = Files .walk (runDir , 1 )) {
294292 unusedFolders .addAll (walker
295293 .filter (it -> {
296294 var name = it .getFileName ().toString ();
Original file line number Diff line number Diff line change @@ -82,7 +82,7 @@ public String formatSize(long bytes) {
8282 } else if (bytes < 1024 * 1024 * 1024 ) {
8383 return supportedLocale .i18n ("download.size.megabyte" , (double ) bytes / (1024 * 1024 ));
8484 } else {
85- return supportedLocale .i18n ("download.size.gibabyte " , (double ) bytes / (1024 * 1024 * 1024 ));
85+ return supportedLocale .i18n ("download.size.gigabyte " , (double ) bytes / (1024 * 1024 * 1024 ));
8686 }
8787 }
8888}
Original file line number Diff line number Diff line change @@ -385,7 +385,7 @@ download.javafx.prepare=Preparing to download
385385download.size.byte =%d B
386386download.size.kibibyte =%.1f KiB
387387download.size.megabyte =%.1f MiB
388- download.size.gibabyte =%.1f GiB
388+ download.size.gigabyte =%.1f GiB
389389download.speed.byte_per_second =%d B/s
390390download.speed.kibibyte_per_second =%.1f KiB/s
391391download.speed.megabyte_per_second =%.1f MiB/s
Original file line number Diff line number Diff line change @@ -378,7 +378,7 @@ download.javafx.prepare=準備開始下載
378378download.size.byte =%d B
379379download.size.kibibyte =%.1f KiB
380380download.size.megabyte =%.1f MiB
381- download.size.gibabyte =%.1f GiB
381+ download.size.gigabyte =%.1f GiB
382382download.speed.byte_per_second =%d B/s
383383download.speed.kibibyte_per_second =%.1f KiB/s
384384download.speed.megabyte_per_second =%.1f MiB/s
Original file line number Diff line number Diff line change @@ -380,7 +380,7 @@ download.javafx.prepare=准备开始下载
380380download.size.byte =%d B
381381download.size.kibibyte =%.1f KiB
382382download.size.megabyte =%.1f MiB
383- download.size.gibabyte =%.1f GiB
383+ download.size.gigabyte =%.1f GiB
384384download.speed.byte_per_second =%d B/s
385385download.speed.kibibyte_per_second =%.1f KiB/s
386386download.speed.megabyte_per_second =%.1f MiB/s
You can’t perform that action at this time.
0 commit comments