mirror of
https://gitlab.com/cable-mc/cobblemon.git
synced 2026-11-01 05:48:53 -05:00
Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b4717a7d93 | ||
|
|
9abc4aa701 | ||
|
|
1f21b310b8 | ||
|
|
c684ae54cd | ||
|
|
766415f621 | ||
|
|
9279d5bac7 | ||
|
|
7483a95ddb | ||
|
|
d2f7b7350f |
No files matched your search
@@ -646,9 +646,9 @@ object CobblemonBlocks : PlatformRegistry<Registry<Block>, ResourceKey<Registry<
|
||||
@JvmField
|
||||
val GALARICA_CUFF = create("galarica_cuff", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.AZALEA_LEAVES).mapColor(MapColor.NONE).noCollission().noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.FLATTENED_10x4))
|
||||
@JvmField
|
||||
val UNREMARKABLE_TEACUP = create("unremarkable_teacup", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.DECORATED_POT).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.TEACUP))
|
||||
val UNREMARKABLE_TEACUP = create("unremarkable_teacup", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.ITEM_BLOCK_TEACUP_SOUNDS).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.TEACUP))
|
||||
@JvmField
|
||||
val MASTERPIECE_TEACUP = create("masterpiece_teacup", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.DECORATED_POT).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.TEACUP))
|
||||
val MASTERPIECE_TEACUP = create("masterpiece_teacup", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(CobblemonSounds.ITEM_BLOCK_TEACUP_SOUNDS).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.TEACUP))
|
||||
@JvmField
|
||||
val CHIPPED_POT = create("chipped_pot", DecorativeItemBlock(BlockBehaviour.Properties.of().sound(SoundType.DECORATED_POT).mapColor(MapColor.NONE).noOcclusion(), DecorativeItemBlock.DecorativeItemBlockType.TEAPOT))
|
||||
@JvmField
|
||||
|
||||
@@ -750,5 +750,20 @@ object CobblemonSounds : PlatformRegistry<Registry<SoundEvent>, ResourceKey<Regi
|
||||
ITEM_BLOCK_JAR_GLASS_LIQUID_STEP
|
||||
)
|
||||
|
||||
@JvmField
|
||||
val ITEM_BLOCK_TEACUP_PLACE = this.create("block.item_block.teacup.place")
|
||||
@JvmField
|
||||
val ITEM_BLOCK_TEACUP_BREAK = this.create("block.item_block.teacup.break")
|
||||
@JvmField
|
||||
val ITEM_BLOCK_TEACUP_STEP = this.create("block.item_block.teacup.step")
|
||||
@JvmField
|
||||
val ITEM_BLOCK_TEACUP_SOUNDS = SoundType(1f, 1.1f,
|
||||
ITEM_BLOCK_TEACUP_BREAK,
|
||||
ITEM_BLOCK_TEACUP_STEP,
|
||||
ITEM_BLOCK_TEACUP_PLACE,
|
||||
ITEM_BLOCK_TEACUP_STEP,
|
||||
ITEM_BLOCK_TEACUP_STEP
|
||||
)
|
||||
|
||||
private fun create(name: String): SoundEvent = this.create(name, SoundEvent.createVariableRangeEvent(cobblemonResource(name)))
|
||||
}
|
||||
@@ -1147,6 +1147,33 @@
|
||||
{ "name": "cobblemon:block/item_block/jar_glass_liquid_step_4", "volume": 0.2 }
|
||||
]
|
||||
},
|
||||
"block.item_block.teacup.place": {
|
||||
"subtitle": "subtitles.block.generic.place",
|
||||
"sounds": [
|
||||
{ "name": "cobblemon:block/item_block/teacup_place_1", "volume": 0.3 },
|
||||
{ "name": "cobblemon:block/item_block/teacup_place_2", "volume": 0.3 },
|
||||
{ "name": "cobblemon:block/item_block/teacup_place_3", "volume": 0.3 },
|
||||
{ "name": "cobblemon:block/item_block/teacup_place_4", "volume": 0.3 }
|
||||
]
|
||||
},
|
||||
"block.item_block.teacup.break": {
|
||||
"subtitle": "subtitles.block.generic.break",
|
||||
"sounds": [
|
||||
{ "name": "cobblemon:block/item_block/teacup_break_1", "volume": 0.4 },
|
||||
{ "name": "cobblemon:block/item_block/teacup_break_2", "volume": 0.4 },
|
||||
{ "name": "cobblemon:block/item_block/teacup_break_3", "volume": 0.4 },
|
||||
{ "name": "cobblemon:block/item_block/teacup_break_4", "volume": 0.4 }
|
||||
]
|
||||
},
|
||||
"block.item_block.teacup.step": {
|
||||
"subtitle": "subtitles.block.generic.footsteps",
|
||||
"sounds": [
|
||||
{ "name": "cobblemon:block/item_block/teacup_step_1", "volume": 0.2 },
|
||||
{ "name": "cobblemon:block/item_block/teacup_step_2", "volume": 0.2 },
|
||||
{ "name": "cobblemon:block/item_block/teacup_step_3", "volume": 0.2 },
|
||||
{ "name": "cobblemon:block/item_block/teacup_step_4", "volume": 0.2 }
|
||||
]
|
||||
},
|
||||
"move.absorb.actor": {
|
||||
"sounds": [ { "name": "cobblemon:move/absorb/absorb_actor", "volume": 0.3 } ]
|
||||
},
|
||||
@@ -1653,6 +1680,18 @@
|
||||
"move.horndrill.target_2": {
|
||||
"sounds": [ { "name": "cobblemon:move/horndrill/horndrill_target_2", "volume": 1.0 } ]
|
||||
},
|
||||
"move.playrough.actor_1": {
|
||||
"sounds": [ { "name": "cobblemon:move/playrough/playrough_actor_1", "volume": 1.0 } ]
|
||||
},
|
||||
"move.playrough.actor_2": {
|
||||
"sounds": [ { "name": "cobblemon:move/playrough/playrough_actor_2", "volume": 1.0 } ]
|
||||
},
|
||||
"move.playrough.actor_3": {
|
||||
"sounds": [ { "name": "cobblemon:move/playrough/playrough_actor_3", "volume": 1.0 } ]
|
||||
},
|
||||
"move.playrough.target": {
|
||||
"sounds": [ { "name": "cobblemon:move/playrough/playrough_target", "volume": 1.0 } ]
|
||||
},
|
||||
"impact.normal": {
|
||||
"sounds": [
|
||||
{ "name": "cobblemon:move/impact_generic/impact_generic_fighting_1", "volume": 0.8 },
|
||||
@@ -8485,4 +8524,4 @@
|
||||
"pokemon.pecharunt.cry": {
|
||||
"sounds": [ { "name": "cobblemon:pokemon/pecharunt/pecharunt_cry", "volume": 0.8 } ]
|
||||
}
|
||||
}
|
||||
},
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
@@ -14,10 +14,20 @@
|
||||
"entityCondition": "q.entity.is_user == true && q.missed(q.entity.uuid) == false",
|
||||
"expressions": ["q.play_animation(q.bedrock_stateful('playrough', 'actor'))"]
|
||||
},
|
||||
{
|
||||
"type": "entity_molang",
|
||||
"entityCondition": "q.entity.is_user == true && q.missed(q.entity.uuid) == false",
|
||||
"expressions": ["q.sound('move.playrough.actor_1');"]
|
||||
},
|
||||
{
|
||||
"type": "pause",
|
||||
"pause": 0.125
|
||||
},
|
||||
{
|
||||
"type": "entity_molang",
|
||||
"entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false",
|
||||
"expressions": ["q.sound('move.playrough.actor_2');"]
|
||||
},
|
||||
{
|
||||
"type": "entity_particles",
|
||||
"entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false",
|
||||
@@ -35,7 +45,21 @@
|
||||
},
|
||||
{
|
||||
"type": "pause",
|
||||
"pause": 0.725
|
||||
"pause": 0.5
|
||||
},
|
||||
{
|
||||
"type": "entity_molang",
|
||||
"entityCondition": "q.entity.is_user == true && q.missed(q.entity.uuid) == false",
|
||||
"expressions": ["q.sound('move.playrough.actor_3');"]
|
||||
},
|
||||
{
|
||||
"type": "entity_molang",
|
||||
"entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false",
|
||||
"expressions": ["q.sound('move.playrough.target');"]
|
||||
},
|
||||
{
|
||||
"type": "pause",
|
||||
"pause": 0.225
|
||||
},
|
||||
{
|
||||
"type": "remove_holds",
|
||||
|
||||
Reference in new issue
Block a user