From 338010ffe83e8eb744937737c99f7f07492e1e23 Mon Sep 17 00:00:00 2001 From: kordum Date: Thu, 11 May 2017 18:43:34 +0300 Subject: [PATCH] Code improve --- .../binnie/core/genetics/BeeBreedingSystem.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java index 2f0f0da5..b4d57388 100644 --- a/src/main/java/binnie/core/genetics/BeeBreedingSystem.java +++ b/src/main/java/binnie/core/genetics/BeeBreedingSystem.java @@ -12,7 +12,6 @@ import forestry.api.apiculture.IApiaristTracker; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeMutation; import forestry.api.apiculture.IBeeRoot; -import forestry.api.genetics.AlleleManager; import forestry.api.genetics.EnumTolerance; import forestry.api.genetics.IAllele; import forestry.api.genetics.IBreedingTracker; @@ -96,38 +95,38 @@ class BeeBreedingSystem extends BreedingSystem { switch ((EnumBeeChromosome) chromosome) { case FERTILITY: for (EnumAllele.Fertility fertility : EnumAllele.Fertility.values()) { - alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(fertility))); + alleles.add(AlleleHelper.getAllele(fertility)); } break; case FLOWERING: for (EnumAllele.Flowering flowering : EnumAllele.Flowering.values()) { - alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(flowering))); + alleles.add(AlleleHelper.getAllele(flowering)); } break; case HUMIDITY_TOLERANCE: case TEMPERATURE_TOLERANCE: for (EnumTolerance tolerance : EnumTolerance.values()) { - alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(tolerance))); + alleles.add(AlleleHelper.getAllele(tolerance)); } break; case LIFESPAN: for (EnumAllele.Lifespan lifespan : EnumAllele.Lifespan.values()) { - alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(lifespan))); + alleles.add(AlleleHelper.getAllele(lifespan)); } break; case SPEED: for (EnumAllele.Speed speed : EnumAllele.Speed.values()) { - alleles.add(AlleleManager.alleleRegistry.getAllele(AlleleHelper.getUid(speed))); + alleles.add(AlleleHelper.getAllele(speed)); } break; case TERRITORY: - for (ForestryAllele.Territory a6 : ForestryAllele.Territory.values()) { - alleles.add(a6.getAllele()); + for (EnumAllele.Territory territory : EnumAllele.Territory.values()) { + alleles.add(AlleleHelper.getAllele(territory)); } break;