- Lots of ui updates. And a couple fixes. (#1221)

Co-authored-by: Pyritie <pyritie@gmail.com>

config/fancymenu/customization/gui_loading_screen.txt

@@ -3,17 +3,17 @@ type = fancymenu_layout
 layout-meta {
   identifier = drippy_loading_overlay
   render_custom_elements_behind_vanilla = false
-  last_edited_time = 1710837053318
+  last_edited_time = 1751008612590
   is_enabled = true
   randommode = false
   randomgroup = 1
   randomonlyfirsttime = false
   layout_index = 0
-  [loading_requirement_container_meta:55b262f6-3a28-4097-9287-2a222e1d0a38-1710837053318] = [groups:][instances:]
+  [loading_requirement_container_meta:a24414bf-23f9-4fae-b752-4e91fecee9d2-1751008530130] = [groups:][instances:]
 }
 
 menu_background {
-  slideshow_name = main_menu
+  slideshow_name = new_loading_screen
   background_type = slideshow
 }
 
@@ -29,93 +29,222 @@ scroll_list_customization {
   show_scroll_list_header_footer_preview_in_editor = false
   repeat_scroll_list_header_texture = false
   repeat_scroll_list_footer_texture = false
+  show_screen_background_overlay_on_custom_background = false
+  apply_vanilla_background_blur = false
+}
+
+layout_action_executable_blocks {
 }
 
 element {
-  source = [source:local]kubejs/assets/tfg/textures/gui/logo_512x512.png
+  source = [source:location]tfg:textures/gui/tfg_logo_icon_outline_white_sr_964x_1024p.gif
   repeat_texture = false
   nine_slice_texture = false
   nine_slice_texture_border_x = 5
   nine_slice_texture_border_y = 5
+  image_tint = #FFFFFF
   element_type = image
   instance_identifier = 22ec4f96-137c-48d9-ac6b-cb4f58e7a7821699231610566
   appearance_delay = no_delay
   appearance_delay_seconds = 1.0
-  fade_in = false
+  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 = 2496
+  auto_sizing_base_screen_height = 1419
+  sticky_anchor = false
   anchor_point = mid-centered
-  x = -50
+  x = -70
-  y = -50
+  y = -67
-  width = 100
+  width = 136
-  height = 100
+  height = 136
   stretch_x = false
   stretch_y = false
   stay_on_screen = false
   element_loading_requirement_container_identifier = 3a10ee73-edca-4147-869e-7902775a5a14-1710837053343
   [loading_requirement_container_meta:3a10ee73-edca-4147-869e-7902775a5a14-1710837053343] = [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
+}
+
+element {
+  interactable = true
+  source = Tip: Read the Field Guide!!!
+  source_mode = direct
+  shadow = true
+  scale = 1.0
+  base_color = #b5b5b5
+  text_border = 2
+  line_spacing = 2
+  enable_scrolling = false
+  auto_line_wrapping = true
+  remove_html_breaks = true
+  code_block_single_color = #737373FF
+  code_block_multi_color = #565656FF
+  headline_line_color = #A9A9A9FF
+  separation_line_color = #A9A9A9FF
+  hyperlink_color = #0771FCFF
+  quote_color = #818181FF
+  quote_indent = 8.0
+  quote_italic = false
+  bullet_list_dot_color = #A9A9A9FF
+  bullet_list_indent = 8.0
+  bullet_list_spacing = 3.0
+  parse_markdown = true
+  element_type = text_v2
+  instance_identifier = 485ef9c0-94a8-4450-94a3-8022e2831591-1751008054758
+  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 = 2496
+  auto_sizing_base_screen_height = 1419
+  sticky_anchor = false
+  anchor_point = element
+  anchor_point_element = progress_bar
+  x = -1
+  y = 13
+  width = 200
+  height = 15
+  stretch_x = false
+  stretch_y = false
+  stay_on_screen = true
+  element_loading_requirement_container_identifier = 613c98a6-70ec-4662-9333-43a7f0ab1e14-1751008054758
+  [loading_requirement_container_meta:613c98a6-70ec-4662-9333-43a7f0ab1e14-1751008054758] = [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
 }
 
 vanilla_button {
   button_element_executable_block_identifier = 97c197fd-2437-4d73-8648-da77552b154b-1710837053334
   [executable_block:97c197fd-2437-4d73-8648-da77552b154b-1710837053334][type:generic] = [executables:]
   restartbackgroundanimations = true
-  loopbackgroundanimations = true
   nine_slice_custom_background = false
   nine_slice_border_x = 5
   nine_slice_border_y = 5
   navigatable = true
+  widget_active_state_requirement_container_identifier = 119a0280-2bdb-4c04-9e07-6de16b3d8938-1751005155458
+  [loading_requirement_container_meta:119a0280-2bdb-4c04-9e07-6de16b3d8938-1751005155458] = [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 = mojang_logo
   appearance_delay = no_delay
   appearance_delay_seconds = 1.0
-  fade_in = false
+  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 = 0
+  x = 180
-  y = 0
+  y = 177
-  width = 0
+  width = 472
-  height = 0
+  height = 118
   stretch_x = false
   stretch_y = false
   stay_on_screen = true
   element_loading_requirement_container_identifier = dc9be166-cadf-440c-98bc-47ac378980ba-1710837053334
   [loading_requirement_container_meta:dc9be166-cadf-440c-98bc-47ac378980ba-1710837053334] = [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
-  nine_slice_slider_handle = false
-  nine_slice_slider_handle_border_x = 5
-  nine_slice_slider_handle_border_y = 5
 }
 
 vanilla_button {
   button_element_executable_block_identifier = f3a70cd2-ecfc-4b6b-91cf-b88673431f32-1710837053334
   [executable_block:f3a70cd2-ecfc-4b6b-91cf-b88673431f32-1710837053334][type:generic] = [executables:]
   restartbackgroundanimations = true
-  loopbackgroundanimations = true
   nine_slice_custom_background = false
   nine_slice_border_x = 5
   nine_slice_border_y = 5
   navigatable = true
+  widget_active_state_requirement_container_identifier = d577ec2a-553b-4634-a340-9254c7f7003b-1751005155458
+  [loading_requirement_container_meta:d577ec2a-553b-4634-a340-9254c7f7003b-1751005155458] = [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 = progress_bar
   appearance_delay = no_delay
   appearance_delay_seconds = 1.0
-  fade_in = false
+  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 = 2496
+  auto_sizing_base_screen_height = 1419
+  sticky_anchor = false
   anchor_point = vanilla
-  x = 0
+  x = 180
-  y = 0
+  y = 388
-  width = 0
+  width = 472
-  height = 0
+  height = 10
   stretch_x = false
   stretch_y = false
   stay_on_screen = true
   element_loading_requirement_container_identifier = fa6c81c1-332c-4f8c-b85a-2de260b1542c-1710837053334
   [loading_requirement_container_meta:fa6c81c1-332c-4f8c-b85a-2de260b1542c-1710837053334] = [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
-  nine_slice_slider_handle = false
-  nine_slice_slider_handle_border_x = 5
-  nine_slice_slider_handle_border_y = 5
 }
 

config/fancymenu/options.txt

@@ -15,7 +15,7 @@ B:advanced_customization_mode = 'false';
 ##[loading]
 
 B:preload_animations = 'true';
-S:preload_resources = '';
+S:preload_resources = '[source:location]tfg:textures/gui/tfg_title_stars.gif%!source_end!%[source:location]tfg:textures/gui/tfg_title_vignette.png%!source_end!%[cubic_panorama]beneath%!source_end!%[slideshow]new_loading_screen%!source_end!%';
 S:custom_game_intro_skip_text = '';
 B:allow_game_intro_skip = 'true';
 S:game_intro_animation_name = '';

config/fancymenu/slideshows/new_loading_screen/properties.txt

@@ -0,0 +1,11 @@
+type = slideshow
+
+slideshow-meta {
+   name = new_loading_screen
+   width = 1920
+   height = 1080
+   x = 0
+   y = 0
+   duration = 5.0
+   fadespeed = 12.0
+}

config/ftbquests/quests/data.snbt

@@ -10,13 +10,7 @@
 	drop_loot_crates: false
 	emergency_items_cooldown: 300
 	grid_scale: 0.5d
-	icon: {
+	icon: "tfg:terra_firma_greg"
-		Count: 1
-		id: "ftbquests:custom_icon"
-		tag: {
-			Icon: "tfg:textures/gui/logo_512x512.png"
-		}
-	}
 	lock_message: "e"
 	loot_crate_no_drop: {
 		boss: 0

kubejs/assets/tfg/textures/item/terra_firma_greg.png.mcmeta

@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 1
+  }
+}

kubejs/server_scripts/ad_astra/tags.js

@@ -245,4 +245,11 @@ const registerAdAstraPlacedFeatures = (event) => {
 	event.add('tfg:moon_small_rock_features', 'tfg:moon/surface/pile_moon_sand')
 	event.add('tfg:moon_small_rock_features', 'tfg:moon/surface/pile_white_sand')
 	event.add('tfg:moon_small_rock_features', 'tfg:moon/surface/pile_black_sand')
+
+	event.add('tfg:venus_delta_surface_features', 'tfg:venus/surface/geyser_source_patch')
+	event.add('tfg:venus_delta_surface_features', 'tfg:venus/surface/stromatolite_cluster_patch')
+	event.add('tfg:venus_delta_surface_features', 'tfg:venus/surface/stromatolite_tower')
+
+	event.add('tfg:venus_delta_terrain_features', 'tfg:venus/terrain/hot_spring_delta')
+	event.add('tfg:venus_delta_terrain_features', 'tfg:venus/terrain/stromatolite_disk')
 }

kubejs/server_scripts/tfg/recipes.miscellaneous.js

@@ -527,6 +527,6 @@ function registerTFGMiscellaneousRecipes(event) {
 		.inputFluids(Fluid.of('gtceu:butane', 4000))
         .outputFluids(Fluid.of('tfg:isobutane', 1000), Fluid.of('gtceu:lpg', 3000))
         .circuit(4)
-        .duration(1400)
+        .duration(2400)
-        .EUt(GTValues.VA[GTValues.EV])
+        .EUt(GTValues.VA[GTValues.HV])
 }