1.19.2 + gradle cleanup

This commit is contained in:
modmuss50 2022-08-08 23:04:22 +01:00
parent 248b9ef1a7
commit e401fa5a97
7 changed files with 18 additions and 66 deletions

View file

@ -17,7 +17,7 @@ curseforge {
id = "237903" id = "237903"
changelog = ENV.CHANGELOG ?: "No changelog provided" changelog = ENV.CHANGELOG ?: "No changelog provided"
releaseType = ENV.RELEASE_CHANNEL ?: "release" releaseType = ENV.RELEASE_CHANNEL ?: "release"
addGameVersion "1.19.1" addGameVersion "1.19.2"
addGameVersion "Fabric" addGameVersion "Fabric"
mainArtifact(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar")) mainArtifact(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar"))

View file

@ -29,7 +29,7 @@
], ],
"depends": { "depends": {
"fabricloader": ">=0.14.8", "fabricloader": ">=0.14.8",
"fabric": ">=0.55.1", "fabric-api": ">=0.59.0",
"team_reborn_energy": ">=2.2.0", "team_reborn_energy": ">=2.2.0",
"fabric-biome-api-v1": ">=3.0.0", "fabric-biome-api-v1": ">=3.0.0",
"minecraft": "~1.19-beta.1" "minecraft": "~1.19-beta.1"

View file

@ -12,7 +12,7 @@ plugins {
id 'eclipse' id 'eclipse'
id 'maven-publish' id 'maven-publish'
id "org.cadixdev.licenser" version "0.6.1" id "org.cadixdev.licenser" version "0.6.1"
id "fabric-loom" version "0.12-SNAPSHOT" id "fabric-loom" version "0.13-SNAPSHOT"
id "com.matthewprenger.cursegradle" version "1.4.0" id "com.matthewprenger.cursegradle" version "1.4.0"
id "de.undercouch.download" version "4.1.1" id "de.undercouch.download" version "4.1.1"
} }
@ -27,13 +27,6 @@ repositories {
includeGroup "dev.architectury" includeGroup "dev.architectury"
} }
} }
maven {
name = "JEI"
url = "https://dvs1.progwml6.com/files/maven/"
content {
includeGroup "mezz.jei"
}
}
} }
def ENV = System.getenv() def ENV = System.getenv()
@ -187,9 +180,11 @@ dependencies {
include project(":RebornCore") include project(":RebornCore")
optionalClientDependency("me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}", false)
// Use groovy for datagen/gametest, if you are copying this you prob dont want it. // Use groovy for datagen/gametest, if you are copying this you prob dont want it.
gametestImplementation 'org.apache.groovy:groovy:4.0.3' gametestImplementation 'org.apache.groovy:groovy:4.0.4'
datagenImplementation 'org.apache.groovy:groovy:4.0.3' datagenImplementation 'org.apache.groovy:groovy:4.0.4'
gametestImplementation ("com.google.truth:truth:1.1.3") { gametestImplementation ("com.google.truth:truth:1.1.3") {
exclude module: "guava" exclude module: "guava"
@ -197,58 +192,15 @@ dependencies {
} }
} }
def modCompat(Map args) { def optionalClientDependency(String dep, runtime = true) {
/* def exclude = {
SourceSet compatSourceSet = sourceSets.create(args.name) {
compileClasspath += args.sourceSet.compileClasspath
runtimeClasspath += args.sourceSet.runtimeClasspath
java {
srcDirs = ["src/compat/${args.name}"]
}
}
jar {
from compatSourceSet.output.classesDirs
from compatSourceSet.output.resourcesDir
}
sourcesJar {
from compatSourceSet.allSource
}
*/
def excludes = {
exclude group: "net.fabricmc.fabric-api" exclude group: "net.fabricmc.fabric-api"
exclude module: "nbt-crafting"
exclude module: "modmenu"
} }
dependencies.modClientCompileOnly(dep, exclude)
// TODO use sourceset specific configurations with https://github.com/FabricMC/fabric-loom/pull/674 if (runtime) {
dependencies { dependencies.modClientRuntimeOnly(dep, exclude)
args.dependencies.each { dependency ->
modLocalRuntime(dependency, excludes)
modCompileOnly(dependency, excludes)
} }
args.compile.each { dependency ->
modCompileOnly(dependency, excludes)
}
args.runtime.each { dependency ->
modLocalRuntime(dependency, excludes)
}
}
/*
allprojects {
loom {
mods {
techreborn {
sourceSet compatSourceSet
}
}
}
}
*/
} }
modCompat( modCompat(
@ -394,7 +346,7 @@ curseforge {
id = "233564" id = "233564"
changelog = ENV.CHANGELOG ?: "No changelog provided" changelog = ENV.CHANGELOG ?: "No changelog provided"
releaseType = ENV.RELEASE_CHANNEL ?: "release" releaseType = ENV.RELEASE_CHANNEL ?: "release"
addGameVersion "1.19.1" // Also update in RebornCore/build.gradle addGameVersion "1.19.2" // Also update in RebornCore/build.gradle
addGameVersion "Fabric" addGameVersion "Fabric"
mainArtifact remapJar mainArtifact remapJar

View file

@ -6,10 +6,10 @@ mod_version=5.3.3
# Fabric Properties # Fabric Properties
# check these on https://modmuss50.me/fabric.html # check these on https://modmuss50.me/fabric.html
minecraft_version=1.19.1 minecraft_version=1.19.2
yarn_version=1.19.1+build.1 yarn_version=1.19.1+build.1
loader_version=0.14.8 loader_version=0.14.9
fapi_version=0.58.4+1.19.1 fapi_version=0.59.0+1.19.2
# Dependencies # Dependencies
energy_version=2.2.0 energy_version=2.2.0

Binary file not shown.

View file

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

View file

@ -31,7 +31,7 @@
}, },
"depends": { "depends": {
"fabricloader": ">=0.14.8", "fabricloader": ">=0.14.8",
"fabric": ">=0.55.1", "fabric-api": ">=0.59.0",
"reborncore": "*", "reborncore": "*",
"team_reborn_energy": ">=2.2.0", "team_reborn_energy": ">=2.2.0",
"fabric-biome-api-v1": ">=3.0.0", "fabric-biome-api-v1": ">=3.0.0",