fix: Remove obsidian-overload package

index.ts

@@ -1,56 +1,7 @@
 import "obsidian";
-import type { Spell, Trait, ability } from "obsidian-overload";
 import type { API } from "src/api/api";
 import type { Filter, FilterLayout } from "src/builder/stores/filter/filter";
 
-// CUSTOM EVENTS
-// ------------------------
-// Convert tuple to arguments of Event.on
-type OnArgs<T> = T extends [infer A, ...infer B]
- ? A extends string
- ? [name: A, callback: (...args: B) => any]
- : never
- : never;
-export type TrackerEvents =
- | [name: "initiative-tracker:state-change", state: TrackerViewState]
- | [name: "initiative-tracker:players-updated", pcs: Creature[]]
- | [name: "initiative-tracker:creatures-added", npcs: Creature[]]
- | [
- name: "initiative-tracker:creature-added-at-location",
- creature: Creature,
- latlng: any
- ]
- | [name: "initiative-tracker:add-creature-here", latlng: any]
- | [name: "initiative-tracker:creature-updated", creature: Creature]
- | [
- name: "initiative-tracker:creature-updated-in-settings",
- creature: Creature
- ]
- | [name: "initiative-tracker:creatures-removed", npcs: Creature[]]
- | [name: "initiative-tracker:new-encounter", state: TrackerViewState]
- | [name: "initiative-tracker:reset-encounter", state: TrackerViewState]
- | [name: "initiative-tracker:active-change", creature: Creature]
- | [name: "initiative-tracker:unload"]
- | [name: "initiative-tracker:apply-damage", creature: Creature]
- | [name: "initiative-tracker:add-status", creature: Creature]
- | [
- name: "initiative-tracker:enable-disable",
- creature: Creature,
- enable: boolean
- ]
- | [name: "initiative-tracker:remove", creature: Creature]
- | [name: "initiative-tracker:closed"]
- | [name: "initiative-tracker:should-save"]
- | [name: "initiative-tracker:save-state", state?: InitiativeViewState]
- /** This event can be used to start an event by sending an object with a name, HP, AC, and initiative modifier at minimum. */
- | [
- name: "initiative-tracker:start-encounter",
- creatures: HomebrewCreature[]
- ]
- | [name: "initiative-tracker:stop-viewing", creatures: HomebrewCreature[]];
-
-export type EventsOnArgs = OnArgs<TrackerEvents>;
-
 export interface TrackerViewState {
  state: boolean;
  npcs: HomebrewCreature[];
@@ -178,7 +129,6 @@ export interface SRDMonster {
  hit_dice?: string;
  speed: string;
  stats: [number, number, number, number, number, number];
- saves?: { [K in ability]?: number }[];
  skillsaves?: { [key: string]: number }[];
  damage_vulnerabilities: string;
  damage_resistances: string;
@@ -187,11 +137,6 @@ export interface SRDMonster {
  senses: string;
  languages: string;
  cr: string | number;
- traits?: Trait[];
- spells?: Spell[];
- actions?: Trait[];
- legendary_actions?: Trait[];
- reactions?: Trait[];
  monster?: string;
  source?: string | string[];
  friendly?: boolean;
@@ -308,4 +253,4 @@ declare global {
  interface Window {
  InitiativeTracker?: API;
  }
-}
+}

package.json

@@ -26,6 +26,7 @@
  "@codemirror/lang-javascript": "^6.2.1",
  "@codemirror/language": "^6.9.1",
  "@codemirror/search": "^6.5.3",
+ "@javalent/dice-roller": "^10.5.7",
  "@popperjs/core": "^2.11.8",
  "@tsconfig/svelte": "^5.0.2",
  "@types/jest": "^29.5.5",
@@ -39,7 +40,6 @@
  "fast-copy": "^3.0.1",
  "jest": "^29.7.0",
  "obsidian": "^1.4.11",
- "obsidian-overload": "^1.156.1",
  "obsidian-utilities": "^1.1.3",
  "standard-version": "^9.5.0",
  "svelte": "^4.2.1",

src/api/api.ts

@@ -1,7 +1,6 @@
-import type { HomebrewCreature } from "obsidian-overload";
 import type InitiativeTracker from "../main";
 import { tracker } from "../tracker/stores/tracker";
-import { type InitiativeViewState } from "../..";
+import { type HomebrewCreature, type InitiativeViewState } from "../..";
 import { Creature } from "src/utils/creature";
 
 export class API {

src/builder/view.ts

@@ -1,11 +1,11 @@
 import { ItemView, type ViewStateResult, WorkspaceLeaf } from "obsidian";
 import type InitiativeTracker from "src/main";
-import { BUILDER_VIEW, buildLoader } from "../utils";
+import { BUILDER_VIEW } from "../utils";
 
 import Builder from "./view/Builder.svelte";
 import { encounter } from "./stores/encounter";
 import { get } from "svelte/store";
-import type { SRDMonster } from "obsidian-overload";
+import type { SRDMonster } from "index";
 
 interface BuilderContext {
  plugin: InitiativeTracker;

src/builder/view/creatures/Creatures.svelte

@@ -12,7 +12,7 @@
  import type InitiativeTracker from "src/main";
  import Ajv from "ajv";
  import schema from "../../stores/filter/filter-schema.json";
- import type { BuilderState } from "obsidian-overload";
+ import type { BuilderState } from "index";
 
  const table = getContext<BuiltTableStore>("table");
  const { sortDir, allHeaders } = table;

src/builder/view/encounter/Encounter.svelte

@@ -15,9 +15,8 @@
  import { START_ENCOUNTER } from "src/utils";
  import { getContext } from "svelte";
  import { tracker } from "src/tracker/stores/tracker";
- import type { CreatureState } from "index";
+ import type { CreatureState, SRDMonster } from "index";
  import { writable } from "svelte/store";
- import type { SRDMonster } from "obsidian-overload";
 
  const { players } = encounter;
 

src/encounter/ui/Encounter.svelte

@@ -4,11 +4,11 @@
 
  import { Creature } from "src/utils/creature";
  import type InitiativeTracker from "src/main";
- import type { StackRoller } from "../../../../obsidian-dice-roller/src/roller";
  import { tracker } from "src/tracker/stores/tracker";
  import type { CreatureState } from "index";
  import CreatureComponent from "./Creature.svelte";
  import { setContext } from "svelte";
+ import type { StackRoller } from "@javalent/dice-roller";
 
  export let plugin: InitiativeTracker;
 

src/encounter/ui/EncounterLine.svelte

@@ -5,8 +5,7 @@
  import { tracker } from "src/tracker/stores/tracker";
  import { START_ENCOUNTER } from "src/utils";
  import { Creature } from "src/utils/creature";
-
- import type { StackRoller } from "../../../../obsidian-dice-roller/src/roller";
+ import type { StackRoller } from "@javalent/dice-roller";
  import { setContext } from "svelte";
 
  export let creatures: Map<Creature, number | string>;