mirror of
https://github.com/GTNewHorizons/MagicBees.git
synced 2026-11-16 18:45:11 +00:00
Cleaning up some warnings hanging around. (Damn you, type erasure.)
Adding descriptions to a bunch of bees missing them.
This commit is contained in:
1 parent
21b26e491c
commit
975a63afef
6 files changed
+26
-26
No files matched your search
@@ -1,7 +1,6 @@
|
||||
package magicbees.bees;
|
||||
|
||||
import magicbees.api.MagicBeesAPI;
|
||||
import magicbees.api.bees.ITransmutationEffectLogic;
|
||||
import magicbees.bees.allele.effect.AlleleEffectCrumbling;
|
||||
import magicbees.bees.allele.effect.AlleleEffectCure;
|
||||
import magicbees.bees.allele.effect.AlleleEffectPotion;
|
||||
|
||||
@@ -58,6 +58,7 @@ public abstract class AlleleEffect extends Allele implements IAlleleBeeEffect
|
||||
return Allele.forestryBaseEffect.doFX(genome, storedData, housing);
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
protected List<Entity> getEntitiesWithinRange(IBeeGenome genome, IBeeHousing housing)
|
||||
{
|
||||
// Get the size of the affected area
|
||||
@@ -76,7 +77,7 @@ public abstract class AlleleEffect extends Allele implements IAlleleBeeEffect
|
||||
max[2] = housing.getZCoord() + area[2] / 2;
|
||||
|
||||
AxisAlignedBB bounds = AxisAlignedBB.getBoundingBox(min[0], min[1], min[2], max[0], max[1], max[2]);
|
||||
return housing.getWorld().getEntitiesWithinAABB(EntityPlayer.class, bounds);
|
||||
return (List<Entity>)housing.getWorld().getEntitiesWithinAABB(EntityPlayer.class, bounds);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -6,7 +6,6 @@ import forestry.api.genetics.IFlowerProvider;
|
||||
|
||||
public class AlleleFlower extends Allele implements IAlleleFlowers
|
||||
{
|
||||
private String uid;
|
||||
private IFlowerProvider provider;
|
||||
|
||||
public AlleleFlower(String uid, IFlowerProvider flowerProvider, boolean isDominant)
|
||||
|
||||
@@ -51,7 +51,7 @@ public enum BeeClassification implements IClassification
|
||||
this.uID = "classification." + name.toLowerCase();
|
||||
this.latin = scientific;
|
||||
this.level = EnumClassLevel.GENUS;
|
||||
this.species = new ArrayList();
|
||||
this.species = new ArrayList<IAlleleSpecies>();
|
||||
this.parent = AlleleManager.alleleRegistry.getClassification("family.apidae");
|
||||
AlleleManager.alleleRegistry.registerClassification(this);
|
||||
}
|
||||
|
||||
@@ -11,7 +11,6 @@ import magicbees.main.Config;
|
||||
import magicbees.main.utils.Tuple;
|
||||
import magicbees.main.utils.compat.ExtraBeesHelper;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import forestry.api.apiculture.EnumBeeChromosome;
|
||||
import forestry.api.apiculture.EnumBeeType;
|
||||
import forestry.api.apiculture.IAlleleBeeSpecies;
|
||||
import forestry.api.apiculture.IBee;
|
||||
|
||||
@@ -253,6 +253,8 @@ magicbees.speciesSpidery=Spidery
|
||||
magicbees.speciesSpidery.description=Spiderbee; n. Does whatever a spider-bee does.|Unknown
|
||||
magicbees.speciesSmouldering=Smouldering
|
||||
magicbees.speciesSmouldering.description=The Skulking bees have become alight with the fire of the ever-burning Blazes.|Apinomicon
|
||||
magicbees.speciesBigBad=Big Bad
|
||||
magicbees.speciesBigBad.description="Who is afraid of the Big Bad Chris?"|Pahimar, last words
|
||||
|
||||
magicbees.speciesTimely=Timely
|
||||
magicbees.speciesTimely.description="An apiarist is never late. He arrives precisely when he means to!"|Sengir, Mad Apiarist
|
||||
@@ -390,47 +392,47 @@ magicbees.speciesTEDante.description=Mixing bees in an inferno produces surprisi
|
||||
magicbees.speciesTEPyro=Pyro
|
||||
magicbees.speciesTEPyro.description=You Monster.|Everyone, to you.
|
||||
magicbees.speciesTEElectrum=Electrum
|
||||
magicbees.speciesTEElectrum.description=...|Apinomicon
|
||||
magicbees.speciesTEElectrum.description=The best of both precious metals, but somehow greater than both.|Apinomicon
|
||||
magicbees.speciesTEPlatinum=Platinum
|
||||
magicbees.speciesTEPlatinum.description=...|Apinomicon
|
||||
magicbees.speciesTEPlatinum.description=Precious, malleable, and unbelieveably shiny.|Apinomicon
|
||||
magicbees.speciesTENickel=Nickel
|
||||
magicbees.speciesTENickel.description=...|Apinomicon
|
||||
magicbees.speciesTENickel.description="If I had a Nickel every time I've heard that... I'd have a hive!"|Marquis Muskrat
|
||||
magicbees.speciesTEInvar=Invar
|
||||
magicbees.speciesTEInvar.description=...|Apinomicon
|
||||
magicbees.speciesTEBronze=Tinker
|
||||
magicbees.speciesTEBronze.description=...|Apinomicon
|
||||
magicbees.speciesTEInvar.description="The coefficient of thermal expansion is quite low. Also, it's a pun!"|Marquis Muskrat
|
||||
magicbees.speciesTEBronze=Bronzed
|
||||
magicbees.speciesTEBronze.description="I love these bees so much, I had them preserved for later."|Marquis Muskrat
|
||||
magicbees.speciesTECoal=Carbon
|
||||
magicbees.speciesTECoal.description=...|Apinomicon
|
||||
magicbees.speciesTECoal.description="Geeze, these ones are a CARBON copy of the ones in Extra Bees!"|Marquis Muskrat
|
||||
magicbees.speciesTEDestabilized=Destabilized
|
||||
magicbees.speciesTEDestabilized.description=These bees started out unstable; they didn't get better with time.|Apinomicon
|
||||
magicbees.speciesTELux=Lux
|
||||
magicbees.speciesTELux.description=Let there be light...|Apinomicon
|
||||
magicbees.speciesTELux.description="Let there be light!"|Marquis Muskrat
|
||||
magicbees.speciesTEWinsome=Winsome
|
||||
magicbees.speciesTEWinsome.description=....|Apinomicon
|
||||
magicbees.speciesTEWinsome.description="I like these ones, they're so adorable!"|Jadedcat, maker of packs
|
||||
magicbees.speciesTEEndearing=Endearing
|
||||
magicbees.speciesTEEndearing.description=....|Apinomicon
|
||||
magicbees.speciesTEEndearing.description="Hypnotic powers and vicious temperment aside, these bees are the cutest!"|Jadedcat, maker of packs
|
||||
magicbees.speciesRSAFluxed=Fluxed
|
||||
magicbees.speciesRSAFluxed.description=....|Apinomicon
|
||||
magicbees.speciesRSAFluxed.description="What? Bees are OP."|Marquis Muskrat
|
||||
magicbees.speciesBMBloody=Bloody
|
||||
magicbees.speciesBMBloody.description=....|Apinomicon
|
||||
magicbees.speciesBMBloody.description=Infused with the power of blood, they now seek additional power.|Apinomicon
|
||||
magicbees.speciesBMBound=Bound
|
||||
magicbees.speciesBMBound.description=....|Apinomicon
|
||||
magicbees.speciesBMBound.description="You're... CERTAIN to like these ones!"|WayOfFlowingTime, terrible punster
|
||||
magicbees.speciesBotRooted=Rooted
|
||||
magicbees.speciesBotRooted.description=....
|
||||
magicbees.speciesBotRooted.description="If you square these bees, they won't be rooted anymore."|MysteriousAges, bad at math jokes
|
||||
magicbees.speciesBotBotanic=Botanic
|
||||
magicbees.speciesBotBotanic.description=....
|
||||
magicbees.speciesBotBotanic.description=Infused with mystical life, they propogate mystical flowers.|Apinomicon
|
||||
magicbees.speciesBotBlossom=Blossom
|
||||
magicbees.speciesBotBlossom.description=....
|
||||
magicbees.speciesBotBlossom.description=The mere presence of these bees encourages buds to flower faster.|Apinomicon
|
||||
magicbees.speciesBotFloral=Floral
|
||||
magicbees.speciesBotFloral.description=....
|
||||
magicbees.speciesBotFloral.description=They love flowers so much, they pratically bring the blossoms back to the hive.|Apinomicon
|
||||
magicbees.speciesBotVazbee=Vazbee
|
||||
magicbees.speciesBotVazbee.description=....
|
||||
magicbees.speciesBotVazbee.description=This isn't a cosplay bee!|Lexica Botania
|
||||
magicbees.speciesBotSomnolent=Somnolent
|
||||
magicbees.speciesBotSomnolent.description=....
|
||||
magicbees.speciesBotSomnolent.description=Slow and sluggish, they work slowly compared to most other species.|Apinomicon
|
||||
magicbees.speciesBotDreaming=Dreaming
|
||||
magicbees.speciesBotDreaming.description=....
|
||||
magicbees.speciesBotDreaming.description=These bees spend an inordinate time inactive and asleep; there is no way to know what they dream of.|Apinomicon
|
||||
magicbees.speciesBotAlfheim=Alfheim
|
||||
magicbees.speciesBotAlfheim.description=....
|
||||
magicbees.speciesBotAlfheim.description=They recall their time in Alfheim, and yearn for a world infused with mana, and so seek to make it so.|Apinomicon
|
||||
magicbees.species=
|
||||
magicbees.species.description=
|
||||
magicbees.speedBlinding=Blinding
|
||||
|
||||
Reference in new issue
Block a user