Don't rely on class load order, do this properly during the init phase (and tell addon devs when to do theirs)

2020-09-24 18:47:41 +01:00
parent b4e9d86d1d
commit c56128a7e2
2 changed files with 16 additions and 13 deletions
@@ -16,6 +16,7 @@ import electroblob.wizardry.packet.WizardryPacketHandler;
 import electroblob.wizardry.registry.*;
 import electroblob.wizardry.spell.Spell;
 import electroblob.wizardry.util.SpellProperties;
+import electroblob.wizardry.util.WandHelper;
 import electroblob.wizardry.worldgen.*;
 import net.minecraft.item.Item;
 import net.minecraft.util.SoundCategory;
@@ -171,6 +172,7 @@ public class Wizardry {
 		WizardryItems.populateArmourMap();
 		WizardryItems.registerDispenseBehaviours();
 		WizardryItems.registerBannerPatterns();
+		WandHelper.populateUpgradeMap();
 		Spell.registry.forEach(Spell::init);
 		SpellProperties.init();