@wayward/types 2.12.3-beta.dev.20230104.1 → 2.13.0-beta

package/definitions/game/ui/old/screens/InGameScreen.d.ts

@@ -9,11 +9,12 @@
  * https://github.com/WaywardGame/types/wiki
  */
 import type Doodad from "game/doodad/Doodad";
-import { EquipType } from "game/entity/IHuman";
-import NPC from "game/entity/npc/NPC";
-import type { DisplayableItemType, IContainer, IDismantleComponent } from "game/item/IItem";
+import type NPC from "game/entity/npc/NPC";
+import type { ContainerReference, DisplayableItemType, IContainer, IDismantleComponent } from "game/item/IItem";
 import { ItemType } from "game/item/IItem";
+import type { IMoveItemOptions } from "game/item/IItemManager";
 import Item from "game/item/Item";
+import type ItemManager from "game/item/ItemManager";
 import Message from "language/dictionary/Message";
 import { SortDirection } from "save/ISaveManager";
 import Input from "ui/component/Input";
@@ -21,8 +22,8 @@ import SortRow from "ui/component/SortRow";
 import type { IBindHandlerApi } from "ui/input/Bind";
 import { GlobalMouseInfo } from "ui/input/InputManager";
 import type { ISortableEvent } from "ui/old/functional/IFunctionalSortable";
-import type { IContainerSortInfo, IDialogInfo } from "ui/old/IOldUi";
-import { DialogId, SortType } from "ui/old/IOldUi";
+import type { IContainerSortInfo } from "ui/old/IOldUi";
+import { OldUiDialogId, SortType } from "ui/old/IOldUi";
 import BaseScreen from "ui/old/screens/BaseScreen";
 import type ActionBar from "ui/screen/screens/game/static/ActionBar";
 import type { ActionSlot } from "ui/screen/screens/game/static/ActionBar";
@@ -49,6 +50,19 @@ export interface IUiContainer {
     name: string;
     owner: NPC | Doodad | Item;
 }
+export interface IOldUiContainerItemAdd {
+    containerDialogElement?: JQuery;
+    containerElement?: JQuery;
+    itemsToSync?: Item[];
+    skipSaveItemOrder?: boolean;
+}
+interface IDialogPosition {
+    title?: string;
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+}
 export default class InGameScreen extends BaseScreen {
     overlayBindCatcherId: number;
     shouldResetMovement: boolean;
@@ -80,6 +94,8 @@ export default class InGameScreen extends BaseScreen {
     private craftingDialogDirty;
     private dismantleDialogDirty;
     private invalidatingTargets;
+    private updateCraftsDiscovery;
+    private addingMultipleItemsToContainer;
     constructor();
     selector(): string;
     bindElements(): void;
@@ -97,8 +113,20 @@ export default class InGameScreen extends BaseScreen {
     onHide(): void;
     initializeGameState(): void;
     onGameEnd(): void;
-    getDialogIndex(dialogId: DialogId, customDialogInfo?: IDialogInfo): string;
-    setupDialog(dialogId: DialogId, highlightItemId?: number, customDialogInfo?: IDialogInfo, containerSortInfo?: IContainerSortInfo): JQueryUI.DialogOptions;
+    /**
+     * Gets dialog index
+     * @param dialogId Dialog id
+     * @param containerReference Container reference when opening a container
+     * @returns string if it's a named dialog, number if it's a container (reference id), -1 if no dialog index was retrievable
+     */
+    getDialogIndex(dialogId: OldUiDialogId, containerReference?: ContainerReference): "inventory" | "crafting-tabs" | number;
+    /**
+     * Gets dialog index
+     * @param containerElement Dialog container element
+     * @returns string if it's a named dialog, number if it's a container (reference id), -1 if no dialog index was retrievable
+     */
+    getDialogIndexByContainerElement(containerElement: JQuery): "inventory" | "crafting-tabs" | number;
+    setupDialog(dialogId: OldUiDialogId, containerReference?: ContainerReference, highlightItemId?: number): JQueryUI.DialogOptions;
     highlightItemElementByItemId(itemId: number, highlight: boolean, force?: boolean, skipCount?: boolean): void;
     highlightItemElementByItemType(itemType: ItemType, highlight: boolean, force?: boolean, skipCount?: boolean): void;
     highlightItemElementByItemTypeWithNoItemId(itemType: ItemType, highlight: boolean, force?: boolean, skipCount?: boolean): void;
@@ -112,7 +140,7 @@ export default class InGameScreen extends BaseScreen {
     focus(): void;
     closeDialog(dialog: JQuery): boolean;
     closeAllDialogs(): boolean;
-    autoOpenDialog(index: string | number, element: JQuery): boolean;
+    autoOpenDialog(dialogId: OldUiDialogId, element: JQuery): boolean;
     openDialogs(): void;
     clampDialogs(): void;
     getItemClass(item?: Item, itemType?: DisplayableItemType): string;
@@ -122,11 +150,18 @@ export default class InGameScreen extends BaseScreen {
     private readonly SYMBOL_LAST_NEARLY_DECAYED;
     private readonly SYMBOL_LAST_DECAY;
     syncDecayBar(item: Item, force?: boolean, element?: HTMLElement | null): void;
-    addItemToContainer(item: Item, container: IContainer, _internal?: boolean, isAddingMultipleItems?: boolean, updateTables?: boolean): void;
     insertItemStringToContainer(itemElement: string | JQuery, containerElement: JQuery): void;
-    onAddItemsToContainer(containerElement: JQuery, containerDialogElement: JQuery | undefined, isInventoryContainer: boolean, updateTables?: boolean): void;
-    afterAddingMultipleItemsToContainer(container: IContainer, itemsToSync?: Item[]): void;
-    removeItemFromContainer(item: Item, container: IContainer): void;
+    /**
+     * Call this before starting to add items to a container
+     */
+    startAddingMultipleItemsToContainer(container: IContainer): void;
+    /**
+     * Call this after adding multiple items to a container.
+     * You must also call startAddingMultipleItemsToContainer before adding any items
+     */
+    completeAddingMultipleItemsToContainer(container: IContainer, itemsToSync?: Item[]): void;
+    onContainerItemAdd(itemManager: ItemManager, itemsAdded: Item[], container: IContainer, options?: IMoveItemOptions, customOptions?: IOldUiContainerItemAdd): void;
+    protected onContainerItemRemove(itemManager: ItemManager, itemsRemoved: Item[], containerRemovedFrom?: IContainer): void;
     refreshContainerName(container: IContainer, nestedUpdate?: boolean): void;
     getInventoryItemsInOrder(): any[];
     saveItemOrder(containerElement: JQuery, activeSort?: boolean): void;
@@ -134,11 +169,9 @@ export default class InGameScreen extends BaseScreen {
     onDismantleItemClick(dismantleItem: Item): void;
     unSelectElements(): void;
     onSortableItemReceive(sortableEvent: ISortableEvent): void;
-    setEquipSlot(equip: EquipType, itemId?: number, internal?: boolean): void;
-    removeItemFromEquipSlot(equip: EquipType, itemId: number): void;
     updateCraftingDialog(craftableItemTypes: ItemType[], nonCraftableItemTypes: ItemType[]): void;
     updateDismantleTab(dismantleItems: IDismantleComponent, force?: boolean): void;
-    createCraftItemElements(containerSortInfo: IContainerSortInfo | undefined): void;
+    createCraftItemElements(containerSortInfo: IContainerSortInfo | undefined, force?: boolean): void;
     updateItem(item: Item, updateChildren?: boolean): void;
     onActionBarSlotUpdate(actionBar: ActionBar, actionSlot: ActionSlot, item?: Item, oldItem?: Item): void;
     private tooltipTarget?;
@@ -154,8 +187,8 @@ export default class InGameScreen extends BaseScreen {
      * @param container The container to check.
      */
     getDialogContainerElementForFilter(container: IContainer): JQuery | undefined;
-    isContainerOpen(value: unknown): value is IContainer;
-    openContainer(container: IContainer | NPC, containerName?: string): void;
+    isContainerOpen(value: unknown): boolean;
+    openContainer(container: IContainer, containerNameSource?: NPC | Doodad | Item): void;
     closeContainer(container: IContainer): void;
     closeContainerDialog(containerDialog?: JQuery, closeType?: "close" | "destroy"): void;
     closeStaticContainers(): void;
@@ -186,16 +219,18 @@ export default class InGameScreen extends BaseScreen {
      */
     updateTablesDirty(which?: "crafting" | "dismantle"): void;
     createSortMenu(container: JQuery, messageType: Message, containerSortInfo?: IContainerSortInfo): SortRow<number>;
-    getContainerId(containerElement: JQuery): string;
+    getContainerSortInfo(index: "inventory" | "crafting-tabs" | number): IContainerSortInfo;
+    getDefaultSortType(index: "inventory" | "crafting-tabs" | number): SortType;
     sortItems(containerElement: JQuery, sortType: SortType, direction: SortDirection, messageType?: Message, activeSort?: boolean): void;
     onUpdateContainer(containerElement: JQuery, activeSort: boolean): void;
     updateSort(containerElement: JQuery, activeSort: boolean): void;
-    isContainerDialogOver(x: number, y: number): boolean;
+    isContainerDialogOver(dialogInfo: IDialogPosition, dialogPositions: IDialogPosition[]): boolean;
     onItemQuickMove(api: IBindHandlerApi): boolean;
     onStopItemQuickMove(): boolean;
     onItemMove(api: IBindHandlerApi): boolean;
     onStopItemMove(api: IBindHandlerApi): void;
     onItemEquipToggle(api: IBindHandlerApi): boolean;
+    onItemOpen(api: IBindHandlerApi): boolean;
     onItemProtectToggle(api: IBindHandlerApi): boolean;
     onItemRename(api: IBindHandlerApi): boolean;
     onDropItem(api: IBindHandlerApi): boolean;
@@ -205,7 +240,7 @@ export default class InGameScreen extends BaseScreen {
     private isOverlayVisible;
     private readonly onInterrupt;
     private readonly onInterruptClosed;
-    private getHoveredItem;
+    getHoveredItem(api: IBindHandlerApi): HTMLElement | undefined;
     /**
      * Get a number based on an item's magical type/skill/stat in order.
      * @param item An item to sort.
@@ -218,3 +253,4 @@ export default class InGameScreen extends BaseScreen {
     private resolveItemReference;
     private getBestSort;
 }
+export {};

package/definitions/game/ui/screen/Screen.d.ts

@@ -12,6 +12,7 @@ import type { Events, IEventEmitter } from "event/EventEmitter";
 import Component from "ui/component/Component";
 import type ContextMenu from "ui/component/ContextMenu";
 import type { IBindHandlerApi } from "ui/input/Bind";
+import Macros from "ui/input/Macros";
 import { Background, ScreenId } from "ui/screen/IScreen";
 import type Dialog from "ui/screen/screens/game/component/Dialog";
 import DialogManager from "ui/screen/screens/game/DialogManager";
@@ -42,6 +43,8 @@ export default abstract class Screen extends Component {
     setBackground(background: Background): this;
     removeBackground(): this;
     hasContextMenu(): boolean;
+    getPartialContextMenuMacros(): Macros.IBindableMatch | undefined;
+    hasPartialContextMenuMacro(api: IBindHandlerApi, macroMatch?: Macros.IBindableMatch): boolean;
     /**
      * Remove the context menu from this element
      */

package/definitions/game/ui/screen/screens/GameScreen.d.ts

@@ -23,7 +23,7 @@ import type QuadrantComponent from "ui/screen/screens/game/component/QuadrantCom
 import { DialogId } from "ui/screen/screens/game/Dialogs";
 import { QuadrantComponentId } from "ui/screen/screens/game/IGameScreenApi";
 import type ActionBar from "ui/screen/screens/game/static/ActionBar";
-import type MenuBar from "ui/screen/screens/game/static/MenuBar";
+import MenuBar from "ui/screen/screens/game/static/MenuBar";
 import type Messages from "ui/screen/screens/game/static/Messages";
 import type StatsQuadrant from "ui/screen/screens/game/static/Stats";
 import MovementHandler from "ui/screen/screens/game/util/movement/MovementHandler";
@@ -96,8 +96,6 @@ export default class GameScreen extends Screen {
     protected onZoom(api: IBindHandlerApi): boolean;
     protected onInspect(api: IBindHandlerApi): boolean;
     protected onScreenshotMode(): boolean;
-    protected onShowMoreInfo(): void;
-    protected onUnshowMoreInfo(): void;
     protected onDisableHealthVignette(): void;
     protected onEquipItem(): void;
     protected onCancel(): boolean;

package/definitions/game/ui/screen/screens/game/DialogManager.d.ts

@@ -20,16 +20,17 @@ export default class DialogManager {
     constructor(screen: Screen);
     get<ID extends DialogId>(id: ID, subId?: string): DialogById[ID] | undefined;
     get<DIALOG extends Dialog>(id: DialogId, subId?: string): DIALOG | undefined;
+    getAll(): Array<[DialogId, string]>;
     getAll<ID extends DialogId>(id: ID): Array<[DialogId, string]>;
     getAll<DIALOG extends Dialog>(id: DialogId): Array<[DialogId, string]>;
-    open<ID extends DialogId>(id: ID, subId?: string): DialogById[ID];
-    open<DIALOG extends Dialog>(id: DialogId, subId?: string): DIALOG;
+    open<ID extends DialogId>(id: ID, initializer?: (dialog: DialogById[ID]) => any, subId?: string, highlightIfAlreadyOpen?: boolean): DialogById[ID];
+    open<DIALOG extends Dialog>(id: DialogId, initializer?: (dialog: DIALOG) => any, subId?: string, highlightIfAlreadyOpen?: boolean): DIALOG;
     isVisible(id: DialogId, subId?: string): boolean | undefined;
     close(id: DialogId | `${DialogId}` | `${DialogId},${string}`, subId?: string): boolean;
     closeAll(): boolean;
-    toggle<ID extends DialogId>(id: ID, force?: boolean, initializer?: (dialog: DialogById[ID]) => any, subId?: string): this;
-    toggle<DIALOG extends Dialog>(id: DialogId, force?: boolean, initializer?: (dialog: DIALOG) => any, subId?: string): this;
-    toggleAll(states: IDialogStates): this;
+    toggle<ID extends DialogId>(id: ID, force?: boolean, initializer?: (dialog: DialogById[ID]) => any, subId?: string, highlightIfAlreadyOpen?: boolean): this;
+    toggle<DIALOG extends Dialog>(id: DialogId, force?: boolean, initializer?: (dialog: DIALOG) => any, subId?: string, highlightIfAlreadyOpen?: boolean): this;
+    toggleAll(states: IDialogStates, loaded?: boolean): this;
     private compute;
     private onClose;
     private getKey;

package/definitions/game/ui/screen/screens/game/DialogMap.d.ts

@@ -12,7 +12,8 @@ import BookDialog from "ui/screen/screens/game/dialog/BookDialog";
 import CraftingDialog from "ui/screen/screens/game/dialog/CraftingDialog";
 import EquipmentDialog from "ui/screen/screens/game/dialog/EquipmentDialog";
 import InspectDialog from "ui/screen/screens/game/dialog/InspectDialog";
-import IslandsDialog from "ui/screen/screens/game/dialog/IslandsDialog";
+import IslandsSailDialog from "ui/screen/screens/game/dialog/IslandsSailDialog";
+import IslandsShippingDialog from "ui/screen/screens/game/dialog/IslandsShippingDialog";
 import MapDialog from "ui/screen/screens/game/dialog/MapDialog";
 import MessagesDialog from "ui/screen/screens/game/dialog/MessagesDialog";
 import MessagesEditFiltersDialog from "ui/screen/screens/game/dialog/MessagesEditFiltersDialog";
@@ -26,7 +27,8 @@ declare const dialogMap: {
     9: typeof CraftingDialog;
     12: typeof EquipmentDialog;
     10: typeof InspectDialog;
-    11: typeof IslandsDialog;
+    11: typeof IslandsSailDialog;
+    13: typeof IslandsShippingDialog;
     7: typeof MapDialog;
     0: typeof MessagesDialog;
     2: typeof MessagesEditFiltersDialog;

package/definitions/game/ui/screen/screens/game/Dialogs.d.ts

@@ -22,8 +22,9 @@ export declare enum DialogId {
     Quests = 8,
     Crafting = 9,
     Inspect = 10,
-    Islands = 11,
-    Equipment = 12
+    IslandsSail = 11,
+    Equipment = 12,
+    IslandsShipping = 13
 }
 export declare enum Edge {
     Top = 0,

package/definitions/game/ui/screen/screens/game/IMessages.d.ts

@@ -10,7 +10,7 @@
  */
 import type { Source } from "game/entity/player/IMessageManager";
 import { ThreeStateButtonState } from "ui/component/IThreeStateButton";
-export declare const DEFAULT_MAX_MESSAGES = 30;
+export declare const DEFAULT_MAX_MESSAGES = 15;
 export declare const MESSAGES_MAX_PINNED = 3;
 export type IFilters = Record<string, IFilter>;
 export type IFilter = {

package/definitions/game/ui/screen/screens/game/component/CanvasDialog.d.ts

@@ -35,7 +35,7 @@ export declare class Canvas extends Component<HTMLCanvasElement> {
     get height(): number;
     set height(value: number);
     clear(): this;
-    draw(image: CanvasImageSource, drawPosition: IVector2, drawSize?: IVector2, sourcePosition?: IVector2, sourceSize?: IVector2, angleRadians?: number, scale?: IVector2): this;
+    draw(image: HTMLImageElement | HTMLCanvasElement, drawPosition: IVector2, drawSize?: IVector2, sourcePosition?: IVector2, sourceSize?: IVector2, angleRadians?: number, scale?: IVector2): this;
     fill(pattern: CanvasPattern, drawPosition?: IVector2, drawSize?: IVector2, scale?: IVector2): this;
     fillText(text: string, position: Vector2, maxWidth?: number): void;
 }

package/definitions/game/ui/screen/screens/game/component/Dialog.d.ts

@@ -20,10 +20,10 @@ import Text from "ui/component/Text";
 import type { IDialogDescription } from "ui/screen/screens/game/Dialogs";
 import { DialogId, Edge } from "ui/screen/screens/game/Dialogs";
 import type { IDialog } from "ui/screen/screens/game/IGameScreenApi";
+import type TooltipLocationHandler from "ui/tooltip/TooltipLocationHandler";
 import type { IDraggableEvents } from "ui/util/Draggable";
 import Draggable from "ui/util/Draggable";
 import Log from "utilities/Log";
-import type { IStringSection } from "utilities/string/Interpolator";
 /**
  * The positions of each edge of the dialog. Stored as percentages.
  */
@@ -78,7 +78,7 @@ interface IDialogEvents extends Events<Component> {
     /**
      * Emitted after all fields decorated with `@Save` are loaded
      */
-    load(): any;
+    load(initial: boolean): any;
 }
 export declare enum DialogClasses {
     Wrapper = "dialog-wrapper",
@@ -99,7 +99,7 @@ export declare enum DialogClasses {
     EndsContent = "dialog-ends-content",
     FooterContent = "dialog-footer-content"
 }
-export default abstract class Dialog extends Component implements IDialog {
+declare abstract class Dialog extends Component implements IDialog {
     readonly subId: string;
     private static topOrder;
     private static topDialog;
@@ -125,6 +125,7 @@ export default abstract class Dialog extends Component implements IDialog {
     private cachedSnapPositions?;
     private readonly activeReasons;
     protected readonly scrollableHandler: void;
+    private loaded?;
     private get visiblePanel();
     get square(): boolean;
     /**
@@ -141,6 +142,7 @@ export default abstract class Dialog extends Component implements IDialog {
      */
     private description;
     constructor(id: number, subId?: string);
+    tempHighlight(duration?: number): void;
     addScrollableWrapper(type?: "scroll" | "auto", initializer?: (wrapper: Component) => any): Component<HTMLElement>;
     addSettingsPanel(): Component<HTMLElement>;
     showSettingsPanel(): this;
@@ -152,7 +154,6 @@ export default abstract class Dialog extends Component implements IDialog {
      */
     close(): Promise<boolean>;
     protected onRemove1(): void;
-    protected onAppend1(): void;
     addPanel(id: string | number): Component<HTMLElement>;
     showPanel(id: string | number): Component<HTMLElement> | undefined;
     getPanel(id: string | number): Component<HTMLElement> | undefined;
@@ -186,7 +187,7 @@ export default abstract class Dialog extends Component implements IDialog {
     /**
      * The name is displayed in the `Move To` context menu option, and in the `Switch With` options
      */
-    getName(): Iterable<IStringSection> | Translation | UiTranslation | ISerializedTranslation | undefined;
+    getName(): Translation | UiTranslation | ISerializedTranslation | undefined;
     /**
      * Event handler for when this dialog is appended
      */
@@ -300,6 +301,10 @@ export default abstract class Dialog extends Component implements IDialog {
     private correctPosition;
     private addHandle;
 }
+declare namespace Dialog {
+    const TooltipLocation: (locationHandler: TooltipLocationHandler) => TooltipLocationHandler;
+}
+export default Dialog;
 /**
  * A component that emits events for being dragged. Takes a `HandlePosition` to be styled with.
  */
@@ -324,7 +329,7 @@ export declare class Header extends Handle implements IRefreshable {
     readonly closeButton: Button;
     readonly text: Text;
     constructor();
-    setText(text: TranslationGenerator): void;
+    setText(text?: TranslationGenerator, ...args: any[]): void;
     refresh(): this;
     setCloseIcon(icon?: "Minimize" | "Close"): this;
 }
@@ -334,4 +339,3 @@ export declare class Footer extends Component {
     readonly content: Component;
     constructor();
 }
-export {};

package/definitions/game/ui/screen/screens/game/component/InspectionsList.d.ts

@@ -37,6 +37,7 @@ export default abstract class InspectionsList<INSPECTIONS_HANDLER extends Inspec
     private readonly previouslyRefreshed;
     constructor(context: InfoProviderContext);
     get<TYPE extends InspectType>(type: TYPE): HashSet<ResolvedInspection<TYPE>> | undefined;
+    all(): Iterable<[InspectType, HashSet<Inspection<any>>]>;
     setInspectTypeFilter(filter?: (inspectType: InspectType) => boolean): this;
     refreshInspectTypeFilter(): this;
     deregister(): void;

package/definitions/game/ui/screen/screens/game/component/Item.d.ts

@@ -12,7 +12,7 @@ import type { Events, IEventEmitter } from "event/EventEmitter";
 import type { ActionId } from "game/entity/action/usable/IUsableAction";
 import { EquipType } from "game/entity/IHuman";
 import { Quality } from "game/IObject";
-import type { ItemType } from "game/item/IItem";
+import type { ItemType, ItemTypeExtra } from "game/item/IItem";
 import type Item from "game/item/Item";
 import Component from "ui/component/Component";
 import type ContextMenu from "ui/component/ContextMenu";
@@ -42,7 +42,6 @@ export declare enum ItemDetailIconLocation {
 export declare enum ItemClasses {
     Main = "item-component",
     Icon = "item-component-icon",
-    ItemIcon = "item-component-icon-item",
     ItemIconIsReal = "item-component-icon-item-is-real",
     ActionIcon = "item-component-icon-action",
     ActionIconHasItem = "item-component-icon-action-has-item",
@@ -63,13 +62,13 @@ export declare enum ItemClasses {
     NearlyDecayed = "item-component-nearly-decayed"
 }
 export declare namespace ItemClasses {
-    const IconLocation: (enumValue: ItemDetailIconLocation) => "item-component-icon-location-bottomright" | "item-component-icon-location-topleft";
+    const IconLocation: (enumValue: ItemDetailIconLocation) => "item-component-icon-location-topleft" | "item-component-icon-location-bottomright";
 }
 export interface IItemHandler {
     noDrag?: true;
     equipSlot?: EquipType;
     getItem?(): Item | undefined;
-    getItemType?(): ItemType | undefined;
+    getItemType?(): ItemType | ItemTypeExtra | undefined;
     getItemQuality?(): Quality | undefined;
     getActionSlot?(): ActionSlot | undefined;
     getBindables?(bindables: Bindable[]): Bindable[];
@@ -90,7 +89,6 @@ export default class ItemComponent extends Component {
     protected readonly handler: IItemHandler;
     static registerSlot(slot: ItemSlot): void;
     event: IEventEmitter<this, Events<IDraggableComponent> & IItemSlotEvents>;
-    readonly itemIcon: Component<HTMLElement>;
     readonly magicalIcon: Component<HTMLElement>;
     readonly protectedIcon: Component<HTMLElement>;
     readonly actionIcon: Component<HTMLElement> | undefined;
@@ -101,6 +99,8 @@ export default class ItemComponent extends Component {
     durabilityBar?: Component;
     readonly draggable?: Draggable;
     constructor(handler: IItemHandler);
+    private registerTickEndHandlerForDecay;
+    private deregisterTickEndHandlerForDecay;
     private lastItem?;
     private getItem;
     protected onSlotUpdate(actionBar: ActionBar, slot: ActionSlot): void;

package/definitions/game/ui/screen/screens/game/component/QuadrantComponent.d.ts

@@ -50,7 +50,7 @@ export default abstract class QuadrantComponent extends StaticComponent {
     protected readonly scrollableHandler: void;
     get preferredQuadrant(): Quadrant;
     get quadrant(): Quadrant;
-    get quadrantName(): "None" | "Top" | "TopRight" | "BottomRight" | "Bottom" | "BottomLeft" | "TopLeft" | "Any";
+    get quadrantName(): "Any" | "None" | "TopLeft" | "Top" | "TopRight" | "BottomRight" | "Bottom" | "BottomLeft";
     readonly log: Log;
     constructor(id: QuadrantComponentId);
     protected registerDataHost(): void;

package/definitions/game/ui/screen/screens/game/component/TileInspectionsList.d.ts

@@ -9,13 +9,13 @@
  * https://github.com/WaywardGame/types/wiki
  */
 import TilePositionInspection from "game/inspection/handlers/TilePositionInspection";
+import type Tile from "game/tile/Tile";
 import UiTranslation from "language/dictionary/UiTranslation";
 import InspectionsList from "ui/screen/screens/game/component/InspectionsList";
-import Vector3 from "utilities/math/Vector3";
 export default class TileInspectionsList extends InspectionsList<TilePositionInspection> {
-    private position?;
-    getPosition(): Vector3 | undefined;
-    setPosition(position: Vector3): this;
+    private tile?;
+    getTile(): Tile | undefined;
+    setTile(tile: Tile | undefined): this;
     isValid(): boolean;
     protected getInvalidTranslation(): UiTranslation;
     protected initializeInspections(): TilePositionInspection;

package/definitions/game/ui/screen/screens/game/dialog/BookDialog.d.ts

@@ -16,11 +16,11 @@ export default class BookDialog extends Dialog {
     private book?;
     private readonly text;
     constructor();
-    getName(): import("../../../../../language/ITranslation").ISerializedTranslation | import("../../../../../language/impl/TranslationImpl").default | import("../../../../../language/dictionary/UiTranslation").default | Iterable<import("../../../../../utilities/string/Interpolator").IStringSection> | undefined;
+    getName(): import("../../../../../language/impl/TranslationImpl").default | import("../../../../../language/ITranslation").ISerializedTranslation | import("../../../../../language/dictionary/UiTranslation").default | undefined;
     openBook(item: Item): void;
     private getText;
-    protected onInventoryItemRemove(_: any, item: Item): void;
-    protected onInventoryItemUpdate(_: any, item: Item): void;
+    protected onInventoryItemRemove(_: any, itemOrItems: Item | Item[]): void;
+    protected onInventoryItemUpdate(_: any, items: Item[]): void;
     protected onPostMove(player: Player): void;
     private closeIfItemIsGone;
 }

package/definitions/game/ui/screen/screens/game/dialog/CraftingDialog.d.ts

@@ -18,10 +18,10 @@ export default class CraftingDialog extends Dialog {
     private readonly craftableWrapper;
     constructor();
     protected updateCraftableInventories(): void;
-    protected onContainerItemAdd(_: any, item: Item, container: IContainer): void;
-    protected onInventoryItemAdd(_: any, item: Item): void;
-    protected onContainerItemRemove(_: any, item: Item, previousContainer: IContainer | undefined): void;
-    protected onInventoryItemRemove(_: any, item: Item): void;
+    protected onContainerItemAdd(_: any, items: Item[], container: IContainer): void;
+    protected onInventoryItemAdd(_: any, items: Item[]): void;
+    protected onContainerItemRemove(_: any, items: Item[], previousContainer: IContainer | undefined): void;
+    protected onInventoryItemRemove(_: any, items: Item[]): void;
     private addItem;
     private addCraftable;
     private removeItem;

package/definitions/game/ui/screen/screens/game/dialog/EquipmentDialog.d.ts

@@ -13,7 +13,7 @@ import type Item from "game/item/Item";
 import Component from "ui/component/Component";
 import type { IBindHandlerApi } from "ui/input/Bind";
 import Dialog from "ui/screen/screens/game/component/Dialog";
-import type { IItemDropApi, ItemSlot } from "ui/screen/screens/game/component/Item";
+import type { IItemDropApi, IItemPickUpApi, ItemSlot } from "ui/screen/screens/game/component/Item";
 import ItemComponent, { ItemRefreshType } from "ui/screen/screens/game/component/Item";
 import EquipmentSlotTooltipHandler from "ui/screen/screens/game/dialog/equipment/EquipmentSlotTooltip";
 export declare enum EquipmentClasses {
@@ -27,7 +27,7 @@ export declare enum EquipmentClasses {
     SlotsWrapper = "game-dialog-equipment-slots-wrapper"
 }
 export declare namespace EquipmentClasses {
-    const SlotType: (enumValue: EquipType) => "game-dialog-equipment-slot-none" | "game-dialog-equipment-slot-head" | "game-dialog-equipment-slot-held" | "game-dialog-equipment-slot-legs" | "game-dialog-equipment-slot-chest" | "game-dialog-equipment-slot-waist" | "game-dialog-equipment-slot-feet" | "game-dialog-equipment-slot-neck" | "game-dialog-equipment-slot-hands" | "game-dialog-equipment-slot-back" | "game-dialog-equipment-slot-mainhand" | "game-dialog-equipment-slot-offhand";
+    const SlotType: (enumValue: EquipType) => "game-dialog-equipment-slot-head" | "game-dialog-equipment-slot-none" | "game-dialog-equipment-slot-held" | "game-dialog-equipment-slot-legs" | "game-dialog-equipment-slot-chest" | "game-dialog-equipment-slot-waist" | "game-dialog-equipment-slot-feet" | "game-dialog-equipment-slot-neck" | "game-dialog-equipment-slot-hands" | "game-dialog-equipment-slot-back" | "game-dialog-equipment-slot-mainhand" | "game-dialog-equipment-slot-offhand";
 }
 export default class EquipmentDialog extends Dialog {
     readonly slots: Component<HTMLElement>;
@@ -43,6 +43,7 @@ export declare class EquipmentSlot extends ItemComponent {
     clear(): void;
     refresh(refreshType: ItemRefreshType): void;
     protected onEquipEvent(): void;
+    protected onPickUp(api: IItemPickUpApi): void;
     protected onDrop(api: IItemDropApi, intoSlot?: ItemSlot): void;
     private isEquippable;
 }

package/definitions/game/ui/screen/screens/game/dialog/IMilestonesDialog.d.ts

@@ -0,0 +1,14 @@
+/*!
+ * Copyright 2011-2021 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
+ */
+export declare enum MilestoneSort {
+    Name = 0,
+    Progress = 1
+}

package/definitions/game/ui/screen/screens/game/dialog/ISkillsDialog.d.ts

@@ -0,0 +1,14 @@
+/*!
+ * Copyright 2011-2021 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
+ */
+export declare enum SkillSort {
+    Name = 0,
+    Level = 1
+}

package/definitions/game/ui/screen/screens/game/dialog/InspectDialog.d.ts

@@ -9,9 +9,9 @@
  * https://github.com/WaywardGame/types/wiki
  */
 import type { Reference } from "game/reference/IReferenceManager";
+import type Tile from "game/tile/Tile";
 import Dialog from "ui/screen/screens/game/component/Dialog";
 import type InspectionsList from "ui/screen/screens/game/component/InspectionsList";
-import Vector3 from "utilities/math/Vector3";
 export default class InspectDialog extends Dialog {
     private inspections?;
     private readonly dropdownDisplayLevel;
@@ -24,7 +24,7 @@ export default class InspectDialog extends Dialog {
     protected onLoad(): Promise<void>;
     inspectReference(reference: Reference): this;
     setInspections(inspections: InspectionsList, update?: boolean): this;
-    setPosition(position: Vector3): this;
+    setTile(tile: Tile): this;
     setInspection(thing: unknown): void;
     protected onClose(): void;
     protected onMoveToIsland(): void;

package/definitions/game/ui/screen/screens/game/dialog/IslandsSailDialog.d.ts

@@ -0,0 +1,31 @@
+/*!
+ * Copyright 2011-2021 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
+ */
+import type { IIslandPort } from "game/island/IIsland";
+import type Island from "game/island/Island";
+import Button from "ui/component/Button";
+import type Component from "ui/component/Component";
+import IslandsDialog from "ui/screen/screens/game/dialog/islands/IslandsDialog";
+export default class IslandsSailDialog extends IslandsDialog {
+    closeOnTravel: boolean;
+    constructor();
+    protected createExecuteButton(port?: IIslandPort): Button;
+    protected onAppend(): void;
+    protected initializeSettingsPanel(panel: Component): void;
+    protected onChangedSelectedIsland(animate?: boolean): void;
+    protected isSelectedIslandValid(): boolean;
+    protected shouldDisplayIsland(x: number, y: number, island?: Island): boolean;
+    protected onMouseMoveWhileOver(): void;
+    private updateSailButton;
+    protected sail(port?: IIslandPort): void;
+    protected preMoveToIsland(): void;
+    protected onLoadedOnIsland(): void;
+    protected onTickEnd(): void;
+}

package/definitions/game/ui/screen/screens/game/dialog/IslandsShippingDialog.d.ts

@@ -0,0 +1,34 @@
+/*!
+ * Copyright 2011-2021 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
+ */
+import type ShipperNPC from "game/entity/npc/npcs/Shipper";
+import type { IIslandPort } from "game/island/IIsland";
+import type Island from "game/island/Island";
+import Button from "ui/component/Button";
+import IslandsDialog from "ui/screen/screens/game/dialog/islands/IslandsDialog";
+export declare enum IslandsShippingDialogClasses {
+    PortButtonShipping = "game-dialog-islands-port-button-shipping",
+    PortsOnlyMode = "game-dialog-islands-ports-only-mode"
+}
+export default class IslandsShippingDialog extends IslandsDialog {
+    private npcId?;
+    get npc(): ShipperNPC | undefined;
+    constructor();
+    setShipper(npc: ShipperNPC): this;
+    protected createExecuteButton(port?: IIslandPort): Button | undefined;
+    protected onChangedSelectedIsland(animate?: boolean): void;
+    protected shouldDisplayIsland(x: number, y: number, island?: Island): boolean;
+    protected shouldDisplayConstructLighthousesHint(): boolean;
+    protected isSelectedIslandValid(): boolean;
+    protected ship(port: IIslandPort): void;
+    protected onLoad(initial: boolean): Promise<void>;
+    protected onTickEnd(): void;
+    private updatePortsOnlyMode;
+}