From 1141c3500afd0c0737f9984eb379c302b607d591 Mon Sep 17 00:00:00 2001
From: szymon <szymek.januszek@gmail.com>
Date: Tue, 4 Aug 2020 17:32:43 +0200
Subject: [PATCH] Better java 8 support

---
 .../core/restore/RestoreBackupRunnable.java           | 11 +++++------
 .../textile_backup/core/restore/RestoreHelper.java    |  9 ++++-----
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main/java/net/szum123321/textile_backup/core/restore/RestoreBackupRunnable.java b/src/main/java/net/szum123321/textile_backup/core/restore/RestoreBackupRunnable.java
index e0d00bd..49a9513 100644
--- a/src/main/java/net/szum123321/textile_backup/core/restore/RestoreBackupRunnable.java
+++ b/src/main/java/net/szum123321/textile_backup/core/restore/RestoreBackupRunnable.java
@@ -19,7 +19,7 @@
 package net.szum123321.textile_backup.core.restore;
 
 import net.minecraft.server.MinecraftServer;
-import net.szum123321.textile_backup.LivingServer;
+import net.szum123321.textile_backup.core.LivingServer;
 import net.szum123321.textile_backup.TextileBackup;
 import net.szum123321.textile_backup.core.Utilities;
 import net.szum123321.textile_backup.core.create.BackupContext;
@@ -33,7 +33,7 @@ import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.nio.channels.FileLock;
+import java.util.NoSuchElementException;
 
 public class RestoreBackupRunnable implements Runnable {
     private final MinecraftServer server;
@@ -76,7 +76,7 @@ public class RestoreBackupRunnable implements Runnable {
         try(FileInputStream fileInputStream = new FileInputStream(backupFile)) {
             TextileBackup.LOGGER.info("Starting decompression...");
 
-            switch(Utilities.getFileExtension(backupFile).orElseThrow()) {
+            switch(Utilities.getFileExtension(backupFile).orElseThrow(() -> new NoSuchElementException("Couldn't get file extention!"))) {
                 case ZIP:
                     ZipDecompressor.decompress(fileInputStream, worldFile);
                     break;
@@ -103,10 +103,9 @@ public class RestoreBackupRunnable implements Runnable {
     private void waitDelay() {
         int delay = TextileBackup.CONFIG.restoreDelay;
 
-        while(delay > 0) {
+        if(delay > 0) {
             try {
-                Thread.sleep(1000);
-                delay--;
+                Thread.sleep(1000 * delay);
             } catch (InterruptedException e) {
                 TextileBackup.LOGGER.error("Exception occurred!", e);
             }
diff --git a/src/main/java/net/szum123321/textile_backup/core/restore/RestoreHelper.java b/src/main/java/net/szum123321/textile_backup/core/restore/RestoreHelper.java
index 41c446e..9f294a4 100644
--- a/src/main/java/net/szum123321/textile_backup/core/restore/RestoreHelper.java
+++ b/src/main/java/net/szum123321/textile_backup/core/restore/RestoreHelper.java
@@ -22,13 +22,12 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.text.LiteralText;
 import net.szum123321.textile_backup.TextileBackup;
 import net.szum123321.textile_backup.core.Utilities;
-import net.szum123321.textile_backup.core.create.BackupContext;
-import net.szum123321.textile_backup.core.create.BackupHelper;
 
 import java.io.File;
 import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.stream.Collectors;
 
 public class RestoreHelper {
@@ -38,7 +37,7 @@ public class RestoreHelper {
                 .filter(file -> Utilities.getFileCreationTime(file).isPresent())
                 .filter(file -> Utilities.getFileCreationTime(file).get().equals(backupTime))
                 .findFirst()
-                .orElseThrow();
+                .orElseThrow(() -> new NoSuchElementException("Couldn't find given backup file!"));
 
         server.getPlayerManager().getPlayerList()
                 .forEach(serverPlayerEntity -> serverPlayerEntity.sendMessage(new LiteralText("Warning! The server is going to shut down in " + TextileBackup.CONFIG.restoreDelay + " seconds!"), false));
@@ -64,8 +63,8 @@ public class RestoreHelper {
         private final String comment;
 
         protected RestoreableFile(File file) {
-            String extension = Utilities.getFileExtension(file).orElseThrow().getString();
-            this.creationTime = Utilities.getFileCreationTime(file).orElseThrow();
+            String extension = Utilities.getFileExtension(file).orElseThrow(() -> new NoSuchElementException("Couldn't get file extention")).getString();
+            this.creationTime = Utilities.getFileCreationTime(file).orElseThrow(() -> new NoSuchElementException("Couldn't get file creation time."));
 
             final String filename = file.getName();