From 419cebef33e9e19eefe128249996b861869f6b3d Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sat, 9 Sep 2017 20:44:19 +0200 Subject: [PATCH] Fix #1680 Display almost all butterflies --- .../genetics/MothDefinition.java | 6 +++-- .../alleles/AlleleButterflySpecies.java | 26 +++++++++++-------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java b/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java index ab2b0fe81..f76d2b822 100644 --- a/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java +++ b/src/main/java/forestry/lepidopterology/genetics/MothDefinition.java @@ -13,6 +13,9 @@ package forestry.lepidopterology.genetics; import java.awt.Color; import java.util.Arrays; import java.util.Locale; + +import net.minecraft.item.ItemStack; + import forestry.api.genetics.IAllele; import forestry.api.genetics.IClassification; import forestry.api.lepidopterology.ButterflyManager; @@ -28,7 +31,6 @@ import forestry.core.genetics.alleles.AlleleHelper; import forestry.core.genetics.alleles.EnumAllele; import forestry.core.utils.StringUtil; import forestry.lepidopterology.genetics.alleles.ButterflyAlleles; -import net.minecraft.item.ItemStack; public enum MothDefinition implements IButterflyDefinition { Brimstone(ButterflyBranchDefinition.Opisthograptis, "brimstone", "luteolata", new Color(0xffea40), true, 1.0f), @@ -44,7 +46,7 @@ public enum MothDefinition implements IButterflyDefinition { AlleleHelper.getInstance().set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.LARGEST); } }, - BombyxMori(ButterflyBranchDefinition.Bombyx, "bombyxMori", "bombyxMori", new Color(0xDADADA), false, 0) { + BombyxMori(ButterflyBranchDefinition.Bombyx, "bombyxMori", "bombyxMori", new Color(0xDADADA), false, 0.0f) { @Override protected void setAlleles(IAllele[] alleles) { AlleleHelper.getInstance().set(alleles, EnumButterflyChromosome.SIZE, EnumAllele.Size.SMALLEST); diff --git a/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflySpecies.java b/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflySpecies.java index 68874f472..c2a151dc7 100644 --- a/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflySpecies.java +++ b/src/main/java/forestry/lepidopterology/genetics/alleles/AlleleButterflySpecies.java @@ -16,7 +16,21 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.NonNullList; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; + import com.mojang.authlib.GameProfile; + +import net.minecraftforge.common.BiomeDictionary; + +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IClassification; import forestry.api.genetics.IIndividual; @@ -28,16 +42,6 @@ import forestry.api.lepidopterology.IAlleleButterflySpeciesBuilder; import forestry.api.lepidopterology.IButterflyRoot; import forestry.core.config.Constants; import forestry.core.genetics.alleles.AlleleSpecies; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; -import net.minecraftforge.common.BiomeDictionary; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; public class AlleleButterflySpecies extends AlleleSpecies implements IAlleleButterflySpecies, IAlleleButterflySpeciesBuilder { @@ -164,7 +168,7 @@ public class AlleleButterflySpecies extends AlleleSpecies /* OTHER */ @Override public boolean isSecret() { - return rarity < 0.8f; + return rarity < 0.25f; } @Override