@wayward/types 2.14.3-beta.dev.20241225.1 → 2.14.3-beta.dev.20241227.1

package/definitions/game/resource/IResourceLoader.d.ts

@@ -10,52 +10,55 @@
  */
 export declare enum PathType {
     Action = 0,
-    AttackAnimation = 1,
-    ChallengeIcon = 2,
-    ChangelogChangeType = 3,
-    ContainerTabAction = 4,
-    Corpse = 5,
-    Creature = 6,
-    Damage = 7,
-    Deity = 8,
-    Doodad = 9,
-    Equip = 10,
-    EquipSlot = 11,
-    GameOptionsIcon = 12,
-    Hairstyle = 13,
-    HelpArticleIcon = 14,
-    InfoIcon = 15,
-    InputIcon = 16,
-    Island = 17,
-    IslandModifier = 18,
-    Item = 19,
-    Map = 20,
-    MapTile = 21,
-    MarkerIcon = 22,
-    MenuBarButtonIcon = 23,
-    MilestoneIcon = 24,
-    Music = 25,
-    Notifier = 26,
-    Overlay = 27,
-    Pin = 28,
-    Quality = 29,
-    RecipeLevel = 30,
-    SkillIcon = 31,
-    Sleep = 32,
-    SoundEffect = 33,
-    StatIcon = 34,
-    StatusEffectGroup = 35,
-    StatusIcon = 36,
-    StatusIconFrame = 37,
-    StatusIconNotifier = 38,
-    StatusOverlay = 39,
-    StatusThreatLevel = 40,
-    Terrain = 41,
-    TerrainDecoration = 42,
-    TerrainDug = 43,
-    TerrainMound = 44,
-    TerrainTilled = 45,
-    TileEvent = 46,
-    Vehicle = 47,
-    Website = 48
+    ActionInfoIcon = 1,
+    ActionSlotItemMethod = 2,
+    ActionSlotType = 3,
+    AttackAnimation = 4,
+    ChallengeIcon = 5,
+    ChangelogChangeType = 6,
+    ContainerTabAction = 7,
+    Corpse = 8,
+    Creature = 9,
+    Damage = 10,
+    Deity = 11,
+    Doodad = 12,
+    Equip = 13,
+    EquipSlot = 14,
+    GameOptionsIcon = 15,
+    Hairstyle = 16,
+    HelpArticleIcon = 17,
+    InfoIcon = 18,
+    InputIcon = 19,
+    Island = 20,
+    IslandModifier = 21,
+    Item = 22,
+    Map = 23,
+    MapTile = 24,
+    MarkerIcon = 25,
+    MenuBarButtonIcon = 26,
+    MilestoneIcon = 27,
+    Music = 28,
+    Notifier = 29,
+    Overlay = 30,
+    Pin = 31,
+    Quality = 32,
+    RecipeLevel = 33,
+    SkillIcon = 34,
+    Sleep = 35,
+    SoundEffect = 36,
+    StatIcon = 37,
+    StatusEffectGroup = 38,
+    StatusIcon = 39,
+    StatusIconFrame = 40,
+    StatusIconNotifier = 41,
+    StatusOverlay = 42,
+    StatusThreatLevel = 43,
+    Terrain = 44,
+    TerrainDecoration = 45,
+    TerrainDug = 46,
+    TerrainMound = 47,
+    TerrainTilled = 48,
+    TileEvent = 49,
+    Vehicle = 50,
+    Website = 51
 }

package/definitions/game/ui/old/OldUi.d.ts

@@ -34,7 +34,7 @@ export default class OldUi {
     getSerializationProperties(_: string): string[];
     setVersionExtra(msg: string): void;
     openDialogs(): void;
-    logErrorEvent(event: ErrorEvent | (Partial<ErrorEvent> & Error), skipLog?: true): void;
+    logErrorEvent(eventOrError: unknown, skipLog?: true): void;
     private loggingRejection;
     private logPromiseRejectionEvent;
 }

package/definitions/game/ui/screen/screens/game/component/container/ContainerBucketItemList.d.ts

@@ -22,6 +22,7 @@ import ItemComponent from "@wayward/game/ui/screen/screens/game/component/ItemCo
 import type { IDraggableComponentSubscriber, ISortableComponent, WithSortableEvents } from "@wayward/game/ui/util/Sortable";
 import Sortable from "@wayward/game/ui/util/Sortable";
 import { type IEventEmitter } from "@wayward/utilities/event/EventEmitter";
+import type { IMoveItemFilterArgument } from "@wayward/game/game/entity/action/actions/moveItem/MoveItemFilterArgument";
 export declare enum ContainerBucketItemListClasses {
     Main = "container-bucket-item-list",
     Anchored = "container-bucket-item-list-anchored",
@@ -29,7 +30,7 @@ export declare enum ContainerBucketItemListClasses {
     ActualTransferDestination = "container-bucket-item-list-actual-transfer-destination",
     HasStackExpanded = "container-bucket-item-list-has-stack-expanded"
 }
-export interface IContainerBucketItemListTransferDetails {
+export interface IContainerBucketItemListTransferDetails extends Omit<IMoveItemFilterArgument, "type"> {
     fromList?: ContainerBucketItemList;
     toList?: ContainerBucketItemList;
     fromContainer?: IContainer;
@@ -37,15 +38,11 @@ export interface IContainerBucketItemListTransferDetails {
     item?: Item;
     itemType: ItemType;
     moveAll: boolean;
-    moveLimit?: number;
     stackList?: ContainerBucketItemList;
     quality?: Quality;
-    text?: string;
-    excludeProtected?: true;
     index?: number;
     silent?: true;
     hidden?: true;
-    excludeEquipped?: boolean;
 }
 export interface IContainerBucketItemListEvents extends WithSortableEvents<Component> {
     addItem(item: Item): any;
@@ -81,6 +78,9 @@ export default class ContainerBucketItemList extends Component implements ISorta
     private containerRef?;
     get container(): IContainer | undefined;
     isStacked(type?: ItemType): boolean;
+    /**
+     * Returns whether this item's type is stacked in this container, *and* this item is not protected.
+     */
     isStacked(item?: Item): boolean;
     getStackedItems(type?: ItemType, excluding?: Item): Item[];
     getStackIndex(type?: ItemType): number | undefined;
@@ -146,6 +146,7 @@ export default class ContainerBucketItemList extends Component implements ISorta
     private getItemIdsInElements;
     private getItemElementId;
     private getItemComponentElements;
+    private getItemComponentById;
     private regenerate;
     private transfer;
     private getSorter;

package/definitions/game/ui/screen/screens/game/static/actions/ActionSlot.d.ts

@@ -30,6 +30,7 @@ import ItemComponent from "@wayward/game/ui/screen/screens/game/component/ItemCo
 import { ItemComponentHandler } from "@wayward/game/ui/screen/screens/game/component/item/ItemComponentHandler";
 import type ActionBar from "@wayward/game/ui/screen/screens/game/static/ActionBar";
 import { ActionSlotUpdateReason, IActionBarSlotData } from "@wayward/game/ui/screen/screens/game/static/actions/IActionBar";
+import { ActionSlotInternalType } from "@wayward/game/ui/screen/screens/game/static/actions/IActionsDrawer";
 import type TooltipLocationHandler from "@wayward/game/ui/tooltip/TooltipLocationHandler";
 import type { Events, IEventEmitter } from "@wayward/utilities/event/EventEmitter";
 export declare enum ActionSlotClasses {
@@ -50,10 +51,6 @@ export declare enum ActionSlotClasses {
     History_Cleared = "game-action-slot-history--cleared",
     ItemComponent = "game-action-slot-item-component"
 }
-export declare enum ActionSlotType {
-    Normal = 0,
-    History = 1
-}
 export interface IActionSlotEvents extends Events<Button>, IItemSlotEvents {
     update(data: IActionBarSlotData | undefined, oldData: IActionBarSlotData | undefined, reason: ActionSlotUpdateReason): any;
     unequipItem(): any;
@@ -62,9 +59,9 @@ export interface IActionSlotEvents extends Events<Button>, IItemSlotEvents {
 export declare class ActionSlot extends Button implements IRefreshable, ItemSlot {
     readonly number: number;
     slotData: IActionBarSlotData;
-    readonly type: ActionSlotType;
+    readonly type: ActionSlotInternalType;
     static getHovered(): ActionSlot | undefined;
-    static tryCreate(number: number, slotData: IActionBarSlotData, type?: ActionSlotType): ActionSlot;
+    static tryCreate(number: number, slotData: IActionBarSlotData, type?: ActionSlotInternalType): ActionSlot;
     event: IEventEmitter<this, IActionSlotEvents>;
     private get actionBar();
     readonly label: Text;
@@ -76,7 +73,7 @@ export declare class ActionSlot extends Button implements IRefreshable, ItemSlot
     private lastItem?;
     private lastQuality?;
     usability: ReturnableUsableActionUsability;
-    protected constructor(number: number, slotData: IActionBarSlotData, type?: ActionSlotType);
+    protected constructor(number: number, slotData: IActionBarSlotData, type?: ActionSlotInternalType);
     isTransientSlot(): boolean;
     getItemComponent(): ItemComponent | undefined;
     private skipNextClick;
@@ -120,7 +117,7 @@ export declare class ActionSlot extends Button implements IRefreshable, ItemSlot
     getActionId(): ActionId | undefined;
     getInternalActionType(): ActionType | undefined;
     private usingCache?;
-    getUsing(fresh?: true): IUsableActionPossibleUsing | undefined;
+    getUsing(fresh?: true, forceWithHoveredTile?: true): IUsableActionPossibleUsing | undefined;
     private getBindingText;
 }
 declare class ActionSlotSlottedContainer extends ItemComponent {

package/definitions/game/ui/screen/screens/game/static/actions/IActionsDrawer.d.ts

@@ -11,7 +11,7 @@
 export declare enum ActionSort {
     Default = 0
 }
-export declare enum ActionSlotItemMethod {
-    ExactItem = 0,
-    AnyItem = 1
+export declare enum ActionSlotInternalType {
+    Normal = 0,
+    History = 1
 }

package/definitions/game/utilities/dev/Debug.d.ts

@@ -8,8 +8,12 @@
  * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
  * https://github.com/WaywardGame/types/wiki
  */
+import DebugShared from "@wayward/utilities/dev/DebugShared";
 declare namespace Debug {
     function typeIfRelevant(type: string, name: string): string | undefined;
     function where(thing: unknown): string | undefined;
+    type JIT = DebugShared.JIT;
+    const JIT: typeof DebugShared.JIT;
+    const isJIT: typeof DebugShared.isJIT;
 }
 export default Debug;

package/definitions/game/utilities/memory/MemoryLeakDetector.d.ts

@@ -26,7 +26,7 @@ declare class MemoryLeakDetector {
     onScreenShow(_: any, screen: Screen): Promise<any>;
     private onReset;
     private runCheck;
-    garbageCollect(): Promise<void>;
+    garbageCollect(source: string): Promise<void>;
     private checkObjects;
 }
 export declare const memoryLeakDetector: MemoryLeakDetector;

package/definitions/game/utilities/object/Merge.d.ts

@@ -34,6 +34,8 @@ declare namespace Merge {
      */
     function MULTIPLY_NON_ZERO(amt: number): Mergeable<number> & number;
     function DIVIDE(amt: number): Mergeable<number> & number;
+    function MIN(amt: number): Mergeable<number> & number;
+    function MAX(amt: number): Mergeable<number> & number;
     function CONCAT(str: string): Mergeable<string> & string;
     /**
      * Note: "PUSH" is used by default for merging array values.

package/definitions/utilities/Functions.d.ts

@@ -9,7 +9,7 @@
  * https://github.com/WaywardGame/types/wiki
  */
 declare namespace Functions {
-    const noOp: () => void;
+    const noOp: (...args: any[]) => void;
     const noOpString: () => string;
     const noOpZero: () => number;
     const noOpNull: () => null;

package/definitions/utilities/Log.d.ts

@@ -24,6 +24,7 @@ export interface ILog {
     trace(...args: any[]): void;
     warn(...args: any[]): void;
     setSources(...sources: string[]): void;
+    ifEnabled(logger: (log: this) => any): void;
 }
 export interface ILogLine {
     type: LogLineType;
@@ -35,6 +36,7 @@ declare abstract class BaseLog implements ILog {
     info: (...args: any[]) => void;
     trace: (...args: any[]) => void;
     warn: (...args: any[]) => void;
+    ifEnabled: (logger: (log: this) => any) => void;
     protected sources: string[];
     constructor(...sources: Array<BaseLog | string>);
     setSources(...sources: Array<BaseLog | string>): void;
@@ -118,6 +120,8 @@ declare namespace Log {
      * @param sources A list of sources to log to.
      */
     function debug(...sources: string[]): (...args: any[]) => void;
+    function ifEnabled(...sources: string[]): (logger: (log: ILog) => any) => void;
+    function ifEnabled<LOG extends ILog>(log: LOG, ...sources: string[]): (logger: (log: LOG) => any) => void;
     /**
      * Returns a method that can be used to `Log.trace` with the given sources.
      * @param sources A list of sources to log to.

package/definitions/utilities/dev/DebugShared.d.ts

@@ -0,0 +1,23 @@
+/*!
+ * Copyright 2011-2024 Unlok
+ * https://www.unlok.ca
+ *
+ * Credits & Thanks:
+ * https://www.unlok.ca/credits-thanks/
+ *
+ * Wayward is a copyrighted and licensed work. Modification and/or distribution of any source files is prohibited. If you wish to modify the game in any way, please refer to the modding guide:
+ * https://github.com/WaywardGame/types/wiki
+ */
+declare namespace DebugShared {
+    const SYMBOL_JIT: unique symbol;
+    export interface JIT<A extends any[] = []> {
+        (): any;
+        (...args: A): any;
+        [SYMBOL_JIT]: true;
+    }
+    export function isJIT(value: unknown): value is JIT;
+    export function JIT<A extends any[]>(debug: JIT, fn: (debug: any, ...args: A) => any): JIT<A>;
+    export function JIT<A extends any[]>(fn: (...args: A) => any): JIT<A>;
+    export {};
+}
+export default DebugShared;

package/definitions/utilities/prototype/Define.d.ts

@@ -11,6 +11,8 @@
 type Implementation<P, K extends keyof P> = (this: P, ...args: P[K] extends (...args: infer A) => any ? A : []) => P[K] extends (...args: any[]) => infer R ? R : never;
 declare function Define<P, K extends string & keyof P>(proto: P, key: K, implementation: Implementation<P, K>): void;
 declare namespace Define {
+    export function set<P, K extends string & keyof P>(proto: P, key: K, value: P[K]): P[K];
+    export function set<V>(proto: any, key: PropertyKey, value: V): V;
     export function all<P, K extends string & keyof P>(protos: P[], key: K, implementation: Implementation<P, K>): void;
     interface IMagicImplementation<O, K extends string & keyof O> {
         get(this: O): O[K];

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@wayward/types",
 	"description": "TypeScript declarations for Wayward, used for modding.",
-	"version": "2.14.3-beta.dev.20241225.1",
+	"version": "2.14.3-beta.dev.20241227.1",
 	"license": "MIT",
 	"repository": {
 		"type": "git",