diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2016-11-30 14:34:21 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-11-30 14:34:21 +1000 |
| commit | 23a4f93b904098bde55de92244beb3ba71aae036 (patch) | |
| tree | 8754fc7c6bd4a4c0816a1a2052fc5f6077a388af /src/Java/gtPlusPlus/xmod | |
| parent | 3369fc3ca7553eaaff688f5de5399464d8a0d8d7 (diff) | |
| download | GT5-Unofficial-23a4f93b904098bde55de92244beb3ba71aae036.tar.gz GT5-Unofficial-23a4f93b904098bde55de92244beb3ba71aae036.tar.bz2 GT5-Unofficial-23a4f93b904098bde55de92244beb3ba71aae036.zip | |
% Changed Forestry handling for Optional annotations.
> Shouldn't crash now if Forestry does not exist.
Should fix #44.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod')
3 files changed, 8 insertions, 7 deletions
diff --git a/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java b/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java index 89020edcf9..cc2e77c448 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java +++ b/src/Java/gtPlusPlus/xmod/forestry/HANDLER_FR.java @@ -5,28 +5,25 @@ import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.xmod.forestry.bees.alveary.AlvearyHandler; import gtPlusPlus.xmod.forestry.bees.items.FR_ItemRegistry; import gtPlusPlus.xmod.forestry.bees.recipe.FR_Gregtech_Recipes; -import cpw.mods.fml.common.Optional; public class HANDLER_FR { - @Optional.Method(modid = "Forestry") + public static void preInit(){ if (LoadedMods.Forestry){ FR_ItemRegistry.Register(); if (CORE.configSwitches.enableCustomAlvearyBlocks){ AlvearyHandler.run(); } - //FR_BlockRegistryApiculture.RegistryApiculture(); } } - @Optional.Method(modid = "Forestry") + public static void Init(){ if (LoadedMods.Forestry){ - //FR_TileHandler.init(); - //new FR_GuiIDRegistry(); + } } - @Optional.Method(modid = "Forestry") + public static void postInit(){ if (LoadedMods.Forestry){ FR_Gregtech_Recipes.registerItems(); diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyHandler.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyHandler.java index 18fed57968..fd18f069cf 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyHandler.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/AlvearyHandler.java @@ -6,10 +6,12 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; +import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; public class AlvearyHandler { + @Optional.Method(modid = "Forestry") public static void run(){ if (!LoadedMods.ExtraBees){ if (CORE.configSwitches.enableCustomAlvearyBlocks){//Alveary Stuff diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java index b2de1f0ce4..a4d842edad 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java @@ -14,6 +14,7 @@ import gtPlusPlus.core.lib.LoadedMods; import net.minecraft.item.*; import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.common.ChestGenHooks; +import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; public class FR_ItemRegistry { @@ -38,6 +39,7 @@ public class FR_ItemRegistry { public static MB_ItemFrame hiveFrameNova; + @Optional.Method(modid = "Forestry") public static void Register() { //Forestry Frames |