DBot/KStarbound
DBot/KStarbound
3
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Bump JDK to 21, Kotlin to 2.1, Gradle to 8.11, more native Lua work

Browse Source
This commit is contained in:
DBotThePony 2024-12-15 02:46:56 +07:00
parent 7f2097e5e7
commit fb1aea8803
Signed by: DBot
GPG Key ID: DCC23B5715498507
13 changed files with 349 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build.gradle.kts
View File

@ -1,6 +1,7 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
plugins { plugins {
kotlin("jvm") version "1.9.10" kotlin("jvm") version "2.1.0"
id("me.champeau.jmh") version "0.7.1" id("me.champeau.jmh") version "0.7.1"
java java
application application
@ -36,13 +37,13 @@ application {
mainClass.set("ru.dbotthepony.kstarbound.MainKt") mainClass.set("ru.dbotthepony.kstarbound.MainKt")
} }
java.toolchain.languageVersion.set(JavaLanguageVersion.of(17)) java.toolchain.languageVersion.set(JavaLanguageVersion.of(21))
tasks.compileKotlin { tasks.compileKotlin {
kotlinOptions { compilerOptions {
jvmTarget = "17" jvmTarget.set(JvmTarget.JVM_21)
freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn" freeCompilerArgs.add("-opt-in=kotlin.RequiresOptIn")
freeCompilerArgs += "-Xjvm-default=all" freeCompilerArgs.add("-Xjvm-default=all")
} }
} }

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

294
gradlew vendored
View File

@ -1,7 +1,7 @@
#!/usr/bin/env sh #!/bin/sh
# #
# Copyright 2015 the original author or authors. # Copyright © 2015-2021 the original authors.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
@ -17,67 +17,99 @@
# #
############################################################################## ##############################################################################
## #
## Gradle start up script for UN*X # Gradle start up script for POSIX generated by Gradle.
## #
# Important for running:
#
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
# noncompliant, but you have some other compliant shell such as ksh or
# bash, then to run this script, type that shell name before the whole
# command line, like:
#
# ksh Gradle
#
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
# (2) This script targets any POSIX shell, so it avoids extensions provided
# by Bash, Ksh, etc; in particular arrays are avoided.
#
# The "traditional" practice of packing multiple parameters into a
# space-separated string is a well documented source of bugs and security
# problems, so this is (mostly) avoided, by progressively accumulating
# options in "$@", and eventually passing that to Java.
#
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
# see the in-line comments for details.
#
# There are tweaks for specific operating systems such as AIX, CygWin,
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
#
############################################################################## ##############################################################################
# Attempt to set APP_HOME # Attempt to set APP_HOME
# Resolve links: $0 may be a link # Resolve links: $0 may be a link
PRG="$0" app_path=$0
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do # Need this for daisy-chained symlinks.
ls=`ls -ld "$PRG"` while
link=`expr "$ls" : '.*-> \(.*\)$'` APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
if expr "$link" : '/.*' > /dev/null; then [ -h "$app_path" ]
PRG="$link" do
else ls=$( ls -ld "$app_path" )
PRG=`dirname "$PRG"`"/$link" link=${ls#*' -> '}
fi case $link in #(
/*) app_path=$link ;; #(
*) app_path=$APP_HOME$link ;;
esac
done done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_NAME="Gradle" # This is normally unused
APP_BASE_NAME=`basename "$0"` # shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value. # Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum" MAX_FD=maximum
warn () { warn () {
echo "$*" echo "$*"
} } >&2
die () { die () {
echo echo
echo "$*" echo "$*"
echo echo
exit 1 exit 1
} } >&2
# OS specific support (must be 'true' or 'false'). # OS specific support (must be 'true' or 'false').
cygwin=false cygwin=false
msys=false msys=false
darwin=false darwin=false
nonstop=false nonstop=false
case "`uname`" in case "$( uname )" in #(
CYGWIN* ) CYGWIN* ) cygwin=true ;; #(
cygwin=true Darwin* ) darwin=true ;; #(
;; MSYS* | MINGW* ) msys=true ;; #(
Darwin* ) NONSTOP* ) nonstop=true ;;
darwin=true
;;
MSYS* | MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
if [ -n "$JAVA_HOME" ] ; then if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables # IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java" JAVACMD=$JAVA_HOME/jre/sh/java
else else
JAVACMD="$JAVA_HOME/bin/java" JAVACMD=$JAVA_HOME/bin/java
fi fi
if [ ! -x "$JAVACMD" ] ; then if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation." location of your Java installation."
fi fi
else else
JAVACMD="java" JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the Please set the JAVA_HOME variable in your environment to match the
location of your Java installation." location of your Java installation."
fi
fi fi
# Increase the maximum file descriptors if we can. # Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
MAX_FD_LIMIT=`ulimit -H -n` case $MAX_FD in #(
if [ $? -eq 0 ] ; then max*)
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
MAX_FD="$MAX_FD_LIMIT" # shellcheck disable=SC2039,SC3045
fi MAX_FD=$( ulimit -H -n ) ||
ulimit -n $MAX_FD warn "Could not query maximum file descriptor limit"
if [ $? -ne 0 ] ; then esac
warn "Could not set maximum file descriptor limit: $MAX_FD" case $MAX_FD in #(
fi '' | soft) :;; #(
else *)
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
fi # shellcheck disable=SC2039,SC3045
fi ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=`expr $i + 1`
done
case $i in
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac esac
fi fi
# Escape application args # Collect all arguments for the java command, stacking in reverse order:
save () { # * args from the command line
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done # * the main class name
echo " " # * -classpath
} # * -D...appname settings
APP_ARGS=`save "$@"` # * --module-path (only if needed)
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# Collect all arguments for the java command, following the shell quoting and substitution rules # For Cygwin or MSYS, switch paths to Windows format before running java
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
# Now convert the arguments - kludge to limit ourselves to /bin/sh
for arg do
if
case $arg in #(
-*) false ;; # don't mess with options #(
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
[ -e "$t" ] ;; #(
*) false ;;
esac
then
arg=$( cygpath --path --ignore --mixed "$arg" )
fi
# Roll the args list around exactly as many times as the number of
# args, so each arg winds up back in the position where it started, but
# possibly modified.
#
# NB: a `for` loop captures its iteration list before it begins, so
# changing the positional parameters here affects neither the number of
# iterations, nor the values presented in `arg`.
shift # remove old arg
set -- "$@" "$arg" # push replacement arg
done
fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
"$@"
# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi
# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
#
# In Bash we could simply go:
#
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
# set -- "${ARGS[@]}" "$@"
#
# but POSIX shell has neither arrays nor command substitution, so instead we
# post-process each arg (as a line of input to sed) to backslash-escape any
# character that might be a shell metacharacter, then use eval to reverse
# that process (while maintaining the separation between arguments), and wrap
# the whole thing up as a single "set" statement.
#
# This will of course break if any of these variables contains a newline or
# an unmatched quote.
#
eval "set -- $(
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
xargs -n1 |
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
tr '\n' ' '
)" '"$@"'
exec "$JAVACMD" "$@" exec "$JAVACMD" "$@"

15
gradlew.bat vendored
View File

@ -14,7 +14,7 @@
@rem limitations under the License. @rem limitations under the License.
@rem @rem
@if "%DEBUG%" == "" @echo off @if "%DEBUG%"=="" @echo off
@rem ########################################################################## @rem ##########################################################################
@rem @rem
@rem Gradle startup script for Windows @rem Gradle startup script for Windows
@ -25,7 +25,8 @@
if "%OS%"=="Windows_NT" setlocal if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0 set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=. if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0 set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% set APP_HOME=%DIRNAME%
@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute if %ERRORLEVEL% equ 0 goto execute
echo. echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
:end :end
@rem End local scope for the variables with windows NT shell @rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd if %ERRORLEVEL% equ 0 goto mainEnd
:fail :fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code! rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 set EXIT_CODE=%ERRORLEVEL%
exit /b 1 if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd :mainEnd
if "%OS%"=="Windows_NT" endlocal if "%OS%"=="Windows_NT" endlocal

3
lua-5.3.6/src/lauxlib.c
View File

@ -1009,7 +1009,8 @@ static void *l_alloc (void *ud, void *ptr, size_t osize, size_t nsize) {
(void)ud; (void)osize; /* not used */ (void)ud; (void)osize; /* not used */
if (nsize == 0) { if (nsize == 0) {
mi_free(ptr); mi_free(ptr);
//free(ptr); // crashes on windows here unless it also uses realloc
//realloc(ptr, 0);
return NULL; return NULL;
} }
else { /* cannot fail when shrinking a block */ else { /* cannot fail when shrinking a block */

12
src/main/java/ru/dbotthepony/kstarbound/lua/LuaJNR.java
View File

@ -32,6 +32,18 @@ public interface LuaJNR {
public int lua_callk(@NotNull Pointer luaState, int numArgs, int numResults, @LongLong long ctx, @LongLong long callback); public int lua_callk(@NotNull Pointer luaState, int numArgs, int numResults, @LongLong long ctx, @LongLong long callback);
public long lua_atpanic(@NotNull Pointer luaState, @LongLong long fn); public long lua_atpanic(@NotNull Pointer luaState, @LongLong long fn);
/**
* Creates a new thread, pushes it on the stack, and returns a pointer to a lua_State that represents this new thread. The new thread returned by this function shares with the original thread its global environment, but has an independent execution stack.
* <p>
* There is no explicit function to close or to destroy a thread. Threads are subject to garbage collection, like any Lua object.
*/
@NotNull
public Pointer lua_newthread(@NotNull Pointer luaState);
public int luaL_ref(@NotNull Pointer luaState, int stackIndex);
public void lua_copy(@NotNull Pointer luaState, int fromIndex, int toIndex);
public int lua_xmove(@NotNull Pointer from, @NotNull Pointer to, int amount);
@Nullable @Nullable
public Pointer luaL_newstate(); public Pointer luaL_newstate();
public void lua_close(@NotNull Pointer luaState); public void lua_close(@NotNull Pointer luaState);

6
src/main/kotlin/ru/dbotthepony/kstarbound/Main.kt
View File

@ -1,17 +1,11 @@
package ru.dbotthepony.kstarbound package ru.dbotthepony.kstarbound
import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.LogManager
import org.classdump.luna.lib.CoroutineLib
import org.classdump.luna.runtime.Coroutine
import org.lwjgl.Version import org.lwjgl.Version
import picocli.CommandLine import picocli.CommandLine
import picocli.CommandLine.Command import picocli.CommandLine.Command
import picocli.CommandLine.Option import picocli.CommandLine.Option
import picocli.CommandLine.Parameters
import ru.dbotthepony.kstarbound.client.StarboundClient import ru.dbotthepony.kstarbound.client.StarboundClient
import ru.dbotthepony.kstarbound.lua.LuaEnvironment
import ru.dbotthepony.kstarbound.lua.LuaState
import ru.dbotthepony.kstarbound.lua.get
import ru.dbotthepony.kstarbound.server.IntegratedStarboundServer import ru.dbotthepony.kstarbound.server.IntegratedStarboundServer
import java.io.File import java.io.File
import java.net.InetSocketAddress import java.net.InetSocketAddress

33
src/main/kotlin/ru/dbotthepony/kstarbound/lua/Conversions.kt
View File

@ -7,7 +7,6 @@ import com.google.gson.JsonObject
import com.google.gson.JsonPrimitive import com.google.gson.JsonPrimitive
import it.unimi.dsi.fastutil.longs.Long2ObjectAVLTreeMap import it.unimi.dsi.fastutil.longs.Long2ObjectAVLTreeMap
import org.classdump.luna.ByteString import org.classdump.luna.ByteString
import org.classdump.luna.Conversions
import org.classdump.luna.LuaRuntimeException import org.classdump.luna.LuaRuntimeException
import org.classdump.luna.Table import org.classdump.luna.Table
import org.classdump.luna.TableFactory import org.classdump.luna.TableFactory
@ -15,7 +14,6 @@ import org.classdump.luna.impl.NonsuspendableFunctionException
import org.classdump.luna.runtime.AbstractFunction3 import org.classdump.luna.runtime.AbstractFunction3
import org.classdump.luna.runtime.ExecutionContext import org.classdump.luna.runtime.ExecutionContext
import ru.dbotthepony.kommons.gson.set import ru.dbotthepony.kommons.gson.set
import ru.dbotthepony.kommons.io.writeSignedVarLong
import ru.dbotthepony.kommons.math.RGBAColor import ru.dbotthepony.kommons.math.RGBAColor
import ru.dbotthepony.kstarbound.math.AABB import ru.dbotthepony.kstarbound.math.AABB
import ru.dbotthepony.kommons.util.IStruct2d import ru.dbotthepony.kommons.util.IStruct2d
@ -27,7 +25,6 @@ import ru.dbotthepony.kommons.util.IStruct3i
import ru.dbotthepony.kommons.util.IStruct4d import ru.dbotthepony.kommons.util.IStruct4d
import ru.dbotthepony.kommons.util.IStruct4f import ru.dbotthepony.kommons.util.IStruct4f
import ru.dbotthepony.kommons.util.IStruct4i import ru.dbotthepony.kommons.util.IStruct4i
import ru.dbotthepony.kstarbound.json.BinaryJsonReader
import ru.dbotthepony.kstarbound.math.vector.Vector2d import ru.dbotthepony.kstarbound.math.vector.Vector2d
import ru.dbotthepony.kstarbound.math.vector.Vector2f import ru.dbotthepony.kstarbound.math.vector.Vector2f
import ru.dbotthepony.kstarbound.math.vector.Vector2i import ru.dbotthepony.kstarbound.math.vector.Vector2i
@ -460,7 +457,7 @@ fun TableFactory.tableFrom(collection: Collection<Any?>): Table {
return alloc return alloc
} }
fun LuaState.getLine2d(stackIndex: Int = -1): Line2d? { fun LuaThread.getLine2d(stackIndex: Int = -1): Line2d? {
val abs = this.absStackIndex(stackIndex) val abs = this.absStackIndex(stackIndex)
if (!this.isTable(abs)) if (!this.isTable(abs))
@ -483,7 +480,7 @@ fun LuaState.getLine2d(stackIndex: Int = -1): Line2d? {
return Line2d(x, y) return Line2d(x, y)
} }
fun LuaState.ArgStack.getLine2d(position: Int = this.position++): Line2d { fun LuaThread.ArgStack.getLine2d(position: Int = this.position++): Line2d {
if (position !in 1 ..this.top) if (position !in 1 ..this.top)
throw IllegalArgumentException("Bad argument #$position: Line2d expected, got nil") throw IllegalArgumentException("Bad argument #$position: Line2d expected, got nil")
@ -491,7 +488,7 @@ fun LuaState.ArgStack.getLine2d(position: Int = this.position++): Line2d {
?: throw IllegalArgumentException("Lua code error: Bad argument #$position: Line2d expected, got ${lua.typeAt(position)}") ?: throw IllegalArgumentException("Lua code error: Bad argument #$position: Line2d expected, got ${lua.typeAt(position)}")
} }
fun LuaState.getVector2d(stackIndex: Int = -1): Vector2d? { fun LuaThread.getVector2d(stackIndex: Int = -1): Vector2d? {
val abs = this.absStackIndex(stackIndex) val abs = this.absStackIndex(stackIndex)
if (!this.isTable(abs)) if (!this.isTable(abs))
@ -514,7 +511,7 @@ fun LuaState.getVector2d(stackIndex: Int = -1): Vector2d? {
return Vector2d(x, y) return Vector2d(x, y)
} }
fun LuaState.ArgStack.getVector2d(position: Int = this.position++): Vector2d { fun LuaThread.ArgStack.getVector2d(position: Int = this.position++): Vector2d {
if (position !in 1 ..this.top) if (position !in 1 ..this.top)
throw IllegalArgumentException("Bad argument #$position: Vector2d expected, got nil") throw IllegalArgumentException("Bad argument #$position: Vector2d expected, got nil")
@ -522,7 +519,7 @@ fun LuaState.ArgStack.getVector2d(position: Int = this.position++): Vector2d {
?: throw IllegalArgumentException("Lua code error: Bad argument #$position: Vector2d expected, got ${lua.typeAt(position)}") ?: throw IllegalArgumentException("Lua code error: Bad argument #$position: Vector2d expected, got ${lua.typeAt(position)}")
} }
fun LuaState.getVector2i(stackIndex: Int = -1): Vector2i? { fun LuaThread.getVector2i(stackIndex: Int = -1): Vector2i? {
val abs = this.absStackIndex(stackIndex) val abs = this.absStackIndex(stackIndex)
if (!this.isTable(abs)) if (!this.isTable(abs))
@ -545,7 +542,7 @@ fun LuaState.getVector2i(stackIndex: Int = -1): Vector2i? {
return Vector2i(x.toInt(), y.toInt()) return Vector2i(x.toInt(), y.toInt())
} }
fun LuaState.ArgStack.getVector2i(position: Int = this.position++): Vector2i { fun LuaThread.ArgStack.getVector2i(position: Int = this.position++): Vector2i {
if (position !in 1 ..this.top) if (position !in 1 ..this.top)
throw IllegalArgumentException("Bad argument #$position: Vector2i expected, got nil") throw IllegalArgumentException("Bad argument #$position: Vector2i expected, got nil")
@ -553,7 +550,7 @@ fun LuaState.ArgStack.getVector2i(position: Int = this.position++): Vector2i {
?: throw IllegalArgumentException("Lua code error: Bad argument #$position: Vector2i expected, got ${lua.typeAt(position)}") ?: throw IllegalArgumentException("Lua code error: Bad argument #$position: Vector2i expected, got ${lua.typeAt(position)}")
} }
fun LuaState.push(value: IStruct4i) { fun LuaThread.push(value: IStruct4i) {
pushTable(arraySize = 4) pushTable(arraySize = 4)
val table = stackTop val table = stackTop
val (x, y, z, w) = value val (x, y, z, w) = value
@ -575,7 +572,7 @@ fun LuaState.push(value: IStruct4i) {
setTableValue(table) setTableValue(table)
} }
fun LuaState.push(value: IStruct3i) { fun LuaThread.push(value: IStruct3i) {
pushTable(arraySize = 3) pushTable(arraySize = 3)
val table = stackTop val table = stackTop
val (x, y, z) = value val (x, y, z) = value
@ -593,7 +590,7 @@ fun LuaState.push(value: IStruct3i) {
setTableValue(table) setTableValue(table)
} }
fun LuaState.push(value: IStruct2i) { fun LuaThread.push(value: IStruct2i) {
pushTable(arraySize = 2) pushTable(arraySize = 2)
val table = stackTop val table = stackTop
val (x, y) = value val (x, y) = value
@ -607,7 +604,7 @@ fun LuaState.push(value: IStruct2i) {
setTableValue(table) setTableValue(table)
} }
fun LuaState.push(value: IStruct4f) { fun LuaThread.push(value: IStruct4f) {
pushTable(arraySize = 4) pushTable(arraySize = 4)
val table = stackTop val table = stackTop
val (x, y, z, w) = value val (x, y, z, w) = value
@ -629,7 +626,7 @@ fun LuaState.push(value: IStruct4f) {
setTableValue(table) setTableValue(table)
} }
fun LuaState.push(value: IStruct3f) { fun LuaThread.push(value: IStruct3f) {
pushTable(arraySize = 3) pushTable(arraySize = 3)
val table = stackTop val table = stackTop
val (x, y, z) = value val (x, y, z) = value
@ -647,7 +644,7 @@ fun LuaState.push(value: IStruct3f) {
setTableValue(table) setTableValue(table)
} }
fun LuaState.push(value: IStruct2f) { fun LuaThread.push(value: IStruct2f) {
pushTable(arraySize = 2) pushTable(arraySize = 2)
val table = stackTop val table = stackTop
val (x, y) = value val (x, y) = value
@ -661,7 +658,7 @@ fun LuaState.push(value: IStruct2f) {
setTableValue(table) setTableValue(table)
} }
fun LuaState.push(value: IStruct4d) { fun LuaThread.push(value: IStruct4d) {
pushTable(arraySize = 4) pushTable(arraySize = 4)
val table = stackTop val table = stackTop
val (x, y, z, w) = value val (x, y, z, w) = value
@ -683,7 +680,7 @@ fun LuaState.push(value: IStruct4d) {
setTableValue(table) setTableValue(table)
} }
fun LuaState.push(value: IStruct3d) { fun LuaThread.push(value: IStruct3d) {
pushTable(arraySize = 3) pushTable(arraySize = 3)
val table = stackTop val table = stackTop
val (x, y, z) = value val (x, y, z) = value
@ -701,7 +698,7 @@ fun LuaState.push(value: IStruct3d) {
setTableValue(table) setTableValue(table)
} }
fun LuaState.push(value: IStruct2d) { fun LuaThread.push(value: IStruct2d) {
pushTable(arraySize = 2) pushTable(arraySize = 2)
val table = stackTop val table = stackTop
val (x, y) = value val (x, y) = value

191
src/main/kotlin/ru/dbotthepony/kstarbound/lua/LuaState.kt → src/main/kotlin/ru/dbotthepony/kstarbound/lua/LuaThread.kt
View File

@ -19,17 +19,19 @@ import org.lwjgl.system.MemoryUtil
import ru.dbotthepony.kommons.gson.set import ru.dbotthepony.kommons.gson.set
import ru.dbotthepony.kstarbound.Starbound import ru.dbotthepony.kstarbound.Starbound
import ru.dbotthepony.kstarbound.json.InternedJsonElementAdapter import ru.dbotthepony.kstarbound.json.InternedJsonElementAdapter
import ru.dbotthepony.kstarbound.math.vector.Vector2i
import java.io.Closeable import java.io.Closeable
import java.lang.ref.Cleaner import java.lang.ref.Cleaner
import java.lang.ref.WeakReference
import java.nio.ByteBuffer import java.nio.ByteBuffer
import java.nio.ByteOrder import java.nio.ByteOrder
import kotlin.math.floor import kotlin.math.floor
import kotlin.properties.Delegates
import kotlin.system.exitProcess import kotlin.system.exitProcess
@Suppress("unused") @Suppress("unused")
class LuaState private constructor(private val pointer: Pointer, val stringInterner: Interner<String> = Starbound.STRINGS) : Closeable { class LuaThread private constructor(
private val pointer: Pointer,
val stringInterner: Interner<String> = Starbound.STRINGS
) : Closeable {
constructor(stringInterner: Interner<String> = Starbound.STRINGS) : this(LuaJNR.INSTANCE.luaL_newstate() ?: throw OutOfMemoryError("Unable to allocate new LuaState"), stringInterner) { constructor(stringInterner: Interner<String> = Starbound.STRINGS) : this(LuaJNR.INSTANCE.luaL_newstate() ?: throw OutOfMemoryError("Unable to allocate new LuaState"), stringInterner) {
val pointer = this.pointer val pointer = this.pointer
val panic = ClosureManager.getInstance().newClosure( val panic = ClosureManager.getInstance().newClosure(
@ -73,9 +75,19 @@ class LuaState private constructor(private val pointer: Pointer, val stringInter
call() call()
} }
private val thread = Thread.currentThread()
private var cleanable: Cleaner.Cleanable? = null private var cleanable: Cleaner.Cleanable? = null
private fun initializeFrom(other: LuaThread) {
}
fun newThread(): LuaThread {
val pointer = LuaJNR.INSTANCE.lua_newthread(pointer)
return LuaThread(pointer, stringInterner).also {
it.initializeFrom(this)
}
}
override fun close() { override fun close() {
this.cleanable?.clean() this.cleanable?.clean()
} }
@ -526,14 +538,14 @@ class LuaState private constructor(private val pointer: Pointer, val stringInter
} }
inner class ArgStack(val top: Int) { inner class ArgStack(val top: Int) {
val lua get() = this@LuaState val lua get() = this@LuaThread
var position = 1 var position = 1
fun hasSomethingAt(position: Int): Boolean { fun hasSomethingAt(position: Int): Boolean {
if (position !in 1 ..this.top) if (position !in 1 ..this.top)
return false return false
return this@LuaState.typeAt(position) != LuaType.NONE return this@LuaThread.typeAt(position) != LuaType.NONE
} }
fun hasSomethingAt(): Boolean { fun hasSomethingAt(): Boolean {
@ -545,85 +557,85 @@ class LuaState private constructor(private val pointer: Pointer, val stringInter
} }
fun isStringAt(position: Int = this.position): Boolean { fun isStringAt(position: Int = this.position): Boolean {
return this@LuaState.typeAt(position) == LuaType.STRING return this@LuaThread.typeAt(position) == LuaType.STRING
} }
fun isNumberAt(position: Int = this.position): Boolean { fun isNumberAt(position: Int = this.position): Boolean {
return this@LuaState.typeAt(position) == LuaType.NUMBER return this@LuaThread.typeAt(position) == LuaType.NUMBER
} }
fun getString(position: Int = this.position++, limit: Long = DEFAULT_STRING_LIMIT): String { fun getString(position: Int = this.position++, limit: Long = DEFAULT_STRING_LIMIT): String {
if (position !in 1 ..this.top) if (position !in 1 ..this.top)
throw IllegalArgumentException("Bad argument #$position: string expected, got nil") throw IllegalArgumentException("Bad argument #$position: string expected, got nil")
return this@LuaState.getString(position, limit = limit) return this@LuaThread.getString(position, limit = limit)
?: throw IllegalArgumentException("Bad argument #$position: string expected, got ${this@LuaState.typeAt(position)}") ?: throw IllegalArgumentException("Bad argument #$position: string expected, got ${this@LuaThread.typeAt(position)}")
} }
fun getStringOrNull(position: Int = this.position++, limit: Long = DEFAULT_STRING_LIMIT): String? { fun getStringOrNull(position: Int = this.position++, limit: Long = DEFAULT_STRING_LIMIT): String? {
val type = this@LuaState.typeAt(position) val type = this@LuaThread.typeAt(position)
if (type != LuaType.STRING && type != LuaType.NIL && type != LuaType.NONE) if (type != LuaType.STRING && type != LuaType.NIL && type != LuaType.NONE)
throw IllegalArgumentException("Bad argument #$position: string expected, got $type") throw IllegalArgumentException("Bad argument #$position: string expected, got $type")
return this@LuaState.getString(position, limit = limit) return this@LuaThread.getString(position, limit = limit)
} }
fun getLong(position: Int = this.position++): Long { fun getLong(position: Int = this.position++): Long {
if (position !in 1 ..this.top) if (position !in 1 ..this.top)
throw IllegalArgumentException("Bad argument #$position: number expected, got nil") throw IllegalArgumentException("Bad argument #$position: number expected, got nil")
return this@LuaState.getLong(position) return this@LuaThread.getLong(position)
?: throw IllegalArgumentException("Bad argument #$position: long expected, got ${this@LuaState.typeAt(position)}") ?: throw IllegalArgumentException("Bad argument #$position: long expected, got ${this@LuaThread.typeAt(position)}")
} }
fun getJson(position: Int = this.position++, limit: Long = DEFAULT_STRING_LIMIT): JsonElement { fun getJson(position: Int = this.position++, limit: Long = DEFAULT_STRING_LIMIT): JsonElement {
if (position !in 1 ..this.top) if (position !in 1 ..this.top)
throw IllegalArgumentException("Bad argument #$position: json expected, got nil") throw IllegalArgumentException("Bad argument #$position: json expected, got nil")
val value = this@LuaState.getJson(position, limit = limit) val value = this@LuaThread.getJson(position, limit = limit)
return value ?: throw IllegalArgumentException("Bad argument #$position: anything expected, got ${this@LuaState.typeAt(position)}") return value ?: throw IllegalArgumentException("Bad argument #$position: anything expected, got ${this@LuaThread.typeAt(position)}")
} }
fun getTable(position: Int = this.position++, limit: Long = DEFAULT_STRING_LIMIT): JsonObject { fun getTable(position: Int = this.position++, limit: Long = DEFAULT_STRING_LIMIT): JsonObject {
if (position !in 1 ..this.top) if (position !in 1 ..this.top)
throw IllegalArgumentException("Bad argument #$position: table expected, got nil") throw IllegalArgumentException("Bad argument #$position: table expected, got nil")
val value = this@LuaState.getTable(position, limit = limit) val value = this@LuaThread.getTable(position, limit = limit)
return value ?: throw IllegalArgumentException("Lua code error: Bad argument #$position: table expected, got ${this@LuaState.typeAt(position)}") return value ?: throw IllegalArgumentException("Lua code error: Bad argument #$position: table expected, got ${this@LuaThread.typeAt(position)}")
} }
fun getAnything(position: Int = this.position++, limit: Long = DEFAULT_STRING_LIMIT): JsonElement? { fun getAnything(position: Int = this.position++, limit: Long = DEFAULT_STRING_LIMIT): JsonElement? {
if (position !in 1 ..this.top) if (position !in 1 ..this.top)
throw IllegalArgumentException("Bad argument #$position: json expected, got nil") throw IllegalArgumentException("Bad argument #$position: json expected, got nil")
return this@LuaState.getJson(position, limit = limit) return this@LuaThread.getJson(position, limit = limit)
} }
fun getDouble(position: Int = this.position++): Double { fun getDouble(position: Int = this.position++): Double {
if (position !in 1 ..this.top) if (position !in 1 ..this.top)
throw IllegalArgumentException("Bad argument #$position: number expected, got nil") throw IllegalArgumentException("Bad argument #$position: number expected, got nil")
return this@LuaState.getDouble(position) return this@LuaThread.getDouble(position)
?: throw IllegalArgumentException("Bad argument #$position: number expected, got ${this@LuaState.typeAt(position)}") ?: throw IllegalArgumentException("Bad argument #$position: number expected, got ${this@LuaThread.typeAt(position)}")
} }
fun getDoubleOrNull(position: Int = this.position++): Double? { fun getDoubleOrNull(position: Int = this.position++): Double? {
val type = this@LuaState.typeAt(position) val type = this@LuaThread.typeAt(position)
if (type != LuaType.NUMBER && type != LuaType.NIL && type != LuaType.NONE) if (type != LuaType.NUMBER && type != LuaType.NIL && type != LuaType.NONE)
throw IllegalArgumentException("Bad argument #$position: double expected, got $type") throw IllegalArgumentException("Bad argument #$position: double expected, got $type")
return this@LuaState.getDouble(position) return this@LuaThread.getDouble(position)
} }
fun getBooleanOrNull(position: Int = this.position++): Boolean? { fun getBooleanOrNull(position: Int = this.position++): Boolean? {
val type = this@LuaState.typeAt(position) val type = this@LuaThread.typeAt(position)
if (type == LuaType.NIL || type == LuaType.NONE) if (type == LuaType.NIL || type == LuaType.NONE)
return null return null
else if (type == LuaType.BOOLEAN) else if (type == LuaType.BOOLEAN)
return this@LuaState.getBoolean(position) return this@LuaThread.getBoolean(position)
else else
throw IllegalArgumentException("Lua code error: Bad argument #$position: boolean expected, got $type") throw IllegalArgumentException("Lua code error: Bad argument #$position: boolean expected, got $type")
} }
@ -632,32 +644,29 @@ class LuaState private constructor(private val pointer: Pointer, val stringInter
if (position !in 1 ..this.top) if (position !in 1 ..this.top)
throw IllegalArgumentException("Bad argument #$position: boolean expected, got nil") throw IllegalArgumentException("Bad argument #$position: boolean expected, got nil")
return this@LuaState.getBoolean(position) return this@LuaThread.getBoolean(position)
?: throw IllegalArgumentException("Bad argument #$position: boolean expected, got ${this@LuaState.typeAt(position)}") ?: throw IllegalArgumentException("Bad argument #$position: boolean expected, got ${this@LuaThread.typeAt(position)}")
} }
fun push() = this@LuaState.push() fun push() = this@LuaThread.push()
fun push(value: Int) = this@LuaState.push(value) fun push(value: Int) = this@LuaThread.push(value)
fun push(value: Long) = this@LuaState.push(value) fun push(value: Long) = this@LuaThread.push(value)
fun push(value: Double) = this@LuaState.push(value) fun push(value: Double) = this@LuaThread.push(value)
fun push(value: Float) = this@LuaState.push(value) fun push(value: Float) = this@LuaThread.push(value)
fun push(value: Boolean) = this@LuaState.push(value) fun push(value: Boolean) = this@LuaThread.push(value)
fun push(value: String?) = this@LuaState.push(value) fun push(value: String) = this@LuaThread.push(value)
fun push(value: JsonElement?) = this@LuaState.push(value) fun push(value: JsonElement?) = this@LuaThread.push(value)
} }
fun push(function: ArgStack.() -> Int, performanceCritical: Boolean) { fun push(function: ArgStack.() -> Int, performanceCritical: Boolean) {
val weak = WeakReference(this)
val pointer = this.pointer
LuaJNI.lua_pushcclosure(pointer.address()) lazy@{ LuaJNI.lua_pushcclosure(pointer.address()) lazy@{
var realLuaState = weak.get() val realLuaState: LuaThread
if (realLuaState == null || realLuaState.pointer.address() != it) { if (pointer.address() != it) {
if (realLuaState == null) realLuaState = LuaThread(LuaJNR.RUNTIME.memoryManager.newPointer(it), stringInterner = stringInterner)
realLuaState = LuaState(LuaJNR.RUNTIME.memoryManager.newPointer(it)) realLuaState.initializeFrom(this)
else } else {
realLuaState = LuaState(LuaJNR.RUNTIME.memoryManager.newPointer(it), stringInterner = realLuaState.stringInterner) realLuaState = this
} }
val args = realLuaState.ArgStack(realLuaState.stackTop) val args = realLuaState.ArgStack(realLuaState.stackTop)
@ -718,6 +727,10 @@ class LuaState private constructor(private val pointer: Pointer, val stringInter
fun push(function: ArgStack.() -> Int) = this.push(function, !RECORD_STACK_TRACES) fun push(function: ArgStack.() -> Int) = this.push(function, !RECORD_STACK_TRACES)
fun moveStackValuesOnto(other: LuaThread, amount: Int = 1) {
LuaJNR.INSTANCE.lua_xmove(pointer, other.pointer, amount)
}
fun push() { fun push() {
LuaJNR.INSTANCE.lua_pushnil(this.pointer) LuaJNR.INSTANCE.lua_pushnil(this.pointer)
} }
@ -742,83 +755,65 @@ class LuaState private constructor(private val pointer: Pointer, val stringInter
LuaJNR.INSTANCE.lua_pushboolean(this.pointer, if (value) 1 else 0) LuaJNR.INSTANCE.lua_pushboolean(this.pointer, if (value) 1 else 0)
} }
fun push(value: String?) { fun push(value: String) {
if (value == null) { pushStringIntoThread(this, value)
this.push()
return
}
val bytes = value.toByteArray(Charsets.UTF_8)
if (bytes.size < DEFAULT_STRING_LIMIT) {
MemoryIO.getInstance().putByteArray(sharedStringBufferPtr, bytes, 0, bytes.size)
LuaJNR.INSTANCE.lua_pushlstring(this.pointer, sharedStringBufferPtr, bytes.size.toLong())
} else {
val mem = MemoryIO.getInstance()
val block = mem.allocateMemory(bytes.size.toLong(), false)
if (block == 0L)
throw OutOfMemoryError("Unable to allocate ${bytes.size} bytes on heap")
try {
mem.putByteArray(block, bytes, 0, bytes.size)
LuaJNR.INSTANCE.lua_pushlstring(this.pointer, block, bytes.size.toLong())
} finally {
mem.freeMemory(block)
}
}
} }
fun pushTable(arraySize: Int = 0, hashSize: Int = 0): Int { fun copy(fromIndex: Int, toIndex: Int) {
LuaJNR.INSTANCE.lua_createtable(this.pointer, arraySize, hashSize) LuaJNR.INSTANCE.lua_copy(pointer, fromIndex, toIndex)
return this.stackTop
} }
fun setTableValue(stackIndex: Int) { fun setTop(topIndex: Int) {
LuaJNR.INSTANCE.lua_settop(pointer, topIndex)
}
fun storeRef(tableIndex: Int) {
LuaJNR.INSTANCE.luaL_ref(pointer, tableIndex)
}
fun pushTable(arraySize: Int = 0, hashSize: Int = 0) {
LuaJNR.INSTANCE.lua_createtable(pointer, arraySize, hashSize)
}
fun setTableValue(stackIndex: Int = -3) {
LuaJNR.INSTANCE.lua_settable(this.pointer, stackIndex) LuaJNR.INSTANCE.lua_settable(this.pointer, stackIndex)
} }
fun setTableValue(key: String, value: JsonElement?) { fun setTableValue(key: String, value: JsonElement?) {
val table = this.stackTop
this.push(key) this.push(key)
this.push(value) this.push(value)
this.setTableValue(table) this.setTableValue()
} }
fun setTableValue(key: String, value: Int) { fun setTableValue(key: String, value: Int) {
val table = this.stackTop
this.push(key) this.push(key)
this.push(value) this.push(value)
this.setTableValue(table) this.setTableValue()
} }
fun setTableValue(key: String, value: Long) { fun setTableValue(key: String, value: Long) {
val table = this.stackTop
this.push(key) this.push(key)
this.push(value) this.push(value)
this.setTableValue(table) this.setTableValue()
} }
fun setTableValue(key: String, value: String?) { fun setTableValue(key: String, value: String?) {
value ?: return value ?: return
val table = this.stackTop
this.push(key) this.push(key)
this.push(value) this.push(value)
this.setTableValue(table) this.setTableValue()
} }
fun setTableValue(key: String, value: Float) { fun setTableValue(key: String, value: Float) {
val table = this.stackTop
this.push(key) this.push(key)
this.push(value) this.push(value)
this.setTableValue(table) this.setTableValue()
} }
fun setTableValue(key: String, value: Double) { fun setTableValue(key: String, value: Double) {
val table = this.stackTop
this.push(key) this.push(key)
this.push(value) this.push(value)
this.setTableValue(table) this.setTableValue()
} }
fun setTableValue(key: Int, value: JsonElement?) { fun setTableValue(key: Int, value: JsonElement?) {
@ -941,7 +936,7 @@ class LuaState private constructor(private val pointer: Pointer, val stringInter
private val LOGGER = LogManager.getLogger() private val LOGGER = LogManager.getLogger()
fun loadInternalScript(name: String): String { fun loadInternalScript(name: String): String {
return LuaState::class.java.getResourceAsStream("/scripts/$name.lua")?.readAllBytes()?.toString(Charsets.UTF_8) ?: throw RuntimeException("/scripts/$name.lua is missing!") return LuaThread::class.java.getResourceAsStream("/scripts/$name.lua")?.readAllBytes()?.toString(Charsets.UTF_8) ?: throw RuntimeException("/scripts/$name.lua is missing!")
} }
private val globalScript by lazy { loadInternalScript("global") } private val globalScript by lazy { loadInternalScript("global") }
@ -990,6 +985,28 @@ class LuaState private constructor(private val pointer: Pointer, val stringInter
return p return p
} }
fun pushStringIntoThread(lua: LuaThread, value: String) {
val bytes = value.toByteArray(Charsets.UTF_8)
if (bytes.size < DEFAULT_STRING_LIMIT) {
MemoryIO.getInstance().putByteArray(sharedStringBufferPtr, bytes, 0, bytes.size)
LuaJNR.INSTANCE.lua_pushlstring(lua.pointer, sharedStringBufferPtr, bytes.size.toLong())
} else {
val mem = MemoryIO.getInstance()
val alloc = mem.allocateMemory(bytes.size.toLong(), false)
if (alloc == 0L)
throw OutOfMemoryError("Unable to allocate ${bytes.size} bytes on heap")
try {
mem.putByteArray(alloc, bytes, 0, bytes.size)
LuaJNR.INSTANCE.lua_pushlstring(lua.pointer, alloc, bytes.size.toLong())
} finally {
mem.freeMemory(alloc)
}
}
}
const val LUA_TNONE = -1 const val LUA_TNONE = -1
const val LUA_TNIL = 0 const val LUA_TNIL = 0
@ -1006,7 +1023,7 @@ class LuaState private constructor(private val pointer: Pointer, val stringInter
const val CHUNK_READ_SIZE = 2L shl 10 const val CHUNK_READ_SIZE = 2L shl 10
const val DEFAULT_STRING_LIMIT = 2L shl 16 const val DEFAULT_STRING_LIMIT = 2L shl 24
const val RECORD_STACK_TRACES = false const val RECORD_STACK_TRACES = false

22
src/main/kotlin/ru/dbotthepony/kstarbound/lua/LuaType.kt
View File

@ -1,16 +1,16 @@
package ru.dbotthepony.kstarbound.lua package ru.dbotthepony.kstarbound.lua
import ru.dbotthepony.kstarbound.lua.LuaState.Companion.LUA_NUMTYPES import ru.dbotthepony.kstarbound.lua.LuaThread.Companion.LUA_NUMTYPES
import ru.dbotthepony.kstarbound.lua.LuaState.Companion.LUA_TBOOLEAN import ru.dbotthepony.kstarbound.lua.LuaThread.Companion.LUA_TBOOLEAN
import ru.dbotthepony.kstarbound.lua.LuaState.Companion.LUA_TFUNCTION import ru.dbotthepony.kstarbound.lua.LuaThread.Companion.LUA_TFUNCTION
import ru.dbotthepony.kstarbound.lua.LuaState.Companion.LUA_TLIGHTUSERDATA import ru.dbotthepony.kstarbound.lua.LuaThread.Companion.LUA_TLIGHTUSERDATA
import ru.dbotthepony.kstarbound.lua.LuaState.Companion.LUA_TNIL import ru.dbotthepony.kstarbound.lua.LuaThread.Companion.LUA_TNIL
import ru.dbotthepony.kstarbound.lua.LuaState.Companion.LUA_TNONE import ru.dbotthepony.kstarbound.lua.LuaThread.Companion.LUA_TNONE
import ru.dbotthepony.kstarbound.lua.LuaState.Companion.LUA_TNUMBER import ru.dbotthepony.kstarbound.lua.LuaThread.Companion.LUA_TNUMBER
import ru.dbotthepony.kstarbound.lua.LuaState.Companion.LUA_TSTRING import ru.dbotthepony.kstarbound.lua.LuaThread.Companion.LUA_TSTRING
import ru.dbotthepony.kstarbound.lua.LuaState.Companion.LUA_TTABLE import ru.dbotthepony.kstarbound.lua.LuaThread.Companion.LUA_TTABLE
import ru.dbotthepony.kstarbound.lua.LuaState.Companion.LUA_TTHREAD import ru.dbotthepony.kstarbound.lua.LuaThread.Companion.LUA_TTHREAD
import ru.dbotthepony.kstarbound.lua.LuaState.Companion.LUA_TUSERDATA import ru.dbotthepony.kstarbound.lua.LuaThread.Companion.LUA_TUSERDATA
enum class LuaType { enum class LuaType {
NONE, NONE,

2
src/main/kotlin/ru/dbotthepony/kstarbound/server/StarboundServer.kt
View File

@ -531,7 +531,7 @@ sealed class StarboundServer(val root: File) : BlockableEventLoop("Server thread
return channels.connections.firstOrNull { it.uuid == uuid } return channels.connections.firstOrNull { it.uuid == uuid }
} }
protected open fun close() { override fun close() {
channels.close() channels.close()
shutdown() shutdown()
} }

8
src/main/kotlin/ru/dbotthepony/kstarbound/util/BlockableEventLoop.kt
View File

@ -265,11 +265,11 @@ open class BlockableEventLoop(name: String) : Thread(name), ScheduledExecutorSer
} }
fun <T> supplyAsync(task: Supplier<T>): CompletableFuture<T> { fun <T> supplyAsync(task: Supplier<T>): CompletableFuture<T> {
return submit(task::get) return submit(task::get) as CompletableFuture<T>
} }
fun <T> supplyAsync(task: () -> T): CompletableFuture<T> { fun <T> supplyAsync(task: () -> T): CompletableFuture<T> {
return submit(task::invoke) return submit(task::invoke) as CompletableFuture<T>
} }
fun ensureSameThread() { fun ensureSameThread() {
@ -328,6 +328,10 @@ open class BlockableEventLoop(name: String) : Thread(name), ScheduledExecutorSer
} }
} }
override fun close() {
// do nothing
}
final override fun <T> invokeAll(tasks: Collection<Callable<T>>): List<Future<T>> { final override fun <T> invokeAll(tasks: Collection<Callable<T>>): List<Future<T>> {
return tasks.map { submit(it) } return tasks.map { submit(it) }
} }