Fix at spam issue with time capsules.

GenerationsMod · Dec 6, 2024 · a86eb5f · a86eb5f
1 parent 62eaef0
commit a86eb5f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/...a/generations/gg/generations/core/generationscore/common/client/render/TimeCapsuleItem.kt b/...a/generations/gg/generations/core/generationscore/common/client/render/TimeCapsuleItem.kt
@@ -13,9 +13,9 @@ import com.mojang.blaze3d.platform.Lighting
 import com.mojang.blaze3d.systems.RenderSystem
 import com.mojang.blaze3d.vertex.PoseStack
 import generations.gg.generations.core.generationscore.common.client.model.RareCandyBone
+import generations.gg.generations.core.generationscore.common.util.getRenderablePokemon
 import generations.gg.generations.core.generationscore.common.world.item.StatueSpawnerItem
 import generations.gg.generations.core.generationscore.common.world.item.TimeCapsule
-import generations.gg.generations.core.generationscore.common.world.item.TimeCapsule.Companion.getRenderablePokmon
 import net.minecraft.client.renderer.LightTexture
 import net.minecraft.client.renderer.MultiBufferSource
 import net.minecraft.client.renderer.texture.OverlayTexture
@@ -28,7 +28,7 @@ object TimeCapsuleItemRenderer : CobblemonBuiltinItemRenderer {
     override fun render(stack: ItemStack, mode: ItemDisplayContext, matrices: PoseStack, vertexConsumers: MultiBufferSource, light: Int, overlay: Int,
     ) {
         if (stack.item is TimeCapsule || stack.item is StatueSpawnerItem || stack.item is PokemonItem) {
-            val (species, aspects) = (if(stack.item is PokemonItem) (stack.item as PokemonItem).getSpeciesAndAspects(stack) else stack.getRenderablePokmon()) ?: return
+            val (species, aspects) = (if(stack.item is PokemonItem) (stack.item as PokemonItem).getSpeciesAndAspects(stack) else stack.getRenderablePokemon()?.let { it.species to it.aspects }) ?: return
 
             matrices.pushPose()
             val model = PokemonModelRepository.getPoser(species.resourceIdentifier, aspects)

diff --git a/...ain/java/generations/gg/generations/core/generationscore/common/world/item/TimeCapsule.kt b/...ain/java/generations/gg/generations/core/generationscore/common/world/item/TimeCapsule.kt
@@ -55,13 +55,12 @@ class TimeCapsule(properties: Properties) : PokemonStoringItem(properties) {
 
 
     companion object {
-        fun ItemStack.getRenderablePokmon(): Pair<Species, Set<String>>? = this.getPokemon()?.let { it.species to it.aspects }
 
         fun registerItemProperty() {
             ItemPropertiesRegistry.register(
                 GenerationsItems.TIME_CAPSULE.get(), GenerationsCore.id("has_pokemon")
             ) { itemStack: ItemStack, clientLevel: ClientLevel?, livingEntity: LivingEntity?, i: Int ->
-                if (itemStack.getRenderablePokmon() == null) 0f else 1f
+                if (itemStack.getRenderablePokemon() == null) 0f else 1f
             }
         }
     }