Trying to fix flywheel dependency some more.

This commit is contained in:
Christian Knaapen
2023-07-18 22:46:09 +02:00
parent 0a9b764d3f
commit 5fb2edb97a
3 changed files with 21 additions and 32 deletions

View File

@@ -7,11 +7,12 @@ buildscript {
maven { url = 'https://maven.parchmentmc.org' } maven { url = 'https://maven.parchmentmc.org' }
} }
dependencies { dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: "${forgegradle_version}", changing: false classpath "net.minecraftforge.gradle:ForgeGradle:${forgegradle_version}"
classpath "org.spongepowered:mixingradle:${mixingradle_version}" classpath "org.spongepowered:mixingradle:${mixingradle_version}"
classpath "org.parchmentmc:librarian:${librarian_version}" classpath "org.parchmentmc:librarian:${librarian_version}"
} }
} }
plugins { plugins {
id 'com.matthewprenger.cursegradle' version "${cursegradle_version}" id 'com.matthewprenger.cursegradle' version "${cursegradle_version}"
} }
@@ -33,7 +34,8 @@ archivesBaseName = "effortlessbuilding-${artifact_minecraft_version}"
java.toolchain.languageVersion = JavaLanguageVersion.of(17) java.toolchain.languageVersion = JavaLanguageVersion.of(17)
println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}" println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + ' (' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
minecraft { minecraft {
mappings channel: 'parchment', version: "${parchment_version}-${minecraft_version}" mappings channel: 'parchment', version: "${parchment_version}-${minecraft_version}"
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
@@ -90,39 +92,17 @@ minecraft {
repositories { repositories {
maven { maven {
// Location of the maven that hosts JEI files (and TiC) // location of the maven for Registrate and Flywheel
name 'Progwml6 maven' name = 'tterrag maven'
url 'https://dvs1.progwml6.com/files/maven' url = 'https://maven.tterrag.com'
} }
/*maven {
// Location of a maven mirror for JEI files, as a fallback
name 'ModMaven'
url 'https://modmaven.k-4u.nl'
}*/
maven { maven {
// Location of the maven for vazkii's mods url = 'https://www.cursemaven.com'
name 'blamejared'
url 'https://maven.blamejared.com'
}
maven {
// Location of the maven for mixed mappings, Registrate, and Flywheel
name 'tterrag maven'
url 'https://maven.tterrag.com'
}
maven {
url 'https://www.cursemaven.com'
content { content {
includeGroup "curse.maven" includeGroup "curse.maven"
} }
} }
maven {
//location of the maven for dynamic trees
url 'https://harleyoconnor.com/maven'
}
maven {
//location of the maven for curios api
url = "https://maven.theillusivec4.top/"
}
maven { maven {
name = "Modrinth" name = "Modrinth"
url = "https://api.modrinth.com/maven" url = "https://api.modrinth.com/maven"
@@ -130,6 +110,11 @@ repositories {
includeGroup "maven.modrinth" includeGroup "maven.modrinth"
} }
} }
mavenLocal()
flatDir {
dirs 'libs'
}
} }
dependencies { dependencies {
@@ -147,7 +132,7 @@ dependencies {
// Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings // 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 // 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 (!Boolean.getBoolean('idea.sync.active')) {
annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor" annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor"
} }
} }
@@ -179,6 +164,7 @@ jar {
} }
task jarJarRelease { task jarJarRelease {
group = 'jarjar'
doLast { doLast {
tasks.jarJar { tasks.jarJar {
classifier = '' classifier = ''
@@ -205,6 +191,7 @@ publishing {
jarJar.component(it) jarJar.component(it)
} }
} }
repositories { repositories {
if (project.hasProperty('mavendir')) { if (project.hasProperty('mavendir')) {
maven { url mavendir } maven { url mavendir }

View File

@@ -14,7 +14,7 @@ mixingradle_version = 0.7-SNAPSHOT
mixin_version = 0.8.5 mixin_version = 0.8.5
librarian_version = 1.+ librarian_version = 1.+
cursegradle_version = 1.4.0 cursegradle_version = 1.4.0
parchment_version = 2022.11.06 parchment_version = 2022.11.27
flywheel_minecraft_version = 1.19.2 flywheel_minecraft_version = 1.19.2
flywheel_version = 0.6.9-18 flywheel_version = 0.6.9-18

View File

@@ -2,5 +2,7 @@
"pack": { "pack": {
"description": "examplemod resources", "description": "examplemod resources",
"pack_format": 10, "pack_format": 10,
"forge:resource_pack_format": 9,
"forge:data_pack_format": 10
} }
} }