@@ -2,6 +2,7 @@ package generations.gg.generations.core.generationscore.common.client.model
22
33import com.cobblemon.mod.common.api.pokemon.PokemonSpecies
44import com.cobblemon.mod.common.client.render.VaryingRenderableResolver
5+ import com.cobblemon.mod.common.client.render.models.blockbench.LocatorAccess.Companion.PREFIX
56import com.cobblemon.mod.common.client.render.models.blockbench.pose.Bone
67import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext
78import com.cobblemon.mod.common.client.render.models.blockbench.repository.VaryingModelRepository
@@ -36,11 +37,11 @@ private val RenderContext.species: Species?
3637 get() = this .request(RenderContext .SPECIES )?.let { PokemonSpecies .getByIdentifier(it) }
3738
3839class RareCandyBone /* Remove when cobblemon doesn't have parts of code that assumes Bone will always be a ModelPart */ (
39- location : ResourceLocation ): ModelPart(CUBE_LIST , BLANK_MAP ), Supplier<Bone>, Bone {
40+ location : ResourceLocation ): ModelPart(mutableListOf(), MAP ), Supplier<Bone>, Bone {
4041 private val objectSupplier: () -> CompiledModel ? = { ModelRegistry [location] }
4142
4243 override fun getChildren (): Map <String , Bone > {
43- return DUMMY
44+ return MAP as Map < String , Bone >
4445 }
4546
4647 override fun render (
@@ -116,11 +117,8 @@ class RareCandyBone /*Remove when cobblemon doesn't have parts of code that assu
116117 override fun get (): Bone = this
117118
118119 companion object {
119- val CUBE_LIST = listOf (Cube (0 , 0 , 0f , 0f , 0f , 1f , 1f , 1f , 0f , 0f , 0f , false , 1.0f , 1.0f , java.util.Set .of(Direction .NORTH ))) // TODO: Remove when assumpt of Bone is always ModelPart is gone.
120- private val BLANK_MAP = mapOf (" root" to ModelPart (CUBE_LIST , mapOf ()))
121- private val temp = Vector3f ()
120+ private val MAP = mapOf (PREFIX + " seat_1" to ModelPart (mutableListOf (), mapOf ()))
122121 private val ROTATION_CORRECTION = Axis .YP .rotationDegrees(180f )
123- private val DUMMY = emptyMap<String , Bone >()
124122 }
125123}
126124
0 commit comments