lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Ritual Registry crashing with more than one registered..

Browse source
This commit is contained in:
Nick 2015-11-03 07:35:14 -08:00
parent ed515f5c80
commit 68fae8c321
3 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java
View file

@ -5,13 +5,14 @@ import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import net.minecraft.block.Block;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
public class ImperfectRitualRegistry {
public static final BiMap<ImperfectRitual, Boolean> enabledRituals = HashBiMap.create();
public static final Map<ImperfectRitual, Boolean> enabledRituals = new HashMap<ImperfectRitual, Boolean>();
private static final BiMap<String, ImperfectRitual> registry = HashBiMap.create();
/**
@ -29,6 +30,10 @@ public class ImperfectRitualRegistry {
}
}
public static void registerRitual(ImperfectRitual imperfectRitual) {
registerRitual(imperfectRitual, imperfectRitual.getName());
}
public static ImperfectRitual getRitualForBlock(BlockStack blockStack) {
for (ImperfectRitual imperfectRitual : getRegistry().values())
if (imperfectRitual.getRequiredBlock().equals(blockStack))

9
src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java
View file

@ -2,14 +2,15 @@ package WayofTime.bloodmagic.api.registry;
import WayofTime.bloodmagic.api.BloodMagicAPI;
import WayofTime.bloodmagic.api.ritual.Ritual;
import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
public class RitualRegistry {
public static final BiMap<Ritual, Boolean> enabledRituals = HashBiMap.create();
public static final Map<Ritual, Boolean> enabledRituals = new HashMap<Ritual, Boolean>();
private static final BiMap<String, Ritual> registry = HashBiMap.create();
/**
@ -56,8 +57,8 @@ public class RitualRegistry {
return HashBiMap.create(registry);
}
public static BiMap<Ritual, Boolean> getEnabledMap() {
return HashBiMap.create(enabledRituals);
public static Map<Ritual, Boolean> getEnabledMap() {
return new HashMap<Ritual, Boolean>(enabledRituals);
}
public static ArrayList<String> getIds() {