xtex/quaedam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: xtex:dca14825265e6992ab91dc8a037e115a7261cc50
Branches Tags
xtex:main
..
compare: xtex:2c95dfa66014f1d032dd6851252f22d59ad03793
Branches Tags
xtex:main

2 Commits
dca1482526 ... 2c95dfa660

Author SHA1 Message Date
xtex
2c95dfa660
fix: fix unable to bootstrap registry warning 2023-08-01 17:53:34 +08:00
xtex
fa1aefe425
feat: remove 3.0 base factor for music 2023-08-01 17:51:53 +08:00
2 changed files with 2 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
common/src/main/kotlin/quaedam/projection/ProjectionEffect.kt
View File

@ -39,7 +39,7 @@ data class ProjectionEffectType<T : ProjectionEffect>(val constructor: () -> T)
val registryKey: ResourceKey<Registry<ProjectionEffectType<*>>> = val registryKey: ResourceKey<Registry<ProjectionEffectType<*>>> =
ResourceKey.createRegistryKey(Quaedam.resource("projection_effect")) ResourceKey.createRegistryKey(Quaedam.resource("projection_effect"))
val registry: Registry<ProjectionEffectType<*>> = BuiltInRegistries.registerSimple(registryKey) { null } val registry: Registry<ProjectionEffectType<*>> = BuiltInRegistries.registerSimple(registryKey) { nopEffect }
val nopEffect: ProjectionEffectType<NopEffect> = val nopEffect: ProjectionEffectType<NopEffect> =
Registry.register(registry, Quaedam.resource("nop"), ProjectionEffectType { NopEffect }) Registry.register(registry, Quaedam.resource("nop"), ProjectionEffectType { NopEffect })

2
common/src/main/kotlin/quaedam/projection/music/MusicPlayer.kt
View File

@ -71,7 +71,7 @@ class MusicPlayer(
// play note // play note
val projections = Projector.findNearbyProjections(level, pos, MusicProjection.effect.get()) val projections = Projector.findNearbyProjections(level, pos, MusicProjection.effect.get())
.takeIf { it.isNotEmpty() } ?: listOf(MusicProjectionEffect()) .takeIf { it.isNotEmpty() } ?: listOf(MusicProjectionEffect())
val volume = 3.0f * projections.maxOf { it.volumeFactor } * note.volume val volume = projections.maxOf { it.volumeFactor } * note.volume
val particle = projections.any { it.particle } val particle = projections.any { it.particle }
val instrument = level.getBlockState(pos).getValue(BlockStateProperties.NOTEBLOCK_INSTRUMENT) val instrument = level.getBlockState(pos).getValue(BlockStateProperties.NOTEBLOCK_INSTRUMENT)
val pitch = if (instrument.isTunable) { val pitch = if (instrument.isTunable) {