FORGE-988: AddonManager refactoring

Furnace also needs merging