From 180bad9d46582e47ef8583711a4ecbcbb6eeed32 Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Thu, 15 Apr 2021 14:20:43 +0200
Subject: [PATCH] linux: fix moving files between different disks

---
 src/main/java/de/bixilon/minosoft/config/Configuration.kt  | 7 ++-----
 .../de/bixilon/minosoft/data/assets/FileAssetsManager.kt   | 7 +++----
 .../minosoft/data/locale/minecraft/MinecraftLanguage.kt    | 2 +-
 src/main/java/de/bixilon/minosoft/gui/rendering/Camera.kt  | 5 -----
 4 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/main/java/de/bixilon/minosoft/config/Configuration.kt b/src/main/java/de/bixilon/minosoft/config/Configuration.kt
index 99ed84e76..74c9d632b 100644
--- a/src/main/java/de/bixilon/minosoft/config/Configuration.kt
+++ b/src/main/java/de/bixilon/minosoft/config/Configuration.kt
@@ -22,6 +22,7 @@ import okio.Buffer
 import java.io.File
 import java.io.FileWriter
 import java.io.IOException
+import java.nio.file.Files
 
 class Configuration(private val configName: String = StaticConfiguration.CONFIG_FILENAME) {
     private val file = File(StaticConfiguration.HOME_DIRECTORY + "config/minosoft/" + configName)
@@ -74,11 +75,7 @@ class Configuration(private val configName: String = StaticConfiguration.CONFIG_
                     throw RuntimeException("Could not save config!")
                 }
             }
-            if (!tempFile.renameTo(file)) {
-                Log.fatal("An error occurred while saving the config file")
-            } else {
-                Log.verbose("Configuration saved to file %s", configName)
-            }
+            Files.move(tempFile.toPath(), file.toPath())
         }
     }
 
diff --git a/src/main/java/de/bixilon/minosoft/data/assets/FileAssetsManager.kt b/src/main/java/de/bixilon/minosoft/data/assets/FileAssetsManager.kt
index 9104052a6..161fc175a 100644
--- a/src/main/java/de/bixilon/minosoft/data/assets/FileAssetsManager.kt
+++ b/src/main/java/de/bixilon/minosoft/data/assets/FileAssetsManager.kt
@@ -20,6 +20,7 @@ import de.bixilon.minosoft.util.Util
 import de.bixilon.minosoft.util.logging.Log
 import de.bixilon.minosoft.util.logging.LogLevels
 import java.io.*
+import java.nio.file.Files
 import java.security.MessageDigest
 import java.util.zip.GZIPOutputStream
 
@@ -105,13 +106,11 @@ interface FileAssetsManager : AssetsManager {
         if (outputFile.exists()) {
             // file is already extracted
             if (!tempDestinationFile.delete()) {
-                throw IllegalStateException(String.format("Could not delete temporary file %s", tempDestinationFile.absolutePath))
+                throw IllegalStateException("Could not delete temporary file ${tempDestinationFile.absolutePath}")
             }
             return hash
         }
-        if (!tempDestinationFile.renameTo(outputFile)) {
-            throw IllegalStateException(String.format("Could not rename file %s to %s", tempDestinationFile.absolutePath, outputFile.absolutePath))
-        }
+        Files.move(tempDestinationFile.toPath(), outputFile.toPath())
         return hash
     }
 
diff --git a/src/main/java/de/bixilon/minosoft/data/locale/minecraft/MinecraftLanguage.kt b/src/main/java/de/bixilon/minosoft/data/locale/minecraft/MinecraftLanguage.kt
index 89a74ca99..2e108a6f4 100644
--- a/src/main/java/de/bixilon/minosoft/data/locale/minecraft/MinecraftLanguage.kt
+++ b/src/main/java/de/bixilon/minosoft/data/locale/minecraft/MinecraftLanguage.kt
@@ -31,7 +31,7 @@ open class MinecraftLanguage : Translator {
 
     constructor(language: String, data: String) {
         this.language = language
-        for (line in data.split("\\r?\\n").toTypedArray()) {
+        for (line in data.lines().toTypedArray()) {
             if (line.isBlank()) {
                 continue
             }
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/Camera.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/Camera.kt
index d2b4c1a87..f3a6bf6ff 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/Camera.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/Camera.kt
@@ -239,10 +239,6 @@ class Camera(
         return glm.lookAt(cameraPosition, cameraPosition + cameraFront, CAMERA_UP_VEC3)
     }
 
-    fun setFOV(fov: Float) {
-        this.fov = fov
-    }
-
     fun setRotation(yaw: Float, pitch: Float) {
         playerEntity.rotation = EntityRotation(yaw.toDouble(), pitch.toDouble())
 
@@ -303,6 +299,5 @@ class Camera(
     companion object {
         private val CAMERA_UP_VEC3 = Vec3(0.0f, 1.0f, 0.0f)
         private const val PLAYER_HEIGHT = 1.3 // player is 1.8 blocks high, the camera is normally at 0.5. 1.8 - 0.5 = 1.13
-        const val PLAYER_WIDTH = 0.60001
     }
 }