mirror of
https://github.com/GTNewHorizons/MagicBees.git
synced 2026-11-18 19:39:06 +00:00
Adding the Hibeescus to Botania integration.
Fixing "missing" loc strings for Vis Apiary Booster. Fixing order of petals within some Botania petal recipes.
This commit is contained in:
1 parent
2e4a7d7bb1
commit
223aba18a4
5 files changed
+224
-14
No files matched your search
@@ -58,6 +58,26 @@ public class BotaniaHelper {
|
||||
MYCELIUM,
|
||||
;
|
||||
}
|
||||
|
||||
public enum Rune {
|
||||
WATER,
|
||||
FIRE,
|
||||
EARTH,
|
||||
AIR,
|
||||
SPRING,
|
||||
SUMMER,
|
||||
AUTUMN,
|
||||
WINTER,
|
||||
MANA,
|
||||
LUST,
|
||||
GLUTTONY,
|
||||
GREED,
|
||||
SLOTH,
|
||||
WRATH,
|
||||
ENVY,
|
||||
PRIDE,
|
||||
;
|
||||
}
|
||||
|
||||
public static Block blockMysticalFlower;
|
||||
public static Block blockLivingRock;
|
||||
@@ -68,6 +88,7 @@ public class BotaniaHelper {
|
||||
public static Item itemManaPetal;
|
||||
public static Item itemManaResource;
|
||||
public static Item itemPastureSeed;
|
||||
public static Item itemRune;
|
||||
|
||||
public static ItemStack[] mysticalFlowerVariants;
|
||||
|
||||
@@ -154,6 +175,7 @@ public class BotaniaHelper {
|
||||
itemManaPetal = ItemInterface.getItem(Name, "manaPetal");
|
||||
itemManaResource = ItemInterface.getItem(Name, "manaResource");
|
||||
itemPastureSeed = ItemInterface.getItem(Name, "grassSeeds");
|
||||
itemRune = ItemInterface.getItem(Name, "rune");
|
||||
}
|
||||
|
||||
public static void doBotaniaModuleConfigs(Configuration configuration) {
|
||||
@@ -183,4 +205,8 @@ public class BotaniaHelper {
|
||||
public static boolean requestMana(ItemStack stack, EntityPlayer player, int manaPerDamage, int charges) {
|
||||
return ManaItemHandler.requestManaExactForTool(stack, player, manaPerDamage * charges, true);
|
||||
}
|
||||
|
||||
public static ItemStack getRune(Rune rune, int quantity) {
|
||||
return new ItemStack(itemRune, quantity, rune.ordinal());
|
||||
}
|
||||
}
|
||||
@@ -3,6 +3,7 @@ package magicbees.main.utils.compat.botania;
|
||||
import magicbees.bees.BeeSpecies;
|
||||
import magicbees.main.utils.compat.BotaniaHelper;
|
||||
import magicbees.main.utils.compat.BotaniaHelper.ManaResource;
|
||||
import magicbees.main.utils.compat.BotaniaHelper.Rune;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import vazkii.botania.api.BotaniaAPI;
|
||||
import vazkii.botania.api.lexicon.LexiconEntry;
|
||||
@@ -19,6 +20,7 @@ public class BotaniaAPIDistanceHelper {
|
||||
|
||||
public static LexiconEntry entryBeegonia;
|
||||
public static LexiconEntry entryHiveacynth;
|
||||
public static LexiconEntry entryHibeescus;
|
||||
public static LexiconEntry entryManaApiaryBooster;
|
||||
|
||||
public static RecipeManaInfusion infusionBeeBotanical;
|
||||
@@ -34,6 +36,10 @@ public class BotaniaAPIDistanceHelper {
|
||||
BotaniaAPI.registerSubTile(SubTileHiveacynth.NAME, SubTileHiveacynth.class);
|
||||
BotaniaAPI.registerSubTileSignature(SubTileHiveacynth.class, new BotaniaSignature(SubTileHiveacynth.NAME));
|
||||
BotaniaAPI.addSubTileToCreativeMenu(SubTileHiveacynth.NAME);
|
||||
|
||||
BotaniaAPI.registerSubTile(SubTileHibeescus.NAME, SubTileHibeescus.class);
|
||||
BotaniaAPI.registerSubTileSignature(SubTileHibeescus.class, new BotaniaSignature(SubTileHibeescus.NAME));
|
||||
BotaniaAPI.addSubTileToCreativeMenu(SubTileHibeescus.NAME);
|
||||
}
|
||||
|
||||
public static void setupCraftingAndLexicon() {
|
||||
@@ -55,12 +61,15 @@ public class BotaniaAPIDistanceHelper {
|
||||
elfResourcesEntry.addPage(BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.beeAlfheim.0"));
|
||||
elfResourcesEntry.addPage(BotaniaAPI.internalHandler.elvenTradesPage("magicbees.botania.lexicon.beeAlfheim.trade", tradeBeeAelfheim));
|
||||
|
||||
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),
|
||||
RecipePetals beegoniaRecipe = BotaniaAPI.registerPetalRecipe(BotaniaAPI.internalHandler.getSubTileAsStack(SubTileBeegonia.NAME),
|
||||
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)
|
||||
});
|
||||
);
|
||||
entryBeegonia = new BotaniaLexiconEntry("tile.botania:flower." + SubTileBeegonia.NAME + ".name", BotaniaAPI.categoryGenerationFlowers);
|
||||
entryBeegonia.setLexiconPages(
|
||||
BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.beegonia.0"),
|
||||
@@ -69,19 +78,47 @@ public class BotaniaAPIDistanceHelper {
|
||||
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),
|
||||
RecipePetals hiveacynthRecipe = BotaniaAPI.registerPetalRecipe(BotaniaAPI.internalHandler.getSubTileAsStack(SubTileHiveacynth.NAME),
|
||||
new ItemStack(BotaniaHelper.itemPetal, 1, 3),
|
||||
new ItemStack(BotaniaHelper.itemManaPetal, 1, 3),
|
||||
new ItemStack(BotaniaHelper.itemPetal, 1, 9),
|
||||
new ItemStack(BotaniaHelper.itemPetal, 1, 9),
|
||||
new ItemStack(BotaniaHelper.itemManaPetal, 1, 9),
|
||||
new ItemStack(BotaniaHelper.itemPetal, 1, 11),
|
||||
new ItemStack(BotaniaHelper.itemManaPetal, 1, 11),
|
||||
new ItemStack(BotaniaHelper.itemManaPetal, 1, 11),
|
||||
new ItemStack(BotaniaHelper.itemManaResource, 1, ManaResource.REDSTONE_ROOT.ordinal())
|
||||
});
|
||||
);
|
||||
entryHiveacynth = new BotaniaLexiconEntry("tile.botania:flower." + SubTileHiveacynth.NAME + ".name", BotaniaAPI.categoryFunctionalFlowers);
|
||||
entryHiveacynth.setLexiconPages(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)
|
||||
);
|
||||
|
||||
RecipePetals hibeescusRecipe = BotaniaAPI.registerPetalRecipe(BotaniaAPI.internalHandler.getSubTileAsStack(SubTileHibeescus.NAME),
|
||||
new ItemStack(BotaniaHelper.itemPetal, 1, 1),
|
||||
new ItemStack(BotaniaHelper.itemManaPetal, 1, 1),
|
||||
new ItemStack(BotaniaHelper.itemPetal, 1, 2),
|
||||
new ItemStack(BotaniaHelper.itemPetal, 1, 2),
|
||||
new ItemStack(BotaniaHelper.itemPetal, 1, 2),
|
||||
new ItemStack(BotaniaHelper.itemManaPetal, 1, 2),
|
||||
new ItemStack(BotaniaHelper.itemManaPetal, 1, 2),
|
||||
new ItemStack(BotaniaHelper.itemPetal, 1, 14),
|
||||
new ItemStack(BotaniaHelper.itemManaPetal, 1, 12),
|
||||
new ItemStack(BotaniaHelper.itemManaPetal, 1, 10),
|
||||
BotaniaHelper.getRune(Rune.AIR, 1),
|
||||
BotaniaHelper.getRune(Rune.SUMMER, 1),
|
||||
BotaniaHelper.getRune(Rune.ENVY, 1),
|
||||
BotaniaHelper.getRune(Rune.GREED, 1),
|
||||
BotaniaHelper.getRune(Rune.PRIDE, 1),
|
||||
new ItemStack(BotaniaHelper.itemManaResource, 1, ManaResource.REDSTONE_ROOT.ordinal())
|
||||
);
|
||||
entryHibeescus = new BotaniaLexiconEntry("tile.botania:flower." + SubTileHibeescus.NAME + ".name", BotaniaAPI.categoryFunctionalFlowers);
|
||||
entryHibeescus.setLexiconPages(BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.hibeescus.0"),
|
||||
BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.hibeescus.1"),
|
||||
BotaniaAPI.internalHandler.petalRecipePage("magicbees.botania.lexicon.hibeescus.crafting", hibeescusRecipe)
|
||||
);
|
||||
|
||||
entryManaApiaryBooster = new BotaniaLexiconEntry("tile.manaAuraProvider.name", BotaniaAPI.categoryDevices);
|
||||
entryManaApiaryBooster.setLexiconPages(
|
||||
BotaniaAPI.internalHandler.textPage("magicbees.botania.lexicon.manaBooster.0"),
|
||||
|
||||
@@ -0,0 +1,141 @@
|
||||
package magicbees.main.utils.compat.botania;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import magicbees.bees.BeeManager;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import vazkii.botania.api.subtile.SubTileFunctional;
|
||||
import forestry.api.apiculture.EnumBeeType;
|
||||
import forestry.api.apiculture.IBee;
|
||||
|
||||
public class SubTileHibeescus extends SubTileFunctional {
|
||||
|
||||
public static final String NAME = "hibeescus";
|
||||
private final int MANA_PER_OPERATION = 100000;
|
||||
private final int OPERATION_TICKS_TIME = 20 * 60 * 15;
|
||||
private final int RANGE = 1;
|
||||
|
||||
private ItemStack beeSlot;
|
||||
private long operationTicksRemaining;
|
||||
|
||||
@Override
|
||||
public void onUpdate() {
|
||||
super.onUpdate();
|
||||
|
||||
if (beeSlot != null && this.mana >= MANA_PER_OPERATION) {
|
||||
progressOperation();
|
||||
}
|
||||
else if (beeSlot == null && this.supertile.getWorldObj().getTotalWorldTime() % 10 == 0) {
|
||||
findBeeItemToHold();
|
||||
}
|
||||
}
|
||||
|
||||
private void progressOperation() {
|
||||
operationTicksRemaining--;
|
||||
|
||||
if (operationTicksRemaining <= 0) {
|
||||
mana -= MANA_PER_OPERATION;
|
||||
IBee bee = BeeManager.beeRoot.getMember(beeSlot);
|
||||
bee.setIsNatural(true);
|
||||
EnumBeeType beeType = EnumBeeType.QUEEN;
|
||||
if (bee.getMate() == null) {
|
||||
beeType = EnumBeeType.PRINCESS;
|
||||
}
|
||||
ItemStack outputStack = BeeManager.beeRoot.getMemberStack(bee, beeType.ordinal());
|
||||
Random r = supertile.getWorldObj().rand;
|
||||
EntityItem entity = new EntityItem(supertile.getWorldObj(),
|
||||
supertile.xCoord - RANGE + r.nextInt(RANGE * 2 + 1), supertile.yCoord + 1, supertile.zCoord - RANGE + r.nextInt(RANGE * 2 + 1),
|
||||
outputStack);
|
||||
entity.motionX = 0;
|
||||
entity.motionY = 0;
|
||||
entity.motionZ = 0;
|
||||
|
||||
supertile.getWorldObj().spawnEntityInWorld(entity);
|
||||
beeSlot = null;
|
||||
}
|
||||
}
|
||||
|
||||
private void findBeeItemToHold() {
|
||||
@SuppressWarnings("unchecked")
|
||||
List<EntityItem> items = supertile.getWorldObj().getEntitiesWithinAABB(EntityItem.class, getSearchBoundingBox());
|
||||
|
||||
for (EntityItem itemEntity : items) {
|
||||
ItemStack item = itemEntity.getEntityItem();
|
||||
if (isItemPrincessOrQueen(item)) {
|
||||
beeSlot = itemEntity.getEntityItem();
|
||||
operationTicksRemaining = OPERATION_TICKS_TIME;
|
||||
|
||||
// Princesses and Queens don't stack, but YOU NEVER KNOW.
|
||||
item.stackSize -= 1;
|
||||
if (item.stackSize <= 0) {
|
||||
itemEntity.setDead();
|
||||
}
|
||||
|
||||
// Leave for loop
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isItemPrincessOrQueen(ItemStack stack) {
|
||||
boolean isBee = BeeManager.beeRoot.isMember(stack, EnumBeeType.PRINCESS.ordinal())
|
||||
|| BeeManager.beeRoot.isMember(stack, EnumBeeType.QUEEN.ordinal());
|
||||
if (isBee) {
|
||||
IBee bee = BeeManager.beeRoot.getMember(stack);
|
||||
// Only process Ignoble bees.
|
||||
if (!bee.isNatural()) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
private AxisAlignedBB getSearchBoundingBox() {
|
||||
return AxisAlignedBB.getBoundingBox(supertile.xCoord - RANGE, supertile.yCoord, supertile.zCoord - RANGE,
|
||||
supertile.xCoord + RANGE + 1, supertile.yCoord + 1, supertile.zCoord + RANGE + 1);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readFromPacketNBT(NBTTagCompound cmp) {
|
||||
super.readFromPacketNBT(cmp);
|
||||
if (cmp.hasKey("slot")) {
|
||||
NBTTagCompound itemTag = (NBTTagCompound)cmp.getTag("slot");
|
||||
beeSlot = ItemStack.loadItemStackFromNBT(itemTag);
|
||||
}
|
||||
operationTicksRemaining = cmp.getLong("operationTicks");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToPacketNBT(NBTTagCompound cmp) {
|
||||
super.writeToPacketNBT(cmp);
|
||||
if (beeSlot != null) {
|
||||
NBTTagCompound itemTag = new NBTTagCompound();
|
||||
beeSlot.writeToNBT(itemTag);
|
||||
cmp.setTag("slot", itemTag);
|
||||
}
|
||||
cmp.setLong("operationTicks", operationTicksRemaining);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ArrayList<ItemStack> getDrops(ArrayList<ItemStack> list) {
|
||||
if (beeSlot != null) {
|
||||
list.add(beeSlot);
|
||||
}
|
||||
return super.getDrops(list);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMaxMana() {
|
||||
return MANA_PER_OPERATION;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean acceptsRedstone() {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user