use forked FFLoader

Author: TexBlock

build.gradle.kts

@@ -98,6 +98,10 @@ allprojects {
             name = "Sinytra"
             url = uri("https://maven.su5ed.dev/releases")
         }
+        maven {
+            name = "KTT"
+            url = uri("https://maven.kessokuteatime.work/snapshots")
+        }
         mavenLocal()
     }
 
@@ -119,8 +123,9 @@ allprojects {
 
 dependencies {
     // Include Forgified Fabric Loader
-    include("org.sinytra:forgified-fabric-loader:$versionForgifiedFabricLoader")
-    api("org.sinytra:forgified-fabric-loader:$versionForgifiedFabricLoader")
+    include("org.sinytra:forgified-fabric-loader:$versionForgifiedFabricLoader:full")
+    compileOnly("org.sinytra:forgified-fabric-loader:$versionForgifiedFabricLoader")
+    runtimeOnly("org.sinytra:forgified-fabric-loader:$versionForgifiedFabricLoader:full")
 }
 
 val processIncludedJars by tasks.registering(NestableJarGenerationTask::class) {

buildSrc/src/main/kotlin/ffapi.neo-setup.gradle.kts

@@ -29,7 +29,8 @@ val testmod: SourceSet by sourceSets.creating {
 }
 
 dependencies {
-    "implementation"("org.sinytra:forgified-fabric-loader:$versionForgifiedFabricLoader")
+    "compileOnly"("org.sinytra:forgified-fabric-loader:$versionForgifiedFabricLoader")
+    "runtimeOnly"("org.sinytra:forgified-fabric-loader:$versionForgifiedFabricLoader:full")
 
     "testmodImplementation"(mainSourceSet.output)
     "testmodImplementation"("org.sinytra:forgified-fabric-loader:$versionForgifiedFabricLoader")

fabric-networking-api-v1/src/main/java/org/sinytra/fabric/networking_api/NetworkingEventHooks.java

@@ -1,12 +1,12 @@
 package org.sinytra.fabric.networking_api;
 
 import net.fabricmc.fabric.api.networking.v1.ServerConfigurationConnectionEvents;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.SharedConstants;
 import net.minecraft.server.commands.DebugConfigCommand;
 import net.minecraft.server.network.ServerConfigurationPacketListenerImpl;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.common.Mod;
-import net.neoforged.fml.loading.FMLLoader;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.event.OnDatapackSyncEvent;
 import net.neoforged.neoforge.event.RegisterCommandsEvent;
@@ -29,7 +29,7 @@ private static void registerCommands(RegisterCommandsEvent event) {
             return;
         }
 
-        if (FMLLoader.getCurrent().isProduction()) {
+        if (FabricLoader.getInstance().isDevelopmentEnvironment()) {
             // Only register this command in a dev env
             return;
         }

fabric-networking-api-v1/src/testmod/java/net/fabricmc/fabric/test/networking/play/NetworkingPlayPacketTest.java

@@ -27,13 +27,15 @@
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.StringArgumentType;
+import net.fabricmc.api.EnvType;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.fabricmc.fabric.impl.networking.FabricRegistryByteBuf;
 import net.fabricmc.fabric.test.networking.NetworkingTestmods;
 import net.fabricmc.fabric.test.networking.common.NetworkingCommonTest;
+import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.PacketSendListener;
@@ -47,7 +49,6 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
 import net.neoforged.bus.api.EventPriority;
-import net.neoforged.fml.loading.FMLLoader;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.event.RegisterCommandsEvent;
 import net.neoforged.neoforge.event.tick.ServerTickEvent;
@@ -108,7 +109,7 @@ public void onInitialize() {
 
 		PayloadTypeRegistry.playS2C().register(OverlayPacket.ID, OverlayPacket.CODEC);
 
-		if (FMLLoader.getCurrent().getDist().isDedicatedServer()) {
+		if (FabricLoader.getInstance().getEnvironmentType() == EnvType.SERVER) {
 			PayloadTypeRegistry.playS2C().register(UnknownPayload.ID, UnknownPayload.CODEC);
 		}
 

ffapi.gradle.properties

@@ -1,13 +1,13 @@
 loom.platform=neoforge
 fabric.loom.dontRemap=true
 
-implementationVersion=2.1.5
+implementationVersion=2.2.4
 
 versionMc=1.21.9
 versionForge=21.9.16-beta
 versionForgeCompat=21.9
-versionForgifiedFabricLoader=2.5.55+0.17.2+1.21.1
-versionFabricLoader=0.17.2
+versionForgifiedFabricLoader=0.1.0+0.18.4+1.21.11
+versionFabricLoader=0.18.4
 
 githubRepository=ThinkingStudios/ForgifiedFabricAPI
 # This is the branch the release tag will be created from