From 9117f6425e3abb5bb87973a840e923c52d5cb911 Mon Sep 17 00:00:00 2001 From: seasnail8169 Date: Tue, 15 Jun 2021 00:43:49 +0100 Subject: [PATCH] More updates --- .editorconfig | 12 +++++++ build.gradle | 42 +++++++++++------------- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 32 insertions(+), 24 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..b722415 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,12 @@ +[*] +charset = utf-8 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true +indent_size = 4 + +[*.{json, yml}] +indent_size = 2 + +[*.md] +trim_trailing_whitespace = false diff --git a/build.gradle b/build.gradle index c73b643..3702d0a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { - id 'fabric-loom' version '0.9-SNAPSHOT' - id 'maven-publish' + id 'fabric-loom' version '0.8-SNAPSHOT' + id 'maven-publish' } sourceCompatibility = targetCompatibility = JavaVersion.VERSION_16 @@ -10,35 +10,31 @@ version = project.mod_version group = project.maven_group repositories { - maven { - name = "jitpack" - url = "https://jitpack.io" - } + maven { + name = "jitpack" + url = "https://jitpack.io" + } } dependencies { - //Minecraft - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_version}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + // Minecraft + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_version}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - //Meteor - modImplementation "com.github.MeteorDevelopment:meteor-client:master-SNAPSHOT" + // Meteor + modImplementation "com.github.MeteorDevelopment:meteor-client:master-SNAPSHOT" } processResources { - inputs.property "version", project.version + inputs.property "version", project.version - filesMatching("fabric.mod.json") { - expand "version": project.version - } + filesMatching("fabric.mod.json") { + expand "version": project.version + } } tasks.withType(JavaCompile).configureEach { - it.options.encoding = "UTF-8" - - def targetVersion = 8 - if (JavaVersion.current().isJava9Compatible()) { - it.options.release = targetVersion - } -} \ No newline at end of file + it.options.encoding = "UTF-8" + it.options.release = 16 +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0f80bbf..69a9715 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists