Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a flag to disable Sodium checking for RivaTuner #2165

Merged
merged 1 commit into from
Nov 16, 2023
+5 −1
Merged

Add a flag to disable Sodium checking for RivaTuner #2165

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .../jellysquid/mods/sodium/client/util/workarounds/platform/windows/WindowsModuleChecks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public static void checkModules() {
}

// RivaTuner hooks the wglCreateContext function, and leaves itself behind as a loaded module
if (modules.stream().anyMatch(module -> module.path.equalsIgnoreCase("RTSSHooks64.dll"))) {
if (Boolean.parseBoolean(System.getProperty("sodium.checks.win32.rtss", "true")) && modules.stream().anyMatch(module -> module.path.equalsIgnoreCase("RTSSHooks64.dll"))) {
LOGGER.error("------------------------------------------------------------------------------------------------------------");
LOGGER.error("READ ME! You appear to be using the RivaTuner Statistics Server (RTSS)!");
LOGGER.error(" * Rivatuner will cause extreme performance issues when using Sodium, and it will likely fill up your hard drive");
Expand All @@ -36,6 +36,10 @@ public static void checkModules() {
LOGGER.error(" * If you don't remember installing RivaTuner, check to see if you have MSI Afterburner installed.");
LOGGER.error(" * For more information on possible workarounds and alternatives to Rivatuner, see the following issue on GitHub:");
LOGGER.error(" https://github.com/CaffeineMC/sodium-fabric/issues/2048");
LOGGER.error(" * HINT: If you believe this is an error, then you can force the game to start anyways by adding the " +
"following JVM argument.");
LOGGER.error(" -Dsodium.checks.win32.rtss" + "=false");
LOGGER.error(" * NOTE: We will not provide support for any issues caused by using this option. You are on your own!");
LOGGER.error("------------------------------------------------------------------------------------------------------------");

throw new RuntimeException("RivaTuner Statistics Server (RTSS) is not compatible with Sodium, " +
Expand Down
Loading