upstream/MagicBees
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/MagicBees.git synced 2026-11-12 16:27:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ae2MatBees

Browse Source
This commit is contained in:
MysteriousAges committed 2015-07-03 16:00:05 -07:00
2 parents 7a77dca7c7 5f78df9fe8
commit 7ee2bc991e
10 files changed
+34 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/magicbees/bees/BeeMutation.java
+2
View File
@@ -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);
src/main/java/magicbees/main/utils/compat/botania/BotaniaAPIDistanceHelper.java
+13 -6
View File
@@ -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),
src/main/java/magicbees/main/utils/compat/botania/SubTileHibeescus.java
+2 -1
View File
@@ -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));
src/main/java/magicbees/tileentity/TileEntityMagicApiary.java
+10 -3
View File
@@ -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: