diff --git a/.gitattributes b/.gitattributes index 3d82841f1..ca9f2d73f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -2,14 +2,8 @@ *.zip binary *.png binary +*.jpg binary +*.jpeg binary dumps/**/*.* linguist-generated=true *.log linguist-generated=true - -# git update-index --assume-unchanged {file} -# git update-index --no-assume-unchanged {file} - -config/packetfixer.properties -config/embeddium-options.json -config/sound_physics_remastered/occlusion.properties -config/sound_physics_remastered/reflectivity.properties \ No newline at end of file diff --git a/.gitignore b/.gitignore index 09465e5e2..14f6d4224 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,11 @@ **/*.code-workspace **/*.zip +# Dev +.vs/ +.vscode/ +.idea/ + # Pakku build/ !.pakku/**/* @@ -45,43 +50,42 @@ config/stellarcore_stitcher_cache_vanilla.dat # .minecraft !bansoukou/**.zip -.vs/ -.vscode/ -.idea/ -.bobby/ -.mixin.out/ -classOut/ -backups/ -profileImage/ -crash-reports/ -logs/ -saves/ -ldlib/ -local/ -vintagefix/ -modernfix/ -XaeroWaypoints*/ -XaeroWorldMap*/ -#defaultconfigs/ -xaero/ -visualores/ -mods-carryover/ -EnderStorage/ -fancymenu_data/ -fancymenu_setups/ -downloads/ -CustomSkinLoader/ -EverlastingSkins/ -cache/ -screenshots/ -shaderpacks/ -chiselsandbits/ + +/.bobby/ +/.mixin.out/ +/classOut +/backups +/profileImage +/crash-reports +/logs +/saves +/ldlib +/local +/vintagefix +/modernfix +/XaeroWaypoints* +/XaeroWorldMap* +/xaero +/visualores +/mods-carryover +/EnderStorage +/fancymenu_data +/fancymenu_setups +/downloads +/CustomSkinLoader +/EverlastingSkins +/cache +/screenshots +/shaderpacks +/chiselsandbits +/gtceu/prospection_cache +/data # Client data bansoukou .curseclient .sl_password -./options.txt +options.txt patchouli_data.json usernamecache.json usercache.json @@ -99,7 +103,7 @@ optionsof.txt optionsshaders.txt OpenComputersMod-* hei_bookmarks.ini -gtceu/prospection_cache/ +icon.png # Server data .pakku/server-overrides/libraries @@ -108,4 +112,5 @@ gtceu/prospection_cache/ .pakku/server-overrides/groovy .pakku/server-overrides/scripts .pakku/server-overrides/mods -.pakku/server-overrides/user_jvm_args.txt \ No newline at end of file +.pakku/server-overrides/user_jvm_args.txt + diff --git a/config/create_connected-common.toml b/config/create_connected-common.toml index 21a9c7231..a4b7ad151 100644 --- a/config/create_connected-common.toml +++ b/config/create_connected-common.toml @@ -32,12 +32,16 @@ migrateCopycatsOnInitialize = false copycat_beam = true copycat_board = true copycat_fence = true - #. fluid_vessel = true large_crank_wheel = false crank_wheel = false inventory_access_port = true inventory_bridge = true + #. + kinetic_bridge = true + cross_connector = true + redstone_link_wildcard = true + kinetic_battery = true #. #Enable/disable categories of features. Disabling a category hides all related features. Values on server override clients diff --git a/config/everycomp-client.toml b/config/everycomp-client.toml new file mode 100644 index 000000000..e6ac40a3f --- /dev/null +++ b/config/everycomp-client.toml @@ -0,0 +1,5 @@ + +[general] + #Enables the generation of dynamic assets. This is required for the mod to work properly. Turn off if you chose to add all the generated assets via datapack manually. This can speedup boot times for modpacks. Note that the generated assets will depend on loaded datapacks + generate_dynamic_assets = true + diff --git a/config/everycomp-common.toml b/config/everycomp-common.toml index 53915b7bd..17f94e37c 100644 --- a/config/everycomp-common.toml +++ b/config/everycomp-common.toml @@ -10,6 +10,8 @@ mod_version_check_packet = false #Don't touch unless you are told to debug_packet = false + #Enables the generation of dynamic assets. This is required for the mod to work properly. Turn off if you chose to add all the generated assets via datapack manually. This can speedup boot times for modpacks. Note that the generated assets will depend on loaded datapacks + generate_dynamic_assets = true [general.tooltips] #Enabled tooltips showing which mod an EC item is from diff --git a/config/everycomp-entries.toml b/config/everycomp-entries.toml index 49b24778e..8965755ac 100644 --- a/config/everycomp-entries.toml +++ b/config/everycomp-entries.toml @@ -45,11 +45,19 @@ ironwood = true ipe = true + [types.wood_type.ad_astra] + aeronos = true + strophar = true + glacian = true + [types.leaves_type] [types.leaves_type.gtceu] rubber = false + [types.leaves_type.ad_astra] + glacian = true + #Disables specific entries [entries] diff --git a/config/fallingtrees_common.json b/config/fallingtrees_common.json index 3e2a1cb52..be10049fe 100644 --- a/config/fallingtrees_common.json +++ b/config/fallingtrees_common.json @@ -1,110 +1,104 @@ { - "disableCrouchMining": false, - "disableExtraToolDamage": false, - "disableExtraFoodExhaustion": false, - "treeLifetimeLength": 4.0, - "dynamicMiningSpeed": { - "disable": false, - "speedMultiplication": 0.05, - "maxSpeedMultiplication": 16.0 - }, - "trees": { - "standardTree": { - "algorithm": { - "maxLeavesRadius": 15, - "maxLogAmount": 512, - "shouldFallOnMaxLogAmount": true, - "shouldIgnorePersistentLeaves": true - }, - "logFilter": { - "whitelistedTags": [ - "minecraft:logs" - ], - "whitelist": [], - "blacklist": [] - }, - "leavesFilter": { - "whitelistedTags": [ - "minecraft:leaves" - ], - "whitelist": [], - "blacklist": [] - }, - "extraBlockFilter": { - "whitelistedTags": [], - "whitelist": [ - "minecraft:vine", - "minecraft:bee_nest", - "minecraft:cocoa" - ], - "blacklist": [] - }, - "enabled": true, - "onlyFallWithRequiredTool": false, - "allowedToolFilter": { - "whitelistedTags": [ - "minecraft:axes" - ], - "whitelist": [], - "blacklist": [] - } - }, - "verticalTree": { - "filter": { - "whitelistedTags": [], - "whitelist": [ - "minecraft:cactus", - "minecraft:bamboo" - ], - "blacklist": [] - }, - "enabled": true, - "onlyFallWithRequiredTool": false, - "allowedToolFilter": { - "whitelistedTags": [], - "whitelist": [], - "blacklist": [] - } - }, - "chorusTree": { - "enabled": true, - "filter": { - "whitelist": [ - "tfg:lunar_chorus_plant", - "tfg:lunar_chorus_flower" - ] - }, - "onlyFallWithRequiredTool": false, - "allowedToolFilter": { - "whitelistedTags": [], - "whitelist": [], - "blacklist": [] - } - }, - "mushroomTree": { - "stemFilter": { - "whitelistedTags": [], - "whitelist": [ - "minecraft:mushroom_stem" - ], - "blacklist": [] - }, - "capFilter": { - "whitelistedTags": [], - "whitelist": [ - "minecraft:red_mushroom_block", - "minecraft:brown_mushroom_block", - "minecraft:shroomlight" - ], - "blacklist": [] - }, - "enabled": true, - "onlyFallWithRequiredTool": false, - "allowedToolFilter": { - "whitelistedTags": [], - "whitelist": [], - "blacklist": [] - } - } - } + "disableCrouchMining": false, + "disableExtraToolDamage": false, + "disableExtraFoodExhaustion": false, + "treeLifetimeLength": 4.0, + "dynamicMiningSpeed": { + "disable": false, + "speedMultiplication": 0.05, + "maxSpeedMultiplication": 16.0 + }, + "trees": { + "standardTree": { + "algorithm": { + "maxLeavesRadius": 15, + "maxLogAmount": 512, + "shouldFallOnMaxLogAmount": true, + "shouldIgnorePersistentLeaves": true + }, + "logFilter": { + "whitelistedTags": [ + "minecraft:logs" + ], + "whitelist": [], + "blacklist": [] + }, + "leavesFilter": { + "whitelistedTags": [ + "minecraft:leaves" + ], + "whitelist": [], + "blacklist": [] + }, + "extraBlockFilter": { + "whitelistedTags": [], + "whitelist": [ + "minecraft:vine", + "minecraft:bee_nest", + "minecraft:cocoa" + ], + "blacklist": [] + }, + "enabled": true, + "onlyFallWithRequiredTool": false, + "allowedToolFilter": { + "whitelistedTags": [ + "minecraft:axes" + ], + "whitelist": [], + "blacklist": [] + } + }, + "verticalTree": { + "filter": { + "whitelistedTags": [], + "whitelist": [ + "minecraft:cactus", + "minecraft:bamboo" + ], + "blacklist": [] + }, + "enabled": true, + "onlyFallWithRequiredTool": false, + "allowedToolFilter": { + "whitelistedTags": [], + "whitelist": [], + "blacklist": [] + } + }, + "chorusTree": { + "enabled": true, + "onlyFallWithRequiredTool": false, + "allowedToolFilter": { + "whitelistedTags": [], + "whitelist": [], + "blacklist": [] + } + }, + "mushroomTree": { + "stemFilter": { + "whitelistedTags": [], + "whitelist": [ + "minecraft:mushroom_stem" + ], + "blacklist": [] + }, + "capFilter": { + "whitelistedTags": [], + "whitelist": [ + "minecraft:red_mushroom_block", + "minecraft:brown_mushroom_block", + "minecraft:shroomlight" + ], + "blacklist": [] + }, + "enabled": true, + "onlyFallWithRequiredTool": false, + "allowedToolFilter": { + "whitelistedTags": [], + "whitelist": [], + "blacklist": [] + } + } + } } \ No newline at end of file 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/config/immersive_aircraft.json b/config/immersive_aircraft.json index dfb05bf77..ae191c474 100644 --- a/config/immersive_aircraft.json +++ b/config/immersive_aircraft.json @@ -1,74 +1,74 @@ { - "enableDropsForNonPlayer": true, - "enableCrashExplosion": true, - "enableCrashBlockDestruction": false, - "enableCrashFire": false, - "crashExplosionRadius": 2.0, - "crashDamage": 2.0, - "preventKillThroughCrash": true, - "healthBarRow": 0, - "damagePerHealthPoint": 30, - "separateCamera": true, - "useThirdPersonByDefault": true, - "enableTrails": true, - "renderDistance": 192.0, - "fuelConsumption": 1.0, - "windClearWeather": 1.0, - "windRainWeather": 3.0, - "windThunderWeather": 3.0, - "repairSpeed": 0.025, - "repairExhaustion": 0.5, - "collisionDamage": true, - "collisionDamageMultiplier": 40.0, - "burnFuelInCreative": false, - "acceptVanillaFuel": true, - "useCustomKeybindSystem": true, - "showHotbarEngineGauge": true, - "weaponsAreDestructive": false, - "dropAircraft": true, - "dropInventory": true, - "dropUpgrades": false, - "regenerateHealthEveryNTicks": 0, - "requireShiftForRepair": false, - "bombBayEntity": { - "minecraft:egg": "tfc:chicken" - }, - "rotaryCannonDamage": 5.0, - "heavyCrossBowVelocity": 3.0, - "fuelList": { - "minecraft:blaze_powder": 1200, - "gtceu:coke_gem": 1200, - "beneath:cursecoal": 1200 - }, - "validDimensions": { - "minecraft:the_end": true, - "minecraft:the_nether": true, - "minecraft:overworld": true, - "ad_astra:earth_orbit": false, - "ad_astra:moon": false, - "ad_astra:moon_orbit": false, - "ad_astra:mars": false, - "ad_astra:mars_orbit": false, - "ad_astra:venus_orbit": false, - "ad_astra:mercury": false, - "ad_astra:mercury_orbit": false, - "ad_astra:glacio": false, - "ad_astra:glacio_orbit": false - }, - "gunpowderAmmunition": { - "minecraft:gunpowder": 100 - }, - "arrowAmmunition": { - "minecraft:arrow": 100, - "minecraft:spectral_arrow": 100, - "minecraft:tipped_arrow": 100 - }, - "bombBayAmmunition": { - "minecraft:tnt": 100, - "gtceu:powderbarrel": 80, - "gtceu:industrial_tnt": 50, - "gtceu:dynamite": 200 - }, - "version": 1, - "name": "immersive_aircraft" + "enableDropsForNonPlayer": true, + "enableCrashExplosion": true, + "enableCrashBlockDestruction": false, + "enableCrashFire": false, + "crashExplosionRadius": 2.0, + "crashDamage": 2.0, + "preventKillThroughCrash": true, + "healthBarRow": 0, + "damagePerHealthPoint": 30, + "separateCamera": true, + "useThirdPersonByDefault": true, + "enableTrails": true, + "renderDistance": 192.0, + "fuelConsumption": 1.0, + "windClearWeather": 1.0, + "windRainWeather": 3.0, + "windThunderWeather": 3.0, + "repairSpeed": 0.025, + "repairExhaustion": 0.5, + "collisionDamage": true, + "collisionDamageMultiplier": 40.0, + "burnFuelInCreative": false, + "acceptVanillaFuel": true, + "useCustomKeybindSystem": true, + "showHotbarEngineGauge": true, + "weaponsAreDestructive": false, + "dropAircraft": true, + "dropInventory": true, + "dropUpgrades": false, + "regenerateHealthEveryNTicks": 0, + "requireShiftForRepair": false, + "bombBayEntity": { + "minecraft:egg": "tfc:chicken" + }, + "rotaryCannonDamage": 5.0, + "heavyCrossBowVelocity": 3.0, + "fuelList": { + "minecraft:blaze_powder": 1200, + "gtceu:coke_gem": 1200, + "beneath:cursecoal": 1200 + }, + "validDimensions": { + "minecraft:the_end": true, + "minecraft:the_nether": true, + "minecraft:overworld": true, + "ad_astra:earth_orbit": false, + "ad_astra:moon": false, + "ad_astra:moon_orbit": false, + "ad_astra:mars": false, + "ad_astra:mars_orbit": false, + "ad_astra:venus_orbit": false, + "ad_astra:mercury": false, + "ad_astra:mercury_orbit": false, + "ad_astra:glacio": false, + "ad_astra:glacio_orbit": false + }, + "gunpowderAmmunition": { + "minecraft:gunpowder": 100 + }, + "arrowAmmunition": { + "minecraft:arrow": 100, + "minecraft:spectral_arrow": 100, + "minecraft:tipped_arrow": 100 + }, + "bombBayAmmunition": { + "minecraft:tnt": 100, + "gtceu:powderbarrel": 80, + "gtceu:industrial_tnt": 50, + "gtceu:dynamite": 200 + }, + "version": 1, + "name": "immersive_aircraft" } \ No newline at end of file diff --git a/config/jade/plugins.json b/config/jade/plugins.json index 5be59cf91..91ce866aa 100644 --- a/config/jade/plugins.json +++ b/config/jade/plugins.json @@ -57,6 +57,16 @@ "greate": { "belt_icon": true }, + "jadeaddons.create": { + "filter": true, + "backtank_capacity": true, + "goggles.requires_goggles": true, + "goggles": false, + "blaze_burner": true, + "exact_block": true, + "goggles.detailed": false, + "placard": true + }, "gtceu": { "primitive_pump": true, "auto_output_info": true, @@ -97,9 +107,6 @@ "jade_chamber": true, "jade_wireless": true }, - "lootr": { - "info": true - }, "balm": { "jade": true }, @@ -195,20 +202,15 @@ "lightroom": true, "photograph_frame": true }, - "create": { - "filter": true, - "backtank_capacity": true, - "goggles.requires_goggles": true, - "goggles": false, - "blaze_burner": true, - "exact_block": true, - "crafting_blueprint": true, - "goggles.detailed": false, - "placard": true + "jadeaddons.lootr": { + "info": true }, "corpse": { "corpse": true }, + "afc": { + "tap": true + }, "tfc_support_indicator": { "support_indicator": true } diff --git a/config/jade/sort-order.json b/config/jade/sort-order.json index 38fbee204..e12840532 100644 --- a/config/jade/sort-order.json +++ b/config/jade/sort-order.json @@ -10,6 +10,7 @@ "ae2:pattern_provider": null, "ae2:power_storage": null, "ae2:server_data": null, + "afc:tap": null, "alekiships:block": null, "alekiships:brewing_stand": null, "alekiships:furnace": null, @@ -89,6 +90,19 @@ "jade:mod_name": null, "jade:object_name": null, "jade:registry_name": null, + "jadeaddons.create:backtank_capacity": null, + "jadeaddons.create:blaze_burner": null, + "jadeaddons.create:contraption_inv": null, + "jadeaddons.create:crafting_blueprint": null, + "jadeaddons.create:exact_block": null, + "jadeaddons.create:filter": null, + "jadeaddons.create:goggles": null, + "jadeaddons.create:hide_boiler_tanks": null, + "jadeaddons.create:package": null, + "jadeaddons.create:placard": null, + "jadeaddons.create:table_cloth": null, + "jadeaddons.lootr:info": null, + "jadeaddons.lootr:inventory": null, "lootr:info": null, "lootr:inventory": null, "minecraft:animal_owner": null, diff --git a/config/modernfix-mixins.properties b/config/modernfix-mixins.properties index e4ddb82e0..15abb4d5a 100644 --- a/config/modernfix-mixins.properties +++ b/config/modernfix-mixins.properties @@ -48,6 +48,7 @@ # mixin.feature.snapshot_easter_egg=true # (default) # mixin.feature.spam_thread_dump=false # (default) # mixin.feature.spark_profile_launch=false # (default) +# mixin.feature.spark_profile_world_join=false # (default) # mixin.feature.stalled_chunk_load_detection=false # (default) # mixin.feature.warn_missing_perf_mods=true # (default) # mixin.launch.class_search_cache=true # (default) @@ -90,7 +91,6 @@ # mixin.perf.memoize_creative_tab_build=true # (default) # mixin.perf.model_optimizations=true # (default) # mixin.perf.mojang_registry_size=true # (default) -# mixin.perf.nbt_memory_usage=true # (default) # mixin.perf.patchouli_deduplicate_books=true # (default) # mixin.perf.potential_spawns_alloc=true # (default) # mixin.perf.reduce_blockstate_cache_rebuilds=true # (default) diff --git a/config/packetfixer.properties b/config/packetfixer.properties index 3145d4309..193a22b4a 100644 --- a/config/packetfixer.properties +++ b/config/packetfixer.properties @@ -1,15 +1,16 @@ #Packet Fixer config file. #Default values (minecraft default): nbtMaxSize 2097152, packetSize 1048576, decoderSize 8388608 and varInt21Size 3. #Max values are 2147483647 for packetSize/decoderSize/varInt21 and 9223372036854775807 for nbtMaxSize. -#Fri May 30 02:48:38 YEKT 2025 -chunkPacketData=2097152 -varLong=10 -nbtMaxSize=209715200 +#Sun Jun 29 07:00:58 YEKT 2025 utfSize=3276700 allSizesUnlimited=true -decoderSize=838860800 +forceUnlimitedNbtEnabled=false packetSize=104857600 stringSize=32767 timeout=90 varInt21=8 varInt=5 +chunkPacketData=2097152 +varLong=10 +nbtMaxSize=209715200 +decoderSize=838860800 diff --git a/config/ponder-client.toml b/config/ponder-client.toml new file mode 100644 index 000000000..dbf745d91 --- /dev/null +++ b/config/ponder-client.toml @@ -0,0 +1,20 @@ +#. +#Slow down a ponder scene whenever there is text on screen. +comfyReading = false +#. +#Show additional info in the ponder view and reload scene scripts more frequently. +editingMode = false + +#. +#Settings for the Placement Assist +[placementAssist] + #. + #What indicator should be used when showing where the assisted placement ends up relative to your crosshair + #Choose 'NONE' to disable the Indicator altogether + #Allowed Values: TEXTURE, TRIANGLE, NONE + indicatorType = "TEXTURE" + #. + #Change the size of the Indicator by this multiplier + #Range: 0.0 ~ 3.4028234663852886E38 + indicatorScale = 1.0 + diff --git a/config/sound_physics_remastered/soundphysics.properties b/config/sound_physics_remastered/soundphysics.properties index beafe0e1f..228bac625 100644 --- a/config/sound_physics_remastered/soundphysics.properties +++ b/config/sound_physics_remastered/soundphysics.properties @@ -5,6 +5,9 @@ enabled=true # This setting requires you to be in singleplayer or having the mod installed on the server # 1.0 is the physically correct value attenuation_factor=1.0 +# The ray distance at which reverb starts +# 0.0 disables reverb attenuation +reverb_attenuation_distance=0.0 # The volume of simulated reverberations reverb_gain=1.0 # The brightness of reverberation @@ -67,6 +70,8 @@ update_moving_sounds=false # Lower values mean more frequent reevaluation but also more lag # This option only takes effect if update_moving_sounds is enabled sound_update_interval=5 +# The maximum distance a sound can be processed +max_sound_processing_distance=512.0 # Disable level clone and cache. This will fall back to original main thread access. # WARNING! Enabling this will cause instability and issues with other mods. unsafe_level_access=false diff --git a/config/tfclunchbox-common.toml b/config/tfclunchbox-common.toml new file mode 100644 index 000000000..c86de5217 --- /dev/null +++ b/config/tfclunchbox-common.toml @@ -0,0 +1,11 @@ + +#Food Traits Configuration +#NOTE: Changes to trait values require game restart to take effect +[food_traits] + #Decay modifier for COOLED trait (lower = food lasts longer) + #Range: 0.01 ~ 1.0 + cooled_decay_modifier = 0.3 + #Decay modifier for PRESERVED trait (lower = food lasts longer) + #Range: 0.01 ~ 1.0 + preserved_decay_modifier = 0.55 + diff --git a/config/tfg-common.toml b/config/tfg-common.toml index c3f5d5d5d..58a16f7ed 100644 --- a/config/tfg-common.toml +++ b/config/tfg-common.toml @@ -1,5 +1,5 @@ -#Should create compatibility be enabled? +#Should be create compat enabled? createCompat = true -#Should TFC ambiental compatibility be enabled? +#Should be tfc ambiental compat enabled? tfcAmbientalCompat = true diff --git a/config/vintageimprovements-common.toml b/config/vintageimprovements-common.toml index ffe153b27..b16196cd0 100644 --- a/config/vintageimprovements-common.toml +++ b/config/vintageimprovements-common.toml @@ -6,4 +6,7 @@ #Defines default Belt Grinder appearance #Range: 0 ~ 4 defaultBeltGrinderSkin = 0 + #. + #You can insert and extract from the Centrifuge while it is working. + easyCentrifuge = false diff --git a/config/waterflasks-common.toml b/config/waterflasks-common.toml index 3c7af8798..a1179c27e 100644 --- a/config/waterflasks-common.toml +++ b/config/waterflasks-common.toml @@ -1,4 +1,6 @@ #Settings for Water Flasks #Allow drinking when not thirsty? Could be useful or wasteful if that's not water in there... Default False thirstyDrinking = false +#Empty flask when shift-right-clicked? Generally a useful feature, but does annoy a certain streamer... Default True +shiftClickToEmpty = true diff --git a/data/fabricDefaultResourcePacks.dat b/data/fabricDefaultResourcePacks.dat deleted file mode 100644 index 9f907f832..000000000 Binary files a/data/fabricDefaultResourcePacks.dat and /dev/null differ diff --git a/icon.png b/icon.png deleted file mode 100644 index fdaf5f4e8..000000000 Binary files a/icon.png and /dev/null differ diff --git a/kubejs/assets/tfg/textures/gui/curseforge_logo.png b/kubejs/assets/tfg/textures/gui/curseforge_logo.png index 86829dad2..5dbf64d3d 100644 Binary files a/kubejs/assets/tfg/textures/gui/curseforge_logo.png and b/kubejs/assets/tfg/textures/gui/curseforge_logo.png differ diff --git a/kubejs/assets/tfg/textures/gui/curseforge_logo_hovered.png b/kubejs/assets/tfg/textures/gui/curseforge_logo_hovered.png index da36fc2d8..515a02c76 100644 Binary files a/kubejs/assets/tfg/textures/gui/curseforge_logo_hovered.png and b/kubejs/assets/tfg/textures/gui/curseforge_logo_hovered.png differ diff --git a/kubejs/assets/tfg/textures/gui/discord_logo.png b/kubejs/assets/tfg/textures/gui/discord_logo.png index 09491fdee..49e63a225 100644 Binary files a/kubejs/assets/tfg/textures/gui/discord_logo.png and b/kubejs/assets/tfg/textures/gui/discord_logo.png differ diff --git a/kubejs/assets/tfg/textures/gui/discord_logo_hovered.png b/kubejs/assets/tfg/textures/gui/discord_logo_hovered.png index 6d4f20faa..d161fd55f 100644 Binary files a/kubejs/assets/tfg/textures/gui/discord_logo_hovered.png and b/kubejs/assets/tfg/textures/gui/discord_logo_hovered.png differ diff --git a/kubejs/assets/tfg/textures/gui/github_logo.png b/kubejs/assets/tfg/textures/gui/github_logo.png index b028c7f0b..ab5f182bc 100644 Binary files a/kubejs/assets/tfg/textures/gui/github_logo.png and b/kubejs/assets/tfg/textures/gui/github_logo.png differ diff --git a/kubejs/assets/tfg/textures/gui/github_logo_hovered.png b/kubejs/assets/tfg/textures/gui/github_logo_hovered.png index b549c5be6..b66fbba8d 100644 Binary files a/kubejs/assets/tfg/textures/gui/github_logo_hovered.png and b/kubejs/assets/tfg/textures/gui/github_logo_hovered.png differ diff --git a/kubejs/assets/tfg/textures/gui/modrinth_logo.png b/kubejs/assets/tfg/textures/gui/modrinth_logo.png index 43546223c..c958e2a7a 100644 Binary files a/kubejs/assets/tfg/textures/gui/modrinth_logo.png and b/kubejs/assets/tfg/textures/gui/modrinth_logo.png differ diff --git a/kubejs/assets/tfg/textures/gui/modrinth_logo_hovered.png b/kubejs/assets/tfg/textures/gui/modrinth_logo_hovered.png index eb1e848e2..540c1103b 100644 Binary files a/kubejs/assets/tfg/textures/gui/modrinth_logo_hovered.png and b/kubejs/assets/tfg/textures/gui/modrinth_logo_hovered.png differ 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",