@wayward/types 2.15.0-beta.dev.20250925.1 → 2.15.0-beta.dev.20250926.1

package/definitions/game/language/Translation.d.ts

@@ -29,7 +29,7 @@ import type { EnumReferenceTypes, Reference, Referenceable } from "@wayward/game
 import Dictionary from "@wayward/game/language/Dictionary";
 import type { DictionaryEntryEnums } from "@wayward/game/language/DictionaryMap";
 import type { ListEnder, TranslationArg } from "@wayward/game/language/ITranslation";
-import { ISerializedTranslation } from "@wayward/game/language/ITranslation";
+import { Article, ISerializedTranslation } from "@wayward/game/language/ITranslation";
 import Message from "@wayward/game/language/dictionary/Message";
 import type { Term } from "@wayward/game/language/dictionary/Misc";
 import { EquipSlotTranslation, MiscTranslation } from "@wayward/game/language/dictionary/Misc";
@@ -37,28 +37,10 @@ import type UiTranslation from "@wayward/game/language/dictionary/UiTranslation"
 import type { TranslationReformatter } from "@wayward/game/language/impl/TranslationImpl";
 import TranslationImpl from "@wayward/game/language/impl/TranslationImpl";
 import { formatListTranslation } from "@wayward/game/language/segment/FormatListSegment";
-import makeTranslationListBuilder from "@wayward/game/language/utility/TranslationListBuilder";
-import ITranslationSorter from "@wayward/game/language/utility/TranslationSorter";
+import TranslationListBuilder from "@wayward/game/language/utility/TranslationListBuilder";
+import TranslationSorter from "@wayward/game/language/utility/TranslationSorter";
 import { IStringSection } from "@wayward/game/utilities/string/Interpolator";
 import { IRange } from "@wayward/utilities/math/Range";
-export declare enum Article {
-    /**
-     * Use no article.
-     */
-    None = "",
-    /**
-     * In English, this is "a" or "an" in front of the text, assuming the "count" is one.
-     */
-    Indefinite = "indefinite",
-    /**
-     * In English, this is "the" in front of the text.
-     */
-    Definite = "definite",
-    /**
-     * Uses "indefinite" if the user hasn't opted out of articles in titles.
-     */
-    Title = "title"
-}
 type Translation = TranslationImpl;
 declare namespace Translation {
     export function is(value: unknown): value is Translation;
@@ -66,7 +48,7 @@ declare namespace Translation {
     export const RANDOM = "random";
     export const getString: typeof TranslationImpl.getString;
     export const resolve: typeof TranslationImpl.resolve;
-    export const sorter: typeof ITranslationSorter.create;
+    export const sorter: typeof TranslationSorter.create;
     /**
      * Gets a translation given a dictionary, entry, and translation index.
      * @param dictionary The dictionary to get a translation from, for instance, `Dictionary.Item`.
@@ -192,7 +174,7 @@ declare namespace Translation {
     export function colorizeImportance(importance: "primary" | "secondary", text: IStringSection[]): Translation;
     export function classes(...classes: string[]): Translation;
     export const formatList: typeof formatListTranslation;
-    export const listBuilder: typeof makeTranslationListBuilder;
+    export const listBuilder: typeof TranslationListBuilder;
     export function reformatSingularNoun(): Translation;
     export function reformatSingularNoun(count: number): Translation;
     export function reformatSingularNoun(article: Article): Translation;

package/definitions/game/language/english/game/CombatDangerLevels.d.ts

@@ -8,6 +8,6 @@
  * 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 { CombatDangerLevel } from "@wayward/game/game/entity/CombatStrengthManager";
+import { CombatDangerLevel } from "@wayward/game/game/entity/ICombatStrength";
 declare const combatDangerLevels: Record<CombatDangerLevel, string>;
 export default combatDangerLevels;

package/definitions/game/language/english/game/CombatStrengths.d.ts

@@ -8,6 +8,6 @@
  * 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 { CombatStrength } from "@wayward/game/game/entity/CombatStrengthManager";
+import { CombatStrength } from "@wayward/game/game/entity/ICombatStrength";
 declare const combatStrengths: Record<CombatStrength, string>;
 export default combatStrengths;

package/definitions/game/language/english/game/FireStages.d.ts

@@ -8,6 +8,6 @@
  * 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 { FireStage } from "@wayward/game/game/tile/events/IFire";
+import FireStage from "@wayward/game/game/tile/events/fire/FireStage";
 declare const fireStages: Record<FireStage, string>;
 export default fireStages;

package/definitions/game/language/english/game/IslandModifiers.d.ts

@@ -8,6 +8,6 @@
  * 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 { IslandModifierType } from "@wayward/game/game/options/modifiers/island/IslandModifier";
+import { IslandModifierType } from "@wayward/game/game/options/modifiers/island/IIslandModifier";
 declare const islandModifiers: Descriptions<IslandModifierType, string>;
 export default islandModifiers;

package/definitions/game/language/english/game/islandName/IslandNameModifierDescriptors.d.ts

@@ -8,6 +8,6 @@
  * 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 { IslandModifierType } from "@wayward/game/game/options/modifiers/island/IslandModifier";
+import { IslandModifierType } from "@wayward/game/game/options/modifiers/island/IIslandModifier";
 declare const islandNameModifierDescriptors: Descriptions<IslandModifierType, [adjective: string, noun: string]>;
 export default islandNameModifierDescriptors;

package/definitions/game/language/english/ui/MilestoneModifierGroups.d.ts

@@ -8,6 +8,6 @@
  * 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 { MilestoneModifierGroup } from "@wayward/game/game/options/modifiers/milestone/MilestoneModifier";
+import { MilestoneModifierGroup } from "@wayward/game/game/options/modifiers/milestone/IMilestoneModifier";
 declare const milestoneModifierGroups: Descriptions<MilestoneModifierGroup, string>;
 export default milestoneModifierGroups;

package/definitions/game/language/utility/TranslationListBuilder.d.ts

@@ -9,8 +9,9 @@
  * https://github.com/WaywardGame/types/wiki
  */
 import type { ListEnder } from "@wayward/game/language/ITranslation";
-import Translation from "@wayward/game/language/Translation";
-export interface ITranslationListBuilderDefinition<T, GROUP, AFFIX> {
+import type Translation from "@wayward/game/language/Translation";
+import TranslationUtility from "@wayward/game/language/utility/TranslationUtility";
+export interface TranslationListBuilderDefinition<T, GROUP, AFFIX> {
     getGroup(item: T): GROUP;
     onGroups?(groups: Array<[GROUP, T[]]>): void;
     getAffix(item: T): AFFIX;
@@ -19,7 +20,9 @@ export interface ITranslationListBuilderDefinition<T, GROUP, AFFIX> {
     translateItem(group: GROUP, lastAffix: Translation | undefined, items: T[]): Translation;
     translateItemSingleAffix?(group: GROUP, affix: AFFIX, items: T[]): Translation | undefined;
 }
-export interface ITranslationListBuilder<T, GROUP, AFFIX> {
+export declare class TranslationListBuilder<T, GROUP, AFFIX> extends TranslationUtility {
+    protected readonly definition: TranslationListBuilderDefinition<T, GROUP, AFFIX>;
+    constructor(definition: TranslationListBuilderDefinition<T, GROUP, AFFIX>);
     translate(items: T[], listEnder?: ListEnder | false): Translation;
 }
-export default function makeTranslationListBuilder<T, GROUP, AFFIX>(definition: ITranslationListBuilderDefinition<T, GROUP, AFFIX>): ITranslationListBuilder<T, GROUP, AFFIX>;
+export default function <T, GROUP, AFFIX>(definition: TranslationListBuilderDefinition<T, GROUP, AFFIX>): TranslationListBuilder<T, GROUP, AFFIX>;

package/definitions/game/language/utility/TranslationSorter.d.ts

@@ -9,9 +9,20 @@
  * https://github.com/WaywardGame/types/wiki
  */
 import type Dictionary from "@wayward/game/language/Dictionary";
-import Translation from "@wayward/game/language/Translation";
-export interface ITranslationSorter<T = number> {
+import type Translation from "@wayward/game/language/Translation";
+import TranslationUtility from "@wayward/game/language/utility/TranslationUtility";
+interface TranslationSorter<T = number> {
     (a: T, b: T): number;
+}
+declare class TranslationSorter<T = number> extends TranslationUtility {
+    private mapper?;
+    private fallback?;
+    private reverse?;
+    private customSorter?;
+    private customSorterArgs?;
+    private translator?;
+    private translationCache?;
+    constructor(dictionary?: Dictionary, index?: number, mapper?: TranslationSorter.EntryMapper);
     /**
      * Sets this sort to be reversed
      */
@@ -19,31 +30,31 @@ export interface ITranslationSorter<T = number> {
     /**
      * Sets whether this sort should be reversed
      */
-    setReverse(reverse: boolean): this;
+    setReverse(r: boolean): this;
     /**
      * Sets this translation sorter to be getting the entry with the given mapper
      */
-    setEntryMapper<T2>(mapper: ITranslationSorter.EntryMapper<T2>): ITranslationSorter<T2>;
+    setEntryMapper<T2>(mapper: TranslationSorter.EntryMapper<T2>): TranslationSorter<T2>;
     /**
      * Sets a fallback sorter for when two translations are in the same position
      */
-    setFallback(fallback?: ITranslationSorter.SortFallback<T>): this;
+    setFallback(fallback?: TranslationSorter.SortFallback<T>): this;
     /**
      * Sets a custom sorter to override the default sort functionality
      *
      * Note: When a custom sorter is used, fallbacks registered in `setFallback` will not be.
      */
-    setSorter<A extends any[]>(sorter?: ITranslationSorter.SortFallback<T, A>, ...args: A): this;
+    setSorter<A extends any[]>(sorter?: TranslationSorter.SortFallback<T, A>, ...args: A): this;
     /**
      * Sets a custom translator, which takes each value to sort and makes a string from it. These strings are cached by the sorter
      */
-    setTranslator<T2 = T>(translator: ITranslationSorter.Translator<T2>): ITranslationSorter<T2>;
+    setTranslator<T2 = T>(translator: TranslationSorter.Translator<T2>): TranslationSorter<T2>;
 }
-declare namespace ITranslationSorter {
+declare namespace TranslationSorter {
     type EntryMapper<T = any> = (v: T) => number;
     type SortFallback<T = any, A extends any[] = any[]> = (a: T, b: T, entryA: T extends Translation ? undefined : number, entryB: T extends Translation ? undefined : number, stringA: string, stringB: string, ...args: A) => number;
     type Translator<T = any> = (v: T, entry?: number, dictionary?: Dictionary, index?: number) => Translation | string | undefined;
-    function create(): ITranslationSorter<Translation>;
-    function create<T = number>(dictionary: Dictionary, index?: number): ITranslationSorter<T>;
+    function create(): TranslationSorter<Translation>;
+    function create<T = number>(dictionary: Dictionary, index?: number): TranslationSorter<T>;
 }
-export default ITranslationSorter;
+export default TranslationSorter;

package/definitions/game/language/utility/TranslationUtility.d.ts

@@ -0,0 +1,15 @@
+/*!
+ * Copyright 2011-2025 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 TranslationClass from "@wayward/game/language/Translation";
+export default class TranslationUtility {
+    private static Translation;
+    protected readonly Translation: typeof TranslationClass;
+}

package/definitions/game/mod/ModInformation.d.ts

@@ -15,9 +15,9 @@ import { ModState, ModType } from "@wayward/game/mod/IModInformation";
 import { CanLoadState } from "@wayward/game/mod/IModManager";
 import type Mod from "@wayward/game/mod/Mod";
 import type { IModPath } from "@wayward/game/steamworks/ISteamworks";
-import type { IRequireJs } from "@wayward/hosts/shared/globalTypes";
 import type { IWorkshopItem } from "@wayward/hosts/shared/interfaces";
 import Log from "@wayward/utilities/Log";
+import type { ModuleLoader } from "@wayward/hosts/shared/globalTypes";
 export declare class ModInformation implements IModInformation {
     private readonly game;
     readonly config: Readonly<IModConfig>;
@@ -119,5 +119,5 @@ export declare class ModInformation implements IModInformation {
      * Called when ModManager setups up the mod
      * @param scriptFileName javascript file name without ".js"
      */
-    loadScript(requireJs: IRequireJs | undefined, modPath: IModPath, scriptFileName: string, reloading: boolean): Promise<void>;
+    loadScript(loader: ModuleLoader | undefined, modPath: IModPath, scriptFileName: string, reloading: boolean): Promise<void>;
 }

package/definitions/game/multiplayer/packets/shared/ActionPacketBase.d.ts

@@ -13,6 +13,7 @@ import { ActionArgument } from "@wayward/game/game/entity/action/IAction";
 import type Entity from "@wayward/game/game/entity/Entity";
 import { Packet } from "@wayward/game/multiplayer/packets/Packet";
 export default abstract class ActionPacketBase extends Packet {
+    readonly isActionPacket = true;
     abstract entity: Entity | undefined;
     protected writeArgument(expectedType: ActionArgumentCustom<any> | ActionArgument, value: any): void;
     protected readArgument(expectedType: ActionArgumentCustom<any> | ActionArgument): unknown;

package/definitions/game/ui/Ui.d.ts

@@ -24,6 +24,7 @@ import SaveDropHandler from "@wayward/game/ui/SaveDropHandler";
 import ServerJoinHandler from "@wayward/game/ui/ServerJoinHandler";
 import Component from "@wayward/game/ui/component/Component";
 import type { IBindHandlerApi } from "@wayward/game/ui/input/Bind";
+import InputManager from "@wayward/game/ui/input/InputManager";
 import { ScreenId } from "@wayward/game/ui/screen/IScreen";
 import ScreenManager from "@wayward/game/ui/screen/ScreenManager";
 import ItemStylesheetHandler from "@wayward/game/ui/screen/screens/game/util/item/ItemStylesheet";
@@ -65,6 +66,8 @@ export declare class Ui extends EventEmitter.Host<IUiEvents> {
     readonly promptsBridge: PromptsBridge;
     private storage;
     private readonly dataHosts;
+    get input(): typeof InputManager;
+    get components(): typeof Component;
     constructor();
     /**
      * @param elements The elements to refresh translations inside

package/definitions/game/ui/component/GameIcons.d.ts

@@ -11,7 +11,7 @@
 import type { Milestone } from "@wayward/game/game/milestones/IMilestone";
 import { GameMode } from "@wayward/game/game/options/IGameOptions";
 import type { Challenge } from "@wayward/game/game/options/modifiers/challenge/IChallenge";
-import type { IslandModifierType } from "@wayward/game/game/options/modifiers/island/IslandModifier";
+import type { IslandModifierType } from "@wayward/game/game/options/modifiers/island/IIslandModifier";
 import Component from "@wayward/game/ui/component/Component";
 import type { IRefreshable } from "@wayward/game/ui/component/Refreshable";
 import type { GameOptionsIcon, IGameOptionsIcon } from "@wayward/game/ui/screen/screens/menu/menus/pause/GameOptionsIcons";

package/definitions/game/ui/input/Bind.d.ts

@@ -10,8 +10,8 @@
  */
 import Bindable from "@wayward/game/ui/input/Bindable";
 import { IInput } from "@wayward/game/ui/input/IInput";
+import InputInfo from "@wayward/game/ui/input/InputInfo";
 import type { GlobalInputInfo, GlobalMouseInfo } from "@wayward/game/ui/input/InputManager";
-import { InputInfo } from "@wayward/game/ui/input/InputManager";
 import type { Macro } from "@wayward/game/ui/input/Macros";
 import type { TypedPropertyDescriptorFunctionAnyNOfParams } from "@wayward/utilities/event/EventManager";
 export interface IBindHandlerApi {

package/definitions/game/ui/input/BindableManager.d.ts

@@ -9,9 +9,10 @@
  * https://github.com/WaywardGame/types/wiki
  */
 import type { BindableTranslation } from "@wayward/game/language/dictionary/Misc";
-import Translation from "@wayward/game/language/Translation";
+import type Translation from "@wayward/game/language/Translation";
 import Bindable from "@wayward/game/ui/input/Bindable";
 import type { Binding } from "@wayward/game/ui/input/Bindings";
+export declare const defaultBindings: Record<Bindable, Binding[]>;
 export interface IManagedBindable {
     position: number;
     translation: Translation;
@@ -23,6 +24,8 @@ export default abstract class BindableManager {
     static registerManager(name: string, manager: BindableManager): boolean;
     static deregisterManager(name: string): boolean;
     static setNeedsUpdate(markBindingsCacheInvalid?: boolean): void;
+    private static readonly cacheInvalidatedCallbacks;
+    static onCacheInvalidated(callback: () => unknown): void;
     private static BINDABLES;
     private static BINDABLES_BY_VALUE;
     private static needsUpdate;

package/definitions/game/ui/input/Bindables.d.ts

@@ -12,6 +12,7 @@ import type Bindable from "@wayward/game/ui/input/Bindable";
 import { BindableMouseTargetingContext, BindableType, BindableTypeContext } from "@wayward/game/ui/input/Bindable";
 import type { Binding } from "@wayward/game/ui/input/Bindings";
 declare namespace Bindables {
+    function onRegistrationsChanged(callback: () => unknown): void;
     function register(index: number, defaultBinding: Binding[]): void;
     function deregister(index: number): void;
     function getType(bindable: Bindable): BindableType | undefined;

package/definitions/game/ui/input/Defaults.d.ts

@@ -10,5 +10,15 @@
  */
 import Bindable from "@wayward/game/ui/input/Bindable";
 import type { Binding } from "@wayward/game/ui/input/Bindings";
-declare const defaultBindings: Record<Bindable, Binding[]>;
-export default defaultBindings;
+import type { IInput } from "@wayward/game/ui/input/IInput";
+import type { Macro } from "@wayward/game/ui/input/Macros";
+interface BindingGenerationContext {
+    mouse: typeof IInput.mouseButton;
+    touch: typeof IInput.touch;
+    key: typeof IInput.key;
+    scroll: typeof IInput.scroll;
+    macro(...inputs: IInput[]): Macro;
+    doublePress(input: IInput): Macro;
+}
+export default function generateDefaultBindings(context: BindingGenerationContext): Record<Bindable, Binding[]>;
+export {};

package/definitions/game/ui/input/InputInfo.d.ts

@@ -0,0 +1,34 @@
+/*!
+ * Copyright 2011-2025 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 Component from "@wayward/game/ui/component/Component";
+import type { InputCatalyst } from "@wayward/game/ui/input/IInput";
+export default class InputInfo {
+    readonly catalyst: InputCatalyst;
+    /**
+     * The component that this input began in.
+     */
+    readonly startTarget: Component;
+    /**
+     * The unix timestamp representing when this input began. If this is a `"down"` event, the value will be `Date.now()`,
+     * whereas if this is a `"holding"` or `"up"` event, the value will be when the `"down"` event fired.
+     */
+    readonly startTime: number;
+    /**
+     * Whether this input was a touch input
+     */
+    readonly touch: boolean;
+    /**
+     * The number of milliseconds that have elapsed since `startTime`. Calculated on the fly.
+     */
+    get duration(): number;
+    constructor(evt: Event, catalyst: InputCatalyst);
+    startWasWithin(component?: Component): boolean | undefined;
+}

package/definitions/game/ui/input/InputManager.d.ts

@@ -11,31 +11,10 @@
 import Component from "@wayward/game/ui/component/Component";
 import Bindable from "@wayward/game/ui/input/Bindable";
 import { IInput, InputCatalyst, Modifier } from "@wayward/game/ui/input/IInput";
+import InputInfo from "@wayward/game/ui/input/InputInfo";
 import Vector2 from "@wayward/game/utilities/math/Vector2";
 import HashMap from "@wayward/utilities/collection/map/HashMap";
 import EventEmitter from "@wayward/utilities/event/EventEmitter";
-export declare class InputInfo {
-    readonly catalyst: InputCatalyst;
-    /**
-     * The component that this input began in.
-     */
-    readonly startTarget: Component;
-    /**
-     * The unix timestamp representing when this input began. If this is a `"down"` event, the value will be `Date.now()`,
-     * whereas if this is a `"holding"` or `"up"` event, the value will be when the `"down"` event fired.
-     */
-    readonly startTime: number;
-    /**
-     * Whether this input was a touch input
-     */
-    readonly touch: boolean;
-    /**
-     * The number of milliseconds that have elapsed since `startTime`. Calculated on the fly.
-     */
-    get duration(): number;
-    constructor(evt: Event, catalyst: InputCatalyst);
-    startWasWithin(component?: Component): boolean | undefined;
-}
 export interface IGlobalMouseInfoEvents {
     move(position: Vector2): any;
     invalidateTarget(): any;

package/definitions/game/ui/input/Macros.d.ts

@@ -11,7 +11,7 @@
 import TranslationImpl from "@wayward/game/language/impl/TranslationImpl";
 import type { IBindHandlerApi } from "@wayward/game/ui/input/Bind";
 import type Bindable from "@wayward/game/ui/input/Bindable";
-import { Binding } from "@wayward/game/ui/input/Bindings";
+import type { Binding } from "@wayward/game/ui/input/Bindings";
 import { IInput } from "@wayward/game/ui/input/IInput";
 import type { IStringSection } from "@wayward/game/utilities/string/Interpolator";
 export interface IMacroSection extends IStringSection {
@@ -42,11 +42,14 @@ declare namespace Macros {
     function didRequestIsolation(): boolean;
     function handleInput(input: IInput, api: IBindHandlerApi): Macro | undefined;
     function currentMatch(bindables?: readonly Bindable[], extraInputs?: IInput[]): IBindableMatch | undefined;
+    function setBindablesSupplier(get: () => readonly Bindable[]): void;
     interface IBindableMatch {
         matches?: Set<Bindable>;
         mayMatch?: Set<Bindable>;
     }
     function match(binding: Binding, ...bindables: Bindable[]): IBindableMatch | undefined;
+    function setBindingsResolver(get: (bindable: Bindable) => readonly Binding[]): void;
+    function setBindingsHashFunction(hashFunction: (binding: Binding) => string): void;
     function mergeMatches(...matches: Array<IBindableMatch | undefined>): IBindableMatch | undefined;
 }
 export default Macros;

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

@@ -15,6 +15,7 @@ import type Human from "@wayward/game/game/entity/Human";
 import type { ActionId, IUsableActionExecutionContext, UsableActionUsability } from "@wayward/game/game/entity/action/usable/IUsableAction";
 import { IUsableActionPossibleUsing, UsableActionExecutionContext } from "@wayward/game/game/entity/action/usable/IUsableAction";
 import type UsableAction from "@wayward/game/game/entity/action/usable/UsableAction";
+import type UsableActionRegistrar from "@wayward/game/game/entity/action/usable/UsableActionRegistrar";
 import type Player from "@wayward/game/game/entity/player/Player";
 import type { IIslandTickOptions } from "@wayward/game/game/island/IIsland";
 import type Island from "@wayward/game/game/island/Island";
@@ -30,9 +31,10 @@ import { DialogId } from "@wayward/game/ui/screen/screens/game/Dialogs";
 import type { IUsableActionExecutionOptions } from "@wayward/game/ui/screen/screens/game/IGameScreenApi";
 import { QuadrantComponentId, UsableActionExecutionResult } from "@wayward/game/ui/screen/screens/game/IGameScreenApi";
 import WorldTooltipHandler from "@wayward/game/ui/screen/screens/game/WorldTooltipHandler";
-import ContainerBucket from "@wayward/game/ui/screen/screens/game/component/ContainerBucket";
+import type ContainerBucket from "@wayward/game/ui/screen/screens/game/component/ContainerBucket";
 import { Quadrant } from "@wayward/game/ui/screen/screens/game/component/IQuadrantComponent";
 import type QuadrantComponent from "@wayward/game/ui/screen/screens/game/component/QuadrantComponent";
+import ContainerBucketManager from "@wayward/game/ui/screen/screens/game/component/container/ContainerBucketManager";
 import ContainerDialog from "@wayward/game/ui/screen/screens/game/dialog/ContainerDialog";
 import type ActionBar from "@wayward/game/ui/screen/screens/game/static/ActionBar";
 import MenuBar from "@wayward/game/ui/screen/screens/game/static/MenuBar";
@@ -81,6 +83,8 @@ export default class GameScreen extends Screen {
     private readonly nightPopupOverlay;
     private readonly buttonRespawn;
     private readonly buttonPause;
+    get buckets(): ContainerBucketManager;
+    get actions(): UsableActionRegistrar;
     constructor();
     get isTwoColumn(): boolean;
     private get gameCanvasComponent();

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

@@ -8,9 +8,8 @@
  * 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 { ItemType } from "@wayward/game/game/item/IItem";
 import { ContainerSort, type IContainer } from "@wayward/game/game/item/IItem";
-import Item from "@wayward/game/game/item/Item";
+import type Item from "@wayward/game/game/item/Item";
 import type ItemManager from "@wayward/game/game/item/ItemManager";
 import Button from "@wayward/game/ui/component/Button";
 import { CheckButton } from "@wayward/game/ui/component/CheckButton";
@@ -19,52 +18,14 @@ import type { IBindHandlerApi } from "@wayward/game/ui/input/Bind";
 import { GlobalMouseInfo } from "@wayward/game/ui/input/InputManager";
 import Dialog from "@wayward/game/ui/screen/screens/game/component/Dialog";
 import DialogSortFilter from "@wayward/game/ui/screen/screens/game/component/DialogSortFilter";
-import type ItemComponent from "@wayward/game/ui/screen/screens/game/component/ItemComponent";
 import ContainerBucketItemList from "@wayward/game/ui/screen/screens/game/component/container/ContainerBucketItemList";
+import type ContainerBucketManager from "@wayward/game/ui/screen/screens/game/component/container/ContainerBucketManager";
 import type { Events, IEventEmitter } from "@wayward/utilities/event/EventEmitter";
-import EventEmitter from "@wayward/utilities/event/EventEmitter";
-export declare enum ContainerBucketClasses {
-    __ShowQuickMoveTargetButtons = "--show-container-bucket-quick-move-target-buttons",
-    __ShowQuickMoveTarget_HoveredAction = "--show-container-bucket-quick-move-target--hovered-action",
-    __ShowQuickMoveTarget_BindableModifiers = "--show-container-bucket-quick-move-target--bindable-modifiers",
-    Main = "container-bucket",
-    TabButton = "container-bucket-tab-button",
-    TabButton_PrefersRight = "container-bucket-tab-button--prefers-right",
-    TabButton_Reverse = "container-bucket-tab-button--reverse",
-    TabButton_Hover = "container-bucket-tab-button--hover",
-    TabButton_HoverOrderEligible = "container-bucket-tab-button--hover-order-eligible",
-    TabButtonQuickMoveTarget = "container-bucket-tab-button-quick-move-target",
-    TabButtonQuickMoveTarget_Targeted = "container-bucket-tab-button-quick-move-target--targeted",
-    TabButtonMoveAll = "container-bucket-tab-button-move-all",
-    TabButtonAction = "container-bucket-tab-button-action"
-}
-export interface IContainerBucketsEvents {
-    register(bucket: ContainerBucket): any;
-    deregister(bucket: ContainerBucket): any;
-}
 export interface IContainerBucketEvents extends Events<Component> {
     addItem(item: Item): any;
     removeItem(item: Item): any;
 }
 export default class ContainerBucket extends Component {
-    static readonly event: EventEmitter<null, IContainerBucketsEvents>;
-    static readonly buckets: ContainerBucket[];
-    private static register;
-    private static deregister;
-    private static reregister;
-    static of(container?: IContainer): ContainerBucket | undefined;
-    static containing(item?: Item): ContainerBucket | undefined;
-    static hasAncestorsOpen(container?: IContainer): boolean;
-    private static activeRef?;
-    static getActive(): ContainerBucket | undefined;
-    static getLastInteracted(filter?: (bucket: ContainerBucket) => any): ContainerBucket | undefined;
-    static getSorting(): ItemComponent | undefined;
-    static cancelSorting(): void;
-    static getTransferDestination(transferFrom?: IContainer, item?: Item | ItemType, filter?: (bucket: ContainerBucket) => any): ContainerBucket | undefined;
-    private static readonly transferDestinationHolds;
-    static addTransferDestinationHoldFor(id: string, transferFrom: ContainerBucket): void;
-    static removeTransferDestinationHoldFor(id: string): void;
-    static updateTransferDestination(): void;
     private readonly instanceId;
     private settingContainer;
     readonly itemList: ContainerBucketItemList;
@@ -77,7 +38,9 @@ export default class ContainerBucket extends Component {
     get dialog(): Dialog | undefined;
     event: IEventEmitter<this, IContainerBucketEvents>;
     tabButtons: Button[];
-    constructor(container?: IContainer);
+    private readonly managerRef;
+    get manager(): ContainerBucketManager;
+    constructor(manager: ContainerBucketManager, container?: IContainer);
     deregisterAsDestination(): this;
     hideSortFilterRow(): this;
     setContainer(container?: IContainer): this;

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

@@ -12,7 +12,7 @@ import type Island from "@wayward/game/game/island/Island";
 import type { Milestone } from "@wayward/game/game/milestones/IMilestone";
 import type { GameMode } from "@wayward/game/game/options/IGameOptions";
 import type { Challenge } from "@wayward/game/game/options/modifiers/challenge/IChallenge";
-import type { IslandModifierType } from "@wayward/game/game/options/modifiers/island/IslandModifier";
+import type { IslandModifierType } from "@wayward/game/game/options/modifiers/island/IIslandModifier";
 import Component from "@wayward/game/ui/component/Component";
 import type { IGameIconsHost, IGameModifiersHost } from "@wayward/game/ui/component/GameIcons";
 import GameIcons, { GameModifiers } from "@wayward/game/ui/component/GameIcons";

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

@@ -16,6 +16,7 @@ import type MagicalPropertyManager from "@wayward/game/game/magic/MagicalPropert
 import Component from "@wayward/game/ui/component/Component";
 import type ContextMenu from "@wayward/game/ui/component/ContextMenu";
 import Bindable from "@wayward/game/ui/input/Bindable";
+import { ItemRefreshType } from "@wayward/game/ui/screen/screens/game/component/item/IItemComponent";
 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 type { ActionSlot } from "@wayward/game/ui/screen/screens/game/static/actions/ActionSlot";
@@ -43,29 +44,6 @@ export interface IItemDropApi {
     bindable?: Bindable;
     handler?: ItemComponentHandler;
 }
-export declare enum ItemTradeType {
-    None = "",
-    ToMerchant = "To",
-    FromMerchant = "From"
-}
-export declare enum ItemRefreshType {
-    None = 0,
-    ItemType = 1,
-    Durability = 2,
-    Decay = 4,
-    Quality = 8,
-    Magic = 16,
-    Protected = 32,
-    EquipSlot = 64,
-    MaybeSlottedInActionSlot = 128,
-    Action = 256,
-    Stack = 512,
-    Stacked = 1024,
-    Trading = 2048,
-    ContainerChange = 4096,
-    Cooldown = 8192,
-    All = 16383
-}
 export interface IItemComponentEvents extends Events<Component>, IDraggableEvents, IItemSlotEvents, ISortableDraggableEvents {
     deregisterHighlights(): any;
     refresh(type: ItemRefreshType): any;

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

@@ -18,6 +18,7 @@ import type Tile from "@wayward/game/game/tile/Tile";
 import Component from "@wayward/game/ui/component/Component";
 import type { IBindHandlerApi } from "@wayward/game/ui/input/Bind";
 import Bindable from "@wayward/game/ui/input/Bindable";
+import type ContainerBucket from "@wayward/game/ui/screen/screens/game/component/ContainerBucket";
 import ItemComponent from "@wayward/game/ui/screen/screens/game/component/ItemComponent";
 import type { IDraggableComponentSubscriber, ISortableComponent, WithSortableEvents } from "@wayward/game/ui/util/Sortable";
 import Sortable from "@wayward/game/ui/util/Sortable";
@@ -84,7 +85,9 @@ export default class ContainerBucketItemList extends Component implements ISorta
     isStacked(item?: Item): boolean;
     getStackedItems(type?: ItemType, excluding?: Item): Item[];
     getStackIndex(type?: ItemType): number | undefined;
-    constructor(container?: IContainer);
+    private readonly bucketRef;
+    get bucket(): ContainerBucket;
+    constructor(bucket: ContainerBucket, container?: IContainer);
     private readonly activeReasons;
     toggleActive(reason: string, active: boolean): void;
     getSortableID(child: Component & Partial<ItemComponent>): number | undefined;