Merge pull request #18 from yuwui/guild

Guild

Uchu.Auth/Handlers/LoginHandler.cs

@@ -2,14 +2,15 @@
 using Microsoft.EntityFrameworkCore;
 using RakDotNet;
 using Uchu.Core;
+using static Uchu.Auth.ServerLoginInfoPacket;
 
 namespace Uchu.Auth.Handlers
 {
     public class LoginHandler : HandlerGroup
     {
         [PacketHandler]
         public async Task LoginRequestHandler(ClientLoginInfoPacket packet, IRakConnection connection)
-        {
+        {   
             await using var ctx = new UchuContext();
 
             var info = new ServerLoginInfoPacket
@@ -25,7 +26,7 @@ public async Task LoginRequestHandler(ClientLoginInfoPacket packet, IRakConnecti
             if (characterSpecification == default)
             {
                 info.LoginCode = LoginCode.InsufficientPermissions;
-                info.Error = new ServerLoginInfoPacket.ErrorMessage
+                info.Error = new ErrorMessage
                 {
                     Message = "No character server instance is running. Please try again later."
                 };
@@ -37,7 +38,7 @@ public async Task LoginRequestHandler(ClientLoginInfoPacket packet, IRakConnecti
                 if (!await ctx.Users.AnyAsync(u => u.Username == packet.Username))
                 {
                     info.LoginCode = LoginCode.InsufficientPermissions;
-                    info.Error = new ServerLoginInfoPacket.ErrorMessage
+                    info.Error = new ErrorMessage
                     {
                         Message = "We have no records of that Username and Password combination. Please try again."
                     };
@@ -51,15 +52,15 @@ public async Task LoginRequestHandler(ClientLoginInfoPacket packet, IRakConnecti
                         if (user.Banned)
                         {
                             info.LoginCode = LoginCode.InsufficientPermissions;
-                            info.Error = new ServerLoginInfoPacket.ErrorMessage
+                            info.Error = new ErrorMessage
                             {
                                 Message = $"This account has been banned by an admin. Reason:\n{user.BannedReason ?? "Unknown"}"
                             };
                         }
                         else if (!string.IsNullOrWhiteSpace(user.CustomLockout))
                         {
                             info.LoginCode = LoginCode.InsufficientPermissions;
-                            info.Error = new ServerLoginInfoPacket.ErrorMessage
+                            info.Error = new ErrorMessage
                             {
                                 Message = user.CustomLockout
                             };
@@ -91,7 +92,7 @@ public async Task LoginRequestHandler(ClientLoginInfoPacket packet, IRakConnecti
                     else
                     {
                         info.LoginCode = LoginCode.InsufficientPermissions;
-                        info.Error = new ServerLoginInfoPacket.ErrorMessage
+                        info.Error = new ErrorMessage
                         {
                             Message = "We have no records of that Username and Password combination. Please try again."
                         };

Uchu.Core/Config/Configuration.cs

@@ -43,13 +43,17 @@ public class Configuration
     public class ManagedScriptSources
     {
         [XmlElement("Script")] public List<string> Scripts { get; set; } = new List<string>();
+
+        [XmlElement("Library")] public List<string> Paths { get; set; } = new List<string>();
     }
 
     public class ServerDllSource
     {
         [XmlElement] public string ServerDllSourcePath { get; set; } = "../../../../";
 
         [XmlElement] public string DotNetPath { get; set; } = "dotnet";
+
+        [XmlElement] public string Instance { get; set; } = "Uchu.Instance.dll";
 
         [XmlElement]
         public List<string> ScriptDllSource { get; set; } = new List<string>

Uchu.Core/Database/Models/Character.cs

@@ -179,6 +179,8 @@ public class Character
         public bool LandingByRocket { get; set; }
 
         public int InventorySize { get; set; }
+
+        public long GuildId { get; set; }
 
         public ZoneId LaunchedRocketFrom { get; set; }
 

Uchu.Core/Database/Models/Guild.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+
+namespace Uchu.Core
+{
+    public class Guild
+    {
+        public long Id { get; set; }
+
+        public string Name { get; set; }
+
+        public long CreatorId { get; set; }
+
+        public List<GuildInvite> Invites { get; set; }
+    }
+}

Uchu.Core/Database/Models/GuildInvite.cs

@@ -0,0 +1,18 @@
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace Uchu.Core
+{
+    public class GuildInvite
+    {
+        public long Id { get; set; }
+
+        public long SenderId { get; set; }
+
+        public long RecipientId { get; set; }
+
+        public long GuildId { get; set; }
+
+        [ForeignKey(nameof(GuildId))]
+        public Guild Guild { get; set; }
+    }
+}

Uchu.Core/Database/Providers/SqliteContext.cs

@@ -0,0 +1,14 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace Uchu.Core.Providers
+{
+    public class SqliteContext : UchuContextBase
+    {
+        public static string DatabasePath { get; set; } = "./Uchu.sqlite";
+
+        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+        {
+            optionsBuilder.UseSqlite($"Data Source=\"{DatabasePath}\"");
+        }
+    }
+}

Uchu.Core/Database/Providers/UchuContextBase.cs

@@ -28,6 +28,10 @@ public abstract class UchuContextBase : DbContext, IAsyncDisposable
 
         public DbSet<CharacterMail> Mails { get; set; }
 
+        public DbSet<Guild> Guilds { get; set; }
+
+        public DbSet<GuildInvite> GuildInvites { get; set; }
+
         public virtual async Task EnsureUpdatedAsync()
         {
             await Database.MigrateAsync().ConfigureAwait(false);

Uchu.Core/Database/UchuContext.cs

@@ -1,7 +1,5 @@
 using System;
-using System.IO;
 using System.Threading.Tasks;
-using System.Xml.Serialization;
 using Microsoft.EntityFrameworkCore;
 using Uchu.Core.Providers;
 
@@ -31,6 +29,10 @@ public sealed class UchuContext : IAsyncDisposable, IDisposable
 
         public DbSet<CharacterMail> Mails => ContextBase.Mails;
 
+        public DbSet<Guild> Guilds => ContextBase.Guilds;
+
+        public DbSet<GuildInvite> GuildInvites => ContextBase.GuildInvites;
+
         public UchuContext()
         {
             var config = UchuContextBase.Config;
@@ -43,6 +45,9 @@ public UchuContext()
                 case "mysql":
                     ContextBase = new MySqlContext();
                     break;
+                case "sqlite":
+                    ContextBase = new SqliteContext();
+                    break;
                 default:
                     Logger.Error($"{config.Database.Provider} is a invalid or unsupported database provider");
                     throw new Exception($"Invalid database provider: \"{config.Database.Provider}\"");

Uchu.Core/Enums/ZoneId.cs

@@ -35,6 +35,7 @@ public enum ZoneId : ushort
         NexusTower = 1900,
         Ninjago = 2000,
         FrakjawBattle,
-        NimbusStationWinterRacetrack = 1261
+        NimbusStationWinterRacetrack = 1261,
+        Test = 58001
     }
 }

Uchu.Core/Extensions/RakConnectionExtensions.cs

@@ -1,3 +1,4 @@
+using System;
 using System.IO;
 using RakDotNet;
 using RakDotNet.IO;
@@ -15,7 +16,14 @@ public static void Send(this IRakConnection @this, ISerializable serializable)
 
             writer.Write(serializable);
 
-            @this.Send(stream.ToArray());
+            try
+            {
+                @this.Send(stream.ToArray());
+            }
+            catch (IOException e)
+            {
+                Logger.Error(e);
+            }
         }
 
         public static void SavePacket(this IRakConnection @this, ISerializable serializable)

Uchu.Core/IO/IFileResources.cs

@@ -6,6 +6,8 @@ namespace Uchu.Core.IO
 {
     public interface IFileResources
     {
+        string RootPath { get; }
+
         Task<string> ReadTextAsync(string path);
 
         Task<byte[]> ReadBytesAsync(string path);

Uchu.Core/IO/LocalResources.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -11,6 +10,8 @@ public class LocalResources : IFileResources
     {
         private readonly Configuration _config;
 
+        public string RootPath => _config.ResourcesConfiguration.GameResourceFolder;
+
         public LocalResources(Configuration config)
         {
             _config = config;
@@ -20,7 +21,7 @@ public async Task<string> ReadTextAsync(string path)
         {
             await using var stream = GetStream(path);
             using var reader = new StreamReader(stream);
-            return await reader.ReadToEndAsync();
+            return await reader.ReadToEndAsync().ConfigureAwait(false);
         }
 
         public async Task<byte[]> ReadBytesAsync(string path)
@@ -77,8 +78,7 @@ public IEnumerable<string> GetAllFilesWithExtension(string location, string exte
 
             return files;
         }
-
-
+
         public Stream GetStream(string path)
         {
             path = path.Replace('\\', '/').ToLower();