From f204802b3b088116d8a451aec776d0e28684665d Mon Sep 17 00:00:00 2001
From: Bud Gidiere <sgidiere@gmail.com>
Date: Wed, 15 Jul 2020 14:09:04 -0500
Subject: [PATCH] Fix

---
 README.md                    |   6 +-
 fetchUpstream.sh             |  12 ----
 patchPaper.sh                |   1 -
 scripts/importmcdev_paper.sh | 122 -----------------------------------
 4 files changed, 1 insertion(+), 140 deletions(-)
 delete mode 100644 fetchUpstream.sh
 delete mode 100755 patchPaper.sh
 delete mode 100755 scripts/importmcdev_paper.sh

diff --git a/README.md b/README.md
index dc67a292..bd2c1e0d 100644
--- a/README.md
+++ b/README.md
@@ -47,11 +47,7 @@ ## Building and setting up
 Run the following commands in the root directory:
 
 ```
-git submodule init
-git submodule update
-./fetchUpstream.sh
-./yapfa build
-./yapfa paperclip
+./yapfa jar
 ```
 
 ## LICENSE
diff --git a/fetchUpstream.sh b/fetchUpstream.sh
deleted file mode 100644
index 3a7e3213..00000000
--- a/fetchUpstream.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-cd Tuinity
-git clean -fx
-git clean -fd
-git fetch
-git reset --hard origin/ver/1.16
-git submodule update --init --recursive -f
-cd ..
-sh patchPaper.sh
-cd Tuinity
-./tuinity paperclip
-cd ..
-./yapfa patch
\ No newline at end of file
diff --git a/patchPaper.sh b/patchPaper.sh
deleted file mode 100755
index 2183b818..00000000
--- a/patchPaper.sh
+++ /dev/null
@@ -1 +0,0 @@
-cp -f ./scripts/importmcdev_paper.sh ./Tuinity/Paper/scripts/importmcdev.sh
\ No newline at end of file
diff --git a/scripts/importmcdev_paper.sh b/scripts/importmcdev_paper.sh
deleted file mode 100755
index 9b2e567c..00000000
--- a/scripts/importmcdev_paper.sh
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/usr/bin/env bash
-
-(
-set -e
-nms="net/minecraft/server"
-export MODLOG=""
-PS1="$"
-basedir="$(cd "$1" && pwd -P)"
-source "$basedir/scripts/functions.sh"
-gitcmd="git -c commit.gpgsign=false"
-
-workdir="$basedir/work"
-minecraftversion=$(cat "$workdir/BuildData/info.json"  | grep minecraftVersion | cut -d '"' -f 4)
-decompiledir="$workdir/Minecraft/$minecraftversion/forge"
-# replace for now
-decompiledir="$workdir/Minecraft/$minecraftversion/spigot"
-export importedmcdev=""
-function import {
-    export importedmcdev="$importedmcdev $1"
-    file="${1}.java"
-    target="$workdir/Spigot/Spigot-Server/src/main/java/$nms/$file"
-    base="$decompiledir/$nms/$file"
-
-    if [[ ! -f "$target" ]]; then
-        export MODLOG="$MODLOG  Imported $file from mc-dev\n";
-        #echo "Copying $base to $target"
-        cp "$base" "$target" || exit 1
-    else
-        echo "UN-NEEDED IMPORT: $file"
-    fi
-}
-
-function importLibrary {
-    group=$1
-    lib=$2
-    prefix=$3
-    shift 3
-    for file in "$@"; do
-        file="$prefix/$file"
-        target="$workdir/Spigot/Spigot-Server/src/main/java/${file}"
-        targetdir=$(dirname "$target")
-        mkdir -p "${targetdir}"
-        base="$workdir/Minecraft/$minecraftversion/libraries/${group}/${lib}/$file"
-        if [ ! -f "$base" ]; then
-            echo "Missing $base"
-            exit 1
-        fi
-        export MODLOG="$MODLOG  Imported $file from $lib\n";
-        sed 's/\r$//' "$base" > "$target" || exit 1
-    done
-}
-
-(
-    cd "$workdir/Spigot/Spigot-Server/"
-    lastlog=$($gitcmd log -1 --oneline)
-    if [[ "$lastlog" = *"mc-dev Imports"* ]]; then
-        $gitcmd reset --hard HEAD^
-    fi
-)
-
-
-
-files=$(cat "$basedir/Spigot-Server-Patches/"* | grep "+++ b/src/main/java/net/minecraft/server/" | sort | uniq | sed 's/\+\+\+ b\/src\/main\/java\/net\/minecraft\/server\///g' | sed 's/.java//g')
-
-nonnms=$(grep -R "new file mode" -B 1 "$basedir/Spigot-Server-Patches/" | grep -v "new file mode" | grep -oE "net\/minecraft\/server\/.*.java" | grep -oE "[A-Za-z]+?.java$" --color=none | sed 's/.java//g')
-function containsElement {
-	local e
-	for e in "${@:2}"; do
-		[[ "$e" == "$1" ]] && return 0;
-	done
-	return 1
-}
-set +e
-for f in $files; do
-	containsElement "$f" ${nonnms[@]}
-	if [ "$?" == "1" ]; then
-		if [ ! -f "$workdir/Spigot/Spigot-Server/src/main/java/net/minecraft/server/$f.java" ]; then
-			if [ ! -f "$decompiledir/$nms/$f.java" ]; then
-				echo "$(color 1 31) ERROR!!! Missing NMS$(color 1 34) $f $(colorend)";
-			else
-				import $f
-			fi
-		fi
-	fi
-done
-
-########################################################
-########################################################
-########################################################
-#                   NMS IMPORTS
-# Temporarily add new NMS dev imports here before you run paper patch
-# but after you have paper rb'd your changes, remove the line from this file before committing.
-# we do not need any lines added to this file for NMS
-
-import PistonExtendsChecker
-import EnumDirection
-#import EnumAxisCycle # doesn't compile without fixes, copied into patch
-# import TileEntityPiston # doesn't compile without fixes, copied into patch
-
-
-
-########################################################
-########################################################
-########################################################
-#              LIBRARY IMPORTS
-# These must always be mapped manually, no automatic stuff
-#
-#             # group    # lib          # prefix               # many files
-
-# dont forget \ at end of each line but last
-importLibrary com.mojang authlib com/mojang/authlib yggdrasil/YggdrasilGameProfileRepository.java
-importLibrary com.mojang datafixerupper com/mojang/datafixers/util Either.java
-
-########################################################
-########################################################
-########################################################
-set -e
-cd "$workdir/Spigot/Spigot-Server/"
-rm -rf nms-patches applyPatches.sh makePatches.sh >/dev/null 2>&1
-$gitcmd add . -A >/dev/null 2>&1
-echo -e "mc-dev Imports\n\n$MODLOG" | $gitcmd commit . -F -
-)