Tweaked jade orb stuff a bit.

Author: Waterpicker

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

@@ -880,7 +880,7 @@ object GenerationsItems: ItemPlatformRegistry() {
     val HOOPA_RING = register("hoopa_ring", ::ItemWithLangTooltipImpl, LEGENDARY_ITEMS)
     val FADED_RED_ORB = register("faded_red_orb", { ElementalPostBattleUpdateItemImpl(it.stacksTo(1).durability(250), ElementalTypes.FIRE) }, LEGENDARY_ITEMS)
     val FADED_BLUE_ORB = register("faded_blue_orb", { ElementalPostBattleUpdateItemImpl(it.stacksTo(1).durability(250), ElementalTypes.WATER) }, LEGENDARY_ITEMS)
-    val FADED_JADE_ORB = register("faded_jade_orb", { ElementalPostBattleUpdateItemImplImpl(it.stacksTo(1).durability(250), key = LegendKeys.RAYQUAZA, types = listOf(ElementalTypes.FLYING)) }, LEGENDARY_ITEMS)
+    val FADED_JADE_ORB = register("faded_jade_orb", { ElementalPostBattleUpdateItemImplImpl(it.stacksTo(1).durability(250), key = LegendKeys.RAYQUAZA, types = listOf(ElementalTypes.FLYING), predicate = { it.y >= 240.0 }) }, LEGENDARY_ITEMS)
     val RED_ORB = registerHeldItem("red_orb", ::Item)
     val BLUE_ORB = registerHeldItem("blue_orb", ::Item)
     val JADE_ORB = register("jade_orb", { JadeOrb(it.stacksTo(1)) }, LEGENDARY_ITEMS)

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

@@ -16,19 +16,22 @@ open class ElementalPostBattleUpdateItemImplImpl(
     properties: Properties,
     private val lang: String = DEFAULT_LANG_KEY,
     private val key: SpeciesKey,
-    types: List<ElementalType> = listOf()
-) : ElementalPostBattleUpdateItemImpl(properties, types) {
+    types: List<ElementalType> = listOf(),
+    private val itemToGiveUponSpawn : Holder<Item>? = null,
+    private val predicate: (Player) -> Boolean = { true }
+    ) : ElementalPostBattleUpdateItemImpl(properties, types) {
 
     override fun use(level: Level, player: Player, usedHand: InteractionHand): InteractionResultHolder<ItemStack> {
         val stack = player.getItemInHand(usedHand)
 
-        if (!level.isClientSide() && player.y >= 240.0) {
+        if (!level.isClientSide() && predicate.invoke(player)) {
 
             val damage = stack.damageValue
 
             if (damage >= stack.maxDamage) {
                 PokemonUtil.spawn(key.createProperties(70), level, player.onPos)
                 stack.consume(1, player)
+                postSpawn(player)
             } else {
                 player.displayClientMessage(Component.translatable(lang, stack.maxDamage - damage), true)
             }
@@ -39,6 +42,10 @@ open class ElementalPostBattleUpdateItemImplImpl(
         return InteractionResultHolder.pass(stack)
     }
 
+    protected fun postSpawn(player: Player) {
+        itemToGiveUponSpawn?.value()?.defaultInstance?.also(player::addItem)
+    }
+
     companion object {
         const val DEFAULT_LANG_KEY: String = "generations_core.orb.amountfull"
     }