Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ dependencies {
implementation 'com.fasterxml.jackson.core:jackson-databind'
implementation 'com.fasterxml.jackson.module:jackson-module-kotlin'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
implementation 'com.github.wurstscript:wurst-project-config:2c7ccd1a5f'
implementation 'com.github.Frotty:SimpleRegistry:f96dda96bd'
implementation 'org.jline:jline:3.30.13'
implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.17'
Expand Down Expand Up @@ -135,6 +136,25 @@ dist.dependsOn versionInfoFile

dist.archiveFileName = "WurstSetup.jar"

def fatJar = dist.archiveFile.map { it.asFile }
def wurstUserDir = "${System.properties['user.home']}/.wurst"
def grillCliDir = "${wurstUserDir}/grill-cli"

tasks.register('delete_legacy_userdir_grill_jar', Delete) {
delete "${wurstUserDir}/WurstSetup.jar"
}

tasks.register('make_for_userdir', Copy) {
dependsOn 'dist', 'delete_legacy_userdir_grill_jar'
from fatJar
into grillCliDir
rename { 'grill.jar' }
}

tasks.register('make_for_userdir_grill_cli') {
dependsOn 'make_for_userdir'
}

task copy_jar(type: Copy) {
mkdir("downloads/")
from 'build/libs/'
Expand Down
130 changes: 0 additions & 130 deletions src/main/kotlin/config/DAOs.kt

This file was deleted.

45 changes: 45 additions & 0 deletions src/main/kotlin/config/ProjectConfigModels.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package config

const val CONFIG_FILE_NAME = "wurst.build"

typealias ScriptMode = org.wurstscript.projectconfig.ScriptMode
typealias Race = org.wurstscript.projectconfig.Race
typealias Controller = org.wurstscript.projectconfig.Controller
Comment thread
Frotty marked this conversation as resolved.
typealias WurstProjectConfigData = org.wurstscript.projectconfig.WurstProjectConfigData
typealias WurstProjectBuildMapData = org.wurstscript.projectconfig.WurstProjectBuildMapData
typealias WurstProjectBuildScenarioData = org.wurstscript.projectconfig.WurstProjectBuildScenarioData
typealias WurstProjectBuildLoadingScreenData = org.wurstscript.projectconfig.WurstProjectBuildLoadingScreenData
typealias WurstProjectBuildOptionFlagsData = org.wurstscript.projectconfig.WurstProjectBuildOptionFlagsData
typealias WurstProjectBuildPlayer = org.wurstscript.projectconfig.WurstProjectBuildPlayer
typealias WurstProjectBuildForce = org.wurstscript.projectconfig.WurstProjectBuildForce
typealias WurstProjectBuildForceFlags = org.wurstscript.projectconfig.WurstProjectBuildForceFlags

fun newProjectConfig(
projectName: String = "unnamed",
dependencies: List<String> = emptyList(),
buildMapData: WurstProjectBuildMapData = WurstProjectBuildMapData.empty(),
scriptMode: ScriptMode? = null,
wc3Patch: String? = null
): WurstProjectConfigData {
return WurstProjectConfigData(projectName, dependencies, buildMapData, scriptMode, wc3Patch)
}

fun WurstProjectConfigData.withProjectName(projectName: String): WurstProjectConfigData {
return WurstProjectConfigData(projectName, dependencies(), buildMapData(), scriptMode(), wc3Patch())
}

fun WurstProjectConfigData.withWc3Patch(wc3Patch: String?): WurstProjectConfigData {
return WurstProjectConfigData(projectName(), dependencies(), buildMapData(), scriptMode(), wc3Patch)
}

fun WurstProjectConfigData.withDependencies(dependencies: List<String>): WurstProjectConfigData {
return WurstProjectConfigData(projectName(), dependencies, buildMapData(), scriptMode(), wc3Patch())
}

fun WurstProjectConfigData.withAddedDependency(dependency: String): WurstProjectConfigData {
return withDependencies(dependencies() + dependency)
}

fun WurstProjectConfigData.withRemovedDependency(dependency: String): WurstProjectConfigData {
return withDependencies(dependencies().filterNot { it == dependency })
}
8 changes: 5 additions & 3 deletions src/main/kotlin/config/WurstProjectConfig.kt
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,11 @@ object WurstProjectConfig {
if (Files.exists(buildFile) && buildFile.fileName.toString().equals(CONFIG_FILE_NAME, ignoreCase = true)) {
val config = YamlHelper.loadProjectConfig(buildFile)
val projectRoot = buildFile.parent
if (config.projectName.isEmpty()) {
config.projectName = projectRoot?.fileName.toString()
saveProjectConfig(projectRoot, config)
if (config.projectName.isBlank()) {
val namedConfig = config.withProjectName(projectRoot?.fileName?.toString() ?: "unnamed")
saveProjectConfig(projectRoot, namedConfig)
Log.print("done\n")
return namedConfig
}
Log.print("done\n")
return config
Expand Down
Loading
Loading