From e96e051a7f6f5bcbcff132f507491964c6e3393d Mon Sep 17 00:00:00 2001 From: Noah Stolk <31079637+NoahStolk@users.noreply.github.com> Date: Sat, 7 Sep 2024 20:52:39 +0200 Subject: [PATCH] Stop using deprecated time extensions --- .../Services/CustomEntryService.cs | 18 +++++++++--------- .../Commands/CustomEntries/UploadRequest.cs | 9 +++++---- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/CustomEntryService.cs b/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/CustomEntryService.cs index 113f2b27d..42a74e7e5 100644 --- a/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/CustomEntryService.cs +++ b/src/DevilDaggersInfo.Web.Server.Domain.Admin/Services/CustomEntryService.cs @@ -1,4 +1,4 @@ -using DevilDaggersInfo.Core.Common.Extensions; +using DevilDaggersInfo.Core.Common; using DevilDaggersInfo.Web.ApiSpec.Admin.CustomEntries; using DevilDaggersInfo.Web.Server.Domain.Admin.Exceptions; using DevilDaggersInfo.Web.Server.Domain.Entities; @@ -45,12 +45,12 @@ public async Task AddCustomEntryAsync(AddCustomEntry addCustomEntry) GemsTotal = addCustomEntry.GemsTotal, HomingStored = addCustomEntry.HomingStored, HomingEaten = addCustomEntry.HomingEaten, - LevelUpTime2 = addCustomEntry.LevelUpTime2.To10thMilliTime(), - LevelUpTime3 = addCustomEntry.LevelUpTime3.To10thMilliTime(), - LevelUpTime4 = addCustomEntry.LevelUpTime4.To10thMilliTime(), + LevelUpTime2 = (int)GameTime.FromSeconds(addCustomEntry.LevelUpTime2).GameUnits, + LevelUpTime3 = (int)GameTime.FromSeconds(addCustomEntry.LevelUpTime3).GameUnits, + LevelUpTime4 = (int)GameTime.FromSeconds(addCustomEntry.LevelUpTime4).GameUnits, PlayerId = addCustomEntry.PlayerId, SubmitDate = addCustomEntry.SubmitDate, - Time = addCustomEntry.Time.To10thMilliTime(), + Time = (int)GameTime.FromSeconds(addCustomEntry.Time).GameUnits, }; _dbContext.CustomEntries.Add(customEntry); await _dbContext.SaveChangesAsync(); @@ -81,12 +81,12 @@ public async Task EditCustomEntryAsync(int id, EditCustomEntry editCustomEntry) customEntry.GemsTotal = editCustomEntry.GemsTotal; customEntry.HomingStored = editCustomEntry.HomingStored; customEntry.HomingEaten = editCustomEntry.HomingEaten; - customEntry.LevelUpTime2 = editCustomEntry.LevelUpTime2.To10thMilliTime(); - customEntry.LevelUpTime3 = editCustomEntry.LevelUpTime3.To10thMilliTime(); - customEntry.LevelUpTime4 = editCustomEntry.LevelUpTime4.To10thMilliTime(); + customEntry.LevelUpTime2 = (int)GameTime.FromSeconds(editCustomEntry.LevelUpTime2).GameUnits; + customEntry.LevelUpTime3 = (int)GameTime.FromSeconds(editCustomEntry.LevelUpTime3).GameUnits; + customEntry.LevelUpTime4 = (int)GameTime.FromSeconds(editCustomEntry.LevelUpTime4).GameUnits; customEntry.PlayerId = editCustomEntry.PlayerId; customEntry.SubmitDate = editCustomEntry.SubmitDate; - customEntry.Time = editCustomEntry.Time.To10thMilliTime(); + customEntry.Time = (int)GameTime.FromSeconds(editCustomEntry.Time).GameUnits; await _dbContext.SaveChangesAsync(); } diff --git a/src/DevilDaggersInfo.Web.Server.Domain/Commands/CustomEntries/UploadRequest.cs b/src/DevilDaggersInfo.Web.Server.Domain/Commands/CustomEntries/UploadRequest.cs index b633ec549..f40f9c8b6 100644 --- a/src/DevilDaggersInfo.Web.Server.Domain/Commands/CustomEntries/UploadRequest.cs +++ b/src/DevilDaggersInfo.Web.Server.Domain/Commands/CustomEntries/UploadRequest.cs @@ -1,3 +1,4 @@ +using DevilDaggersInfo.Core.Common; using DevilDaggersInfo.Core.Common.Extensions; using DevilDaggersInfo.Core.CriteriaExpression; using DevilDaggersInfo.Web.Server.Domain.Constants; @@ -219,10 +220,10 @@ public TargetCollection CreateTargetCollection() HomingStored = GetFinalHomingValue(), HomingEaten = HomingEaten, DeathType = DeathType, - Time = TimeInSeconds.To10thMilliTime(), - LevelUpTime2 = LevelUpTime2InSeconds.To10thMilliTime(), - LevelUpTime3 = LevelUpTime3InSeconds.To10thMilliTime(), - LevelUpTime4 = LevelUpTime4InSeconds.To10thMilliTime(), + Time = (int)GameTime.FromSeconds(TimeInSeconds).GameUnits, + LevelUpTime2 = (int)GameTime.FromSeconds(LevelUpTime2InSeconds).GameUnits, + LevelUpTime3 = (int)GameTime.FromSeconds(LevelUpTime3InSeconds).GameUnits, + LevelUpTime4 = (int)GameTime.FromSeconds(LevelUpTime4InSeconds).GameUnits, EnemiesAlive = EnemiesAlive, Skull1Kills = GetFinalEnemyStat(urd => urd.Skull1sKilled), Skull2Kills = GetFinalEnemyStat(urd => urd.Skull2sKilled),