From 07942d4218129fd0d4ef58494f33e60be104c450 Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Fri, 24 Apr 2015 21:45:04 -0700 Subject: [PATCH] Adding a reference to the Tempus thaumcraft aspect in the API. Closes #44 --- src/main/java/magicbees/api/MagicBeesAPI.java | 4 ++++ .../magicbees/main/utils/compat/ThaumcraftHelper.java | 11 ++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/magicbees/api/MagicBeesAPI.java b/src/main/java/magicbees/api/MagicBeesAPI.java index 1c8087e..44473e4 100644 --- a/src/main/java/magicbees/api/MagicBeesAPI.java +++ b/src/main/java/magicbees/api/MagicBeesAPI.java @@ -6,4 +6,8 @@ public class MagicBeesAPI { // Use this object during or after the Mod.Init phase to add your logic to the Transmutation bee effect. public static ITransmutationEffectController transmutationEffectController; + + // This is a reference to the Tempus aspect. Initialized after MagicBees's post init phase. + // Ensure it is not null, and cast it to thaumcraft.api.aspects.Aspect. + public static Object thaumcraftAspectTempus; } diff --git a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java index 024d54a..7bdd398 100644 --- a/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java +++ b/src/main/java/magicbees/main/utils/compat/ThaumcraftHelper.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; +import magicbees.api.MagicBeesAPI; import magicbees.item.types.PollenType; import magicbees.item.types.PropolisType; import magicbees.item.types.ResourceType; @@ -155,6 +156,11 @@ public class ThaumcraftHelper { public static void preInit() { if (Loader.isModLoaded(Name) && Config.thaumcraftActive) { isThaumcraftPresent = true; + aspectTime = new Aspect("tempus", 0xB68CFF, new Aspect[] { + Aspect.VOID, Aspect.ORDER }, new ResourceLocation( + CommonProxy.DOMAIN, CommonProxy.TEXTURE + + "aspects/tempus.png"), 1); + MagicBeesAPI.thaumcraftAspectTempus = aspectTime; } else { // Switch off TC-dependant items. ResourceType.LORE_FRAGMENT.setHidden(); @@ -176,11 +182,6 @@ public class ThaumcraftHelper { public static void postInit() { if (isActive()) { - aspectTime = new Aspect("tempus", 0xB68CFF, new Aspect[] { - Aspect.VOID, Aspect.ORDER }, new ResourceLocation( - CommonProxy.DOMAIN, CommonProxy.TEXTURE - + "aspects/tempus.png"), 1); - setupItemAspects(); setupCrafting(); setupResearch();