FIxed for issue where zygarde cube will fire gui even when you collect a zygarde cell.

Author: Waterpicker

common/src/main/java/generations/gg/generations/core/generationscore/common/GenerationsArchitecturyEvents.kt

@@ -57,7 +57,7 @@ object GenerationsArchitecturyEvents {
 
                     return@register EventResult.interruptTrue()
                 } else if(player.level().getBlockState(pos).block is VendingMachineBlock) { //TODO: upgrade to a vending machines tag.
-
+//TODO: Restore shopss post release
                 }
             }
 
@@ -68,20 +68,9 @@ object GenerationsArchitecturyEvents {
             if(player !is ServerPlayer) return@register EventResult.pass()
 
             val stack = player.getItemInHand(hand)
-            if (stack.`is`(GenerationsItems.ZYGARDE_CUBE.get()) && entity is ZygardeCellEntity) {
-                if (stack.damageValue != ZygardeCubeItem.FULL) {
-                    stack.damageValue += 1
-                    player.displayClientMessage("item.generations_core.zygarde_cube.tooltip.cell_add".asTranslated(), false)
-                    player.level().playSound(null, player.blockPosition(), GenerationsSounds.ZYGARDE_CELL.get(), SoundSource.BLOCKS, 0.5f, 1.0f)
-                    entity.remove(Entity.RemovalReason.DISCARDED)
-                    return@register EventResult.interruptTrue()
-                } else {
-                    player.displayClientMessage("item.generations_core.zygarde_cube.tooltip.cell_full".asTranslated(), false)
-                }
-            } else {
-                if(entity is PokemonEntity) {
-                    return@register if(GenerationsCobblemonInteractions.triggerCustomInteraction(entity, player, stack)) EventResult.interruptTrue() else EventResult.pass()
-                }
+
+            if(entity is PokemonEntity) {
+                return@register if(GenerationsCobblemonInteractions.triggerCustomInteraction(entity, player, stack)) EventResult.interruptTrue() else EventResult.pass()
             }
 
             return@register EventResult.pass()

common/src/main/java/generations/gg/generations/core/generationscore/common/world/entity/ZygardeCellEntity.kt

@@ -37,14 +37,14 @@ class ZygardeCellEntity : Entity {
     override fun addAdditionalSaveData(compound: CompoundTag) {
     }
 
-    override fun hurt(source: DamageSource, amount: Float): Boolean {
-        var player = source.entity.instanceOrNull<ServerPlayer>() ?: return true
-
-        var stack = player.mainHandItem.takeIf { it.`is`(GenerationsItems.ZYGARDE_CUBE.get()) } ?: return true
+    override fun interact(player: Player, hand: InteractionHand): InteractionResult {
+        if(hand != InteractionHand.MAIN_HAND) return InteractionResult.PASS;
+        val serverPlayer = player.instanceOrNull<ServerPlayer>() ?: return InteractionResult.PASS;
+        val stack = player.mainHandItem.takeIf { it.`is`(GenerationsItems.ZYGARDE_CUBE.get()) } ?: return InteractionResult.PASS
 
         if (stack.damageValue != ZygardeCubeItem.FULL) {
             stack.damageValue += 1
-            player.displayClientMessage(
+            serverPlayer.displayClientMessage(
                 Component.translatable("item.generations_core.zygarde_cube.tooltip.cell_add"),
                 false
             )
@@ -57,18 +57,22 @@ class ZygardeCellEntity : Entity {
                 1.0f
             )
             remove(RemovalReason.DISCARDED)
+
+            player.cooldowns.addCooldown(stack.item, 20)
+
+            return InteractionResult.SUCCESS
         } else {
             player.displayClientMessage(
                 Component.translatable("item.generations_core.zygarde_cube.tooltip.cell_full"),
                 false
             )
         }
 
-        return false
+        return InteractionResult.PASS
     }
 
     override fun isPushable(): Boolean {
-        return true
+        return false
     }
 
     override fun isPickable(): Boolean {

common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/ZygardeCubeItem.kt

@@ -25,12 +25,11 @@ class ZygardeCubeItem(properties: Properties) : Item(properties), LangTooltip {
         tooltipComponents.add(Component.translatable("item.generations_core.zygarde_cube.tooltip.lore2"))
         tooltipComponents.add(Component.translatable("item.generations_core.zygarde_cube.tooltip.lore3"))
         tooltipComponents.add(Component.translatable("item.generations_core.zygarde_cube.tooltip.lore4", stack.damageValue, stack.maxDamage))
-//        LangTooltip.appendHoverText(stack, level, tooltipComponents, isAdvanced)
     }
 
     override fun use(level: Level, player: Player, usedHand: InteractionHand): InteractionResultHolder<ItemStack> {
         if(player is ServerPlayer && usedHand == InteractionHand.MAIN_HAND) {
-            val dialogue: Dialogue = Dialogues.dialogues[GenerationsCore.id("zygarde_cell")] ?: return InteractionResultHolder.fail(player.mainHandItem)
+            val dialogue: Dialogue = Dialogues.dialogues[GenerationsCore.id("zygarde_cube")] ?: return InteractionResultHolder.fail(player.mainHandItem)
             player.openDialogue(dialogue)
 
             return InteractionResultHolder.success(player.mainHandItem)
@@ -42,4 +41,4 @@ class ZygardeCubeItem(properties: Properties) : Item(properties), LangTooltip {
     companion object {
         const val FULL = 100
     }
-}
+}