diff --git a/build.gradle b/build.gradle index d875f62..dfa221a 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,6 @@ plugins { id 'eclipse' id 'idea' id 'maven-publish' - id 'java-library' id 'net.neoforged.gradle' version '[6.0.18,6.2)' id 'org.spongepowered.mixin' version '0.7.+' //id 'org.parchmentmc.librarian.forgegradle' version '1.+' @@ -186,11 +185,18 @@ dependencies { // See https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html tasks.withType(ProcessResources).configureEach { var replaceProperties = [ - minecraft_version : minecraft_version, minecraft_version_range: minecraft_version_range, - neo_version : neo_version, neo_version_range: neo_version_range, + minecraft_version : minecraft_version, + minecraft_version_range: minecraft_version_range, + neo_version : neo_version, + neo_version_range: neo_version_range, loader_version_range: loader_version_range, - mod_id : mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version, - mod_authors : mod_authors, mod_description: mod_description, pack_format_number: pack_format_number, + mod_id : mod_id, + mod_name: mod_name, + mod_license: mod_license, + mod_version: mod_version, + mod_authors : mod_authors, + mod_description: mod_description, + pack_format_number: pack_format_number, ] inputs.properties replaceProperties @@ -205,9 +211,7 @@ tasks.named('jar', Jar).configure { duplicatesStrategy = "exclude" from { configurations.provided.collect { it.isDirectory() ? it : zipTree(it) } } - exclude 'META-INF/*' - exclude 'META-INF/*' - exclude 'META-INF/*' + //exclude 'META-INF/*' manifest { attributes([ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fae0804..37aef8d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists