Skip to content

Commit

Permalink
Merge branch 'master' into mc1.17
Browse files Browse the repository at this point in the history
  • Loading branch information
@Pandapip1
Pandapip1 authored Apr 22, 2024
2 parents f6a0c5d + 8f29e3a commit a46804d
Show file tree
Hide file tree
Showing 2 changed files with 66 additions and 13 deletions.
4 changes: 2 additions & 2 deletions src/lib/plugins/errorHandler.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports.player = async function (player, serv) {
function unhandledRejection (promise) {
serv.warn('-------------------------------')
serv.warn('Please report this flying-squid! This is bug (mabye)')
serv.warn('Please report this error to flying-squid! This is can be bug')
serv.warn('Unhandled rejection warning!')
serv.warn('Error: ' + promise)
serv.warn('Report this error here: https://github.com/PrismarineJS/flying-squid/issues')
Expand All @@ -11,7 +11,7 @@ module.exports.player = async function (player, serv) {

function uncaughtException (err) {
serv.err('-------------------------------')
serv.err('Please report this flying-squid! This is bug (mabye)')
serv.err('Please report this error to flying-squid! This is can be bug')
serv.err('Something went wrong!')
serv.err('Error: ' + err.stack)
serv.err('Report this error here: https://github.com/PrismarineJS/flying-squid/issues')
Expand Down
75 changes: 64 additions & 11 deletions src/lib/plugins/sound.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ const { skipMcPrefix } = require('../utils')

const Vec3 = require('vec3').Vec3

module.exports.server = function (serv) {
module.exports.server = function (serv, { version }) {
const registry = require('prismarine-registry')(version)
serv.playSound = (sound, world, position, { whitelist, blacklist = [], radius = 32, volume = 1.0, pitch = 1.0, soundCategory = 0 } = {}) => {
const players = (typeof whitelist !== 'undefined'
? (typeof whitelist instanceof Array ? whitelist : [whitelist])
Expand All @@ -28,6 +29,31 @@ module.exports.server = function (serv) {
})
}

serv.playSoundId = (soundId, world, position, { whitelist, blacklist = [], radius = 32, volume = 1.0, pitch = 1.0, soundCategory = 0 } = {}) => {
const players = (typeof whitelist !== 'undefined'
? (typeof whitelist instanceof Array ? whitelist : [whitelist])
: serv.getNearby({
world,
position,
radius
}))
players.filter(player => blacklist.indexOf(player) === -1)
.forEach(player => {
const iniPos = position ? position.scaled(1 / 32) : player.position.scaled(1 / 32)
const pos = iniPos.scaled(8).floored()
// only packet still in fixed position in all versions
player._client.write('sound_effect', {
soundId,
soundCategory,
x: pos.x,
y: pos.y,
z: pos.z,
volume,
pitch: Math.round(pitch * 63)
})
})
}

serv.playNoteBlock = (pitch, world, position, { instrument = 'harp', particle = true } = {}) => {
if (particle) {
serv.emitParticle(23, world, position.clone().add(new Vec3(0.5, 1.5, 0.5)), {
Expand All @@ -43,42 +69,64 @@ module.exports.server = function (serv) {
serv.commands.add({
base: 'playsoundforall',
info: 'to play sound for everyone',
usage: '/playsoundforall <sound_name> [volume] [pitch]',
usage: '/playsoundforall <sound_name> [volume] [pitch] [useID]',
onlyPlayer: true,
op: true,
parse (str) {
const results = str.match(/([^ ]+)(?: ([^ ]+))?(?: ([^ ]+))?/)
const results = str.match(/([^ ]+)(?: ([^ ]+))?(?: ([^ ]+))?(?: (true|false))?/)
if (!results) return false
return {
sound_name: skipMcPrefix(results[1]),
volume: results[2] ? parseFloat(results[2]) : 1.0,
pitch: results[3] ? parseFloat(results[3]) : 1.0
pitch: results[3] ? parseFloat(results[3]) : 1.0,
useId: results[4] ? results[4] === 'true' : false
}
},
action (action, ctx) {
ctx.player.chat('Playing "' + action.sound_name + '" (volume: ' + action.volume + ', pitch: ' + action.pitch + ')')
serv.playSound(action.sound_name, ctx.player.world, ctx.player.position, { volume: action.volume, pitch: action.pitch })
if (action.useId) {
const id = registry?.soundsByName[action.sound_name]?.id
if (id) {
ctx.player.chat('Playing "' + action.sound_name + '" (volume: ' + action.volume + ', pitch: ' + action.pitch + ') using ID')
serv.playSoundId(id, ctx.player.world, ctx.player.position, { volume: action.volume, pitch: action.pitch })
} else {
ctx.player.chat('"' + action.sound_name + '" could not be played by ID')
}
} else {
ctx.player.chat('Playing "' + action.sound_name + '" (volume: ' + action.volume + ', pitch: ' + action.pitch + ')')
serv.playSound(action.sound_name, ctx.player.world, ctx.player.position, { volume: action.volume, pitch: action.pitch })
}
}
})

serv.commands.add({
base: 'playsound',
info: 'to play sound for yourself',
usage: '/playsound <sound_name> [volume] [pitch]',
usage: '/playsound <sound_name> [volume] [pitch] [useID]',
onlyPlayer: true,
op: true,
parse (str) {
const results = str.match(/([^ ]+)(?: ([^ ]+))?(?: ([^ ]+))?/)
const results = str.match(/([^ ]+)(?: ([^ ]+))?(?: ([^ ]+))?(?: (true|false))?/)
if (!results) return false
return {
sound_name: skipMcPrefix(results[1]),
volume: results[2] ? parseFloat(results[2]) : 1.0,
pitch: results[3] ? parseFloat(results[3]) : 1.0
pitch: results[3] ? parseFloat(results[3]) : 1.0,
useId: results[4] ? results[4] === 'true' : false
}
},
action (action, ctx) {
ctx.player.chat('Playing "' + action.sound_name + '" (volume: ' + action.volume + ', pitch: ' + action.pitch + ')')
ctx.player.playSound(action.sound_name, { volume: action.volume, pitch: action.pitch })
if (action.useId) {
const id = registry?.soundsByName[action.sound_name]?.id
if (id) {
ctx.player.chat('Playing "' + action.sound_name + '" (volume: ' + action.volume + ', pitch: ' + action.pitch + ') using ID')
ctx.player.playSoundId(id, { volume: action.volume, pitch: action.pitch })
} else {
ctx.player.chat('"' + action.sound_name + '" could not be played by ID')
}
} else {
ctx.player.chat('Playing "' + action.sound_name + '" (volume: ' + action.volume + ', pitch: ' + action.pitch + ')')
ctx.player.playSound(action.sound_name, { volume: action.volume, pitch: action.pitch })
}
}
})
}
Expand All @@ -89,6 +137,11 @@ module.exports.player = function (player, serv) {
serv.playSound(sound, player.world, null, opt)
}

player.playSoundId = (sound, opt = {}) => {
opt.whitelist = player
serv.playSoundId(sound, player.world, null, opt)
}

player.on('placeBlock_cancel', async ({ reference }, cancel) => {
if (player.crouching) return
const id = await player.world.getBlockType(reference)
Expand Down

0 comments on commit a46804d

Please sign in to comment.