Remove Allay Mappings Submodules (#493)

* Download allay mappings from github instead of using git submodules

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Remove allay gitignore

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>

* Use the same dependency notation as the rest of the project

---------

Signed-off-by: solonovamax <solonovamax@12oclockpoint.com>
This commit is contained in:
solo 2025-03-25 17:14:51 -04:00 committed by GitHub
parent 4bef2f5a7f
commit 1d658bd52d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 28 additions and 24 deletions

6
.gitmodules vendored
View File

@ -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

View File

@ -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 {

View File

@ -1 +0,0 @@
/src/main/resources/mapping/*.json

View File

@ -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<Copy>("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", 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 {
dependsOn("copyMappings")
from(geyserMappings) {
into("mapping")
exclude("mapping/.keep")
exclude("mappings/**")
exclude("mappings-generator/**")
}
// rather jank, but whatever
rename("(?:generator_)?([^-]+)-(.*)\\.json", "$1.json")
}
}

@ -1 +0,0 @@
Subproject commit 362665358ee8baa2abf90f93453fb6801b0ec3ce

@ -1 +0,0 @@
Subproject commit 366618e0e751387c890ed95994e3537a13c173b3