Revert "Use generics for Chromosome type, begin unifying code"

This reverts commit 43e41034f6.

Conflicts:
	src/main/java/forestry/api/arboriculture/IAlleleTreeSpecies.java
	src/main/java/forestry/api/genetics/IAlleleSpeciesCustom.java
	src/main/java/forestry/core/proxy/ProxyRenderClient.java
This commit is contained in:
mezz committed 2016-03-03 20:50:38 -08:00
1 parent 87f2dc0a0a
commit efcab41e04
217 files changed
+2408 -3136

No files matched your search

@@ -21,8 +21,6 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import forestry.api.arboriculture.ITreeGenome;
import forestry.api.arboriculture.ITreeModifier;
import forestry.api.arboriculture.ITreekeepingMode;
import forestry.api.arboriculture.TreeManager;
import forestry.api.genetics.IFruitFamily;
@@ -53,9 +51,7 @@ public class FruitProviderRandom extends FruitProviderNone {
public ItemStack[] getFruits(ITreeGenome genome, World world, BlockPos pos, int ripeningTime) {
ArrayList<ItemStack> product = new ArrayList<>();
ITreekeepingMode mode = TreeManager.treeRoot.getMode(world);
ITreeModifier modifier = mode.getTreeModifier();
float modeYieldMod = modifier.getYieldModifier(genome, 1f);
float modeYieldMod = TreeManager.treeRoot.getTreekeepingMode(world).getYieldModifier(genome, 1f);
for (Map.Entry<ItemStack, Float> entry : products.entrySet()) {
if (world.rand.nextFloat() <= genome.getYield() * modeYieldMod * entry.getValue()) {