diff --git a/assets/graphics/gui/apple_rosetta_warning.tga b/assets/graphics/gui/apple_rosetta_warning.tga new file mode 100644 index 000000000..882185506 --- /dev/null +++ b/assets/graphics/gui/apple_rosetta_warning.tga @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6fec48224fe99133a11d57f339c7ea12183b19430643cd52a9ccbc00be225265 +size 32786 diff --git a/assets/locales/en/terrarum.json b/assets/locales/en/terrarum.json index c13df6318..7d11f3696 100644 --- a/assets/locales/en/terrarum.json +++ b/assets/locales/en/terrarum.json @@ -13,6 +13,8 @@ "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_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_LABEL_RESTART_REQUIRED": "Restart Required", "MENU_LABEL_KEYBOARD_LAYOUT": "Keyboard Layout", diff --git a/src/net/torvald/terrarum/modulebasegame/TitleScreen.kt b/src/net/torvald/terrarum/modulebasegame/TitleScreen.kt index e5c701623..424c2407d 100644 --- a/src/net/torvald/terrarum/modulebasegame/TitleScreen.kt +++ b/src/net/torvald/terrarum/modulebasegame/TitleScreen.kt @@ -122,9 +122,9 @@ class TitleScreen(batch: FlippingSpriteBatch) : IngameInstance(batch) { private lateinit var worldFBO: FloatFrameBuffer 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 { - warning32bitJavaIcon.flip(false, false) gameUpdateGovernor = ConsistentUpdateRate.also { it.reset() } } @@ -346,10 +346,8 @@ class TitleScreen(batch: FlippingSpriteBatch) : IngameInstance(batch) { } // warn: rosetta on Apple M-chips else if (App.getUndesirableConditions() == "apple_execution_through_rosetta") { - texts = listOf( - "It seems you are using a Mac with Apple Silicon but running the game through Rosetta.", - "A native build for the game is available which runs much faster than current version." - ) + Toolkit.drawCentered(batch, warningAppleRosettaIcon, yoff) + texts = (1..2).map { Lang.get("GAME_APPLE_ROSETTA_WARNING$it") } textcols = texts.map { Color.WHITE } } @@ -399,6 +397,7 @@ class TitleScreen(batch: FlippingSpriteBatch) : IngameInstance(batch) { uiRemoCon.dispose() demoWorld.dispose() warning32bitJavaIcon.texture.dispose() + warningAppleRosettaIcon.texture.dispose() } override fun inputStrobed(e: TerrarumKeyboardEvent) {