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

package/definitions/game/event/EventBuses.d.ts

@@ -42,8 +42,10 @@ import type { Renderer } from "@wayward/game/renderer/Renderer";
 import type { WorldRenderer } from "@wayward/game/renderer/world/WorldRenderer";
 import type SaveManager from "@wayward/game/save/SaveManager";
 import type Steamworks from "@wayward/game/steamworks/Steamworks";
+import type { GlobalMouseInfo } from "@wayward/game/ui/input/InputManager";
 import type ScreenManager from "@wayward/game/ui/screen/ScreenManager";
 import type GameScreen from "@wayward/game/ui/screen/screens/GameScreen";
+import type ItemComponentEventBus from "@wayward/game/ui/screen/screens/game/component/item/ItemComponentEventBus";
 import type ActionBar from "@wayward/game/ui/screen/screens/game/static/ActionBar";
 import type HoveredTileTracker from "@wayward/game/ui/screen/screens/game/util/HoveredTileTracker";
 import type ActionMenuHandler from "@wayward/game/ui/screen/screens/game/util/movement/ActionMenuHandler";
@@ -92,11 +94,13 @@ export declare enum EventBus {
     UiActionMenuHandler = 37,
     UiGameScreen = 38,
     UiHoveredTileTracker = 39,
-    UiInteractionManager = 40,
-    UiMovementHandler = 41,
-    UiPathingHandler = 42,
-    UsableActions = 43,
-    WorldRenderer = 44
+    UiInputManagerMouse = 40,
+    UiInteractionManager = 41,
+    UiItemComponentStatic = 42,
+    UiMovementHandler = 43,
+    UiPathingHandler = 44,
+    UsableActions = 45,
+    WorldRenderer = 46
 }
 declare const eventBuses: {
     [EventBus.Actions](): ActionExecutor<any, any, any, any, any>;
@@ -139,7 +143,9 @@ declare const eventBuses: {
     [EventBus.UiActionMenuHandler](): ActionMenuHandler;
     [EventBus.UiGameScreen](): GameScreen;
     [EventBus.UiHoveredTileTracker](): HoveredTileTracker;
+    [EventBus.UiInputManagerMouse](): GlobalMouseInfo;
     [EventBus.UiInteractionManager](): InteractionManager;
+    [EventBus.UiItemComponentStatic](): ItemComponentEventBus;
     [EventBus.UiMovementHandler](): MovementHandler;
     [EventBus.UiPathingHandler](): PathingHandler;
     [EventBus.UsableActions](): UsableAction;
@@ -187,11 +193,13 @@ export declare const eventBusManager: EventBusManager<EventBus, {
     37(): ActionMenuHandler;
     38(): GameScreen;
     39(): HoveredTileTracker;
-    40(): InteractionManager;
-    41(): MovementHandler;
-    42(): PathingHandler;
-    43(): UsableAction;
-    44(): WorldRenderer;
+    40(): GlobalMouseInfo;
+    41(): InteractionManager;
+    42(): ItemComponentEventBus;
+    43(): MovementHandler;
+    44(): PathingHandler;
+    45(): UsableAction;
+    46(): WorldRenderer;
 }>;
 /**
  * For backwards compat / ease of use

package/definitions/game/event/EventManager.d.ts

@@ -56,11 +56,13 @@ export declare const eventManager: EventManager<EventBus, {
     37(): import("../ui/screen/screens/game/util/movement/ActionMenuHandler").default;
     38(): import("../ui/screen/screens/GameScreen").default;
     39(): import("../ui/screen/screens/game/util/HoveredTileTracker").default;
-    40(): import("../ui/screen/screens/game/util/movement/InteractionManager").default;
-    41(): import("../ui/screen/screens/game/util/movement/MovementHandler").default;
-    42(): import("../ui/screen/screens/game/util/movement/PathingHandler").default;
-    43(): import("../game/entity/action/usable/UsableAction").default;
-    44(): import("../renderer/world/WorldRenderer").WorldRenderer;
+    40(): import("../ui/input/InputManager").GlobalMouseInfo;
+    41(): import("../ui/screen/screens/game/util/movement/InteractionManager").default;
+    42(): import("../ui/screen/screens/game/component/item/ItemComponentEventBus").default;
+    43(): import("../ui/screen/screens/game/util/movement/MovementHandler").default;
+    44(): import("../ui/screen/screens/game/util/movement/PathingHandler").default;
+    45(): import("../game/entity/action/usable/UsableAction").default;
+    46(): import("../renderer/world/WorldRenderer").WorldRenderer;
 }>;
 /**
  * EventHandler that is typed with the games event buses

package/definitions/game/game/entity/Entity.d.ts

@@ -34,6 +34,7 @@ import type TileEvent from "@wayward/game/game/tile/TileEvent";
 import { type ISerializedTranslation } from "@wayward/game/language/ITranslation";
 import type Translation from "@wayward/game/language/Translation";
 import type { RenderSource, UpdateRenderFlag } from "@wayward/game/renderer/IRenderer";
+import type { Renderer } from "@wayward/game/renderer/Renderer";
 import type { INotificationLocation, ItemNotifierType, MarkerIconType, StatNotificationType } from "@wayward/game/renderer/notifier/INotifier";
 import type { IVector3 } from "@wayward/game/utilities/math/IVector";
 import type { IVector4 } from "@wayward/game/utilities/math/Vector4";
@@ -44,21 +45,18 @@ export default abstract class Entity<DescriptionType = unknown, TypeType extends
     abstract readonly tileUpdateType: TileUpdateType;
     id: number;
     type: TypeType;
+    historicalActions?: PartialRecord<ActionType, number>;
     referenceId?: number;
     renamed?: string | ISerializedTranslation;
     x: number;
     y: number;
     z: WorldZ;
     private _data?;
+    private _persistentMarker?;
+    private _persistentMarkerHidden?;
     private _tags?;
-    historicalActions?: PartialRecord<ActionType, number>;
     islandId: IslandId;
     preventRendering?: boolean;
-    /**
-     * Notifier marker assigned to this entity
-     */
-    private persistentMarker;
-    private persistentMarkerHidden;
     private _humansWithinBound?;
     /**
      * Cached tile the entity is on.
@@ -119,7 +117,10 @@ export default abstract class Entity<DescriptionType = unknown, TypeType extends
     updateView(source: RenderSource, updateFov?: boolean | UpdateRenderFlag.FieldOfView | UpdateRenderFlag.FieldOfViewSkipTransition): void;
     notifyItem(itemNotifierType: ItemNotifierType, item: Item): void;
     notifyStat(type: StatNotificationType, value: number): void;
-    initMarker(): void;
+    /**
+     * This is called clientside the first time the renderer seens the entity
+     */
+    onFirstRender(renderer: Renderer): void;
     getCurrentMarkerIconType(): MarkerIconType | undefined;
     setMarkerIconHidden(hidden: boolean): void;
     addMarkerIcon(type: MarkerIconType): void;

package/definitions/game/game/entity/IEntity.d.ts

@@ -25,7 +25,8 @@ import type Item from "@wayward/game/game/item/Item";
 import type Tile from "@wayward/game/game/tile/Tile";
 import type TileEvent from "@wayward/game/game/tile/TileEvent";
 import type { Direction } from "@wayward/game/utilities/math/Direction";
-export interface IEntityEvents {
+import type { IEventSubscriberEvents } from "@wayward/utilities/event/EventEmitter";
+export interface IEntityEvents extends IEventSubscriberEvents {
     /**
      * Called when an entity is killed by another entity.
      */

package/definitions/game/game/entity/action/ActionsRegistration.d.ts

@@ -152,7 +152,7 @@ export declare const actionDescriptionsSlow: {
     }, [import("../../item/Item").default]>;
     134: import("./Action").Action<[import("@wayward/game/game/entity/action/IAction").ActionArgument.Container, import("./argument/ActionArgumentEnum").default<import("../../item/IItem").ItemType, "Bow" | "None" | "String" | "HideGlue" | "AnimalSkull" | "GraniteArrow" | "GraniteArrowhead" | "PileOfAsh" | "BarkLeggings" | "BarkShield" | "BarkTunic" | "Bone" | "Branch" | "CactusSpines" | "Charcoal" | "GraniteFlooring" | "CookedMeat" | "Earthworm" | "Feather" | "Fertilizer" | "WaterskinOfSeawater" | "FirePlough" | "BeggartickSeeds" | "Fossil" | "GoldCoins" | "GoldenChalice" | "GoldenRing" | "GoldShortSword" | "GrassSeeds" | "IronOre" | "WoodenDowels" | "Granite" | "LeafBedroll" | "Hide" | "Leaves" | "Limestone" | "Log" | "GraniteMortarAndPestle" | "ButtonMushrooms" | "Nopal" | "Peat" | "Sandstone" | "PileOfGravel" | "PileOfBeachSand" | "WoodenArrow" | "GraniteAxe" | "Bandage" | "WovenFabric" | "CactusNeedle" | "GraniteShovel" | "WoodenSpear" | "Suture" | "Raft" | "RawMeat" | "Raspberries" | "FlyAmanita" | "Rope" | "MapleSeeds" | "Badderlocks" | "SharpGlass" | "SharpGranite" | "Skullcap" | "SmoothGranite" | "Soil" | "GraniteSpear" | "Stones" | "GraniteWall" | "StrippedBark" | "Leather" | "Tannin" | "MilkThistleSeeds" | "TreeBark" | "HoneyFungus" | "ClematisVine" | "Twigs" | "Waterskin" | "WoodenPole" | "PeatBandage" | "BowDrill" | "FishingNet" | "RawCod" | "CookedCod" | "GraniteCampfire" | "VineWhip" | "PileOfSnow" | "BarkTorch" | "LitBarkTorch" | "HandDrill" | "SmallBag" | "Shale" | "SharpenedBone" | "Grindstone" | "RawFishSteak" | "CookedFishSteak" | "WaterskinOfDesalinatedWater" | "BoatPaddle" | "BullBoat" | "RefinedSand" | "Spyglass" | "Retort" | "RawClay" | "RawClayBlowpipe" | "ClayBlowpipe" | "LeatherBelt" | "LeatherTunic" | "LeatherBoots" | "LeatherCap" | "LeatherGorget" | "LeatherPants" | "LeatherGloves" | "GraniteFurnace" | "SandstoneKiln" | "IronTongs" | "Talc" | "TalcumPowder" | "WoodenSandCastFlask" | "Lens" | "PlantRoots" | "Lockpick" | "BoneNeedle" | "Pineapple" | "TatteredMap" | "Coal" | "SmeltedWroughtIron" | "LimestonePowder" | "SmeltedIron" | "Backpack" | "RottenMeat" | "GraniteHammer" | "RawChicken" | "CookedChicken" | "GraniteAnvil" | "WoodenChest" | "IronShortSword" | "IronBreastplate" | "IronBoots" | "IronHelmet" | "IronGorget" | "IronCuisses" | "IronGauntlets" | "IronHeater" | "SandstoneWall" | "SandstoneFlooring" | "SpiderSilk" | "AnimalFat" | "TallowTorch" | "ClayFlakes" | "GreenSand" | "OldInstructionalScroll" | "SlimeGelatin" | "SlimeGlue" | "CookedSpiderMeat" | "SpiderMeat" | "IronLockpick" | "RottingVegetation" | "Chives" | "IronHammer" | "IronSpear" | "IronShovel" | "IronDoubleAxe" | "IronPickaxe" | "Inkstick" | "Coconut" | "PalmLeaf" | "Offal" | "BoneFragments" | "LitPoleTorch" | "CottonBoll" | "CottonSeeds" | "CottonFabric" | "BonePole" | "Tourniquet" | "WroughtIronPickaxe" | "WroughtIronDoubleAxe" | "WroughtIronShovel" | "WroughtIronSpear" | "WroughtIronHammer" | "WroughtIronLockpick" | "WroughtIronShield" | "WroughtIronGauntlets" | "WroughtIronCuisses" | "WroughtIronGorget" | "WroughtIronHelmet" | "WroughtIronBoots" | "WroughtIronBreastplate" | "WroughtIronShortSword" | "WoodenWall" | "WoodenFlooring" | "WoodenDoor" | "FishingRod" | "MessageInABottle" | "CarbonPowder" | "PileOfCompost" | "FishGlue" | "WoodenShavings" | "GraniteDeadfall" | "Snare" | "WaterskinOfMedicinalWater" | "CharcoalBandage" | "WoodenTongs" | "WroughtIronTongs" | "SheetOfGlass" | "SolarStill" | "TinWaterStill" | "GraniteSundial" | "LitTallowTorch" | "Sinew" | "ShortBow" | "LongBow" | "CompositeBow" | "WaterskinOfPurifiedFreshWater" | "WaterskinOfUnpurifiedFreshWater" | "GlassBottle" | "Cork" | "GlassBottleOfSeawater" | "GlassBottleOfDesalinatedWater" | "GlassBottleOfMedicinalWater" | "GlassBottleOfPurifiedFreshWater" | "GlassBottleOfUnpurifiedFreshWater" | "WroughtIronArrow" | "IronArrow" | "GraniteBullet" | "WroughtIronBullet" | "IronBullet" | "LeatherQuiver" | "Ectoplasm" | "MagicalEssence" | "WoodenFence" | "CreatureIdol" | "CordedSling" | "LeatherSling" | "WroughtIronArrowhead" | "IronArrowhead" | "Hammock" | "CottonBedroll" | "FeatherBedroll" | "RawTaintedMeat" | "CookedTaintedMeat" | "GraniteKnife" | "RawBlindfish" | "CookedBlindfish" | "Pemmican" | "CookedPemmican" | "Sail" | "Sailboat" | "ChickenEgg" | "BoiledChickenEgg" | "SheafOfHay" | "Niter" | "Saltpeter" | "BlackPowder" | "FlintlockPistol" | "Giblets" | "ExplosiveTrap" | "SkeletalMageWand" | "RawClayJug" | "ClayJug" | "ClayJugOfSeawater" | "ClayJugOfDesalinatedWater" | "ClayJugOfMedicinalWater" | "ClayJugOfPurifiedFreshWater" | "ClayJugOfUnpurifiedFreshWater" | "RawClayBrick" | "ClayBrick" | "ClayWall" | "ClayFlooring" | "PineappleSeeds" | "RaspberrySeeds" | "PricklyPearSeeds" | "ClematisSeeds" | "PaperSheet" | "PaperMold" | "Beggarticks" | "MilkThistleFlowers" | "DrawnMap" | "TatteredClothShirt" | "TatteredClothTrousers" | "WoodenGate" | "PoisonIvyLeaves" | "PoisonIvySeeds" | "WroughtIronChest" | "IronChest" | "SwitchgrassSeeds" | "Apple" | "SpiderEggs" | "TailFeathers" | "AppleSeeds" | "VenomGland" | "OrnateWoodenChest" | "RollOfRedCarpet" | "OrnateCape" | "FireBladder" | "GoldenKey" | "WoodenShortSword" | "ClayKiln" | "ClayCampfire" | "ClayFurnace" | "CopperWaterStill" | "SandstoneCampfire" | "SandstoneFurnace" | "WroughtIronWaterStill" | "GraniteKiln" | "WroughtIronAnvil" | "IronAnvil" | "MageRobe" | "CrackedOrb" | "AnimalClaw" | "AnimalPelt" | "AnimalFur" | "Scales" | "SharkFin" | "RawReptileMeat" | "CookedReptileMeat" | "Tentacles" | "CookedTentacles" | "WormMeat" | "CookedWormMeat" | "GranitePickaxe" | "WroughtIronAxe" | "IronAxe" | "FertileSoil" | "GraniteHoe" | "WroughtIronHoe" | "IronHoe" | "LavaBeetleHelmet" | "SpruceCone" | "SpruceSeeds" | "SpruceNeedles" | "CypressCone" | "CypressSeeds" | "CypressLeaves" | "Lettuce" | "LettuceSeeds" | "ChiveSeeds" | "Potato" | "PotatoSeeds" | "Carrot" | "CarrotSeeds" | "CornEar" | "CornSeeds" | "Cucumber" | "CucumberSeeds" | "Tomato" | "TomatoSeeds" | "Pumpkin" | "PumpkinSeeds" | "PricklyPearFruit" | "SugarCaneStalks" | "SugarCaneSeeds" | "BushelOfWheat" | "Wheat" | "CookedPotato" | "CookedCornCob" | "BundleOfSwitchgrass" | "Cloak" | "WoodenMortarAndPestle" | "SandstoneMortarAndPestle" | "WroughtIronMortarAndPestle" | "IronMortarAndPestle" | "RawClayMortarAndPestle" | "ClayMortarAndPestle" | "CopperOre" | "SmeltedCopper" | "CopperPickaxe" | "CopperDoubleAxe" | "CopperShovel" | "CopperSpear" | "CopperHammer" | "CopperLockpick" | "CopperBuckler" | "CopperGauntlets" | "CopperGreaves" | "CopperGorget" | "CopperHelmet" | "CopperBoots" | "CopperCuirass" | "CopperShortSword" | "CopperTongs" | "CopperArrow" | "CopperBullet" | "CopperArrowhead" | "CopperChest" | "CopperAnvil" | "CopperAxe" | "CopperHoe" | "CopperMortarAndPestle" | "WaterskinOfGoatMilk" | "ClayJugOfGoatMilk" | "GlassBottleOfGoatMilk" | "Obsidian" | "OrnateBlueBook" | "Journal" | "MossCoveredBook" | "GildedRedBook" | "ArrowShaft" | "SlitherSucker" | "AberrantSlitherSucker" | "StrawHat" | "BlackplateSabatons" | "BlackplateBreastplate" | "BlackplateGauntlets" | "BlackplateGorget" | "BlackplateGreaves" | "BlackplateHelmet" | "DeathKnightAxe" | "Macuahuitl" | "ObsidianArrow" | "ObsidianArrowhead" | "ObsidianAxe" | "ObsidianKnife" | "ObsidianShovel" | "ObsidianSpear" | "TumbleweedSeeds" | "CoconutHusk" | "PeeledCoconut" | "CoconutMeat" | "CoconutContainerOfCoconutWater" | "CoconutContainer" | "CoconutContainerOfSeawater" | "CoconutContainerOfDesalinatedWater" | "CoconutContainerOfMedicinalWater" | "CoconutContainerOfPurifiedFreshWater" | "CoconutContainerOfUnpurifiedFreshWater" | "CoconutContainerOfGoatMilk" | "OldEducationalScroll" | "StrippedHide" | "ClaySandCastFlask" | "SandstoneSandCastFlask" | "GraniteSandCastFlask" | "BoneGlue" | "CutHide" | "BoneMeal" | "PileOfDesertSand" | "JoshuaTreeLeaves" | "JoshuaTreeFruit" | "JoshuaTreeSeeds" | "CookedJoshuaTreeFruit" | "JoshuaTreeFlowers" | "SaguaroCactusFruit" | "SaguaroCactusSeeds" | "SaguaroCactusChunk" | "GraniteWell" | "SandstoneWell" | "ClayWell" | "AloeVeraLeaves" | "AloeVeraSeeds" | "DeadScorpion" | "DeadAberrantScorpion" | "CookedScorpion" | "CookedAberrantScorpion" | "ScorpionStinger" | "CopperBakingTray" | "WroughtIronBakingTray" | "IronBakingTray" | "Flour" | "Dough" | "Hardtack" | "HitchingPost" | "ShreddedPaper" | "RawMudskipper" | "RawAberrantMudskipper" | "CookedMudskipper" | "CookedAberrantMudskipper" | "RawRedSnapper" | "CookedRedSnapper" | "RawWalleye" | "CookedWalleye" | "WoodenShield" | "CopperRefinementTools" | "WroughtIronRefinementTools" | "IronRefinementTools" | "ScaleBelt" | "ScaleVest" | "ScaleBoots" | "ScaleCap" | "ScaleBevor" | "ScaleLeggings" | "ScaleGloves" | "CookedJoshuaTreeFlowers" | "SaguaroCactusRibs" | "BladesOfGrass" | "AnimalDroppings" | "AnimalDung" | "Guano" | "Tallow" | "TallowCandle" | "LitTallowCandle" | "WispDust" | "MagicalAspect" | "GoldenSextant" | "RawChoppedFish" | "CookedChoppedFish" | "CookedFishKebab" | "AshCement" | "AshCementBrick" | "AshCementFlooring" | "AshCementWall" | "IceShard" | "PenguinEgg" | "BoiledPenguinEgg" | "RawPenguinMeat" | "CookedPenguinMeat" | "Crowberries" | "CookedCrowberries" | "CrowberrySeeds" | "Winterberries" | "WinterberrySeeds" | "ArcticPoppies" | "ArcticPoppySeeds" | "PirateHat" | "AloeVeraBandage" | "SharkTooth" | "CopperKnife" | "WroughtIronKnife" | "IronKnife" | "TinOre" | "SmeltedTin" | "TinPickaxe" | "TinDoubleAxe" | "TinShovel" | "TinSpear" | "TinHammer" | "TinLockpick" | "TinShield" | "TinGloves" | "TinChausses" | "TinBevor" | "TinHelmet" | "TinFootgear" | "TinCuirass" | "TinShortSword" | "TinTongs" | "TinArrow" | "TinBullet" | "TinArrowhead" | "TinChest" | "TinAnvil" | "TinAxe" | "TinHoe" | "TinMortarAndPestle" | "TinBakingTray" | "TinRefinementTools" | "TinKnife" | "SmeltedBronze" | "BronzePickaxe" | "BronzeDoubleAxe" | "BronzeShovel" | "BronzeSpear" | "BronzeHammer" | "BronzeLockpick" | "BronzeKiteShield" | "BronzeGauntlets" | "BronzeGreaves" | "BronzeBevor" | "BronzeHelmet" | "BronzeBoots" | "BronzeChestArmor" | "BronzeShortSword" | "BronzeTongs" | "BronzeArrow" | "BronzeBullet" | "BronzeArrowhead" | "BronzeChest" | "BronzeAnvil" | "BronzeAxe" | "BronzeHoe" | "BronzeMortarAndPestle" | "BronzeBakingTray" | "BronzeRefinementTools" | "BronzeKnife" | "IceBrick" | "SnowBrick" | "IceWall" | "IceFlooring" | "SnowWall" | "SnowFlooring" | "CaliginousScrap" | "MagicalExtract" | "ShimmeringFibers" | "MagicalTwine" | "SandstoneHammer" | "SandstoneBullet" | "SandstoneAnvil" | "SnowScarecrow" | "FrozenFlesh" | "AnimalTusk" | "WhitePineCone" | "WhitePineSeeds" | "WhitePineNeedles" | "FurCoat" | "FurMittens" | "FurBoots" | "BirdDroppings" | "HardenedCoil" | "MagicalBinding" | "ArmoredScales" | "RawPangolinMeat" | "CookedPangolinMeat" | "ArmoredScaleBelt" | "ArmoredScaleVest" | "ArmoredScaleBoots" | "ArmoredScaleCrown" | "ArmoredScaleBevor" | "ArmoredScaleCuisses" | "ArmoredScaleGloves" | "TinNeedle" | "CopperNeedle" | "WroughtIronNeedle" | "IronNeedle" | "BronzeNeedle" | "TuftsOfTanglehead" | "TangleheadSeeds" | "WispInAGlassBottle" | "AberrantWispInAGlassBottle" | "WispInAClayJug" | "AberrantWispInAClayJug" | "WispInACoconutContainer" | "AberrantWispInACoconutContainer" | "WispInAWaterskin" | "AberrantWispInAWaterskin" | "StrawScarecrow" | "CactusScarecrow" | "ClothShirt" | "ClothTrousers" | "UnripePapaya" | "Papaya" | "PapayaSeeds" | "PalapalaiFrond" | "PalapalaiSpores" | "ButtonMushroomSpores" | "FlyAmanitaSpores" | "BrambleCrown" | "DarkBrambleCrown" | "Cotton" | "WaterskinOfSwampWater" | "GlassBottleOfSwampWater" | "ClayJugOfSwampWater" | "CoconutContainerOfSwampWater" | "WaterskinOfFilteredWater" | "GlassBottleOfFilteredWater" | "ClayJugOfFilteredWater" | "CoconutContainerOfFilteredWater" | "ClayFilter" | "SandstoneAxe" | "SandstoneShovel" | "SharpSandstone" | "SmoothSandstone" | "SandstoneSpear" | "SandstoneKnife" | "SandstonePickaxe" | "SandstoneHoe" | "SandstoneDeadfall" | "SandstoneSundial" | "WoodenPlank" | "WoodenWheel" | "WoodenAxle" | "WoodenMinecart" | "WoodenRail" | "WoodenTrack" | "TinWheel" | "TinAxle" | "TinMinecart" | "TinRail" | "TinTrack" | "CopperWheel" | "CopperAxle" | "CopperMinecart" | "CopperRail" | "CopperTrack" | "WroughtIronWheel" | "WroughtIronAxle" | "WroughtIronMinecart" | "WroughtIronRail" | "WroughtIronTrack" | "IronWheel" | "IronAxle" | "IronMinecart" | "IronRail" | "IronTrack" | "BronzeWheel" | "BronzeAxle" | "BronzeMinecart" | "BronzeRail" | "BronzeTrack" | "BasaltArrow" | "BasaltArrowhead" | "Basalt" | "BasaltMortarAndPestle" | "BasaltAxe" | "BasaltShovel" | "SharpBasalt" | "SmoothBasalt" | "BasaltSpear" | "BasaltFlooring" | "BasaltWall" | "BasaltCampfire" | "BasaltFurnace" | "BasaltHammer" | "BasaltAnvil" | "BasaltDeadfall" | "IronWaterStill" | "BasaltSundial" | "BasaltBullet" | "BasaltKnife" | "BasaltKiln" | "BasaltPickaxe" | "BasaltHoe" | "BasaltSandCastFlask" | "BasaltWell" | "WoodenTrackGate" | "MoldyScroll" | "MysteriousParchment" | "MagicalInscription" | "CattailLeaves" | "CattailShoots" | "CattailFlowers" | "CattailSeeds" | "CobblestoneFlooring" | "WaterLilies" | "Mud" | "SpikerushSheaths" | "SpikerushSeeds" | "WoodenBookcase" | "GraniteLighthouse" | "SandstoneLighthouse" | "ClayLighthouse" | "BasaltLighthouse" | "WoodenCage" | "FullWoodenCage" | "TinCage" | "FullTinCage" | "CopperCage" | "FullCopperCage" | "WroughtIronCage" | "FullWroughtIronCage" | "IronCage" | "FullIronCage" | "BronzeCage" | "FullBronzeCage" | "Amber" | "Tourmaline" | "Topaz" | "Opal" | "Sapphire" | "WoodGolemFigure" | "ClayGolemFigure" | "GraniteGolemFigure" | "SandstoneGolemFigure" | "BasaltGolemFigure" | "AberrantWoodGolemFigure" | "AberrantClayGolemFigure" | "AberrantGraniteGolemFigure" | "AberrantSandstoneGolemFigure" | "AberrantBasaltGolemFigure" | "GraniteDripstone" | "SandstoneDripstone" | "BasaltDripstone" | "ClayDripstone" | "BronzeWaterStill" | "ArmorStand" | "RuneOfEvil" | "RuneOfChaos" | "RuneOfGood" | "GraniteAltar" | "WoodenWheelbarrow" | "TinWheelbarrow" | "CopperWheelbarrow" | "WroughtIronWheelbarrow" | "IronWheelbarrow" | "BronzeWheelbarrow" | "GraniteCrucible" | "SandstoneCrucible" | "BasaltCrucible" | "RawClayCrucible" | "ClayCrucible" | "SandstoneAltar" | "BasaltAltar" | "ClayAltar" | "PineResin" | "SpruceResin" | "CypressResin" | "Pitch" | "PitchGlue" | "MagicalOrb" | "RawAberrantCod" | "CookedAberrantCod" | "RawAberrantBlindfish" | "CookedAberrantBlindfish" | "RawAberrantRedSnapper" | "CookedAberrantRedSnapper" | "RawAberrantWalleye" | "CookedAberrantWalleye" | "FishBones" | "AnimalCartilage" | "GelatinPowder" | "Gelatin" | "Aspic" | "FruitCocktail" | "VegetableTerrine" | "TatteredClothBandana" | "ClothBandana" | "RustedScimitar" | "TricorneHat" | "SandstoneArrowhead" | "SandstoneArrow" | "ReedFlute" | "WoodenFlute" | "RawClayFlute" | "ClayFlute" | "BoneFlute" | "TinFlute" | "CopperFlute" | "WroughtIronFlute" | "IronFlute" | "BronzeFlute" | "StrippedLeather" | "ChickenEggshells" | "PenguinEggshells" | "Last">, [arg1: import("@wayward/game/game/entity/action/IAction").ActionArgument.Undefined, import("@wayward/game/game/entity/action/IAction").ActionArgument.Integer32]], import("../player/Player").default, void, import("@wayward/game/game/entity/action/IAction").IActionUsable, [import("../../item/IItem").IContainer, import("../../item/IItem").ItemType, (number | undefined)?]>;
     4: import("./Action").Action<[import("@wayward/game/game/entity/action/IAction").ActionArgument.ItemInventory, [arg1: import("@wayward/game/game/entity/action/IAction").ActionArgument.Undefined, import("@wayward/game/game/entity/action/IAction").ActionArgument.ItemInventory], [arg1: import("@wayward/game/game/entity/action/IAction").ActionArgument.Undefined, import("@wayward/game/game/entity/action/IAction").ActionArgument.ItemNearby], [arg1: import("@wayward/game/game/entity/action/IAction").ActionArgument.Undefined, import("@wayward/game/game/entity/action/IAction").ActionArgument.ItemNearby], [arg1: import("@wayward/game/game/entity/action/IAction").ActionArgument.Undefined, import("@wayward/game/game/entity/action/IAction").ActionArgument.ItemNearby]], import("../Human").default<unknown, number, import("../../reference/IReferenceManager").ReferenceType.NPC | import("../../reference/IReferenceManager").ReferenceType.Player>, void, import("@wayward/game/game/entity/action/actions/StartFire").IStartFireCanUse, [import("../../item/Item").default, (import("../../item/Item").default | undefined)?, (import("../../item/Item").default | undefined)?, (import("../../item/Item").default | undefined)?, (import("../../item/Item").default | undefined)?]>;
-    23: import("./Action").Action<[import("@wayward/game/game/entity/action/IAction").ActionArgument.ItemInventory], import("../Human").default<unknown, number, import("../../reference/IReferenceManager").ReferenceType.NPC | import("../../reference/IReferenceManager").ReferenceType.Player>, void, import("@wayward/game/game/entity/action/actions/StokeFire").IStokeFireCanUse, [import("../../item/Item").default]>;
+    23: import("./Action").Action<[import("@wayward/game/game/entity/action/IAction").ActionArgument.ItemNearby], import("../Human").default<unknown, number, import("../../reference/IReferenceManager").ReferenceType.NPC | import("../../reference/IReferenceManager").ReferenceType.Player>, void, import("@wayward/game/game/entity/action/actions/StokeFire").IStokeFireCanUse, [import("../../item/Item").default]>;
     121: import("./Action").Action<[import("@wayward/game/game/entity/action/IAction").ActionArgument.ItemInventory], import("../Human").default<unknown, number, import("../../reference/IReferenceManager").ReferenceType.NPC | import("../../reference/IReferenceManager").ReferenceType.Player>, void, import("@wayward/game/game/entity/action/actions/Summon").ISummonAction, [import("../../item/Item").default]>;
     128: import("./Action").Action<[[arg1: import("@wayward/game/game/entity/action/IAction").ActionArgument.Undefined, import("@wayward/game/game/entity/action/IAction").ActionArgument.Doodad]], import("../Human").default<unknown, number, import("../../reference/IReferenceManager").ReferenceType.NPC | import("../../reference/IReferenceManager").ReferenceType.Player>, boolean, import("@wayward/game/game/entity/action/actions/SwapWithArmorStand").ISwapEquipment, [(import("../../doodad/Doodad").default | undefined)?]>;
     131: import("./Action").Action<[[arg1: import("@wayward/game/game/entity/action/IAction").ActionArgument.Undefined, import("@wayward/game/game/entity/action/IAction").ActionArgument.Doodad]], import("../Human").default<unknown, number, import("../../reference/IReferenceManager").ReferenceType.NPC | import("../../reference/IReferenceManager").ReferenceType.Player>, boolean, import("@wayward/game/game/entity/action/actions/SwapWithArmorStand").ISwapEquipment, [(import("../../doodad/Doodad").default | undefined)?]>;

package/definitions/game/game/entity/action/actions/StokeFire.d.ts

@@ -21,5 +21,5 @@ export interface IStokeFireCanUse extends IActionUsable {
     doodad?: Doodad;
     tileEvent?: TileEvent;
 }
-declare const _default: Action<[ActionArgument.ItemInventory], import("../../Human").default<unknown, number, import("../../../reference/IReferenceManager").ReferenceType.NPC | import("../../../reference/IReferenceManager").ReferenceType.Player>, void, IStokeFireCanUse, [Item]>;
+declare const _default: Action<[ActionArgument.ItemNearby], import("../../Human").default<unknown, number, import("../../../reference/IReferenceManager").ReferenceType.NPC | import("../../../reference/IReferenceManager").ReferenceType.Player>, void, IStokeFireCanUse, [Item]>;
 export default _default;

package/definitions/game/game/entity/action/usable/IUsableAction.d.ts

@@ -35,7 +35,7 @@ import type Message from "@wayward/game/language/dictionary/Message";
 import { TranslationArg } from "@wayward/game/language/ITranslation";
 import type Translation from "@wayward/game/language/Translation";
 import type Bindable from "@wayward/game/ui/input/Bindable";
-import type { ItemDetailIconLocation } from "@wayward/game/ui/screen/screens/game/component/ItemComponent";
+import type { ItemDetailIconLocation } from "@wayward/game/ui/screen/screens/game/component/item/IItemComponent";
 import type Tooltip from "@wayward/game/ui/tooltip/Tooltip";
 import type { HighlightSelector } from "@wayward/game/ui/util/IHighlight";
 import type HashSet from "@wayward/utilities/collection/set/HashSet";

package/definitions/game/game/entity/action/usable/UsableAction.d.ts

@@ -27,6 +27,12 @@ import Message from "@wayward/game/language/dictionary/Message";
 import type { HighlightSelector } from "@wayward/game/ui/util/IHighlight";
 import Observer from "@wayward/game/utilities/Observer";
 import EventEmitter from "@wayward/utilities/event/EventEmitter";
+export interface IUsableActionResolveUsingOptions {
+    /** Whether to skip filling in the `fromTile` and `targetTile` properties. Defaults to `true` */
+    skipTiles?: boolean;
+    /** Whether to skip filling in the `item`. Defaults to `false` */
+    skipItem?: boolean;
+}
 export interface IUsableActionEvents {
     preExecute(player: Player, using: IUsableActionPossibleUsing, context: IUsableActionExecutionContext): any;
     postExecute(player: Player, using: IUsableActionPossibleUsing, context: IUsableActionExecutionContext): any;
@@ -70,8 +76,8 @@ declare class UsableAction<REQUIREMENTS extends IUsableActionRequirements = IUsa
     } | {
         used: false;
     };
-    resolveUsing(player: Player, using: IUsableActionUsing<REQUIREMENTS>, fillTiles?: boolean): Message | IUsableActionUsing<REQUIREMENTS>;
-    resolveUsingOrUndefined(player: Player, using: IUsableActionUsing<REQUIREMENTS>, fillTiles?: boolean): IUsableActionUsing<REQUIREMENTS> | undefined;
+    resolveUsing(player: Player, using: IUsableActionUsing<REQUIREMENTS>, options?: IUsableActionResolveUsingOptions): Message | IUsableActionUsing<REQUIREMENTS>;
+    resolveUsingOrUndefined(player: Player, using: IUsableActionUsing<REQUIREMENTS>, options?: IUsableActionResolveUsingOptions): IUsableActionUsing<REQUIREMENTS> | undefined;
     isUsable(player: Player, provided: IUsableActionUsing<REQUIREMENTS>, context: UsableActionExecutionContext | IUsableActionExecutionContext): UsableActionUsability<REQUIREMENTS>;
     isApplicable(player: Player, provided?: IUsableActionPossibleUsing, fullUsabilityCheck?: boolean, requireItem?: boolean): provided is IUsableActionUsing<REQUIREMENTS>;
     private isItemApplicable;

package/definitions/game/game/entity/npc/NPC.d.ts

@@ -76,7 +76,6 @@ export default abstract class NPC extends Human<INPCDescription, NPCType, Refere
     addMilestone(): void;
     protected getStatusApplicability(): StatusApplicability | undefined;
     get isValid(): boolean;
-    load(): void;
     /**
      * Creates inventory, equips items, and scales stats
      */

package/definitions/game/game/inspection/InfoProvider.d.ts

@@ -21,8 +21,9 @@ import type { ISerializedImagePath } from "@wayward/game/ui/util/ImagePath";
 import ImagePath from "@wayward/game/ui/util/ImagePath";
 import BaseObserver from "@wayward/game/utilities/Observer";
 import type { IStringSection } from "@wayward/game/utilities/string/Interpolator";
+import type { IEventSubscriberEvents } from "@wayward/utilities/event/EventEmitter";
 import EventEmitter from "@wayward/utilities/event/EventEmitter";
-export interface IInfoProviderEvents {
+export interface IInfoProviderEvents extends IEventSubscriberEvents {
     /**
      * Should be emitted when the info provider is starting to initialize its component.
      */

package/definitions/game/game/inspection/InspectionsHandler.d.ts

@@ -13,8 +13,9 @@ import type { InfoProviderContext } from "@wayward/game/game/inspection/InfoProv
 import type Inspection from "@wayward/game/game/inspection/Inspection";
 import type { ResolvedInspection } from "@wayward/game/game/inspection/InspectionTypeMap";
 import HashSet from "@wayward/utilities/collection/set/HashSet";
+import type { IEventSubscriberEvents } from "@wayward/utilities/event/EventEmitter";
 import EventEmitter from "@wayward/utilities/event/EventEmitter";
-export interface IInspectionsHandlerEvents {
+export interface IInspectionsHandlerEvents extends IEventSubscriberEvents {
     updatedInspections(type: InspectType, newInspections: HashSet<Inspection<any>>, oldInspections?: HashSet<Inspection<any>>): any;
 }
 export default abstract class InspectionsHandler extends EventEmitter.Host<IInspectionsHandlerEvents> {

package/definitions/game/language/segment/BindSegment.d.ts

@@ -9,7 +9,7 @@
  * https://github.com/WaywardGame/types/wiki
  */
 import type Bindable from "@wayward/game/ui/input/Bindable";
-import type { ISegment, IStringSection } from "@wayward/game/utilities/string/Interpolator";
+import type { IRegexSegment, IStringSection } from "@wayward/game/utilities/string/Interpolator";
 export interface IBindingsSection extends IStringSection {
     bindable: Bindable | null;
     bindableNoBindingsFallback?: IStringSection[];
@@ -19,5 +19,5 @@ export interface IBindingsSection extends IStringSection {
 export declare namespace IBindingsSection {
     function create(bindable: Bindable | null, fallback?: IStringSection[], simplify?: boolean, contextless?: boolean): IBindingsSection;
 }
-declare const bindSegment: ISegment;
+declare const bindSegment: IRegexSegment;
 export default bindSegment;

package/definitions/game/language/segment/InterpolateArgumentSegment.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 type { ISegment } from "@wayward/game/utilities/string/Interpolator";
-declare const interpolateArgumentSegment: ISegment;
+import type { IRegexSegment } from "@wayward/game/utilities/string/Interpolator";
+declare const interpolateArgumentSegment: IRegexSegment;
 export default interpolateArgumentSegment;

package/definitions/game/language/segment/NumberSegment.d.ts

@@ -10,18 +10,18 @@
  */
 import type Translation from "@wayward/game/language/Translation";
 import TranslationImpl from "@wayward/game/language/impl/TranslationImpl";
-import type { ISegment } from "@wayward/game/utilities/string/Interpolator";
+import type { IRegexSegment, ISegment } from "@wayward/game/utilities/string/Interpolator";
 declare namespace NumberTranslation {
     function translate(number: number, failWith?: string | Translation): Translation;
     const numberAsWordsSegment: ISegment;
     function romanNumeral(number: number): TranslationImpl;
     const numberAsRomanNumeralSegment: ISegment;
-    const numberToPlacesSegment: ISegment;
-    const numberToPercentSegment: ISegment;
+    const numberToPlacesSegment: IRegexSegment;
+    const numberToPercentSegment: IRegexSegment;
     const numberDifferenceSegment: ISegment;
     /**
      * @deprecated Prefer `numberToPlacesSegment`, `numberAsWordsSegment`
      */
-    const compatNumberSegment: ISegment;
+    const compatNumberSegment: IRegexSegment;
 }
 export default NumberTranslation;

package/definitions/game/language/segment/ReferenceSegment.d.ts

@@ -10,10 +10,10 @@
  */
 import type { InfoProviderContext } from "@wayward/game/game/inspection/InfoProviderContext";
 import type { Reference } from "@wayward/game/game/reference/IReferenceManager";
-import type { ISegment, IStringSection } from "@wayward/game/utilities/string/Interpolator";
+import type { IRegexSegment, IStringSection } from "@wayward/game/utilities/string/Interpolator";
 export interface IReferenceSection extends IStringSection {
     reference: Reference;
     context?: InfoProviderContext;
 }
-declare const referenceSegment: ISegment;
+declare const referenceSegment: IRegexSegment;
 export default referenceSegment;

package/definitions/game/language/segment/ReformatSegment.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 type { ISegment } from "@wayward/game/utilities/string/Interpolator";
-declare const reformatSegment: ISegment;
+import type { IRegexSegment } from "@wayward/game/utilities/string/Interpolator";
+declare const reformatSegment: IRegexSegment;
 export default reformatSegment;

package/definitions/game/language/segment/Segments.d.ts

@@ -41,4 +41,4 @@ export declare enum Segment {
 }
 declare const segments: Record<Segment, ISegment>;
 export default segments;
-export declare const segmentsMapInverted: Map<ISegment, Segment>;
+export declare const segmentsMapInverted: Map<ISegment<unknown>, Segment>;

package/definitions/game/language/segment/TranslationSegment.d.ts

@@ -9,14 +9,14 @@
  * https://github.com/WaywardGame/types/wiki
  */
 import type Dictionary from "@wayward/game/language/Dictionary";
-import type { ISegment, ISegmentApi, IStringSection } from "@wayward/game/utilities/string/Interpolator";
+import type { IRegexSegment, ISegmentApi, IStringSection } from "@wayward/game/utilities/string/Interpolator";
 import type { Random } from "@wayward/utilities/random/Random";
 declare namespace TranslationSegment {
-    const include: ISegment;
-    const thisEntry: ISegment & {
+    const include: IRegexSegment;
+    const thisEntry: IRegexSegment & {
         translationChain: Array<[Dictionary, number | string, number, Random]>;
     };
-    const conditional: ISegment;
+    const conditional: IRegexSegment;
     function resolveTranslation(random: Random, api: ISegmentApi, dictionaryName: string, entryName: string, index: string | undefined, subTranslationArgsString: string, args: any[]): IStringSection[] | undefined;
     function getSubTranslationArgs(api: ISegmentApi, str: string, ...args: any[]): IStringSection[][];
 }

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

@@ -9,6 +9,7 @@
  * https://github.com/WaywardGame/types/wiki
  */
 import type Version from "@wayward/game/utilities/Version";
+import type { IEventSubscriberEvents } from "@wayward/utilities/event/EventEmitter";
 export declare enum MultiplayerCompatibility {
     Clientside = "clientside",
     Serverside = "serverside",
@@ -35,7 +36,7 @@ export interface IModConfig {
     readonly github?: string;
     readonly saveGameData?: boolean;
 }
-export interface IModEvents {
+export interface IModEvents extends IEventSubscriberEvents {
     unload(): any;
     initialize(): any;
     uninitialize(): any;

package/definitions/game/renderer/RenderersNotifiers.d.ts

@@ -26,5 +26,5 @@ export declare class RenderersNotifiers {
     addItem(location: INotificationLocation, itemNotifierType: ItemNotifierType, type: DisplayableItemType): void;
     addCreature(location: INotificationLocation, creatureNotifierType: CreatureNotifierType, type: CreatureType, aberrant?: boolean): void;
     addMarker(location: INotificationLocation, markerType: MarkerIconType, markerGuid: string): void;
-    removeNotification(location: INotificationLocation, guid: string): void;
+    removeMarker(location: INotificationLocation, guid: string): void;
 }

package/definitions/game/renderer/notifier/Notifier.d.ts

@@ -23,6 +23,9 @@ export declare class Notifier {
     private mostRecentLife;
     private nextUpdate;
     private readonly notifications;
+    /**
+     * Marker guid -> notification
+     */
     private readonly markers;
     private suspended;
     constructor(context: IRendererContext, capacity: number);
@@ -35,7 +38,7 @@ export declare class Notifier {
     addStatus(location: INotificationLocation, status: Status, reason: StatusChangeReason): void;
     addNotifierIcon(location: INotificationLocation, type: NotifierIconType): void;
     addMarker(location: INotificationLocation, type: MarkerIconType, markerGuid: string): void;
-    removeNotification(guid: string): void;
+    removeMarker(guid: string): void;
     suspend(): void;
     resume(): void;
     private update;

package/definitions/game/renderer/world/WorldRenderer.d.ts

@@ -144,6 +144,10 @@ export declare class WorldRenderer extends EventEmitter.Host<IWorldRendererEvent
     private overlayBatch;
     private vehicleBatch;
     private readonly entitiesInViewport;
+    /**
+     * A set of entities seen before (rendered on screen at least once)
+     */
+    private entititiesRenderedBefore;
     private viewportSpritesDirty;
     private cachedBounds;
     private cachedBoundsTimestamp;

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

@@ -101,7 +101,9 @@ export default class Component<E extends HTMLElement = HTMLElement> extends Even
     addEventListener(type: string, listener: (this: HTMLElement, ev: Event) => any, options?: boolean | AddEventListenerOptions): this;
     removeEventListener<K extends keyof HTMLElementEventMap>(type: K, listener: (this: HTMLElement, ev: HTMLElementEventMap[K]) => any): this;
     getAs<C extends Component>(cls: AnyClass<C>): C | undefined;
+    cast<C extends Component>(): C;
     matches(selector: string): boolean;
+    matches<C extends Component>(selector: string): this is C;
     exists(): boolean;
     /**
      * A cached alias for `element.getBoundingClientRect()`. Boxes are updated or regenerated as ancestors shift.

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

@@ -14,7 +14,7 @@ import Component from "@wayward/game/ui/component/Component";
 import type { TranslationGenerator } from "@wayward/game/ui/component/IComponent";
 import Text, { Heading } from "@wayward/game/ui/component/Text";
 import Bindable from "@wayward/game/ui/input/Bindable";
-import type { ItemComponentHandler } from "@wayward/game/ui/screen/screens/game/component/ItemComponent";
+import type { ItemComponentHandler } from "@wayward/game/ui/screen/screens/game/component/item/ItemComponentHandler";
 import type Tooltip from "@wayward/game/ui/tooltip/Tooltip";
 import type { IDraggableComponent, IDraggableEvents } from "@wayward/game/ui/util/Draggable";
 import Draggable from "@wayward/game/ui/util/Draggable";

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

@@ -14,7 +14,8 @@ import type { ISerializedTranslation } from "@wayward/game/language/ITranslation
 import type Translation from "@wayward/game/language/Translation";
 import type Component from "@wayward/game/ui/component/Component";
 import type { IStringSection } from "@wayward/game/utilities/string/Interpolator";
-export interface IComponentEvents {
+import type { IEventSubscriberEvents } from "@wayward/utilities/event/EventEmitter";
+export interface IComponentEvents extends IEventSubscriberEvents {
     show(): any;
     hide(): any;
     toggleVisible(visible: boolean): any;

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)): void;
+    logErrorEvent(event: ErrorEvent | (Partial<ErrorEvent> & Error), skipLog?: true): void;
     private loggingRejection;
     private logPromiseRejectionEvent;
 }

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

@@ -8,29 +8,23 @@
  * 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 { Quality } from "@wayward/game/game/IObject";
 import { EquipType } from "@wayward/game/game/entity/IHuman";
 import type { ActionId } from "@wayward/game/game/entity/action/usable/IUsableAction";
-import type UsableAction from "@wayward/game/game/entity/action/usable/UsableAction";
-import type MerchantNPC from "@wayward/game/game/entity/npc/npcs/Merchant";
-import type { IContainer, ItemTypeExtra } from "@wayward/game/game/item/IItem";
 import { ItemType } from "@wayward/game/game/item/IItem";
 import type Item from "@wayward/game/game/item/Item";
 import type MagicalPropertyManager from "@wayward/game/game/magic/MagicalPropertyManager";
 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 { 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";
 import type { IDraggableEvents } from "@wayward/game/ui/util/Draggable";
 import Draggable from "@wayward/game/ui/util/Draggable";
-import type Sortable from "@wayward/game/ui/util/Sortable";
 import type { ISortableDraggableEvents } from "@wayward/game/ui/util/Sortable";
 import PerfCache from "@wayward/game/utilities/PerfCache";
 import Vector2 from "@wayward/game/utilities/math/Vector2";
-import WeakishSet from "@wayward/utilities/collection/set/WeakishSet";
 import type { Events, IEventEmitter } from "@wayward/utilities/event/EventEmitter";
-import EventEmitter from "@wayward/utilities/event/EventEmitter";
 type ItemSlotExtend = Omit<Component, "event"> & {
     event: IEventEmitter<Component, IItemSlotEvents>;
 };
@@ -49,88 +43,6 @@ export interface IItemDropApi {
     bindable?: Bindable;
     handler?: ItemComponentHandler;
 }
-export declare enum ItemDetailIconLocation {
-    TopLeft = 0,
-    BottomRight = 1
-}
-export declare enum ItemClasses {
-    Main = "item-component",
-    _InHeading = "item-component--in-heading",
-    Active = "active",// currently used for crafting & trading
-    Icon = "item-component-icon",
-    ItemIconIsReal = "item-component-icon-item-is-real",
-    ActionIcon = "item-component-icon-action",
-    ActionIconAnyItem = "item-component-icon-action-any-item",
-    ActionIconMissingItem = "item-component-icon-action-missing-item",
-    ActionIconHasItem = "item-component-icon-action-has-item",
-    ActionIconNone = "item-component-icon-action-none",
-    TargetIcon = "item-component-icon-target",
-    TargetIcon_Creature = "item-component-icon-target--creature",
-    TargetIcon_Doodad = "item-component-icon-target--doodad",
-    TargetIcon_Vehicle = "item-component-icon-target--vehicle",
-    TargetIcon_Plant = "item-component-icon-target--plant",
-    TargetIcon_NPC = "item-component-icon-target--npc",
-    TargetIcon_TileEvent = "item-component-icon-target--tile-event",
-    SlottedIcon = "item-component-icon-slotted",
-    Equipped = "item-component-equipped",
-    EquipIcon = "item-component-icon-equip",
-    EquipIconHasItem = "item-component-icon-equip-has-item",
-    MagicalIcon = "item-component-icon-magical",
-    ProtectedIcon = "item-component-icon-protected",
-    Trading = "item-component-trading",
-    TradingIcon = "item-component-icon-trading",
-    TradingIconFromMerchant = "item-component-icon-trading-from-merchant",
-    TradingIconToMerchant = "item-component-icon-trading-to-merchant",
-    Slot = "item-component-slot",
-    Dragging = "item-component-dragging",
-    DragPreview = "item-component-drag-preview",
-    DragPreview_Small = "item-component-drag-preview--small",
-    StatBar = "item-component-stat-bar",
-    StatBars = "item-component-stat-bars-wrapper",
-    DecayBar = "item-component-stat-bar-decay",
-    CooldownBar = "item-component-stat-bar-cooldown",
-    DurabilityBar = "item-component-stat-bar-durability",
-    NearlyDestroyed = "item-component-nearly-destroyed",
-    NearlyDecayed = "item-component-nearly-decayed",
-    Transient = "item-component-transient",
-    Highlight = "item-component-highlight",
-    Stack = "item-component-stack",
-    StackQuantity = "item-component-stack-quantity",
-    StackQuantityX = "item-component-stack-quantity-x",
-    StackQuantityDigit = "item-component-stack-quantity-digit",
-    Stacked = "item-component-stacked",
-    StackedVisible = "item-component-stacked-visible"
-}
-export declare namespace ItemClasses {
-    const IconLocation: (enumValue: ItemDetailIconLocation) => "item-component-icon-location-topleft" | "item-component-icon-location-bottomright";
-}
-export interface IItemComponentHandlerDescription {
-    noDrag?: true;
-    equipSlot?: EquipType;
-    hasHighlight?: SupplierOr<boolean>;
-    getItem?(): Item | undefined;
-    getItemType?(): ItemType | ItemTypeExtra | undefined;
-    getItemQuality?(): ArrayOr<Quality> | undefined;
-    getAction?(): UsableAction | undefined;
-    getActionSlot?(): ActionSlot | undefined;
-    getBindables?(bindables: Bindable[]): Bindable[];
-    getSortable?(): Sortable;
-    getStackQuantity?(): number;
-    getContainer?(): IContainer | undefined;
-    getStackItems?(): readonly Item[];
-    getStackDisplayItem?(): Item | undefined;
-    getDisplayItem?(): Item | undefined;
-    getDurability?(): number;
-    getCooldown?(): number;
-    isDamaged?(): boolean;
-    isDecayed?(): boolean;
-}
-export interface ItemComponentHandler extends IItemComponentHandlerDescription {
-}
-export declare class ItemComponentHandler {
-    readonly isItemComponentHandler = true;
-    constructor(description?: IItemComponentHandlerDescription);
-}
 export declare enum ItemTradeType {
     None = "",
     ToMerchant = "To",
@@ -164,19 +76,10 @@ export interface IItemComponentStaticEvents {
 }
 export default class ItemComponent extends Component implements ItemSlot {
     readonly handler: ItemComponentHandler;
-    static readonly eventGlobal: EventEmitter<null, IItemComponentStaticEvents>;
     static create<C extends ItemComponent = ItemComponent>(handler: ItemComponentHandler, ...params: any[]): C | undefined;
     static registerSlot(slot: ItemSlot): void;
     static getHovered(): ItemComponent | undefined;
     static QUALITY_CLASS_NAMES: PerfCache<string[]>;
-    private static readonly tradingByItem;
-    private static readonly tradingToMerchant;
-    private static readonly tradingFromMerchant;
-    static getTrading(merchant: MerchantNPC, type: ItemTradeType): WeakishSet<Item> | undefined;
-    static isTrading(item: Item, merchant: MerchantNPC): boolean;
-    static toggleTrading(items: Item[], merchant: MerchantNPC, trading: ItemTradeType): ItemTradeType;
-    private static sendMerchantChatMessage;
-    static clearTrading(merchant?: MerchantNPC): void;
     event: IEventEmitter<this, IItemComponentEvents>;
     readonly magicalIcon: Component<HTMLElement> | undefined;
     readonly protectedIcon: Component<HTMLElement> | undefined;
@@ -198,6 +101,7 @@ export default class ItemComponent extends Component implements ItemSlot {
     readonly draggable?: Draggable;
     private transient;
     protected constructor(handler: ItemComponentHandler, ...params: any[]);
+    protected get debug(): any;
     private tickEndHandlerReasons?;
     private registerTickEndHandler;
     private deregisterTickEndHandler;
@@ -228,6 +132,7 @@ export default class ItemComponent extends Component implements ItemSlot {
     protected onUpdateDecay(): void;
     protected onUpdateQuality(): void;
     protected onTickEnd(): void;
+    protected onRooted(): void;
     protected onRootedAndAppend(): void;
     protected onLoadedOnIsland(): void;
     protected onActionBarItemSlottedMapUpdate(): void;
@@ -270,6 +175,5 @@ export default class ItemComponent extends Component implements ItemSlot {
     private lastActionIcon?;
     private refreshActionIcon;
     protected onHoldingNotMoving(time: number): void;
-    protected onMouseEnterOrLeave(): void;
 }
 export {};

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

@@ -82,8 +82,6 @@ export default class ContainerBucketItemList extends Component implements ISorta
     get container(): IContainer | undefined;
     isStacked(type?: ItemType): boolean;
     isStacked(item?: Item): boolean;
-    isFirstVisiblyStacked(item?: Item, excluding?: Item): boolean;
-    getStackedItemsThatAreVisible(type?: ItemType, excluding?: Item): Item[];
     getStackedItems(type?: ItemType, excluding?: Item): Item[];
     getStackIndex(type?: ItemType): number | undefined;
     constructor(container?: IContainer);

package/definitions/game/ui/screen/screens/game/component/item/IItemComponent.d.ts

@@ -0,0 +1,65 @@
+/*!
+ * 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
+ */
+export declare enum ItemDetailIconLocation {
+    TopLeft = 0,
+    BottomRight = 1
+}
+export declare enum ItemClasses {
+    Main = "item-component",
+    _InHeading = "item-component--in-heading",
+    Active = "active",// currently used for crafting & trading
+    Icon = "item-component-icon",
+    ItemIconIsReal = "item-component-icon-item-is-real",
+    ActionIcon = "item-component-icon-action",
+    ActionIconAnyItem = "item-component-icon-action-any-item",
+    ActionIconMissingItem = "item-component-icon-action-missing-item",
+    ActionIconHasItem = "item-component-icon-action-has-item",
+    ActionIconNone = "item-component-icon-action-none",
+    TargetIcon = "item-component-icon-target",
+    TargetIcon_Creature = "item-component-icon-target--creature",
+    TargetIcon_Doodad = "item-component-icon-target--doodad",
+    TargetIcon_Vehicle = "item-component-icon-target--vehicle",
+    TargetIcon_Plant = "item-component-icon-target--plant",
+    TargetIcon_NPC = "item-component-icon-target--npc",
+    TargetIcon_TileEvent = "item-component-icon-target--tile-event",
+    SlottedIcon = "item-component-icon-slotted",
+    Equipped = "item-component-equipped",
+    EquipIcon = "item-component-icon-equip",
+    EquipIconHasItem = "item-component-icon-equip-has-item",
+    MagicalIcon = "item-component-icon-magical",
+    ProtectedIcon = "item-component-icon-protected",
+    Trading = "item-component-trading",
+    TradingIcon = "item-component-icon-trading",
+    TradingIconFromMerchant = "item-component-icon-trading-from-merchant",
+    TradingIconToMerchant = "item-component-icon-trading-to-merchant",
+    Slot = "item-component-slot",
+    Dragging = "item-component-dragging",
+    DragPreview = "item-component-drag-preview",
+    DragPreview_Small = "item-component-drag-preview--small",
+    StatBar = "item-component-stat-bar",
+    StatBars = "item-component-stat-bars-wrapper",
+    DecayBar = "item-component-stat-bar-decay",
+    CooldownBar = "item-component-stat-bar-cooldown",
+    DurabilityBar = "item-component-stat-bar-durability",
+    NearlyDestroyed = "item-component-nearly-destroyed",
+    NearlyDecayed = "item-component-nearly-decayed",
+    Transient = "item-component-transient",
+    Highlight = "item-component-highlight",
+    Stack = "item-component-stack",
+    StackQuantity = "item-component-stack-quantity",
+    StackQuantityX = "item-component-stack-quantity-x",
+    StackQuantityDigit = "item-component-stack-quantity-digit",
+    Stacked = "item-component-stacked",
+    StackedVisible = "item-component-stacked-visible"
+}
+export declare namespace ItemClasses {
+    const IconLocation: (enumValue: ItemDetailIconLocation) => "item-component-icon-location-topleft" | "item-component-icon-location-bottomright";
+}

package/definitions/game/ui/screen/screens/game/component/item/ItemComponentEventBus.d.ts

@@ -0,0 +1,39 @@
+/*!
+ * 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
+ */
+import type { GlobalMouseInfo } from "@wayward/game/ui/input/InputManager";
+import { type ItemRefreshType } from "@wayward/game/ui/screen/screens/game/component/ItemComponent";
+import type ItemComponent from "@wayward/game/ui/screen/screens/game/component/ItemComponent";
+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";
+import EventEmitter from "@wayward/utilities/event/EventEmitter";
+interface IItemComponentEventBusEvents {
+    update(type: ItemRefreshType): any;
+    changeHovered(): any;
+}
+declare namespace _ {
+    class ItemComponentEventBus extends EventEmitter.Host<IItemComponentEventBusEvents> {
+        private readonly items;
+        private readonly itemsForTickEndEvents;
+        registerItem(component: ItemComponent): void;
+        registerForTickEndEvents(component: ItemComponent): void;
+        deregisterForTickEndEvents(component: ItemComponent): void;
+        protected onUpdate(type: ItemRefreshType): void;
+        protected onSlotUpdate(actionBar: ActionBar, slot: ActionSlot): void;
+        protected onTickEnd(): void;
+        protected onLoadedOnIsland(): void;
+        protected onActionBarItemSlottedMapUpdate(): void;
+        private hovered;
+        protected onUpdateTarget(mouse: GlobalMouseInfo): void;
+    }
+}
+type ItemComponentEventBus = _.ItemComponentEventBus;
+declare function ItemComponentEventBus(): ItemComponentEventBus;
+export default ItemComponentEventBus;

package/definitions/game/ui/screen/screens/game/component/item/ItemComponentHandler.d.ts

@@ -0,0 +1,46 @@
+/*!
+ * 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
+ */
+import type UsableAction from "@wayward/game/game/entity/action/usable/UsableAction";
+import type { EquipType } from "@wayward/game/game/entity/IHuman";
+import type { Quality } from "@wayward/game/game/IObject";
+import type { ItemTypeExtra, IContainer } from "@wayward/game/game/item/IItem";
+import { ItemType } from "@wayward/game/game/item/IItem";
+import type Item from "@wayward/game/game/item/Item";
+import type Bindable from "@wayward/game/ui/input/Bindable";
+import type { ActionSlot } from "@wayward/game/ui/screen/screens/game/static/actions/ActionSlot";
+import type Sortable from "@wayward/game/ui/util/Sortable";
+export interface IItemComponentHandlerDescription {
+    noDrag?: true;
+    equipSlot?: EquipType;
+    hasHighlight?: SupplierOr<boolean>;
+    getItem?(): Item | undefined;
+    getItemType?(): ItemType | ItemTypeExtra | undefined;
+    getItemQuality?(): ArrayOr<Quality> | undefined;
+    getAction?(): UsableAction | undefined;
+    getActionSlot?(): ActionSlot | undefined;
+    getBindables?(bindables: Bindable[]): Bindable[];
+    getSortable?(): Sortable;
+    getStackQuantity?(): number;
+    getContainer?(): IContainer | undefined;
+    getStackItems?(): readonly Item[];
+    getStackDisplayItem?(): Item | undefined;
+    getDisplayItem?(): Item | undefined;
+    getDurability?(): number;
+    getCooldown?(): number;
+    isDamaged?(): boolean;
+    isDecayed?(): boolean;
+}
+export interface ItemComponentHandler extends IItemComponentHandlerDescription {
+}
+export declare class ItemComponentHandler {
+    readonly isItemComponentHandler = true;
+    constructor(description?: IItemComponentHandlerDescription);
+}

package/definitions/game/ui/screen/screens/game/component/item/ItemComponentTradeManager.d.ts

@@ -0,0 +1,32 @@
+/*!
+ * 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
+ */
+import type Human from "@wayward/game/game/entity/Human";
+import type MerchantNPC from "@wayward/game/game/entity/npc/npcs/Merchant";
+import type Item from "@wayward/game/game/item/Item";
+import { ItemTradeType } from "@wayward/game/ui/screen/screens/game/component/ItemComponent";
+import WeakishSet from "@wayward/utilities/collection/set/WeakishSet";
+declare namespace _ {
+    class ItemComponentTradeManager {
+        private readonly tradingByItem;
+        private readonly tradingToMerchant;
+        private readonly tradingFromMerchant;
+        getTrading(merchant: MerchantNPC, type: ItemTradeType): WeakishSet<Item> | undefined;
+        getTradeType(item: Item): ItemTradeType | undefined;
+        isTrading(item: Item, merchant: MerchantNPC): boolean;
+        toggleTrading(items: Item[], merchant: MerchantNPC, trading: ItemTradeType): ItemTradeType;
+        private sendMerchantChatMessage;
+        clearTrading(merchant?: MerchantNPC): void;
+        onTrade(merchant: MerchantNPC, human: Human): void;
+    }
+}
+type ItemComponentTradeManager = _.ItemComponentTradeManager;
+declare function ItemComponentTradeManager(): ItemComponentTradeManager;
+export default ItemComponentTradeManager;

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

@@ -14,8 +14,8 @@ 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 Dialog from "@wayward/game/ui/screen/screens/game/component/Dialog";
-import type { IItemDropApi, IItemPickUpApi, ItemSlot } from "@wayward/game/ui/screen/screens/game/component/ItemComponent";
-import ItemComponent, { ItemRefreshType } from "@wayward/game/ui/screen/screens/game/component/ItemComponent";
+import { ItemRefreshType, type IItemDropApi, type IItemPickUpApi, type ItemSlot } from "@wayward/game/ui/screen/screens/game/component/ItemComponent";
+import ItemComponent from "@wayward/game/ui/screen/screens/game/component/ItemComponent";
 import EquipmentSlotTooltipHandler from "@wayward/game/ui/screen/screens/game/dialog/equipment/EquipmentSlotTooltip";
 import { MenuBarButtonType } from "@wayward/game/ui/screen/screens/game/static/menubar/IMenuBarButton";
 export declare enum EquipmentClasses {

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

@@ -25,8 +25,9 @@ import Component from "@wayward/game/ui/component/Component";
 import type { IRefreshable } from "@wayward/game/ui/component/Refreshable";
 import Text from "@wayward/game/ui/component/Text";
 import type { IBindHandlerApi } from "@wayward/game/ui/input/Bind";
-import type { IItemSlotEvents, ItemSlot } from "@wayward/game/ui/screen/screens/game/component/ItemComponent";
-import ItemComponent, { ItemComponentHandler } from "@wayward/game/ui/screen/screens/game/component/ItemComponent";
+import { type IItemSlotEvents, type ItemSlot } from "@wayward/game/ui/screen/screens/game/component/ItemComponent";
+import ItemComponent from "@wayward/game/ui/screen/screens/game/component/ItemComponent";
+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 type TooltipLocationHandler from "@wayward/game/ui/tooltip/TooltipLocationHandler";

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

@@ -22,8 +22,9 @@ import HorizontalLine from "@wayward/game/ui/component/HorizontalLine";
 import RangeChoiceList from "@wayward/game/ui/component/RangeChoiceList";
 import Text, { Heading, Paragraph } from "@wayward/game/ui/component/Text";
 import ItemDropdown from "@wayward/game/ui/component/dropdown/ItemDropdown";
-import type { IItemComponentHandlerDescription, IItemDropApi, IItemSlotEvents, ItemSlot } from "@wayward/game/ui/screen/screens/game/component/ItemComponent";
+import type { IItemDropApi, ItemSlot, IItemSlotEvents } from "@wayward/game/ui/screen/screens/game/component/ItemComponent";
 import ItemComponent from "@wayward/game/ui/screen/screens/game/component/ItemComponent";
+import type { IItemComponentHandlerDescription } from "@wayward/game/ui/screen/screens/game/component/item/ItemComponentHandler";
 import type { Events, IEventEmitter } from "@wayward/utilities/event/EventEmitter";
 export declare enum ActionSlotConfigurationColumnClasses {
     Main = "game-action-configuration-drawer-configuration-column",

package/definitions/game/utilities/string/Interpolator.d.ts

@@ -23,12 +23,13 @@ export interface IInterpolationOptions {
     formatDates?: boolean;
 }
 export type Ends = [start: string, end?: string, endAtStringEnd?: true];
-export interface ISegment {
+export interface ISegment<T = unknown> {
     ends?: Ends[];
     trimTrailingWhitespace?: true;
-    match?: RegExp;
-    handle(match: RegExpMatchArray, segment: string, api: ISegmentApi, ...args: any[]): string | IStringSection | Iterable<IStringSection>;
+    match?: RegExp | ((segment: string) => T | undefined);
+    handle(match: T, segment: string, api: ISegmentApi, ...args: any[]): string | IStringSection | Iterable<IStringSection>;
 }
+export type IRegexSegment = ISegment<RegExpExecArray>;
 export interface IStringSection {
     content: string | IStringSection[];
     classes?: Set<string>;
@@ -92,12 +93,42 @@ export default Interpolator;
  * - `"{test}" => args[0]["test"]`
  * - `"{3.test.4.wow}" => args[3]["test"][4]["wow"]`
  */
-export declare const argumentSegment: ISegment;
+export declare const argumentSegment: IRegexSegment;
 export type InterpolationConditionalSegmentOperator = InterpolationConditionalSegmentOperatorEquivalence | InterpolationConditionalSegmentOperatorNumeric;
 export type InterpolationConditionalSegmentOperatorEquivalence = "=" | "!=";
 export type InterpolationConditionalSegmentOperatorNumeric = "<" | ">" | "<=" | ">=";
-export declare const conditionalSegment: ISegment;
-export declare const falsyCoalescingSegment: ISegment;
+export type ConditionalSegmentCheck = string | {
+    variable: string;
+    operator: InterpolationConditionalSegmentOperator;
+    value: string;
+    variable2?: never;
+} | {
+    variable: string;
+    operator: InterpolationConditionalSegmentOperator;
+    variable2: string;
+    value?: never;
+};
+export interface IConditionalSegmentExpression {
+    checks: ConditionalSegmentCheck[];
+    operator: "&" | "|";
+    length: number;
+}
+/**
+ * Uses an argument to determine whether to show one of two segments. If the argument is truthy, returns
+ * any content in the segment after the `?` and before the `:`. If the argument is falsey, returns any
+ * content in the segment after the `:`. The colon is optional; if not provided, falsey = empty string.
+ *
+ * - `"{0?hi}"`
+ * 	- When given `[true]`, `=> "hi"`
+ * 	- When given `[false]`, `=> ""`
+ * 	- When given `[]`, `=> ""`
+ * - `"{test?hi:bye}"
+ * 	- When given `[{test: true}]`, `=> "hi"`
+ * 	- When given `[{test: false}]`, `=> "bye"`
+ * 	- When given `[]`, `=> "bye"`
+ */
+export declare const conditionalSegment: ISegment<IConditionalSegmentExpression>;
+export declare const falsyCoalescingSegment: IRegexSegment;
 export declare const classSegment: ISegment;
 export declare const basicInterpolator: Interpolator;
 export declare function interpolateSectioned(str: string, ...args: any[]): IStringSection[];

package/definitions/utilities/collection/map/IterableWeakMap.d.ts

@@ -0,0 +1,35 @@
+/*!
+ * 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
+ */
+/**
+ * Strong keys are stored in a Map.
+ * Weak keys are stored in a WeakMap.
+ * Based on https://github.com/tc39/proposal-weakrefs?tab=readme-ov-file#iterable-weakmaps
+ */
+export declare class IterableWeakMap<K, V> implements Iterable<[K, V]> {
+    #private;
+    constructor(iterable?: Iterable<[K, V]>);
+    /**
+     * This is more of an estimate since we might be waiting for some garbage collection to happen
+     */
+    get size(): number;
+    /**
+     * This will cause keys that are cleaned up via garbage collection to be logged
+     */
+    enableLogging(): IterableWeakMap<K, V>;
+    get(key: K): V | undefined;
+    set(key: K, value: V): this;
+    delete(key: K): boolean;
+    [Symbol.iterator](): Generator<[K, V]>;
+    entries(): IterableIterator<[K, V]>;
+    keys(): IterableIterator<K>;
+    values(): IterableIterator<V>;
+    private isWeakKey;
+}

package/definitions/utilities/event/EventEmitter.d.ts

@@ -8,6 +8,7 @@
  * 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 { IterableWeakMap } from "@wayward/utilities/collection/map/IterableWeakMap";
 import { PriorityMap } from "@wayward/utilities/collection/map/PriorityMap";
 export declare enum Priority {
     Lowest = -2000,
@@ -24,12 +25,16 @@ type Abstract<T> = Function & {
 };
 type Constructor<T> = new (...args: any[]) => T;
 type ClassOrAbstractClass<T> = Abstract<T> | Constructor<T>;
+export interface IEventSubscriberEvents {
+    releaseEventSubscriptions(): any;
+}
 export interface IEventEmitterHost<E> {
     event: IEventEmitter<this | null, E>;
 }
 export type IEventEmitterHostClass<E> = ClassOrAbstractClass<IEventEmitterHost<E>>;
 export type Events<T> = T extends IEventEmitterHost<infer E> ? E : T extends IEventEmitterHostClass<infer E> ? E : never;
-export type EventPriorityMap = PriorityMap<Map<string | Handler<any, any>, string | Handler<any, any>>>;
+export type EventPriorityMapKV = string | Handler<any, any>;
+export type EventPriorityMap = PriorityMap<Map<EventPriorityMapKV, EventPriorityMapKV> | IterableWeakMap<EventPriorityMapKV, EventPriorityMapKV>>;
 export interface ITrueEventEmitterHostClass<E> extends Class<any> {
     [SYMBOL_SUPERCLASSES]: Array<ITrueEventEmitterHostClass<E>>;
     [SYMBOL_SUBSCRIPTIONS]: Map<any, Map<keyof E, EventPriorityMap>>;
@@ -59,8 +64,14 @@ export interface IEventEmitter<H = any, E = any> {
     emitAsyncParallel<K extends keyof E>(event: K, ...args: ArgsOf<E[K]>): Promise<Array<(Extract<ReturnOf<E[K]>, Promise<any>> extends Promise<infer R> ? R : never) | Exclude<ReturnOf<E[K]>, Promise<any>>>> & {
         isResolved?: true;
     };
+    subscribe<K extends ArrayOr<keyof E>>(host: IEventEmitterHost<IEventSubscriberEvents>, event: K, handler: Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>, priority?: number, once?: boolean): H;
+    /** @deprecated */
     subscribe<K extends ArrayOr<keyof E>>(event: K, handler: Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>, priority?: number, once?: boolean): H;
+    subscribeUnsafe<K extends ArrayOr<keyof E>>(event: K, handler: Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>, priority?: number, once?: boolean): H;
+    subscribeNext<K extends ArrayOr<keyof E>>(host: IEventEmitterHost<IEventSubscriberEvents>, event: K, handler: Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>, priority?: number): H;
+    /** @deprecated */
     subscribeNext<K extends ArrayOr<keyof E>>(event: K, handler: Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>, priority?: number): H;
+    subscribeNextUnsafe<K extends ArrayOr<keyof E>>(event: K, handler: Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>, priority?: number): H;
     unsubscribe<K extends ArrayOr<keyof E>>(event: K, handler: Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>, priority?: number): boolean;
     waitFor<K extends ArrayOr<keyof E>>(events: K, priority?: number): Promise<ArgsOf<K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>>;
     race<K extends ArrayOr<keyof E>>(raceWith: Promise<any>, events: K, priority?: number): Promise<ArgsOf<K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>>;
@@ -72,8 +83,14 @@ export interface IEventEmitter<H = any, E = any> {
 export interface IUntilSubscriber<H, E> {
     until(promise: Promise<any>): this;
     until<E2>(emitter: IEventEmitterHost<E2>, ...events: Array<keyof E2>): this;
+    subscribe<K extends ArrayOr<keyof E>>(host: IEventEmitterHost<IEventSubscriberEvents>, event: K, handler: Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>, priority?: number): H;
+    /** @deprecated */
     subscribe<K extends ArrayOr<keyof E>>(event: K, handler: Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>, priority?: number): H;
+    subscribeUnsafe<K extends ArrayOr<keyof E>>(event: K, handler: Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>, priority?: number): H;
+    subscribeNext<K extends ArrayOr<keyof E>>(host: IEventEmitterHost<IEventSubscriberEvents>, event: K, handler: Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>, priority?: number): H;
+    /** @deprecated */
     subscribeNext<K extends ArrayOr<keyof E>>(event: K, handler: Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>, priority?: number): H;
+    subscribeNextUnsafe<K extends ArrayOr<keyof E>>(event: K, handler: Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>, priority?: number): H;
 }
 declare class EventEmitter<H, E> {
     private readonly host;
@@ -92,8 +109,15 @@ declare class EventEmitter<H, E> {
     emitReduce<K extends keyof E, A extends ReturnOf<E[K]> & Head<ArgsOf<E[K]>>>(event: K, arg: A, ...args: Tail<ArgsOf<E[K]>>): Extract<ReturnOf<E[K]> & Head<ArgsOf<E[K]>>, undefined> extends undefined ? (undefined extends A ? ReturnOf<E[K]> : A) : ReturnOf<E[K]>;
     emitAsync<K extends keyof E>(event: K, ...args: ArgsOf<E[K]>): Promise<any[]>;
     emitAsyncParallel<K extends keyof E>(event: K, ...args: ArgsOf<E[K]>): Promise<any[]>;
-    subscribe<K extends ArrayOr<keyof E>>(events: K, handler: keyof H | Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>, priority?: number, once?: boolean): H;
-    subscribeNext<K extends ArrayOr<keyof E>>(events: K, handler: keyof H | Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>, priority?: number): H;
+    subscribeUnsafe<K extends ArrayOr<keyof E>>(events: K, handler: Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>, priority?: number, once?: boolean): H;
+    subscribe<K extends ArrayOr<keyof E>>(host: IEventEmitterHost<IEventSubscriberEvents>, events: K, handler: Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>, priority?: number, once?: boolean): H;
+    /** @deprecated */
+    subscribe<K extends ArrayOr<keyof E>>(events: K, handler: Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>, priority?: number, once?: boolean): H;
+    private subscribeInternal;
+    subscribeNextUnsafe<K extends ArrayOr<keyof E>>(events: K, handler: Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>, priority?: number): H;
+    subscribeNext<K extends ArrayOr<keyof E>>(host: IEventEmitterHost<IEventSubscriberEvents>, events: K, handler: Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>, priority?: number): H;
+    /** @deprecated */
+    subscribeNext<K extends ArrayOr<keyof E>>(events: K, handler: Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>, priority?: number): H;
     unsubscribe<K extends ArrayOr<keyof E>>(events: K, handler: keyof H | Handler<H, K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>, priority?: number): boolean;
     waitFor<K extends ArrayOr<keyof E>>(events: K, priority?: number): Promise<ArgsOf<K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>>;
     race<K extends ArrayOr<keyof E>>(raceWith: number | Promise<any>, events: K, priority?: number): Promise<ArgsOf<K extends any[] ? E[K[number]] : E[Extract<K, keyof E>]>>;

package/definitions/utilities/event/EventManager.d.ts

@@ -10,7 +10,7 @@
  */
 import type { EventBusManager } from "@wayward/utilities/event/EventBusManager";
 import type EventEmitter from "@wayward/utilities/event/EventEmitter";
-import type { Events, IEventEmitterHost, IEventEmitterHostClass } from "@wayward/utilities/event/EventEmitter";
+import type { Events, IEventEmitterHost, IEventEmitterHostClass, IEventSubscriberEvents } from "@wayward/utilities/event/EventEmitter";
 type HostOrHostClass = IEventEmitterHost<any> | IEventEmitterHostClass<any>;
 type HostFromHostOrHostClass<H> = H extends {
     event: EventEmitter<null, any>;
@@ -55,7 +55,17 @@ export declare class EventManager<EventBus extends number, EventBuses extends Re
     waitFor<E extends EmitterOrBus<EventBus>, K extends Event<EventBus, EventBuses, E>>(emitter: E, event: K, priority?: number): Promise<Parameters<Handler<EventBus, EventBuses, E, K>>>;
     until<E2>(emitter: IEventEmitterHost<E2>, ...events: Array<keyof E2>): IEventManagerUntil<EventBus, EventBuses>;
     until(promise: Promise<any>): IEventManagerUntil<EventBus, EventBuses>;
+    registerEventBusSubscriber(subscriber: IEventEmitterHost<IEventSubscriberEvents>): void;
+    /**
+     * @deprecated This subscriber object will not be automatically cleaned up!
+     *
+     * If this is intentional, switch to {@link registerEventBusSubscriberUnsafe}.
+     *
+     *  Otherwise, this subscriber object needs to be an {@link IEventEmitterHost}<{@link IEventSubscriberEvents}> —
+     * the `"releaseEventSubscriptions"` call will automatically clean up this subscriber.
+     */
     registerEventBusSubscriber(subscriber: object): void;
+    registerEventBusSubscriberUnsafe(subscriber: object): void;
     deregisterEventBusSubscriber(subscriber: object): boolean;
 }
 declare const SYMBOL_EVENT_HANDLERS: unique symbol;

package/package.json

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