diff --git a/build.gradle b/build.gradle index 192c1603..22bd9354 100644 --- a/build.gradle +++ b/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,12 +15,12 @@ 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' group = project.maven_group @@ -38,8 +38,7 @@ 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}" // Code Quality compileOnly "org.jetbrains:annotations:${project.jetbrains_annotations_version}" @@ -49,7 +48,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 +109,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}:") } } @@ -149,9 +145,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 +191,12 @@ publisher { setLoaders("fabric") setCurseEnvironment("both") - setArtifact(remapJar) + setArtifact(jar) setJavaVersions([JavaVersion.VERSION_21]) // Add subproject artifacts as additional files subprojects.each { subproject -> - addAdditionalFile(subproject.remapJar) + addAdditionalFile(subproject.jar) } github { diff --git a/ec-core/build.gradle b/ec-core/build.gradle index e3f8fbab..fc0c8739 100644 --- a/ec-core/build.gradle +++ b/ec-core/build.gradle @@ -1,11 +1,12 @@ plugins { + id 'net.fabricmc.fabric-loom' version "${loom_version}" id 'maven-publish' } 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}" + 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,10 +22,10 @@ publishing { groupId project.maven_group version project.version // Main - artifact(remapJar) { builtBy remapJar } + artifact(jar) { builtBy jar } // Sources artifact(sourcesJar) { - builtBy remapSourcesJar + builtBy sourcesJar } } diff --git a/ec-core/src/main/resources/fabric.mod.json b/ec-core/src/main/resources/fabric.mod.json index 66593284..daae9564 100644 --- a/ec-core/src/main/resources/fabric.mod.json +++ b/ec-core/src/main/resources/fabric.mod.json @@ -34,7 +34,7 @@ "depends": { "fabricloader": ">=0.11.3", - "fabric": "*" + "fabric-api": "*" }, "suggests": { "flamingo": "*" diff --git a/gradle.properties b/gradle.properties index 6d17e998..91139011 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,12 +3,12 @@ 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 +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.2+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 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55b..8bdaf60c 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 2a84e188..c61a118f 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.0.0-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/gradlew b/gradlew index 23d15a93..ef07e016 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index eb1d2d55..6936e131 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -30,7 +30,7 @@ "depends": { "fabricloader": ">=0.11.3", - "fabric": "*", + "fabric-api": "*", "fabric-permissions-api-v0": "*" }, "suggests": {