From f7ec600f13a9f308bce56c6a002231a711c0ff8d Mon Sep 17 00:00:00 2001 From: Redeix <59435925+Redeix@users.noreply.github.com> Date: Sun, 29 Jun 2025 14:02:42 -0500 Subject: [PATCH] Modern markings integration (#1228) * - Lots of ui updates. And a couple fixes. * - New button textures. - Fixed campfire loot table. - Made anvil rod recipes easier. - Added assembler recipes for multiblock tank parts. * - Added assembler recipes for multiblock tank parts. * - Updated Changelog * - Some more UI tweaks. - Added modern-markings mod with integration. --------- Co-authored-by: Pyritie --- .../fancymenu/customization/gui_main_menu.txt | 652 +++++++++--------- .../new_loading_screen/properties.txt | 1 + .../tfg/textures/gui/curseforge_logo.png | Bin 666 -> 470 bytes .../textures/gui/curseforge_logo_hovered.png | Bin 707 -> 496 bytes .../assets/tfg/textures/gui/discord_logo.png | Bin 750 -> 536 bytes .../tfg/textures/gui/discord_logo_hovered.png | Bin 779 -> 553 bytes .../assets/tfg/textures/gui/github_logo.png | Bin 730 -> 507 bytes .../tfg/textures/gui/github_logo_hovered.png | Bin 727 -> 491 bytes .../assets/tfg/textures/gui/modrinth_logo.png | Bin 822 -> 538 bytes .../textures/gui/modrinth_logo_hovered.png | Bin 856 -> 580 bytes kubejs/server_scripts/main_server_script.js | 2 + .../server_scripts/modern_markings/recipes.js | 30 + kubejs/server_scripts/modern_markings/tags.js | 128 ++++ .../modern_markings/constants.js | 5 + pakku-lock.json | 36 + 15 files changed, 528 insertions(+), 326 deletions(-) create mode 100644 kubejs/server_scripts/modern_markings/recipes.js create mode 100644 kubejs/server_scripts/modern_markings/tags.js create mode 100644 kubejs/startup_scripts/modern_markings/constants.js diff --git a/config/fancymenu/customization/gui_main_menu.txt b/config/fancymenu/customization/gui_main_menu.txt index b50e2292b..775417978 100644 --- a/config/fancymenu/customization/gui_main_menu.txt +++ b/config/fancymenu/customization/gui_main_menu.txt @@ -3,13 +3,13 @@ type = fancymenu_layout layout-meta { identifier = title_screen render_custom_elements_behind_vanilla = false - last_edited_time = 1751008826207 + last_edited_time = 1751139900053 is_enabled = true randommode = false randomgroup = 1 randomonlyfirsttime = false layout_index = 0 - [loading_requirement_container_meta:faf4d8c0-8425-41f5-b4d1-f34dc0422311-1751008738382] = [groups:][instances:] + [loading_requirement_container_meta:972392c6-4578-4095-8eaa-d43d3f172baa-1751139875370] = [groups:][instances:] } menu_background { @@ -471,15 +471,15 @@ element { } vanilla_button { - button_element_executable_block_identifier = 3efcd3d7-b601-4f0c-b3db-8cc038e3ca78-1746358841072 - [executable_block:3efcd3d7-b601-4f0c-b3db-8cc038e3ca78-1746358841072][type:generic] = [executables:] + button_element_executable_block_identifier = bb6e02a6-d703-43b2-914a-608b1ee8f63f-1746358841072 + [executable_block:bb6e02a6-d703-43b2-914a-608b1ee8f63f-1746358841072][type:generic] = [executables:] restartbackgroundanimations = true nine_slice_custom_background = false nine_slice_border_x = 5 nine_slice_border_y = 5 navigatable = true - widget_active_state_requirement_container_identifier = b6f0af7c-c9a6-4d6e-942b-e9d7bd8f0d6d-1746358841072 - [loading_requirement_container_meta:b6f0af7c-c9a6-4d6e-942b-e9d7bd8f0d6d-1746358841072] = [groups:][instances:] + widget_active_state_requirement_container_identifier = 95e365d1-90bd-403a-a60d-6b7ed99eb9cd-1746358841072 + [loading_requirement_container_meta:95e365d1-90bd-403a-a60d-6b7ed99eb9cd-1746358841072] = [groups:][instances:] is_template = false template_apply_width = false template_apply_height = false @@ -493,7 +493,64 @@ vanilla_button { nine_slice_slider_handle_border_x = 5 nine_slice_slider_handle_border_y = 5 element_type = vanilla_button - instance_identifier = minecraft_logo_widget + instance_identifier = title_screen_copyright_button + appearance_delay = no_delay + appearance_delay_seconds = 1.0 + fade_in_v2 = no_fading + fade_in_speed = 1.0 + fade_out = no_fading + fade_out_speed = 1.0 + base_opacity = 1.0 + auto_sizing = false + auto_sizing_base_screen_width = 2168 + auto_sizing_base_screen_height = 968 + sticky_anchor = false + anchor_point = bottom-left + x = 5 + y = 4 + width = 196 + height = 10 + stretch_x = false + stretch_y = false + stay_on_screen = true + element_loading_requirement_container_identifier = 6da1aad5-7ef1-4dea-9ad0-ff5aed935abe-1746358841072 + [loading_requirement_container_meta:6da1aad5-7ef1-4dea-9ad0-ff5aed935abe-1746358841072] = [groups:][instances:] + enable_parallax = false + parallax_intensity = 0.5 + invert_parallax = false + animated_offset_x = 0 + animated_offset_y = 0 + load_once_per_session = false + in_editor_color = #FFC800FF + layer_hidden_in_editor = false + is_hidden = false + automated_button_clicks = 0 +} + +vanilla_button { + button_element_executable_block_identifier = 17fa0c0f-39d1-4b03-bc2f-0ccd0e0a6d25-1746358841072 + [executable_block:17fa0c0f-39d1-4b03-bc2f-0ccd0e0a6d25-1746358841072][type:generic] = [executables:] + restartbackgroundanimations = true + nine_slice_custom_background = false + nine_slice_border_x = 5 + nine_slice_border_y = 5 + navigatable = true + widget_active_state_requirement_container_identifier = 01242da9-e8ac-43c4-b553-a11988b0621e-1746358841072 + [loading_requirement_container_meta:01242da9-e8ac-43c4-b553-a11988b0621e-1746358841072] = [groups:][instances:] + is_template = false + template_apply_width = false + template_apply_height = false + template_apply_posx = false + template_apply_posy = false + template_apply_opacity = false + template_apply_visibility = false + template_apply_label = false + template_share_with = buttons + nine_slice_slider_handle = false + nine_slice_slider_handle_border_x = 5 + nine_slice_slider_handle_border_y = 5 + element_type = vanilla_button + instance_identifier = minecraft_branding_widget appearance_delay = no_delay appearance_delay_seconds = 1.0 fade_in_v2 = no_fading @@ -506,187 +563,15 @@ vanilla_button { auto_sizing_base_screen_height = 0 sticky_anchor = false anchor_point = vanilla - x = 288 - y = 30 - width = 256 - height = 51 + x = 2 + y = 423 + width = 128 + height = 49 stretch_x = false stretch_y = false stay_on_screen = false - element_loading_requirement_container_identifier = 7cf9d856-d8bb-4aed-aa82-6ce7c5f4eb91-1746358841072 - [loading_requirement_container_meta:7cf9d856-d8bb-4aed-aa82-6ce7c5f4eb91-1746358841072] = [groups:][instances:] - enable_parallax = false - parallax_intensity = 0.5 - invert_parallax = false - animated_offset_x = 0 - animated_offset_y = 0 - load_once_per_session = false - in_editor_color = #FFC800FF - layer_hidden_in_editor = false - is_hidden = true - automated_button_clicks = 0 -} - -vanilla_button { - button_element_executable_block_identifier = 8e3abb1a-7f06-42bd-920a-eeabb0f225ec-1710837053345 - [executable_block:8e3abb1a-7f06-42bd-920a-eeabb0f225ec-1710837053345][type:generic] = [executables:] - restartbackgroundanimations = true - nine_slice_custom_background = false - nine_slice_border_x = 5 - nine_slice_border_y = 5 - navigatable = true - widget_active_state_requirement_container_identifier = 1c9f2f8a-49b4-4ed4-9744-049cd1b3c415-1738509235087 - [loading_requirement_container_meta:1c9f2f8a-49b4-4ed4-9744-049cd1b3c415-1738509235087] = [groups:][instances:] - is_template = false - template_apply_width = false - template_apply_height = false - template_apply_posx = false - template_apply_posy = false - template_apply_opacity = false - template_apply_visibility = false - template_apply_label = false - template_share_with = buttons - nine_slice_slider_handle = false - nine_slice_slider_handle_border_x = 5 - nine_slice_slider_handle_border_y = 5 - element_type = vanilla_button - instance_identifier = mc_titlescreen_accessibility_button - appearance_delay = no_delay - appearance_delay_seconds = 1.0 - fade_in_v2 = no_fading - fade_in_speed = 1.0 - fade_out = no_fading - fade_out_speed = 1.0 - base_opacity = 1.0 - auto_sizing = false - auto_sizing_base_screen_width = 0 - auto_sizing_base_screen_height = 0 - sticky_anchor = false - anchor_point = vanilla - x = 520 - y = 250 - width = 20 - height = 20 - stretch_x = false - stretch_y = false - stay_on_screen = false - element_loading_requirement_container_identifier = f97a69d2-7673-4f9e-97eb-d37eb76122f3-1710837053345 - [loading_requirement_container_meta:f97a69d2-7673-4f9e-97eb-d37eb76122f3-1710837053345] = [groups:][instances:] - enable_parallax = false - parallax_intensity = 0.5 - invert_parallax = false - animated_offset_x = 0 - animated_offset_y = 0 - load_once_per_session = false - in_editor_color = #FFC800FF - layer_hidden_in_editor = false - is_hidden = true - automated_button_clicks = 0 -} - -vanilla_button { - button_element_executable_block_identifier = 0fe14f8d-aeb6-4498-9a88-d36a7b7674e8-1746358841072 - [executable_block:0fe14f8d-aeb6-4498-9a88-d36a7b7674e8-1746358841072][type:generic] = [executables:] - restartbackgroundanimations = true - nine_slice_custom_background = false - nine_slice_border_x = 5 - nine_slice_border_y = 5 - navigatable = true - widget_active_state_requirement_container_identifier = b83b7017-ce81-4d3b-8243-7ababe152084-1746358841072 - [loading_requirement_container_meta:b83b7017-ce81-4d3b-8243-7ababe152084-1746358841072] = [groups:][instances:] - is_template = false - template_apply_width = false - template_apply_height = false - template_apply_posx = false - template_apply_posy = false - template_apply_opacity = false - template_apply_visibility = false - template_apply_label = false - template_share_with = buttons - nine_slice_slider_handle = false - nine_slice_slider_handle_border_x = 5 - nine_slice_slider_handle_border_y = 5 - element_type = vanilla_button - instance_identifier = minecraft_splash_widget - appearance_delay = no_delay - appearance_delay_seconds = 1.0 - fade_in_v2 = no_fading - fade_in_speed = 1.0 - fade_out = no_fading - fade_out_speed = 1.0 - base_opacity = 1.0 - auto_sizing = false - auto_sizing_base_screen_width = 0 - auto_sizing_base_screen_height = 0 - sticky_anchor = false - anchor_point = vanilla - x = 489 - y = 49 - width = 100 - height = 40 - stretch_x = false - stretch_y = false - stay_on_screen = false - element_loading_requirement_container_identifier = 223456f0-8f0e-4317-9ea2-874fe14236c9-1746358841072 - [loading_requirement_container_meta:223456f0-8f0e-4317-9ea2-874fe14236c9-1746358841072] = [groups:][instances:] - enable_parallax = false - parallax_intensity = 0.5 - invert_parallax = false - animated_offset_x = 0 - animated_offset_y = 0 - load_once_per_session = false - in_editor_color = #FFC800FF - layer_hidden_in_editor = false - is_hidden = true - automated_button_clicks = 0 -} - -vanilla_button { - button_element_executable_block_identifier = d29af260-9081-410f-86cc-eca92eb2161b-1710837053345 - [executable_block:d29af260-9081-410f-86cc-eca92eb2161b-1710837053345][type:generic] = [executables:] - backgroundnormal = [source:local]kubejs/assets/tfg/textures/gui/modrinth_logo.png - restartbackgroundanimations = true - nine_slice_custom_background = false - nine_slice_border_x = 5 - nine_slice_border_y = 5 - navigatable = true - widget_active_state_requirement_container_identifier = a23ac421-e3aa-452e-bcd0-a7b01a605883-1738509235087 - [loading_requirement_container_meta:a23ac421-e3aa-452e-bcd0-a7b01a605883-1738509235087] = [groups:][instances:] - is_template = false - template_apply_width = false - template_apply_height = false - template_apply_posx = false - template_apply_posy = false - template_apply_opacity = false - template_apply_visibility = false - template_apply_label = false - template_share_with = buttons - nine_slice_slider_handle = false - nine_slice_slider_handle_border_x = 5 - nine_slice_slider_handle_border_y = 5 - element_type = vanilla_button - instance_identifier = 376322 - appearance_delay = no_delay - appearance_delay_seconds = 1.0 - fade_in_v2 = no_fading - fade_in_speed = 1.0 - fade_out = no_fading - fade_out_speed = 1.0 - base_opacity = 1.0 - auto_sizing = false - auto_sizing_base_screen_width = 0 - auto_sizing_base_screen_height = 0 - sticky_anchor = false - anchor_point = mid-centered - x = 72 - y = 18 - width = 20 - height = 20 - stretch_x = false - stretch_y = false - stay_on_screen = false - element_loading_requirement_container_identifier = 59eca2f8-b704-4a42-b2d3-101e17f6e61e-1710837053345 - [loading_requirement_container_meta:59eca2f8-b704-4a42-b2d3-101e17f6e61e-1710837053345] = [groups:][instances:] + element_loading_requirement_container_identifier = a04d6611-e8bf-4d12-8483-05bfa180ee5b-1746358841072 + [loading_requirement_container_meta:a04d6611-e8bf-4d12-8483-05bfa180ee5b-1746358841072] = [groups:][instances:] enable_parallax = false parallax_intensity = 0.5 invert_parallax = false @@ -758,6 +643,63 @@ vanilla_button { automated_button_clicks = 0 } +vanilla_button { + button_element_executable_block_identifier = 8e3abb1a-7f06-42bd-920a-eeabb0f225ec-1710837053345 + [executable_block:8e3abb1a-7f06-42bd-920a-eeabb0f225ec-1710837053345][type:generic] = [executables:] + restartbackgroundanimations = true + nine_slice_custom_background = false + nine_slice_border_x = 5 + nine_slice_border_y = 5 + navigatable = true + widget_active_state_requirement_container_identifier = 1c9f2f8a-49b4-4ed4-9744-049cd1b3c415-1738509235087 + [loading_requirement_container_meta:1c9f2f8a-49b4-4ed4-9744-049cd1b3c415-1738509235087] = [groups:][instances:] + is_template = false + template_apply_width = false + template_apply_height = false + template_apply_posx = false + template_apply_posy = false + template_apply_opacity = false + template_apply_visibility = false + template_apply_label = false + template_share_with = buttons + nine_slice_slider_handle = false + nine_slice_slider_handle_border_x = 5 + nine_slice_slider_handle_border_y = 5 + element_type = vanilla_button + instance_identifier = mc_titlescreen_accessibility_button + appearance_delay = no_delay + appearance_delay_seconds = 1.0 + fade_in_v2 = no_fading + fade_in_speed = 1.0 + fade_out = no_fading + fade_out_speed = 1.0 + base_opacity = 1.0 + auto_sizing = false + auto_sizing_base_screen_width = 0 + auto_sizing_base_screen_height = 0 + sticky_anchor = false + anchor_point = vanilla + x = 520 + y = 250 + width = 20 + height = 20 + stretch_x = false + stretch_y = false + stay_on_screen = false + element_loading_requirement_container_identifier = f97a69d2-7673-4f9e-97eb-d37eb76122f3-1710837053345 + [loading_requirement_container_meta:f97a69d2-7673-4f9e-97eb-d37eb76122f3-1710837053345] = [groups:][instances:] + enable_parallax = false + parallax_intensity = 0.5 + invert_parallax = false + animated_offset_x = 0 + animated_offset_y = 0 + load_once_per_session = false + in_editor_color = #FFC800FF + layer_hidden_in_editor = false + is_hidden = true + automated_button_clicks = 0 +} + vanilla_button { button_element_executable_block_identifier = 4fd9e559-3c06-41dc-ae8f-7a2ebaf224c9-1710837053345 [executable_block:4fd9e559-3c06-41dc-ae8f-7a2ebaf224c9-1710837053345][type:generic] = [executables:] @@ -817,6 +759,177 @@ vanilla_button { automated_button_clicks = 0 } +vanilla_button { + button_element_executable_block_identifier = 785145e3-49a4-45fa-86a5-76543bb7c226-1710837053345 + [executable_block:785145e3-49a4-45fa-86a5-76543bb7c226-1710837053345][type:generic] = [executables:] + restartbackgroundanimations = true + nine_slice_custom_background = false + nine_slice_border_x = 5 + nine_slice_border_y = 5 + navigatable = true + widget_active_state_requirement_container_identifier = 98ecc456-cc76-47f1-9039-833f736d0a5e-1738509235087 + [loading_requirement_container_meta:98ecc456-cc76-47f1-9039-833f736d0a5e-1738509235087] = [groups:][instances:] + is_template = false + template_apply_width = false + template_apply_height = false + template_apply_posx = false + template_apply_posy = false + template_apply_opacity = false + template_apply_visibility = false + template_apply_label = false + template_share_with = buttons + nine_slice_slider_handle = false + nine_slice_slider_handle_border_x = 5 + nine_slice_slider_handle_border_y = 5 + element_type = vanilla_button + instance_identifier = mc_titlescreen_realms_button + appearance_delay = no_delay + appearance_delay_seconds = 1.0 + fade_in_v2 = no_fading + fade_in_speed = 1.0 + fade_out = no_fading + fade_out_speed = 1.0 + base_opacity = 1.0 + auto_sizing = false + auto_sizing_base_screen_width = 0 + auto_sizing_base_screen_height = 0 + sticky_anchor = false + anchor_point = mid-centered + x = 47 + y = -5 + width = 98 + height = 20 + stretch_x = false + stretch_y = false + stay_on_screen = false + element_loading_requirement_container_identifier = 7c454c53-713f-4c87-97e8-288da3eba763-1710837053345 + [loading_requirement_container_meta:7c454c53-713f-4c87-97e8-288da3eba763-1710837053345] = [groups:][instances:] + enable_parallax = false + parallax_intensity = 0.5 + invert_parallax = false + animated_offset_x = 0 + animated_offset_y = 0 + load_once_per_session = false + in_editor_color = #FFC800FF + layer_hidden_in_editor = false + is_hidden = true + automated_button_clicks = 0 +} + +vanilla_button { + button_element_executable_block_identifier = 3efcd3d7-b601-4f0c-b3db-8cc038e3ca78-1746358841072 + [executable_block:3efcd3d7-b601-4f0c-b3db-8cc038e3ca78-1746358841072][type:generic] = [executables:] + restartbackgroundanimations = true + nine_slice_custom_background = false + nine_slice_border_x = 5 + nine_slice_border_y = 5 + navigatable = true + widget_active_state_requirement_container_identifier = b6f0af7c-c9a6-4d6e-942b-e9d7bd8f0d6d-1746358841072 + [loading_requirement_container_meta:b6f0af7c-c9a6-4d6e-942b-e9d7bd8f0d6d-1746358841072] = [groups:][instances:] + is_template = false + template_apply_width = false + template_apply_height = false + template_apply_posx = false + template_apply_posy = false + template_apply_opacity = false + template_apply_visibility = false + template_apply_label = false + template_share_with = buttons + nine_slice_slider_handle = false + nine_slice_slider_handle_border_x = 5 + nine_slice_slider_handle_border_y = 5 + element_type = vanilla_button + instance_identifier = minecraft_logo_widget + appearance_delay = no_delay + appearance_delay_seconds = 1.0 + fade_in_v2 = no_fading + fade_in_speed = 1.0 + fade_out = no_fading + fade_out_speed = 1.0 + base_opacity = 1.0 + auto_sizing = false + auto_sizing_base_screen_width = 0 + auto_sizing_base_screen_height = 0 + sticky_anchor = false + anchor_point = vanilla + x = 288 + y = 30 + width = 256 + height = 51 + stretch_x = false + stretch_y = false + stay_on_screen = false + element_loading_requirement_container_identifier = 7cf9d856-d8bb-4aed-aa82-6ce7c5f4eb91-1746358841072 + [loading_requirement_container_meta:7cf9d856-d8bb-4aed-aa82-6ce7c5f4eb91-1746358841072] = [groups:][instances:] + enable_parallax = false + parallax_intensity = 0.5 + invert_parallax = false + animated_offset_x = 0 + animated_offset_y = 0 + load_once_per_session = false + in_editor_color = #FFC800FF + layer_hidden_in_editor = false + is_hidden = true + automated_button_clicks = 0 +} + +vanilla_button { + button_element_executable_block_identifier = 0fe14f8d-aeb6-4498-9a88-d36a7b7674e8-1746358841072 + [executable_block:0fe14f8d-aeb6-4498-9a88-d36a7b7674e8-1746358841072][type:generic] = [executables:] + restartbackgroundanimations = true + nine_slice_custom_background = false + nine_slice_border_x = 5 + nine_slice_border_y = 5 + navigatable = true + widget_active_state_requirement_container_identifier = b83b7017-ce81-4d3b-8243-7ababe152084-1746358841072 + [loading_requirement_container_meta:b83b7017-ce81-4d3b-8243-7ababe152084-1746358841072] = [groups:][instances:] + is_template = false + template_apply_width = false + template_apply_height = false + template_apply_posx = false + template_apply_posy = false + template_apply_opacity = false + template_apply_visibility = false + template_apply_label = false + template_share_with = buttons + nine_slice_slider_handle = false + nine_slice_slider_handle_border_x = 5 + nine_slice_slider_handle_border_y = 5 + element_type = vanilla_button + instance_identifier = minecraft_splash_widget + appearance_delay = no_delay + appearance_delay_seconds = 1.0 + fade_in_v2 = no_fading + fade_in_speed = 1.0 + fade_out = no_fading + fade_out_speed = 1.0 + base_opacity = 1.0 + auto_sizing = false + auto_sizing_base_screen_width = 0 + auto_sizing_base_screen_height = 0 + sticky_anchor = false + anchor_point = vanilla + x = 489 + y = 49 + width = 100 + height = 40 + stretch_x = false + stretch_y = false + stay_on_screen = false + element_loading_requirement_container_identifier = 223456f0-8f0e-4317-9ea2-874fe14236c9-1746358841072 + [loading_requirement_container_meta:223456f0-8f0e-4317-9ea2-874fe14236c9-1746358841072] = [groups:][instances:] + enable_parallax = false + parallax_intensity = 0.5 + invert_parallax = false + animated_offset_x = 0 + animated_offset_y = 0 + load_once_per_session = false + in_editor_color = #FFC800FF + layer_hidden_in_editor = false + is_hidden = true + automated_button_clicks = 0 +} + vanilla_button { button_element_executable_block_identifier = 829507fa-6c1f-46c8-94ea-4c4d8275a324-1710837053345 [executable_block:829507fa-6c1f-46c8-94ea-4c4d8275a324-1710837053345][type:generic] = [executables:] @@ -934,15 +1047,17 @@ vanilla_button { } vanilla_button { - button_element_executable_block_identifier = 785145e3-49a4-45fa-86a5-76543bb7c226-1710837053345 - [executable_block:785145e3-49a4-45fa-86a5-76543bb7c226-1710837053345][type:generic] = [executables:] + button_element_executable_block_identifier = c68f6eba-8ff3-42ea-b8a3-55a296372b3a-1710837053345 + [executable_block:c68f6eba-8ff3-42ea-b8a3-55a296372b3a-1710837053345][type:generic] = [executables:] + backgroundnormal = [source:local]kubejs/assets/tfg/textures/gui/button_98x20.png + backgroundhovered = [source:location]tfg:textures/gui/button_hover_98x20.gif restartbackgroundanimations = true nine_slice_custom_background = false nine_slice_border_x = 5 nine_slice_border_y = 5 navigatable = true - widget_active_state_requirement_container_identifier = 98ecc456-cc76-47f1-9039-833f736d0a5e-1738509235087 - [loading_requirement_container_meta:98ecc456-cc76-47f1-9039-833f736d0a5e-1738509235087] = [groups:][instances:] + widget_active_state_requirement_container_identifier = 6e4a2784-5288-4825-8c7e-69972c4d322e-1738509235087 + [loading_requirement_container_meta:6e4a2784-5288-4825-8c7e-69972c4d322e-1738509235087] = [groups:][instances:] is_template = false template_apply_width = false template_apply_height = false @@ -956,7 +1071,7 @@ vanilla_button { nine_slice_slider_handle_border_x = 5 nine_slice_slider_handle_border_y = 5 element_type = vanilla_button - instance_identifier = mc_titlescreen_realms_button + instance_identifier = mc_titlescreen_quit_button appearance_delay = no_delay appearance_delay_seconds = 1.0 fade_in_v2 = no_fading @@ -965,19 +1080,19 @@ vanilla_button { fade_out_speed = 1.0 base_opacity = 1.0 auto_sizing = false - auto_sizing_base_screen_width = 0 - auto_sizing_base_screen_height = 0 + auto_sizing_base_screen_width = 2496 + auto_sizing_base_screen_height = 1419 sticky_anchor = false anchor_point = mid-centered - x = 47 - y = -5 + x = -100 + y = 37 width = 98 height = 20 stretch_x = false stretch_y = false stay_on_screen = false - element_loading_requirement_container_identifier = 7c454c53-713f-4c87-97e8-288da3eba763-1710837053345 - [loading_requirement_container_meta:7c454c53-713f-4c87-97e8-288da3eba763-1710837053345] = [groups:][instances:] + element_loading_requirement_container_identifier = a9f8d43c-d00b-4db2-ada7-81fa3a121de1-1710837053345 + [loading_requirement_container_meta:a9f8d43c-d00b-4db2-ada7-81fa3a121de1-1710837053345] = [groups:][instances:] enable_parallax = false parallax_intensity = 0.5 invert_parallax = false @@ -986,64 +1101,7 @@ vanilla_button { load_once_per_session = false in_editor_color = #FFC800FF layer_hidden_in_editor = false - is_hidden = true - automated_button_clicks = 0 -} - -vanilla_button { - button_element_executable_block_identifier = 17fa0c0f-39d1-4b03-bc2f-0ccd0e0a6d25-1746358841072 - [executable_block:17fa0c0f-39d1-4b03-bc2f-0ccd0e0a6d25-1746358841072][type:generic] = [executables:] - restartbackgroundanimations = true - nine_slice_custom_background = false - nine_slice_border_x = 5 - nine_slice_border_y = 5 - navigatable = true - widget_active_state_requirement_container_identifier = 01242da9-e8ac-43c4-b553-a11988b0621e-1746358841072 - [loading_requirement_container_meta:01242da9-e8ac-43c4-b553-a11988b0621e-1746358841072] = [groups:][instances:] - is_template = false - template_apply_width = false - template_apply_height = false - template_apply_posx = false - template_apply_posy = false - template_apply_opacity = false - template_apply_visibility = false - template_apply_label = false - template_share_with = buttons - nine_slice_slider_handle = false - nine_slice_slider_handle_border_x = 5 - nine_slice_slider_handle_border_y = 5 - element_type = vanilla_button - instance_identifier = minecraft_branding_widget - appearance_delay = no_delay - appearance_delay_seconds = 1.0 - fade_in_v2 = no_fading - fade_in_speed = 1.0 - fade_out = no_fading - fade_out_speed = 1.0 - base_opacity = 1.0 - auto_sizing = false - auto_sizing_base_screen_width = 0 - auto_sizing_base_screen_height = 0 - sticky_anchor = false - anchor_point = vanilla - x = 2 - y = 423 - width = 128 - height = 49 - stretch_x = false - stretch_y = false - stay_on_screen = false - element_loading_requirement_container_identifier = a04d6611-e8bf-4d12-8483-05bfa180ee5b-1746358841072 - [loading_requirement_container_meta:a04d6611-e8bf-4d12-8483-05bfa180ee5b-1746358841072] = [groups:][instances:] - enable_parallax = false - parallax_intensity = 0.5 - invert_parallax = false - animated_offset_x = 0 - animated_offset_y = 0 - load_once_per_session = false - in_editor_color = #FFC800FF - layer_hidden_in_editor = false - is_hidden = true + is_hidden = false automated_button_clicks = 0 } @@ -1107,17 +1165,16 @@ vanilla_button { } vanilla_button { - button_element_executable_block_identifier = c68f6eba-8ff3-42ea-b8a3-55a296372b3a-1710837053345 - [executable_block:c68f6eba-8ff3-42ea-b8a3-55a296372b3a-1710837053345][type:generic] = [executables:] - backgroundnormal = [source:local]kubejs/assets/tfg/textures/gui/button_98x20.png - backgroundhovered = [source:location]tfg:textures/gui/button_hover_98x20.gif + button_element_executable_block_identifier = d29af260-9081-410f-86cc-eca92eb2161b-1710837053345 + [executable_block:d29af260-9081-410f-86cc-eca92eb2161b-1710837053345][type:generic] = [executables:] + backgroundnormal = [source:local]kubejs/assets/tfg/textures/gui/modrinth_logo.png restartbackgroundanimations = true nine_slice_custom_background = false nine_slice_border_x = 5 nine_slice_border_y = 5 navigatable = true - widget_active_state_requirement_container_identifier = 6e4a2784-5288-4825-8c7e-69972c4d322e-1738509235087 - [loading_requirement_container_meta:6e4a2784-5288-4825-8c7e-69972c4d322e-1738509235087] = [groups:][instances:] + widget_active_state_requirement_container_identifier = a23ac421-e3aa-452e-bcd0-a7b01a605883-1738509235087 + [loading_requirement_container_meta:a23ac421-e3aa-452e-bcd0-a7b01a605883-1738509235087] = [groups:][instances:] is_template = false template_apply_width = false template_apply_height = false @@ -1131,7 +1188,7 @@ vanilla_button { nine_slice_slider_handle_border_x = 5 nine_slice_slider_handle_border_y = 5 element_type = vanilla_button - instance_identifier = mc_titlescreen_quit_button + instance_identifier = 376322 appearance_delay = no_delay appearance_delay_seconds = 1.0 fade_in_v2 = no_fading @@ -1140,19 +1197,19 @@ vanilla_button { fade_out_speed = 1.0 base_opacity = 1.0 auto_sizing = false - auto_sizing_base_screen_width = 2496 - auto_sizing_base_screen_height = 1419 + auto_sizing_base_screen_width = 0 + auto_sizing_base_screen_height = 0 sticky_anchor = false anchor_point = mid-centered - x = -100 - y = 37 - width = 98 + x = 72 + y = 18 + width = 20 height = 20 stretch_x = false stretch_y = false stay_on_screen = false - element_loading_requirement_container_identifier = a9f8d43c-d00b-4db2-ada7-81fa3a121de1-1710837053345 - [loading_requirement_container_meta:a9f8d43c-d00b-4db2-ada7-81fa3a121de1-1710837053345] = [groups:][instances:] + element_loading_requirement_container_identifier = 59eca2f8-b704-4a42-b2d3-101e17f6e61e-1710837053345 + [loading_requirement_container_meta:59eca2f8-b704-4a42-b2d3-101e17f6e61e-1710837053345] = [groups:][instances:] enable_parallax = false parallax_intensity = 0.5 invert_parallax = false @@ -1161,64 +1218,7 @@ vanilla_button { load_once_per_session = false in_editor_color = #FFC800FF layer_hidden_in_editor = false - is_hidden = false - automated_button_clicks = 0 -} - -vanilla_button { - button_element_executable_block_identifier = bb6e02a6-d703-43b2-914a-608b1ee8f63f-1746358841072 - [executable_block:bb6e02a6-d703-43b2-914a-608b1ee8f63f-1746358841072][type:generic] = [executables:] - restartbackgroundanimations = true - nine_slice_custom_background = false - nine_slice_border_x = 5 - nine_slice_border_y = 5 - navigatable = true - widget_active_state_requirement_container_identifier = 95e365d1-90bd-403a-a60d-6b7ed99eb9cd-1746358841072 - [loading_requirement_container_meta:95e365d1-90bd-403a-a60d-6b7ed99eb9cd-1746358841072] = [groups:][instances:] - is_template = false - template_apply_width = false - template_apply_height = false - template_apply_posx = false - template_apply_posy = false - template_apply_opacity = false - template_apply_visibility = false - template_apply_label = false - template_share_with = buttons - nine_slice_slider_handle = false - nine_slice_slider_handle_border_x = 5 - nine_slice_slider_handle_border_y = 5 - element_type = vanilla_button - instance_identifier = title_screen_copyright_button - appearance_delay = no_delay - appearance_delay_seconds = 1.0 - fade_in_v2 = no_fading - fade_in_speed = 1.0 - fade_out = no_fading - fade_out_speed = 1.0 - base_opacity = 1.0 - auto_sizing = false - auto_sizing_base_screen_width = 2168 - auto_sizing_base_screen_height = 968 - sticky_anchor = false - anchor_point = bottom-left - x = 5 - y = 4 - width = 196 - height = 10 - stretch_x = false - stretch_y = false - stay_on_screen = true - element_loading_requirement_container_identifier = 6da1aad5-7ef1-4dea-9ad0-ff5aed935abe-1746358841072 - [loading_requirement_container_meta:6da1aad5-7ef1-4dea-9ad0-ff5aed935abe-1746358841072] = [groups:][instances:] - enable_parallax = false - parallax_intensity = 0.5 - invert_parallax = false - animated_offset_x = 0 - animated_offset_y = 0 - load_once_per_session = false - in_editor_color = #FFC800FF - layer_hidden_in_editor = false - is_hidden = false + is_hidden = true automated_button_clicks = 0 } diff --git a/config/fancymenu/slideshows/new_loading_screen/properties.txt b/config/fancymenu/slideshows/new_loading_screen/properties.txt index 625dcbba4..06b79d18c 100644 --- a/config/fancymenu/slideshows/new_loading_screen/properties.txt +++ b/config/fancymenu/slideshows/new_loading_screen/properties.txt @@ -8,4 +8,5 @@ slideshow-meta { y = 0 duration = 5.0 fadespeed = 12.0 + randomize = true } \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/gui/curseforge_logo.png b/kubejs/assets/tfg/textures/gui/curseforge_logo.png index 86829dad259664b08eb24dd079811beee5854951..5dbf64d3d4d78584172e6b534027a5849de1cd82 100644 GIT binary patch delta 459 zcmV;+0W|)a1=a&0iBL{Q4GJ0x0000DNk~Le0000K0000K2nGNE0F8+q4Ur)ie*uU| zL_t(IjjfY0Yr;SnhMyFNg3Imx2we)XnOqCDlYgL7DU_luQcAXFa*=MG>TVaQKOj?7 z5Fz;oB6RC;OXurg?zk8e3-yJAyZbIrzW4j?oY8m!pg4}4iUo82OIvNe)yc77S`~oR z!`(s4Uq3%)e);xZm_S8O?z`P=f27@p=`{C2KL~hv>dk@XZtUXr8Eu)@;Shjj7(%KnHYiPj~z}4g9 zfukir`_-6vK@)am-twPLA(v>i`BpkZM=y>b=NAltu%dzf3U&Yh002ovPDHLkV1niL B(j@=@ delta 656 zcmV;B0&o4+1DXXPiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPKe*#QN zL_t(oh0T|-Yui8+#=k2G6tvusO%VJaNDvH)GTCDxT|(#Vg%F%ThT_pvhKOvP8oH(w z0)dXz6gyxH(wNODcUI`oU{R+{rQ^$Ymx!3Rw9?Re?A$QogOv51&bunzW@03n{hVD)%6VrliBG}dOR5D zSMKivx3{$$o{dI`DZK}HXu+@1B2ff2bN*Bnd8q z;Q7b>e*WycZY{hD41gaG{DVUPB^l5amu*=XM-h09l)-gS5u9lk*%2uQVoC{siQ<4U z4?rP1zUyk?aU21~61=K`TpZ2|lV>7se*gzw*orw^er}>yn+0+$yqN(fJAX0aaTMh>@P0n`n(Wu8 z1{}uH^Wm`YZW@M4`hVQrrP+0UJp&vrcRQVI%K{iPGGSzZ!+8@b8^e4C_^!LG2?Gy)A%7y~GspyFEA8gLj(ZOba{aJ(pW$J4iM{GQLfW~WZ4bbq4^Nbo!w zu_#5j=1P`k!N`CNcZ60f4yRSrz;pk9Qv>pNR>t*mO0KNJpVAlYWGMbc#I+XR q1q4u?wIH&yz4iYxu(Q1d0Qd*Vh#nVF3HTQP0000I1N{kN9if0s)$Z(N>>taCa;E*g#WPPGby!P*0@AmHrbaST*U z@Zk{v7ueFV+nXBzreO%xD$}bgreXNCPU6!rr0e^Xq;yMCDtl;-7B>(Di+@zgsM_{r0wYWix@+ zr%@?M>2`fT^-)_I+l$N^J6bRWaMEmkb2JBN-x@Q|Xu_(*u+vuj)6Z3BDEhs=qSyZu bFp>BKY8<$Z#bWcY00000NkvXXu0mjfkR0M( delta 698 zcmV;r0!97s1H%O&iBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPKe*$$$ zL_t(og~gXYYui8=#vc{C6x89?pv4~`AT0*PNe653l(9p|hcM2N$q)jbJVba17(&Mo zXvaXoi!~&%6TC=c@Z!Z}y+y=R)WJGMI-UNdmh()9bkgs+_uhM7PMXi>0Dza9YY$u0 z&e5?10AIEV6{#XvxwLb1Tsrvdf8d7)02R^8mz(QSprVC^4M?R>GxYg6zy`mseic3i zOV<@X?>{}|j%Hw>JswK~!|>Xjj(FzbA#i(}`NPv*53N>f3Scj7p3WNpfWOtM1k?1| zoepM}6+EwBTwr!`68lNL*#v;d+=kzyIMCPi#BLfp3e2p7gCqg>pcp)a!SlaK74! zq{uQrX)Y7F3@|t=LP>3y^?-(^t#cxWiQEwwm}XjqgX&kxu%0Oee+Wr!&6x&NN1>n^z&1EbL>X&%3Sxtk3yb|Yd6N^x1Yp)6J4--w2nLl2k3ZL+2F`@7G( g8J*wX0Ra917;q^)5O2U4o&W#<07*qoM6N<$f=(+sUH||9 diff --git a/kubejs/assets/tfg/textures/gui/discord_logo.png b/kubejs/assets/tfg/textures/gui/discord_logo.png index 09491fdee4743daaa185de02c73eeb8c9c486e3b..49e63a2250c8b0f950f906ddf9f8f49f6a0d9e35 100644 GIT binary patch delta 525 zcmV+o0`mRt1(*aOiBL{Q4GJ0x0000DNk~Le0000K0000K2nGNE0F8+q4Ur)ie*wx# zL_t(Ijjfb1NE=ZY$A2#b!A>0tMMIVwVumbcx~oHL#ic_WTnh??fOgANx^{OJx`?Zj zxxq!6q!mdPbty$dbU1lPf|H}rz7Fr+<=$Nm2lK(f-S__Yd*A>2-ksPxI0R5kCqzC5 z6VIic1@|g9EtrX1*1~X9Rl`v=f7ObtyotQI`Szs&K)umX04r|`0Q~rA_cxjUzVj|} z_hI|%7-(RhH;cTO)z9aD{zZUfjPo58hvt()|JUEt%cY{$_ir?TMD32yc=r8Ayh`eGMF3KaiV!MPY6x zyvl&@%0OC^2&+&skbL~KGI2MnLV5QX^+fm09>{n=W$T?3aLF5p(=Mu1aZ*Ex9|^$9 zmnseb?V}T}F1C6vUl-hbV@xQ(SEY)B7W!_hSre^h4ZHPMD*@8D1|rJpP4p$PLZg%JM%a3;iS_X=9g P00000NkvXXu0mjf4i@c5 delta 741 zcmV8ZLkea{Qpl2aNfa?j>Czz?Tm_{9lf`xkLPMINA(oa*E`>sK4tL+>_x-zTQO~^bcklbX_r3f6+!>o&JFsEG zUl;%o@L5#CEyy!B{1E zTr2IHOOL`_ZSS-DcBOpAt(LQrk(C#(Wdox4%V!Zx1%ZPfBP8wxFck!Vux^OfO!v5M zHfjZB8p<`mW^M`oIo4O_kuTPj$w>*&*gx!EIrUEeN~9tdG3;mVhiEKfe_(xe9)O&L zb{BXxWt{8s2%1_0Yo&cN5}mzP)0?8xH<4RTAYZJfY29-h4o)ut0Hcc`03Z^bb>)sO zh6n^hPAxohTSawJa6O2qc(t5uRm<5{zxUIrtHi72Y>SztJ#^3-5XJ3srdrM#opz6F zOvM3f-*?(QS7FJ(+4+L0e~Ooivs$B8-~>dIDh`9V4!8td;>w7H!O6grr{XY;Z` z0~DIY^H)HPIR?7Nzmz7#Z36)DRKyE7e5a|Y}NwvZ(d zOGa%o*1KglS)*0}giD1W6Hir4Do%x2?f&DZd;+w=SU{R-6XU%uoedOBR1_xTOq~IR zk(=S@a6@=yoG=GtJ9BG?-Mzkkma`ud&+GVK2{TN@e}MtW&U}EeI2ZbV2`tW8UroOO Xr00000NkvXXu0mjfTsuws diff --git a/kubejs/assets/tfg/textures/gui/discord_logo_hovered.png b/kubejs/assets/tfg/textures/gui/discord_logo_hovered.png index 6d4f20faa9c9591718e4f635f7e63f9edee02745..d161fd55f7780435f5213e47a5be3e0aa9ae1823 100644 GIT binary patch delta 542 zcmV+(0^$9O2B`!giBL{Q4GJ0x0000DNk~Le0000K0000K2nGNE0F8+q4Ur)ie*xP` zL_t(IjjffxYZGA@$3Jg43b8{MDYPL%4@@&;>2{g4maggO;vfit;+DZtoE>x#iVpq{ zIcNuKlhhVk5Nsi$ZBT~`FNJP(EHtmfd++6a?{Z7c0~zwY@B4Y5U%7~{{TnW?3X183 z@GO{^pBw!b?d7Y_$}=#4%d5hze?WF3xrF}dQ1wrTnO5ZKCOmV)s9AjclS(Ze_it_EzG2| z%mNLp({3DVB@7I-yL;y7kb&xw_x5F8x%E!Fku-b^qb?(vm{!-TN!hpA|wknM`_)T^OMcAC%I5;A1cL^Uap|0 gEZ)8SG_}8gf0`Q6F4BCCL;wH)07*qoM6N<$f~mOzNB{r; delta 770 zcmV+d1O5D|1d9eCiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPKe*(Qp zL_t(og~eArXj4%bJud_yb?8zGZHUl-F9~GHmJHJTw2MPBx;RLLhT_)2Q9{ARAud8R zgR^S_6%-p=6dDlhU{LyKGc-I4rAu83h2%Qq-Ix3OUW+C@Q~2Jw-#Pbt-~C>$@$JU| z0C0L9AebWNXNLv=1g0sfLQt`De`9`jIC0@;)lUQff~tq7=aVUnYGbScVo`yuQe9CRqvXYTlsxBK4#h*Ni zU?v27|2af_DS(*}0EBf*v}O*ETBO}9DyyOF0lM>%;J>3%P9R@uDJv&ce}FCfyAK05 zZuJKu6=uY6o_P;ZGh(1pP5_WAp*;nDNh#;5JO+DO18W;QBobY`Qqt?f>J#KvfKTM67tDmhCiZ*-pRr+l{Nl z8?|hQnq_n7pfwDf0i|@ZjVdMiUXr_Z*_Z~!jggQU7M)N%Zk%jyIJG}M3X8G zh1dsN1w6`?5d-$I?aNbfsK&ANLN>rc(>(tLtTETX;n5$Z3GvtfKrB@!4<8rCNkVfH zk8=DrA{|5f)*zeP*MQyx0K`>vf7e8KLC@3mmv#`* z1+SkcJ7RgwWK_Av>h|0!9qg}nVySvstd`b5rJOL{y!}N)fqbczc0M4?443-?0NTwW zJ&I6?e}4bPH5a)~L3U3g`jFb8AnD(ft<1ONa407*qoM6N<$f-QGl AvH$=8 diff --git a/kubejs/assets/tfg/textures/gui/github_logo.png b/kubejs/assets/tfg/textures/gui/github_logo.png index b028c7f0ba3562e0e9d6fe99e09193ba457799de..ab5f182bccf87e2a8b2c952bd44b50171c933413 100644 GIT binary patch delta 496 zcmV- zx);cBUbOfDJO~ULGGu9{f;(J%m1DW*q4WcT&%0$59jkpp@eN?)LfX!?$&toBEr|vP3CGS(Yr9 z%fWNyd5+eavMhVK>GhAIC{RiPV6E+KSS%K3t;zEoDP=D|@h9i=8Ko3Sl8_`xP@T0F zYb{!9s;c@s&^Z@WH3SYt@5lhV-EI^#6qC1?{72y7aCjSdI-N$rhSqgze^}SG0Gieg z^Z9%bl%^?C$|4B7bcgVv@X`^p*{ri6O;Z3Lw)XQ=fSV5=g>$Znq6lM*xImu))q(-C zEW1|Kfpw1DDqF2qjWI^Vajdk~z#q?Tw_Eo6y^>OjUM;SHJ~WQw23~qQRL6_@o;nEJ za$VP=uImDzs;bUyj&Z<{Mi18)wXdMDb_%v$8*K@E1Ba{vVC=DJfx_5hbMyJjAo%C6 m&Q!g7{|UTj!`Ndx6u$xgXtwH^epY4x0000>ul1<{G#U^>=-V71P1D{0*Voqogkjj)XU7Ak;y7kB8dX7h zYqQzx?bEpls}sa=JQx5V%d*1&q?Fcny9K~;96ZkhU_PIhaMflij$<6he*r)#wQjT1 z_z8U9&rO%lW;5>Z?@QyR%y*;F2msIX@H|h1VTe+yA3)orL#4-SPXH?*sP<|61ZkSK z8o#~0Js6}(y(6J^|Ecv~gyKf+J3d2{Wf@Tv4Fh;9bpo8y3kLz50^*=ZsFbpjBsm&F zk6SDjxUSn64O=~M3`CY?f3^M<SV(P;4H<%Kj&%Olt3_ErFRO+>I$0R=@OSpi}^9yd;wrYTCPb+O`d zY!^Un4_tltXh|v8RS-jgHZ++`cAC*ow@x+ffj~-$ZQHr7>6B8Ie{I{jF0r)CB;&d+ zQ4|To1D)y>32ocXUDqwEqP8NWqE%mj)>EK2Uy>vOAc`WU(`i{Fo=W?Q(x7nX3Lr@m zp^syqV|WUH5~R468}n3oVsJLBMn_XR@N`N45$Wf?9sue=sVTqr2|T9GDI%Yyy886F z*T6r28()ie@2C2HC*R+;E;A^A_J0gn00000NkvXXu0mjf D_8&;Y diff --git a/kubejs/assets/tfg/textures/gui/github_logo_hovered.png b/kubejs/assets/tfg/textures/gui/github_logo_hovered.png index b549c5be65b68c69eee551b7362168034865a654..b66fbba8df11790ccc97a262098276656ee5fe4e 100644 GIT binary patch delta 480 zcmV<60U!R?1?vMLiBL{Q4GJ0x0000DNk~Le0000K0000K2nGNE0F8+q4Ur)ie*v9I zL_t(IjlGqjuIfM#hQB2Z0)=c+S0o7rvlyOXRXwT#!2@8C7+!#;wwO8|0C8$+>Zu@U zQi(!f_6TTid)XckCufo--JO}Qe`jZRh1QxN2sFQA!fL?8@p#lx6p2r>J^LkW!Lm8I#GRQ&}9xD5c1< z?8VmuSS%LxM3N*m>~guhJOD~5;y5;btk)deZa1Wq_`Z+t`^JO{tdt_p^PhobS=K7v zSy!B8nq05fA3;sldmr+Lz|-mU9(cW8KZ13|wQ5)tg#fhcx&RD^!%k2be}=fOn;3!5 z-65J#cGCwKomt{KA&sbwn@`eJfUBJtiS+=!{L8bEm-T9D`nH^ zRHtbw9LJGLDd1nvtyU{`yPb4hxAOoo*3fYr4UfHTs^e4ri#jl@a#0kbD2fCi&-2!5 ze$oM5eK>ontwEo*lLZh2Hi6Mum7v+crdEN+;R+!3`#sz3_QxyWe!sWI{eHhIRD1*U WCc;+Dk_avU0000Dqp4O6uXs%mnowsOCrO)ZMwFhnsJlFA~Q z+y#l6nBf!S5}+3bZPUF8DWT`y^KkCD=N_~?&jHwOw?8*`lIyw}z`uJsRp~+T=9=re zEEbC#!1FxqS|?9WPx;5kM{S<@e|(+;Xq(NZ2C!bQHGs#*$K1AU!Y~9NilV_Fx~`XV z3n4;hmSq9(`ubYJRj;PvIL0sxf1q4{rIbq` z6R@h~a>;77DxEjgd^VX(0I)0z%d%|W_Yp$$18AFcsN{GV31AO6RU73Jq-omf{O#@S zVi1*jS3(*7TkFqDaVx-Y+h>TfEF%blVF341C%`SEa1p>QATFweLI^EMlB*%)xZQ4t zX`0Gv*cyRrAhIm0*;kx9e@)xYN+^WTD2`#%G;5Q}QriW%+wCNP()k%c(FN7|f&yX> z*Z|Y%l<|11boll4MVhANmTL=pD**f)L~zytImJP;2khx|s+=rMQ-ly<@y6xYE`VAN zc%G+4Q504|8gitg*=%-pHSFZoDOC@~ diff --git a/kubejs/assets/tfg/textures/gui/modrinth_logo.png b/kubejs/assets/tfg/textures/gui/modrinth_logo.png index 43546223c2d31465662ccafea8017813fe671d88..c958e2a7a4385666ae84694e6c9dd51dfffc06fd 100644 GIT binary patch delta 527 zcmV+q0`UE|2ATvRiBL{Q4GJ0x0000DNk~Le0000K0000K2nGNE0F8+q4Ur)ie*w%% zL_t(IjjfciOT;h~#=nYm6oi7yO}RnTRiuG)y3OToazET0oy65a9Q+d`yHoo=99$jT z#KGYqayUp(5kaoYb7+#L*PMd-rlc?Vz3(Mo8mX%c02u!h(Xt1N{z|)f)V%y1Y{bK= z*jqJMtJ#l5BXyOr1)d%sxdfdNf6w+m(SO**!^b`1K~k8Mq!F=Dq6ObOJaGyeAONti zr~XS3Be7{&=9)WL0ijwq4{iZ1Y@@qXc%P&l#DgRPFzMt-r`bCIO#FNUNN2>oooyc` z5e^v-5_EDffl{G_ODx&J=yk}m{m;fGTcpf2(xl4C$9*FMTzGjwymQ>fOn$oQ%O6G{{qw_wt> zdjW{Mx=2HzP$D7_TSXRNWnRO?hXI&}NdO!^Lvv1aNvQ{r0Hp6nap%rC{8D^11WM5Z zLWZVI;t(tdw2Ooi?g!xe%qX)aZ#~ULz=qmIMg7U%;RyrP{}4Bi0r&qdqAyky=049W RA0*6A1_PNgb}GCDozpKc;HgU&c?r51 za56YUyV@`e+|bQ{(O+N(ktZHWNzvloBv2&ZyLXRANiBXXVZ-3Op#b3BnL(p?k2rJH zwP-q+h&7ATvU5!szyF+!BOv1If0xg#3u#UU6cE}~gmkIjOyuT%hLAw(;@g+P0Kmh~ zM_?Dc99eRp-b5k=!dM?x1^_M=9~fAd`qiI9pv))Jhe#`d^TuB!SzPA_blU)`S4?R7>o}^c@4`y3|!EI!HA4e}MpeeOMVj z0Z%+@!%qZIL52$ABdSZSJj2#=y@(W`Ihlv=kN!~3<%o$@KzCYEQDs|k2{Nu!$ZUB; zq!l_- zrOFP#5TGl{^j50Sb{C}Fe_m%@s}W|E=yI2-Xge zP+vqtZ}u~ww*lCmpK>b5U|)@e^I`%`XVy0qDo49l-lo;5`6ZWHe?@(>=CJAs0*lj9 zO?MOH-)OG61d-e0BsOL6lp+m2Xub{I`Sm3q0#pcfc+*toaPk9A{^&l42?`O zq?3FskDO?^)`%%T*fHs?6akLf3(9T^xN8;wKJv_J({B-QmHiOHkReR66LS9^MGYp` zTdnj~zdBd*np)mme}Jd`z|p7xmm>X%l`%B<2E+s*iBL{Q4GJ0x0000DNk~Le0000K0000K2nGNE0F8+q4Ur)ie*yMM zL_t(IjjfciY8ycihW|C>MNWH75LN|7cBx1dydfD0t3H+}(CDpI5sF$9b&7ctix z47qm@=+XoX#zg{yz`{jXj4=VBgRm)XXK(LrT_scP-OPOR&+hDs+dnH@UR@ac9}_(f zCf>c6{1a_IJup3n0l?+eMI&JPe{)t9d#JuoULA`N$QL3`z8@O~p1wbG4w{qMPBs{? z-eC3n2ck4CtV_`$8JWoroQ6~>Q#`msOKA5$BgglakZO@r)pKaLz`sx@q zxZYzJU=O7e{jFZsz+bJPhf1+uq|CKhYj+R;0Q(&PwoHDi$Dz!1;$VxXGAiqgO_}Q? zN@FwtBkNoMGIQ;t%(a1Tf95-dw;xu*&Q${@Gg)BKfhpJSXF%T6MH&iaCIx{ED`J4X z4ND&epbb+1On49NKG8WP9zX$5{yfSXx6k35;;SK0f)NlJXd03U!Gb^zl9_Z5fInwe z84r2qYW9HY9Sl9Lt-b3MZL4OWn0}m@DQ3X%iPW%#?zZ>~jI;7{5O(K!zyJUM07*qo IM6N<$g2ue~8vpxo{Ei4{!=sE(EF47|h{9 zq%+7adywjf11sBt-1pDKieF8@r$c3*SNxU>q4540Y%BCHkq#V z+ldVAk0h{l@$qA20N~>1C9sTM?mKdz&O{Og;+VbM8vy8kA26`4^^=@KphA-ALWBwU zx=ZCdv@B|;;r=y=XEGIe{(9ZgjHn;pa;;93cUzb*mf7>+}`ZEQ6t_}iBIlnU(9<2 zFal^uK^qSUY{qL9>@?GMBXA}v&DSzd29wSy5Y#pfK8AVlMvdP|&TOO}sG7R6yCpb* zT@Ap#>j8L(GQYO&zMX)GdBEBO5}J#sCuTnYdJ%!G_^G6d3|4k5f1Z~TXgjmgP_T~n zuS8ONYJP=FoubmLC7gNzfz5cW`qP1tH=1uQQIzgD1xXn^r$~zr+OK1Oex>9+fT}

`a^pcOlBNwz>XT+Qz+*s(X9088T3(6%0{51;zA9_mc)w>V;N%p`W~~c}*j48Gz^gz|pDzmm>ccD`!GL);tC8 zXhKh7~IXZ*?ZCJ)i|>soE@*8lJ8cyqS~ a0Q?0Y-mOVob6S%C0000| diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index bb3f20f28..10eab60a3 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -34,6 +34,7 @@ ServerEvents.tags('item', event => { registerGTCEUItemTags(event) registerMegaCellsItemTags(event) registerMinecraftItemTags(event) + registerModernMarkingsItemTags(event) registerMoreRedItemTags(event) registerHotOrNotItemTags(event) registerRailWaysItemTags(event) @@ -226,6 +227,7 @@ ServerEvents.recipes(event => { registerMegaCellsRecipes(event) registerMERequesterRecipes(event) registerMinecraftRecipes(event) + registerModernMarkingRecipes(event) registerMoreRedRecipes(event) registerRailWaysRecipes(event) registerRnrRecipes(event) diff --git a/kubejs/server_scripts/modern_markings/recipes.js b/kubejs/server_scripts/modern_markings/recipes.js new file mode 100644 index 000000000..018d7b1d7 --- /dev/null +++ b/kubejs/server_scripts/modern_markings/recipes.js @@ -0,0 +1,30 @@ +const registerModernMarkingRecipes = (event) => { + event.remove({mod: 'ags_modernmarkings'}) + + event.shaped('16x ags_modernmarkings:wall_marking_hazard_diamond', [ + ' B ', + 'AEC', + ' D ' + ], { + A: '#forge:dyes/blue', + B: '#forge:dyes/red', + C: '#forge:dyes/yellow', + D: '#forge:dyes/white', + E: ChemicalHelper.get(TagPrefix.plate, GTMaterials.Steel, 1) + }).id('tfg:shaped/wall_marking_hazard_diamond') + + event.recipes.gtceu.large_chemical_reactor('tfg:large_chemical_reactor/wall_marking_hazard_diamond') + .inputFluids(Fluid.of('tfc:blue_dye', 144), Fluid.of('tfc:red_dye', 144), Fluid.of('tfc:yellow_dye', 144), Fluid.of('tfc:white_dye', 144)) + .itemInputs(ChemicalHelper.get(TagPrefix.plate, GTMaterials.Steel, 1)) + .itemOutputs('32x ags_modernmarkings:wall_marking_hazard_diamond') + .duration(240) + .EUt(GTValues.VA[GTValues.LV]) + + const markings = Ingredient.of('#ags_modernmarkings:markings').itemIds.toArray().map(String); + + markings.forEach(item => { + event.stonecutting(item, + Ingredient.of('#ags_modernmarkings:markings').subtract(item) + ).id(`tfg:stonecutter/${item.replace(/:/g, "/")}`) + }) +}; \ No newline at end of file diff --git a/kubejs/server_scripts/modern_markings/tags.js b/kubejs/server_scripts/modern_markings/tags.js new file mode 100644 index 000000000..d8fb2ce9d --- /dev/null +++ b/kubejs/server_scripts/modern_markings/tags.js @@ -0,0 +1,128 @@ +const registerModernMarkingsItemTags = (event) => { + + global.MODERN_MARKINGS_DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) + }); + + const floor_markings = [ + 'ags_modernmarkings:floor_marking_nostep', + 'ags_modernmarkings:floor_marking_white_arrow', + 'ags_modernmarkings:floor_marking_white_lane', + 'ags_modernmarkings:floor_marking_white_double_arrow', + 'ags_modernmarkings:floor_marking_white_square', + 'ags_modernmarkings:floor_marking_yellow_arrow', + 'ags_modernmarkings:floor_marking_yellow_sideline', + 'ags_modernmarkings:floor_marking_yellow_square', + 'ags_modernmarkings:floor_marking_yellow_stripes', + 'ags_modernmarkings:floor_marking_redx', + 'ags_modernmarkings:floor_marking_noentry', + 'ags_modernmarkings:floor_marking_black_singleline', + 'ags_modernmarkings:floor_marking_white_singleline', + 'ags_modernmarkings:floor_marking_red_singleline', + 'ags_modernmarkings:floor_marking_yellow_singleline', + 'ags_modernmarkings:floor_marking_green_singleline', + 'ags_modernmarkings:floor_marking_blue_singleline', + 'ags_modernmarkings:floor_marking_orange_singleline', + 'ags_modernmarkings:floor_marking_yellow_hazardline', + 'ags_modernmarkings:floor_marking_red_hazardline', + 'ags_modernmarkings:floor_marking_whiteblack_hazardline', + 'ags_modernmarkings:floor_marking_danger_yellow', + 'ags_modernmarkings:floor_marking_danger_red', + 'ags_modernmarkings:floor_marking_exit', + 'ags_modernmarkings:floor_marking_white_lane_cross', + 'ags_modernmarkings:floor_marking_yellow_lane', + 'ags_modernmarkings:floor_marking_black_corner', + 'ags_modernmarkings:floor_marking_blue_corner', + 'ags_modernmarkings:floor_marking_green_corner', + 'ags_modernmarkings:floor_marking_orange_corner', + 'ags_modernmarkings:floor_marking_white_corner', + 'ags_modernmarkings:floor_marking_yellow_corner', + 'ags_modernmarkings:floor_marking_red_corner' + ]; + + const wall_markings = [ + 'ags_modernmarkings:wall_marking_number_0', + 'ags_modernmarkings:wall_marking_number_1', + 'ags_modernmarkings:wall_marking_number_2', + 'ags_modernmarkings:wall_marking_number_3', + 'ags_modernmarkings:wall_marking_number_4', + 'ags_modernmarkings:wall_marking_number_5', + 'ags_modernmarkings:wall_marking_number_6', + 'ags_modernmarkings:wall_marking_number_7', + 'ags_modernmarkings:wall_marking_number_8', + 'ags_modernmarkings:wall_marking_number_9', + 'ags_modernmarkings:wall_marking_number_no', + 'ags_modernmarkings:wall_marking_number_numero', + 'ags_modernmarkings:wall_marking_number_dash', + 'ags_modernmarkings:wall_marking_number_comma', + 'ags_modernmarkings:wall_marking_number_period', + 'ags_modernmarkings:wall_marking_exclamation_mark', + 'ags_modernmarkings:wall_marking_question_mark', + 'ags_modernmarkings:wall_marking_hazard_diamond', + 'ags_modernmarkings:wall_marking_arrowleft', + 'ags_modernmarkings:wall_marking_arrowright', + 'ags_modernmarkings:wall_marking_exit', + 'ags_modernmarkings:wall_marking_hazardline_left', + 'ags_modernmarkings:wall_marking_hazardline_right', + 'ags_modernmarkings:wall_marking_symbol_chemical', + 'ags_modernmarkings:wall_marking_symbol_electric', + 'ags_modernmarkings:wall_marking_symbol_fire', + 'ags_modernmarkings:wall_marking_symbol_fluid', + 'ags_modernmarkings:wall_marking_symbol_frost', + 'ags_modernmarkings:wall_marking_symbol_gears', + 'ags_modernmarkings:wall_marking_symbol_laser', + 'ags_modernmarkings:wall_marking_symbol_magic', + 'ags_modernmarkings:wall_marking_symbol_mob', + 'ags_modernmarkings:wall_marking_symbol_pinch', + 'ags_modernmarkings:wall_marking_symbol_production', + 'ags_modernmarkings:wall_marking_symbol_radiation', + 'ags_modernmarkings:wall_marking_symbol_storage', + 'ags_modernmarkings:wall_marking_symbol_yellow_chemical', + 'ags_modernmarkings:wall_marking_symbol_yellow_electric', + 'ags_modernmarkings:wall_marking_symbol_yellow_fire', + 'ags_modernmarkings:wall_marking_symbol_yellow_fluid', + 'ags_modernmarkings:wall_marking_symbol_yellow_frost', + 'ags_modernmarkings:wall_marking_symbol_yellow_gears', + 'ags_modernmarkings:wall_marking_symbol_yellow_laser', + 'ags_modernmarkings:wall_marking_symbol_yellow_magic', + 'ags_modernmarkings:wall_marking_symbol_yellow_mob', + 'ags_modernmarkings:wall_marking_symbol_yellow_pinch', + 'ags_modernmarkings:wall_marking_symbol_yellow_production', + 'ags_modernmarkings:wall_marking_symbol_yellow_radiation', + 'ags_modernmarkings:wall_marking_symbol_yellow_storage', + 'ags_modernmarkings:wall_marking_symbol_jeo', + 'ags_modernmarkings:wall_marking_warning_danger', + 'ags_modernmarkings:wall_marking_voltage_eu', + 'ags_modernmarkings:wall_marking_voltage_ev', + 'ags_modernmarkings:wall_marking_voltage_fe', + 'ags_modernmarkings:wall_marking_voltage_hv', + 'ags_modernmarkings:wall_marking_voltage_iv', + 'ags_modernmarkings:wall_marking_voltage_luv', + 'ags_modernmarkings:wall_marking_voltage_lv', + 'ags_modernmarkings:wall_marking_voltage_max', + 'ags_modernmarkings:wall_marking_voltage_mv', + 'ags_modernmarkings:wall_marking_voltage_pert', + 'ags_modernmarkings:wall_marking_voltage_rf', + 'ags_modernmarkings:wall_marking_voltage_uev', + 'ags_modernmarkings:wall_marking_voltage_uhv', + 'ags_modernmarkings:wall_marking_voltage_uiv', + 'ags_modernmarkings:wall_marking_voltage_umv', + 'ags_modernmarkings:wall_marking_voltage_uv', + 'ags_modernmarkings:wall_marking_voltage_uxv', + 'ags_modernmarkings:wall_marking_voltage_zpm', + 'ags_modernmarkings:wall_marking_voltage_ulv', + 'ags_modernmarkings:wall_marking_voltage_steam' + ]; + + floor_markings.forEach(marking => { + event.add('ags_modernmarkings:floor_markings', marking) + }) + + wall_markings.forEach(marking => { + event.add('ags_modernmarkings:wall_markings', marking) + }) + + event.add('ags_modernmarkings:markings', '#ags_modernmarkings:floor_markings') + event.add('ags_modernmarkings:markings', '#ags_modernmarkings:wall_markings') +}; \ No newline at end of file diff --git a/kubejs/startup_scripts/modern_markings/constants.js b/kubejs/startup_scripts/modern_markings/constants.js new file mode 100644 index 000000000..1a9d84861 --- /dev/null +++ b/kubejs/startup_scripts/modern_markings/constants.js @@ -0,0 +1,5 @@ +// priority: 0 + +global.MODERN_MARKINGS_DISABLED_ITEMS = [ + 'ags_modernmarkings:chalk' +]; diff --git a/pakku-lock.json b/pakku-lock.json index d7efe56ca..badf08986 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -5808,6 +5808,42 @@ } ] }, + { + "pakku_id": "vM88oJ8vHOUgPzGf", + "type": "MOD", + "slug": { + "curseforge": "modernmarkings" + }, + "name": { + "curseforge": "ModernMarkings" + }, + "id": { + "curseforge": "1267477" + }, + "files": [ + { + "type": "curseforge", + "file_name": "ags_modernmarkings-0.4.2-1.20.1.jar", + "mc_versions": [ + "1.20.1" + ], + "loaders": [ + "forge" + ], + "release_type": "release", + "url": "https://edge.forgecdn.net/files/6659/716/ags_modernmarkings-0.4.2-1.20.1.jar", + "id": "6659716", + "parent_id": "1267477", + "hashes": { + "sha1": "7297e554cd075b7e4d7497248d60ca40b943bc98", + "md5": "f4058de0aafaabae98e90e050f0348d3" + }, + "required_dependencies": [], + "size": 305666, + "date_published": "2025-06-17T02:42:48.933Z" + } + ] + }, { "pakku_id": "aHeU7fAIYgE8bqks", "type": "MOD",