JM's Vanilla Flavored Matcha

Makes JM's Fixes compatable with the Matcha Flavored datapack. Place this above JM's Fixes.

General Changes:

• Many names reverted to vanilla
• Iron blocks and items match the color of chains
• All tools and armor match JM's Fixes