Fixed additional potential spam.

GenerationsMod · Dec 6, 2024 · 5d1b9c6 · 5d1b9c6
1 parent a86eb5f
commit 5d1b9c6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/...main/java/generations/gg/generations/core/generationscore/common/util/PokemonFunctions.kt b/...main/java/generations/gg/generations/core/generationscore/common/util/PokemonFunctions.kt
@@ -136,6 +136,8 @@ fun ItemStack.getPokemon(): Pokemon? {
 }
 
 
+
+
 fun Pokemon.removeIfBelongs(player: Player): Boolean {
     return belongsTo(player) && storeCoordinates.get()?.remove() == true
 }
@@ -149,5 +151,4 @@ fun <T:Any> ItemStack.setLore(lore: List<T>?): ItemStack {
         compoundtag.remove(ItemStack.TAG_LORE)
     }
     return this
-}
-
+}
diff --git a/...main/java/generations/gg/generations/core/generationscore/common/world/item/DnaSplicer.kt b/...main/java/generations/gg/generations/core/generationscore/common/world/item/DnaSplicer.kt
@@ -28,6 +28,7 @@ class DnaSplicer(properties: Properties): PokemonStoringItem(properties) {
                 var list = mutableListOf<Component>()
                 list.add(pokemon)
                 stack.setLore(list)
+                stack.setHoverName(super.getName(stack).copy() + getPokemonText(stack))
 
                 player.level().playSound(null, entity, SoundEvents.ENDERMAN_TELEPORT, SoundSource.MASTER, 1.0f, 1.0f)
 
@@ -92,10 +93,6 @@ class DnaSplicer(properties: Properties): PokemonStoringItem(properties) {
         return false
     }
 
-    override fun getName(stack: ItemStack): Component {
-        return super.getName(stack).copy().withStyle(ChatFormatting.GRAY) + getPokemonText(stack)
-    }
-
     override fun getPokemonText(stack: ItemStack): Component {
 
         var color = ChatFormatting.WHITE

diff --git a/...a/generations/gg/generations/core/generationscore/common/world/item/PokemonStoringItem.kt b/...a/generations/gg/generations/core/generationscore/common/world/item/PokemonStoringItem.kt
@@ -44,11 +44,12 @@ abstract class PokemonStoringItem(properties: Properties) : Item(properties), Po
                 item.shrink(1)
                 item.removePokemon()
                 item.setLore(mutableListOf<Component>())
+                item.setHoverName(null)
                 player.level().playSound(null, player, SoundEvents.ENDERMAN_TELEPORT, SoundSource.MASTER, 1.0f, 1.0f)
                 return InteractionResultHolder.sidedSuccess(item, false)
             }
         }
         return super.use(level, player, usedHand)
     }
 
-}
+}
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
@@ -29,6 +29,7 @@ class TimeCapsule(properties: Properties) : PokemonStoringItem(properties) {
             var list = mutableListOf<Component>()
             list.add(pokemon)
             stack.setLore(list)
+            stack.setHoverName(super.getName(stack).copy() + getPokemonText(stack))
 
             player.level().playSound(
                 null,
@@ -46,10 +47,6 @@ class TimeCapsule(properties: Properties) : PokemonStoringItem(properties) {
         }
     }
 
-    override fun getName(stack: ItemStack): Component {
-        return super.getName(stack).copy() + getPokemonText(stack)
-    }
-
     override val isConsumed: Boolean
         get() = false