port to fabric (not finish)

Author: TexBlock

build.gradle

@@ -1,11 +1,8 @@
 import java.time.Instant
 
 plugins {
-	id 'base'
-	id 'java'
-	id 'idea'
 	id 'maven-publish'
-	id 'net.neoforged.moddev' version "2.0.75"
+	id 'fabric-loom' version '1.10-SNAPSHOT'
 	id "me.shedaniel.unified-publishing" version "0.1.+"
 }
 
@@ -14,54 +11,33 @@ def isLocal = !ENV.containsKey("GITHUB_RUN_NUMBER")
 
 version = "${mod_version}-${isLocal ? "local.${Instant.now().epochSecond}" : "build.${ENV.GITHUB_RUN_NUMBER}"}"
 group = project.maven_group
-base.archivesBaseName = project.archives_base_name
+base.archivesName = project.archives_base_name
 
 println("Building version: ${version}")
 
-neoForge {
-	version = project.neoforge_version
-	accessTransformers {
-		publish(project.file('src/main/resources/META-INF/accesstransformer.cfg'))
-	}
+loom {
+	interfaceInjection.enabled
 
-	interfaceInjectionData {
-		from(file('interfaces.json'))
-		publish(file('interfaces.json'))
-	}
+	accessWidenerPath.set(file("src/main/resources/kubejs.accesswidener"))
 
 	runs {
-		configureEach {
-			logLevel = org.slf4j.event.Level.INFO
-		}
-
 		client {
 			client()
 
 			if (ENV.MC_CLIENT_ARGS) {
-				programArguments.addAll(ENV.MC_CLIENT_ARGS.split(' '))
+				programArgs.addAll(ENV.MC_CLIENT_ARGS.split(' '))
 			}
 
-			jvmArguments.addAll("-XX:+IgnoreUnrecognizedVMOptions", "-XX:+AllowEnhancedClassRedefinition")
-			gameDirectory = file 'runs/client'
+			vmArgs.addAll("-XX:+IgnoreUnrecognizedVMOptions", "-XX:+AllowEnhancedClassRedefinition")
+			runDir = 'runs/client'
 		}
 
 		server {
 			server()
-			programArgument("--nogui")
-			gameDirectory = file 'runs/server'
-		}
-	}
-
-	mods {
-		kubejs {
-			sourceSet sourceSets.main
+			programArgs.add("--nogui")
+			runDir = 'runs/server'
 		}
 	}
-
-	parchment {
-		minecraftVersion = parchment_mc_version
-		mappingsVersion = parchment_mapping_version
-	}
 }
 
 compileJava {
@@ -71,18 +47,14 @@ compileJava {
 }
 
 java {
-	sourceCompatibility = targetCompatibility = '21'
+	sourceCompatibility = targetCompatibility = JavaLanguageVersion.of(21)
 	withSourcesJar()
 }
 
 repositories {
 	mavenLocal()
 	mavenCentral()
 
-	maven {
-		url "https://maven.neoforged.net/releases"
-	}
-
 	maven {
 		name = 'ParchmentMC'
 		url = 'https://maven.parchmentmc.org'
@@ -126,29 +98,37 @@ repositories {
 			includeGroup "com.github.rtyley"
 		}
 	}
+
+	maven { url = "https://mvn.devos.one/snapshots/" }
 }
 
 dependencies {
-	api("dev.latvian.mods:rhino:$rhino_version") { transitive(false) }
+	// To change the versions see the gradle.properties file
+	minecraft "com.mojang:minecraft:${project.minecraft_version}"
+	mappings loom.layered() {
+		officialMojangMappings()
+		parchment("org.parchmentmc.data:parchment-${project.parchment_mc_version}:${project.parchment_mapping_version}")
+	}
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-	compileOnly("dev.architectury:architectury-neoforge:$architectury_version")
-	compileOnly("mezz.jei:jei-1.21.1-neoforge:$jei_version")
-	compileOnly("me.shedaniel:RoughlyEnoughItems-neoforge:$rei_version")
-	compileOnly("dev.emi:emi-neoforge:$emi_version:api")
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-	additionalRuntimeClasspath(jarJar(implementation('dev.latvian.apps:tiny-java-server'))) {
-		version {
-			strictly "[$tiny_server_version,)"
-			prefer "$tiny_server_version"
-		}
-	}
+	modImplementation("teamreborn:energy:4.1.0")
 
-	additionalRuntimeClasspath(jarJar(implementation("com.github.rtyley:animated-gif-lib-for-java"))) {
-		version {
-			strictly "[animated-gif-lib-$gif_lib_version,)"
-			prefer "animated-gif-lib-$gif_lib_version"
-		}
-	}
+	modApi("dev.latvian.mods:rhino:$rhino_version") { transitive(false) }
+
+	modCompileOnly("dev.architectury:architectury-fabric:$architectury_version")
+	modCompileOnly("mezz.jei:jei-1.21.1-fabric:$jei_version")
+	modCompileOnly("me.shedaniel:RoughlyEnoughItems-fabric:$rei_version")
+	modCompileOnly("dev.emi:emi-fabric:$emi_version:api")
+
+	implementation("dev.latvian.apps:tiny-java-server:${project.tiny_server_version}")
+	include("dev.latvian.apps:tiny-java-server:${project.tiny_server_version}")
+
+	implementation("com.github.rtyley:animated-gif-lib-for-java:animated-gif-lib-${project.gif_lib_version}")
+	include("com.github.rtyley:animated-gif-lib-for-java:animated-gif-lib-${project.gif_lib_version}")
+
+	implementation("com.google.code.findbugs:jsr305:3.0.2")
 }
 
 processResources {
@@ -160,7 +140,7 @@ processResources {
 	println("[Process Resources] Replacing properties in resources: " + toReplace)
 
 	inputs.properties toReplace
-	filesMatching("META-INF/neoforge.mods.toml") {
+	filesMatching("fabric.mod.json") {
 		expand toReplace
 	}
 }
@@ -188,6 +168,7 @@ publishing {
 	}
 
 	repositories {
+		/*
 		if (ENV.MAVEN_URL && ENV.MAVEN_USERNAME && ENV.MAVEN_TOKEN) {
 			maven {
 				url = ENV.MAVEN_URL
@@ -197,16 +178,17 @@ publishing {
 				}
 			}
 		}
+		 */
 	}
 }
 
 unifiedPublishing {
 	project {
 		releaseType = "${ENV.RELEASE_TYPE ?: 'release'}"
-		gameVersions = Arrays.asList(rootProject.supported_versions.split(', '))
-		gameLoaders = ["neoforge"]
-		displayName = "$mod_name NeoForge $project.version"
-		changelog = "https://kubejs.com/changelog?mc=${project.minecraft_version}"
+		gameVersions = Arrays.asList(project.supported_versions.split(', '))
+		gameLoaders = ["fabric"]
+		displayName = "$mod_name Fabric $project.version"
+		//changelog = "https://kubejs.com/changelog?mc=${project.minecraft_version}"
 		mainPublication jar
 
 		relations {
@@ -232,13 +214,6 @@ unifiedPublishing {
 	}
 }
 
-idea {
-	module {
-		downloadSources = true
-		downloadJavadoc = true
-	}
-}
-
 afterEvaluate {
 	tasks.withType(JavaCompile) {
 		options.compilerArgs << "-Xmaxerrs" << "1000"

gradle.properties

@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 mod_id=kubejs
-archives_base_name=kubejs-neoforge
+archives_base_name=kubejs-fabric
 mod_name=KubeJS
 maven_group=dev.latvian.mods
 mod_author=latvian.dev
@@ -13,7 +13,8 @@ minecraft_version=1.21.1
 supported_versions=1.21.1, 1.21
 mod_version=2101.7.2
 
-neoforge_version=21.1.97
+loader_version=0.16.9
+fabric_version=0.114.0+1.21.1
 parchment_mc_version=1.21.1
 parchment_mapping_version=2024.11.17
 rhino_version=2101.2.7-build.74

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -3,13 +3,10 @@ pluginManagement {
 		mavenLocal()
 		gradlePluginPortal()
 		mavenCentral()
-		maven { url "https://maven.neoforged.net/releases" }
+		maven {
+			name = 'Fabric'
+			url = 'https://maven.fabricmc.net/'
+		}
 		maven { url "https://maven.creeperhost.net/" }
 	}
 }
-
-plugins {
-	id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
-}
-
-rootProject.name = 'KubeJS-1.21.1'

src/main/java/dev/latvian/mods/kubejs/KubeJS.java

@@ -9,6 +9,7 @@
 import dev.latvian.mods.kubejs.ingredient.KubeJSIngredients;
 import dev.latvian.mods.kubejs.item.creativetab.KubeJSCreativeTabs;
 import dev.latvian.mods.kubejs.level.ruletest.KubeJSRuleTests;
+import dev.latvian.mods.kubejs.net.KubeJSNet;
 import dev.latvian.mods.kubejs.plugin.KubeJSPlugin;
 import dev.latvian.mods.kubejs.plugin.KubeJSPlugins;
 import dev.latvian.mods.kubejs.plugin.builtin.event.StartupEvents;
@@ -20,15 +21,10 @@
 import dev.latvian.mods.kubejs.script.ScriptType;
 import dev.latvian.mods.kubejs.script.data.KubeFileResourcePack;
 import dev.latvian.mods.kubejs.util.RecordDefaults;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.ModContainer;
 import net.minecraft.resources.ResourceLocation;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.bus.api.IEventBus;
-import net.neoforged.fml.ModContainer;
-import net.neoforged.fml.ModList;
-import net.neoforged.fml.common.Mod;
-import net.neoforged.neoforge.common.NeoForgeMod;
-import net.neoforged.neoforgespi.language.IModFileInfo;
-import net.neoforged.neoforgespi.language.IModInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,7 +33,6 @@
 import java.nio.file.Files;
 import java.util.ArrayList;
 
-@Mod(KubeJS.MOD_ID)
 public class KubeJS {
 	public static final String MOD_ID = "kubejs";
 	public static final String MOD_NAME = "KubeJS";
@@ -48,11 +43,12 @@ public class KubeJS {
 	public static String VERSION = "0";
 	public static String DISPLAY_NAME = "KubeJS";
 
+	public static KubeJS instance;
+
 	public static ResourceLocation id(String path) {
 		return ResourceLocation.fromNamespaceAndPath(MOD_ID, path);
 	}
 
-	public static IEventBus modEventBus;
 	public static ModContainer thisMod;
 
 	public static KubeJSCommon PROXY = new KubeJSCommon();
@@ -67,12 +63,12 @@ public static ScriptManager getClientScriptManager() {
 		return clientScriptManager;
 	}
 
-	public KubeJS(IEventBus bus, Dist dist, ModContainer mod) throws Throwable {
-		modEventBus = bus;
-		thisMod = mod;
-		VERSION = mod.getModInfo().getVersion().toString();
+	public KubeJS() throws Throwable {
+		instance = this;
+		thisMod = FabricLoader.getInstance().getModContainer(MOD_ID).orElseThrow();
+		VERSION = thisMod.getMetadata().getVersion().getFriendlyString();
 		DISPLAY_NAME = "KubeJS " + VERSION;
-		QUERY = "source=kubejs&mc=" + MC_VERSION_NUMBER + "&loader=neoforge&v=" + URLEncoder.encode(mod.getModInfo().getVersion().toString(), StandardCharsets.UTF_8);
+		QUERY = "source=kubejs&mc=" + MC_VERSION_NUMBER + "&loader=fabric&v=" + URLEncoder.encode(thisMod.getMetadata().getVersion().getFriendlyString(), StandardCharsets.UTF_8);
 
 		if (Files.notExists(KubeJSPaths.README)) {
 			try {
@@ -115,11 +111,11 @@ public KubeJS(IEventBus bus, Dist dist, ModContainer mod) throws Throwable {
 
 		var pluginTimer = Stopwatch.createStarted();
 		LOGGER.info("Looking for KubeJS plugins...");
-		var allMods = new ArrayList<>(ModList.get().getMods().stream().map(IModInfo::getOwningFile).map(IModFileInfo::getFile).toList());
-		var thisModFile = mod.getModInfo().getOwningFile().getFile();
-		allMods.remove(thisModFile);
-		allMods.addFirst(thisModFile);
-		KubeJSPlugins.load(allMods, dist == Dist.CLIENT);
+		var allMods = new ArrayList<>(FabricLoader.getInstance().getAllMods());
+		//var thisModFile = mod.getModInfo().getOwningFile().getFile();
+		allMods.remove(thisMod);
+		allMods.addFirst(thisMod);
+		KubeJSPlugins.load(allMods, FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT);
 		LOGGER.info("Done in " + pluginTimer.stop());
 
 		KubeJSPlugins.forEachPlugin(KubeJSPlugin::init);
@@ -130,7 +126,7 @@ public KubeJS(IEventBus bus, Dist dist, ModContainer mod) throws Throwable {
 			startupScriptManager.reload();
 		}
 
-		if (dist.isClient()) {
+		if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
 			clientScriptManager = new ClientScriptManager();
 
 			if (!datagen) {
@@ -140,26 +136,27 @@ public KubeJS(IEventBus bus, Dist dist, ModContainer mod) throws Throwable {
 
 		KubeJSPlugins.forEachPlugin(KubeJSPlugin::initStartup);
 
-		if (dist.isClient()) {
+		if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
 			KubeFileResourcePack.scanForInvalidFiles("kubejs/assets/", KubeJSPaths.ASSETS);
 		}
 
 		KubeFileResourcePack.scanForInvalidFiles("kubejs/data/", KubeJSPaths.DATA);
 
-		if (dist.isClient() || !CommonProperties.get().serverOnly) {
-			// See NeoForgeRegistriesSetup.VANILLA_SYNC_REGISTRIES
-			NeoForgeMod.enableMilkFluid();
+		if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT || !CommonProperties.get().serverOnly) {
 			// KubeJSComponents.REGISTRY.register(bus);
-			KubeJSRecipeSerializers.REGISTRY.register(bus);
-			KubeJSMenus.REGISTRY.register(bus);
+			KubeJSRecipeSerializers.init();
+			KubeJSMenus.init();
 		}
 
-		KubeJSIngredients.REGISTRY.register(bus);
-		KubeJSFluidIngredients.REGISTRY.register(bus);
-		KubeJSCreativeTabs.REGISTRY.register(bus);
-		KubeJSRuleTests.REGISTRY.register(bus);
-		KubeJSHolderSets.REGISTRY.register(bus);
+		KubeJSIngredients.init();
+		KubeJSFluidIngredients.init();
+		KubeJSCreativeTabs.init();
+		KubeJSRuleTests.init();
+		KubeJSHolderSets.init();
+	}
 
+	public void setup() {
+		KubeJSNet.register();
 		StartupEvents.INIT.post(ScriptType.STARTUP, KubeStartupEvent.BASIC);
 		// KubeJSRegistries.chunkGenerators().register(new ResourceLocation(KubeJS.MOD_ID, "flat"), () -> KJSFlatLevelSource.CODEC);
 	}

src/main/java/dev/latvian/mods/kubejs/KubeJSCommon.java

@@ -5,10 +5,10 @@
 import dev.latvian.mods.kubejs.script.ScriptType;
 import dev.latvian.mods.kubejs.script.data.ExportablePackResources;
 import dev.latvian.mods.kubejs.web.WebServerProperties;
+import me.textrue.kubejs.fabric.thirdparty.util.ServerLifecycleHooks;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.entity.player.Player;
-import net.neoforged.neoforge.server.ServerLifecycleHooks;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.List;