Update for 2.14.0-beta.dev.20240915.1

Author: Spacetech

package-lock.json

@@ -10,8 +10,8 @@
 		"watch": "npx tsc --build --watch --pretty --preserveWatchOutput"
 	},
 	"devDependencies": {
-		"@wayward/types": "^2.14.0-beta.dev.20240914.1",
+		"@wayward/types": "^2.14.0-beta.dev.20240915.1",
 		"rimraf": "3.0.2",
-		"typescript": "^5.6.1-rc"
+		"typescript": "^5.6.2"
 	}
 }

package.json

@@ -1,4 +1,3 @@
-import Stream from "@wayward/goodstream/Stream";
 import Tile from "@wayward/game/game/tile/Tile";
 import Mod from "@wayward/game/mod/Mod";
 import { Tuple } from "@wayward/utilities/collection/Tuple";
@@ -9,6 +8,7 @@ import Vector3 from "@wayward/game/utilities/math/Vector3";
 import DebugTools from "../DebugTools";
 import { DEBUG_TOOLS_ID } from "../IDebugTools";
 import { IOverlayInfo } from "@wayward/game/game/tile/ITerrain";
+import Objects from "@wayward/utilities/object/Objects";
 
 export default class SelectionOverlay {
 
@@ -131,9 +131,8 @@ export default class SelectionOverlay {
 	 * Returns an array of neighbor positions that are painted/selected
 	 */
 	private static getPaintOverlayConnections(neighbors: INeighborTiles): NeighborPosition[] {
-		return Stream.keys(neighbors)
-			.filter(neighborPosition => this.overlays.has(neighbors[neighborPosition]))
-			.toArray();
+		return Objects.keys(neighbors)
+			.filter(neighborPosition => this.overlays.has(neighbors[neighborPosition]));
 	}
 
 }

src/overlay/SelectionOverlay.ts

@@ -94,11 +94,10 @@ export default class DebugToolsDialog extends TabDialog<DebugToolsPanel> {
 	 * This will only be called once
 	 */
 	protected override getSubpanels(): DebugToolsPanel[] {
-		return subpanelClasses.stream()
-			.merge(this.DEBUG_TOOLS.modRegistryMainDialogPanels.getRegistrations()
+		return subpanelClasses
+			.concat(this.DEBUG_TOOLS.modRegistryMainDialogPanels.getRegistrations()
 				.map(registration => registration.data(DebugToolsPanel)))
-			.map(cls => new cls())
-			.toArray();
+			.map(cls => new cls());
 	}
 
 	/**

src/ui/DebugToolsDialog.ts

@@ -101,12 +101,11 @@ export default class InspectDialog extends TabDialog<InspectInformationSection>
 	 * This will only be called once
 	 */
 	protected override getSubpanels(): InspectInformationSection[] {
-		const subpanels = informationSectionClasses.stream()
-			.merge(this.DEBUG_TOOLS.modRegistryInspectDialogPanels.getRegistrations()
+		const subpanels = informationSectionClasses
+			.concat(this.DEBUG_TOOLS.modRegistryInspectDialogPanels.getRegistrations()
 				.map(registration => registration.data(InspectInformationSection)))
 			.map(cls => new cls()
-				.event.subscribe("update", this.update))
-			.toArray();
+				.event.subscribe("update", this.update));
 
 		// we're going to need the entity information section for some other stuff
 		this.entityInfoSection = subpanels
@@ -126,13 +125,13 @@ export default class InspectDialog extends TabDialog<InspectInformationSection>
 	protected override getSubpanelInformation(subpanels: InspectInformationSection[]): SubpanelInformation[] {
 		this.entityButtons = [];
 
-		return this.subpanels.stream()
+		return this.subpanels
 			// add the tabs of the section to the tuple
 			.map(section => Tuple(section, section.getTabs()))
 			// if there are no tabs from the section, remove it
 			.filter(([, tabs]) => !!tabs.length)
 			// map each of the section/tab tuples with an array of tuples representing all the subpanels (tabs) provided by that section
-			.map(([section, tabs]) => tabs
+			.flatMap(([section, tabs]) => tabs
 				// map each tab to the subpanel information for it
 				.map(([index, getTabTranslation]) => Tuple(
 					Text.toString(getTabTranslation),
@@ -142,11 +141,7 @@ export default class InspectDialog extends TabDialog<InspectInformationSection>
 						.schedule(section => this.onShowSubpanel(section)(component)),
 					// we cache all of the entity buttons
 					(button: Button) => !(section instanceof EntityInformation) ? undefined : this.entityButtons[index] = button,
-				)))
-			// currently we have an array of `SubpanelInformation` arrays, because each tab provided an array of them, fix with `flat`
-			.flatMap<SubpanelInformation>()
-			// and now return an array
-			.toArray();
+				)));
 	}
 
 	public override getName(): Translation {

src/ui/InspectDialog.ts

@@ -36,7 +36,7 @@ export default class CorpseInformation extends InspectInformationSection {
 	}
 
 	public override getTabs(): TabInformation[] {
-		return this.corpses.entries().stream()
+		return this.corpses.entries()
 			.map(([i, corpse]) => Tuple(i, () => translation(DebugToolsTranslation.CorpseName)
 				.get(localIsland.corpses.getName(corpse, Article.None).inContext(TextContext.Title))))
 			.toArray();

src/ui/inspect/CorpseInformation.ts

@@ -108,12 +108,11 @@ export default class EntityInformation extends InspectInformationSection {
 		this.DEBUG_TOOLS.creatureZoneOverlay.event.until(this, "remove")
 			.subscribe("changeMode", () => this.highlightZone.refresh(false));
 
-		this.subsections = entitySubsectionClasses.stream()
-			.merge(this.DEBUG_TOOLS.modRegistryInspectDialogEntityInformationSubsections.getRegistrations()
+		this.subsections = entitySubsectionClasses
+			.concat(this.DEBUG_TOOLS.modRegistryInspectDialogEntityInformationSubsections.getRegistrations()
 				.map(registration => registration.data(InspectEntityInformationSubsection)))
 			.map(cls => new cls()
-				.appendTo(this))
-			.toArray();
+				.appendTo(this));
 
 		this.statWrapper = new Component()
 			.classes.add("debug-tools-inspect-entity-sub-section")
@@ -135,7 +134,7 @@ export default class EntityInformation extends InspectInformationSection {
 	}
 
 	public override getTabs(): [number, () => IStringSection[]][] {
-		return this.entities.entries().stream()
+		return this.entities.entries()
 			.map(([i, entity]) => Tuple(i, () => translation(DebugToolsTranslation.EntityName)
 				.get(EntityType[entity.entityType], entity.getName()/*.inContext(TextContext.Title)*/)))
 			.toArray();
@@ -314,14 +313,13 @@ export default class EntityInformation extends InspectInformationSection {
 
 	@Bound
 	private createTeleportToPlayerMenu(): ContextMenu<string | number | symbol> {
-		return game.playerManager.getAll(true, true).stream()
+		return game.playerManager.getAll(true, true)
 			.filter(player => player !== this.entity)
 			.map(player => Tuple(player.name, {
 				translation: TranslationImpl.generator(player.name),
 				onActivate: () => this.teleport(player.tile),
 			}))
 			.sort(([, t1], [, t2]) => Text.toString(t1.translation).localeCompare(Text.toString(t2.translation)))
-			// create the context menu from them
 			.collect<ContextMenu>(options => new ContextMenu(...options))
 			.addAllDescribedOptions();
 	}

src/ui/inspect/EntityInformation.ts

@@ -33,7 +33,7 @@ export default class TileEventInformation extends InspectInformationSection {
 	}
 
 	public override getTabs(): TabInformation[] {
-		return this.tileEvents.entries().stream()
+		return this.tileEvents.entries()
 			.map(([i, tileEvent]) => Tuple(i, () => translation(DebugToolsTranslation.TileEventName)
 				.get(Translation.nameOf(Dictionary.TileEvent, tileEvent, Article.None).inContext(TextContext.Title))))
 			.toArray();

src/ui/inspect/TileEventInformation.ts

@@ -22,9 +22,8 @@ import { Bound } from "@wayward/utilities/Decorators";
 import { Tuple } from "@wayward/utilities/collection/Tuple";
 import { Priority } from "@wayward/utilities/event/EventEmitter";
 import { OwnEventHandler } from "@wayward/utilities/event/EventManager";
-
 import Tile from "@wayward/game/game/tile/Tile";
-import Stream from "@wayward/goodstream/Stream";
+
 import DebugTools from "../../DebugTools";
 import { DEBUG_TOOLS_ID, DebugToolsTranslation, translation } from "../../IDebugTools";
 import PlaceTemplate from "../../action/PlaceTemplate";
@@ -72,8 +71,8 @@ export default class TemplatePanel extends DebugToolsPanel {
 			.setLabel(label => label.setText(translation(DebugToolsTranslation.LabelTemplate)))
 			.append(this.dropdownTemplate = new Dropdown<string>()
 				.setRefreshMethod(() => ({
-					defaultOption: Stream.keys<string>(terrainTemplates[this.dropdownType.selectedOption]!).first()!,
-					options: Stream.keys<string>(terrainTemplates[this.dropdownType.selectedOption]!)
+					defaultOption: Object.keys(terrainTemplates[this.dropdownType.selectedOption]!).at(0)!,
+					options: Object.keys(terrainTemplates[this.dropdownType.selectedOption]!)
 						.map(name => Tuple(name, TranslationImpl.generator(name)))
 						.sort(([, t1], [, t2]) => Text.toString(t1).localeCompare(Text.toString(t2)))
 						.map(([id, t]) => Tuple(id, (option: Button) => option.setText(t))),