Skip to content

Commit

Permalink
Update versions for 1.21.1
Browse files Browse the repository at this point in the history
- Add mc version to more mod version properties
- Add version properties for loaders
- Temporarily use ModDevGradle instead of minivan for xplat, since minivan tries to download macos arm natives from the wrong place
  • Loading branch information
artemisSystem committed Sep 5, 2024
1 parent 30d5475 commit e2dcc0f
Show file tree
Hide file tree
Showing 8 changed files with 55 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .builds/linux.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
image: debian/bookworm
packages:
- openjdk-17-jdk-headless
- openjdk-21-jdk-headless
- jq
sources:
- https://git.sr.ht/~williewillus/botania
Expand Down
12 changes: 6 additions & 6 deletions Fabric/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -99,20 +99,20 @@ dependencies {
minecraft "com.mojang:minecraft:${minecraft_version}"
mappings loom.layered() {
officialMojangMappings()
parchment("org.parchmentmc.data:parchment-${minecraft_version}:${parchment_version}@zip")
parchment("org.parchmentmc.data:parchment-${parchment_version}@zip")
}

modImplementation "net.fabricmc:fabric-loader:0.16.0"
modImplementation "net.fabricmc.fabric-api:fabric-api:0.97.0+${minecraft_version}"
modImplementation "net.fabricmc:fabric-loader:${fabric_version}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_api_version}"

compileOnly project(":Xplat")

modImplementation "vazkii.patchouli:Patchouli:${minecraft_version}-${patchouli_version}-FABRIC"
modImplementation "vazkii.patchouli:Patchouli:${patchouli_version}-FABRIC"

modCompileOnly "me.shedaniel:RoughlyEnoughItems-fabric:${rei_version}"

modCompileOnly "dev.emi:emi-fabric:${emi_version}+${minecraft_version}:api"
modLocalRuntime "dev.emi:emi-fabric:${emi_version}+${minecraft_version}"
modCompileOnly "dev.emi:emi-fabric:${emi_version}:api"
modLocalRuntime "dev.emi:emi-fabric:${emi_version}"

modImplementation "me.zeroeightsix:fiber:0.23.0-2"
include "me.zeroeightsix:fiber:0.23.0-2"
Expand Down
19 changes: 10 additions & 9 deletions NeoForge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,9 @@ repositories {

subsystems {
parchment {
minecraftVersion = "${minecraft_version}"
mappingsVersion = "${parchment_version}"
var parchment_components = parchment_version.split(":")
minecraftVersion = parchment_components[0]
mappingsVersion = parchment_components[1]
}
}

Expand All @@ -56,18 +57,18 @@ runs {
}

dependencies {
implementation "net.neoforged:neoforge:20.4.173"
implementation "net.neoforged:neoforge:${neoforge_version}"
implementation project(":Xplat")

implementation "vazkii.patchouli:Patchouli:${minecraft_version}-${patchouli_version}-NEOFORGE"
implementation "vazkii.patchouli:Patchouli:${patchouli_version}-NEOFORGE"
compileOnly "mezz.jei:jei-${minecraft_version}-common-api:${jei_version}"
runtimeOnly "mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}"
// runtimeOnly "mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}"

compileOnly "dev.emi:emi-neoforge:${emi_version}+${minecraft_version}:api"
//runtimeOnly "dev.emi:emi-neoforge:${emi_version}+${minecraft_version}"
compileOnly "dev.emi:emi-neoforge:${emi_version}:api"
runtimeOnly "dev.emi:emi-neoforge:${emi_version}"

compileOnly "top.theillusivec4.curios:curios-neoforge:${curios_version}+${minecraft_version}:api"
runtimeOnly "top.theillusivec4.curios:curios-neoforge:${curios_version}+${minecraft_version}"
compileOnly "top.theillusivec4.curios:curios-neoforge:${curios_version}:api"
runtimeOnly "top.theillusivec4.curios:curios-neoforge:${curios_version}"

// compileOnly 'com.blamejared.crafttweaker:CraftTweaker-forge-1.18.2:9.1.123'

Expand Down
25 changes: 19 additions & 6 deletions Xplat/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
plugins {
id 'java'
id 'agency.highlysuspect.minivan'
// temporary until https://github.com/CrackedPolishedBlackstoneBricksMC/minivan/issues/2 is fixed
// id 'agency.highlysuspect.minivan'
// could probably have used NeoGradle but i had the code for ModDevGradle ready
id "net.neoforged.moddev"
}

archivesBaseName = "${mod_name}-xplat"
Expand All @@ -9,9 +12,19 @@ if (System.getenv().RELEASE_MODE == null) {
version += '-SNAPSHOT'
}

minivan {
version(minecraft_version)
accessWideners 'src/main/resources/botania_xplat.accesswidener'
// minivan {
// version(minecraft_version)
// accessWideners 'src/main/resources/botania_xplat.accesswidener'
// }

neoForge {
neoFormVersion = "1.21.1-20240808.144430"

parchment {
var parchment_components = parchment_version.split(":")
mappingsVersion = parchment_components[1]
minecraftVersion = parchment_components[0]
}
}

repositories {
Expand All @@ -35,7 +48,7 @@ repositories {
dependencies {
compileOnly "net.fabricmc:sponge-mixin:${mixin_version}"
annotationProcessor("io.github.llamalad7:mixinextras-common:${mixinextras_version}")
compileOnly "vazkii.patchouli:Patchouli-xplat:${minecraft_version}-${patchouli_version}"
compileOnly "vazkii.patchouli:Patchouli-xplat:${patchouli_version}"

testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.1'
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.1'
Expand All @@ -45,7 +58,7 @@ dependencies {
compileOnly "com.unascribed:ears-api:${ears_version}"

compileOnly "mezz.jei:jei-${minecraft_version}-common-api:${jei_version}"
compileOnly "dev.emi:emi-xplat-mojmap:${emi_version}+${minecraft_version}:api"
compileOnly "dev.emi:emi-xplat-mojmap:${emi_version}:api"

compileOnly "org.jetbrains:annotations:24.0.1"

Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ subprojects {
apply plugin: 'pmd'
apply plugin: "com.diffplug.spotless"
apply plugin: 'maven-publish'
java.toolchain.languageVersion = JavaLanguageVersion.of(17)
java.toolchain.languageVersion = JavaLanguageVersion.of(21)
java.withSourcesJar()
archivesBaseName = "${mod_name}"

Expand All @@ -28,7 +28,7 @@ subprojects {

tasks.withType(JavaCompile).configureEach {
it.options.encoding = 'UTF-8'
it.options.release = 17
it.options.release = 21
}

tasks.withType(GenerateModuleMetadata).configureEach {
Expand Down
24 changes: 15 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,24 @@ org.gradle.jvmargs=-Xmx3G \
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED

minecraft_version=1.20.4
minecraft_version=1.21.1
build_number=447
group=vazkii.botania
mod_name=Botania

mixin_version=0.15.0+mixin.0.8.7
mixinextras_version=0.4.0
patchouli_version=85
jei_version=17.3.1.3
emi_version=1.1.10
rei_version=14.1.742
trinkets_version=3.8.1
curios_version=7.4.3
patchouli_version=1.21-87
jei_version=19.16.4.171
emi_version=1.1.12+1.21
rei_version=16.0.754
trinkets_version=3.10.0
curios_version=9.0.9+1.21
ears_version=1.4.6
cca_version=5.4.0
parchment_version=2024.04.14
cca_version=6.1.1
parchment_version=1.21:2024.07.28

neoforge_version=21.1.39

fabric_version=0.16.4
fabric_api_version=0.103.0+1.21.1
2 changes: 1 addition & 1 deletion gradle/gradle-daemon-jvm.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#This file is generated by updateDaemonJvm
toolchainVersion=17
toolchainVersion=21
1 change: 1 addition & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
pluginManagement {
plugins {
id 'net.neoforged.gradle.userdev' version '7.0.97' apply false
id "net.neoforged.moddev" version "0.1.126" apply false
id 'org.spongepowered.mixin' version '0.8.7' apply false
id 'agency.highlysuspect.minivan' version '0.5' apply false
id 'fabric-loom' version '1.7.2' apply false
Expand Down

0 comments on commit e2dcc0f

Please sign in to comment.