switch to Tuinity

scripts/applyPatches.sh

@@ -91,5 +91,5 @@ function applyPatch {
     fi
 }
 
-(applyPatch Paper/Paper-API ${FORK_NAME}-API HEAD api $API_REPO 0 2 &&
-applyPatch Paper/Paper-Server ${FORK_NAME}-Server HEAD server $SERVER_REPO 1 2) || exit 1
+(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

@@ -9,13 +9,13 @@ function changeLog() {
     base=$(git ls-tree HEAD $1  | cut -d' ' -f3 | cut -f1)
     cd $1 && git log --oneline ${base}...HEAD
 }
-paper=$(changeLog Paper)
+paper=$(changeLog Tuinity)
 
 updated=""
 logsuffix=""
 if [ ! -z "$paper" ]; then
-    logsuffix="$logsuffix\n\nPaper Changes:\n$paper"
-    if [ -z "$updated" ]; then updated="Paper"; else updated="$updated/Paper"; fi
+    logsuffix="$logsuffix\n\Tuinity 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"
 
@@ -27,4 +27,4 @@ log="Updated Upstream ($updated)\n\n${disclaimer}${logsuffix}"
 
 echo -e "$log" | git commit -F -
 
-) || exit 1
+) || exit 1

scripts/functions.sh

@@ -43,7 +43,7 @@ function basedir {
 }
 
 function paperdir {
-    cd "$basedir/Paper"
+    cd "$basedir/Tuinity"
 }
 
 gitcmd() {

scripts/generateImports.sh

@@ -9,7 +9,7 @@ basedir=$1
 
 source "$basedir/scripts/functions.sh"
 
-paperworkdir="$basedir/Paper/work"
+paperworkdir="$basedir/Tuinity/Paper/work"
 minecraftversion=$(cat $paperworkdir/BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4)
 decompile="$paperworkdir/Minecraft/$minecraftversion/spigot"
 
@@ -28,7 +28,7 @@ rm src/net/minecraft/server/*.java
 cp $decompile/net/minecraft/server/*.java src/net/minecraft/server
 
 # diff and only preserve new added files
-paperserver="$basedir/Paper/Paper-Server/src/main/java/net/minecraft/server"
+paperserver="$basedir/Tuinity/Tuinity-Server/src/main/java/net/minecraft/server"
 cd $basedir/mc-dev/src/net/minecraft/server/
 
 for file in $(/bin/ls $paperserver)

scripts/importSources.sh

@@ -18,8 +18,8 @@ echo "----------------------------------------"
 # SCRIPT HEADER end
 
 # For a description of this script, see updateUpstream.sh.
-paperworkdir="$basedir/Paper/work"
-paperserverdir="$basedir/Paper/Paper-Server"
+paperworkdir="$basedir/Tuinity/Paper/work"
+paperserverdir="$basedir/Tuinity/Tuinity-Server"
 papersrcdir="$paperserverdir/src/main/java"
 papernmsdir="$papersrcdir/net/minecraft/server"
 
@@ -31,7 +31,7 @@ papernmsdir="$papersrcdir/net/minecraft/server"
     fi
 )
 
-minecraftversion=$(cat "$basedir"/Paper/work/BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4)
+minecraftversion=$(cat "$basedir"/Tuinity/Paper/work/BuildData/info.json | grep minecraftVersion | cut -d '"' -f 4)
 decompiledir=$paperworkdir/Minecraft/$minecraftversion/spigot
 
 nms="net/minecraft/server"

scripts/installLauncher.sh

@@ -15,7 +15,7 @@ echo "----------------------------------------"
 # License from Paper applies to this file
 
 set -e
-paperworkdir="$basedir/Paper/work"
+paperworkdir="$basedir/Tuinity/Paper/work"
 mcver=$(cat "$paperworkdir/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4)
 serverjar="$basedir/Akarin-Server/target/akarin-$mcver.jar"
 vanillajar="$paperworkdir/Minecraft/$mcver/$mcver.jar"

scripts/updateUpstream.sh

@@ -41,11 +41,11 @@ if [[ "$2" == "--resetPaper" ]]; then
 fi
 
 # patch paper
-echo "  $(bashcolor 1 32)(0/$subtasks)$(bashcolorend) - Apply patches of Paper.."
+echo "  $(bashcolor 1 32)(0/$subtasks)$(bashcolorend) - Apply patches of Tuinity.."
 echo "  "
-paperVer=$(gethead Paper)
+paperVer=$(gethead Tuinity)
 paperdir
-./paper patch
+./tuinity patch
 
 #cd "Paper-Server"
 #mcVer=$($mvncmd -o org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=minecraft_version | sed -n -e '/^\[.*\]/ !{ /^[0-9]/ { p; q } }')