diff --git a/thaumicbees_res/build.xml b/thaumicbees_res/build.xml index 13df65b..b2bc431 100644 --- a/thaumicbees_res/build.xml +++ b/thaumicbees_res/build.xml @@ -1,23 +1,22 @@ - + - + - - + + - - - + + - - - + + + @@ -28,7 +27,6 @@ - @@ -64,9 +62,6 @@ - - - @@ -122,10 +117,6 @@ - - @@ -142,7 +133,7 @@ - + diff --git a/thaumicbees_res/changelog.txt b/thaumicbees_res/changelog.txt index 895a87a..4c597b2 100644 --- a/thaumicbees_res/changelog.txt +++ b/thaumicbees_res/changelog.txt @@ -1,3 +1,7 @@ +1.4.7a +Update for Forestry Beta. + +1.4.7 Added the Bee Collector's Jar. Created an alternate recipe for the Temporal Frame that is always active. Adjusted TC3 alternate recipe for the Temporal Frame. diff --git a/thaumicbees_src/thaumicbees/bees/Allele.java b/thaumicbees_src/thaumicbees/bees/Allele.java index d5ff126..c3ee805 100644 --- a/thaumicbees_src/thaumicbees/bees/Allele.java +++ b/thaumicbees_src/thaumicbees/bees/Allele.java @@ -4,11 +4,11 @@ import net.minecraft.potion.Potion; import thaumicbees.main.utils.compat.ArsMagicaHelper; import thaumicbees.main.utils.compat.ThaumcraftHelper; import forestry.api.apiculture.IAlleleBeeSpecies; -import forestry.api.apiculture.IAlleleFlowers; import forestry.api.apiculture.IBeeRoot; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IAlleleEffect; +import forestry.api.genetics.IAlleleFlowers; public class Allele implements IAllele { diff --git a/thaumicbees_src/thaumicbees/bees/AlleleEffect.java b/thaumicbees_src/thaumicbees/bees/AlleleEffect.java index 086c1e4..43ce5ff 100644 --- a/thaumicbees_src/thaumicbees/bees/AlleleEffect.java +++ b/thaumicbees_src/thaumicbees/bees/AlleleEffect.java @@ -55,18 +55,6 @@ public abstract class AlleleEffect extends Allele implements IAlleleBeeEffect genome.getPrimary().getIconColour(0), area[0], area[1], area[2]); return storedData; } - - @Override - public String getIconTextureFile() - { - return null; - } - - @Override - public int getIconIndex() - { - return -1; - } protected List getEntitiesWithinRange(IBeeGenome genome, IBeeHousing housing) { diff --git a/thaumicbees_src/thaumicbees/bees/AlleleEffectPotion.java b/thaumicbees_src/thaumicbees/bees/AlleleEffectPotion.java index a6c9b81..4279050 100644 --- a/thaumicbees_src/thaumicbees/bees/AlleleEffectPotion.java +++ b/thaumicbees_src/thaumicbees/bees/AlleleEffectPotion.java @@ -61,17 +61,4 @@ public class AlleleEffectPotion extends AlleleEffect return storedData; } - - @Override - public String getIconTextureFile() - { - return null; - } - - @Override - public int getIconIndex() - { - return -1; - } - } diff --git a/thaumicbees_src/thaumicbees/bees/AlleleFlower.java b/thaumicbees_src/thaumicbees/bees/AlleleFlower.java index bcef7be..aa62ef1 100644 --- a/thaumicbees_src/thaumicbees/bees/AlleleFlower.java +++ b/thaumicbees_src/thaumicbees/bees/AlleleFlower.java @@ -1,8 +1,8 @@ package thaumicbees.bees; -import forestry.api.apiculture.IAlleleFlowers; -import forestry.api.apiculture.IFlowerProvider; import forestry.api.genetics.AlleleManager; +import forestry.api.genetics.IAlleleFlowers; +import forestry.api.genetics.IFlowerProvider; public class AlleleFlower extends Allele implements IAlleleFlowers { diff --git a/thaumicbees_src/thaumicbees/bees/BeeSpecies.java b/thaumicbees_src/thaumicbees/bees/BeeSpecies.java index fb4b68f..9fdf8b0 100644 --- a/thaumicbees_src/thaumicbees/bees/BeeSpecies.java +++ b/thaumicbees_src/thaumicbees/bees/BeeSpecies.java @@ -24,10 +24,12 @@ import thaumicbees.main.utils.compat.ThaumcraftHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.apiculture.BeeManager; +import forestry.api.apiculture.EnumBeeChromosome; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; +import forestry.api.apiculture.IBeeRoot; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; import forestry.api.core.IIconProvider; @@ -692,6 +694,18 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider return this.dominant; } + @Override + public IBeeRoot getRoot() + { + return Allele.beeRoot; + } + + @Override + public boolean isNocturnal() + { + return this.genomeTemplate[EnumBeeChromosome.NOCTURNAL.ordinal()].equals(Allele.getBaseAllele("boolTrue")); + } + @Override public boolean isJubilant(IBeeGenome genome, IBeeHousing housing) { diff --git a/thaumicbees_src/thaumicbees/bees/FlowerProviderArsMagicaFlower.java b/thaumicbees_src/thaumicbees/bees/FlowerProviderArsMagicaFlower.java index c61b076..9c2d5a0 100644 --- a/thaumicbees_src/thaumicbees/bees/FlowerProviderArsMagicaFlower.java +++ b/thaumicbees_src/thaumicbees/bees/FlowerProviderArsMagicaFlower.java @@ -1,13 +1,12 @@ package thaumicbees.bees; -import thaumicbees.main.Config; -import thaumicbees.main.utils.LocalizationManager; -import thaumicbees.main.utils.compat.ThaumcraftHelper; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IFlowerProvider; +import thaumicbees.main.Config; +import thaumicbees.main.utils.LocalizationManager; +import forestry.api.genetics.IFlowerProvider; +import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; public class FlowerProviderArsMagicaFlower implements IFlowerProvider @@ -15,7 +14,7 @@ public class FlowerProviderArsMagicaFlower implements IFlowerProvider private ItemStack[] flowers = {new ItemStack(Config.amBlackOrchid), new ItemStack(Config.amDesertNova) }; @Override - public boolean isAcceptedFlower(World world, IBeeGenome genome, int x, int y, int z) + public boolean isAcceptedFlower(World world, IIndividual genome, int x, int y, int z) { boolean flag = false; int id = world.getBlockId(x, y, z); @@ -27,7 +26,7 @@ public class FlowerProviderArsMagicaFlower implements IFlowerProvider } @Override - public boolean growFlower(World world, IBeeGenome genome, int x, int y, int z) + public boolean growFlower(World world, IIndividual genome, int x, int y, int z) { boolean flag = false; int blockDown = world.getBlockId(x, y - 1, z); @@ -54,7 +53,7 @@ public class FlowerProviderArsMagicaFlower implements IFlowerProvider } @Override - public ItemStack[] affectProducts(World world, IBeeGenome genome, int x, int y, int z, ItemStack[] products) + public ItemStack[] affectProducts(World world, IIndividual genome, int x, int y, int z, ItemStack[] products) { return products; } diff --git a/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNode.java b/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNode.java index b0c8437..2651350 100644 --- a/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNode.java +++ b/thaumicbees_src/thaumicbees/bees/FlowerProviderAuraNode.java @@ -1,14 +1,12 @@ package thaumicbees.bees; -import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aura.AuraNode; -import thaumicbees.main.Config; import thaumicbees.main.utils.LocalizationManager; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IFlowerProvider; +import forestry.api.genetics.IFlowerProvider; +import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; public class FlowerProviderAuraNode implements IFlowerProvider @@ -16,7 +14,7 @@ public class FlowerProviderAuraNode implements IFlowerProvider protected int nodeRange = 70; @Override - public boolean isAcceptedFlower(World world, IBeeGenome genome, int x, int y, int z) + public boolean isAcceptedFlower(World world, IIndividual genome, int x, int y, int z) { return this.isNodeWithinRange(world, x, y, z); } @@ -28,7 +26,7 @@ public class FlowerProviderAuraNode implements IFlowerProvider } @Override - public boolean growFlower(World world, IBeeGenome genome, int x, int y, int z) + public boolean growFlower(World world, IIndividual genome, int x, int y, int z) { return true; } @@ -40,7 +38,7 @@ public class FlowerProviderAuraNode implements IFlowerProvider } @Override - public ItemStack[] affectProducts(World world, IBeeGenome genome, int x, int y, int z, ItemStack[] products) + public ItemStack[] affectProducts(World world, IIndividual genome, int x, int y, int z, ItemStack[] products) { return products; } diff --git a/thaumicbees_src/thaumicbees/bees/FlowerProviderBookshelf.java b/thaumicbees_src/thaumicbees/bees/FlowerProviderBookshelf.java index 1e5272f..5ba2919 100644 --- a/thaumicbees_src/thaumicbees/bees/FlowerProviderBookshelf.java +++ b/thaumicbees_src/thaumicbees/bees/FlowerProviderBookshelf.java @@ -2,20 +2,20 @@ package thaumicbees.bees; import java.util.EnumSet; -import thaumicbees.main.utils.LocalizationManager; -import cpw.mods.fml.common.registry.LanguageRegistry; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; +import thaumicbees.main.utils.LocalizationManager; import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IFlowerProvider; +import forestry.api.genetics.IFlowerProvider; +import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; public class FlowerProviderBookshelf implements IFlowerProvider { - public boolean isAcceptedFlower(World world, IBeeGenome genome, int x, int i, int j) + public boolean isAcceptedFlower(World world, IIndividual genome, int x, int i, int j) { boolean flag = false; if (world.getBlockId(x, i, j) == Block.bookShelf.blockID) @@ -25,14 +25,14 @@ public class FlowerProviderBookshelf implements IFlowerProvider return flag; } - public boolean growFlower(World world, IBeeGenome genome, int x, int i, int j) + public boolean growFlower(World world, IIndividual genome, int x, int i, int j) { // Always return true so the system thinks we grew a flower. // Bees can't grow bookshelves! Are you crazy?! return true; } - public ItemStack[] affectProducts(World world, IBeeGenome genome, int x, int i, int j, ItemStack products[]) + public ItemStack[] affectProducts(World world, IIndividual genome, int x, int i, int j, ItemStack products[]) { return products; } diff --git a/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java b/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java index 815a753..50a4382 100644 --- a/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java +++ b/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java @@ -1,17 +1,13 @@ package thaumicbees.bees; -import java.util.EnumSet; - -import cpw.mods.fml.common.registry.LanguageRegistry; -import thaumicbees.main.Config; -import thaumicbees.main.utils.LocalizationManager; -import thaumicbees.main.utils.compat.ThaumcraftHelper; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import net.minecraftforge.common.EnumPlantType; -import forestry.api.apiculture.IBeeGenome; -import forestry.api.apiculture.IFlowerProvider; +import thaumicbees.main.Config; +import thaumicbees.main.utils.LocalizationManager; +import thaumicbees.main.utils.compat.ThaumcraftHelper; +import forestry.api.genetics.IFlowerProvider; +import forestry.api.genetics.IIndividual; import forestry.api.genetics.IPollinatable; public class FlowerProviderThaumcraftFlower implements IFlowerProvider @@ -19,7 +15,7 @@ public class FlowerProviderThaumcraftFlower implements IFlowerProvider private ItemStack[] flowers = {new ItemStack(Config.tcPlant, 1, 2), new ItemStack(Config.tcPlant, 1, 3) }; @Override - public boolean isAcceptedFlower(World world, IBeeGenome genome, int x, int y, int z) + public boolean isAcceptedFlower(World world, IIndividual genome, int x, int y, int z) { boolean flag = false; if (world.getBlockId(x, y, z) == Config.tcPlant.blockID) @@ -34,7 +30,7 @@ public class FlowerProviderThaumcraftFlower implements IFlowerProvider } @Override - public boolean growFlower(World world, IBeeGenome genome, int x, int y, int z) + public boolean growFlower(World world, IIndividual genome, int x, int y, int z) { boolean flag = false; int blockDown = world.getBlockId(x, y - 1, z); @@ -61,7 +57,7 @@ public class FlowerProviderThaumcraftFlower implements IFlowerProvider } @Override - public ItemStack[] affectProducts(World world, IBeeGenome genome, int x, int y, int z, ItemStack[] products) + public ItemStack[] affectProducts(World world, IIndividual genome, int x, int y, int z, ItemStack[] products) { return products; }