diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java index 98552106..f90e145d 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/registry/ImperfectRitualRegistry.java @@ -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 enabledRituals = HashBiMap.create(); + public static final Map enabledRituals = new HashMap(); private static final BiMap 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)) diff --git a/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java b/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java index cff5bac0..67aaaaa9 100644 --- a/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java +++ b/src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java @@ -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 enabledRituals = HashBiMap.create(); + public static final Map enabledRituals = new HashMap(); private static final BiMap registry = HashBiMap.create(); /** @@ -56,8 +57,8 @@ public class RitualRegistry { return HashBiMap.create(registry); } - public static BiMap getEnabledMap() { - return HashBiMap.create(enabledRituals); + public static Map getEnabledMap() { + return new HashMap(enabledRituals); } public static ArrayList getIds() { diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java index c00c6026..48423394 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java +++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/RitualHelper.java @@ -4,12 +4,12 @@ import WayofTime.bloodmagic.api.registry.ImperfectRitualRegistry; import WayofTime.bloodmagic.api.registry.RitualRegistry; import WayofTime.bloodmagic.api.ritual.Ritual; import WayofTime.bloodmagic.api.ritual.imperfect.ImperfectRitual; -import com.google.common.collect.BiMap; import net.minecraftforge.common.config.Configuration; import sun.misc.Launcher; import java.io.File; import java.net.URL; +import java.util.Map; public class RitualHelper { @@ -55,7 +55,7 @@ public class RitualHelper { * @param category - The config category to write to. */ @SuppressWarnings("unchecked") - private static void checkRituals(Configuration config, String packageName, String category, Class ritualClass, BiMap enabledMap) { + private static void checkRituals(Configuration config, String packageName, String category, Class ritualClass, Map enabledMap) { String name = packageName; if (!name.startsWith("/")) name = "/" + name; @@ -75,8 +75,7 @@ public class RitualHelper { Object o = Class.forName(packageName + "." + className).newInstance(); if (ritualClass.isInstance(o)) - enabledMap.put(ritualClass.cast(o), - config.get(category, className, true).getBoolean()); + enabledMap.put(ritualClass.cast(o), config.get(category, className, true).getBoolean()); } catch (ClassNotFoundException e) { e.printStackTrace();