Merge pull request #27 from MintCoolMC/dev_progress

Update 10123
MintCoolMC · May 19, 2024 · 590dfad · 590dfad
2 parents 92ca531 + 2cf903e
commit 590dfad
Show file tree

Hide file tree

Showing 37 changed files with 1,693 additions and 94 deletions.
diff --git a/manifest.json b/manifest.json
@@ -4,14 +4,14 @@
         "description": "Minecraft UI Pack\n§ehttps://mintraspberry.cool/rainbowpieui",
         "name": "Rainbow Pie UI",
         "uuid": "82d610e8-0968-4c0a-a47e-38e6663ee6ff",
-        "version": [ 2, 4, 10116 ],
+        "version": [ 2, 5, 10123 ],
         "min_engine_version": [ 1, 20, 80 ]
     },
     "modules": [
         {
             "type": "resources",
             "uuid": "d983a931-3833-458c-93b4-58e6c1ed9255",
-            "version": [ 2, 4, 10116 ]
+            "version": [ 2, 5, 10123 ]
         }
     ],
     "settings": [

diff --git a/texts/en_US.lang b/texts/en_US.lang
@@ -17,6 +17,11 @@ rainbowpie.ui.themesystem.description.title=Description:
 rainbowpie.ui.themesystem.version_toolow=This theme version is too low! please update!
 rainbowpie.ui.themesystem.version_toohight=This theme version is too hight!
 
+rainbowpie.ui.start.vanilla_tip=Have you encountered a BUG? If you encounter a bug, please report it to us via Github
+rainbowpie.ui.start.startui_tip=Back to Rainbow Pie UI style StartUI
+rainbowpie.ui.start.vanilla=Vanilla
+rainbowpie.ui.start.startui=StartUI
+
 rainbowpie.ui.trade2.tradeAll=Trade All
 
 rainbowpie.ui.inventory.actions.destroy_selection=Destroy
@@ -83,6 +88,11 @@ rainbowpie.ui.pause.permissions.member=Member
 rainbowpie.ui.pause.permissions.op=Operator
 rainbowpie.ui.pause.permissions.visitor=Visitor
 
+rainbowpie.ui.pause.vanilla_tip=Switch to Vanilla style PauseUI
+rainbowpie.ui.pause.pauseui_tip=Back to Rainbow Pie UI style PauseUI
+rainbowpie.ui.pause.vanilla=Vanilla
+rainbowpie.ui.pause.pauseui=PauseUI
+
 rainbowpie.ui.warning.text.error=A serious error has been detected, which may affect your normal use. If you are not using any other resource packs and are using a supported game version, please report this error to issues.
 rainbowpie.ui.warning.text.warning=An error has been detected. If you are not using any other resource packs and are using a supported game version, please report this error to issues.
 rainbowpie.ui.warning.button.check=Check error

diff --git a/texts/zh_CN.lang b/texts/zh_CN.lang
@@ -17,6 +17,11 @@ rainbowpie.ui.themesystem.description.title=简介:	#
 rainbowpie.ui.themesystem.version_toolow=当前主题版本太低！请更新！	#
 rainbowpie.ui.themesystem.version_toohight=当前主题版本太高！	#
 
+rainbowpie.ui.start.vanilla_tip=遇到 Bug 了吗？如果你遇到了 Bug 请通过 Github 反馈给我们！
+rainbowpie.ui.start.startui_tip=回到 Rainbow Pie UI 样式的 StartUI
+rainbowpie.ui.start.vanilla=原版
+rainbowpie.ui.start.startui=StartUI
+
 rainbowpie.ui.trade2.tradeAll=交易全部
 
 rainbowpie.ui.inventory.actions.destroy_selection=销毁物品
@@ -83,6 +88,11 @@ rainbowpie.ui.pause.permissions.member=成员
 rainbowpie.ui.pause.permissions.op=操作员
 rainbowpie.ui.pause.permissions.visitor=访客
 
+rainbowpie.ui.pause.vanilla_tip=切换到原版样式的 PauseUI
+rainbowpie.ui.pause.pauseui_tip=回到 Rainbow Pie UI 样式的 PauseUI
+rainbowpie.ui.pause.vanilla=原版
+rainbowpie.ui.pause.pauseui=PauseUI
+
 rainbowpie.ui.warning.text.error=检查到一个致命的错误，这可能影响到你正常使用。如果你没有使用其他资源包并且正在使用受支持的游戏版本，请把此错误报告到issues。
 rainbowpie.ui.warning.text.warning=检查到一个错误。如果你没有使用其他资源包并且正在使用受支持的游戏版本，请把此错误报告到issues。
 rainbowpie.ui.warning.button.check=查看报错

diff --git a/texts/zh_TW.lang b/texts/zh_TW.lang
@@ -17,6 +17,11 @@ rainbowpie.ui.themesystem.description.title=介紹:	#
 rainbowpie.ui.themesystem.version_toolow=當前外觀包版本太低！	#
 rainbowpie.ui.themesystem.version_toohight=當前外觀包版本太高！	#
 
+rainbowpie.ui.start.vanilla_tip=遇到 Bug 了嗎？如果你遇到了 Bug 請通過 Github 反饋給我們！
+rainbowpie.ui.start.startui_tip=回到 Rainbow Pie UI 樣式的 StartUI
+rainbowpie.ui.start.vanilla=原版
+rainbowpie.ui.start.startui=StartUI
+
 rainbowpie.ui.trade2.tradeAll=交易全部
 
 rainbowpie.ui.inventory.actions.destroy_selection=銷毀物品
@@ -83,6 +88,11 @@ rainbowpie.ui.pause.permissions.member=成員
 rainbowpie.ui.pause.permissions.op=操作者
 rainbowpie.ui.pause.permissions.visitor=訪客
 
+rainbowpie.ui.pause.vanilla_tip=切換到原版樣式的 PauseUI
+rainbowpie.ui.pause.pauseui_tip=回到 Rainbow Pie UI 樣式的 PauseUI
+rainbowpie.ui.pause.vanilla=原版
+rainbowpie.ui.pause.pauseui=PauseUI
+
 rainbowpie.ui.warning.text.error=檢查到一個嚴重的錯誤，這可能會影響到你正常使用。如果你沒有使用其他資源套件并且正在使用受支持的游戲版本，請把此錯誤報告到issues。
 rainbowpie.ui.warning.text.warning=檢查到一個錯誤。如果你沒有使用其他資源套件并且正在使用受支持的游戲版本，請把此錯誤報告到issues。
 rainbowpie.ui.warning.button.check=查看報錯

diff --git a/textures/MintUI/background/background.png b/textures/MintUI/background/background.png
diff --git a/textures/MintUI/background/background_blur.png b/textures/MintUI/background/background_blur.png
diff --git a/textures/MintUI/background/note.txt b/textures/MintUI/background/note.txt
@@ -0,0 +1,2 @@
+When the background resolution is 1920x1080,
+the Gaussian blur radius should be 12.0px
diff --git a/ui/MintUI/mintui_background.json b/ui/MintUI/mintui_background.json
@@ -13,6 +13,32 @@
           "size": [ "100%", "100%" ],
           "layer": 1,
           "controls": [
+            {
+              "gradient_top": {
+                "type": "custom",
+                "renderer": "gradient_renderer",
+                "ignored": "(not $rainbowpie_ui_flag_screenbackground_gradient)",
+                "size": [ "100%", 30 ],
+                "anchor_from": "top_middle",
+                "anchor_to": "top_middle",
+                "color1": [ 0.0, 0.0, 0.0, 0.5 ],
+                "color2": [ 0.0, 0.0, 0.0, 0.0 ],
+                "layer": 2
+              }
+            },
+            {
+              "design02_gradient_bottom": {
+                "type": "custom",
+                "renderer": "gradient_renderer",
+                "ignored": "(not $rainbowpie_ui_flag_screenbackground_gradient)",
+                "size": [ "100%", 30 ],
+                "anchor_from": "bottom_middle",
+                "anchor_to": "bottom_middle",
+                "color1": [ 0.0, 0.0, 0.0, 0.0 ],
+                "color2": [ 0.0, 0.0, 0.0, 0.5 ],
+                "layer": 2
+              }
+            },
             {
               "image_background": {
                 "type": "image",
@@ -51,6 +77,32 @@
           "size": [ "100%", "100%" ],
           "layer": 1,
           "controls": [
+            {
+              "gradient_top": {
+                "type": "custom",
+                "renderer": "gradient_renderer",
+                "ignored": "(not $rainbowpie_ui_flag_screenbackground_gradient)",
+                "size": [ "100%", 30 ],
+                "anchor_from": "top_middle",
+                "anchor_to": "top_middle",
+                "color1": [ 0.0, 0.0, 0.0, 0.5 ],
+                "color2": [ 0.0, 0.0, 0.0, 0.0 ],
+                "layer": 2
+              }
+            },
+            {
+              "design02_gradient_bottom": {
+                "type": "custom",
+                "renderer": "gradient_renderer",
+                "ignored": "(not $rainbowpie_ui_flag_screenbackground_gradient)",
+                "size": [ "100%", 30 ],
+                "anchor_from": "bottom_middle",
+                "anchor_to": "bottom_middle",
+                "color1": [ 0.0, 0.0, 0.0, 0.0 ],
+                "color2": [ 0.0, 0.0, 0.0, 0.5 ],
+                "layer": 2
+              }
+            },
             {
               "image_background": {
                 "type": "image",
@@ -133,6 +185,32 @@
                 "animation_reset_name": "$background_children_anim_reset",
                 "anims": "$background_children_anims",
                 "controls": [
+                  {
+                    "gradient_top": {
+                      "type": "custom",
+                      "renderer": "gradient_renderer",
+                      "ignored": "(not $rainbowpie_ui_flag_screenbackground_gradient)",
+                      "size": [ "100%", 30 ],
+                      "anchor_from": "top_middle",
+                      "anchor_to": "top_middle",
+                      "color1": [ 0.0, 0.0, 0.0, 0.5 ],
+                      "color2": [ 0.0, 0.0, 0.0, 0.0 ],
+                      "layer": 2
+                    }
+                  },
+                  {
+                    "design02_gradient_bottom": {
+                      "type": "custom",
+                      "renderer": "gradient_renderer",
+                      "ignored": "(not $rainbowpie_ui_flag_screenbackground_gradient)",
+                      "size": [ "100%", 30 ],
+                      "anchor_from": "bottom_middle",
+                      "anchor_to": "bottom_middle",
+                      "color1": [ 0.0, 0.0, 0.0, 0.0 ],
+                      "color2": [ 0.0, 0.0, 0.0, 0.5 ],
+                      "layer": 2
+                    }
+                  },
                   {
                     "image_background": {
                       "type": "image",
@@ -212,6 +290,32 @@
                 "animation_reset_name": "$background_children_anim_reset",
                 "anims": "$background_children_anims",
                 "controls": [
+                  {
+                    "gradient_top": {
+                      "type": "custom",
+                      "renderer": "gradient_renderer",
+                      "ignored": "(not $rainbowpie_ui_flag_screenbackground_gradient)",
+                      "size": [ "100%", 30 ],
+                      "anchor_from": "top_middle",
+                      "anchor_to": "top_middle",
+                      "color1": [ 0.0, 0.0, 0.0, 0.5 ],
+                      "color2": [ 0.0, 0.0, 0.0, 0.0 ],
+                      "layer": 2
+                    }
+                  },
+                  {
+                    "design02_gradient_bottom": {
+                      "type": "custom",
+                      "renderer": "gradient_renderer",
+                      "ignored": "(not $rainbowpie_ui_flag_screenbackground_gradient)",
+                      "size": [ "100%", 30 ],
+                      "anchor_from": "bottom_middle",
+                      "anchor_to": "bottom_middle",
+                      "color1": [ 0.0, 0.0, 0.0, 0.0 ],
+                      "color2": [ 0.0, 0.0, 0.0, 0.5 ],
+                      "layer": 2
+                    }
+                  },
                   {
                     "image_background": {
                       "type": "image",

diff --git a/ui/RainbowPieUI/common/rainbowpie_ui_button.json b/ui/RainbowPieUI/common/rainbowpie_ui_button.json
@@ -45,6 +45,9 @@
     "$rainbowpie_localui_button_desc_enabled|default": false,
     "$rainbowpie_localui_button_desc_text|default": "HoverText",
     "$rainbowpie_localui_button_desc_text_bindings|default": [],
+    "$rainbowpie_localui_button_desc_text_size|default": [ "100%c + 8px", "100%c + 5px" ],
+    "$rainbowpie_localui_button_desc_text_offset|default": [ 10, -10 ],
+    "$rainbowpie_localui_button_desc_text_anchor|default": "top_left",
     "$rainbowpie_localui_button_hover_border_layer|default": 50,
 
     "controls": [
@@ -330,9 +333,9 @@
       {
         "custom_hover_text": {
           "type": "button",
-          "enabled": "(not $touch)",
+          "enabled": "(not ($touch or $game_pad))",
           "allow_clipping": false,
-          "follows_cursor": "(not $touch)",
+          "follows_cursor": "(not ($touch or $game_pad))",
           "consume_event": false,
           "consume_hover_events": false,
           "focus_enabled": false,
@@ -342,7 +345,7 @@
           "$locked_control": "",
           "variables": [
             {
-              "requires": "$touch",
+              "requires": "($touch or $game_pad)",
               "$hover_control": "",
               "$locked_control": "hover_text"
             }
@@ -357,19 +360,45 @@
                     "hover_text_background": {
                       "type": "image",
                       "texture": "($rainbowpie_ui_path_home + '/r_white')",
-                      "size": [ "100%c + 8px", "100%c + 5px" ],
-                      "offset": [ 10, -10 ],
-                      "anchor_from": "top_left",
-                      "anchor_to": "top_left",
+                      "size": "$rainbowpie_localui_button_desc_text_size",
+                      "offset": "$rainbowpie_localui_button_desc_text_offset",
+                      "anchor_from": "$rainbowpie_localui_button_desc_text_anchor",
+                      "anchor_to": "$rainbowpie_localui_button_desc_text_anchor",
+                      // "clips_children": true, // Why "clips_children" doesn't work here
                       "layer": 200,
                       "color": "$rainbowpie_ui_theme_hovertext_background_color",
                       "alpha": "$rainbowpie_ui_theme_hovertext_background_alpha",
                       "controls": [
+                        {
+                          "background_icon": {
+                            "type": "panel",
+                            "size": [ 0, 0 ],
+                            "anchor_to": "$rainbowpie_ui_theme_hovertext_bgicon_anchor",
+                            "anchor_from": "$rainbowpie_ui_theme_hovertext_bgicon_anchor",
+                            "ignored": "(not $rainbowpie_ui_theme_hovertext_bgicon_enabled)",
+                            "controls": [
+                              {
+                                "icon_image": {
+                                  "type": "image",
+                                  "size": "$rainbowpie_ui_theme_hovertext_bgicon_size",
+                                  "anchor_to": "$rainbowpie_ui_theme_hovertext_bgicon_anchor",
+                                  "anchor_from": "$rainbowpie_ui_theme_hovertext_bgicon_anchor",
+                                  "offset": "$rainbowpie_ui_theme_hovertext_bgicon_offset",
+                                  "texture": "$rainbowpie_ui_theme_hovertext_bgicon_texture",
+                                  "alpha": "$rainbowpie_ui_theme_hovertext_bgicon_alpha",
+                                  "fill": "$rainbowpie_ui_theme_hovertext_bgicon_fill",
+                                  "layer": 3
+                                }
+                              }
+                            ]
+                          }
+                        },
                         {
                           "hover_text_controls": {
                             "type": "stack_panel",
                             "orientation": "vertical",
                             "size": [ "100%cm", "100%c" ],
+                            "layer": 8,
                             "controls": [
                               {
                                 "hover_text_label@rainbowpie_ui_common.text_label_notheme": {

diff --git a/ui/RainbowPieUI/module/hud_bow_helper.json b/ui/RainbowPieUI/module/hud_bow_helper.json
@@ -319,6 +319,28 @@
                       "orientation": "horizontal",
                       "size": [ "100%c", 12 ],
                       "controls": [
+                        {
+                          "no_arrows_text_panel": {
+                            "type": "panel",
+                            "size": [ "100%c", "100%" ],
+                            "controls": [
+                              {
+                                "count_text@rainbowpie_ui_common.text_label": {
+                                  "text": "No arrows",
+                                  "color": [ 1.0, 0.333, 0.333 ]
+                                }
+                              }
+                            ],
+                            "bindings": [
+                              {
+                                "binding_type": "view",
+                                "source_control_name": "arrow_count",
+                                "source_property_name": "(#inventory_target_item_total_count_int = 0)",
+                                "target_property_name": "#visible"
+                              }
+                            ]
+                          }
+                        },
                         {
                           "count_title_panel": {
                             "type": "panel",
@@ -327,6 +349,14 @@
                               {
                                 "arrow_panel@rainbowpie_module_hud_bow_helper.arrow_slot_panel": {}
                               }
+                            ],
+                            "bindings": [
+                              {
+                                "binding_type": "view",
+                                "source_control_name": "arrow_count",
+                                "source_property_name": "(not (#inventory_target_item_total_count_int = 0))",
+                                "target_property_name": "#visible"
+                              }
                             ]
                           }
                         },
@@ -349,6 +379,14 @@
                                   ]
                                 }
                               }
+                            ],
+                            "bindings": [
+                              {
+                                "binding_type": "view",
+                                "source_control_name": "arrow_count",
+                                "source_property_name": "(not (#inventory_target_item_total_count_int = 0))",
+                                "target_property_name": "#visible"
+                              }
                             ]
                           }
                         }

diff --git a/ui/RainbowPieUI/module_pack.json b/ui/RainbowPieUI/module_pack.json
@@ -35,7 +35,7 @@
         "hud_bow_helper@rainbowpie_ui_module_list.module_item": {
           "$module_icon_texture": "($rainbowpie_ui_path_home + '/module/hud_bow_helper')",
           "$module_name": "HUD Bow Helper",
-          "$module_version": "1.4-v1.20.50",
+          "$module_version": "1.5",
           "$module_author": "MintCoolMC",
           "$module_description": "Shows the total count of arrows in the inventory",
           "$module_state_check": "$rainbowpie_ui_module_hud_bow_helper",

diff --git a/ui/RainbowPieUI/rainbowpie_ui_theme_preview.json b/ui/RainbowPieUI/rainbowpie_ui_theme_preview.json
@@ -213,7 +213,7 @@
                 "texture": "textures/ui/White",
                 "color": "$rainbowpie_ui_theme_topbar_background_color",
                 "alpha": "$rainbowpie_ui_theme_topbar_background_alpha",
-                "layer": 5,
+                "layer": 6,
                 "controls": [
                   {
                     "mini_text_1@rainbowpie_ui_common.text_label_notheme": {
@@ -239,7 +239,7 @@
                 "texture": "textures/ui/White",
                 "color": "$rainbowpie_ui_theme_text_background_color",
                 "alpha": "$rainbowpie_ui_theme_text_background_alpha",
-                "layer": 5,
+                "layer": 6,
                 "controls": [
                   {
                     "mini_text_1@rainbowpie_ui_common.text_label_notheme": {