26.1.1

.github/workflows/gradle.yml

@@ -32,19 +32,19 @@ jobs:
 
     steps:
       - name: ✨ Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: 🛂 Validate Gradle wrapper
-        uses: gradle/actions/wrapper-validation@v4
+        uses: gradle/actions/wrapper-validation@v6
 
-      - name: 🏗 Set up JDK 21
-        uses: actions/setup-java@v4
+      - name: 🏗 Set up JDK 25
+        uses: actions/setup-java@v5
         with:
-          java-version: 21
-          distribution: adopt
+          java-version: 25
+          distribution: temurin
 
       - name: 📷 Begin Gradle cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: |
             ~/.gradle/caches
@@ -76,15 +76,15 @@ jobs:
             -exec cp {} upload-staging/ \;
 
       - name: 📦 Upload mod-only artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: mod_artifact
           path: upload-staging/
           # jars are already compressed
           compression-level: 0
 
       - name: 📦 Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: artifacts
           path: 'build/libs/'
@@ -93,7 +93,7 @@ jobs:
 
       - name: 📝 Upload reports
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: reports
           path: 'build/reports/'

.github/workflows/publish.yml

@@ -33,8 +33,8 @@ on:
         default: true
 
 env:
-  JAVA_VERSION: 21
-  JAVA_DISTRIBUTION: adopt
+  JAVA_VERSION: 25
+  JAVA_DISTRIBUTION: temurin
 
 jobs:
   publish:
@@ -48,7 +48,7 @@ jobs:
 
     steps:
       - name: ✨ Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: 📖 Extract version from gradle.properties
         id: version
@@ -84,16 +84,16 @@ jobs:
           fi
 
       - name: 🛂 Validate Gradle wrapper
-        uses: gradle/actions/wrapper-validation@v4
+        uses: gradle/actions/wrapper-validation@v6
 
       - name: 🏗 Set up JDK ${{ env.JAVA_VERSION }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: ${{ env.JAVA_VERSION }}
           distribution: ${{ env.JAVA_DISTRIBUTION }}
 
       - name: 📷 Begin Gradle cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: |
             ~/.gradle/caches
@@ -117,15 +117,15 @@ jobs:
             -exec cp {} upload-staging/ \;
 
       - name: 📦 Upload mod-only artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: mod_artifact
           path: upload-staging/
           # jars are already compressed
           compression-level: 0
 
       - name: 📦 Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: artifacts
           path: 'build/libs/'
@@ -134,7 +134,7 @@ jobs:
 
       - name: 📝 Upload test reports
         if: ${{ always() }}
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: test-reports
           path: '**/build/reports/'

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id 'groovy'
-    id 'fabric-loom' version "${loom_version}"
+    id 'net.fabricmc.fabric-loom' version "${loom_version}"
     id 'maven-publish'
     id "com.hypherionmc.modutils.modpublisher" version "2.1.6"
 }
@@ -15,14 +15,25 @@ String getenv(String key) {
     return ext.env.getOrDefault(key, "NOT FOUND")
 }
 
-tasks.named('remapJar').configure {
+tasks.named('jar').configure {
     dependsOn(tasks.named('compileTestGroovy'))
 }
 
 allprojects {
-    apply plugin: 'fabric-loom'
+    apply plugin: 'net.fabricmc.fabric-loom'
     apply plugin: 'idea'
 
+    loom {
+        splitEnvironmentSourceSets()
+
+        mods {
+            "${project.mod_id}" {
+                sourceSet sourceSets.main
+                sourceSet sourceSets.client
+            }
+        }
+    }
+
     group = project.maven_group
     String vers_suffix = getenv("VERSION_SUFFIX")
     String full_version = vers_suffix != 'NOT FOUND' && vers_suffix != ''
@@ -38,8 +49,9 @@ allprojects {
     dependencies {
         // Fabric
         minecraft "com.mojang:minecraft:${project.minecraft_version}"
-        mappings loom.officialMojangMappings()
-        modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+        implementation "net.fabricmc:fabric-loader:${project.loader_version}"
+        implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
+        implementation "eu.pb4:placeholder-api:${project.placeholder_api_version}"
 
         // Code Quality
         compileOnly "org.jetbrains:annotations:${project.jetbrains_annotations_version}"
@@ -49,7 +61,7 @@ allprojects {
         testImplementation "net.fabricmc:fabric-loader-junit:${project.loader_version}"
 
         subprojects.each {
-            implementation project(path: ":${it.name}", configuration: "namedElements")
+            implementation project(path: ":${it.name}")
             include project("${it.name}:")
         }
     }
@@ -110,25 +122,22 @@ allprojects {
 
 // Root-project-specific dependencies
 dependencies {
-    modImplementation "me.lucko:fabric-permissions-api:${project.permissions_api_version}"
-
-    // included in fabriclocader 1.15+, kept here for compat on older loaders, I think
-    include(implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${project.mixinextras_version}")))
+    implementation "me.lucko:fabric-permissions-api:${project.permissions_api_version}"
 
     // JIJ Dependencies (include for packaging)
-    modApi  "me.lucko:fabric-permissions-api:${project.permissions_api_version}"
+    implementation "me.lucko:fabric-permissions-api:${project.permissions_api_version}"
     include "me.lucko:fabric-permissions-api:${project.permissions_api_version}"
     include "eu.pb4:placeholder-api:${project.placeholder_api_version}"
-    modImplementation "org.yaml:snakeyaml:${project.snakeyaml_version}"
+    implementation "org.yaml:snakeyaml:${project.snakeyaml_version}"
     include "org.yaml:snakeyaml:${project.snakeyaml_version}"
-    modImplementation "io.github.ladysnake:PlayerAbilityLib:${pal_version}"
+    implementation "io.github.ladysnake:PlayerAbilityLib:${pal_version}"
     include "io.github.ladysnake:PlayerAbilityLib:${pal_version}"
 
     // mod compatibility
-    modCompileOnly  "maven.modrinth:vanish:${project.vanish_version}"
+    compileOnly  "maven.modrinth:vanish:${project.vanish_version}"
 
     subprojects.each {
-        implementation project(path: ":${it.name}", configuration: "namedElements")
+        implementation project(path: ":${it.name}")
         include project("${it.name}:")
     }
 }
@@ -140,7 +149,7 @@ tasks.withType(JavaCompile).configureEach {
     // If Javadoc is generated, this must be specified in that task too.
     it.options.encoding = "UTF-8"
     // java version
-    it.options.release.set(21)
+    it.options.release.set(25)
 }
 
 publishing {
@@ -149,9 +158,9 @@ publishing {
             artifactId = project.mod_id
             groupId = project.maven_group
             version = project.version
-            artifact(remapJar) { builtBy remapJar }
+            artifact(jar) { builtBy jar }
             artifact(sourcesJar) {
-                builtBy remapSourcesJar
+                builtBy sourcesJar
             }
         }
     }
@@ -195,12 +204,12 @@ publisher {
     setLoaders("fabric")
     setCurseEnvironment("both")
 
-    setArtifact(remapJar)
-    setJavaVersions([JavaVersion.VERSION_21])
+    setArtifact(jar)
+    setJavaVersions([JavaVersion.VERSION_25])
 
     // Add subproject artifacts as additional files
     subprojects.each { subproject ->
-        addAdditionalFile(subproject.remapJar)
+        addAdditionalFile(subproject.jar)
     }
 
     github {

ec-core/build.gradle

@@ -1,11 +1,15 @@
 plugins {
+    id 'net.fabricmc.fabric-loom' version "${loom_version}"
     id 'maven-publish'
 }
+apply plugin: 'net.fabricmc.fabric-loom'
 
 dependencies {
     // Required dependencies (expose as api so root project can use them)
-    modApi "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-    modApi "eu.pb4:placeholder-api:${project.placeholder_api_version}"
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    implementation "net.fabricmc:fabric-loader:${project.loader_version}"
+    implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
+    implementation "eu.pb4:placeholder-api:${project.placeholder_api_version}"
 
     testImplementation platform("org.junit:junit-bom:${project.junit_bom_version}")
     testImplementation 'org.junit.jupiter:junit-jupiter'
@@ -21,12 +25,12 @@ publishing {
             groupId project.maven_group
             version project.version
             // Main
-            artifact(remapJar) { builtBy remapJar }
-            // Sources
-            artifact(sourcesJar) {
-                builtBy remapSourcesJar
-
-            }
+            artifact(jar) { builtBy jar }
+//            // Sources
+//            artifact(sourcesJar) {
+//                builtBy sourcesJar
+//
+//            }
         }
     }
 }

ec-core/src/main/java/dev/jpcode/eccore/util/TextUtil.java

@@ -196,7 +196,7 @@ public static void registerTextParser(StringToTextParser parser) {
 
     static {
         registerTextParser(str -> ComponentSerialization.CODEC.parse(JsonOps.INSTANCE, JsonParser.parseString(str)).getOrThrow());
-        registerTextParser(str -> TagParser.DEFAULT.parseText(str, ParserContext.of()));
+        registerTextParser(str -> TagParser.DEFAULT.parseComponent(str, ParserContext.of()));
     }
 
     public static Component parseText(String textStr) {

ec-core/src/main/resources/fabric.mod.json

@@ -34,7 +34,7 @@
 
   "depends": {
     "fabricloader": ">=0.11.3",
-    "fabric": "*"
+    "fabric-api": "*"
   },
   "suggests": {
     "flamingo": "*"

gradle.properties

@@ -2,13 +2,13 @@
 org.gradle.jvmargs=-Xmx2048M
 
 # Fabric Properties
-# check these on https://fabricmc.net/develup
-minecraft_version=1.21.11
-loader_version=0.18.2
-loom_version=1.13-SNAPSHOT
+# check these on https://fabricmc.net/develop
+minecraft_version=26.1.1
+loader_version=0.18.6
+loom_version=1.15-SNAPSHOT
 
 # Fabric API
-fabric_version=0.139.4+1.21.11
+fabric_api_version=0.145.4+26.1.1
 
 # Mod Properties
 mod_name = Essential Commands
@@ -19,20 +19,20 @@ maven_group = com.fibermc
 archives_base_name = essential_commands
 
 # Common Publishing
-game_versions=1.21.11
+game_versions=26.1.1
 gh_owner=John-Paul-R
 gh_repo=essential-commands
 
 # Dependencies
-permissions_api_version=0.6.1
-placeholder_api_version=2.8.1+1.21.10
-pal_version=1.15.0
-vanish_version=1.6.1+1.21.9-rc1
-mixinextras_version=0.5.0
+permissions_api_version=0.7.0
+placeholder_api_version=3.0.0-beta.2+26.1
+pal_version=1.16.0
+vanish_version=1.6.8+26.1
+#mixinextras_version=0.5.0
 snakeyaml_version=2.5
 jetbrains_annotations_version=22.0.0
 junit_bom_version=5.10.1
-mod_menu_version=3.0.0
+mod_menu_version=18.0.0-alpha.8
 
 # Platform-Specific Publishing
 # Modrinth

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/com/fibermc/essentialcommands/ECPlaceholderRegistry.java

@@ -11,7 +11,7 @@ private ECPlaceholderRegistry() {}
 
     public static void register() {
         var namespace = EssentialCommands.MOD_ID;
-        Placeholders.register(
+        Placeholders.registerServer(
             Identifier.fromNamespaceAndPath(namespace, "nickname"),
             (ctx, arg) -> {
                 if (ctx.hasPlayer()) {