External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

even more refactoring

Browse source
This commit is contained in:
betasteward 2015-06-25 21:46:28 -04:00
parent 46c4349362
commit d74efbfb0b
24 changed files with 89 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

86
Mage.Network/src/main/java/org/mage/network/Server.java
View file

@ -40,29 +40,29 @@ import org.mage.network.handlers.server.ConnectionHandler;
import org.mage.network.handlers.server.HeartbeatHandler;
import org.mage.network.handlers.server.ServerRequestHandler;
import org.mage.network.interfaces.MageServer;
import org.mage.network.messages.callback.ChatMessageMessage;
import org.mage.network.messages.callback.GameAskMessage;
import org.mage.network.messages.callback.GameChooseAbilityMessage;
import org.mage.network.messages.callback.GameChooseChoiceMessage;
import org.mage.network.messages.callback.GameChoosePileMessage;
import org.mage.network.messages.callback.GameEndInfoMessage;
import org.mage.network.messages.callback.GameErrorMessage;
import org.mage.network.messages.callback.GameInformMessage;
import org.mage.network.messages.callback.GameInformPersonalMessage;
import org.mage.network.messages.callback.GameInitMessage;
import org.mage.network.messages.callback.GameOverMessage;
import org.mage.network.messages.callback.GamePlayManaMessage;
import org.mage.network.messages.callback.GamePlayXManaMessage;
import org.mage.network.messages.callback.GameSelectAmountMessage;
import org.mage.network.messages.callback.GameSelectMessage;
import org.mage.network.messages.callback.GameStartedMessage;
import org.mage.network.messages.callback.GameTargetMessage;
import org.mage.network.messages.callback.GameUpdateMessage;
import org.mage.network.messages.callback.InformClientMessage;
import org.mage.network.messages.callback.JoinedTableMessage;
import org.mage.network.messages.callback.ChatMessageCallback;
import org.mage.network.messages.callback.GameAskCallback;
import org.mage.network.messages.callback.GameChooseAbilityCallback;
import org.mage.network.messages.callback.GameChooseChoiceCallback;
import org.mage.network.messages.callback.GameChoosePileCallback;
import org.mage.network.messages.callback.GameEndInfoCallback;
import org.mage.network.messages.callback.GameErrorCallback;
import org.mage.network.messages.callback.GameInformCallback;
import org.mage.network.messages.callback.GameInformPersonalCallback;
import org.mage.network.messages.callback.GameInitCallback;
import org.mage.network.messages.callback.GameOverCallback;
import org.mage.network.messages.callback.GamePlayManaCallback;
import org.mage.network.messages.callback.GamePlayXManaCallback;
import org.mage.network.messages.callback.GameSelectAmountCallback;
import org.mage.network.messages.callback.GameSelectCallback;
import org.mage.network.messages.callback.GameStartedCallback;
import org.mage.network.messages.callback.GameTargetCallback;
import org.mage.network.messages.callback.GameUpdateCallback;
import org.mage.network.messages.callback.InformClientCallback;
import org.mage.network.messages.callback.JoinedTableCallback;
import org.mage.network.messages.MessageType;
import org.mage.network.messages.PingMessage;
import org.mage.network.messages.callback.UserRequestDialogMessage;
import org.mage.network.messages.callback.UserRequestDialogCallback;
/**
*
@ -159,17 +159,17 @@ public class Server {
public void sendChatMessage(String sessionId, UUID chatId, ChatMessage message) {
Channel ch = findChannel(sessionId);
if (ch != null)
ch.writeAndFlush(new ChatMessageMessage(chatId, message)).addListener(WriteListener.getInstance());
ch.writeAndFlush(new ChatMessageCallback(chatId, message)).addListener(WriteListener.getInstance());
}
public void informClient(String sessionId, String title, String message, MessageType type) {
Channel ch = findChannel(sessionId);
if (ch != null)
ch.writeAndFlush(new InformClientMessage(title, message, type)).addListener(WriteListener.getInstance());
ch.writeAndFlush(new InformClientCallback(title, message, type)).addListener(WriteListener.getInstance());
}
public void informClients(String title, String message, MessageType type) {
clients.writeAndFlush(new InformClientMessage(title, message, type)).addListener(WriteListener.getInstance());
clients.writeAndFlush(new InformClientCallback(title, message, type)).addListener(WriteListener.getInstance());
}
public void pingClient(String sessionId) {
@ -183,115 +183,115 @@ public class Server {
public void joinedTable(String sessionId, UUID roomId, UUID tableId, UUID chatId, boolean owner, boolean tournament) {
Channel ch = findChannel(sessionId);
if (ch != null)
ch.writeAndFlush(new JoinedTableMessage(roomId, tableId, chatId, owner, tournament)).addListener(WriteListener.getInstance());
ch.writeAndFlush(new JoinedTableCallback(roomId, tableId, chatId, owner, tournament)).addListener(WriteListener.getInstance());
}
public void gameStarted(String sessionId, UUID gameId, UUID playerId) {
Channel ch = findChannel(sessionId);
if (ch != null)
ch.writeAndFlush(new GameStartedMessage(gameId, playerId)).addListener(WriteListener.getInstance());
ch.writeAndFlush(new GameStartedCallback(gameId, playerId)).addListener(WriteListener.getInstance());
}
public void initGame(String sessionId, UUID gameId, GameView gameView) {
Channel ch = findChannel(sessionId);
if (ch != null)
ch.writeAndFlush(new GameInitMessage(gameId, gameView)).addListener(WriteListener.getInstance());
ch.writeAndFlush(new GameInitCallback(gameId, gameView)).addListener(WriteListener.getInstance());
}
public void gameAsk(String sessionId, UUID gameId, GameView gameView, String question) {
Channel ch = findChannel(sessionId);
if (ch != null)
ch.writeAndFlush(new GameAskMessage(gameId, gameView, question)).addListener(WriteListener.getInstance());
ch.writeAndFlush(new GameAskCallback(gameId, gameView, question)).addListener(WriteListener.getInstance());
}
public void gameTarget(String sessionId, UUID gameId, GameView gameView, String question, CardsView cardView, Set<UUID> targets, boolean required, Map<String, Serializable> options) {
Channel ch = findChannel(sessionId);
if (ch != null)
ch.writeAndFlush(new GameTargetMessage(gameId, gameView, question, cardView, targets, required, options)).addListener(WriteListener.getInstance());
ch.writeAndFlush(new GameTargetCallback(gameId, gameView, question, cardView, targets, required, options)).addListener(WriteListener.getInstance());
}
public void gameSelect(String sessionId, UUID gameId, GameView gameView, String message, Map<String, Serializable> options) {
Channel ch = findChannel(sessionId);
if (ch != null)
ch.writeAndFlush(new GameSelectMessage(gameId, gameView, message, options)).addListener(WriteListener.getInstance());
ch.writeAndFlush(new GameSelectCallback(gameId, gameView, message, options)).addListener(WriteListener.getInstance());
}
public void gameChooseAbility(String sessionId, UUID gameId, AbilityPickerView abilities) {
Channel ch = findChannel(sessionId);
if (ch != null)
ch.writeAndFlush(new GameChooseAbilityMessage(gameId, abilities)).addListener(WriteListener.getInstance());
ch.writeAndFlush(new GameChooseAbilityCallback(gameId, abilities)).addListener(WriteListener.getInstance());
}
public void gameChoosePile(String sessionId, UUID gameId, String message, CardsView pile1, CardsView pile2) {
Channel ch = findChannel(sessionId);
if (ch != null)
ch.writeAndFlush(new GameChoosePileMessage(gameId, message, pile1, pile2)).addListener(WriteListener.getInstance());
ch.writeAndFlush(new GameChoosePileCallback(gameId, message, pile1, pile2)).addListener(WriteListener.getInstance());
}
public void gameChooseChoice(String sessionId, UUID gameId, Choice choice) {
Channel ch = findChannel(sessionId);
if (ch != null)
ch.writeAndFlush(new GameChooseChoiceMessage(gameId, choice)).addListener(WriteListener.getInstance());
ch.writeAndFlush(new GameChooseChoiceCallback(gameId, choice)).addListener(WriteListener.getInstance());
}
public void gamePlayMana(String sessionId, UUID gameId, GameView gameView, String message) {
Channel ch = findChannel(sessionId);
if (ch != null)
ch.writeAndFlush(new GamePlayManaMessage(gameId, gameView, message)).addListener(WriteListener.getInstance());
ch.writeAndFlush(new GamePlayManaCallback(gameId, gameView, message)).addListener(WriteListener.getInstance());
}
public void gamePlayXMana(String sessionId, UUID gameId, GameView gameView, String message) {
Channel ch = findChannel(sessionId);
if (ch != null)
ch.writeAndFlush(new GamePlayXManaMessage(gameId, gameView, message)).addListener(WriteListener.getInstance());
ch.writeAndFlush(new GamePlayXManaCallback(gameId, gameView, message)).addListener(WriteListener.getInstance());
}
public void gameSelectAmount(String sessionId, UUID gameId, String message, int min, int max) {
Channel ch = findChannel(sessionId);
if (ch != null)
ch.writeAndFlush(new GameSelectAmountMessage(gameId, message, min, max)).addListener(WriteListener.getInstance());
ch.writeAndFlush(new GameSelectAmountCallback(gameId, message, min, max)).addListener(WriteListener.getInstance());
}
public void endGameInfo(String sessionId, UUID gameId, GameEndView view) {
Channel ch = findChannel(sessionId);
if (ch != null)
ch.writeAndFlush(new GameEndInfoMessage(gameId, view)).addListener(WriteListener.getInstance());
ch.writeAndFlush(new GameEndInfoCallback(gameId, view)).addListener(WriteListener.getInstance());
}
public void userRequestDialog(String sessionId, UUID gameId, UserRequestMessage userRequestMessage) {
Channel ch = findChannel(sessionId);
if (ch != null)
ch.writeAndFlush(new UserRequestDialogMessage(gameId, userRequestMessage)).addListener(WriteListener.getInstance());
ch.writeAndFlush(new UserRequestDialogCallback(gameId, userRequestMessage)).addListener(WriteListener.getInstance());
}
public void gameUpdate(String sessionId, UUID gameId, GameView view) {
Channel ch = findChannel(sessionId);
if (ch != null)
ch.writeAndFlush(new GameUpdateMessage(gameId, view)).addListener(WriteListener.getInstance());
ch.writeAndFlush(new GameUpdateCallback(gameId, view)).addListener(WriteListener.getInstance());
}
public void gameInform(String sessionId, UUID gameId, GameClientMessage message) {
Channel ch = findChannel(sessionId);
if (ch != null)
ch.writeAndFlush(new GameInformMessage(gameId, message)).addListener(WriteListener.getInstance());
ch.writeAndFlush(new GameInformCallback(gameId, message)).addListener(WriteListener.getInstance());
}
public void gameInformPersonal(String sessionId, UUID gameId, GameClientMessage message) {
Channel ch = findChannel(sessionId);
if (ch != null)
ch.writeAndFlush(new GameInformPersonalMessage(gameId, message)).addListener(WriteListener.getInstance());
ch.writeAndFlush(new GameInformPersonalCallback(gameId, message)).addListener(WriteListener.getInstance());
}
public void gameOver(String sessionId, UUID gameId, String message) {
Channel ch = findChannel(sessionId);
if (ch != null)
ch.writeAndFlush(new GameOverMessage(gameId, message)).addListener(WriteListener.getInstance());
ch.writeAndFlush(new GameOverCallback(gameId, message)).addListener(WriteListener.getInstance());
}
public void gameError(String sessionId, UUID gameId, String message) {
Channel ch = findChannel(sessionId);
if (ch != null)
ch.writeAndFlush(new GameErrorMessage(gameId, message)).addListener(WriteListener.getInstance());
ch.writeAndFlush(new GameErrorCallback(gameId, message)).addListener(WriteListener.getInstance());
}
}

4
Mage.Network/src/main/java/org/mage/network/messages/callback/ChatMessageMessage.java → Mage.Network/src/main/java/org/mage/network/messages/callback/ChatMessageCallback.java
View file

@ -9,12 +9,12 @@ import org.mage.network.messages.ClientMessage;
*
* @author BetaSteward
*/
public class ChatMessageMessage extends ClientMessage {
public class ChatMessageCallback extends ClientMessage {
private UUID chatId;
private ChatMessage message;
public ChatMessageMessage(UUID chatId, ChatMessage message) {
public ChatMessageCallback(UUID chatId, ChatMessage message) {
this.chatId = chatId;
this.message = message;
}

4
Mage.Network/src/main/java/org/mage/network/messages/callback/GameAskMessage.java → Mage.Network/src/main/java/org/mage/network/messages/callback/GameAskCallback.java
View file

@ -9,13 +9,13 @@ import org.mage.network.messages.ClientMessage;
*
* @author BetaSteward
*/
public class GameAskMessage extends ClientMessage {
public class GameAskCallback extends ClientMessage {
private UUID gameId;
private GameView gameView;
private String question;
public GameAskMessage(UUID gameId, GameView gameView, String question) {
public GameAskCallback(UUID gameId, GameView gameView, String question) {
this.gameId = gameId;
this.gameView = gameView;
this.question = question;

4
Mage.Network/src/main/java/org/mage/network/messages/callback/GameChooseAbilityMessage.java → Mage.Network/src/main/java/org/mage/network/messages/callback/GameChooseAbilityCallback.java
View file

@ -9,11 +9,11 @@ import org.mage.network.messages.ClientMessage;
*
* @author BetaSteward
*/
public class GameChooseAbilityMessage extends ClientMessage {
public class GameChooseAbilityCallback extends ClientMessage {
private final UUID gameId;
private final AbilityPickerView abilities;
public GameChooseAbilityMessage(UUID gameId, AbilityPickerView abilities) {
public GameChooseAbilityCallback(UUID gameId, AbilityPickerView abilities) {
this.gameId = gameId;
this.abilities = abilities;
}

4
Mage.Network/src/main/java/org/mage/network/messages/callback/GameChooseChoiceMessage.java → Mage.Network/src/main/java/org/mage/network/messages/callback/GameChooseChoiceCallback.java
View file

@ -9,11 +9,11 @@ import org.mage.network.messages.ClientMessage;
*
* @author BetaSteward
*/
public class GameChooseChoiceMessage extends ClientMessage {
public class GameChooseChoiceCallback extends ClientMessage {
private final UUID gameId;
private final Choice choice;
public GameChooseChoiceMessage(UUID gameId, Choice choice) {
public GameChooseChoiceCallback(UUID gameId, Choice choice) {
this.gameId = gameId;
this.choice = choice;
}

4
Mage.Network/src/main/java/org/mage/network/messages/callback/GameChoosePileMessage.java → Mage.Network/src/main/java/org/mage/network/messages/callback/GameChoosePileCallback.java
View file

@ -9,13 +9,13 @@ import org.mage.network.messages.ClientMessage;
*
* @author BetaSteward
*/
public class GameChoosePileMessage extends ClientMessage {
public class GameChoosePileCallback extends ClientMessage {
private final UUID gameId;
private final String message;
private final CardsView pile1;
private final CardsView pile2;
public GameChoosePileMessage(UUID gameId, String message, CardsView pile1, CardsView pile2) {
public GameChoosePileCallback(UUID gameId, String message, CardsView pile1, CardsView pile2) {
this.gameId = gameId;
this.message = message;
this.pile1 = pile1;

4
Mage.Network/src/main/java/org/mage/network/messages/callback/GameEndInfoMessage.java → Mage.Network/src/main/java/org/mage/network/messages/callback/GameEndInfoCallback.java
View file

@ -10,11 +10,11 @@ import org.mage.network.messages.ClientMessage;
*
* @author BetaSteward
*/
public class GameEndInfoMessage extends ClientMessage {
public class GameEndInfoCallback extends ClientMessage {
private final UUID gameId;
private final GameEndView view;
public GameEndInfoMessage(UUID gameId, GameEndView view) {
public GameEndInfoCallback(UUID gameId, GameEndView view) {
this.gameId = gameId;
this.view = view;
}

4
Mage.Network/src/main/java/org/mage/network/messages/callback/GameErrorMessage.java → Mage.Network/src/main/java/org/mage/network/messages/callback/GameErrorCallback.java
View file

@ -8,11 +8,11 @@ import org.mage.network.messages.ClientMessage;
*
* @author BetaSteward
*/
public class GameErrorMessage extends ClientMessage {
public class GameErrorCallback extends ClientMessage {
private final UUID gameId;
private final String message;
public GameErrorMessage(UUID gameId, String message) {
public GameErrorCallback(UUID gameId, String message) {
this.gameId = gameId;
this.message = message;
}

4
Mage.Network/src/main/java/org/mage/network/messages/callback/GameInformMessage.java → Mage.Network/src/main/java/org/mage/network/messages/callback/GameInformCallback.java
View file

@ -9,11 +9,11 @@ import org.mage.network.messages.ClientMessage;
*
* @author BetaSteward
*/
public class GameInformMessage extends ClientMessage {
public class GameInformCallback extends ClientMessage {
private final UUID gameId;
private final GameClientMessage message;
public GameInformMessage(UUID gameId, GameClientMessage message) {
public GameInformCallback(UUID gameId, GameClientMessage message) {
this.gameId = gameId;
this.message = message;
}

4
Mage.Network/src/main/java/org/mage/network/messages/callback/GameInformPersonalMessage.java → Mage.Network/src/main/java/org/mage/network/messages/callback/GameInformPersonalCallback.java
View file

@ -9,11 +9,11 @@ import org.mage.network.messages.ClientMessage;
*
* @author BetaSteward
*/
public class GameInformPersonalMessage extends ClientMessage {
public class GameInformPersonalCallback extends ClientMessage {
private final UUID gameId;
private final GameClientMessage message;
public GameInformPersonalMessage(UUID gameId, GameClientMessage message) {
public GameInformPersonalCallback(UUID gameId, GameClientMessage message) {
this.gameId = gameId;
this.message = message;
}

4
Mage.Network/src/main/java/org/mage/network/messages/callback/GameInitMessage.java → Mage.Network/src/main/java/org/mage/network/messages/callback/GameInitCallback.java
View file

@ -9,12 +9,12 @@ import org.mage.network.messages.ClientMessage;
*
* @author BetaSteward
*/
public class GameInitMessage extends ClientMessage {
public class GameInitCallback extends ClientMessage {
private UUID gameId;
private GameView gameView;
public GameInitMessage(UUID gameId, GameView gameView) {
public GameInitCallback(UUID gameId, GameView gameView) {
this.gameId = gameId;
this.gameView = gameView;
}

4
Mage.Network/src/main/java/org/mage/network/messages/callback/GameOverMessage.java → Mage.Network/src/main/java/org/mage/network/messages/callback/GameOverCallback.java
View file

@ -8,11 +8,11 @@ import org.mage.network.messages.ClientMessage;
*
* @author BetaSteward
*/
public class GameOverMessage extends ClientMessage {
public class GameOverCallback extends ClientMessage {
private final UUID gameId;
private final String message;
public GameOverMessage(UUID gameId, String message) {
public GameOverCallback(UUID gameId, String message) {
this.gameId = gameId;
this.message = message;
}

4
Mage.Network/src/main/java/org/mage/network/messages/callback/GamePlayManaMessage.java → Mage.Network/src/main/java/org/mage/network/messages/callback/GamePlayManaCallback.java
View file

@ -9,12 +9,12 @@ import org.mage.network.messages.ClientMessage;
*
* @author BetaSteward
*/
public class GamePlayManaMessage extends ClientMessage {
public class GamePlayManaCallback extends ClientMessage {
private final UUID gameId;
private final GameView gameView;
private final String message;
public GamePlayManaMessage(UUID gameId, GameView gameView, String message) {
public GamePlayManaCallback(UUID gameId, GameView gameView, String message) {
this.gameId = gameId;
this.gameView = gameView;
this.message = message;

4
Mage.Network/src/main/java/org/mage/network/messages/callback/GamePlayXManaMessage.java → Mage.Network/src/main/java/org/mage/network/messages/callback/GamePlayXManaCallback.java
View file

@ -9,12 +9,12 @@ import org.mage.network.messages.ClientMessage;
*
* @author BetaSteward
*/
public class GamePlayXManaMessage extends ClientMessage {
public class GamePlayXManaCallback extends ClientMessage {
private final UUID gameId;
private final GameView gameView;
private final String message;
public GamePlayXManaMessage(UUID gameId, GameView gameView, String message) {
public GamePlayXManaCallback(UUID gameId, GameView gameView, String message) {
this.gameId = gameId;
this.gameView = gameView;
this.message = message;

4
Mage.Network/src/main/java/org/mage/network/messages/callback/GameSelectAmountMessage.java → Mage.Network/src/main/java/org/mage/network/messages/callback/GameSelectAmountCallback.java
View file

@ -8,13 +8,13 @@ import org.mage.network.messages.ClientMessage;
*
* @author BetaSteward
*/
public class GameSelectAmountMessage extends ClientMessage {
public class GameSelectAmountCallback extends ClientMessage {
private final UUID gameId;
private final String message;
private final int min;
private final int max;
public GameSelectAmountMessage(UUID gameId, String message, int min, int max) {
public GameSelectAmountCallback(UUID gameId, String message, int min, int max) {
this.gameId = gameId;
this.message = message;
this.min = min;

4
Mage.Network/src/main/java/org/mage/network/messages/callback/GameSelectMessage.java → Mage.Network/src/main/java/org/mage/network/messages/callback/GameSelectCallback.java
View file

@ -11,13 +11,13 @@ import org.mage.network.messages.ClientMessage;
*
* @author BetaSteward
*/
public class GameSelectMessage extends ClientMessage {
public class GameSelectCallback extends ClientMessage {
private final UUID gameId;
private final GameView gameView;
private final String message;
private final Map<String, Serializable> options;
public GameSelectMessage(UUID gameId, GameView gameView, String message, Map<String, Serializable> options) {
public GameSelectCallback(UUID gameId, GameView gameView, String message, Map<String, Serializable> options) {
this.gameId = gameId;
this.gameView = gameView;
this.message = message;

4
Mage.Network/src/main/java/org/mage/network/messages/callback/GameStartedMessage.java → Mage.Network/src/main/java/org/mage/network/messages/callback/GameStartedCallback.java
View file

@ -8,12 +8,12 @@ import org.mage.network.messages.ClientMessage;
*
* @author BetaSteward
*/
public class GameStartedMessage extends ClientMessage {
public class GameStartedCallback extends ClientMessage {
private UUID gameId;
private UUID playerId;
public GameStartedMessage(UUID gameId, UUID playerId) {
public GameStartedCallback(UUID gameId, UUID playerId) {
this.gameId = gameId;
this.playerId = playerId;
}

4
Mage.Network/src/main/java/org/mage/network/messages/callback/GameTargetMessage.java → Mage.Network/src/main/java/org/mage/network/messages/callback/GameTargetCallback.java
View file

@ -13,7 +13,7 @@ import org.mage.network.messages.ClientMessage;
*
* @author BetaSteward
*/
public class GameTargetMessage extends ClientMessage {
public class GameTargetCallback extends ClientMessage {
private final UUID gameId;
private final GameView gameView;
@ -23,7 +23,7 @@ public class GameTargetMessage extends ClientMessage {
private final boolean required;
private final Map<String, Serializable> options;
public GameTargetMessage(UUID gameId, GameView gameView, String question, CardsView cardView, Set<UUID> targets, boolean required, Map<String, Serializable> options) {
public GameTargetCallback(UUID gameId, GameView gameView, String question, CardsView cardView, Set<UUID> targets, boolean required, Map<String, Serializable> options) {
this.gameId = gameId;
this.gameView = gameView;
this.question = question;

4
Mage.Network/src/main/java/org/mage/network/messages/callback/GameUpdateMessage.java → Mage.Network/src/main/java/org/mage/network/messages/callback/GameUpdateCallback.java
View file

@ -9,11 +9,11 @@ import org.mage.network.messages.ClientMessage;
*
* @author BetaSteward
*/
public class GameUpdateMessage extends ClientMessage {
public class GameUpdateCallback extends ClientMessage {
private final UUID gameId;
private final GameView view;
public GameUpdateMessage(UUID gameId, GameView view) {
public GameUpdateCallback(UUID gameId, GameView view) {
this.gameId = gameId;
this.view = view;
}

4
Mage.Network/src/main/java/org/mage/network/messages/callback/InformClientMessage.java → Mage.Network/src/main/java/org/mage/network/messages/callback/InformClientCallback.java
View file

@ -8,13 +8,13 @@ import org.mage.network.messages.MessageType;
*
* @author BetaSteward
*/
public class InformClientMessage extends ClientMessage {
public class InformClientCallback extends ClientMessage {
private String title;
private String message;
private MessageType type;
public InformClientMessage(String title, String message, MessageType type) {
public InformClientCallback(String title, String message, MessageType type) {
this.title = title;
this.message = message;
this.type = type;

4
Mage.Network/src/main/java/org/mage/network/messages/callback/JoinedTableMessage.java → Mage.Network/src/main/java/org/mage/network/messages/callback/JoinedTableCallback.java
View file

@ -8,7 +8,7 @@ import org.mage.network.messages.ClientMessage;
*
* @author BetaSteward
*/
public class JoinedTableMessage extends ClientMessage {
public class JoinedTableCallback extends ClientMessage {
private UUID roomId;
private UUID tableId;
@ -16,7 +16,7 @@ public class JoinedTableMessage extends ClientMessage {
private boolean owner;
private boolean tournament;
public JoinedTableMessage(UUID roomId, UUID tableId, UUID chatId, boolean owner, boolean tournament) {
public JoinedTableCallback(UUID roomId, UUID tableId, UUID chatId, boolean owner, boolean tournament) {
this.roomId = roomId;
this.tableId = tableId;
this.chatId = chatId;

4
Mage.Network/src/main/java/org/mage/network/messages/callback/UserRequestDialogMessage.java → Mage.Network/src/main/java/org/mage/network/messages/callback/UserRequestDialogCallback.java
View file

@ -9,11 +9,11 @@ import org.mage.network.messages.ClientMessage;
*
* @author BetaSteward
*/
public class UserRequestDialogMessage extends ClientMessage {
public class UserRequestDialogCallback extends ClientMessage {
private final UUID gameId;
private final UserRequestMessage userRequestMessage;
public UserRequestDialogMessage(UUID gameId, UserRequestMessage userRequestMessage) {
public UserRequestDialogCallback(UUID gameId, UserRequestMessage userRequestMessage) {
this.gameId = gameId;
this.userRequestMessage = userRequestMessage;
}

4
Mage.Network/src/main/java/org/mage/network/messages/requests/LeaveTableRequest.java
View file

@ -4,7 +4,7 @@ import io.netty.channel.ChannelHandlerContext;
import java.util.UUID;
import org.mage.network.handlers.WriteListener;
import org.mage.network.interfaces.MageServer;
import org.mage.network.messages.responses.LeftTableMessage;
import org.mage.network.messages.responses.LeaveTableResponse;
/**
*
@ -22,7 +22,7 @@ public class LeaveTableRequest extends ServerRequest {
@Override
public void handleMessage(MageServer server, ChannelHandlerContext ctx) {
ctx.writeAndFlush(new LeftTableMessage(server.leaveTable(ctx.channel().id().asLongText(), roomId, tableId))).addListener(WriteListener.getInstance());
ctx.writeAndFlush(new LeaveTableResponse(server.leaveTable(ctx.channel().id().asLongText(), roomId, tableId))).addListener(WriteListener.getInstance());
}
}

4
Mage.Network/src/main/java/org/mage/network/messages/responses/LeftTableMessage.java → Mage.Network/src/main/java/org/mage/network/messages/responses/LeaveTableResponse.java
View file

@ -7,11 +7,11 @@ import org.mage.network.messages.ClientMessage;
*
* @author BetaSteward
*/
public class LeftTableMessage extends ClientMessage {
public class LeaveTableResponse extends ClientMessage {
private boolean success;
public LeftTableMessage(boolean success) {
public LeaveTableResponse(boolean success) {
this.success = success;
}