Back-port software workarounds from Sodium 0.6.9

build.gradle.kts

@@ -42,13 +42,20 @@ sourceSets {
     val main = getByName("main")
     val api = create("api")
     val desktop = create("desktop")
+    val workarounds = create("workarounds")
 
     api.apply {
         java {
             compileClasspath += main.compileClasspath
         }
     }
 
+    workarounds.apply {
+        java {
+            compileClasspath += main.compileClasspath
+        }
+    }
+
     desktop.apply {
         java {
             srcDir("src/desktop/java")
@@ -58,7 +65,9 @@ sourceSets {
     main.apply {
         java {
             compileClasspath += api.output
+            compileClasspath += workarounds.output
             runtimeClasspath += api.output
+            runtimeClasspath += workarounds.output
         }
     }
 }
@@ -89,8 +98,7 @@ tasks {
     }
 
     jar {
-        from("${rootProject.projectDir}/COPYING")
-        from("${rootProject.projectDir}/COPYING.LESSER")
+        from("${rootProject.projectDir}/LICENSE.md")
 
         val api = sourceSets.getByName("api")
         from(api.output.classesDirs)
@@ -100,6 +108,10 @@ tasks {
         from(desktop.output.classesDirs)
         from(desktop.output.resourcesDir)
 
+        val workarounds = sourceSets.getByName("workarounds")
+        from(workarounds.output.classesDirs)
+        from(workarounds.output.resourcesDir)
+
         manifest.attributes["Main-Class"] = "net.caffeinemc.mods.sodium.desktop.LaunchWarn"
     }
 

src/main/java/me/jellysquid/mods/sodium/client/SodiumPreLaunch.java

@@ -1,16 +1,15 @@
 package me.jellysquid.mods.sodium.client;
 
-import me.jellysquid.mods.sodium.client.compatibility.checks.PreLaunchChecks;
-import me.jellysquid.mods.sodium.client.compatibility.workarounds.Workarounds;
-import me.jellysquid.mods.sodium.client.compatibility.environment.probe.GraphicsAdapterProbe;
+import net.caffeinemc.mods.sodium.client.compatibility.checks.PreLaunchChecks;
+import net.caffeinemc.mods.sodium.client.compatibility.environment.probe.GraphicsAdapterProbe;
+import net.caffeinemc.mods.sodium.client.compatibility.workarounds.Workarounds;
 import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
 
 public class SodiumPreLaunch implements PreLaunchEntrypoint {
     @Override
     public void onPreLaunch() {
-        PreLaunchChecks.beforeLWJGLInit();
+        PreLaunchChecks.checkEnvironment();
         GraphicsAdapterProbe.findAdapters();
-        PreLaunchChecks.onGameInit();
         Workarounds.init();
     }
 }