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

warning for apple rosetta

Browse Source
This commit is contained in:
minjaesong
2023-06-24 02:06:22 +09:00
parent 49b2011ea0
commit 592e489411
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/graphics/gui/apple_rosetta_warning.tga LFS Normal file
View File

Binary file not shown.

2
assets/locales/en/terrarum.json
View File

@@ -13,6 +13,8 @@
"GAME_32BIT_WARNING1": "It looks like you’re running a 32-Bit version of Java.", "GAME_32BIT_WARNING1": "It looks like you’re running a 32-Bit version of Java.",
"GAME_32BIT_WARNING2": "Please download and install the latest 64-Bit Java at:", "GAME_32BIT_WARNING2": "Please download and install the latest 64-Bit Java at:",
"GAME_32BIT_WARNING3": "https://www.java.com/en/download/", "GAME_32BIT_WARNING3": "https://www.java.com/en/download/",
"GAME_APPLE_ROSETTA_WARNING1": "It seems you are using a Mac with Apple Silicon but running the x86 build of the game.",
"GAME_APPLE_ROSETTA_WARNING2": "Please use the native build for improved performance and the gameplay experiences.",
"MENU_OPTION_STREAMERS_LAYOUT": "Chat Overlay", "MENU_OPTION_STREAMERS_LAYOUT": "Chat Overlay",
"MENU_LABEL_RESTART_REQUIRED": "Restart Required", "MENU_LABEL_RESTART_REQUIRED": "Restart Required",
"MENU_LABEL_KEYBOARD_LAYOUT": "Keyboard Layout", "MENU_LABEL_KEYBOARD_LAYOUT": "Keyboard Layout",

9
src/net/torvald/terrarum/modulebasegame/TitleScreen.kt
View File

@@ -122,9 +122,9 @@ class TitleScreen(batch: FlippingSpriteBatch) : IngameInstance(batch) {
private lateinit var worldFBO: FloatFrameBuffer private lateinit var worldFBO: FloatFrameBuffer
private val warning32bitJavaIcon = TextureRegion(Texture(Gdx.files.internal("assets/graphics/gui/32_bit_warning.tga"))) private val warning32bitJavaIcon = TextureRegion(Texture(Gdx.files.internal("assets/graphics/gui/32_bit_warning.tga")))
private val warningAppleRosettaIcon = TextureRegion(Texture(Gdx.files.internal("assets/graphics/gui/apple_rosetta_warning.tga")))
init { init {
warning32bitJavaIcon.flip(false, false)
gameUpdateGovernor = ConsistentUpdateRate.also { it.reset() } gameUpdateGovernor = ConsistentUpdateRate.also { it.reset() }
} }
@@ -346,10 +346,8 @@ class TitleScreen(batch: FlippingSpriteBatch) : IngameInstance(batch) {
} }
// warn: rosetta on Apple M-chips // warn: rosetta on Apple M-chips
else if (App.getUndesirableConditions() == "apple_execution_through_rosetta") { else if (App.getUndesirableConditions() == "apple_execution_through_rosetta") {
texts = listOf( Toolkit.drawCentered(batch, warningAppleRosettaIcon, yoff)
"It seems you are using a Mac with Apple Silicon but running the game through Rosetta.", texts = (1..2).map { Lang.get("GAME_APPLE_ROSETTA_WARNING$it") }
"A native build for the game is available which runs much faster than current version."
)
textcols = texts.map { Color.WHITE } textcols = texts.map { Color.WHITE }
} }
@@ -399,6 +397,7 @@ class TitleScreen(batch: FlippingSpriteBatch) : IngameInstance(batch) {
uiRemoCon.dispose() uiRemoCon.dispose()
demoWorld.dispose() demoWorld.dispose()
warning32bitJavaIcon.texture.dispose() warning32bitJavaIcon.texture.dispose()
warningAppleRosettaIcon.texture.dispose()
} }
override fun inputStrobed(e: TerrarumKeyboardEvent) { override fun inputStrobed(e: TerrarumKeyboardEvent) {