AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-18 11:54:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

linux: fix moving files between different disks

Browse Source
This commit is contained in:
Bixilon 2021-04-15 14:20:43 +02:00
parent a009167fae
commit 180bad9d46
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
4 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/de/bixilon/minosoft/config/Configuration.kt
View File

@ -22,6 +22,7 @@ import okio.Buffer
import java.io.File import java.io.File
import java.io.FileWriter import java.io.FileWriter
import java.io.IOException import java.io.IOException
import java.nio.file.Files
class Configuration(private val configName: String = StaticConfiguration.CONFIG_FILENAME) { class Configuration(private val configName: String = StaticConfiguration.CONFIG_FILENAME) {
private val file = File(StaticConfiguration.HOME_DIRECTORY + "config/minosoft/" + configName) 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!") throw RuntimeException("Could not save config!")
} }
} }
if (!tempFile.renameTo(file)) { Files.move(tempFile.toPath(), file.toPath())
Log.fatal("An error occurred while saving the config file")
} else {
Log.verbose("Configuration saved to file %s", configName)
}
} }
} }

7
src/main/java/de/bixilon/minosoft/data/assets/FileAssetsManager.kt
View File

@ -20,6 +20,7 @@ import de.bixilon.minosoft.util.Util
import de.bixilon.minosoft.util.logging.Log import de.bixilon.minosoft.util.logging.Log
import de.bixilon.minosoft.util.logging.LogLevels import de.bixilon.minosoft.util.logging.LogLevels
import java.io.* import java.io.*
import java.nio.file.Files
import java.security.MessageDigest import java.security.MessageDigest
import java.util.zip.GZIPOutputStream import java.util.zip.GZIPOutputStream
@ -105,13 +106,11 @@ interface FileAssetsManager : AssetsManager {
if (outputFile.exists()) { if (outputFile.exists()) {
// file is already extracted // file is already extracted
if (!tempDestinationFile.delete()) { 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 return hash
} }
if (!tempDestinationFile.renameTo(outputFile)) { Files.move(tempDestinationFile.toPath(), outputFile.toPath())
throw IllegalStateException(String.format("Could not rename file %s to %s", tempDestinationFile.absolutePath, outputFile.absolutePath))
}
return hash return hash
} }

2
src/main/java/de/bixilon/minosoft/data/locale/minecraft/MinecraftLanguage.kt
View File

@ -31,7 +31,7 @@ open class MinecraftLanguage : Translator {
constructor(language: String, data: String) { constructor(language: String, data: String) {
this.language = language this.language = language
for (line in data.split("\\r?\\n").toTypedArray()) { for (line in data.lines().toTypedArray()) {
if (line.isBlank()) { if (line.isBlank()) {
continue continue
} }

5
src/main/java/de/bixilon/minosoft/gui/rendering/Camera.kt
View File

@ -239,10 +239,6 @@ class Camera(
return glm.lookAt(cameraPosition, cameraPosition + cameraFront, CAMERA_UP_VEC3) return glm.lookAt(cameraPosition, cameraPosition + cameraFront, CAMERA_UP_VEC3)
} }
fun setFOV(fov: Float) {
this.fov = fov
}
fun setRotation(yaw: Float, pitch: Float) { fun setRotation(yaw: Float, pitch: Float) {
playerEntity.rotation = EntityRotation(yaw.toDouble(), pitch.toDouble()) playerEntity.rotation = EntityRotation(yaw.toDouble(), pitch.toDouble())
@ -303,6 +299,5 @@ class Camera(
companion object { companion object {
private val CAMERA_UP_VEC3 = Vec3(0.0f, 1.0f, 0.0f) 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 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
} }
} }