diff --git a/build.gradle b/build.gradle
index a3bf946..291ee5e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,28 +2,16 @@ plugins {
     id 'fabric-loom' version "${fabric_loom}" apply false
     id 'net.neoforged.moddev' version "${neoforge_moddevgradle}" apply false
 
-    id "io.github.pacifistmc.forgix" version "1.2.9"
+    id "io.github.pacifistmc.forgix" version "${forgix_version}"
 }
 
 forgix {
-    group = "dev.mrsnowy.teleport_commands"
-    mergedJarName = "${mod_id}-${minecraft_version}-v${version}.jar"
-    outputDir = "merged/build/libs"
+    archiveBaseName = "${mod_id}"
+    archiveVersion = "merged-${minecraft_version}-v${version}"
+    archiveClassifier = ""
 
-    // NeoForge Project Configuration
-    neoforge {
-        projectName = "neoforge" // Name of the NeoForge subproject
+    destinationDirectory = layout.projectDirectory.dir("merged/build/libs")
 
-//        // Mixin configuration files (if applicable)
-//        mixin "${mod_id}.mixins.json"
-//        mixin "${mod_id}-forge.mixins.json"
-        jarLocation = "build/libs/${mod_id}-neoforge-${minecraft_version}-v${version}.jar"
-    }
-
-    // Fabric Project Configuration
-    fabric {
-        projectName = "fabric" // Name of the Fabric subproject
-
-        jarLocation = "build/libs/${mod_id}-fabric-${minecraft_version}-v${version}.jar"
-    }
+    fabric()
+    neoforge()
 }
\ No newline at end of file
diff --git a/buildSrc/src/main/groovy/multiloader-common.gradle b/buildSrc/src/main/groovy/multiloader-common.gradle
index c44ef7d..2f90dbc 100644
--- a/buildSrc/src/main/groovy/multiloader-common.gradle
+++ b/buildSrc/src/main/groovy/multiloader-common.gradle
@@ -22,19 +22,19 @@ repositories {
         }
         filter { includeGroupAndSubgroups('org.spongepowered') }
     }
-    exclusiveContent {
-        forRepositories(
-                maven {
-                    name = 'ParchmentMC'
-                    url = 'https://maven.parchmentmc.org/'
-                },
-                maven {
-                    name = "NeoForge"
-                    url = 'https://maven.neoforged.net/releases'
-                }
-        )
-        filter { includeGroup('org.parchmentmc.data') }
-    }
+//    exclusiveContent {
+//        forRepositories(
+//                maven {
+//                    name = 'ParchmentMC'
+//                    url = 'https://maven.parchmentmc.org/'
+//                },
+//                maven {
+//                    name = "NeoForge"
+//                    url = 'https://maven.neoforged.net/releases'
+//                }
+//        )
+//        filter { includeGroup('org.parchmentmc.data') }
+//    }
     maven {
         name = 'BlameJared'
         url = 'https://maven.blamejared.com'
diff --git a/common/build.gradle b/common/build.gradle
index ca3cb04..31eb064 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -5,7 +5,7 @@ plugins {
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(25)
+        languageVersion = JavaLanguageVersion.of("${java_version}")
     }
 }
 
@@ -20,10 +20,10 @@ neoForge {
         neoFormVersion = neo_form_version
         disableRecompilation = true
     }
-    parchment {
-        minecraftVersion = parchment_minecraft
-        mappingsVersion = parchment_version
-    }
+//    parchment {
+//        minecraftVersion = parchment_minecraft
+//        mappingsVersion = parchment_version
+//    }
 }
 
 dependencies {
diff --git a/gradle.properties b/gradle.properties
index 8a798f4..9bc9ac2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -16,14 +16,17 @@ credits=Mr. Snowy
 description=A server-side mod that adds various teleportation related commands.
 minecraft_version_range=[26.1]
 
+# see https://github.com/PacifistMC/Forgix
+forgix_version = 2.0.0-SNAPSHOT.5.1
+
 # see https://projects.neoforged.net/neoforged/neoform for new versions
 neo_form_version=26.1-1
 
-# see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions
-# TODO Update 26.1
-parchment_minecraft=1.21.11
-# There is no new version for now
-parchment_version=2025.12.20
+## see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions
+## TODO Update 26.1
+#parchment_minecraft=1.21.11
+## There is no new version for now
+#parchment_version=2025.12.20
 
 # see https://fabricmc.net/develop/ for new versions
 fabric_loader_version=0.18.5
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
index 1dea13b..b526b89 100644
--- a/neoforge/build.gradle
+++ b/neoforge/build.gradle
@@ -21,10 +21,10 @@ neoForge {
         accessTransformers.from(at.absolutePath)
     }
 
-    parchment {
-        minecraftVersion = parchment_minecraft
-        mappingsVersion = parchment_version
-    }
+//    parchment {
+//        minecraftVersion = parchment_minecraft
+//        mappingsVersion = parchment_version
+//    }
 
     runs {
         configureEach {