Some fancy attempt at the prison bottle and gracedia changes.

Author: Waterpicker

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

@@ -21,12 +21,16 @@ class GracideaItem(properties: Properties) : Item(properties), PokemonInteractio
             val provider = entity.pokemon.getProviderOrNull<FlagSpeciesFeatureProvider>("sky") ?: return false
             val feature = provider.getOrCreate(entity.pokemon)
 
-            if (!feature.enabled && entity.level().isDay) {
-                feature.enabled = true
-                feature.apply(entity)
-                player.sendSystemMessage("generations_core.ability.formchange".asTranslated(entity.pokemon.getDisplayName().string), true)
-                return true
-            }
+            val state = when {
+                !feature.enabled && entity.level().isDay -> true
+                feature.enabled -> false
+                else -> null
+            } ?: return false
+
+            feature.enabled = state
+            feature.apply(entity)
+            player.sendSystemMessage("generations_core.ability.formchange".asTranslated(entity.pokemon.getDisplayName().string), true)
+            return true
         }
 
         return false

common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/GenerationsShrines.kt

@@ -90,7 +90,7 @@ object GenerationsShrines {
     val PRISON_BOTTLE: RegistrySupplier<PrisonBottleBlock> = registerBlockItem(
         "prison_bottle",
         { PrisonBottleBlock(BOTTLE_PROPERTIES) },
-        { block, properties -> FormChangingBlockItem(block, properties, "unbound") }, GenerationsItems.LEGENDARY_ITEMS
+        { block, properties -> PokemonInteractBlockItem(block, properties, "unbound")  }, GenerationsItems.LEGENDARY_ITEMS
     )
 
 

common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/PokemonInteractBlockItem.kt

@@ -0,0 +1,26 @@
+package generations.gg.generations.core.generationscore.common.world.level.block
+
+import com.cobblemon.mod.common.api.pokemon.feature.FlagSpeciesFeatureProvider
+import com.cobblemon.mod.common.entity.pokemon.PokemonEntity
+import com.cobblemon.mod.common.util.asTranslated
+import generations.gg.generations.core.generationscore.common.util.getOrCreate
+import generations.gg.generations.core.generationscore.common.util.getProviderOrNull
+import generations.gg.generations.core.generationscore.common.world.item.BlockItemWithLang
+import generations.gg.generations.core.generationscore.common.world.item.GenerationsCobblemonInteractions
+import net.minecraft.server.level.ServerPlayer
+import net.minecraft.world.item.Item
+import net.minecraft.world.item.ItemStack
+import net.minecraft.world.level.block.Block
+
+open class PokemonInteractBlockItem(block: Block, properties: Item.Properties, val form: String): BlockItemWithLang(block, properties), GenerationsCobblemonInteractions.PokemonInteraction {
+    override fun processInteraction(player: ServerPlayer, entity: PokemonEntity, stack: ItemStack): Boolean {
+
+        val provider = entity.pokemon.getProviderOrNull<FlagSpeciesFeatureProvider>("form") ?: return false
+        val feature = provider.getOrCreate(entity.pokemon)
+
+        feature.enabled = !feature.enabled
+        feature.apply(entity)
+        player.sendSystemMessage("generations_core.ability.formchange".asTranslated(entity.pokemon.getDisplayName().string), true)
+    }
+
+}