Merging main repo undid a lot of my changes so this PR reimplements them. Fixes build and playthrough. Has been tested.Reviewed-on: #29 Co-authored-by: qloak <realminecart@gmail.com>