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

Renamed AppLoader into App

Browse Source
This commit is contained in:
minjaesong
2021-09-09 09:48:33 +09:00
parent c3dd005fb2
commit 8f834fe869
116 changed files with 796 additions and 850 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,10 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.AppLoader.printdbg
import net.torvald.terrarum.AppLoader.printdbgerr
import net.torvald.terrarum.App.printdbg
import net.torvald.terrarum.App.printdbgerr
import net.torvald.terrarum.ModMgr
import net.torvald.terrarum.ModMgr.loadOrder
import net.torvald.terrarum.modulebasegame.console.*
import java.io.BufferedReader
import java.io.InputStreamReader
import java.util.*
import kotlin.streams.toList
/**
* Created by minjaesong on 2016-01-15.

12
src/net/torvald/terrarum/console/ResizeScreen.kt
View File

@@ -1,19 +1,19 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.AppLoader
import net.torvald.terrarum.App
import net.torvald.terrarum.TerrarumScreenSize
@ConsoleAlias("resize")
object ResizeScreen: ConsoleCommand {
override fun execute(args: Array<String>) {
if (args.size == 3) {
AppLoader.resizeScreen(args[1].toInt(), args[2].toInt())
App.resizeScreen(args[1].toInt(), args[2].toInt())
}
else if (args.size == 2) {
when (args[1]) {
"720p" -> AppLoader.resizeScreen(1280,720)
"1080p" -> AppLoader.resizeScreen(1920,1080)
"default" -> AppLoader.resizeScreen(TerrarumScreenSize.defaultW, TerrarumScreenSize.defaultH)
"720p" -> App.resizeScreen(1280,720)
"1080p" -> App.resizeScreen(1920,1080)
"default" -> App.resizeScreen(TerrarumScreenSize.defaultW, TerrarumScreenSize.defaultH)
else -> { printUsage(); return }
}
}
@@ -21,7 +21,7 @@ object ResizeScreen: ConsoleCommand {
printUsage(); return
}
Echo("Screen resized to ${AppLoader.screenSize.screenW}x${AppLoader.screenSize.screenH}")
Echo("Screen resized to ${App.scr.width}x${App.scr.height}")
}
override fun printUsage() {

4
src/net/torvald/terrarum/console/ScreencapNogui.kt
View File

@@ -3,7 +3,7 @@ package net.torvald.terrarum.console
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.graphics.Pixmap
import net.torvald.gdx.graphics.PixmapIO2
import net.torvald.terrarum.AppLoader
import net.torvald.terrarum.App
import net.torvald.terrarum.ccG
import net.torvald.terrarum.modulebasegame.IngameRenderer
@@ -15,7 +15,7 @@ object ScreencapNogui: ConsoleCommand {
val w = 960
val h = 640
val p = Pixmap.createFromFrameBuffer((it.width - w).ushr(1), (it.height - h).ushr(1), w, h)
PixmapIO2.writeTGA(Gdx.files.absolute(AppLoader.defaultDir + "/Exports/${args[1]}.tga"), p, true)
PixmapIO2.writeTGA(Gdx.files.absolute(App.defaultDir + "/Exports/${args[1]}.tga"), p, true)
p.dispose()
}
IngameRenderer.fboRGBexportRequested = true

10
src/net/torvald/terrarum/console/SetLocale.kt
View File

@@ -1,7 +1,7 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.langpack.Lang
import net.torvald.terrarum.AppLoader
import net.torvald.terrarum.App
import java.io.IOException
@@ -11,14 +11,14 @@ import java.io.IOException
internal object SetLocale : ConsoleCommand {
override fun execute(args: Array<String>) {
if (args.size == 2) {
val prevLocale = AppLoader.GAME_LOCALE
AppLoader.GAME_LOCALE = args[1]
val prevLocale = App.GAME_LOCALE
App.GAME_LOCALE = args[1]
try {
Echo("Set locale to '" + AppLoader.GAME_LOCALE + "'.")
Echo("Set locale to '" + App.GAME_LOCALE + "'.")
}
catch (e: IOException) {
Echo("could not read lang file.")
AppLoader.GAME_LOCALE = prevLocale
App.GAME_LOCALE = prevLocale
}
}

4
src/net/torvald/terrarum/console/TakeScreenshot.kt
View File

@@ -1,11 +1,11 @@
package net.torvald.terrarum.console
import net.torvald.terrarum.AppLoader
import net.torvald.terrarum.App
@ConsoleNoExport
object TakeScreenshot: ConsoleCommand {
override fun execute(args: Array<String>) {
AppLoader.requestScreenshot()
App.requestScreenshot()
}
override fun printUsage() {

4
src/net/torvald/terrarum/console/Version.kt
View File

@@ -2,7 +2,7 @@ package net.torvald.terrarum.console
import com.badlogic.gdx.Gdx
import net.torvald.terrarum.Terrarum
import net.torvald.terrarum.AppLoader
import net.torvald.terrarum.App
import net.torvald.terrarum.langpack.Lang
/**
@@ -11,7 +11,7 @@ import net.torvald.terrarum.langpack.Lang
internal object Version : ConsoleCommand {
override fun execute(args: Array<String>) {
Echo("${AppLoader.GAME_NAME} ${AppLoader.getVERSION_STRING()}")
Echo("${App.GAME_NAME} ${App.getVERSION_STRING()}")
Echo("Java version: ${System.getProperty("java.version")}")
Echo("Polyglot language pack version: ${Lang.POLYGLOT_VERSION}")
Echo("GL version: ${Terrarum.GL_VERSION}")