From 319682ae2b3170a74704577aa45977b727ac1d19 Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Mon, 20 Apr 2015 23:24:20 -0700 Subject: [PATCH] Cleaning up crashy statements that rely on API classes being present. --- .../main/utils/compat/BloodMagicHelper.java | 8 ++- .../main/utils/compat/BotaniaHelper.java | 44 +------------- .../botania/BotaniaAPIDistanceHelper.java | 60 +++++++++++++++++++ .../utils/compat/botania/LexiconEntries.java | 9 --- 4 files changed, 68 insertions(+), 53 deletions(-) create mode 100644 src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java delete mode 100644 src/main/java/magicbees/main/utils/compat/botania/LexiconEntries.java diff --git a/src/main/java/magicbees/main/utils/compat/BloodMagicHelper.java b/src/main/java/magicbees/main/utils/compat/BloodMagicHelper.java index 8d8bbd5..16daee9 100644 --- a/src/main/java/magicbees/main/utils/compat/BloodMagicHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BloodMagicHelper.java @@ -40,9 +40,11 @@ public class BloodMagicHelper public static void postInit() { - BloodMagicHelper.addAltarRecipeBee(BeeSpecies.MYSTICAL, BeeSpecies.BM_BLOODY, 1, 1000, 100, 100); - - BloodMagicHelper.addBindingRecipeBee(BeeSpecies.BM_BLOODY, BeeSpecies.BM_BOUND); + if (isActive()) { + BloodMagicHelper.addAltarRecipeBee(BeeSpecies.MYSTICAL, BeeSpecies.BM_BLOODY, 1, 1000, 100, 100); + + BloodMagicHelper.addBindingRecipeBee(BeeSpecies.BM_BLOODY, BeeSpecies.BM_BOUND); + } } public static void getBlocks() diff --git a/src/main/java/magicbees/main/utils/compat/BotaniaHelper.java b/src/main/java/magicbees/main/utils/compat/BotaniaHelper.java index 1b7d708..5014d95 100644 --- a/src/main/java/magicbees/main/utils/compat/BotaniaHelper.java +++ b/src/main/java/magicbees/main/utils/compat/BotaniaHelper.java @@ -4,21 +4,12 @@ import magicbees.bees.BeeManager; import magicbees.main.Config; import magicbees.main.utils.BlockInterface; import magicbees.main.utils.ItemInterface; -import magicbees.main.utils.compat.botania.BotaniaLexiconEntry; -import magicbees.main.utils.compat.botania.BotaniaSignature; -import magicbees.main.utils.compat.botania.LexiconEntries; -import magicbees.main.utils.compat.botania.SubTileBeegonia; -import magicbees.main.utils.compat.botania.SubTileHiveacynth; +import magicbees.main.utils.compat.botania.BotaniaAPIDistanceHelper; import net.minecraft.block.Block; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.lexicon.LexiconPage; -import vazkii.botania.api.recipe.RecipePetals; -import vazkii.botania.api.subtile.SubTileEntity; import cpw.mods.fml.common.Loader; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -79,8 +70,7 @@ public class BotaniaHelper { getBlocks(); getItems(); - registerSubtile(SubTileBeegonia.NAME, SubTileBeegonia.class); - registerSubtile(SubTileHiveacynth.NAME, SubTileHiveacynth.class); + BotaniaAPIDistanceHelper.registerSubtiles(); } } @@ -88,39 +78,11 @@ public class BotaniaHelper { if (isActive()) { // Hiveacynth would appreciate it if this list existed. BeeManager.populateSpeciesListRarity(); - - RecipePetals beegoniaRecipe = BotaniaAPI.registerPetalRecipe(BotaniaAPI.internalHandler.getSubTileAsStack(SubTileBeegonia.NAME), new Object[] { - new ItemStack(itemPetal), new ItemStack(itemManaPetal), new ItemStack(itemPetal, 1, 4), new ItemStack(itemPetal, 1, 4), - new ItemStack(itemPetal, 1, 4), new ItemStack(itemManaPetal, 1, 4), new ItemStack(itemManaPetal, 1, 15) - }); - LexiconEntries.entryBeegonia = new BotaniaLexiconEntry(SubTileBeegonia.NAME, BotaniaAPI.categoryGenerationFlowers); - LexiconEntries.entryBeegonia.setLexiconPages(new LexiconPage[] { - BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.beegonia.0"), - BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.beegonia.1"), - BotaniaAPI.internalHandler.petalRecipePage("magicbees.botania.lexicon.beegonia.crafting", beegoniaRecipe), - BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.beegonia.2") - }); - RecipePetals hiveacynthRecipe = BotaniaAPI.registerPetalRecipe(BotaniaAPI.internalHandler.getSubTileAsStack(SubTileHiveacynth.NAME), new Object[] { - new ItemStack(itemPetal, 1, 3), new ItemStack(itemPetal, 1, 9), new ItemStack(itemPetal, 1, 9), new ItemStack(itemPetal, 1, 11), - new ItemStack(itemManaPetal, 1, 3), new ItemStack(itemManaPetal, 1, 9), new ItemStack(itemManaPetal, 1, 11), - new ItemStack(itemManaPetal, 1, 11), new ItemStack(itemManaResource, 1, ManaResource.REDSTONE_ROOT.ordinal()) - }); - LexiconEntries.entryHiveacynth = new BotaniaLexiconEntry(SubTileHiveacynth.NAME, BotaniaAPI.categoryFunctionalFlowers); - LexiconEntries.entryHiveacynth.setLexiconPages(new LexiconPage[] { - BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.hiveacynth.0"), - BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.hiveacynth.1"), - BotaniaAPI.internalHandler.petalRecipePage("magicbees.botania.lexicon.hiveacynth.crafting", hiveacynthRecipe) - }); + BotaniaAPIDistanceHelper.setupCraftingAndLexicon(); } } - private static void registerSubtile(String subtileName, Class tileClass) { - BotaniaAPI.registerSubTile(subtileName, tileClass); - BotaniaAPI.registerSubTileSignature(tileClass, new BotaniaSignature(subtileName)); - BotaniaAPI.addSubTileToCreativeMenu(subtileName); - } - public static void getBlocks() { blockLivingRock = BlockInterface.getBlock(Name, "livingrock"); blockLivingWood = BlockInterface.getBlock(Name, "livingwood"); diff --git a/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java b/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java new file mode 100644 index 0000000..4b8109b --- /dev/null +++ b/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java @@ -0,0 +1,60 @@ +package magicbees.main.utils.compat.botania; + +import magicbees.main.utils.compat.BotaniaHelper; +import magicbees.main.utils.compat.BotaniaHelper.ManaResource; +import net.minecraft.item.ItemStack; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.lexicon.LexiconPage; +import vazkii.botania.api.recipe.RecipePetals; + +/** + * Subordinate helper to the Botania Helper that has references to Botania API stuff that will cause + * NoClassDefFoundErrors if included in the Botania Helper proper. + */ +public class BotaniaAPIDistanceHelper { + + public static LexiconEntry entryBeegonia; + public static LexiconEntry entryHiveacynth; + + public static void registerSubtiles() { + BotaniaAPI.registerSubTile(SubTileBeegonia.NAME, SubTileBeegonia.class); + BotaniaAPI.registerSubTileSignature(SubTileBeegonia.class, new BotaniaSignature(SubTileBeegonia.NAME)); + BotaniaAPI.addSubTileToCreativeMenu(SubTileBeegonia.NAME); + + BotaniaAPI.registerSubTile(SubTileHiveacynth.NAME, SubTileHiveacynth.class); + BotaniaAPI.registerSubTileSignature(SubTileHiveacynth.class, new BotaniaSignature(SubTileHiveacynth.NAME)); + BotaniaAPI.addSubTileToCreativeMenu(SubTileHiveacynth.NAME); + } + + public static void setupCraftingAndLexicon() { + + RecipePetals beegoniaRecipe = BotaniaAPI.registerPetalRecipe(BotaniaAPI.internalHandler.getSubTileAsStack(SubTileBeegonia.NAME), new Object[] { + new ItemStack(BotaniaHelper.itemPetal), new ItemStack(BotaniaHelper.itemManaPetal), + new ItemStack(BotaniaHelper.itemPetal, 1, 4), new ItemStack(BotaniaHelper.itemPetal, 1, 4), + new ItemStack(BotaniaHelper.itemPetal, 1, 4), new ItemStack(BotaniaHelper.itemManaPetal, 1, 4), + new ItemStack(BotaniaHelper.itemManaPetal, 1, 15) + }); + BotaniaAPIDistanceHelper.entryBeegonia = new BotaniaLexiconEntry(SubTileBeegonia.NAME, BotaniaAPI.categoryGenerationFlowers); + BotaniaAPIDistanceHelper.entryBeegonia.setLexiconPages(new LexiconPage[] { + BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.beegonia.0"), + BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.beegonia.1"), + BotaniaAPI.internalHandler.petalRecipePage("magicbees.botania.lexicon.beegonia.crafting", beegoniaRecipe), + BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.beegonia.2") + }); + + RecipePetals hiveacynthRecipe = BotaniaAPI.registerPetalRecipe(BotaniaAPI.internalHandler.getSubTileAsStack(SubTileHiveacynth.NAME), new Object[] { + new ItemStack(BotaniaHelper.itemPetal, 1, 3), new ItemStack(BotaniaHelper.itemPetal, 1, 9), + new ItemStack(BotaniaHelper.itemPetal, 1, 9), new ItemStack(BotaniaHelper.itemPetal, 1, 11), + new ItemStack(BotaniaHelper.itemManaPetal, 1, 3), new ItemStack(BotaniaHelper.itemManaPetal, 1, 9), + new ItemStack(BotaniaHelper.itemManaPetal, 1, 11), new ItemStack(BotaniaHelper.itemManaPetal, 1, 11), + new ItemStack(BotaniaHelper.itemManaResource, 1, ManaResource.REDSTONE_ROOT.ordinal()) + }); + BotaniaAPIDistanceHelper.entryHiveacynth = new BotaniaLexiconEntry(SubTileHiveacynth.NAME, BotaniaAPI.categoryFunctionalFlowers); + BotaniaAPIDistanceHelper.entryHiveacynth.setLexiconPages(new LexiconPage[] { + BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.hiveacynth.0"), + BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.hiveacynth.1"), + BotaniaAPI.internalHandler.petalRecipePage("magicbees.botania.lexicon.hiveacynth.crafting", hiveacynthRecipe) + }); + } +} diff --git a/src/main/java/magicbees/main/utils/compat/botania/LexiconEntries.java b/src/main/java/magicbees/main/utils/compat/botania/LexiconEntries.java deleted file mode 100644 index c712912..0000000 --- a/src/main/java/magicbees/main/utils/compat/botania/LexiconEntries.java +++ /dev/null @@ -1,9 +0,0 @@ -package magicbees.main.utils.compat.botania; - -import vazkii.botania.api.lexicon.LexiconEntry; - -public class LexiconEntries { - - public static LexiconEntry entryBeegonia; - public static LexiconEntry entryHiveacynth; -}