Update to 26.1

JulianVennen · JulianVennen · commit 16bc567c938d · 2026-03-30T12:33:35.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,9 @@
-# 3.1.1.
+# 3.2.0
+- Update to 26.1
+
+---
+
+# 3.1.1
 - Fix issues when filtering windows paths
 
 ---
diff --git a/README.md b/README.md
@@ -112,6 +112,6 @@ For other platforms or other IDEs run their respective gradle tasks:
 | Bukkit     |                                 | `./gradlew :bukkit:runServer`         |
 | BungeeCord |                                 | `./gradlew :bungeecord:runBungeeCord` |
 | Velocity   |                                 | `./gradlew :velocity:runVelocity`     |
-| Forge      | `./gradlew :forge:Client`       | `./gradlew :forge:Server`             |
+| Forge      | `./gradlew :forge:runClient`    | `./gradlew :forge:runServer`          |
 | Fabric     | `./gradlew :fabric:runClient`   | `./gradlew :fabric:runServer`         |
 | NeoForge   | `./gradlew :neoforge:runClient` | `./gradlew :neoforge:runServer`       |
diff --git a/build.gradle b/build.gradle
@@ -46,11 +46,10 @@ tasks.register('buildAll', Copy) {
     dependsOn(':bukkit:shadowJar', ':velocity:shadowJar', ':bungeecord:shadowJar',
             ':forge:jarJar', ':fabric:build', ':neoforge:build')
 
-    from('fabric/build/libs', 'neoforge/build/libs')
+    from('fabric/build/libs', 'neoforge/build/libs', 'forge/build/libs')
     from('bukkit/build/libs', copyShadowJar)
     from('bungeecord/build/libs', copyShadowJar)
     from('velocity/build/libs', copyShadowJar)
-    // from('forge/build/libs', copyShadowJar)
 
     it.rename { String fileName ->
         fileName.replace(mod_name, mod_id)
diff --git a/bukkit/build.gradle b/bukkit/build.gradle
@@ -13,7 +13,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly "org.spigotmc:spigot-api:${minor_minecraft_version}-R0.1-SNAPSHOT"
+    compileOnly "org.spigotmc:spigot-api:${minecraft_gamedrop_version}-R0.1-SNAPSHOT"
     implementation(libs.mclogs.api) {
         exclude group: 'com.google.code.gson', module: 'gson'
     }
diff --git a/bungeecord/build.gradle b/bungeecord/build.gradle
@@ -17,7 +17,7 @@ repositories {
 }
 
 dependencies {
-    compileOnly "net.md-5:bungeecord-api:${minor_minecraft_version}-R0.4"
+    compileOnly "net.md-5:bungeecord-api:${minecraft_gamedrop_version}-R0.1-SNAPSHOT"
     implementation(libs.mclogs.api) {
         exclude group: 'com.google.code.gson', module: 'gson'
     }
diff --git a/common-mc/build.gradle b/common-mc/build.gradle
@@ -17,12 +17,6 @@ dependencies {
 
 neoForge {
     neoFormVersion = neo_form_version
-    if (enable_parchment) {
-        parchment {
-            minecraftVersion = parchment_minecraft
-            mappingsVersion = parchment_version
-        }
-    }
 }
 
 configurations {
diff --git a/common-mc/src/main/java/gs/mclo/commands/ClientCommandSourceStackBuildContext.java b/common-mc/src/main/java/gs/mclo/commands/ClientCommandSourceStackBuildContext.java
@@ -12,9 +12,4 @@ public ClientCommandSourceStackBuildContext() {
     public ICommandSourceAccessor<MinecraftComponent> mapSource(CommandSourceStack source) {
         return new ClientCommandSourceStackAccessor(source);
     }
-
-    @Override
-    public boolean supportsClientCommandClickEvents() {
-        return false;
-    }
 }
diff --git a/common/build.gradle b/common/build.gradle
@@ -21,7 +21,6 @@ dependencies {
     implementation(libs.brigadier)
     compileOnly(libs.jetbrains.annotations)
 }
-
 configurations {
     commonJava {
         canBeResolved = false
diff --git a/common/src/main/java/gs/mclo/commands/BuildContext.java b/common/src/main/java/gs/mclo/commands/BuildContext.java
@@ -31,7 +31,7 @@ public BuildContext(CommandEnvironment environment) {
 
     /**
      * Are click events with client commands supported in this context?
-     * Forge (and older NeoForge versions) do not support this.
+     * older Forge and NeoForge versions did not support this.
      * @return True if click events are supported, false otherwise.
      */
     public boolean supportsClientCommandClickEvents() {
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -14,14 +14,8 @@ repositories {
 
 dependencies {
     minecraft "com.mojang:minecraft:${minecraft_version}"
-    mappings loom.layered {
-        officialMojangMappings()
-        if (enable_parchment) {
-            parchment("org.parchmentmc.data:parchment-${parchment_minecraft}:${parchment_version}@zip")
-        }
-    }
-    modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}"
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
+    implementation "net.fabricmc:fabric-loader:${fabric_loader_version}"
+    implementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
 
     implementation(libs.mclogs.api)
     include(libs.mclogs.api)
@@ -54,7 +48,7 @@ loom {
 modrinth {
     token = findProperty('modrinth_api_token') as String ?: ''
     projectId = modrinth_project_id
-    uploadFile = remapJar
+    uploadFile = jar
     gameVersions = minecraft_version_list
     loaders = ["fabric"]
     changelog = rootProject.changelog
diff --git a/forge/build.gradle b/forge/build.gradle
@@ -21,11 +21,12 @@ minecraft {
             systemProperty 'eventbus.api.strictRuntimeChecks', 'true'
         }
 
-        client {
+        register('client') {
             workingDir.convention layout.projectDirectory.dir('runs/Client')
+            jvmArgs '-XstartOnFirstThread'
         }
 
-        server {
+        register('server') {
             workingDir.convention layout.projectDirectory.dir('runs/Server')
             args '--nogui'
         }
diff --git a/forge/src/main/java/gs/mclo/platform/services/ForgePlatformHelper.java b/forge/src/main/java/gs/mclo/platform/services/ForgePlatformHelper.java
@@ -21,7 +21,7 @@ public String getMinecraftVersion() {
 
     @Override
     public String getModVersion() {
-        return ModList.get().getModFileById(Constants.MOD_ID).versionString();
+        return ModList.getModFileById(Constants.MOD_ID).versionString();
     }
 
     @Override
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@
 # Project
 version=3.1.2-SNAPSHOT
 group=gs.mclo
-java_version=21
+java_version=25
 
 # Common
 mod_name=mclo.gs
@@ -17,37 +17,33 @@ homepage_url=https://mclo.gs
 sources_url=https://github.com/aternosorg/mclogs-integration
 issues_url=https://github.com/aternosorg/mclogs-integration/issues
 
-minecraft_version=1.21.11
-minecraft_versions=1.21.11
-minor_minecraft_version=1.21
-min_minecraft_version=1.21.11
-max_minecraft_version=1.22
+minecraft_version=26.1
+minecraft_versions=26.1
+minecraft_gamedrop_version=26.1
+min_minecraft_version=26.1
+max_minecraft_version=26.2
 
 ## This is the version of minecraft that the 'common' project uses, you can find a list of all versions here
 ## https://projects.neoforged.net/neoforged/neoform
-neo_form_version=1.21.11-20251209.172050
-# The version of ParchmentMC that is used, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions
-enable_parchment=false
-parchment_minecraft=1.21.4
-parchment_version=2025.01.19
+neo_form_version=26.1-1
 
 # Fabric
 # https://fabricmc.net/develop/
-fabric_version=0.139.4+1.21.11
-fabric_loader_version=0.17.3
+fabric_version=0.144.0+26.1
+fabric_loader_version=0.18.4
 
 # Forge
 # https://files.minecraftforge.net/
-forge_version=61.0.8
-forge_loader_version_range=[61,)
+forge_version=62.0.1
+forge_loader_version_range=[62,)
 
 # NeoForge
 # https://projects.neoforged.net/neoforged/neoforge
-neoforge_version=21.11.3-beta
+neoforge_version=26.1.0.1-beta
 neoforge_loader_version_range=[4,)
 
 # Velocity
-velocity_versions=3.4
+velocity_versions=3.5
 
 # Publishing
 modrinth_project_id=6DdCzpTL
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,16 +5,16 @@ brigadier = "1.0.18"
 curseforge-gradle = "1.1.15"
 eventbus-validator = "7.0.1"
 # see https://fabricmc.net/develop/ for new versions
-fabric-loom = "1.14-SNAPSHOT"
-forge-gradle = "[7,8)"
+fabric-loom = "1.15-SNAPSHOT"
+forge-gradle = "[7.0.17,8)"
 forge-jarjar = "[0.2.3,0.3)"
 gson = "2.12.1"
 hangar = "0.1.3"
 jetbrains-annotations = "26.0.2"
 mclogs = "6.2.1"
 minotaur = "2.8.7"
 # see https://projects.neoforged.net/neoforged/moddevgradle for new versions
-neoforge-moddev = "2.0.111"
+neoforge-moddev = "2.0.141"
 night-config = { strictly = "[3.7,4.0)", prefer = "3.8.1" }
 runtask = "2.3.1"
 shadow = "9.0.0-rc1"
@@ -37,7 +37,7 @@ velocity-api = { module = "com.velocitypowered:velocity-api", version.ref = "vel
 
 [plugins]
 curseforge-gradle = { id = "net.darkhax.curseforgegradle", version.ref = "curseforge-gradle" }
-fabric-loom = { id = "net.fabricmc.fabric-loom-remap", version.ref = "fabric-loom" }
+fabric-loom = { id = "net.fabricmc.fabric-loom", version.ref = "fabric-loom" }
 forge-gradle = { id = "net.minecraftforge.gradle", version.ref = "forge-gradle" }
 forge-jarjar = { id = "net.minecraftforge.jarjar", version.ref = "forge-jarjar" }
 hangar = { id = "io.papermc.hangar-publish-plugin", version.ref = "hangar" }
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -15,12 +15,6 @@ repositories {
 neoForge {
     version = neoforge_version
 
-    if (enable_parchment) {
-        parchment {
-            minecraftVersion = parchment_minecraft
-            mappingsVersion = parchment_version
-        }
-    }
     runs {
         configureEach {
             systemProperty('neoforge.enabledGameTestNamespaces', mod_id)
diff --git a/neoforge/src/main/java/gs/mclo/commands/NeoForgeClientCommandSourceStackBuildContext.java b/neoforge/src/main/java/gs/mclo/commands/NeoForgeClientCommandSourceStackBuildContext.java
@@ -12,9 +12,4 @@ public class NeoForgeClientCommandSourceStackBuildContext extends ClientCommandS
      */
     public NeoForgeClientCommandSourceStackBuildContext() {
     }
-
-    @Override
-    public boolean supportsClientCommandClickEvents() {
-        return true;
-    }
 }
diff --git a/settings.gradle b/settings.gradle
@@ -40,7 +40,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
 }
 
 // This should match the folder name of the project, or else IDEA may complain (see https://youtrack.jetbrains.com/issue/IDEA-317606)

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ repositories {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`dependencies {`
`16`		`- compileOnly "org.spigotmc:spigot-api:${minor_minecraft_version}-R0.1-SNAPSHOT"`
	`16`	`+ compileOnly "org.spigotmc:spigot-api:${minecraft_gamedrop_version}-R0.1-SNAPSHOT"`
`17`	`17`	`implementation(libs.mclogs.api) {`
`18`	`18`	`exclude group: 'com.google.code.gson', module: 'gson'`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ repositories {`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`dependencies {`
`20`		`- compileOnly "net.md-5:bungeecord-api:${minor_minecraft_version}-R0.4"`
	`20`	`+ compileOnly "net.md-5:bungeecord-api:${minecraft_gamedrop_version}-R0.1-SNAPSHOT"`
`21`	`21`	`implementation(libs.mclogs.api) {`
`22`	`22`	`exclude group: 'com.google.code.gson', module: 'gson'`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,4 @@ public ClientCommandSourceStackBuildContext() {`
`12`	`12`	`public ICommandSourceAccessor<MinecraftComponent> mapSource(CommandSourceStack source) {`
`13`	`13`	`return new ClientCommandSourceStackAccessor(source);`
`14`	`14`	`}`
`15`		`-`
`16`		`- @Override`
`17`		`- public boolean supportsClientCommandClickEvents() {`
`18`		`- return false;`
`19`		`- }`
`20`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ dependencies {`
`21`	`21`	`implementation(libs.brigadier)`
`22`	`22`	`compileOnly(libs.jetbrains.annotations)`
`23`	`23`	`}`
`24`		`-`
`25`	`24`	`configurations {`
`26`	`25`	`commonJava {`
`27`	`26`	`canBeResolved = false`