From a77495e15e3d3bb86caacc80fe188d3958beceeb Mon Sep 17 00:00:00 2001
From: Steven Tracey <steven@nevets.tech>
Date: Thu, 29 Jul 2021 11:58:27 -0400
Subject: [PATCH] setup dev environment

---
 .gitattributes                             |   6 +
 .gitignore                                 |  17 ++
 build.gradle.kts                           |  73 ++++++++
 gradle.properties                          |   1 +
 gradle/wrapper/gradle-wrapper.properties   |   5 +
 gradlew                                    | 185 +++++++++++++++++++++
 gradlew.bat                                |  89 ++++++++++
 scripts/upstreamCommit.sh                  |  28 ++++
 settings.gradle.kts                        |  10 ++
 upstreamConfig/0001-Tuinity.properties     |   5 +
 upstreamConfig/0002-Airplane.properties    |   5 +
 upstreamConfig/0003-Purpur.properties      |   5 +
 upstreamConfig/0004-Empirecraft.properties |   5 +
 upstreamConfig/0005-Sugarcane.properties   |   5 +
 upstreamUtils/step1.js                     |  59 +++++++
 upstreamUtils/step2-alternative.sh         |  26 +++
 upstreamUtils/step2.sh                     |  25 +++
 17 files changed, 549 insertions(+)
 create mode 100644 .gitattributes
 create mode 100644 build.gradle.kts
 create mode 100644 gradle.properties
 create mode 100644 gradle/wrapper/gradle-wrapper.properties
 create mode 100644 gradlew
 create mode 100644 gradlew.bat
 create mode 100644 scripts/upstreamCommit.sh
 create mode 100644 settings.gradle.kts
 create mode 100644 upstreamConfig/0001-Tuinity.properties
 create mode 100644 upstreamConfig/0002-Airplane.properties
 create mode 100644 upstreamConfig/0003-Purpur.properties
 create mode 100644 upstreamConfig/0004-Empirecraft.properties
 create mode 100644 upstreamConfig/0005-Sugarcane.properties
 create mode 100644 upstreamUtils/step1.js
 create mode 100644 upstreamUtils/step2-alternative.sh
 create mode 100644 upstreamUtils/step2.sh

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..00a51af
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,6 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# These are explicitly windows files and should use crlf
+*.bat           text eol=crlf
+
diff --git a/.gitignore b/.gitignore
index a1c2a23..4a7fb2b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,20 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+
+# Ignore Gradle project-specific cache directory
+.gradle/
+build/
+
+#IntelliJ
+*.iml
+*.ipr
+*.iws
+.idea/
+out/
+
+run/
+
+Luna-Server
+Luna-API
+Luna-MojangAPI
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..1e4e43c
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,73 @@
+plugins {
+    java
+    id("com.github.johnrengelman.shadow") version "7.0.0" apply false
+    id("io.papermc.paperweight.patcher") version "1.1.8"
+}
+
+repositories {
+    mavenCentral()
+    maven("https://papermc.io/repo/repository/maven-public/") {
+        content {
+            onlyForConfigurations("paperclip")
+        }
+    }
+    maven("https://maven.quiltmc.org/repository/release/") {
+        content {
+            onlyForConfigurations("remapper")
+        }
+    }
+}
+
+dependencies {
+    remapper("org.quiltmc:tiny-remapper:0.4.1")
+    paperclip("io.papermc:paperclip:2.0.1")
+}
+
+subprojects {
+    apply(plugin = "java")
+
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(16))
+        }
+    }
+
+    tasks.withType<JavaCompile>().configureEach {
+        options.encoding = "UTF-8"
+        options.release.set(16)
+    }
+
+    repositories {
+        mavenCentral()
+        maven("https://oss.sonatype.org/content/groups/public/")
+        maven("https://papermc.io/repo/repository/maven-public/")
+        maven("https://ci.emc.gs/nexus/content/groups/aikar/")
+        maven("https://repo.aikar.co/content/groups/aikar")
+        maven("https://repo.md-5.net/content/repositories/releases/")
+        maven("https://hub.spigotmc.org/nexus/content/groups/public/")
+        maven("https://jitpack.io") // Airplane
+    }
+}
+
+paperweight {
+    serverProject.set(project(":Luna-Server"))
+
+    usePaperUpstream(providers.gradleProperty("paperCommit")) {
+        withPaperPatcher {
+            apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
+            apiOutputDir.set(layout.projectDirectory.dir("Luna-API"))
+
+            serverPatchDir.set(layout.projectDirectory.dir("patches/server"))
+            serverOutputDir.set(layout.projectDirectory.dir("Luna-Server"))
+        }
+
+        patchTasks {
+            register("mojangApi") {
+                isBareDirectory.set(true)
+                upstreamDirPath.set("Paper-MojangAPI")
+                patchDir.set(layout.projectDirectory.dir("patches/mojangapi"))
+                outputDir.set(layout.projectDirectory.dir("Luna-MojangAPI"))
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..dc211a5
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1 @@
+group = vip.lunamc.server.survival
version = 1.17.1-R0.1-SNAPSHOT

mcVersion = 1.17.1
packageVersion = 1_17_R1
paperCommit = a67959e131d35cfc73b5cfe10e641ce767c161d0

org.gradle.parallel=true
org.gradle.vfs.watch=false

org.gradle.jvmargs=-Xmx3G -Xms2G
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..05679dc
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000..744e882
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MSYS* | MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..107acd3
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/scripts/upstreamCommit.sh b/scripts/upstreamCommit.sh
new file mode 100644
index 0000000..4087dee
--- /dev/null
+++ b/scripts/upstreamCommit.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+(
+set -e
+PS1="$"
+
+function changelog() {
+    base=$(git ls-tree HEAD $1  | cut -d' ' -f3 | cut -f1)
+    cd $1 && git log --oneline ${base}...HEAD
+}
+paper=$(changelog .gradle/caches/paperweight/upstreams/paper)
+
+updated=""
+logsuffix=""
+if [ ! -z "$paper" ]; then
+    logsuffix="$logsuffix\n\nPaper Changes:\n$paper"
+    updated="Paper"
+fi
+disclaimer="Upstream has released updates that appear to apply and compile correctly"
+
+if [ ! -z "$1" ]; then
+    disclaimer="$@"
+fi
+
+log="${UP_LOG_PREFIX}Updated Upstream ($updated)\n\n${disclaimer}${logsuffix}"
+
+echo -e "$log" | git commit -F -
+
+) || exit 1
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000..26f5c02
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,10 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven("https://papermc.io/repo/repository/maven-public/")
+    }
+}
+
+rootProject.name = "Luna"
+
+include("Luna-API", "Luna-Server", "Luna-MojangAPI")
\ No newline at end of file
diff --git a/upstreamConfig/0001-Tuinity.properties b/upstreamConfig/0001-Tuinity.properties
new file mode 100644
index 0000000..ec8d78e
--- /dev/null
+++ b/upstreamConfig/0001-Tuinity.properties
@@ -0,0 +1,5 @@
+name=Tuinity
+repo=https://github.com/Tuinity/Tuinity.git
+useBlackList=True
+list=server/Build-changes.patch,server/Update-version-fetcher-repo.patch
+branch=origin/master
\ No newline at end of file
diff --git a/upstreamConfig/0002-Airplane.properties b/upstreamConfig/0002-Airplane.properties
new file mode 100644
index 0000000..39cefd6
--- /dev/null
+++ b/upstreamConfig/0002-Airplane.properties
@@ -0,0 +1,5 @@
+name=Airplane
+repo=https://github.com/TECHNOVE/Airplane.git
+useBlackList=True
+list=server/Airplane-Branding-Changes.patch
+branch=origin/ver/1.17
\ No newline at end of file
diff --git a/upstreamConfig/0003-Purpur.properties b/upstreamConfig/0003-Purpur.properties
new file mode 100644
index 0000000..75beada
--- /dev/null
+++ b/upstreamConfig/0003-Purpur.properties
@@ -0,0 +1,5 @@
+name=Purpur
+repo=https://github.com/pl3xgaming/Purpur.git
+useBlackList=False
+list=api/Purpur-config-files.patch,server/Purpur-config-files.patch,server/Disable-outdated-build-check.patch,server/Fix-outdated-server-showing-in-ping-before-server-fu.patch,server/Dont-send-useless-entity-packets.patch,server/Fix-the-dead-lagging-the-server.patch,server/Skip-events-if-there-s-no-listeners.patch,server/Add-permission-for-F3-N-debug.patch,server/MC-168772-Fix-Add-turtle-egg-block-options.patch,api/Lagging-threshold.patch,server/Logger-settings-suppressing-pointless-logs.patch,server/Configurable-TPS-Catchup.patch,server/Configurable-villager-brain-ticks.patch,server/Squid-EAR-immunity.patch,server/Alternative-Keepalive-Handling.patch,server/Signs-editable-on-right-click.patch,server/Signs-allow-color-codes.patch
+branch=origin/ver/1.17.1
\ No newline at end of file
diff --git a/upstreamConfig/0004-Empirecraft.properties b/upstreamConfig/0004-Empirecraft.properties
new file mode 100644
index 0000000..c00f791
--- /dev/null
+++ b/upstreamConfig/0004-Empirecraft.properties
@@ -0,0 +1,5 @@
+name=Empirecraft
+repo=https://github.com/starlis/empirecraft.git
+useBlackList=False
+list=server/Don-t-trigger-Lootable-Refresh-for-non-player-intera.patch,server/dont-load-chunks-for-physics.patch,server/Don-t-save-Fireworks.patch,server/Don-t-use-force-unload-for-keep-spawn-setting-change.patch,server/Fix-Give-command.patch
+branch=origin/master
\ No newline at end of file
diff --git a/upstreamConfig/0005-Sugarcane.properties b/upstreamConfig/0005-Sugarcane.properties
new file mode 100644
index 0000000..19d06e7
--- /dev/null
+++ b/upstreamConfig/0005-Sugarcane.properties
@@ -0,0 +1,5 @@
+name=Sugarcane
+repo=https://github.com/SugarcaneMC/Sugarcane.git
+useBlackList=False
+list=server/Utilities.patch,server/Sugarcane-configuration.patch,server/Global-Eula-file.patch
+branch=origin/1.17.1/dev
\ No newline at end of file
diff --git a/upstreamUtils/step1.js b/upstreamUtils/step1.js
new file mode 100644
index 0000000..7e7ec01
--- /dev/null
+++ b/upstreamUtils/step1.js
@@ -0,0 +1,59 @@
+#!/usr/bin/env node
+const child_process = require('child_process');
+const util = require('util');
+const fs = require('fs');
+
+function execAsync(cmd, callback) {
+  const c = child_process.exec(cmd, callback);
+
+  c.stdout.pipe(process.stdout);
+  c.stderr.pipe(process.stderr);
+
+  return c;
+}
+
+const exec = util.promisify(execAsync);
+const readFile = util.promisify(fs.readFile);
+
+function realname(type, short) {
+  for (var i=0; i<=9999; i++) {
+    for (const prefix of ['', '0', '00', '000']) {
+      const full = 'patches/'+type+'/'+prefix+i+"-"+short;
+      if (fs.existsSync(full)) {
+        return full;
+      }
+    }
+  }
+  throw new Error(`patch not found type=${type} short=${short}`)
+}
+
+function parse(prop) {
+  return new Map(prop.replace(/\r/g,"").split("\n").filter(line => line !== "").map(line => {
+      const [key, value] = line.split("=");
+      return [key, value];
+    }));
+}
+
+(async () => {
+  await exec('rm -fr patches *-Server *-API');
+  await exec('git checkout HEAD patches');
+  await exec('./gradlew applyPatches');
+  const config = parse(await readFile(process.argv.slice().pop(), {encoding: 'utf8'}));
+  const patches = config.get('list').split(',').map(element => {
+    const [type, short] = element.split('/');
+    return realname(type, short);
+  });
+  const patchesCmd = patches.join(' ');
+  const configBlack = config.get('useBlackList');
+  const useBlackList = configBlack === 'True' ? true : (configBlack === 'False' ? false : void 0);
+  if (useBlackList === void 0) {
+    throw new Error('Illegal value');
+  }
+  if (useBlackList) {
+    await exec('rm '+patchesCmd);
+  } else {
+    await exec('rm -fr patches');
+    await exec('git checkout HEAD '+patchesCmd);
+  }
+  await exec('./gradlew applyPatches');
+})();
\ No newline at end of file
diff --git a/upstreamUtils/step2-alternative.sh b/upstreamUtils/step2-alternative.sh
new file mode 100644
index 0000000..8c4ba1a
--- /dev/null
+++ b/upstreamUtils/step2-alternative.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+set -e
+upstream=`cd "$1" && pwd`
+upstream_commmit=`cd "$upstream" && git rev-parse HEAD`
+upstream_name="$(eval echo `cd "$upstream" && grep '^rootProject.name =' settings.gradle.kts | awk '{print $3;}'`)"
+
+cd Luna-API
+if cat "$upstream/patches/api"/*.patch | patch -p1 --merge --no-backup-if-mismatch; then
+  :
+else
+  :
+fi
+git add .
+git commit -m"$upstream_name API Changes
+commit $upstream_commmit"
+
+
+cd ../Luna-Server
+if cat "$upstream/patches/server"/*.patch | patch -p1 --merge --no-backup-if-mismatch; then
+  :
+else
+  :
+fi
+git add .
+git commit -m"$upstream_name Server Changes
+commit $upstream_commmit"
\ No newline at end of file
diff --git a/upstreamUtils/step2.sh b/upstreamUtils/step2.sh
new file mode 100644
index 0000000..3c7fc2b
--- /dev/null
+++ b/upstreamUtils/step2.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+set -e
+
+rm -fr *.patch
+
+ver="$(git rev-parse HEAD)"
+
+rootProject.name(){
+  name="$2"
+}
+eval "$(grep '^rootProject.name =' settings.gradle.kts)"
+
+cd "$name-Server"
+onecommit() {
+git reset --soft base
+git commit -m"$name $1 Changes
+commit $ver
+$(git log --format=%B --reverse HEAD..HEAD@{1})"
+}
+onecommit Server
+git format-patch --no-signature --zero-commit --full-index --no-stat -N -o .. HEAD^
+cd "../$name-API"
+onecommit API
+git format-patch --no-signature --zero-commit --full-index --no-stat -N -o .. HEAD^
+cd ..
\ No newline at end of file