-
-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed formatting and some build warnings
Signed-off-by: TreyRuffy <[email protected]>
- Loading branch information
Showing
12 changed files
with
473 additions
and
489 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,55 +1,55 @@ | ||
| plugins { | ||
| id "architectury-plugin" version "3.4-SNAPSHOT" // Uses Architectury plugin https://github.com/architectury/architectury-plugin | ||
| id "dev.architectury.loom" version "0.10.0-SNAPSHOT" apply false // Uses Architectury Loom | ||
| // (fork of Fabric Loom) https://github.com/architectury/architectury-loom - does not apply to root project | ||
| id "net.kyori.indra.git" version "2.0.6" // Uses Indra Git plugin | ||
| id "net.kyori.indra.checkstyle" version "2.0.6" // Uses Indra Checkstyle plugin | ||
| id "architectury-plugin" version "3.4-SNAPSHOT" // Uses Architectury plugin https://github.com/architectury/architectury-plugin | ||
| id "dev.architectury.loom" version "0.10.0-SNAPSHOT" apply false // Uses Architectury Loom | ||
| // (fork of Fabric Loom) https://github.com/architectury/architectury-loom - does not apply to root project | ||
| id "net.kyori.indra" version "2.0.6" // Uses Indra plugin | ||
| id "net.kyori.indra.git" version "2.0.6" // Uses Indra Git plugin | ||
| id "net.kyori.indra.checkstyle" version "2.0.6" // Uses Indra Checkstyle plugin | ||
| } | ||
|
|
||
| architectury { | ||
| minecraft = rootProject.minecraft_version // Sets Minecraft version from gradle.properties | ||
| minecraft = rootProject.minecraft_version // Sets Minecraft version from gradle.properties | ||
| } | ||
|
|
||
|
|
||
| subprojects { | ||
| apply plugin: "dev.architectury.loom" // Applies Architectury Loom to subprojects | ||
| apply plugin: "dev.architectury.loom" // Applies Architectury Loom to subprojects | ||
|
|
||
| loom { | ||
| silentMojangMappingsLicense() // Silences the annoying as hell Mojang License text | ||
| } | ||
| loom { | ||
| silentMojangMappingsLicense() // Silences the annoying as hell Mojang License text | ||
| } | ||
|
|
||
| dependencies { | ||
| minecraft "com.mojang:minecraft:${rootProject.minecraft_version}" // Minecraft dependency | ||
| //mappings loom.officialMojangMappings() // Maps Minecraft so we can tell what classes are what - official mappings | ||
| mappings "net.fabricmc:yarn:${rootProject.yarn_version}:v2" // Alternative, open, mappings from Fabric | ||
| } | ||
| dependencies { | ||
| minecraft "com.mojang:minecraft:${rootProject.minecraft_version}" // Minecraft dependency | ||
| //mappings loom.officialMojangMappings() // Maps Minecraft so we can tell what classes are what - official mappings | ||
| mappings "net.fabricmc:yarn:${rootProject.yarn_version}:v2" // Alternative, open, mappings from Fabric | ||
| } | ||
| } | ||
|
|
||
| allprojects { | ||
| apply plugin: "java" | ||
| apply plugin: "architectury-plugin" // Applies architectury plugin to all projects | ||
| apply plugin: "maven-publish" | ||
| apply plugin: "net.kyori.indra" // Applies Indra to all projects | ||
| apply plugin: "net.kyori.indra.git" // Applies Indra Git to all projects | ||
| apply plugin: "net.kyori.indra.checkstyle" // Applies Indra Checkstyle to all projects | ||
|
|
||
| archivesBaseName = rootProject.archives_base_name // sets the archive name from gradle.properties | ||
| version = rootProject.mod_version // sets the version from gradle.properties | ||
| group = rootProject.maven_group // sets the maven group from gradle.properties | ||
| indra { | ||
| checkstyle("8.41.1") | ||
| javaVersions { | ||
| target(16) | ||
| testWith(16) | ||
| } | ||
| } | ||
|
|
||
| java { | ||
| withSourcesJar() | ||
| } | ||
|
|
||
| compileJava { | ||
| options.compilerArgs += "-Xlint:-processing" // Fixes "no processor claimed any of these annotations" warning | ||
| } | ||
| apply plugin: "java" | ||
| apply plugin: "architectury-plugin" // Applies architectury plugin to all projects | ||
| apply plugin: "maven-publish" | ||
| apply plugin: "net.kyori.indra" // Applies Indra to all projects | ||
| apply plugin: "net.kyori.indra.git" // Applies Indra Git to all projects | ||
| apply plugin: "net.kyori.indra.checkstyle" // Applies Indra Checkstyle to all projects | ||
|
|
||
| archivesBaseName = rootProject.archives_base_name // sets the archive name from gradle.properties | ||
| version = rootProject.mod_version // sets the version from gradle.properties | ||
| group = rootProject.maven_group // sets the maven group from gradle.properties | ||
| indra { | ||
| checkstyle("8.41.1") | ||
| javaVersions { | ||
| target(16) | ||
| testWith(16) | ||
| } | ||
| } | ||
|
|
||
| java { | ||
| withSourcesJar() | ||
| } | ||
|
|
||
| compileJava { | ||
| options.compilerArgs += "-Xlint:-processing" // Fixes "no processor claimed any of these annotations" warning | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,59 +1,56 @@ | ||
| repositories { | ||
| maven { url "https://maven.shedaniel.me/" } // cloth-config repository | ||
| mavenCentral() | ||
| maven { url "https://maven.shedaniel.me/" } // cloth-config repository | ||
| mavenCentral() | ||
| } | ||
|
|
||
| configurations { | ||
| shadowCommon // Don"t use shadow from the shadow plugin because we don"t want IDEA to index this. | ||
| shadowCommon // Don"t use shadow from the shadow plugin because we don"t want IDEA to index this. | ||
| } | ||
|
|
||
| dependencies { | ||
| // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies | ||
| // Do NOT use other classes from fabric loader | ||
| modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" | ||
| // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies | ||
| // Do NOT use other classes from fabric loader | ||
| modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}" | ||
|
|
||
| modImplementation "me.shedaniel.cloth:cloth-config:${project.cloth_version}", { | ||
| exclude module: "fabric-api" | ||
| } | ||
| modImplementation "me.shedaniel.cloth:cloth-config:${project.cloth_version}", { | ||
| exclude module: "fabric-api" | ||
| } | ||
|
|
||
| implementation "com.electronwill.night-config:json:3.6.4" | ||
| shadowCommon "com.electronwill.night-config:json:3.6.4" | ||
| implementation "com.electronwill.night-config:json:3.6.4" | ||
| shadowCommon "com.electronwill.night-config:json:3.6.4" | ||
| } | ||
|
|
||
| loom { | ||
| accessWidenerPath.set(file("src/main/resources/betterf3.accesswidener")) | ||
| /*common { | ||
| mixinConfig "betterf3.mixins.json" | ||
| }*/ | ||
| accessWidenerPath.set(file("src/main/resources/betterf3.accesswidener")) | ||
| /*common { | ||
| mixinConfig "betterf3.mixins.json" | ||
| }*/ | ||
| } | ||
|
|
||
| architectury { | ||
| if (rootProject.forge_enabled.toBoolean()) { | ||
| common() | ||
| } else { | ||
| common(false) | ||
| } | ||
| if (rootProject.forge_enabled.toBoolean()) { | ||
| common() | ||
| } else { | ||
| common(false) | ||
| } | ||
| } | ||
|
|
||
| afterEvaluate { | ||
| remapJar { | ||
| remapAccessWidener = false | ||
| } | ||
| remapJar { | ||
| remapAccessWidener.set(false) | ||
| } | ||
| } | ||
|
|
||
| java { | ||
| withSourcesJar() | ||
| withSourcesJar() | ||
| } | ||
|
|
||
| publishing { | ||
| publications { | ||
| mavenCommon(MavenPublication) { | ||
| artifactId = rootProject.archives_base_name | ||
| // add all the jars that should be included when publishing to maven | ||
| artifact remapJar | ||
| artifact(sourcesJar) { | ||
| builtBy remapSourcesJar | ||
| } | ||
| } | ||
| } | ||
| publishing { | ||
| publications { | ||
| mavenJava(MavenPublication) { | ||
| from components.java | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.