From 304db02da3fd58a95a5fbfd74bb4e9360bf177f1 Mon Sep 17 00:00:00 2001 From: Mintraspberry Cool Date: Wed, 22 May 2024 17:32:54 +0800 Subject: [PATCH 1/7] update for servers --- ui/_global_variables.json | 4 +++- ui/ui_common.json | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ui/_global_variables.json b/ui/_global_variables.json index 7cb5a45..728e679 100644 --- a/ui/_global_variables.json +++ b/ui/_global_variables.json @@ -56,6 +56,7 @@ "$rainbowpie_ui_animation_chat_transition_time": 0.35, // Flags + "$rainbowpie_ui_flag_server_identifier": "", "$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 +607,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/ui_common.json b/ui/ui_common.json index 2907cc8..a05f634 100644 --- a/ui/ui_common.json +++ b/ui/ui_common.json @@ -1752,12 +1752,19 @@ // Zeqa Network { "requires": "($is_zeqa)", + "$rainbowpie_ui_flag_server_identifier": "ZeqaNetwork", "$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": "CubeCraft" } ] } From c1f86c9584e79210a2c439aedc4cb7e8cc511fbb Mon Sep 17 00:00:00 2001 From: Mintraspberry Cool Date: Wed, 22 May 2024 18:45:48 +0800 Subject: [PATCH 2/7] update turn_front turn_back button size and offset --- .../ui_extras/smithing_table_2_screen_controls.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ui/RainbowPieUI/ui_extras/smithing_table_2_screen_controls.json b/ui/RainbowPieUI/ui_extras/smithing_table_2_screen_controls.json index 8e6361b..f191dce 100644 --- 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" ] } }, { From 98f5e7aeeffd1051c310da8dba30460d13d3988b Mon Sep 17 00:00:00 2001 From: Mintraspberry Cool Date: Wed, 22 May 2024 19:53:17 +0800 Subject: [PATCH 3/7] update server flag --- .../ui_extras/pause_screen_controls.json | 26 +++++++++++++------ ui/_global_variables.json | 1 + ui/ui_common.json | 9 ++++--- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/ui/RainbowPieUI/ui_extras/pause_screen_controls.json b/ui/RainbowPieUI/ui_extras/pause_screen_controls.json index f458952..f8c83db 100644 --- 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/_global_variables.json b/ui/_global_variables.json index 728e679..b6798f2 100644 --- a/ui/_global_variables.json +++ b/ui/_global_variables.json @@ -57,6 +57,7 @@ // 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", // 覆盖界面 diff --git a/ui/ui_common.json b/ui/ui_common.json index a05f634..ab33059 100644 --- a/ui/ui_common.json +++ b/ui/ui_common.json @@ -1752,7 +1752,8 @@ // Zeqa Network { "requires": "($is_zeqa)", - "$rainbowpie_ui_flag_server_identifier": "ZeqaNetwork", + "$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, @@ -1763,8 +1764,10 @@ // 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": "CubeCraft" + "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 } ] } From 66238bad1115c81155fdf5cc6953179ece54cc54 Mon Sep 17 00:00:00 2001 From: Mintraspberry Cool Date: Wed, 22 May 2024 22:58:33 +0800 Subject: [PATCH 4/7] update 10125 --- manifest.json | 4 ++-- ui/_global_variables.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manifest.json b/manifest.json index 5f576db..c91a613 100644 --- 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 ], + "version": [ 2, 5, 10125 ], "min_engine_version": [ 1, 20, 80 ] }, "modules": [ { "type": "resources", "uuid": "d983a931-3833-458c-93b4-58e6c1ed9255", - "version": [ 2, 5, 10123 ] + "version": [ 2, 5, 10125 ] } ], "settings": [ diff --git a/ui/_global_variables.json b/ui/_global_variables.json index b6798f2..63770e5 100644 --- a/ui/_global_variables.json +++ b/ui/_global_variables.json @@ -6,10 +6,10 @@ "$rainbowpieui_branch_display_name": "DEV", "$rainbowpieui_engine_version": "25", - "$rainbowpieui_patch_version": "10123", + "$rainbowpieui_patch_version": "10125", "$rainbowpieui_hotfix_version": "1", "$rainbowpieui_engine_version_name": "2.5", - "$rainbowpieui_full_version_name": "2.5.10123.master", + "$rainbowpieui_full_version_name": "2.5.10125.master", "$rainbowpieui_codename": "pancake", "$rainbowpieui_watermark": true, "$rainbowpieui_bool": true, @@ -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.10125", "$rainbowpie_ui_verify_enabled": false, "$rainbowpie_ui_verify_mode": "default", // blacklist|whitelist|[default] From b5cac259fc1dc14ec907d3859c123f978822016e Mon Sep 17 00:00:00 2001 From: Mintraspberry Cool Date: Fri, 14 Jun 2024 21:01:10 +0800 Subject: [PATCH 5/7] fix v1.21.0 errors --- ui/pdp_screen.json | 2 +- ui/ui_common.json | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/ui/pdp_screen.json b/ui/pdp_screen.json index 6c3647b..65b145d 100644 --- 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/ui_common.json b/ui/ui_common.json index ab33059..40e3aff 100644 --- 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 }, From df2072f3ee7c31a6cd547286df113cc3545b10f2 Mon Sep 17 00:00:00 2001 From: Mintraspberry Cool Date: Fri, 14 Jun 2024 21:27:05 +0800 Subject: [PATCH 6/7] fix ui error: Data bindings must have at least one property to bind! --- ui/RainbowPieUI/rainbowpie_ui_controls.json | 6 ++++-- ui/settings_sections/general_section.json | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ui/RainbowPieUI/rainbowpie_ui_controls.json b/ui/RainbowPieUI/rainbowpie_ui_controls.json index 96e3c6c..03cdaf0 100644 --- 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/settings_sections/general_section.json b/ui/settings_sections/general_section.json index 7c3281c..ab375f7 100644 --- 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" } From 07c0b0c71df70ec6cc4b3c7ec043733c40940ecf Mon Sep 17 00:00:00 2001 From: Mintraspberry Cool Date: Fri, 14 Jun 2024 21:30:57 +0800 Subject: [PATCH 7/7] update 10126 (mc v1.21.0) --- manifest.json | 6 +++--- ui/_global_variables.json | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifest.json b/manifest.json index c91a613..607aea9 100644 --- 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, 10125 ], - "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, 10125 ] + "version": [ 2, 5, 10126 ] } ], "settings": [ diff --git a/ui/_global_variables.json b/ui/_global_variables.json index 63770e5..9557a69 100644 --- a/ui/_global_variables.json +++ b/ui/_global_variables.json @@ -6,18 +6,18 @@ "$rainbowpieui_branch_display_name": "DEV", "$rainbowpieui_engine_version": "25", - "$rainbowpieui_patch_version": "10125", + "$rainbowpieui_patch_version": "10126", "$rainbowpieui_hotfix_version": "1", "$rainbowpieui_engine_version_name": "2.5", - "$rainbowpieui_full_version_name": "2.5.10125.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.10125", + "$mintui_pack_version": "2.5.10126", "$rainbowpie_ui_verify_enabled": false, "$rainbowpie_ui_verify_mode": "default", // blacklist|whitelist|[default]