From d2e63cf3254bdbf19e01a8088cb3cc0f7bda6c2e Mon Sep 17 00:00:00 2001
From: Marwolf <cleako@gmail.com>
Date: Sat, 11 Aug 2018 19:13:08 -0400
Subject: [PATCH] Implemented gradle for Windows single player

---
 Initial_Production_Linux_Configuration.sh |  3 +--
 Setup_Windows.cmd                         |  4 ++--
 Start_Single_Player_Game_Windows.cmd      | 14 ++++++++------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Initial_Production_Linux_Configuration.sh b/Initial_Production_Linux_Configuration.sh
index 9ccef0a..f09b79a 100755
--- a/Initial_Production_Linux_Configuration.sh
+++ b/Initial_Production_Linux_Configuration.sh
@@ -21,7 +21,6 @@ sudo nano Run_Production_Linux_Game_Server.sh
 sudo nano Game/server/config/config.xml
 echo ""
 echo ""
-echo "Launching Run_Production_Linux_Game_Server.sh"
+echo "Ready to execute Run_Production_Linux_Game_Server.sh"
 echo ""
 echo ""
-./Run_Production_Linux_Game_Server.sh
diff --git a/Setup_Windows.cmd b/Setup_Windows.cmd
index 0b90b99..cb218e3 100644
--- a/Setup_Windows.cmd
+++ b/Setup_Windows.cmd
@@ -59,9 +59,9 @@ goto doinstall
 
 :installjava
 echo:
-echo Installing Oracle Java JDK 8 and Apache Ant.
+echo Installing Oracle Java JDK 8 and Gradle.
 echo:
-choco install -y jdk8 ant
+choco install -y jdk8 gradle ant
 echo:
 echo:
 goto askdocker
diff --git a/Start_Single_Player_Game_Windows.cmd b/Start_Single_Player_Game_Windows.cmd
index afb7e73..8b35c7f 100644
--- a/Start_Single_Player_Game_Windows.cmd
+++ b/Start_Single_Player_Game_Windows.cmd
@@ -17,12 +17,12 @@ echo:
 REM   Compile the game server and client:
 echo Compiling the game client.
 echo:
-call ant -f Game/client/build.xml compile
+call gradle -b Game/client/build.gradle compile
 echo:
 echo:
 echo Compiling the game server.
 echo:
-call ant -f Game/server/build.xml compile
+call gradle -b Game/server/build.gradle compile
 echo:
 echo:
 
@@ -31,7 +31,7 @@ echo Removing old then extracting a fresh client cache to your home folder.
 echo:
 rmdir "%HOMEPATH%/OpenRSC" /s /Q
 md "%HOMEPATH%/OpenRSC"
-7z x "Game/client/cache.zip" -o"%HOMEPATH%/OpenRSC" -r
+7z x "Game/client/cache.zip" -o"%HOMEPATH%/OpenRSC" -r > NULL
 echo:
 echo:
 
@@ -45,7 +45,7 @@ echo:
 REM   Generate updated cache files, copies them to cache folder overwriting existing:
 echo Generating cache .dat files from current config database and copying to client cache in your home folder.
 echo:
-call ant -f Game/server/build.xml npcs items objects > NULL
+call sudo gradle -b Game/server/build.gradle npcs items objects > NULL
 xcopy /y "Game/server/npcs.dat" "%HOMEPATH%/OpenRSC/npcs.dat"
 xcopy /y "Game/server/objects.dat" "%HOMEPATH%/OpenRSC/objects.dat"
 xcopy /y "Game/server/items.dat" "%HOMEPATH%/OpenRSC/items.dat"
@@ -55,13 +55,15 @@ echo:
 REM   Run the game client in a new window:
 echo Starting the game client in a new window.
 echo:
-call START "" ant -f Game/client/build.xml runclient
+call START "" java -jar Game/client/Open_RSC_Client.jar
 echo:
 echo:
 
 REM   Run the game server in the current window:
 echo Starting the game server in the current window.
 echo:
-call ant -f Game/server/build.xml runserver
+cd Game/server
+call java -jar Open_RSC_Server.jar
+cd ../../
 echo:
 pause