diff --git a/build.gradle b/build.gradle index 63f0bbff..0bcbc9e7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java-library' id 'idea' - id 'net.neoforged.moddev' version '0.1.120' + id 'net.neoforged.moddev' version '1.0.17' } version = '3.2' @@ -22,8 +22,7 @@ neoForge { minecraftVersion = project.parchment_minecraft_version } - //validateAccessTransformers = true - accessTransformers.add('src/main/resources/META-INF/accesstransformer.cfg') + accessTransformers = project.files('src/main/resources/META-INF/accesstransformer.cfg') runs { configureEach { @@ -86,7 +85,10 @@ repositories { maven { name = 'KubeJS and Rhino' url = "https://maven.saps.dev/minecraft" - content { includeGroup "dev.latvian.mods" } + content { + includeGroup "dev.latvian.mods" + includeGroup "dev.latvian.apps" + } } maven { name = 'ModKit' @@ -111,11 +113,18 @@ repositories { includeGroup "curse.maven" } } + // Required for KubeJS + maven { + url 'https://jitpack.io' + content { + includeGroup "com.github.rtyley" + } + } } dependencies { // TOP OPTIONAL - compileOnly("mcjty.theoneprobe:theoneprobe:${mc_version}_neo-${top_version}") { + compileOnly("mcjty.theoneprobe:theoneprobe:1.21_neo-${top_version}") { transitive = false } // JADE OPTIONAL @@ -127,12 +136,12 @@ dependencies { compileOnly("me.shedaniel:RoughlyEnoughItems-forge:${rei_version}") compileOnly("me.shedaniel.cloth:cloth-config-neoforge:${cloth_config_version}") // EMI OPTIONAL - compileOnly("dev.emi:emi-neoforge:${emi_version}:api") - compileOnly("dev.emi:emi-neoforge:${emi_version}") + compileOnly("dev.emi:emi-neoforge:${emi_version}+${mc_version}:api") + compileOnly("dev.emi:emi-neoforge:${emi_version}+${mc_version}") //implementation("curse.maven:reipc-521393:4837449") // KubeJS OPTIONAL implementation("dev.architectury:architectury-neoforge:${architectury_version}") - implementation "curse.maven:rhino-416294:5554415" + implementation("dev.latvian.mods:rhino:${rhino_version}") implementation("dev.latvian.mods:kubejs-neoforge:${kubejs_version}") // ModKit DEV ONLY @@ -165,21 +174,6 @@ tasks.withType(ProcessResources).configureEach { filesMatching(['META-INF/neoforge.mods.toml']) { expand replaceProperties } - - // Minify JSON resources - // Actual reduction in file size is just a few KB, but why not? - doLast { - fileTree(dir: outputs.files.asPath, include: "**/*.json").each { - File file -> - //noinspection UnnecessaryQualifiedReference - try { - file.text = groovy.json.JsonOutput.toJson(new groovy.json.JsonSlurper().parse(file)) - } catch (Exception e) { - println "Unable to minify file ${file.name}" - throw new RuntimeException(e) - } - } - } } tasks.withType(JavaCompile).configureEach { diff --git a/changelog.md b/changelog.md index 1a2ecb5c..c2c3ee2e 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,6 @@ +## Ex Deorum 3.3 +- Now built against Minecraft 1.21.1 + ## Ex Deorum 3.2 - Fix KubeJS plugin. - Buff wooden crucibles to 4x like in old Ex Nihilo diff --git a/gradle.properties b/gradle.properties index 9da58f5c..2f504765 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,22 +1,25 @@ # Sets default memory used for gradle commands. Can be overridden by user or command line properties. # This is required to provide enough memory for the Minecraft decompilation process. -org.gradle.jvmargs=-Xmx3G +org.gradle.jvmargs=-Xmx1G +org.gradle.daemon=true org.gradle.parallel=true +org.gradle.caching=true +org.gradle.configuration-cache=true -mc_version=1.21 -neo_version=21.0.147 -neo_version_range=[21,) -loader_version_range=[3,) +mc_version=1.21.1 +neo_version=21.1.51 +neo_version_range=[21.1,) +loader_version_range=[4,) -jei_version=19.5.3.67 +jei_version=19.18.3.204 rei_version=14.0.688 -emi_version=1.1.7+1.21 +emi_version=1.1.13 cloth_config_version=15.0.127 top_version=12.0.3-5 -kubejs_version=2100.7.0-build.119 -#rhino_version=2004.2.3-build.4 +kubejs_version=2101.7.0-build.171 +rhino_version=2101.2.5-build.54 architectury_version=13.0.6 -parchment_minecraft_version=1.20.6 -parchment_mappings_version=2024.06.02 +parchment_minecraft_version=1.21 +parchment_mappings_version=2024.07.28 \ No newline at end of file