Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 15 additions & 19 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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"
}
Expand All @@ -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
Expand All @@ -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}"
Expand All @@ -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}:")
}
}
Expand Down Expand Up @@ -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}:")
}
}
Expand All @@ -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
}
}
}
Expand Down Expand Up @@ -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 {
Expand Down
9 changes: 5 additions & 4 deletions ec-core/build.gradle
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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

}
}
Expand Down
2 changes: 1 addition & 1 deletion ec-core/src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

"depends": {
"fabricloader": ">=0.11.3",
"fabric": "*"
"fabric-api": "*"
},
"suggests": {
"flamingo": "*"
Expand Down
22 changes: 11 additions & 11 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

"depends": {
"fabricloader": ">=0.11.3",
"fabric": "*",
"fabric-api": "*",
"fabric-permissions-api-v0": "*"
},
"suggests": {
Expand Down
Loading