fix!: resources namespace collision (#219)

* fix(L10n): remove unused `Mana Phantom`

* refactor: namespace `localization/` into `marisa`

* refactor: namespace `audio/sound/` into `marisa`

* chore: img

* chore: adjust deno config for new path

.gitattributes

@@ -1,4 +1,4 @@
 * text=auto eol=lf
 
 *.bat linguist-vendored
-src/main/resources/localization/schemas/** linguist-vendored
+src/main/resources/marisa/localization/schemas/** linguist-vendored

.vscode/settings.json

@@ -21,69 +21,69 @@
   "json.schemas": [
     {
       "fileMatch": [
-        "src/main/resources/localization/ENG/keywords.json",
-        "src/main/resources/localization/FRA/keywords.json",
-        "src/main/resources/localization/JPN/keywords.json",
-        "src/main/resources/localization/KOR/keywords.json",
-        "src/main/resources/localization/ZHS/keywords.json",
-        "src/main/resources/localization/ZHT/keywords.json"
+        "src/main/resources/marisa/localization/ENG/keywords.json",
+        "src/main/resources/marisa/localization/FRA/keywords.json",
+        "src/main/resources/marisa/localization/JPN/keywords.json",
+        "src/main/resources/marisa/localization/KOR/keywords.json",
+        "src/main/resources/marisa/localization/ZHS/keywords.json",
+        "src/main/resources/marisa/localization/ZHT/keywords.json"
       ],
-      "url": "./src/main/resources/localization/schemas/keywords.json"
+      "url": "./src/main/resources/marisa/localization/schemas/keywords.json"
     },
     {
       "fileMatch": [
-        "src/main/resources/localization/ENG/events.json",
-        "src/main/resources/localization/FRA/events.json",
-        "src/main/resources/localization/JPN/events.json",
-        "src/main/resources/localization/KOR/events.json",
-        "src/main/resources/localization/ZHS/events.json",
-        "src/main/resources/localization/ZHT/events.json"
+        "src/main/resources/marisa/localization/ENG/events.json",
+        "src/main/resources/marisa/localization/FRA/events.json",
+        "src/main/resources/marisa/localization/JPN/events.json",
+        "src/main/resources/marisa/localization/KOR/events.json",
+        "src/main/resources/marisa/localization/ZHS/events.json",
+        "src/main/resources/marisa/localization/ZHT/events.json"
       ],
-      "url": "./src/main/resources/localization/schemas/events.json"
+      "url": "./src/main/resources/marisa/localization/schemas/events.json"
     },
     {
       "fileMatch": [
-        "src/main/resources/localization/ENG/cards.json",
-        "src/main/resources/localization/FRA/cards.json",
-        "src/main/resources/localization/JPN/cards.json",
-        "src/main/resources/localization/KOR/cards.json",
-        "src/main/resources/localization/ZHS/cards.json",
-        "src/main/resources/localization/ZHT/cards.json"
+        "src/main/resources/marisa/localization/ENG/cards.json",
+        "src/main/resources/marisa/localization/FRA/cards.json",
+        "src/main/resources/marisa/localization/JPN/cards.json",
+        "src/main/resources/marisa/localization/KOR/cards.json",
+        "src/main/resources/marisa/localization/ZHS/cards.json",
+        "src/main/resources/marisa/localization/ZHT/cards.json"
       ],
-      "url": "./src/main/resources/localization/schemas/cards.json"
+      "url": "./src/main/resources/marisa/localization/schemas/cards.json"
     },
     {
       "fileMatch": [
-        "src/main/resources/localization/ENG/relics.json",
-        "src/main/resources/localization/FRA/relics.json",
-        "src/main/resources/localization/JPN/relics.json",
-        "src/main/resources/localization/KOR/relics.json",
-        "src/main/resources/localization/ZHS/relics.json",
-        "src/main/resources/localization/ZHT/relics.json"
+        "src/main/resources/marisa/localization/ENG/relics.json",
+        "src/main/resources/marisa/localization/FRA/relics.json",
+        "src/main/resources/marisa/localization/JPN/relics.json",
+        "src/main/resources/marisa/localization/KOR/relics.json",
+        "src/main/resources/marisa/localization/ZHS/relics.json",
+        "src/main/resources/marisa/localization/ZHT/relics.json"
       ],
-      "url": "./src/main/resources/localization/schemas/relics.json"
+      "url": "./src/main/resources/marisa/localization/schemas/relics.json"
     },
     {
       "fileMatch": [
-        "src/main/resources/localization/ENG/powers.json",
-        "src/main/resources/localization/FRA/powers.json",
-        "src/main/resources/localization/JPN/powers.json",
-        "src/main/resources/localization/KOR/powers.json",
-        "src/main/resources/localization/ZHS/powers.json",
-        "src/main/resources/localization/ZHT/powers.json"
+        "src/main/resources/marisa/localization/ENG/powers.json",
+        "src/main/resources/marisa/localization/FRA/powers.json",
+        "src/main/resources/marisa/localization/JPN/powers.json",
+        "src/main/resources/marisa/localization/KOR/powers.json",
+        "src/main/resources/marisa/localization/ZHS/powers.json",
+        "src/main/resources/marisa/localization/ZHT/powers.json"
       ],
-      "url": "./src/main/resources/localization/schemas/powers.json"
+      "url": "./src/main/resources/marisa/localization/schemas/powers.json"
     },
     {
       "fileMatch": [
-        "src/main/resources/localization/ENG/potions.json",
-        "src/main/resources/localization/FRA/potions.json",
-        "src/main/resources/localization/JPN/potions.json",
-        "src/main/resources/localization/KOR/potions.json",
-        "src/main/resources/localization/ZHS/potions.json",
-        "src/main/resources/localization/ZHT/potions.json"
+        "src/main/resources/marisa/localization/ENG/potions.json",
+        "src/main/resources/marisa/localization/FRA/potions.json",
+        "src/main/resources/marisa/localization/JPN/potions.json",
+        "src/main/resources/marisa/localization/KOR/potions.json",
+        "src/main/resources/marisa/localization/ZHS/potions.json",
+        "src/main/resources/marisa/localization/ZHT/potions.json"
       ],
-      "url": "./src/main/resources/localization/schemas/potions.json"
+      "url": "./src/main/resources/marisa/localization/schemas/potions.json"
     }
   ],
   "explorer.autoRevealExclude": {

LICENSE.md

@@ -11,16 +11,17 @@ src
 └── main
     ├── kotlin
     └── resources
-        ├── audio
-        ├── img
-        └── localization
+        └── marisa
+            ├── audio
+            ├── img
+            └── localization
 ```
 
 ## Source Code(`src/main/kotlin/`)
 
 Source code of this project is licensed under [MIT][mit].
 
-## Resources(`src/main/resources/`)
+## Resources(`src/main/resources/marisa`)
 
 #### Images(`img/`)
 

deno.jsonc

@@ -3,7 +3,7 @@
     "l10n": "deno task --cwd localization/",
     "link": "deno run --allow-read --allow-write --allow-env ./scripts/link/mod.ts"
   },
-  "exclude": ["src/main/kotlin/", "src/main/resources/img", "build/"],
+  "exclude": ["src/main/kotlin/", "src/main/resources/marisa/img", "build/"],
   "fmt": {
     "semiColons": false,
     "lineWidth": 100,

localization

@@ -1 +1 @@
-./src/main/resources/localization/
+./src/main/resources/marisa/localization/

src/main/kotlin/marisa/Constants.kt

@@ -0,0 +1,5 @@
+package marisa
+
+const val modName = "marisa"
+
+fun String.modPath() = "$modName/$this"

src/main/kotlin/marisa/Localize.kt

@@ -8,7 +8,8 @@ fun localize(
     name: String,
     fallback: Settings.GameLanguage = Settings.GameLanguage.ENG
 ): String {
-    fun Settings.GameLanguage.toFile() = Gdx.files.internal("localization/$this/$name.json")
+    fun Settings.GameLanguage.toFile() =
+        Gdx.files.internal("$modName/localization/$this/$name.json")
 
     val file = Settings.language.toFile()
     val fallbackFile = fallback.toFile()

src/main/kotlin/marisa/MarisaContinued.kt

@@ -1,7 +1,9 @@
 package marisa
 
-import basemod.*
+import basemod.BaseMod
 import basemod.BaseMod.GetMonster
+import basemod.ModLabeledToggleButton
+import basemod.ModPanel
 import basemod.helpers.RelicType
 import basemod.interfaces.*
 import com.badlogic.gdx.graphics.Color
@@ -33,7 +35,6 @@ import marisa.patches.ThModClassEnum
 import marisa.potions.BottledSpark
 import marisa.potions.ShroomBrew
 import marisa.potions.StarNLove
-import marisa.powers.Marisa.*
 import marisa.relics.*
 import org.apache.logging.log4j.LogManager
 import org.apache.logging.log4j.Logger
@@ -223,21 +224,21 @@ class MarisaContinued :
         //        private const val ORIN_ENCOUNTER_ZHS = """阿燐"""
         //        private const val ZOMBIE_FAIRY_ENC_ZHS = """僵尸妖精"""
 
-        private const val MOD_BADGE = "img/UI/badge.png"
+        private const val MOD_BADGE = "marisa/img/UI/badge.png"
 
         //card backgrounds
-        private const val ATTACK_CC = "img/512/bg_attack_MRS_s.png"
-        private const val SKILL_CC = "img/512/bg_skill_MRS_s.png"
-        private const val POWER_CC = "img/512/bg_power_MRS_s.png"
-        private const val ENERGY_ORB_CC = "img/512/cardOrb.png"
-        private const val ATTACK_CC_PORTRAIT = "img/1024/bg_attack_MRS.png"
-        private const val SKILL_CC_PORTRAIT = "img/1024/bg_skill_MRS.png"
-        private const val POWER_CC_PORTRAIT = "img/1024/bg_power_MRS.png"
-        private const val ENERGY_ORB_CC_PORTRAIT = "img/1024/cardOrb.png"
+        private const val ATTACK_CC = "marisa/img/512/bg_attack_MRS_s.png"
+        private const val SKILL_CC = "marisa/img/512/bg_skill_MRS_s.png"
+        private const val POWER_CC = "marisa/img/512/bg_power_MRS_s.png"
+        private const val ENERGY_ORB_CC = "marisa/img/512/cardOrb.png"
+        private const val ATTACK_CC_PORTRAIT = "marisa/img/1024/bg_attack_MRS.png"
+        private const val SKILL_CC_PORTRAIT = "marisa/img/1024/bg_skill_MRS.png"
+        private const val POWER_CC_PORTRAIT = "marisa/img/1024/bg_power_MRS.png"
+        private const val ENERGY_ORB_CC_PORTRAIT = "marisa/img/1024/cardOrb.png"
         val STARLIGHT: Color = CardHelper.getColor(0, 10, 125)
-        const val CARD_ENERGY_ORB = "img/UI/energyOrb.png"
-        private const val MY_CHARACTER_BUTTON = "img/charSelect/MarisaButton.png"
-        private const val MARISA_PORTRAIT = "img/charSelect/marisaPortrait.jpg"
+        const val CARD_ENERGY_ORB = "marisa/img/UI/energyOrb.png"
+        private const val MY_CHARACTER_BUTTON = "marisa/img/charSelect/MarisaButton.png"
+        private const val MARISA_PORTRAIT = "marisa/img/charSelect/marisaPortrait.jpg"
 
         @JvmField
         var isCatEventEnabled: Boolean = false

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

@@ -44,7 +44,7 @@ class `6A` : CustomCard(
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION
-        const val IMG_PATH = "img/cards/6A.png"
+        const val IMG_PATH = "marisa/img/cards/6A.png"
         private const val COST = 1
         private const val ATTACK_DMG = 5
         private const val UPGRADE_PLUS_DMG = 2

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

@@ -66,7 +66,7 @@ class AbsoluteMagnitude : CustomCard(
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION
         val DESCRIPTION_UPG = cardStrings.UPGRADE_DESCRIPTION
-        const val IMG_PATH = "img/cards/absMagni.png"
+        const val IMG_PATH = "marisa/img/cards/absMagni.png"
         private const val COST = 2
         private const val ATK_MULT = 2
         private const val ATK_MULT_UPG = 3

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

@@ -48,7 +48,7 @@ class Acceleration : AmplifiableCard(
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME: String = cardStrings.NAME
         val DESCRIPTION: String = cardStrings.DESCRIPTION
-        const val IMG_PATH = "img/cards/GuidingStar.png"
+        const val IMG_PATH = "marisa/img/cards/GuidingStar.png"
         private const val COST = 0
         private const val DRAW = 2
 

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

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

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

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

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

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

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

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

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

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

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

@@ -77,7 +77,7 @@ class BlazingStar : AmplifiedAttack(
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION
-        const val IMG_PATH = "img/cards/BlazingStar.png"
+        const val IMG_PATH = "marisa/img/cards/BlazingStar.png"
         private const val COST = 2
         private const val ATK_DMG = 16
         private const val UPG_DMG = 4

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

@@ -64,7 +64,7 @@ class CasketOfStar : CustomCard(
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION
         val DESCRIPTION_UPG = cardStrings.UPGRADE_DESCRIPTION
-        const val IMG_PATH = "img/cards/CasketOfStar.png"
+        const val IMG_PATH = "marisa/img/cards/CasketOfStar.png"
         private const val COST = 2
     }
 }

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

@@ -69,7 +69,7 @@ class ChargeUpSpray : CustomCard(
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION
-        const val IMG_PATH = "img/cards/ChargeUpSpray.png"
+        const val IMG_PATH = "marisa/img/cards/ChargeUpSpray.png"
         private const val COST = 1
         private const val ATTACK_DMG = 8
         private const val UPGRADE_PLUS_DMG = 4

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

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

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

@@ -107,7 +107,7 @@ class CollectingQuirk : CustomCard(
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION
         private val EXTENDED_DESCRIPTION = cardStrings.EXTENDED_DESCRIPTION
-        const val IMG_PATH = "img/cards/collec.png"
+        const val IMG_PATH = "marisa/img/cards/collec.png"
         private const val COST = 2
         private const val DIVIDER = 4
         private const val UPG_DIVIDER = 3

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

@@ -59,7 +59,7 @@ class DC : CustomCard(
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION
-        const val IMG_PATH = "img/cards/DC.png"
+        const val IMG_PATH = "marisa/img/cards/DC.png"
         private const val COST = 1
         private const val ATTACK_DMG = 8
         private const val UPGRADE_PLUS_DMG = 3

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

@@ -102,7 +102,7 @@ class DarkMatter : CustomCard(
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION
         val DESCRIPTION_UPG = cardStrings.UPGRADE_DESCRIPTION
-        const val IMG_PATH = "img/cards/DarkMatter.png"
+        const val IMG_PATH = "marisa/img/cards/DarkMatter.png"
         private const val COST = 0
         private const val BLC_GAIN = 5
         private const val UPG_BLC = 2

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

@@ -1,13 +1,13 @@
 package marisa.cards
 
-import marisa.action.DarkSparkAction
-import marisa.patches.AbstractCardEnum
-import marisa.patches.CardTagEnum
 import basemod.abstracts.CustomCard
 import com.megacrit.cardcrawl.cards.AbstractCard
 import com.megacrit.cardcrawl.characters.AbstractPlayer
 import com.megacrit.cardcrawl.core.CardCrawlGame
 import com.megacrit.cardcrawl.monsters.AbstractMonster
+import marisa.action.DarkSparkAction
+import marisa.patches.AbstractCardEnum
+import marisa.patches.CardTagEnum
 
 class DarkSpark : CustomCard(
     ID,
@@ -49,7 +49,7 @@ class DarkSpark : CustomCard(
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION
-        const val IMG_PATH = "img/cards/darkSpark.png"
+        const val IMG_PATH = "marisa/img/cards/darkSpark.png"
         private const val COST = 2
         private const val ATK_DMG = 7
 

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

@@ -54,7 +54,7 @@ class DeepEcologicalBomb : AmplifiableCard(
         private val cardStrings = CardCrawlGame.languagePack.getCardStrings(ID)
         val NAME = cardStrings.NAME
         val DESCRIPTION = cardStrings.DESCRIPTION
-        const val IMG_PATH = "img/cards/DeepEcoBomb.png"
+        const val IMG_PATH = "marisa/img/cards/DeepEcoBomb.png"
         private const val STC = 2
         private const val UPG_STC = 1
         private const val COST = 1