Minecraft 26 compatibility

api/build.gradle.kts

@@ -5,20 +5,23 @@ plugins {
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
+        languageVersion.set(JavaLanguageVersion.of(25))
     }
 }
 
 dependencies {
+    implementation("com.mojang:brigadier:1.3.10")
+
     // Cloud 2
     api("org.incendo:cloud-core:2.0.0")
     api("org.incendo:cloud-annotations:2.0.0")
-    api("org.incendo:cloud-brigadier:2.0.0-beta.10")
-    api("org.incendo:cloud-minecraft-extras:2.0.0-beta.9")
+    api("org.incendo:cloud-brigadier:2.0.0-beta.15")
+    api("org.incendo:cloud-minecraft-extras:2.0.0-beta.15")
     api("org.incendo:cloud-processors-confirmation:1.0.0-rc.1")
     api("org.incendo:cloud-processors-cooldown:1.0.0-rc.1")
     api("org.incendo:cloud-processors-requirements:1.0.0-rc.1")
 
+
     // Impactor
-    api("net.impactdev.impactor.api:players:5.1.1-SNAPSHOT")
+    api("net.impactdev.impactor.api:players:5.3.6-SNAPSHOT")
 }

build-logic/src/main/kotlin/impactdev.base-conventions.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     java
     `java-library`
-    id("org.cadixdev.licenser")
+//    id("org.cadixdev.licenser")
 }
 
 repositories {
@@ -21,11 +21,13 @@ repositories {
     }
 
     maven(url = "https://maven.neoforged.net/releases")
+    maven(url = "https://jitpack.io")
+    mavenLocal()
 }
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(21))
+        languageVersion.set(JavaLanguageVersion.of(25))
     }
 }
 
@@ -34,16 +36,16 @@ version = rootProject.version
 tasks {
     withType<JavaCompile> {
         options.encoding = "UTF-8"
-        dependsOn(updateLicenses)
+//        dependsOn(updateLicenses)
         finalizedBy(test)
     }
 }
 
-license {
-    header(rootProject.file("HEADER.txt"))
-    properties {
-        this.set("name", "ImpactDev Command Manager")
-        this.set("url", "https://github.com/NickImpact/Impactor/")
-        this.set("year", 2023)
-    }
-}
+//license {
+//    header(rootProject.file("HEADER.txt"))
+//    properties {
+//        this.set("name", "ImpactDev Command Manager")
+//        this.set("url", "https://github.com/NickImpact/Impactor/")
+//        this.set("year", 2023)
+//    }
+//}

build-logic/src/main/kotlin/impactdev.loom-conventions.gradle.kts

@@ -1,25 +1,14 @@
 plugins {
     id("impactdev.base-conventions")
 
-    id("dev.architectury.loom")
+    id("dev.architectury.loom-no-remap")
     id("architectury-plugin")
 }
 
 architectury {
     minecraft = rootProject.property("minecraft").toString()
 }
 
-loom {
-    silentMojangMappingsLicense()
-}
-
 dependencies {
     minecraft("net.minecraft:minecraft:${rootProject.property("minecraft")}")
-    mappings(loom.officialMojangMappings())
-}
-
-tasks {
-    remapJar {
-        archiveBaseName.set("impactor-commands-${project.name}")
-    }
 }

common/build.gradle.kts

@@ -4,8 +4,10 @@ plugins {
 }
 
 dependencies {
+    implementation("com.mojang:brigadier:1.3.10")
+
     api(project(":api"))
-    api("net.impactdev.impactor.api:plugins:5.1.1-SNAPSHOT")
+    api("net.impactdev.impactor.api:plugins:5.3.6-SNAPSHOT")
 
     implementation("com.github.ben-manes.caffeine:caffeine:3.1.8")
 }

fabric/build.gradle.kts

@@ -9,11 +9,14 @@ architectury {
 }
 
 dependencies {
-    modImplementation("net.fabricmc:fabric-loader:${rootProject.property("fabric-loader")}")
-    modImplementation(fabricApi.module("fabric-lifecycle-events-v1", rootProject.property("fabric-api").toString()))
+    implementation("net.fabricmc:fabric-loader:${rootProject.property("fabric-loader")}")
+    implementation(fabricApi.module("fabric-lifecycle-events-v1", rootProject.property("fabric-api").toString()))
+    implementation("com.mojang:brigadier:1.3.10")
 
     api(project(":common"))
-    include(modImplementation("org.incendo:cloud-fabric:2.0.0-beta.9")!!)
+    include(implementation("org.incendo:cloud-fabric:2.0.0-beta.16") {
+        exclude("net.fabricmc.fabric-api")
+    }!!)
 }
 
 tasks {

gradle.properties

@@ -4,6 +4,7 @@ org.gradle.parallel=false
 plugin=5.3.1
 snapshot = false
 
-minecraft=1.21.1
-fabric-loader=0.16.9
-fabric-api=0.107.0+1.21.1
+minecraft=26.1.2
+neoforge=26.1.2.75
+fabric-loader=0.18.4
+fabric-api=0.151.0+26.1.2

gradle/libs.versions.yml

@@ -1,28 +1,28 @@
 versions:
 
   # jetbains
-  kotlin: 1.7.10
+  kotlin: 2.4.0
   coroutines: 1.6.1
-  annotations: 23.0.0
-  serialization: 1.3.2
+  annotations: 26.1.0
+  serialization: 1.11.0
 
   # plugins
   licenser: 0.6.1
-  shadow: 8.1.1
+  shadow: 9.4.2
   blossom: 1.3.1
-  loom: 1.7-SNAPSHOT
-  architectury-plugin: 3.4-SNAPSHOT
+  loom: 1.17.480
+  architectury-plugin: 3.5-SNAPSHOT
 
   # fabric/remap
-  fabric-loader: 0.14.16
-  fabric-api: 0.75.1+1.18.2
+  fabric-loader: 0.18.4
+  fabric-api: 0.151.0+26.1.2
 
   # forge
   forge: 1.18.2-40.1.0
-  neoforge: 21.1.66
+  neoforge: 26.1.2.75
 
   # architectury
-  architectury: 6.3.49
+  architectury: 20.0.6
 
   # test
   junit: 5.9.0
@@ -41,12 +41,12 @@ dependencies:
     name: licenser
     version: { ref: licenser }
   shadow:
-    group: com.github.johnrengelman
-    name: shadow
+    group: com.gradleup.shadow
+    name: shadow-gradle-plugin
     version: { ref: shadow }
   loom:
-    group: dev.architectury
-    name: architectury-loom
+    group: dev.architectury.loom-no-remap
+    name: dev.architectury.loom-no-remap.gradle.plugin
     version: { ref: loom }
   architecturyPlugin:
     group: architectury-plugin

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

neoforge/build.gradle.kts

@@ -10,9 +10,10 @@ architectury {
 
 dependencies {
     neoForge(libs.neoforge)
+    implementation("com.mojang:brigadier:1.3.10")
 
     api(project(":common"))
-    include(modImplementation("org.incendo:cloud-neoforge:2.0.0-beta.9")!!)
+    include(implementation("org.incendo:cloud-neoforge:2.0.0-beta.16")!!)
 }
 
 tasks {