diff --git a/buildSrc/src/main/kotlin/task/ApplyPatches.kt b/buildSrc/src/main/kotlin/task/ApplyPatches.kt index 7dabccc2..6aaecab5 100644 --- a/buildSrc/src/main/kotlin/task/ApplyPatches.kt +++ b/buildSrc/src/main/kotlin/task/ApplyPatches.kt @@ -60,9 +60,9 @@ internal fun Project.createApplyPatchesTask( return false; } - fun applyPatchesYarn(): Boolean { - val projectDir = Paths.get("$rootDir/Yatopia-Server_yarn").toFile() - val importDir = Paths.get("$rootDir/mappings/work/Yatopia-Server_yarn_unpatched").toFile() + fun applyPatchesYarn(): Boolean { // Todo actually port to kotlin + val projectDir = Paths.get("$rootDir/$forkName-Server_yarn").toFile() + val importDir = Paths.get("$rootDir/mappings/work/$forkName-Server_yarn_unpatched").toFile() logger.lifecycle(">>> Resetting subproject $name") if (projectDir.exists()) { ensureSuccess(gitCmd("fetch", "origin", dir = projectDir)) @@ -74,7 +74,7 @@ internal fun Project.createApplyPatchesTask( projectDir.mkdirs() val applyName = "mappedPatches" - val name = "Yatopia-Server_yarn" + val name = "$forkName-Server_yarn" val patchDir: Path = Paths.get("$rootDir/mappedPatches") if (Files.notExists(patchDir)) return true @@ -107,6 +107,20 @@ internal fun Project.createApplyPatchesTask( return false; } + fun initYarn() { // Todo actually port to kotlin + val paperDecompDir = toothpick.paperDecompDir + bashCmd("cd mappings/mapper && ./gradlew installDist", printOut = true) + bashCmd("rm -fr mappings/work/Base", printOut = true) + bashCmd("mkdir -p mappings/work/Base/src/main/java/com/mojang", printOut = true) + bashCmd("cp -r $forkName-Server/src/main/java/* mappings/work/Base/src/main/java/", printOut = true) + bashCmd("cp -r $paperDecompDir/libraries/com.mojang/*/* mappings/work/Base/src/main/java/", printOut = true) + bashCmd("rm -fr mappings/work/$forkName-Server_yarn_unpatched && mkdir -p mappings/work/$forkName-Server_yarn_unpatched/src/main/java", printOut = true) + bashCmd("cp $forkName-Server/.gitignore $forkName-Server/pom.xml $forkName-Server/checkstyle.xml $forkName-Server/CONTRIBUTING.md $forkName-Server/LGPL.txt $forkName-Server/LICENCE.txt $forkName-Server/README.md mappings/work/$forkName-Server_yarn_unpatched/", printOut = true) + bashCmd("JAVA_OPTS='-Xms1G -Xmx2G' mappings/mapper/build/install/mapper/bin/mapper mappings/map.srg mappings/work/Base/src/main/java mappings/work/$forkName-Server_yarn_unpatched/src/main/java", printOut = true) + bashCmd("find -name '*.java' | xargs --max-procs=4 --no-run-if-empty sed -i '/^import [a-zA-Z0-9]*;$/d'", dir = File("${rootProject.projectDir}/mappings/work/$forkName-Server_yarn_unpatched/src/main/java")) + bashCmd("git init && git add . && git commit --quiet --message=init", dir = File("${rootProject.projectDir}/mappings/work/$forkName-Server_yarn_unpatched"), printOut = true) + } + doLast { for ((name, subproject) in toothpick.subprojects) { val (sourceRepo, projectDir, patchesDir) = subproject @@ -148,7 +162,7 @@ internal fun Project.createApplyPatchesTask( } bashCmd("rm -fr patches/server/*-Mapped-Patches.patch") - bashCmd("bash mappings/scripts/init.sh", printOut = true) + initYarn() if (applyPatchesYarn()) {} } diff --git a/mappings/scripts/init.sh b/mappings/scripts/init.sh deleted file mode 100755 index 323507c9..00000000 --- a/mappings/scripts/init.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -set -e -cd "$(dirname "$0")" -cd .. -basedir="$(cd .. && pwd -P)" - -source $basedir/mappings/scripts/source.sh - -do_fixes(){ - find -name '*.java' | xargs --max-procs=4 --no-run-if-empty sed -i '/^import [a-zA-Z0-9]*;$/d' -} - -cd ${basedir}/mappings/mapper -./gradlew installDist -cd "$basedir" - - -echo "Copying files for the 'Base' Folder" -rm -fr $basedir/mappings/work/Base -mkdir -p $basedir/mappings/work/Base/src/main/java/com/mojang -bash -c "cp -r ${basedir}/${inputdirprefix}Server/src/main/java/* ${basedir}/mappings/work/Base/src/main/java/" -# bash -c "cp -r ${basedir}/${inputdirprefix}API/src/main/java/* Base/src/main/java/" -mcver=$(cat "$paperdir/work/BuildData/info.json" | grep minecraftVersion | cut -d '"' -f 4) - -cp -r ${basedir}/${paperdir}/work/Minecraft/"${mcver}"/libraries/com.mojang/*/* ${basedir}/mappings/work/Base/src/main/java/ - - -echo "Setting up 'Mapped' Folder" -rm -fr $basedir/mappings/work/Yatopia-Server_yarn_unpatched -mkdir -p $basedir/mappings/work/Yatopia-Server_yarn_unpatched/src/main/java -echo "Remapping...." -cp "${basedir}/${inputdirprefix}Server/.gitignore" "${basedir}/${inputdirprefix}Server/pom.xml" "${basedir}/${inputdirprefix}Server/checkstyle.xml" "${basedir}/${inputdirprefix}Server/CONTRIBUTING.md" "${basedir}/${inputdirprefix}Server/LGPL.txt" "${basedir}/${inputdirprefix}Server/LICENCE.txt" "${basedir}/${inputdirprefix}Server/README.md" mappings/work/Yatopia-Server_yarn_unpatched/ - -JAVA_OPTS="-Xms1G -Xmx2G" ${basedir}/mappings/mapper/build/install/mapper/bin/mapper ${basedir}/mappings/map.srg ${basedir}/mappings/work/Base/src/main/java ${basedir}/mappings/work/Yatopia-Server_yarn_unpatched/src/main/java - -echo "Applying fixes..." -cd "$basedir"/mappings/work/Yatopia-Server_yarn_unpatched/src/main/java -do_fixes - -cd "$basedir"/mappings/work/Yatopia-Server_yarn_unpatched -git init -git add . -git commit --quiet --message=init -cd "$basedir"