Fix compiler errors

RabiMimi · Jun 25, 2022 · d0d75ac · d0d75ac
1 parent 4666b08
commit d0d75ac
Show file tree

Hide file tree

Showing 121 changed files with 558 additions and 292 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
-  "editor.tabSize": 2,
+  "editor.tabSize": 4,
   "editor.formatOnSave": true,
   "omnisharp.enableImportCompletion": true,
   "omnisharp.organizeImportsOnFormat": true,

diff --git a/Actions/AgariAction.cs b/Actions/AgariAction.cs
@@ -1,5 +1,6 @@
 using RabiRiichi.Core;
 using RabiRiichi.Events.InGame;
+using RabiRiichi.Generated.Actions;
 using RabiRiichi.Patterns;
 
 namespace RabiRiichi.Actions {
@@ -11,6 +12,10 @@ public AgariAction(int playerId, AgariInfo agariInfo, GameTile incoming, int pri
             this.incoming = incoming;
             priority = ActionPriority.Ron + priorityDelta;
         }
+
+        public virtual AgariActionMsg ToProto() {
+            return new AgariActionMsg();
+        }
     }
 
     public class RonAction : AgariAction {
@@ -19,6 +24,12 @@ public RonAction(AgariInfo agariInfo, GameTile incoming, int priorityDelta = 0)
             : base(agariInfo.playerId, agariInfo, incoming, priorityDelta) { }
         public RonAction(int playerId, ScoreStorage scores, GameTile incoming, int priorityDelta = 0)
             : base(playerId, new AgariInfo(playerId, scores), incoming, priorityDelta) { }
+
+        public override AgariActionMsg ToProto() {
+            var ret = base.ToProto();
+            ret.Type = AgariType.Ron;
+            return ret;
+        }
     }
 
     public class TsumoAction : AgariAction {
@@ -27,5 +38,11 @@ public TsumoAction(AgariInfo agariInfo, GameTile incoming, int priorityDelta = 0
             : base(agariInfo.playerId, agariInfo, incoming, priorityDelta) { }
         public TsumoAction(int playerId, ScoreStorage scores, GameTile incoming, int priorityDelta = 0)
             : this(new AgariInfo(playerId, scores), incoming, priorityDelta) { }
+
+        public override AgariActionMsg ToProto() {
+            var ret = base.ToProto();
+            ret.Type = AgariType.Tsumo;
+            return ret;
+        }
     }
 }
diff --git a/Actions/ChiiAction.cs b/Actions/ChiiAction.cs
@@ -1,12 +1,20 @@
 using RabiRiichi.Core;
+using RabiRiichi.Generated.Actions;
 using System.Collections.Generic;
-
+using System.Linq;
 
 namespace RabiRiichi.Actions {
     public class ChiiAction : ChooseTilesAction {
         public override string name => "chii";
         public ChiiAction(int playerId, List<List<GameTile>> tiles, int priorityDelta = 0) : base(playerId, tiles) {
             priority = ActionPriority.Chii + priorityDelta;
         }
+
+        public ChiiActionMsg ToProto() {
+            var ret = new ChiiActionMsg();
+            ret.TileGroups.AddRange(options.Select(o =>
+                MenLike.From(((ChooseTilesActionOption)o).tiles).ToProto()));
+            return ret;
+        }
     }
 }
diff --git a/Actions/KanAction.cs b/Actions/KanAction.cs
@@ -1,7 +1,8 @@
 using RabiRiichi.Communication;
 using RabiRiichi.Core;
+using RabiRiichi.Generated.Actions;
 using System.Collections.Generic;
-
+using System.Linq;
 
 namespace RabiRiichi.Actions {
     [RabiPrivate]
@@ -10,5 +11,12 @@ public class KanAction : ChooseTilesAction {
         public KanAction(int playerId, List<List<GameTile>> tiles, int priorityDelta = 0) : base(playerId, tiles) {
             priority = ActionPriority.Kan + priorityDelta;
         }
+
+        public KanActionMsg ToProto() {
+            var ret = new KanActionMsg();
+            ret.TileGroups.AddRange(options.Select(o =>
+                MenLike.From(((ChooseTilesActionOption)o).tiles).ToProto()));
+            return ret;
+        }
     }
 }
diff --git a/Actions/PlayTileAction.cs b/Actions/PlayTileAction.cs
@@ -1,6 +1,7 @@
 using RabiRiichi.Core;
+using RabiRiichi.Generated.Actions;
 using System.Collections.Generic;
-
+using System.Linq;
 
 namespace RabiRiichi.Actions {
     public class PlayTileAction : ChooseTileAction {
@@ -14,5 +15,12 @@ public PlayTileAction(int playerId, List<GameTile> tiles, GameTile defaultTile,
                 response = index;
             }
         }
+
+        public PlayTileActionMsg ToProto() {
+            var ret = new PlayTileActionMsg();
+            ret.Tiles.AddRange(options.Select(
+                o => ((ChooseTileActionOption)o).tile.ToProto()));
+            return ret;
+        }
     }
 }
diff --git a/Actions/PlayerAction.cs b/Actions/PlayerAction.cs
@@ -1,4 +1,5 @@
 using RabiRiichi.Communication;
+using RabiRiichi.Generated.Actions;
 using RabiRiichi.Util;
 using System;
 using System.Text.Json;

diff --git a/Actions/PonAction.cs b/Actions/PonAction.cs
@@ -1,12 +1,20 @@
 using RabiRiichi.Core;
+using RabiRiichi.Generated.Actions;
 using System.Collections.Generic;
-
+using System.Linq;
 
 namespace RabiRiichi.Actions {
     public class PonAction : ChooseTilesAction {
         public override string name => "pon";
         public PonAction(int playerId, List<List<GameTile>> tiles, int priorityDelta = 0) : base(playerId, tiles) {
             priority = ActionPriority.Pon + priorityDelta;
         }
+
+        public PonActionMsg ToProto() {
+            var ret = new PonActionMsg();
+            ret.TileGroups.AddRange(options.Select(o =>
+                MenLike.From(((ChooseTilesActionOption)o).tiles).ToProto()));
+            return ret;
+        }
     }
 }
diff --git a/Actions/Resolver/KanResolver.cs b/Actions/Resolver/KanResolver.cs
@@ -1,4 +1,5 @@
 using RabiRiichi.Core;
+using RabiRiichi.Generated.Core;
 using System.Collections.Generic;
 using System.Linq;
 

diff --git a/Actions/RiichiAction.cs b/Actions/RiichiAction.cs
@@ -1,6 +1,7 @@
 using RabiRiichi.Core;
+using RabiRiichi.Generated.Actions;
 using System.Collections.Generic;
-
+using System.Linq;
 
 namespace RabiRiichi.Actions {
 
@@ -10,5 +11,12 @@ public class RiichiAction : PlayTileAction {
         public RiichiAction(int playerId, List<GameTile> tiles, GameTile defaultTile, int priorityDelta = 0) : base(playerId, tiles, defaultTile) {
             priority = ActionPriority.Riichi + priorityDelta;
         }
+
+        public new RiichiActionMsg ToProto() {
+            var ret = new RiichiActionMsg();
+            ret.Tiles.AddRange(options.Select(
+                o => ((ChooseTileActionOption)o).tile.ToProto()));
+            return ret;
+        }
     }
 }
diff --git a/Actions/RyuukyokuAction.cs b/Actions/RyuukyokuAction.cs
@@ -1,6 +1,6 @@
 using RabiRiichi.Communication;
 using RabiRiichi.Events.InGame;
-
+using RabiRiichi.Generated.Actions;
 
 namespace RabiRiichi.Actions {
 
@@ -12,5 +12,11 @@ public RyuukyokuAction(int playerId, RyuukyokuEvent ev, int priorityDelta = 0) :
             this.ev = ev;
             this.priority = ActionPriority.Ryuukyoku + priorityDelta;
         }
+
+        public RyuukyokuActionMsg ToProto() {
+            return new RyuukyokuActionMsg {
+                Reason = reason
+            };
+        }
     }
 }
diff --git a/Actions/SinglePlayerInquiry.cs b/Actions/SinglePlayerInquiry.cs
@@ -1,6 +1,9 @@
 using RabiRiichi.Communication;
+using RabiRiichi.Communication.Proto;
+using RabiRiichi.Generated.Actions;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 
 namespace RabiRiichi.Actions {
     [RabiMessage]
@@ -66,5 +69,11 @@ public bool OnResponse(int index, string response) {
             hasResponded = true;
             return true;
         }
+
+        public SinglePlayerInquiryMsg ToProto() {
+            var ret = new SinglePlayerInquiryMsg();
+            ret.Actions.AddRange(actions.Select(action => ProtoConverters.ToProto(action)));
+            return ret;
+        }
     }
 }
diff --git a/Actions/SkipAction.cs b/Actions/SkipAction.cs
@@ -1,9 +1,15 @@
+using RabiRiichi.Generated.Actions;
+
 namespace RabiRiichi.Actions {
     public class SkipAction : ConfirmAction {
         public override string name => "skip";
 
         public SkipAction(int playerId, int priorityDelta = 0) : base(playerId) {
             priority = ActionPriority.Skip + priorityDelta;
         }
+
+        public virtual SkipActionMsg ToProto() {
+            return new SkipActionMsg();
+        }
     }
 }
diff --git a/Communication/Proto/Converters.cs b/Communication/Proto/Converters.cs
@@ -0,0 +1,92 @@
+using RabiRiichi.Actions;
+using RabiRiichi.Events;
+using RabiRiichi.Events.InGame;
+using RabiRiichi.Generated.Actions;
+using RabiRiichi.Generated.Events;
+using System;
+
+namespace RabiRiichi.Communication.Proto {
+    public static class ProtoConverters {
+        public static PlayerActionMsg ToProto(IPlayerAction action) {
+            var ret = new PlayerActionMsg();
+            if (action is AgariAction agariAction) {
+                ret.AgariAction = agariAction.ToProto();
+            } else if (action is ChiiAction chiiAction) {
+                ret.ChiiAction = chiiAction.ToProto();
+            } else if (action is PonAction ponAction) {
+                ret.PonAction = ponAction.ToProto();
+            } else if (action is KanAction kanAction) {
+                ret.KanAction = kanAction.ToProto();
+            } else if (action is RiichiAction riichiAction) {
+                ret.RiichiAction = riichiAction.ToProto();
+            } else if (action is RyuukyokuAction ryuukyokuAction) {
+                ret.RyuukyokuAction = ryuukyokuAction.ToProto();
+            } else if (action is PlayTileAction playTileAction) {
+                ret.PlayTileAction = playTileAction.ToProto();
+            } else if (action is SkipAction skipAction) {
+                ret.SkipAction = skipAction.ToProto();
+            } else {
+                throw new ArgumentException($"Unknown action type: {action.GetType()}");
+            }
+            return ret;
+        }
+
+        public static EventMsg ToProto(EventBase ev, int playerId) {
+            var ret = new EventMsg();
+            if (ev is AddKanEvent addKanEvent) {
+                ret.AddKanEvent = addKanEvent.ToProto();
+            } else if (ev is AddTileEvent addTileEvent) {
+                ret.AddTileEvent = addTileEvent.ToProto(playerId);
+            } else if (ev is AgariEvent agariEvent) {
+                ret.AgariEvent = agariEvent.ToProto();
+            } else if (ev is ApplyScoreEvent applyScoreEvent) {
+                ret.ApplyScoreEvent = applyScoreEvent.ToProto();
+            } else if (ev is BeginGameEvent beginGameEvent) {
+                ret.BeginGameEvent = beginGameEvent.ToProto();
+            } else if (ev is CalcScoreEvent calcScoreEvent) {
+                ret.CalcScoreEvent = calcScoreEvent.ToProto();
+            } else if (ev is ClaimTileEvent claimTileEvent) {
+                ret.ClaimTileEvent = claimTileEvent.ToProto();
+            } else if (ev is ConcludeGameEvent concludeGameEvent) {
+                ret.ConcludeGameEvent = concludeGameEvent.ToProto();
+            } else if (ev is DealerFirstTurnEvent dealerFirstTurnEvent) {
+                ret.DealerFirstTurnEvent = dealerFirstTurnEvent.ToProto(playerId);
+            } else if (ev is DealHandEvent dealHandEvent) {
+                ret.DealHandEvent = dealHandEvent.ToProto();
+            } else if (ev is DiscardTileEvent discardTileEvent) {
+                ret.DiscardTileEvent = discardTileEvent.ToProto(playerId);
+            } else if (ev is DrawTileEvent drawTileEvent) {
+                ret.DrawTileEvent = drawTileEvent.ToProto(playerId);
+            } else if (ev is IncreaseJunEvent increaseJunEvent) {
+                ret.IncreaseJunEvent = increaseJunEvent.ToProto();
+            } else if (ev is KanEvent kanEvent) {
+                ret.KanEvent = kanEvent.ToProto();
+            } else if (ev is LateClaimTileEvent lateClaimTileEvent) {
+                ret.LateClaimTileEvent = lateClaimTileEvent.ToProto();
+            } else if (ev is NextGameEvent nextGameEvent) {
+                ret.NextGameEvent = nextGameEvent.ToProto();
+            } else if (ev is NextPlayerEvent nextPlayerEvent) {
+                ret.NextPlayerEvent = nextPlayerEvent.ToProto();
+            } else if (ev is RevealDoraEvent revealDoraEvent) {
+                ret.RevealDoraEvent = revealDoraEvent.ToProto();
+            } else if (ev is RyuukyokuEvent ryuukyokuEvent) {
+                ret.RyuukyokuEvent = ryuukyokuEvent.ToProto();
+            } else if (ev is SetFuritenEvent setFuritenEvent) {
+                ret.SetFuritenEvent = setFuritenEvent.ToProto();
+            } else if (ev is SetIppatsuEvent setIppatsuEvent) {
+                ret.SetIppatsuEvent = setIppatsuEvent.ToProto();
+            } else if (ev is SetMenzenEvent setMenzenEvent) {
+                ret.SetMenzenEvent = setMenzenEvent.ToProto();
+            } else if (ev is SetRiichiEvent setRiichiEvent) {
+                ret.SetRiichiEvent = setRiichiEvent.ToProto();
+            } else if (ev is StopGameEvent stopGameEvent) {
+                ret.StopGameEvent = stopGameEvent.ToProto();
+            } else if (ev is SyncGameStateEvent syncGameStateEvent) {
+                ret.SyncGameStateEvent = syncGameStateEvent.ToProto(playerId);
+            } else {
+                throw new ArgumentException($"Unknown event type: {ev.GetType()}");
+            }
+            return ret;
+        }
+    }
+}
diff --git a/Core/Wall.cs b/Core/Wall.cs
@@ -1,4 +1,6 @@
 using RabiRiichi.Core.Config;
+using RabiRiichi.Generated.Core;
+using RabiRiichi.Generated.Patterns;
 using RabiRiichi.Util;
 using System;
 using System.Collections.Generic;

diff --git a/Events/InGame/ConcludeGameEvent.cs b/Events/InGame/ConcludeGameEvent.cs
@@ -39,7 +39,7 @@ public ConcludeGameEvent(EventBase parent, ConcludeGameReason reason, int[] tenp
             this.tenpaiPlayers = tenpaiPlayers;
         }
 
-        public ConcludeGameEventMsg ToProto(int playerId) {
+        public ConcludeGameEventMsg ToProto() {
             return new ConcludeGameEventMsg {
                 Doras = doras.ToString(),
                 Uradoras = uradoras.ToString(),

diff --git a/Events/InGame/Listener/CalcScoreListener.cs b/Events/InGame/Listener/CalcScoreListener.cs
@@ -1,5 +1,6 @@
 using RabiRiichi.Core;
 using RabiRiichi.Core.Config;
+using RabiRiichi.Generated.Events.InGame;
 using RabiRiichi.Util;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/Events/InGame/Listener/ClaimTileListener.cs b/Events/InGame/Listener/ClaimTileListener.cs
@@ -1,4 +1,5 @@
 using RabiRiichi.Core;
+using RabiRiichi.Generated.Core;
 using System.Threading.Tasks;
 
 namespace RabiRiichi.Events.InGame.Listener {

diff --git a/Events/InGame/Listener/DealerFirstTurnListener.cs b/Events/InGame/Listener/DealerFirstTurnListener.cs
@@ -1,5 +1,6 @@
 using RabiRiichi.Actions.Resolver;
 using RabiRiichi.Core;
+using RabiRiichi.Generated.Core;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 

diff --git a/Events/InGame/Listener/DrawTileListener.cs b/Events/InGame/Listener/DrawTileListener.cs
@@ -1,6 +1,7 @@
 using RabiRiichi.Actions;
 using RabiRiichi.Actions.Resolver;
 using RabiRiichi.Core;
+using RabiRiichi.Generated.Core;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;

diff --git a/Events/InGame/Listener/NextPlayerListener.cs b/Events/InGame/Listener/NextPlayerListener.cs
@@ -1,4 +1,5 @@
 using RabiRiichi.Core;
+using RabiRiichi.Generated.Core;
 using System.Threading.Tasks;
 
 namespace RabiRiichi.Events.InGame.Listener {

diff --git a/Events/InGame/Listener/RyuukyokuListener.cs b/Events/InGame/Listener/RyuukyokuListener.cs
@@ -1,5 +1,6 @@
 using RabiRiichi.Core;
 using RabiRiichi.Core.Config;
+using RabiRiichi.Generated.Events.InGame;
 using RabiRiichi.Util;
 using System;
 using System.Linq;