Use 4 spaces instead of tabs for indentation

This commit is contained in:
autaut03 2019-02-12 21:42:17 +02:00
parent 4a1a45dc09
commit b5b0402d51
1 changed files with 52 additions and 52 deletions

View File

@ -1,13 +1,13 @@
buildscript { buildscript {
repositories { repositories {
jcenter() jcenter()
mavenCentral() mavenCentral()
maven { url 'https://files.minecraftforge.net/maven' } maven { url 'https://files.minecraftforge.net/maven' }
} }
dependencies { dependencies {
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }
plugins { plugins {
@ -27,75 +27,75 @@ sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = co
compileKotlin.kotlinOptions.jvmTarget = compileTestKotlin.kotlinOptions.jvmTarget = '1.8' compileKotlin.kotlinOptions.jvmTarget = compileTestKotlin.kotlinOptions.jvmTarget = '1.8'
minecraft { minecraft {
mappings channel: mappings_channel, version: mappings_version mappings channel: mappings_channel, version: mappings_version
runs { runs {
client = { client = {
// recommended logging data for a userdev environment // recommended logging data for a userdev environment
properties 'forge.logging.markers': 'CORE,SCAN,REGISTRIES,REGISTRYDUMP' properties 'forge.logging.markers': 'CORE,SCAN,REGISTRIES,REGISTRYDUMP'
// recommended logging level for the console // recommended logging level for the console
properties 'forge.logging.console.level': 'debug' properties 'forge.logging.console.level': 'debug'
// enable console colors // enable console colors
properties 'forge.logging.noansi': 'false' properties 'forge.logging.noansi': 'false'
workingDirectory project.file('run').canonicalPath workingDirectory project.file('run').canonicalPath
source sourceSets.main source sourceSets.main
} }
// todo https://github.com/MinecraftForge/ForgeGradle/pull/546 // todo https://github.com/MinecraftForge/ForgeGradle/pull/546
/*testClient = { /*testClient = {
workingDirectory project.file('run').canonicalPath workingDirectory project.file('run').canonicalPath
source sourceSets.main source sourceSets.main
source sourceSets.test source sourceSets.test
merge 'client' merge 'client'
}*/ }*/
server = { server = {
// recommended logging data for a userdev environment // recommended logging data for a userdev environment
properties 'forge.logging.markers': 'CORE,SCAN,REGISTRIES,REGISTRYDUMP' properties 'forge.logging.markers': 'CORE,SCAN,REGISTRIES,REGISTRYDUMP'
// recommended logging level for the console // recommended logging level for the console
properties 'forge.logging.console.level': 'debug' properties 'forge.logging.console.level': 'debug'
// enable console colors // enable console colors
properties 'forge.logging.noansi': 'false' properties 'forge.logging.noansi': 'false'
workingDirectory project.file('run').canonicalPath workingDirectory project.file('run').canonicalPath
source sourceSets.main source sourceSets.main
} }
} }
} }
repositories { repositories {
jcenter() jcenter()
} }
dependencies { dependencies {
minecraft forge_version minecraft forge_version
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
compile "org.jetbrains:annotations:$annotations_version" compile "org.jetbrains:annotations:$annotations_version"
compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
compile "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$coroutines_version" compile "org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:$coroutines_version"
} }
shadowJar { shadowJar {
classifier = "" classifier = ""
dependencies { dependencies {
include(dependency("org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}")) include(dependency("org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"))
include(dependency("org.jetbrains.kotlin:kotlin-reflect:${kotlin_version}")) include(dependency("org.jetbrains.kotlin:kotlin-reflect:${kotlin_version}"))
include(dependency("org.jetbrains:annotations:${annotations_version}")) include(dependency("org.jetbrains:annotations:${annotations_version}"))
include(dependency("org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutines_version}")) include(dependency("org.jetbrains.kotlinx:kotlinx-coroutines-core:${coroutines_version}"))
include(dependency("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:${coroutines_version}")) include(dependency("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:${coroutines_version}"))
} }
} }
tasks.build.dependsOn shadowJar tasks.build.dependsOn shadowJar
artifacts { artifacts {
archives shadowJar archives shadowJar
} }
/*reobf { /*reobf {