From ba9826b5e19251967c62ac49bedb557389121aea Mon Sep 17 00:00:00 2001 From: lexikiq Date: Wed, 19 Jan 2022 15:04:30 -0500 Subject: [PATCH] Exclude eden-common from shading (without patches) Slightly cleaner approach; less prone to patch breakage from upstream changes and much easier to update --- build.gradle.kts | 4 ++++ ....patch => 0001-Add-Getter-interfaces.patch} | 6 +++--- patches/api/0001-Build-changes.patch | 18 ------------------ ...ndEvent.patch => 0002-Add-SoundEvent.patch} | 0 ...0003-Add-PlayerUseRespawnAnchorEvent.patch} | 0 ...location-to-EntityDamageByBlockEvent.patch} | 0 ...h => 0005-Expanded-Adventure-support.patch} | 0 ...0006-Add-UnsafeValues-canPlaceItemOn.patch} | 0 ...ls.patch => 0007-Expose-NMS-ordinals.patch} | 0 ...atch => 0008-Expose-MCUtil-Executors.patch} | 0 ... => 0009-Add-BlockDropResourcesEvent.patch} | 0 ...patch => 0010-Add-Furnace-Recipe-API.patch} | 0 patches/server/0001-Build-changes.patch | 11 +++++------ 13 files changed, 12 insertions(+), 27 deletions(-) rename patches/api/{0002-Add-Getter-interfaces.patch => 0001-Add-Getter-interfaces.patch} (99%) delete mode 100644 patches/api/0001-Build-changes.patch rename patches/api/{0003-Add-SoundEvent.patch => 0002-Add-SoundEvent.patch} (100%) rename patches/api/{0004-Add-PlayerUseRespawnAnchorEvent.patch => 0003-Add-PlayerUseRespawnAnchorEvent.patch} (100%) rename patches/api/{0005-Add-origin-location-to-EntityDamageByBlockEvent.patch => 0004-Add-origin-location-to-EntityDamageByBlockEvent.patch} (100%) rename patches/api/{0006-Expanded-Adventure-support.patch => 0005-Expanded-Adventure-support.patch} (100%) rename patches/api/{0007-Add-UnsafeValues-canPlaceItemOn.patch => 0006-Add-UnsafeValues-canPlaceItemOn.patch} (100%) rename patches/api/{0008-Expose-NMS-ordinals.patch => 0007-Expose-NMS-ordinals.patch} (100%) rename patches/api/{0009-Expose-MCUtil-Executors.patch => 0008-Expose-MCUtil-Executors.patch} (100%) rename patches/api/{0010-Add-BlockDropResourcesEvent.patch => 0009-Add-BlockDropResourcesEvent.patch} (100%) rename patches/api/{0011-Add-Furnace-Recipe-API.patch => 0010-Add-Furnace-Recipe-API.patch} (100%) diff --git a/build.gradle.kts b/build.gradle.kts index 4ccea85..03b1b15 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -48,6 +48,10 @@ subprojects { maven("https://papermc.io/repo/repository/maven-public/") maven("https://sonatype.projecteden.gg/repository/maven-public/") } + + dependencies { + compileOnly("gg.projecteden:eden-common:2.0.5-SNAPSHOT") + } } paperweight { diff --git a/patches/api/0002-Add-Getter-interfaces.patch b/patches/api/0001-Add-Getter-interfaces.patch similarity index 99% rename from patches/api/0002-Add-Getter-interfaces.patch rename to patches/api/0001-Add-Getter-interfaces.patch index d6a0a93..de1ff86 100644 --- a/patches/api/0002-Add-Getter-interfaces.patch +++ b/patches/api/0001-Add-Getter-interfaces.patch @@ -659,7 +659,7 @@ index ff8f1231f3e2e71740fd24fa8d4dac5d0e550ae7..ee19d7fd5bb1851af39320f1edd858e1 private final UUID uuid; private final String name; diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java -index 0dd0beee6800fb34520dfa2d05e5bdda76624d64..1c34b25d3c8a4ec098de6402de4c84fc663d5c27 100644 +index 5f35ba35f8517ec28c1b21b3007c9a20dea097a7..37c83fd0ed65bc8b65ffca01b7e051d2175b751d 100644 --- a/src/main/java/org/bukkit/block/Block.java +++ b/src/main/java/org/bukkit/block/Block.java @@ -31,7 +31,7 @@ import org.jetbrains.annotations.Nullable; @@ -745,7 +745,7 @@ index 28d1ff809e44bda0324ffac957c1d455be02e783..2b64852da2f22bd984216ef0164587e0 // Paper start @Override diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java -index 5e4a9ce5f899624255e806152c59f60664bcf701..366ea14e42c21bd43f51434ddbf2d91b1433dff0 100644 +index 7eda2ba17e39b8183e572c1cefa8afffbf17afcb..4d518881b845087730ae51e4baad569400c312e1 100644 --- a/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java @@ -43,7 +43,7 @@ import org.jetbrains.annotations.Nullable; @@ -1051,7 +1051,7 @@ index 9013d043503d175004ad276799e5935b7fa59dc4..4095ca19e6ceff2432e0cbd372e9475f private boolean cancelled; diff --git a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java -index 694a81769076ea58aae9f14f076ab80c9952c957..d6efe9d51f1c8e975a897a1b03cfe5ceef5358f3 100644 +index 356d1154b0732e2daf242d60fa715dba9f2dc9db..9722f420816246fee91eaf19d320a9b5b42e94fc 100644 --- a/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java +++ b/src/main/java/org/bukkit/event/player/AsyncPlayerPreLoginEvent.java @@ -14,7 +14,7 @@ import org.jetbrains.annotations.NotNull; diff --git a/patches/api/0001-Build-changes.patch b/patches/api/0001-Build-changes.patch deleted file mode 100644 index f99040e..0000000 --- a/patches/api/0001-Build-changes.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: lexikiq -Date: Sun, 26 Dec 2021 20:48:45 -0500 -Subject: [PATCH] Build changes - - -diff --git a/build.gradle.kts b/build.gradle.kts -index 001c2b963205012f340db0d539e4033c748124ce..ec41f7da61db5209874a9f01b1b5c3a90f1ea3ea 100644 ---- a/build.gradle.kts -+++ b/build.gradle.kts -@@ -22,6 +22,7 @@ configurations.api { - } - - dependencies { -+ compileOnly("gg.projecteden:eden-common:2.0.5-SNAPSHOT") // Parchment - // api dependencies are listed transitively to API consumers - api("commons-lang:commons-lang:2.6") - api("com.google.guava:guava:31.0.1-jre") diff --git a/patches/api/0003-Add-SoundEvent.patch b/patches/api/0002-Add-SoundEvent.patch similarity index 100% rename from patches/api/0003-Add-SoundEvent.patch rename to patches/api/0002-Add-SoundEvent.patch diff --git a/patches/api/0004-Add-PlayerUseRespawnAnchorEvent.patch b/patches/api/0003-Add-PlayerUseRespawnAnchorEvent.patch similarity index 100% rename from patches/api/0004-Add-PlayerUseRespawnAnchorEvent.patch rename to patches/api/0003-Add-PlayerUseRespawnAnchorEvent.patch diff --git a/patches/api/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch b/patches/api/0004-Add-origin-location-to-EntityDamageByBlockEvent.patch similarity index 100% rename from patches/api/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch rename to patches/api/0004-Add-origin-location-to-EntityDamageByBlockEvent.patch diff --git a/patches/api/0006-Expanded-Adventure-support.patch b/patches/api/0005-Expanded-Adventure-support.patch similarity index 100% rename from patches/api/0006-Expanded-Adventure-support.patch rename to patches/api/0005-Expanded-Adventure-support.patch diff --git a/patches/api/0007-Add-UnsafeValues-canPlaceItemOn.patch b/patches/api/0006-Add-UnsafeValues-canPlaceItemOn.patch similarity index 100% rename from patches/api/0007-Add-UnsafeValues-canPlaceItemOn.patch rename to patches/api/0006-Add-UnsafeValues-canPlaceItemOn.patch diff --git a/patches/api/0008-Expose-NMS-ordinals.patch b/patches/api/0007-Expose-NMS-ordinals.patch similarity index 100% rename from patches/api/0008-Expose-NMS-ordinals.patch rename to patches/api/0007-Expose-NMS-ordinals.patch diff --git a/patches/api/0009-Expose-MCUtil-Executors.patch b/patches/api/0008-Expose-MCUtil-Executors.patch similarity index 100% rename from patches/api/0009-Expose-MCUtil-Executors.patch rename to patches/api/0008-Expose-MCUtil-Executors.patch diff --git a/patches/api/0010-Add-BlockDropResourcesEvent.patch b/patches/api/0009-Add-BlockDropResourcesEvent.patch similarity index 100% rename from patches/api/0010-Add-BlockDropResourcesEvent.patch rename to patches/api/0009-Add-BlockDropResourcesEvent.patch diff --git a/patches/api/0011-Add-Furnace-Recipe-API.patch b/patches/api/0010-Add-Furnace-Recipe-API.patch similarity index 100% rename from patches/api/0011-Add-Furnace-Recipe-API.patch rename to patches/api/0010-Add-Furnace-Recipe-API.patch diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index f01e221..f02cbad 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Build changes diff --git a/build.gradle.kts b/build.gradle.kts -index 028f6a1795ceb99d1760c73b0980238677b4b8bc..603c4c12130c1be68eda955d89fb83f30b083ab3 100644 +index 028f6a1795ceb99d1760c73b0980238677b4b8bc..0466c22ca2325d090a5763c6b940252c32815a85 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -18,8 +18,9 @@ repositories { +@@ -18,8 +18,8 @@ repositories { } dependencies { @@ -16,11 +16,10 @@ index 028f6a1795ceb99d1760c73b0980238677b4b8bc..603c4c12130c1be68eda955d89fb83f3 - implementation(project(":paper-mojangapi")) + implementation(project(":parchment-api")) // Parchment + implementation("io.papermc.paper:paper-mojangapi:1.18.1-R0.1-SNAPSHOT") // Parchment -+ compileOnly("gg.projecteden:eden-common:2.0.5-SNAPSHOT") // Parchment // Paper start implementation("org.jline:jline-terminal-jansi:3.21.0") implementation("net.minecrell:terminalconsoleappender:1.3.0") -@@ -68,7 +69,7 @@ tasks.jar { +@@ -68,7 +68,7 @@ tasks.jar { attributes( "Main-Class" to "org.bukkit.craftbukkit.Main", "Implementation-Title" to "CraftBukkit", @@ -29,7 +28,7 @@ index 028f6a1795ceb99d1760c73b0980238677b4b8bc..603c4c12130c1be68eda955d89fb83f3 "Implementation-Vendor" to date, // Paper "Specification-Title" to "Bukkit", "Specification-Version" to project.version, -@@ -84,7 +85,27 @@ tasks.jar { +@@ -84,7 +84,27 @@ tasks.jar { publishing { publications.create("maven") { @@ -58,7 +57,7 @@ index 028f6a1795ceb99d1760c73b0980238677b4b8bc..603c4c12130c1be68eda955d89fb83f3 } } -@@ -156,7 +177,7 @@ fun TaskContainer.registerRunTask( +@@ -156,7 +176,7 @@ fun TaskContainer.registerRunTask( name: String, block: JavaExec.() -> Unit ): TaskProvider = register(name) {