Merge pull request #126 from Akarin-project/master

Updated various dev files from master

.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Fri Mar 06 14:06:17 MST 2020
-gradle.version=5.6.2
+#Sat Mar 28 16:11:26 MST 2020
+gradle.version=6.2.2

scripts/build - Copy.sh

@@ -1,63 +0,0 @@
-#!/usr/bin/env bash
-
-(
-set -e
-basedir="$(cd "$1" && pwd -P)"
-workdir="$basedir/work"
-paperbasedir="$basedir/work/Paper"
-paperworkdir="$basedir/work/Paper/work"
-
-if [[ "$2" == "--setup" ]] || [[ "$3" == "--setup" ]] || [[ "$4" == "--setup" ]]; then
-	echo "[Akarin] Setup Paper.."
-	(
-		if [[ "$2" == "--remote" ]] || [[ "$3" == "--remote" ]] || [[ "$4" == "--remote" ]]; then
-			cd "$paperworkdir"
-			if [[ -d "Minecraft" ]]; then
-				rm Minecraft/ -r
-			fi
-			git clone https://github.com/Akarin-project/Minecraft.git
-		fi
-
-		#cd "$paperbasedir"
-		#./paper patch
-	)
-fi
-
-echo "[Akarin] Ready to build"
-(
-	cd "$paperbasedir"
-	echo "[Akarin] Touch sources.."
-
-	cd "$paperbasedir"
-	if [[ "$2" == "--fast" ]] || [[ "$3" == "--fast" ]] || [[ "$4" == "--fast" ]]; then
-		echo "[Akarin] Test and repatch has been skipped"
-		echo "$paperbasedir/if"
-		\cp -rf "$basedir/api/src/main" "$paperbasedir/Paper-API/src/"
-		\cp -rf "$basedir/api/pom.xml" "$paperbasedir/Paper-API/"
-		\cp -rf "$basedir/src" "$paperbasedir/Paper-Server/"
-		\cp -rf "$basedir/pom.xml" "$paperbasedir/Paper-Server/"
-		mvn clean install -Dmaven.test.skip=true
-	else
-		echo "$paperbasedir/else"
-		rm -rf Paper-API/src
-		rm -rf Paper-Server/src
-		./paper patch
-		\cp -rf "$basedir/api/src/main" "$paperbasedir/Paper-API/src/"
-		\cp -rf "$basedir/api/pom.xml" "$paperbasedir/Paper-API/"
-		\cp -rf "$basedir/src" "$paperbasedir/Paper-Server/"
-		\cp -rf "$basedir/pom.xml" "$paperbasedir/Paper-Server/"
-		mvn clean install -Dmaven.test.skip=true
-	fi
-	
-	minecraftversion=$(cat "$paperworkdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
-	rawjar="$paperbasedir/Paper-Server/target/akarin-$minecraftversion.jar"
-	\cp -rf "$rawjar" "$basedir/akarin-$minecraftversion.jar"
-	rawapi="$paperbasedir/Paper-API/target/akarin-api-1.14.4-R0.1-SNAPSHOT.jar"
-	\cp -rf "$rawapi" "$basedir/akarin-api-1.14.4-R0.1-SNAPSHOT.jar"
-	
-	echo ""
-	echo "[Akarin] Build successful"
-	echo "[Akarin] Migrated the final jar to $basedir/"
-)
-
-)

scripts/gradlebuild.sh

@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+
+(
+set -e
+version="master"
+basedir="$(cd "$1" && pwd -P)"
+workdir="$basedir/work"
+paperbasedir="$basedir/work/Paper"
+paperworkdir="$basedir/work/Paper/work"
+
+# init
+git submodule update --init --remote
+cd "$basedir"
+
+echo "[Akarin] Setup Paper.."
+cd "$paperworkdir"
+if [[ -d "Minecraft" ]]; then
+	rm Minecraft/ -r
+fi
+git clone https://github.com/Akarin-project/Minecraft.git
+
+echo "[Akarin] Ready to build"
+
+cd "$paperbasedir"
+echo "[Akarin] Touch sources.."
+	
+rm -rf Paper-API/src
+rm -rf Paper-Server/src
+./paper patch
+\cp -rf "$basedir/api/src/main" "$paperbasedir/Paper-API/src/"
+\cp -rf "$basedir/api/pom.xml" "$paperbasedir/Paper-API/"
+\cp -rf "$basedir/src" "$paperbasedir/Paper-Server/"
+\cp -rf "$basedir/pom.xml" "$paperbasedir/Paper-Server/"
+
+cd "$basedir"
+bash ./gradlew install
+	
+minecraftversion=$(cat "$paperworkdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
+rawjar="$paperbasedir/Paper-Server/target/akarin-$minecraftversion.jar"
+\cp -rf "$rawjar" "$basedir/akarin-$minecraftversion.jar"
+rawapi="$paperbasedir/Paper-API/target/akarin-api-1.14.4-R0.1-SNAPSHOT.jar"
+\cp -rf "$rawapi" "$basedir/akarin-api-1.14.4-R0.1-SNAPSHOT.jar"
+	
+echo ""
+echo "[Akarin] Build successful"
+echo "[Akarin] Migrated the final jar to $basedir/"
+
+)