Moving to Forestry 3.6; updating deprecated methods to new versions.

build.gradle

@@ -74,3 +74,6 @@ task deobfJar(type: Jar) { // Generate deobfuscated
     from sourceSets.main.output
     classifier = 'deobf'
 }
+
+task fullBuild(dependsOn: ['build', 'deobfJar']) {
+}

gradle.properties

@@ -1,8 +1,8 @@
 version_major=2
 version_minor=3
-version_rev=3
+version_rev=4
 
-version_forestry=3.4.0.7
+version_forestry=3.6.3.20
 version_bloodmagic=1.3.3-4
 version_botania=r1.6-197
 

src/main/java/magicbees/bees/BeeSpecies.java

@@ -555,8 +555,8 @@ public static void setupBeeSpecies() {
 	private boolean isActive;
 	private boolean isNocturnal;
 	private IClassification branch;
-	private HashMap<ItemStack, Integer> products;
-	private HashMap<ItemStack, Integer> specialties;
+	private HashMap<ItemStack, Float> products;
+	private HashMap<ItemStack, Float> specialties;
 	private IAllele genomeTemplate[];
 	private String uid;
 	private boolean dominant;
@@ -603,8 +603,8 @@ private BeeSpecies(String speciesName, String genusName, IClassification classif
 		hasEffect = hasGlowEffect;
 		isSecret = isSpeciesSecret;
 		isCounted = isSpeciesCounted;
-		products = new HashMap<ItemStack, Integer>();
-		specialties = new HashMap<ItemStack, Integer>();
+		products = new HashMap<ItemStack, Float>();
+		specialties = new HashMap<ItemStack, Float>();
 		this.branch = classification;
 		this.branch.addMemberSpecies(this);
 		this.isNocturnal = isSpeciesNocturnal;
@@ -615,13 +615,25 @@ public IAllele[] getGenome() {
 		return genomeTemplate;
 	}
 
+	@Deprecated
 	public BeeSpecies addProduct(ItemStack produce, int percentChance) {
-		products.put(produce, percentChance);
+		products.put(produce, percentChance / 100f);
+		return this;
+	}
+
+	public BeeSpecies addProduct(ItemStack produce, float chance) {
+		products.put(produce, chance);
 		return this;
 	}
 
+	@Deprecated
 	public BeeSpecies addSpecialty(ItemStack produce, int percentChance) {
-		specialties.put(produce, Integer.valueOf(percentChance));
+		specialties.put(produce, percentChance / 100f);
+		return this;
+	}
+
+	public BeeSpecies addSpecialty(ItemStack produce, float chance) {
+		specialties.put(produce, chance);
 		return this;
 	}
 
@@ -695,15 +707,27 @@ public IClassification getBranch() {
 	}
 
 	@Override
-	public HashMap<ItemStack, Integer> getProducts() {
+	public Map<ItemStack, Float> getProductChances() {
 		return products;
 	}
 
 	@Override
-	public HashMap<ItemStack, Integer> getSpecialty() {
+	public Map<ItemStack, Float> getSpecialtyChances() {
 		return specialties;
 	}
 
+	@Override
+	@Deprecated
+	public HashMap<ItemStack, Integer> getProducts() {
+		return null;
+	}
+
+	@Override
+	@Deprecated
+	public HashMap<ItemStack, Integer> getSpecialty() {
+		return null;
+	}
+
 	@Override
 	public String getUID() {
 		return this.uid;

src/main/java/magicbees/bees/allele/flowerProvider/FlowerImpl.java

@@ -0,0 +1,50 @@
+package magicbees.bees.allele.flowerProvider;
+
+import net.minecraft.block.Block;
+import forestry.api.genetics.IFlower;
+
+public class FlowerImpl implements IFlower {
+
+	private Block flowerBlock;
+	private int meta;
+	private double weight;
+	private boolean plantable;
+
+	public FlowerImpl(Block flower, int blockMeta, double flowerWeight, boolean isPlantable) {
+		flowerBlock = flower;
+		meta = blockMeta;
+		weight = flowerWeight;
+		plantable = isPlantable;
+	}
+
+	@Override
+	public Block getBlock() {
+		return flowerBlock;
+	}
+
+	@Override
+	public int getMeta() {
+		return meta;
+	}
+
+	@Override
+	public double getWeight() {
+		return weight;
+	}
+
+	@Override
+	public void setWeight(double value) {
+		weight = value;
+	}
+
+	@Override
+	public boolean isPlantable() {
+		return plantable;
+	}
+
+	@Override
+	public int compareTo(IFlower other) {
+		return (int)(weight - other.getWeight());
+	}
+
+}

src/main/java/magicbees/bees/allele/flowerProvider/FlowerProvider.java

@@ -0,0 +1,50 @@
+package magicbees.bees.allele.flowerProvider;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import forestry.api.genetics.IFlower;
+import forestry.api.genetics.IFlowerProvider;
+import forestry.api.genetics.IIndividual;
+import forestry.api.genetics.IPollinatable;
+
+public abstract class FlowerProvider implements IFlowerProvider {
+
+	protected List<IFlower> flowers;
+
+	public FlowerProvider(int size) {
+		flowers = new ArrayList<IFlower>(size);
+	}
+
+	@Override
+	public boolean isAcceptedFlower(World world, IIndividual genome, int x, int y, int z) {
+		Block block = world.getBlock(x, y, z);
+		for (IFlower flower : flowers) {
+			if (flower.getBlock() == block) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public List<IFlower> getFlowers() {
+		return flowers;
+	}
+
+	@Override
+	public abstract boolean isAcceptedPollinatable(World world, IPollinatable pollinatable);
+
+	@Override
+	public abstract boolean growFlower(World world, IIndividual individual, int x, int y, int z);
+
+	@Override
+	public abstract String getDescription();
+
+	@Override
+	public abstract ItemStack[] affectProducts(World world, IIndividual individual, int x, int y, int z, ItemStack[] products);
+
+}

src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderArsMagicaFlower.java

@@ -6,23 +6,18 @@
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
-import forestry.api.genetics.IFlowerProvider;
 import forestry.api.genetics.IIndividual;
 import forestry.api.genetics.IPollinatable;
 
-public class FlowerProviderArsMagicaFlower implements IFlowerProvider {
-	private ItemStack[] flowers = { new ItemStack(Config.amBlackOrchid), new ItemStack(Config.amDesertNova), new ItemStack(Config.amAum),
-			new ItemStack(Config.amWakebloom), new ItemStack(Config.amTarmaRoot) };
-
-	@Override
-	public boolean isAcceptedFlower(World world, IIndividual genome, int x, int y, int z) {
-		boolean flag = false;
-		Block block = world.getBlock(x, y, z);
-		if (block == Config.amBlackOrchid || block == Config.amDesertNova || block == Config.amAum || block == Config.amWakebloom
-				|| block == Config.amTarmaRoot) {
-			flag = true;
-		}
-		return flag;
+public class FlowerProviderArsMagicaFlower extends FlowerProvider {
+
+	public FlowerProviderArsMagicaFlower() {
+		super(5);
+		flowers.add(new FlowerImpl(Config.amBlackOrchid, 0, 1, true));
+		flowers.add(new FlowerImpl(Config.amDesertNova, 0, 1, true));
+		flowers.add(new FlowerImpl(Config.amAum, 0, 1, true));
+		flowers.add(new FlowerImpl(Config.amWakebloom, 0, 1, true));
+		flowers.add(new FlowerImpl(Config.amTarmaRoot, 0, 1, true));
 	}
 
 	@Override
@@ -66,11 +61,6 @@ public ItemStack[] affectProducts(World world, IIndividual genome, int x, int y,
 		return products;
 	}
 
-	@Override
-	public ItemStack[] getItemStacks() {
-		return this.flowers;
-	}
-
 	@Override
 	public boolean isAcceptedPollinatable(World world, IPollinatable pollinatable) {
 		return pollinatable.getPlantType().size() > 1;

src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderAuraNode.java

@@ -1,18 +1,24 @@
 package magicbees.bees.allele.flowerProvider;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import magicbees.main.utils.LocalizationManager;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
-import forestry.api.genetics.IFlowerProvider;
+import forestry.api.genetics.IFlower;
 import forestry.api.genetics.IIndividual;
 import forestry.api.genetics.IPollinatable;
 
-public class FlowerProviderAuraNode implements IFlowerProvider {
-	protected int nodeRange = 70;
+public class FlowerProviderAuraNode extends FlowerProvider {
+
+	public FlowerProviderAuraNode() {
+		super(0);
+	}
 
 	@Override
 	public boolean isAcceptedFlower(World world, IIndividual genome, int x, int y, int z) {
-		return this.isNodeWithinRange(world, x, y, z);
+		return false;
 	}
 
 	@Override
@@ -32,34 +38,12 @@ public String getDescription() {
 
 	@Override
 	public ItemStack[] affectProducts(World world, IIndividual genome, int x, int y, int z, ItemStack[] products) {
+		if (isAcceptedFlower(world, genome, x, y, z)) {
+
+		}
 		return products;
 	}
 
-	@Override
-	public ItemStack[] getItemStacks() {
-		return null;
-	}
-
-	protected boolean isNodeWithinRange(World w, int x, int y, int z) {
-		boolean nodeNearby = false;
-		/*
-		 * if (ThaumcraftApi.getClosestAuraWithinRange(w, x, y, z,
-		 * this.nodeRange) >= 0) { nodeNearby = true; }
-		 */
-		return nodeNearby;
-	}
-
-	/*
-	 * protected AuraNode getNodeWithinRange(World w, int x, int y, int z) {
-	 * AuraNode node = null;
-	 * 
-	 * int nodeId = ThaumcraftApi.getClosestAuraWithinRange(w, x, y, z,
-	 * this.nodeRange); if (nodeId >= 0) { node =
-	 * ThaumcraftApi.getNodeCopy(nodeId); }
-	 * 
-	 * return node; }
-	 */
-
 	protected ItemStack[] addItemToProducts(ItemStack[] products, ItemStack itemStack) {
 		for (ItemStack stack : products) {
 			if (stack.getItem() == itemStack.getItem() && stack.getItemDamage() == itemStack.getItemDamage()) {
@@ -82,4 +66,9 @@ protected ItemStack[] addItemToProducts(ItemStack[] products, ItemStack itemStac
 		return products;
 	}
 
+	@Override
+	public List<IFlower> getFlowers() {
+		return new ArrayList<IFlower>();
+	}
+
 }

src/main/java/magicbees/bees/allele/flowerProvider/FlowerProviderBookshelf.java

@@ -7,11 +7,16 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraftforge.common.EnumPlantType;
-import forestry.api.genetics.IFlowerProvider;
+import net.minecraftforge.oredict.OreDictionary;
 import forestry.api.genetics.IIndividual;
 import forestry.api.genetics.IPollinatable;
 
-public class FlowerProviderBookshelf implements IFlowerProvider {
+public class FlowerProviderBookshelf extends FlowerProvider {
+
+	public FlowerProviderBookshelf() {
+		super(1);
+		flowers.add(new FlowerImpl(Blocks.bookshelf, OreDictionary.WILDCARD_VALUE, 1, false));
+	}
 
 	public boolean isAcceptedFlower(World world, IIndividual genome, int x, int i, int j) {
 		boolean flag = false;
@@ -21,26 +26,23 @@ public boolean isAcceptedFlower(World world, IIndividual genome, int x, int i, i
 		return flag;
 	}
 
+	@Override
 	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;
 	}
 
+	@Override
 	public ItemStack[] affectProducts(World world, IIndividual genome, int x, int i, int j, ItemStack products[]) {
 		return products;
 	}
 
-	public ItemStack[] getItemStacks() {
-		return new ItemStack[] { new ItemStack(Blocks.bookshelf) };
-	}
-
 	@Override
 	public boolean isAcceptedPollinatable(World world, IPollinatable pollinatable) {
 		EnumSet<EnumPlantType> types = pollinatable.getPlantType();
 		return types.size() > 0 && !types.contains(EnumPlantType.Nether) && !types.contains(EnumPlantType.Water);
 	}
 
+	@Override
 	public String getDescription() {
 		return LocalizationManager.getLocalizedString("flowerProvider.book");
 	}