diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 45f3162..5123cc3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -2,168 +2,76 @@ name: Publish on Modrinth & CurseForge
 
 on:
   workflow_dispatch:
-    secrets:
-      CURSEFORGE_TOKEN:
-        required: true
-      MODRINTH_TOKEN:
-        required: true
+
+secrets:
+  CURSEFORGE_TOKEN:
+    required: true
+  MODRINTH_TOKEN:
+    required: true
+
+permissions:
+  contents: write
 
 jobs:
-  build:
+  publish:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Branch
-        uses: actions/checkout@v3
-
-      - name: Get Artifact Id
-        uses: actions/github-script@v5
-        env:
-          branch: ${{ github.head_ref || github.ref_name }}   
-        id: artifact_id
-        with:
-          result-encoding: string
-          script: |
-            // use env branch replace / with _
-            return process.env.branch.replace(/\//g, '_')
+        uses: actions/checkout@v6
 
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'adopt'
-          java-version: 21
+          java-version: 25
 
       - name: Grant Execute Permission
         run: chmod +x gradlew
 
       - name: Build
-        run: |
-          ./gradlew build
-
-      - name: Upload To Artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: ${{ steps.artifact_id.outputs.result }}
-          path: |
-            ./dist/**/*
-            ./fabric/build/libs
-            ./forge/build/libs
-            ./gradle.properties
-
-  deploy:
-    runs-on: ubuntu-latest
-    needs:
-      - build
-    steps:
-      - name: Checkout Branch
-        uses: actions/checkout@v3
-          
-      - name: Get Artifact Id
-        uses: actions/github-script@v5
-        env:
-          branch: ${{ github.head_ref || github.ref_name }}   
-        id: artifact_id
-        with:
-          result-encoding: string
-          script: |
-            // use env branch replace / with _
-            return process.env.branch.replace(/\//g, '_')
-
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'adopt'
-          java-version: 21
-
-      - name: Download Artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: ${{ steps.artifact_id.outputs.result }}
+        run: ./gradlew build
 
       - name: Load Gradle Properties
         uses: christian-draeger/read-properties@1.1.1
         id: gradle_properties
         with:
           path: './gradle.properties'
-          properties: 'java_version minecraft_version mod_version'
-
-      - name: Check For Fabric Jar
-        uses: actions/github-script@v5
-        id: fabric_release
-        with:
-          result-encoding: string
-          script: |
-            const fs = require("fs")
-            return fs.readdirSync("./fabric/build/libs")[0] || false;
-
-      - name: Check For Forge Jar
-        uses: actions/github-script@v5
-        id: forge_release
-        with:
-          result-encoding: string
-          script: |
-            const fs = require("fs")
-            return fs.readdirSync("./forge/build/libs")[0] || false;
+          properties: 'minecraft_version mod_version'
 
-      - name: Run Publish Fabric
-        if: ${{ steps.fabric_release.outputs.result != 'false' }}
+      - name: Run Publish
+        id: publish_merged
         uses: Kir-Antipov/mc-publish@v3.3
-        id: publish_fabric
         with:
           modrinth-id: OI3FlFon
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
-          modrinth-featured: false
+          modrinth-featured: true
           modrinth-unfeature-mode: any
 
-          curseforge-id: 1302303
-          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
-
-          name: ${{ steps.gradle_properties.outputs.mod_version }}+${{ steps.gradle_properties.outputs.minecraft_version }}-Fabric
-          version: ${{ steps.gradle_properties.outputs.mod_version }}
-
-          files: |
-            ./fabric/build/libs/!(*-@(dev|sources|javadoc|all|dev-shadow)).jar
-            ./fabric/build/libs/*-@(dev|sources|javadoc|all|dev-shadow).jar
-          version-type: release
-
-          loaders: fabric
-          game-versions: |
-            ${{ steps.gradle_properties.outputs.minecraft_version }}
-
-          changelog-file: CHANGELOG.md
-
-          java: ${{ steps.gradle_properties.outputs.java_version }}
-          retry-attempts: 5
-          retry-delay: 60000
-          fail-mode: skip
-
-      - name: Run Publish Forge
-        if: ${{ steps.forge_release.outputs.result != 'false' }}
-        uses: Kir-Antipov/mc-publish@v3.3
-        id: publish_forge
-        with:
-          modrinth-id: OI3FlFon
-          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
-          modrinth-featured: false
-          modrinth-unfeature-mode: any
+          github-tag: v${{ steps.gradle_properties.outputs.mod_version }}+${{ steps.gradle_properties.outputs.minecraft_version }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
 
           curseforge-id: 1302303
           curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
 
-          name: ${{ steps.gradle_properties.outputs.mod_version }}+${{ steps.gradle_properties.outputs.minecraft_version }}-NeoForge
+          name: ${{ steps.gradle_properties.outputs.mod_version }}+${{ steps.gradle_properties.outputs.minecraft_version }}
           version: ${{ steps.gradle_properties.outputs.mod_version }}
 
           files: |
-            ./forge/build/libs/!(*-@(dev|sources|javadoc|all|dev-shadow)).jar
-            ./forge/build/libs/*-@(dev|sources|javadoc|all|dev-shadow).jar
-          version-type: release
+            ./build/libs/BendableCuboidsMerged-*.jar
+          version-type: beta
+
+          loaders: |
+            fabric
+            neoforge
 
-          loaders: neoforge
           game-versions: |
             ${{ steps.gradle_properties.outputs.minecraft_version }}
+            26.1.1
+            26.1
 
           changelog-file: CHANGELOG.md
 
-          java: ${{ steps.gradle_properties.outputs.java_version }}
+          java: 25
           retry-attempts: 5
           retry-delay: 60000
           fail-mode: skip
@@ -174,22 +82,11 @@ jobs:
           {
             echo 'P2D_LINKS<<EOF'
 
-            # --- Fabric ---
-            if [ -n "${{ steps.publish_fabric.outputs.modrinth-url }}" ]; then
-              echo "Modrinth (Fabric)|${{ steps.publish_fabric.outputs.modrinth-url }}|MODRINTH"
-            fi
-            if [ -n "${{ steps.publish_fabric.outputs.curseforge-url }}" ]; then
-              echo "CurseForge (Fabric)|${{ steps.publish_fabric.outputs.curseforge-url }}|CURSEFORGE"
-            fi
-
-            echo ""
-
-            # --- NeoForge ---
-            if [ -n "${{ steps.publish_forge.outputs.modrinth-url }}" ]; then
-              echo "Modrinth (NeoForge)|${{ steps.publish_forge.outputs.modrinth-url }}|MODRINTH"
+            if [ -n "${{ steps.publish_merged.outputs.modrinth-url }}" ]; then
+              echo "Modrinth|${{ steps.publish_merged.outputs.modrinth-url }}|MODRINTH"
             fi
-            if [ -n "${{ steps.publish_forge.outputs.curseforge-url }}" ]; then
-              echo "CurseForge (NeoForge)|${{ steps.publish_forge.outputs.curseforge-url }}|CURSEFORGE"
+            if [ -n "${{ steps.publish_merged.outputs.curseforge-url }}" ]; then
+              echo "CurseForge|${{ steps.publish_merged.outputs.curseforge-url }}|CURSEFORGE"
             fi
 
             echo 'EOF'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa0a50f..3ff3861 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1 +1 @@
-- Update to new PAL
\ No newline at end of file
+- Port to 26.1.X
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 40ce2b4..75e6658 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,106 +1,161 @@
 import org.redlance.dima_dencep.gradle.publish2discord.tasks.PublishDiscordTask
-import org.apache.commons.lang3.StringUtils
 
 plugins {
-    id "org.redlance.dima_dencep.gradle.PublishToDiscord" version "1.0.6"
-    id "com.gradleup.shadow" version "9.2.2" apply false
-    id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.13-SNAPSHOT" apply false
+    id "org.redlance.dima_dencep.gradle.PublishToDiscord" version "1.0.8"
+    id "com.gradleup.shadow" version "9.4.1"
+    id "xyz.wagyourtail.unimined" version "1.4.2-SNAPSHOT"
+    id "maven-publish"
 }
 
-architectury {
-    minecraft = rootProject.minecraft_version
-}
+base.archivesName = rootProject.archives_base_name
+version = "${rootProject.mod_version}+mc.${rootProject.minecraft_version}"
+group = rootProject.maven_group
 
-subprojects {
-    apply plugin: "dev.architectury.loom"
+sourceSets {
+    fabric
+    neoforge
+}
 
-    loom {
-        silentMojangMappingsLicense()
+repositories {
+    mavenLocal()
+    // Fix issue with lwjgl-freetype not being found on macOS
+    maven {
+        url = "https://libraries.minecraft.net"
+        content {
+            includeModule("org.lwjgl", "lwjgl-freetype")
+        }
     }
-
-    dependencies {
-        minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-        mappings loom.layered() {
-            officialMojangMappings()
-            parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip")
+    maven {
+        name = "NeoForged"
+        url = "https://maven.neoforged.net/releases"
+    }
+    maven {
+        name = "RedlanceMinecraft"
+        url = "https://repo.redlance.org/public"
+    }
+    maven {
+        name = "Modrinth"
+        url = "https://api.modrinth.com/maven"
+        content {
+            includeGroup "maven.modrinth"
         }
     }
 }
 
-allprojects {
-    apply plugin: "java"
-    apply plugin: "architectury-plugin"
-    apply plugin: "maven-publish"
+configurations {
+    shadow
+}
 
-    base.archivesName = "${rootProject.archives_base_name}${StringUtils.capitalize(project.name)}"
-    version = "${rootProject.mod_version}+mc.${rootProject.minecraft_version}"
-    group = rootProject.maven_group
+unimined.minecraft(sourceSets.main) {
+    version minecraft_version
 
-    repositories {
-        mavenLocal()
-        // Fix issue with lwjgl-freetype not being found on macOS
-        maven {
-            url = "https://libraries.minecraft.net"
-            content {
-                includeModule("org.lwjgl", "lwjgl-freetype")
-            }
-        }
-        maven {
-            name = "NeoForged"
-            url = "https://maven.neoforged.net/releases"
-        }
-        maven {
-            name = "RedlanceMinecraft"
-            url = "https://repo.redlance.org/public"
-        }
-        maven {
-            name = "Modrinth"
-            url = "https://api.modrinth.com/maven"
-            content {
-                includeGroup "maven.modrinth"
-            }
-        }
+    fabric {
+        loader fabric_loader_version
+        accessWidener file("src/main/resources/bendable_cuboids.classtweaker")
     }
 
-    tasks.withType(JavaCompile).configureEach {
-        options.encoding = "UTF-8"
-        options.release.set 21
+    defaultRemapJar = false
+}
+
+unimined.minecraft(sourceSets.fabric) {
+    combineWith(sourceSets.main)
+
+    fabric {
+        loader fabric_loader_version
+        accessWidener file("src/main/resources/bendable_cuboids.classtweaker")
     }
+    defaultRemapJar = true
+}
 
-    jar {
-        if (!rootProject.version.toString().contains("dev") && !project.gradle.startParameter.taskNames.contains("runClient"))
-            processResources.exclude('assets/bendable_cuboids/player_animations/*')
+unimined.minecraft(sourceSets.neoforge) {
+    combineWith(sourceSets.main)
+
+    neoForge {
+        loader("net.neoforged:neoforge:$neoforge_version:universal")
+        mixinConfig("bendable_cuboids.mixins.json")
+
+        accessTransformer(provider {
+            def transformed = file("src/main/resources/bendable_cuboids.classtweaker").text
+                    .replaceFirst(/classTweaker\s+v\d+\s+(\S+)/, 'accessWidener v2 $1')
+                    .readLines()
+                    .findAll { line ->
+                        !line.trim().startsWith("transitive-inject-interface") && !line.trim().startsWith("inject-interface")
+                    }
+                    .join("\n")
+
+            def out = layout.buildDirectory.file("generated/bendable_cuboids.classtweaker").get().asFile
+            try {
+                out.parentFile.mkdirs()
+                out.write(transformed)
+                return aw2at(out)
+            } finally {
+                out.delete()
+            }
+        }.get())
     }
+    defaultRemapJar = true
+}
+
+dependencies {
+    // Common
+    compileOnly("com.zigythebird.playeranim:PlayerAnimationLibCommon:${rootProject.player_anim_version}")
+    compileOnly("com.zigythebird.playeranim:PlayerAnimationLibCore:${rootProject.player_anim_version}")
+    compileOnly("maven.modrinth:3dskinlayers:8kxiY3G1")
+
+    // Fabric
+    fabricImplementation("com.zigythebird.playeranim:PlayerAnimationLibFabric:${rootProject.player_anim_version}")
+
+    // NeoForge
+    neoforgeImplementation("com.zigythebird.playeranim:PlayerAnimationLibNeo:${rootProject.player_anim_version}")
+}
+
+shadowJar {
+    configurations = [project.configurations.shadow]
+
+    from(tasks.named("remapFabricJar").map { zipTree(it.archiveFile) })
+    from(tasks.named("remapNeoforgeJar").map { zipTree(it.archiveFile) })
 
-    java {
-        withSourcesJar()
+    archiveBaseName.set("${rootProject.archives_base_name}Merged")
+    archiveClassifier.set null
+
+    // Services
+    filesMatching('META-INF/services/**') {
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
     }
+    mergeServiceFiles()
 
-    publishing {
-        repositories {
-            maven {
-                name = "RedlanceMinecraft"
-                url = "https://repo.redlance.org/public"
-                credentials {
-                    username = "dima_dencep"
-                    password = System.getenv("MAVEN_PASSWORD")
-                }
-            }
-        }
+    // Fix fabric jij
+    filesMatching("META-INF/jarjar/*.jar") {
+        path = path.replace("META-INF/jarjar/", "META-INF/jars/")
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    }
+    filesMatching('META-INF/jarjar/metadata.json') {
+        filter { it.replace('META-INF/jarjar/', 'META-INF/jars/') }
+    }
+}
+
+[tasks.processResources, tasks.processFabricResources, tasks.processNeoforgeResources].each {
+    def buildProps = rootProject.properties.clone()
+    buildProps.put("version", version)
+
+    // Another workaround
+    buildProps.put("fabric_minecraft_version", minecraft_version.replace('-snapshot-', '-alpha.'))
+
+    it.filesMatching(["META-INF/neoforge.mods.toml", "fabric.mod.json"]) {
+        expand buildProps
     }
 }
 
 tasks.register("publishToDiscord", PublishDiscordTask) {
     url.set(providers.environmentVariable("DISCORD_WEBHOOK"))
     username.set("BendableCuboids Updates")
-    avatar.set("https://raw.githubusercontent.com/PlayerAnimationLibrary/BendableCuboids/refs/heads/main/common/src/main/resources/assets/bendable_cuboids/icon.png")
+    avatar.set("https://raw.githubusercontent.com/PlayerAnimationLibrary/BendableCuboids/refs/heads/main/src/main/resources/assets/bendable_cuboids/icon.png")
 
     container {
         it.title = "## ✨ ${rootProject.archives_base_name}\n### v${version} is out!"
         it.description = "### Changes:\n${rootProject.file("CHANGELOG.md").getText("UTF-8")}"
 
-        it.thumbnail("https://raw.githubusercontent.com/PlayerAnimationLibrary/BendableCuboids/refs/heads/main/common/src/main/resources/assets/bendable_cuboids/icon.png")
+        it.thumbnail("https://raw.githubusercontent.com/PlayerAnimationLibrary/BendableCuboids/refs/heads/main/src/main/resources/assets/bendable_cuboids/icon.png")
         it.timestamp(System.currentTimeMillis())
     }
 
@@ -110,3 +165,49 @@ tasks.register("publishToDiscord", PublishDiscordTask) {
 
     footer = "||<@&1411332102942752798>||"
 }
+
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = "UTF-8"
+    options.release.set 25
+}
+
+jar {
+    if (!rootProject.version.toString().contains("dev") && !project.gradle.startParameter.taskNames.contains("runClient")) {
+        processResources.exclude('assets/bendable_cuboids/player_animations/*')
+    }
+    archiveClassifier.set "dev"
+}
+
+shadow {
+    addShadowVariantIntoJavaComponent = false
+}
+
+tasks.register("mergedSourcesJar", Jar) {
+    from sourceSets.main.allSource
+    from sourceSets.fabric.allSource
+    from sourceSets.neoforge.allSource
+
+    archiveBaseName.set("${rootProject.archives_base_name}Merged")
+    archiveClassifier.set("sources")
+}
+
+publishing {
+    publications {
+        mavenMain(MavenPublication) {
+            artifactId = "BendableCuboidsMerged"
+
+            artifact shadowJar
+            artifact mergedSourcesJar
+        }
+    }
+    repositories {
+        maven {
+            name = "RedlanceMinecraft"
+            url = "https://repo.redlance.org/public"
+            credentials {
+                username = "dima_dencep"
+                password = System.getenv("MAVEN_PASSWORD")
+            }
+        }
+    }
+}
diff --git a/common/build.gradle b/common/build.gradle
deleted file mode 100644
index 01b05f4..0000000
--- a/common/build.gradle
+++ /dev/null
@@ -1,22 +0,0 @@
-loom {
-    accessWidenerPath = file("src/main/resources/bendable_cuboids.accesswidener")
-}
-
-dependencies {
-    modCompileOnly "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-
-    modCompileOnly "com.zigythebird.playeranim:PlayerAnimationLibCommon:${rootProject.player_anim_version}"
-    compileOnly "com.zigythebird.playeranim:PlayerAnimationLibCore:${rootProject.player_anim_version}"
-
-    // Third-party
-    modCompileOnly "maven.modrinth:3dskinlayers:MQXq1li8"
-}
-
-publishing {
-    publications {
-        mavenCommon(MavenPublication) {
-            artifactId = "BendableCuboidsCommon"
-            from components.java
-        }
-    }
-}
diff --git a/common/src/main/resources/architectury.common.json b/common/src/main/resources/architectury.common.json
deleted file mode 100644
index 5e8a6ef..0000000
--- a/common/src/main/resources/architectury.common.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  "injected_interfaces": {
-    "net/minecraft/class_5607": [
-      "com/zigythebird/bendable_cuboids/api/ILayerDefinition"
-    ],
-    "net/minecraft/class_5610": [
-      "com/zigythebird/bendable_cuboids/api/IPartDefinition"
-    ],
-    "net/minecraft/class_5604": [
-      "com/zigythebird/bendable_cuboids/api/ICubeDefinition"
-    ],
-    "net/minecraft/class_630": [
-      "com/zigythebird/bendable_cuboids/api/BendableModelPart",
-      "com/zigythebird/bendable_cuboids/api/SodiumHelper"
-    ]
-  },
-  "accessWidener": "bendable_cuboids.accesswidener"
-}
\ No newline at end of file
diff --git a/common/src/main/resources/architectury.common.marker b/common/src/main/resources/architectury.common.marker
deleted file mode 100644
index e69de29..0000000
diff --git a/fabric/build.gradle b/fabric/build.gradle
deleted file mode 100644
index 6373631..0000000
--- a/fabric/build.gradle
+++ /dev/null
@@ -1,72 +0,0 @@
-plugins {
-    id "com.gradleup.shadow"
-}
-
-loom {
-    accessWidenerPath = project(":common").loom.accessWidenerPath
-}
-
-architectury {
-    platformSetupLoomIde()
-    fabric()
-}
-
-configurations {
-    common
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-    developmentFabric.extendsFrom common
-}
-
-dependencies {
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-    modImplementation "com.zigythebird.playeranim:PlayerAnimationLibFabric:${rootProject.player_anim_version}"
-
-    common(project(path: ":common", configuration: "namedElements")) { transitive = false }
-}
-
-processResources {
-    inputs.property "version", project.version
-
-    filesMatching("fabric.mod.json") {
-        expand "version": project.version
-    }
-}
-
-shadowJar {
-    configurations = [project.configurations.common]
-    archiveClassifier.set "dev-shadow"
-
-    exclude "architectury.common.marker"
-}
-
-remapJar {
-    injectAccessWidener = true
-
-    inputFile.set shadowJar.archiveFile
-    dependsOn shadowJar
-    archiveClassifier.set null
-}
-
-jar {
-    archiveClassifier.set "dev"
-}
-
-sourcesJar {
-    def commonSources = project(":common").sourcesJar
-    dependsOn commonSources
-    from commonSources.archiveFile.map { zipTree(it) }
-}
-
-shadow {
-    addShadowVariantIntoJavaComponent = false
-}
-
-publishing {
-    publications {
-        mavenFabric(MavenPublication) {
-            artifactId = "BendableCuboidsFabric"
-            from components.java
-        }
-    }
-}
diff --git a/forge/build.gradle b/forge/build.gradle
deleted file mode 100644
index 163569f..0000000
--- a/forge/build.gradle
+++ /dev/null
@@ -1,74 +0,0 @@
-plugins {
-    id "com.gradleup.shadow"
-}
-
-loom {
-    accessWidenerPath = project(":common").loom.accessWidenerPath
-}
-
-architectury {
-    platformSetupLoomIde()
-    neoForge()
-}
-
-configurations {
-    common
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-    developmentNeoForge.extendsFrom common
-}
-
-dependencies {
-    neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}"
-    modImplementation "com.zigythebird.playeranim:PlayerAnimationLibNeo:${rootProject.player_anim_version}"
-
-    common(project(path: ":common", configuration: "namedElements")) { transitive = false }
-}
-
-processResources {
-    inputs.property "version", project.version
-
-    filesMatching("META-INF/neoforge.mods.toml") {
-        expand "version": project.version
-    }
-}
-
-shadowJar {
-    exclude "fabric.mod.json"
-    exclude "architectury.common.json"
-    exclude "architectury.common.marker"
-
-    configurations = [project.configurations.common]
-    archiveClassifier.set "dev-shadow"
-}
-
-remapJar {
-    atAccessWideners.add(loom.accessWidenerPath.get().asFile.name)
-
-    inputFile.set shadowJar.archiveFile
-    dependsOn shadowJar
-    archiveClassifier.set null
-}
-
-jar {
-    archiveClassifier.set "dev"
-}
-
-sourcesJar {
-    def commonSources = project(":common").sourcesJar
-    dependsOn commonSources
-    from commonSources.archiveFile.map { zipTree(it) }
-}
-
-shadow {
-    addShadowVariantIntoJavaComponent = false
-}
-
-publishing {
-    publications {
-        mavenNeoForge(MavenPublication) {
-            artifactId = "BendableCuboidsNeo"
-            from components.java
-        }
-    }
-}
diff --git a/forge/gradle.properties b/forge/gradle.properties
deleted file mode 100644
index 2914393..0000000
--- a/forge/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-loom.platform=neoforge
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index d18fc8f..07f3774 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,15 +3,14 @@ org.gradle.jvmargs=-Xmx4G
 org.gradle.parallel=true
 
 # Mod properties
-mod_version = 2.0.1
+mod_version = 2.0.2
 maven_group = com.zigythebird.bendable_cuboids
 archives_base_name = BendableCuboids
 
 # Minecraft properties
-minecraft_version = 1.21.11
-parchment_version = 2025.12.20
+minecraft_version = 26.1.2
 
 # Dependencies
-fabric_loader_version = 0.18.4
-neoforge_version = 21.11.14-beta
-player_anim_version = 1.1.5+mc.1.21.11
+fabric_loader_version = 0.19.2
+neoforge_version = 26.1.2.29-beta
+player_anim_version = 1.2.2+dev+mc.26.1
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 8bdaf60..f8e1ee3 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 23449a2..c61a118 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
index f00c027..15880e8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,15 +1,10 @@
 pluginManagement {
     repositories {
-        maven { url = "https://maven.fabricmc.net/" }
-        maven { url = "https://maven.architectury.dev/" }
-        maven { url = "https://maven.neoforged.net/releases" }
         maven { url = "https://repo.redlance.org/public" }
+        maven { url = "https://maven.wagyourtail.xyz/releases" }
+        maven { url = "https://maven.wagyourtail.xyz/snapshots" }
         gradlePluginPortal()
     }
 }
 
-include("common")
-include("fabric")
-include("forge")
-
 rootProject.name = "BendableCuboids"
diff --git a/fabric/src/main/java/com/zigythebird/bendable_cuboids/fabric/BendableCuboidsModFabric.java b/src/fabric/java/com/zigythebird/bendable_cuboids/fabric/BendableCuboidsModFabric.java
similarity index 100%
rename from fabric/src/main/java/com/zigythebird/bendable_cuboids/fabric/BendableCuboidsModFabric.java
rename to src/fabric/java/com/zigythebird/bendable_cuboids/fabric/BendableCuboidsModFabric.java
diff --git a/fabric/src/main/resources/fabric.mod.json b/src/fabric/resources/fabric.mod.json
similarity index 82%
rename from fabric/src/main/resources/fabric.mod.json
rename to src/fabric/resources/fabric.mod.json
index edac324..8fdd473 100644
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/src/fabric/resources/fabric.mod.json
@@ -6,8 +6,9 @@
   "description": "Adds model cubes that can be bent, for example like arms in MC Story Mode!",
   "icon": "/assets/bendable_cuboids/icon.png",
   "authors": [
-    "KosmX",
-    "Zigy"
+    "Zigy",
+    "dima_dencep",
+    "KosmX"
   ],
   "contributors": [],
   "contact": {
@@ -25,11 +26,11 @@
     "bendable_cuboids.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.18.4",
-    "minecraft": ">=1.21.11"
+    "fabricloader": ">=${fabric_loader_version}",
+    "minecraft": ">=26.1"
   },
   "breaks": {
-    "player_animation_library": "<1.1.5+mc.1.21.11"
+    "player_animation_library": "<${player_anim_version}"
   },
   "custom": {
     "modmenu": {
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/BendableCuboidsMod.java b/src/main/java/com/zigythebird/bendable_cuboids/BendableCuboidsMod.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/BendableCuboidsMod.java
rename to src/main/java/com/zigythebird/bendable_cuboids/BendableCuboidsMod.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/ModMixinPlugin.java b/src/main/java/com/zigythebird/bendable_cuboids/ModMixinPlugin.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/ModMixinPlugin.java
rename to src/main/java/com/zigythebird/bendable_cuboids/ModMixinPlugin.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/api/Bendable.java b/src/main/java/com/zigythebird/bendable_cuboids/api/Bendable.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/api/Bendable.java
rename to src/main/java/com/zigythebird/bendable_cuboids/api/Bendable.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/api/BendableCube.java b/src/main/java/com/zigythebird/bendable_cuboids/api/BendableCube.java
similarity index 97%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/api/BendableCube.java
rename to src/main/java/com/zigythebird/bendable_cuboids/api/BendableCube.java
index 488aa19..ecea9e1 100644
--- a/common/src/main/java/com/zigythebird/bendable_cuboids/api/BendableCube.java
+++ b/src/main/java/com/zigythebird/bendable_cuboids/api/BendableCube.java
@@ -3,7 +3,6 @@
 import com.zigythebird.bendable_cuboids.impl.Plane;
 import net.minecraft.core.Direction;
 import net.minecraft.util.Mth;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/api/BendableModelPart.java b/src/main/java/com/zigythebird/bendable_cuboids/api/BendableModelPart.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/api/BendableModelPart.java
rename to src/main/java/com/zigythebird/bendable_cuboids/api/BendableModelPart.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/api/ICubeDefinition.java b/src/main/java/com/zigythebird/bendable_cuboids/api/ICubeDefinition.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/api/ICubeDefinition.java
rename to src/main/java/com/zigythebird/bendable_cuboids/api/ICubeDefinition.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/api/ILayerDefinition.java b/src/main/java/com/zigythebird/bendable_cuboids/api/ILayerDefinition.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/api/ILayerDefinition.java
rename to src/main/java/com/zigythebird/bendable_cuboids/api/ILayerDefinition.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/api/IMutableModel.java b/src/main/java/com/zigythebird/bendable_cuboids/api/IMutableModel.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/api/IMutableModel.java
rename to src/main/java/com/zigythebird/bendable_cuboids/api/IMutableModel.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/api/IPartDefinition.java b/src/main/java/com/zigythebird/bendable_cuboids/api/IPartDefinition.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/api/IPartDefinition.java
rename to src/main/java/com/zigythebird/bendable_cuboids/api/IPartDefinition.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/api/SodiumHelper.java b/src/main/java/com/zigythebird/bendable_cuboids/api/SodiumHelper.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/api/SodiumHelper.java
rename to src/main/java/com/zigythebird/bendable_cuboids/api/SodiumHelper.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/impl/BendUtil.java b/src/main/java/com/zigythebird/bendable_cuboids/impl/BendUtil.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/impl/BendUtil.java
rename to src/main/java/com/zigythebird/bendable_cuboids/impl/BendUtil.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/impl/BendableCuboid.java b/src/main/java/com/zigythebird/bendable_cuboids/impl/BendableCuboid.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/impl/BendableCuboid.java
rename to src/main/java/com/zigythebird/bendable_cuboids/impl/BendableCuboid.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/impl/IVertex.java b/src/main/java/com/zigythebird/bendable_cuboids/impl/IVertex.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/impl/IVertex.java
rename to src/main/java/com/zigythebird/bendable_cuboids/impl/IVertex.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/impl/Plane.java b/src/main/java/com/zigythebird/bendable_cuboids/impl/Plane.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/impl/Plane.java
rename to src/main/java/com/zigythebird/bendable_cuboids/impl/Plane.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/impl/Quad.java b/src/main/java/com/zigythebird/bendable_cuboids/impl/Quad.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/impl/Quad.java
rename to src/main/java/com/zigythebird/bendable_cuboids/impl/Quad.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/impl/RememberingPos.java b/src/main/java/com/zigythebird/bendable_cuboids/impl/RememberingPos.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/impl/RememberingPos.java
rename to src/main/java/com/zigythebird/bendable_cuboids/impl/RememberingPos.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/impl/RepositionableVertex.java b/src/main/java/com/zigythebird/bendable_cuboids/impl/RepositionableVertex.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/impl/RepositionableVertex.java
rename to src/main/java/com/zigythebird/bendable_cuboids/impl/RepositionableVertex.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/impl/Vertex.java b/src/main/java/com/zigythebird/bendable_cuboids/impl/Vertex.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/impl/Vertex.java
rename to src/main/java/com/zigythebird/bendable_cuboids/impl/Vertex.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/impl/compatibility/PlayerBendHelper.java b/src/main/java/com/zigythebird/bendable_cuboids/impl/compatibility/PlayerBendHelper.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/impl/compatibility/PlayerBendHelper.java
rename to src/main/java/com/zigythebird/bendable_cuboids/impl/compatibility/PlayerBendHelper.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/impl/compatibility/SkinLayersCompat.java b/src/main/java/com/zigythebird/bendable_cuboids/impl/compatibility/SkinLayersCompat.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/impl/compatibility/SkinLayersCompat.java
rename to src/main/java/com/zigythebird/bendable_cuboids/impl/compatibility/SkinLayersCompat.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/mixin/CubeDefinitionMixin.java b/src/main/java/com/zigythebird/bendable_cuboids/mixin/CubeDefinitionMixin.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/mixin/CubeDefinitionMixin.java
rename to src/main/java/com/zigythebird/bendable_cuboids/mixin/CubeDefinitionMixin.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/mixin/LayerDefinitionMixin.java b/src/main/java/com/zigythebird/bendable_cuboids/mixin/LayerDefinitionMixin.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/mixin/LayerDefinitionMixin.java
rename to src/main/java/com/zigythebird/bendable_cuboids/mixin/LayerDefinitionMixin.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/mixin/ModelPartMixin.java b/src/main/java/com/zigythebird/bendable_cuboids/mixin/ModelPartMixin.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/mixin/ModelPartMixin.java
rename to src/main/java/com/zigythebird/bendable_cuboids/mixin/ModelPartMixin.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/mixin/PartDefinitionMixin.java b/src/main/java/com/zigythebird/bendable_cuboids/mixin/PartDefinitionMixin.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/mixin/PartDefinitionMixin.java
rename to src/main/java/com/zigythebird/bendable_cuboids/mixin/PartDefinitionMixin.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/AvatarRendererMixin_playerAnim.java b/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/AvatarRendererMixin_playerAnim.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/AvatarRendererMixin_playerAnim.java
rename to src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/AvatarRendererMixin_playerAnim.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/EntityModelSetMixin_playerAnim.java b/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/EntityModelSetMixin_playerAnim.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/EntityModelSetMixin_playerAnim.java
rename to src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/EntityModelSetMixin_playerAnim.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/ItemInHandLayerMixin_playerAnim.java b/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/ItemInHandLayerMixin_playerAnim.java
similarity index 96%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/ItemInHandLayerMixin_playerAnim.java
rename to src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/ItemInHandLayerMixin_playerAnim.java
index da10891..9f980d4 100644
--- a/common/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/ItemInHandLayerMixin_playerAnim.java
+++ b/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/ItemInHandLayerMixin_playerAnim.java
@@ -32,7 +32,7 @@ private void renderMixin(S armedEntityRenderState, ItemStackRenderState itemStac
                 state.playerAnimLib$getAnimManager().get3DTransform(bone);
                 float offset = 0.25f;
                 poseStack.translate(0, offset, 0);
-                poseStack.mulPose(Axis.XP.rotation(bone.getBend()));
+                poseStack.mulPose(Axis.XP.rotation(bone.bend));
                 poseStack.translate(0, -offset, 0);
             }
         }
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/ModelMixin_playerAnim.java b/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/ModelMixin_playerAnim.java
similarity index 100%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/ModelMixin_playerAnim.java
rename to src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/ModelMixin_playerAnim.java
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/PlayerCapeModelMixin_playerAnim.java b/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/PlayerCapeModelMixin_playerAnim.java
similarity index 94%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/PlayerCapeModelMixin_playerAnim.java
rename to src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/PlayerCapeModelMixin_playerAnim.java
index eda4a69..ecab24d 100644
--- a/common/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/PlayerCapeModelMixin_playerAnim.java
+++ b/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/PlayerCapeModelMixin_playerAnim.java
@@ -33,9 +33,9 @@ public class PlayerCapeModelMixin_playerAnim implements IBoneUpdater {
     public void bc$updatePart(AvatarAnimManager manager, ModelPart part, PlayerAnimBone bone, CallbackInfo ci) {
         if (this.cape != part) return;
 
-        float bend = bone.getBend();
+        float bend = bone.bend;
         if (Math.abs(bend) > 0.0001f) { // An ugly hack for animations that don't animate the cape
-            float torsoBend = manager.get3DTransform(new PlayerAnimBone("torso")).getBend();
+            float torsoBend = manager.get3DTransform("torso").bend;
             if (torsoBend < 0) bend += torsoBend;
         }
 
diff --git a/common/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/PlayerModelMixin_playerAnim.java b/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/PlayerModelMixin_playerAnim.java
similarity index 90%
rename from common/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/PlayerModelMixin_playerAnim.java
rename to src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/PlayerModelMixin_playerAnim.java
index f4c07ff..a4ea3cf 100644
--- a/common/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/PlayerModelMixin_playerAnim.java
+++ b/src/main/java/com/zigythebird/bendable_cuboids/mixin/playeranim/PlayerModelMixin_playerAnim.java
@@ -57,19 +57,19 @@ public PlayerModelMixin_playerAnim(ModelPart root) {
         this.bc$animation = emote;
 
         if (this.head == part) return;
-        PlayerBendHelper.bend(part, bone.getBend());
+        PlayerBendHelper.bend(part, bone.bend);
 
         // Overlay shit
         if (this.body == part) {
-            PlayerBendHelper.bend(this.jacket, bone.getBend());
+            PlayerBendHelper.bend(this.jacket, bone.bend);
         } else if (this.rightArm == part) {
-            PlayerBendHelper.bend(this.rightSleeve, bone.getBend());
+            PlayerBendHelper.bend(this.rightSleeve, bone.bend);
         } else if (this.leftArm == part) {
-            PlayerBendHelper.bend(this.leftSleeve, bone.getBend());
+            PlayerBendHelper.bend(this.leftSleeve, bone.bend);
         } else if (this.rightLeg == part) {
-            PlayerBendHelper.bend(this.rightPants, bone.getBend());
+            PlayerBendHelper.bend(this.rightPants, bone.bend);
         } else if (this.leftLeg == part) {
-            PlayerBendHelper.bend(this.leftPants, bone.getBend());
+            PlayerBendHelper.bend(this.leftPants, bone.bend);
         }
     }
 
diff --git a/common/src/main/resources/assets/bendable_cuboids/icon.png b/src/main/resources/assets/bendable_cuboids/icon.png
similarity index 100%
rename from common/src/main/resources/assets/bendable_cuboids/icon.png
rename to src/main/resources/assets/bendable_cuboids/icon.png
diff --git a/common/src/main/resources/assets/bendable_cuboids/player_animations/.gitignore b/src/main/resources/assets/bendable_cuboids/player_animations/.gitignore
similarity index 100%
rename from common/src/main/resources/assets/bendable_cuboids/player_animations/.gitignore
rename to src/main/resources/assets/bendable_cuboids/player_animations/.gitignore
diff --git a/common/src/main/resources/assets/bendable_cuboids/player_animations/bend_test.json b/src/main/resources/assets/bendable_cuboids/player_animations/bend_test.json
similarity index 100%
rename from common/src/main/resources/assets/bendable_cuboids/player_animations/bend_test.json
rename to src/main/resources/assets/bendable_cuboids/player_animations/bend_test.json
diff --git a/common/src/main/resources/assets/bendable_cuboids/player_animations/bend_test2.json b/src/main/resources/assets/bendable_cuboids/player_animations/bend_test2.json
similarity index 100%
rename from common/src/main/resources/assets/bendable_cuboids/player_animations/bend_test2.json
rename to src/main/resources/assets/bendable_cuboids/player_animations/bend_test2.json
diff --git a/common/src/main/resources/assets/bendable_cuboids/player_animations/bend_test3.json b/src/main/resources/assets/bendable_cuboids/player_animations/bend_test3.json
similarity index 100%
rename from common/src/main/resources/assets/bendable_cuboids/player_animations/bend_test3.json
rename to src/main/resources/assets/bendable_cuboids/player_animations/bend_test3.json
diff --git a/common/src/main/resources/assets/bendable_cuboids/player_animations/bend_test4.json b/src/main/resources/assets/bendable_cuboids/player_animations/bend_test4.json
similarity index 100%
rename from common/src/main/resources/assets/bendable_cuboids/player_animations/bend_test4.json
rename to src/main/resources/assets/bendable_cuboids/player_animations/bend_test4.json
diff --git a/common/src/main/resources/assets/bendable_cuboids/player_animations/bend_test5.json b/src/main/resources/assets/bendable_cuboids/player_animations/bend_test5.json
similarity index 100%
rename from common/src/main/resources/assets/bendable_cuboids/player_animations/bend_test5.json
rename to src/main/resources/assets/bendable_cuboids/player_animations/bend_test5.json
diff --git a/common/src/main/resources/assets/bendable_cuboids/player_animations/bend_test6.json b/src/main/resources/assets/bendable_cuboids/player_animations/bend_test6.json
similarity index 100%
rename from common/src/main/resources/assets/bendable_cuboids/player_animations/bend_test6.json
rename to src/main/resources/assets/bendable_cuboids/player_animations/bend_test6.json
diff --git a/common/src/main/resources/assets/bendable_cuboids/player_animations/bend_test7.json b/src/main/resources/assets/bendable_cuboids/player_animations/bend_test7.json
similarity index 100%
rename from common/src/main/resources/assets/bendable_cuboids/player_animations/bend_test7.json
rename to src/main/resources/assets/bendable_cuboids/player_animations/bend_test7.json
diff --git a/common/src/main/resources/assets/bendable_cuboids/player_animations/bend_test8.json b/src/main/resources/assets/bendable_cuboids/player_animations/bend_test8.json
similarity index 100%
rename from common/src/main/resources/assets/bendable_cuboids/player_animations/bend_test8.json
rename to src/main/resources/assets/bendable_cuboids/player_animations/bend_test8.json
diff --git a/common/src/main/resources/assets/bendable_cuboids/player_animations/bend_test9.json b/src/main/resources/assets/bendable_cuboids/player_animations/bend_test9.json
similarity index 100%
rename from common/src/main/resources/assets/bendable_cuboids/player_animations/bend_test9.json
rename to src/main/resources/assets/bendable_cuboids/player_animations/bend_test9.json
diff --git a/common/src/main/resources/assets/bendable_cuboids/player_animations/drag.json b/src/main/resources/assets/bendable_cuboids/player_animations/drag.json
similarity index 100%
rename from common/src/main/resources/assets/bendable_cuboids/player_animations/drag.json
rename to src/main/resources/assets/bendable_cuboids/player_animations/drag.json
diff --git a/common/src/main/resources/assets/bendable_cuboids/player_animations/test_cape_example.json b/src/main/resources/assets/bendable_cuboids/player_animations/test_cape_example.json
similarity index 100%
rename from common/src/main/resources/assets/bendable_cuboids/player_animations/test_cape_example.json
rename to src/main/resources/assets/bendable_cuboids/player_animations/test_cape_example.json
diff --git a/common/src/main/resources/assets/bendable_cuboids/player_animations/test_cape_example_head.json b/src/main/resources/assets/bendable_cuboids/player_animations/test_cape_example_head.json
similarity index 100%
rename from common/src/main/resources/assets/bendable_cuboids/player_animations/test_cape_example_head.json
rename to src/main/resources/assets/bendable_cuboids/player_animations/test_cape_example_head.json
diff --git a/common/src/main/resources/assets/bendable_cuboids/player_animations/test_cape_example_torso_0.json b/src/main/resources/assets/bendable_cuboids/player_animations/test_cape_example_torso_0.json
similarity index 100%
rename from common/src/main/resources/assets/bendable_cuboids/player_animations/test_cape_example_torso_0.json
rename to src/main/resources/assets/bendable_cuboids/player_animations/test_cape_example_torso_0.json
diff --git a/common/src/main/resources/assets/bendable_cuboids/player_animations/test_cape_example_torso_1.json b/src/main/resources/assets/bendable_cuboids/player_animations/test_cape_example_torso_1.json
similarity index 100%
rename from common/src/main/resources/assets/bendable_cuboids/player_animations/test_cape_example_torso_1.json
rename to src/main/resources/assets/bendable_cuboids/player_animations/test_cape_example_torso_1.json
diff --git a/common/src/main/resources/assets/bendable_cuboids/player_animations/test_cape_example_torso_2.json b/src/main/resources/assets/bendable_cuboids/player_animations/test_cape_example_torso_2.json
similarity index 100%
rename from common/src/main/resources/assets/bendable_cuboids/player_animations/test_cape_example_torso_2.json
rename to src/main/resources/assets/bendable_cuboids/player_animations/test_cape_example_torso_2.json
diff --git a/common/src/main/resources/bendable_cuboids.accesswidener b/src/main/resources/bendable_cuboids.classtweaker
similarity index 56%
rename from common/src/main/resources/bendable_cuboids.accesswidener
rename to src/main/resources/bendable_cuboids.classtweaker
index 7f07043..1577345 100644
--- a/common/src/main/resources/bendable_cuboids.accesswidener
+++ b/src/main/resources/bendable_cuboids.classtweaker
@@ -1,4 +1,4 @@
-accessWidener v1 named
+classTweaker v1 official
 extendable class net/minecraft/client/model/geom/ModelPart
 accessible class net/minecraft/client/model/geom/ModelPart$Polygon
 accessible class net/minecraft/client/model/geom/ModelPart$Vertex
@@ -10,3 +10,8 @@ accessible field net/minecraft/client/model/geom/builders/CubeDeformation growZ
 accessible field net/minecraft/client/model/geom/builders/MaterialDefinition xTexSize I
 accessible field net/minecraft/client/model/geom/builders/MaterialDefinition yTexSize I
 accessible field net/minecraft/client/model/geom/builders/CubeDefinition dimensions Lorg/joml/Vector3fc;
+transitive-inject-interface net/minecraft/client/model/geom/builders/LayerDefinition com/zigythebird/bendable_cuboids/api/ILayerDefinition
+transitive-inject-interface net/minecraft/client/model/geom/builders/PartDefinition com/zigythebird/bendable_cuboids/api/IPartDefinition
+transitive-inject-interface net/minecraft/client/model/geom/builders/CubeDefinition com/zigythebird/bendable_cuboids/api/ICubeDefinition
+transitive-inject-interface net/minecraft/client/model/geom/ModelPart com/zigythebird/bendable_cuboids/api/BendableModelPart
+transitive-inject-interface net/minecraft/client/model/geom/ModelPart com/zigythebird/bendable_cuboids/api/SodiumHelper
diff --git a/common/src/main/resources/bendable_cuboids.mixins.json b/src/main/resources/bendable_cuboids.mixins.json
similarity index 100%
rename from common/src/main/resources/bendable_cuboids.mixins.json
rename to src/main/resources/bendable_cuboids.mixins.json
diff --git a/forge/src/main/java/com/zigythebird/bendable_cuboids/neoforge/BendableCuboidsModNeo.java b/src/neoforge/java/com/zigythebird/bendable_cuboids/neoforge/BendableCuboidsModNeo.java
similarity index 100%
rename from forge/src/main/java/com/zigythebird/bendable_cuboids/neoforge/BendableCuboidsModNeo.java
rename to src/neoforge/java/com/zigythebird/bendable_cuboids/neoforge/BendableCuboidsModNeo.java
diff --git a/src/neoforge/resources/META-INF/accesstransformer.cfg b/src/neoforge/resources/META-INF/accesstransformer.cfg
new file mode 100644
index 0000000..787c62a
--- /dev/null
+++ b/src/neoforge/resources/META-INF/accesstransformer.cfg
@@ -0,0 +1,11 @@
+public-f net.minecraft.client.model.geom.ModelPart
+public net.minecraft.client.model.geom.ModelPart children
+public net.minecraft.client.model.geom.ModelPart cubes
+public net.minecraft.client.model.geom.ModelPart$Polygon
+public net.minecraft.client.model.geom.ModelPart$Vertex
+public net.minecraft.client.model.geom.builders.CubeDeformation growX
+public net.minecraft.client.model.geom.builders.CubeDeformation growY
+public net.minecraft.client.model.geom.builders.CubeDeformation growZ
+public net.minecraft.client.model.geom.builders.MaterialDefinition xTexSize
+public net.minecraft.client.model.geom.builders.MaterialDefinition yTexSize
+public net.minecraft.client.model.geom.builders.CubeDefinition dimensions
\ No newline at end of file
diff --git a/forge/src/main/resources/META-INF/neoforge.mods.toml b/src/neoforge/resources/META-INF/neoforge.mods.toml
similarity index 87%
rename from forge/src/main/resources/META-INF/neoforge.mods.toml
rename to src/neoforge/resources/META-INF/neoforge.mods.toml
index 297dbb6..2bf7ec3 100644
--- a/forge/src/main/resources/META-INF/neoforge.mods.toml
+++ b/src/neoforge/resources/META-INF/neoforge.mods.toml
@@ -8,7 +8,7 @@ modId = "bendable_cuboids"
 version = "${version}"
 displayURL = "https://github.com/ZigyTheBird/BendableCuboids"
 displayName = "Bendable Cuboids Library"
-authors = "KosmX, Zigy"
+authors = "Zigy, dima_dencep, KosmX"
 description = '''
 Adds model cubes that can be bent, for example like arms in MC Story Mode!
 '''
@@ -20,13 +20,13 @@ config = "bendable_cuboids.mixins.json"
 [[dependencies.bendable_cuboids]]
 modId = "minecraft"
 type = "required"
-versionRange = "[1.21.11,)"
+versionRange = "[26.1,)"
 ordering = "NONE"
 side = "CLIENT"
 
 [[dependencies.bendable_cuboids]]
 modId="player_animation_library"
 type="incompatible"
-versionRange="[1.0,1.1.5+mc.1.21.11)"
+versionRange="[1.0,${player_anim_version})"
 ordering="NONE"
 side="BOTH"