peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge branch 'dev/model' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into dev/model

Browse Source
This commit is contained in:
Daniel Grigencha
2024-12-06 02:38:53 +01:00
parent 1e6856744b f713e00c36
commit 58b9298c91
5 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Projekte/mdga/client/src/main/java/pp/mdga/client/server/MdgaServer.java
View File

@@ -5,6 +5,7 @@
import com.jme3.network.serializing.serializers.EnumSerializer; import com.jme3.network.serializing.serializers.EnumSerializer;
import pp.mdga.Resources; import pp.mdga.Resources;
import pp.mdga.game.*; import pp.mdga.game.*;
import pp.mdga.game.card.*;
import pp.mdga.message.client.*; import pp.mdga.message.client.*;
import pp.mdga.message.server.*; import pp.mdga.message.server.*;
import pp.mdga.server.ServerGameLogic; import pp.mdga.server.ServerGameLogic;
@@ -145,6 +146,11 @@ private void initializeSerializables() {
Serializer.registerClass(BonusNode.class); Serializer.registerClass(BonusNode.class);
Serializer.registerClass(StartNode.class); Serializer.registerClass(StartNode.class);
Serializer.registerClass(HomeNode.class); Serializer.registerClass(HomeNode.class);
Serializer.registerClass(PowerCard.class);
Serializer.registerClass(TurboCard.class);
Serializer.registerClass(SwapCard.class);
Serializer.registerClass(ShieldCard.class);
Serializer.registerClass(HiddenCard.class);
Serializer.registerClass(Color.class, new EnumSerializer()); Serializer.registerClass(Color.class, new EnumSerializer());
Serializer.registerClass(PieceState.class, new EnumSerializer()); Serializer.registerClass(PieceState.class, new EnumSerializer());

2
Projekte/mdga/model/src/main/java/pp/mdga/game/card/HiddenCard.java
View File

@@ -1,11 +1,13 @@
package pp.mdga.game.card; package pp.mdga.game.card;
import com.jme3.network.serializing.Serializable;
import pp.mdga.game.BonusCard; import pp.mdga.game.BonusCard;
import pp.mdga.visitor.Visitor; import pp.mdga.visitor.Visitor;
/** /**
* This class represents the hidden power card of this application. * This class represents the hidden power card of this application.
*/ */
@Serializable
public class HiddenCard extends PowerCard { public class HiddenCard extends PowerCard {
/** /**
* Constructor. * Constructor.

2
Projekte/mdga/model/src/main/java/pp/mdga/game/card/ShieldCard.java
View File

@@ -1,11 +1,13 @@
package pp.mdga.game.card; package pp.mdga.game.card;
import com.jme3.network.serializing.Serializable;
import pp.mdga.game.BonusCard; import pp.mdga.game.BonusCard;
import pp.mdga.visitor.Visitor; import pp.mdga.visitor.Visitor;
/** /**
* This class represents the shield power card of this application. * This class represents the shield power card of this application.
*/ */
@Serializable
public class ShieldCard extends PowerCard { public class ShieldCard extends PowerCard {
/** /**
* Constructor. * Constructor.

2
Projekte/mdga/model/src/main/java/pp/mdga/game/card/SwapCard.java
View File

@@ -1,11 +1,13 @@
package pp.mdga.game.card; package pp.mdga.game.card;
import com.jme3.network.serializing.Serializable;
import pp.mdga.game.BonusCard; import pp.mdga.game.BonusCard;
import pp.mdga.visitor.Visitor; import pp.mdga.visitor.Visitor;
/** /**
* This class represents the swap power card of this application. * This class represents the swap power card of this application.
*/ */
@Serializable
public class SwapCard extends PowerCard { public class SwapCard extends PowerCard {
/** /**
* Constructor. * Constructor.

2
Projekte/mdga/model/src/main/java/pp/mdga/game/card/TurboCard.java
View File

@@ -1,11 +1,13 @@
package pp.mdga.game.card; package pp.mdga.game.card;
import com.jme3.network.serializing.Serializable;
import pp.mdga.game.BonusCard; import pp.mdga.game.BonusCard;
import pp.mdga.visitor.Visitor; import pp.mdga.visitor.Visitor;
/** /**
* This class represents the turbo power card of this application. * This class represents the turbo power card of this application.
*/ */
@Serializable
public class TurboCard extends PowerCard { public class TurboCard extends PowerCard {
/** /**
* Constructor. * Constructor.