Compare commits
No commits in common. "2fe9bce2ea00b01c3c7cb00580e469309f94a06f" and "bdf674b6780d16c3794673fea9c6ee573d5bca47" have entirely different histories.
2fe9bce2ea
...
bdf674b678
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"version": "0.24.2",
|
||||
"version": "0.24.1",
|
||||
"useWorkspaces": true,
|
||||
"npmClient": "yarn",
|
||||
"packages": [
|
||||
|
|
|
@ -12,11 +12,9 @@
|
|||
"build": "lerna run build",
|
||||
"ug": "yarn upgrade-interactive --latest",
|
||||
"np": "./script/push.sh",
|
||||
"lsp": "npm login -scope=@ccms",
|
||||
"lp": "lerna publish",
|
||||
"lpb": "lerna publish --dist-tag beta",
|
||||
"lpc": "lerna publish --canary --preid beta --pre-dist-tag beta",
|
||||
"lpf": "lerna publish from-package --yes"
|
||||
"lsp": "npm login --registry=https://registry.npmjs.org --scope=@ccms",
|
||||
"lp": "lerna publish --registry https://registry.npmjs.org",
|
||||
"lpb": "lerna publish --registry https://registry.npmjs.org --canary --preid beta --pre-dist-tag beta"
|
||||
},
|
||||
"workspaces": [
|
||||
"packages/*"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/amqp",
|
||||
"version": "0.24.2",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript amqp package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -19,12 +19,12 @@
|
|||
"test": "echo \"Error: run tests from root\" && exit 1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/api": "^0.24.2",
|
||||
"@ccms/common": "^0.24.2",
|
||||
"@ccms/container": "^0.24.2"
|
||||
"@ccms/api": "^0.24.1",
|
||||
"@ccms/common": "^0.24.1",
|
||||
"@ccms/container": "^0.24.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@ccms/nashorn": "^0.24.2",
|
||||
"@ccms/nashorn": "^0.24.1",
|
||||
"@javatypes/amqp-client": "^0.0.3",
|
||||
"@javatypes/spring-amqp": "^0.0.3",
|
||||
"@javatypes/spring-rabbit": "^0.0.3",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/api",
|
||||
"version": "0.24.2",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript api package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -19,9 +19,9 @@
|
|||
"test": "echo \"Error: run tests from root\" && exit 1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/common": "^0.24.2",
|
||||
"@ccms/container": "^0.24.2",
|
||||
"@ccms/polyfill": "^0.24.2",
|
||||
"@ccms/common": "^0.24.1",
|
||||
"@ccms/container": "^0.24.1",
|
||||
"@ccms/polyfill": "^0.24.1",
|
||||
"base64-js": "^1.5.1",
|
||||
"source-map-builder": "^0.0.7"
|
||||
},
|
||||
|
|
|
@ -44,13 +44,13 @@ export namespace jsconsole {
|
|||
let file = Paths.get(Paths.get(fileName, '..', sourceMappingURL).toFile().getCanonicalPath()).toFile()
|
||||
if (file.exists()) {
|
||||
sourceContent = base.read(file)
|
||||
sourceFileMaps[fileName] = file.getCanonicalPath()
|
||||
} else if (global.debug) {
|
||||
console.debug('readSourceMap can\'t found', fileName, 'source map file', sourceMappingURL)
|
||||
}
|
||||
}
|
||||
if (sourceContent) {
|
||||
sourceMaps[fileName] = new SourceMapBuilder(JSON.parse(sourceContent))
|
||||
sourceFileMaps[fileName] = Paths.get(fileName, '..', sourceMaps[fileName].sources[0]).toFile().getCanonicalPath()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -88,9 +88,9 @@ export namespace jsconsole {
|
|||
let { fileName, lineNumber } = readSourceMap(trace.fileName, trace.lineNumber)
|
||||
if (fileName.startsWith(root)) { fileName = fileName.split(root)[1] }
|
||||
if (color) {
|
||||
cache.push(` §e->§c ${fileName}:${lineNumber}(${trace.lineNumber}) => §4${trace.methodName}`)
|
||||
cache.push(` §e->§c ${fileName}:${lineNumber} => §4${trace.methodName}`)
|
||||
} else {
|
||||
cache.push(` -> ${fileName}:${lineNumber}(${trace.lineNumber}) => ${trace.methodName}`)
|
||||
cache.push(` -> ${fileName}:${lineNumber} => ${trace.methodName}`)
|
||||
}
|
||||
} else {
|
||||
let className = trace.className
|
||||
|
|
|
@ -5,7 +5,7 @@ export namespace item {
|
|||
export abstract class Item {
|
||||
abstract builder(): ItemBuilder
|
||||
abstract toJson(item: any): string
|
||||
abstract fromJson(json: string): any
|
||||
abstract fromJSON(json: string): any
|
||||
}
|
||||
export interface ItemBuilder {
|
||||
from(item: any): ItemBuilder
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/bukkit",
|
||||
"version": "0.24.2",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript bukkit package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -25,8 +25,8 @@
|
|||
"typescript": "^4.6.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/api": "^0.24.2",
|
||||
"@ccms/common": "^0.24.2",
|
||||
"@ccms/container": "^0.24.2"
|
||||
"@ccms/api": "^0.24.1",
|
||||
"@ccms/common": "^0.24.1",
|
||||
"@ccms/container": "^0.24.1"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -12,7 +12,6 @@ export class BukkitItem extends item.Item {
|
|||
private NBTTagCompound: any
|
||||
private nmsSaveNBTMethodName: any
|
||||
private MojangsonParser: any
|
||||
private nmsItemStack: any
|
||||
private mpParseMethodName: any
|
||||
private nmsVersion: any
|
||||
constructor() {
|
||||
|
@ -26,8 +25,8 @@ export class BukkitItem extends item.Item {
|
|||
let nbt = new this.NBTTagCompound()
|
||||
return this.CraftItemStack.asNMSCopy(item)[this.nmsSaveNBTMethodName](nbt).toString()
|
||||
}
|
||||
fromJson(json: string) {
|
||||
return this.CraftItemStack.asBukkitCopy(new this.nmsItemStack(this.MojangsonParser[this.mpParseMethodName](json)))
|
||||
fromJSON(json: string) {
|
||||
return this.CraftItemStack.asBukkitCopy(this.MojangsonParser[this.mpParseMethodName](json))
|
||||
}
|
||||
private obcCls(name: string) {
|
||||
return base.getClass(['org.bukkit.craftbukkit', this.nmsVersion, name].join('.'))
|
||||
|
@ -45,7 +44,6 @@ export class BukkitItem extends item.Item {
|
|||
// @ts-ignore
|
||||
let asNMSCopyMethod = CraftItemStackClass.getMethod('asNMSCopy', ItemStack.class)
|
||||
let nmsItemStackClass = asNMSCopyMethod.getReturnType()
|
||||
this.nmsItemStack = Java.type(nmsItemStackClass.getName())
|
||||
let nmsNBTTagCompoundClass = undefined
|
||||
for (let method of Java.from(nmsItemStackClass.getMethods())) {
|
||||
let rt = method.getReturnType()
|
||||
|
@ -63,7 +61,7 @@ export class BukkitItem extends item.Item {
|
|||
}
|
||||
}
|
||||
try {
|
||||
this.MojangsonParser = this.nmsCls('MojangsonParser').static
|
||||
this.MojangsonParser = this.nmsCls('MojangsonParser')
|
||||
} catch (error) {
|
||||
this.MojangsonParser = Java.type('net.minecraft.nbt.MojangsonParser')
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/bungee",
|
||||
"version": "0.24.2",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript bungee package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -25,8 +25,8 @@
|
|||
"typescript": "^4.6.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/api": "^0.24.2",
|
||||
"@ccms/common": "^0.24.2",
|
||||
"@ccms/container": "^0.24.2"
|
||||
"@ccms/api": "^0.24.1",
|
||||
"@ccms/common": "^0.24.1",
|
||||
"@ccms/container": "^0.24.1"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"private": true,
|
||||
"name": "@ccms/client",
|
||||
"version": "0.24.2",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript client package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/common",
|
||||
"version": "0.24.2",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript common package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -19,7 +19,7 @@
|
|||
"test": "echo \"Error: run tests from root\" && exit 1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@ccms/nashorn": "^0.24.2",
|
||||
"@ccms/nashorn": "^0.24.1",
|
||||
"@javatypes/jdk": "^0.0.3",
|
||||
"reflect-metadata": "^0.1.13",
|
||||
"rimraf": "^3.0.2",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/compile",
|
||||
"version": "0.24.2",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript compile package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/container",
|
||||
"version": "0.24.2",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript container package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -19,7 +19,7 @@
|
|||
"test": "echo \"Error: run tests from root\" && exit 1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@ccms/nashorn": "^0.24.2",
|
||||
"@ccms/nashorn": "^0.24.1",
|
||||
"reflect-metadata": "^0.1.13",
|
||||
"rimraf": "^3.0.2",
|
||||
"typescript": "^4.6.3"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/core",
|
||||
"version": "0.24.2",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript core package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -24,8 +24,8 @@
|
|||
"typescript": "^4.6.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/api": "^0.24.2",
|
||||
"@ccms/container": "^0.24.2"
|
||||
"@ccms/api": "^0.24.1",
|
||||
"@ccms/container": "^0.24.1"
|
||||
},
|
||||
"gitHead": "781524f83e52cad26d7c480513e3c525df867121"
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/database",
|
||||
"version": "0.24.2",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript database package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -25,7 +25,7 @@
|
|||
"typescript": "^4.6.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/api": "^0.24.2",
|
||||
"@ccms/container": "^0.24.2"
|
||||
"@ccms/api": "^0.24.1",
|
||||
"@ccms/container": "^0.24.1"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/i18n",
|
||||
"version": "0.24.2",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript i18n package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -19,7 +19,7 @@
|
|||
"test": "echo \"Error: run tests from root\" && exit 1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@ccms/nashorn": "^0.24.2",
|
||||
"@ccms/nashorn": "^0.24.1",
|
||||
"@types/js-yaml": "^4.0.5",
|
||||
"reflect-metadata": "^0.1.13",
|
||||
"rimraf": "^3.0.2",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/keyvalue",
|
||||
"version": "0.24.2",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript keyvalue package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -19,12 +19,12 @@
|
|||
"test": "echo \"Error: run tests from root\" && exit 1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/api": "^0.24.2",
|
||||
"@ccms/common": "^0.24.2",
|
||||
"@ccms/container": "^0.24.2"
|
||||
"@ccms/api": "^0.24.1",
|
||||
"@ccms/common": "^0.24.1",
|
||||
"@ccms/container": "^0.24.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@ccms/nashorn": "^0.24.2",
|
||||
"@ccms/nashorn": "^0.24.1",
|
||||
"@javatypes/amqp-client": "^0.0.3",
|
||||
"@javatypes/spring-amqp": "^0.0.3",
|
||||
"@javatypes/spring-rabbit": "^0.0.3",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/molang",
|
||||
"version": "0.24.2",
|
||||
"version": "0.24.1",
|
||||
"description": "A fast parser for Minecraft's MoLang",
|
||||
"main": "dist/index.js",
|
||||
"types": "dist/index.d.ts",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/nashorn",
|
||||
"version": "0.24.2",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript nashorn package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/nodejs",
|
||||
"version": "0.24.2",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript nodejs package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -19,7 +19,7 @@
|
|||
"test": "echo \"Error: run tests from root\" && exit 1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@ccms/nashorn": "^0.24.2",
|
||||
"@ccms/nashorn": "^0.24.1",
|
||||
"reflect-metadata": "^0.1.13",
|
||||
"rimraf": "^3.0.2",
|
||||
"tslib": "^2.3.1",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/nukkit",
|
||||
"version": "0.24.2",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript nukkit package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -25,8 +25,8 @@
|
|||
"typescript": "^4.6.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/api": "^0.24.2",
|
||||
"@ccms/common": "^0.24.2",
|
||||
"@ccms/container": "^0.24.2"
|
||||
"@ccms/api": "^0.24.1",
|
||||
"@ccms/common": "^0.24.1",
|
||||
"@ccms/container": "^0.24.1"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/plugin",
|
||||
"version": "0.24.2",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript plugin package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -26,10 +26,10 @@
|
|||
"typescript": "^4.6.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/api": "^0.24.2",
|
||||
"@ccms/common": "^0.24.2",
|
||||
"@ccms/container": "^0.24.2",
|
||||
"@ccms/i18n": "^0.24.2",
|
||||
"@ccms/api": "^0.24.1",
|
||||
"@ccms/common": "^0.24.1",
|
||||
"@ccms/container": "^0.24.1",
|
||||
"@ccms/i18n": "^0.24.1",
|
||||
"@ccms/verify": "^0.21.1",
|
||||
"crypto-js": "^4.1.1",
|
||||
"js-yaml": "^4.1.0"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/polyfill",
|
||||
"version": "0.24.2",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript polyfill package",
|
||||
"author": "MiaoWoo <admin@yumc.pw>",
|
||||
"homepage": "https://github.com/circlecloud/ms.git",
|
||||
|
@ -14,12 +14,12 @@
|
|||
"test": "echo \"Error: run tests from root\" && exit 1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/i18n": "^0.24.2",
|
||||
"@ccms/nodejs": "^0.24.2",
|
||||
"@ccms/i18n": "^0.24.1",
|
||||
"@ccms/nodejs": "^0.24.1",
|
||||
"core-js": "^3.22.1"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@ccms/nashorn": "^0.24.2",
|
||||
"@ccms/nashorn": "^0.24.1",
|
||||
"reflect-metadata": "^0.1.13",
|
||||
"rimraf": "^3.0.2",
|
||||
"typescript": "^4.6.3"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/protocol",
|
||||
"version": "0.24.2",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript protocol package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/sponge",
|
||||
"version": "0.24.2",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript sponge package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -25,8 +25,8 @@
|
|||
"typescript": "^4.6.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/api": "^0.24.2",
|
||||
"@ccms/common": "^0.24.2",
|
||||
"@ccms/container": "^0.24.2"
|
||||
"@ccms/api": "^0.24.1",
|
||||
"@ccms/common": "^0.24.1",
|
||||
"@ccms/container": "^0.24.1"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/spring",
|
||||
"version": "0.24.2",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript spring package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -24,9 +24,9 @@
|
|||
"typescript": "^4.6.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/api": "^0.24.2",
|
||||
"@ccms/common": "^0.24.2",
|
||||
"@ccms/container": "^0.24.2",
|
||||
"@ccms/database": "^0.24.2"
|
||||
"@ccms/api": "^0.24.1",
|
||||
"@ccms/common": "^0.24.1",
|
||||
"@ccms/container": "^0.24.1",
|
||||
"@ccms/database": "^0.24.1"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/web",
|
||||
"version": "0.24.2",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript web package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -29,7 +29,7 @@
|
|||
"typescript": "^4.6.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"@ccms/api": "^0.24.2",
|
||||
"@ccms/container": "^0.24.2"
|
||||
"@ccms/api": "^0.24.1",
|
||||
"@ccms/container": "^0.24.1"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"name": "@ccms/websocket",
|
||||
"version": "0.24.2",
|
||||
"version": "0.24.1",
|
||||
"description": "MiaoScript websocket package",
|
||||
"keywords": [
|
||||
"miaoscript",
|
||||
|
@ -23,7 +23,7 @@
|
|||
"parseuri": "^0.0.6"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@ccms/nashorn": "^0.24.2",
|
||||
"@ccms/nashorn": "^0.24.1",
|
||||
"@javatypes/tomcat-websocket-api": "^0.0.3",
|
||||
"reflect-metadata": "^0.1.13",
|
||||
"rimraf": "^3.0.2",
|
||||
|
|
Loading…
Reference in New Issue