From 998d3ae83dfb07736a16718851d8a823720ab78d Mon Sep 17 00:00:00 2001
From: Ben Kerllenevich <me@notom3ga.me>
Date: Sun, 13 Jun 2021 10:26:34 -0400
Subject: [PATCH] switch fully away from submodule

---
 .gitmodules       |  4 ---
 Paper             |  1 -
 build.gradle.kts  | 88 +----------------------------------------------
 gradle.properties | 10 +++---
 4 files changed, 7 insertions(+), 96 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 Paper

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 8d68aa28c..000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,4 +0,0 @@
-[submodule "Paper"]
-	path = Paper
-	url = https://github.com/PaperMC/Paper
-	branch = dev/1.17
diff --git a/Paper b/Paper
deleted file mode 160000
index 19da14ee0..000000000
--- a/Paper
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 19da14ee00f93cc6b3e234162062a818df1f97d2
diff --git a/build.gradle.kts b/build.gradle.kts
index 8ac05adb3..081bcecce 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,3 @@
-import io.papermc.paperweight.util.Git
-
 plugins {
     java
     id("com.github.johnrengelman.shadow") version "7.0.0" apply false
@@ -52,69 +50,10 @@ subprojects {
     }
 }
 
-/*
-val paperDir = layout.projectDirectory.dir("Paper")
-val paperBranch = "dev/1.17"
-
-val initSubmodules by tasks.registering {
-    group = "paperweight"
-
-    outputs.upToDateWhen { false }
-    doLast {
-        paperDir.asFile.mkdirs()
-        Git(layout.projectDirectory)("submodule", "update", "--init", "--recursive").executeOut()
-    }
-}
-
-val upstreamUpdate by tasks.registering {
-    group = "paperweight"
-
-    outputs.upToDateWhen { false }
-    finalizedBy(cleanUpstreamCaches)
-
-    doLast {
-        Git(paperDir)("fetch").executeOut()
-        Git(paperDir)("clean", "-fd").executeOut()
-        Git(paperDir)("reset", "--hard", "origin/$paperBranch").executeOut()
-        Git(layout.projectDirectory)("add", "--force", paperDir.asFile.name).executeOut()
-        Git(layout.projectDirectory)("submodule", "update", "--init", "--recursive").executeOut()
-    }
-}
-
-val cleanUpstreamCaches by tasks.registering(GradleBuild::class) {
-    dir = paperDir.asFile
-    tasks = listOf("cleanCache")
-}
-
-val upstreamCommit by tasks.registering {
-    group = "paperweight"
-
-    outputs.upToDateWhen { false }
-    doLast {
-        val old = Git(layout.projectDirectory)("ls-tree", "HEAD", paperDir.asFile.name).readText()
-            ?.substringAfter("commit ")?.substringBefore("\t")
-        val changes = Git(paperDir)("log", "--oneline", "$old...HEAD").readText()
-        changes ?: run {
-            println("No changes to commit?")
-            return@doLast
-        }
-        val commitMessage = """
-            |Updated Upstream (Paper)
-            |
-            |Upstream has released updates that appear to apply and compile correctly.
-            |
-            |Paper Changes:
-            |$changes
-        """.trimMargin()
-        Git(layout.projectDirectory)("commit", "-m", commitMessage).executeOut()
-    }
-}
-*/
-
 paperweight {
     serverProject.set(project(":Purpur-Server"))
 
-    usePaperUpstream(providers.gradleProperty("paperRef")) {
+    usePaperUpstream(providers.gradleProperty("paperCommit")) {
         withPaperPatcher {
             apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
             apiOutputDir.set(layout.projectDirectory.dir("Purpur-API"))
@@ -123,29 +62,4 @@ paperweight {
             serverOutputDir.set(layout.projectDirectory.dir("Purpur-Server"))
         }
     }
-
-    /*
-    upstreams {
-        register("paper") {
-            upstreamDataTask {
-                dependsOn(initSubmodules)
-                projectDir.set(paperDir)
-                workDir.set(layout.projectDirectory)
-            }
-
-            patchTasks {
-                register("api") {
-                    sourceDir.set(paperDir.dir("Paper-API"))
-                    patchDir.set(layout.projectDirectory.dir("patches/api"))
-                    outputDir.set(layout.projectDirectory.dir("Purpur-API"))
-                }
-                register("server") {
-                    sourceDir.set(paperDir.dir("Paper-Server"))
-                    patchDir.set(layout.projectDirectory.dir("patches/server"))
-                    outputDir.set(layout.projectDirectory.dir("Purpur-Server"))
-                }
-            }
-        }
-    }
-     */
 }
diff --git a/gradle.properties b/gradle.properties
index df4a3896c..10dacb61f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,6 @@
-group = "net.pl3x.purpur"
-version = 1.17-R0.1-SNAPSHOT
-packageVersion = 1_17_R1
-paperRef = dev/1.17
+group=net.pl3x.purpur
+version=1.17-R0.1-SNAPSHOT
+packageVersion=1_17_R1
+paperCommit=0ea382b41d440644c103961fd9373574b6e12772
+
+org.gradle.jvmargs=-Xmx3G