clean up

23 files changed, 41 insertions, 129 deletions

diff --git a/src/jake2/client/SCR.java b/src/jake2/client/SCR.java
index 62723cb..f0f380e 100644
--- a/src/jake2/client/SCR.java
+++ b/src/jake2/client/SCR.java
@@ -1,8 +1,6 @@
 /*
  * SCR.java
  * Copyright (C) 2003
- * 
- * $Id: SCR.java,v 1.18 2005-12-04 17:32:42 cawe Exp $
  */
 /*
  Copyright (C) 1997-2001 Id Software, Inc.
@@ -32,14 +30,11 @@ import jake2.game.Cmd;
 import jake2.game.cvar_t;
 import jake2.qcommon.*;
 import jake2.sound.S;
-import jake2.sys.Sys;
 import jake2.sys.Timer;
 import jake2.util.Lib;
 import jake2.util.Vargs;
 
 import java.awt.Dimension;
-import java.io.IOException;
-import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.Arrays;
diff --git a/src/jake2/client/client_state_t.java b/src/jake2/client/client_state_t.java
index c77a3d6..d1da9a0 100644
--- a/src/jake2/client/client_state_t.java
+++ b/src/jake2/client/client_state_t.java
@@ -19,7 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 27.11.2003 by RST.
-//$Id: client_state_t.java,v 1.6 2006-12-12 15:20:30 cawe Exp $
 
 package jake2.client;
 
@@ -28,9 +27,8 @@ import jake2.game.cmodel_t;
 import jake2.game.usercmd_t;
 import jake2.render.image_t;
 import jake2.render.model_t;
-import jake2.sound.*;
+import jake2.sound.sfx_t;
 
-import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
 
 public class client_state_t {
diff --git a/src/jake2/game/GameChase.java b/src/jake2/game/GameChase.java
index 1759e96..32558b3 100644
--- a/src/jake2/game/GameChase.java
+++ b/src/jake2/game/GameChase.java
@@ -19,17 +19,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 16.11.2005 by RST.
-// $Id: GameChase.java,v 1.2 2006-01-21 21:53:32 salomo Exp $
 
 package jake2.game;
 
 
-import jake2.*;
-import jake2.client.*;
-import jake2.game.*;
-import jake2.qcommon.*;
-import jake2.render.*;
-import jake2.server.*;
+import jake2.Defines;
+import jake2.Globals;
+import jake2.server.SV_WORLD;
 import jake2.util.Math3D;
 
 
diff --git a/src/jake2/game/GameSpawn.java b/src/jake2/game/GameSpawn.java
index f983275..385170c 100644
--- a/src/jake2/game/GameSpawn.java
+++ b/src/jake2/game/GameSpawn.java
@@ -20,12 +20,9 @@
 
 // Created on 18.11.2003 by RST.
 
-// $Id: GameSpawn.java,v 1.17 2006-01-21 21:53:32 salomo Exp $
-
 package jake2.game;
 
 import jake2.Defines;
-import jake2.Globals;
 import jake2.game.monsters.*;
 import jake2.qcommon.Com;
 import jake2.util.Lib;
diff --git a/src/jake2/game/GameTrigger.java b/src/jake2/game/GameTrigger.java
index 1e23752..443f873 100644
--- a/src/jake2/game/GameTrigger.java
+++ b/src/jake2/game/GameTrigger.java
@@ -20,15 +20,10 @@
 
 // Created on 27.12.2003 by RST.
 
-// $Id: GameTrigger.java,v 1.8 2006-01-21 21:53:32 salomo Exp $
-
 package jake2.game;
 
-import jake2.*;
-import jake2.client.*;
-import jake2.qcommon.*;
-import jake2.render.*;
-import jake2.server.*;
+import jake2.Defines;
+import jake2.Globals;
 import jake2.util.Lib;
 import jake2.util.Math3D;
 
diff --git a/src/jake2/game/GameTurret.java b/src/jake2/game/GameTurret.java
index 65d48cc..43201b7 100644
--- a/src/jake2/game/GameTurret.java
+++ b/src/jake2/game/GameTurret.java
@@ -19,15 +19,12 @@
  */
 
 // Created on 28.12.2003 by RST.
-// $Id: GameTurret.java,v 1.7 2006-01-21 21:53:32 salomo Exp $
+
 package jake2.game;
 
-import jake2.*;
-import jake2.client.*;
+import jake2.Defines;
+import jake2.Globals;
 import jake2.game.monsters.M_Infantry;
-import jake2.qcommon.*;
-import jake2.render.*;
-import jake2.server.*;
 import jake2.util.Lib;
 import jake2.util.Math3D;
 
diff --git a/src/jake2/game/GameWeapon.java b/src/jake2/game/GameWeapon.java
index d908b2b..beb11cc 100644
--- a/src/jake2/game/GameWeapon.java
+++ b/src/jake2/game/GameWeapon.java
@@ -19,17 +19,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on on 12.11.2003 by RST.
-// $Id: GameWeapon.java,v 1.6 2005-11-20 22:18:33 salomo Exp $
 
 package jake2.game;
 
-
-import jake2.*;
-import jake2.client.*;
-import jake2.game.*;
-import jake2.qcommon.*;
-import jake2.render.*;
-import jake2.server.*;
+import jake2.Defines;
+import jake2.Globals;
 import jake2.util.Lib;
 import jake2.util.Math3D;
 
diff --git a/src/jake2/game/PlayerClient.java b/src/jake2/game/PlayerClient.java
index ff6415d..b25f2e9 100644
--- a/src/jake2/game/PlayerClient.java
+++ b/src/jake2/game/PlayerClient.java
@@ -20,13 +20,10 @@
 
 // Created on 28.12.2003 by RST.
 
-// $Id: PlayerClient.java,v 1.12 2005-12-27 21:02:30 salomo Exp $
-
 package jake2.game;
 
 import jake2.Defines;
 import jake2.game.monsters.M_Player;
-import jake2.game.pmove_t.TraceAdapter;
 import jake2.util.Lib;
 import jake2.util.Math3D;
 
diff --git a/src/jake2/game/PlayerHud.java b/src/jake2/game/PlayerHud.java
index 0766b23..088fefe 100644
--- a/src/jake2/game/PlayerHud.java
+++ b/src/jake2/game/PlayerHud.java
@@ -19,15 +19,11 @@
  */
 
 // Created on 28.12.2003 by RST.
-// $Id: PlayerHud.java,v 1.9 2005-11-20 22:18:33 salomo Exp $
 
 package jake2.game;
 
-import jake2.*;
-import jake2.client.*;
-import jake2.qcommon.*;
-import jake2.render.*;
-import jake2.server.*;
+import jake2.Defines;
+import jake2.qcommon.Com;
 import jake2.util.Lib;
 import jake2.util.Math3D;
 import jake2.util.Vargs;
diff --git a/src/jake2/game/client_persistant_t.java b/src/jake2/game/client_persistant_t.java
index b27f860..0ff1aca 100644
--- a/src/jake2/game/client_persistant_t.java
+++ b/src/jake2/game/client_persistant_t.java
@@ -19,17 +19,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 31.10.2003 by RST.
-// $Id: client_persistant_t.java,v 1.7 2005-02-06 18:52:55 salomo Exp $
 
 package jake2.game;
 
 import jake2.Defines;
-import jake2.util.Lib;
 import jake2.util.QuakeFile;
 
 import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
 
 public class client_persistant_t {
 
diff --git a/src/jake2/game/edict_t.java b/src/jake2/game/edict_t.java
index 771e1dc..f52aff1 100644
--- a/src/jake2/game/edict_t.java
+++ b/src/jake2/game/edict_t.java
@@ -19,15 +19,15 @@
  */
 
 // Created on 04.11.2003 by RST.
-// $Id: edict_t.java,v 1.7 2005-02-19 21:17:44 salomo Exp $
-package jake2.game;
 
-import java.io.IOException;
-import java.io.RandomAccessFile;
+package jake2.game;
 
-import jake2.*;
+import jake2.Defines;
 import jake2.qcommon.Com;
-import jake2.util.*;
+import jake2.util.Lib;
+import jake2.util.QuakeFile;
+
+import java.io.IOException;
 
 public class edict_t {
 
diff --git a/src/jake2/game/entity_state_t.java b/src/jake2/game/entity_state_t.java
index 75ce803..3b6f360 100644
--- a/src/jake2/game/entity_state_t.java
+++ b/src/jake2/game/entity_state_t.java
@@ -19,16 +19,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 08.11.2003 by RST.
-// $Id: entity_state_t.java,v 1.5 2005-06-05 15:21:47 salomo Exp $
 
 package jake2.game;
 
-import java.io.IOException;
-import java.io.RandomAccessFile;
-
 import jake2.util.Math3D;
 import jake2.util.QuakeFile;
 
+import java.io.IOException;
+
 public class entity_state_t implements Cloneable
 {
 	/** entity_state_t is the information conveyed from the server
diff --git a/src/jake2/game/game_locals_t.java b/src/jake2/game/game_locals_t.java
index 85c67f0..4fe3182 100644
--- a/src/jake2/game/game_locals_t.java
+++ b/src/jake2/game/game_locals_t.java
@@ -19,17 +19,14 @@
  */
 
 // Created on 31.10.2003 by RST.
-// $Id: game_locals_t.java,v 1.7 2004-09-22 19:22:06 salomo Exp $
+
 package jake2.game;
 
 import jake2.Defines;
 import jake2.qcommon.Com;
-import jake2.util.Lib;
 import jake2.util.QuakeFile;
 
 import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
 import java.util.Date;
 
 public class game_locals_t {
diff --git a/src/jake2/game/gclient_t.java b/src/jake2/game/gclient_t.java
index d8481ed..acc5b41 100644
--- a/src/jake2/game/gclient_t.java
+++ b/src/jake2/game/gclient_t.java
@@ -19,18 +19,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 31.10.2003 by RST.
-// $Id: gclient_t.java,v 1.7 2006-01-21 21:53:32 salomo Exp $
 
 package jake2.game;
 
-import jake2.qcommon.Com;
-import jake2.util.Lib;
 import jake2.util.QuakeFile;
 
-import java.awt.event.ItemListener;
 import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
 
 public class gclient_t
 {
diff --git a/src/jake2/game/gitem_t.java b/src/jake2/game/gitem_t.java
index c5c7c4d..1bfe278 100644
--- a/src/jake2/game/gitem_t.java
+++ b/src/jake2/game/gitem_t.java
@@ -19,12 +19,8 @@
  */
 
 // Created on 20.11.2003 by RST.
-// $Id: gitem_t.java,v 1.5 2005-02-06 19:08:00 salomo Exp $
 package jake2.game;
 
-import jake2.*;
-import jake2.*;
-
 public class gitem_t {
     private static int id = 0;
 
diff --git a/src/jake2/game/mframe_t.java b/src/jake2/game/mframe_t.java
index af5f095..c8a35f5 100644
--- a/src/jake2/game/mframe_t.java
+++ b/src/jake2/game/mframe_t.java
@@ -19,15 +19,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 11.11.2003 by RST.
-// $Id: mframe_t.java,v 1.2 2004-08-20 21:29:58 salomo Exp $
 
 package jake2.game;
 
-import jake2.util.Lib;
 import jake2.util.QuakeFile;
 
 import java.io.IOException;
-import java.io.RandomAccessFile;
 
 public class mframe_t
 {
diff --git a/src/jake2/game/mmove_t.java b/src/jake2/game/mmove_t.java
index cf8b2c2..0a35b96 100644
--- a/src/jake2/game/mmove_t.java
+++ b/src/jake2/game/mmove_t.java
@@ -19,15 +19,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 11.11.2003 by RST.
-// $Id: mmove_t.java,v 1.2 2004-08-20 21:29:57 salomo Exp $
 
 package jake2.game;
 
-import jake2.util.Lib;
 import jake2.util.QuakeFile;
 
 import java.io.IOException;
-import java.io.RandomAccessFile;
 
 public class mmove_t {
 	public mmove_t(int firstframe, int lastframe, mframe_t frame[], EntThinkAdapter endfunc) {
diff --git a/src/jake2/game/player_state_t.java b/src/jake2/game/player_state_t.java
index cf4daf4..364be11 100644
--- a/src/jake2/game/player_state_t.java
+++ b/src/jake2/game/player_state_t.java
@@ -19,20 +19,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 31.10.2003 by RST.
-// $Id: player_state_t.java,v 1.4 2004-08-20 21:29:58 salomo Exp $
 
 package jake2.game;
 
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
-
-import jake2.*;
-import jake2.*;
+import jake2.Defines;
 import jake2.qcommon.Com;
 import jake2.util.Lib;
 import jake2.util.Math3D;
 
+import java.io.IOException;
+import java.io.RandomAccessFile;
+
 /** 
  	Player_state_t is the information needed in addition to pmove_state_t
 	to rendered a view.  There will only be 10 player_state_t sent each second,
diff --git a/src/jake2/game/usercmd_t.java b/src/jake2/game/usercmd_t.java
index 4dae480..058ca5d 100644
--- a/src/jake2/game/usercmd_t.java
+++ b/src/jake2/game/usercmd_t.java
@@ -19,14 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 31.10.2003 by RST.
-// $Id: usercmd_t.java,v 1.4 2005-01-21 01:08:48 cawe Exp $
 
 package jake2.game;
 
-import java.util.Arrays;
-
-import jake2.util.Lib;
-import jake2.util.Math3D;
 
 public class usercmd_t implements Cloneable {
 	public byte msec;
diff --git a/src/jake2/qcommon/MD4.java b/src/jake2/qcommon/MD4.java
index 2c01f08..9565ec0 100644
--- a/src/jake2/qcommon/MD4.java
+++ b/src/jake2/qcommon/MD4.java
@@ -19,7 +19,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 02.02.2004 by RST.
-// $Id: MD4.java,v 1.2 2004-07-09 06:50:49 hzi Exp $
 
 package jake2.qcommon;
 
@@ -27,13 +26,6 @@ import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.security.MessageDigest;
 
-import jake2.*;
-import jake2.client.*;
-import jake2.game.*;
-import jake2.render.*;
-import jake2.server.*;
-import jake2.util.Lib;
-
 
 public class MD4 extends MessageDigest implements Cloneable {
 	// MD4 specific object variables
diff --git a/src/jake2/render/basic/Main.java b/src/jake2/render/basic/Main.java
index a099a78..34545d7 100644
--- a/src/jake2/render/basic/Main.java
+++ b/src/jake2/render/basic/Main.java
@@ -1,8 +1,6 @@
 /*
  * Main.java
  * Copyright (C) 2003
- *
- * $Id: Main.java,v 1.3 2006-11-22 15:05:38 cawe Exp $
  */
 /*
 Copyright (C) 1997-2001 Id Software, Inc.
@@ -26,12 +24,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 package jake2.render.basic;
 
 import jake2.Defines;
-import jake2.Globals;
 import jake2.client.*;
-import jake2.game.*;
+import jake2.game.Cmd;
+import jake2.game.cplane_t;
+import jake2.game.cvar_t;
 import jake2.qcommon.*;
 import jake2.render.*;
-import jake2.util.*;
+import jake2.util.Lib;
+import jake2.util.Math3D;
+import jake2.util.Vargs;
 
 import java.awt.Dimension;
 import java.nio.FloatBuffer;
diff --git a/src/jake2/server/SV_SEND.java b/src/jake2/server/SV_SEND.java
index df1bc55..3046324 100644
--- a/src/jake2/server/SV_SEND.java
+++ b/src/jake2/server/SV_SEND.java
@@ -19,20 +19,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 17.01.2004 by RST.
-// $Id: SV_SEND.java,v 1.10 2005-12-18 22:10:12 cawe Exp $
 
 package jake2.server;
 
-import java.io.IOException;
-
-import jake2.*;
-import jake2.client.*;
-import jake2.game.*;
+import jake2.Defines;
+import jake2.Globals;
+import jake2.game.EndianHandler;
+import jake2.game.edict_t;
 import jake2.qcommon.*;
-import jake2.render.*;
 import jake2.util.Lib;
 import jake2.util.Math3D;
 
+import java.io.IOException;
+
 public class SV_SEND {
 	/*
 	=============================================================================
diff --git a/src/jake2/server/SV_USER.java b/src/jake2/server/SV_USER.java
index 1c9bcf2..4470735 100644
--- a/src/jake2/server/SV_USER.java
+++ b/src/jake2/server/SV_USER.java
@@ -19,25 +19,13 @@
  */
 
 // Created on 17.01.2004 by RST.
-// $Id: SV_USER.java,v 1.10 2005-12-17 20:32:01 salomo Exp $
+
 package jake2.server;
 
 import jake2.Defines;
 import jake2.Globals;
-import jake2.game.Cmd;
-import jake2.game.GameAI;
-import jake2.game.GameBase;
-import jake2.game.Info;
-import jake2.game.PlayerClient;
-import jake2.game.edict_t;
-import jake2.game.entity_state_t;
-import jake2.game.usercmd_t;
-import jake2.qcommon.Cbuf;
-import jake2.qcommon.Com;
-import jake2.qcommon.Cvar;
-import jake2.qcommon.FS;
-import jake2.qcommon.MSG;
-import jake2.qcommon.SZ;
+import jake2.game.*;
+import jake2.qcommon.*;
 import jake2.util.Lib;
 
 import java.io.IOException;