Skip to content

feat: further implement solid material, get solid material by key #6

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.

Sign up for GitHub

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

Merged
dayyeeet merged 3 commits into from
Aug 8, 2024
Merged

feat: further implement solid material, get solid material by key #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4995568
fix: wrong dependency definition for solid-material
dayyeeet Aug 8, 2024
9614e9a
chore: increment version number
dayyeeet Aug 8, 2024
c9a8a61
feat: SolidMaterial by key
dayyeeet Aug 8, 2024
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
5 changes: 2 additions & 3 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ plugins {
}

group = "io.github.solid-resourcepack"
version = "1.0.6"
version = "1.0.8"

repositories {
mavenCentral()
mavenLocal()
maven("https://repo.papermc.io/repository/maven-public/")
maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
}
Expand All @@ -22,7 +21,7 @@ dependencies {
testImplementation(rootProject.libs.kotlinTest)
implementation(rootProject.libs.kotlinJvm)
compileOnly(libs.paper)
api(libs.soldiMaterial)
api(libs.solidMaterial)
api(libs.bundles.creative)
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ paper = { module = "io.papermc.paper:paper-api", version.ref = "paper" }

creativeApi = { module = "team.unnamed:creative-api", version.ref = "creative" }
creativeSerializer = { module = "team.unnamed:creative-serializer-minecraft", version.ref = "creative" }
soldiMaterial = { module = "io.github.solid-resourcepack:material-api", version.ref = "solidMaterial" }
solidMaterial = { module = "io.github.solid-resourcepack:solid-material-api", version.ref = "solidMaterial" }

[bundles]
creative = [
Expand Down
14 changes: 13 additions & 1 deletion src/main/kotlin/io/github/solid/resourcepack/api/material/SolidMaterialMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@ package io.github.solid.resourcepack.api.material
import io.github.solid.resourcepack.material.SolidBlockMaterial
import io.github.solid.resourcepack.material.SolidItemMaterial
import io.github.solid.resourcepack.material.SolidMaterial
import net.kyori.adventure.key.Key
import org.bukkit.Material
import org.jetbrains.annotations.ApiStatus.Experimental

object SolidMaterialMapper {

/**
* Converts a [Material] to a [SolidMaterial]
* Gets a [SolidMaterial] by a [Material]
* IMPORTANT: Only works in a server context
*/
@Experimental
Expand All @@ -23,6 +24,17 @@ object SolidMaterialMapper {
throw IllegalArgumentException("Material $material is not supported")
}

/**
* Gets a [SolidMaterial] by a [Key] (if this key represents a material in a resource pack context)
*/
fun from(key: Key): SolidMaterial {
//For fastness, we use the key to determine the type, and then call from(Material, MaterialType)
val split = key.value().split("/")
val type = split.first().uppercase()
val material = split.last().uppercase()
return from(Material.valueOf(material), MaterialType.valueOf(type))
}

fun from(material: Material, type: MaterialType): SolidMaterial {
val returned = mutableListOf<SolidMaterial>()
if (type == MaterialType.ITEM || type == MaterialType.BOTH) {
Expand Down