diff --git a/gradle.properties b/gradle.properties index 2b80b4e3c..169f8a41f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,4 +8,4 @@ jei_version=4.2.0.211 version_major=5 version_minor=3 -version_patch=0 +version_patch=1 diff --git a/src/main/java/forestry/api/genetics/IAlleleRegistry.java b/src/main/java/forestry/api/genetics/IAlleleRegistry.java index 7900f94ff..8a78621a0 100644 --- a/src/main/java/forestry/api/genetics/IAlleleRegistry.java +++ b/src/main/java/forestry/api/genetics/IAlleleRegistry.java @@ -109,6 +109,13 @@ public interface IAlleleRegistry { */ void registerAllele(IAllele allele, IChromosomeType... chromosomeTypes); + /** + * Add more valid chromosome types for an allele. + * Used by addons that create new chromosome types beyond bees, trees, and butterflies. + * @since Forestry 5.3.1 + */ + void addValidAlleleTypes(IAllele allele, IChromosomeType... chromosomeTypes); + /** * @return HashMap of all registered deprecated alleles and their corresponding replacements */ diff --git a/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java b/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java index 783321883..444cf3db1 100644 --- a/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java +++ b/src/main/java/forestry/core/genetics/alleles/AlleleRegistry.java @@ -151,13 +151,7 @@ public class AlleleRegistry implements IAlleleRegistry { @Override public void registerAllele(IAllele allele, IChromosomeType... chromosomeTypes) { - for (IChromosomeType chromosomeType : chromosomeTypes) { - if (!chromosomeType.getAlleleClass().isAssignableFrom(allele.getClass())) { - throw new IllegalArgumentException("Allele class (" + allele.getClass() + ") does not match chromosome type (" + chromosomeType.getAlleleClass() + ")."); - } - allelesByType.put(chromosomeType, allele); - typesByAllele.put(allele, chromosomeType); - } + addValidAlleleTypes(allele, chromosomeTypes); alleleMap.put(allele.getUID(), allele); if (allele instanceof IAlleleSpecies) { @@ -170,6 +164,17 @@ public class AlleleRegistry implements IAlleleRegistry { } } + @Override + public void addValidAlleleTypes(IAllele allele, IChromosomeType... chromosomeTypes) { + for (IChromosomeType chromosomeType : chromosomeTypes) { + if (!chromosomeType.getAlleleClass().isAssignableFrom(allele.getClass())) { + throw new IllegalArgumentException("Allele class (" + allele.getClass() + ") does not match chromosome type (" + chromosomeType.getAlleleClass() + ")."); + } + allelesByType.put(chromosomeType, allele); + typesByAllele.put(allele, chromosomeType); + } + } + @Override public void registerDeprecatedAlleleReplacement(String deprecatedUID, IAllele replacementAllele) { if (deprecatedAlleleMap.containsKey(deprecatedUID)) {