diff --git a/build.gradle b/build.gradle index db0c917a0..1f196a27a 100644 --- a/build.gradle +++ b/build.gradle @@ -3,8 +3,8 @@ plugins { id 'idea' id 'maven-publish' id 'net.minecraftforge.gradle' version "${forgegradle_version}" - id 'org.spongepowered.mixin' version "${mixingradle_version}" id 'org.parchmentmc.librarian.forgegradle' version "${librarian_version}" + id 'org.spongepowered.mixin' version "${mixingradle_version}" id 'com.matthewprenger.cursegradle' version "${cursegradle_version}" } @@ -104,9 +104,9 @@ dependencies { // https://discord.com/channels/313125603924639766/725850371834118214/910619168821354497 // Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings // This allows 'Settings > Build, Execution, and Deployment > Build Tools > Gradle > Build and run using' set to IntelliJ to work correctly - if (System.getProperty('idea.sync.active') != 'true') { + // if (System.getProperty('idea.sync.active') != 'true') { annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor" - } + // } } test { @@ -159,7 +159,6 @@ tasks.named('jar', Jar).configure { 'Implementation-Version' : project.jar.archiveVersion, //'Implementation-Vendor': 'flywheel authors', 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), - 'MixinConfigs' : 'flywheel.mixins.json,flywheel.sodium.mixins.json' ]) } @@ -167,11 +166,6 @@ tasks.named('jar', Jar).configure { addLicense(it) } -tasks.named('jarJar').configure { - finalizedBy 'reobfJarJar' - addLicense(it) -} - java { withSourcesJar() withJavadocJar() @@ -209,6 +203,6 @@ curseforge { changelog = file('changelog.txt') releaseType = project.curse_type mainArtifact jar - addGameVersion '1.20.2' + addGameVersion '1.20.1' } } diff --git a/gradle.properties b/gradle.properties index 50ce641ae..df48a4edc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,17 +3,17 @@ org.gradle.daemon = false # mod version info mod_version = 1.0.0-alpha -artifact_minecraft_version=1.20 -minecraft_version=1.20.2 -forge_version=48.0.40 +artifact_minecraft_version = 1.20 +minecraft_version = 1.20.1 +forge_version = 47.2.6 # build dependency versions -forgegradle_version=[6.0.16,6.2) -mixingradle_version=0.7.+ +forgegradle_version = [6.0.16,6.2) +mixingradle_version = 0.7.+ mixin_version = 0.8.5 librarian_version = 1.+ cursegradle_version = 1.4.0 -parchment_version=2023.10.22 +parchment_version = 2023.09.03 # curseforge info projectId = 486392 diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index c63e6a3d1..ddee02640 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 = "[47,)" issueTrackerURL = "https://github.com/Jozufozu/Flywheel/issues" license = "MIT" @@ -18,13 +18,13 @@ A modern engine for modded minecraft.''' [[dependencies.flywheel]] modId = "forge" mandatory = true -versionRange = "[48.0.0,)" +versionRange = "[47.0.0,)" ordering = "NONE" side = "CLIENT" [[dependencies.flywheel]] modId = "minecraft" mandatory = true -versionRange = "[1.20.2,)" +versionRange = "[1.20.1,)" ordering = "NONE" side = "CLIENT"