cleanup enter/leave menu

Author: pquiring

Diff for: src/jfcraft/client/Client.java

@@ -30,6 +30,8 @@ public class Client {
   public String name, pass;
   public boolean auth = false;
   public boolean isLocal = false;
+  public boolean isClient = false;
+  public boolean isServer = false;
 
   public Player player;
   public XYZ ang = new XYZ();  //mouse angle (copied to player in tick)
@@ -140,13 +142,17 @@ public void initTimer(String name, boolean stdout) {
     Static.initClientThread(name, stdout, true);
   }
 
+  /** Create Client for server side. */
   public Client(ServerTransport transport) {
     this.serverTransport = transport;
+    isServer = true;
     init();
   }
 
+  /** Create Client for client side. */
   public Client(ClientTransport transport) {
     this.clientTransport = transport;
+    isClient = true;
     init();
   }
 
@@ -768,14 +774,16 @@ public void rebuildAll() {
     }
   }
 
-  public void leaveMenuReset() {
+  public void leaveMenu() {
     chunk = null;
     bedtime = 0;
     leavebed = true;
     container = null;
     villager = null;
     villager_trade_index = -1;
     crafted = null;
-    Static.game.enterMenu(GAME);
+    if (isClient) {
+      Static.game.leaveMenu();
+    }
   }
 }

Diff for: src/jfcraft/client/InventoryMenu.java

@@ -104,7 +104,7 @@ public InventoryMenu() {
 
   public void setup() {
     setCursor(true);
-    Static.client.clientTransport.enterMenu(Client.INVENTORY);  //TODO : move to server side
+    Static.client.clientTransport.enterMenu(Client.INVENTORY);
     player = (Player)Static.entities.entities[Entities.PLAYER];
     player.ang.y = 180.0f;  //face the "real" player
     player.armors = Static.client.player.armors;

Diff for: src/jfcraft/opengl/RenderScreen.java

@@ -777,7 +777,6 @@ public void leaveMenu() {
     Static.video.setScreen(Static.game);
     setCursor(false);
     Static.inGame = true;
-    Static.client.leaveMenuReset();
   }
 
   private static RenderBuffers o_shade = null;

Diff for: src/jfcraft/packet/PacketMenuLeave.java

@@ -20,7 +20,7 @@ public PacketMenuLeave(byte cmd) {
 
   //process on client side
   public void process(Client client) {
-    client.leaveMenuReset();
+    client.leaveMenu();
   }
 
   //process on server side
@@ -38,7 +38,7 @@ public void process(Server server, Client client) {
         client.serverTransport.setCraftItem(a, client.craft[a]);
       }
       server.updateCrafted(client);
-      client.leaveMenuReset();
+      client.leaveMenu();
       client.menu = Client.GAME;
     }
   }

Diff for: src/jfcraft/server/ClientTransport.java

@@ -133,7 +133,7 @@ public void invExchange(byte idx) {
     }
   }
   public void enterMenu(byte menu) {
-    //TODO : remove this packet - do on server side
+    //only used for InventoryMenu and CreativeMenu
     Packet packet = new PacketMenuEnter(Packets.MENUENTER, menu);
     synchronized(packets) {
       packets.add(packet);