diff --git a/build.gradle b/build.gradle index f4997da..ad88fb0 100644 --- a/build.gradle +++ b/build.gradle @@ -189,3 +189,13 @@ tasks.withType(JavaCompile).configureEach { it.options.encoding = "UTF-8" it.options.release = 17 } + +// Merge the resources and classes into the same directory. +// This is done because java expects modules to be in a single directory. +// And if we have it in multiple we have to do performance intensive hacks like having the UnionFileSystem +// This will eventually be migrated to ForgeGradle so modders don't need to manually do it. But that is later. +sourceSets.each { + def dir = layout.buildDirectory.dir("sourcesSets/$it.name") + it.output.resourcesDir = dir + it.java.destinationDirectory = dir +} diff --git a/gradle.properties b/gradle.properties index b42041f..6985b61 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,15 +7,15 @@ maven_group = plus.dragons.visuality mod_name = visuality-forge mod_id = visuality mod_version = 2.0.2 -minecraft_version = 1.20.2 -forge_version = 48.0.33 +minecraft_version = 1.20.3 +forge_version = 49.0.2 # Build Dependency Versions forgegradle_version = 6.0.14 mixingradle_version = 0.7-SNAPSHOT mixin_version = 0.8.5 librarian_version = 1.+ -parchment_version = 1.20.1-2023.09.03 +parchment_version = 1.20.2-2023.12.10 # Mod Dependency Versions mixin_extras_version = 0.2.0 \ No newline at end of file diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 78011ca..a4d580b 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -1,5 +1,5 @@ modLoader="javafml" -loaderVersion="[48,)" +loaderVersion="[49,)" license="MIT" issueTrackerURL="https://github.com/ChannelingMC/visuality-forge/issues/" @@ -17,13 +17,13 @@ issueTrackerURL="https://github.com/ChannelingMC/visuality-forge/issues/" [[dependencies.visuality]] modId="forge" mandatory=true - versionRange="[48,)" + versionRange="[49,)" ordering="NONE" side="BOTH" [[dependencies.visuality]] modId="minecraft" mandatory=true - versionRange="[1.20.2,1.21)" + versionRange="[1.20.3,1.21)" ordering="NONE" side="BOTH"