Skip to content
This repository was archived by the owner on Sep 28, 2025. It is now read-only.

Commit 694e2d1

Browse files
DaanV2DaanV2
committed
chore: updating blockception dependencies
1 parent 0323425 commit 694e2d1

File tree

8 files changed

+75
-55
lines changed

8 files changed

+75
-55
lines changed

‎client/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
},
2525
"dependencies": {
2626
"@blockception/shared": "^0.0.1",
27-
"bc-minecraft-bedrock-project": "^1.21.101-5",
27+
"bc-minecraft-bedrock-project": "^1.21.101-6",
2828
"bc-minecraft-bedrock-vanilla-data": "^1.21.80-10",
2929
"node": "^24.1.0",
3030
"vscode-languageclient": "^9.0.1"

‎package-lock.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"license": "BSD-3-Clause",
4242
"dependencies": {
4343
"@blockception/shared": "^0.0.1",
44-
"bc-minecraft-bedrock-project": "^1.21.101-5",
44+
"bc-minecraft-bedrock-project": "^1.21.101-6",
4545
"bc-minecraft-bedrock-vanilla-data": "^1.21.80-10",
4646
"node": "^24.1.0",
4747
"vscode-languageclient": "^9.0.1"
@@ -4004,30 +4004,30 @@
40044004
}
40054005
},
40064006
"node_modules/bc-minecraft-bedrock-diagnoser": {
4007-
"version": "1.21.100-3",
4008-
"resolved": "https://registry.npmjs.org/bc-minecraft-bedrock-diagnoser/-/bc-minecraft-bedrock-diagnoser-1.21.100-3.tgz",
4009-
"integrity": "sha512-fCxLPOlOt515nw8h6Oh3Z4GQi36XBYew+LGkiF5iwVJu0LpfQgSNjp8ZG1CTZXbidB9hMilC/bO1QW3IoG6Q7w==",
4007+
"version": "1.21.100-4",
4008+
"resolved": "https://registry.npmjs.org/bc-minecraft-bedrock-diagnoser/-/bc-minecraft-bedrock-diagnoser-1.21.100-4.tgz",
4009+
"integrity": "sha512-jtTN+SGp0WplqTMNOLkGiOaVBhzhMRHOBLysRbnZXN35z977prBbWGgXKoqNcpYHOJiHjvvmDavUN3NxUrfMAw==",
40104010
"license": "BSD-3-Clause",
40114011
"dependencies": {
40124012
"bc-minecraft-bedrock-command": "^1.21.100-3",
4013-
"bc-minecraft-bedrock-project": "^1.21.101-5",
4013+
"bc-minecraft-bedrock-project": "^1.21.101-6",
40144014
"bc-minecraft-bedrock-types": "^1.22.1-16",
40154015
"bc-minecraft-bedrock-vanilla-data": "^1.21.80-10",
4016-
"bc-minecraft-molang": "^1.21.100-7",
4016+
"bc-minecraft-molang": "^1.21.100-8",
40174017
"bc-minecraft-project": "^1.21.73-8",
40184018
"jsonc": "^2.0.0"
40194019
}
40204020
},
40214021
"node_modules/bc-minecraft-bedrock-project": {
4022-
"version": "1.21.101-5",
4023-
"resolved": "https://registry.npmjs.org/bc-minecraft-bedrock-project/-/bc-minecraft-bedrock-project-1.21.101-5.tgz",
4024-
"integrity": "sha512-Uf4llatxrhfoZDP2kU2IAhxqpJFLqHCQRdePq14Ax2IlhpruXOIUhOzcREzswXbUAVLAItJ0zEs2wVdZuHvcEw==",
4022+
"version": "1.21.101-6",
4023+
"resolved": "https://registry.npmjs.org/bc-minecraft-bedrock-project/-/bc-minecraft-bedrock-project-1.21.101-6.tgz",
4024+
"integrity": "sha512-UH1iY44JmaNSiWKECcvo3oZIDxlgExHwl30RF0bTwOGeGfR0OuymMpiJ2neoGSny9AB2zJ22KbDEdrzkpMfQig==",
40254025
"license": "BSD-3-Clause",
40264026
"dependencies": {
40274027
"bc-minecraft-bedrock-command": "^1.21.100-3",
40284028
"bc-minecraft-bedrock-types": "^1.22.1-16",
40294029
"bc-minecraft-bedrock-vanilla-data": "^1.21.80-10",
4030-
"bc-minecraft-molang": "^1.21.100-7",
4030+
"bc-minecraft-molang": "^1.21.100-8",
40314031
"bc-minecraft-project": "^1.21.73-8",
40324032
"jsonc": "^2.0.0"
40334033
}
@@ -11952,8 +11952,8 @@
1195211952
"@daanv2/queue-processor": "^2.2.1",
1195311953
"@types/vscode": "^1.103.0",
1195411954
"bc-minecraft-bedrock-command": "^1.21.100-3",
11955-
"bc-minecraft-bedrock-diagnoser": "^1.21.100-3",
11956-
"bc-minecraft-bedrock-project": "^1.21.101-5",
11955+
"bc-minecraft-bedrock-diagnoser": "^1.21.100-4",
11956+
"bc-minecraft-bedrock-project": "^1.21.101-6",
1195711957
"bc-minecraft-bedrock-types": "^1.22.1-16",
1195811958
"bc-minecraft-bedrock-vanilla-data": "^1.21.80-10",
1195911959
"bc-minecraft-molang": "^1.21.100-8",

‎server/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
"@daanv2/queue-processor": "^2.2.1",
2929
"@types/vscode": "^1.103.0",
3030
"bc-minecraft-bedrock-command": "^1.21.100-3",
31-
"bc-minecraft-bedrock-diagnoser": "^1.21.100-3",
32-
"bc-minecraft-bedrock-project": "^1.21.101-5",
31+
"bc-minecraft-bedrock-diagnoser": "^1.21.100-4",
32+
"bc-minecraft-bedrock-project": "^1.21.101-6",
3333
"bc-minecraft-bedrock-types": "^1.22.1-16",
3434
"bc-minecraft-bedrock-vanilla-data": "^1.21.80-10",
3535
"bc-minecraft-molang": "^1.21.100-8",

‎server/src/lib/lsp/completion/minecraft/molang/contexts.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Data } from "bc-minecraft-molang";
22
import { CompletionItemKind } from "vscode-languageserver";
33
import { GetDataSet } from "../../../../minecraft/molang/getdataset";
4-
import { Context } from '../../../context/context';
4+
import { Context } from "../../../context/context";
55
import { CompletionBuilder } from "../../builder/builder";
6-
import { CompletionContext } from '../../context';
6+
import { CompletionContext } from "../../context";
77

88
export function provideCompletion(context: Context<CompletionContext>): void {
99
const data = GetDataSet(context.document.uri);

‎server/src/lib/lsp/completion/minecraft/molang/general.ts‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
import { MolangFunction } from "bc-minecraft-molang";
2+
import { CompletionItemKind } from "vscode-languageserver";
3+
import { CompletionBuilder } from "../../builder";
4+
5+
export function generateMolangFunction(
6+
scope: string,
7+
data: MolangFunction,
8+
builder: CompletionBuilder,
9+
kinds: CompletionItemKind = CompletionItemKind.Function
10+
): void {
11+
let syntax = data.id;
12+
let doc = data.deprecated ? data.deprecated : data.documentation ?? `The molang query: ${data.id}`;
13+
14+
if (data.parameters && data.parameters.length > 0) {
15+
syntax += "(" + data.parameters.map((p) => p.id).join(", ") + ")";
16+
doc += "\n\n";
17+
18+
doc += data.parameters.map((i) => `- **${i.id}** ${i.documentation}`).join("\n");
19+
}
20+
21+
builder.add({
22+
label: data.id,
23+
documentation: {
24+
kind: "markdown",
25+
value: `${scope}.${syntax}\n\n${doc}`,
26+
},
27+
deprecated: data.deprecated !== undefined,
28+
kind: kinds,
29+
insertText: syntax,
30+
});
31+
}

‎server/src/lib/lsp/completion/minecraft/molang/math.ts‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,8 @@
1-
import { MolangData, MolangFunction } from "bc-minecraft-molang";
2-
import { CompletionItemKind } from "vscode-languageserver";
1+
import { MolangData } from "bc-minecraft-molang";
32
import { Context } from '../../../context/context';
4-
import { CompletionBuilder } from "../../builder/builder";
53
import { CompletionContext } from '../../context';
4+
import { generateMolangFunction } from './general';
65

76
export function provideCompletion(context: Context<CompletionContext>): void {
8-
MolangData.General.Math.forEach((item) => Generate(item, context.builder));
9-
}
10-
11-
function Generate(
12-
data: MolangFunction,
13-
builder: CompletionBuilder,
14-
kinds: CompletionItemKind = CompletionItemKind.Function
15-
): void {
16-
let insert = data.id;
17-
18-
if (data.parameters && data.parameters.length > 0) {
19-
insert += `(${data.parameters.map((p) => p.id).join(", ")})`;
20-
}
21-
22-
builder.add({ label:data.id, documentation: data.documentation ?? `The molang math: ${data.id}`, kind: kinds, insertText: insert});
7+
MolangData.General.Math.forEach((item) => generateMolangFunction("math", item, context.builder));
238
}

‎server/src/lib/lsp/completion/minecraft/molang/query.ts‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,8 @@
1-
import { MolangData, MolangFunction } from "bc-minecraft-molang";
2-
import { CompletionItemKind } from "vscode-languageserver";
3-
import { Context } from '../../../context/context';
4-
import { CompletionBuilder } from "../../builder/builder";
5-
import { CompletionContext } from '../../context';
1+
import { MolangData } from "bc-minecraft-molang";
2+
import { Context } from "../../../context/context";
3+
import { CompletionContext } from "../../context";
4+
import { generateMolangFunction } from "./general";
65

76
export function provideCompletion(context: Context<CompletionContext>): void {
8-
MolangData.General.Queries.forEach((item) => Generate(item, context.builder));
9-
}
10-
11-
function Generate(data: MolangFunction, builder: CompletionBuilder, kinds: CompletionItemKind = CompletionItemKind.Function): void {
12-
let insert = data.id;
13-
14-
if (data.parameters && data.parameters.length > 0) {
15-
insert += '(' + data.parameters.map((p) => p.id).join(', ') + ')';
16-
}
17-
18-
builder.add({ label:data.id, documentation: data.documentation ?? `The molang query: ${data.id}`, kind: kinds, insertText: insert});
7+
MolangData.General.Queries.forEach((item) => generateMolangFunction("query", item, context.builder));
198
}

‎server/src/lib/lsp/hover/minecraft/molang.ts‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@ export function provideHover(context: Context<HoverContext>): Hover | undefined
1616
return provideHoverAt(context, line, range, offset);
1717
}
1818

19-
export function provideHoverAt(context: Pick<Context<HoverContext>, "document">, currentText: string, textRange: TextRange, cursor: number): Hover | undefined {
19+
export function provideHoverAt(
20+
context: Pick<Context<HoverContext>, "document">,
21+
currentText: string,
22+
textRange: TextRange,
23+
cursor: number
24+
): Hover | undefined {
2025
let startIndex = cursor - textRange.start;
2126
let dotIndex = -1;
2227

@@ -101,8 +106,8 @@ export function provideHoverSpecific(
101106
}
102107

103108
function findGen(data: string, range: Range | undefined = undefined, items: MolangFunction[]): Hover | undefined {
104-
for (let I = 0; I < items.length; I++) {
105-
const item = items[I];
109+
for (let i = 0; i < items.length; i++) {
110+
const item = items[i];
106111

107112
if (item.id === data && item.documentation) {
108113
let doc = `${item.id} \n\n${item.documentation}`;
@@ -113,8 +118,18 @@ function findGen(data: string, range: Range | undefined = undefined, items: Mola
113118
if (item.deprecated) {
114119
doc += `\n\n**Deprecated**: ${item.deprecated}`;
115120
}
121+
let syntax = item.id;
122+
if (item.parameters) {
123+
syntax += `(${item.parameters.map(i => `<${i.id}>`).join(', ')})`
124+
}
116125

117-
return { contents: { value: doc, kind: "markdown" }, range: range };
126+
return {
127+
contents: {
128+
value: `${syntax}\n---\n${doc}`,
129+
kind: "markdown",
130+
},
131+
range: range,
132+
};
118133
}
119134
}
120135

0 commit comments

Comments
 (0)