а вот и звуки
This commit is contained in:
parent
c64270c75e
commit
333f268228
@ -26,6 +26,14 @@ class SoundDataProvider(event: GatherDataEvent) : SoundDefinitionsProvider(event
|
|||||||
.with(SoundDefinition.Sound.sound(modLocation("item/rifle_shot"), SoundDefinition.SoundType.SOUND)))
|
.with(SoundDefinition.Sound.sound(modLocation("item/rifle_shot"), SoundDefinition.SoundType.SOUND)))
|
||||||
|
|
||||||
simple(MSoundEvents.CARGO_CRATE_OPEN)
|
simple(MSoundEvents.CARGO_CRATE_OPEN)
|
||||||
|
|
||||||
|
add(MSoundEvents.ANDROID_JUMP_BOOST,
|
||||||
|
definition().subtitle("otm.sound.android.jump_boost")
|
||||||
|
.with(SoundDefinition.Sound.sound(modLocation("android/jump_boost"), SoundDefinition.SoundType.SOUND)))
|
||||||
|
|
||||||
|
add(MSoundEvents.ANDROID_SHOCKWAVE,
|
||||||
|
definition().subtitle("otm.sound.android.shockwave")
|
||||||
|
.with(SoundDefinition.Sound.sound(modLocation("android/shockwave"), SoundDefinition.SoundType.SOUND)))
|
||||||
}
|
}
|
||||||
|
|
||||||
private inline fun add(value: SoundEvent, block: SoundDefinition.() -> Unit) {
|
private inline fun add(value: SoundEvent, block: SoundDefinition.() -> Unit) {
|
||||||
|
@ -7,6 +7,7 @@ import net.minecraft.nbt.CompoundTag
|
|||||||
import net.minecraft.network.FriendlyByteBuf
|
import net.minecraft.network.FriendlyByteBuf
|
||||||
import net.minecraft.resources.ResourceLocation
|
import net.minecraft.resources.ResourceLocation
|
||||||
import net.minecraft.server.level.ServerPlayer
|
import net.minecraft.server.level.ServerPlayer
|
||||||
|
import net.minecraft.sounds.SoundSource
|
||||||
import net.minecraftforge.network.NetworkEvent
|
import net.minecraftforge.network.NetworkEvent
|
||||||
import ru.dbotthepony.mc.otm.ClientConfig
|
import ru.dbotthepony.mc.otm.ClientConfig
|
||||||
import ru.dbotthepony.mc.otm.OverdriveThatMatters
|
import ru.dbotthepony.mc.otm.OverdriveThatMatters
|
||||||
@ -28,6 +29,7 @@ import ru.dbotthepony.mc.otm.network.packetHandled
|
|||||||
import ru.dbotthepony.mc.otm.network.sender
|
import ru.dbotthepony.mc.otm.network.sender
|
||||||
import ru.dbotthepony.mc.otm.registry.AndroidFeatures
|
import ru.dbotthepony.mc.otm.registry.AndroidFeatures
|
||||||
import ru.dbotthepony.mc.otm.registry.MNames
|
import ru.dbotthepony.mc.otm.registry.MNames
|
||||||
|
import ru.dbotthepony.mc.otm.registry.MSoundEvents
|
||||||
import java.util.function.Supplier
|
import java.util.function.Supplier
|
||||||
|
|
||||||
object TriggerJumpBoostPacket : MatteryPacket {
|
object TriggerJumpBoostPacket : MatteryPacket {
|
||||||
@ -48,6 +50,17 @@ object TriggerJumpBoostPacket : MatteryPacket {
|
|||||||
|
|
||||||
if (feature.isActive && feature.cooldown <= 4 && mattery.androidEnergy.extractEnergyInnerExact(ServerConfig.AndroidJumpBoost.ENERGY_COST, false).isPositive) {
|
if (feature.isActive && feature.cooldown <= 4 && mattery.androidEnergy.extractEnergyInnerExact(ServerConfig.AndroidJumpBoost.ENERGY_COST, false).isPositive) {
|
||||||
feature.putOnCooldown()
|
feature.putOnCooldown()
|
||||||
|
|
||||||
|
context.sender?.let {
|
||||||
|
it.level.playSound(
|
||||||
|
it,
|
||||||
|
it,
|
||||||
|
MSoundEvents.ANDROID_JUMP_BOOST,
|
||||||
|
SoundSource.PLAYERS,
|
||||||
|
1f,
|
||||||
|
1f
|
||||||
|
)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -83,6 +96,15 @@ class JumpBoostFeature(capability: MatteryPlayerCapability) : AndroidSwitchableF
|
|||||||
ply.deltaMovement += Vector(0.0, ServerConfig.AndroidJumpBoost.POWER * (level + 1) / 20.0, 0.0)
|
ply.deltaMovement += Vector(0.0, ServerConfig.AndroidJumpBoost.POWER * (level + 1) / 20.0, 0.0)
|
||||||
putOnCooldown()
|
putOnCooldown()
|
||||||
MatteryPlayerNetworkChannel.sendToServer(TriggerJumpBoostPacket)
|
MatteryPlayerNetworkChannel.sendToServer(TriggerJumpBoostPacket)
|
||||||
|
|
||||||
|
ply.level.playSound(
|
||||||
|
ply,
|
||||||
|
ply,
|
||||||
|
MSoundEvents.ANDROID_JUMP_BOOST,
|
||||||
|
SoundSource.PLAYERS,
|
||||||
|
1f,
|
||||||
|
1f
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -7,6 +7,7 @@ import net.minecraft.ChatFormatting
|
|||||||
import net.minecraft.network.FriendlyByteBuf
|
import net.minecraft.network.FriendlyByteBuf
|
||||||
import net.minecraft.resources.ResourceLocation
|
import net.minecraft.resources.ResourceLocation
|
||||||
import net.minecraft.server.level.ServerPlayer
|
import net.minecraft.server.level.ServerPlayer
|
||||||
|
import net.minecraft.sounds.SoundSource
|
||||||
import net.minecraft.world.entity.Entity
|
import net.minecraft.world.entity.Entity
|
||||||
import net.minecraft.world.entity.LivingEntity
|
import net.minecraft.world.entity.LivingEntity
|
||||||
import net.minecraft.world.entity.monster.warden.Warden
|
import net.minecraft.world.entity.monster.warden.Warden
|
||||||
@ -38,6 +39,7 @@ import ru.dbotthepony.mc.otm.network.sender
|
|||||||
import ru.dbotthepony.mc.otm.onceServer
|
import ru.dbotthepony.mc.otm.onceServer
|
||||||
import ru.dbotthepony.mc.otm.registry.AndroidFeatures
|
import ru.dbotthepony.mc.otm.registry.AndroidFeatures
|
||||||
import ru.dbotthepony.mc.otm.registry.MNames
|
import ru.dbotthepony.mc.otm.registry.MNames
|
||||||
|
import ru.dbotthepony.mc.otm.registry.MSoundEvents
|
||||||
import ru.dbotthepony.mc.otm.registry.ShockwaveDamageSource
|
import ru.dbotthepony.mc.otm.registry.ShockwaveDamageSource
|
||||||
import ru.dbotthepony.mc.otm.triggers.ShockwaveDamageMobTrigger
|
import ru.dbotthepony.mc.otm.triggers.ShockwaveDamageMobTrigger
|
||||||
import ru.dbotthepony.mc.otm.triggers.ShockwaveTrigger
|
import ru.dbotthepony.mc.otm.triggers.ShockwaveTrigger
|
||||||
@ -193,6 +195,15 @@ class ShockwaveFeature(capability: MatteryPlayerCapability) : AndroidSwitchableF
|
|||||||
} else {
|
} else {
|
||||||
shockwave()
|
shockwave()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ply.level.playSound(
|
||||||
|
ply,
|
||||||
|
ply,
|
||||||
|
MSoundEvents.ANDROID_SHOCKWAVE,
|
||||||
|
SoundSource.PLAYERS,
|
||||||
|
1f,
|
||||||
|
1f
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!wasMidair) {
|
if (!wasMidair) {
|
||||||
|
@ -20,6 +20,9 @@ object MSoundEvents {
|
|||||||
val PLAYER_BECOME_ANDROID: SoundEvent by make("player_become_android")
|
val PLAYER_BECOME_ANDROID: SoundEvent by make("player_become_android")
|
||||||
val CARGO_CRATE_OPEN: SoundEvent by make("cargo_crate_open")
|
val CARGO_CRATE_OPEN: SoundEvent by make("cargo_crate_open")
|
||||||
|
|
||||||
|
val ANDROID_JUMP_BOOST: SoundEvent by make("android.jump_boost")
|
||||||
|
val ANDROID_SHOCKWAVE: SoundEvent by make("android.shockwave")
|
||||||
|
|
||||||
internal fun register(bus: IEventBus) {
|
internal fun register(bus: IEventBus) {
|
||||||
registry.register(bus)
|
registry.register(bus)
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user