diff --git a/.idea/.idea.TaikoMods.dir/.idea/projectSettingsUpdater.xml b/.idea/.idea.TaikoMods.dir/.idea/projectSettingsUpdater.xml deleted file mode 100644 index 4bb9f4d..0000000 --- a/.idea/.idea.TaikoMods.dir/.idea/projectSettingsUpdater.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/.idea.TaikoMods.dir/.idea/workspace.xml b/.idea/.idea.TaikoMods.dir/.idea/workspace.xml deleted file mode 100644 index 7d16c69..0000000 --- a/.idea/.idea.TaikoMods.dir/.idea/workspace.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1643955770420 - - - - - - - - - - \ No newline at end of file diff --git a/Folder.DotSettings.user b/Folder.DotSettings.user deleted file mode 100644 index 806e514..0000000 --- a/Folder.DotSettings.user +++ /dev/null @@ -1,5 +0,0 @@ - - True - <AssemblyExplorer> - <Assembly Path="C:\git\public-git\taiko-mods\Taiko-Mod\bin\Debug\net48\Assembly-CSharp-firstpass.dll" /> -</AssemblyExplorer> \ No newline at end of file diff --git a/TakoTakoScripts/TJAConvert/Files.cs b/TJAConvert/Files.cs similarity index 100% rename from TakoTakoScripts/TJAConvert/Files.cs rename to TJAConvert/Files.cs diff --git a/TakoTakoScripts/TJAConvert/FodyWeavers.xml b/TJAConvert/FodyWeavers.xml similarity index 100% rename from TakoTakoScripts/TJAConvert/FodyWeavers.xml rename to TJAConvert/FodyWeavers.xml diff --git a/TakoTakoScripts/TJAConvert/Program.cs b/TJAConvert/Program.cs similarity index 100% rename from TakoTakoScripts/TJAConvert/Program.cs rename to TJAConvert/Program.cs diff --git a/TakoTakoScripts/TJAConvert/References/SonicAudioLib.dll b/TJAConvert/References/SonicAudioLib.dll similarity index 100% rename from TakoTakoScripts/TJAConvert/References/SonicAudioLib.dll rename to TJAConvert/References/SonicAudioLib.dll diff --git a/TakoTakoScripts/TJAConvert/TJAConvert.csproj b/TJAConvert/TJAConvert.csproj similarity index 95% rename from TakoTakoScripts/TJAConvert/TJAConvert.csproj rename to TJAConvert/TJAConvert.csproj index b0e8ce9..021884a 100644 --- a/TakoTakoScripts/TJAConvert/TJAConvert.csproj +++ b/TJAConvert/TJAConvert.csproj @@ -39,6 +39,6 @@ - + - \ No newline at end of file + diff --git a/TakoTakoScripts/TJAConvert/TJAMetaData.cs b/TJAConvert/TJAMetaData.cs similarity index 100% rename from TakoTakoScripts/TJAConvert/TJAMetaData.cs rename to TJAConvert/TJAMetaData.cs diff --git a/TakoTakoScripts/TakoTako.Common/CustomSong.cs b/TakoTako.Common/CustomSong.cs similarity index 99% rename from TakoTakoScripts/TakoTako.Common/CustomSong.cs rename to TakoTako.Common/CustomSong.cs index 142adab..d62e3cc 100644 --- a/TakoTakoScripts/TakoTako.Common/CustomSong.cs +++ b/TakoTako.Common/CustomSong.cs @@ -203,4 +203,4 @@ namespace TakoTako.Common [JsonProperty(NullValueHandling = NullValueHandling.Ignore, DefaultValueHandling = DefaultValueHandling.Ignore)] public int krFont; } -} \ No newline at end of file +} diff --git a/TakoTakoScripts/TakoTako.Common/MurmurHash2.cs b/TakoTako.Common/MurmurHash2.cs similarity index 100% rename from TakoTakoScripts/TakoTako.Common/MurmurHash2.cs rename to TakoTako.Common/MurmurHash2.cs diff --git a/TakoTakoScripts/TakoTako.Common/TakoTako.Common.csproj b/TakoTako.Common/TakoTako.Common.csproj similarity index 85% rename from TakoTakoScripts/TakoTako.Common/TakoTako.Common.csproj rename to TakoTako.Common/TakoTako.Common.csproj index 93116fc..86b9c71 100644 --- a/TakoTakoScripts/TakoTako.Common/TakoTako.Common.csproj +++ b/TakoTako.Common/TakoTako.Common.csproj @@ -9,7 +9,7 @@ - ..\..\TakoTako\References\Newtonsoft.Json.dll + ..\TakoTako\References\Newtonsoft.Json.dll diff --git a/TakoTako.sln b/TakoTako.sln index 37b8c77..fe4a263 100644 --- a/TakoTako.sln +++ b/TakoTako.sln @@ -1,8 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TakoTako.Common", "TakoTakoScripts\TakoTako.Common\TakoTako.Common.csproj", "{DDD2BC9B-15CB-47AE-A104-F45A3C65C7B1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TakoTako.Common", "TakoTako.Common\TakoTako.Common.csproj", "{DDD2BC9B-15CB-47AE-A104-F45A3C65C7B1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TJAConvert", "TakoTakoScripts\TJAConvert\TJAConvert.csproj", "{9ED2476B-FB39-4BE9-8661-21311AD9A3E8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TJAConvert", "TJAConvert\TJAConvert.csproj", "{9ED2476B-FB39-4BE9-8661-21311AD9A3E8}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TakoTako", "TakoTako\TakoTako.csproj", "{3B286FDB-8AB8-49B0-852E-5180AFBC20D5}" EndProject diff --git a/TakoTako.sln.DotSettings b/TakoTako.sln.DotSettings index 8d2bd36..fd2fec2 100644 --- a/TakoTako.sln.DotSettings +++ b/TakoTako.sln.DotSettings @@ -1,2 +1,7 @@  - True \ No newline at end of file + True + True + True + True + True + \ No newline at end of file diff --git a/TakoTako/TakoTako.csproj b/TakoTako/TakoTako.csproj index 9457ba4..309e4c0 100644 --- a/TakoTako/TakoTako.csproj +++ b/TakoTako/TakoTako.csproj @@ -55,7 +55,7 @@ - + @@ -63,4 +63,4 @@ - \ No newline at end of file + diff --git a/TakoTakoScripts/.gitignore b/TakoTakoScripts/.gitignore deleted file mode 100644 index 9d3e8b0..0000000 --- a/TakoTakoScripts/.gitignore +++ /dev/null @@ -1,35 +0,0 @@ -# Common IntelliJ Platform excludes - -# User specific -**/.idea/**/workspace.xml -**/.idea/**/tasks.xml -**/.idea/shelf/* -**/.idea/dictionaries -**/.idea/httpRequests/ - -# Sensitive or high-churn files -**/.idea/**/dataSources/ -**/.idea/**/dataSources.ids -**/.idea/**/dataSources.xml -**/.idea/**/dataSources.local.xml -**/.idea/**/sqlDataSources.xml -**/.idea/**/dynamic.xml - -# Rider -# Rider auto-generates .iml files, and contentModel.xml -**/.idea/**/*.iml -**/.idea/**/contentModel.xml -**/.idea/**/modules.xml - -*.suo -*.user -.vs/ -[Bb]in/ -[Oo]bj/ -_UpgradeReport_Files/ -[Pp]ackages/ - -Thumbs.db -Desktop.ini -.DS_Store -ShortcutFolder.lnk diff --git a/TakoTakoScripts/.idea/.idea.TakoTakoScripts/.idea/.gitignore b/TakoTakoScripts/.idea/.idea.TakoTakoScripts/.idea/.gitignore deleted file mode 100644 index bd4c181..0000000 --- a/TakoTakoScripts/.idea/.idea.TakoTakoScripts/.idea/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Rider ignored files -/modules.xml -/.idea.TakoTakoScripts.iml -/projectSettingsUpdater.xml -/contentModel.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/TakoTakoScripts/.idea/.idea.TakoTakoScripts/.idea/encodings.xml b/TakoTakoScripts/.idea/.idea.TakoTakoScripts/.idea/encodings.xml deleted file mode 100644 index df87cf9..0000000 --- a/TakoTakoScripts/.idea/.idea.TakoTakoScripts/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/TakoTakoScripts/.idea/.idea.TakoTakoScripts/.idea/indexLayout.xml b/TakoTakoScripts/.idea/.idea.TakoTakoScripts/.idea/indexLayout.xml deleted file mode 100644 index 7b08163..0000000 --- a/TakoTakoScripts/.idea/.idea.TakoTakoScripts/.idea/indexLayout.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/TakoTakoScripts/.idea/.idea.TakoTakoScripts/.idea/vcs.xml b/TakoTakoScripts/.idea/.idea.TakoTakoScripts/.idea/vcs.xml deleted file mode 100644 index 6c0b863..0000000 --- a/TakoTakoScripts/.idea/.idea.TakoTakoScripts/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/TakoTakoScripts/TJAConvert/FodyWeavers.xsd b/TakoTakoScripts/TJAConvert/FodyWeavers.xsd deleted file mode 100644 index 05e92c1..0000000 --- a/TakoTakoScripts/TJAConvert/FodyWeavers.xsd +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks - - - - - A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks. - - - - - A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks - - - - - A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks. - - - - - A list of unmanaged 32 bit assembly names to include, delimited with line breaks. - - - - - A list of unmanaged 64 bit assembly names to include, delimited with line breaks. - - - - - The order of preloaded assemblies, delimited with line breaks. - - - - - - This will copy embedded files to disk before loading them into memory. This is helpful for some scenarios that expected an assembly to be loaded from a physical file. - - - - - Controls if .pdbs for reference assemblies are also embedded. - - - - - Controls if runtime assemblies are also embedded. - - - - - Controls whether the runtime assemblies are embedded with their full path or only with their assembly name. - - - - - Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option. - - - - - As part of Costura, embedded assemblies are no longer included as part of the build. This cleanup can be turned off. - - - - - Costura by default will load as part of the module initialization. This flag disables that behavior. Make sure you call CosturaUtility.Initialize() somewhere in your code. - - - - - Costura will by default use assemblies with a name like 'resources.dll' as a satellite resource and prepend the output path. This flag disables that behavior. - - - - - A list of assembly names to exclude from the default action of "embed all Copy Local references", delimited with | - - - - - A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |. - - - - - A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with | - - - - - A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |. - - - - - A list of unmanaged 32 bit assembly names to include, delimited with |. - - - - - A list of unmanaged 64 bit assembly names to include, delimited with |. - - - - - The order of preloaded assemblies, delimited with |. - - - - - - - - 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - - - - - A comma-separated list of error codes that can be safely ignored in assembly verification. - - - - - 'false' to turn off automatic generation of the XML Schema file. - - - - - \ No newline at end of file diff --git a/TakoTakoScripts/TakoTakoScripts.Common/TakoTakoScripts.Common.csproj b/TakoTakoScripts/TakoTakoScripts.Common/TakoTakoScripts.Common.csproj deleted file mode 100644 index 93116fc..0000000 --- a/TakoTakoScripts/TakoTakoScripts.Common/TakoTakoScripts.Common.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - net48 - TakoTako.Common - TakoTako.Common - latest - - - - - ..\..\TakoTako\References\Newtonsoft.Json.dll - - - - diff --git a/TakoTakoScripts/TakoTakoScripts.sln.DotSettings b/TakoTakoScripts/TakoTakoScripts.sln.DotSettings deleted file mode 100644 index 0b1fe32..0000000 --- a/TakoTakoScripts/TakoTakoScripts.sln.DotSettings +++ /dev/null @@ -1,7 +0,0 @@ - - ACB - OGG - TJA - True - True - True \ No newline at end of file diff --git a/TakoTakoScripts/global.json b/TakoTakoScripts/global.json deleted file mode 100644 index e5674e1..0000000 --- a/TakoTakoScripts/global.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "sdk": { - "version": "5.0.0", - "rollForward": "latestMinor", - "allowPrerelease": false - } -} \ No newline at end of file