From 75f912b50a0eb36699af5baddca16799331421cd Mon Sep 17 00:00:00 2001 From: Daniel Hejduk Date: Fri, 6 Jun 2025 13:21:22 +0200 Subject: [PATCH 1/4] Implementing TextMessages --- .../space/itoncek/trailcompass/TrailServer.java | 2 +- .../database/{mesages => messages}/Message.java | 2 +- .../trailcompass/database/messages/TextMessage.java | 13 +++++++++++++ 3 files changed, 15 insertions(+), 2 deletions(-) rename server/src/main/java/space/itoncek/trailcompass/database/{mesages => messages}/Message.java (91%) create mode 100644 server/src/main/java/space/itoncek/trailcompass/database/messages/TextMessage.java diff --git a/server/src/main/java/space/itoncek/trailcompass/TrailServer.java b/server/src/main/java/space/itoncek/trailcompass/TrailServer.java index 6b844f1..9d1dc11 100644 --- a/server/src/main/java/space/itoncek/trailcompass/TrailServer.java +++ b/server/src/main/java/space/itoncek/trailcompass/TrailServer.java @@ -24,7 +24,7 @@ import space.itoncek.trailcompass.database.cards.DeckCard; import space.itoncek.trailcompass.database.cards.ShadowCard; import space.itoncek.trailcompass.database.curses.TextCurse; -import space.itoncek.trailcompass.database.mesages.Message; +import space.itoncek.trailcompass.database.messages.Message; import space.itoncek.trailcompass.gamedata.utils.TextGraphics; import space.itoncek.trailcompass.modules.ConfigManager; import space.itoncek.trailcompass.modules.DeckManager; diff --git a/server/src/main/java/space/itoncek/trailcompass/database/mesages/Message.java b/server/src/main/java/space/itoncek/trailcompass/database/messages/Message.java similarity index 91% rename from server/src/main/java/space/itoncek/trailcompass/database/mesages/Message.java rename to server/src/main/java/space/itoncek/trailcompass/database/messages/Message.java index 97efe81..f58ff8c 100644 --- a/server/src/main/java/space/itoncek/trailcompass/database/mesages/Message.java +++ b/server/src/main/java/space/itoncek/trailcompass/database/messages/Message.java @@ -1,4 +1,4 @@ -package space.itoncek.trailcompass.database.mesages; +package space.itoncek.trailcompass.database.messages; import jakarta.persistence.*; import lombok.Getter; diff --git a/server/src/main/java/space/itoncek/trailcompass/database/messages/TextMessage.java b/server/src/main/java/space/itoncek/trailcompass/database/messages/TextMessage.java new file mode 100644 index 0000000..3fe708d --- /dev/null +++ b/server/src/main/java/space/itoncek/trailcompass/database/messages/TextMessage.java @@ -0,0 +1,13 @@ +package space.itoncek.trailcompass.database.messages; + +import jakarta.persistence.Entity; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +public class TextMessage extends Message { + String title; + String content; +} From 788cbb81402a371c2d03f13960b5ebfce8d9d4b2 Mon Sep 17 00:00:00 2001 From: Daniel Hejduk Date: Fri, 6 Jun 2025 13:31:37 +0200 Subject: [PATCH 2/4] Including TextMessage into managedClasses --- .../src/main/java/space/itoncek/trailcompass/TrailServer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/space/itoncek/trailcompass/TrailServer.java b/server/src/main/java/space/itoncek/trailcompass/TrailServer.java index 9d1dc11..ca0109b 100644 --- a/server/src/main/java/space/itoncek/trailcompass/TrailServer.java +++ b/server/src/main/java/space/itoncek/trailcompass/TrailServer.java @@ -25,6 +25,7 @@ import space.itoncek.trailcompass.database.cards.ShadowCard; import space.itoncek.trailcompass.database.curses.TextCurse; import space.itoncek.trailcompass.database.messages.Message; +import space.itoncek.trailcompass.database.messages.TextMessage; import space.itoncek.trailcompass.gamedata.utils.TextGraphics; import space.itoncek.trailcompass.modules.ConfigManager; import space.itoncek.trailcompass.modules.DeckManager; @@ -71,7 +72,8 @@ public TrailServer() { TextCurse.class, FreeQuestionToken.class, //messages - Message.class + Message.class, + TextMessage.class ) .jdbcPoolSize(8) // PostgreSQL From 51601b940c682fa321fef1ab37d5457b2f19a491 Mon Sep 17 00:00:00 2001 From: Daniel Hejduk Date: Fri, 6 Jun 2025 20:26:22 +0200 Subject: [PATCH 3/4] Adding all of so far needed message types --- .../java/space/itoncek/trailcompass/TrailServer.java | 8 +++++--- .../trailcompass/database/messages/CurseMessage.java | 12 ++++++++++++ .../database/messages/GameeventMessage.java | 5 +++++ .../database/messages/RequestMessage.java | 12 ++++++++++++ 4 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 server/src/main/java/space/itoncek/trailcompass/database/messages/CurseMessage.java create mode 100644 server/src/main/java/space/itoncek/trailcompass/database/messages/GameeventMessage.java create mode 100644 server/src/main/java/space/itoncek/trailcompass/database/messages/RequestMessage.java diff --git a/server/src/main/java/space/itoncek/trailcompass/TrailServer.java b/server/src/main/java/space/itoncek/trailcompass/TrailServer.java index ca0109b..f092dfa 100644 --- a/server/src/main/java/space/itoncek/trailcompass/TrailServer.java +++ b/server/src/main/java/space/itoncek/trailcompass/TrailServer.java @@ -24,8 +24,7 @@ import space.itoncek.trailcompass.database.cards.DeckCard; import space.itoncek.trailcompass.database.cards.ShadowCard; import space.itoncek.trailcompass.database.curses.TextCurse; -import space.itoncek.trailcompass.database.messages.Message; -import space.itoncek.trailcompass.database.messages.TextMessage; +import space.itoncek.trailcompass.database.messages.*; import space.itoncek.trailcompass.gamedata.utils.TextGraphics; import space.itoncek.trailcompass.modules.ConfigManager; import space.itoncek.trailcompass.modules.DeckManager; @@ -73,7 +72,10 @@ public TrailServer() { FreeQuestionToken.class, //messages Message.class, - TextMessage.class + TextMessage.class, + CurseMessage.class, + GameeventMessage.class, + RequestMessage.class ) .jdbcPoolSize(8) // PostgreSQL diff --git a/server/src/main/java/space/itoncek/trailcompass/database/messages/CurseMessage.java b/server/src/main/java/space/itoncek/trailcompass/database/messages/CurseMessage.java new file mode 100644 index 0000000..243ae00 --- /dev/null +++ b/server/src/main/java/space/itoncek/trailcompass/database/messages/CurseMessage.java @@ -0,0 +1,12 @@ +package space.itoncek.trailcompass.database.messages; + +import jakarta.persistence.Entity; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +public class CurseMessage extends Message { + // TODO: Complete this +} diff --git a/server/src/main/java/space/itoncek/trailcompass/database/messages/GameeventMessage.java b/server/src/main/java/space/itoncek/trailcompass/database/messages/GameeventMessage.java new file mode 100644 index 0000000..a25560d --- /dev/null +++ b/server/src/main/java/space/itoncek/trailcompass/database/messages/GameeventMessage.java @@ -0,0 +1,5 @@ +package space.itoncek.trailcompass.database.messages; + +public class GameeventMessage extends Message { + // TODO: Complete this +} diff --git a/server/src/main/java/space/itoncek/trailcompass/database/messages/RequestMessage.java b/server/src/main/java/space/itoncek/trailcompass/database/messages/RequestMessage.java new file mode 100644 index 0000000..64cc46d --- /dev/null +++ b/server/src/main/java/space/itoncek/trailcompass/database/messages/RequestMessage.java @@ -0,0 +1,12 @@ +package space.itoncek.trailcompass.database.messages; + +import jakarta.persistence.Entity; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +public class RequestMessage extends Message { + // TODO: Complete this +} From 59383c7b492dfad9ebc60c00535f42b2843047d1 Mon Sep 17 00:00:00 2001 From: Daniel Hejduk Date: Fri, 6 Jun 2025 20:59:09 +0200 Subject: [PATCH 4/4] Renaming to CardCastMessage --- .../src/main/java/space/itoncek/trailcompass/TrailServer.java | 2 +- .../messages/{CurseMessage.java => CardCastMessage.java} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename server/src/main/java/space/itoncek/trailcompass/database/messages/{CurseMessage.java => CardCastMessage.java} (80%) diff --git a/server/src/main/java/space/itoncek/trailcompass/TrailServer.java b/server/src/main/java/space/itoncek/trailcompass/TrailServer.java index f092dfa..86b8d99 100644 --- a/server/src/main/java/space/itoncek/trailcompass/TrailServer.java +++ b/server/src/main/java/space/itoncek/trailcompass/TrailServer.java @@ -73,7 +73,7 @@ public TrailServer() { //messages Message.class, TextMessage.class, - CurseMessage.class, + CardCastMessage.class, GameeventMessage.class, RequestMessage.class ) diff --git a/server/src/main/java/space/itoncek/trailcompass/database/messages/CurseMessage.java b/server/src/main/java/space/itoncek/trailcompass/database/messages/CardCastMessage.java similarity index 80% rename from server/src/main/java/space/itoncek/trailcompass/database/messages/CurseMessage.java rename to server/src/main/java/space/itoncek/trailcompass/database/messages/CardCastMessage.java index 243ae00..1bbbbb7 100644 --- a/server/src/main/java/space/itoncek/trailcompass/database/messages/CurseMessage.java +++ b/server/src/main/java/space/itoncek/trailcompass/database/messages/CardCastMessage.java @@ -7,6 +7,6 @@ @Getter @Setter @Entity -public class CurseMessage extends Message { +public class CardCastMessage extends Message { // TODO: Complete this }