diff options
Diffstat (limited to 'src/Java')
4 files changed, 65 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java index 0c62c68331..5d91ecc694 100644 --- a/src/Java/gtPlusPlus/GTplusplus.java +++ b/src/Java/gtPlusPlus/GTplusplus.java @@ -31,7 +31,7 @@ import cpw.mods.fml.common.event.*; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -@Mod(modid=CORE.MODID, name=CORE.name, version=CORE.VERSION, dependencies="required-after:Forge; required-after:PlayerAPI; after:IC2; after:ihl; after:psychedelicraft; after:gregtech; after:Forestry; after:MagicBees; after:CoFHCore; after:Growthcraft; after:Railcraft; after:CompactWindmills; after:ForbiddenMagic; after:MorePlanet; after:PneumaticCraft; after:ExtraUtilities; after:Thaumcraft; after:rftools; after:simplyjetpacks; after:BigReactors; after:EnderIO;") +@Mod(modid=CORE.MODID, name=CORE.name, version=CORE.VERSION, dependencies="required-after:Forge; after:PlayerAPI; after:IC2; after:ihl; after:psychedelicraft; after:gregtech; after:Forestry; after:MagicBees; after:CoFHCore; after:Growthcraft; after:Railcraft; after:CompactWindmills; after:ForbiddenMagic; after:MorePlanet; after:PneumaticCraft; after:ExtraUtilities; after:Thaumcraft; after:rftools; after:simplyjetpacks; after:BigReactors; after:EnderIO;") public class GTplusplus implements ActionListener { diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java index ae5dea04cd..c365a19231 100644 --- a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java +++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java @@ -15,17 +15,19 @@ public class COMPAT_Baubles { baublesNotLoaded(); } } - + public static void baublesLoaded(){ Utils.LOG_INFO("Baubles Found - Loading Wearables."); ModItems.itemPersonalCloakingDevice = new ItemCloakingDevice(0); //itemPersonalCloakingDeviceCharged = new ItemCloakingDevice(0).set; ModItems.itemPersonalHealingDevice = new ItemHealingDevice(); - ModItems.itemSlowBuildingRing = new ItemSlowBuildingRing(); + if (LoadedMods.PlayerAPI){ + ModItems.itemSlowBuildingRing = new ItemSlowBuildingRing(); + } } - + public static void baublesNotLoaded(){ Utils.LOG_INFO("Baubles Not Found - Skipping Resources."); } - + } diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_PlayerAPI.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_PlayerAPI.java new file mode 100644 index 0000000000..f09b91c275 --- /dev/null +++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_PlayerAPI.java @@ -0,0 +1,52 @@ +package gtPlusPlus.core.common.compat; + +import api.player.client.ClientPlayerAPI; +import gtPlusPlus.core.common.BasePlayer; +import gtPlusPlus.core.handler.events.SneakManager; +import net.minecraftforge.common.MinecraftForge; + +public class COMPAT_PlayerAPI { + + public static class commonProxy{ + public static void initPre(){ + + } + + public static void Init(){ + + } + + public static void initPost(){ + + } + } + + public static class clientProxy{ + public static void initPre(){ + MinecraftForge.EVENT_BUS.register(SneakManager.instance); + } + + public static void Init(){ + ClientPlayerAPI.register("SneakManager", BasePlayer.class); + } + + public static void initPost(){ + + } + } + + public static class serverProxy{ + public static void initPre(){ + + } + + public static void Init(){ + + } + + public static void initPost(){ + + } + } + +} diff --git a/src/Java/gtPlusPlus/core/lib/LoadedMods.java b/src/Java/gtPlusPlus/core/lib/LoadedMods.java index 9e07f48bf3..e947137ccd 100644 --- a/src/Java/gtPlusPlus/core/lib/LoadedMods.java +++ b/src/Java/gtPlusPlus/core/lib/LoadedMods.java @@ -11,6 +11,7 @@ public class LoadedMods { //Initialize Variables public static boolean Gregtech = false; + public static boolean PlayerAPI = false; public static boolean BuildCraft = false; public static boolean EnderIO = false; public static boolean Big_Reactors = false; @@ -61,6 +62,11 @@ public class LoadedMods { totalMods++; } + if (Loader.isModLoaded("PlayerAPI") == true){ + PlayerAPI = true; + Utils.LOG_INFO("Components enabled for: PlayerAPI"); + totalMods++; + } if (Loader.isModLoaded("BuildCraft") == true){ BuildCraft = true; Utils.LOG_INFO("Components enabled for: BuildCraft"); |