Ported to Raylib-cs 6

7 files changed, 17 insertions, 17 deletions

diff --git a/Bitmap.cs b/Bitmap.cs
index 91eabb9..4cd44d7 100644
--- a/Bitmap.cs
+++ b/Bitmap.cs
@@ -69,7 +69,7 @@ class Bitmap : IDisposable
     public static Bitmap FromFile(string path, int MaxW = MaxWidth, int MaxH = MaxHeight)
     {
         if (!File.Exists(path) || new FileInfo(path).Length > 40000 || !path.Contains(".png"))
-        return new Bitmap(Raylib.GenImageChecked(32, 32, 4, 4, Color.BLACK, Color.PINK));
+        return new Bitmap(Raylib.GenImageChecked(32, 32, 4, 4, Color.Black, Color.Pink));
 
         byte[] memory = File.ReadAllBytes(path);
         return FromPNGMemory(memory, MaxW, MaxH);
@@ -102,7 +102,7 @@ class Bitmap : IDisposable
             if (fallbackImage != null) return FromPNGMemory(fallbackImage, MaxW, MaxH);
         }
 
-        Image img = Raylib.GenImageChecked(width, height, 4, 4, Color.PINK, Color.BLACK);
+        Image img = Raylib.GenImageChecked(width, height, 4, 4, Color.Pink, Color.Black);
 
         if (TooBig) return new Bitmap(img);
 
diff --git a/Main.cs b/Main.cs
index 77a7679..ef901b5 100644
--- a/Main.cs
+++ b/Main.cs
@@ -19,7 +19,7 @@ static class OnekoOnline
 
     public static Font DefaultFont;
 
-    const ConfigFlags raylibConfFlags = ConfigFlags.FLAG_VSYNC_HINT;
+    const ConfigFlags raylibConfFlags = ConfigFlags.VSyncHint;
     
     public static void Main()
     {
@@ -55,9 +55,9 @@ static class OnekoOnline
 
             Raylib.BeginTextureMode(RenderTexture);
 
-            Raylib.ClearBackground(Color.GRAY);
-            Raylib.DrawTextEx(DefaultFont, "こんにちは", new(17,18), 11, 0, Color.WHITE);
-            Raylib.DrawText("Oneko Online", 10, 9, 8, Color.WHITE);
+            Raylib.ClearBackground(Color.Gray);
+            Raylib.DrawTextEx(DefaultFont, "こんにちは", new(17,18), 11, 0, Color.White);
+            Raylib.DrawText("Oneko Online", 10, 9, 8, Color.White);
 
             Drawable.DrawAll();
 
@@ -65,7 +65,7 @@ static class OnekoOnline
 
             Raylib.BeginDrawing();
             //Dunno why, but it renders upside down, so I flip it here
-            Raylib.DrawTexturePro(RenderTexture.Texture, new Rectangle(0f,0f,WindowX,-WindowY), new Rectangle(0,0,WindowX*WindowScale,WindowY*WindowScale), Vector2.Zero,0f,Color.WHITE);
+            Raylib.DrawTexturePro(RenderTexture.Texture, new Rectangle(0f,0f,WindowX,-WindowY), new Rectangle(0,0,WindowX*WindowScale,WindowY*WindowScale), Vector2.Zero,0f,Color.White);
             Raylib.EndDrawing();
         }
 
diff --git a/Mouse.cs b/Mouse.cs
index 3b82689..fdf0c5c 100644
--- a/Mouse.cs
+++ b/Mouse.cs
@@ -42,10 +42,10 @@ abstract class Mouse : Drawable
     public override void Draw()
     {
         Vector2 NametagPosition = new(Position.X-(Name.Length*3)+4, Position.Y-13);
-        Raylib.DrawTextEx(OnekoOnline.DefaultFont, Name, NametagPosition+Directions.Down, 11, 0, Color.BLACK); //Shadow
-        Raylib.DrawTextEx(OnekoOnline.DefaultFont, Name, NametagPosition, 11, 0, Color.WHITE);
+        Raylib.DrawTextEx(OnekoOnline.DefaultFont, Name, NametagPosition+Directions.Down, 11, 0, Color.Black); //Shadow
+        Raylib.DrawTextEx(OnekoOnline.DefaultFont, Name, NametagPosition, 11, 0, Color.White);
 
-        Raylib.DrawTexture(Cursor.Texture, (int)Position.X, (int)Position.Y, Color.WHITE);
+        Raylib.DrawTexture(Cursor.Texture, (int)Position.X, (int)Position.Y, Color.White);
     }
 
     protected override void Unload()
diff --git a/MouseLocal.cs b/MouseLocal.cs
index da2db24..6a6bc95 100644
--- a/MouseLocal.cs
+++ b/MouseLocal.cs
@@ -20,7 +20,7 @@ class MouseLocal : Mouse
         Visible = Raylib.IsCursorOnScreen() && Raylib.IsWindowFocused();
         Position = Raylib.GetMousePosition()/OnekoOnline.WindowScale;
 
-        bool clicked = Raylib.IsMouseButtonPressed(MouseButton.MOUSE_BUTTON_LEFT);
+        bool clicked = Raylib.IsMouseButtonPressed(MouseButton.Left);
         if (clicked && Visible) Clicked?.Invoke(this);
 
         if (Visible && OnekoOnline.Client!.Connected) {
diff --git a/Oneko.cs b/Oneko.cs
index 0ebb38e..e63c56a 100644
--- a/Oneko.cs
+++ b/Oneko.cs
@@ -8,7 +8,7 @@ abstract class Oneko : Drawable
 {
     public readonly Bitmap SpriteSheet;
     public Rectangle Sprite {get; protected set;} = Idle1;
-    protected Color ColorTint = Color.WHITE;
+    protected Color ColorTint = Color.White;
 
     protected byte FrameId {
         get => (byte)Array.IndexOf(FrameArray, Sprite);
@@ -52,8 +52,8 @@ abstract class Oneko : Drawable
     {
         //Nametag
         Vector2 NametagPosition = new(Position.X-(Name.Length*3)+4, Position.Y-28);
-        Raylib.DrawTextEx(OnekoOnline.DefaultFont, Name, NametagPosition+Directions.Down, 11, 0, Color.BLACK); //Shadow
-        Raylib.DrawTextEx(OnekoOnline.DefaultFont, Name, NametagPosition, 11, 0, Color.WHITE);
+        Raylib.DrawTextEx(OnekoOnline.DefaultFont, Name, NametagPosition+Directions.Down, 11, 0, Color.Black); //Shadow
+        Raylib.DrawTextEx(OnekoOnline.DefaultFont, Name, NametagPosition, 11, 0, Color.White);
 
         //The neko
         Raylib.DrawTexturePro(SpriteSheet.Texture, Sprite, new Rectangle(Position.X, Position.Y, Size.X, Size.Y), Size/2, Rotation, ColorTint);
diff --git a/OnekoNet.cs b/OnekoNet.cs
index 4a01ec8..6b84805 100644
--- a/OnekoNet.cs
+++ b/OnekoNet.cs
@@ -37,8 +37,8 @@ class OnekoNet : Oneko
     public override void Update(float delta)
     {
         NetworkIssueTimer += delta;
-        if (NetworkIssueTimer < 0.6f) ColorTint = Color.WHITE;
-        else ColorTint = Color.WHITE with {A = 120};
+        if (NetworkIssueTimer < 0.6f) ColorTint = Color.White;
+        else ColorTint = Color.White with {A = 120};
     }
 
     public static void SpawnNetNeko(ClientUser user)
diff --git a/OnekoOnline.csproj b/OnekoOnline.csproj
index 8559b1b..98caaf9 100644
--- a/OnekoOnline.csproj
+++ b/OnekoOnline.csproj
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="LiteNetLib" Version="1.1.0" />
-    <PackageReference Include="Raylib-cs" Version="5.0.0" />
+    <PackageReference Include="Raylib-cs" Version="6.0.0" />
     
     <EmbeddedResource Include="nekos\oneko.png" />
     <EmbeddedResource Include="misc\cursor.png" />