From b7254c7d12bbd64f7640c3cddf91256e8d304e24 Mon Sep 17 00:00:00 2001
From: coolGi <sasanaps@hotmail.com>
Date: Thu, 7 Jul 2022 14:22:52 +0000
Subject: [PATCH] Fixed windows auto builder script

---
 buildAll     |  6 +++---
 buildAll.bat | 23 ++++++++++++-----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/buildAll b/buildAll
index 2636fdc81..69fb3ba4c 100755
--- a/buildAll
+++ b/buildAll
@@ -2,9 +2,9 @@
 
 buildVersion()
 {
-    ./gradlew -PmcVer=$1 build
-    ./gradlew mergeJars -PmcVer=$1
-    rm -R build/libs common/build/libs fabric/build/libs forge/build/libs
+    ./gradlew clean -PmcVer=$1 --no-daemon
+    ./gradlew build -PmcVer=$1 --no-daemon
+    ./gradlew mergeJars -PmcVer=$1 --no-daemon
 }
 
 buildVersion 1.19
diff --git a/buildAll.bat b/buildAll.bat
index 8d8ddae4e..bb2ed159c 100644
--- a/buildAll.bat
+++ b/buildAll.bat
@@ -1,16 +1,17 @@
 @echo off
 
-:buildVersion
-call gradlew.bat -PmcVer=%~1 build
-call gradlew.bat mergeJars -PmcVer=%~1
-rm -R build/libs common/build/libs fabric/build/libs forge/build/libs
-EXIT /B 0
-
 SETLOCAL
-CALL :buildVersion 1.19
-CALL :buildVersion 1.18.2
-CALL :buildVersion 1.18.1
-CALL :buildVersion 1.17.1
-CALL :buildVersion 1.16.5
+CALL :buildVersion "1.19"
+CALL :buildVersion "1.18.2"
+CALL :buildVersion "1.18.1"
+CALL :buildVersion "1.17.1"
+CALL :buildVersion "1.16.5"
 EXIT /B %ERRORLEVEL%
 
+:buildVersion
+@echo on
+call ./gradlew.bat clean -PmcVer="%~1" --no-daemon
+call ./gradlew.bat build -PmcVer="%~1" --no-daemon
+call ./gradlew.bat mergeJars -PmcVer="%~1" --no-daemon
+@echo off
+EXIT /B 0