From 5052df884458b39dbc7e509cf3cbb0681993e18c Mon Sep 17 00:00:00 2001 From: mezz Date: Tue, 29 Sep 2015 21:08:34 -0700 Subject: [PATCH] Revert "Fix breaking change to the API in IMutation" This reverts commit f020dcf2e233c3177a4a8659e199ca4f2ecc1004. --- api/forestry | 2 +- .../java/forestry/core/genetics/ItemResearchNote.java | 4 ++-- .../forestry/core/genetics/mutations/Mutation.java | 10 ---------- src/main/java/forestry/core/utils/GeneticsUtil.java | 10 ++++------ 4 files changed, 7 insertions(+), 19 deletions(-) diff --git a/api/forestry b/api/forestry index 73da80bca..87d0201ad 160000 --- a/api/forestry +++ b/api/forestry @@ -1 +1 @@ -Subproject commit 73da80bca5efde424a2a8921985ce919bc6ef0dd +Subproject commit 87d0201ad926ad9d5c06a7181aaabe3587a5b97a diff --git a/src/main/java/forestry/core/genetics/ItemResearchNote.java b/src/main/java/forestry/core/genetics/ItemResearchNote.java index 1c0719c5d..deb3f408e 100755 --- a/src/main/java/forestry/core/genetics/ItemResearchNote.java +++ b/src/main/java/forestry/core/genetics/ItemResearchNote.java @@ -142,8 +142,8 @@ public class ItemResearchNote extends ItemForestry { return false; } - IAlleleSpecies species0 = (IAlleleSpecies) encoded.getAllele0(); - IAlleleSpecies species1 = (IAlleleSpecies) encoded.getAllele1(); + IAlleleSpecies species0 = encoded.getAllele0(); + IAlleleSpecies species1 = encoded.getAllele1(); IAlleleSpecies speciesResult = (IAlleleSpecies) encoded.getTemplate()[root.getKaryotypeKey().ordinal()]; tracker.registerSpecies(species0); diff --git a/src/main/java/forestry/core/genetics/mutations/Mutation.java b/src/main/java/forestry/core/genetics/mutations/Mutation.java index b7666e66d..85cbaefda 100644 --- a/src/main/java/forestry/core/genetics/mutations/Mutation.java +++ b/src/main/java/forestry/core/genetics/mutations/Mutation.java @@ -139,16 +139,6 @@ public abstract class Mutation implements IMutationCustom { return species1; } - @Override - public IAlleleSpecies getSpecies0() { - return species0; - } - - @Override - public IAlleleSpecies getSpecies1() { - return species1; - } - @Override public float getBaseChance() { return chance; diff --git a/src/main/java/forestry/core/utils/GeneticsUtil.java b/src/main/java/forestry/core/utils/GeneticsUtil.java index c462fbfa8..16f1dc954 100644 --- a/src/main/java/forestry/core/utils/GeneticsUtil.java +++ b/src/main/java/forestry/core/utils/GeneticsUtil.java @@ -192,16 +192,14 @@ public class GeneticsUtil { exclude.add(species); for (IMutation mutation : species.getRoot().getPaths(species, speciesChromosome)) { - IAlleleSpecies species0 = (IAlleleSpecies) mutation.getAllele0(); - IAlleleSpecies species1 = (IAlleleSpecies) mutation.getAllele1(); - if (!exclude.contains(species0)) { - int otherAdvance = getGeneticAdvancement(species0, exclude, speciesChromosome); + if (!exclude.contains(mutation.getAllele0())) { + int otherAdvance = getGeneticAdvancement(mutation.getAllele0(), exclude, speciesChromosome); if (otherAdvance > highest) { highest = otherAdvance; } } - if (!exclude.contains(species1)) { - int otherAdvance = getGeneticAdvancement(species1, exclude, speciesChromosome); + if (!exclude.contains(mutation.getAllele1())) { + int otherAdvance = getGeneticAdvancement(mutation.getAllele1(), exclude, speciesChromosome); if (otherAdvance > highest) { highest = otherAdvance; }