Post-merge fixups

In particular, act as if a spellbook has been discovered during tooltip
generation if player is null. This allows JEI to index all the spell
names.
This commit is contained in:
Philipp Rustemeier
2018-03-16 17:40:50 +01:00
parent 873b5a4f4d
commit ea11910af2
9 changed files with 25 additions and 26 deletions
@@ -1,11 +1,5 @@
package electroblob.wizardry.spell;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.constants.Element;
import electroblob.wizardry.constants.SpellType;
@@ -30,6 +24,12 @@ import net.minecraftforge.registries.ForgeRegistry;
import net.minecraftforge.registries.IForgeRegistry;
import net.minecraftforge.registries.IForgeRegistryEntry;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.function.Predicate;
import java.util.stream.Collectors;
/**
* Generic spell class which is the superclass to all spells in wizardry. When extending this class, you must do the
* following: