From b4a9f4d3c03160437ab53d985eb372588f9af1c0 Mon Sep 17 00:00:00 2001 From: solonovamax Date: Sat, 8 Mar 2025 15:24:17 -0500 Subject: [PATCH 1/3] Download allay mappings from github instead of using git submodules Signed-off-by: solonovamax --- .gitmodules | 6 --- platforms/allay/build.gradle.kts | 41 ++++++++++++------- .../allay/src/main/resources/mapping/.keep | 0 platforms/allay/src/main/resources/mappings | 1 - .../src/main/resources/mappings-generator | 1 - 5 files changed, 26 insertions(+), 23 deletions(-) delete mode 100644 .gitmodules delete mode 100644 platforms/allay/src/main/resources/mapping/.keep delete mode 160000 platforms/allay/src/main/resources/mappings delete mode 160000 platforms/allay/src/main/resources/mappings-generator diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index fd2ddc10f0..0000000000 --- a/.gitmodules +++ /dev/null @@ -1,6 +0,0 @@ -[submodule "platforms/allay/src/main/resources/mappings"] - path = platforms/allay/src/main/resources/mappings - url = https://github.com/GeyserMC/mappings -[submodule "platforms/allay/src/main/resources/mappings-generator"] - path = platforms/allay/src/main/resources/mappings-generator - url = https://github.com/GeyserMC/mappings-generator diff --git a/platforms/allay/build.gradle.kts b/platforms/allay/build.gradle.kts index 858d0fbd2a..8deb537e06 100644 --- a/platforms/allay/build.gradle.kts +++ b/platforms/allay/build.gradle.kts @@ -1,26 +1,37 @@ +repositories { + ivy { + url = uri("https://raw.githubusercontent.com/") + patternLayout { + artifact("[organisation]/[revision]/[artifact].([ext])") + setM2compatible(true) + } + metadataSources { + artifact() + } + } +} + +val geyserMappings: Configuration by configurations.register("geyserMappings") { + isCanBeConsumed = false +} + dependencies { shadedApi(project(":common:implementation:base")) implementation("com.google.code.gson", "gson", Versions.Allay.gson) compileOnly("org.allaymc.allay", "api", Versions.Allay.api) -} -tasks.register("copyMappings") { - from("src/main/resources/mappings") { - include("biomes.json", "items.json") - } - from("src/main/resources/mappings-generator") { - include("generator_blocks.json") - rename("generator_blocks.json", "blocks.json") - } - into("src/main/resources/mapping") + geyserMappings("GeyserMC.mappings:items:3626653@json") + geyserMappings("GeyserMC.mappings:biomes:3626653@json") + geyserMappings("GeyserMC.mappings-generator:generator_blocks:366618e@json") } tasks.processResources { - dependsOn("copyMappings") + from(geyserMappings) { + into("mapping") - exclude("mapping/.keep") - exclude("mappings/**") - exclude("mappings-generator/**") -} \ No newline at end of file + // rather jank, but whatever + rename("(?:generator_)?([^-]+)-(.*)\\.json", "$1.json") + } +} diff --git a/platforms/allay/src/main/resources/mapping/.keep b/platforms/allay/src/main/resources/mapping/.keep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/platforms/allay/src/main/resources/mappings b/platforms/allay/src/main/resources/mappings deleted file mode 160000 index 362665358e..0000000000 --- a/platforms/allay/src/main/resources/mappings +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 362665358ee8baa2abf90f93453fb6801b0ec3ce diff --git a/platforms/allay/src/main/resources/mappings-generator b/platforms/allay/src/main/resources/mappings-generator deleted file mode 160000 index 366618e0e7..0000000000 --- a/platforms/allay/src/main/resources/mappings-generator +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 366618e0e751387c890ed95994e3537a13c173b3 From d8fb1ce873b6cc780bdc6a0424e0fcac0663d675 Mon Sep 17 00:00:00 2001 From: solonovamax Date: Sat, 8 Mar 2025 15:34:37 -0500 Subject: [PATCH 2/3] Remove allay gitignore Signed-off-by: solonovamax --- platforms/allay/.gitignore | 1 - 1 file changed, 1 deletion(-) delete mode 100644 platforms/allay/.gitignore diff --git a/platforms/allay/.gitignore b/platforms/allay/.gitignore deleted file mode 100644 index 50e37b3cdc..0000000000 --- a/platforms/allay/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/src/main/resources/mapping/*.json From 565c8fc3acfbcca4170cc1b9bd15410d54c790bc Mon Sep 17 00:00:00 2001 From: solonovamax Date: Sat, 22 Mar 2025 19:35:44 -0400 Subject: [PATCH 3/3] Use the same dependency notation as the rest of the project --- buildSrc/src/main/kotlin/Versions.kt | 2 ++ platforms/allay/build.gradle.kts | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 4b600acac7..d9fa955ddc 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -81,6 +81,8 @@ object Versions { object Allay { const val api = "0.2.0" const val gson = "2.12.1" + const val mappings = "3626653" + const val mappingsGenerator = "366618e" } object Minestom { diff --git a/platforms/allay/build.gradle.kts b/platforms/allay/build.gradle.kts index 8deb537e06..9b096a2017 100644 --- a/platforms/allay/build.gradle.kts +++ b/platforms/allay/build.gradle.kts @@ -22,9 +22,9 @@ dependencies { compileOnly("org.allaymc.allay", "api", Versions.Allay.api) - geyserMappings("GeyserMC.mappings:items:3626653@json") - geyserMappings("GeyserMC.mappings:biomes:3626653@json") - geyserMappings("GeyserMC.mappings-generator:generator_blocks:366618e@json") + geyserMappings("GeyserMC.mappings", "items", Versions.Allay.mappings, ext = "json") + geyserMappings("GeyserMC.mappings", "biomes", Versions.Allay.mappings, ext = "json") + geyserMappings("GeyserMC.mappings-generator", "generator_blocks", Versions.Allay.mappingsGenerator, ext = "json") } tasks.processResources {