Refactor and extend new library.

[plomrogue2-experiments] / new / client.py

diff --git a/new/client.py b/new/client.py
index 45c16db78bc5bb3ca6b654f10d852a38e66f03ed..7a9902708a60cf36140ae2024fd1e9c21cbb00d6 100755 (executable)
--- a/new/client.py
+++ b/new/client.py
@@ -1,11 +1,12 @@
 #!/usr/bin/env python3
 import curses
-import plom_socket
 import socket
 import threading
-from parser import ArgError, Parser
-from plomrogue import (MapBase, WorldBase, ThingBase, cmd_MAP, cmd_THING_TYPE,
-                        cmd_THING_POS)
+from plomrogue.parser import ArgError, Parser
+from plomrogue.commands import cmd_MAP, cmd_THING_TYPE, cmd_THING_POS
+from plomrogue.game import Game, WorldBase, ThingBase
+from plomrogue.mapping import MapBase
+from plomrogue.io import PlomSocket
 import types
 
 
@@ -415,7 +416,7 @@ class TUI:
 
 
 s = socket.create_connection(('127.0.0.1', 5000))
-plom_socket = plom_socket.PlomSocket(s)
+plom_socket = PlomSocket(s)
 game = Game()
 t = threading.Thread(target=recv_loop, args=(plom_socket, game))
 t.start()