diff --git a/RebornCore/build.gradle b/RebornCore/build.gradle index 1b5f9bf90..91c32113d 100644 --- a/RebornCore/build.gradle +++ b/RebornCore/build.gradle @@ -17,7 +17,7 @@ curseforge { id = "237903" changelog = ENV.CHANGELOG ?: "No changelog provided" releaseType = ENV.RELEASE_CHANNEL ?: "release" - addGameVersion "1.19.1" + addGameVersion "1.19.2" addGameVersion "Fabric" mainArtifact(file("${project.buildDir}/libs/${archivesBaseName}-${version}.jar")) diff --git a/RebornCore/src/main/resources/fabric.mod.json b/RebornCore/src/main/resources/fabric.mod.json index cc2487540..9f1039b32 100644 --- a/RebornCore/src/main/resources/fabric.mod.json +++ b/RebornCore/src/main/resources/fabric.mod.json @@ -29,7 +29,7 @@ ], "depends": { "fabricloader": ">=0.14.8", - "fabric": ">=0.55.1", + "fabric-api": ">=0.59.0", "team_reborn_energy": ">=2.2.0", "fabric-biome-api-v1": ">=3.0.0", "minecraft": "~1.19-beta.1" diff --git a/build.gradle b/build.gradle index e84058681..602ecea52 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,7 @@ plugins { id 'eclipse' id 'maven-publish' 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 "de.undercouch.download" version "4.1.1" } @@ -27,13 +27,6 @@ repositories { includeGroup "dev.architectury" } } - maven { - name = "JEI" - url = "https://dvs1.progwml6.com/files/maven/" - content { - includeGroup "mezz.jei" - } - } } def ENV = System.getenv() @@ -187,9 +180,11 @@ dependencies { 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. - gametestImplementation 'org.apache.groovy:groovy:4.0.3' - datagenImplementation 'org.apache.groovy:groovy:4.0.3' + gametestImplementation 'org.apache.groovy:groovy:4.0.4' + datagenImplementation 'org.apache.groovy:groovy:4.0.4' gametestImplementation ("com.google.truth:truth:1.1.3") { exclude module: "guava" @@ -197,58 +192,15 @@ dependencies { } } -def modCompat(Map args) { - /* - 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 = { +def optionalClientDependency(String dep, runtime = true) { + def exclude = { 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 - dependencies { - args.dependencies.each { dependency -> - modLocalRuntime(dependency, excludes) - modCompileOnly(dependency, excludes) - } - args.compile.each { dependency -> - modCompileOnly(dependency, excludes) - } - args.runtime.each { dependency -> - modLocalRuntime(dependency, excludes) - } + if (runtime) { + dependencies.modClientRuntimeOnly(dep, exclude) } - - /* - allprojects { - loom { - mods { - techreborn { - sourceSet compatSourceSet - } - } - } - } - */ } modCompat( @@ -394,7 +346,7 @@ curseforge { id = "233564" changelog = ENV.CHANGELOG ?: "No changelog provided" 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" mainArtifact remapJar diff --git a/gradle.properties b/gradle.properties index a47ec16a1..57aa10ab2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,10 +6,10 @@ mod_version=5.3.3 # Fabric Properties # 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 -loader_version=0.14.8 -fapi_version=0.58.4+1.19.1 +loader_version=0.14.9 +fapi_version=0.59.0+1.19.2 # Dependencies energy_version=2.2.0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2..41d9927a4 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 41dfb8790..ae04661ee 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME 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 zipStorePath=wrapper/dists diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 82237c7cc..bea348134 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -31,7 +31,7 @@ }, "depends": { "fabricloader": ">=0.14.8", - "fabric": ">=0.55.1", + "fabric-api": ">=0.59.0", "reborncore": "*", "team_reborn_energy": ">=2.2.0", "fabric-biome-api-v1": ">=3.0.0",