Skip to content

Commit 27121b9

Browse files
leaftail1880leaftail1880
committed
Merge branch 'updt93' of github.com:LushWay/Scripts
2 parents 46e02e8 + 25d5cf3 commit 27121b9

31 files changed

Lines changed: 316 additions & 360 deletions

‎package.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@
1717
"@formatjs/intl-locale": "^4.2.11",
1818
"@formatjs/intl-numberformat": "^8.15.4",
1919
"@formatjs/intl-pluralrules": "^5.4.4",
20-
"@minecraft/server": "2.0.0-beta.1.21.70-stable",
21-
"@minecraft/server-gametest": "1.0.0-beta.1.21.70-stable",
22-
"@minecraft/server-net": "1.0.0-beta.1.21.70-stable",
23-
"@minecraft/server-ui": "2.0.0-beta.1.21.70-stable",
24-
"@minecraft/vanilla-data": "1.21.70",
20+
"@minecraft/server": "2.1.0-beta.1.21.90-stable",
21+
"@minecraft/server-gametest": "1.0.0-beta.1.21.90-stable",
22+
"@minecraft/server-net": "1.0.0-beta.1.21.90-stable",
23+
"@minecraft/server-ui": "2.1.0-beta.1.21.90-stable",
24+
"@minecraft/vanilla-data": "1.21.90",
2525
"async-mutex": "^0.5.0"
2626
},
2727
"resolutions": {
28-
"@minecraft/server": "2.0.0-beta.1.21.70-stable",
29-
"@minecraft/server-gametest": "1.0.0-beta.1.21.70-stable",
30-
"@minecraft/server-net": "1.0.0-beta.1.21.70-stable",
31-
"@minecraft/server-ui": "2.0.0-beta.1.21.70-stable",
32-
"@minecraft/vanilla-data": "1.21.70"
28+
"@minecraft/server": "2.1.0-beta.1.21.90-stable",
29+
"@minecraft/server-gametest": "1.0.0-beta.1.21.90-stable",
30+
"@minecraft/server-net": "1.0.0-beta.1.21.90-stable",
31+
"@minecraft/server-ui": "2.1.0-beta.1.21.90-stable",
32+
"@minecraft/vanilla-data": "1.21.90"
3333
},
3434
"devDependencies": {
3535
"@eslint/js": "^9.29.0",

‎src/lib/cutscene/cutscene.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ export class Cutscene {
219219
restorePlayerCamera(player, this.restoreCameraTime)
220220
system.runTimeout(
221221
() => {
222-
if (player.isValid) player.onScreenDisplay.resetHudElements()
222+
if (player.isValid) player.onScreenDisplay.resetHudElementsVisibility()
223223
Compass.forceHide.delete(player)
224224
Sidebar.forceHide.delete(player)
225225
},

‎src/lib/database/utils.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ export class DatabaseUtils {
8686

8787
/** Creates a table entity that is used for data storage */
8888
static createTableEntity(tableType: string, tableName: string, index = 0): Entity {
89-
const entity = world.overworld.spawnEntity(DatabaseUtils.entityTypeId, DatabaseUtils.entityLocation)
89+
const entity = world.overworld.spawnEntity<string>(DatabaseUtils.entityTypeId, DatabaseUtils.entityLocation)
9090

9191
entity.setDynamicProperty('tableName', tableName)
9292
entity.setDynamicProperty('tableType', tableType)

‎src/lib/extensions/on-screen-display.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ export const ScreenDisplayOverride: ScreenDisplayOverrideTypes & ScreenDisplayOv
201201
return this.player[ScreenDisplaySymbol].hideAllExcept(hudElements)
202202
},
203203

204-
resetHudElements() {
205-
return this.player[ScreenDisplaySymbol].resetHudElements()
204+
resetHudElementsVisibility() {
205+
return this.player[ScreenDisplaySymbol].resetHudElementsVisibility()
206206
},
207207

208208
setHudVisibility(visible, hudElements) {

‎src/lib/extensions/player.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,8 @@ expand(Player.prototype, {
201201

202202
// We need to switch player to gamemode where we can apply damage to them
203203
const been = this.getGameMode()
204-
const damageable = been === GameMode.survival || been === GameMode.adventure
205-
if (!damageable) this.setGameMode(GameMode.survival)
204+
const damageable = been === GameMode.Survival || been === GameMode.Adventure
205+
if (!damageable) this.setGameMode(GameMode.Survival)
206206

207207
const equippable = this.getComponent('equippable')
208208
const damages =

‎src/lib/form/modal.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ export class ModalForm<Callback extends (ctx: FormCallback, ...args: any[]) => v
7272
}
7373

7474
this.args.push({ type: 'dropdown', options: options })
75-
this.form.dropdown(label, options, defaultValueIndex)
75+
this.form.dropdown(label, options, { defaultValueIndex })
7676

7777
// @ts-expect-error AAAAAAAAAAAA
7878
return this
@@ -133,7 +133,7 @@ export class ModalForm<Callback extends (ctx: FormCallback, ...args: any[]) => v
133133
}
134134

135135
this.args.push({ type: 'dropdown', options: objectKeys })
136-
this.form.dropdown(label, visibleKeys, defaultValueIndex)
136+
this.form.dropdown(label, visibleKeys, { defaultValueIndex })
137137

138138
// @ts-expect-error AAAAAAAAAAAA
139139
return this
@@ -156,7 +156,7 @@ export class ModalForm<Callback extends (ctx: FormCallback, ...args: any[]) => v
156156
defaultValue = 0,
157157
): ModalForm<AppendFormField<Callback, number>> {
158158
this.args.push({ type: 'slider' })
159-
this.form.slider(label, minimumValue, maximumValue, valueStep, defaultValue)
159+
this.form.slider(label, minimumValue, maximumValue, { defaultValue, valueStep })
160160

161161
// @ts-expect-error AAAAAAAAAAAA
162162
return this
@@ -170,7 +170,7 @@ export class ModalForm<Callback extends (ctx: FormCallback, ...args: any[]) => v
170170
*/
171171
addToggle(label: string, defaultValue: boolean): ModalForm<AppendFormField<Callback, boolean>> {
172172
this.args.push({ type: 'toggle' })
173-
this.form.toggle(label, defaultValue)
173+
this.form.toggle(label, { defaultValue })
174174

175175
// @ts-expect-error AAAAAAAAAAAA
176176
return this
@@ -189,7 +189,7 @@ export class ModalForm<Callback extends (ctx: FormCallback, ...args: any[]) => v
189189
defaultValue?: string,
190190
): ModalForm<AppendFormField<Callback, string>> {
191191
this.args.push({ type: 'textField' })
192-
this.form.textField(label, placeholderText, defaultValue)
192+
this.form.textField(label, placeholderText, { defaultValue })
193193

194194
// @ts-expect-error AAAAAAAAAAAA
195195
return this

‎src/lib/quest/menu.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Player, world } from '@minecraft/server'
2+
import { EventSignal } from 'lib/event-signal'
23
import { ActionForm } from 'lib/form/action'
34
import { ArrayForm } from 'lib/form/array'
45
import { MessageForm } from 'lib/form/message'
@@ -8,7 +9,6 @@ import { is } from 'lib/roles'
89
import { noNullable } from 'lib/util'
910
import { Vec } from 'lib/vector'
1011
import { Quest } from './quest'
11-
import { EventSignal } from 'lib'
1212

1313
const quest = new Command('q')
1414
.setAliases('quest')

‎src/lib/region/kinds/safe-area.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@ system.runPlayerInterval(
6969
const region = regions[0] as Region | undefined
7070

7171
const gamemode = player.getGameMode()
72-
const adventure = gamemode === GameMode.adventure
73-
const survival = gamemode === GameMode.survival
72+
const adventure = gamemode === GameMode.Adventure
73+
const survival = gamemode === GameMode.Survival
7474

7575
if (adventure && (!region || nearDisabledAdventureRegions(player))) {
76-
player.setGameMode(GameMode.survival)
76+
player.setGameMode(GameMode.Survival)
7777
} else if (survival && region && adventureModeRegion(region)) {
78-
player.setGameMode(GameMode.adventure)
78+
player.setGameMode(GameMode.Adventure)
7979
}
8080
},
8181
'safeAreaDisableAdventureNear',
@@ -87,12 +87,12 @@ RegionEvents.onPlayerRegionsChange.subscribe(({ player, previous, newest }) => {
8787
const now = newest[0] && (adventureModeRegion(newest[0]) || !nearDisabledAdventureRegions(player))
8888

8989
const gamemode = player.getGameMode()
90-
const adventure = gamemode === GameMode.adventure
91-
const survival = gamemode === GameMode.survival
90+
const adventure = gamemode === GameMode.Adventure
91+
const survival = gamemode === GameMode.Survival
9292

9393
if (been && adventure && !now) {
94-
player.setGameMode(GameMode.survival)
94+
player.setGameMode(GameMode.Survival)
9595
} else if (now && survival) {
96-
player.setGameMode(GameMode.adventure)
96+
player.setGameMode(GameMode.Adventure)
9797
}
9898
})

‎src/lib/roles.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ describe('roles auto switch gamemode', () => {
66
it('should switch gamemode', () => {
77
const player = TEST_createPlayer()
88

9-
expect(player.getGameMode()).toBe(GameMode.survival)
9+
expect(player.getGameMode()).toBe(GameMode.Survival)
1010

1111
expect(getRole(player)).toBe('member')
1212
expect(getRole(player.id)).toBe(getRole(player))
1313

1414
setRole(player, 'admin')
1515
expect(getRole(player.id)).toBe('admin')
16-
expect(player.getGameMode()).toBe(GameMode.survival)
16+
expect(player.getGameMode()).toBe(GameMode.Survival)
1717

1818
setRole(player, 'spectator')
19-
expect(player.getGameMode()).toBe(GameMode.spectator)
19+
expect(player.getGameMode()).toBe(GameMode.Spectator)
2020

2121
setRole(player, 'member')
22-
expect(player.getGameMode()).toBe(GameMode.survival)
22+
expect(player.getGameMode()).toBe(GameMode.Survival)
2323
})
2424

2525
it('should return valid role', () => {

‎src/lib/roles.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ export function setRole(player: Player | string, role: Role): void {
124124
Core.beforeEvents.roleChange.subscribe(({ newRole, oldRole, player }) => {
125125
if (!player) return
126126
if (newRole === 'spectator') {
127-
player.setGameMode(GameMode.spectator)
127+
player.setGameMode(GameMode.Spectator)
128128
} else if (oldRole === 'spectator') {
129-
player.setGameMode(GameMode.survival)
129+
player.setGameMode(GameMode.Survival)
130130
}
131131
})
132132

@@ -135,7 +135,7 @@ world.afterEvents.playerSpawn.subscribe(({ player, initialSpawn }) => {
135135
if (player.isSimulated()) return
136136
if (initialSpawn) {
137137
if (player.database.role === 'spectator') {
138-
player.setGameMode(GameMode.spectator)
138+
player.setGameMode(GameMode.Spectator)
139139
}
140140
}
141141
})

0 commit comments

Comments
 (0)