chore: tabs even in gradle

This commit is contained in:
ftbsc 2023-02-07 21:46:05 +01:00
parent 93838f17ee
commit 0591511859
2 changed files with 75 additions and 72 deletions

View file

@ -8,3 +8,6 @@ indent_size = 4
[*.java] [*.java]
indent_size = 2 indent_size = 2
[*.gradle]
indent_size = 4

View file

@ -1,12 +1,12 @@
buildscript { buildscript {
repositories { repositories {
maven { url = 'https://maven.minecraftforge.net' } maven { url = 'https://maven.minecraftforge.net' }
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
classpath "com.palantir.gradle.gitversion:gradle-git-version:0.13.0" classpath "com.palantir.gradle.gitversion:gradle-git-version:0.13.0"
} }
} }
repositories { repositories {
@ -29,12 +29,12 @@ def minecraftVersion = '1.16.5'
def forgeVersion = '36.2.34' def forgeVersion = '36.2.34'
project.ext { // external properties coming from gradle.properties project.ext { // external properties coming from gradle.properties
deployJarDo = getProjectProperty("deployJar.do", "false") deployJarDo = getProjectProperty("deployJar.do", "false")
deployJarTargetDir = getProjectProperty("deployJar.targetDir", ".") deployJarTargetDir = getProjectProperty("deployJar.targetDir", ".")
} }
def getProjectProperty(String property, String fallback) { //allows for custom gradle.properties while retaining default fallback values def getProjectProperty(String property, String fallback) { //allows for custom gradle.properties while retaining default fallback values
return (project.hasProperty(property)) ? project.property(property) : fallback return (project.hasProperty(property)) ? project.property(property) : fallback
} }
java.toolchain.languageVersion = JavaLanguageVersion.of(8) // Mojang ships Java 8 to end users, so your mod should target Java 8. java.toolchain.languageVersion = JavaLanguageVersion.of(8) // Mojang ships Java 8 to end users, so your mod should target Java 8.
@ -42,93 +42,93 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(8) // Mojang ships Java
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: 'official', version: minecraftVersion mappings channel: 'official', version: minecraftVersion
runs { runs {
client { client {
workingDirectory project.file('run') workingDirectory project.file('run')
// Recommended logging data for a userdev environment // Recommended logging data for a userdev environment
// The markers can be changed as needed. // The markers can be changed as needed.
// "SCAN": For mods scan. // "SCAN": For mods scan.
// "REGISTRIES": For firing of registry events. // "REGISTRIES": For firing of registry events.
// "REGISTRYDUMP": For getting the contents of all registries. // "REGISTRYDUMP": For getting the contents of all registries.
property 'forge.logging.markers', 'REGISTRIES' property 'forge.logging.markers', 'REGISTRIES'
property 'forge.logging.console.level', 'debug' property 'forge.logging.console.level', 'debug'
mods { mods {
bscv { bscv {
source sourceSets.main source sourceSets.main
} }
} }
} }
data { data {
workingDirectory project.file('run') workingDirectory project.file('run')
// "SCAN": For mods scan. // "SCAN": For mods scan.
// "REGISTRIES": For firing of registry events. // "REGISTRIES": For firing of registry events.
// "REGISTRYDUMP": For getting the contents of all registries. // "REGISTRYDUMP": For getting the contents of all registries.
property 'forge.logging.markers', 'REGISTRIES' property 'forge.logging.markers', 'REGISTRIES'
property 'forge.logging.console.level', 'debug' property 'forge.logging.console.level', 'debug'
// Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
args '--mod', 'bsvc', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') args '--mod', 'bsvc', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
mods { mods {
bscv { bscv {
source sourceSets.main source sourceSets.main
} }
} }
} }
} }
} }
// Include resources generated by data generators. // Include resources generated by data generators.
sourceSets.main.resources { srcDir 'src/generated/resources' } sourceSets.main.resources { srcDir 'src/generated/resources' }
dependencies { dependencies {
minecraft "net.minecraftforge:forge:${minecraftVersion}-${forgeVersion}" minecraft "net.minecraftforge:forge:${minecraftVersion}-${forgeVersion}"
implementation 'ftbsc:lll:0.0.3' implementation 'ftbsc:lll:0.0.3'
} }
jar { jar {
archiveName = "${jar.baseName}-${shortVersion}.${jar.extension}" archiveName = "${jar.baseName}-${shortVersion}.${jar.extension}"
manifest { manifest {
attributes([ attributes([
"Specification-Title": "bscv", "Specification-Title": "bscv",
"Specification-Vendor": "ftbsc", "Specification-Vendor": "ftbsc",
"Specification-Version": "1", // We are version 1 of ourselves "Specification-Version": "1", // We are version 1 of ourselves
"Implementation-Title": project.name, "Implementation-Title": project.name,
"Implementation-Version": "${version}", "Implementation-Version": "${version}",
"Implementation-Vendor" :"ftbsc", "Implementation-Vendor" :"ftbsc",
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
]) ])
} }
} }
jar.finalizedBy('reobfJar') jar.finalizedBy('reobfJar')
//copy jar from build/libs to the forge mod folder //copy jar from build/libs to the forge mod folder
tasks.register('deployJar', Copy) { tasks.register('deployJar', Copy) {
if (!project.ext.deployJarDo.toBoolean()) return if (!project.ext.deployJarDo.toBoolean()) return
from project.jar from project.jar
into project.ext.deployJarTargetDir into project.ext.deployJarTargetDir
} }
publishing { publishing {
publications { publications {
mavenJava(MavenPublication) { mavenJava(MavenPublication) {
artifact jar artifact jar
} }
} }
repositories { repositories {
maven { maven {
url "file:///${project.projectDir}/mcmodsrepo" url "file:///${project.projectDir}/mcmodsrepo"
} }
} }
} }
build { build {
//dependsOn shadowJar, reobfShadowJar //dependsOn shadowJar, reobfShadowJar
finalizedBy deployJar finalizedBy deployJar
} }