From 72955ad6c3b8085603176d7f17cb202006dcd9c7 Mon Sep 17 00:00:00 2001
From: Kyle Wood <kyle@denwav.dev>
Date: Sun, 20 Jun 2021 01:59:07 -0500
Subject: [PATCH] Merge library and mcdev imports files, bump paperweight

---
 build-data/dev-imports.txt     | 10 ++++++++++
 build-data/library-imports.txt |  7 -------
 build-data/mcdev-imports.txt   |  4 ----
 build.gradle.kts               |  2 +-
 4 files changed, 11 insertions(+), 12 deletions(-)
 create mode 100644 build-data/dev-imports.txt
 delete mode 100644 build-data/library-imports.txt
 delete mode 100644 build-data/mcdev-imports.txt

diff --git a/build-data/dev-imports.txt b/build-data/dev-imports.txt
new file mode 100644
index 0000000000..b818b96e27
--- /dev/null
+++ b/build-data/dev-imports.txt
@@ -0,0 +1,10 @@
+# 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
+# To import classes from the vanilla Minecraft jar use `minecraft` as the artifactId:
+#     minecraft net.minecraft.world.level.entity.LevelEntityGetterAdapter
+#     minecraft net/minecraft/world/level/entity/LevelEntityGetter.java
diff --git a/build-data/library-imports.txt b/build-data/library-imports.txt
deleted file mode 100644
index e6e68fdb6f..0000000000
--- a/build-data/library-imports.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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
deleted file mode 100644
index 6f0ec2fe82..0000000000
--- a/build-data/mcdev-imports.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# 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 44ee5bd805..521f94c606 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,7 +1,7 @@
 plugins {
     java
     id("com.github.johnrengelman.shadow") version "7.0.0" apply false
-    id("io.papermc.paperweight.core") version "1.1.3"
+    id("io.papermc.paperweight.core") version "1.1.4"
 }
 
 subprojects {