Merge pull request #28 from MintCoolMC/dev_progress

update 10126 (mc v1.21.0)
MintCoolMC · Jun 16, 2024 · 29ef6bf · 29ef6bf
2 parents c28e878 + 07c0b0c
commit 29ef6bf
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 34 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, 5, 10123 ],
-        "min_engine_version": [ 1, 20, 80 ]
+        "version": [ 2, 5, 10126 ],
+        "min_engine_version": [ 1, 21, 0 ]
     },
     "modules": [
         {
             "type": "resources",
             "uuid": "d983a931-3833-458c-93b4-58e6c1ed9255",
-            "version": [ 2, 5, 10123 ]
+            "version": [ 2, 5, 10126 ]
         }
     ],
     "settings": [

diff --git a/ui/RainbowPieUI/rainbowpie_ui_controls.json b/ui/RainbowPieUI/rainbowpie_ui_controls.json
@@ -249,12 +249,14 @@
     "anchor_from": "left_middle",
     "anchor_to": "left_middle",
     "$back_button_text|default": "",
+    "$back_button_text_binding_type|default": "none",
     "controls": [
       {
         "back_button@rainbowpie_ui_controls.rainbowpie_uioverride_back_button": {
           "offset": [ 0, 0 ],
-          "$button_text_binding_type": "global",
-          "$button_text": "$back_button_text"
+          "$button_text_binding_type": "$back_button_text_binding_type",
+          "$button_text": "$back_button_text",
+          "$rainbowpie_localui_backbutton_title_bindings": "$rainbowpie_localui_screenheader_title_bindings"
         }
       }
     ]

diff --git a/ui/RainbowPieUI/ui_extras/pause_screen_controls.json b/ui/RainbowPieUI/ui_extras/pause_screen_controls.json
@@ -175,17 +175,22 @@
                   {
                     "rainbowpie_version_label@rainbowpie_ui_common.text_label": {
                       "ignored": "$rainbowpieui_ci",
-                      "$rainbowpie_localui_this_device_os|default": "NULL",
-                      "$rainbowpie_localui_this_device_osc|default": "NULL",
-                      "$rainbowpie_localui_this_control_mode|default": "NULL",
+                      "$rainbowpie_localui_this_split": "",
+                      "$rainbowpie_localui_this_device_os": "NULL",
+                      "$rainbowpie_localui_this_device_osc": "NULL",
+                      "$rainbowpie_localui_this_control_mode": "NULL",
                       "offset": [ 2, 0 ],
                       "anchor_from": "left_middle",
                       "anchor_to": "left_middle",
                       "size": [ "80% - 2px", 10 ],
                       "text_alignment": "left",
-                      "text": "($mintui_pack_name + ' ' + $rainbowpieui_branch_display_name + ' ' + $rainbowpieui_engine_version_name + '.' + $rainbowpieui_patch_version + '.' + $rainbowpieui_hotfix_version + ' | ' + $rainbowpie_localui_this_device_osc + ' - ' + $rainbowpie_localui_this_device_os + ' | ' + $rainbowpie_localui_this_control_mode)",
+                      "text": "($mintui_pack_name + ' ' + $rainbowpieui_branch_display_name + ' ' + $rainbowpieui_engine_version_name + '.' + $rainbowpieui_patch_version + '.' + $rainbowpieui_hotfix_version + $rainbowpie_localui_this_split + $rainbowpie_ui_flag_server_displayname)",
                       "layer": 1,
                       "variables": [
+                        {
+                          "requires": "(not ($rainbowpie_ui_flag_server_displayname = ''))",
+                          "$rainbowpie_localui_this_split": " | "
+                        },
                         {
                           "requires": "$game_pad",
                           "$rainbowpie_localui_this_control_mode": "Controller"
@@ -256,17 +261,22 @@
                   {
                     "rainbowpie_ci_version_label@rainbowpie_ui_common.text_label": {
                       "ignored": "(not $rainbowpieui_ci)",
-                      "$rainbowpie_localui_this_device_os|default": "NULL",
-                      "$rainbowpie_localui_this_device_osc|default": "NULL",
-                      "$rainbowpie_localui_this_control_mode|default": "NULL",
+                      "$rainbowpie_localui_this_split": "",
+                      "$rainbowpie_localui_this_device_os": "NULL",
+                      "$rainbowpie_localui_this_device_osc": "NULL",
+                      "$rainbowpie_localui_this_control_mode": "NULL",
                       "offset": [ 2, 0 ],
                       "anchor_from": "left_middle",
                       "anchor_to": "left_middle",
                       "size": [ "80% - 2px", 10 ],
                       "text_alignment": "left",
-                      "text": "($mintui_pack_name + ' ' + $rainbowpieui_branch_display_name + ' ' + $rainbowpieui_engine_version_name + '.' + $rainbowpieui_patch_version + '.' + $rainbowpieui_hotfix_version + ' ' + $rainbowpieui_branch_name + '/' + $rainbowpieui_commit_id + ' | ' + $rainbowpie_localui_this_device_osc + ' - ' + $rainbowpie_localui_this_device_os + ' | ' + $rainbowpie_localui_this_control_mode)",
+                      "text": "($mintui_pack_name + ' ' + $rainbowpieui_branch_display_name + ' ' + $rainbowpieui_engine_version_name + '.' + $rainbowpieui_patch_version + '.' + $rainbowpieui_hotfix_version + ' ' + $rainbowpieui_branch_name + '/' + $rainbowpieui_commit_id + $rainbowpie_localui_this_split + $rainbowpie_ui_flag_server_displayname)",
                       "layer": 1,
                       "variables": [
+                        {
+                          "requires": "(not ($rainbowpie_ui_flag_server_displayname = ''))",
+                          "$rainbowpie_localui_this_split": " | "
+                        },
                         {
                           "requires": "$game_pad",
                           "$rainbowpie_localui_this_control_mode": "Controller"

diff --git a/ui/RainbowPieUI/ui_extras/smithing_table_2_screen_controls.json b/ui/RainbowPieUI/ui_extras/smithing_table_2_screen_controls.json
@@ -43,6 +43,7 @@
 
   "result_item_preview": {
     "type": "panel",
+    // Base Size: 18x18
     "controls": [
       {
         "turn_front@common_buttons.light_content_button": {
@@ -51,8 +52,8 @@
           "$button_content": "rainbowpieui_smithing_table_2.turn_front_icon",
           "anchor_to": "bottom_middle",
           "anchor_from": "bottom_middle",
-          "size": [ 12, 12 ],
-          "offset": [ -14, 2 ]
+          "size": [ "66.66666666666667%", "100%x" ], // 12x12
+          "offset": [ "-116.6666666666667%x", "16.66666666666667%y" ] //-14x2
         }
       },
       {
@@ -62,8 +63,8 @@
           "$button_content": "rainbowpieui_smithing_table_2.turn_back_icon",
           "anchor_to": "bottom_middle",
           "anchor_from": "bottom_middle",
-          "size": [ 12, 12 ],
-          "offset": [ 18, 2 ]
+          "size": [ "66.66666666666667%", "100%x" ], // 12x12
+          "offset": [ "150%y", "16.66666666666667%y" ]
         }
       },
       {

diff --git a/ui/_global_variables.json b/ui/_global_variables.json
@@ -6,18 +6,18 @@
   "$rainbowpieui_branch_display_name": "Release",
 
   "$rainbowpieui_engine_version": "25",
-  "$rainbowpieui_patch_version": "10123",
+  "$rainbowpieui_patch_version": "10126",
   "$rainbowpieui_hotfix_version": "1",
   "$rainbowpieui_engine_version_name": "2.5",
-  "$rainbowpieui_full_version_name": "2.5.10123.master",
+  "$rainbowpieui_full_version_name": "2.5.10126.master",
   "$rainbowpieui_codename": "pancake",
   "$rainbowpieui_watermark": true,
   "$rainbowpieui_bool": true,
 
-  "$rainbowpieui_version_minecraft_target": "v1.20.80",
-  "$rainbowpieui_version_minecraft_bigver": "v1.20",
-  "$rainbowpieui_version_minecraft_max": "v1.20.89",
-  "$rainbowpieui_version_minecraft_min": "v1.20.80",
+  "$rainbowpieui_version_minecraft_target": "v1.21.0",
+  "$rainbowpieui_version_minecraft_bigver": "v1.21",
+  "$rainbowpieui_version_minecraft_max": "v1.21.9",
+  "$rainbowpieui_version_minecraft_min": "v1.21.0",
 
   "$mintui_bool": true,
   "$mintui_base_name": "MintUI",
@@ -28,7 +28,7 @@
   "$mintui_pack_name": "Rainbow Pie UI",
   "$mintui_pack_description": "Minecraft UI Pack\n§ehttps://mintraspberry.cool/rainbowpieui",
   "$mintui_pack_uuid": "82d610e8-0968-4c0a-a47e-38e6663ee6ff",
-  "$mintui_pack_version": "2.5.10123",
+  "$mintui_pack_version": "2.5.10126",
 
   "$rainbowpie_ui_verify_enabled": false,
   "$rainbowpie_ui_verify_mode": "default", // blacklist|whitelist|[default]
@@ -56,6 +56,8 @@
   "$rainbowpie_ui_animation_chat_transition_time": 0.35,
 
   // Flags
+  "$rainbowpie_ui_flag_server_identifier": "",
+  "$rainbowpie_ui_flag_server_displayname": "",
   "$rainbowpie_ui_flag_bg_mask_ingame": true, // 在游戏内是否显示mask
   "$rainbowpie_ui_flag_bg_mask": true, // 在游戏外是否显示mask
   "$rainbowpie_ui_flag_overlay_screen": "toast_screen.toast_screen_content,debug_screen.content_panel,hud.hud_content,rainbowpie_ui_common.screen_background", // 覆盖界面
@@ -606,6 +608,7 @@
 
   // Compatibility for servers or other resource packs
   // The variables here will be overwritten when the server loads the resource package.
-  "$is_zeqa": false // Zeqa Network (Server)
+  "$is_zeqa": false, // Zeqa Network (Server)
+  "$cubecraft_green": "string" // CubeCraft
 }
 
diff --git a/ui/pdp_screen.json b/ui/pdp_screen.json
@@ -81,7 +81,7 @@
     "backup_font_type": "$rainbowpie_ui_theme_global_font_backup_name"
   },
 
-  "glyph_panel/item_glyph_count_panel/item_glyph_count_panel_label": {
+  "glyph_icon_with_count/item_glyph_count_panel_label": {
     "font_type": "$rainbowpie_ui_theme_global_font_name",
     "backup_font_type": "$rainbowpie_ui_theme_global_font_backup_name"
   },

diff --git a/ui/settings_sections/general_section.json b/ui/settings_sections/general_section.json
@@ -127,7 +127,7 @@
                     "anchor_to": "top_middle",
                     "$tooltip_panel_offset": [ 0, 6 ],
                     "$tooltip_popup_image": "textures/ui/WarningGlyph",
-                    "$tooltip_button_binding_type": "global",
+                    "$tooltip_button_binding_type": "none",
                     "$tooltip_button_collection_name": "",
                     "$tooltip_text_binding_name": "Now you can use your CPU to fry eggs! :D"
                   }

diff --git a/ui/ui_common.json b/ui/ui_common.json
@@ -17,13 +17,6 @@
     "alpha": "$rainbowpie_ui_theme_text_background_alpha"
   },
 
-  "base_screen/variables_button_mappings_and_controls/factory_panel/error_dialog_factory": {
-    "factory_variables": [
-      "$rainbowpie_ui_theme_global_font_name",
-      "$rainbowpie_ui_theme_global_font_backup_name"
-    ]
-  },
-
   "selected_item_details_factory": {
     "ignored": true
   },
@@ -1752,12 +1745,22 @@
           // Zeqa Network
           {
             "requires": "($is_zeqa)",
+            "$rainbowpie_ui_flag_server_identifier": "78239b75_zeqa",
+            "$rainbowpie_ui_flag_server_displayname": "Zeqa Network",
             "$rainbowpie_ui_flag_56cd0456": true, // PauseUI Back To Vanilla Button
             "$rainbowpie_ui_flag_scoreboard_default_font": true,
             "$rainbowpie_ui_moduleflag_inventory_actions_drop_all_item_enabled": false,
             "$rainbowpie_ui_module_chest_fastpick": false,
             "$rainbowpie_ui_flag_chatui_default_font": true,
             "$rainbowpie_ui_flag_hudtitle_default_font": true
+          },
+          // CubeCraft
+          // In CubeCraft's UI resource pack, $cubecraft_green will be overwritten as an array format, which will not be equal to "string"
+          {
+            "requires": "(not ($cubecraft_green = 'string'))",
+            "$rainbowpie_ui_flag_server_identifier": "d29f22ac_cubecraft",
+            "$rainbowpie_ui_flag_server_displayname": "CubeCraft Games",
+            "$rainbowpie_ui_flag_scoreboard_default_font": true
           }
         ]
       }