Skip to content

Commit c184625

Browse files
committed
fix script errors
1 parent 62eb474 commit c184625

File tree

6 files changed

+48
-8
lines changed

6 files changed

+48
-8
lines changed

package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
"homepage": "https://github.com/JaylyDev/ScriptAPI#readme",
1818
"type": "module",
1919
"dependencies": {
20-
"@minecraft/server": "beta",
21-
"@minecraft/server-admin": "beta",
22-
"@minecraft/server-gametest": "beta",
23-
"@minecraft/server-net": "beta",
24-
"@minecraft/server-ui": "beta",
20+
"@minecraft/server": "1.1.0-beta.preview.1.19.50.25",
21+
"@minecraft/server-admin": "1.0.0-beta.preview.1.19.50.25",
22+
"@minecraft/server-gametest": "1.0.0-beta.preview.1.19.50.25",
23+
"@minecraft/server-net": "1.0.0-beta.preview.1.19.50.25",
24+
"@minecraft/server-ui": "1.0.0-beta.preview.1.19.50.25",
2525
"@types/mojang-minecraft": "0.1.6",
2626
"@types/mojang-minecraft-ui": "0.1.0"
2727
},

scripts/custom-enchantments/index.d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Author: iBlqzed <https://github.com/iBlqzed>
2-
import { Player, ItemStack, Entity, Block, BlockPermutation } from "mojang-minecraft";
2+
import { Player, ItemStack, Entity, Block, BlockPermutation } from "@minecraft/server";
33
export declare class Enchant {
44
protected id: string;
55
constructor(info: EnchantInfo);

scripts/custom-enchantments/index.js

+14
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ const itemTypes = {
4444
"minecraft:netherrite_hoe"
4545
]
4646
};
47+
import { InventoryComponentContainer } from "@minecraft/server";
4748
import { world, Player } from "mojang-minecraft";
4849
const enchants = {};
4950
const names = {};
@@ -100,6 +101,10 @@ export function getEnchants(item) {
100101
}
101102
world.events.entityHit.subscribe(({ entity, hitBlock, hitEntity }) => {
102103
if (entity instanceof Player) {
104+
/**
105+
* @type {InventoryComponentContainer}
106+
*/
107+
//@ts-ignore
103108
const inv = entity.getComponent("inventory").container;
104109
const item = inv.getItem(entity.selectedSlot);
105110
if (!item)
@@ -114,6 +119,10 @@ world.events.entityHit.subscribe(({ entity, hitBlock, hitEntity }) => {
114119
});
115120
world.events.entityHurt.subscribe(({ hurtEntity, damagingEntity, damage }) => {
116121
if (damagingEntity instanceof Player) {
122+
/**
123+
* @type {InventoryComponentContainer}
124+
*/
125+
//@ts-ignore
117126
const inv = damagingEntity.getComponent("inventory").container;
118127
const item = inv.getItem(damagingEntity.selectedSlot);
119128
if (!item)
@@ -146,6 +155,11 @@ world.events.beforeItemUseOn.subscribe(({ source, item, blockLocation }) => {
146155
}
147156
});
148157
world.events.blockBreak.subscribe(({ player, block, brokenBlockPermutation }) => {
158+
159+
/**
160+
* @type {InventoryComponentContainer}
161+
*/
162+
//@ts-ignore
149163
const inv = player.getComponent("inventory").container;
150164
const item = inv.getItem(player.selectedSlot);
151165
if (!item)

scripts/custom-enchantments/tests.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { world } from "mojang-minecraft"
1+
import { InventoryComponentContainer, world } from "@minecraft/server"
22
import { addEnchant, Enchant } from "./index"
33

44
const bleedEnchant = new Enchant({
@@ -7,10 +7,14 @@ const bleedEnchant = new Enchant({
77
})
88

99
bleedEnchant.onHurt(data => {
10-
data.hurtEntity.runCommand(`damage @s 2`)
10+
data.hurtEntity.runCommandAsync(`damage @s 2`)
1111
})
1212

1313
world.events.beforeChat.subscribe(data => {
14+
/**
15+
* @type {InventoryComponentContainer}
16+
*/
17+
//@ts-ignore
1418
const inv = data.sender.getComponent("inventory").container
1519
const item = inv.getItem(data.sender.selectedSlot)
1620
addEnchant(item, 'bleed', 5)

scripts/getgamemode/index.js

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
2+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
3+
if (ar || !(i in from)) {
4+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
5+
ar[i] = from[i];
6+
}
7+
}
8+
return to.concat(ar || Array.prototype.slice.call(from));
9+
};
10+
import { GameMode, world } from "@minecraft/server";
11+
/**
12+
* Gets the Gamemode of a player
13+
* @author Smell of Curry
14+
* @param {Player} player player to get
15+
* @returns {keyof typeof GameMode}
16+
* @example if (getGamemode(player) == "creative") return;
17+
*/
18+
export function getGamemode(player) {
19+
return Object.values(GameMode).find(function (g) { return __spreadArray([], world.getPlayers({ name: player.name, gameMode: g }), true).length; });
20+
}

scripts/getgamemode/tests.js

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
import { getGamemode } from "getgamemode";
2+
getGamemode;

0 commit comments

Comments
 (0)