diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 78db237ca..50ce7347f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -10,7 +10,6 @@ /Directory.Build.props @andy840119 /appveyor.yml @andy840119 /cake.config @andy840119 -/crowdin.yml @andy840119 # Resource related /assets/ @andy840119 diff --git a/crowdin.yml b/crowdin.yml deleted file mode 100644 index 8c9e614c0..000000000 --- a/crowdin.yml +++ /dev/null @@ -1,12 +0,0 @@ -preserve_hierarchy: true -files: - - source: /osu.Game.Rulesets.Karaoke/Localisation/*.resx - translation: /osu.Game.Rulesets.Karaoke/Localisation/%file_name%.%locale%.%file_extension% - ignore: - - /osu.Game.Rulesets.Karaoke/Localisation/%file_name%.*.%file_extension% - update_option: update_as_unapproved - languages_mapping: - locale: - ja: ja - zh-CN: zh - zh-TW: zh-Hant diff --git a/osu.Game.Rulesets.Karaoke/ILRepack.targets b/osu.Game.Rulesets.Karaoke/ILRepack.targets index ebfc4f85c..f682e9608 100644 --- a/osu.Game.Rulesets.Karaoke/ILRepack.targets +++ b/osu.Game.Rulesets.Karaoke/ILRepack.targets @@ -3,6 +3,7 @@ + diff --git a/osu.Game.Rulesets.Karaoke/KaraokeRuleset.cs b/osu.Game.Rulesets.Karaoke/KaraokeRuleset.cs index 6be05d607..d10eb49dc 100644 --- a/osu.Game.Rulesets.Karaoke/KaraokeRuleset.cs +++ b/osu.Game.Rulesets.Karaoke/KaraokeRuleset.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; -using System.Linq; using osu.Framework.Graphics; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Sprites; @@ -25,6 +24,7 @@ using osu.Game.Rulesets.Karaoke.Edit.Setup; using osu.Game.Rulesets.Karaoke.Mods; using osu.Game.Rulesets.Karaoke.Replays; +using osu.Game.Rulesets.Karaoke.Resources; using osu.Game.Rulesets.Karaoke.Scoring; using osu.Game.Rulesets.Karaoke.Skinning.Legacy; using osu.Game.Rulesets.Karaoke.Statistics; @@ -182,23 +182,16 @@ public override IResourceStore CreateResourceStore() { var store = new ResourceStore(); - // add ruleset store - store.AddStore(getRulesetStore()); + // add resource in the current dll. + store.AddStore(base.CreateResourceStore()); + + // add resource dll, it only works in the local because the resource will be packed into main dll in the resource build. + store.AddStore(new DllResourceStore(KaraokeResources.ResourceAssembly)); // add shader resource from font package. store.AddStore(new NamespacedResourceStore(new ShaderResourceStore(), "Resources")); return store; - - IResourceStore getRulesetStore() - { - var rulesetStore = base.CreateResourceStore(); - if (rulesetStore.GetAvailableResources().Any()) - return rulesetStore; - - // IRMerge might change the assembly name, which will cause resource not found. - return new NamespacedResourceStore(new DllResourceStore("osu.Game.Rulesets.Karaoke.dll"), @"Resources"); - } } public override DifficultyCalculator CreateDifficultyCalculator(IWorkingBeatmap beatmap) => new KaraokeDifficultyCalculator(RulesetInfo, beatmap); diff --git a/osu.Game.Rulesets.Karaoke/Localisation/ChangelogSection.ja.resx b/osu.Game.Rulesets.Karaoke/Localisation/ChangelogSection.ja.resx deleted file mode 100644 index 4ff155226..000000000 --- a/osu.Game.Rulesets.Karaoke/Localisation/ChangelogSection.ja.resx +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 変更履歴を見る - - \ No newline at end of file diff --git a/osu.Game.Rulesets.Karaoke/Localisation/ChangelogSection.resx b/osu.Game.Rulesets.Karaoke/Localisation/ChangelogSection.resx deleted file mode 100644 index 23c29a87e..000000000 --- a/osu.Game.Rulesets.Karaoke/Localisation/ChangelogSection.resx +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - View current changelog - - \ No newline at end of file diff --git a/osu.Game.Rulesets.Karaoke/Localisation/ChangelogSection.zh-Hant.resx b/osu.Game.Rulesets.Karaoke/Localisation/ChangelogSection.zh-Hant.resx deleted file mode 100644 index 50c3ce5c1..000000000 --- a/osu.Game.Rulesets.Karaoke/Localisation/ChangelogSection.zh-Hant.resx +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 查看現在的更新日誌 - - \ No newline at end of file diff --git a/osu.Game.Rulesets.Karaoke/Localisation/ChangelogSection.zh.resx b/osu.Game.Rulesets.Karaoke/Localisation/ChangelogSection.zh.resx deleted file mode 100644 index f8bbec842..000000000 --- a/osu.Game.Rulesets.Karaoke/Localisation/ChangelogSection.zh.resx +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 查看当前更新日志 - - \ No newline at end of file diff --git a/osu.Game.Rulesets.Karaoke/Localisation/ChangelogStrings.cs b/osu.Game.Rulesets.Karaoke/Localisation/ChangelogStrings.cs index 5687305cf..710e92862 100644 --- a/osu.Game.Rulesets.Karaoke/Localisation/ChangelogStrings.cs +++ b/osu.Game.Rulesets.Karaoke/Localisation/ChangelogStrings.cs @@ -7,7 +7,7 @@ namespace osu.Game.Rulesets.Karaoke.Localisation { public static class ChangelogStrings { - private const string prefix = @"osu.Game.Rulesets.Karaoke.Localisation.ChangelogSection"; + private const string prefix = @"osu.Game.Rulesets.Karaoke.Resources.Localisation.ChangelogSection"; /// /// "View current changelog" diff --git a/osu.Game.Rulesets.Karaoke/Localisation/Common.ja.resx b/osu.Game.Rulesets.Karaoke/Localisation/Common.ja.resx deleted file mode 100644 index 4ea69ec3c..000000000 --- a/osu.Game.Rulesets.Karaoke/Localisation/Common.ja.resx +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - カラオケ! - - \ No newline at end of file diff --git a/osu.Game.Rulesets.Karaoke/Localisation/Common.resx b/osu.Game.Rulesets.Karaoke/Localisation/Common.resx deleted file mode 100644 index 760944027..000000000 --- a/osu.Game.Rulesets.Karaoke/Localisation/Common.resx +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - karaoke! - - \ No newline at end of file diff --git a/osu.Game.Rulesets.Karaoke/Localisation/Common.zh-Hant.resx b/osu.Game.Rulesets.Karaoke/Localisation/Common.zh-Hant.resx deleted file mode 100644 index f017fb49c..000000000 --- a/osu.Game.Rulesets.Karaoke/Localisation/Common.zh-Hant.resx +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 卡拉OK - - \ No newline at end of file diff --git a/osu.Game.Rulesets.Karaoke/Localisation/Common.zh.resx b/osu.Game.Rulesets.Karaoke/Localisation/Common.zh.resx deleted file mode 100644 index f017fb49c..000000000 --- a/osu.Game.Rulesets.Karaoke/Localisation/Common.zh.resx +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 卡拉OK - - \ No newline at end of file diff --git a/osu.Game.Rulesets.Karaoke/Localisation/CommonStrings.cs b/osu.Game.Rulesets.Karaoke/Localisation/CommonStrings.cs index 6c49b75ab..8729b22cc 100644 --- a/osu.Game.Rulesets.Karaoke/Localisation/CommonStrings.cs +++ b/osu.Game.Rulesets.Karaoke/Localisation/CommonStrings.cs @@ -7,7 +7,7 @@ namespace osu.Game.Rulesets.Karaoke.Localisation { public static class CommonStrings { - private const string prefix = @"osu.Game.Rulesets.Karaoke.Localisation.Common"; + private const string prefix = @"osu.Game.Rulesets.Karaoke.Resources.Localisation.Common"; /// /// "karaoke!" diff --git a/osu.Game.Rulesets.Karaoke/Localisation/KaraokeSettingsSubsection.ja.resx b/osu.Game.Rulesets.Karaoke/Localisation/KaraokeSettingsSubsection.ja.resx deleted file mode 100644 index 25990abdf..000000000 --- a/osu.Game.Rulesets.Karaoke/Localisation/KaraokeSettingsSubsection.ja.resx +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - スクロール速度 - - - 再生するときは、マウスを見せてください - - - 翻訳 - - - お好みの言語 - - - 翻訳を好む言語を選択してください。 - - - マイクデバイス - - - 遅れ - - - 設定を開く - - - より多くの設定を調整するためのルールセット設定を開きます。 - - - 更新履歴 - - - どんなカラオケが変わったのか見てみましょう。 - - \ No newline at end of file diff --git a/osu.Game.Rulesets.Karaoke/Localisation/KaraokeSettingsSubsection.resx b/osu.Game.Rulesets.Karaoke/Localisation/KaraokeSettingsSubsection.resx deleted file mode 100644 index efa200bc9..000000000 --- a/osu.Game.Rulesets.Karaoke/Localisation/KaraokeSettingsSubsection.resx +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Scroll speed - - - Show cursor while playing - - - Translate - - - Prefer language - - - Select prefer translate language. - - - Microphone devices - - - Practice preempt time - - - Open ruleset settings - - - Open ruleset settings for adjusting more configs. - - - Change log - - - Let's see what karaoke! changed. - - \ No newline at end of file diff --git a/osu.Game.Rulesets.Karaoke/Localisation/KaraokeSettingsSubsection.zh-Hant.resx b/osu.Game.Rulesets.Karaoke/Localisation/KaraokeSettingsSubsection.zh-Hant.resx deleted file mode 100644 index 6df56401e..000000000 --- a/osu.Game.Rulesets.Karaoke/Localisation/KaraokeSettingsSubsection.zh-Hant.resx +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 捲動速度 - - - 當遊玩的時候，顯示鼠標 - - - 翻譯 - - - 偏好的語言 - - - 選擇偏好的翻譯語言 - - - 麥克風來源 - - - 延遲時間 - - - 打開設定 - - - 有更多設定藏在裡面 - - - 更新日誌 - - - 看看我們最近又更新了什麼 - - \ No newline at end of file diff --git a/osu.Game.Rulesets.Karaoke/Localisation/KaraokeSettingsSubsection.zh.resx b/osu.Game.Rulesets.Karaoke/Localisation/KaraokeSettingsSubsection.zh.resx deleted file mode 100644 index 4d3011629..000000000 --- a/osu.Game.Rulesets.Karaoke/Localisation/KaraokeSettingsSubsection.zh.resx +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 滚动速度 - - - 当游玩的时候，显示鼠标 - - - 翻译 - - - 偏好语言 - - - 选择偏好的翻译语言 - - - 麦克风设备 - - - 延迟时间 - - - 打开设置 - - - 有更多设定藏在里面 - - - 更新日志 - - - 看看我们最近又更新了什么 - - \ No newline at end of file diff --git a/osu.Game.Rulesets.Karaoke/Localisation/KaraokeSettingsSubsectionStrings.cs b/osu.Game.Rulesets.Karaoke/Localisation/KaraokeSettingsSubsectionStrings.cs index 5939713a9..d0bfae5c2 100644 --- a/osu.Game.Rulesets.Karaoke/Localisation/KaraokeSettingsSubsectionStrings.cs +++ b/osu.Game.Rulesets.Karaoke/Localisation/KaraokeSettingsSubsectionStrings.cs @@ -7,7 +7,7 @@ namespace osu.Game.Rulesets.Karaoke.Localisation { public static class KaraokeSettingsSubsectionStrings { - private const string prefix = @"osu.Game.Rulesets.Karaoke.Localisation.KaraokeSettingsSubsection"; + private const string prefix = @"osu.Game.Rulesets.Karaoke.Resources.Localisation.KaraokeSettingsSubsection"; /// /// "Scroll speed" diff --git a/osu.Game.Rulesets.Karaoke/Resources/Mod/Snow/Snow.png b/osu.Game.Rulesets.Karaoke/Resources/Mod/Snow/Snow.png deleted file mode 100644 index 2058d7a44..000000000 Binary files a/osu.Game.Rulesets.Karaoke/Resources/Mod/Snow/Snow.png and /dev/null differ diff --git a/osu.Game.Rulesets.Karaoke/Resources/Textures/Eggs/blue-easter-egg.png b/osu.Game.Rulesets.Karaoke/Resources/Textures/Eggs/blue-easter-egg.png deleted file mode 100644 index 527865ea7..000000000 Binary files a/osu.Game.Rulesets.Karaoke/Resources/Textures/Eggs/blue-easter-egg.png and /dev/null differ diff --git a/osu.Game.Rulesets.Karaoke/Resources/Textures/Eggs/camp-tent.png b/osu.Game.Rulesets.Karaoke/Resources/Textures/Eggs/camp-tent.png deleted file mode 100644 index 724b9b544..000000000 Binary files a/osu.Game.Rulesets.Karaoke/Resources/Textures/Eggs/camp-tent.png and /dev/null differ diff --git a/osu.Game.Rulesets.Karaoke/Resources/Textures/Eggs/easter-egg-roll.png b/osu.Game.Rulesets.Karaoke/Resources/Textures/Eggs/easter-egg-roll.png deleted file mode 100644 index c8f16bfd3..000000000 Binary files a/osu.Game.Rulesets.Karaoke/Resources/Textures/Eggs/easter-egg-roll.png and /dev/null differ diff --git a/osu.Game.Rulesets.Karaoke/Resources/Textures/Eggs/golden-egg.png b/osu.Game.Rulesets.Karaoke/Resources/Textures/Eggs/golden-egg.png deleted file mode 100644 index b81cfa347..000000000 Binary files a/osu.Game.Rulesets.Karaoke/Resources/Textures/Eggs/golden-egg.png and /dev/null differ diff --git a/osu.Game.Rulesets.Karaoke/Resources/Textures/Eggs/pink-easter-egg.png b/osu.Game.Rulesets.Karaoke/Resources/Textures/Eggs/pink-easter-egg.png deleted file mode 100644 index e2021f400..000000000 Binary files a/osu.Game.Rulesets.Karaoke/Resources/Textures/Eggs/pink-easter-egg.png and /dev/null differ diff --git a/osu.Game.Rulesets.Karaoke/Resources/Textures/Eggs/yellow-easter-egg.png b/osu.Game.Rulesets.Karaoke/Resources/Textures/Eggs/yellow-easter-egg.png deleted file mode 100644 index ad1542b35..000000000 Binary files a/osu.Game.Rulesets.Karaoke/Resources/Textures/Eggs/yellow-easter-egg.png and /dev/null differ diff --git a/osu.Game.Rulesets.Karaoke/Resources/Textures/logo.png b/osu.Game.Rulesets.Karaoke/Resources/Textures/logo.png deleted file mode 100644 index 00a0a44ea..000000000 Binary files a/osu.Game.Rulesets.Karaoke/Resources/Textures/logo.png and /dev/null differ diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj index c4f76958d..ab54dea8b 100644 --- a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj +++ b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj @@ -8,6 +8,7 @@ + @@ -30,7 +31,6 @@ -