Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions Refresh.Common/Extensions/RequestContextExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.Net;
using JetBrains.Annotations;
using Bunkum.Core;
using JetBrains.Annotations;

namespace Refresh.GameServer.Extensions;
namespace Refresh.Common.Extensions;

public static class RequestContextExtensions
{
Expand Down
2 changes: 1 addition & 1 deletion Refresh.Common/Time/IDateTimeProvider.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Refresh.GameServer.Time;
namespace Refresh.Common.Time;

public interface IDateTimeProvider
{
Expand Down
2 changes: 1 addition & 1 deletion Refresh.Common/Time/SystemDateTimeProvider.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Refresh.GameServer.Time;
namespace Refresh.Common.Time;

public class SystemDateTimeProvider : IDateTimeProvider
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Refresh.GameServer.Endpoints;
namespace Refresh.Core.Authentication.Permission;

[AttributeUsage(AttributeTargets.Method)]
public class AllowDuringMaintenanceAttribute : Attribute
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Refresh.Database.Models.Users;

namespace Refresh.GameServer.Endpoints;
namespace Refresh.Core.Authentication.Permission;

[AttributeUsage(AttributeTargets.Method)]
public class MinimumRoleAttribute : Attribute // TODO: DocAttribute
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Refresh.GameServer.Endpoints;
namespace Refresh.Core.Authentication.Permission;

[AttributeUsage(AttributeTargets.Method)]
public class RequireEmailVerifiedAttribute : Attribute;
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Refresh.Database.Models.Authentication;

namespace Refresh.GameServer.Authentication;
namespace Refresh.Core.Authentication;

public static class TokenGameUtility
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Refresh.Database.Models.Assets;

namespace Refresh.GameServer.Configuration;
namespace Refresh.Core.Configuration;

public class ConfigAssetFlags
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Bunkum.Core.Configuration;

namespace Refresh.GameServer.Configuration;
namespace Refresh.Core.Configuration;

/// <summary>
/// A configuration holding basic contact information for those operating this instance.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Refresh.Database.Models.Assets;
using Refresh.Database.Models.Users;

namespace Refresh.GameServer.Configuration;
namespace Refresh.Core.Configuration;

[SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Global")]
[SuppressMessage("ReSharper", "RedundantDefaultMemberInitializer")]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Bunkum.Core.Configuration;

namespace Refresh.GameServer.Configuration;
namespace Refresh.Core.Configuration;

/// <summary>
/// A configuration file representing options for various integrations like e-mail, discord, and others.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Bunkum.Core.Configuration;

namespace Refresh.GameServer.Configuration;
namespace Refresh.Core.Configuration;

public class RichPresenceConfig : Config
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Refresh.GameServer.Configuration;
namespace Refresh.Core.Configuration;

public class TimedLevelUploadLimitProperties
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#if POSTGRES
using Microsoft.EntityFrameworkCore;

namespace Refresh.GameServer.Extensions;
namespace Refresh.Core.Extensions;


public static class DbSetExtensions
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
using System.Security.Cryptography;
using Bunkum.Core.Storage;
using Refresh.Common.Helpers;
using Refresh.Database.Models.Authentication;
using Refresh.Core.Importing;
using Refresh.Core.Importing.Mip;
using Refresh.Core.Types.Data;
using Refresh.Database;
using Refresh.GameServer.Importing;
using Refresh.GameServer.Importing.Mip;
using Refresh.Database.Models.Assets;
using Refresh.GameServer.Types.Data;
using Refresh.Database.Models.Authentication;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.PixelFormats;
using SixLabors.ImageSharp.Processing;

namespace Refresh.GameServer.Extensions;
namespace Refresh.Core.Extensions;

public static class GameAssetExtensions
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Refresh.Database.Models.Assets;
using Refresh.Database.Models.Levels;

namespace Refresh.GameServer.Extensions;
namespace Refresh.Core.Extensions;

public static class GameDatabaseContextExtensions
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Refresh.Database;
using Refresh.Database.Models.Playlists;

namespace Refresh.GameServer.Extensions;
namespace Refresh.Core.Extensions;

public static class GamePlaylistExtensions
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Refresh.GameServer.Configuration;
using Refresh.Core.Configuration;
using Refresh.Database.Models.Users;

namespace Refresh.GameServer.Extensions;
namespace Refresh.Core.Extensions;

public static class GameUserExtensions
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Refresh.GameServer.Types.Data;
using Refresh.Core.Types.Data;
using Refresh.Database.Models.Photos;

namespace Refresh.GameServer.Extensions;
namespace Refresh.Core.Extensions;

public static class PhotoExtensions
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Bunkum.Core;
using NPTicket;
using Refresh.GameServer.Authentication;
using Refresh.Core.Authentication;
using Refresh.Database.Models.Authentication;

namespace Refresh.GameServer.Extensions;
namespace Refresh.Core.Extensions;

public static class TicketExtensions
{
Expand Down
9 changes: 9 additions & 0 deletions Refresh.Core/GlobalUsings.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
// Global using directives

global using static System.Net.HttpStatusCode;
global using Newtonsoft.Json;
global using Newtonsoft.Json.Serialization;

global using Refresh.Common.Extensions;
global using Refresh.Core.Extensions;
global using Refresh.Database.Extensions;
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
using JetBrains.Annotations;
using NotEnoughLogs;
using Refresh.Common.Helpers;
using Refresh.Database.Models.Authentication;
using Refresh.Common.Time;
using Refresh.Database;
using Refresh.GameServer.Time;
using Refresh.Database.Models.Assets;
using Refresh.Database.Models.Authentication;

namespace Refresh.GameServer.Importing;
namespace Refresh.Core.Importing;

public class AssetImporter : Importer
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Buffers.Binary;

namespace Refresh.GameServer.Importing;
namespace Refresh.Core.Importing;

public class BEBinaryReader : BinaryReader
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using SixLabors.ImageSharp.Metadata;
using SixLabors.ImageSharp.PixelFormats;

namespace Refresh.GameServer.Importing.Gtf;
namespace Refresh.Core.Importing.Gtf;

public class GtfDecoder : ImageDecoder
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using SixLabors.ImageSharp.Formats;

namespace Refresh.GameServer.Importing.Gtf;
namespace Refresh.Core.Importing.Gtf;

public class GtfFormat : IImageFormat<GtfMetadata>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Refresh.GameServer.Importing.Gtf;
namespace Refresh.Core.Importing.Gtf;

public struct GtfHeader
{
Expand Down
6 changes: 6 additions & 0 deletions Refresh.Core/Importing/Gtf/GtfMetadata.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
namespace Refresh.Core.Importing.Gtf;

public class GtfMetadata
{

}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Refresh.GameServer.Importing.Gtf;
namespace Refresh.Core.Importing.Gtf;

//See https://github.com/RPCS3/rpcs3/blob/23cb67e0a10f7d7ecf39122fa697af8dcc30690e/rpcs3/Emu/RSX/gcm_enums.h#L135
public enum GtfPixelFormat : byte
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using Pfim;
using Refresh.GameServer.Importing.Gtf;
using Refresh.GameServer.Importing.Mip;
using Refresh.Core.Importing.Gtf;
using Refresh.Core.Importing.Mip;
using SixLabors.ImageSharp;
using SixLabors.ImageSharp.Formats;
using SixLabors.ImageSharp.PixelFormats;

namespace Refresh.GameServer.Importing;
namespace Refresh.Core.Importing;

public partial class ImageImporter // Conversions
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
using Bunkum.Core.Storage;
using NotEnoughLogs;
using Refresh.Common.Helpers;
using Refresh.Database.Models.Authentication;
using Refresh.Database;
using Refresh.Database.Models.Assets;
using Refresh.Database.Models.Authentication;

namespace Refresh.GameServer.Importing;
namespace Refresh.Core.Importing;

public partial class ImageImporter : Importer
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
using JetBrains.Annotations;
using NotEnoughLogs;
using Refresh.Common.Helpers;
using Refresh.Database.Models.Authentication;
using Refresh.Database.Models.Assets;
using Refresh.Database.Models.Authentication;

namespace Refresh.GameServer.Importing;
namespace Refresh.Core.Importing;

public abstract class Importer
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using SixLabors.ImageSharp.Metadata;
using SixLabors.ImageSharp.PixelFormats;

namespace Refresh.GameServer.Importing.Mip;
namespace Refresh.Core.Importing.Mip;

public class MipDecoder : ImageDecoder
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using SixLabors.ImageSharp.Processing.Processors.Dithering;
using SixLabors.ImageSharp.Processing.Processors.Quantization;

namespace Refresh.GameServer.Importing.Mip;
namespace Refresh.Core.Importing.Mip;

public class MipEncoder : ImageEncoder
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using SixLabors.ImageSharp.Formats;

namespace Refresh.GameServer.Importing.Mip;
namespace Refresh.Core.Importing.Mip;

public class MipFormat : IImageFormat<MipMetadata>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Rgba32 = SixLabors.ImageSharp.PixelFormats.Rgba32;

namespace Refresh.GameServer.Importing.Mip;
namespace Refresh.Core.Importing.Mip;

public class MipHeader
{
Expand Down
6 changes: 6 additions & 0 deletions Refresh.Core/Importing/Mip/MipMetadata.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
namespace Refresh.Core.Importing.Mip;

public class MipMetadata
{

}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Diagnostics;
using ICSharpCode.SharpZipLib.Zip.Compression;

namespace Refresh.GameServer.Importing;
namespace Refresh.Core.Importing;

/// <summary>
/// Streams the data contained within a TEX file
Expand Down
41 changes: 41 additions & 0 deletions Refresh.Core/Refresh.Core.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Refresh.Common\Refresh.Common.csproj" />
<ProjectReference Include="..\Refresh.Database\Refresh.Database.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="AttribDoc" Version="1.2.1" />
<PackageReference Include="BCnEncoder.Net" Version="2.2.0" />
<PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="Discord.Net.Webhook" Version="3.17.4" />
<PackageReference Include="DnsClient" Version="1.8.0" />
<PackageReference Include="MailKit" Version="4.11.0" />
<PackageReference Include="NPTicket" Version="3.1.1" />
<PackageReference Include="Pfim" Version="0.11.3" />
<PackageReference Include="SharpZipLib" Version="1.4.2" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.8" />
<PackageReference Include="EasyHotReload" Version="1.0.0" />
</ItemGroup>

<ItemGroup>
<Using Include="BCrypt.Net.BCrypt" Alias="BC" />
</ItemGroup>

<ItemGroup>
<None Remove="Resources\lbp3.txt" />
<EmbeddedResource Include="Resources\lbp3.txt" />
<None Remove="Resources\lbpv.txt" />
<EmbeddedResource Include="Resources\lbpv.txt" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Refresh.GameServer;
namespace Refresh.Core;

public enum RefreshContext
{
Expand Down
File renamed without changes.
File renamed without changes.
Loading
Loading