Better, Faster Build Piepline

.github/workflows/build.yml

@@ -2,45 +2,50 @@ name: CI
 
 on: [push, pull_request]
 
+
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        java: [11, 8]
+        java: [11, 8, 14]
 
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK ${{ matrix.java }}
       uses: actions/[email protected]
       with:
         java-version: ${{ matrix.java }}
-
-    - uses: actions/[email protected]
+    - name: Pull Maven Cache
+      uses: actions/[email protected]
+      id: maven-cache
       with:
         path: ~/.m2/repository
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: ${{ runner.os }}-maven-
-
+    - uses: s4u/[email protected]
+      name: Use ${{ matrix.java }} as the java target
+      with:
+        properties: '[{"maven.compiler.target": "${{ matrix.java }}"}]'
+    - name: Setup YAPFA Project
+      run: |
+         git submodule update --init --recursive -f
+         git config --global user.email "[email protected]"
+         git config --global user.name "Github CI"
+         sudo chmod -R -f 777 scripts   
+    - name: Build Maven Depends
+      if: steps.maven-cache.outputs.cache-hit != 'true'
+      run: |
+         cd Tuinity
+         ./tuinity jar
+         cd ..//           
     - name: Build YAPFA
       run: |
-        git submodule init
-        git submodule update --init --recursive
-        git config --global user.email "[email protected]"
-        git config --global user.name "Github CI"
-        yapfaDir=`pwd`
-        ./patchPaper.sh
-        cd Tuinity
-        mvn -N install
-        ./tuinity patch
-        cd $yapfaDir
-        ./yapfa patch
-        ./yapfa build
-        ./yapfa paperclip
+        ./yapfa full
     - name: Upload Artifact
       uses: actions/upload-artifact@v2-preview
       with:
         name: YAPFA-${{ matrix.java }}
-        path: yapfa-paperclip.jar
+        path: target/YAPFA-1.16.1-paperclip.jar

.gitignore

@@ -7,3 +7,5 @@ mc-dev
 .project
 .idea
 yapfa-paperclip.jar
+
+target/site/surefire-report.html

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "Tuinity"]
 	path = Tuinity
-	url = https://github.com/Spottedleaf/Tuinity
+	url = https://github.com/tsao-chi/Tuinity-autoupstreamupdate.git
+	branch = ver/1.16

README.md

@@ -47,11 +47,8 @@ This Fork tries to import universal/performance patches from [EMC](https://githu
 Run the following commands in the root directory:
 
 ```
-git submodule init
-git submodule update
-./fetchUpstream.sh
-./yapfa build
-./yapfa paperclip
+git submodule update --init --recursive --force
+./yapfa jar
 ```
 
 ## LICENSE
@@ -61,4 +58,4 @@ Everything is licensed under the MIT license, and is free to be used in your own
 See [EMC](https://github.com/starlis/empirecraft), [Lithium](https://github.com/jellysquid3/lithium-fabric), [Akarin](https://github.com/Akarin-project/Akarin), [Purpur](https://github.com/pl3xgaming/Purpur) and [Tuinity](https://github.com/Spottedleaf/Tuinity)
 for the license of material used/modified by this project.
 
-**By using this project you accept the Mojang EULA! Starting the server-jar requires that you have read and accepted the EULA because of [this patch](https://github.com/tr7zw/YAPFA/blob/master/patches/server/0017-EMC-Accept-the-EULA.patch)!**
+**By using this project you accept the Mojang EULA! Starting the server-jar requires that you have read and accepted the EULA because of [this patch](https://github.com/tr7zw/YAPFA/blob/master/patches/server/0017-EMC-Accept-the-EULA.patch)!**

current-tuinity

@@ -1 +1 @@
-1.15.2--055421230a1bb70eefcf15d57ad8551e1e9d47b1
+1.16.1--8c602452d2ded22cb7322c41de5c78395b5f1348

scripts/applyPatches.sh

@@ -0,0 +1,95 @@
+#!/usr/bin/env bash
+
+# SCRIPT HEADER start
+basedir=$1
+source "$basedir/scripts/functions.sh"
+echo "  "
+echo "----------------------------------------"
+echo "  $(bashcolor 1 32)Task$(bashcolorend) - Apply Patches"
+echo "  This will apply all of YAPFA patches on top of the Paper."
+echo "  "
+echo "  $(bashcolor 1 32)Subtask:$(bashcolorend)"
+echo "  - Import Sources"
+echo "  "
+echo "  $(bashcolor 1 32)Modules:$(bashcolorend)"
+echo "  - $(bashcolor 1 32)1$(bashcolorend) : API"
+echo "  - $(bashcolor 1 32)2$(bashcolorend) : Server"
+echo "----------------------------------------"
+# SCRIPT HEADER end
+
+needimport=$2
+
+function applyPatch {
+    baseproject=$1
+    basename=$(basename $baseproject)
+    target=$2
+    branch=$3
+    patch_folder=$4
+
+    # Skip if that software have no patch
+    haspatch=-f "$basedir/patches/$patch_folder/"*.patch >/dev/null 2>&1 # too many files
+	if [ ! haspatch ]; then
+	    echo "  $(bashcolor 1 33)($5/$6) Skipped$(bashcolorend) - No patch found for $target under patches/$patch_folder"
+		return
+	fi
+
+    echo "  $(bashcolor 1 32)($5/$6)$(bashcolorend) - Setup upstream project.."
+    cd "$basedir/$baseproject"
+    $gitcmd fetch --all &> /dev/null
+	# Create the upstream branch in Paper project with current state
+    $gitcmd checkout master >/dev/null 2>&1 # possibly already in
+	$gitcmd branch -D upstream &> /dev/null
+	$gitcmd branch -f upstream "$branch" &> /dev/null && $gitcmd checkout upstream &> /dev/null
+
+	if [[ $needimport != "1" ]]; then
+	    if [ $baseproject != "Paper/Paper-API" ]; then
+	        echo "  $(bashcolor 1 32)($5/$6)$(bashcolorend) - Import new introduced NMS files.."
+	        basedir && $scriptdir/importSources.sh $basedir 1 || exit 1
+		fi
+    fi
+
+    basedir
+	# Create source project dirs
+    if [ ! -d  "$basedir/$target" ]; then
+        mkdir "$basedir/$target"
+        cd "$basedir/$target"
+        # $gitcmd remote add origin "$5"
+    fi
+    cd "$basedir/$target"
+	$gitcmd init > /dev/null 2>&1
+
+    echo "  "
+	echo "  $(bashcolor 1 32)($5/$6)$(bashcolorend) - Reset $target to $basename.."
+	# Add the generated Paper project as the upstream remote of subproject
+    $gitcmd remote rm upstream &> /dev/null
+    $gitcmd remote add upstream "$basedir/$baseproject" &> /dev/null
+	# Ensure that we are in the branch we want so not overriding things
+    $gitcmd checkout master &> /dev/null || $gitcmd checkout -b master &> /dev/null
+    $gitcmd fetch upstream &> /dev/null
+	# Reset our source project to Paper
+    cd "$basedir/$target" && $gitcmd reset --hard upstream/upstream &> /dev/null
+	echo "  "
+
+	echo "  $(bashcolor 1 32)($5/$6)$(bashcolorend) - Apply patches to $target.."
+	# Abort previous applying operation
+    $gitcmd am --abort >/dev/null 2>&1
+	# Apply our patches on top Paper in our dirs
+    $gitcmd am --no-utf8 --3way --ignore-whitespace "$basedir/patches/$patch_folder/"*.patch
+
+    if [ "$?" != "0" ]; then
+        echo "  Something did not apply cleanly to $target."
+        echo "  Please review above details and finish the apply then"
+        echo "  save the changes with rebuildPatches.sh"
+		echo "  or use 'git am --abort' to cancel this applying."
+        echo "  $(bashcolor 1 33)($5/$6) Suspended$(bashcolorend) - Resolve the conflict or abort the apply"
+		echo "  "
+		cd "$basedir/$target"
+        exit 1
+    else
+        echo "  $(bashcolor 1 32)($6/$6) Succeed$(bashcolorend) - Patches applied cleanly to $target"
+		echo "  "
+    fi
+}
+
+(applyPatch Tuinity/Tuinity-API ${FORK_NAME}-API HEAD api $API_REPO 0 2 &&
+applyPatch Tuinity/Tuinity-Server ${FORK_NAME}-Server HEAD server $SERVER_REPO 1 2) || exit 1

scripts/commitUpstream.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+echo "[YAPFA] State: Commit Upstream"
+
+(
+set -e
+
+function changeLog() {
+    base=$(git ls-tree HEAD $1  | cut -d' ' -f3 | cut -f1)
+    cd $1 && git log --oneline ${base}...HEAD
+}
+paper=$(changeLog Tuinity)
+
+updated=""
+logsuffix=""
+if [ ! -z "$paper" ]; then
+    logsuffix="$logsuffix\nTuinity Changes:\n$paper"
+    if [ -z "$updated" ]; then updated="Tuinity"; else updated="$updated/Tuinity"; fi
+fi
+disclaimer="Upstream has released updates that appears to apply and compile correctly"
+
+if [ ! -z "$1" ]; then
+    disclaimer="$@"
+fi
+
+log="Updated Upstream ($updated)\n\n${disclaimer}${logsuffix}"
+
+echo -e "$log" | git commit -F -
+
+) || exit 1

scripts/fetchUpstream.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+cd $1
+cd Tuinity
+git clean -fx
+git clean -fd
+git fetch
+git reset --hard origin/ver/1.16
+git submodule update --init --recursive -f