diff --git a/gradle.properties b/gradle.properties index 986b3d9..d4f80a8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ version_minor=3 version_rev=2 version_forestry=3.4.0.7 -version_bloodmagic=1.3.1-7 -version_botania=r1.6-180 +version_bloodmagic=1.3.3-4 +version_botania=r1.6-197 version_mc=1.7.10 version_forge=10.13.2.1291 diff --git a/libs/BloodMagic-1.7.10-1.3.1-7.jar b/libs/BloodMagic-1.7.10-1.3.1-7.jar deleted file mode 100644 index 3330e3d..0000000 Binary files a/libs/BloodMagic-1.7.10-1.3.1-7.jar and /dev/null differ diff --git a/libs/BloodMagic-1.7.10-1.3.3-4.jar b/libs/BloodMagic-1.7.10-1.3.3-4.jar new file mode 100644 index 0000000..832e64e Binary files /dev/null and b/libs/BloodMagic-1.7.10-1.3.3-4.jar differ diff --git a/libs/Botania r1.6-180-deobf.jar b/libs/Botania r1.6-197-deobf.jar similarity index 89% rename from libs/Botania r1.6-180-deobf.jar rename to libs/Botania r1.6-197-deobf.jar index ed71bcd..42ec35d 100644 Binary files a/libs/Botania r1.6-180-deobf.jar and b/libs/Botania r1.6-197-deobf.jar differ diff --git a/src/main/java/magicbees/bees/BeeMutation.java b/src/main/java/magicbees/bees/BeeMutation.java index c9b45d7..76756e0 100644 --- a/src/main/java/magicbees/bees/BeeMutation.java +++ b/src/main/java/magicbees/bees/BeeMutation.java @@ -113,6 +113,8 @@ public class BeeMutation implements IBeeMutation new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.ETHEREAL, BeeSpecies.GHASTLY, 9); new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.HATEFUL, BeeSpecies.SMOULDERING, 7) .setBiomeRequired(BiomeDictionary.Type.NETHER); + new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.MYSTERIOUS, BeeSpecies.BIGBAD, 7) + .setMoonPhaseRestricted(MoonPhase.FULL, MoonPhase.FULL); new BeeMutation(BeeSpecies.ETHEREAL, BeeSpecies.OBLIVION, BeeSpecies.NAMELESS, 10); new BeeMutation(BeeSpecies.OBLIVION, BeeSpecies.NAMELESS, BeeSpecies.ABANDONED, 8); diff --git a/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java b/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java index 879e224..6bbb75a 100644 --- a/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java +++ b/src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java @@ -1,6 +1,7 @@ package magicbees.main.utils.compat.botania; import magicbees.bees.BeeSpecies; +import magicbees.main.Config; import magicbees.main.utils.compat.BotaniaHelper; import magicbees.main.utils.compat.BotaniaHelper.ManaResource; import magicbees.main.utils.compat.BotaniaHelper.Rune; @@ -18,6 +19,8 @@ import forestry.api.apiculture.EnumBeeType; */ public class BotaniaAPIDistanceHelper { + public static LexiconEntry entryManasteelForestryTools; + public static LexiconEntry entryBeeTrade; public static LexiconEntry entryBeegonia; public static LexiconEntry entryHiveacynth; public static LexiconEntry entryHibeescus; @@ -53,13 +56,17 @@ public class BotaniaAPIDistanceHelper { tradeBeeAelfheim = new SpeciesRecipeElvenTrade(BeeSpecies.BOT_DREAMING, BeeSpecies.BOT_ALFHEIM); BotaniaAPI.elvenTradeRecipes.add(tradeBeeAelfheim); - LexiconEntry manasteelEntry = getLexiconEntryForName(BotaniaHelper.LEXICON_ENTRY_MANA_GEAR); - manasteelEntry.addPage(BotaniaAPI.internalHandler.craftingRecipePage("magicbees.botania.lexicon.manasteelScoop", BotaniaHelper.manasteelScoopRecipe)); - manasteelEntry.addPage(BotaniaAPI.internalHandler.craftingRecipePage("magicbees.botania.lexicon.manasteelGrafter", BotaniaHelper.manasteelGrafterRecipe)); + entryManasteelForestryTools = new BotaniaLexiconEntry("magicbees.botania.lexicon.manasteelTools.title", BotaniaAPI.categoryTools); + entryManasteelForestryTools.setIcon(new ItemStack(Config.manasteelScoop)); + entryManasteelForestryTools.addPage(BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.manasteelTools.0")); + entryManasteelForestryTools.addPage(BotaniaAPI.internalHandler.craftingRecipePage("magicbees.botania.lexicon.manasteelScoop", BotaniaHelper.manasteelScoopRecipe)); + entryManasteelForestryTools.addPage(BotaniaAPI.internalHandler.craftingRecipePage("magicbees.botania.lexicon.manasteelGrafter", BotaniaHelper.manasteelGrafterRecipe)); - LexiconEntry elfResourcesEntry = getLexiconEntryForName(BotaniaHelper.LEXICON_ENTRY_ELF_RESOURCES); - elfResourcesEntry.addPage(BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.beeAlfheim.0")); - elfResourcesEntry.addPage(BotaniaAPI.internalHandler.elvenTradesPage("magicbees.botania.lexicon.beeAlfheim.trade", tradeBeeAelfheim)); + entryBeeTrade = new BotaniaLexiconEntry("magicbees.botania.lexicon.beeAlfheim.title", BotaniaAPI.categoryAlfhomancy); + entryBeeTrade.setIcon(BeeSpecies.BOT_ALFHEIM.getBeeItem(EnumBeeType.PRINCESS)); + entryBeeTrade.setKnowledgeType(BotaniaAPI.elvenKnowledge); + entryBeeTrade.addPage(BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.beeAlfheim.0")); + entryBeeTrade.addPage(BotaniaAPI.internalHandler.elvenTradesPage("magicbees.botania.lexicon.beeAlfheim.trade", tradeBeeAelfheim)); RecipePetals beegoniaRecipe = BotaniaAPI.registerPetalRecipe(BotaniaAPI.internalHandler.getSubTileAsStack(SubTileBeegonia.NAME), new ItemStack(BotaniaHelper.itemPetal), diff --git a/src/main/java/magicbees/main/utils/compat/botania/SubTileHibeescus.java b/src/main/java/magicbees/main/utils/compat/botania/SubTileHibeescus.java index 461495a..1d30273 100644 --- a/src/main/java/magicbees/main/utils/compat/botania/SubTileHibeescus.java +++ b/src/main/java/magicbees/main/utils/compat/botania/SubTileHibeescus.java @@ -75,8 +75,9 @@ public class SubTileHibeescus extends SubTileFunctional { for (EntityItem itemEntity : items) { ItemStack item = itemEntity.getEntityItem(); - if (isItemPrincessOrQueen(item)) { + if (!itemEntity.isDead && isItemPrincessOrQueen(item)) { beeSlot = itemEntity.getEntityItem(); + itemEntity.setDead(); operationTicksRemaining = (long)(OPERATION_TICKS_TIME * BotaniaHelper.hibeescusTicksMultiplier); if (operationTicksRemaining > 0) { operationTicksRemaining += supertile.getWorldObj().rand.nextInt((int)(operationTicksRemaining * 0.02)); diff --git a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java index 821ed04..6ef050a 100644 --- a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java @@ -406,7 +406,16 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory @Override public int[] getAccessibleSlotsFromSide(int side) { - return new int[0]; + if (side == 0 || side == 1) { + return new int[] { SLOT_QUEEN, SLOT_DRONE }; + } + else { + int[] slots = new int[SLOT_PRODUCTS_COUNT]; + for (int i = 0, slot = SLOT_PRODUCTS_START; i < SLOT_PRODUCTS_COUNT; ++i, ++slot) { + slots[i] = slot; + } + return slots; + } } @Override @@ -424,8 +433,6 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory @Override public boolean canExtractItem(int slot, ItemStack itemStack, int side) { switch (slot){ - case SLOT_QUEEN: - case SLOT_DRONE: case SLOT_FRAME_START: case SLOT_FRAME_START + 1: case SLOT_FRAME_START + 2: diff --git a/src/main/resources/assets/magicbees/lang/de_DE.lang b/src/main/resources/assets/magicbees/lang/de_DE.lang index 6bf3d3a..03908b7 100644 --- a/src/main/resources/assets/magicbees/lang/de_DE.lang +++ b/src/main/resources/assets/magicbees/lang/de_DE.lang @@ -331,6 +331,8 @@ magicbees.speciesCobalt=Cobalten magicbees.speciesCobalt.description=Die instabilen Eigenschaften dieses Materials scheinen die Bienen nicht im Geringsten zu beinflussen.|Apinomikon magicbees.speciesManyullyn=Manyullin magicbees.speciesManyullyn.description="Tie tie-pa-tie pie!" +magicbees.speciesOsmium=Osmiös +magicbees.speciesOsmium.description=Manche behaupten, der Name dieser Bienen wäre frei erfunden, trotz des offensichtlichen Zusammenhangs.|Apinomikon magicbees.speciesDiamond=Diamandin magicbees.speciesDiamond.description=Kristallin, glitzernd, und härter als Drachenzähne. Diese Bienen sind nichts davon.|Apinomikon diff --git a/src/main/resources/assets/magicbees/lang/en_US.lang b/src/main/resources/assets/magicbees/lang/en_US.lang index f594380..4e12b35 100644 --- a/src/main/resources/assets/magicbees/lang/en_US.lang +++ b/src/main/resources/assets/magicbees/lang/en_US.lang @@ -594,9 +594,12 @@ tc.research_page.MB_VisAuraProvider.1=Infusing Unusual Pollen with vis and combi #Botania Lexicon entries magicbees.botania.lexicon.subtitle=[Magic Bees] +magicbees.botania.lexicon.manasteelTools.title=Manasteel Naturalist's Tools +magicbees.botania.lexicon.manasteelTools.0=Manasteel's unusual properties lends itself well to Naturalist's tools. The &1Manasteel Scoop&0 can be used to effectively harvest hives, and the &1Manasteel Grafter&0 is a durable subsitute for the generic bronze grafters. Of course, both tools have the ability to regenerate with mana. For best results, combine the tool with Living Wood. magicbees.botania.lexicon.manasteelScoop=The &1Manasteel Scoop&0 magicbees.botania.lexicon.manasteelGrafter=The &1Manasteel Grafter&0 +magicbees.botania.lexicon.beeAlfheim.title=Alfheim Apimancy magicbees.botania.lexicon.beeAlfheim.trade=Trading for &bAlfheim Drones&0 magicbees.botania.lexicon.beeAlfheim.0=&1Elven Beekeepers&0 are anxious to discover the delights of your world's bees, and are particularly interested in the &1Dreaming Drones&0 that you can provide. In return, they will trade &bAlfheim Drones&0, the only bees that exist in Alfheim.