External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-29 06:52:02 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into Network_Upgrade

Browse source 
Conflicts:
	Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
	Mage.Client/src/main/java/mage/client/game/GamePanel.java
	Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java
	Mage.Server/src/main/java/mage/server/Session.java
	Mage.Server/src/main/java/mage/server/User.java
	Mage.Server/src/main/java/mage/server/game/GameController.java
	Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java
	Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java
This commit is contained in:
betasteward 2015-07-12 12:25:44 -04:00
commit 5c829b79d5
552 changed files with 30213 additions and 6146 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Network/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>1.4.1</version>
<version>1.4.2</version>
</parent>
<artifactId>mage-network</artifactId>

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

@ -211,10 +211,10 @@ public class Server {
ch.writeAndFlush(new GameInitCallback(gameId, gameView)).addListener(WriteListener.getInstance());
}
public void gameAsk(String sessionId, UUID gameId, GameView gameView, String question) {
public void gameAsk(String sessionId, UUID gameId, GameView gameView, String question, Map<String, Serializable> options) {
Channel ch = findChannel(sessionId);
if (ch != null)
ch.writeAndFlush(new GameAskCallback(gameId, gameView, question)).addListener(WriteListener.getInstance());
ch.writeAndFlush(new GameAskCallback(gameId, gameView, question, options)).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) {
@ -247,10 +247,10 @@ public class Server {
ch.writeAndFlush(new GameChooseChoiceCallback(gameId, choice)).addListener(WriteListener.getInstance());
}
public void gamePlayMana(String sessionId, UUID gameId, GameView gameView, String message) {
public void gamePlayMana(String sessionId, UUID gameId, GameView gameView, String message, Map<String, Serializable> options) {
Channel ch = findChannel(sessionId);
if (ch != null)
ch.writeAndFlush(new GamePlayManaCallback(gameId, gameView, message)).addListener(WriteListener.getInstance());
ch.writeAndFlush(new GamePlayManaCallback(gameId, gameView, message, options)).addListener(WriteListener.getInstance());
}
public void gamePlayXMana(String sessionId, UUID gameId, GameView gameView, String message) {

4
Mage.Network/src/main/java/org/mage/network/interfaces/MageClient.java
View file

@ -45,12 +45,12 @@ public interface MageClient {
void gameOver(UUID gameId, String message);
void gameError(UUID gameId, String message);
void gameAsk(UUID gameId, GameView gameView, String question);
void gameAsk(UUID gameId, GameView gameView, String question, Map<String, Serializable> options);
void gameTarget(UUID gameId, GameView gameView, String question, CardsView cardView, Set<UUID> targets, boolean required, Map<String, Serializable> options);
void gameChooseAbility(UUID gameId, AbilityPickerView abilities);
void gameChoosePile(UUID gameId, String message, CardsView pile1, CardsView pile2);
void gameChooseChoice(UUID gameId, Choice choice);
void gamePlayMana(UUID gameId, GameView gameView, String message);
void gamePlayMana(UUID gameId, GameView gameView, String message, Map<String, Serializable> options);
void gamePlayXMana(UUID gameId, GameView gameView, String message);
void gameSelectAmount(UUID gameId, String message, int min, int max);
void gameSelect(UUID gameId, GameView gameView, String message, Map<String, Serializable> options);

14
Mage.Network/src/main/java/org/mage/network/messages/callback/GameAskCallback.java
View file

@ -1,5 +1,7 @@
package org.mage.network.messages.callback;
import java.io.Serializable;
import java.util.Map;
import java.util.UUID;
import mage.view.GameView;
import org.mage.network.handlers.client.ClientMessageHandler;
@ -11,19 +13,21 @@ import org.mage.network.messages.ClientMessage;
*/
public class GameAskCallback extends ClientMessage {
private UUID gameId;
private GameView gameView;
private String question;
private final UUID gameId;
private final GameView gameView;
private final String question;
private final Map<String, Serializable> options;
public GameAskCallback(UUID gameId, GameView gameView, String question) {
public GameAskCallback(UUID gameId, GameView gameView, String question, Map<String, Serializable> options) {
this.gameId = gameId;
this.gameView = gameView;
this.question = question;
this.options = options;
}
@Override
public void handleMessage(ClientMessageHandler handler) {
handler.getClient().gameAsk(gameId, gameView, question);
handler.getClient().gameAsk(gameId, gameView, question, options);
}
}

8
Mage.Network/src/main/java/org/mage/network/messages/callback/GamePlayManaCallback.java
View file

@ -1,5 +1,7 @@
package org.mage.network.messages.callback;
import java.io.Serializable;
import java.util.Map;
import java.util.UUID;
import mage.view.GameView;
import org.mage.network.handlers.client.ClientMessageHandler;
@ -13,16 +15,18 @@ public class GamePlayManaCallback extends ClientMessage {
private final UUID gameId;
private final GameView gameView;
private final String message;
private final Map<String, Serializable> options;
public GamePlayManaCallback(UUID gameId, GameView gameView, String message) {
public GamePlayManaCallback(UUID gameId, GameView gameView, String message, Map<String, Serializable> options) {
this.gameId = gameId;
this.gameView = gameView;
this.message = message;
this.options = options;
}
@Override
public void handleMessage(ClientMessageHandler handler) {
handler.getClient().gamePlayMana(gameId, gameView, message);
handler.getClient().gamePlayMana(gameId, gameView, message, options);
}
}