mirror of
https://github.com/GTNewHorizons/MagicBees.git
synced 2026-11-19 11:59:19 +00:00
Update to forestry 3.6 API.
Adds Aura node Recharge effect.
This commit is contained in:
1 parent
922a8fffd6
commit
4c93eb6bf4
16 files changed
+317
-83
No files matched your search
@@ -4,6 +4,7 @@ import magicbees.api.MagicBeesAPI;
|
||||
import magicbees.bees.allele.effect.AlleleEffectCrumbling;
|
||||
import magicbees.bees.allele.effect.AlleleEffectCure;
|
||||
import magicbees.bees.allele.effect.AlleleEffectPotion;
|
||||
import magicbees.bees.allele.effect.AlleleEffectRecharge;
|
||||
import magicbees.bees.allele.effect.AlleleEffectSpawnMob;
|
||||
import magicbees.bees.allele.effect.AlleleEffectSpawnMobWeighted;
|
||||
import magicbees.bees.allele.effect.AlleleEffectSpawnWisp;
|
||||
@@ -47,6 +48,7 @@ public class Allele implements IAllele {
|
||||
public static IAlleleEffect effectMoveSpeed;
|
||||
public static IAlleleEffect effectSlowSpeed;
|
||||
public static IAlleleEffect effectWithering;
|
||||
public static IAlleleEffect effectVisRecharge;
|
||||
public static IAlleleEffect effectTransmuting;
|
||||
public static IAlleleEffect effectCrumbling;
|
||||
public static IAlleleEffect effectInvisibility;
|
||||
@@ -73,6 +75,8 @@ public class Allele implements IAllele {
|
||||
if (ThaumcraftHelper.isActive()) {
|
||||
Allele.flowerThaumcraft = new AlleleFlower("ThaumcraftPlant", new FlowerProviderThaumcraftFlower(), false);
|
||||
Allele.flowerAuraNode = new AlleleFlower("AuraNode", new FlowerProviderAuraNode(), true);
|
||||
|
||||
Allele.effectVisRecharge = new AlleleEffectRecharge("VisRecharge", false);
|
||||
|
||||
Allele.spawnBrainyZombie = new AlleleEffectSpawnMob("Brainy", false, ThaumcraftHelper.Entity.BRAINY_ZOMBIE.entityID)
|
||||
.setAggrosPlayerOnSpawn()
|
||||
|
||||
@@ -894,7 +894,7 @@ public class BeeGenomeManager {
|
||||
IAllele[] genome = getTemplateTCBaseVis();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TC_REJUVENATING;
|
||||
//genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectNodeCharge;
|
||||
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectVisRecharge;
|
||||
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowerAuraNode;
|
||||
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceNone");
|
||||
|
||||
|
||||
@@ -231,17 +231,17 @@ public class BeeMutation implements IBeeMutation {
|
||||
|
||||
if (ThaumcraftHelper.isActive()) {
|
||||
new BeeMutation(BeeSpecies.WINDY, BeeSpecies.WINDY, BeeSpecies.TC_AIR, 8)
|
||||
.setBlockAndMetaRequired(Config.tcCrystal, ThaumcraftHelper.ShardType.AIR.ordinal());
|
||||
.setBlockAndMetaRequired(ThaumcraftHelper.crystal, ThaumcraftHelper.ShardType.AIR.ordinal());
|
||||
new BeeMutation(BeeSpecies.FIREY, BeeSpecies.FIREY, BeeSpecies.TC_FIRE, 8)
|
||||
.setBlockAndMetaRequired(Config.tcCrystal, ThaumcraftHelper.ShardType.FIRE.ordinal());
|
||||
.setBlockAndMetaRequired(ThaumcraftHelper.crystal, ThaumcraftHelper.ShardType.FIRE.ordinal());
|
||||
new BeeMutation(BeeSpecies.WATERY, BeeSpecies.WATERY, BeeSpecies.TC_WATER, 8)
|
||||
.setBlockAndMetaRequired(Config.tcCrystal, ThaumcraftHelper.ShardType.WATER.ordinal());
|
||||
.setBlockAndMetaRequired(ThaumcraftHelper.crystal, ThaumcraftHelper.ShardType.WATER.ordinal());
|
||||
new BeeMutation(BeeSpecies.EARTHY, BeeSpecies.EARTHY, BeeSpecies.TC_EARTH, 8)
|
||||
.setBlockAndMetaRequired(Config.tcCrystal, ThaumcraftHelper.ShardType.EARTH.ordinal());
|
||||
.setBlockAndMetaRequired(ThaumcraftHelper.crystal, ThaumcraftHelper.ShardType.EARTH.ordinal());
|
||||
new BeeMutation(BeeSpecies.ETHEREAL, BeeSpecies.ARCANE, BeeSpecies.TC_ORDER, 8)
|
||||
.setBlockAndMetaRequired(Config.tcCrystal, ThaumcraftHelper.ShardType.ORDER.ordinal());
|
||||
.setBlockAndMetaRequired(ThaumcraftHelper.crystal, ThaumcraftHelper.ShardType.ORDER.ordinal());
|
||||
new BeeMutation(BeeSpecies.ETHEREAL, BeeSpecies.SUPERNATURAL, BeeSpecies.TC_CHAOS, 8)
|
||||
.setBlockAndMetaRequired(Config.tcCrystal, ThaumcraftHelper.ShardType.CHAOS.ordinal());
|
||||
.setBlockAndMetaRequired(ThaumcraftHelper.crystal, ThaumcraftHelper.ShardType.CHAOS.ordinal());
|
||||
|
||||
new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.WINDY, BeeSpecies.TC_BATTY, 9);
|
||||
new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.PUPIL, BeeSpecies.TC_BRAINY, 9);
|
||||
|
||||
@@ -273,10 +273,10 @@ public class BeeProductHelper {
|
||||
TC_ORDER.addSpecialty(Config.propolis.getStackForType(PropolisType.ORDER), 0.18f);
|
||||
TC_CHAOS.addSpecialty(Config.propolis.getStackForType(PropolisType.CHAOS), 0.18f);
|
||||
|
||||
TC_BRAINY.addSpecialty(new ItemStack(Config.tcMiscResource, 1, ThaumcraftHelper.MiscResource.ZOMBIE_BRAIN.ordinal()), 0.2f);
|
||||
TC_CHICKEN.addSpecialty(new ItemStack(Config.tcNuggetChicken, 1), 0.9f);
|
||||
TC_BEEF.addSpecialty(new ItemStack(Config.tcNuggetBeef, 1), 0.9f);
|
||||
TC_PORK.addSpecialty(new ItemStack(Config.tcNuggetPork, 1), 0.9f);
|
||||
TC_BRAINY.addSpecialty(new ItemStack(ThaumcraftHelper.miscResource, 1, ThaumcraftHelper.MiscResource.ZOMBIE_BRAIN.ordinal()), 0.2f);
|
||||
TC_CHICKEN.addSpecialty(new ItemStack(ThaumcraftHelper.nuggetChicken, 1), 0.9f);
|
||||
TC_BEEF.addSpecialty(new ItemStack(ThaumcraftHelper.nuggetBeef, 1), 0.9f);
|
||||
TC_PORK.addSpecialty(new ItemStack(ThaumcraftHelper.nuggetPork, 1), 0.9f);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -478,7 +478,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
// These species should be fixed. ¯\_(ツ)_/¯
|
||||
TC_TAINT.setInactive();
|
||||
TC_ATTRACT.setInactive();
|
||||
TC_REJUVENATING.setInactive();
|
||||
//TC_REJUVENATING.setInactive();
|
||||
|
||||
BeeProductHelper.initEquivalentExchange3Species();
|
||||
if (!EquivalentExchangeHelper.isActive()) {
|
||||
@@ -556,7 +556,11 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
private boolean isNocturnal;
|
||||
private IClassification branch;
|
||||
private HashMap<ItemStack, Float> products;
|
||||
@Deprecated
|
||||
private HashMap<ItemStack, Integer> oldProducts;
|
||||
private HashMap<ItemStack, Float> specialties;
|
||||
@Deprecated
|
||||
private HashMap<ItemStack, Integer> oldSpecialties;
|
||||
private IAllele genomeTemplate[];
|
||||
private String uid;
|
||||
private boolean dominant;
|
||||
@@ -604,7 +608,9 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
isSecret = isSpeciesSecret;
|
||||
isCounted = isSpeciesCounted;
|
||||
products = new HashMap<ItemStack, Float>();
|
||||
oldProducts = new HashMap<ItemStack, Integer>();
|
||||
specialties = new HashMap<ItemStack, Float>();
|
||||
oldSpecialties = new HashMap<ItemStack, Integer>();
|
||||
this.branch = classification;
|
||||
this.branch.addMemberSpecies(this);
|
||||
this.isNocturnal = isSpeciesNocturnal;
|
||||
@@ -617,23 +623,25 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
|
||||
@Deprecated
|
||||
public BeeSpecies addProduct(ItemStack produce, int percentChance) {
|
||||
products.put(produce, percentChance / 100f);
|
||||
return this;
|
||||
// Don't use this plz.
|
||||
return null;
|
||||
}
|
||||
|
||||
public BeeSpecies addProduct(ItemStack produce, float chance) {
|
||||
products.put(produce, chance);
|
||||
oldProducts.put(produce, (int)(chance * 100));
|
||||
return this;
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
public BeeSpecies addSpecialty(ItemStack produce, int percentChance) {
|
||||
specialties.put(produce, percentChance / 100f);
|
||||
return this;
|
||||
// Don't use this plz.
|
||||
return null;
|
||||
}
|
||||
|
||||
public BeeSpecies addSpecialty(ItemStack produce, float chance) {
|
||||
specialties.put(produce, chance);
|
||||
oldSpecialties.put(produce, (int)(chance * 100));
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -719,13 +727,13 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
@Override
|
||||
@Deprecated
|
||||
public HashMap<ItemStack, Integer> getProducts() {
|
||||
return null;
|
||||
return oldProducts;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Deprecated
|
||||
public HashMap<ItemStack, Integer> getSpecialty() {
|
||||
return null;
|
||||
return oldSpecialties;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
package magicbees.bees.allele.effect;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import magicbees.bees.AlleleEffect;
|
||||
import magicbees.main.utils.BlockUtil;
|
||||
import magicbees.main.utils.compat.thaumcraft.NodeHelper;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.chunk.Chunk;
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
import forestry.api.apiculture.IBeeHousing;
|
||||
import forestry.api.genetics.IEffectData;
|
||||
|
||||
public class AlleleEffectRecharge extends AlleleEffect {
|
||||
|
||||
private int range;
|
||||
|
||||
public AlleleEffectRecharge(String id, boolean isDominant) {
|
||||
super(id, isDominant, 10);
|
||||
range = 20;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IEffectData validateStorage(IEffectData storedData) {
|
||||
if (storedData == null || !(storedData instanceof magicbees.bees.EffectData)) {
|
||||
storedData = new magicbees.bees.EffectData(1, 0, 0);
|
||||
}
|
||||
return storedData;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected IEffectData doEffectThrottled(IBeeGenome genome, IEffectData storedData, IBeeHousing housing) {
|
||||
World world = housing.getWorld();
|
||||
int xCoord = housing.getXCoord();
|
||||
int yCoord = housing.getYCoord();
|
||||
int zCoord = housing.getZCoord();
|
||||
List<Chunk> chunks = BlockUtil.getChunksInSearchRange(world, xCoord, zCoord, range);
|
||||
|
||||
if (NodeHelper.rechargeNodeInRange(chunks, world, xCoord, yCoord, zCoord, range)) {
|
||||
storedData.setInteger(0, storedData.getInteger(0) - throttle);
|
||||
}
|
||||
|
||||
return storedData;
|
||||
}
|
||||
}
|
||||
@@ -4,8 +4,11 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import magicbees.main.utils.LocalizationManager;
|
||||
import magicbees.main.utils.compat.ThaumcraftHelper;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import forestry.api.genetics.IFlower;
|
||||
import forestry.api.genetics.IIndividual;
|
||||
import forestry.api.genetics.IPollinatable;
|
||||
@@ -13,11 +16,20 @@ import forestry.api.genetics.IPollinatable;
|
||||
public class FlowerProviderAuraNode extends FlowerProvider {
|
||||
|
||||
public FlowerProviderAuraNode() {
|
||||
super(0);
|
||||
super(2);
|
||||
flowers.add(new FlowerImpl(ThaumcraftHelper.airy, ThaumcraftHelper.AiryBlockType.NODE.ordinal(), 1, false));
|
||||
flowers.add(new FlowerImpl(ThaumcraftHelper.airy, ThaumcraftHelper.AiryBlockType.ENERGIZED_NODE.ordinal(), 1, false));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAcceptedFlower(World world, IIndividual genome, int x, int y, int z) {
|
||||
Block block = world.getBlock(x, y, z);
|
||||
int meta = world.getBlockMetadata(x, y, z);
|
||||
for (IFlower flower : flowers) {
|
||||
if (flower.getBlock() == block && (flower.getMeta() == OreDictionary.WILDCARD_VALUE || flower.getMeta() == meta)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
+5
-6
@@ -1,6 +1,5 @@
|
||||
package magicbees.bees.allele.flowerProvider;
|
||||
|
||||
import magicbees.main.Config;
|
||||
import magicbees.main.utils.LocalizationManager;
|
||||
import magicbees.main.utils.compat.ThaumcraftHelper;
|
||||
import net.minecraft.block.Block;
|
||||
@@ -14,13 +13,13 @@ public class FlowerProviderThaumcraftFlower extends FlowerProvider {
|
||||
|
||||
public FlowerProviderThaumcraftFlower() {
|
||||
super(2);
|
||||
flowers.add(new FlowerImpl(Config.tcPlant, ThaumcraftHelper.BlockPlant.SHIMMERLEAF.ordinal(), 1, true));
|
||||
flowers.add(new FlowerImpl(Config.tcPlant, ThaumcraftHelper.BlockPlant.CINDERPEARL.ordinal(), 1, true));
|
||||
flowers.add(new FlowerImpl(ThaumcraftHelper.plant, ThaumcraftHelper.BlockPlant.SHIMMERLEAF.ordinal(), 1, true));
|
||||
flowers.add(new FlowerImpl(ThaumcraftHelper.plant, ThaumcraftHelper.BlockPlant.CINDERPEARL.ordinal(), 1, true));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAcceptedFlower(World world, IIndividual genome, int x, int y, int z) {
|
||||
if (world.getBlock(x, y, z) == Config.tcPlant) {
|
||||
if (world.getBlock(x, y, z) == ThaumcraftHelper.plant) {
|
||||
int meta = world.getBlockMetadata(x, y, z);
|
||||
if (meta == ThaumcraftHelper.BlockPlant.SHIMMERLEAF.ordinal()
|
||||
|| meta == ThaumcraftHelper.BlockPlant.CINDERPEARL.ordinal()) {
|
||||
@@ -36,10 +35,10 @@ public class FlowerProviderThaumcraftFlower extends FlowerProvider {
|
||||
Block blockDown = world.getBlock(x, y - 1, z);
|
||||
if (world.getBlock(x, y, z).isAir(world, x, y, z)) {
|
||||
if (blockDown == Blocks.dirt || blockDown == Blocks.grass) {
|
||||
world.setBlock(x, y, z, Config.tcPlant, ThaumcraftHelper.BlockPlant.SHIMMERLEAF.ordinal(), 2);
|
||||
world.setBlock(x, y, z, ThaumcraftHelper.plant, ThaumcraftHelper.BlockPlant.SHIMMERLEAF.ordinal(), 2);
|
||||
flag = true;
|
||||
} else if (blockDown == Blocks.sand) {
|
||||
world.setBlock(x, y, z, Config.tcPlant, ThaumcraftHelper.BlockPlant.CINDERPEARL.ordinal(), 2);
|
||||
world.setBlock(x, y, z, ThaumcraftHelper.plant, ThaumcraftHelper.BlockPlant.CINDERPEARL.ordinal(), 2);
|
||||
flag = true;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user