From 36a4edddb77b87c378cfb9e5f8856e608a71bb36 Mon Sep 17 00:00:00 2001 From: Xikaro <0regon.end@gmail.com> Date: Sat, 17 Feb 2024 19:15:23 +0500 Subject: [PATCH] mods + cfg --- config/betterchunkloading.json | 38 ++++++++++++ config/connectivity.json | 34 +++++++++++ config/embeddium++.toml | 14 +++-- config/fastbench.cfg | 19 ------ config/fastsuite.cfg | 20 ------ config/limitedchunks.json | 14 +++++ config/recipeessentials.json | 30 +++++++++ config/smoothchunk.json | 10 +++ config/sophisticatedcore-common.toml | 2 +- config/voicechat/voicechat-client.properties | 2 +- config/voicechat/voicechat-server.properties | 4 +- config/zume.json5 | 64 ++++++++++++++++++++ mods | 2 +- 13 files changed, 203 insertions(+), 50 deletions(-) create mode 100644 config/betterchunkloading.json create mode 100644 config/connectivity.json delete mode 100644 config/fastbench.cfg delete mode 100644 config/fastsuite.cfg create mode 100644 config/limitedchunks.json create mode 100644 config/recipeessentials.json create mode 100644 config/smoothchunk.json create mode 100644 config/zume.json5 diff --git a/config/betterchunkloading.json b/config/betterchunkloading.json new file mode 100644 index 000000000..624c626d5 --- /dev/null +++ b/config/betterchunkloading.json @@ -0,0 +1,38 @@ +{ + "enablePrediction": { + "desc:": "Enables predictive chunkloading, which predicts player movement and preloads an area in movement direction: default:true", + "enablePrediction": true + }, + "predictionarea": { + "desc:": "Size of the area marked for preloading: default:7 chunks, max: 32, min: 2", + "predictionarea": 7 + }, + "enablePreGen": { + "desc:": "Enables predictive, async pre-gen far ahead of the player, to generate nonexisting chunks early so they load in time, requires enablePrediction: default:true", + "enablePreGen": true + }, + "preGenArea": { + "desc:": "Size of the area marked for pregeneration: default:7 chunks, min 1, max 32", + "preGenArea": 7 + }, + "enableLazyChunkloading": { + "desc:": "Enables lazy chunkloading around the player, which makes the area loaded directly around the player react more slowly to player position changes.(Improves server performance, less chunks are loaded/unlaoded frequently) : default:true", + "enableLazyChunkloading": true + }, + "lazyloadingspeed": { + "desc:": "Set the speed of lazy loading, increasing this makes the lazy chunk loading gets less lazy and react to player position changes faster: default:0.7", + "lazyloadingspeed": 0.7 + }, + "enableFasterChunkLoading": { + "desc:": "Enables faster chunk loading, which slightly improves the general chunk loading speed: default:true", + "enableFasterChunkLoading": true + }, + "debugLogging": { + "desc:": "Enables debug logging to show chunk loading changes: default:false", + "debugLogging": false + }, + "enableFasterChunkTasks": { + "desc:": "Enables faster chunk tasks: default:true", + "enableFasterChunkTasks": true + } +} \ No newline at end of file diff --git a/config/connectivity.json b/config/connectivity.json new file mode 100644 index 000000000..9e09e71af --- /dev/null +++ b/config/connectivity.json @@ -0,0 +1,34 @@ +{ + "disableLoginLimits": { + "desc:": "Should login packet size limits be disabled? Error:(IOException(\"Payload may not be larger than 1048576 bytes\")) default:true", + "disableLoginLimits": true + }, + "disablePacketLimits": { + "desc:": "Should play packet size limits be disabled? Error:(Badly compressed packet) default:true", + "disablePacketLimits": true + }, + "disableChatVerificationDisconnect": { + "desc:": "(Clientside) Disables players disconnecting on chat message verification problems,(enable debugPrintMessages to see the message causing issues). default:true", + "disableChatVerificationDisconnect": true + }, + "debugPrintMessages": { + "desc:": "Enable addition debug logging for networking errors. default:false", + "debugPrintMessages": false + }, + "logintimeout": { + "desc:": "Set the max login timeout in seconds. default = 120", + "logintimeout": 2400 + }, + "disconnectTimeout": { + "desc:": "Set the ingame disconnect timeout for disconnecting players. Default = 60sec", + "disconnectTimeout": 60 + }, + "packetHistoryMinutes": { + "desc:": "Set the amount of minutes for which network packet history data is saved. Default = 5 minutes", + "packetHistoryMinutes": 5 + }, + "showFullResourceLocationException": { + "desc:": "Enable to see the full log output for all resource location exceptions. Default = false", + "showFullResourceLocationException": false + } +} \ No newline at end of file diff --git a/config/embeddium++.toml b/config/embeddium++.toml index dd447f5e9..d4cb72c43 100644 --- a/config/embeddium++.toml +++ b/config/embeddium++.toml @@ -53,11 +53,11 @@ #Configure horizontal max distance before cull entities #Value is squared, default was 64^2 (or 64x64) #Range: > 0 - cullingDistanceX = 1024 + cullingMaxDistanceX = 4096 #Configure vertical max distance before cull entities #Value is raw #Range: 0 ~ 512 - cullingDistanceY = 32 + cullingMaxDistanceY = 32 [embeddiumplus.performance.distanceCulling.tileEntities] #Toggles distance culling for Block Entities @@ -71,11 +71,11 @@ #Configure horizontal max distance before cull Block entities #Value is squared, default was 64^2 (or 64x64) #Range: > 0 - cullingDistanceX = 1024 + cullingMaxDistanceX = 4096 #Configure vertical max distance before cull Block entities #Value is raw #Range: 0 ~ 512 - cullingDistanceY = 32 + cullingMaxDistanceY = 32 [embeddiumplus.dynlights] #Toggle if Block Entities should have dynamic lights @@ -102,7 +102,7 @@ chunkFadeSpeed = "SLOW" #Raise clouds #Modify clouds height perfect for a adaptative world experience - #Range: 0 ~ 320 + #Range: 0 ~ 512 cloudsHeight = 256 #Toggle fog feature #Fog was a vanilla feature, toggling off may increases performance @@ -118,7 +118,6 @@ #Toggle Darkness on End dimension enableOnEnd = false #Toggle Darkness default mode for modded dimensions - #This option will be replaced with a whitelist in a near future valueByDefault = false #Configure Darkness Mode #Each config changes what is considered 'true darkness' @@ -141,4 +140,7 @@ enableBlockLightOnly = false #Toggle Darkness on Overworld dimension enableOnOverworld = true + #List of all dimensions to use True Darkness + #This option overrides 'valueByDefault' state + dimensionWhitelist = [] diff --git a/config/fastbench.cfg b/config/fastbench.cfg deleted file mode 100644 index 42c93bcec..000000000 --- a/config/fastbench.cfg +++ /dev/null @@ -1,19 +0,0 @@ -# File Specification: https://gist.github.com/Shadows-of-Fire/88ac714a758636c57a52e32ace5474c1 - -# - -general { - # If the recipe book button is removed. - # Default: true - B:"Remove Recipe Book Button"=false - - # If the crafting table has a tooltip - # Default: false - B:"Disable tooltip on crafting table"=false - - # The tick interval at which all pooled grid updates will be run. Duplicate updates within the interval will be squashed. - # Default: 2; Range: [1 ~ 100] - I:"Grid Update Interval"=2 -} - - diff --git a/config/fastsuite.cfg b/config/fastsuite.cfg deleted file mode 100644 index 51e6d0eea..000000000 --- a/config/fastsuite.cfg +++ /dev/null @@ -1,20 +0,0 @@ -# File Specification: https://gist.github.com/Shadows-of-Fire/88ac714a758636c57a52e32ace5474c1 - -# FastSuite Configuration - -general { - # A list of recipe types which may only be looked up on the main thread. Add a recipe type to this list if errors start happening. - # Default: [ - S:"Single Threaded Recipe Types" < - > - - # The max time, in seconds, that a recipe lookup may take before aborting the lookup and logging an error. - # Default: 25; Range: [1 ~ 300] - I:"Max Recipe Lookup Time"=25 - - # If true, the stacks used as recipe inputs will be locked and throw an error if modified during parallel matching. Useful for debugging. - # Default: false - B:"Lock Crafting Input Stacks"=false -} - - diff --git a/config/limitedchunks.json b/config/limitedchunks.json new file mode 100644 index 000000000..f858613d2 --- /dev/null +++ b/config/limitedchunks.json @@ -0,0 +1,14 @@ +{ + "chunkunloadnoplayer": { + "desc:": "How long a player can keep chunkloaded chunks active after logging out. default:10, min 0, max 2000", + "chunkunloadnoplayer": 10 + }, + "debugLog": { + "desc:": "Print log messages for which chunk tickets are unloaded where. Default: false", + "debugLog": false + }, + "excludedtickets": { + "desc:": "List of excluded ticket/chunkload types, these are mod-specific. : e.g. format : [\"mekanism\", \"player\"]", + "excludedtickets": [] + } +} \ No newline at end of file diff --git a/config/recipeessentials.json b/config/recipeessentials.json new file mode 100644 index 000000000..38892de32 --- /dev/null +++ b/config/recipeessentials.json @@ -0,0 +1,30 @@ +{ + "disableRecipebook": { + "desc:": "Disables the recipe book entirely, removes the button on client side and removes synced data on server side: default:false", + "disableRecipebook": true + }, + "enableBetterRecipebookSorting": { + "desc:": "Enables better sorting for the list of displayed recipes in the recipebook, craftables and recently used recipes are priotized: default:true", + "enableBetterRecipebookSorting": true + }, + "recipebookShowAll": { + "desc:": "Enables the recipe book to show all recipes from the get go, also enables modded recipes to show and disables network/login overhead: default:true", + "recipebookShowAll": true + }, + "fastItemComparisons": { + "desc:": "Enables faster item comparison for better performance, disable on mod conflicts: default:true", + "fastItemComparisons": true + }, + "smallerRecipePacket": { + "desc:": "Reduces the size of the recipe packet, to prevent errors on too large packets and helps bad connections, requires the mod to be present on both client and server, disable on mod conflicts: default:false", + "smallerRecipePacket": true + }, + "cacheRecipes": { + "desc:": "Caches recipe lookups to greatly improve lookup speed: default:true", + "cacheRecipes": true + }, + "logCachingErrors": { + "desc:": "Enables error logging for recipe caching: default:false", + "logCachingErrors": false + } +} \ No newline at end of file diff --git a/config/smoothchunk.json b/config/smoothchunk.json new file mode 100644 index 000000000..d9a2d386a --- /dev/null +++ b/config/smoothchunk.json @@ -0,0 +1,10 @@ +{ + "chunkSaveDelay": { + "desc:": "Delay before a chunk is saved to disk, default: 300 seconds", + "chunkSaveDelay": 300 + }, + "debugLogging": { + "desc:": "Enables debug logging of how many chunks got saved in a tick. default: false", + "debugLogging": false + } +} \ No newline at end of file diff --git a/config/sophisticatedcore-common.toml b/config/sophisticatedcore-common.toml index 5c864f82c..188cb8aa4 100644 --- a/config/sophisticatedcore-common.toml +++ b/config/sophisticatedcore-common.toml @@ -2,5 +2,5 @@ #Common Settings [common] #Disable / enable any items here (disables their recipes) - enabledItems = ["sophisticatedbackpacks:compacting_upgrade|false", "sophisticatedbackpacks:advanced_restock_upgrade|false", "sophisticatedbackpacks:diamond_backpack|false", "sophisticatedbackpacks:tank_upgrade|false", "sophisticatedbackpacks:auto_smoking_upgrade|false", "sophisticatedbackpacks:filter_upgrade|false", "sophisticatedbackpacks:advanced_compacting_upgrade|false", "sophisticatedbackpacks:feeding_upgrade|false", "sophisticatedbackpacks:advanced_pickup_upgrade|false", "sophisticatedbackpacks:smoking_upgrade|false", "sophisticatedbackpacks:everlasting_upgrade|false", "sophisticatedbackpacks:advanced_feeding_upgrade|false", "sophisticatedbackpacks:crafting_upgrade|false", "sophisticatedbackpacks:stack_upgrade_tier_4|false", "sophisticatedbackpacks:stack_upgrade_tier_2|false", "sophisticatedbackpacks:stack_upgrade_tier_3|false", "sophisticatedbackpacks:stack_upgrade_tier_1|false", "sophisticatedbackpacks:advanced_pump_upgrade|false", "sophisticatedbackpacks:refill_upgrade|false", "sophisticatedbackpacks:auto_blasting_upgrade|false", "sophisticatedbackpacks:void_upgrade|false", "sophisticatedbackpacks:advanced_refill_upgrade|false", "sophisticatedbackpacks:advanced_tool_swapper_upgrade|false", "sophisticatedbackpacks:smelting_upgrade|false", "sophisticatedbackpacks:battery_upgrade|false", "sophisticatedbackpacks:magnet_upgrade|false", "sophisticatedbackpacks:advanced_magnet_upgrade|false", "sophisticatedbackpacks:blasting_upgrade|false", "sophisticatedbackpacks:deposit_upgrade|false", "sophisticatedbackpacks:iron_backpack|false", "sophisticatedbackpacks:stonecutter_upgrade|false", "sophisticatedbackpacks:backpack|false", "sophisticatedbackpacks:tool_swapper_upgrade|false", "sophisticatedbackpacks:jukebox_upgrade|false", "sophisticatedbackpacks:advanced_filter_upgrade|false", "sophisticatedbackpacks:inception_upgrade|false", "sophisticatedbackpacks:anvil_upgrade|false", "sophisticatedbackpacks:xp_pump_upgrade|false", "sophisticatedbackpacks:auto_smelting_upgrade|false", "sophisticatedbackpacks:pickup_upgrade|false", "sophisticatedbackpacks:upgrade_base|false", "sophisticatedbackpacks:gold_backpack|false", "sophisticatedbackpacks:advanced_deposit_upgrade|false", "sophisticatedbackpacks:advanced_void_upgrade|false", "sophisticatedbackpacks:restock_upgrade|false", "sophisticatedbackpacks:pump_upgrade|false", "sophisticatedbackpacks:netherite_backpack|false"] + enabledItems = ["sophisticatedbackpacks:compacting_upgrade|false", "sophisticatedbackpacks:advanced_restock_upgrade|false", "sophisticatedbackpacks:diamond_backpack|false", "sophisticatedbackpacks:tank_upgrade|false", "sophisticatedbackpacks:auto_smoking_upgrade|false", "sophisticatedbackpacks:filter_upgrade|false", "sophisticatedbackpacks:advanced_compacting_upgrade|false", "sophisticatedbackpacks:feeding_upgrade|false", "sophisticatedbackpacks:advanced_pickup_upgrade|false", "sophisticatedbackpacks:smoking_upgrade|false", "sophisticatedbackpacks:everlasting_upgrade|false", "sophisticatedbackpacks:advanced_feeding_upgrade|false", "sophisticatedbackpacks:crafting_upgrade|false", "sophisticatedbackpacks:stack_upgrade_tier_4|false", "sophisticatedbackpacks:stack_upgrade_tier_2|false", "sophisticatedbackpacks:stack_upgrade_tier_3|false", "sophisticatedbackpacks:stack_upgrade_tier_1|false", "sophisticatedbackpacks:advanced_pump_upgrade|false", "sophisticatedbackpacks:refill_upgrade|false", "sophisticatedbackpacks:auto_blasting_upgrade|false", "sophisticatedbackpacks:void_upgrade|false", "sophisticatedbackpacks:advanced_refill_upgrade|false", "sophisticatedbackpacks:advanced_tool_swapper_upgrade|false", "sophisticatedbackpacks:smelting_upgrade|false", "sophisticatedbackpacks:battery_upgrade|false", "sophisticatedbackpacks:magnet_upgrade|false", "sophisticatedbackpacks:advanced_magnet_upgrade|false", "sophisticatedbackpacks:blasting_upgrade|false", "sophisticatedbackpacks:deposit_upgrade|false", "sophisticatedbackpacks:iron_backpack|false", "sophisticatedbackpacks:stonecutter_upgrade|false", "sophisticatedbackpacks:backpack|false", "sophisticatedbackpacks:tool_swapper_upgrade|false", "sophisticatedbackpacks:jukebox_upgrade|false", "sophisticatedbackpacks:advanced_filter_upgrade|false", "sophisticatedbackpacks:inception_upgrade|false", "sophisticatedbackpacks:anvil_upgrade|false", "sophisticatedbackpacks:xp_pump_upgrade|false", "sophisticatedbackpacks:auto_smelting_upgrade|false", "sophisticatedbackpacks:pickup_upgrade|false", "sophisticatedbackpacks:upgrade_base|false", "sophisticatedbackpacks:gold_backpack|false", "sophisticatedbackpacks:advanced_deposit_upgrade|false", "sophisticatedbackpacks:advanced_void_upgrade|false", "sophisticatedbackpacks:restock_upgrade|false", "sophisticatedbackpacks:pump_upgrade|false", "sophisticatedbackpacks:netherite_backpack|false", "sophisticatedbackpacks:copper_backpack|false", "sophisticatedbackpacks:stack_upgrade_starter_tier|false"] diff --git a/config/voicechat/voicechat-client.properties b/config/voicechat/voicechat-client.properties index ebbd99b91..3ea23c438 100644 --- a/config/voicechat/voicechat-client.properties +++ b/config/voicechat/voicechat-client.properties @@ -1,4 +1,4 @@ -# Simple Voice Chat client config v1.20.1-2.5.2 +# Simple Voice Chat client config v1.20.1-2.5.4 # If the voice chat onboarding process has been finished onboarding_finished=false diff --git a/config/voicechat/voicechat-server.properties b/config/voicechat/voicechat-server.properties index 3d5e3d6fe..bf5c290ed 100644 --- a/config/voicechat/voicechat-server.properties +++ b/config/voicechat/voicechat-server.properties @@ -1,4 +1,4 @@ -# Simple Voice Chat server config v1.20.1-2.5.2 +# Simple Voice Chat server config v1.20.1-2.5.4 # The port of the voice chat server # Setting this to "-1" sets the port to the Minecraft servers port (Not recommended) @@ -17,7 +17,7 @@ whisper_distance_multiplier=0.5 # Possible values are 'VOIP', 'AUDIO' and 'RESTRICTED_LOWDELAY' codec=VOIP # The maximum size in bytes that voice packets are allowed to have -mtu_size=1024 +mtu_size=512 # The frequency at which keep alive packets are sent # Setting this to a higher value may result in timeouts keep_alive=1000 diff --git a/config/zume.json5 b/config/zume.json5 new file mode 100644 index 000000000..bff59f629 --- /dev/null +++ b/config/zume.json5 @@ -0,0 +1,64 @@ +{ + /* + Enable Cinematic Camera while zooming. + If you disable this, you should also try setting `zoomSmoothnessMs` to `0`. + DEFAULT: `true` + */ + "enableCinematicZoom": true, + /* + Mouse Sensitivity will not be reduced below this amount while zoomed in. + Set to `1.0` to prevent it from being changed at all (not recommended without `enableCinematicZoom`). + DEFAULT: `0.4` + */ + "mouseSensitivityFloor": 0.4, + /* + Speed for Zoom In/Out key binds & zoom scrolling (if enabled). + DEFAULT: `20` + */ + "zoomSpeed": 20, + /* + Allows you to zoom in and out by scrolling up and down on your mouse while zoom is active. + This will prevent you from scrolling through your hotbar while zooming if enabled. + DEFAULT: `true` + */ + "enableZoomScrolling": true, + /* + FOV changes will be spread out over this many milliseconds. + Set to `0` to disable animations. + DEFAULT: `150` + */ + "zoomSmoothnessMs": 150, + /* + Smoothing animation progress will be raised to this exponent for easing. Higher numbers will feel faster. + It is recommended to also increase `zoomSmoothnessMs` when increasing this. + Set to `1` to disable. + DEFAULT: `4` + */ + "easingExponent": 4, + /* + Zoom percentage will be squared before being applied if `true`. + Makes differences in FOV more uniform. You should probably keep this on if you don't understand what it does. + DEFAULT: `true` + */ + "useQuadratic": true, + /* + Default starting zoom percentage. + DEFAULT: `0.5` + */ + "defaultZoom": 0.5, + /* + If `true`, the Zoom keybind will act as a toggle. If `false`, Zoom will only be active while the keybind is held. + DEFAULT: `false` + */ + "toggleMode": false, + /* + Maximum zoom FOV. + DEFAULT: `60.0` + */ + "maxFOV": 60.0, + /* + Minimum zoom FOV. + DEFAULT: `1.0` + */ + "minFOV": 1.0 +} \ No newline at end of file diff --git a/mods b/mods index 5438078e3..79d75643b 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit 5438078e3e9e7b6d47d5090201bdb76ee9cfcbb1 +Subproject commit 79d75643bae0c99cb4fb6d490eb1d460d2c61f27