From 2f54c56b18ed38133e070bf7973a629f62d85aa9 Mon Sep 17 00:00:00 2001 From: Logicka Date: Mon, 12 May 2025 04:28:53 -0500 Subject: [PATCH] Blue giant sun settings, minor sanity changes Did some harsh configurations with the sun's lighting and configured sanity so you don't immediately die when you're burned by the sun. dmg:sanity from 1:1 to 55:1 Most of the files aren't changed Idk why they're being pushed or reported as changed --- .gitignore | 2 + 1.20.1-FearFactoryTest/instance.cfg | 52 +++++++-------- .../minecraft/config/allthetrims.json | 2 +- .../minecraft/config/darkness.properties | 2 +- .../config/embeddium-fingerprint.json | 2 +- .../minecraft/config/flywheel-client.toml | 2 +- .../minecraft/config/oculus.properties | 2 +- .../minecraft/config/sanitydim/default.toml | 2 +- 1.20.1-FearFactoryTest/minecraft/icon.png | 2 +- 1.20.1-FearFactoryTest/minecraft/options.txt | 63 +++++++++---------- .../Hysteria-Shaders-Universal-v1.2.1.zip.txt | 33 +++++++--- 11 files changed, 92 insertions(+), 72 deletions(-) diff --git a/.gitignore b/.gitignore index 827f53f..51d6450 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ 1.20.1-FearFactoryTest/minecraft/.blinkload/atlas_textures_cache.json /1.20.1-FearFactoryTest/minecraft/.blinkload 1.20.1-FearFactoryTest/minecraft/.blinkload/atlas_textures_cache.json +1.20.1-FearFactoryTest/instance.cfg +1.20.1-FearFactoryTest/instance.cfg diff --git a/1.20.1-FearFactoryTest/instance.cfg b/1.20.1-FearFactoryTest/instance.cfg index 4ea4d18..9476f47 100644 --- a/1.20.1-FearFactoryTest/instance.cfg +++ b/1.20.1-FearFactoryTest/instance.cfg @@ -1,32 +1,20 @@ [General] -AutoCloseConsole=false AutomaticJava=true -CloseAfterLaunch=false ConfigVersion=1.2 -CustomGLFWPath= -CustomOpenALPath= -EnableFeralGamemode=false -EnableMangoHud=false -Env=@Variant(\0\0\0\b\0\0\0\0) ExportAuthor= ExportName= ExportOptionalFiles=true ExportSummary= ExportVersion=1.0.0 IgnoreJavaCompatibility=false -InstanceAccountId= InstanceType=OneSix JavaArchitecture=64 -JavaPath=/home/qb/.var/app/org.prismlauncher.PrismLauncher/data/PrismLauncher/java/java-runtime-gamma/bin/java +JavaPath=C:/Users/Keybl/Documents/PrismLauncher-Windows-MinGW-w64-Portable-9.4/java/java-runtime-gamma/bin/javaw.exe JavaRealArchitecture=amd64 -JavaSignature=7b784ed89ddd21859884bcf0fad44d920fc92286 +JavaSignature=2c94189bf2f770bbfd88f8047fdcb69e492a67b6 JavaVendor=Microsoft JavaVersion=17.0.8 JoinServerOnLaunch=false -JoinServerOnLaunchAddress= -JoinWorldOnLaunch= -JvmArgs= -LaunchMaximized=false LogPrePostOutput=true ManagedPack=false ManagedPackID= @@ -36,9 +24,6 @@ ManagedPackVersionID= ManagedPackVersionName= MaxMemAlloc=16384 MinMemAlloc=512 -MinecraftWinHeight=480 -MinecraftWinWidth=854 -OnlineFixes=false OverrideCommands=false OverrideConsole=false OverrideEnv=false @@ -52,27 +37,42 @@ OverrideNativeWorkarounds=false OverridePerformance=false OverrideWindow=false PermGen=128 +Profiler= +UseAccountForInstance=false +iconKey=default +lastLaunchTime=1747039279565 +lastTimePlayed=6523 +linkedInstances=[] +name=1.20.1 FearFactory +notes= +totalTimePlayed=39241 +AutoCloseConsole=false +CloseAfterLaunch=false +CustomGLFWPath= +CustomOpenALPath= +EnableFeralGamemode=false +EnableMangoHud=false +Env=@Variant(\0\0\0\b\0\0\0\0) +InstanceAccountId= +JoinServerOnLaunchAddress= +JoinWorldOnLaunch= +JvmArgs= +LaunchMaximized=false +MinecraftWinHeight=480 +MinecraftWinWidth=854 +OnlineFixes=false PostExitCommand= PreLaunchCommand= -Profiler= QuitAfterGameStop=false RecordGameTime=true ShowConsole=false ShowConsoleOnError=true ShowGameTime=true -UseAccountForInstance=false UseDiscreteGpu=false UseNativeGLFW=false UseNativeOpenAL=false UseZink=false WrapperCommand= -iconKey=default -lastLaunchTime=1747019107318 -lastTimePlayed=518 -linkedInstances=[] -name=1.20.1 FearFactory -notes= -totalTimePlayed=28214 [UI] mods_Page\Columns=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\x1\x1\0\0\0\0\0\0\0\0\0\0\0\v\x80\a\0\0\0\x4\0\0\0\a\0\0\0\x64\0\0\0\b\0\0\0\x64\0\0\0\n\0\0\0\x64\0\0\0\t\0\0\0\x64\0\0\x3\x39\0\0\0\v\x1\x1\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\v\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\xe1\0\0\0\x1\0\0\0\x1\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\0\0\0\x64\0\0\0\0) diff --git a/1.20.1-FearFactoryTest/minecraft/config/allthetrims.json b/1.20.1-FearFactoryTest/minecraft/config/allthetrims.json index 23ad039..04d26d3 100644 --- a/1.20.1-FearFactoryTest/minecraft/config/allthetrims.json +++ b/1.20.1-FearFactoryTest/minecraft/config/allthetrims.json @@ -1,4 +1,4 @@ { "debug": false, - "trim_registry_mismatch_message": "§b[All The Trims] §cTrim Registry Mismatch. §rPlease ensure that the client and server have the same mods with the same versions." + "trim_registry_mismatch_message": "§b[All The Trims] §cTrim Registry Mismatch. §rPlease ensure that the client and server have the same mods with the same versions." } \ No newline at end of file diff --git a/1.20.1-FearFactoryTest/minecraft/config/darkness.properties b/1.20.1-FearFactoryTest/minecraft/config/darkness.properties index dc7da58..df3bd35 100644 --- a/1.20.1-FearFactoryTest/minecraft/config/darkness.properties +++ b/1.20.1-FearFactoryTest/minecraft/config/darkness.properties @@ -1,5 +1,5 @@ #Darkness properties file -#Sun May 11 18:38:48 CDT 2025 +#Mon May 12 03:46:03 CDT 2025 dark_nether_fog=0.5 only_affect_block_light=false dark_end_fog=0.0 diff --git a/1.20.1-FearFactoryTest/minecraft/config/embeddium-fingerprint.json b/1.20.1-FearFactoryTest/minecraft/config/embeddium-fingerprint.json index 3f82367..1c8e750 100644 --- a/1.20.1-FearFactoryTest/minecraft/config/embeddium-fingerprint.json +++ b/1.20.1-FearFactoryTest/minecraft/config/embeddium-fingerprint.json @@ -1 +1 @@ -{"v":1,"s":"76c677720f7f959b6ade8c9f002b76295a3a83e322d811b3eb73092e6328eb0b1e65a60d8c1e3ce5e8d6500299d0356cc14572ebe5cd8b34e4c038c1d34b8535","u":"905202c79ca62aaec10775870bd8925b6923648f5e8efe98ec91fa37588474aa3b5cab4bc508436836e5cffb1f91a8ed68934c558ad6c0e5d4b16235e27950b7","p":"05782e439e4a6dc3b6f727be2e373043e1812fef35664c9b2e81dd02e897a899456f81d8c943d6ede97209b448d677fdc5c50571e10efbadcef03e13b191dde6","t":1746997297} \ No newline at end of file +{"v":1,"s":"4ad5a6343f108c5f62e8926945582e75b23a3cc71bfe6682509b9d653f37831bd08ff4711e0022c61fd5a9a41375a2e2981e8bce658fb7e82595f1c2bfef50e6","u":"7004904bd974233150270e07603076ce06abd0f303b79087eb2dea802a977082a9f6606ce49f4855a8ca1b29a6eea7e7b16f179b70eb9390eea28aa6b1fad3d4","p":"804a9be946ff25856bd4fc179420becef0cf4729ac81ec6160da3402cdbb20bb53b8eee67168ac6ced31a7ab8047ce2253b9f012e79c029675a40aba73f0333a","t":1747028273} \ No newline at end of file diff --git a/1.20.1-FearFactoryTest/minecraft/config/flywheel-client.toml b/1.20.1-FearFactoryTest/minecraft/config/flywheel-client.toml index 8b9521a..6d59965 100644 --- a/1.20.1-FearFactoryTest/minecraft/config/flywheel-client.toml +++ b/1.20.1-FearFactoryTest/minecraft/config/flywheel-client.toml @@ -3,7 +3,7 @@ backend = "DEFAULT" #Enable or disable instance update limiting with distance. limitUpdates = true #The number of worker threads to use. Set to -1 to let Flywheel decide. Set to 0 to disable parallelism. Requires a game restart to take effect. -#Range: -1 ~ 12 +#Range: -1 ~ 16 workerThreads = -1 #Config options for Flywheel's built-in backends. diff --git a/1.20.1-FearFactoryTest/minecraft/config/oculus.properties b/1.20.1-FearFactoryTest/minecraft/config/oculus.properties index 7d94944..efac759 100644 --- a/1.20.1-FearFactoryTest/minecraft/config/oculus.properties +++ b/1.20.1-FearFactoryTest/minecraft/config/oculus.properties @@ -1,5 +1,5 @@ #This file stores configuration options for Iris, such as the currently active shaderpack -#Sun May 11 18:31:41 CDT 2025 +#Mon May 12 03:56:09 CDT 2025 colorSpace=SRGB disableUpdateMessage=false enableDebugOptions=false diff --git a/1.20.1-FearFactoryTest/minecraft/config/sanitydim/default.toml b/1.20.1-FearFactoryTest/minecraft/config/sanitydim/default.toml index d914113..02f85f0 100644 --- a/1.20.1-FearFactoryTest/minecraft/config/sanitydim/default.toml +++ b/1.20.1-FearFactoryTest/minecraft/config/sanitydim/default.toml @@ -77,7 +77,7 @@ sleeping_cd = 1200.0 #Players will gain sanity based on the damage they take from any sources with the ratio of 1 to this number #Range: -100.0 ~ 100.0 - hurt_ratio = -1.0 + hurt_ratio = -0.05 #Spawning a baby chicken by throwing an egg restores this amount of sanity #Range: -100.0 ~ 100.0 baby_chicken_spawn = 5.0 diff --git a/1.20.1-FearFactoryTest/minecraft/icon.png b/1.20.1-FearFactoryTest/minecraft/icon.png index a447e98..1c4c623 100644 --- a/1.20.1-FearFactoryTest/minecraft/icon.png +++ b/1.20.1-FearFactoryTest/minecraft/icon.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:aba93480387ce59f4f8ec4157ec0c07b3c8243088df535bc9cdd61acd8e869a2 +oid sha256:247dfe5bf4e6c33acadbc90e91a28d74ea25f0c1471264de2ddc0ca1a6ee7bbd size 2441 diff --git a/1.20.1-FearFactoryTest/minecraft/options.txt b/1.20.1-FearFactoryTest/minecraft/options.txt index d1277d0..b860ebe 100644 --- a/1.20.1-FearFactoryTest/minecraft/options.txt +++ b/1.20.1-FearFactoryTest/minecraft/options.txt @@ -183,11 +183,11 @@ key_keybind.sophisticatedbackpacks.open_backpack:key.mouse.4 key_keybind.sophisticatedbackpacks.inventory_interaction:key.keyboard.c key_keybind.sophisticatedbackpacks.tool_swap:key.keyboard.unknown key_keybind.sophisticatedbackpacks.sort:key.mouse.middle -key_keybind.sophisticatedbackpacks.toggle_upgrade_5:key.keyboard.unknown -key_keybind.sophisticatedbackpacks.toggle_upgrade_4:key.keyboard.unknown -key_keybind.sophisticatedbackpacks.toggle_upgrade_3:key.keyboard.unknown -key_keybind.sophisticatedbackpacks.toggle_upgrade_2:key.keyboard.x:ALT key_keybind.sophisticatedbackpacks.toggle_upgrade_1:key.keyboard.z:ALT +key_keybind.sophisticatedbackpacks.toggle_upgrade_2:key.keyboard.x:ALT +key_keybind.sophisticatedbackpacks.toggle_upgrade_3:key.keyboard.unknown +key_keybind.sophisticatedbackpacks.toggle_upgrade_4:key.keyboard.unknown +key_keybind.sophisticatedbackpacks.toggle_upgrade_5:key.keyboard.unknown key_key.cataclysm.ability:key.keyboard.x key_key.cataclysm.helmet_ability:key.keyboard.c key_key.cataclysm.chestplate_ability:key.keyboard.y @@ -201,37 +201,37 @@ key_key.ftbultimine:key.keyboard.grave.accent key_key.ftbteams.open_gui:key.keyboard.unknown key_chunkloaders.keys.open_screen:key.keyboard.c key_key.biomancy.item_default:key.keyboard.v -key_key.jei.toggleEditMode:key.keyboard.unknown -key_key.jei.toggleHideIngredient:key.mouse.left:CONTROL -key_key.jei.focusSearch:key.keyboard.f:CONTROL -key_key.jei.cheatItemStack:key.mouse.left:SHIFT -key_key.jei.showRecipe2:key.mouse.left -key_key.jei.closeRecipeGui:key.keyboard.escape -key_key.jei.toggleBookmarkOverlay:key.keyboard.unknown -key_key.jei.nextCategory:key.keyboard.page.down:SHIFT -key_key.jei.maxTransferRecipeBookmark:key.mouse.left:CONTROL key_key.jei.cheatItemStack2:key.mouse.middle -key_key.jei.transferRecipeBookmark:key.mouse.left:SHIFT -key_key.jei.cheatOneItem2:key.mouse.right -key_key.jei.clearSearchBar:key.mouse.right -key_key.jei.nextRecipePage:key.keyboard.page.down -key_key.jei.showRecipe:key.keyboard.r -key_key.jei.cheatOneItem:key.mouse.left -key_key.jei.previousPage:key.keyboard.unknown -key_key.jei.copy.recipe.id:key.keyboard.unknown -key_key.jei.toggleCheatMode:key.keyboard.unknown -key_key.jei.nextPage:key.keyboard.unknown -key_key.jei.recipeBack:key.keyboard.backspace -key_key.jei.previousCategory:key.keyboard.page.up:SHIFT -key_key.jei.previousSearch:key.keyboard.up -key_key.jei.previousRecipePage:key.keyboard.page.up -key_key.jei.bookmark:key.keyboard.a key_key.jei.toggleWildcardHideIngredient:key.mouse.right:CONTROL +key_key.jei.nextRecipePage:key.keyboard.page.down +key_key.jei.nextCategory:key.keyboard.page.down:SHIFT +key_key.jei.cheatItemStack:key.mouse.left:SHIFT +key_key.jei.closeRecipeGui:key.keyboard.escape +key_key.jei.nextPage:key.keyboard.unknown +key_key.jei.toggleCheatMode:key.keyboard.unknown +key_key.jei.cheatOneItem:key.mouse.left +key_key.jei.cheatOneItem2:key.mouse.right +key_key.jei.toggleHideIngredient:key.mouse.left:CONTROL +key_key.jei.copy.recipe.id:key.keyboard.unknown +key_key.jei.showRecipe2:key.mouse.left key_key.jei.showUses:key.keyboard.u -key_key.jei.showUses2:key.mouse.right -key_key.jei.nextSearch:key.keyboard.down -key_key.jei.toggleCheatModeConfigButton:key.mouse.left:CONTROL +key_key.jei.toggleEditMode:key.keyboard.unknown +key_key.jei.focusSearch:key.keyboard.f:CONTROL +key_key.jei.bookmark:key.keyboard.a +key_key.jei.showRecipe:key.keyboard.r +key_key.jei.previousSearch:key.keyboard.up key_key.jei.toggleOverlay:key.keyboard.o:CONTROL +key_key.jei.toggleBookmarkOverlay:key.keyboard.unknown +key_key.jei.previousRecipePage:key.keyboard.page.up +key_key.jei.maxTransferRecipeBookmark:key.mouse.left:CONTROL +key_key.jei.recipeBack:key.keyboard.backspace +key_key.jei.showUses2:key.mouse.right +key_key.jei.toggleCheatModeConfigButton:key.mouse.left:CONTROL +key_key.jei.transferRecipeBookmark:key.mouse.left:SHIFT +key_key.jei.previousPage:key.keyboard.unknown +key_key.jei.nextSearch:key.keyboard.down +key_key.jei.clearSearchBar:key.mouse.right +key_key.jei.previousCategory:key.keyboard.page.up:SHIFT key_key.ars_nouveau.open_book:key.keyboard.c key_key.ars_nouveau.selection_hud:key.keyboard.v key_key.ars_nouveau.next_slot:key.keyboard.x @@ -255,7 +255,6 @@ key_keyinfo.copycats.fill_copycat:key.keyboard.left.alt key_create.keyinfo.toolmenu:key.keyboard.left.alt key_create.keyinfo.toolbelt:key.keyboard.left.alt key_create.keyinfo.rotate_menu:key.keyboard.unknown -key_simpleclouds.key.openGenPreviewer:key.keyboard.f12 key_key.azurelib.reload:key.keyboard.r key_key.azurelib.scope:key.keyboard.left.alt key_key.azurelib.fire:key.keyboard.unknown diff --git a/1.20.1-FearFactoryTest/minecraft/shaderpacks/Hysteria-Shaders-Universal-v1.2.1.zip.txt b/1.20.1-FearFactoryTest/minecraft/shaderpacks/Hysteria-Shaders-Universal-v1.2.1.zip.txt index ca2e823..b91be85 100644 --- a/1.20.1-FearFactoryTest/minecraft/shaderpacks/Hysteria-Shaders-Universal-v1.2.1.zip.txt +++ b/1.20.1-FearFactoryTest/minecraft/shaderpacks/Hysteria-Shaders-Universal-v1.2.1.zip.txt @@ -1,24 +1,43 @@ -#Sun May 11 22:58:09 CDT 2025 -SKY_GROUND=true +#Mon May 12 04:10:57 CDT 2025 shadowDistance=160.0 +SUN_ANGULAR_RADIUS=10.0 +STARS_INTENSITY=0.90 COLORED_LIGHTS=true -AURORA_SNOW=AURORA_ALWAYS -TAAU=true +SUN_NR=0.30 +CUSTOM_SKY=true PIXELATED_SHADOWS=true ENTITY_SHADOWS=false TAAU_RENDER_SCALE=0.50 INFO=0 +MOTION_BLUR=false CAVE_LIGHTING_I=0.00 WATER_CAUSTICS=true +SUN_I=2.00 CLOUDS_CUMULUS_PRIMARY_STEPS_H=10 WATER_TEXTURE=WATER_TEXTURE_HIGHLIGHT +SUN_NB=0.90 +SUN_ER=0.05 +RAIN_OPACITY=0.77 +SUN_NG=0.50 +CLOUDS_CUMULUS_PRIMARY_STEPS_Z=5 +VANILLA_SUN=false +GRADE_SATURATION=0.90 +SKY_GROUND=true +SUN_EG=0.06 +AURORA_SNOW=AURORA_ALWAYS +MOON_B=0.20 +MOON_I=1.15 +MOON_G=0.10 +SUN_MR=0.15 CLOUDS_CUMULUS_LIGHTING_STEPS=1 +MOON_ANGULAR_RADIUS=3.0 WATER_FOAM=true shadowMapResolution=1024 -RAIN_OPACITY=0.77 -CLOUDS_CUMULUS_PRIMARY_STEPS_Z=5 +TAA=false +MOON_R=0.12 +SUN_MG=0.15 CLOUDS_CUMULUS_AMBIENT_STEPS=1 +VANILLA_MOON=false SHADOW_PCF=false -GRADE_SATURATION=0.90 VL_QUALITY=1 GRADE_BRIGHTNESS=0.99