From 37a1c8d3619862a254ba7b1fde79a14622e3083f Mon Sep 17 00:00:00 2001 From: zontreck Date: Tue, 11 Mar 2025 01:05:41 -0700 Subject: [PATCH 01/15] Issue a hotfix for a small issue that happens when no players are online. --- AriasServerUtils/ModSystems/ASUServer.cs | 1 + AriasServerUtils/modinfo.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AriasServerUtils/ModSystems/ASUServer.cs b/AriasServerUtils/ModSystems/ASUServer.cs index 31b6bab..61a35d8 100644 --- a/AriasServerUtils/ModSystems/ASUServer.cs +++ b/AriasServerUtils/ModSystems/ASUServer.cs @@ -368,6 +368,7 @@ namespace AriasServerUtils // Iterate over all players, get their entity, check if mounted on a bed. // If mounted on a bed, check tiredness int TotalOnline = API.World.AllOnlinePlayers.Length; + if (TotalOnline == 0) return; // No one on, just abort the checks. int TotalInBed = 0; bool isAlreadySleeping = false; diff --git a/AriasServerUtils/modinfo.json b/AriasServerUtils/modinfo.json index e8035c4..0decec5 100644 --- a/AriasServerUtils/modinfo.json +++ b/AriasServerUtils/modinfo.json @@ -4,7 +4,7 @@ "name": "Aria's Server Utilities", "authors": ["zontreck"], "description": "A collection of server utilities\n\nBuild Date: 03-11-2025 @ 00:52 AM MST", - "version": "1.0.7", + "version": "1.0.7-1", "dependencies": { "game": "" } From 11f52de3f73914c081eb76f2159c26c05a83e9c6 Mon Sep 17 00:00:00 2001 From: zontreck Date: Tue, 11 Mar 2025 01:05:50 -0700 Subject: [PATCH 02/15] Bump version 1.0.8 --- AriasServerUtils/modinfo.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AriasServerUtils/modinfo.json b/AriasServerUtils/modinfo.json index 0decec5..70884e3 100644 --- a/AriasServerUtils/modinfo.json +++ b/AriasServerUtils/modinfo.json @@ -3,8 +3,8 @@ "modid": "ariasserverutils", "name": "Aria's Server Utilities", "authors": ["zontreck"], - "description": "A collection of server utilities\n\nBuild Date: 03-11-2025 @ 00:52 AM MST", - "version": "1.0.7-1", + "description": "A collection of server utilities\n\nBuild Date: 03-11-2025 @ 1:05 AM MST", + "version": "1.0.8", "dependencies": { "game": "" } From 268834b434f4f73108d2948ed18eec21cdaa907c Mon Sep 17 00:00:00 2001 From: zontreck Date: Thu, 24 Apr 2025 11:35:01 -0700 Subject: [PATCH 03/15] Patch for 1.20.9 --- AriasServerUtils/ModSystems/ASUServer.cs | 8 ++++---- AriasServerUtils/modinfo.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/AriasServerUtils/ModSystems/ASUServer.cs b/AriasServerUtils/ModSystems/ASUServer.cs index 61a35d8..b00aa66 100644 --- a/AriasServerUtils/ModSystems/ASUServer.cs +++ b/AriasServerUtils/ModSystems/ASUServer.cs @@ -347,7 +347,7 @@ namespace AriasServerUtils Sleeping = false; foreach (var player in SleepingPlayers) { - EntityBehaviorTiredness ebt = player.GetBehavior("tiredness") as EntityBehaviorTiredness; + EntityBehaviorTiredness ebt = player.GetBehavior(); ebt.IsSleeping = false; ebt.Tiredness = 0; } @@ -387,13 +387,13 @@ namespace AriasServerUtils { if (SleepingPlayers.Contains(ePlay)) { - EntityBehaviorTiredness ebt = ePlay.GetBehavior("tiredness") as EntityBehaviorTiredness; + EntityBehaviorTiredness ebt = ePlay.GetBehavior(); if (ebt != null) ebt.IsSleeping = false; } } - EntityBehaviorTiredness EBT = ePlay.GetBehavior("tiredness") as EntityBehaviorTiredness; + EntityBehaviorTiredness EBT = ePlay.GetBehavior(); if (EBT == null) continue; if (EBT.IsSleeping) isAlreadySleeping = true; } @@ -419,7 +419,7 @@ namespace AriasServerUtils if (bed.MountedBy != null) SleepingPlayers.Add(bed.MountedBy); // Start sleep - EntityBehaviorTiredness EBT = bed.MountedBy.GetBehavior("tiredness") as EntityBehaviorTiredness; + EntityBehaviorTiredness EBT = bed.MountedBy.GetBehavior(); EBT.IsSleeping = true; bed.MountedBy.TryUnmount(); // Stand up. We cant trigger the real sleep phase, but all code for starting time accel has been executed. diff --git a/AriasServerUtils/modinfo.json b/AriasServerUtils/modinfo.json index 70884e3..faddc0d 100644 --- a/AriasServerUtils/modinfo.json +++ b/AriasServerUtils/modinfo.json @@ -3,8 +3,8 @@ "modid": "ariasserverutils", "name": "Aria's Server Utilities", "authors": ["zontreck"], - "description": "A collection of server utilities\n\nBuild Date: 03-11-2025 @ 1:05 AM MST", - "version": "1.0.8", + "description": "A collection of server utilities\n\nBuild Date: 04-24-2025 @ 11:26 AM MST", + "version": "1.0.9", "dependencies": { "game": "" } From 7ca713e42a1921ca69da89b3b4561ff61c4651bb Mon Sep 17 00:00:00 2001 From: zontreck Date: Sat, 3 May 2025 12:36:01 -0700 Subject: [PATCH 04/15] Fix: #4 --- AriasServerUtils/EventHandler.cs | 2 +- AriasServerUtils/modinfo.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/AriasServerUtils/EventHandler.cs b/AriasServerUtils/EventHandler.cs index 1b5a646..b284c3d 100644 --- a/AriasServerUtils/EventHandler.cs +++ b/AriasServerUtils/EventHandler.cs @@ -344,7 +344,7 @@ namespace AriasServerUtils ServerUtilities.NewBackCacheForPlayer(isp); ServerUtilities.serverWarps.warps[name].Location.Merge(isp.Entity); - ServerUtilities.SendMessageTo(isp, Lang.Get($"{ServerUtilities.MOD_ID}:warp-set", name)); + ServerUtilities.SendMessageTo(isp, Lang.Get($"{ServerUtilities.MOD_ID}:warp-tp", name)); diff --git a/AriasServerUtils/modinfo.json b/AriasServerUtils/modinfo.json index faddc0d..93e2621 100644 --- a/AriasServerUtils/modinfo.json +++ b/AriasServerUtils/modinfo.json @@ -3,8 +3,8 @@ "modid": "ariasserverutils", "name": "Aria's Server Utilities", "authors": ["zontreck"], - "description": "A collection of server utilities\n\nBuild Date: 04-24-2025 @ 11:26 AM MST", - "version": "1.0.9", + "description": "A collection of server utilities\n\nBuild Date: 05-3-2025 @ 12:34 PM MST", + "version": "1.0.10-dev.1", "dependencies": { "game": "" } From 4c585f647eb8998616a6af35be6167b2337f1ef0 Mon Sep 17 00:00:00 2001 From: zontreck Date: Sat, 3 May 2025 12:40:50 -0700 Subject: [PATCH 05/15] Remove old deprecated code in RTPFactory --- AriasServerUtils/RTPFactory.cs | 36 ---------------------------------- AriasServerUtils/modinfo.json | 4 ++-- 2 files changed, 2 insertions(+), 38 deletions(-) diff --git a/AriasServerUtils/RTPFactory.cs b/AriasServerUtils/RTPFactory.cs index ef37717..d2544a2 100644 --- a/AriasServerUtils/RTPFactory.cs +++ b/AriasServerUtils/RTPFactory.cs @@ -59,42 +59,6 @@ public class RTPFactory check.Y = height + 1; PPos.Y = height + 1; return PPos; - - int Y = 255; - bool lastBlockAir = true; - bool lastLastBlockAir = true; - bool curBlockAir = true; - bool safe = false; - for (Y = 255; Y > 1; Y--) - { - // Manually scan downwards - check.Y = Y; - var current = BA.GetBlock(check); - - if (current.BlockMaterial != EnumBlockMaterial.Air) - { - curBlockAir = false; - } - - - - lastLastBlockAir = lastBlockAir; - lastBlockAir = curBlockAir; - - - if (!curBlockAir && lastBlockAir && lastLastBlockAir) - { - // We found a safe spot to land - check.Y++; - safe = true; - break; - } - } - - if (!safe) return null; - - PPos.Y = check.Y; - return PPos; } /// diff --git a/AriasServerUtils/modinfo.json b/AriasServerUtils/modinfo.json index 93e2621..bc18a83 100644 --- a/AriasServerUtils/modinfo.json +++ b/AriasServerUtils/modinfo.json @@ -3,8 +3,8 @@ "modid": "ariasserverutils", "name": "Aria's Server Utilities", "authors": ["zontreck"], - "description": "A collection of server utilities\n\nBuild Date: 05-3-2025 @ 12:34 PM MST", - "version": "1.0.10-dev.1", + "description": "A collection of server utilities\n\nBuild Date: 05-3-2025 @ 12:40 PM MST", + "version": "1.0.10-dev.2", "dependencies": { "game": "" } From e56a123cb8daa3b25fd20777a9f45e2adde87633 Mon Sep 17 00:00:00 2001 From: zontreck Date: Sat, 3 May 2025 12:53:44 -0700 Subject: [PATCH 06/15] #5: Add debug to player sleeping percentage --- AriasServerUtils/EventHandler.cs | 11 +++++++++++ AriasServerUtils/ModSystems/ASUClient.cs | 3 ++- AriasServerUtils/ModSystems/ASUServer.cs | 18 +++++++++++------- AriasServerUtils/modinfo.json | 4 ++-- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/AriasServerUtils/EventHandler.cs b/AriasServerUtils/EventHandler.cs index b284c3d..b4af602 100644 --- a/AriasServerUtils/EventHandler.cs +++ b/AriasServerUtils/EventHandler.cs @@ -7,6 +7,7 @@ using Vintagestory.API.Config; using Vintagestory.API.MathTools; using Vintagestory.API.Server; using Vintagestory.API.Util; +using Vintagestory.GameContent; namespace AriasServerUtils { @@ -577,5 +578,15 @@ namespace AriasServerUtils } return TextCommandResult.Success(sReturn); } + + internal static TextCommandResult HandleSleepyDebug(TextCommandCallingArgs args) + { + EntityBehaviorTiredness sleepy = args.Caller.Entity.GetBehavior(); + if (sleepy != null) + { + sleepy.Tiredness = 100; + } + return TextCommandResult.Success(); + } } } \ No newline at end of file diff --git a/AriasServerUtils/ModSystems/ASUClient.cs b/AriasServerUtils/ModSystems/ASUClient.cs index 2f678b3..3374d49 100644 --- a/AriasServerUtils/ModSystems/ASUClient.cs +++ b/AriasServerUtils/ModSystems/ASUClient.cs @@ -24,10 +24,11 @@ public class ASUModClient : ModSystem { // Time acceleration handler accel = packet.Sleeping; + CAPI.Logger.Notification("Time acceleration: " + packet.Sleeping); if (accel) { - CAPI.World.Calendar.SetTimeSpeedModifier("asu_psp", 500); + CAPI.World.Calendar.SetTimeSpeedModifier("asu_psp", 1000); } else CAPI.World.Calendar.RemoveTimeSpeedModifier("asu_psp"); } diff --git a/AriasServerUtils/ModSystems/ASUServer.cs b/AriasServerUtils/ModSystems/ASUServer.cs index b00aa66..859f43f 100644 --- a/AriasServerUtils/ModSystems/ASUServer.cs +++ b/AriasServerUtils/ModSystems/ASUServer.cs @@ -238,7 +238,7 @@ namespace AriasServerUtils .HandleWith(Events.HandleASU) .WithDescription("Lists all Aria's Server Utils commands") .EndSubCommand() - /*.BeginSubCommand("test") + .BeginSubCommand("test") .RequiresPlayer() .RequiresPrivilege(Privilege.controlserver) .BeginSubCommand("sleep") @@ -246,12 +246,7 @@ namespace AriasServerUtils .RequiresPrivilege(Privilege.controlserver) .HandleWith(TestSleep) .EndSubCommand() - .BeginSubCommand("calendarspeed") - .RequiresPlayer() - .RequiresPrivilege(Privilege.controlserver) - .HandleWith(TestCalendarSpeed) - .EndSubCommand() - .EndSubCommand()*/ ; + .EndSubCommand(); api.ChatCommands.Create("setwarp").RequiresPlayer().RequiresPrivilege(Privilege.chat).WithDescription("Creates a new server warp").WithArgs(parsers.OptionalWord("name")).HandleWith(Events.HandleWarpUpdate); api.ChatCommands.Create("warp").RequiresPlayer().RequiresPrivilege(Privilege.chat).WithDescription("Warp to the specified server warp").WithArgs(parsers.OptionalWord("name")).HandleWith(Events.HandleWarp); @@ -263,12 +258,16 @@ namespace AriasServerUtils api.ChatCommands.Create("rtp").RequiresPlayer().RequiresPrivilege(Privilege.chat).WithArgs(parsers.OptionalInt("maxDist", defaultValue: -1)).WithDescription("Seeks a position possibly thousands of blocks away to teleport to.").HandleWith(Events.HandleRTP); api.ChatCommands.Create("listcooldowns").RequiresPrivilege(Privilege.chat).WithDescription("Lists the cooldown settings on the server, as well as your own active cooldowns if applicable.").HandleWith(Events.HandleListCooldowns); + + api.ChatCommands.Create("debugasu_sleepy").RequiresPlayer().RequiresPrivilege(Privilege.controlserver).WithDescription("Debugging command to test the sleeping system").HandleWith(Events.HandleSleepyDebug); } private TextCommandResult TestSleep(TextCommandCallingArgs args) { // Initiate the sleep process // Basically run all the same commands as we would on a player in bed + Events.HandleSleepyDebug(args); + OriginalSpeed = API.World.Calendar.CalendarSpeedMul; if (args.Caller.Player is IServerPlayer isp) { @@ -361,6 +360,8 @@ namespace AriasServerUtils }); API.World.Calendar.RemoveTimeSpeedModifier("asu_psp"); + + API.Logger.Notification("Stopping PSP Time Acceleration"); } return; } @@ -422,6 +423,9 @@ namespace AriasServerUtils EntityBehaviorTiredness EBT = bed.MountedBy.GetBehavior(); EBT.IsSleeping = true; + + API.Logger.Notification("Starting PSP Time Acceleration"); + bed.MountedBy.TryUnmount(); // Stand up. We cant trigger the real sleep phase, but all code for starting time accel has been executed. } diff --git a/AriasServerUtils/modinfo.json b/AriasServerUtils/modinfo.json index bc18a83..be4f659 100644 --- a/AriasServerUtils/modinfo.json +++ b/AriasServerUtils/modinfo.json @@ -3,8 +3,8 @@ "modid": "ariasserverutils", "name": "Aria's Server Utilities", "authors": ["zontreck"], - "description": "A collection of server utilities\n\nBuild Date: 05-3-2025 @ 12:40 PM MST", - "version": "1.0.10-dev.2", + "description": "A collection of server utilities\n\nBuild Date: 05-3-2025 @ 12:53 PM MST", + "version": "1.0.10-dev.3", "dependencies": { "game": "" } From 12d10a9a3c231e057e9d45e848a796eff9ed2846 Mon Sep 17 00:00:00 2001 From: zontreck Date: Sat, 3 May 2025 13:57:36 -0700 Subject: [PATCH 07/15] Attempt to fix time accel on server Part of #5 --- AriasServerUtils/ModSystems/ASUClient.cs | 16 -------- AriasServerUtils/ModSystems/ASUServer.cs | 39 +++---------------- AriasServerUtils/modinfo.json | 4 +- .../network/ASUTimeAccelPacket.cs | 7 ---- 4 files changed, 8 insertions(+), 58 deletions(-) delete mode 100644 AriasServerUtils/network/ASUTimeAccelPacket.cs diff --git a/AriasServerUtils/ModSystems/ASUClient.cs b/AriasServerUtils/ModSystems/ASUClient.cs index 3374d49..2966dc3 100644 --- a/AriasServerUtils/ModSystems/ASUClient.cs +++ b/AriasServerUtils/ModSystems/ASUClient.cs @@ -15,21 +15,5 @@ public class ASUModClient : ModSystem public override void StartClientSide(ICoreClientAPI api) { CAPI = api; - api.Network.RegisterChannel("asutimeaccel") - .RegisterMessageType() - .SetMessageHandler(onReceiveTimeAccel); - } - - private void onReceiveTimeAccel(ASUTimeAcceleration packet) - { - // Time acceleration handler - accel = packet.Sleeping; - CAPI.Logger.Notification("Time acceleration: " + packet.Sleeping); - - if (accel) - { - CAPI.World.Calendar.SetTimeSpeedModifier("asu_psp", 1000); - } - else CAPI.World.Calendar.RemoveTimeSpeedModifier("asu_psp"); } } \ No newline at end of file diff --git a/AriasServerUtils/ModSystems/ASUServer.cs b/AriasServerUtils/ModSystems/ASUServer.cs index 859f43f..8c3becd 100644 --- a/AriasServerUtils/ModSystems/ASUServer.cs +++ b/AriasServerUtils/ModSystems/ASUServer.cs @@ -96,10 +96,6 @@ namespace AriasServerUtils //api.Event.PlayerLeave += OnPlayerDC; - ServerNetworkChannel = api.Network.RegisterChannel("asutimeaccel") - .RegisterMessageType(); - - api.ChatCommands.Create("setspawn").RequiresPrivilege(Privilege.controlserver).HandleWith(Events.HandleSetSpawn); api.ChatCommands.Create("spawn").RequiresPrivilege(Privilege.chat).HandleWith(Events.HandleSpawn); @@ -273,18 +269,15 @@ namespace AriasServerUtils { Hours = API.World.Calendar.TotalHours; SleepingPlayers.Add(isp.Entity); + API.Logger.Notification($"Game Hours: {API.World.Calendar.TotalHours}, Difference: {API.World.Calendar.TotalHours - Hours}"); EntityAgent Agent = isp.Entity; - EntityBehaviorTiredness ebt = Agent.GetBehavior("tiredness") as EntityBehaviorTiredness; + + EntityBehaviorTiredness ebt = Agent.GetBehavior(); + ebt.IsSleeping = true; ebt.Tiredness = 100; Sleeping = true; - - ServerNetworkChannel.BroadcastPacket(new ASUTimeAcceleration - { - Sleeping = true - }); - API.World.Calendar.SetTimeSpeedModifier("asu_psp", 1000); } @@ -307,11 +300,6 @@ namespace AriasServerUtils OriginalSpeed = 0.5f; ebt.IsSleeping = true; - ServerNetworkChannel.BroadcastPacket(new ASUTimeAcceleration - { - Sleeping = true - }); - API.World.Calendar.SetTimeSpeedModifier("asu_psp", 1000); SendMessageTo(isp, "Applied calendar speed multiplier"); @@ -322,11 +310,6 @@ namespace AriasServerUtils OriginalSpeed = 0; ebt.IsSleeping = false; - ServerNetworkChannel.BroadcastPacket(new ASUTimeAcceleration - { - Sleeping = false - }); - API.World.Calendar.RemoveTimeSpeedModifier("asu_psp"); SendMessageTo(isp, "Restored default calendar speed"); @@ -341,7 +324,8 @@ namespace AriasServerUtils if (API.Side == EnumAppSide.Client) return; // This must only ever be called on the server! if (Sleeping) { - if (API.World.Calendar.TotalHours - Hours >= 7) + API.Logger.Notification($"Game Hours: {API.World.Calendar.TotalHours}, Difference: {API.World.Calendar.TotalHours - Hours}"); + if (API.World.Calendar.TotalHours - Hours >= 6) { Sleeping = false; foreach (var player in SleepingPlayers) @@ -353,12 +337,6 @@ namespace AriasServerUtils SleepingPlayers.Clear(); - - ServerNetworkChannel.BroadcastPacket(new ASUTimeAcceleration - { - Sleeping = false - }); - API.World.Calendar.RemoveTimeSpeedModifier("asu_psp"); API.Logger.Notification("Stopping PSP Time Acceleration"); @@ -407,11 +385,6 @@ namespace AriasServerUtils if (Percentage >= config.PlayerSleepingPercentage) { - ServerNetworkChannel.BroadcastPacket(new ASUTimeAcceleration - { - Sleeping = true - }); - API.World.Calendar.SetTimeSpeedModifier("asu_psp", 1000); // Call the API to make sleep happen diff --git a/AriasServerUtils/modinfo.json b/AriasServerUtils/modinfo.json index be4f659..60ec0b3 100644 --- a/AriasServerUtils/modinfo.json +++ b/AriasServerUtils/modinfo.json @@ -3,8 +3,8 @@ "modid": "ariasserverutils", "name": "Aria's Server Utilities", "authors": ["zontreck"], - "description": "A collection of server utilities\n\nBuild Date: 05-3-2025 @ 12:53 PM MST", - "version": "1.0.10-dev.3", + "description": "A collection of server utilities\n\nBuild Date: 05-3-2025 @ 1:56 PM MST", + "version": "1.0.10-dev.9", "dependencies": { "game": "" } diff --git a/AriasServerUtils/network/ASUTimeAccelPacket.cs b/AriasServerUtils/network/ASUTimeAccelPacket.cs deleted file mode 100644 index bb66753..0000000 --- a/AriasServerUtils/network/ASUTimeAccelPacket.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System; - -[Serializable] -public class ASUTimeAcceleration -{ - public bool Sleeping = false; -} \ No newline at end of file From b00e56fdf74e4a05c87576fe6327231ae69cee8d Mon Sep 17 00:00:00 2001 From: zontreck Date: Sat, 3 May 2025 14:02:17 -0700 Subject: [PATCH 08/15] Ensure time accel is disabled when world is fully loaded. Part of #5 --- AriasServerUtils/ModSystems/ASUServer.cs | 7 +++++++ AriasServerUtils/modinfo.json | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/AriasServerUtils/ModSystems/ASUServer.cs b/AriasServerUtils/ModSystems/ASUServer.cs index 8c3becd..07b5e45 100644 --- a/AriasServerUtils/ModSystems/ASUServer.cs +++ b/AriasServerUtils/ModSystems/ASUServer.cs @@ -29,6 +29,7 @@ namespace AriasServerUtils internal static Warps serverWarps = new Warps(); internal static Random rng = new Random((int)TimeUtil.GetUnixEpochTimestamp()); + internal bool isFirstStart = true; internal static string[] saveInvTypes = new string[] { @@ -322,6 +323,12 @@ namespace AriasServerUtils private void OnCheckSleepingPlayers() { if (API.Side == EnumAppSide.Client) return; // This must only ever be called on the server! + if (isFirstStart) + { + API.World.Calendar.RemoveTimeSpeedModifier("asu_psp"); + isFirstStart = false; + } + if (Sleeping) { API.Logger.Notification($"Game Hours: {API.World.Calendar.TotalHours}, Difference: {API.World.Calendar.TotalHours - Hours}"); diff --git a/AriasServerUtils/modinfo.json b/AriasServerUtils/modinfo.json index 60ec0b3..6d99817 100644 --- a/AriasServerUtils/modinfo.json +++ b/AriasServerUtils/modinfo.json @@ -3,8 +3,8 @@ "modid": "ariasserverutils", "name": "Aria's Server Utilities", "authors": ["zontreck"], - "description": "A collection of server utilities\n\nBuild Date: 05-3-2025 @ 1:56 PM MST", - "version": "1.0.10-dev.9", + "description": "A collection of server utilities\n\nBuild Date: 05-3-2025 @ 2:01 PM MST", + "version": "1.0.10-dev.10", "dependencies": { "game": "" } From 7fb2d38c3d2ebb6ccfcbf0f09a37b5b968eca76e Mon Sep 17 00:00:00 2001 From: zontreck Date: Sat, 3 May 2025 14:21:28 -0700 Subject: [PATCH 09/15] Fix: #5 --- AriasServerUtils/ModSystems/ASUServer.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/AriasServerUtils/ModSystems/ASUServer.cs b/AriasServerUtils/ModSystems/ASUServer.cs index 07b5e45..df4957e 100644 --- a/AriasServerUtils/ModSystems/ASUServer.cs +++ b/AriasServerUtils/ModSystems/ASUServer.cs @@ -357,8 +357,6 @@ namespace AriasServerUtils if (TotalOnline == 0) return; // No one on, just abort the checks. int TotalInBed = 0; - bool isAlreadySleeping = false; - List BEBs = new(); foreach (var player in API.World.AllOnlinePlayers) @@ -368,9 +366,12 @@ namespace AriasServerUtils { BEBs.Add(beb); TotalInBed++; + //API.Logger.Notification($"Bed found for player {player.PlayerName}"); } if (ePlay.MountedOn == null) { + //API.Logger.Notification($"No bed found for player {player.PlayerName}"); + if (SleepingPlayers.Contains(ePlay)) { EntityBehaviorTiredness ebt = ePlay.GetBehavior(); @@ -378,17 +379,16 @@ namespace AriasServerUtils ebt.IsSleeping = false; } } - - EntityBehaviorTiredness EBT = ePlay.GetBehavior(); - if (EBT == null) continue; - if (EBT.IsSleeping) isAlreadySleeping = true; } - if (isAlreadySleeping) return; // Abort + if (Sleeping) return; // Abort SleepingPlayers.Clear(); int Percentage = TotalInBed * 100 / TotalOnline; + + API.Logger.Notification($"Percentage of players in bed: ${Percentage}, Required percentage: ${config.PlayerSleepingPercentage}"); + if (Percentage >= config.PlayerSleepingPercentage) { From 9715975a48522a3a502201cbbc4527d1f17e3988 Mon Sep 17 00:00:00 2001 From: zontreck Date: Sat, 3 May 2025 14:23:18 -0700 Subject: [PATCH 10/15] Release 1.0.10 --- AriasServerUtils/ModSystems/ASUServer.cs | 15 +++++++++------ AriasServerUtils/modinfo.json | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/AriasServerUtils/ModSystems/ASUServer.cs b/AriasServerUtils/ModSystems/ASUServer.cs index df4957e..680db83 100644 --- a/AriasServerUtils/ModSystems/ASUServer.cs +++ b/AriasServerUtils/ModSystems/ASUServer.cs @@ -243,6 +243,11 @@ namespace AriasServerUtils .RequiresPrivilege(Privilege.controlserver) .HandleWith(TestSleep) .EndSubCommand() + .BeginSubCommand("sleepy") + .RequiresPlayer() + .RequiresPrivilege(Privilege.controlserver) + .HandleWith(Events.HandleSleepyDebug) + .EndSubCommand() .EndSubCommand(); api.ChatCommands.Create("setwarp").RequiresPlayer().RequiresPrivilege(Privilege.chat).WithDescription("Creates a new server warp").WithArgs(parsers.OptionalWord("name")).HandleWith(Events.HandleWarpUpdate); @@ -255,8 +260,6 @@ namespace AriasServerUtils api.ChatCommands.Create("rtp").RequiresPlayer().RequiresPrivilege(Privilege.chat).WithArgs(parsers.OptionalInt("maxDist", defaultValue: -1)).WithDescription("Seeks a position possibly thousands of blocks away to teleport to.").HandleWith(Events.HandleRTP); api.ChatCommands.Create("listcooldowns").RequiresPrivilege(Privilege.chat).WithDescription("Lists the cooldown settings on the server, as well as your own active cooldowns if applicable.").HandleWith(Events.HandleListCooldowns); - - api.ChatCommands.Create("debugasu_sleepy").RequiresPlayer().RequiresPrivilege(Privilege.controlserver).WithDescription("Debugging command to test the sleeping system").HandleWith(Events.HandleSleepyDebug); } private TextCommandResult TestSleep(TextCommandCallingArgs args) @@ -331,7 +334,7 @@ namespace AriasServerUtils if (Sleeping) { - API.Logger.Notification($"Game Hours: {API.World.Calendar.TotalHours}, Difference: {API.World.Calendar.TotalHours - Hours}"); + //API.Logger.Notification($"Game Hours: {API.World.Calendar.TotalHours}, Difference: {API.World.Calendar.TotalHours - Hours}"); if (API.World.Calendar.TotalHours - Hours >= 6) { Sleeping = false; @@ -346,7 +349,7 @@ namespace AriasServerUtils API.World.Calendar.RemoveTimeSpeedModifier("asu_psp"); - API.Logger.Notification("Stopping PSP Time Acceleration"); + //API.Logger.Notification("Stopping PSP Time Acceleration"); } return; } @@ -387,7 +390,7 @@ namespace AriasServerUtils int Percentage = TotalInBed * 100 / TotalOnline; - API.Logger.Notification($"Percentage of players in bed: ${Percentage}, Required percentage: ${config.PlayerSleepingPercentage}"); + //API.Logger.Notification($"Percentage of players in bed: {Percentage}, Required percentage: {config.PlayerSleepingPercentage}"); if (Percentage >= config.PlayerSleepingPercentage) { @@ -404,7 +407,7 @@ namespace AriasServerUtils EBT.IsSleeping = true; - API.Logger.Notification("Starting PSP Time Acceleration"); + //API.Logger.Notification("Starting PSP Time Acceleration"); bed.MountedBy.TryUnmount(); // Stand up. We cant trigger the real sleep phase, but all code for starting time accel has been executed. } diff --git a/AriasServerUtils/modinfo.json b/AriasServerUtils/modinfo.json index 6d99817..594c49e 100644 --- a/AriasServerUtils/modinfo.json +++ b/AriasServerUtils/modinfo.json @@ -3,8 +3,8 @@ "modid": "ariasserverutils", "name": "Aria's Server Utilities", "authors": ["zontreck"], - "description": "A collection of server utilities\n\nBuild Date: 05-3-2025 @ 2:01 PM MST", - "version": "1.0.10-dev.10", + "description": "A collection of server utilities\n\nBuild Date: 05-3-2025 @ 2:23 PM MST", + "version": "1.0.10", "dependencies": { "game": "" } From 419c05dbacd32bebb246c5a50f71115caa0ce35a Mon Sep 17 00:00:00 2001 From: zontreck Date: Wed, 7 May 2025 12:15:23 -0700 Subject: [PATCH 11/15] Add farmland drop --- AriasServerUtils/EventHandler.cs | 80 +++++++++++++++++++ AriasServerUtils/Globals.cs | 16 +++- AriasServerUtils/ModSystems/ASUServer.cs | 13 +++ .../assets/ariasserverutils/lang/en.json | 3 + AriasServerUtils/modinfo.json | 4 +- 5 files changed, 113 insertions(+), 3 deletions(-) diff --git a/AriasServerUtils/EventHandler.cs b/AriasServerUtils/EventHandler.cs index b4af602..c7fa6c4 100644 --- a/AriasServerUtils/EventHandler.cs +++ b/AriasServerUtils/EventHandler.cs @@ -559,6 +559,38 @@ namespace AriasServerUtils else return TextCommandResult.Success(); } + + internal static TextCommandResult HandleUpdateASUFarmlandDowngrade(TextCommandCallingArgs args) + { + if (args[0] is bool downgrade) + { + // Update the flag + ServerUtilities.config.EnableFarmlandDowngrade = downgrade; + ServerUtilities.MarkDirty(); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); + } + else + { + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:farmland-downgrade", ServerUtilities.config.EnableFarmlandDowngrade)); + } + } + + + internal static TextCommandResult HandleUpdateASUFarmlandDrop(TextCommandCallingArgs args) + { + if (args[0] is bool drop) + { + // Update the flag + ServerUtilities.config.EnableFarmlandDrop = drop; + ServerUtilities.MarkDirty(); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); + } + else + { + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:farmland-drop", ServerUtilities.config.EnableFarmlandDrop)); + } + } + internal static TextCommandResult HandleListCooldowns(TextCommandCallingArgs args) { string sReturn = "SERVER COOLDOWN SETTINGS\n"; @@ -588,5 +620,53 @@ namespace AriasServerUtils } return TextCommandResult.Success(); } + + internal static void CheckBreakFarmland(IServerPlayer byPlayer, BlockSelection blockSel, ref float dropQuantityMultiplier, ref EnumHandling handling) + { + if (!ServerUtilities.config.EnableFarmlandDrop) + { + return; // Default behavior + } + + if (blockSel.Block is BlockFarmland farmland) + { + BlockEntityFarmland beFarmland = farmland.GetBlockEntity(blockSel.Position); + string farmlandType = blockSel.Block.LastCodePart(); + + if (ServerUtilities.config.EnableFarmlandDowngrade) + { + + switch (farmlandType) + { + case "verylow": + { // barren + break; // Can't downgrade further + } + case "low": + { + farmlandType = "verylow"; + break; + } + case "medium": + { + farmlandType = "low"; + break; + } + case "compost": + { // high + farmlandType = "medium"; + break; + } + case "high": + { // Terra preta + farmlandType = "compost"; + break; + } + } + } + + byPlayer.Entity.World.SpawnItemEntity(new ItemStack(byPlayer.Entity.World.GetBlock(new AssetLocation($"soil-{farmlandType}-none"))), blockSel.Position.ToVec3d().Add(0.5, 0.5, 0.5)); + } + } } } \ No newline at end of file diff --git a/AriasServerUtils/Globals.cs b/AriasServerUtils/Globals.cs index a98b5cc..3436bbf 100644 --- a/AriasServerUtils/Globals.cs +++ b/AriasServerUtils/Globals.cs @@ -22,7 +22,7 @@ namespace AriasServerUtils { CooldownType.RTP, "30s" }, { CooldownType.Back, "5s" } }; - private static readonly int CURRENT_VERSION = 5; + private static readonly int CURRENT_VERSION = 6; public int Version { get; set; } = 0; @@ -36,11 +36,25 @@ namespace AriasServerUtils public int MaxRTPBlockDistance { get; set; } = 50000; public Dictionary Cooldowns { get; set; } = new Dictionary(); + + /// + /// If true, attempts to downgrade the soil quality when breaking farmland. + /// + public bool EnableFarmlandDowngrade { get; set; } = false; + + /// + /// If true, farmland will drop as soil when broken. + /// + public bool EnableFarmlandDrop { get; set; } = true; + public Dictionary GetDefaultCooldowns() { return m_defaultCD; } + /// + /// Performs some checks against known possible invalid values and sets them to sane values. + /// public void SanityCheck() { foreach (var cd in GetDefaultCooldowns()) diff --git a/AriasServerUtils/ModSystems/ASUServer.cs b/AriasServerUtils/ModSystems/ASUServer.cs index 680db83..36a590d 100644 --- a/AriasServerUtils/ModSystems/ASUServer.cs +++ b/AriasServerUtils/ModSystems/ASUServer.cs @@ -94,6 +94,7 @@ namespace AriasServerUtils api.Event.PlayerJoin += OnPlayerJoin; api.Event.PlayerDisconnect += OnPlayerDC; api.Event.ChunkColumnLoaded += RTPFactory.ChunkLoaded; + api.Event.BreakBlock += Events.CheckBreakFarmland; //api.Event.PlayerLeave += OnPlayerDC; @@ -181,6 +182,18 @@ namespace AriasServerUtils .WithDescription("Update RTP Max block distance. Plus and/or minus this distance from player current position (Default is 50000)") .HandleWith(Events.HandleUpdateASURTPMax) .EndSubCommand() + .BeginSubCommand("farmlandDowngrade") + .RequiresPrivilege(Privilege.controlserver) + .WithArgs(parsers.OptionalBool("downgrade")) + .WithDescription("Enables or disables farmland downgrade when breaking farmland") + .HandleWith(Events.HandleUpdateASUFarmlandDowngrade) + .EndSubCommand() + .BeginSubCommand("farmlandDrop") + .RequiresPrivilege(Privilege.controlserver) + .WithArgs(parsers.OptionalBool("drop")) + .WithDescription("Enables or disables dropping soil when breaking farmland") + .HandleWith(Events.HandleUpdateASUFarmlandDrop) + .EndSubCommand() .BeginSubCommand("cooldowns") .WithDescription("Commands related to all the various cooldowns") .BeginSubCommand("back") diff --git a/AriasServerUtils/assets/ariasserverutils/lang/en.json b/AriasServerUtils/assets/ariasserverutils/lang/en.json index 162d5a9..a53ecdf 100644 --- a/AriasServerUtils/assets/ariasserverutils/lang/en.json +++ b/AriasServerUtils/assets/ariasserverutils/lang/en.json @@ -23,6 +23,9 @@ "updatedconfig": "[ASU] server config updated", "config-value-reset": "[ASU] server config value reset to default", + "farmland-downgrade": "The current farmland downgrade setting is {0}", + "farmland-drop": "The current farmland drop setting is {0}", + "warp-tp": "Teleported to warp [{0}]", "warp-set": "Warp [{0}] created!", "warp-no": "You lack permissions to manage a warp", diff --git a/AriasServerUtils/modinfo.json b/AriasServerUtils/modinfo.json index 594c49e..f920863 100644 --- a/AriasServerUtils/modinfo.json +++ b/AriasServerUtils/modinfo.json @@ -3,8 +3,8 @@ "modid": "ariasserverutils", "name": "Aria's Server Utilities", "authors": ["zontreck"], - "description": "A collection of server utilities\n\nBuild Date: 05-3-2025 @ 2:23 PM MST", - "version": "1.0.10", + "description": "A collection of server utilities\n\nBuild Date: 05-7-2025 @ 12:15 AM MST", + "version": "1.0.11-dev.1", "dependencies": { "game": "" } From 45b024654a4f5b6f7a7309ffbcdc0c64eead10c6 Mon Sep 17 00:00:00 2001 From: zontreck Date: Wed, 7 May 2025 12:21:23 -0700 Subject: [PATCH 12/15] Ship 1.0.11 with the farmland feature --- AriasServerUtils/EventHandler.cs | 47 ++++++++++++------- .../assets/ariasserverutils/lang/en.json | 2 +- AriasServerUtils/modinfo.json | 4 +- 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/AriasServerUtils/EventHandler.cs b/AriasServerUtils/EventHandler.cs index c7fa6c4..6869045 100644 --- a/AriasServerUtils/EventHandler.cs +++ b/AriasServerUtils/EventHandler.cs @@ -275,7 +275,7 @@ namespace AriasServerUtils { ServerUtilities.config.AdminsBypassMaxHomes = bypass; ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", bypass)); } return TextCommandResult.Success(); @@ -289,7 +289,7 @@ namespace AriasServerUtils ServerUtilities.config.MaxBackCache = max; ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", max)); } return TextCommandResult.Success(); @@ -302,7 +302,7 @@ namespace AriasServerUtils ServerUtilities.config.MaxHomes = maxHomes; ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", maxHomes)); } return TextCommandResult.Success(); @@ -311,19 +311,32 @@ namespace AriasServerUtils internal static TextCommandResult HandleUpdateASUMgrWarps(TextCommandCallingArgs args) { if (args[0] is bool mgr) + { ServerUtilities.config.onlyAdminsCreateWarps = mgr; + + ServerUtilities.MarkDirty(); + + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", mgr)); + } else ServerUtilities.config.onlyAdminsCreateWarps = true; ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); + + + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", true)); } internal static TextCommandResult HandleUpdateASUPSP(TextCommandCallingArgs args) { - if (args[0] is int psp) ServerUtilities.config.PlayerSleepingPercentage = psp; - ServerUtilities.MarkDirty(); + if (args[0] is int psp) + { + ServerUtilities.config.PlayerSleepingPercentage = psp; + ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", psp)); + } + + return TextCommandResult.Success(); } internal static TextCommandResult HandleWarp(TextCommandCallingArgs args) @@ -431,7 +444,7 @@ namespace AriasServerUtils ServerUtilities.config.MaxRTPBlockDistance = maxDist; ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", maxDist)); } return TextCommandResult.Success(); @@ -444,7 +457,7 @@ namespace AriasServerUtils ServerUtilities.config.Cooldowns[CooldownType.Back] = CD; ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", CD)); } else { @@ -462,7 +475,7 @@ namespace AriasServerUtils ServerUtilities.config.Cooldowns[CooldownType.Warp] = CD; ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", CD)); } else { @@ -480,7 +493,7 @@ namespace AriasServerUtils ServerUtilities.config.Cooldowns[CooldownType.Home] = CD; ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", CD)); } else { @@ -498,7 +511,7 @@ namespace AriasServerUtils ServerUtilities.config.Cooldowns[CooldownType.Spawn] = CD; ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", CD)); } else { @@ -516,7 +529,7 @@ namespace AriasServerUtils ServerUtilities.config.Cooldowns[CooldownType.RTP] = CD; ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", CD)); } else { @@ -542,7 +555,7 @@ namespace AriasServerUtils // Update the bypass ServerUtilities.config.AdminsBypassCooldowns = bypass; ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", bypass)); } else return TextCommandResult.Success(); } @@ -554,7 +567,7 @@ namespace AriasServerUtils // Update the flag ServerUtilities.config.AdminsBypassRTPMaxDistance = bypass; ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", bypass)); } else return TextCommandResult.Success(); } @@ -567,7 +580,7 @@ namespace AriasServerUtils // Update the flag ServerUtilities.config.EnableFarmlandDowngrade = downgrade; ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", downgrade)); } else { @@ -583,7 +596,7 @@ namespace AriasServerUtils // Update the flag ServerUtilities.config.EnableFarmlandDrop = drop; ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", drop)); } else { diff --git a/AriasServerUtils/assets/ariasserverutils/lang/en.json b/AriasServerUtils/assets/ariasserverutils/lang/en.json index a53ecdf..7f983a4 100644 --- a/AriasServerUtils/assets/ariasserverutils/lang/en.json +++ b/AriasServerUtils/assets/ariasserverutils/lang/en.json @@ -20,7 +20,7 @@ "help": "All Aria's Server Utilities Commands: \n\nMax Homes: {0}; \nAdmins can bypass max homes: {1}\nMax back positions: {2}\n\n{3}", - "updatedconfig": "[ASU] server config updated", + "updatedconfig": "[ASU] server config updated with the new value: {0}", "config-value-reset": "[ASU] server config value reset to default", "farmland-downgrade": "The current farmland downgrade setting is {0}", diff --git a/AriasServerUtils/modinfo.json b/AriasServerUtils/modinfo.json index f920863..cc1577f 100644 --- a/AriasServerUtils/modinfo.json +++ b/AriasServerUtils/modinfo.json @@ -3,8 +3,8 @@ "modid": "ariasserverutils", "name": "Aria's Server Utilities", "authors": ["zontreck"], - "description": "A collection of server utilities\n\nBuild Date: 05-7-2025 @ 12:15 AM MST", - "version": "1.0.11-dev.1", + "description": "A collection of server utilities\n\nBuild Date: 05-7-2025 @ 12:21 PM MST", + "version": "1.0.11", "dependencies": { "game": "" } From bd120215754224bf2dd956536ef662ac026f3cb6 Mon Sep 17 00:00:00 2001 From: zontreck Date: Thu, 5 Jun 2025 12:18:07 -0700 Subject: [PATCH 13/15] Some refactoring work Add command aliases Begin adding the sethomemount command Part of #6 --- AriasServerUtils/EventHandler.cs | 24 ++++++++++++++++----- AriasServerUtils/Globals.cs | 1 + AriasServerUtils/ModSystems/ASUServer.cs | 27 ++++++++++++------------ AriasServerUtils/PlayerData.cs | 10 ++++++++- AriasServerUtils/modinfo.json | 4 ++-- 5 files changed, 45 insertions(+), 21 deletions(-) diff --git a/AriasServerUtils/EventHandler.cs b/AriasServerUtils/EventHandler.cs index 6869045..6b19245 100644 --- a/AriasServerUtils/EventHandler.cs +++ b/AriasServerUtils/EventHandler.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using Vintagestory.API.Common; +using Vintagestory.API.Common.Entities; using Vintagestory.API.Config; using Vintagestory.API.MathTools; using Vintagestory.API.Server; @@ -126,8 +127,10 @@ namespace AriasServerUtils if (data.Homes.ContainsKey(homeName)) { + Home home = data.Homes[homeName]; ServerUtilities.NewBackCacheForPlayer(isp); - data.Homes[homeName].Location.Merge(isp.Entity); + + home.Location.Merge(isp.Entity, unmount: !home.CanHaveMount); ServerUtilities.SendMessageTo(isp, Lang.Get($"{ServerUtilities.MOD_ID}:home-tp")); } @@ -199,6 +202,12 @@ namespace AriasServerUtils if (args.Caller.Player is IServerPlayer isp) { + + if (args.Command.FullName == "sethomemount") + { + // Check for the gears and pay here, or show error. + } + bool bypass = isOp && ServerUtilities.config.AdminsBypassMaxHomes; var data = ServerUtilities.GetPlayerData(isp); @@ -207,6 +216,13 @@ namespace AriasServerUtils data.Homes[homeName] = Home.MakeHome(args.Caller.Player.Entity, homeName); ServerUtilities.SendMessageTo(isp, Lang.Get($"{ServerUtilities.MOD_ID}:home-set")); + + + if (args.Command.FullName == "sethomemount") + { + // Enable mount in the home + data.Homes[homeName].CanHaveMount = true; + } } else { @@ -355,15 +371,13 @@ namespace AriasServerUtils if (ServerUtilities.serverWarps.warps.ContainsKey(name)) { + Warp warp = ServerUtilities.serverWarps.warps[name]; ServerUtilities.NewBackCacheForPlayer(isp); - ServerUtilities.serverWarps.warps[name].Location.Merge(isp.Entity); + warp.Location.Merge(isp.Entity, unmount: !warp.CanHaveMount); ServerUtilities.SendMessageTo(isp, Lang.Get($"{ServerUtilities.MOD_ID}:warp-tp", name)); - - - data.ActiveCooldowns.Add(CooldownType.Warp, TimeUtil.DecodeTimeNotation(ServerUtilities.config.Cooldowns.Get(CooldownType.Warp)) + TimeUtil.GetUnixEpochTimestamp()); ServerUtilities.MarkDirty(); } diff --git a/AriasServerUtils/Globals.cs b/AriasServerUtils/Globals.cs index 3436bbf..7a9ead4 100644 --- a/AriasServerUtils/Globals.cs +++ b/AriasServerUtils/Globals.cs @@ -93,6 +93,7 @@ namespace AriasServerUtils public PlayerPosition Location; public string CreatedBy; public DateTime CreatedAt; + public bool CanHaveMount = false; public static Warp Create(IServerPlayer player) diff --git a/AriasServerUtils/ModSystems/ASUServer.cs b/AriasServerUtils/ModSystems/ASUServer.cs index 36a590d..e640c0e 100644 --- a/AriasServerUtils/ModSystems/ASUServer.cs +++ b/AriasServerUtils/ModSystems/ASUServer.cs @@ -99,19 +99,20 @@ namespace AriasServerUtils - api.ChatCommands.Create("setspawn").RequiresPrivilege(Privilege.controlserver).HandleWith(Events.HandleSetSpawn); - api.ChatCommands.Create("spawn").RequiresPrivilege(Privilege.chat).HandleWith(Events.HandleSpawn); - api.ChatCommands.Create("delspawn").RequiresPrivilege(Privilege.controlserver).HandleWith(Events.HandleClearSpawn); + api.ChatCommands.Create("setspawn").RequiresPrivilege(Privilege.controlserver).HandleWith(Events.HandleSetSpawn).WithAlias("ss"); + api.ChatCommands.Create("spawn").RequiresPrivilege(Privilege.chat).HandleWith(Events.HandleSpawn).WithAlias("s"); + api.ChatCommands.Create("delspawn").RequiresPrivilege(Privilege.controlserver).HandleWith(Events.HandleClearSpawn).WithAlias("ds"); //api.ChatCommands.Create("test_death").RequiresPlayer().RequiresPrivilege(Privilege.controlserver).HandleWith(TestDeath); var parsers = api.ChatCommands.Parsers; api.ChatCommands.Create("restoreinv").RequiresPlayer().WithArgs(parsers.OnlinePlayer("player")).HandleWith(Events.HandleReturnItems).WithDescription("Returns items to a player in the event of a problem").RequiresPrivilege(Privilege.controlserver); - api.ChatCommands.Create("sethome").RequiresPlayer().WithArgs(parsers.OptionalWord("name")).WithDescription("Creates a home").RequiresPrivilege(Privilege.chat).HandleWith(Events.HandleSetHome); - api.ChatCommands.Create("home").RequiresPlayer().WithArgs(parsers.OptionalWord("name")).WithDescription("Teleports you to home").RequiresPrivilege(Privilege.chat).HandleWith(Events.HandleGoHome); - api.ChatCommands.Create("delhome").RequiresPlayer().WithArgs(parsers.OptionalWord("name")).WithDescription("Deletes a home entry").RequiresPrivilege(Privilege.chat).HandleWith(Events.HandleDelHome); - api.ChatCommands.Create("homes").RequiresPlayer().WithDescription("Lists your homes").RequiresPrivilege(Privilege.chat).HandleWith(Events.HandleListHomes); + api.ChatCommands.Create("sethome").RequiresPlayer().WithArgs(parsers.OptionalWord("name")).WithDescription("Creates a home").RequiresPrivilege(Privilege.chat).HandleWith(Events.HandleSetHome).WithAlias("sh"); + api.ChatCommands.Create("home").RequiresPlayer().WithArgs(parsers.OptionalWord("name")).WithDescription("Teleports you to home").RequiresPrivilege(Privilege.chat).HandleWith(Events.HandleGoHome).WithAlias("h"); + api.ChatCommands.Create("delhome").RequiresPlayer().WithArgs(parsers.OptionalWord("name")).WithDescription("Deletes a home entry").RequiresPrivilege(Privilege.chat).HandleWith(Events.HandleDelHome).WithAlias("dh"); + api.ChatCommands.Create("homes").RequiresPlayer().WithDescription("Lists your homes").RequiresPrivilege(Privilege.chat).HandleWith(Events.HandleListHomes).WithAlias("lh"); + api.ChatCommands.Create("sethomemount").RequiresPlayer().WithArgs(parsers.OptionalWord("name")).WithDescription("Create a home with the ability to take a mount with you. Costs [undefined] gears.").RequiresPrivilege(Privilege.chat).HandleWith(Events.HandleSetHome).WithAlias("shm", "shb"); api.ChatCommands.Create("asu") .RequiresPrivilege(Privilege.chat) @@ -263,16 +264,16 @@ namespace AriasServerUtils .EndSubCommand() .EndSubCommand(); - api.ChatCommands.Create("setwarp").RequiresPlayer().RequiresPrivilege(Privilege.chat).WithDescription("Creates a new server warp").WithArgs(parsers.OptionalWord("name")).HandleWith(Events.HandleWarpUpdate); - api.ChatCommands.Create("warp").RequiresPlayer().RequiresPrivilege(Privilege.chat).WithDescription("Warp to the specified server warp").WithArgs(parsers.OptionalWord("name")).HandleWith(Events.HandleWarp); - api.ChatCommands.Create("delwarp").RequiresPlayer().RequiresPrivilege(Privilege.chat).WithDescription("Deletes the specified warp").WithArgs(parsers.OptionalWord("name")).HandleWith(Events.HandleWarpDelete); - api.ChatCommands.Create("warps").RequiresPlayer().RequiresPrivilege(Privilege.chat).WithDescription("Lists all server warps").HandleWith(Events.HandleWarpList); + api.ChatCommands.Create("setwarp").RequiresPlayer().RequiresPrivilege(Privilege.chat).WithDescription("Creates a new server warp").WithArgs(parsers.OptionalWord("name")).HandleWith(Events.HandleWarpUpdate).WithAlias("sw"); + api.ChatCommands.Create("warp").RequiresPlayer().RequiresPrivilege(Privilege.chat).WithDescription("Warp to the specified server warp").WithArgs(parsers.OptionalWord("name")).HandleWith(Events.HandleWarp).WithAlias("w"); + api.ChatCommands.Create("delwarp").RequiresPlayer().RequiresPrivilege(Privilege.chat).WithDescription("Deletes the specified warp").WithArgs(parsers.OptionalWord("name")).HandleWith(Events.HandleWarpDelete).WithAlias("dw"); + api.ChatCommands.Create("warps").RequiresPlayer().RequiresPrivilege(Privilege.chat).WithDescription("Lists all server warps").HandleWith(Events.HandleWarpList).WithAlias("lw"); - api.ChatCommands.Create("back").RequiresPlayer().RequiresPrivilege(Privilege.chat).WithDescription("Returns you to the last location you were at").HandleWith(Events.HandleBack); + api.ChatCommands.Create("back").RequiresPlayer().RequiresPrivilege(Privilege.chat).WithDescription("Returns you to the last location you were at").HandleWith(Events.HandleBack).WithAlias("b"); api.ChatCommands.Create("rtp").RequiresPlayer().RequiresPrivilege(Privilege.chat).WithArgs(parsers.OptionalInt("maxDist", defaultValue: -1)).WithDescription("Seeks a position possibly thousands of blocks away to teleport to.").HandleWith(Events.HandleRTP); - api.ChatCommands.Create("listcooldowns").RequiresPrivilege(Privilege.chat).WithDescription("Lists the cooldown settings on the server, as well as your own active cooldowns if applicable.").HandleWith(Events.HandleListCooldowns); + api.ChatCommands.Create("listcooldowns").RequiresPrivilege(Privilege.chat).WithDescription("Lists the cooldown settings on the server, as well as your own active cooldowns if applicable.").HandleWith(Events.HandleListCooldowns).WithAlias("lc"); } private TextCommandResult TestSleep(TextCommandCallingArgs args) diff --git a/AriasServerUtils/PlayerData.cs b/AriasServerUtils/PlayerData.cs index baec1b3..efb9db3 100644 --- a/AriasServerUtils/PlayerData.cs +++ b/AriasServerUtils/PlayerData.cs @@ -31,8 +31,15 @@ namespace AriasServerUtils } - public void Merge(Entity entity) + public void Merge(Entity entity, bool unmount = true) { + if (entity is EntityPlayer player) + { + if (unmount && player.MountedOn.Entity != null) + { + player.TryUnmount(); + } + } entity.TeleportTo(new BlockPos(X, Y, Z, Dimension)); entity.Pos.SetYaw(Yaw); entity.Pos.Pitch = Pitch; @@ -88,6 +95,7 @@ namespace AriasServerUtils public class Home { public PlayerPosition Location { get; set; } + public bool CanHaveMount = false; public static Home MakeHome(Entity player, string homeName) { diff --git a/AriasServerUtils/modinfo.json b/AriasServerUtils/modinfo.json index cc1577f..506a13a 100644 --- a/AriasServerUtils/modinfo.json +++ b/AriasServerUtils/modinfo.json @@ -3,8 +3,8 @@ "modid": "ariasserverutils", "name": "Aria's Server Utilities", "authors": ["zontreck"], - "description": "A collection of server utilities\n\nBuild Date: 05-7-2025 @ 12:21 PM MST", - "version": "1.0.11", + "description": "A collection of server utilities\n\nBuild Date: 06-05-2025 @ 11:56 AM MST", + "version": "1.1.0-dev.1", "dependencies": { "game": "" } From ac8ac62d27cc3723be9d8d4108928645c1d1c7e4 Mon Sep 17 00:00:00 2001 From: zontreck Date: Thu, 5 Jun 2025 12:41:22 -0700 Subject: [PATCH 14/15] Fix serialization of home mount flag Part of #6 --- AriasServerUtils/EventHandler.cs | 15 ++++----------- AriasServerUtils/Globals.cs | 9 ++++++++- AriasServerUtils/PlayerData.cs | 3 ++- AriasServerUtils/modinfo.json | 4 ++-- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/AriasServerUtils/EventHandler.cs b/AriasServerUtils/EventHandler.cs index 6b19245..667c1f1 100644 --- a/AriasServerUtils/EventHandler.cs +++ b/AriasServerUtils/EventHandler.cs @@ -202,10 +202,11 @@ namespace AriasServerUtils if (args.Caller.Player is IServerPlayer isp) { - - if (args.Command.FullName == "sethomemount") + bool withMount = false; + if (args.Command.Name == "sethomemount") { // Check for the gears and pay here, or show error. + withMount = true; } bool bypass = isOp && ServerUtilities.config.AdminsBypassMaxHomes; @@ -213,16 +214,8 @@ namespace AriasServerUtils if (bypass || data.Homes.Count < ServerUtilities.config.MaxHomes || data.Homes.ContainsKey(homeName)) { - data.Homes[homeName] = Home.MakeHome(args.Caller.Player.Entity, homeName); + data.Homes[homeName] = Home.MakeHome(args.Caller.Player.Entity, homeName, withMount: withMount); ServerUtilities.SendMessageTo(isp, Lang.Get($"{ServerUtilities.MOD_ID}:home-set")); - - - - if (args.Command.FullName == "sethomemount") - { - // Enable mount in the home - data.Homes[homeName].CanHaveMount = true; - } } else { diff --git a/AriasServerUtils/Globals.cs b/AriasServerUtils/Globals.cs index 7a9ead4..0040c91 100644 --- a/AriasServerUtils/Globals.cs +++ b/AriasServerUtils/Globals.cs @@ -96,12 +96,13 @@ namespace AriasServerUtils public bool CanHaveMount = false; - public static Warp Create(IServerPlayer player) + public static Warp Create(IServerPlayer player, bool withMount = false) { Warp warp = new Warp(); warp.Location = PlayerPosition.from(player.Entity); warp.CreatedBy = player.PlayerName; warp.CreatedAt = DateTime.Now; + warp.CanHaveMount = withMount; return warp; } @@ -113,6 +114,12 @@ namespace AriasServerUtils public Dictionary warps = new Dictionary(); } + [Serializable] + public class Costs + { + + } + public class BackCaches { diff --git a/AriasServerUtils/PlayerData.cs b/AriasServerUtils/PlayerData.cs index efb9db3..6be84eb 100644 --- a/AriasServerUtils/PlayerData.cs +++ b/AriasServerUtils/PlayerData.cs @@ -97,10 +97,11 @@ namespace AriasServerUtils public PlayerPosition Location { get; set; } public bool CanHaveMount = false; - public static Home MakeHome(Entity player, string homeName) + public static Home MakeHome(Entity player, string homeName, bool withMount = false) { Home home = new Home(); home.Location = PlayerPosition.from(player); + home.CanHaveMount = withMount; return home; diff --git a/AriasServerUtils/modinfo.json b/AriasServerUtils/modinfo.json index 506a13a..5a7b9ec 100644 --- a/AriasServerUtils/modinfo.json +++ b/AriasServerUtils/modinfo.json @@ -3,8 +3,8 @@ "modid": "ariasserverutils", "name": "Aria's Server Utilities", "authors": ["zontreck"], - "description": "A collection of server utilities\n\nBuild Date: 06-05-2025 @ 11:56 AM MST", - "version": "1.1.0-dev.1", + "description": "A collection of server utilities\n\nBuild Date: 06-05-2025 @ 12:38 PM MST", + "version": "1.1.0-dev.2", "dependencies": { "game": "" } From a88807045ed4674dd99153fe34c29a669e8da372 Mon Sep 17 00:00:00 2001 From: zontreck Date: Thu, 5 Jun 2025 16:44:48 -0700 Subject: [PATCH 15/15] Implement money utility APIs Part of #6 --- AriasServerUtils/Globals.cs | 30 ++++++ AriasServerUtils/ModSystems/ASUServer.cs | 42 +------- AriasServerUtils/RustyGearUtils.cs | 131 +++++++++++++++++++++++ AriasServerUtils/modinfo.json | 4 +- 4 files changed, 164 insertions(+), 43 deletions(-) create mode 100644 AriasServerUtils/RustyGearUtils.cs diff --git a/AriasServerUtils/Globals.cs b/AriasServerUtils/Globals.cs index 0040c91..5da42ab 100644 --- a/AriasServerUtils/Globals.cs +++ b/AriasServerUtils/Globals.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Runtime.ConstrainedExecution; +using Vintagestory.API.Common; using Vintagestory.API.Server; namespace AriasServerUtils @@ -114,10 +115,39 @@ namespace AriasServerUtils public Dictionary warps = new Dictionary(); } + /// + /// This contains per command costs, as well as helper functions that can refund a player, or check if the player has the required balance, or payment + /// + /// [Serializable] public class Costs { + public Dictionary costs = new Dictionary(); + /// + /// Checks if the player has the balance required to use the command + /// + /// The command the player is trying to use + /// The player + /// True if the player has the required balance + public bool PlayerHasBalance(string cmd, EntityPlayer player) + { + int gears = 0; + int required = 0; + if (costs.ContainsKey(cmd)) + { + // Get the cost for that command + required = costs[cmd]; + } + + // Scan the player inventory, check gears + + + + + if (gears >= required) return true; + return false; + } } diff --git a/AriasServerUtils/ModSystems/ASUServer.cs b/AriasServerUtils/ModSystems/ASUServer.cs index e640c0e..1eed677 100644 --- a/AriasServerUtils/ModSystems/ASUServer.cs +++ b/AriasServerUtils/ModSystems/ASUServer.cs @@ -32,14 +32,6 @@ namespace AriasServerUtils internal bool isFirstStart = true; - internal static string[] saveInvTypes = new string[] { - GlobalConstants.hotBarInvClassName, - GlobalConstants.backpackInvClassName, - GlobalConstants.craftingInvClassName, - GlobalConstants.mousecursorInvClassName, - GlobalConstants.characterInvClassName - }; - List SleepingPlayers { get; set; } = new(); float OriginalSpeed { get; set; } = 0.0f; public double Hours { get; private set; } = 0.0; @@ -503,42 +495,10 @@ namespace AriasServerUtils private void OnPlayerDeath(IServerPlayer player, DamageSource damageSource) { - PlayerInventory inv = new PlayerInventory(); - var invMgr = player.InventoryManager; - + PlayerInventory inv = RustyGearUtils.GetAllItems(player); NewBackCacheForPlayer(player); - var iBackpackSlotNum = 0; - foreach (var type in saveInvTypes) - { - foreach (var stack in invMgr.GetOwnInventory(type)) - { - - if (iBackpackSlotNum >= 4) - { - continue; - } - if (type == GlobalConstants.backpackInvClassName) - { - iBackpackSlotNum++; - } - if (stack.Empty) continue; - if (stack.Inventory.ClassName == GlobalConstants.characterInvClassName) - { - if (stack.Itemstack.ItemAttributes?["protectionModifiers"].Exists ?? false) - { - inv.Items.Add(stack.Itemstack.Clone()); - } - } - else - inv.Items.Add(stack.Itemstack.Clone()); - - API.Logger.Notification($"SAVED STORAGE ITEM TYPE: {stack.Itemstack}"); - - } - } - backupInventory[player.PlayerName] = inv; } diff --git a/AriasServerUtils/RustyGearUtils.cs b/AriasServerUtils/RustyGearUtils.cs new file mode 100644 index 0000000..229a7be --- /dev/null +++ b/AriasServerUtils/RustyGearUtils.cs @@ -0,0 +1,131 @@ +using System; +using AriasServerUtils; +using Vintagestory.API.Common; +using Vintagestory.API.Config; +using Vintagestory.API.Datastructures; +using Vintagestory.API.Server; +using Vintagestory.API.Util; + +public static class RustyGearUtils +{ + + + internal static string[] saveInvTypes = new string[] { + GlobalConstants.hotBarInvClassName, + GlobalConstants.backpackInvClassName, + GlobalConstants.craftingInvClassName, + GlobalConstants.mousecursorInvClassName, + GlobalConstants.characterInvClassName + }; + + // Replace with the correct code if it's different + private const string RustyGearCode = "currency-rustygear"; + + /// + /// Counts the total number of rusty gears in the player's inventory. + /// + public static int CountRustyGears(IServerPlayer player) + { + int total = 0; + + player.Entity.WalkInventory((slot) => + { + if (slot is ItemSlotCreative || !(slot.Inventory is InventoryBasePlayer)) return true; + + total += CurrencyValuePerItem(slot) * slot.StackSize; + + return true; + }); + + return total; + } + + private static int CurrencyValuePerItem(ItemSlot slot) + { + JsonObject obj = slot.Itemstack?.Collectible?.Attributes?["currency"]; + if (obj != null && obj.Exists) + { + JsonObject v = obj["value"]; + return v.Exists ? v.AsInt(0) : 0; + } + return 0; + } + /// + /// Attempts to subtract a specific number of rusty gears from the player's inventory. + /// + /// The player. + /// How many gears to remove. + /// True if the full amount was successfully removed, false if not enough gears. + public static bool SubtractRustyGears(IServerPlayer player, int amount) + { + // Check if the player has enough rusty gears + int currentAmount = CountRustyGears(player); + if (currentAmount < amount) return false; + + // Subtract the specified amount of rusty gears from the player's inventory + player.Entity.WalkInventory((slot) => + { + if (slot is ItemSlotCreative || !(slot.Inventory is InventoryBasePlayer)) return true; + + int value = CurrencyValuePerItem(slot) * slot.StackSize; + if (value > 0 && slot.StackSize > 0) + { + // Calculate the amount of rusty gears to remove from this slot + int amountToRemove = Math.Min(value, amount); + + // If the slot size is less than or equal to the amount to remove, set the slot's itemstack to null + if (slot.StackSize <= amountToRemove) slot.Itemstack = null; + else + { + // Otherwise, subtract the amount to remove from the slot size and decrement the total amount + slot.Itemstack.StackSize -= amountToRemove; + amount -= amountToRemove; + } + } + + // If the total amount has been removed, return true + if (amount <= 0) return true; // we're done + return true; + }); + + // If the player's inventory still contains rusty gears, they don't have enough to remove + return false; + } + + public static PlayerInventory GetAllItems(IServerPlayer player) + { + PlayerInventory inv = new PlayerInventory(); + + var invMgr = player.InventoryManager; + + var iBackpackSlotNum = 0; + foreach (var type in saveInvTypes) + { + foreach (var stack in invMgr.GetOwnInventory(type)) + { + + if (iBackpackSlotNum >= 4) + { + continue; + } + if (type == GlobalConstants.backpackInvClassName) + { + iBackpackSlotNum++; + } + if (stack.Empty) continue; + if (stack.Inventory.ClassName == GlobalConstants.characterInvClassName) + { + if (stack.Itemstack.ItemAttributes?["protectionModifiers"].Exists ?? false) + { + inv.Items.Add(stack.Itemstack.Clone()); + } + } + else + inv.Items.Add(stack.Itemstack.Clone()); + + } + } + + return inv; + } +} diff --git a/AriasServerUtils/modinfo.json b/AriasServerUtils/modinfo.json index 5a7b9ec..47b0a7a 100644 --- a/AriasServerUtils/modinfo.json +++ b/AriasServerUtils/modinfo.json @@ -3,8 +3,8 @@ "modid": "ariasserverutils", "name": "Aria's Server Utilities", "authors": ["zontreck"], - "description": "A collection of server utilities\n\nBuild Date: 06-05-2025 @ 12:38 PM MST", - "version": "1.1.0-dev.2", + "description": "A collection of server utilities\n\nBuild Date: 06-05-2025 @ 4:44 PM MST", + "version": "1.1.0-dev.3", "dependencies": { "game": "" }