diff --git a/client/config/badoptimizations.txt b/client/config/badoptimizations.txt index cec9a60..ec27b8c 100644 --- a/client/config/badoptimizations.txt +++ b/client/config/badoptimizations.txt @@ -3,7 +3,6 @@ lightmap_time_change_needed_for_update: 80 enable_sky_color_caching: true skycolor_time_change_needed_for_update: 20 enable_debug_renderer_disable_if_not_needed: true -enable_fps_string_optimization: true enable_particle_manager_optimization: true enable_toast_optimizations: true enable_sky_angle_caching_in_worldrenderer: true @@ -13,4 +12,6 @@ enable_entity_flag_caching: true enable_remove_redundant_fov_calculations: true enable_remove_tutorial_if_not_demo: true show_f3_text: false -config_version: 1 +ignore_mod_incompatibilities: false +log_config: false +config_version: 3 diff --git a/client/config/c2me.toml b/client/config/c2me.toml index d35f723..b121029 100644 --- a/client/config/c2me.toml +++ b/client/config/c2me.toml @@ -1,5 +1,5 @@ version = 3 -defaultGlobalExecutorParallelismExpression = "max(1,min(if(is_windows,(cpus/2.0),(cpus/1.5)),if(is_j9vm,((mem_gb-(if(is_client,0.5,0.2)))/0.2),((mem_gb-(if(is_client,0.8,0.5)))/0.2))))" +defaultGlobalExecutorParallelismExpression = "max(1,min(if(is_client,(cpus/2.66+1),(cpus/1.5)),if(is_j9vm,((mem_gb-(if(is_client,0.5,0.2)))/0.2),((mem_gb-(if(is_client,0.8,0.5)))/0.2))))" [clientSideConfig] @@ -14,4 +14,4 @@ defaultGlobalExecutorParallelismExpression = "max(1,min(if(is_windows,(cpus/2.0) gcFreeChunkSerializer = true [threadedWorldGen] - enabled = true \ No newline at end of file + enabled = true diff --git a/client/config/immediatelyfast.json b/client/config/immediatelyfast.json index de8363b..d3500f2 100644 --- a/client/config/immediatelyfast.json +++ b/client/config/immediatelyfast.json @@ -2,5 +2,6 @@ "fast_buffer_upload_size_mb": 64, "experimental_disable_error_checking": true, "experimental_screen_batching": true, - "experimental_sign_text_buffering": true + "experimental_sign_text_buffering": true, + "experimental_disable_resource_pack_conflict_handling": true } diff --git a/client/config/moreculling.toml b/client/config/moreculling.toml index 5715c7e..3865a32 100644 --- a/client/config/moreculling.toml +++ b/client/config/moreculling.toml @@ -2,7 +2,6 @@ version = 1 itemFrameLODRange = 16 itemFrame3FaceCullingRange = 2.0 leavesCullingMode = "DEPTH" -leavesCullingAmount = 3 includeMangroveRoots = true entityModelCulling = true -endGatewayCulling = true \ No newline at end of file +endGatewayCulling = true diff --git a/client/options.txt b/client/options.txt index dd81ee5..ea5a099 100644 --- a/client/options.txt +++ b/client/options.txt @@ -1,16 +1,14 @@ -version:3465 -enableVsync:true +enableVsync:false fullscreen:true +darkMojangStudiosBackground:true fov:0.5 renderDistance:12 simulationDistance:5 maxFps:260 graphicsMode:0 -resourcePacks:["vanilla","fabric","continuity:default","file/fancy.zip","file/3D.zip","file/utility.zip"] +tutorialStep:none +skipMultiplayerWarning:true +joinedFirstServer:true syncChunkWrites:false -key_key.saveToolbarActivator:key.keyboard.unknown -key_key.mute_microphone:key.keyboard.unknown -key_key.hide_icons:key.keyboard.unknown -key_key.voice_chat_group:key.keyboard.unknown soundCategory_master:0.4 -soundCategory_music:0.1 +soundCategory_music:0.1 \ No newline at end of file diff --git a/server/server/config/badoptimizations.txt b/server/server/config/badoptimizations.txt new file mode 100644 index 0000000..ec27b8c --- /dev/null +++ b/server/server/config/badoptimizations.txt @@ -0,0 +1,17 @@ +enable_lightmap_caching: true +lightmap_time_change_needed_for_update: 80 +enable_sky_color_caching: true +skycolor_time_change_needed_for_update: 20 +enable_debug_renderer_disable_if_not_needed: true +enable_particle_manager_optimization: true +enable_toast_optimizations: true +enable_sky_angle_caching_in_worldrenderer: true +enable_entity_renderer_caching: true +enable_block_entity_renderer_caching: true +enable_entity_flag_caching: true +enable_remove_redundant_fov_calculations: true +enable_remove_tutorial_if_not_demo: true +show_f3_text: false +ignore_mod_incompatibilities: false +log_config: false +config_version: 3 diff --git a/server/server/config/c2me.toml b/server/server/config/c2me.toml index 6f5ce07..b121029 100644 --- a/server/server/config/c2me.toml +++ b/server/server/config/c2me.toml @@ -1,144 +1,17 @@ -version = 3 -# (Default: -# max( -# 1, -# min( -# if( is_windows, -# (cpus / 1.6 - 2), -# (cpus / 1.2 - 2) -# ), -# if( is_j9vm, -# ( ( mem_gb - (if(is_client, 0.6, 0.2)) ) / 0.5 ), -# ( ( mem_gb - (if(is_client, 1.2, 0.6)) ) / 1.2 ) -# ) -# ) - if(is_client, 2, 0) -# ) -# ) -# The expression for the default value of global executor parallelism. -# This is used when the parallelism isn't overridden. -# Available variables: is_windows, is_j9vm, is_client, cpus, mem_gb -# -defaultGlobalExecutorParallelismExpression = "max(1,min(if(is_windows,(cpus/2.0),(cpus/1.5)),if(is_j9vm,((mem_gb-(if(is_client,0.5,0.2)))/0.2),((mem_gb-(if(is_client,0.8,0.5)))/0.2))))" -# (Default: 10) Configures the parallelism of global executor -globalExecutorParallelism = "default" - -[noTickViewDistance] - # (Default: true) Whether to use compatibility mode to send chunks - # This may fix some mod compatibility issues - compatibilityMode = false - # (Default: 11) No-tick view distance max concurrent chunk loads - # Lower this for a better latency and higher this for a faster loading - maxConcurrentChunkLoads = 2 - # (Default: false) Whether to ensure correct chunks within normal render distance - # This will send chunks twice increasing network load - ensureChunkCorrectness = "default" - # (Default: true) Whether to enable no-tick view distance - enabled = "default" - -[ioSystem] - # (Default: true) Whether to use async chunk loading & unloading - async = "default" - # (Default: -1) Defines which chunk compression should be used - # -1 for Vanilla default - # 1 for GZip (RFC1952) (Vanilla compatible) - # 2 for Zlib (RFC1950) (Vanilla default) (Vanilla compatible) - # 3 for Uncompressed (Fastest, but higher disk usage) (Vanilla compatible) - # - # Original chunk data will still readable after modifying this option - # as this option only affects newly stored chunks - # Invalid values will fall back to vanilla default - # - chunkStreamVersion = "default" - # (Default: false) EXPERIMENTAL FEATURE - # This replaces the way your chunks are saved. - # Please keep regular backups of your world if you are using this feature, - # and report any world issues you encounter with this feature to our GitHub. - # - # Whether to use the fast reduced allocation chunk serializer - # (may cause incompatibility with other mods) - # - # Set to false for the following reasons: - # Incompatible with architectury@9.2.14 (*) (defined in c2me) - gcFreeChunkSerializer = true - # (Default: true) Whether to use the optimized implementation of IO system - replaceImpl = "default" - # (Default: 8192) Soft limit for io worker nbt cache - chunkDataCacheSoftLimit = "default" - # (Default: 32678) Hard limit for io worker nbt cache - chunkDataCacheLimit = "default" - -[threadedWorldGen] - # (Default: true) Whether to allow feature generation (world decorations like trees, ores and etc.) run in parallel - # (may cause incompatibility with other mods) - allowThreadedFeatures = "default" - # (Default: true) Whether to allow reducing lock radius - # (may cause incompatibility with other mods) - reduceLockRadius = "default" - # (Default: true) Whether to enable async and parallel scheduling - # This will reduce server thread load - # (may cause incompatibility with other mods) - # - asyncScheduling = "default" - # (Default: true) Whether to enable this feature - enabled = true - -[fixes] - # (Default: true) - # Whether to disable the shutdown hook of log4j2 on dedicated servers. - # Enabling this also makes the JVM exit when the dedicated server is considered fully shut down. - # This option have no effect on client-side. - # We has historically been doing this, and this config option allows you to disable this behavior. - # - disableLoggingShutdownHook = "default" - # (Default: true) Enforces safe world random access. - # This feature detects unsafe off-thread world random access, helping to find the causes - # of mysterious "Accessing LegacyRandomSource from multiple threads" crash. - # The default behavior is to fail hard when such bad things happens. - # Disabling this option will replace this behavior with a warning. - # - # It is generally not recommended to disable this settings unless you know what you are doing - # - # - enforceSafeWorldRandomAccess = "default" - -[generalOptimizations] - # (Default: 100000) The task interval of mid-tick chunk tasks in nanoseconds (-1 to disable) - # Mid-tick chunk tasks is to execute chunk tasks during server tick loop - # to speed up chunk loading and generation - # This helps chunks loading and generating under high MSPT but may raise - # MSPT when chunks are loading or generating - # - # It is generally not recommended to adjust this value unless you know - # what you are doing - # - # Incompatible with Dimensional Threading (dimthread) - # - midTickChunkTasksInterval = "default" - # (Default: true) Whether to let async chunk request no longer block server thread - # (may cause incompatibility with other mods) - optimizeAsyncChunkRequest = "default" - - [generalOptimizations.autoSave] - # (Default: ENHANCED) Defines how auto save should be handled - # VANILLA: Use vanilla auto-save behavior (auto-save performed every tick during ticking) - # ENHANCED: Use C2ME enhanced auto-save (auto-save performed when the server have spare time after ticking) - # PERIODIC: Use pre-1.18 vanilla auto-save behavior (auto-save performed every 6000 ticks during ticking) - # - # Please preserve quotes so this config don't break - # - mode = "default" - # (Default: 20000) Defines the delay in milliseconds between performing auto-save for a chunk - # This is only used when mode is set to ENHANCED - # - delay = "default" - -[vanillaWorldGenOptimizations] - # (Default: true) Whether to enable aquifer optimizations to accelerate overworld worldgen - # (may cause incompatibility with other mods) - optimizeAquifer = "default" - # (Default: true) Whether to enable End Biome Cache to accelerate The End worldgen - # This is no longer included in lithium-fabric - # (may cause incompatibility with other mods) - # - useEndBiomeCache = "default" - +version = 3 +defaultGlobalExecutorParallelismExpression = "max(1,min(if(is_client,(cpus/2.66+1),(cpus/1.5)),if(is_j9vm,((mem_gb-(if(is_client,0.5,0.2)))/0.2),((mem_gb-(if(is_client,0.8,0.5)))/0.2))))" + +[clientSideConfig] + + [clientSideConfig.modifyMaxVDConfig] + enabled = false + +[noTickViewDistance] + compatibilityMode = false + maxConcurrentChunkLoads = 2 + +[ioSystem] + gcFreeChunkSerializer = true + +[threadedWorldGen] + enabled = true diff --git a/server/server/config/entityculling.json b/server/server/config/entityculling.json new file mode 100644 index 0000000..90087f2 --- /dev/null +++ b/server/server/config/entityculling.json @@ -0,0 +1,5 @@ +{ + "sleepDelay": 153, + "hitboxLimit": 90, + "disableF3": true +} \ No newline at end of file diff --git a/server/server/config/fabric_loader_dependencies.json b/server/server/config/fabric_loader_dependencies.json new file mode 100644 index 0000000..226b536 --- /dev/null +++ b/server/server/config/fabric_loader_dependencies.json @@ -0,0 +1,10 @@ + { + "version": 1, + "overrides": { + "nvidium": { + "-depends": { + "sodium": "" + } + } + } + } diff --git a/server/server/config/ferritecore.mixin.properties b/server/server/config/ferritecore.mixin.properties index d55d381..77da9f7 100644 --- a/server/server/config/ferritecore.mixin.properties +++ b/server/server/config/ferritecore.mixin.properties @@ -1,22 +1 @@ -# Replace the blockstate neighbor table -replaceNeighborLookup = true -# Do not store the properties of a state explicitly and read themfrom the replace neighbor table instead. Requires replaceNeighborLookup to be enabled -replacePropertyMap = true -# Cache the predicate instances used in multipart models -cacheMultipartPredicates = true -# Avoid creation of new strings when creating ModelResourceLocations -modelResourceLocations = true -# Do not create a new MultipartBakedModel instance for each block state using the same multipartmodel. Requires cacheMultipartPredicates to be enabled -multipartDeduplication = true -# Deduplicate cached data for blockstates, most importantly collision and render shapes -blockstateCacheDeduplication = true -# Deduplicate vertex data of baked quads in the basic model implementations -bakedQuadDeduplication = true -# Use smaller data structures for "simple" models, especially models with few side-specific faces -modelSides = true -# Replace objects used to detect multi-threaded access to chunks by a much smaller field. This option is disabled by default due to very rare and very hard-to-reproduce crashes, use at your own risk! -useSmallThreadingDetector = true -# Use a slightly more compact, but also slightly slower representation for block states -compactFastMap = false -# Populate the neighbor table used by vanilla. Enabling this slightly increases memory usage, but can help with issues in the rare case where mods access it directly. -populateNeighborTable = false +useSmallThreadingDetector = true \ No newline at end of file diff --git a/server/server/config/immediatelyfast.json b/server/server/config/immediatelyfast.json new file mode 100644 index 0000000..d3500f2 --- /dev/null +++ b/server/server/config/immediatelyfast.json @@ -0,0 +1,7 @@ +{ + "fast_buffer_upload_size_mb": 64, + "experimental_disable_error_checking": true, + "experimental_screen_batching": true, + "experimental_sign_text_buffering": true, + "experimental_disable_resource_pack_conflict_handling": true +} diff --git a/server/server/config/modernfix-mixins.properties b/server/server/config/modernfix-mixins.properties index 33117b6..17da5f6 100644 --- a/server/server/config/modernfix-mixins.properties +++ b/server/server/config/modernfix-mixins.properties @@ -1,81 +1,12 @@ -# This is the configuration file for ModernFix. -# In general, prefer using the config screen to editing this file. It can be accessed -# via the standard mod menu on your respective mod loader. Changes will, however, -# require restarting the game to take effect. -# -# The following options can be enabled or disabled if there is a compatibility issue. -# Add a line with your option name and =true or =false at the bottom of the file to enable -# or disable a rule. For example: -# mixin.perf.dynamic_resources=true -# Do not include the #. You may reset to defaults by deleting this file. -# -# Available options: -# mixin.bugfix.buffer_builder_leak=true # (default) -# mixin.bugfix.chunk_deadlock=false # (overridden for mod compat) -# mixin.bugfix.concurrency=true # (default) -# mixin.bugfix.ender_dragon_leak=true # (default) -# mixin.bugfix.packet_leak=false # (default) -# mixin.bugfix.paper_chunk_patches=false # (overridden for mod compat) -# mixin.bugfix.restore_old_dragon_movement=false # (default) -# mixin.bugfix.world_leaks=true # (default) -# mixin.bugfix.world_screen_skipped=true # (default) -# mixin.devenv=false # (default) -# mixin.feature.branding=true # (default) -# mixin.feature.cause_lag_by_disabling_threads=false # (default) -# mixin.feature.direct_stack_trace=false # (default) -# mixin.feature.disable_unihex_font=false # (default) -# mixin.feature.integrated_server_watchdog=true # (default) -# mixin.feature.measure_time=true # (default) -# mixin.feature.remove_chat_signing=false # (default) -# mixin.feature.snapshot_easter_egg=true # (default) -# mixin.feature.spam_thread_dump=false # (default) -# mixin.feature.spark_profile_launch=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) -# mixin.perf.blast_search_trees=true # (default) -# mixin.perf.blast_search_trees.force=false # (default) -# mixin.perf.cache_blockstate_cache_arrays=true # (default) -# mixin.perf.cache_model_materials=true # (default) -# mixin.perf.cache_profile_texture_url=true # (default) -# mixin.perf.cache_strongholds=false # (overridden for mod compat) -# mixin.perf.cache_upgraded_structures=true # (default) -# mixin.perf.clear_fabric_mapping_tables=false # (default) -# mixin.perf.clear_mixin_classinfo=false # (default) -# mixin.perf.compact_bit_storage=true # (default) -# mixin.perf.dedicated_reload_executor=true # (default) -# mixin.perf.deduplicate_climate_parameters=false # (default) -# mixin.perf.deduplicate_location=false # (default) -# mixin.perf.deduplicate_wall_shapes=true # (default) -# mixin.perf.dynamic_dfu=true # (default) -# mixin.perf.dynamic_entity_renderers=false # (default) -# mixin.perf.dynamic_resources=false # (default) -# mixin.perf.dynamic_sounds=true # (default) -# mixin.perf.dynamic_structure_manager=true # (default) -# mixin.perf.faster_command_suggestions=true # (default) -# mixin.perf.faster_item_rendering=false # (default) -# mixin.perf.faster_structure_location=true # (default) -# mixin.perf.faster_texture_stitching=true # (default) -# mixin.perf.fix_loop_spin_waiting=true # (default) -# mixin.perf.model_optimizations=true # (default) -# mixin.perf.mojang_registry_size=true # (default) -# mixin.perf.nbt_memory_usage=false # (overridden for mod compat) -# mixin.perf.reduce_blockstate_cache_rebuilds=true # (default) -# mixin.perf.remove_biome_temperature_cache=true # (default) -# mixin.perf.remove_spawn_chunks=false # (default) -# mixin.perf.resourcepacks=true # (default) -# mixin.perf.state_definition_construct=true # (default) -# mixin.perf.thread_priorities=false # (overridden for mod compat) -# mixin.perf.ticking_chunk_alloc=true # (default) -# mixin.perf.worldgen_allocation=false # (default) -# mixin.safety=true # (default) -# -# User overrides go here. +mixin.bugfix.chunk_deadlock=true mixin.bugfix.packet_leak=true +mixin.bugfix.paper_chunk_patches=true mixin.perf.clear_fabric_mapping_tables=true mixin.perf.clear_mixin_classinfo=true mixin.perf.deduplicate_location=true mixin.perf.dynamic_entity_renderers=true mixin.perf.dynamic_resources=true mixin.perf.faster_item_rendering=true +mixin.perf.nbt_memory_usage=true mixin.perf.remove_spawn_chunks=true +mixin.perf.thread_priorities=false \ No newline at end of file diff --git a/server/server/config/moreculling.toml b/server/server/config/moreculling.toml new file mode 100644 index 0000000..3865a32 --- /dev/null +++ b/server/server/config/moreculling.toml @@ -0,0 +1,7 @@ +version = 1 +itemFrameLODRange = 16 +itemFrame3FaceCullingRange = 2.0 +leavesCullingMode = "DEPTH" +includeMangroveRoots = true +entityModelCulling = true +endGatewayCulling = true diff --git a/server/server/config/threadtweak.json b/server/server/config/threadtweak.json index 07bc824..13951e0 100644 --- a/server/server/config/threadtweak.json +++ b/server/server/config/threadtweak.json @@ -1,13 +1,8 @@ { - "threadCount": { - "bootstrap": 1, - "main": 3 - }, "threadPriority": { "game": 8, - "bootstrap": 1, "main": 2, "io": 7, - "integratedServer": 8 + "integratedServer": 7 } -} \ No newline at end of file +} diff --git a/server/server/config/vmp.properties b/server/server/config/vmp.properties index c8f7b0d..affdc18 100644 --- a/server/server/config/vmp.properties +++ b/server/server/config/vmp.properties @@ -1,15 +1,4 @@ -#Configuration file for VMP -#Fri Mar 21 22:09:23 GMT 2025 -deprecated_precache_biome_lookup=false -exp3_use_packet_priority_system=false -exp_use_optimized_chunk_ticking_iteration=true -exp_use_packet_priority_system_block_update_consolidation=false -show_async_loading_messages=false -show_chunk_tracking_messages=false -target_chunk_send_rate=-1 -use_async_chunks_on_login=true -use_async_chunks_on_some_commands=false -use_async_logging=true -use_async_portals=true -use_multiple_netty_event_loops=false -use_optimized_entity_tracking=true +exp_use_optimized_chunk_ticking_iteration=true +show_async_loading_messages=false +show_chunk_tracking_messages=false +use_multiple_netty_event_loops=false \ No newline at end of file