Lobalia, Pa'uvilla, and Pomohana are here!
This commit is contained in:
dhi_holo committed 2025-12-01 16:37:53 +10:00
1 parent 429e927c3f
commit 759fb0ecd8
39 files changed
+105 -101

No files matched your search

@@ -15,9 +15,9 @@ import com.cobblemon.mod.common.block.LecternBlock
import com.cobblemon.mod.common.block.MintBlock.MintType
import com.cobblemon.mod.common.block.campfirepot.CampfirePotBlock
import com.cobblemon.mod.common.block.chest.GildedChestBlock
import com.cobblemon.mod.common.block.decor.CraspediaFlowerBlock
import com.cobblemon.mod.common.block.decor.HydrangeaFlowerBlock
import com.cobblemon.mod.common.block.decor.LobeliaFlowerBlock
import com.cobblemon.mod.common.block.decor.PomohanaFlowerBlock
import com.cobblemon.mod.common.block.decor.PauvillaFlowerBlock
import com.cobblemon.mod.common.block.decor.LobaliaFlowerBlock
import com.cobblemon.mod.common.block.general.BaleBlock
import com.cobblemon.mod.common.block.grower.SaccharineTreeGrower
import com.cobblemon.mod.common.block.sign.CobblemonHangingSignBlock
@@ -44,7 +44,6 @@ import net.minecraft.world.level.block.*
import net.minecraft.world.level.block.state.BlockBehaviour
import net.minecraft.world.level.block.state.BlockState
import net.minecraft.world.level.block.state.properties.BlockSetType
import net.minecraft.world.level.block.state.properties.BlockStateProperties
import net.minecraft.world.level.block.state.properties.BlockStateProperties.LIT
import net.minecraft.world.level.block.state.properties.NoteBlockInstrument
import net.minecraft.world.level.block.state.properties.WoodType
@@ -574,11 +573,11 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
val POTTED_WHITE_MINT = this.create("potted_white_mint", BlocksInvoker.createFlowerPotBlock(WHITE_MINT_LEAF_LITTER))
@JvmField
val LOBELIA = this.create("lobelia", LobeliaFlowerBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).ignitedByLava().pushReaction(PushReaction.DESTROY)))
val LOBALIA = this.create("lobalia", LobaliaFlowerBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).ignitedByLava().pushReaction(PushReaction.DESTROY)))
@JvmField
val CRASPEDIA = this.create("craspedia", CraspediaFlowerBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().instabreak().sound(SoundType.GRASS).ignitedByLava().pushReaction(PushReaction.DESTROY)))
val POMOHANA = this.create("pomohana", PomohanaFlowerBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().instabreak().sound(SoundType.GRASS).ignitedByLava().pushReaction(PushReaction.DESTROY)))
@JvmField
val HYDRANGEA = this.create("hydrangea",HydrangeaFlowerBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().sound(SoundType.GRASS).strength(0.2F).ignitedByLava().pushReaction(PushReaction.DESTROY)))
val PAUVILLA = this.create("pauvilla",PauvillaFlowerBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().sound(SoundType.GRASS).strength(0.2F).ignitedByLava().pushReaction(PushReaction.DESTROY)))
@JvmField
val HEARTY_GRAIN_BALE = this.create("hearty_grain_bale", BaleBlock(BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).instrument(NoteBlockInstrument.BANJO).strength(0.5F).sound(CobblemonSounds.HEARTY_GRAIN_BALE_SOUNDS)))
@@ -1459,11 +1459,13 @@ object CobblemonItems : PlatformRegistry<Registry<Item>, ResourceKey<Registry<It
// Plants, Flora, and Flowers
@JvmField
val LOBELIA = compostableBlockItem("lobelia", CobblemonBlocks.LOBELIA, 0.85f)
val LOBALIA = compostableBlockItem("lobalia", CobblemonBlocks.LOBALIA, 0.85f)
@JvmField
val CRASPEDIA = compostableBlockItem("craspedia", CobblemonBlocks.CRASPEDIA, 0.85f)
val POMOHANA = compostableBlockItem("pomohana", CobblemonBlocks.POMOHANA, 0.85f)
@JvmField
val HYDRANGEA = compostableBlockItem("hydrangea", CobblemonBlocks.HYDRANGEA, 0.85f)
val PAUVILLA = compostableBlockItem("pauvilla", CobblemonBlocks.PAUVILLA, 0.85f)
// @JvmField
// val SENSERIA = compostableBlockItem("senseria", CobblemonBlocks.SENSERIA, 0.85f)
private fun blockItem(name: String, block: Block, rarity: Rarity = Rarity.COMMON): BlockItem = this.create(name, BlockItem(block, Item.Properties().rarity(rarity)))
@@ -9,7 +9,6 @@
package com.cobblemon.mod.common.block.decor
import com.cobblemon.mod.common.block.HeartyGrainsBlock
import com.cobblemon.mod.common.block.HeartyGrainsBlock.Companion.WATERLOGGED
import net.minecraft.core.BlockPos
import net.minecraft.world.item.context.BlockPlaceContext
@@ -27,7 +26,7 @@ import net.minecraft.world.phys.shapes.Shapes
import net.minecraft.world.phys.shapes.VoxelShape
class LobeliaFlowerBlock(properties: Properties?) : TallFlowerBlock(properties), SimpleWaterloggedBlock {
class LobaliaFlowerBlock(properties: Properties?) : TallFlowerBlock(properties), SimpleWaterloggedBlock {
init {
registerDefaultState(stateDefinition.any()
@@ -24,10 +24,10 @@ import java.util.*
//TODO: Allow it to dangle like VineBlock.class
//TODO: Decide whether this flower requires shears (and if so, update loot table), or if some way to cause a loot drop when a blockstate becomes false is needed
class HydrangeaFlowerBlock(properties: Properties?) : MultifaceBlock(properties), BonemealableBlock {
val CODEC: MapCodec<HydrangeaFlowerBlock?> =
simpleCodec<HydrangeaFlowerBlock?>({ properties: Properties? -> HydrangeaFlowerBlock(properties) })
override fun codec(): MapCodec<HydrangeaFlowerBlock?> {
class PauvillaFlowerBlock(properties: Properties?) : MultifaceBlock(properties), BonemealableBlock {
val CODEC: MapCodec<PauvillaFlowerBlock?> =
simpleCodec<PauvillaFlowerBlock?>({ properties: Properties? -> PauvillaFlowerBlock(properties) })
override fun codec(): MapCodec<PauvillaFlowerBlock?> {
return CODEC
}
@@ -18,7 +18,7 @@ import net.minecraft.world.phys.shapes.Shapes
import net.minecraft.world.phys.shapes.VoxelShape
class CraspediaFlowerBlock(properties: Properties?) : PinkPetalsBlock(properties) {
class PomohanaFlowerBlock(properties: Properties?) : PinkPetalsBlock(properties) {
override fun getShape(state: BlockState, world: BlockGetter, pos: BlockPos, context: CollisionContext): VoxelShape = AABB
@@ -334,9 +334,10 @@ object CobblemonClient {
CobblemonBlocks.WHITE_MINT_LEAF_LITTER,
CobblemonBlocks.POTTED_WHITE_MINT,
CobblemonBlocks.LOBELIA,
CobblemonBlocks.CRASPEDIA,
CobblemonBlocks.HYDRANGEA
CobblemonBlocks.LOBALIA,
CobblemonBlocks.POMOHANA,
CobblemonBlocks.PAUVILLA
//,CobblemonBlocks.SENSERIA
)
this.createBoatModelLayers()
@@ -0,0 +1,10 @@
{
"variants": {
"half=lower": {
"model": "cobblemon:block/lobalia_bottom"
},
"half=upper": {
"model": "cobblemon:block/lobalia_top"
}
}
}
@@ -1,10 +0,0 @@
{
"variants": {
"half=lower": {
"model": "cobblemon:block/lobelia_bottom"
},
"half=upper": {
"model": "cobblemon:block/lobelia_top"
}
}
}
@@ -2,7 +2,7 @@
"multipart": [
{
"apply": {
"model": "cobblemon:block/hydrangea"
"model": "cobblemon:block/pauvilla"
},
"when": {
"north": "true"
@@ -10,7 +10,7 @@
},
{
"apply": {
"model": "cobblemon:block/hydrangea"
"model": "cobblemon:block/pauvilla"
},
"when": {
"down": "false",
@@ -23,7 +23,7 @@
},
{
"apply": {
"model": "cobblemon:block/hydrangea",
"model": "cobblemon:block/pauvilla",
"uvlock": true,
"y": 90
},
@@ -33,7 +33,7 @@
},
{
"apply": {
"model": "cobblemon:block/hydrangea",
"model": "cobblemon:block/pauvilla",
"uvlock": true,
"y": 90
},
@@ -48,7 +48,7 @@
},
{
"apply": {
"model": "cobblemon:block/hydrangea",
"model": "cobblemon:block/pauvilla",
"uvlock": true,
"y": 180
},
@@ -58,7 +58,7 @@
},
{
"apply": {
"model": "cobblemon:block/hydrangea",
"model": "cobblemon:block/pauvilla",
"uvlock": true,
"y": 180
},
@@ -73,7 +73,7 @@
},
{
"apply": {
"model": "cobblemon:block/hydrangea",
"model": "cobblemon:block/pauvilla",
"uvlock": true,
"y": 270
},
@@ -83,7 +83,7 @@
},
{
"apply": {
"model": "cobblemon:block/hydrangea",
"model": "cobblemon:block/pauvilla",
"uvlock": true,
"y": 270
},
@@ -98,7 +98,7 @@
},
{
"apply": {
"model": "cobblemon:block/hydrangea",
"model": "cobblemon:block/pauvilla",
"uvlock": true,
"x": 270
},
@@ -108,7 +108,7 @@
},
{
"apply": {
"model": "cobblemon:block/hydrangea",
"model": "cobblemon:block/pauvilla",
"uvlock": true,
"x": 270
},
@@ -123,7 +123,7 @@
},
{
"apply": {
"model": "cobblemon:block/hydrangea",
"model": "cobblemon:block/pauvilla",
"uvlock": true,
"x": 90
},
@@ -133,7 +133,7 @@
},
{
"apply": {
"model": "cobblemon:block/hydrangea",
"model": "cobblemon:block/pauvilla",
"uvlock": true,
"x": 90
},
@@ -2,7 +2,7 @@
"multipart": [
{
"apply": {
"model": "cobblemon:block/craspedia_1"
"model": "cobblemon:block/pomohana_1"
},
"when": {
"facing": "north",
@@ -11,7 +11,7 @@
},
{
"apply": {
"model": "cobblemon:block/craspedia_1",
"model": "cobblemon:block/pomohana_1",
"y": 90
},
"when": {
@@ -21,7 +21,7 @@
},
{
"apply": {
"model": "cobblemon:block/craspedia_1",
"model": "cobblemon:block/pomohana_1",
"y": 180
},
"when": {
@@ -31,7 +31,7 @@
},
{
"apply": {
"model": "cobblemon:block/craspedia_1",
"model": "cobblemon:block/pomohana_1",
"y": 270
},
"when": {
@@ -41,7 +41,7 @@
},
{
"apply": {
"model": "cobblemon:block/craspedia_2"
"model": "cobblemon:block/pomohana_2"
},
"when": {
"facing": "north",
@@ -50,7 +50,7 @@
},
{
"apply": {
"model": "cobblemon:block/craspedia_2",
"model": "cobblemon:block/pomohana_2",
"y": 90
},
"when": {
@@ -60,7 +60,7 @@
},
{
"apply": {
"model": "cobblemon:block/craspedia_2",
"model": "cobblemon:block/pomohana_2",
"y": 180
},
"when": {
@@ -70,7 +70,7 @@
},
{
"apply": {
"model": "cobblemon:block/craspedia_2",
"model": "cobblemon:block/pomohana_2",
"y": 270
},
"when": {
@@ -80,7 +80,7 @@
},
{
"apply": {
"model": "cobblemon:block/craspedia_3"
"model": "cobblemon:block/pomohana_3"
},
"when": {
"facing": "north",
@@ -89,7 +89,7 @@
},
{
"apply": {
"model": "cobblemon:block/craspedia_3",
"model": "cobblemon:block/pomohana_3",
"y": 90
},
"when": {
@@ -99,7 +99,7 @@
},
{
"apply": {
"model": "cobblemon:block/craspedia_3",
"model": "cobblemon:block/pomohana_3",
"y": 180
},
"when": {
@@ -109,7 +109,7 @@
},
{
"apply": {
"model": "cobblemon:block/craspedia_3",
"model": "cobblemon:block/pomohana_3",
"y": 270
},
"when": {
@@ -119,7 +119,7 @@
},
{
"apply": {
"model": "cobblemon:block/craspedia_4"
"model": "cobblemon:block/pomohana_4"
},
"when": {
"facing": "north",
@@ -128,7 +128,7 @@
},
{
"apply": {
"model": "cobblemon:block/craspedia_4",
"model": "cobblemon:block/pomohana_4",
"y": 90
},
"when": {
@@ -138,7 +138,7 @@
},
{
"apply": {
"model": "cobblemon:block/craspedia_4",
"model": "cobblemon:block/pomohana_4",
"y": 180
},
"when": {
@@ -148,7 +148,7 @@
},
{
"apply": {
"model": "cobblemon:block/craspedia_4",
"model": "cobblemon:block/pomohana_4",
"y": 270
},
"when": {
@@ -925,6 +925,9 @@
"block.cobblemon.galarica_nut_bush": "Galarica Nut Bush",
"block.cobblemon.pep_up_flower": "Pep-Up Flower",
"block.cobblemon.potted_pep_up_flower": "Potted Pep-Up Flower",
"block.cobblemon.lobalia": "Lobalia",
"block.cobblemon.pomohana": "Pomohana",
"block.cobblemon.pauvilla": "Pa'uvilla",
"block.cobblemon.gilded_chest": "Gilded Chest",
"block.cobblemon.gimmighoul_chest": "Gimmighoul Chest",
"block.cobblemon.blue_gilded_chest": "Blue Gilded Chest",
@@ -3,9 +3,9 @@
"credit": "Made with Blockbench",
"ambientocclusion": false,
"textures": {
"particle": "cobblemon:block/flowers/lobelia_top",
"stem": "cobblemon:block/flowers/lobelia_bottom",
"detail": "cobblemon:block/flowers/lobelia_details"
"particle": "cobblemon:block/flowers/lobalia_top",
"stem": "cobblemon:block/flowers/lobalia_bottom",
"detail": "cobblemon:block/flowers/lobalia_details"
},
"elements": [
{
@@ -4,7 +4,7 @@
"ambientocclusion": false,
"textures": {
"particle": "#flower",
"flower": "cobblemon:block/flowers/lobelia_top"
"flower": "cobblemon:block/flowers/lobalia_top"
},
"elements": [
{
@@ -1,9 +1,9 @@
{
"ambientocclusion": false,
"textures": {
"particle": "cobblemon:block/flowers/hydrangea_vine",
"vine": "cobblemon:block/flowers/hydrangea_vine",
"flowers": "cobblemon:block/flowers/hydrangea_flowers"
"particle": "cobblemon:block/flowers/pauvilla_vine",
"vine": "cobblemon:block/flowers/pauvilla_vine",
"flowers": "cobblemon:block/flowers/pauvilla_flowers"
},
"elements": [
{
@@ -2,8 +2,8 @@
"ambientocclusion": false,
"texture_size": [32, 32],
"textures": {
"particle": "cobblemon:block/flowers/craspedia",
"flower": "cobblemon:block/flowers/craspedia"
"particle": "cobblemon:block/flowers/pomohana",
"flower": "cobblemon:block/flowers/pomohana"
},
"elements": [
{
@@ -2,8 +2,8 @@
"ambientocclusion": false,
"texture_size": [32, 32],
"textures": {
"particle": "cobblemon:block/flowers/craspedia",
"flower": "cobblemon:block/flowers/craspedia"
"particle": "cobblemon:block/flowers/pomohana",
"flower": "cobblemon:block/flowers/pomohana"
},
"elements": [
{
@@ -2,8 +2,8 @@
"ambientocclusion": false,
"texture_size": [32, 32],
"textures": {
"particle": "cobblemon:block/flowers/craspedia",
"flower": "cobblemon:block/flowers/craspedia"
"particle": "cobblemon:block/flowers/pomohana",
"flower": "cobblemon:block/flowers/pomohana"
},
"elements": [
{
@@ -2,8 +2,8 @@
"ambientocclusion": false,
"texture_size": [32, 32],
"textures": {
"particle": "cobblemon:block/flowers/craspedia",
"flower": "cobblemon:block/flowers/craspedia"
"particle": "cobblemon:block/flowers/pomohana",
"flower": "cobblemon:block/flowers/pomohana"
},
"elements": [
{
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "cobblemon:item/flowers/lobelia"
"layer0": "cobblemon:item/flowers/lobalia"
}
}
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "cobblemon:item/flowers/craspedia"
"layer0": "cobblemon:item/flowers/pauvilla"
}
}
@@ -1,6 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "cobblemon:item/flowers/hydrangea"
"layer0": "cobblemon:item/flowers/pomohana"
}
}
@@ -13,18 +13,18 @@
"type": "minecraft:item",
"conditions": [
{
"block": "cobblemon:lobelia",
"block": "cobblemon:lobalia",
"condition": "minecraft:block_state_property",
"properties": {
"half": "lower"
}
}
],
"name": "cobblemon:lobelia"
"name": "cobblemon:lobalia"
}
],
"rolls": 1.0
}
],
"random_sequence": "cobblemon:blocks/lobelia"
"random_sequence": "cobblemon:blocks/lobalia"
}
@@ -12,7 +12,7 @@
"add": true,
"conditions": [
{
"block": "cobblemon:hydrangea",
"block": "cobblemon:pauvilla",
"condition": "minecraft:block_state_property",
"properties": {
"down": "true"
@@ -26,7 +26,7 @@
"add": true,
"conditions": [
{
"block": "cobblemon:hydrangea",
"block": "cobblemon:pauvilla",
"condition": "minecraft:block_state_property",
"properties": {
"up": "true"
@@ -40,7 +40,7 @@
"add": true,
"conditions": [
{
"block": "cobblemon:hydrangea",
"block": "cobblemon:pauvilla",
"condition": "minecraft:block_state_property",
"properties": {
"north": "true"
@@ -54,7 +54,7 @@
"add": true,
"conditions": [
{
"block": "cobblemon:hydrangea",
"block": "cobblemon:pauvilla",
"condition": "minecraft:block_state_property",
"properties": {
"south": "true"
@@ -68,7 +68,7 @@
"add": true,
"conditions": [
{
"block": "cobblemon:hydrangea",
"block": "cobblemon:pauvilla",
"condition": "minecraft:block_state_property",
"properties": {
"west": "true"
@@ -82,7 +82,7 @@
"add": true,
"conditions": [
{
"block": "cobblemon:hydrangea",
"block": "cobblemon:pauvilla",
"condition": "minecraft:block_state_property",
"properties": {
"east": "true"
@@ -101,11 +101,11 @@
"function": "minecraft:explosion_decay"
}
],
"name": "cobblemon:hydrangea"
"name": "cobblemon:pauvilla"
}
],
"rolls": 1
}
],
"random_sequence": "cobblemon:blocks/hydrangea"
"random_sequence": "cobblemon:blocks/pauvilla"
}
@@ -11,7 +11,7 @@
"add": false,
"conditions": [
{
"block": "cobblemon:craspedia",
"block": "cobblemon:pomohana",
"condition": "minecraft:block_state_property",
"properties": {
"flower_amount": "2"
@@ -25,7 +25,7 @@
"add": false,
"conditions": [
{
"block": "cobblemon:craspedia",
"block": "cobblemon:pomohana",
"condition": "minecraft:block_state_property",
"properties": {
"flower_amount": "3"
@@ -39,7 +39,7 @@
"add": false,
"conditions": [
{
"block": "cobblemon:craspedia",
"block": "cobblemon:pomohana",
"condition": "minecraft:block_state_property",
"properties": {
"flower_amount": "4"
@@ -53,11 +53,11 @@
"function": "minecraft:explosion_decay"
}
],
"name": "cobblemon:craspedia"
"name": "cobblemon:pomohana"
}
],
"rolls": 1.0
}
],
"random_sequence": "cobblemon:blocks/craspedia"
"random_sequence": "cobblemon:blocks/pomohana"
}
@@ -1,7 +1,7 @@
{
"values": [
"cobblemon:lobelia",
"cobblemon:craspedia",
"cobblemon:hydrangea"
"cobblemon:lobalia",
"cobblemon:pomohana",
"cobblemon:pauvilla"
]
}
@@ -5,7 +5,7 @@
"minecraft:lilac",
"minecraft:peony",
"minecraft:pink_tulip",
"cobblemon:hydrangea",
"cobblemon:pauvilla",
{
"id": "aether_redux:iridia",
"required": false
@@ -4,7 +4,7 @@
"minecraft:poppy",
"minecraft:red_tulip",
"minecraft:rose_bush",
"cobblemon:lobelia",
"cobblemon:lobalia",
{
"id": "ancient_aether:sakura_blossoms",
"required": false
@@ -3,7 +3,7 @@
"values": [
"minecraft:dandelion",
"minecraft:sunflower",
"cobblemon:craspedia",
"cobblemon:pomohana",
{
"id": "biomesoplenty:goldenrod",
"required": false
@@ -1,7 +1,7 @@
{
"values": [
"cobblemon:lobelia",
"cobblemon:craspedia",
"cobblemon:hydrangea"
"cobblemon:lobalia",
"cobblemon:pomohana",
"cobblemon:pauvilla"
]
}