mirrors/cobblemon
1
0
Fork 1
mirror of https://gitlab.com/cable-mc/cobblemon.git synced 2026-10-20 14:16:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Placeable Vitamins Experiment A

Browse Source 
Need coder feedback regarding this
Makes Mochi and Feathers require clicking in the air or directly on a Pokemon, if it thinks it can place as a block it prevents usage
This commit is contained in:
dhi_holo
2026-08-04 19:25:13 +10:00
parent e40d2ee806
commit c2e87e4cfa
5 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/src/main/kotlin/com/cobblemon/mod/common/CobblemonItems.kt
+6 -6
View File
@@ -650,17 +650,17 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
@JvmField
val EXPERIENCE_CANDY_XL = candyItem("exp_candy_xl") { _, _ -> CandyItem.DEFAULT_XL_CANDY_YIELD }
@JvmField
val CALCIUM = create("calcium", VitaminItem(Stats.SPECIAL_ATTACK))
val CALCIUM = create("calcium", VitaminItem(Stats.SPECIAL_ATTACK, CobblemonBlocks.CALCIUM))
@JvmField
val CARBOS = create("carbos", VitaminItem(Stats.SPEED))
val CARBOS = create("carbos", VitaminItem(Stats.SPEED, CobblemonBlocks.CARBOS))
@JvmField
val HP_UP = create("hp_up", VitaminItem(Stats.HP))
val HP_UP = create("hp_up", VitaminItem(Stats.HP, CobblemonBlocks.HP_UP))
@JvmField
val IRON = create("iron", VitaminItem(Stats.DEFENCE))
val IRON = create("iron", VitaminItem(Stats.DEFENCE, CobblemonBlocks.IRON))
@JvmField
val PROTEIN = create("protein", VitaminItem(Stats.ATTACK))
val PROTEIN = create("protein", VitaminItem(Stats.ATTACK, CobblemonBlocks.PROTEIN))
@JvmField
val ZINC = create("zinc", VitaminItem(Stats.SPECIAL_DEFENCE))
val ZINC = create("zinc", VitaminItem(Stats.SPECIAL_DEFENCE, CobblemonBlocks.ZINC))
@JvmField
val HEALTH_MOCHI = create("health_mochi", MochiItem(Stats.HP))
@JvmField
common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/EVIncreaseItem.kt
+5 -1
View File
@@ -20,14 +20,18 @@ import net.minecraft.sounds.SoundEvent
import net.minecraft.world.InteractionHand
import net.minecraft.world.InteractionResultHolder
import net.minecraft.world.entity.player.Player
import net.minecraft.world.item.ItemNameBlockItem
import net.minecraft.world.item.ItemStack
import net.minecraft.world.item.Items
import net.minecraft.world.level.Level
import net.minecraft.world.level.block.Block
import net.minecraft.world.level.block.Blocks
abstract class EVIncreaseItem(
val stat: Stat,
val evIncreaseAmount: Int,
) : CobblemonItem(Properties()), PokemonSelectingItem {
block: Block? = Blocks.AIR
) : ItemNameBlockItem(block, Properties()), PokemonSelectingItem {
override val bagItem = null
override fun canUseOnPokemon(stack: ItemStack, pokemon: Pokemon) = pokemon.evs.getOrDefault(stat) < EVs.MAX_STAT_VALUE &&
super.canUseOnPokemon(stack, pokemon)
common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/FeatherItem.kt
+2 -1
View File
@@ -11,7 +11,8 @@ package com.cobblemon.mod.common.item.interactive
import com.cobblemon.mod.common.CobblemonSounds
import com.cobblemon.mod.common.api.pokemon.stats.Stat
import net.minecraft.sounds.SoundEvent
import net.minecraft.world.level.block.Blocks
class FeatherItem(stat: Stat) : EVIncreaseItem(stat, 1) {
class FeatherItem(stat: Stat) : EVIncreaseItem(stat, 1, Blocks.AIR) {
override val sound: SoundEvent = CobblemonSounds.MEDICINE_FEATHER_USE
}
common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/MochiItem.kt
+2 -1
View File
@@ -15,8 +15,9 @@ import net.minecraft.server.level.ServerPlayer
import net.minecraft.sounds.SoundEvent
import net.minecraft.world.InteractionResultHolder
import net.minecraft.world.item.ItemStack
import net.minecraft.world.level.block.Blocks
class MochiItem(stat: Stats): EVIncreaseItem(stat, 4) {
class MochiItem(stat: Stats): EVIncreaseItem(stat, 4, Blocks.AIR) {
override val sound: SoundEvent = CobblemonSounds.MOCHI_USE
override fun applyToPokemon(player: ServerPlayer, stack: ItemStack, pokemon: Pokemon): InteractionResultHolder<ItemStack> {
common/src/main/kotlin/com/cobblemon/mod/common/item/interactive/VitaminItem.kt
+2 -1
View File
@@ -11,7 +11,8 @@ package com.cobblemon.mod.common.item.interactive
import com.cobblemon.mod.common.CobblemonSounds
import com.cobblemon.mod.common.api.pokemon.stats.Stats
import net.minecraft.sounds.SoundEvent
import net.minecraft.world.level.block.Block
class VitaminItem(stat: Stats) : EVIncreaseItem(stat, 10) {
class VitaminItem(stat: Stats, block: Block) : EVIncreaseItem(stat, 10, block) {
override val sound: SoundEvent = CobblemonSounds.MEDICINE_PILLS_USE
}