diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/main/MainErosController.kt b/src/main/java/de/bixilon/minosoft/gui/eros/main/MainErosController.kt index bc70264fb..a9a080460 100644 --- a/src/main/java/de/bixilon/minosoft/gui/eros/main/MainErosController.kt +++ b/src/main/java/de/bixilon/minosoft/gui/eros/main/MainErosController.kt @@ -86,7 +86,7 @@ class MainErosController : JavaFXWindowController() { override fun init() { logoFX.image = JavaFXUtil.MINOSOFT_LOGO - versionTextFX.text = RunConfiguration.VERSION_STRING + versionTextFX.text = RunConfiguration.APPLICATION_NAME iconMap = mapOf( ErosMainActivities.PLAY to playIconFX, ErosMainActivities.PROFILES to profilesIconFX, diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/main/about/AboutController.kt b/src/main/java/de/bixilon/minosoft/gui/eros/main/about/AboutController.kt index 6180abf61..6a183c28c 100644 --- a/src/main/java/de/bixilon/minosoft/gui/eros/main/about/AboutController.kt +++ b/src/main/java/de/bixilon/minosoft/gui/eros/main/about/AboutController.kt @@ -44,7 +44,7 @@ class AboutController : EmbeddedJavaFXController() { bixilonLogoFX.children.setAll(JavaFXUtil.BIXILON_LOGO) createCrashReportFX.ctext = CRASH_REPORT - versionStringFX.text = RunConfiguration.VERSION_STRING + versionStringFX.text = RunConfiguration.APPLICATION_NAME aboutTextFX.text = TEXT } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt index 0431c05ff..87afb595f 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt @@ -295,7 +295,7 @@ class RenderWindow( } if (RenderConstants.SHOW_FPS_IN_WINDOW_TITLE) { - window.title = "Minosoft ${RunConfiguration.VERSION_STRING} | FPS: ${renderStats.smoothAvgFPS.rounded10}" + window.title = "${RunConfiguration.APPLICATION_NAME} | FPS: ${renderStats.smoothAvgFPS.rounded10}" } renderStats.endFrame() } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/pause/PauseMenu.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/pause/PauseMenu.kt index 434c5583e..c1d2530d7 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/pause/PauseMenu.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/gui/screen/menu/pause/PauseMenu.kt @@ -34,7 +34,7 @@ import de.bixilon.minosoft.terminal.RunConfiguration class PauseMenu(guiRenderer: GUIRenderer) : Menu(guiRenderer) { init { - add(TextElement(guiRenderer, RunConfiguration.VERSION_STRING, HorizontalAlignments.CENTER, false, scale = 3.0f)) + add(TextElement(guiRenderer, RunConfiguration.APPLICATION_NAME, HorizontalAlignments.CENTER, false, scale = 3.0f)) add(SpacerElement(guiRenderer, Vec2i(0, 20))) add(ButtonElement(guiRenderer, "menu.pause.back_to_game".i18n()) { guiRenderer.gui.pause(false) }) add(ButtonElement(guiRenderer, "menu.pause.options.debug".i18n()) { guiRenderer.gui.push(DebugMenu) }) diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/DebugHUDElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/DebugHUDElement.kt index a2def8f9b..46cd2ecff 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/DebugHUDElement.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/DebugHUDElement.kt @@ -93,7 +93,7 @@ class DebugHUDElement(guiRenderer: GUIRenderer) : Element(guiRenderer), Layouted private fun initLeft(): Element { val layout = RowLayout(guiRenderer) layout.margin = Vec4i(2) - layout += TextElement(guiRenderer, TextComponent(RunConfiguration.VERSION_STRING, ChatColors.RED)) + layout += TextElement(guiRenderer, TextComponent(RunConfiguration.APPLICATION_NAME, ChatColors.RED)) layout += AutoTextElement(guiRenderer, 1) { "FPS §d${renderWindow.renderStats.smoothAvgFPS.rounded10}" } renderWindow.renderer[WorldRenderer]?.apply { layout += AutoTextElement(guiRenderer, 1) { "C v=$visibleSize, m=${loadedMeshesSize.format()}, cQ=${culledQueuedSize.format()}, q=${queueSize.format()}, pT=${preparingTasksSize.format()}/${maxPreparingTasks.format()}, l=${meshesToLoadSize.format()}/${maxMeshesToLoad.format()}, w=${connection.world.chunks.size.format()}" } diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/GLFWWindow.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/GLFWWindow.kt index 023aca8d9..c49999eb6 100644 --- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/GLFWWindow.kt +++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/GLFWWindow.kt @@ -183,7 +183,7 @@ class GLFWWindow( glfwWindowHint(GLFW_VISIBLE, false.glfw) - window = glfwCreateWindow(size.x, size.y, "Minosoft ${RunConfiguration.VERSION_STRING}", MemoryUtil.NULL, MemoryUtil.NULL) + window = glfwCreateWindow(size.x, size.y, RunConfiguration.APPLICATION_NAME, MemoryUtil.NULL, MemoryUtil.NULL) if (window == MemoryUtil.NULL) { try { destroy() diff --git a/src/main/java/de/bixilon/minosoft/properties/MinosoftPropertiesLoader.kt b/src/main/java/de/bixilon/minosoft/properties/MinosoftPropertiesLoader.kt index 51f4ee589..b6daa91d3 100644 --- a/src/main/java/de/bixilon/minosoft/properties/MinosoftPropertiesLoader.kt +++ b/src/main/java/de/bixilon/minosoft/properties/MinosoftPropertiesLoader.kt @@ -28,7 +28,7 @@ object MinosoftPropertiesLoader { val json = Minosoft.MINOSOFT_ASSETS_MANAGER[minosoft("version.json")].readJson() MinosoftProperties = json - RunConfiguration.VERSION_STRING = "Minosoft ${MinosoftProperties.general.name}" + RunConfiguration.APPLICATION_NAME = "Minosoft ${MinosoftProperties.general.name}" Log.log(LogMessageType.OTHER, LogLevels.INFO) { "This is minosoft version ${MinosoftProperties.general.name}${MinosoftProperties.git?.let { ", built on ${it.commitShort}/${it.branch}" }}!" } } } diff --git a/src/main/java/de/bixilon/minosoft/terminal/RunConfiguration.kt b/src/main/java/de/bixilon/minosoft/terminal/RunConfiguration.kt index 30f2f74fa..339aa1b5a 100644 --- a/src/main/java/de/bixilon/minosoft/terminal/RunConfiguration.kt +++ b/src/main/java/de/bixilon/minosoft/terminal/RunConfiguration.kt @@ -58,7 +58,7 @@ object RunConfiguration { val X_START_ON_FIRST_THREAD_SET = System.getenv("JAVA_STARTED_ON_FIRST_THREAD_${ProcessHandle.current().pid()}") == "1" - var VERSION_STRING = "Minosoft" + var APPLICATION_NAME = "Minosoft" var SKIP_RENDERERS: List = emptyList()