diff --git a/build.gradle.kts b/build.gradle.kts index 4d23673..75f8c8a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,4 @@ import io.papermc.paperweight.util.constants.* -val edenVersion: String by project plugins { java @@ -49,10 +48,6 @@ subprojects { maven("https://papermc.io/repo/repository/maven-public/") maven("https://sonatype.projecteden.gg/repository/maven-public/") } - - dependencies { - implementation("gg.projecteden:eden-interfaces:$edenVersion") - } } paperweight { diff --git a/patches/api/0001-Build-changes.patch b/patches/api/0001-Build-changes.patch new file mode 100644 index 0000000..06b0fde --- /dev/null +++ b/patches/api/0001-Build-changes.patch @@ -0,0 +1,26 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Lexi Larkin +Date: Sun, 6 Aug 2023 22:01:19 -0400 +Subject: [PATCH] Build changes + + +diff --git a/build.gradle.kts b/build.gradle.kts +index 149f9088fe806467656e8b1c4157df60fda69ba7..d9f93515f92e35ad27f20ead90952b5ecee86661 100644 +--- a/build.gradle.kts ++++ b/build.gradle.kts +@@ -19,6 +19,7 @@ val apiAndDocs: Configuration by configurations.creating { + attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_RUNTIME)) + } + } ++val edenVersion: String by project // Parchment + configurations.api { + extendsFrom(apiAndDocs) + } +@@ -46,6 +47,7 @@ dependencies { + apiAndDocs("net.kyori:adventure-text-logger-slf4j") + api("org.apache.logging.log4j:log4j-api:$log4jVersion") + api("org.slf4j:slf4j-api:$slf4jVersion") ++ api("gg.projecteden:eden-interfaces:$edenVersion") // Parchment + + implementation("org.ow2.asm:asm:9.4") + implementation("org.ow2.asm:asm-commons:9.4") diff --git a/patches/api/0001-Add-Getter-interfaces.patch b/patches/api/0002-Add-Getter-interfaces.patch similarity index 100% rename from patches/api/0001-Add-Getter-interfaces.patch rename to patches/api/0002-Add-Getter-interfaces.patch diff --git a/patches/api/0002-Add-SoundEvent.patch b/patches/api/0003-Add-SoundEvent.patch similarity index 100% rename from patches/api/0002-Add-SoundEvent.patch rename to patches/api/0003-Add-SoundEvent.patch diff --git a/patches/api/0003-Add-PlayerUseRespawnAnchorEvent.patch b/patches/api/0004-Add-PlayerUseRespawnAnchorEvent.patch similarity index 100% rename from patches/api/0003-Add-PlayerUseRespawnAnchorEvent.patch rename to patches/api/0004-Add-PlayerUseRespawnAnchorEvent.patch diff --git a/patches/api/0004-Add-origin-location-to-EntityDamageByBlockEvent.patch b/patches/api/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch similarity index 100% rename from patches/api/0004-Add-origin-location-to-EntityDamageByBlockEvent.patch rename to patches/api/0005-Add-origin-location-to-EntityDamageByBlockEvent.patch diff --git a/patches/api/0005-Expanded-Adventure-support.patch b/patches/api/0006-Expanded-Adventure-support.patch similarity index 100% rename from patches/api/0005-Expanded-Adventure-support.patch rename to patches/api/0006-Expanded-Adventure-support.patch diff --git a/patches/api/0006-Add-UnsafeValues-canPlaceItemOn.patch b/patches/api/0007-Add-UnsafeValues-canPlaceItemOn.patch similarity index 100% rename from patches/api/0006-Add-UnsafeValues-canPlaceItemOn.patch rename to patches/api/0007-Add-UnsafeValues-canPlaceItemOn.patch diff --git a/patches/api/0007-Expose-MCUtil-Executors.patch b/patches/api/0008-Expose-MCUtil-Executors.patch similarity index 100% rename from patches/api/0007-Expose-MCUtil-Executors.patch rename to patches/api/0008-Expose-MCUtil-Executors.patch diff --git a/patches/api/0008-Add-BlockDropResourcesEvent.patch b/patches/api/0009-Add-BlockDropResourcesEvent.patch similarity index 100% rename from patches/api/0008-Add-BlockDropResourcesEvent.patch rename to patches/api/0009-Add-BlockDropResourcesEvent.patch diff --git a/patches/api/0009-Add-Furnace-Recipe-API.patch b/patches/api/0010-Add-Furnace-Recipe-API.patch similarity index 100% rename from patches/api/0009-Add-Furnace-Recipe-API.patch rename to patches/api/0010-Add-Furnace-Recipe-API.patch diff --git a/patches/api/0010-Add-HangingFrame-Tick-API.patch b/patches/api/0011-Add-HangingFrame-Tick-API.patch similarity index 100% rename from patches/api/0010-Add-HangingFrame-Tick-API.patch rename to patches/api/0011-Add-HangingFrame-Tick-API.patch diff --git a/patches/api/0011-Add-Player-getHiddenEntities-API.patch b/patches/api/0012-Add-Player-getHiddenEntities-API.patch similarity index 100% rename from patches/api/0011-Add-Player-getHiddenEntities-API.patch rename to patches/api/0012-Add-Player-getHiddenEntities-API.patch diff --git a/patches/api/0012-Add-Timings-Events.patch b/patches/api/0013-Add-Timings-Events.patch similarity index 100% rename from patches/api/0012-Add-Timings-Events.patch rename to patches/api/0013-Add-Timings-Events.patch diff --git a/patches/api/0013-Expanded-Insomnia-API-methods.patch b/patches/api/0014-Expanded-Insomnia-API-methods.patch similarity index 100% rename from patches/api/0013-Expanded-Insomnia-API-methods.patch rename to patches/api/0014-Expanded-Insomnia-API-methods.patch diff --git a/patches/api/0014-Add-NPC-to-EntityType.patch b/patches/api/0015-Add-NPC-to-EntityType.patch similarity index 100% rename from patches/api/0014-Add-NPC-to-EntityType.patch rename to patches/api/0015-Add-NPC-to-EntityType.patch diff --git a/patches/api/0015-Revert-BungeeChat-Deprecation.patch b/patches/api/0016-Revert-BungeeChat-Deprecation.patch similarity index 88% rename from patches/api/0015-Revert-BungeeChat-Deprecation.patch rename to patches/api/0016-Revert-BungeeChat-Deprecation.patch index ab1d934..8130f0f 100644 --- a/patches/api/0015-Revert-BungeeChat-Deprecation.patch +++ b/patches/api/0016-Revert-BungeeChat-Deprecation.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Revert BungeeChat Deprecation diff --git a/build.gradle.kts b/build.gradle.kts -index 149f9088fe806467656e8b1c4157df60fda69ba7..ec34a20389fcf09904830f9778b2f429030dc197 100644 +index d9f93515f92e35ad27f20ead90952b5ecee86661..4f9582d14c27ab4f8c9e87a26d305988e9edbb61 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -29,7 +29,7 @@ dependencies { +@@ -30,7 +30,7 @@ dependencies { // api dependencies are listed transitively to API consumers api("com.google.guava:guava:31.1-jre") api("com.google.code.gson:gson:2.10") @@ -17,7 +17,7 @@ index 149f9088fe806467656e8b1c4157df60fda69ba7..ec34a20389fcf09904830f9778b2f429 api("org.yaml:snakeyaml:2.0") api("org.joml:joml:1.10.5") // Paper start -@@ -110,7 +110,7 @@ tasks.withType { +@@ -112,7 +112,7 @@ tasks.withType { "https://javadoc.io/doc/org.yaml/snakeyaml/2.0/", "https://javadoc.io/doc/org.jetbrains/annotations/$annotationsVersion/", // Paper - we don't want Java 5 annotations // Paper start diff --git a/patches/api/0016-Add-PreEntityShootBowEvent.patch b/patches/api/0017-Add-PreEntityShootBowEvent.patch similarity index 100% rename from patches/api/0016-Add-PreEntityShootBowEvent.patch rename to patches/api/0017-Add-PreEntityShootBowEvent.patch