brammie15/Reeks2Missie6
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump version

Browse Source
This commit is contained in:
Bram Verhulst
2024-08-05 11:21:38 +02:00
parent 61c5a0e489
commit 9cc4705802
5 changed files with 29 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
package-lock.json generated
View File

@@ -8,7 +8,7 @@
"name": "scripting-starter", "name": "scripting-starter",
"version": "0.1.0", "version": "0.1.0",
"dependencies": { "dependencies": {
"@minecraft/server": "1.4.0-beta.1.20.10-stable", "@minecraft/server": "1.11.0",
"decode-uri-component": "^0.2.2" "decode-uri-component": "^0.2.2"
}, },
"devDependencies": { "devDependencies": {
@@ -89,13 +89,16 @@
"node_modules/@minecraft/common": { "node_modules/@minecraft/common": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/@minecraft/common/-/common-1.1.0.tgz", "resolved": "https://registry.npmjs.org/@minecraft/common/-/common-1.1.0.tgz",
"integrity": "sha512-stbUtINCXbcLNRlGNVX68xRC6ZYq3k3CYmfptwrCcPBEUjVOpVkSj3H4Y0qiSYB+1rVWv7DgiP7Uf9++50Ne5g==", "integrity": "sha512-stbUtINCXbcLNRlGNVX68xRC6ZYq3k3CYmfptwrCcPBEUjVOpVkSj3H4Y0qiSYB+1rVWv7DgiP7Uf9++50Ne5g=="
"dev": true
}, },
"node_modules/@minecraft/server": { "node_modules/@minecraft/server": {
"version": "1.4.0-beta.1.20.10-stable", "version": "1.11.0",
"resolved": "https://registry.npmjs.org/@minecraft/server/-/server-1.4.0-beta.1.20.10-stable.tgz", "resolved": "https://registry.npmjs.org/@minecraft/server/-/server-1.11.0.tgz",
"integrity": "sha512-GFxR3rc83fLG4G1QV51D6a7V1EylomZrUMO1oUNINhkMpNBe2ACA9CBpLpkixxg0Y3aDpUnTkuhjQpoMnekPSA==" "integrity": "sha512-sVTKkAR7fgcgRrBrl+QiqlwiL07JTCSRbwSLpkmsPDvgfhH4bQsdPXC8fWZGRxwKikC4/oBxGq5j6pJp87yF6Q==",
"license": "MIT",
"dependencies": {
"@minecraft/common": "^1.1.0"
}
}, },
"node_modules/@minecraft/server-ui": { "node_modules/@minecraft/server-ui": {
"version": "1.1.0", "version": "1.1.0",
@@ -106,15 +109,6 @@
"@minecraft/server": "^1.2.0" "@minecraft/server": "^1.2.0"
} }
}, },
"node_modules/@minecraft/server-ui/node_modules/@minecraft/server": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/@minecraft/server/-/server-1.7.0.tgz",
"integrity": "sha512-4q9N3vdLZMAUxPo//bovimPbPLuPbHbQC507ZB2h++dqOGWUGnCcTXTNRg2zkBwMonAzWHONkUsVr5tsi9BHcg==",
"dev": true,
"dependencies": {
"@minecraft/common": "^1.1.0"
}
},
"node_modules/@nodelib/fs.scandir": { "node_modules/@nodelib/fs.scandir": {
"version": "2.1.5", "version": "2.1.5",
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -5315,13 +5309,15 @@
"@minecraft/common": { "@minecraft/common": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/@minecraft/common/-/common-1.1.0.tgz", "resolved": "https://registry.npmjs.org/@minecraft/common/-/common-1.1.0.tgz",
"integrity": "sha512-stbUtINCXbcLNRlGNVX68xRC6ZYq3k3CYmfptwrCcPBEUjVOpVkSj3H4Y0qiSYB+1rVWv7DgiP7Uf9++50Ne5g==", "integrity": "sha512-stbUtINCXbcLNRlGNVX68xRC6ZYq3k3CYmfptwrCcPBEUjVOpVkSj3H4Y0qiSYB+1rVWv7DgiP7Uf9++50Ne5g=="
"dev": true
}, },
"@minecraft/server": { "@minecraft/server": {
"version": "1.4.0-beta.1.20.10-stable", "version": "1.11.0",
"resolved": "https://registry.npmjs.org/@minecraft/server/-/server-1.4.0-beta.1.20.10-stable.tgz", "resolved": "https://registry.npmjs.org/@minecraft/server/-/server-1.11.0.tgz",
"integrity": "sha512-GFxR3rc83fLG4G1QV51D6a7V1EylomZrUMO1oUNINhkMpNBe2ACA9CBpLpkixxg0Y3aDpUnTkuhjQpoMnekPSA==" "integrity": "sha512-sVTKkAR7fgcgRrBrl+QiqlwiL07JTCSRbwSLpkmsPDvgfhH4bQsdPXC8fWZGRxwKikC4/oBxGq5j6pJp87yF6Q==",
"requires": {
"@minecraft/common": "^1.1.0"
}
}, },
"@minecraft/server-ui": { "@minecraft/server-ui": {
"version": "1.1.0", "version": "1.1.0",
@@ -5330,17 +5326,6 @@
"dev": true, "dev": true,
"requires": { "requires": {
"@minecraft/server": "^1.2.0" "@minecraft/server": "^1.2.0"
},
"dependencies": {
"@minecraft/server": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/@minecraft/server/-/server-1.7.0.tgz",
"integrity": "sha512-4q9N3vdLZMAUxPo//bovimPbPLuPbHbQC507ZB2h++dqOGWUGnCcTXTNRg2zkBwMonAzWHONkUsVr5tsi9BHcg==",
"dev": true,
"requires": {
"@minecraft/common": "^1.1.0"
}
}
} }
}, },
"@nodelib/fs.scandir": { "@nodelib/fs.scandir": {

2
package.json
View File

@@ -23,7 +23,7 @@
"enablemcpreviewloopback": "CheckNetIsolation.exe LoopbackExempt -a -p=S-1-15-2-424268864-5579737-879501358-346833251-474568803-887069379-4040235476" "enablemcpreviewloopback": "CheckNetIsolation.exe LoopbackExempt -a -p=S-1-15-2-424268864-5579737-879501358-346833251-474568803-887069379-4040235476"
}, },
"dependencies": { "dependencies": {
"@minecraft/server": "1.4.0-beta.1.20.10-stable", "@minecraft/server": "1.11.0",
"decode-uri-component": "^0.2.2" "decode-uri-component": "^0.2.2"
} }
} }

20
scripts/Commandeer/mindKeeper.ts
View File

@@ -1,4 +1,4 @@
import { ChatSendAfterEvent, DynamicPropertiesDefinition, PropertyRegistry, World, system } from "@minecraft/server"; import { Vector3, World, system } from "@minecraft/server";
class Store { class Store {
type: StoreType; type: StoreType;
@@ -29,7 +29,7 @@ enum StoreType {
*/ */
class Mindkeeper { class Mindkeeper {
registerdStores: Array<Store> = []; registerdStores: Array<Store> = [];
propertyManager = new DynamicPropertiesDefinition(); // propertyManager = new DynamicPropertiesDefinition();
world: World; world: World;
initialised: boolean = false; initialised: boolean = false;
debugLog: string[] = []; debugLog: string[] = [];
@@ -72,7 +72,7 @@ class Mindkeeper {
* Registers the dynamic properties to the world's property registry. * Registers the dynamic properties to the world's property registry.
* @param propertyRegistry The property registry of the world. * @param propertyRegistry The property registry of the world.
*/ */
registerToWorld(propertyRegistry: PropertyRegistry) { registerToWorld() {
for (let i = 0; i < this.registerdStores.length; i++) { for (let i = 0; i < this.registerdStores.length; i++) {
let isAlreadyDefined = true; let isAlreadyDefined = true;
@@ -89,20 +89,19 @@ class Mindkeeper {
} }
switch (this.registerdStores[i].getType()) { switch (this.registerdStores[i].getType()) {
case StoreType.string: case StoreType.string:
this.propertyManager.defineString(this.registerdStores[i].getName(), 25565); this.world.setDynamicProperty(this.registerdStores[i].getName(), "");
this.debugLog.push("registerd string" + this.registerdStores[i].getName()); this.debugLog.push("registerd string" + this.registerdStores[i].getName());
break; break;
case StoreType.number: case StoreType.number:
this.propertyManager.defineNumber(this.registerdStores[i].getName(), 0); this.world.setDynamicProperty(this.registerdStores[i].getName(), 0);
this.debugLog.push("registerd number" + this.registerdStores[i].getName()); this.debugLog.push("registerd number" + this.registerdStores[i].getName());
break; break;
case StoreType.boolean: case StoreType.boolean:
this.propertyManager.defineBoolean(this.registerdStores[i].getName(), false); this.world.setDynamicProperty(this.registerdStores[i].getName(), false);
this.debugLog.push("registerd boolean" + this.registerdStores[i].getName()); this.debugLog.push("registerd boolean" + this.registerdStores[i].getName());
break; break;
} }
} }
propertyRegistry.registerWorldDynamicProperties(this.propertyManager);
this.initialised = true; this.initialised = true;
} }
@@ -111,7 +110,7 @@ class Mindkeeper {
* @param store The name of the store. * @param store The name of the store.
* @param value The value to set. * @param value The value to set.
*/ */
set(store: string, value: string | number | boolean): void { set(store: string, value: string | number | boolean | Vector3): void {
if (this.registerdStores.find((s) => s.getName() === store)?.getType() != typeof value) { if (this.registerdStores.find((s) => s.getName() === store)?.getType() != typeof value) {
this.world.sendMessage(`Store ${store} is not of type ${typeof value}`); this.world.sendMessage(`Store ${store} is not of type ${typeof value}`);
return; return;
@@ -126,7 +125,7 @@ class Mindkeeper {
* @param store The name of the store. * @param store The name of the store.
* @returns The value of the store, or undefined if the store is not defined. * @returns The value of the store, or undefined if the store is not defined.
*/ */
get(store: string): string | number | boolean | undefined { get(store: string): string | number | boolean | Vector3 | undefined {
try { try {
let data = this.world.getDynamicProperty(store); let data = this.world.getDynamicProperty(store);
if (data === undefined) { if (data === undefined) {
@@ -219,7 +218,8 @@ class Mindkeeper {
if (command === "!deleteStoresConfirm") { if (command === "!deleteStoresConfirm") {
this.getStores().forEach((store) => { this.getStores().forEach((store) => {
this.world.sendMessage(`Deleting ${store.getName()}`); this.world.sendMessage(`Deleting ${store.getName()}`);
this.world.removeDynamicProperty(store.getName()); this.world.sendMessage("This feature no longer works, thanks minecraft ");
// this.world.dynami(store.getName());
}); });
this.secondWarning = false; this.secondWarning = false;
} }

2
scripts/Commandeer/pupeteer.ts
View File

@@ -105,7 +105,7 @@ class Pupeteer {
} }
static givePlayerItem(player: Player, item: ItemStack) { static givePlayerItem(player: Player, item: ItemStack) {
(player.getComponent("inventory") as EntityInventoryComponent).container.addItem(item); (player.getComponent("inventory") as EntityInventoryComponent).container!.addItem(item);
} }
} }

2
scripts/levels/level1/mission1.ts
View File

@@ -1,4 +1,4 @@
import { MinecraftBlockTypes, Vector3, world } from "@minecraft/server"; import { BlockType, BlockTypes, Vector3, world } from "@minecraft/server";
import Level from "../../Commandeer/level/level"; import Level from "../../Commandeer/level/level";
import pupeteer from "../../Commandeer/pupeteer"; import pupeteer from "../../Commandeer/pupeteer";
import { teleportAgent, isAgentAt, getAgentLocation, getAgent } from "../../Commandeer/utils/agentUtils"; import { teleportAgent, isAgentAt, getAgentLocation, getAgent } from "../../Commandeer/utils/agentUtils";