diff --git a/AriasServerUtils/ModSystems/ASUServer.cs b/AriasServerUtils/ASUModSystem.cs similarity index 58% rename from AriasServerUtils/ModSystems/ASUServer.cs rename to AriasServerUtils/ASUModSystem.cs index 1eed677..c688363 100644 --- a/AriasServerUtils/ModSystems/ASUServer.cs +++ b/AriasServerUtils/ASUModSystem.cs @@ -1,13 +1,11 @@ using System; using System.Collections.Generic; using System.IO; -using System.Linq; using Vintagestory.API.Client; using Vintagestory.API.Common; using Vintagestory.API.Common.CommandAbbr; using Vintagestory.API.Common.Entities; using Vintagestory.API.Config; -using Vintagestory.API.Datastructures; using Vintagestory.API.MathTools; using Vintagestory.API.Server; using Vintagestory.API.Util; @@ -19,7 +17,7 @@ namespace AriasServerUtils { public static string MOD_ID = "ariasserverutils"; public static ASUModConfig config = new ASUModConfig(); - internal static ICoreServerAPI API; + private static ICoreServerAPI API; private static bool bDirty = false; internal static Dictionary backupInventory = new Dictionary(); @@ -28,15 +26,15 @@ namespace AriasServerUtils internal static BackCaches backCaches = new BackCaches(); internal static Warps serverWarps = new Warps(); - internal static Random rng = new Random((int)TimeUtil.GetUnixEpochTimestamp()); - internal bool isFirstStart = true; - List SleepingPlayers { get; set; } = new(); - float OriginalSpeed { get; set; } = 0.0f; - public double Hours { get; private set; } = 0.0; - bool Sleeping { get; set; } = false; - public IServerNetworkChannel ServerNetworkChannel { get; private set; } + internal static string[] saveInvTypes = new string[] { + GlobalConstants.hotBarInvClassName, + GlobalConstants.backpackInvClassName, + GlobalConstants.craftingInvClassName, + GlobalConstants.mousecursorInvClassName, + GlobalConstants.characterInvClassName + }; /// /// Method to register all mod blocks @@ -56,14 +54,6 @@ namespace AriasServerUtils { } - - public override bool ShouldLoad(EnumAppSide side) - { - return side == EnumAppSide.Server; - } - - - // Called on server and client public override void Start(ICoreAPI api) { @@ -82,29 +72,28 @@ namespace AriasServerUtils api.Event.ServerRunPhase(EnumServerRunPhase.GameReady, OnGameReady); api.Event.ServerRunPhase(EnumServerRunPhase.Shutdown, OnShutdown); + api.Event.Timer(OnCheckModDirty, 20); + api.Event.Timer(OnCheckPlayerCooldowns, 1); api.Event.PlayerDeath += OnPlayerDeath; api.Event.PlayerJoin += OnPlayerJoin; api.Event.PlayerDisconnect += OnPlayerDC; - api.Event.ChunkColumnLoaded += RTPFactory.ChunkLoaded; - api.Event.BreakBlock += Events.CheckBreakFarmland; //api.Event.PlayerLeave += OnPlayerDC; - 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("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("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).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("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("asu") .RequiresPrivilege(Privilege.chat) @@ -135,22 +124,6 @@ namespace AriasServerUtils .WithDescription("DANGER: This updates the flag allowing anybody to create warps, even non-admins. It is recommended to leave this alone. The default is true/on/yes") .HandleWith(Events.HandleUpdateASUMgrWarps) .EndSubCommand() - .BeginSubCommand("adminBypassCooldown") - .RequiresPrivilege(Privilege.controlserver) - .WithArgs( - parsers.Bool("bypass") - ) - .WithDescription("This flag controls whether admins can or can not bypass the cooldown system (Default: true)") - .HandleWith(Events.HandleUpdateASUBypassCD) - .EndSubCommand() - .BeginSubCommand("adminsBypassRTPMaxDist") - .RequiresPrivilege(Privilege.controlserver) - .WithArgs( - parsers.Bool("bypass") - ) - .WithDescription("This flag would allow admins to go further than the max server RTP distance when manually specifying a distance to RTP (Default: false)") - .HandleWith(Events.HandleUpdateASUBypassRTPMaxDist) - .EndSubCommand() .BeginSubCommand("maxback") .RequiresPrivilege(Privilege.controlserver) .WithArgs( @@ -172,21 +145,9 @@ namespace AriasServerUtils .WithArgs( parsers.Int("maxDistance") ) - .WithDescription("Update RTP Max block distance. Plus and/or minus this distance from player current position (Default is 50000)") + .WithDescription("Update RTP Max block distance. Plus and/or minus this distance from player current position") .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") @@ -240,200 +201,22 @@ namespace AriasServerUtils .RequiresPrivilege(Privilege.chat) .HandleWith(Events.HandleASU) .WithDescription("Lists all Aria's Server Utils commands") - .EndSubCommand() - .BeginSubCommand("test") - .RequiresPlayer() - .RequiresPrivilege(Privilege.controlserver) - .BeginSubCommand("sleep") - .RequiresPlayer() - .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).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("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("back").RequiresPlayer().RequiresPrivilege(Privilege.chat).WithDescription("Returns you to the last location you were at").HandleWith(Events.HandleBack).WithAlias("b"); + api.ChatCommands.Create("back").RequiresPlayer().RequiresPrivilege(Privilege.chat).WithDescription("Returns you to the last location you were at").HandleWith(Events.HandleBack); 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).WithAlias("lc"); - } - - 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) - { - 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(); - - ebt.IsSleeping = true; - ebt.Tiredness = 100; - Sleeping = true; - - API.World.Calendar.SetTimeSpeedModifier("asu_psp", 1000); - } - - return TextCommandResult.Success($"Test initiated, original calendar multiplier: '{OriginalSpeed}'"); - } - - private TextCommandResult TestCalendarSpeed(TextCommandCallingArgs args) - { - if (args.Caller.Player is IServerPlayer isp) - { - EntityAgent agent = isp.Entity; - EntityBehaviorTiredness ebt = agent.GetBehavior("tiredness") as EntityBehaviorTiredness; - - SendMessageTo(isp, $"- Current calendar speed: {API.World.Calendar.CalendarSpeedMul}"); - SendMessageTo(isp, $"- Total Hours: {API.World.Calendar.TotalHours}"); - SendMessageTo(isp, $"- Tiredness: {ebt.Tiredness}"); - if (OriginalSpeed == 0) - { - // Apply multiplier - OriginalSpeed = 0.5f; - ebt.IsSleeping = true; - - API.World.Calendar.SetTimeSpeedModifier("asu_psp", 1000); - - SendMessageTo(isp, "Applied calendar speed multiplier"); - } - else - { - // Unapply multiplier - OriginalSpeed = 0; - ebt.IsSleeping = false; - - API.World.Calendar.RemoveTimeSpeedModifier("asu_psp"); - - SendMessageTo(isp, "Restored default calendar speed"); - } - } - - return TextCommandResult.Success(); - } - - 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}"); - if (API.World.Calendar.TotalHours - Hours >= 6) - { - Sleeping = false; - foreach (var player in SleepingPlayers) - { - EntityBehaviorTiredness ebt = player.GetBehavior(); - ebt.IsSleeping = false; - ebt.Tiredness = 0; - } - - SleepingPlayers.Clear(); - - API.World.Calendar.RemoveTimeSpeedModifier("asu_psp"); - - //API.Logger.Notification("Stopping PSP Time Acceleration"); - } - return; - } - if (config.PlayerSleepingPercentage == 100) return; // Normal behavior - // 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; - - List BEBs = new(); - - foreach (var player in API.World.AllOnlinePlayers) - { - EntityAgent ePlay = player.Entity; - if (ePlay.MountedOn is BlockEntityBed beb) - { - 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(); - if (ebt != null) - ebt.IsSleeping = false; - } - } - } - - 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) - { - - API.World.Calendar.SetTimeSpeedModifier("asu_psp", 1000); - - // Call the API to make sleep happen - foreach (var bed in BEBs) - { - if (bed.MountedBy != null) SleepingPlayers.Add(bed.MountedBy); - - // Start sleep - 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. - } - - // Get current calendar speed - Hours = API.World.Calendar.TotalHours; - Sleeping = true; - } } private void OnCheckPlayerCooldowns() { foreach (var cdEntry in ServerUtilities.mPlayerData) { - // Obtain the IServerPlayer instance for this player. - IServerPlayer player = API.Server.Players.First(x => x.PlayerName == cdEntry.Key); - if (player.HasPrivilege(Privilege.controlserver) && ServerUtilities.config.AdminsBypassCooldowns) - { - cdEntry.Value.ActiveCooldowns.Clear(); // Problem solved. - } List toRemove = new(); foreach (var cd in cdEntry.Value.ActiveCooldowns) { @@ -495,10 +278,42 @@ namespace AriasServerUtils private void OnPlayerDeath(IServerPlayer player, DamageSource damageSource) { - PlayerInventory inv = RustyGearUtils.GetAllItems(player); + PlayerInventory inv = new PlayerInventory(); + var invMgr = player.InventoryManager; + 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; } @@ -552,13 +367,6 @@ namespace AriasServerUtils // -> Step 3. Load Mod Warps <- serverWarps = API.LoadModConfig(GetConfigurationFile("warps", ModConfigType.Global)); if (serverWarps == null) serverWarps = new Warps(); - - - - API.Event.Timer(OnCheckModDirty, 20); - API.Event.Timer(OnCheckPlayerCooldowns, 1); - API.Event.Timer(OnCheckSleepingPlayers, 5); - API.Event.Timer(RTPFactory.HandleRTPChecking, 1); } public string GetConfigurationFile(string sName, ModConfigType type) diff --git a/AriasServerUtils/EventHandler.cs b/AriasServerUtils/EventHandler.cs index 667c1f1..134c08d 100644 --- a/AriasServerUtils/EventHandler.cs +++ b/AriasServerUtils/EventHandler.cs @@ -3,12 +3,10 @@ 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; using Vintagestory.API.Util; -using Vintagestory.GameContent; namespace AriasServerUtils { @@ -16,7 +14,7 @@ namespace AriasServerUtils { internal static TextCommandResult HandleASU(TextCommandCallingArgs args) { - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:help", ServerUtilities.config.MaxHomes, ServerUtilities.config.AdminsBypassMaxHomes, ServerUtilities.config.MaxBackCache, string.Join(", ", new string[] { "setspawn", "spawn", "delspawn", "sethome", "home", "delhome", "homes", "restoreinv", "asu", "warp", "setwarp", "delwarp", "warps", "back", "rtp", "listcooldowns" }))); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:help", ServerUtilities.config.MaxHomes, ServerUtilities.config.AdminsBypassMaxHomes, ServerUtilities.config.MaxBackCache, string.Join(", ", new string[] { "setspawn", "spawn", "delspawn", "sethome", "home", "delhome", "homes", "restoreinv", "asu", "warp", "setwarp", "delwarp", "warps", "back", "rtp" }))); } internal static TextCommandResult HandleBack(TextCommandCallingArgs args) @@ -60,7 +58,7 @@ namespace AriasServerUtils if (args[0] is int ix) { if (ix == -1) ix = maxDistance; - if (ix > maxDistance && !(ServerUtilities.config.AdminsBypassRTPMaxDistance && isp.HasPrivilege(Privilege.controlserver))) + if (ix > maxDistance) { ServerUtilities.SendMessageTo(isp, Lang.Get($"{ServerUtilities.MOD_ID}:rtp-capped", ix, maxDistance)); } @@ -76,7 +74,29 @@ namespace AriasServerUtils ServerUtilities.SendMessageTo(isp, Lang.Get($"{ServerUtilities.MOD_ID}:rtp-search")); - RTPFactory.TryRTP(isp, maxDistance: maxDistance); + + PlayerPosition pPos = RTPFactory.GetRandomPosition(isp, maxDistance: maxDistance); + if (pPos == null) + { + ps.ActiveCooldowns.Add(CooldownType.RTP, (TimeUtil.DecodeTimeNotation(ServerUtilities.config.Cooldowns.Get(CooldownType.RTP)) / 2) + TimeUtil.GetUnixEpochTimestamp()); + ServerUtilities.MarkDirty(); + + ServerUtilities.SendMessageTo(isp, Lang.Get($"{ServerUtilities.MOD_ID}:rtp-fail")); + return TextCommandResult.Success(); + } + Vec2i origin = new((int)isp.Entity.Pos.X, (int)isp.Entity.Pos.Z); + Vec2i npos = new(pPos.X, pPos.Z); + + float distance = RTPFactory.GetDistance(origin, npos); + + pPos.Merge(isp.Entity); + + + ps.ActiveCooldowns.Add(CooldownType.RTP, TimeUtil.DecodeTimeNotation(ServerUtilities.config.Cooldowns.Get(CooldownType.RTP)) + TimeUtil.GetUnixEpochTimestamp()); + ServerUtilities.MarkDirty(); + + ServerUtilities.SendMessageTo(isp, Lang.Get($"{ServerUtilities.MOD_ID}:rtp", distance)); + } return TextCommandResult.Success(); } @@ -127,10 +147,8 @@ namespace AriasServerUtils if (data.Homes.ContainsKey(homeName)) { - Home home = data.Homes[homeName]; ServerUtilities.NewBackCacheForPlayer(isp); - - home.Location.Merge(isp.Entity, unmount: !home.CanHaveMount); + data.Homes[homeName].Location.Merge(isp.Entity); ServerUtilities.SendMessageTo(isp, Lang.Get($"{ServerUtilities.MOD_ID}:home-tp")); } @@ -202,20 +220,14 @@ namespace AriasServerUtils if (args.Caller.Player is IServerPlayer isp) { - 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; var data = ServerUtilities.GetPlayerData(isp); if (bypass || data.Homes.Count < ServerUtilities.config.MaxHomes || data.Homes.ContainsKey(homeName)) { - data.Homes[homeName] = Home.MakeHome(args.Caller.Player.Entity, homeName, withMount: withMount); + data.Homes[homeName] = Home.MakeHome(args.Caller.Player.Entity, homeName); ServerUtilities.SendMessageTo(isp, Lang.Get($"{ServerUtilities.MOD_ID}:home-set")); + } else { @@ -284,7 +296,7 @@ namespace AriasServerUtils { ServerUtilities.config.AdminsBypassMaxHomes = bypass; ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", bypass)); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); } return TextCommandResult.Success(); @@ -298,7 +310,7 @@ namespace AriasServerUtils ServerUtilities.config.MaxBackCache = max; ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", max)); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); } return TextCommandResult.Success(); @@ -311,7 +323,7 @@ namespace AriasServerUtils ServerUtilities.config.MaxHomes = maxHomes; ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", maxHomes)); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); } return TextCommandResult.Success(); @@ -320,32 +332,19 @@ 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", true)); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); } 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", psp)); - } - - return TextCommandResult.Success(); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); } internal static TextCommandResult HandleWarp(TextCommandCallingArgs args) @@ -364,11 +363,13 @@ namespace AriasServerUtils if (ServerUtilities.serverWarps.warps.ContainsKey(name)) { - Warp warp = ServerUtilities.serverWarps.warps[name]; ServerUtilities.NewBackCacheForPlayer(isp); - warp.Location.Merge(isp.Entity, unmount: !warp.CanHaveMount); + 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)); data.ActiveCooldowns.Add(CooldownType.Warp, TimeUtil.DecodeTimeNotation(ServerUtilities.config.Cooldowns.Get(CooldownType.Warp)) + TimeUtil.GetUnixEpochTimestamp()); @@ -451,7 +452,7 @@ namespace AriasServerUtils ServerUtilities.config.MaxRTPBlockDistance = maxDist; ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", maxDist)); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); } return TextCommandResult.Success(); @@ -464,7 +465,7 @@ namespace AriasServerUtils ServerUtilities.config.Cooldowns[CooldownType.Back] = CD; ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", CD)); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); } else { @@ -482,7 +483,7 @@ namespace AriasServerUtils ServerUtilities.config.Cooldowns[CooldownType.Warp] = CD; ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", CD)); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); } else { @@ -500,7 +501,7 @@ namespace AriasServerUtils ServerUtilities.config.Cooldowns[CooldownType.Home] = CD; ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", CD)); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); } else { @@ -518,7 +519,7 @@ namespace AriasServerUtils ServerUtilities.config.Cooldowns[CooldownType.Spawn] = CD; ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", CD)); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); } else { @@ -536,7 +537,7 @@ namespace AriasServerUtils ServerUtilities.config.Cooldowns[CooldownType.RTP] = CD; ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", CD)); + return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig")); } else { @@ -554,139 +555,5 @@ namespace AriasServerUtils return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:config-value-reset")); } - - internal static TextCommandResult HandleUpdateASUBypassCD(TextCommandCallingArgs args) - { - if (args[0] is bool bypass) - { - // Update the bypass - ServerUtilities.config.AdminsBypassCooldowns = bypass; - ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", bypass)); - } - else return TextCommandResult.Success(); - } - - internal static TextCommandResult HandleUpdateASUBypassRTPMaxDist(TextCommandCallingArgs args) - { - if (args[0] is bool bypass) - { - // Update the flag - ServerUtilities.config.AdminsBypassRTPMaxDistance = bypass; - ServerUtilities.MarkDirty(); - return TextCommandResult.Success(Lang.Get($"{ServerUtilities.MOD_ID}:updatedconfig", bypass)); - } - 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", downgrade)); - } - 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", drop)); - } - 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"; - foreach (var cd in ServerUtilities.config.Cooldowns) - { - sReturn += $"{cd.Key}: {cd.Value}\n"; - } - if (args.Caller.Player is IServerPlayer isp) - { - sReturn += "\nYour active cooldowns:"; - foreach (var cd in ServerUtilities.GetPlayerData(isp).ActiveCooldowns) - { - long remain = cd.Value - TimeUtil.GetUnixEpochTimestamp(); - string sCDVal = TimeUtil.EncodeTimeNotation(remain); - sReturn += $"{cd.Key}: {sCDVal}\n"; - } - } - 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(); - } - - 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 5da42ab..1b8af8c 100644 --- a/AriasServerUtils/Globals.cs +++ b/AriasServerUtils/Globals.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Runtime.ConstrainedExecution; -using Vintagestory.API.Common; using Vintagestory.API.Server; namespace AriasServerUtils @@ -23,39 +22,23 @@ namespace AriasServerUtils { CooldownType.RTP, "30s" }, { CooldownType.Back, "5s" } }; - private static readonly int CURRENT_VERSION = 6; + private static readonly int CURRENT_VERSION = 3; public int Version { get; set; } = 0; public int MaxHomes { get; set; } = 20; public bool AdminsBypassMaxHomes { get; set; } = true; public bool onlyAdminsCreateWarps { get; set; } = true; - public bool AdminsBypassCooldowns { get; set; } = true; - public bool AdminsBypassRTPMaxDistance { get; set; } = false; public int MaxBackCache { get; set; } = 10; public int PlayerSleepingPercentage { get; set; } = 50; - public int MaxRTPBlockDistance { get; set; } = 50000; + public int MaxRTPBlockDistance { get; set; } = 5000; 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()) @@ -94,16 +77,14 @@ namespace AriasServerUtils public PlayerPosition Location; public string CreatedBy; public DateTime CreatedAt; - public bool CanHaveMount = false; - public static Warp Create(IServerPlayer player, bool withMount = false) + public static Warp Create(IServerPlayer player) { Warp warp = new Warp(); warp.Location = PlayerPosition.from(player.Entity); warp.CreatedBy = player.PlayerName; warp.CreatedAt = DateTime.Now; - warp.CanHaveMount = withMount; return warp; } @@ -115,41 +96,6 @@ 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; - } - } - public class BackCaches { diff --git a/AriasServerUtils/ModSystems/ASUClient.cs b/AriasServerUtils/ModSystems/ASUClient.cs deleted file mode 100644 index 2966dc3..0000000 --- a/AriasServerUtils/ModSystems/ASUClient.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using Vintagestory.API.Client; -using Vintagestory.API.Common; - -public class ASUModClient : ModSystem -{ - public static ICoreClientAPI CAPI; - bool accel = false; - - public override bool ShouldLoad(EnumAppSide forSide) - { - return forSide == EnumAppSide.Client; - } - - public override void StartClientSide(ICoreClientAPI api) - { - CAPI = api; - } -} \ No newline at end of file diff --git a/AriasServerUtils/PlayerData.cs b/AriasServerUtils/PlayerData.cs index 6be84eb..baec1b3 100644 --- a/AriasServerUtils/PlayerData.cs +++ b/AriasServerUtils/PlayerData.cs @@ -31,15 +31,8 @@ namespace AriasServerUtils } - public void Merge(Entity entity, bool unmount = true) + public void Merge(Entity entity) { - 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; @@ -95,13 +88,11 @@ namespace AriasServerUtils public class Home { public PlayerPosition Location { get; set; } - public bool CanHaveMount = false; - public static Home MakeHome(Entity player, string homeName, bool withMount = false) + public static Home MakeHome(Entity player, string homeName) { Home home = new Home(); home.Location = PlayerPosition.from(player); - home.CanHaveMount = withMount; return home; diff --git a/AriasServerUtils/RTPFactory.cs b/AriasServerUtils/RTPFactory.cs index d2544a2..ad91bff 100644 --- a/AriasServerUtils/RTPFactory.cs +++ b/AriasServerUtils/RTPFactory.cs @@ -1,13 +1,9 @@ using System; -using System.Collections.Generic; using System.Data; -using System.Linq; using System.Numerics; using AriasServerUtils; -using Microsoft.Win32.SafeHandles; using Vintagestory.API.Common; using Vintagestory.API.Common.Entities; -using Vintagestory.API.Config; using Vintagestory.API.MathTools; using Vintagestory.API.Server; using Vintagestory.GameContent; @@ -15,272 +11,65 @@ using Vintagestory.GameContent; namespace AriasServerUtils; public class RTPFactory { - - private static List RTPCache = new(); - private static List ChunkChecks = new(); - - /* - if (pPos == null) - { - ps.ActiveCooldowns.Add(CooldownType.RTP, (TimeUtil.DecodeTimeNotation(ServerUtilities.config.Cooldowns.Get(CooldownType.RTP)) / 2) + TimeUtil.GetUnixEpochTimestamp()); - ServerUtilities.MarkDirty(); - - ServerUtilities.SendMessageTo(isp, Lang.Get($"{ServerUtilities.MOD_ID}:rtp-fail")); - return TextCommandResult.Success(); - } - Vec2i origin = new((int)isp.Entity.Pos.X, (int)isp.Entity.Pos.Z); - Vec2i npos = new(pPos.X, pPos.Z); - - float distance = RTPFactory.GetDistance(origin, npos); - - pPos.Merge(isp.Entity); - - - ps.ActiveCooldowns.Add(CooldownType.RTP, TimeUtil.DecodeTimeNotation(ServerUtilities.config.Cooldowns.Get(CooldownType.RTP)) + TimeUtil.GetUnixEpochTimestamp()); - ServerUtilities.MarkDirty(); - - ServerUtilities.SendMessageTo(isp, Lang.Get($"{ServerUtilities.MOD_ID}:rtp", distance)); - - */ - /// - /// This function searches for a safe position + /// This function searches for a safe position, honoring the max RTP distance in the global configuration /// /// The player to be teleported - /// A safe position if able to be found - public static PlayerPosition GetSafePosition(RTPData data, RTPPosition position) + /// A random position +/- max distance from current position. + public static PlayerPosition GetRandomPosition(IServerPlayer isp, int maxDistance) { - PlayerPosition PPos = data.LastPosition.GetPlayerPosition(); - BlockPos check = data.LastPosition.GetBlockPos(); - var BA = ServerUtilities.API.World.BlockAccessor; - check.Y = 1; - int height = BA.GetTerrainMapheightAt(check); - if (height >= 0 && height <= 20) return null; - check.Y = height + 1; - PPos.Y = height + 1; - return PPos; - } + Random rng = new Random(); + EntityPos vPos = isp.Entity.Pos; + BlockPos bPos = new BlockPos(isp.Entity.Pos.Dimension); + IServerWorldAccessor iswa = isp.Entity.World as IServerWorldAccessor; - /// - /// This function will schedule a task to perform an RTP. - /// - /// Player to be teleported - /// Max distance +/- the current position. - public static void TryRTP(IServerPlayer isp, int maxDistance) - { - var data = new RTPData(isp, maxDistance, 10, PlayerPosition.from(isp.Entity)); - RTPCache.Add(data); - } + int tries = 1000; + PlayerPosition PPos = PlayerPosition.from(isp.Entity); + while (tries-- > 0) + { + // Generate random X and Z within max RTP distance + bPos.X = (int)vPos.X + rng.Next(0, maxDistance); + bPos.Z = (int)vPos.Z + rng.Next(0, maxDistance); + bPos.Y = 255; + + if (rng.Next(0, 1) == 1) bPos.X = -bPos.X; + if (rng.Next(0, 1) == 1) bPos.Z = -bPos.Z; + + Block lastAboveLast = null; + Block lastBlock = null; + Block curBlock; + + // Scan downwards to find a valid landing spot + for (int i = 255; i > 0; i--) + { + bPos.Y = i; + curBlock = iswa.BlockAccessor.GetBlock(bPos); + + if (curBlock.MatterState == EnumMatterState.Solid) + { + if (lastBlock != null && lastBlock.BlockMaterial == EnumBlockMaterial.Air && + lastAboveLast != null && lastAboveLast.BlockMaterial == EnumBlockMaterial.Air) + { + // Found a valid spot: curBlock is solid, lastBlock & lastAboveLast are gas (air) + PPos.X = bPos.X; + PPos.Y = bPos.Y + 1; + PPos.Z = bPos.Z; + + return PPos; + } + } + + lastAboveLast = lastBlock; + lastBlock = curBlock; + } + } + + return null; // Return null if no valid position is found after retries + } public static float GetDistance(Vec2i pos1, Vec2i pos2) { return MathF.Sqrt(MathF.Pow(pos2.X - pos1.X, 2) + MathF.Pow(pos2.Y - pos1.Y, 2)); } - /// - /// Fired automatically by the internal game timer. This function will handle checking for a RTP Location - /// - /// NOTE: This function will only cause the chunks in question to be force loaded long enough to check their blocks and make sure it is safe to land there. - /// - internal static void HandleRTPChecking() - { - foreach (var chunk in ChunkChecks) - { - chunk.Wait--; - if (chunk.Wait <= 0) - { - ChunkChecks.Remove(chunk); - break; - } - } - // We want to now loop over the entire cache list. - // We'll then generate a position to check - // We'll also then check the loaded status of the chunk - foreach (var rtp in RTPCache) - { - // Check for any chunks still being checked. - int num = ChunkChecks.Select(x => x.rtp.player.PlayerUID == rtp.player.PlayerUID).Count(); - if (num > 0) continue; - - - if (rtp.NumTriesRemaining <= 0) - { - // Send failure message to the player - ServerUtilities.SendMessageTo(rtp.player, Lang.Get($"{ServerUtilities.MOD_ID}:rtp-fail")); - // This check needs to be removed from the queue - RTPCache.Remove(rtp); - HandleRTPChecking(); - return; // We modified the list, so abort the loop. - } - - // Get the world handle, then get chunk size - var worldManager = ServerUtilities.API.WorldManager; - var chunkSize = worldManager.ChunkSize; - var worldSize = new Vec3i(worldManager.MapSizeX, worldManager.MapSizeY, worldManager.MapSizeZ); - - // Generate a new position - var position = rtp.MakeNewPosition(worldSize); - ServerUtilities.SendMessageTo(rtp.player, Lang.Get($"{ServerUtilities.MOD_ID}:rtp-progress", rtp.NumTriesRemaining)); - - // Generate a chunk load check object. - RTPChunk chunk = new RTPChunk(); - chunk.ChunkX = position.x / chunkSize; - chunk.ChunkZ = position.z / chunkSize; - chunk.dim = position.dimension; - chunk.rtp = rtp; - - // Log the request - ChunkChecks.Add(chunk); - - // Check if the chunk's coordinates are loaded - var cxCheck = ServerUtilities.API.World.IsFullyLoadedChunk(position.GetBlockPos()); - if (cxCheck) - { - // Process the check here, no need to load - var posX = GetSafePosition(rtp, position); - if (posX == null) - { - // Let this get checked again - //ServerUtilities.API.Logger.Notification("position null: resume search"); - } - else - { - - // Found! Perform teleport and remove the RTP Check - RTPCache.Remove(rtp); - posX.Merge(rtp.player.Entity); - - ServerUtilities.SendMessageTo(rtp.player, Lang.Get($"{ServerUtilities.MOD_ID}:rtp", GetDistance(new Vec2i(rtp.StartPosition.X, rtp.StartPosition.Z), new Vec2i(posX.X, posX.Z)))); - - //ServerUtilities.API.Logger.Notification("position found"); - } - - ChunkChecks.Remove(chunk); - } - else - { - // Load the chunk - worldManager.LoadChunkColumnPriority(chunk.ChunkX, chunk.ChunkZ); - } - } - } - - internal static void ChunkLoaded(Vec2i chunkCoord, IWorldChunk[] chunks) - { - // Check if this is even a valid check - var num = ChunkChecks.Where(x => x.ChunkX == chunkCoord.X && x.ChunkZ == chunkCoord.Y).Count(); - if (num == 0) return; - - - // Get the chunk from the stack - var chunk = ChunkChecks.Where(x => x.ChunkX == chunkCoord.X && x.ChunkZ == chunkCoord.Y).First(); - - // Attempt to find a landing point. - var data = chunk.rtp; - var pos = GetSafePosition(data, data.LastPosition); - - if (pos == null) - { - // Let this get checked again - //ServerUtilities.API.Logger.Notification("position null: resume search"); - } - else - { - // Found! Perform teleport and remove the RTP Check - RTPCache.Remove(data); - pos.Merge(data.player.Entity); - - ServerUtilities.SendMessageTo(data.player, Lang.Get($"{ServerUtilities.MOD_ID}:rtp", GetDistance(new Vec2i(data.StartPosition.X, data.StartPosition.Z), new Vec2i(pos.X, pos.Z)))); - - //ServerUtilities.API.Logger.Notification("position found"); - } - - // Remove this check - ChunkChecks.Remove(chunk); - } -} - -public class RTPChunk -{ - public int ChunkX; - public int ChunkZ; - public int dim; - public RTPData rtp; - public int Wait = 5; -} - -public class RTPData -{ - public IServerPlayer player; - public int NumTriesRemaining; - public int MaxDistance; - public PlayerPosition StartPosition; - public RTPPosition LastPosition; - - public RTPData(IServerPlayer isp, int maxDistance, int tries, PlayerPosition playerPosition) - { - MaxDistance = maxDistance; - player = isp; - NumTriesRemaining = tries; - StartPosition = playerPosition; - } - - public RTPPosition MakeNewPosition(Vec3i mapSize) - { - NumTriesRemaining--; - LastPosition = new RTPPosition((int)player.Entity.Pos.X, (int)player.Entity.Pos.Z, MaxDistance, player.Entity.Pos.Dimension, mapSize, player); - - return LastPosition; - } -} - -public class RTPPosition -{ - public int x; - public int y; - public int z; - - public int dimension; - - public RTPPosition(int x, int z, int maxDist, int dim, Vec3i mapSize, IServerPlayer player) - { - - int worldx = mapSize.X / 2; - int worldz = mapSize.Z / 2; - - if (maxDist > worldx) - { - ServerUtilities.SendMessageTo(player, Lang.Get($"{ServerUtilities.MOD_ID}:rtp-capped", maxDist, (worldx))); - maxDist = worldx / 2; - } - - int minX = x - maxDist; - int maxX = x + maxDist; - int minZ = z - maxDist; - int maxZ = z + maxDist; - - this.x = ServerUtilities.rng.Next(minX, maxX); - this.y = 1; - this.z = ServerUtilities.rng.Next(minZ, maxZ); - - - - this.dimension = dim; - } - - public PlayerPosition GetPlayerPosition() - { - return new PlayerPosition - { - X = x, - Y = y, - Dimension = dimension, - Z = z - }; - } - - public BlockPos GetBlockPos() - { - return new BlockPos(new Vec3i(x, y, z), dimension); - } } \ No newline at end of file diff --git a/AriasServerUtils/RustyGearUtils.cs b/AriasServerUtils/RustyGearUtils.cs deleted file mode 100644 index 229a7be..0000000 --- a/AriasServerUtils/RustyGearUtils.cs +++ /dev/null @@ -1,131 +0,0 @@ -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/assets/ariasserverutils/lang/en.json b/AriasServerUtils/assets/ariasserverutils/lang/en.json index 7f983a4..4498f90 100644 --- a/AriasServerUtils/assets/ariasserverutils/lang/en.json +++ b/AriasServerUtils/assets/ariasserverutils/lang/en.json @@ -20,12 +20,9 @@ "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 with the new value: {0}", + "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", @@ -37,14 +34,9 @@ "back": "You've been taken back to your last position", "rtp-search": "Searching for a random position...", - "rtp-progress": "Still searching for a random position... [{0}] tries remaining...", "rtp": "You have been teleported [{0}] blocks away!", - "rtp-found": "Found a valid landing position after {0} tries.", "rtp-fail": "Giving up on RTP search. No valid position could be found. Try again later", "rtp-capped": "The distance you tried to go [{0}] is greater than the maximum allowable by the server [{1}]", - "cmd-cooldown": "[{0}] is currently on cooldown. You can use this command again in [{1}]", - - "psp": "[ASU] PSP Starting... you do not need to stay in bed", - "psp-ending": "[ASU] PSP Complete" + "cmd-cooldown": "[{0}] is currently on cooldown. You can use this command again in [{1}]" } diff --git a/AriasServerUtils/modinfo.json b/AriasServerUtils/modinfo.json index 47b0a7a..2036aac 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 @ 4:44 PM MST", - "version": "1.1.0-dev.3", + "description": "A collection of server utilities\n\nBuild Date: 03-07-2025 @ 1:28 AM MST", + "version": "1.0.5", "dependencies": { "game": "" }