diff --git a/.idea/runConfigurations/App.xml b/.idea/runConfigurations/App.xml new file mode 100644 index 000000000..8a91989a2 --- /dev/null +++ b/.idea/runConfigurations/App.xml @@ -0,0 +1,17 @@ + + + + \ No newline at end of file diff --git a/src/net/torvald/UnsafePtr.kt b/src/net/torvald/UnsafePtr.kt index ab4a29049..c83f0d1f2 100644 --- a/src/net/torvald/UnsafePtr.kt +++ b/src/net/torvald/UnsafePtr.kt @@ -110,8 +110,8 @@ internal class UnsafePtr(pointer: Long, allocSize: Long) { // You may break the glass and use this tool when some fucking incomprehensible bugs ("vittujen vitun bugit") // appear (e.g. getting garbage values when it fucking shouldn't) -// assert(!destroyed) { throw NullPointerException("The pointer is already destroyed ($this)") } -// if (index !in 0 until size) throw IndexOutOfBoundsException("Index: $index; alloc size: $size") + assert(!destroyed) { throw NullPointerException("The pointer is already destroyed ($this)") } + assert(index in 0 until size) { throw IndexOutOfBoundsException("Index: $index; alloc size: $size") } } operator fun get(index: Long): Byte { diff --git a/src/net/torvald/terrarum/App.java b/src/net/torvald/terrarum/App.java index fc9a71d43..998651b20 100644 --- a/src/net/torvald/terrarum/App.java +++ b/src/net/torvald/terrarum/App.java @@ -34,8 +34,8 @@ import net.torvald.terrarum.langpack.Lang; import net.torvald.terrarum.modulebasegame.IngameRenderer; import net.torvald.terrarum.modulebasegame.TerrarumIngame; import net.torvald.terrarum.modulebasegame.ui.ItemSlotImageFactory; -import net.torvald.terrarum.serialise.WriteConfig; import net.torvald.terrarum.savegame.DiskSkimmer; +import net.torvald.terrarum.serialise.WriteConfig; import net.torvald.terrarum.ui.Toolkit; import net.torvald.terrarum.utils.JsonFetcher; import net.torvald.terrarum.worlddrawer.CreateTileAtlas; @@ -842,7 +842,7 @@ public class App implements ApplicationListener { tileMaker = new CreateTileAtlas(); tileMaker.invoke(false); - IME.INSTANCE.invoke(); + IME.invoke(); Terrarum.initialise(); diff --git a/src/net/torvald/terrarum/gamecontroller/IME.kt b/src/net/torvald/terrarum/gamecontroller/IME.kt index c4455ae44..92c497fe0 100644 --- a/src/net/torvald/terrarum/gamecontroller/IME.kt +++ b/src/net/torvald/terrarum/gamecontroller/IME.kt @@ -88,7 +88,7 @@ object IME { } } - fun invoke() {} + @JvmStatic fun invoke() {} fun getLowLayerByName(name: String): TerrarumKeyLayout { return lowLayers[name.lowercase()]!!