skip mc prefix, make setblock with name

src/lib/plugins/blocks.js

@@ -1,3 +1,5 @@
+const { skipMcPrefix } = require('../utils')
+
 const Vec3 = require('vec3').Vec3
 
 module.exports.player = function (player, serv) {
@@ -60,7 +62,7 @@ module.exports.server = function (serv, { version }) {
     op: true,
     tab: ['blockX', 'blockY', 'blockZ', 'block', 'number'],
     parse (str) {
-      const results = str.match(/^(~|~?-?[0-9]+) (~|~?-?[0-9]+) (~|~?-?[0-9]+) ([0-9]{1,3})(?: ([0-9]{1,3}))?/)
+      const results = str.match(/^(~|~?-?[0-9]+) (~|~?-?[0-9]+) (~|~?-?[0-9]+) ([\w_:0-9]+)(?: ([0-9]{1,3}))?/)
       if (!results) return false
       return results
     },
@@ -69,6 +71,7 @@ module.exports.server = function (serv, { version }) {
       if (ctx.player) res = res.map((val, i) => serv.posFromString(val, ctx.player.position[['x', 'y', 'z'][i]]))
       else res = res.map((val, i) => serv.posFromString(val, new Vec3(0, 128, 0)[['x', 'y', 'z'][i]]))
 
+      res[1] = isNaN(+res[1]) ? mcData.blocksByName[skipMcPrefix(res[1])]?.id : +res[1]
       const id = parseInt(params[4], 10)
       const data = parseInt(params[5] || 0, 10)
       const stateId = serv.supportFeature('theFlattening') ? (blocks[id].minStateId + data) : (id << 4 | data)

src/lib/plugins/effects.js

@@ -1,5 +1,6 @@
 const { pascalCase } = require('change-case')
 const UserError = require('../user_error')
+const { skipMcPrefix } = require('../utils')
 
 module.exports.entity = function (entity, serv) {
   entity.effects = {}
@@ -73,8 +74,8 @@ module.exports.server = function (serv, options) {
           let effId = parseInt(params[2])
           if (isNaN(effId)) {
             const mcData = require('minecraft-data')(options.version)
-            const effectNamePascal = pascalCase(params[2])
-            const effect = mcData.effectsByName[effectNamePascal];
+            const effectNamePascal = pascalCase(skipMcPrefix(params[2]))
+            const effect = mcData.effectsByName[effectNamePascal]
             if (!effect) throw new UserError(`Unknown effect ${params[2]}}`)
             effId = effect.id
           }

src/lib/plugins/players.js

@@ -1,3 +1,5 @@
+const { skipMcPrefix } = require('../utils')
+
 const UserError = require('flying-squid').UserError
 
 module.exports.server = function (serv, { version }) {
@@ -111,12 +113,12 @@ module.exports.server = function (serv, { version }) {
       if (args[2] && !args[2].match(/\d/)) throw new UserError('Count must be numerical')
       return {
         players,
-        item: args[1],
+        item: skipMcPrefix(args[1]),
         count: args[2] ? args[2] : 1
       }
     },
     action ({ players, item, count }) {
-      const itemData = isNaN(+item) ? mcData.itemsByName[item.replace(/minecraft:/, '')] : mcData.items[+item]
+      const itemData = isNaN(+item) ? mcData.itemsByName[skipMcPrefix(item)] : mcData.items[+item]
 
       if (!itemData) throw new UserError(`Unknown item '${item}'`)
       const newItem = new Item(itemData.id, count)
@@ -149,7 +151,7 @@ module.exports.server = function (serv, { version }) {
     parse (args, ctx) {
       args = args.split(' ')
       if (args[0] === '') return false
-      const enchantment = mcData.enchantmentsByName[args[1]]
+      const enchantment = mcData.enchantmentsByName[skipMcPrefix(args[1])]
       if (!enchantment) throw new UserError('No such enchantment')
       if (args[2] && (parseInt(args[2]) > enchantment.maxLevel || parseInt(args[2]) < 1)) throw new UserError(`Level ${args[2]} is not supported by that enchantment`)
       const players = serv.getPlayers(args[0], ctx.player)

src/lib/plugins/sound.js

@@ -1,3 +1,5 @@
+const { skipMcPrefix } = require('../utils')
+
 const Vec3 = require('vec3').Vec3
 
 module.exports.server = function (serv) {
@@ -48,7 +50,7 @@ module.exports.server = function (serv) {
       const results = str.match(/([^ ]+)(?: ([^ ]+))?(?: ([^ ]+))?/)
       if (!results) return false
       return {
-        sound_name: results[1],
+        sound_name: skipMcPrefix(results[1]),
         volume: results[2] ? parseFloat(results[2]) : 1.0,
         pitch: results[3] ? parseFloat(results[3]) : 1.0
       }
@@ -69,7 +71,7 @@ module.exports.server = function (serv) {
       const results = str.match(/([^ ]+)(?: ([^ ]+))?(?: ([^ ]+))?/)
       if (!results) return false
       return {
-        sound_name: results[1],
+        sound_name: skipMcPrefix(results[1]),
         volume: results[2] ? parseFloat(results[2]) : 1.0,
         pitch: results[3] ? parseFloat(results[3]) : 1.0
       }

src/lib/plugins/spawn.js

@@ -3,6 +3,7 @@ const requireIndex = require('../requireindex')
 const plugins = requireIndex(path.join(__dirname, '..', 'plugins'))
 const UserError = require('flying-squid').UserError
 const UUID = require('uuid-1345')
+const { skipMcPrefix } = require('../utils')
 const Vec3 = require('vec3').Vec3
 
 module.exports.server = function (serv, options) {
@@ -116,7 +117,7 @@ module.exports.server = function (serv, options) {
     op: true,
     action (name, ctx) {
       if (Object.keys(serv.entities).length > options['max-entities']) { throw new UserError('Too many mobs !') }
-      const entity = entitiesByName[name]
+      const entity = entitiesByName[skipMcPrefix(name)]
       if (!entity) {
         return 'No entity named ' + name
       }
@@ -146,7 +147,7 @@ module.exports.server = function (serv, options) {
     },
     action ({ number, name }, ctx) {
       if (Object.keys(serv.entities).length > options['max-entities'] - number) { throw new UserError('Too many mobs !') }
-      const entity = entitiesByName[name]
+      const entity = entitiesByName[skipMcPrefix(name)]
       if (!entity) {
         return 'No entity named ' + name
       }

src/lib/plugins/tabComplete.js

@@ -37,7 +37,7 @@ module.exports.player = function (player, serv, options) {
 
     use: function (id, otherData = null, existingContent = '') {
       if (id === undefined || !this.types[id]) return
-      const matches = this.types[id](otherData) || this.types.player();
+      const matches = this.types[id](otherData) || this.types.player()
       sendTabComplete(matches, existingContent)
     },
     add: function (id, cb) {

src/lib/utils.js

@@ -0,0 +1 @@
+module.exports.skipMcPrefix = (name) => typeof name === 'string' ? name.replace(/^minecraft:/, '') : name