From a1416734d5f0762eb3d246c655f45f29d2011f9f Mon Sep 17 00:00:00 2001
From: BillyGalbreath <blake.galbreath@gmail.com>
Date: Tue, 15 Jun 2021 12:48:49 -0500
Subject: [PATCH] fix mcdev imports

---
 build-data/library-imports.txt | 7 +++++++
 build-data/mcdev-imports.txt   | 4 ++++
 build.gradle.kts               | 6 +++---
 library-imports.txt            | 0
 mcdev-imports.txt              | 0
 5 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 build-data/library-imports.txt
 create mode 100644 build-data/mcdev-imports.txt
 delete mode 100644 library-imports.txt
 delete mode 100644 mcdev-imports.txt

diff --git a/build-data/library-imports.txt b/build-data/library-imports.txt
new file mode 100644
index 000000000..e6e68fdb6
--- /dev/null
+++ b/build-data/library-imports.txt
@@ -0,0 +1,7 @@
+# You can use this file to import files from minecraft libraries into the project
+# format:
+#     <artifactId> <fileName>
+# both fully qualified and a file based syntax are accepted for <fileName>:
+# authlib com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java
+# datafixerupper com.mojang.datafixers.DataFixerBuilder
+# datafixerupper com/mojang/datafixers/util/Either.java
diff --git a/build-data/mcdev-imports.txt b/build-data/mcdev-imports.txt
new file mode 100644
index 000000000..6f0ec2fe8
--- /dev/null
+++ b/build-data/mcdev-imports.txt
@@ -0,0 +1,4 @@
+# You can use this file to import files from vanilla into the project
+# both fully qualified and a file based syntax are accepted here:
+# net.minecraft.world.level.entity.LevelEntityGetterAdapter
+# net/minecraft/world/level/entity/LevelEntityGetter.java
diff --git a/build.gradle.kts b/build.gradle.kts
index 69a96a470..41effb11d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -65,9 +65,9 @@ paperweight {
         patchTasks {
             named("server") {
                 patchTask {
-                    sourceMcDevJar.set(layout.projectDirectory.file(".gradle/cache/paperweight/upstreams/paper/.gradle/caches/paperweight/taskCache/decompileJar.jar"))
-                    libraryImports.set(layout.projectDirectory.file("library-imports.txt"))
-                    mcdevImports.set(layout.projectDirectory.file("mcdev-imports.txt"))
+                    sourceMcDevJar.set(layout.projectDirectory.file(".gradle/caches/paperweight/upstreams/paper/.gradle/caches/paperweight/taskCache/decompileJar.jar"))
+                    libraryImports.set(layout.projectDirectory.file("build-data/library-imports.txt"))
+                    mcdevImports.set(layout.projectDirectory.file("build-data/mcdev-imports.txt"))
                 }
             }
         }
diff --git a/library-imports.txt b/library-imports.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/mcdev-imports.txt b/mcdev-imports.txt
deleted file mode 100644
index e69de29bb..000000000