diff --git a/.gitignore b/.gitignore index 5e3cb8d..2947d8a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ obj/ /packages/ riderModule.iml /_ReSharper.Caches/ -Server/Server.csproj.user \ No newline at end of file +WeebSights/WeebSights.csproj.user \ No newline at end of file diff --git a/WeebSights-Port.sln b/WeebSights-Port.sln index 24df5e7..67064ae 100644 --- a/WeebSights-Port.sln +++ b/WeebSights-Port.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "Server\Server.csproj", "{D2A6BE7F-0C34-4655-88EF-BC319CD2C069}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WeebSights", "WeebSights\WeebSights.csproj", "{D2A6BE7F-0C34-4655-88EF-BC319CD2C069}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Server/Mod.cs b/WeebSights/Mod.cs similarity index 100% rename from Server/Mod.cs rename to WeebSights/Mod.cs diff --git a/Server/ModMetadata.cs b/WeebSights/ModMetadata.cs similarity index 100% rename from Server/ModMetadata.cs rename to WeebSights/ModMetadata.cs diff --git a/Server/Models/WeebItemConfig.cs b/WeebSights/Models/WeebItemConfig.cs similarity index 100% rename from Server/Models/WeebItemConfig.cs rename to WeebSights/Models/WeebItemConfig.cs diff --git a/Server/Models/WeebLocaleConfig.cs b/WeebSights/Models/WeebLocaleConfig.cs similarity index 100% rename from Server/Models/WeebLocaleConfig.cs rename to WeebSights/Models/WeebLocaleConfig.cs diff --git a/Server/Properties/launchSettings.json b/WeebSights/Properties/launchSettings.json similarity index 100% rename from Server/Properties/launchSettings.json rename to WeebSights/Properties/launchSettings.json diff --git a/Server/Services/WeebItemService.cs b/WeebSights/Services/WeebItemService.cs similarity index 99% rename from Server/Services/WeebItemService.cs rename to WeebSights/Services/WeebItemService.cs index a3f317c..611e91c 100644 --- a/Server/Services/WeebItemService.cs +++ b/WeebSights/Services/WeebItemService.cs @@ -53,8 +53,10 @@ public class WeebItemService(ISptLogger logger, JsonUtil jsonUt { logger.Error("[Weeb Iron Sights] Failed to add filter to item " + item.Key); continue; - } + } +#if DEBUG logger.Success($"[Weeb Iron Sights] Added {sight.Id} to filter on item {item.Key}"); +#endif } } diff --git a/Server/Services/WeebLocaleService.cs b/WeebSights/Services/WeebLocaleService.cs similarity index 100% rename from Server/Services/WeebLocaleService.cs rename to WeebSights/Services/WeebLocaleService.cs diff --git a/Server/Services/WeebTraderService.cs b/WeebSights/Services/WeebTraderService.cs similarity index 100% rename from Server/Services/WeebTraderService.cs rename to WeebSights/Services/WeebTraderService.cs diff --git a/Server/Server.csproj b/WeebSights/WeebSights.csproj similarity index 53% rename from Server/Server.csproj rename to WeebSights/WeebSights.csproj index 987bed4..51903d1 100644 --- a/Server/Server.csproj +++ b/WeebSights/WeebSights.csproj @@ -9,23 +9,7 @@ 1.0.0 1.0.0 - - - - - - $(SPTPath)user/mods/$(MSBuildProjectName) - - - - - - - - - - - + @@ -34,7 +18,7 @@ Always - + @@ -46,4 +30,35 @@ Always + + + $(SPTPath)user/mods/$(MSBuildProjectName) + + + none + false + + + + + + + + + + + + + + + + + + $(OutputPath)../package/SPT/user/mods/$(MSBuildProjectName) + + + + + + diff --git a/Server/bundles.json b/WeebSights/bundles.json similarity index 100% rename from Server/bundles.json rename to WeebSights/bundles.json diff --git a/Server/bundles/LICENSE.md b/WeebSights/bundles/LICENSE.md similarity index 100% rename from Server/bundles/LICENSE.md rename to WeebSights/bundles/LICENSE.md diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_anti.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_anti.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_anti.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_anti.bundle diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_anime.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_anime.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_anime.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_anime.bundle diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_anime2.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_anime2.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_anime2.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_anime2.bundle diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_anime3.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_anime3.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_anime3.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_anime3.bundle diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_anime3v2.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_anime3v2.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_anime3v2.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_anime3v2.bundle diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_anti2.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_anti2.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_anti2.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_anti2.bundle diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_anime.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_anime.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_anime.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_anime.bundle diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_anime2.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_anime2.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_anime2.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_anime2.bundle diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_anime3.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_anime3.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_anime3.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_anime3.bundle diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_anime3v2.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_anime3v2.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_anime3v2.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_anime3v2.bundle diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_anti.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_anti.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_anti.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_anti.bundle diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_anti2.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_anti2.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_anti2.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_anti2.bundle diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_ramrem.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_ramrem.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_ramrem.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_ramrem.bundle diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_std.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_std.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_std.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_fde_std.bundle diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_ramrem.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_ramrem.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_ramrem.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_ramrem.bundle diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_std.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_std.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_std.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_magpul_mbus_gen2_std.bundle diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_anime.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_anime.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_anime.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_anime.bundle diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_anime2.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_anime2.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_anime2.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_anime2.bundle diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_anime3.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_anime3.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_anime3.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_anime3.bundle diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_anime3v2.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_anime3v2.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_anime3v2.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_anime3v2.bundle diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_anti.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_anti.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_anti.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_anti.bundle diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_anti2.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_anti2.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_anti2.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_anti2.bundle diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_ramrem.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_ramrem.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_ramrem.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_ramrem.bundle diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_std.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_std.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_std.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_sig_flip_up_std.bundle diff --git a/Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_weebshit_textures.bundle b/WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_weebshit_textures.bundle similarity index 100% rename from Server/bundles/assets/content/items/mods/sights rear/sight_rear_all_weebshit_textures.bundle rename to WeebSights/bundles/assets/content/items/mods/sights rear/sight_rear_all_weebshit_textures.bundle diff --git a/Server/db/items.jsonc b/WeebSights/db/items.jsonc similarity index 100% rename from Server/db/items.jsonc rename to WeebSights/db/items.jsonc diff --git a/Server/db/locales/en.json b/WeebSights/db/locales/en.json similarity index 100% rename from Server/db/locales/en.json rename to WeebSights/db/locales/en.json