fix!: add namespace

build.gradle.kts

@@ -1,7 +1,8 @@
+import org.apache.tools.ant.filters.ReplaceTokens
 import org.jetbrains.kotlin.com.google.gson.Gson
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
-val modID = "MarisaContinued"
+val modID = "marisa"
 val jarFile = "$buildDir/libs/${modID}.jar"
 val changelog = File("docs/changelog/changelog.md").readText()
 val changeBBCode = File("docs/changelog/changelog.bbcode").readText()
@@ -112,16 +113,40 @@ data class Config(
     val visibility: String = "public",
     val changeNote: String,
     val tags: List<String> = listOf(
-        "Touhou", "Character", "Marisa", "Kirisame Marisa",
-        "English", "Simplified Chinese", "Traditional Chinese", "French", "Korean", "Japanese", "Spanish - Spain"
+        "Touhou",
+        "Character",
+        "Marisa",
+        "Kirisame Marisa",
+        "English",
+        "Simplified Chinese",
+        "Traditional Chinese",
+        "French",
+        "Korean",
+        "Japanese",
+        "Spanish - Spain"
     ),
 )
 
 val gson: Gson = Gson().newBuilder().disableHtmlEscaping().setPrettyPrinting().create()
 val configFile = file("src/main/resources/ModTheSpire.json")
 
+val tokens = project.extra.properties.entries
+    .filter { it.value is String }
+    .associate { "${it.key}" to it.value }
+
 tasks.processResources {
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    filteringCharset = "UTF-8"
+    val expansion: FileCopyDetails.() -> Unit = {
+        filter(
+            ReplaceTokens::class,
+            "tokens" to tokens,
+            "beginToken" to "\${",
+            "endToken" to "}",
+        )
+    }
+    filesMatching("ModTheSpire.json", expansion)
+    filesMatching("${modID}/localization/**/*.json", expansion)
 }
 
 tasks.register("modthespire") {

paths.ts

@@ -8,10 +8,11 @@ const readGradle = async (): Promise<Record<string, string>> => {
 
 const gradleProperties = await readGradle()
 
+export const modId = "marisa"
 export const root = import.meta.dirname!
-export const jar = resolve(root, "build", "libs", "MarisaContinued.jar")
+export const jar = resolve(root, "build", "libs", `${modId}.jar`)
 export const image = resolve("docs", "thumbnail", "image.jpg")
 
 export const home = Deno.env.get("HOME")!
 export const steam = resolve(gradleProperties["userSteamDir"], "common")
-export const mod = resolve(steam, "SlayTheSpire", "MarisaContinued")
+export const mod = resolve(steam, "SlayTheSpire", modId)

releases.ts

@@ -1,6 +1,6 @@
 import { join } from "@std/path"
 import $ from "@david/dax"
-import { steam as SteamPath } from "./paths.ts"
+import { modId, steam as SteamPath } from "./paths.ts"
 
 export const basePath = "docs/changelog"
 
@@ -11,7 +11,7 @@ const changelogText = await Deno.readTextFile(changelogPath)
 const title = changelogText.split("\n")[0].replace("# ", "")
 const body = changelogText.split("\n").slice(1).join("\n")
 
-export const jarPath = "build/libs/MarisaContinued.jar"
+export const jarPath = `build/libs/${modId}.jar`
 export const stsPath = join(SteamPath, "SlayTheSpire")
 
 const github = async () => {
@@ -29,7 +29,7 @@ if (import.meta.main) {
       break
     }
     case "steam": {
-      await $`java -jar mod-uploader.jar upload -w MarisaContinued/`.cwd(stsPath)
+      await $`java -jar mod-uploader.jar upload -w ${modId}/`.cwd(stsPath)
       break
     }
     default: {

releases_test.ts

@@ -3,6 +3,7 @@ import { basePath, changelogPath, jarPath, stsPath, version } from "./releases.t
 import { verifyHardLink } from "./link/mod.ts"
 import { assertEquals, assertStringIncludes } from "@std/assert"
 import { readZip } from "https://deno.land/x/jszip@0.11.0/mod.ts"
+import { modId } from "./paths.ts"
 
 Deno.test("hardlinks are verified", async () => {
   await verifyHardLink({ quiet: true, check: true })
@@ -17,7 +18,7 @@ Deno.test("modjson.json has correct version", async () => {
 
 Deno.test("changelog.md has correct version", async () => {
   const paths = [
-    join(stsPath, "MarisaContinued", "config.json"),
+    join(stsPath, modId, "config.json"),
     join(basePath, "changelog.bbcode"),
     join(basePath, "changelog.sts.txt"),
     changelogPath,

src/main/kotlin/marisa/MarisaContinued.kt

@@ -150,7 +150,8 @@ class MarisaContinued :
             settingsPanel
         )
         fun toggleButton(text: String, y: Float, configName: String, enabled: Boolean) =
-            ModLabeledToggleButton(text, 350.0f, y,
+            ModLabeledToggleButton(
+                text, 350.0f, y,
                 Settings.CREAM_COLOR, FontHelper.charDescFont, enabled, settingsPanel, {}) {
                 getConfig().run {
                     setBool(configName, it.enabled)

src/main/kotlin/marisa/cards/6A.kt

@@ -40,7 +40,7 @@ class `6A` : CustomCard(
     }
 
     companion object {
-        const val ID = "6A"
+        const val ID = "marisa:6A"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION

src/main/kotlin/marisa/cards/AbsoluteMagnitude.kt

@@ -61,7 +61,7 @@ class AbsoluteMagnitude : CustomCard(
     }
 
     companion object {
-        const val ID = "AbsoluteMagnitude"
+        const val ID = "marisa:AbsoluteMagnitude"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION

src/main/kotlin/marisa/cards/Acceleration.kt

@@ -44,7 +44,7 @@ class Acceleration : AmplifiableCard(
     }
 
     companion object {
-        const val ID = "Acceleration"
+        const val ID = "marisa:Acceleration"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME: String = cardStrings.NAME
         val DESCRIPTION: String = cardStrings.DESCRIPTION

src/main/kotlin/marisa/cards/AlicesGift.kt

@@ -48,7 +48,7 @@ class AlicesGift : AmplifiableCard(
     }
 
     companion object {
-        const val ID = "AlicesGift"
+        const val ID = "marisa:AlicesGift"
         const val IMG_PATH = "marisa/img/cards/GiftDoll_v2.png"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME

src/main/kotlin/marisa/cards/AsteroidBelt.kt

@@ -44,7 +44,7 @@ class AsteroidBelt : AmplifiableCard(
     }
 
     companion object {
-        const val ID = "AsteroidBelt"
+        const val ID = "marisa:AsteroidBelt"
         const val IMG_PATH = "marisa/img/cards/Asteroid.png"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME

src/main/kotlin/marisa/cards/BigCrunch.kt

@@ -40,7 +40,7 @@ class BigCrunch : CustomCard(
     }
 
     companion object {
-        const val ID = "BigCrunch"
+        const val ID = "marisa:BigCrunch"
         const val IMG_PATH = "marisa/img/cards/BigCrunch.png"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME

src/main/kotlin/marisa/cards/BinaryStars.kt

@@ -48,7 +48,7 @@ class BinaryStars : AmplifiableCard(
     }
 
     companion object {
-        const val ID = "BinaryStars"
+        const val ID = "marisa:BinaryStars"
         const val IMG_PATH = "marisa/img/cards/binaryStar.png"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME

src/main/kotlin/marisa/cards/BlazeAway.kt

@@ -66,7 +66,7 @@ class BlazeAway : CustomCard(
     }
 
     companion object {
-        const val ID = "BlazeAway"
+        const val ID = "marisa:BlazeAway"
         const val IMG_PATH = "marisa/img/cards/blazeAway.png"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME

src/main/kotlin/marisa/cards/BlazingStar.kt

@@ -73,7 +73,7 @@ class BlazingStar : AmplifiedAttack(
     }
 
     companion object {
-        const val ID = "BlazingStar"
+        const val ID = "marisa:BlazingStar"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION

src/main/kotlin/marisa/cards/CasketOfStar.kt

@@ -59,7 +59,7 @@ class CasketOfStar : CustomCard(
     }
 
     companion object {
-        const val ID = "CasketOfStar"
+        const val ID = "marisa:CasketOfStar"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION

src/main/kotlin/marisa/cards/ChargeUpSpray.kt

@@ -65,7 +65,7 @@ class ChargeUpSpray : CustomCard(
     }
 
     companion object {
-        const val ID = "ChargeUpSpray"
+        const val ID = "marisa:ChargeUpSpray"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION

src/main/kotlin/marisa/cards/ChargingUp.kt

@@ -42,7 +42,7 @@ class ChargingUp : CustomCard(
     }
 
     companion object {
-        const val ID = "ChargingUp"
+        const val ID = "marisa:ChargingUp"
         const val IMG_PATH = "marisa/img/cards/ChargingUp.png"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME

src/main/kotlin/marisa/cards/CollectingQuirk.kt

@@ -62,9 +62,9 @@ class CollectingQuirk : CustomCard(
         rawDescription = DESCRIPTION + EXTENDED_DESCRIPTION[0]
         initializeDescription()
         MarisaContinued.logger.info(
-            """CollectingQuirk : applyPowers : damage :$damage ; 
-                |counter : $counter ; 
-                |block :$block ; 
+            """CollectingQuirk : applyPowers : damage :$damage ;
+                |counter : $counter ;
+                |block :$block ;
                 |magic number :$magicNumber""".trimMargin()
         )
     }
@@ -102,7 +102,7 @@ class CollectingQuirk : CustomCard(
     }
 
     companion object {
-        const val ID = "CollectingQuirk"
+        const val ID = "marisa:CollectingQuirk"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION

src/main/kotlin/marisa/cards/DC.kt

@@ -55,7 +55,7 @@ class DC : CustomCard(
     }
 
     companion object {
-        const val ID = "DC"
+        const val ID = "marisa:DC"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION

src/main/kotlin/marisa/cards/DarkMatter.kt

@@ -97,7 +97,7 @@ class DarkMatter : CustomCard(
     }
 
     companion object {
-        const val ID = "DarkMatter"
+        const val ID = "marisa:DarkMatter"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION

src/main/kotlin/marisa/cards/DarkSpark.kt

@@ -45,7 +45,7 @@ class DarkSpark : CustomCard(
     }
 
     companion object {
-        const val ID = "DarkSpark"
+        const val ID = "marisa:DarkSpark"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION

src/main/kotlin/marisa/cards/DeepEcologicalBomb.kt

@@ -50,7 +50,7 @@ class DeepEcologicalBomb : AmplifiableCard(
     }
 
     companion object {
-        const val ID = "DeepEcoloBomb"
+        const val ID = "marisa:DeepEcoloBomb"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION

src/main/kotlin/marisa/cards/Defend_MRS.kt

@@ -41,7 +41,7 @@ class Defend_MRS : CustomCard(
     }
 
     companion object {
-        const val ID = "Defend_MRS"
+        const val ID = "marisa:Defend_MRS"
         const val IMG_PATH = "marisa/img/cards/Defend_MRS.png"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME

src/main/kotlin/marisa/cards/DoubleSpark.kt

@@ -60,7 +60,7 @@ class DoubleSpark : CustomCard(
     }
 
     companion object {
-        const val ID = "DoubleSpark"
+        const val ID = "marisa:DoubleSpark"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION

src/main/kotlin/marisa/cards/DragonMeteor.kt

@@ -81,7 +81,7 @@ class DragonMeteor : CustomCard(
     }
 
     companion object {
-        const val ID = "DragonMeteor"
+        const val ID = "marisa:DragonMeteor"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION

src/main/kotlin/marisa/cards/EarthLightRay.kt

@@ -57,7 +57,7 @@ class EarthLightRay : AmplifiableCard(
     }
 
     companion object {
-        const val ID = "EarthLightRay"
+        const val ID = "marisa:EarthLightRay"
         const val IMG_PATH = "marisa/img/cards/EarthLightRay.png"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME

src/main/kotlin/marisa/cards/EnergyFlow.kt

@@ -46,7 +46,7 @@ class EnergyFlow : CustomCard(
     }
 
     companion object {
-        const val ID = "EnergyFlow"
+        const val ID = "marisa:EnergyFlow"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION

src/main/kotlin/marisa/cards/EnergyRecoil.kt

@@ -71,7 +71,7 @@ class EnergyRecoil : CustomCard(
     }
 
     companion object {
-        const val ID = "EnergyRecoil"
+        const val ID = "marisa:EnergyRecoil"
         const val IMG_PATH = "marisa/img/cards/recoil.png"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME

src/main/kotlin/marisa/cards/EscapeVelocity.kt

@@ -47,7 +47,7 @@ class EscapeVelocity : CustomCard(
     }
 
     companion object {
-        const val ID = "EscapeVelocity"
+        const val ID = "marisa:EscapeVelocity"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION

src/main/kotlin/marisa/cards/EventHorizon.kt

@@ -33,7 +33,7 @@ class EventHorizon : CustomCard(
     }
 
     companion object {
-        const val ID = "EventHorizon"
+        const val ID = "marisa:EventHorizon"
         const val IMG_PATH = "marisa/img/cards/EventHorizon.png"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME

src/main/kotlin/marisa/cards/FairyDestructionRay.kt

@@ -54,7 +54,7 @@ class FairyDestructionRay : AmplifiableCard(
     }
 
     companion object {
-        const val ID = "FairyDestructionRay"
+        const val ID = "marisa:FairyDestructionRay"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION

src/main/kotlin/marisa/cards/FinalSpark.kt

@@ -78,7 +78,7 @@ class FinalSpark : CustomCard(
     }
 
     companion object {
-        const val ID = "FinalSpark"
+        const val ID = "marisa:FinalSpark"
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION