From 49a7221e6a80047a6817718dab079c14d9b0595c Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 21 Jan 2024 15:40:55 +0700 Subject: [PATCH] start --- .gitignore | 14 +----------- ....properties => canary.properties.disabled} | 0 config/fastbench.cfg | 2 +- config/immediatelyfast.json | 22 +++++++++++++++++++ config/lithium.properties | 7 ++++++ config/modelfix-client.toml | 21 ++++++++++++++++++ config/roughlyenoughitems/config.json5 | 8 ++----- config/rrls.toml | 8 +++++++ mods | 2 +- 9 files changed, 63 insertions(+), 21 deletions(-) rename config/{canary.properties => canary.properties.disabled} (100%) create mode 100644 config/immediatelyfast.json create mode 100644 config/lithium.properties create mode 100644 config/modelfix-client.toml create mode 100644 config/rrls.toml diff --git a/.gitignore b/.gitignore index dca95e16a..724e96666 100644 --- a/.gitignore +++ b/.gitignore @@ -59,16 +59,4 @@ knownkeys.txt # Server Pack -.github/buildtools/serverpack/logs/ -.github/buildtools/serverpack/world/ -.github/buildtools/serverpack/config/ -.github/buildtools/serverpack/crash-reports/ -.github/buildtools/serverpack/kubejs/ -.github/buildtools/serverpack/mods/ -.github/buildtools/serverpack/local/ -.github/buildtools/serverpack/xaerominimap-common.txt -.github/buildtools/serverpack/xaeroworldmap-common.txt -.github/buildtools/serverpack/banned-ips.json -.github/buildtools/serverpack/banned-players.json -.github/buildtools/serverpack/ops.json -.github/buildtools/serverpack/whitelist.json \ No newline at end of file +.github/buildtools/serverpack/* \ No newline at end of file diff --git a/config/canary.properties b/config/canary.properties.disabled similarity index 100% rename from config/canary.properties rename to config/canary.properties.disabled diff --git a/config/fastbench.cfg b/config/fastbench.cfg index 8f774c528..42c93bcec 100644 --- a/config/fastbench.cfg +++ b/config/fastbench.cfg @@ -5,7 +5,7 @@ general { # If the recipe book button is removed. # Default: true - B:"Remove Recipe Book Button"=true + B:"Remove Recipe Book Button"=false # If the crafting table has a tooltip # Default: false diff --git a/config/immediatelyfast.json b/config/immediatelyfast.json new file mode 100644 index 000000000..b34da085c --- /dev/null +++ b/config/immediatelyfast.json @@ -0,0 +1,22 @@ +{ + "REGULAR_INFO": "----- Regular config values below -----", + "font_atlas_resizing": true, + "map_atlas_generation": true, + "hud_batching": true, + "fast_text_lookup": true, + "fast_buffer_upload": true, + "fast_buffer_upload_size_mb": 256, + "fast_buffer_upload_explicit_flush": true, + "COSMETIC_INFO": "----- Cosmetic only config values below (Does not optimize anything) -----", + "dont_add_info_into_debug_hud": false, + "EXPERIMENTAL_INFO": "----- Experimental config values below (Rendering glitches may occur) -----", + "experimental_disable_error_checking": false, + "experimental_disable_resource_pack_conflict_handling": false, + "experimental_sign_text_buffering": false, + "experimental_screen_batching": false, + "DEBUG_INFO": "----- Debug only config values below (Do not touch) -----", + "debug_only_and_not_recommended_disable_universal_batching": false, + "debug_only_and_not_recommended_disable_mod_conflict_handling": false, + "debug_only_and_not_recommended_disable_hardware_conflict_handling": false, + "debug_only_print_additional_error_information": false +} \ No newline at end of file diff --git a/config/lithium.properties b/config/lithium.properties new file mode 100644 index 000000000..d276f4036 --- /dev/null +++ b/config/lithium.properties @@ -0,0 +1,7 @@ +# This is the configuration file for Radium. +# This file exists for debugging purposes and should not be configured otherwise. +# +# You can find information on editing this file and all the available options here: +# https://github.com/jellysquid3/lithium-fabric/wiki/Configuration-File +# +# By default, this file will be empty except for this notice. diff --git a/config/modelfix-client.toml b/config/modelfix-client.toml new file mode 100644 index 000000000..cfac1c8d1 --- /dev/null +++ b/config/modelfix-client.toml @@ -0,0 +1,21 @@ + +[default] + #quad expansion increment. enlarges each quad. Use to hide gaps. Keep both as close to 0 as possible + #Range: -0.1 ~ 0.1 + item_quad_expansion = 0.008 + #quad x/y offset. simply put moves the quad toward the center of the item. Use to hide gaps + #Range: -0.1 ~ 0.1 + item_quad_indent = 0.007 + +[mac_os] + #It has been reported that some mac os systems are affected by atlass bleeding so the mod cant apply its main fix by removing atlas shrinking. Instead it can reduce it as much as possible by multiplying it by shrink_value_multiplier + #quad expansion increment. enlarges each quad. Use to hide gaps. Keep both as close to 0 as possible + #Range: -0.1 ~ 0.1 + item_quad_expansion = 0.04 + #quad x/y offset. simply put moves the quad toward the center of the item. Use to hide gaps + #Range: -0.1 ~ 0.1 + item_quad_indent = 0.0099 + #set to 0 for non macos behavior. 1 keeps vanilla behavior to prevent atlas bleeding + #Range: 0.0 ~ 1.0 + shrink_ratio_multiplier = 1.0 + diff --git a/config/roughlyenoughitems/config.json5 b/config/roughlyenoughitems/config.json5 index ed9c1f67a..5ccd43f15 100644 --- a/config/roughlyenoughitems/config.json5 +++ b/config/roughlyenoughitems/config.json5 @@ -1,10 +1,6 @@ { "basics": { - "favorites": [ - "{id:\"ftbteams:my_team\",json:'{\"group\":\"ftblibrary:info\",\"icon\":\"ftbteams:textures/teams.png\",\"x\":0,\"click\":\"ftbteams:open_gui\",\"loading_screen\":true}',type:\"ftblibrary:sidebar_button\"}", - "{id:\"ftbquests:quests\",json:'{\"group\":\"ftblibrary:info\",\"icon\":\"ftbquests:item/book\",\"x\":610,\"click\":\"ftbquests:open_gui\",\"required_server_mods\":[\"ftbquests\"],\"custom_text\":true}',type:\"ftblibrary:sidebar_button\"}", - "{id:\"ftbessentials:trash_can\",json:'{\"group\":\"ftblibrary:util\",\"icon\":\"ftblibrary:icons/bin\",\"x\":150,\"click\":\"command:/trashcan\",\"required_server_mods\":[\"ftbessentials\"]}',type:\"ftblibrary:sidebar_button\"}" - ], + "favorites": [], "hiddenFavorites": [], "displayHistory": [], // Declares whether cheating mode is on. @@ -163,7 +159,7 @@ "functionality": { "inputMethod": null, // Declares whether REI should remove the recipe book. - "disableRecipeBook": true, + "disableRecipeBook": false, // Declares whether mob effects should be on the left side instead of the right side. "leftSideMobEffects": true, // Declares whether subsets is enabled. diff --git a/config/rrls.toml b/config/rrls.toml new file mode 100644 index 000000000..cd2e12af6 --- /dev/null +++ b/config/rrls.toml @@ -0,0 +1,8 @@ +enabled = true +rgbProgress = false +loadingScreenHide = false +showIn = "ALL" +type = "PROGRESS" +reloadText = "" +resetResources = false +reInitScreen = true diff --git a/mods b/mods index 7fa418ec2..68387e1cd 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit 7fa418ec236ef30e269c406b6f0587c90f8ef2b2 +Subproject commit 68387e1cd2f090131538bc9e53fc011c13a341ef