diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml index 19151d642..5a7878cf7 100644 --- a/.idea/libraries/lib.xml +++ b/.idea/libraries/lib.xml @@ -5,7 +5,6 @@ - @@ -15,8 +14,6 @@ - - @@ -29,7 +26,6 @@ - diff --git a/.idea/misc.xml b/.idea/misc.xml index 18d93cc08..2c55e21aa 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -38,20 +38,7 @@ - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7f4..35eb1ddfb 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Terrarum_renewed.iml b/Terrarum_renewed.iml index 728bcc8a5..f1d33d1b1 100644 --- a/Terrarum_renewed.iml +++ b/Terrarum_renewed.iml @@ -5,6 +5,11 @@ + + + + + diff --git a/src/net/torvald/terrarum/StateInGame.kt b/src/net/torvald/terrarum/StateInGame.kt index b636799cb..d0757b0a4 100644 --- a/src/net/torvald/terrarum/StateInGame.kt +++ b/src/net/torvald/terrarum/StateInGame.kt @@ -275,8 +275,6 @@ constructor() : BasicGameState() { actorsDrawFrameBuffer.graphics.clear() uisDrawFrameBuffer.graphics.clear() - - gwin.isAntiAlias = true blendNormal() diff --git a/src/net/torvald/terrarum/console/SetAV.kt b/src/net/torvald/terrarum/console/SetAV.kt index 76d9408ba..2a9e5e1f0 100644 --- a/src/net/torvald/terrarum/console/SetAV.kt +++ b/src/net/torvald/terrarum/console/SetAV.kt @@ -27,7 +27,7 @@ internal class SetAV : ConsoleCommand { override fun execute(args: Array) { fun parseAVInput(arg: String): Any { - val `val`: Any + var `val`: Any try { `val` = Integer(arg) // try for integer diff --git a/src/net/torvald/terrarum/virtualcomputer/luaapi/Filesystem.kt b/src/net/torvald/terrarum/virtualcomputer/luaapi/Filesystem.kt index 94ac875ff..692574c9e 100644 --- a/src/net/torvald/terrarum/virtualcomputer/luaapi/Filesystem.kt +++ b/src/net/torvald/terrarum/virtualcomputer/luaapi/Filesystem.kt @@ -56,7 +56,7 @@ internal class Filesystem(globals: Globals, computer: BaseTerrarumComputer) { throw IOException("path contains invalid characters") } - val isCaseInsensitive: Boolean + var isCaseInsensitive: Boolean init { try { diff --git a/src/net/torvald/terrarum/weather/WeatherMixer.kt b/src/net/torvald/terrarum/weather/WeatherMixer.kt index b4a0ff097..6a187af22 100644 --- a/src/net/torvald/terrarum/weather/WeatherMixer.kt +++ b/src/net/torvald/terrarum/weather/WeatherMixer.kt @@ -162,10 +162,10 @@ object WeatherMixer { val skybox: Image val extraImages = ArrayList() val classification = JSON.get("classification").asJsonPrimitive.asString - val mixFrom: String? + var mixFrom: String? try { mixFrom = JSON.get("mixFrom").asJsonPrimitive.asString } catch (e: NullPointerException) { mixFrom = null } - val mixPercentage: Double? + var mixPercentage: Double? try { mixPercentage = JSON.get("mixPercentage").asJsonPrimitive.asDouble } catch (e: NullPointerException) { mixPercentage = null }