diff --git a/src/java/com/threerings/micasa/lobby/LobbyConfig.java b/src/java/com/threerings/micasa/lobby/LobbyConfig.java index 111c779f1..65063862e 100644 --- a/src/java/com/threerings/micasa/lobby/LobbyConfig.java +++ b/src/java/com/threerings/micasa/lobby/LobbyConfig.java @@ -28,7 +28,7 @@ import java.util.Properties; import com.samskivert.util.StringUtil; import com.threerings.crowd.data.PlaceConfig; -import com.threerings.parlor.game.GameConfig; +import com.threerings.parlor.game.data.GameConfig; import com.threerings.micasa.util.MiCasaContext; public class LobbyConfig extends PlaceConfig diff --git a/src/java/com/threerings/micasa/lobby/LobbyController.java b/src/java/com/threerings/micasa/lobby/LobbyController.java index 9b1e40462..b3eec3833 100644 --- a/src/java/com/threerings/micasa/lobby/LobbyController.java +++ b/src/java/com/threerings/micasa/lobby/LobbyController.java @@ -1,5 +1,5 @@ // -// $Id: LobbyController.java,v 1.11 2004/08/27 02:12:50 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -30,7 +30,7 @@ import com.threerings.crowd.client.PlaceView; import com.threerings.crowd.util.CrowdContext; import com.threerings.parlor.client.*; -import com.threerings.parlor.game.GameConfig; +import com.threerings.parlor.game.data.GameConfig; import com.threerings.micasa.Log; import com.threerings.micasa.util.MiCasaContext; diff --git a/src/java/com/threerings/micasa/lobby/table/TableListView.java b/src/java/com/threerings/micasa/lobby/table/TableListView.java index a56334fca..dcae983d3 100644 --- a/src/java/com/threerings/micasa/lobby/table/TableListView.java +++ b/src/java/com/threerings/micasa/lobby/table/TableListView.java @@ -44,7 +44,7 @@ import com.threerings.parlor.client.SeatednessObserver; import com.threerings.parlor.client.TableDirector; import com.threerings.parlor.client.TableObserver; import com.threerings.parlor.data.Table; -import com.threerings.parlor.game.GameConfig; +import com.threerings.parlor.game.data.GameConfig; import com.threerings.crowd.client.PlaceView; import com.threerings.crowd.data.PlaceObject; diff --git a/src/java/com/threerings/micasa/simulator/client/SimulatorController.java b/src/java/com/threerings/micasa/simulator/client/SimulatorController.java index b21a2b44d..39745c6ea 100644 --- a/src/java/com/threerings/micasa/simulator/client/SimulatorController.java +++ b/src/java/com/threerings/micasa/simulator/client/SimulatorController.java @@ -1,5 +1,5 @@ // -// $Id: SimulatorController.java,v 1.3 2004/08/27 02:12:52 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -29,7 +29,7 @@ import com.threerings.presents.client.SessionObserver; import com.threerings.crowd.data.BodyObject; -import com.threerings.parlor.game.GameConfig; +import com.threerings.parlor.game.data.GameConfig; import com.threerings.parlor.util.ParlorContext; import com.threerings.micasa.Log; diff --git a/src/java/com/threerings/micasa/simulator/client/SimulatorService.java b/src/java/com/threerings/micasa/simulator/client/SimulatorService.java index 9933207bf..f444aee29 100644 --- a/src/java/com/threerings/micasa/simulator/client/SimulatorService.java +++ b/src/java/com/threerings/micasa/simulator/client/SimulatorService.java @@ -1,5 +1,5 @@ // -// $Id: SimulatorService.java,v 1.2 2004/08/27 02:12:52 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -24,7 +24,7 @@ package com.threerings.micasa.simulator.client; import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; -import com.threerings.parlor.game.GameConfig; +import com.threerings.parlor.game.data.GameConfig; /** * Provides access to simulator invocation services. diff --git a/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java b/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java index 3c9491707..57f9eda24 100644 --- a/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java +++ b/src/java/com/threerings/micasa/simulator/data/SimulatorMarshaller.java @@ -22,7 +22,7 @@ package com.threerings.micasa.simulator.data; import com.threerings.micasa.simulator.client.SimulatorService; -import com.threerings.parlor.game.GameConfig; +import com.threerings.parlor.game.data.GameConfig; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.dobj.InvocationResponseEvent; diff --git a/src/java/com/threerings/micasa/simulator/server/Simulant.java b/src/java/com/threerings/micasa/simulator/server/Simulant.java index c3abbf55f..5256f5acd 100644 --- a/src/java/com/threerings/micasa/simulator/server/Simulant.java +++ b/src/java/com/threerings/micasa/simulator/server/Simulant.java @@ -1,5 +1,5 @@ // -// $Id: Simulant.java,v 1.5 2004/08/27 02:12:54 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -27,8 +27,8 @@ import com.threerings.presents.dobj.MessageEvent; import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.data.PlaceObject; -import com.threerings.parlor.game.GameConfig; -import com.threerings.parlor.game.GameManager; +import com.threerings.parlor.game.data.GameConfig; +import com.threerings.parlor.game.server.GameManager; public abstract class Simulant { diff --git a/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java b/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java index 49892afe8..d3c893d67 100644 --- a/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java +++ b/src/java/com/threerings/micasa/simulator/server/SimulatorDispatcher.java @@ -23,7 +23,7 @@ package com.threerings.micasa.simulator.server; import com.threerings.micasa.simulator.client.SimulatorService; import com.threerings.micasa.simulator.data.SimulatorMarshaller; -import com.threerings.parlor.game.GameConfig; +import com.threerings.parlor.game.data.GameConfig; import com.threerings.presents.client.Client; import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.InvocationMarshaller; diff --git a/src/java/com/threerings/micasa/simulator/server/SimulatorManager.java b/src/java/com/threerings/micasa/simulator/server/SimulatorManager.java index 5cd2d2288..70f228cbd 100644 --- a/src/java/com/threerings/micasa/simulator/server/SimulatorManager.java +++ b/src/java/com/threerings/micasa/simulator/server/SimulatorManager.java @@ -1,5 +1,5 @@ // -// $Id: SimulatorManager.java,v 1.18 2004/10/22 19:27:54 ray Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -37,9 +37,9 @@ import com.threerings.crowd.server.PlaceManager; import com.threerings.crowd.server.PlaceRegistry.CreationObserver; import com.threerings.crowd.server.PlaceRegistry; -import com.threerings.parlor.game.GameConfig; -import com.threerings.parlor.game.GameManager; -import com.threerings.parlor.game.GameObject; +import com.threerings.parlor.game.data.GameConfig; +import com.threerings.parlor.game.data.GameObject; +import com.threerings.parlor.game.server.GameManager; import com.threerings.micasa.Log; diff --git a/src/java/com/threerings/micasa/simulator/server/SimulatorProvider.java b/src/java/com/threerings/micasa/simulator/server/SimulatorProvider.java index 06bc589b5..901a3812a 100644 --- a/src/java/com/threerings/micasa/simulator/server/SimulatorProvider.java +++ b/src/java/com/threerings/micasa/simulator/server/SimulatorProvider.java @@ -1,5 +1,5 @@ // -// $Id: SimulatorProvider.java,v 1.4 2004/08/27 02:12:54 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -25,7 +25,7 @@ import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationProvider; import com.threerings.crowd.data.BodyObject; -import com.threerings.parlor.game.GameConfig; +import com.threerings.parlor.game.data.GameConfig; import com.threerings.micasa.Log; diff --git a/src/java/com/threerings/parlor/card/client/CardGameController.java b/src/java/com/threerings/parlor/card/client/CardGameController.java index 162b60647..95908d3af 100644 --- a/src/java/com/threerings/parlor/card/client/CardGameController.java +++ b/src/java/com/threerings/parlor/card/client/CardGameController.java @@ -27,7 +27,7 @@ import com.threerings.parlor.card.data.Card; import com.threerings.parlor.card.data.CardCodes; import com.threerings.parlor.card.data.Hand; -import com.threerings.parlor.game.GameController; +import com.threerings.parlor.game.client.GameController; /** * A controller class for card games. Handles common functions like diff --git a/src/java/com/threerings/parlor/card/data/CardGameObject.java b/src/java/com/threerings/parlor/card/data/CardGameObject.java index 81adccfae..6ef05010f 100644 --- a/src/java/com/threerings/parlor/card/data/CardGameObject.java +++ b/src/java/com/threerings/parlor/card/data/CardGameObject.java @@ -21,7 +21,7 @@ package com.threerings.parlor.card.data; -import com.threerings.parlor.game.GameObject; +import com.threerings.parlor.game.data.GameObject; /** * Game object class for card games. diff --git a/src/java/com/threerings/parlor/card/server/CardGameManager.java b/src/java/com/threerings/parlor/card/server/CardGameManager.java index b96a14288..a5d7f1034 100644 --- a/src/java/com/threerings/parlor/card/server/CardGameManager.java +++ b/src/java/com/threerings/parlor/card/server/CardGameManager.java @@ -32,7 +32,7 @@ import com.threerings.parlor.card.data.CardGameObject; import com.threerings.parlor.card.data.Deck; import com.threerings.parlor.card.data.Hand; -import com.threerings.parlor.game.GameManager; +import com.threerings.parlor.game.server.GameManager; import com.threerings.presents.client.InvocationService.ConfirmListener; import com.threerings.presents.data.ClientObject; diff --git a/src/java/com/threerings/parlor/card/trick/TrickCardGameController.java b/src/java/com/threerings/parlor/card/trick/TrickCardGameController.java index 0ec3d432d..b200896cd 100644 --- a/src/java/com/threerings/parlor/card/trick/TrickCardGameController.java +++ b/src/java/com/threerings/parlor/card/trick/TrickCardGameController.java @@ -1,5 +1,5 @@ // -// $Id: TrickCardGameController.java,v 1.2 2004/10/15 00:14:23 andrzej Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -21,7 +21,7 @@ package com.threerings.parlor.card.trick; -import com.threerings.parlor.turn.TurnGameController; +import com.threerings.parlor.turn.client.TurnGameController; /** * A card game controller interface for trick-based card games, such as diff --git a/src/java/com/threerings/parlor/card/trick/TrickCardGameControllerDelegate.java b/src/java/com/threerings/parlor/card/trick/TrickCardGameControllerDelegate.java index b50b4dd5f..975c51ca6 100644 --- a/src/java/com/threerings/parlor/card/trick/TrickCardGameControllerDelegate.java +++ b/src/java/com/threerings/parlor/card/trick/TrickCardGameControllerDelegate.java @@ -21,7 +21,7 @@ package com.threerings.parlor.card.trick; -import com.threerings.parlor.turn.TurnGameControllerDelegate; +import com.threerings.parlor.turn.client.TurnGameControllerDelegate; import com.threerings.presents.dobj.AttributeChangedEvent; diff --git a/src/java/com/threerings/parlor/card/trick/TrickCardGameManager.java b/src/java/com/threerings/parlor/card/trick/TrickCardGameManager.java index e464344e3..6adc17846 100644 --- a/src/java/com/threerings/parlor/card/trick/TrickCardGameManager.java +++ b/src/java/com/threerings/parlor/card/trick/TrickCardGameManager.java @@ -1,5 +1,5 @@ // -// $Id: TrickCardGameManager.java,v 1.2 2004/10/15 00:14:23 andrzej Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -21,7 +21,7 @@ package com.threerings.parlor.card.trick; -import com.threerings.parlor.turn.TurnGameManager; +import com.threerings.parlor.turn.server.TurnGameManager; /** * A card game manager interface for trick-based card games, such as diff --git a/src/java/com/threerings/parlor/card/trick/TrickCardGameManagerDelegate.java b/src/java/com/threerings/parlor/card/trick/TrickCardGameManagerDelegate.java index 8b6b21cd1..078538a5f 100644 --- a/src/java/com/threerings/parlor/card/trick/TrickCardGameManagerDelegate.java +++ b/src/java/com/threerings/parlor/card/trick/TrickCardGameManagerDelegate.java @@ -23,9 +23,9 @@ package com.threerings.parlor.card.trick; import com.threerings.crowd.data.PlaceObject; -import com.threerings.parlor.game.GameManager; +import com.threerings.parlor.game.server.GameManager; -import com.threerings.parlor.turn.TurnGameManagerDelegate; +import com.threerings.parlor.turn.server.TurnGameManagerDelegate; /** * A card game manager delegate for trick-based card games, such as diff --git a/src/java/com/threerings/parlor/card/trick/TrickCardGameObject.java b/src/java/com/threerings/parlor/card/trick/TrickCardGameObject.java index 3618a62c0..abc3e7c6e 100644 --- a/src/java/com/threerings/parlor/card/trick/TrickCardGameObject.java +++ b/src/java/com/threerings/parlor/card/trick/TrickCardGameObject.java @@ -1,5 +1,5 @@ // -// $Id: TrickCardGameObject.java,v 1.2 2004/10/15 00:14:23 andrzej Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -21,7 +21,7 @@ package com.threerings.parlor.card.trick; -import com.threerings.parlor.turn.TurnGameObject; +import com.threerings.parlor.turn.data.TurnGameObject; /** * Game objects for trick-based card games must implement this interface. diff --git a/src/java/com/threerings/parlor/client/GameConfigurator.java b/src/java/com/threerings/parlor/client/GameConfigurator.java index b03e91381..81e63fd58 100644 --- a/src/java/com/threerings/parlor/client/GameConfigurator.java +++ b/src/java/com/threerings/parlor/client/GameConfigurator.java @@ -24,7 +24,7 @@ package com.threerings.parlor.client; import javax.swing.JPanel; import com.samskivert.swing.VGroupLayout; -import com.threerings.parlor.game.GameConfig; +import com.threerings.parlor.game.data.GameConfig; import com.threerings.parlor.util.ParlorContext; /** diff --git a/src/java/com/threerings/parlor/client/Invitation.java b/src/java/com/threerings/parlor/client/Invitation.java index ee989ac0b..53941d4fc 100644 --- a/src/java/com/threerings/parlor/client/Invitation.java +++ b/src/java/com/threerings/parlor/client/Invitation.java @@ -1,5 +1,5 @@ // -// $Id: Invitation.java,v 1.4 2004/08/27 02:20:12 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -25,7 +25,7 @@ import com.threerings.util.Name; import com.threerings.parlor.Log; import com.threerings.parlor.data.ParlorCodes; -import com.threerings.parlor.game.GameConfig; +import com.threerings.parlor.game.data.GameConfig; import com.threerings.parlor.util.ParlorContext; /** diff --git a/src/java/com/threerings/parlor/client/InvitationResponseObserver.java b/src/java/com/threerings/parlor/client/InvitationResponseObserver.java index 4eb9f55a7..72b825896 100644 --- a/src/java/com/threerings/parlor/client/InvitationResponseObserver.java +++ b/src/java/com/threerings/parlor/client/InvitationResponseObserver.java @@ -1,5 +1,5 @@ // -// $Id: InvitationResponseObserver.java,v 1.7 2004/08/27 02:20:12 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -21,7 +21,7 @@ package com.threerings.parlor.client; -import com.threerings.parlor.game.GameConfig; +import com.threerings.parlor.game.data.GameConfig; /** * A client entity that wishes to generate invitations for games must diff --git a/src/java/com/threerings/parlor/client/ParlorDecoder.java b/src/java/com/threerings/parlor/client/ParlorDecoder.java index efc351063..70fcb6e5a 100644 --- a/src/java/com/threerings/parlor/client/ParlorDecoder.java +++ b/src/java/com/threerings/parlor/client/ParlorDecoder.java @@ -4,7 +4,7 @@ package com.threerings.parlor.client; import com.threerings.parlor.client.ParlorReceiver; -import com.threerings.parlor.game.GameConfig; +import com.threerings.parlor.game.data.GameConfig; import com.threerings.presents.client.InvocationDecoder; import com.threerings.util.Name; diff --git a/src/java/com/threerings/parlor/client/ParlorDirector.java b/src/java/com/threerings/parlor/client/ParlorDirector.java index abdc5794e..e43c07a33 100644 --- a/src/java/com/threerings/parlor/client/ParlorDirector.java +++ b/src/java/com/threerings/parlor/client/ParlorDirector.java @@ -32,7 +32,7 @@ import com.threerings.presents.client.InvocationService; import com.threerings.parlor.Log; import com.threerings.parlor.data.ParlorCodes; -import com.threerings.parlor.game.GameConfig; +import com.threerings.parlor.game.data.GameConfig; import com.threerings.parlor.util.ParlorContext; /** diff --git a/src/java/com/threerings/parlor/client/ParlorReceiver.java b/src/java/com/threerings/parlor/client/ParlorReceiver.java index 8318c1c00..41573c6d2 100644 --- a/src/java/com/threerings/parlor/client/ParlorReceiver.java +++ b/src/java/com/threerings/parlor/client/ParlorReceiver.java @@ -26,7 +26,7 @@ import com.threerings.util.Name; import com.threerings.presents.client.InvocationReceiver; import com.threerings.parlor.data.ParlorCodes; -import com.threerings.parlor.game.GameConfig; +import com.threerings.parlor.game.data.GameConfig; /** * Defines, for the parlor services, a set of notifications delivered diff --git a/src/java/com/threerings/parlor/client/ParlorService.java b/src/java/com/threerings/parlor/client/ParlorService.java index d45680d19..32b375d03 100644 --- a/src/java/com/threerings/parlor/client/ParlorService.java +++ b/src/java/com/threerings/parlor/client/ParlorService.java @@ -26,7 +26,7 @@ import com.threerings.util.Name; import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; -import com.threerings.parlor.game.GameConfig; +import com.threerings.parlor.game.data.GameConfig; /** * Provides an interface to the various parlor invocation services. diff --git a/src/java/com/threerings/parlor/client/TableDirector.java b/src/java/com/threerings/parlor/client/TableDirector.java index 084721ca4..15a3fb4a7 100644 --- a/src/java/com/threerings/parlor/client/TableDirector.java +++ b/src/java/com/threerings/parlor/client/TableDirector.java @@ -37,7 +37,7 @@ import com.threerings.crowd.data.PlaceObject; import com.threerings.parlor.Log; import com.threerings.parlor.data.Table; import com.threerings.parlor.data.TableLobbyObject; -import com.threerings.parlor.game.GameConfig; +import com.threerings.parlor.game.data.GameConfig; import com.threerings.parlor.util.ParlorContext; /** diff --git a/src/java/com/threerings/parlor/data/ParlorMarshaller.java b/src/java/com/threerings/parlor/data/ParlorMarshaller.java index 57bd0fca9..73f3fbbb2 100644 --- a/src/java/com/threerings/parlor/data/ParlorMarshaller.java +++ b/src/java/com/threerings/parlor/data/ParlorMarshaller.java @@ -22,7 +22,7 @@ package com.threerings.parlor.data; import com.threerings.parlor.client.ParlorService; -import com.threerings.parlor.game.GameConfig; +import com.threerings.parlor.game.data.GameConfig; import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.InvocationMarshaller; diff --git a/src/java/com/threerings/parlor/data/Table.java b/src/java/com/threerings/parlor/data/Table.java index 5010632d1..467f0dcca 100644 --- a/src/java/com/threerings/parlor/data/Table.java +++ b/src/java/com/threerings/parlor/data/Table.java @@ -31,7 +31,7 @@ import com.threerings.util.Name; import com.threerings.presents.dobj.DSet; import com.threerings.parlor.data.ParlorCodes; -import com.threerings.parlor.game.GameConfig; +import com.threerings.parlor.game.data.GameConfig; /** * This class represents a table that is being used to matchmake a game by diff --git a/src/java/com/threerings/parlor/game/GameController.java b/src/java/com/threerings/parlor/game/client/GameController.java similarity index 97% rename from src/java/com/threerings/parlor/game/GameController.java rename to src/java/com/threerings/parlor/game/client/GameController.java index 1bd491a2b..132dbb7dc 100644 --- a/src/java/com/threerings/parlor/game/GameController.java +++ b/src/java/com/threerings/parlor/game/client/GameController.java @@ -19,7 +19,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.threerings.parlor.game; +package com.threerings.parlor.game.client; import java.awt.event.ActionEvent; @@ -34,6 +34,10 @@ import com.threerings.crowd.data.PlaceObject; import com.threerings.crowd.util.CrowdContext; import com.threerings.parlor.Log; +import com.threerings.parlor.game.data.GameCodes; +import com.threerings.parlor.game.data.GameConfig; +import com.threerings.parlor.game.data.GameObject; +import com.threerings.parlor.game.data.PartyGameConfig; import com.threerings.parlor.util.ParlorContext; /** diff --git a/src/java/com/threerings/parlor/game/GameControllerDelegate.java b/src/java/com/threerings/parlor/game/client/GameControllerDelegate.java similarity index 95% rename from src/java/com/threerings/parlor/game/GameControllerDelegate.java rename to src/java/com/threerings/parlor/game/client/GameControllerDelegate.java index c3564a70b..9b680a421 100644 --- a/src/java/com/threerings/parlor/game/GameControllerDelegate.java +++ b/src/java/com/threerings/parlor/game/client/GameControllerDelegate.java @@ -1,5 +1,5 @@ // -// $Id: GameControllerDelegate.java,v 1.3 2004/08/27 02:20:14 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -19,7 +19,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.threerings.parlor.game; +package com.threerings.parlor.game.client; import com.threerings.crowd.client.PlaceControllerDelegate; diff --git a/src/java/com/threerings/parlor/game/GameService.java b/src/java/com/threerings/parlor/game/client/GameService.java similarity index 94% rename from src/java/com/threerings/parlor/game/GameService.java rename to src/java/com/threerings/parlor/game/client/GameService.java index c50fc56e4..c92b004cd 100644 --- a/src/java/com/threerings/parlor/game/GameService.java +++ b/src/java/com/threerings/parlor/game/client/GameService.java @@ -1,5 +1,5 @@ // -// $Id: GameService.java,v 1.3 2004/08/27 02:20:14 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -19,7 +19,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.threerings.parlor.game; +package com.threerings.parlor.game.client; import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; diff --git a/src/java/com/threerings/parlor/game/GameCodes.java b/src/java/com/threerings/parlor/game/data/GameCodes.java similarity index 97% rename from src/java/com/threerings/parlor/game/GameCodes.java rename to src/java/com/threerings/parlor/game/data/GameCodes.java index 40dd0ebaa..b3b23126d 100644 --- a/src/java/com/threerings/parlor/game/GameCodes.java +++ b/src/java/com/threerings/parlor/game/data/GameCodes.java @@ -19,7 +19,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.threerings.parlor.game; +package com.threerings.parlor.game.data; import com.threerings.presents.data.InvocationCodes; diff --git a/src/java/com/threerings/parlor/game/GameConfig.java b/src/java/com/threerings/parlor/game/data/GameConfig.java similarity index 99% rename from src/java/com/threerings/parlor/game/GameConfig.java rename to src/java/com/threerings/parlor/game/data/GameConfig.java index e24e0c668..f05c20631 100644 --- a/src/java/com/threerings/parlor/game/GameConfig.java +++ b/src/java/com/threerings/parlor/game/data/GameConfig.java @@ -19,7 +19,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.threerings.parlor.game; +package com.threerings.parlor.game.data; import com.threerings.crowd.data.PlaceConfig; import com.threerings.util.Name; diff --git a/src/java/com/threerings/parlor/game/GameMarshaller.java b/src/java/com/threerings/parlor/game/data/GameMarshaller.java similarity index 95% rename from src/java/com/threerings/parlor/game/GameMarshaller.java rename to src/java/com/threerings/parlor/game/data/GameMarshaller.java index 014f52b33..0a5d70a4d 100644 --- a/src/java/com/threerings/parlor/game/GameMarshaller.java +++ b/src/java/com/threerings/parlor/game/data/GameMarshaller.java @@ -19,9 +19,9 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.threerings.parlor.game; +package com.threerings.parlor.game.data; -import com.threerings.parlor.game.GameService; +import com.threerings.parlor.game.client.GameService; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.dobj.InvocationResponseEvent; diff --git a/src/java/com/threerings/parlor/game/GameObject.java b/src/java/com/threerings/parlor/game/data/GameObject.java similarity index 99% rename from src/java/com/threerings/parlor/game/GameObject.java rename to src/java/com/threerings/parlor/game/data/GameObject.java index 701450256..639b9c3b7 100644 --- a/src/java/com/threerings/parlor/game/GameObject.java +++ b/src/java/com/threerings/parlor/game/data/GameObject.java @@ -19,7 +19,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.threerings.parlor.game; +package com.threerings.parlor.game.data; import com.samskivert.util.ListUtil; import com.samskivert.util.StringUtil; diff --git a/src/java/com/threerings/parlor/game/PartyGameConfig.java b/src/java/com/threerings/parlor/game/data/PartyGameConfig.java similarity index 97% rename from src/java/com/threerings/parlor/game/PartyGameConfig.java rename to src/java/com/threerings/parlor/game/data/PartyGameConfig.java index 78f5c8038..af422a41f 100644 --- a/src/java/com/threerings/parlor/game/PartyGameConfig.java +++ b/src/java/com/threerings/parlor/game/data/PartyGameConfig.java @@ -19,7 +19,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.threerings.parlor.game; +package com.threerings.parlor.game.data; import com.threerings.parlor.data.TableConfig; diff --git a/src/java/com/threerings/parlor/game/TeamGameConfig.java b/src/java/com/threerings/parlor/game/data/TeamGameConfig.java similarity index 92% rename from src/java/com/threerings/parlor/game/TeamGameConfig.java rename to src/java/com/threerings/parlor/game/data/TeamGameConfig.java index 498154216..72bd4c08f 100644 --- a/src/java/com/threerings/parlor/game/TeamGameConfig.java +++ b/src/java/com/threerings/parlor/game/data/TeamGameConfig.java @@ -1,5 +1,5 @@ // -// $Id: TeamGameConfig.java,v 1.1 2004/11/04 23:31:10 andrzej Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -19,7 +19,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.threerings.parlor.game; +package com.threerings.parlor.game.data; import com.threerings.parlor.data.TableConfig; diff --git a/src/java/com/threerings/parlor/game/AI.java b/src/java/com/threerings/parlor/game/server/AI.java similarity index 86% rename from src/java/com/threerings/parlor/game/AI.java rename to src/java/com/threerings/parlor/game/server/AI.java index 4a4307cb9..7fad2ee8e 100644 --- a/src/java/com/threerings/parlor/game/AI.java +++ b/src/java/com/threerings/parlor/game/server/AI.java @@ -1,7 +1,7 @@ // -// $Id: AI.java,v 1.1 2004/10/22 19:27:54 ray Exp $ +// $Id$ -package com.threerings.parlor.game; +package com.threerings.parlor.game.server; /** * Represents attributes of an AI player. diff --git a/src/java/com/threerings/parlor/game/AIGameTicker.java b/src/java/com/threerings/parlor/game/server/AIGameTicker.java similarity index 98% rename from src/java/com/threerings/parlor/game/AIGameTicker.java rename to src/java/com/threerings/parlor/game/server/AIGameTicker.java index 3efeedbe9..4410779f9 100644 --- a/src/java/com/threerings/parlor/game/AIGameTicker.java +++ b/src/java/com/threerings/parlor/game/server/AIGameTicker.java @@ -19,7 +19,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.threerings.parlor.game; +package com.threerings.parlor.game.server; import java.util.Iterator; import java.util.HashSet; diff --git a/src/java/com/threerings/parlor/game/GameDispatcher.java b/src/java/com/threerings/parlor/game/server/GameDispatcher.java similarity index 93% rename from src/java/com/threerings/parlor/game/GameDispatcher.java rename to src/java/com/threerings/parlor/game/server/GameDispatcher.java index dd1a8bdfc..48b590190 100644 --- a/src/java/com/threerings/parlor/game/GameDispatcher.java +++ b/src/java/com/threerings/parlor/game/server/GameDispatcher.java @@ -19,10 +19,10 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.threerings.parlor.game; +package com.threerings.parlor.game.server; -import com.threerings.parlor.game.GameMarshaller; -import com.threerings.parlor.game.GameService; +import com.threerings.parlor.game.data.GameMarshaller; +import com.threerings.parlor.game.client.GameService; import com.threerings.presents.client.Client; import com.threerings.presents.data.ClientObject; import com.threerings.presents.data.InvocationMarshaller; diff --git a/src/java/com/threerings/parlor/game/GameManager.java b/src/java/com/threerings/parlor/game/server/GameManager.java similarity index 99% rename from src/java/com/threerings/parlor/game/GameManager.java rename to src/java/com/threerings/parlor/game/server/GameManager.java index 6eabacfa8..f5b76600d 100644 --- a/src/java/com/threerings/parlor/game/GameManager.java +++ b/src/java/com/threerings/parlor/game/server/GameManager.java @@ -19,7 +19,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.threerings.parlor.game; +package com.threerings.parlor.game.server; import java.util.ArrayList; import java.util.Arrays; @@ -45,6 +45,11 @@ import com.threerings.crowd.server.PlaceManagerDelegate; import com.threerings.parlor.Log; import com.threerings.parlor.data.ParlorCodes; +import com.threerings.parlor.game.data.GameCodes; +import com.threerings.parlor.game.data.GameConfig; +import com.threerings.parlor.game.data.GameMarshaller; +import com.threerings.parlor.game.data.GameObject; +import com.threerings.parlor.game.data.PartyGameConfig; import com.threerings.parlor.server.ParlorSender; /** diff --git a/src/java/com/threerings/parlor/game/GameManagerDelegate.java b/src/java/com/threerings/parlor/game/server/GameManagerDelegate.java similarity index 98% rename from src/java/com/threerings/parlor/game/GameManagerDelegate.java rename to src/java/com/threerings/parlor/game/server/GameManagerDelegate.java index a0813a6ad..dd0b96e54 100644 --- a/src/java/com/threerings/parlor/game/GameManagerDelegate.java +++ b/src/java/com/threerings/parlor/game/server/GameManagerDelegate.java @@ -19,7 +19,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.threerings.parlor.game; +package com.threerings.parlor.game.server; import com.threerings.crowd.server.PlaceManagerDelegate; diff --git a/src/java/com/threerings/parlor/game/GameProvider.java b/src/java/com/threerings/parlor/game/server/GameProvider.java similarity index 93% rename from src/java/com/threerings/parlor/game/GameProvider.java rename to src/java/com/threerings/parlor/game/server/GameProvider.java index 5744fbf7e..6ad931d7b 100644 --- a/src/java/com/threerings/parlor/game/GameProvider.java +++ b/src/java/com/threerings/parlor/game/server/GameProvider.java @@ -1,5 +1,5 @@ // -// $Id: GameProvider.java,v 1.3 2004/08/27 02:20:14 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -19,7 +19,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.threerings.parlor.game; +package com.threerings.parlor.game.server; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationProvider; diff --git a/src/java/com/threerings/parlor/game/GameWatcher.java b/src/java/com/threerings/parlor/game/server/GameWatcher.java similarity index 96% rename from src/java/com/threerings/parlor/game/GameWatcher.java rename to src/java/com/threerings/parlor/game/server/GameWatcher.java index 727faf5f8..167f94119 100644 --- a/src/java/com/threerings/parlor/game/GameWatcher.java +++ b/src/java/com/threerings/parlor/game/server/GameWatcher.java @@ -1,5 +1,5 @@ // -// $Id: GameWatcher.java,v 1.3 2004/08/27 02:20:14 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -19,7 +19,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.threerings.parlor.game; +package com.threerings.parlor.game.server; import com.threerings.presents.dobj.AttributeChangeListener; import com.threerings.presents.dobj.AttributeChangedEvent; @@ -28,6 +28,8 @@ import com.threerings.crowd.data.PlaceObject; import com.threerings.crowd.server.PlaceManager; import com.threerings.crowd.server.PlaceRegistry; +import com.threerings.parlor.game.data.GameObject; + /** * An abstract convenience class used server-side to keep an eye on a game * and perform a one-time game-over activity when the game ends. Classes diff --git a/src/java/com/threerings/parlor/server/ParlorDispatcher.java b/src/java/com/threerings/parlor/server/ParlorDispatcher.java index f4e73acff..ae48ed6b2 100644 --- a/src/java/com/threerings/parlor/server/ParlorDispatcher.java +++ b/src/java/com/threerings/parlor/server/ParlorDispatcher.java @@ -23,7 +23,7 @@ package com.threerings.parlor.server; import com.threerings.parlor.client.ParlorService; import com.threerings.parlor.data.ParlorMarshaller; -import com.threerings.parlor.game.GameConfig; +import com.threerings.parlor.game.data.GameConfig; import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.ClientObject; diff --git a/src/java/com/threerings/parlor/server/ParlorManager.java b/src/java/com/threerings/parlor/server/ParlorManager.java index 54982e47c..aa4b0f219 100644 --- a/src/java/com/threerings/parlor/server/ParlorManager.java +++ b/src/java/com/threerings/parlor/server/ParlorManager.java @@ -1,5 +1,5 @@ // -// $Id: ParlorManager.java,v 1.22 2004/08/27 02:20:14 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -32,8 +32,8 @@ import com.threerings.crowd.server.PlaceRegistry; import com.threerings.parlor.Log; import com.threerings.parlor.data.ParlorCodes; -import com.threerings.parlor.game.GameConfig; -import com.threerings.parlor.game.GameManager; +import com.threerings.parlor.game.data.GameConfig; +import com.threerings.parlor.game.server.GameManager; /** * The parlor manager is responsible for the parlor services in diff --git a/src/java/com/threerings/parlor/server/ParlorProvider.java b/src/java/com/threerings/parlor/server/ParlorProvider.java index f338c7920..c1213dbda 100644 --- a/src/java/com/threerings/parlor/server/ParlorProvider.java +++ b/src/java/com/threerings/parlor/server/ParlorProvider.java @@ -37,8 +37,8 @@ import com.threerings.parlor.Log; import com.threerings.parlor.client.ParlorService.InviteListener; import com.threerings.parlor.client.ParlorService.TableListener; import com.threerings.parlor.data.ParlorCodes; -import com.threerings.parlor.game.GameConfig; -import com.threerings.parlor.game.GameManager; +import com.threerings.parlor.game.data.GameConfig; +import com.threerings.parlor.game.server.GameManager; /** * The parlor provider handles the server side of the various Parlor diff --git a/src/java/com/threerings/parlor/server/ParlorSender.java b/src/java/com/threerings/parlor/server/ParlorSender.java index cf2f5e6ef..23e6c0b8a 100644 --- a/src/java/com/threerings/parlor/server/ParlorSender.java +++ b/src/java/com/threerings/parlor/server/ParlorSender.java @@ -5,7 +5,7 @@ package com.threerings.parlor.server; import com.threerings.parlor.client.ParlorDecoder; import com.threerings.parlor.client.ParlorReceiver; -import com.threerings.parlor.game.GameConfig; +import com.threerings.parlor.game.data.GameConfig; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationSender; import com.threerings.util.Name; diff --git a/src/java/com/threerings/parlor/server/TableManager.java b/src/java/com/threerings/parlor/server/TableManager.java index fffda7205..2d4c12e73 100644 --- a/src/java/com/threerings/parlor/server/TableManager.java +++ b/src/java/com/threerings/parlor/server/TableManager.java @@ -46,8 +46,8 @@ import com.threerings.parlor.data.ParlorCodes; import com.threerings.parlor.data.Table; import com.threerings.parlor.data.TableConfig; import com.threerings.parlor.data.TableLobbyObject; -import com.threerings.parlor.game.GameConfig; -import com.threerings.parlor.game.GameManager; +import com.threerings.parlor.game.data.GameConfig; +import com.threerings.parlor.game.server.GameManager; /** * A table manager can be used by a place manager to take care of the diff --git a/src/java/com/threerings/parlor/turn/TurnDisplay.java b/src/java/com/threerings/parlor/turn/client/TurnDisplay.java similarity index 83% rename from src/java/com/threerings/parlor/turn/TurnDisplay.java rename to src/java/com/threerings/parlor/turn/client/TurnDisplay.java index e732805db..2e9297c91 100644 --- a/src/java/com/threerings/parlor/turn/TurnDisplay.java +++ b/src/java/com/threerings/parlor/turn/client/TurnDisplay.java @@ -1,7 +1,25 @@ // // $Id$ +// +// Narya library - tools for developing networked games +// Copyright (C) 2002-2005 Three Rings Design, Inc., All Rights Reserved +// http://www.threerings.net/code/narya/ +// +// This library is free software; you can redistribute it and/or modify it +// under the terms of the GNU Lesser General Public License as published +// by the Free Software Foundation; either version 2.1 of the License, or +// (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.threerings.parlor.turn; +package com.threerings.parlor.turn.client; import java.awt.Color; import java.awt.GridBagConstraints; @@ -22,8 +40,8 @@ import com.threerings.util.Name; import com.threerings.crowd.client.PlaceView; import com.threerings.crowd.data.PlaceObject; -import com.threerings.parlor.game.GameObject; -import com.threerings.parlor.turn.TurnGameObject; +import com.threerings.parlor.game.data.GameObject; +import com.threerings.parlor.turn.data.TurnGameObject; import com.threerings.presents.dobj.AttributeChangeListener; import com.threerings.presents.dobj.AttributeChangedEvent; diff --git a/src/java/com/threerings/parlor/turn/TurnGameController.java b/src/java/com/threerings/parlor/turn/client/TurnGameController.java similarity index 94% rename from src/java/com/threerings/parlor/turn/TurnGameController.java rename to src/java/com/threerings/parlor/turn/client/TurnGameController.java index 66cbbb0d5..c82ac6841 100644 --- a/src/java/com/threerings/parlor/turn/TurnGameController.java +++ b/src/java/com/threerings/parlor/turn/client/TurnGameController.java @@ -19,11 +19,11 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.threerings.parlor.turn; +package com.threerings.parlor.turn.client; import com.threerings.util.Name; -import com.threerings.parlor.game.GameController; +import com.threerings.parlor.game.client.GameController; /** * Games that wish to make use of the turn game services should have their diff --git a/src/java/com/threerings/parlor/turn/TurnGameControllerDelegate.java b/src/java/com/threerings/parlor/turn/client/TurnGameControllerDelegate.java similarity index 93% rename from src/java/com/threerings/parlor/turn/TurnGameControllerDelegate.java rename to src/java/com/threerings/parlor/turn/client/TurnGameControllerDelegate.java index 3fa4ecd16..10ffbcc88 100644 --- a/src/java/com/threerings/parlor/turn/TurnGameControllerDelegate.java +++ b/src/java/com/threerings/parlor/turn/client/TurnGameControllerDelegate.java @@ -1,5 +1,5 @@ // -// $Id: TurnGameControllerDelegate.java,v 1.6 2004/08/27 02:20:15 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -19,7 +19,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.threerings.parlor.turn; +package com.threerings.parlor.turn.client; import com.threerings.util.Name; @@ -31,9 +31,11 @@ import com.threerings.crowd.data.PlaceConfig; import com.threerings.crowd.data.PlaceObject; import com.threerings.crowd.util.CrowdContext; -import com.threerings.parlor.game.GameController; -import com.threerings.parlor.game.GameControllerDelegate; -import com.threerings.parlor.game.GameObject; +import com.threerings.parlor.game.client.GameController; +import com.threerings.parlor.game.client.GameControllerDelegate; +import com.threerings.parlor.game.data.GameObject; + +import com.threerings.parlor.turn.data.TurnGameObject; /** * Performs the client-side processing for a turn-based game. Games which diff --git a/src/java/com/threerings/parlor/turn/TurnGameObject.java b/src/java/com/threerings/parlor/turn/data/TurnGameObject.java similarity index 95% rename from src/java/com/threerings/parlor/turn/TurnGameObject.java rename to src/java/com/threerings/parlor/turn/data/TurnGameObject.java index f2c7cfa7d..3a7c53f91 100644 --- a/src/java/com/threerings/parlor/turn/TurnGameObject.java +++ b/src/java/com/threerings/parlor/turn/data/TurnGameObject.java @@ -19,11 +19,11 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.threerings.parlor.turn; +package com.threerings.parlor.turn.data; import com.threerings.util.Name; -import com.threerings.parlor.game.GameObject; +import com.threerings.parlor.game.data.GameObject; /** * Games that wish to support turn-based play must implement this diff --git a/src/java/com/threerings/parlor/turn/TurnGameManager.java b/src/java/com/threerings/parlor/turn/server/TurnGameManager.java similarity index 96% rename from src/java/com/threerings/parlor/turn/TurnGameManager.java rename to src/java/com/threerings/parlor/turn/server/TurnGameManager.java index defadb91a..969863f58 100644 --- a/src/java/com/threerings/parlor/turn/TurnGameManager.java +++ b/src/java/com/threerings/parlor/turn/server/TurnGameManager.java @@ -19,11 +19,11 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.threerings.parlor.turn; +package com.threerings.parlor.turn.server; import com.threerings.util.Name; -import com.threerings.parlor.game.GameManager; +import com.threerings.parlor.game.server.GameManager; /** * A game manager that wishes to make use of the turn game services should diff --git a/src/java/com/threerings/parlor/turn/TurnGameManagerDelegate.java b/src/java/com/threerings/parlor/turn/server/TurnGameManagerDelegate.java similarity index 96% rename from src/java/com/threerings/parlor/turn/TurnGameManagerDelegate.java rename to src/java/com/threerings/parlor/turn/server/TurnGameManagerDelegate.java index f0d0d4c2c..b4178c47e 100644 --- a/src/java/com/threerings/parlor/turn/TurnGameManagerDelegate.java +++ b/src/java/com/threerings/parlor/turn/server/TurnGameManagerDelegate.java @@ -1,5 +1,5 @@ // -// $Id: TurnGameManagerDelegate.java,v 1.10 2004/08/27 02:20:15 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -19,7 +19,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -package com.threerings.parlor.turn; +package com.threerings.parlor.turn.server; import com.threerings.util.Name; import com.threerings.util.RandomUtil; @@ -27,8 +27,10 @@ import com.threerings.util.RandomUtil; import com.threerings.crowd.data.PlaceObject; import com.threerings.parlor.Log; -import com.threerings.parlor.game.GameManager; -import com.threerings.parlor.game.GameManagerDelegate; +import com.threerings.parlor.game.server.GameManager; +import com.threerings.parlor.game.server.GameManagerDelegate; + +import com.threerings.parlor.turn.data.TurnGameObject; /** * Performs the server-side turn-based game processing for a turn based diff --git a/src/java/com/threerings/puzzle/client/PlayerStatusView.java b/src/java/com/threerings/puzzle/client/PlayerStatusView.java index 7be09c3ef..98abc79b4 100644 --- a/src/java/com/threerings/puzzle/client/PlayerStatusView.java +++ b/src/java/com/threerings/puzzle/client/PlayerStatusView.java @@ -1,5 +1,5 @@ // -// $Id: PlayerStatusView.java,v 1.4 2004/08/27 02:20:27 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -25,7 +25,7 @@ import javax.swing.JPanel; import com.threerings.util.Name; -import com.threerings.parlor.game.GameObject; +import com.threerings.parlor.game.data.GameObject; import com.threerings.puzzle.data.BoardSummary; import com.threerings.puzzle.data.PuzzleConfig; diff --git a/src/java/com/threerings/puzzle/client/PuzzleController.java b/src/java/com/threerings/puzzle/client/PuzzleController.java index 0147ae134..c941d6ac8 100644 --- a/src/java/com/threerings/puzzle/client/PuzzleController.java +++ b/src/java/com/threerings/puzzle/client/PuzzleController.java @@ -48,7 +48,7 @@ import com.threerings.presents.dobj.ElementUpdatedEvent; import com.threerings.crowd.client.PlaceControllerDelegate; import com.threerings.crowd.data.PlaceObject; -import com.threerings.parlor.game.GameController; +import com.threerings.parlor.game.client.GameController; import com.threerings.puzzle.Log; import com.threerings.puzzle.data.Board; diff --git a/src/java/com/threerings/puzzle/client/PuzzleControllerDelegate.java b/src/java/com/threerings/puzzle/client/PuzzleControllerDelegate.java index 48311a656..54f462762 100644 --- a/src/java/com/threerings/puzzle/client/PuzzleControllerDelegate.java +++ b/src/java/com/threerings/puzzle/client/PuzzleControllerDelegate.java @@ -1,5 +1,5 @@ // -// $Id: PuzzleControllerDelegate.java,v 1.5 2004/10/15 23:33:51 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -23,7 +23,7 @@ package com.threerings.puzzle.client; import com.threerings.crowd.data.PlaceObject; -import com.threerings.parlor.game.GameControllerDelegate; +import com.threerings.parlor.game.client.GameControllerDelegate; import com.threerings.puzzle.data.Board; import com.threerings.puzzle.data.PuzzleCodes; diff --git a/src/java/com/threerings/puzzle/data/PuzzleConfig.java b/src/java/com/threerings/puzzle/data/PuzzleConfig.java index a96761a40..54aca3819 100644 --- a/src/java/com/threerings/puzzle/data/PuzzleConfig.java +++ b/src/java/com/threerings/puzzle/data/PuzzleConfig.java @@ -21,7 +21,7 @@ package com.threerings.puzzle.data; -import com.threerings.parlor.game.GameConfig; +import com.threerings.parlor.game.data.GameConfig; /** * Encapsulates the basic configuration information for a puzzle game. diff --git a/src/java/com/threerings/puzzle/data/PuzzleObject.java b/src/java/com/threerings/puzzle/data/PuzzleObject.java index 5ffc25cbb..8288aaa6a 100644 --- a/src/java/com/threerings/puzzle/data/PuzzleObject.java +++ b/src/java/com/threerings/puzzle/data/PuzzleObject.java @@ -21,7 +21,7 @@ package com.threerings.puzzle.data; -import com.threerings.parlor.game.GameObject; +import com.threerings.parlor.game.data.GameObject; /** * Extends the basic {@link GameObject} to add individual player diff --git a/src/java/com/threerings/puzzle/server/PuzzleManager.java b/src/java/com/threerings/puzzle/server/PuzzleManager.java index 355cc1b75..21710a048 100644 --- a/src/java/com/threerings/puzzle/server/PuzzleManager.java +++ b/src/java/com/threerings/puzzle/server/PuzzleManager.java @@ -34,7 +34,7 @@ import com.threerings.presents.dobj.OidList; import com.threerings.crowd.data.BodyObject; import com.threerings.crowd.server.CrowdServer; -import com.threerings.parlor.game.GameManager; +import com.threerings.parlor.game.server.GameManager; import com.threerings.util.MessageBundle; import com.threerings.util.Name; diff --git a/src/java/com/threerings/puzzle/server/PuzzleManagerDelegate.java b/src/java/com/threerings/puzzle/server/PuzzleManagerDelegate.java index 549b5f3ad..3c5a4607c 100644 --- a/src/java/com/threerings/puzzle/server/PuzzleManagerDelegate.java +++ b/src/java/com/threerings/puzzle/server/PuzzleManagerDelegate.java @@ -1,5 +1,5 @@ // -// $Id: PuzzleManagerDelegate.java,v 1.4 2004/08/27 02:20:32 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -21,7 +21,7 @@ package com.threerings.puzzle.server; -import com.threerings.parlor.game.GameManagerDelegate; +import com.threerings.parlor.game.server.GameManagerDelegate; /** * Extends the {@link GameManagerDelegate} mechanism with puzzle manager diff --git a/tests/src/java/com/threerings/parlor/TestClient.java b/tests/src/java/com/threerings/parlor/TestClient.java index 01eb95862..884db07ff 100644 --- a/tests/src/java/com/threerings/parlor/TestClient.java +++ b/tests/src/java/com/threerings/parlor/TestClient.java @@ -32,7 +32,8 @@ import com.threerings.crowd.util.CrowdContext; import com.threerings.parlor.Log; import com.threerings.parlor.client.*; -import com.threerings.parlor.game.*; +import com.threerings.parlor.game.client.*; +import com.threerings.parlor.game.data.*; import com.threerings.parlor.util.ParlorContext; public class TestClient extends com.threerings.crowd.client.TestClient diff --git a/tests/src/java/com/threerings/parlor/TestConfig.java b/tests/src/java/com/threerings/parlor/TestConfig.java index 626ee0ae6..fb4409899 100644 --- a/tests/src/java/com/threerings/parlor/TestConfig.java +++ b/tests/src/java/com/threerings/parlor/TestConfig.java @@ -22,7 +22,7 @@ package com.threerings.parlor; import com.threerings.parlor.client.GameConfigurator; -import com.threerings.parlor.game.GameConfig; +import com.threerings.parlor.game.data.GameConfig; public class TestConfig extends GameConfig { diff --git a/tests/src/java/com/threerings/parlor/TestController.java b/tests/src/java/com/threerings/parlor/TestController.java index b1f03816e..764d5fcf7 100644 --- a/tests/src/java/com/threerings/parlor/TestController.java +++ b/tests/src/java/com/threerings/parlor/TestController.java @@ -1,5 +1,5 @@ // -// $Id: TestController.java,v 1.6 2004/08/27 02:21:02 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -22,7 +22,7 @@ package com.threerings.parlor; import com.threerings.crowd.client.PlaceView; -import com.threerings.parlor.game.GameController; +import com.threerings.parlor.game.client.GameController; public class TestController extends GameController { diff --git a/tests/src/java/com/threerings/parlor/TestManager.java b/tests/src/java/com/threerings/parlor/TestManager.java index 5cf716eca..53f0d8559 100644 --- a/tests/src/java/com/threerings/parlor/TestManager.java +++ b/tests/src/java/com/threerings/parlor/TestManager.java @@ -1,5 +1,5 @@ // -// $Id: TestManager.java,v 1.4 2004/08/27 02:21:02 mdb Exp $ +// $Id$ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -21,7 +21,7 @@ package com.threerings.parlor; -import com.threerings.parlor.game.GameManager; +import com.threerings.parlor.game.server.GameManager; public class TestManager extends GameManager {