mirror of
https://github.com/GTNewHorizons/MagicBees.git
synced 2026-11-20 04:09:48 +00:00
Fixing old Loc glitch in Beealyzer for flower providers.
Tweaking TransmutationEffectController's constructor to accept "normal" looking parameter list. Fixed swapped parameters in SpeciesRecipeElvenTrade. Adding genomes for Aelfheim bees... still a bit bland. |:
This commit is contained in:
1 parent
a6c235aa5a
commit
549433e445
9 files changed
+27
-13
No files matched your search
@@ -10,6 +10,7 @@ import magicbees.bees.allele.effect.AlleleEffectSpawnMobWeighted;
|
||||
import magicbees.bees.allele.effect.AlleleEffectSpawnWisp;
|
||||
import magicbees.bees.allele.effect.AlleleEffectTransmuting;
|
||||
import magicbees.bees.allele.effect.TransmutationEffectController;
|
||||
import magicbees.bees.allele.effect.TransmutationEffectLBotaniaLiving;
|
||||
import magicbees.bees.allele.effect.TransmutationEffectRailcraft;
|
||||
import magicbees.bees.allele.effect.TransmutationEffectVanilla;
|
||||
import magicbees.bees.allele.flowerProvider.FlowerProviderArsMagicaFlower;
|
||||
@@ -50,6 +51,7 @@ public class Allele implements IAllele {
|
||||
public static IAlleleEffect effectTransmuting;
|
||||
public static IAlleleEffect effectCrumbling;
|
||||
public static IAlleleEffect effectInvisibility;
|
||||
public static IAlleleEffect effectDreaming;
|
||||
|
||||
public static IAlleleEffect spawnBrainyZombie;
|
||||
public static IAlleleEffect spawnWisp;
|
||||
@@ -120,6 +122,11 @@ public class Allele implements IAllele {
|
||||
} else {
|
||||
Allele.spawnBlizz = (IAlleleEffect) Allele.getBaseAllele("effectNone");
|
||||
}
|
||||
|
||||
if (BotaniaHelper.isActive()) {
|
||||
Allele.effectDreaming = new AlleleEffectTransmuting("Dreaming", false,
|
||||
new TransmutationEffectController(new TransmutationEffectLBotaniaLiving()), 100);
|
||||
}
|
||||
|
||||
Allele.effectCleansing = new AlleleEffectCure("Curative", false);
|
||||
Allele.effectDigSpeed = new AlleleEffectPotion("DigSpeed", Potion.digSpeed, 15, false);
|
||||
@@ -127,12 +134,12 @@ public class Allele implements IAllele {
|
||||
Allele.effectSlowSpeed = new AlleleEffectPotion("SlowSpeed", Potion.moveSlowdown, 3, false).setMalicious();
|
||||
Allele.effectWithering = new AlleleEffectPotion("Withering", Potion.wither, 10, false).setMalicious();
|
||||
|
||||
TransmutationEffectController controller = new TransmutationEffectController(new ITransmutationEffectLogic[] {
|
||||
TransmutationEffectController controller = new TransmutationEffectController(
|
||||
new TransmutationEffectRailcraft(),
|
||||
new TransmutationEffectVanilla()
|
||||
});
|
||||
);
|
||||
MagicBeesAPI.transmutationEffectController = controller;
|
||||
Allele.effectTransmuting = new AlleleEffectTransmuting("Transmuting", true, controller);
|
||||
Allele.effectTransmuting = new AlleleEffectTransmuting("Transmuting", true, controller, 200);
|
||||
Allele.effectCrumbling = new AlleleEffectCrumbling("Crumbling", true);
|
||||
|
||||
Allele.effectInvisibility = new AlleleEffectPotion("Invisibility", Potion.invisibility, 10, false);
|
||||
|
||||
@@ -23,4 +23,9 @@ public class AlleleFlower extends Allele implements IAlleleFlowers
|
||||
return this.provider;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return this.provider.getDescription();
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1357,7 +1357,7 @@ public class BeeGenomeManager {
|
||||
IAllele[] genome = getTemplateBotSomnolent();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.BOT_DREAMING;
|
||||
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedNormal");
|
||||
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedNorm");
|
||||
genome[EnumBeeChromosome.TERRITORY.ordinal()] = Allele.getBaseAllele("territoryLarger");
|
||||
|
||||
return genome;
|
||||
@@ -1367,6 +1367,7 @@ public class BeeGenomeManager {
|
||||
IAllele[] genome = getTemplateBotDreaming();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.BOT_AELFHEIM;
|
||||
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectDreaming;
|
||||
|
||||
return genome;
|
||||
}
|
||||
|
||||
@@ -12,8 +12,8 @@ public class AlleleEffectTransmuting extends AlleleEffect {
|
||||
|
||||
private TransmutationEffectController transmutationController;
|
||||
|
||||
public AlleleEffectTransmuting(String id, boolean isDominant, TransmutationEffectController effectController) {
|
||||
super(id, isDominant, 200);
|
||||
public AlleleEffectTransmuting(String id, boolean isDominant, TransmutationEffectController effectController, int timeoutBeeTicks) {
|
||||
super(id, isDominant, timeoutBeeTicks);
|
||||
this.transmutationController = effectController;
|
||||
}
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ import net.minecraft.world.biome.BiomeGenBase;
|
||||
public class TransmutationEffectController implements ITransmutationEffectController {
|
||||
private List<ITransmutationEffectLogic> logicObjects;
|
||||
|
||||
public TransmutationEffectController(ITransmutationEffectLogic[] effectLogic) {
|
||||
public TransmutationEffectController(ITransmutationEffectLogic... effectLogic) {
|
||||
logicObjects = new ArrayList<ITransmutationEffectLogic>();
|
||||
for (ITransmutationEffectLogic logic : effectLogic) {
|
||||
logicObjects.add(logic);
|
||||
|
||||
@@ -1,12 +1,10 @@
|
||||
package magicbees.main.utils.compat;
|
||||
|
||||
import magicbees.bees.BeeManager;
|
||||
import magicbees.bees.BeeSpecies;
|
||||
import magicbees.main.Config;
|
||||
import magicbees.main.utils.BlockInterface;
|
||||
import magicbees.main.utils.ItemInterface;
|
||||
import magicbees.main.utils.compat.botania.BotaniaAPIDistanceHelper;
|
||||
import magicbees.main.utils.compat.botania.SpeciesRecipeManaInfusion;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Blocks;
|
||||
@@ -17,13 +15,11 @@ import net.minecraft.item.crafting.IRecipe;
|
||||
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.mana.ManaItemHandler;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import forestry.api.apiculture.EnumBeeType;
|
||||
|
||||
public class BotaniaHelper {
|
||||
|
||||
@@ -63,6 +59,7 @@ public class BotaniaHelper {
|
||||
public static Block blockMysticalFlower;
|
||||
public static Block blockLivingRock;
|
||||
public static Block blockLivingWood;
|
||||
public static Block blockDreamWood;
|
||||
|
||||
public static Item itemPetal;
|
||||
public static Item itemManaPetal;
|
||||
@@ -130,6 +127,7 @@ public class BotaniaHelper {
|
||||
blockMysticalFlower = BlockInterface.getBlock(Name, "flower");
|
||||
blockLivingRock = BlockInterface.getBlock(Name, "livingrock");
|
||||
blockLivingWood = BlockInterface.getBlock(Name, "livingwood");
|
||||
blockDreamWood = BlockInterface.getBlock(Name, "dreamwood");
|
||||
|
||||
// Generate 16-colour flowers.
|
||||
mysticalFlowerVariants = new ItemStack[16];
|
||||
|
||||
@@ -45,6 +45,7 @@ public class BotaniaAPIDistanceHelper {
|
||||
BotaniaAPI.manaInfusionRecipes.add(infusionBeeVazbee);
|
||||
|
||||
tradeBeeAelfheim = new SpeciesRecipeElvenTrade(BeeSpecies.BOT_DREAMING, BeeSpecies.BOT_AELFHEIM);
|
||||
BotaniaAPI.elvenTradeRecipes.add(tradeBeeAelfheim);
|
||||
|
||||
LexiconEntry manasteelEntry = getLexiconEntryForName(BotaniaHelper.LEXICON_ENTRY_MANA_GEAR);
|
||||
manasteelEntry.addPage(BotaniaAPI.internalHandler.craftingRecipePage("magicbees.botania.lexicon.manasteelScoop", BotaniaHelper.manasteelScoopRecipe));
|
||||
|
||||
@@ -15,8 +15,8 @@ public class SpeciesRecipeElvenTrade extends RecipeElvenTrade {
|
||||
private IAlleleBeeSpecies inputSpecies;
|
||||
|
||||
public SpeciesRecipeElvenTrade(IAlleleBeeSpecies inSpecies, IAlleleBeeSpecies outSpecies) {
|
||||
super(BeeManager.getDefaultItemStackForSpecies(inSpecies, EnumBeeType.DRONE),
|
||||
BeeManager.getDefaultItemStackForSpecies(outSpecies, EnumBeeType.DRONE));
|
||||
super(BeeManager.getDefaultItemStackForSpecies(outSpecies, EnumBeeType.DRONE),
|
||||
BeeManager.getDefaultItemStackForSpecies(inSpecies, EnumBeeType.DRONE));
|
||||
inputSpecies = inSpecies;
|
||||
}
|
||||
|
||||
@@ -33,6 +33,7 @@ public class SpeciesRecipeElvenTrade extends RecipeElvenTrade {
|
||||
if (BeeManager.beeRoot.isMember(inStack, EnumBeeType.DRONE.ordinal())) {
|
||||
IBee bee = BeeManager.beeRoot.getMember(inStack);
|
||||
if (bee.getGenome().getPrimary().equals(inputSpecies)) {
|
||||
matchedStacks.add(inStack);
|
||||
found = true;
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user