using reference for WelcomeScene, WelcomeCondition, and WelcomeAction

assets/welcomes/en.properties

@@ -17,9 +17,9 @@ Discord.no=Mark as Junk
 UpdateECHO.title=Update ECHO
 UpdateECHO=News: Recently, the ECHO has published a new version {0}.\n\
   You can click the button below to update your ECHO terminal.
-UpdateECHO.button-a=[accent]Update[]
-UpdateECHO.button-b=Not Now
-UpdateECHO.button-c=Skip This
+UpdateECHO.update=[accent]Update[]
+UpdateECHO.no=Not Now
+UpdateECHO.skip-this=Skip This
 UpdateECHO.break-update-warning=Warning: The latest version is a break update, so it may make your saves corrupted. Be careful!
 #v2
 EmploymentVerification.title=Employment Verification

assets/welcomes/ja.properties

@@ -17,9 +17,9 @@ Discord.no=\u30B8\u30E3\u30F3\u30AF\u3068\u3057\u3066\u30DE\u30FC\u30AF
 UpdateECHO.title=\uFF25\uFF23\uFF28\uFF2F\u3092\u66F4\u65B0\u3059\u308B
 UpdateECHO=News: \u6700\u8FD1\u3001\uFF25\uFF23\uFF28\uFF2F\u306F\u65B0\u3057\u3044\u30D0\u30FC\u30B8\u30E7\u30F3\u3092\u516C\u958B\u3057\u307E\u3057\u305F {0}\u3002\n\
   \u4E0B\u306E\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u3001\uFF25\uFF23\uFF28\uFF2F\u7AEF\u672B\u3092\u66F4\u65B0\u3067\u304D\u307E\u3059\u3002
-UpdateECHO.button-a=\u66F4\u65B0\u3059\u308B
-UpdateECHO.button-b=\u4ECA\u306F\u3084\u3081\u308D
-UpdateECHO.button-c=\u8868\u793A\u3057\u306A\u3044
+UpdateECHO.update=\u66F4\u65B0\u3059\u308B
+UpdateECHO.no=\u4ECA\u306F\u3084\u3081\u308D
+UpdateECHO.skip-this=\u8868\u793A\u3057\u306A\u3044
 #v2
 EmploymentVerification.title=\u96C7\u7528\u78BA\u8A8D
 EmploymentVerification=\u300APlum Star Inc.\u300B\u306B\u3088\u3046\u3053\u305D\u3002\u6B64\u306E\u65B0\u3057\u3044\u30D0\u30FC\u30B8\u30E7\u30F3\u306E\u5B8C\u5168\u306A\u30B5\u30A4\u30D0\u30CD\u30C6\u30A3\u30C3\u30AF\u30B9\u3092\u304A\u697D\u3057\u307F\u304F\u3060\u3055\u3044\uFF01\n\

assets/welcomes/ru.properties

@@ -17,9 +17,9 @@ Discord.no=\u041E\u0442\u043C\u0435\u0442\u0438\u0442\u044C \u043A\u0430\u043A \
 UpdateECHO.title=\u041E\u0431\u043D\u043E\u0432\u0438\u0442\u044C \u042D\u0425\u041E
 UpdateECHO=\u041D\u043E\u0432\u043E\u0441\u0442\u0438: \u041D\u0435\u0434\u0430\u0432\u043D\u043E ECHO \u043E\u043F\u0443\u0431\u043B\u0438\u043A\u043E\u0432\u0430\u043B\u043E \u043D\u043E\u0432\u0443\u044E \u0432\u0435\u0440\u0441\u0438\u044E {0}.\n\
    \u0412\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u043D\u0430\u0436\u0430\u0442\u044C \u043A\u043D\u043E\u043F\u043A\u0443 \u043D\u0438\u0436\u0435, \u0447\u0442\u043E\u0431\u044B \u043E\u0431\u043D\u043E\u0432\u0438\u0442\u044C \u0441\u0432\u043E\u0439 \u0442\u0435\u0440\u043C\u0438\u043D\u0430\u043B ECHO.
-UpdateECHO.button-a=\u041E\u0431\u043D\u043E\u0432\u043B\u044F\u0442\u044C
-UpdateECHO.button-b=\u041D\u0435 \u0441\u0435\u0439\u0447\u0430\u0441
-UpdateECHO.button-c=\u0411\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u043F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C
+UpdateECHO.update=\u041E\u0431\u043D\u043E\u0432\u043B\u044F\u0442\u044C
+UpdateECHO.no=\u041D\u0435 \u0441\u0435\u0439\u0447\u0430\u0441
+UpdateECHO.skip-this=\u0411\u043E\u043B\u044C\u0448\u0435 \u043D\u0435 \u043F\u043E\u043A\u0430\u0437\u044B\u0432\u0430\u0442\u044C
 #v2
 EmploymentVerification.title=\u041F\u0440\u043E\u0432\u0435\u0440\u043A\u0430 \u0437\u0430\u043D\u044F\u0442\u043E\u0441\u0442\u0438
 EmploymentVerification=\u041F\u0440\u0438\u0441\u043E\u0435\u0434\u0438\u043D\u044F\u0439\u0442\u0435\u0441\u044C \u043A \u043D\u0430\u043C, Plum Star Inc., \u043D\u0430\u0441\u043B\u0430\u0436\u0434\u0430\u0439\u0442\u0435\u0441\u044C \u044D\u0442\u043E\u0439 \u043D\u043E\u0432\u043E\u0439 \u0432\u0435\u0440\u0441\u0438\u0435\u0439 \u043F\u043E\u043B\u043D\u043E\u0439 \u043A\u0438\u0431\u0435\u0440\u043D\u0435\u0442\u0438\u043A\u0438!\n\

assets/welcomes/uk_UA.properties

@@ -17,9 +17,9 @@ Discord.no=\u0412\u0438\u0434\u0430\u043B\u0438\u0442\u0438
 UpdateECHO.title=\u041E\u043D\u043E\u0432\u0438\u0442\u0438 ECHO
 UpdateECHO=\u041D\u043E\u0432\u0438\u043D\u0438: \u043D\u0435\u0449\u043E\u0434\u0430\u0432\u043D\u043E ECHO \u043E\u043F\u0443\u0431\u043B\u0456\u043A\u0443\u0432\u0430\u043B\u0438 \u043D\u043E\u0432\u0443 \u0432\u0435\u0440\u0441\u0456\u044E: {0}.\n\
   \u0412\u0438 \u043C\u043E\u0436\u0435\u0442\u0435 \u043D\u0430\u0442\u0438\u0441\u043D\u0443\u0442\u0438 \u043A\u043D\u043E\u043F\u043A\u0443 \u043D\u0438\u0436\u0447\u0435, \u0449\u043E\u0431 \u043E\u043D\u043E\u0432\u0438\u0442\u0438 \u0442\u0435\u0440\u043C\u0456\u043D\u0430\u043B ECHO.
-UpdateECHO.button-a=\u041E\u043D\u043E\u0432\u0438\u0442\u0438
-UpdateECHO.button-b=\u041D\u0435 \u0437\u0430\u0440\u0430\u0437
-UpdateECHO.button-c=\u041D\u0435 \u043F\u043E\u043A\u0430\u0437\u0443\u0432\u0430\u0442\u0438
+UpdateECHO.update=\u041E\u043D\u043E\u0432\u0438\u0442\u0438
+UpdateECHO.no=\u041D\u0435 \u0437\u0430\u0440\u0430\u0437
+UpdateECHO.skip-this=\u041D\u0435 \u043F\u043E\u043A\u0430\u0437\u0443\u0432\u0430\u0442\u0438
 #v2
 EmploymentVerification.title=\u041F\u0456\u0434\u0442\u0432\u0435\u0440\u0434\u0436\u0435\u043D\u043D\u044F \u043F\u0440\u0430\u0446\u0435\u0432\u043B\u0430\u0448\u0442\u0443\u0432\u0430\u043D\u043D\u044F
 EmploymentVerification=\u041B\u0430\u0441\u043A\u0430\u0432\u043E \u043F\u0440\u043E\u0441\u0438\u043C\u043E \u0434\u043E \u043D\u0430\u0441, \u00AB\u041F\u043B\u044E\u043C \u0421\u0442\u0430\u0440 \u0406\u043D\u043A\u043E\u0440\u043F\u043E\u0440\u0435\u0439\u0448\u043D\u00BB, \u043D\u0430\u0441\u043E\u043B\u043E\u0434\u0436\u0443\u0439\u0442\u0435\u0441\u044C \u0446\u0456\u0454\u044E \u043D\u043E\u0432\u043E\u044E \u0432\u0435\u0440\u0441\u0456\u0454\u044E, \u0449\u043E \u0441\u043F\u043E\u0432\u043D\u0435\u043D\u0430 \u043A\u0443\u043F\u043E\u044E \u043A\u0456\u0431\u0435\u0440\u043D\u0435\u0442\u0438\u0447\u043D\u0438\u0445 \u0440\u0435\u0447\u0435\u0439!\n\

assets/welcomes/zh_CN.properties

@@ -17,9 +17,9 @@ Discord.no=\u6807\u8BB0\u4E3A\u5783\u573E\u5185\u5BB9
 UpdateECHO.title=\u66F4\u65B0\u201C\u98DE\u58F0\u201D
 UpdateECHO=News: \u6700\u8FD1\uFF0C\u201C\u98DE\u58F0\u201D\u7EC8\u7AEF\u63A8\u51FA\u4E86\u65B0\u7248\u672C{0}\u3002\n\
   \u4F60\u53EF\u4EE5\u70B9\u51FB\u4E0B\u9762\u7684\u6309\u94AE\u66F4\u65B0\u4F60\u7684\u7EC8\u7AEF
-UpdateECHO.button-a=[accent]\u66F4\u65B0[]
-UpdateECHO.button-b=\u4EE5\u540E\u63D0\u9192\u6211
-UpdateECHO.button-c=\u4E0D\u518D\u663E\u793A
+UpdateECHO.update=[accent]\u66F4\u65B0[]
+UpdateECHO.no=\u4EE5\u540E\u63D0\u9192\u6211
+UpdateECHO.skip-this=\u4E0D\u518D\u663E\u793A
 UpdateECHO.break-update-warning=\u8B66\u544A\uFF1A\u6700\u65B0\u7248\u672C\u7684\u66F4\u65B0\u5DF2\u635F\u574F\uFF0C\u53EF\u80FD\u4F1A\u5BFC\u81F4\u5B58\u6863\u9519\u8BEF\u3002\u8BF7\u52A1\u5FC5\u8C28\u614E\uFF01
 #v2
 EmploymentVerification.title=\u9A8C\u8BC1\u96C7\u4F63\u72B6\u6001

common/src/net/liplum/common/ui/RateStarPanel.kt

@@ -5,11 +5,12 @@ import arc.scene.ui.ImageButton
 import arc.scene.ui.layout.Table
 import plumy.core.assets.TR
 
-class RateStarPanelBuilder {
-    var starNumber = 5
-    var starSize = 50f
-    var inactiveStar: TR = TR()
-    var activeStar: TR = TR()
+class RateStarPanelBuilder(
+    val starNumber: Int = 5,
+    val starSize: Float = 50f,
+    val activeStar: TR = TR(),
+    val inactiveStar: TR = TR(),
+) {
     inline fun build(
         crossinline onRate: (Int) -> Unit = {},
     ): Table = Table().apply {

main/src/net/liplum/ui/CioUI.kt

@@ -31,8 +31,8 @@ import net.liplum.ui.settings.SliderSettingX.Companion.addSliderSettingX
 import net.liplum.update.Updater
 import net.liplum.utils.IsLocal
 import net.liplum.utils.safeCall
-import net.liplum.welcome.Conditions
 import net.liplum.welcome.Welcome
+import net.liplum.welcome.WelcomeConditions
 import net.liplum.welcome.Welcomes
 import net.liplum.welcome.findAll
 import plumy.core.ClientOnly
@@ -167,19 +167,18 @@ object CioUI {
                             Updater.accessJob?.join()
                             if (!failed) {
                                 if (Updater.requireUpdate) {
-                                    val updateTips = Welcomes.findAll { tip ->
-                                        tip.condition == Conditions.CheckUpdate
+                                    val updateScenes = Welcomes.findAll { tip ->
+                                        tip.condition == WelcomeConditions.CheckUpdate
                                     }
-                                    if (updateTips.isEmpty()) {
+                                    if (updateScenes.isEmpty()) {
                                         ShowTextDialog(bundle("not-support"))
                                     } else {
-                                        val updateTip = updateTips.randomExcept(atLeastOne = true) {
+                                        val updateScene = updateScenes.randomExcept(atLeastOne = true) {
                                             id != Settings.LastWelcomeID
                                         }
-                                        if (updateTip != null)
-                                            Welcome.genEntity().apply {
-                                                tip = updateTip
-                                            }.showTip()
+                                        Welcomes.updateECHO
+                                        if (updateScene != null)
+                                            Welcome.createEntity(updateScene).showTip()
                                         else
                                             ShowTextDialog(bundle("not-support"))
                                     }

main/src/net/liplum/welcome/SharedUI.kt

@@ -7,14 +7,13 @@ import arc.scene.ui.Label
 import arc.scene.ui.TextButton
 import arc.scene.ui.layout.Cell
 import arc.scene.ui.layout.Table
-import arc.scene.utils.Elem
 import arc.util.Scaling
 import mindustry.gen.Tex
 import net.liplum.Meta
 import net.liplum.Var
 import net.liplum.i18nName
-import plumy.core.assets.TR
 import plumy.core.DesktopOnly
+import plumy.core.assets.TR
 
 internal fun Dialog.addPoster(
     icon: TR,
@@ -35,7 +34,7 @@ internal fun Dialog.addPoster(
     return img
 }
 
-internal fun Dialog.addPoliteWelcome(entity: Welcome.Entity) {
+internal fun Dialog.addPoliteWelcome(entity: WelcomeEntity) {
     addCenterText(
         entity.bundle.format(
             "welcome",
@@ -79,22 +78,12 @@ internal fun Dialog.addBoxedText(
 internal inline fun Dialog.addCloseButton(
     text: String,
     table: Table = this.cont,
+    width: Float = 200f,
     crossinline task: () -> Unit = {},
 ): Cell<TextButton> {
     return table.button(text) {
         Welcome.recordClick()
         task()
         hide()
-    }.size(200f, 50f)
-}
-
-internal inline fun Dialog.createCloseButton(
-    text: String,
-    crossinline task: () -> Unit = {},
-): TextButton {
-    return Elem.newButton(text) {
-        Welcome.recordClick()
-        task()
-        hide()
-    }
+    }.size(width, 50f)
 }