diff --git a/build.gradle b/build.gradle index cb8c956..4b55c50 100644 --- a/build.gradle +++ b/build.gradle @@ -7,11 +7,12 @@ buildscript { maven { url = 'https://maven.parchmentmc.org' } } 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.parchmentmc:librarian:${librarian_version}" } } + plugins { id 'com.matthewprenger.cursegradle' version "${cursegradle_version}" } @@ -33,7 +34,8 @@ archivesBaseName = "effortlessbuilding-${artifact_minecraft_version}" 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 { mappings channel: 'parchment', version: "${parchment_version}-${minecraft_version}" accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') @@ -69,7 +71,7 @@ minecraft { } data { - workingDirectory project.file('run') + workingDirectory project.file('run') property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP' property 'forge.logging.console.level', 'debug' args '--mod', 'effortlessbuilding', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources') @@ -90,39 +92,17 @@ minecraft { repositories { maven { - // Location of the maven that hosts JEI files (and TiC) - name 'Progwml6 maven' - url 'https://dvs1.progwml6.com/files/maven' + // location of the maven for Registrate and Flywheel + name = 'tterrag 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 { - // Location of the maven for vazkii's mods - 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' + url = 'https://www.cursemaven.com' content { 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 { name = "Modrinth" url = "https://api.modrinth.com/maven" @@ -130,6 +110,11 @@ repositories { includeGroup "maven.modrinth" } } + + mavenLocal() + flatDir { + dirs 'libs' + } } dependencies { @@ -147,7 +132,7 @@ dependencies { // 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 (!Boolean.getBoolean('idea.sync.active')) { annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor" } } @@ -179,6 +164,7 @@ jar { } task jarJarRelease { + group = 'jarjar' doLast { tasks.jarJar { classifier = '' @@ -205,6 +191,7 @@ publishing { jarJar.component(it) } } + repositories { if (project.hasProperty('mavendir')) { maven { url mavendir } diff --git a/gradle.properties b/gradle.properties index 3c61089..9a9dfe1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ mixingradle_version = 0.7-SNAPSHOT mixin_version = 0.8.5 librarian_version = 1.+ cursegradle_version = 1.4.0 -parchment_version = 2022.11.06 +parchment_version = 2022.11.27 flywheel_minecraft_version = 1.19.2 flywheel_version = 0.6.9-18 \ No newline at end of file diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 9d47c8c..4a33ce3 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -2,5 +2,7 @@ "pack": { "description": "examplemod resources", "pack_format": 10, + "forge:resource_pack_format": 9, + "forge:data_pack_format": 10 } }