diff --git a/GeneralMods/AdvancedSaveBackup/manifest.json b/GeneralMods/AdvancedSaveBackup/manifest.json index e4f73e74..f4afb5a4 100644 --- a/GeneralMods/AdvancedSaveBackup/manifest.json +++ b/GeneralMods/AdvancedSaveBackup/manifest.json @@ -1,7 +1,7 @@ { "Name": "Advanced Save Backup", "Author": "Alpha_Omegasis", - "Version": "1.4.0", + "Version": "1.5.0", "Description": "Backs up your save files when loading SMAPI and every in game night when saving.", "UniqueID": "Omegasis.AdvancedSaveBackup", "EntryDll": "AdvancedSaveBackup.dll", diff --git a/GeneralMods/AutoSpeed/manifest.json b/GeneralMods/AutoSpeed/manifest.json index 5eef2d12..6bb4ca77 100644 --- a/GeneralMods/AutoSpeed/manifest.json +++ b/GeneralMods/AutoSpeed/manifest.json @@ -1,7 +1,7 @@ { "Name": "Auto Speed", "Author": "Alpha_Omegasis", - "Version": "1.4.1", + "Version": "1.5.0", "Description": "Got to go fast!", "UniqueID": "Omegasis.AutoSpeed", "EntryDll": "AutoSpeed.dll", diff --git a/GeneralMods/BillboardAnywhere/manifest.json b/GeneralMods/BillboardAnywhere/manifest.json index 3dee7105..ce7852f0 100644 --- a/GeneralMods/BillboardAnywhere/manifest.json +++ b/GeneralMods/BillboardAnywhere/manifest.json @@ -1,7 +1,7 @@ { "Name": "Billboard Anywhere", "Author": "Alpha_Omegasis", - "Version": "1.4.1", + "Version": "1.5.0", "Description": "Lets you view the billboard from anywhere.", "UniqueID": "Omegasis.BillboardAnywhere", "EntryDll": "BillboardAnywhere.dll", diff --git a/GeneralMods/BuildEndurance/manifest.json b/GeneralMods/BuildEndurance/manifest.json index 33897c2b..a9cb9d66 100644 --- a/GeneralMods/BuildEndurance/manifest.json +++ b/GeneralMods/BuildEndurance/manifest.json @@ -1,7 +1,7 @@ { "Name": "Build Endurance", "Author": "Alpha_Omegasis", - "Version": "1.4.1", + "Version": "1.5.0", "Description": "Increase your health as you play.", "UniqueID": "Omegasis.BuildEndurance", "EntryDll": "BuildEndurance.dll", diff --git a/GeneralMods/BuildHealth/manifest.json b/GeneralMods/BuildHealth/manifest.json index 9333b38e..2d8b65a3 100644 --- a/GeneralMods/BuildHealth/manifest.json +++ b/GeneralMods/BuildHealth/manifest.json @@ -1,7 +1,7 @@ { "Name": "Build Health", "Author": "Alpha_Omegasis", - "Version": "1.4.1", + "Version": "1.5.0", "Description": "Increase your health as you play.", "UniqueID": "Omegasis.BuildHealth", "EntryDll": "BuildHealth.dll", diff --git a/GeneralMods/BuyBackCollectables/manifest.json b/GeneralMods/BuyBackCollectables/manifest.json index c1b70ba2..e700b1b2 100644 --- a/GeneralMods/BuyBackCollectables/manifest.json +++ b/GeneralMods/BuyBackCollectables/manifest.json @@ -1,7 +1,7 @@ { "Name": "Buy Back Collectables", "Author": "Alpha_Omegasis", - "Version": "1.4.1", + "Version": "1.5.0", "Description": "Lets you buy back any obtained collectable.", "UniqueID": "Omegasis.BuyBackCollectables", "EntryDll": "BuyBackCollectables.dll", diff --git a/GeneralMods/CustomNPCFramework/Class1.cs b/GeneralMods/CustomNPCFramework/Class1.cs index 28ded7da..03bac289 100644 --- a/GeneralMods/CustomNPCFramework/Class1.cs +++ b/GeneralMods/CustomNPCFramework/Class1.cs @@ -81,7 +81,7 @@ namespace CustomNPCFramework StardewModdingAPI.Events.SaveEvents.BeforeSave += SaveEvents_BeforeSave; StardewModdingAPI.Events.SaveEvents.AfterSave += SaveEvents_AfterSave; - StardewModdingAPI.Events.LocationEvents.CurrentLocationChanged += LocationEvents_CurrentLocationChanged; + StardewModdingAPI.Events.PlayerEvents.Warped += LocationEvents_CurrentLocationChanged; StardewModdingAPI.Events.GameEvents.UpdateTick += GameEvents_UpdateTick; npcTracker = new NPCTracker(); assetPool = new AssetPool(); @@ -149,7 +149,7 @@ namespace CustomNPCFramework /// /// /// - private void LocationEvents_CurrentLocationChanged(object sender, StardewModdingAPI.Events.EventArgsCurrentLocationChanged e) + private void LocationEvents_CurrentLocationChanged(object sender, StardewModdingAPI.Events.EventArgsPlayerWarped e) { } diff --git a/GeneralMods/CustomShopsRedux/manifest.json b/GeneralMods/CustomShopsRedux/manifest.json index deff5333..363a3a2d 100644 --- a/GeneralMods/CustomShopsRedux/manifest.json +++ b/GeneralMods/CustomShopsRedux/manifest.json @@ -1,7 +1,7 @@ { "Name": "Custom Shop Redux GUI", "Author": "Alpha_Omegasis", - "Version": "1.4.1", + "Version": "1.5.0", "Description": "A nice way to make custom shops.", "UniqueID": "Omegasis.CustomShopReduxGui", "EntryDll": "CustomShopsRedux.dll", diff --git a/GeneralMods/DailyQuestAnywhere/manifest.json b/GeneralMods/DailyQuestAnywhere/manifest.json index faaaefa9..1bc9f1fb 100644 --- a/GeneralMods/DailyQuestAnywhere/manifest.json +++ b/GeneralMods/DailyQuestAnywhere/manifest.json @@ -1,7 +1,7 @@ { "Name": "Daily Quest Anywhere", "Author": "Alpha_Omegasis", - "Version": "1.4.1", + "Version": "1.5.0", "Description": "Open the daily quest board from anywhere in the game.", "UniqueID": "Omegasis.DailyQuestAnywhere", "EntryDll": "DailyQuestAnywhere.dll", diff --git a/GeneralMods/HappyBirthday/manifest.json b/GeneralMods/HappyBirthday/manifest.json index 43131b79..bf199687 100644 --- a/GeneralMods/HappyBirthday/manifest.json +++ b/GeneralMods/HappyBirthday/manifest.json @@ -3,7 +3,7 @@ "Author": "Alpha_Omegasis", "Version": { "MajorVersion": 1, - "MinorVersion": 5, + "MinorVersion": 6, "PatchVersion": 0, "Build": null }, diff --git a/GeneralMods/MoreRain/manifest.json b/GeneralMods/MoreRain/manifest.json index eaf789f3..aff4f327 100644 --- a/GeneralMods/MoreRain/manifest.json +++ b/GeneralMods/MoreRain/manifest.json @@ -1,7 +1,7 @@ { "Name": "More Rain", "Author": "Alpha_Omegasis", - "Version": "1.5.1", + "Version": "1.6.0", "Description": "Change how much it rains in the game.", "UniqueID": "Omegasis.MoreRain", "EntryDll": "MoreRain.dll", diff --git a/GeneralMods/MuseumRearranger/manifest.json b/GeneralMods/MuseumRearranger/manifest.json index f6f9d609..4317e2eb 100644 --- a/GeneralMods/MuseumRearranger/manifest.json +++ b/GeneralMods/MuseumRearranger/manifest.json @@ -1,7 +1,7 @@ { "Name": "Museum Rearranger", "Author": "Alpha_Omegasis", - "Version": "1.4.1", + "Version": "1.5.0", "Description": "Lets you rearrange the museum without needing to donate something.", "UniqueID": "Omegasis.MuseumRearranger", "EntryDll": "MuseumRearranger.dll", diff --git a/GeneralMods/NightOwl/manifest.json b/GeneralMods/NightOwl/manifest.json index 37fa292e..95407765 100644 --- a/GeneralMods/NightOwl/manifest.json +++ b/GeneralMods/NightOwl/manifest.json @@ -1,7 +1,7 @@ { "Name": "Night Owl", "Author": "Alpha_Omegasis", - "Version": "1.4.1", + "Version": "1.5.0", "Description": "Lets you stay up all night.", "UniqueID": "Omegasis.NightOwl", "EntryDll": "NightOwl.dll", diff --git a/GeneralMods/NoMorePets/manifest.json b/GeneralMods/NoMorePets/manifest.json index aed0a4e9..64ca1569 100644 --- a/GeneralMods/NoMorePets/manifest.json +++ b/GeneralMods/NoMorePets/manifest.json @@ -1,7 +1,7 @@ { "Name": "No More Pets", "Author": "Alpha_Omegasis", - "Version": "1.4.1", + "Version": "1.5.0", "Description": "Removes all pets from the game.", "UniqueID": "Omegasis.NoMorePets", "EntryDll": "NoMorePets.dll", diff --git a/GeneralMods/SaveAnywhere/manifest.json b/GeneralMods/SaveAnywhere/manifest.json index 6e5cd1f0..36fda132 100644 --- a/GeneralMods/SaveAnywhere/manifest.json +++ b/GeneralMods/SaveAnywhere/manifest.json @@ -1,7 +1,7 @@ { "Name": "Save Anywhere", "Author": "Alpha_Omegasis", - "Version": "2.6.2", + "Version": "2.7.0", "Description": "Lets you save almost anywhere.", "UniqueID": "Omegasis.SaveAnywhere", "EntryDll": "SaveAnywhere.dll", diff --git a/GeneralMods/StardewMods.sln b/GeneralMods/StardewMods.sln index 0c1a96af..c34679cd 100644 --- a/GeneralMods/StardewMods.sln +++ b/GeneralMods/StardewMods.sln @@ -31,8 +31,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NightOwl", "NightOwl\NightO EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SaveAnywhere", "SaveAnywhere\SaveAnywhere.csproj", "{E17855AD-DBAF-49BD-B3E2-9899403252F6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StardewSymphony", "StardewSymphony\StardewSymphony.csproj", "{697F7EC8-02C6-4F39-A917-EE45955CFFF9}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TimeFreeze", "TimeFreeze\TimeFreeze.csproj", "{07410BC3-9B33-40E9-A2EF-B8EDF983F0A3}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "~metadata", "~metadata", "{90EB59CA-51F6-49CF-8DCE-A8BB62C58E17}" @@ -254,18 +252,6 @@ Global {E17855AD-DBAF-49BD-B3E2-9899403252F6}.x86|Any CPU.Build.0 = x86|Any CPU {E17855AD-DBAF-49BD-B3E2-9899403252F6}.x86|x86.ActiveCfg = x86|x86 {E17855AD-DBAF-49BD-B3E2-9899403252F6}.x86|x86.Build.0 = x86|x86 - {697F7EC8-02C6-4F39-A917-EE45955CFFF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {697F7EC8-02C6-4F39-A917-EE45955CFFF9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {697F7EC8-02C6-4F39-A917-EE45955CFFF9}.Debug|x86.ActiveCfg = Debug|x86 - {697F7EC8-02C6-4F39-A917-EE45955CFFF9}.Debug|x86.Build.0 = Debug|x86 - {697F7EC8-02C6-4F39-A917-EE45955CFFF9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {697F7EC8-02C6-4F39-A917-EE45955CFFF9}.Release|Any CPU.Build.0 = Release|Any CPU - {697F7EC8-02C6-4F39-A917-EE45955CFFF9}.Release|x86.ActiveCfg = Release|x86 - {697F7EC8-02C6-4F39-A917-EE45955CFFF9}.Release|x86.Build.0 = Release|x86 - {697F7EC8-02C6-4F39-A917-EE45955CFFF9}.x86|Any CPU.ActiveCfg = x86|Any CPU - {697F7EC8-02C6-4F39-A917-EE45955CFFF9}.x86|Any CPU.Build.0 = x86|Any CPU - {697F7EC8-02C6-4F39-A917-EE45955CFFF9}.x86|x86.ActiveCfg = x86|x86 - {697F7EC8-02C6-4F39-A917-EE45955CFFF9}.x86|x86.Build.0 = x86|x86 {07410BC3-9B33-40E9-A2EF-B8EDF983F0A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {07410BC3-9B33-40E9-A2EF-B8EDF983F0A3}.Debug|Any CPU.Build.0 = Debug|Any CPU {07410BC3-9B33-40E9-A2EF-B8EDF983F0A3}.Debug|x86.ActiveCfg = Debug|x86 diff --git a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/manifest.json b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/manifest.json index fa3d9fb2..29e66f95 100644 --- a/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/manifest.json +++ b/GeneralMods/StardewSymphonyRemastered/StardewSymphonyRemastered/manifest.json @@ -1,5 +1,5 @@ { - "Name": "Stardew Symphony", + "Name": "Stardew Symphony Remastered", "Author": "Alpha_Omegasis", "Version": "2.0.0", "Description": "Adding more music to the game one beep at a time. Now with streaming!", diff --git a/GeneralMods/StardustCore/Serialization/Serialization.cs b/GeneralMods/StardustCore/Serialization/Serialization.cs index 84cc3146..6f29510c 100644 --- a/GeneralMods/StardustCore/Serialization/Serialization.cs +++ b/GeneralMods/StardustCore/Serialization/Serialization.cs @@ -190,14 +190,14 @@ namespace StardustCore.Serialization foreach (KeyValuePair obj in loc.objects.Pairs) { j++; - ModCore.ModMonitor.Log("Parsing location " + loc.Name + " : object number" + j + "/" + i + " : object name: " + obj.Value.name); + //ModCore.ModMonitor.Log("Parsing location " + loc.Name + " : object number" + j + "/" + i + " : object name: " + obj.Value.name); if (obj.Value is StardewValley.Objects.Chest) { int k = (obj.Value as StardewValley.Objects.Chest).items.Count; int l = 0; foreach (var item in (obj.Value as StardewValley.Objects.Chest).items) { l++; - ModCore.ModMonitor.Log("Parsing Chest at : " + loc.Name + " X: " + obj.Key.X + " Y: " + obj.Key.Y + " : object number: " + l + "/" + k + "object name: " + item.Name); + //ModCore.ModMonitor.Log("Parsing Chest at : " + loc.Name + " X: " + obj.Key.X + " Y: " + obj.Key.Y + " : object number: " + l + "/" + k + "object name: " + item.Name); if (item is CoreObject) removalList.Add(item); } diff --git a/GeneralMods/StardustCore/manifest.json b/GeneralMods/StardustCore/manifest.json index 7337f01c..7fbf7b09 100644 --- a/GeneralMods/StardustCore/manifest.json +++ b/GeneralMods/StardustCore/manifest.json @@ -2,7 +2,7 @@ "Name": "StardustCore", "Author": "Alpha_Omegasis", "Version": "2.0.0", - "Description": "A core mod that allows for other mods to be run.", + "Description": "A core mod that allows for other mods of mine to be run.", "UniqueID": "Omegasis.StardustCore", "EntryDll": "StardustCore.dll", "MinimumApiVersion": "2.3", diff --git a/GeneralMods/TimeFreeze/manifest.json b/GeneralMods/TimeFreeze/manifest.json index 341cfbd7..0352e8f2 100644 --- a/GeneralMods/TimeFreeze/manifest.json +++ b/GeneralMods/TimeFreeze/manifest.json @@ -1,7 +1,7 @@ { "Name": "Time Freeze", "Author": "Alpha_Omegasis", - "Version": "1.2.1", + "Version": "1.3.0", "Description": "Emulates old Harvest Moon-style games where time is frozen inside.", "UniqueID": "Omegasis.TimeFreeze", "EntryDll": "TimeFreeze.dll",