Fix all remaining 1.5.2 Forge-only patching issues. Next, MCPC+.

Signed-off-by: Ross Allan <rallanpcl@gmail.com>