curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-06-12 19:44:05 +09:00
Code Issues Packages Projects Releases Wiki Activity

ability to load console commands from mods

Browse Source
This commit is contained in:
minjaesong
2022-02-27 02:24:59 +09:00
parent 95476359fe
commit f4402771c8
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/torvald/spriteanimation/HasAssembledSprite.kt
View File

@@ -2,9 +2,9 @@ package net.torvald.spriteanimation
import com.badlogic.gdx.graphics.Texture import com.badlogic.gdx.graphics.Texture
import com.badlogic.gdx.graphics.g2d.TextureRegion import com.badlogic.gdx.graphics.g2d.TextureRegion
import net.torvald.terrarum.gameitems.GameItem
import net.torvald.terrarum.spriteassembler.ADProperties import net.torvald.terrarum.spriteassembler.ADProperties
import net.torvald.terrarum.spriteassembler.AssembleSheetPixmap import net.torvald.terrarum.spriteassembler.AssembleSheetPixmap
import net.torvald.terrarum.gameitems.GameItem
import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
/** /**

2
src/net/torvald/spriteanimation/SpriteAnimation.kt
View File

@@ -17,7 +17,7 @@ import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
*/ */
class SpriteAnimation(@Transient val parentActor: ActorWithBody) : Disposable { class SpriteAnimation(@Transient val parentActor: ActorWithBody) : Disposable {
lateinit var textureRegion: TextureRegionPack; private set internal lateinit var textureRegion: TextureRegionPack; private set
var currentFrame = 0 var currentFrame = 0
var currentRow = 0 var currentRow = 0

9
src/net/torvald/terrarum/console/CommandDict.kt
View File

@@ -3,8 +3,6 @@ package net.torvald.terrarum.console
import net.torvald.terrarum.App.printdbg import net.torvald.terrarum.App.printdbg
import net.torvald.terrarum.App.printdbgerr import net.torvald.terrarum.App.printdbgerr
import net.torvald.terrarum.ModMgr import net.torvald.terrarum.ModMgr
import java.io.BufferedReader
import java.io.InputStreamReader
/** /**
* Created by minjaesong on 2016-01-15. * Created by minjaesong on 2016-01-15.
@@ -46,7 +44,12 @@ object CommandDict {
commandsList.forEach { commandName -> commandsList.forEach { commandName ->
val canonicalName = "$packageConsole.$commandName" val canonicalName = "$packageConsole.$commandName"
val it = Class.forName(canonicalName) val it = ModMgr.moduleClassloader[modName].let {
if (it != null)
it.loadClass(canonicalName)
else
Class.forName(canonicalName)
}
printdbg(this, "> Trying to instantiate ${it.canonicalName}") printdbg(this, "> Trying to instantiate ${it.canonicalName}")

5
src/net/torvald/terrarum/console/Echo.kt
View File

@@ -1,14 +1,13 @@
package net.torvald.terrarum.console package net.torvald.terrarum.console
import net.torvald.terrarum.*
import net.torvald.terrarum.App.csi0 import net.torvald.terrarum.App.csi0
import net.torvald.terrarum.App.csiG import net.torvald.terrarum.App.csiG
import net.torvald.terrarum.ui.ConsoleWindow import net.torvald.terrarum.INGAME
/** /**
* Created by minjaesong on 2016-01-16. * Created by minjaesong on 2016-01-16.
*/ */
internal object Echo : ConsoleCommand { object Echo : ConsoleCommand {
override fun execute(args: Array<String>) { override fun execute(args: Array<String>) {
val argsWoHeader = Array<String>(args.size - 1, {it -> args[it + 1]}) val argsWoHeader = Array<String>(args.size - 1, {it -> args[it + 1]})
argsWoHeader.forEach { execute(it) } argsWoHeader.forEach { execute(it) }

2
src/net/torvald/terrarum/console/EchoError.kt
View File

@@ -7,7 +7,7 @@ import net.torvald.terrarum.ccR
* Created by minjaesong on 2016-04-25. * Created by minjaesong on 2016-04-25.
*/ */
@ConsoleAlias("error") @ConsoleAlias("error")
internal object EchoError : ConsoleCommand { object EchoError : ConsoleCommand {
override fun execute(args: Array<String>) { override fun execute(args: Array<String>) {
val argsWoHeader = Array(args.size - 1) { args[it + 1] } val argsWoHeader = Array(args.size - 1) { args[it + 1] }
argsWoHeader.forEach { execute(it) } argsWoHeader.forEach { execute(it) }