Skip to content

Commit 163dec9

Browse files
authored
Merge pull request #7 from solid-resourcepack/development
chore: update to newest solid-material
2 parents 5436495 + 46bf62a commit 163dec9

4 files changed

Lines changed: 3 additions & 76 deletions

File tree

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
}
1010

1111
group = "io.github.solid-resourcepack"
12-
version = "1.0.8"
12+
version = "1.0.9"
1313

1414
repositories {
1515
mavenCentral()

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ shadow = "8.1.1"
55
paper = "1.21-R0.1-SNAPSHOT"
66
creative = "1.7.2"
77
sonatypeCentralPortalPublisher = "1.2.3"
8-
solidMaterial = "1.21"
8+
solidMaterial = "1.21-1.0.1"
99

1010
[libraries]
1111
kotlinJvm = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin" }

src/main/kotlin/io/github/solid/resourcepack/api/material/SolidMaterialMapper.kt

Lines changed: 0 additions & 63 deletions
This file was deleted.

src/test/kotlin/PredicateTest.kt

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,14 @@
11
import io.github.solid.resourcepack.api.builder.AdvancedResourcePack
2-
import io.github.solid.resourcepack.api.builder.config.ModelVariant
32
import io.github.solid.resourcepack.api.builder.config.Predicate
4-
import io.github.solid.resourcepack.api.key.KeyType
5-
import io.github.solid.resourcepack.api.key.SolidKey
63
import io.github.solid.resourcepack.material.SolidMaterial
74
import net.kyori.adventure.key.Key
8-
import org.bukkit.Material
95
import team.unnamed.creative.ResourcePack
106

117
val BOOST_ARROW = Key.key("test", "item/boost_arrow")
128
fun main() {
139
val pack = AdvancedResourcePack(ResourcePack.resourcePack())
1410
pack.apply(
15-
Predicate.customModelData(
16-
SolidMaterial(
17-
SolidKey.from(Material.POPPED_CHORUS_FRUIT, KeyType.ITEM),
18-
SolidKey.ITEM_GENERATED,
19-
ModelVariant.Textures.generic(SolidKey.from(Material.POPPED_CHORUS_FRUIT, KeyType.ITEM))
20-
)
21-
).models(BOOST_ARROW).build()
11+
Predicate.customModelData(SolidMaterial.from(Key.key("minecraft", "item/stick"))).models(BOOST_ARROW).build()
2212
)
2313

2414
val mapper = TestMapper()

0 commit comments

Comments
 (0)