Backport

build.gradle.kts

@@ -10,8 +10,6 @@ plugins {
 
     id("me.modmuss50.mod-publish-plugin") version("0.3.4")
 
-    id("embeddium-fabric-remapper")
-
     id("com.gradleup.shadow") version "8.3.0"
 
     id("xyz.wagyourtail.jvmdowngrader") version "1.1.3"
@@ -100,26 +98,12 @@ fun DependencyHandlerScope.compatCompileOnly(dependency: Any) {
 }
 
 loom {
-    forge {
-        mixinConfigs.add("embeddium.mixins.json")
-    }
-    runs {
-        this["client"].apply {
-            mods {
-                create("archives_base_name"()) {
-                    sourceSet(sourceSets["main"])
-                    extraSourceSets.forEach {
-                        sourceSet(sourceSets[it])
-                    }
-                }
-            }
-        }
-    }
+    accessWidenerPath = file("src/main/resources/embeddium.accesswidener")
     createRemapConfigurations(sourceSets["compat"])
 }
 
 fun fAPIModule(name: String): Dependency {
-    return fabricApiModuleFinder.module(name, "fabric_version"())
+    return fabricApi.module(name, "fabric_version"())
 }
 
 dependencies {
@@ -133,26 +117,21 @@ dependencies {
             parchment("org.parchmentmc.data:parchment-${parchment_version[1]}:${parchment_version[0]}@zip")
         }
     })
-    forge("net.minecraftforge:forge:${"minecraft_version"()}-${"forge_version"()}")
-
-    // Mods
-    "modCompatCompileOnly"("curse.maven:codechickenlib-242818:${"codechicken_fileid"()}")
-    "modCompatCompileOnly"("curse.maven:flywheel-486392:3535459")
 
-    modLocalRuntime("curse.maven:lazydfu-460819:3249059")
+    modLocalRuntime("curse.maven:lazydfu-433518:3209972")
 
     // Fabric API
-    "fabricCompileOnly"(fAPIModule("fabric-api-base"))
-    "fabricCompileOnly"(fAPIModule("fabric-renderer-api-v1"))
-    "fabricCompileOnly"(fAPIModule("fabric-rendering-data-attachment-v1"))
-    "fabricCompileOnly"(fAPIModule("fabric-renderer-indigo"))
-    compileOnly("net.fabricmc:fabric-loader:${"fabric_loader_version"()}")
+    "modImplementation"(fAPIModule("fabric-api-base"))
+    "include"(fAPIModule("fabric-api-base"))
+    "modCompileOnly"(fAPIModule("fabric-renderer-api-v1"))
+    "modCompileOnly"(fAPIModule("fabric-rendering-data-attachment-v1"))
+    "modImplementation"(fAPIModule("fabric-rendering-fluids-v1"))
+    "include"(fAPIModule("fabric-rendering-fluids-v1"))
+    "modCompileOnly"(fAPIModule("fabric-renderer-indigo"))
+    "modImplementation"("net.fabricmc:fabric-loader:${"fabric_loader_version"()}")
 
     //"runtimeOnlyNonPublishable"(fg.deobf("curse.maven:modernfix-790626:5288170"))
 
-    shadow("io.github.llamalad7:mixinextras-common:0.3.5")
-    annotationProcessor("io.github.llamalad7:mixinextras-common:0.3.5")
-
     compileOnly("org.projectlombok:lombok:1.18.30")
     annotationProcessor("org.projectlombok:lombok:1.18.30")
 
@@ -162,7 +141,7 @@ dependencies {
 tasks.processResources {
     inputs.property("version", "version"())
 
-    filesMatching("META-INF/mods.toml") {
+    filesMatching("fabric.mod.json") {
         expand("version" to "version"())
     }
 }
@@ -193,7 +172,6 @@ tasks.named<Jar>("sourcesJar").configure {
 tasks.named<ShadowJar>("shadowJar").configure {
     archiveClassifier = "dev-shadow"
     configurations = listOf(project.configurations.shadow.get())
-    relocate("com.llamalad7.mixinextras", "org.embeddedt.embeddium.impl.shadow.mixinextras")
     relocate("org.joml", "org.embeddedt.embeddium.impl.shadow.joml")
     mergeServiceFiles()
 }
@@ -224,8 +202,7 @@ publishMods {
     file = tasks.shadowJar.get().archiveFile
     changelog = "https://github.com/embeddedt/embeddium/wiki/Changelog"
     type = STABLE
-    modLoaders.add("forge")
-    modLoaders.add("neoforge")
+    modLoaders.add("fabric")
 
     curseforge {
         projectId = "908741"

gradle.properties

@@ -4,9 +4,9 @@ kotlin.code.style=official
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop/
-minecraft_version=1.16.5
+minecraft_version=1.16.1
 parchment_version=2022.03.06-1.16.5
-fabric_version=0.42.0+1.16
+fabric_version=0.18.0+build.387-1.16.1
 fabric_loader_version=0.15.11
 
 # Mod Properties
@@ -15,9 +15,6 @@ fabric_loader_version=0.15.11
 	archives_base_name = embeddium
 
 
-forge_version=36.2.39
-loom.platform=forge
-
 codechicken_fileid=3681973
 
 base_mc_version_commit=0263cc2ffd33599aa90d5b226242035459e45ee7

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

@@ -3,24 +3,18 @@
 import me.jellysquid.mods.sodium.client.data.fingerprint.FingerprintMeasure;
 import me.jellysquid.mods.sodium.client.data.fingerprint.HashedFingerprint;
 import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions;
-import net.minecraftforge.fml.ModList;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.fml.loading.FMLLoader;
 
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.loader.api.FabricLoader;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.embeddedt.embeddium.api.EmbeddiumConstants;
 import org.embeddedt.embeddium.render.ShaderModBridge;
-import org.embeddedt.embeddium.taint.incompats.IncompatibleModManager;
-import org.embeddedt.embeddium.taint.scanning.TaintDetector;
 import org.embeddedt.embeddium.util.sodium.FlawlessFrames;
 
 import java.io.IOException;
 
-@Mod(SodiumClientMod.MODID)
-public class SodiumClientMod {
+public class SodiumClientMod implements ClientModInitializer {
     public static final String MODID = EmbeddiumConstants.MODID;
     public static final String MODNAME = EmbeddiumConstants.MODNAME;
 
@@ -29,36 +23,17 @@ public class SodiumClientMod {
 
     private static String MOD_VERSION;
 
-    public SodiumClientMod() {
-        MOD_VERSION = ModList.get().getModContainerById(MODID).get().getModInfo().getVersion().toString();
+    @Override
+    public void onInitializeClient() {
+        MOD_VERSION = FabricLoader.getInstance().getModContainer(MODID).get().getMetadata().getVersion().toString();
         //ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (a, b) -> true));
 
-        if (!FMLLoader.getDist().isClient()) {
-            return;
-        }
-
-        TaintDetector.init();
-
-        var eventBus = FMLJavaModLoadingContext.get().getModEventBus();
-
-        if("true".equals(System.getProperty("embeddium.enableGameTest"))) {
-            try {
-                eventBus.register(Class.forName("org.embeddedt.embeddium.impl.gametest.content.TestRegistry"));
-            } catch (ClassNotFoundException e) {
-                throw new RuntimeException(e);
-            }
-        }
-        eventBus.addListener(this::onClientSetup);
-
         try {
             updateFingerprint();
         } catch (Throwable t) {
             LOGGER.error("Failed to update fingerprint", t);
         }
-    }
 
-    public void onClientSetup(final FMLClientSetupEvent event) {
-        IncompatibleModManager.checkMods(event);
         FlawlessFrames.onClientInitialization();
     }
 

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

@@ -2,12 +2,14 @@
 
 import me.jellysquid.mods.sodium.client.compatibility.environment.probe.GraphicsAdapterProbe;
 import me.jellysquid.mods.sodium.client.compatibility.workarounds.Workarounds;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.fml.loading.FMLLoader;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.entrypoint.PreLaunchEntrypoint;
 
-public class SodiumPreLaunch {
-    public static void onPreLaunch() {
-        if(FMLLoader.getDist() == Dist.CLIENT) {
+public class SodiumPreLaunch implements PreLaunchEntrypoint {
+    @Override
+    public void onPreLaunch() {
+        if(FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
             GraphicsAdapterProbe.findAdapters();
             Workarounds.init();
         }