Update to accomodate FRAPI revert

IMS212 · IMS212 · commit 79b317164382 · 2026-03-31T17:09:00.000-07:00
see FabricMC/fabric-api#5289
diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -4,7 +4,7 @@ object BuildConfig {
     val MINECRAFT_VERSION: String = "26.1"
     val NEOFORGE_VERSION: String = "26.1.0.18-beta"
     val FABRIC_LOADER_VERSION: String = "0.18.4"
-    val FABRIC_API_VERSION: String = "0.145.0+26.1"
+    val FABRIC_API_VERSION: String = "0.145.1+26.1"
     val SUPPORT_FRAPI : Boolean = true
 
     // This value can be set to null to disable Parchment.
diff --git a/common/src/main/java/net/caffeinemc/mods/sodium/client/services/FRAPIProvider.java b/common/src/main/java/net/caffeinemc/mods/sodium/client/services/FRAPIProvider.java
@@ -0,0 +1,14 @@
+package net.caffeinemc.mods.sodium.client.services;
+
+public interface FRAPIProvider {
+    FRAPIProvider INSTANCE = Services.loadOr(FRAPIProvider.class, () -> () -> {}); // Returns a no-op implementation if the platform does not support FRAPI
+
+    static FRAPIProvider getInstance() {
+        return INSTANCE;
+    }
+
+    /**
+     * Registers the FRAPI provider. This should only be called once, and should be called during mod initialization.
+     */
+    void register();
+}
diff --git a/fabric/src/main/java/net/caffeinemc/mods/sodium/fabric/SodiumFabricMod.java b/fabric/src/main/java/net/caffeinemc/mods/sodium/fabric/SodiumFabricMod.java
@@ -2,6 +2,7 @@
 
 import net.caffeinemc.mods.sodium.client.SodiumClientMod;
 import net.caffeinemc.mods.sodium.client.config.ConfigManager;
+import net.caffeinemc.mods.sodium.client.services.FRAPIProvider;
 import net.caffeinemc.mods.sodium.client.util.FlawlessFrames;
 import net.caffeinemc.mods.sodium.fabric.config.ConfigLoaderFabric;
 import net.fabricmc.api.ClientModInitializer;
@@ -25,5 +26,7 @@ public void onInitializeClient() {
         FabricLoader.getInstance()
                 .getEntrypoints("frex_flawless_frames", Consumer.class)
                 .forEach(api -> api.accept(FlawlessFrames.getProvider()));
+
+        FRAPIProvider.getInstance().register();
     }
 }
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -51,9 +51,6 @@
     ],
     "preLaunch" : [
       "net.caffeinemc.mods.sodium.fabric.SodiumPreLaunch"
-    ],
-    "fabric-renderer-api-v1:renderer_provider": [
-      "net.caffeinemc.mods.sodium.client.render.frapi.SodiumProvider"
     ]
   },
   "custom" : {
@@ -101,7 +98,7 @@
     "notenoughcrashes" : "<4.4.8",
     "noxesium" : "<2.3.3",
     "reeses-sodium-options" : "<2.0.2",
-    "fabric-api": "<0.140.0",
+    "fabric-api": "<0.145.1",
     "sodium-extra" : "<0.8.0",
     "audio_engine_tweaks" : "<1.2.12",
     "sspb" : "<6.0.0",
diff --git a/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/SodiumProvider.java b/frapi/src/main/java/net/caffeinemc/mods/sodium/client/render/frapi/SodiumProvider.java
@@ -1,11 +1,11 @@
 package net.caffeinemc.mods.sodium.client.render.frapi;
 
+import net.caffeinemc.mods.sodium.client.services.FRAPIProvider;
 import net.fabricmc.fabric.api.client.renderer.v1.Renderer;
-import net.fabricmc.fabric.api.client.renderer.v1.RendererProvider;
 
-public class SodiumProvider implements RendererProvider {
+public class SodiumProvider implements FRAPIProvider {
     @Override
-    public Renderer getRenderer() {
-        return SodiumRenderer.INSTANCE;
+    public void register() {
+        Renderer.register(SodiumRenderer.INSTANCE);
     }
 }
diff --git a/frapi/src/main/resources/META-INF/services/net.caffeinemc.mods.sodium.client.services.FRAPIProvider b/frapi/src/main/resources/META-INF/services/net.caffeinemc.mods.sodium.client.services.FRAPIProvider
@@ -0,0 +1 @@
+net.caffeinemc.mods.sodium.client.render.frapi.SodiumProvider
diff --git a/neoforge/src/mod/java/net/caffeinemc/mods/sodium/neoforge/SodiumForgeMod.java b/neoforge/src/mod/java/net/caffeinemc/mods/sodium/neoforge/SodiumForgeMod.java
@@ -1,6 +1,7 @@
 package net.caffeinemc.mods.sodium.neoforge;
 
 import net.caffeinemc.mods.sodium.client.gui.VideoSettingsScreen;
+import net.caffeinemc.mods.sodium.client.services.FRAPIProvider;
 import net.caffeinemc.mods.sodium.client.util.FlawlessFrames;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.bus.api.IEventBus;
@@ -34,5 +35,7 @@ public SodiumForgeMod(IEventBus bus, ModContainer modContainer) {
                 throw new RuntimeException("Failed to execute Flawless Frames handler for mod " + mod.getModId() + "!", e);
             }
         }
+
+        FRAPIProvider.getInstance().register();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`import net.caffeinemc.mods.sodium.client.SodiumClientMod;`
`4`	`4`	`import net.caffeinemc.mods.sodium.client.config.ConfigManager;`
	`5`	`+import net.caffeinemc.mods.sodium.client.services.FRAPIProvider;`
`5`	`6`	`import net.caffeinemc.mods.sodium.client.util.FlawlessFrames;`
`6`	`7`	`import net.caffeinemc.mods.sodium.fabric.config.ConfigLoaderFabric;`
`7`	`8`	`import net.fabricmc.api.ClientModInitializer;`
`@@ -25,5 +26,7 @@ public void onInitializeClient() {`
`25`	`26`	`FabricLoader.getInstance()`
`26`	`27`	`.getEntrypoints("frex_flawless_frames", Consumer.class)`
`27`	`28`	`.forEach(api -> api.accept(FlawlessFrames.getProvider()));`
	`29`	`+`
	`30`	`+ FRAPIProvider.getInstance().register();`
`28`	`31`	`}`
`29`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`package net.caffeinemc.mods.sodium.client.render.frapi;`
`2`	`2`
	`3`	`+import net.caffeinemc.mods.sodium.client.services.FRAPIProvider;`
`3`	`4`	`import net.fabricmc.fabric.api.client.renderer.v1.Renderer;`
`4`		`-import net.fabricmc.fabric.api.client.renderer.v1.RendererProvider;`
`5`	`5`
`6`		`-public class SodiumProvider implements RendererProvider {`
	`6`	`+public class SodiumProvider implements FRAPIProvider {`
`7`	`7`	`@Override`
`8`		`- public Renderer getRenderer() {`
`9`		`- return SodiumRenderer.INSTANCE;`
	`8`	`+ public void register() {`
	`9`	`+ Renderer.register(SodiumRenderer.INSTANCE);`
`10`	`10`	`}`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+net.caffeinemc.mods.sodium.client.render.frapi.SodiumProvider`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package net.caffeinemc.mods.sodium.neoforge;`
`2`	`2`
`3`	`3`	`import net.caffeinemc.mods.sodium.client.gui.VideoSettingsScreen;`
	`4`	`+import net.caffeinemc.mods.sodium.client.services.FRAPIProvider;`
`4`	`5`	`import net.caffeinemc.mods.sodium.client.util.FlawlessFrames;`
`5`	`6`	`import net.neoforged.api.distmarker.Dist;`
`6`	`7`	`import net.neoforged.bus.api.IEventBus;`
`@@ -34,5 +35,7 @@ public SodiumForgeMod(IEventBus bus, ModContainer modContainer) {`
`34`	`35`	`throw new RuntimeException("Failed to execute Flawless Frames handler for mod " + mod.getModId() + "!", e);`
`35`	`36`	`}`
`36`	`37`	`}`
	`38`	`+`
	`39`	`+ FRAPIProvider.getInstance().register();`
`37`	`40`	`}`
`38`	`41`	`}`