From 98a38a1f6eab482637e39b070849dacce8c5e7fa Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Wed, 22 May 2013 00:42:49 -0700 Subject: [PATCH] Forestry 2.2.4 API break updates. --- thaumicbees_res/build.xml | 29 +++++++------------ thaumicbees_res/changelog.txt | 4 +++ thaumicbees_src/thaumicbees/bees/Allele.java | 7 ++++- .../thaumicbees/bees/AlleleEffect.java | 14 +-------- .../thaumicbees/bees/AlleleEffectPotion.java | 13 --------- .../thaumicbees/bees/AlleleFlower.java | 4 +-- .../thaumicbees/bees/BeeMutation.java | 4 +-- .../thaumicbees/bees/BeeSpecies.java | 18 ++++++++++-- .../bees/FlowerProviderArsMagicaFlower.java | 15 +++++----- .../bees/FlowerProviderAuraNode.java | 12 ++++---- .../bees/FlowerProviderBookshelf.java | 12 ++++---- .../bees/FlowerProviderThaumcraftFlower.java | 20 +++++-------- .../tileentity/EffectJarHousing.java | 12 ++++++-- .../tileentity/TileEntityEffectJar.java | 5 ++-- 14 files changed, 80 insertions(+), 89 deletions(-) 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 82547ad..c3ee805 100644 --- a/thaumicbees_src/thaumicbees/bees/Allele.java +++ b/thaumicbees_src/thaumicbees/bees/Allele.java @@ -4,13 +4,16 @@ 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 { + public static IBeeRoot beeRoot; + public static AlleleInteger fertilityHighDominant; public static AlleleFloat speedBlinding; @@ -43,6 +46,8 @@ public class Allele implements IAllele public static void setupAdditionalAlleles() { + beeRoot = (IBeeRoot)AlleleManager.alleleRegistry.getSpeciesRoot("rootBees"); + Allele.fertilityHighDominant = new AlleleInteger("fertilityHighDominant", 3, true); Allele.speedBlinding = new AlleleFloat("speedBlinding", 2f, false); diff --git a/thaumicbees_src/thaumicbees/bees/AlleleEffect.java b/thaumicbees_src/thaumicbees/bees/AlleleEffect.java index e4a125f..43ce5ff 100644 --- a/thaumicbees_src/thaumicbees/bees/AlleleEffect.java +++ b/thaumicbees_src/thaumicbees/bees/AlleleEffect.java @@ -52,21 +52,9 @@ public abstract class AlleleEffect extends Allele implements IAlleleBeeEffect area[2] = Math.max((int)(area[2] * mod), 1); ThaumicBees.proxy.drawBeeEffects(housing.getWorld(), housing.getXCoord(), housing.getYCoord(), housing.getZCoord(), - genome.getPrimaryAsBee().getIconColour(0), area[0], area[1], area[2]); + 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/BeeMutation.java b/thaumicbees_src/thaumicbees/bees/BeeMutation.java index dae0eb6..da995d0 100644 --- a/thaumicbees_src/thaumicbees/bees/BeeMutation.java +++ b/thaumicbees_src/thaumicbees/bees/BeeMutation.java @@ -325,7 +325,7 @@ public class BeeMutation implements IBeeMutation this.requiredBlockMeta = OreDictionary.WILDCARD_VALUE; this.requiredBlockOreDictEntry = null; - BeeManager.breedingManager.registerBeeMutation(this); + Allele.beeRoot.registerMutation(this); } public float getChance(IBeeHousing housing, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) @@ -404,7 +404,7 @@ public class BeeMutation implements IBeeMutation finalChance = Math.round(chance * housing.getMutationModifier((IBeeGenome) genome0, (IBeeGenome) genome1, chance) - * BeeManager.breedingManager.getBeekeepingMode(housing.getWorld()) + * Allele.beeRoot.getBeekeepingMode(housing.getWorld()) .getMutationModifier((IBeeGenome) genome0, (IBeeGenome) genome1, chance)); } diff --git a/thaumicbees_src/thaumicbees/bees/BeeSpecies.java b/thaumicbees_src/thaumicbees/bees/BeeSpecies.java index 68e2eb6..62010cf 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; @@ -544,7 +546,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider public ItemStack getBeeItem(EnumBeeType beeType) { - return BeeManager.beeInterface.getBeeStack(BeeManager.beeInterface.getBee(null, BeeManager.beeInterface.templateAsGenome(genomeTemplate)), beeType); + return Allele.beeRoot.getMemberStack(Allele.beeRoot.getBee(null, Allele.beeRoot.templateAsGenome(genomeTemplate)), beeType.ordinal()); } @Override @@ -642,6 +644,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) { @@ -650,7 +664,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider private BeeSpecies register() { - BeeManager.breedingManager.registerBeeTemplate(this.getGenome()); + Allele.beeRoot.registerTemplate(this.getGenome()); if (!this.isActive) { AlleleManager.alleleRegistry.blacklistAllele(this.getUID()); 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; } diff --git a/thaumicbees_src/thaumicbees/tileentity/EffectJarHousing.java b/thaumicbees_src/thaumicbees/tileentity/EffectJarHousing.java index 7bdb183..79c72da 100644 --- a/thaumicbees_src/thaumicbees/tileentity/EffectJarHousing.java +++ b/thaumicbees_src/thaumicbees/tileentity/EffectJarHousing.java @@ -1,5 +1,6 @@ package thaumicbees.tileentity; +import thaumicbees.bees.Allele; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import forestry.api.apiculture.BeeManager; @@ -8,6 +9,7 @@ import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import forestry.api.core.EnumHumidity; import forestry.api.core.EnumTemperature; +import forestry.api.genetics.IIndividual; /** * @@ -146,7 +148,7 @@ public class EffectJarHousing implements IBeeHousing ItemStack stack = this.jarEntity.getStackInSlot(TileEntityEffectJar.QUEEN_SLOT); if (stack != null) { - IBee queen = BeeManager.beeInterface.getBee(stack); + IBee queen = Allele.beeRoot.getMember(stack); temp = queen.getGenome().getPrimary().getTemperature(); } return temp; @@ -159,7 +161,7 @@ public class EffectJarHousing implements IBeeHousing ItemStack stack = this.jarEntity.getStackInSlot(TileEntityEffectJar.QUEEN_SLOT); if (stack != null) { - IBee queen = BeeManager.beeInterface.getBee(stack); + IBee queen = Allele.beeRoot.getMember(stack); humid = queen.getGenome().getPrimary().getHumidity(); } return humid; @@ -198,4 +200,10 @@ public class EffectJarHousing implements IBeeHousing return true; } + @Override + public boolean onPollenRetrieved(IBee queen, IIndividual pollen, boolean isHandled) + { + return false; + } + } diff --git a/thaumicbees_src/thaumicbees/tileentity/TileEntityEffectJar.java b/thaumicbees_src/thaumicbees/tileentity/TileEntityEffectJar.java index b14c83f..eb0c40f 100644 --- a/thaumicbees_src/thaumicbees/tileentity/TileEntityEffectJar.java +++ b/thaumicbees_src/thaumicbees/tileentity/TileEntityEffectJar.java @@ -1,5 +1,6 @@ package thaumicbees.tileentity; +import thaumicbees.bees.Allele; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -67,7 +68,7 @@ public class TileEntityEffectJar extends TileEntity implements IInventory { if (this.beeSlots[QUEEN_SLOT] != null) { - IBee queen = BeeManager.beeInterface.getBee(this.beeSlots[QUEEN_SLOT]); + IBee queen = Allele.beeRoot.getMember(this.beeSlots[QUEEN_SLOT]); currentBeeHealth = (queen.getHealth() * 100) / queen.getMaxHealth(); currentBeeColour = ((IAlleleBeeSpecies)queen.getGenome().getPrimary()).getIconColour(0); @@ -108,7 +109,7 @@ public class TileEntityEffectJar extends TileEntity implements IInventory ItemStack droneStack = this.beeSlots[DRONE_SLOT]; if (BeeManager.beeInterface.isDrone(droneStack)) { - IBee bee = BeeManager.beeInterface.getBee(droneStack); + IBee bee = Allele.beeRoot.getMember(droneStack); if (droneStack.stackSize == 1) { this.beeSlots[DRONE_SLOT] = null;