Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Allay Mappings Submodules #493

Merged
merged 3 commits into from
Mar 25, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions .gitmodules

This file was deleted.

2 changes: 2 additions & 0 deletions buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
@@ -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 {
1 change: 0 additions & 1 deletion platforms/allay/.gitignore

This file was deleted.

41 changes: 26 additions & 15 deletions platforms/allay/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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")
}
}
Empty file.
1 change: 0 additions & 1 deletion platforms/allay/src/main/resources/mappings
Submodule mappings deleted from 362665
1 change: 0 additions & 1 deletion platforms/allay/src/main/resources/mappings-generator
Submodule mappings-generator deleted from 366618
Loading