From db06230dc598a3af441ae0b98400e8f2229eb2ce Mon Sep 17 00:00:00 2001
From: Ethan Lee <flibitijibibo@gmail.com>
Date: Sat, 11 Feb 2012 04:17:48 -0500
Subject: [PATCH] - Remove the HighPrecisionTimer, removing the last compiler
 warning. 	- Turns out that thing was antiquated anyway. Convenient! -
 Update the buildfile to make zip distributions for each platform.

---
 build.xml                               | 24 ++++++++++++++
 src/lwjake2/sys/HighPrecisionTimer.java | 43 -------------------------
 src/lwjake2/sys/Timer.java              |  6 +---
 3 files changed, 25 insertions(+), 48 deletions(-)
 delete mode 100644 src/lwjake2/sys/HighPrecisionTimer.java

diff --git a/build.xml b/build.xml
index cff4f0a..8e93e05 100644
--- a/build.xml
+++ b/build.xml
@@ -75,6 +75,12 @@
 		<copy file="lib/lwjgl_native/liblwjgl64.so" todir="built/Linux"/>
 		<copy file="lib/lwjgl_native/libopenal.so" todir="built/Linux"/>
 		<copy file="lib/lwjgl_native/libopenal64.so" todir="built/Linux"/>
+		
+		<!-- Create the zip distribution -->
+		<mkdir dir="built/zip"/>
+		<zip destfile="built/zip/LWJake2-Linux.zip">
+			<zipfileset dir="built/Linux" prefix="LWJake2"/>
+		</zip>
 	</target>
 
 	<!-- Build OSX version of LWJake2 -->
@@ -102,6 +108,12 @@
 		<!-- Copy OSX native libraries -->
 		<copy file="lib/lwjgl_native/liblwjgl.jnilib" todir="built/OSX"/>
 		<copy file="lib/lwjgl_native/openal.dylib" todir="built/OSX"/>
+		
+		<!-- Create the zip distribution -->
+		<mkdir dir="built/zip"/>
+		<zip destfile="built/zip/LWJake2-OSX.zip">
+			<zipfileset dir="built/OSX" prefix="LWJake2"/>
+		</zip>
 	</target>
 
 	<!-- Build Windows version of LWJake2 -->
@@ -131,6 +143,12 @@
 		<copy file="lib/lwjgl_native/lwjgl64.dll" todir="built/Windows"/>
 		<copy file="lib/lwjgl_native/OpenAL32.dll" todir="built/Windows"/>
 		<copy file="lib/lwjgl_native/OpenAL64.dll" todir="built/Windows"/>
+		
+		<!-- Create the zip distribution -->
+		<mkdir dir="built/zip"/>
+		<zip destfile="built/zip/LWJake2-Windows.zip">
+			<zipfileset dir="built/Windows" prefix="LWJake2"/>
+		</zip>
 	</target>
 	
 	<!-- Build the server version of LWJake2 -->
@@ -146,6 +164,12 @@
 		<!-- Copy executable files -->
 		<copy file="executables/LWJake2_Server.sh" todir="built/Server"/>
 		<copy file="executables/LWJake2_Server.bat" todir="built/Server"/>
+		
+		<!-- Create the zip distribution -->
+		<mkdir dir="built/zip"/>
+		<zip destfile="built/zip/LWJake2-Server.zip">
+			<zipfileset dir="built/Server" prefix="LWJake2"/>
+		</zip>
 	</target>
 
 	<!-- Build the source distribution -->
diff --git a/src/lwjake2/sys/HighPrecisionTimer.java b/src/lwjake2/sys/HighPrecisionTimer.java
deleted file mode 100644
index 762a0e2..0000000
--- a/src/lwjake2/sys/HighPrecisionTimer.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 1997-2001 Id Software, Inc.
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * 
- * This program 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 General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- */
-
-package lwjake2.sys;
-
-import sun.misc.Perf;
-
-// TODO: Is there an alternative to sun.misc.Perf? - flibit
-
-class HighPrecisionTimer extends Timer {
-
-	private Perf perf = Perf.getPerf();
-	private double f = 1000.0 / perf.highResFrequency();
-	private long base;
-	
-	HighPrecisionTimer() {
-		base = perf.highResCounter();
-	}
-	
-	public long currentTimeMillis() {
-		long time = perf.highResCounter();
-		long delta = time - base;
-		if (delta < 0) {
-			delta += Long.MAX_VALUE + 1;
-		}
-		return (long)(delta * f);
-	}
-}
diff --git a/src/lwjake2/sys/Timer.java b/src/lwjake2/sys/Timer.java
index a08551f..b8825c8 100644
--- a/src/lwjake2/sys/Timer.java
+++ b/src/lwjake2/sys/Timer.java
@@ -31,11 +31,7 @@ public abstract class Timer {
 		try {
 			t = new NanoTimer();
 		} catch (Throwable e) {
-			try {
-				t = new HighPrecisionTimer();
-			} catch (Throwable e1) {
-				t = new StandardTimer();
-			}
+			t = new StandardTimer();
 		}
 		Com.Println("using " + t.getClass().getName());
 	}