mirror of
https://github.com/curioustorvald/Terrarum.git
synced 2026-03-08 12:51:51 +09:00
rudimentary deploy system
This commit is contained in:
@@ -1,11 +1,15 @@
|
||||
module terrarum.terrarum {
|
||||
// java
|
||||
requires java.base;
|
||||
requires java.desktop;
|
||||
requires java.logging;
|
||||
requires jdk.unsupported; // sun.misc.Unsafe
|
||||
|
||||
// kotlin
|
||||
requires kotlin.stdlib;
|
||||
requires kotlin.test;
|
||||
requires kotlin.reflect;
|
||||
requires kotlin.stdlib.jdk8;
|
||||
|
||||
// gdx
|
||||
requires gdx;
|
||||
@@ -16,15 +20,16 @@ module terrarum.terrarum {
|
||||
|
||||
// terrarum
|
||||
requires TerrarumSansBitmap;
|
||||
requires TerranVirtualDisk;
|
||||
requires Terrarum.Joise;
|
||||
|
||||
// etc
|
||||
requires GetCpuName;
|
||||
requires kotlinx.serialization.core.jvm;
|
||||
requires kotlinx.serialization.json;
|
||||
requires kotlinx.serialization.json.jvm;
|
||||
requires org.apache.commons.codec;
|
||||
requires commons.csv;
|
||||
requires jxinput;
|
||||
requires org.graalvm.sdk;
|
||||
requires com.ibm.icu;
|
||||
requires org.lwjgl.opengl;
|
||||
|
||||
exports net.torvald.terrarum;
|
||||
}
|
||||
@@ -49,7 +49,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
const val VERSION_RAW = 0x00030000
|
||||
// Commit counts up to the Release 0.3: 2257 (plz update!)
|
||||
// Commit counts up to the Release 0.3: 2259 (plz update!)
|
||||
|
||||
//////////////////////////////////////////////////////////
|
||||
// CONFIGURATION FOR TILE MAKER //
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
package net.torvald.terrarum.debuggerapp
|
||||
|
||||
import net.torvald.terrarum.TerrarumAppConfiguration
|
||||
import net.torvald.terrarum.serialise.Common
|
||||
import net.torvald.terrarum.savegame.EntryFile
|
||||
import net.torvald.terrarum.savegame.VDUtil
|
||||
import net.torvald.terrarum.savegame.VirtualDisk
|
||||
import net.torvald.terrarum.savegame.diskIDtoReadableFilename
|
||||
import net.torvald.terrarum.serialise.Common
|
||||
import java.io.File
|
||||
import java.io.PrintStream
|
||||
import java.nio.charset.Charset
|
||||
@@ -110,7 +110,7 @@ class SavegameCracker(
|
||||
it.call(this, args)
|
||||
}
|
||||
catch (e: Throwable) {
|
||||
val error = e.cause ?: e
|
||||
val error = (e.cause ?: e) as java.lang.Throwable
|
||||
printerrln("Error -- ${error}")
|
||||
error.printStackTrace(stderr)
|
||||
printerrln("Error -- ${error}")
|
||||
|
||||
@@ -6,7 +6,6 @@ import java.util.*
|
||||
import java.util.logging.Level
|
||||
import java.util.zip.GZIPInputStream
|
||||
import java.util.zip.GZIPOutputStream
|
||||
import javax.naming.OperationNotSupportedException
|
||||
import kotlin.experimental.and
|
||||
|
||||
/**
|
||||
@@ -499,7 +498,7 @@ object VDUtil {
|
||||
}
|
||||
fun ByteArray64.toIntBig(): Int {
|
||||
if (this.size != 4L)
|
||||
throw OperationNotSupportedException("ByteArray is not Int")
|
||||
throw UnsupportedOperationException("ByteArray is not Int")
|
||||
|
||||
var i = 0
|
||||
var c = 0
|
||||
@@ -508,7 +507,7 @@ object VDUtil {
|
||||
}
|
||||
fun ByteArray64.toLongBig(): Long {
|
||||
if (this.size != 8L)
|
||||
throw OperationNotSupportedException("ByteArray is not Long")
|
||||
throw UnsupportedOperationException("ByteArray is not Long")
|
||||
|
||||
var i = 0L
|
||||
var c = 0
|
||||
@@ -517,7 +516,7 @@ object VDUtil {
|
||||
}
|
||||
fun ByteArray64.toInt48Big(): Long {
|
||||
if (this.size != 6L)
|
||||
throw OperationNotSupportedException("ByteArray is not Long")
|
||||
throw UnsupportedOperationException("ByteArray is not Long")
|
||||
|
||||
var i = 0L
|
||||
var c = 0
|
||||
@@ -526,7 +525,7 @@ object VDUtil {
|
||||
}
|
||||
fun ByteArray64.toShortBig(): Short {
|
||||
if (this.size != 2L)
|
||||
throw OperationNotSupportedException("ByteArray is not Short")
|
||||
throw UnsupportedOperationException("ByteArray is not Short")
|
||||
|
||||
return (this[0].toUint().shl(256) + this[1].toUint()).toShort()
|
||||
}
|
||||
|
||||
@@ -13,7 +13,6 @@ import net.torvald.terrarum.*
|
||||
import net.torvald.terrarum.gamecontroller.*
|
||||
import net.torvald.terrarum.utils.Clipboard
|
||||
import net.torvald.terrarumsansbitmap.gdx.CodepointSequence
|
||||
import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
|
||||
import net.torvald.toJavaString
|
||||
import kotlin.streams.toList
|
||||
|
||||
@@ -382,7 +381,7 @@ class UIItemTextLineInput(
|
||||
}
|
||||
}
|
||||
|
||||
private fun String.toCodePoints() = this.codePoints().toList().filter { it > 0 }.toList()
|
||||
private fun String.toCodePoints() = (this as java.lang.CharSequence).codePoints().toList().filter { it > 0 }.toList()
|
||||
|
||||
private fun endComposing(force: Boolean = false) {
|
||||
getIME(force)?.let {
|
||||
|
||||
Reference in New Issue
Block a user