mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-20 12:19:47 +00:00
Refactoring bee species
This commit is contained in:
1 parent
0726954433
commit
1b3b452900
14 files changed
+2382
-1857
No files matched your search
@@ -17,7 +17,7 @@ import binnie.core.IInitializable;
|
||||
public class ExtraBeesIntegration implements IInitializable {
|
||||
|
||||
private static final boolean loaded;
|
||||
public static IAlleleBeeSpecies water, rock, basalt;
|
||||
public static IAlleleBeeSpecies water, rock, basalt, marble;
|
||||
public static Block hive;
|
||||
public static Item dictionary;
|
||||
|
||||
@@ -36,16 +36,16 @@ public class ExtraBeesIntegration implements IInitializable {
|
||||
|
||||
@Override
|
||||
public void init() {
|
||||
water = getExtraBeesSpecies("water");
|
||||
rock = getExtraBeesSpecies("rock");
|
||||
basalt = getExtraBeesSpecies("basalt");
|
||||
hive = Preconditions.checkNotNull(ForgeRegistries.BLOCKS.getValue(new ResourceLocation("extrabees", "hive")));
|
||||
dictionary = Preconditions.checkNotNull(ForgeRegistries.ITEMS.getValue(new ResourceLocation("genetics", "dictionary")));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void postInit() {
|
||||
|
||||
water = getExtraBeesSpecies("water");
|
||||
rock = getExtraBeesSpecies("rock");
|
||||
basalt = getExtraBeesSpecies("basalt");
|
||||
marble = getExtraBeesSpecies("marble");
|
||||
}
|
||||
|
||||
private IAlleleBeeSpecies getExtraBeesSpecies(String species) {
|
||||
|
||||
@@ -24,7 +24,6 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
import forestry.api.apiculture.BeeManager;
|
||||
import forestry.api.apiculture.IAlleleBeeSpecies;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.AlleleSpeciesRegisterEvent;
|
||||
import forestry.core.gui.GuiIdRegistry;
|
||||
import forestry.core.gui.GuiType;
|
||||
@@ -32,10 +31,8 @@ import forestry.core.proxy.Proxies;
|
||||
|
||||
import binnie.Constants;
|
||||
import binnie.extrabees.alveary.TileEntityExtraBeesAlvearyPart;
|
||||
import binnie.extrabees.genetics.ExtraBeeMutation;
|
||||
import binnie.extrabees.genetics.ExtraBeesBranch;
|
||||
import binnie.extrabees.genetics.ExtraBeeDefinition;
|
||||
import binnie.extrabees.genetics.ExtraBeesFlowers;
|
||||
import binnie.extrabees.genetics.ExtraBeesSpecies;
|
||||
import binnie.extrabees.genetics.effect.ExtraBeesEffect;
|
||||
import binnie.extrabees.init.BlockRegister;
|
||||
import binnie.extrabees.init.ItemRegister;
|
||||
@@ -110,8 +107,7 @@ public class ExtraBees {
|
||||
GameRegistry.registerWorldGenerator(extraBeesWorldGenerator, 0);
|
||||
ExtraBeesEffect.doInit();
|
||||
ExtraBeesFlowers.doInit();
|
||||
ExtraBeesSpecies.doInit();
|
||||
ExtraBeeMutation.doInit();
|
||||
ExtraBeeDefinition.doInit();
|
||||
}
|
||||
|
||||
@Mod.EventHandler
|
||||
@@ -136,9 +132,6 @@ public class ExtraBees {
|
||||
if(event.getRoot() != BeeManager.beeRoot){
|
||||
return;
|
||||
}
|
||||
ExtraBeesBranch.setSpeciesBranches();
|
||||
for (final ExtraBeesSpecies species : ExtraBeesSpecies.values()) {
|
||||
AlleleManager.alleleRegistry.registerAllele(species);
|
||||
}
|
||||
ExtraBeeDefinition.doPreInit();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package binnie.extrabees.genetics;
|
||||
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import forestry.api.apiculture.IBeeHousing;
|
||||
import forestry.api.climate.IClimateProvider;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import forestry.api.genetics.IGenome;
|
||||
import forestry.api.genetics.IMutationCondition;
|
||||
|
||||
public class ConditionPerson implements IMutationCondition {
|
||||
|
||||
String name;
|
||||
|
||||
public ConditionPerson(final String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDescription() {
|
||||
return "Can only be bred by " + this.name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate) {
|
||||
TileEntity tileEnity = world.getTileEntity(pos);
|
||||
if (tileEnity instanceof IBeeHousing) {
|
||||
IBeeHousing housing = (IBeeHousing) tileEnity;
|
||||
if (housing.getOwner() != null && housing.getOwner().getName() != null && housing.getOwner().getName().equals(this.name)) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,329 @@
|
||||
package binnie.extrabees.genetics;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Locale;
|
||||
|
||||
import forestry.api.apiculture.BeeManager;
|
||||
import forestry.api.apiculture.EnumBeeChromosome;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import forestry.api.genetics.IClassification;
|
||||
import forestry.apiculture.genetics.alleles.AlleleEffects;
|
||||
import forestry.core.genetics.IBranchDefinition;
|
||||
import forestry.core.genetics.alleles.EnumAllele;
|
||||
|
||||
import binnie.extrabees.genetics.effect.ExtraBeesEffect;
|
||||
import binnie.genetics.genetics.AlleleHelper;
|
||||
|
||||
@SuppressWarnings("Duplicates")
|
||||
public enum ExtraBeeBranchDefinition implements IBranchDefinition {
|
||||
BARREN("Vacapis") {
|
||||
@Override
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.NEVER_SLEEPS, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.DEAD.getUID()));
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
|
||||
}
|
||||
},
|
||||
HOSTILE("Infenapis") {
|
||||
@Override
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.DOWN_1);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.NEVER_SLEEPS, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.CAVE_DWELLING, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.TOLERATES_RAIN, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.DEAD.getUID()));
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
|
||||
}
|
||||
},
|
||||
ROCKY("Monapis") {
|
||||
@Override
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.NEVER_SLEEPS, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.CAVE_DWELLING, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.TOLERATES_RAIN, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_1);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_1);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.ROCK.getUID()));
|
||||
}
|
||||
},
|
||||
METALLIC("Lamminapis") {
|
||||
@Override
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.NEVER_SLEEPS, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.CAVE_DWELLING, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.TOLERATES_RAIN, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.ROCK.getUID()));
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
|
||||
}
|
||||
},
|
||||
METALLIC2("Metalapis") {
|
||||
@Override
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.NEVER_SLEEPS, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.CAVE_DWELLING, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.TOLERATES_RAIN, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.ROCK.getUID()));
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
|
||||
}
|
||||
},
|
||||
ALLOY("Allapis"),
|
||||
PRECIOUS("Pluriapis") {
|
||||
@Override
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.NEVER_SLEEPS, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.CAVE_DWELLING, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.TOLERATES_RAIN, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.ROCK.getUID()));
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
|
||||
}
|
||||
},
|
||||
MINERAL("Niphapis") {
|
||||
@Override
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.NEVER_SLEEPS, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.CAVE_DWELLING, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.TOLERATES_RAIN, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.ROCK.getUID()));
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
|
||||
}
|
||||
},
|
||||
GEMSTONE("Gemmapis") {
|
||||
@Override
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.NEVER_SLEEPS, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.CAVE_DWELLING, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.TOLERATES_RAIN, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.ROCK.getUID()));
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
|
||||
}
|
||||
},
|
||||
NUCLEAR("Levapis") {
|
||||
@Override
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.NEVER_SLEEPS, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.CAVE_DWELLING, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.TOLERATES_RAIN, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.ROCK.getUID()));
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_2);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTEST);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.RADIOACTIVE.getUID()));
|
||||
}
|
||||
},
|
||||
HISTORIC("Priscapis") {
|
||||
@Override
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.ELONGATED);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOW);
|
||||
}
|
||||
},
|
||||
FOSSILIZED("Fosiapis") {
|
||||
@Override
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOW);
|
||||
}
|
||||
},
|
||||
REFINED("Petrapis") {
|
||||
@Override
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOW);
|
||||
}
|
||||
},
|
||||
AQUATIC("Aquapis") {
|
||||
@Override
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.TOLERATES_RAIN, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOWEST);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.BOTH_1);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.WATER.getUID()));
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.WATER.getUID()));
|
||||
}
|
||||
},
|
||||
SACCHARINE("Sacchapis") {
|
||||
@Override
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.SUGAR.getUID()));
|
||||
}
|
||||
},
|
||||
CLASSICAL("Grecapis"){
|
||||
@Override
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOW);
|
||||
}
|
||||
},
|
||||
VOLCANIC("Irrapis") {
|
||||
@Override
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.METEOR.getUID()));
|
||||
}
|
||||
},
|
||||
VIRULENT("Virapis") {
|
||||
@Override
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.JUNGLE);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.EFFECT, AlleleEffects.effectMiasmic);
|
||||
}
|
||||
},
|
||||
VISCOUS("Viscapis") {
|
||||
@Override
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.JUNGLE);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOW);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.ECTOPLASM.getUID()));
|
||||
}
|
||||
},
|
||||
CAUSTIC("Morbapis") {
|
||||
@Override
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.UP_1);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.JUNGLE);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.FAST);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.AVERAGE);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.ACID.getUID()));
|
||||
}
|
||||
},
|
||||
ENERGETIC("Incitapis") {
|
||||
@Override
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.CAVE_DWELLING, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.REDSTONE.getUID()));
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.LIGHTNING.getUID()));
|
||||
}
|
||||
},
|
||||
FARMING("Agriapis"),
|
||||
SHADOW("Pullapis") {
|
||||
@Override
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.NEVER_SLEEPS, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.BLINDNESS.getUID()));
|
||||
}
|
||||
},
|
||||
PRIMARY("Primapis"),
|
||||
SECONDARY("Secapis"),
|
||||
TERTIARY("Tertiapis"),
|
||||
FTB("Eftebeapis") {
|
||||
@Override
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.NORMAL);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.EFFECT, AlleleEffects.effectBeatific);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.MAXIMUM);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.MAXIMUM);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.TERRITORY, EnumAllele.Territory.LARGEST);
|
||||
}
|
||||
},
|
||||
QUANTUM("Quantapis") {
|
||||
@Override
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.LOW);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.LONGER);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.UP_1);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.TERRITORY, EnumAllele.Territory.LARGE);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.END);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.NEVER_SLEEPS, true);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.EFFECT, AlleleHelper.getAllele(ExtraBeesEffect.GRAVITY.getUID()));
|
||||
}
|
||||
},
|
||||
BOTANIA("Botaniapis") {
|
||||
@Override
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWER);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORT);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOW);
|
||||
AlleleHelper.getInstance().set(template, EnumBeeChromosome.FLOWER_PROVIDER, AlleleHelper.getAllele(ExtraBeesFlowers.MYSTICAL.getUID()));
|
||||
}
|
||||
};
|
||||
|
||||
private static IAllele[] defaultTemplate;
|
||||
|
||||
private final IClassification branch;
|
||||
|
||||
ExtraBeeBranchDefinition(String scientific) {
|
||||
branch = BeeManager.beeFactory.createBranch(name().toLowerCase(Locale.ENGLISH), scientific);
|
||||
IClassification parent = AlleleManager.alleleRegistry.getClassification("family.apidae");
|
||||
if (parent != null) {
|
||||
parent.addMemberGroup(branch);
|
||||
}
|
||||
}
|
||||
|
||||
protected void setBranchProperties(IAllele[] template) {
|
||||
// ignored
|
||||
}
|
||||
|
||||
@Override
|
||||
public final IAllele[] getTemplate() {
|
||||
IAllele[] template = getDefaultTemplate();
|
||||
setBranchProperties(template);
|
||||
return template;
|
||||
}
|
||||
|
||||
@Override
|
||||
public final IClassification getBranch() {
|
||||
return branch;
|
||||
}
|
||||
|
||||
private static IAllele[] getDefaultTemplate() {
|
||||
if (defaultTemplate == null) {
|
||||
defaultTemplate = new IAllele[EnumBeeChromosome.values().length];
|
||||
|
||||
AlleleHelper.getInstance().set(defaultTemplate, EnumBeeChromosome.SPEED, EnumAllele.Speed.SLOWEST);
|
||||
AlleleHelper.getInstance().set(defaultTemplate, EnumBeeChromosome.LIFESPAN, EnumAllele.Lifespan.SHORTER);
|
||||
AlleleHelper.getInstance().set(defaultTemplate, EnumBeeChromosome.FERTILITY, EnumAllele.Fertility.NORMAL);
|
||||
AlleleHelper.getInstance().set(defaultTemplate, EnumBeeChromosome.TEMPERATURE_TOLERANCE, EnumAllele.Tolerance.NONE);
|
||||
AlleleHelper.getInstance().set(defaultTemplate, EnumBeeChromosome.NEVER_SLEEPS, false);
|
||||
AlleleHelper.getInstance().set(defaultTemplate, EnumBeeChromosome.HUMIDITY_TOLERANCE, EnumAllele.Tolerance.NONE);
|
||||
AlleleHelper.getInstance().set(defaultTemplate, EnumBeeChromosome.TOLERATES_RAIN, false);
|
||||
AlleleHelper.getInstance().set(defaultTemplate, EnumBeeChromosome.CAVE_DWELLING, false);
|
||||
AlleleHelper.getInstance().set(defaultTemplate, EnumBeeChromosome.FLOWER_PROVIDER, EnumAllele.Flowers.VANILLA);
|
||||
AlleleHelper.getInstance().set(defaultTemplate, EnumBeeChromosome.FLOWERING, EnumAllele.Flowering.SLOWEST);
|
||||
AlleleHelper.getInstance().set(defaultTemplate, EnumBeeChromosome.TERRITORY, EnumAllele.Territory.AVERAGE);
|
||||
AlleleHelper.getInstance().set(defaultTemplate, EnumBeeChromosome.EFFECT, AlleleEffects.effectNone);
|
||||
}
|
||||
return Arrays.copyOf(defaultTemplate, defaultTemplate.length);
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large.
Load diff
@@ -1,276 +0,0 @@
|
||||
package binnie.extrabees.genetics;
|
||||
|
||||
import com.google.common.base.Preconditions;
|
||||
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import net.minecraftforge.common.BiomeDictionary;
|
||||
|
||||
import forestry.api.apiculture.BeeManager;
|
||||
import forestry.api.apiculture.IAlleleBeeSpecies;
|
||||
import forestry.api.apiculture.IBeeHousing;
|
||||
import forestry.api.apiculture.IBeeMutationBuilder;
|
||||
import forestry.api.climate.IClimateProvider;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import forestry.api.genetics.IGenome;
|
||||
import forestry.api.genetics.IMutationCondition;
|
||||
import forestry.apiculture.genetics.BeeDefinition;
|
||||
|
||||
import static forestry.apiculture.genetics.BeeDefinition.AUSTERE;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.BOGGY;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.COMMON;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.CULTIVATED;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.DEMONIC;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.DILIGENT;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.ENDED;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.EXOTIC;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.FARMERLY;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.FIENDISH;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.FOREST;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.FRUGAL;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.HERMITIC;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.HEROIC;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.IMPERIAL;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.INDUSTRIOUS;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.MAJESTIC;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.MARSHY;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.MEADOWS;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.MIRY;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.MODEST;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.MONASTIC;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.NOBLE;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.RURAL;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.SECLUDED;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.SINISTER;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.SPECTRAL;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.TROPICAL;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.UNWEARY;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.VALIANT;
|
||||
import static forestry.apiculture.genetics.BeeDefinition.WINTRY;
|
||||
|
||||
public class ExtraBeeMutation {
|
||||
|
||||
public static void doInit() {
|
||||
registerMutation(MEADOWS, FRUGAL, ExtraBeesSpecies.ARID, 10);
|
||||
registerMutation(FOREST, FRUGAL, ExtraBeesSpecies.ARID, 10);
|
||||
registerMutation(ExtraBeesSpecies.ARID, COMMON, ExtraBeesSpecies.BARREN, 8);
|
||||
registerMutation(ExtraBeesSpecies.ARID, ExtraBeesSpecies.BARREN, ExtraBeesSpecies.DESOLATE, 8);
|
||||
registerMutation(ExtraBeesSpecies.BARREN, FOREST, ExtraBeesSpecies.GNAWING, 15);
|
||||
registerMutation(ExtraBeesSpecies.DESOLATE, MEADOWS, ExtraBeesSpecies.ROTTEN, 15);
|
||||
registerMutation(ExtraBeesSpecies.DESOLATE, FOREST, ExtraBeesSpecies.BONE, 15);
|
||||
registerMutation(ExtraBeesSpecies.DESOLATE, MODEST, ExtraBeesSpecies.CREEPER, 15);
|
||||
registerMutation(ExtraBeesSpecies.BARREN, MARSHY, ExtraBeesSpecies.DECOMPOSING, 15);
|
||||
registerMutation(ExtraBeesSpecies.ROCK, DILIGENT, ExtraBeesSpecies.STONE, 12);
|
||||
registerMutation(ExtraBeesSpecies.STONE, UNWEARY, ExtraBeesSpecies.GRANITE, 10);
|
||||
registerMutation(ExtraBeesSpecies.GRANITE, INDUSTRIOUS, ExtraBeesSpecies.MINERAL, 6);
|
||||
registerMutation(ExtraBeesSpecies.MINERAL, MEADOWS, ExtraBeesSpecies.IRON, 5);
|
||||
registerMutation(ExtraBeesSpecies.MINERAL, FOREST, ExtraBeesSpecies.IRON, 5);
|
||||
registerMutation(ExtraBeesSpecies.MINERAL, WINTRY, ExtraBeesSpecies.COPPER, 5);
|
||||
registerMutation(ExtraBeesSpecies.MINERAL, MODEST, ExtraBeesSpecies.COPPER, 5);
|
||||
registerMutation(ExtraBeesSpecies.MINERAL, MARSHY, ExtraBeesSpecies.TIN, 5);
|
||||
registerMutation(ExtraBeesSpecies.MINERAL, TROPICAL, ExtraBeesSpecies.TIN, 5);
|
||||
registerMutation(ExtraBeesSpecies.MINERAL, MEADOWS, ExtraBeesSpecies.LEAD, 5);
|
||||
registerMutation(ExtraBeesSpecies.MINERAL, MODEST, ExtraBeesSpecies.LEAD, 5);
|
||||
registerMutation(ExtraBeesSpecies.MINERAL, WINTRY, ExtraBeesSpecies.ZINC, 5);
|
||||
registerMutation(ExtraBeesSpecies.MINERAL, TROPICAL, ExtraBeesSpecies.ZINC, 5);
|
||||
registerMutation(ExtraBeesSpecies.MINERAL, FOREST, ExtraBeesSpecies.NICKEL, 5);
|
||||
registerMutation(ExtraBeesSpecies.MINERAL, MARSHY, ExtraBeesSpecies.NICKEL, 5);
|
||||
registerMutation(ExtraBeesSpecies.MINERAL, CULTIVATED, ExtraBeesSpecies.TITANIUM, 3);
|
||||
registerMutation(ExtraBeesSpecies.MINERAL, COMMON, ExtraBeesSpecies.TUNGSTATE, 3);
|
||||
registerMutation(ExtraBeesSpecies.ZINC, MAJESTIC, ExtraBeesSpecies.SILVER, 2);
|
||||
registerMutation(ExtraBeesSpecies.TIN, MAJESTIC, ExtraBeesSpecies.SILVER, 2);
|
||||
registerMutation(ExtraBeesSpecies.LEAD, MAJESTIC, ExtraBeesSpecies.SILVER, 2);
|
||||
registerMutation(ExtraBeesSpecies.TITANIUM, MAJESTIC, ExtraBeesSpecies.SILVER, 3);
|
||||
registerMutation(ExtraBeesSpecies.IRON, MAJESTIC, ExtraBeesSpecies.GOLD, 2);
|
||||
registerMutation(ExtraBeesSpecies.COPPER, MAJESTIC, ExtraBeesSpecies.GOLD, 2);
|
||||
registerMutation(ExtraBeesSpecies.NICKEL, MAJESTIC, ExtraBeesSpecies.GOLD, 2);
|
||||
registerMutation(ExtraBeesSpecies.TUNGSTATE, MAJESTIC, ExtraBeesSpecies.GOLD, 3);
|
||||
registerMutation(ExtraBeesSpecies.GOLD, ExtraBeesSpecies.SILVER, ExtraBeesSpecies.PLATINUM, 2);
|
||||
registerMutation(ExtraBeesSpecies.MINERAL, IMPERIAL, ExtraBeesSpecies.LAPIS, 5);
|
||||
registerMutation(ExtraBeesSpecies.LAPIS, FOREST, ExtraBeesSpecies.EMERALD, 5);
|
||||
registerMutation(ExtraBeesSpecies.LAPIS, MODEST, ExtraBeesSpecies.RUBY, 5);
|
||||
registerMutation(ExtraBeesSpecies.LAPIS, ExtraBeesSpecies.WATER, ExtraBeesSpecies.SAPPHIRE, 5);
|
||||
registerMutation(ExtraBeesSpecies.LAPIS, CULTIVATED, ExtraBeesSpecies.DIAMOND, 5);
|
||||
registerMutation(ExtraBeesSpecies.PREHISTORIC, ExtraBeesSpecies.MINERAL, ExtraBeesSpecies.UNSTABLE, 5);
|
||||
registerMutation(ExtraBeesSpecies.UNSTABLE, ExtraBeesSpecies.IRON, ExtraBeesSpecies.NUCLEAR, 5);
|
||||
registerMutation(ExtraBeesSpecies.UNSTABLE, ExtraBeesSpecies.COPPER, ExtraBeesSpecies.NUCLEAR, 5);
|
||||
registerMutation(ExtraBeesSpecies.UNSTABLE, ExtraBeesSpecies.TIN, ExtraBeesSpecies.NUCLEAR, 5);
|
||||
registerMutation(ExtraBeesSpecies.UNSTABLE, ExtraBeesSpecies.ZINC, ExtraBeesSpecies.NUCLEAR, 5);
|
||||
registerMutation(ExtraBeesSpecies.UNSTABLE, ExtraBeesSpecies.NICKEL, ExtraBeesSpecies.NUCLEAR, 5);
|
||||
registerMutation(ExtraBeesSpecies.UNSTABLE, ExtraBeesSpecies.LEAD, ExtraBeesSpecies.NUCLEAR, 5);
|
||||
registerMutation(ExtraBeesSpecies.NUCLEAR, ExtraBeesSpecies.GOLD, ExtraBeesSpecies.RADIOACTIVE, 5);
|
||||
registerMutation(ExtraBeesSpecies.NUCLEAR, ExtraBeesSpecies.SILVER, ExtraBeesSpecies.RADIOACTIVE, 5);
|
||||
registerMutation(ExtraBeesSpecies.NUCLEAR, FRUGAL, ExtraBeesSpecies.YELLORIUM, 5);
|
||||
registerMutation(ExtraBeesSpecies.NUCLEAR, ExtraBeesSpecies.YELLORIUM, ExtraBeesSpecies.CYANITE, 5);
|
||||
registerMutation(ExtraBeesSpecies.YELLORIUM, ExtraBeesSpecies.CYANITE, ExtraBeesSpecies.BLUTONIUM, 5);
|
||||
registerMutation(NOBLE, DILIGENT, ExtraBeesSpecies.ANCIENT, 10);
|
||||
registerMutation(ExtraBeesSpecies.ANCIENT, SECLUDED, ExtraBeesSpecies.PRIMEVAL, 8);
|
||||
registerMutation(ExtraBeesSpecies.PRIMEVAL, ExtraBeesSpecies.ANCIENT, ExtraBeesSpecies.PREHISTORIC, 8);
|
||||
registerMutation(ExtraBeesSpecies.PREHISTORIC, IMPERIAL, ExtraBeesSpecies.RELIC, 8);
|
||||
registerMutation(ExtraBeesSpecies.PRIMEVAL, ExtraBeesSpecies.GROWING, ExtraBeesSpecies.COAL, 8);
|
||||
registerMutation(ExtraBeesSpecies.PRIMEVAL, RURAL, ExtraBeesSpecies.COAL, 8);
|
||||
registerMutation(ExtraBeesSpecies.PRIMEVAL, MIRY, ExtraBeesSpecies.RESIN, 8);
|
||||
registerMutation(ExtraBeesSpecies.PRIMEVAL, ExtraBeesSpecies.OCEAN, ExtraBeesSpecies.OIL, 8);
|
||||
registerMutation(ExtraBeesSpecies.PRIMEVAL, FRUGAL, ExtraBeesSpecies.OIL, 8);
|
||||
registerMutation(ExtraBeesSpecies.OIL, INDUSTRIOUS, ExtraBeesSpecies.DISTILLED, 8);
|
||||
registerMutation(ExtraBeesSpecies.DISTILLED, ExtraBeesSpecies.OIL, ExtraBeesSpecies.FUEL, 8);
|
||||
registerMutation(ExtraBeesSpecies.DISTILLED, ExtraBeesSpecies.COAL, ExtraBeesSpecies.CREOSOTE, 8);
|
||||
registerMutation(ExtraBeesSpecies.DISTILLED, ExtraBeesSpecies.RESIN, ExtraBeesSpecies.LATEX, 8);
|
||||
registerMutation(ExtraBeesSpecies.WATER, DILIGENT, ExtraBeesSpecies.RIVER, 10).restrictBiomeType(BiomeDictionary.Type.RIVER);
|
||||
registerMutation(ExtraBeesSpecies.WATER, DILIGENT, ExtraBeesSpecies.OCEAN, 10).restrictBiomeType(BiomeDictionary.Type.OCEAN);
|
||||
registerMutation(ExtraBeesSpecies.BLACK, ExtraBeesSpecies.OCEAN, ExtraBeesSpecies.INK, 8);
|
||||
registerMutation(FOREST, DILIGENT, ExtraBeesSpecies.GROWING, 10);
|
||||
registerMutation(ExtraBeesSpecies.GROWING, UNWEARY, ExtraBeesSpecies.THRIVING, 10);
|
||||
registerMutation(ExtraBeesSpecies.THRIVING, INDUSTRIOUS, ExtraBeesSpecies.BLOOMING, 8);
|
||||
registerMutation(VALIANT, DILIGENT, ExtraBeesSpecies.SWEET, 15);
|
||||
registerMutation(ExtraBeesSpecies.SWEET, RURAL, ExtraBeesSpecies.SUGAR, 15);
|
||||
registerMutation(ExtraBeesSpecies.SWEET, ExtraBeesSpecies.GROWING, ExtraBeesSpecies.RIPENING, 5);
|
||||
registerMutation(ExtraBeesSpecies.SWEET, ExtraBeesSpecies.THRIVING, ExtraBeesSpecies.FRUIT, 5);
|
||||
registerMutation(FARMERLY, MEADOWS, ExtraBeesSpecies.ALCOHOL, 10);
|
||||
registerMutation(FARMERLY, MEADOWS, ExtraBeesSpecies.FARM, 10);
|
||||
registerMutation(ExtraBeesSpecies.WATER, FARMERLY, ExtraBeesSpecies.MILK, 10);
|
||||
registerMutation(FARMERLY, TROPICAL, ExtraBeesSpecies.COFFEE, 10);
|
||||
registerMutation(ExtraBeesSpecies.WATER, MIRY, ExtraBeesSpecies.SWAMP, 10);
|
||||
registerMutation(ExtraBeesSpecies.SWAMP, BOGGY, ExtraBeesSpecies.BOGGY, 8);
|
||||
registerMutation(ExtraBeesSpecies.BOGGY, ExtraBeesSpecies.SWAMP, ExtraBeesSpecies.FUNGAL, 8);
|
||||
registerMutation(BOGGY, MIRY, ExtraBeesSpecies.FUNGAL, 8);
|
||||
registerMutation(ExtraBeesSpecies.WATER, FOREST, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.WATER, MEADOWS, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.WATER, MODEST, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.WATER, TROPICAL, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.WATER, MARSHY, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.WATER, WINTRY, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.WATER, ExtraBeesSpecies.ROCK, COMMON.getTemplate(), 15);
|
||||
registerMutation(ExtraBeesSpecies.WATER, ExtraBeesSpecies.BASALT, COMMON.getTemplate(), 15);
|
||||
registerMutation(ExtraBeesSpecies.ROCK, FOREST, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.ROCK, MEADOWS, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.ROCK, MODEST, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.ROCK, TROPICAL, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.ROCK, MARSHY, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.ROCK, WINTRY, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.ROCK, ExtraBeesSpecies.BASALT, COMMON.getTemplate(), 15);
|
||||
registerMutation(ExtraBeesSpecies.BASALT, FOREST, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.BASALT, MEADOWS, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.BASALT, MODEST, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.BASALT, TROPICAL, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.BASALT, MARSHY, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.BASALT, WINTRY, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.WATER, COMMON, CULTIVATED, 12);
|
||||
registerMutation(ExtraBeesSpecies.ROCK, COMMON, CULTIVATED, 12);
|
||||
registerMutation(ExtraBeesSpecies.BASALT, COMMON, CULTIVATED, 12);
|
||||
registerMutation(ExtraBeesSpecies.BASALT, FIENDISH, ExtraBeesSpecies.TEMPERED, 30).restrictBiomeType(BiomeDictionary.Type.NETHER);
|
||||
registerMutation(ExtraBeesSpecies.TEMPERED, DEMONIC, ExtraBeesSpecies.VOLCANIC, 20).restrictBiomeType(BiomeDictionary.Type.NETHER);
|
||||
registerMutation(ExtraBeesSpecies.BASALT, CULTIVATED, SINISTER, 60).restrictBiomeType(BiomeDictionary.Type.NETHER);
|
||||
registerMutation(ExtraBeesSpecies.BASALT, SINISTER, FIENDISH, 40).restrictBiomeType(BiomeDictionary.Type.NETHER);
|
||||
registerMutation(SINISTER, TROPICAL, ExtraBeesSpecies.MALICIOUS, 10);
|
||||
registerMutation(ExtraBeesSpecies.MALICIOUS, TROPICAL, ExtraBeesSpecies.INFECTIOUS, 8);
|
||||
registerMutation(ExtraBeesSpecies.MALICIOUS, ExtraBeesSpecies.INFECTIOUS, ExtraBeesSpecies.VIRULENT, 8);
|
||||
registerMutation(ExtraBeesSpecies.WATER, EXOTIC, ExtraBeesSpecies.VISCOUS, 10);
|
||||
registerMutation(ExtraBeesSpecies.VISCOUS, EXOTIC, ExtraBeesSpecies.GLUTINOUS, 8);
|
||||
registerMutation(ExtraBeesSpecies.VISCOUS, ExtraBeesSpecies.GLUTINOUS, ExtraBeesSpecies.STICKY, 8);
|
||||
registerMutation(ExtraBeesSpecies.MALICIOUS, ExtraBeesSpecies.VISCOUS, ExtraBeesSpecies.CORROSIVE, 10);
|
||||
registerMutation(ExtraBeesSpecies.CORROSIVE, FIENDISH, ExtraBeesSpecies.CAUSTIC, 8);
|
||||
registerMutation(ExtraBeesSpecies.CORROSIVE, ExtraBeesSpecies.CAUSTIC, ExtraBeesSpecies.ACIDIC, 4);
|
||||
registerMutation(CULTIVATED, VALIANT, ExtraBeesSpecies.EXCITED, 10);
|
||||
registerMutation(ExtraBeesSpecies.EXCITED, DILIGENT, ExtraBeesSpecies.ENERGETIC, 8);
|
||||
registerMutation(ExtraBeesSpecies.EXCITED, ExtraBeesSpecies.ENERGETIC, ExtraBeesSpecies.ECSTATIC, 8);
|
||||
registerMutation(WINTRY, DILIGENT, ExtraBeesSpecies.ARTIC, 10);
|
||||
registerMutation(ExtraBeesSpecies.OCEAN, ExtraBeesSpecies.ARTIC, ExtraBeesSpecies.FREEZING, 10);
|
||||
registerMutation(ExtraBeesSpecies.ROCK, SINISTER, ExtraBeesSpecies.SHADOW, 10);
|
||||
registerMutation(ExtraBeesSpecies.SHADOW, ExtraBeesSpecies.ROCK, ExtraBeesSpecies.DARKENED, 8);
|
||||
registerMutation(ExtraBeesSpecies.SHADOW, ExtraBeesSpecies.DARKENED, ExtraBeesSpecies.ABYSS, 8);
|
||||
registerMutation(FOREST, VALIANT, ExtraBeesSpecies.RED, 5);
|
||||
registerMutation(MEADOWS, VALIANT, ExtraBeesSpecies.YELLOW, 5);
|
||||
registerMutation(ExtraBeesSpecies.WATER, VALIANT, ExtraBeesSpecies.BLUE, 5);
|
||||
registerMutation(TROPICAL, VALIANT, ExtraBeesSpecies.GREEN, 5);
|
||||
registerMutation(ExtraBeesSpecies.ROCK, VALIANT, ExtraBeesSpecies.BLACK, 5);
|
||||
registerMutation(WINTRY, VALIANT, ExtraBeesSpecies.WHITE, 5);
|
||||
registerMutation(MARSHY, VALIANT, ExtraBeesSpecies.BROWN, 5);
|
||||
registerMutation(ExtraBeesSpecies.RED, ExtraBeesSpecies.YELLOW, ExtraBeesSpecies.ORANGE, 5);
|
||||
registerMutation(ExtraBeesSpecies.GREEN, ExtraBeesSpecies.BLUE, ExtraBeesSpecies.CYAN, 5);
|
||||
registerMutation(ExtraBeesSpecies.RED, ExtraBeesSpecies.BLUE, ExtraBeesSpecies.PURPLE, 5);
|
||||
registerMutation(ExtraBeesSpecies.BLACK, ExtraBeesSpecies.WHITE, ExtraBeesSpecies.GRAY, 5);
|
||||
registerMutation(ExtraBeesSpecies.BLUE, ExtraBeesSpecies.WHITE, ExtraBeesSpecies.LIGHTBLUE, 5);
|
||||
registerMutation(ExtraBeesSpecies.RED, ExtraBeesSpecies.WHITE, ExtraBeesSpecies.PINK, 5);
|
||||
registerMutation(ExtraBeesSpecies.GREEN, ExtraBeesSpecies.WHITE, ExtraBeesSpecies.LIMEGREEN, 5);
|
||||
registerMutation(ExtraBeesSpecies.PURPLE, ExtraBeesSpecies.PINK, ExtraBeesSpecies.MAGENTA, 5);
|
||||
registerMutation(ExtraBeesSpecies.GRAY, ExtraBeesSpecies.WHITE, ExtraBeesSpecies.LIGHTGRAY, 5);
|
||||
registerMutation(ExtraBeesSpecies.TEMPERED, ExtraBeesSpecies.EXCITED, ExtraBeesSpecies.GLOWSTONE, 5);
|
||||
registerMutation(ExtraBeesSpecies.DESOLATE, AUSTERE, ExtraBeesSpecies.HAZARDOUS, 5);
|
||||
registerMutation(ExtraBeesSpecies.RELIC, ENDED, ExtraBeesSpecies.JADED, 2).addMutationCondition(new ConditionPerson("jadedcat"));
|
||||
registerMutation(ExtraBeesSpecies.EXCITED, AUSTERE, ExtraBeesSpecies.CELEBRATORY, 5);
|
||||
registerMutation(SECLUDED, ENDED, ExtraBeesSpecies.UNUSUAL, 5);
|
||||
registerMutation(ExtraBeesSpecies.UNUSUAL, HERMITIC, ExtraBeesSpecies.SPATIAL, 5);
|
||||
registerMutation(ExtraBeesSpecies.SPATIAL, SPECTRAL, ExtraBeesSpecies.QUANTUM, 5);
|
||||
registerMutation(NOBLE, MONASTIC, ExtraBeesSpecies.MYSTICAL, 5);
|
||||
|
||||
registerMutation(ExtraBeesSpecies.WATER, ExtraBeesSpecies.MARBLE, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.ROCK, ExtraBeesSpecies.MARBLE, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.MARBLE, FOREST, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.MARBLE, MEADOWS, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.MARBLE, MODEST, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.MARBLE, TROPICAL, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.MARBLE, MARSHY, COMMON, 15);
|
||||
registerMutation(ExtraBeesSpecies.MARBLE, COMMON, CULTIVATED, 12);
|
||||
registerMutation(ExtraBeesSpecies.MARBLE, HEROIC, ExtraBeesSpecies.ROMAN, 10);
|
||||
registerMutation(ExtraBeesSpecies.ROMAN, ExtraBeesSpecies.MARBLE, ExtraBeesSpecies.GREEK, 8);
|
||||
registerMutation(ExtraBeesSpecies.ROMAN, ExtraBeesSpecies.MARBLE, ExtraBeesSpecies.GREEK, 8);
|
||||
registerMutation(ExtraBeesSpecies.GREEK, ExtraBeesSpecies.ROMAN, ExtraBeesSpecies.CLASSICAL, 8);
|
||||
|
||||
}
|
||||
|
||||
public static IBeeMutationBuilder registerMutation(BeeDefinition allele0, BeeDefinition allele1, ExtraBeesSpecies mutation, int chance) {
|
||||
return registerMutation(allele0.getGenome().getPrimary(), allele1.getGenome().getPrimary(), mutation, chance);
|
||||
}
|
||||
|
||||
public static IBeeMutationBuilder registerMutation(ExtraBeesSpecies allele0, ExtraBeesSpecies allele1, BeeDefinition mutation, int chance) {
|
||||
return registerMutation(allele0, allele1, mutation.getTemplate(), chance);
|
||||
}
|
||||
|
||||
public static IBeeMutationBuilder registerMutation(IAlleleBeeSpecies allele0, BeeDefinition allele1, BeeDefinition mutation, int chance) {
|
||||
return registerMutation(allele0, allele1.getGenome().getPrimary(), mutation.getTemplate(), chance);
|
||||
}
|
||||
|
||||
public static IBeeMutationBuilder registerMutation(IAlleleBeeSpecies allele0, BeeDefinition allele1, ExtraBeesSpecies mutation, int chance) {
|
||||
return registerMutation(allele0, allele1.getGenome().getPrimary(), mutation, chance);
|
||||
}
|
||||
|
||||
public static IBeeMutationBuilder registerMutation(IAlleleBeeSpecies allele0, IAlleleBeeSpecies allele1, ExtraBeesSpecies mutation, int chance) {
|
||||
return registerMutation(allele0, allele1, mutation.getTemplate(), chance);
|
||||
}
|
||||
|
||||
public static IBeeMutationBuilder registerMutation(IAlleleBeeSpecies allele0, IAlleleBeeSpecies allele1, IAllele[] template, int chance) {
|
||||
Preconditions.checkNotNull(allele0);
|
||||
Preconditions.checkNotNull(allele1);
|
||||
Preconditions.checkNotNull(template);
|
||||
return BeeManager.beeMutationFactory.createMutation(allele0, allele1, template, chance);
|
||||
}
|
||||
|
||||
static class ConditionPerson implements IMutationCondition {
|
||||
|
||||
String name;
|
||||
|
||||
public ConditionPerson(final String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDescription() {
|
||||
return "Can only be bred by " + this.name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public float getChance(World world, BlockPos pos, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1, IClimateProvider climate) {
|
||||
TileEntity tileEnity = world.getTileEntity(pos);
|
||||
if (tileEnity instanceof IBeeHousing) {
|
||||
IBeeHousing housing = (IBeeHousing) tileEnity;
|
||||
if (housing.getOwner() != null && housing.getOwner().getName() != null && housing.getOwner().getName().equals(this.name)) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,309 +0,0 @@
|
||||
package binnie.extrabees.genetics;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.LinkedHashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import forestry.api.apiculture.IAlleleBeeSpecies;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.IAlleleSpecies;
|
||||
import forestry.api.genetics.IClassification;
|
||||
|
||||
import binnie.core.util.I18N;
|
||||
|
||||
public enum ExtraBeesBranch implements IClassification {
|
||||
|
||||
BARREN("Vacapis"),
|
||||
HOSTILE("Infenapis"),
|
||||
ROCKY("Monapis"),
|
||||
METALLIC("Lamminapis"),
|
||||
METALLIC2("Metalapis"),
|
||||
ALLOY("Allapis"),
|
||||
PRECIOUS("Pluriapis"),
|
||||
MINERAL("Niphapis"),
|
||||
GEMSTONE("Gemmapis"),
|
||||
NUCLEAR("Levapis"),
|
||||
HISTORIC("Priscapis"),
|
||||
FOSSILIZED("Fosiapis"),
|
||||
REFINED("Petrapis"),
|
||||
AQUATIC("Aquapis"),
|
||||
SACCHARINE("Sacchapis"),
|
||||
CLASSICAL("Grecapis"),
|
||||
VOLCANIC("Irrapis"),
|
||||
VIRULENT("Virapis"),
|
||||
VISCOUS("Viscapis"),
|
||||
CAUSTIC("Morbapis"),
|
||||
ENERGETIC("Incitapis"),
|
||||
FARMING("Agriapis"),
|
||||
SHADOW("Pullapis"),
|
||||
PRIMARY("Primapis"),
|
||||
SECONDARY("Secapis"),
|
||||
TERTIARY("Tertiapis"),
|
||||
FTB("Eftebeapis"),
|
||||
QUANTUM("Quantapis"),
|
||||
BOTANIA("Botaniapis"); //TODO There is 1 bee in here, that produces the petal of the flowers around, move to MagicBEes?
|
||||
|
||||
IClassification parent;
|
||||
private String uid;
|
||||
private String scientific;
|
||||
private Set<IAlleleBeeSpecies> speciesSet;
|
||||
|
||||
ExtraBeesBranch(final String scientific) {
|
||||
this.uid = "";
|
||||
this.scientific = "";
|
||||
this.speciesSet = new LinkedHashSet<>();
|
||||
this.scientific = scientific;
|
||||
this.uid = this.toString().toLowerCase();
|
||||
}
|
||||
|
||||
public static void setSpeciesBranches() {
|
||||
final IClassification frozenBranch = AlleleManager.alleleRegistry.getClassification("genus.bees.frozen");
|
||||
if (frozenBranch != null) {
|
||||
frozenBranch.addMemberSpecies(ExtraBeesSpecies.ARTIC);
|
||||
ExtraBeesSpecies.ARTIC.setBranch(frozenBranch);
|
||||
frozenBranch.addMemberSpecies(ExtraBeesSpecies.FREEZING);
|
||||
ExtraBeesSpecies.FREEZING.setBranch(frozenBranch);
|
||||
}
|
||||
final IClassification agrarianBranch = AlleleManager.alleleRegistry.getClassification("genus.bees.agrarian");
|
||||
if (agrarianBranch != null) {
|
||||
agrarianBranch.addMemberSpecies(ExtraBeesSpecies.FARM);
|
||||
ExtraBeesSpecies.FARM.setBranch(agrarianBranch);
|
||||
ExtraBeesSpecies.GROWING.setBranch(agrarianBranch);
|
||||
ExtraBeesSpecies.THRIVING.setBranch(agrarianBranch);
|
||||
ExtraBeesSpecies.BLOOMING.setBranch(agrarianBranch);
|
||||
}
|
||||
final IClassification boggyBranch = AlleleManager.alleleRegistry.getClassification("genus.bees.boggy");
|
||||
if (boggyBranch != null) {
|
||||
boggyBranch.addMemberSpecies(ExtraBeesSpecies.SWAMP);
|
||||
boggyBranch.addMemberSpecies(ExtraBeesSpecies.BOGGY);
|
||||
boggyBranch.addMemberSpecies(ExtraBeesSpecies.FUNGAL);
|
||||
ExtraBeesSpecies.SWAMP.setBranch(boggyBranch);
|
||||
ExtraBeesSpecies.BOGGY.setBranch(boggyBranch);
|
||||
ExtraBeesSpecies.FUNGAL.setBranch(boggyBranch);
|
||||
}
|
||||
final IClassification festiveBranch = AlleleManager.alleleRegistry.getClassification("genus.bees.festive");
|
||||
if (festiveBranch != null) {
|
||||
festiveBranch.addMemberSpecies(ExtraBeesSpecies.CELEBRATORY);
|
||||
ExtraBeesSpecies.CELEBRATORY.setBranch(festiveBranch);
|
||||
}
|
||||
final IClassification austereBranch = AlleleManager.alleleRegistry.getClassification("genus.bees.austere");
|
||||
if (austereBranch != null) {
|
||||
austereBranch.addMemberSpecies(ExtraBeesSpecies.HAZARDOUS);
|
||||
ExtraBeesSpecies.HAZARDOUS.setBranch(austereBranch);
|
||||
}
|
||||
ExtraBeesBranch.FARMING.addMemberSpecies(ExtraBeesSpecies.ALCOHOL);
|
||||
ExtraBeesBranch.FARMING.addMemberSpecies(ExtraBeesSpecies.MILK);
|
||||
ExtraBeesBranch.FARMING.addMemberSpecies(ExtraBeesSpecies.COFFEE);
|
||||
ExtraBeesBranch.FARMING.addMemberSpecies(ExtraBeesSpecies.CITRUS);
|
||||
ExtraBeesBranch.FARMING.addMemberSpecies(ExtraBeesSpecies.MINT);
|
||||
ExtraBeesBranch.FARMING.register();
|
||||
ExtraBeesBranch.BARREN.addMemberSpecies(ExtraBeesSpecies.ARID);
|
||||
ExtraBeesBranch.BARREN.addMemberSpecies(ExtraBeesSpecies.BARREN);
|
||||
ExtraBeesBranch.BARREN.addMemberSpecies(ExtraBeesSpecies.DESOLATE);
|
||||
ExtraBeesBranch.BARREN.addMemberSpecies(ExtraBeesSpecies.DECOMPOSING);
|
||||
ExtraBeesBranch.BARREN.addMemberSpecies(ExtraBeesSpecies.GNAWING);
|
||||
ExtraBeesBranch.BARREN.register();
|
||||
ExtraBeesBranch.HOSTILE.addMemberSpecies(ExtraBeesSpecies.ROTTEN);
|
||||
ExtraBeesBranch.HOSTILE.addMemberSpecies(ExtraBeesSpecies.BONE);
|
||||
ExtraBeesBranch.HOSTILE.addMemberSpecies(ExtraBeesSpecies.CREEPER);
|
||||
ExtraBeesBranch.HOSTILE.register();
|
||||
ExtraBeesBranch.ROCKY.addMemberSpecies(ExtraBeesSpecies.ROCK);
|
||||
ExtraBeesBranch.ROCKY.addMemberSpecies(ExtraBeesSpecies.STONE);
|
||||
ExtraBeesBranch.ROCKY.addMemberSpecies(ExtraBeesSpecies.GRANITE);
|
||||
ExtraBeesBranch.ROCKY.addMemberSpecies(ExtraBeesSpecies.MINERAL);
|
||||
ExtraBeesBranch.ROCKY.register();
|
||||
ExtraBeesBranch.METALLIC.addMemberSpecies(ExtraBeesSpecies.IRON);
|
||||
ExtraBeesBranch.METALLIC.addMemberSpecies(ExtraBeesSpecies.COPPER);
|
||||
ExtraBeesBranch.METALLIC.addMemberSpecies(ExtraBeesSpecies.TIN);
|
||||
ExtraBeesBranch.METALLIC.addMemberSpecies(ExtraBeesSpecies.LEAD);
|
||||
ExtraBeesBranch.METALLIC.register();
|
||||
ExtraBeesBranch.METALLIC2.addMemberSpecies(ExtraBeesSpecies.NICKEL);
|
||||
ExtraBeesBranch.METALLIC2.addMemberSpecies(ExtraBeesSpecies.ZINC);
|
||||
ExtraBeesBranch.METALLIC2.addMemberSpecies(ExtraBeesSpecies.TUNGSTATE);
|
||||
ExtraBeesBranch.METALLIC2.addMemberSpecies(ExtraBeesSpecies.TITANIUM);
|
||||
ExtraBeesBranch.METALLIC2.register();
|
||||
ExtraBeesBranch.ALLOY.addMemberSpecies(ExtraBeesSpecies.BRONZE);
|
||||
ExtraBeesBranch.ALLOY.addMemberSpecies(ExtraBeesSpecies.BRASS);
|
||||
ExtraBeesBranch.ALLOY.addMemberSpecies(ExtraBeesSpecies.STEEL);
|
||||
ExtraBeesBranch.ALLOY.addMemberSpecies(ExtraBeesSpecies.INVAR);
|
||||
ExtraBeesBranch.ALLOY.register();
|
||||
ExtraBeesBranch.PRECIOUS.addMemberSpecies(ExtraBeesSpecies.SILVER);
|
||||
ExtraBeesBranch.PRECIOUS.addMemberSpecies(ExtraBeesSpecies.GOLD);
|
||||
ExtraBeesBranch.PRECIOUS.addMemberSpecies(ExtraBeesSpecies.ELECTRUM);
|
||||
ExtraBeesBranch.PRECIOUS.addMemberSpecies(ExtraBeesSpecies.PLATINUM);
|
||||
ExtraBeesBranch.PRECIOUS.register();
|
||||
ExtraBeesBranch.MINERAL.addMemberSpecies(ExtraBeesSpecies.LAPIS);
|
||||
ExtraBeesBranch.MINERAL.addMemberSpecies(ExtraBeesSpecies.SODALITE);
|
||||
ExtraBeesBranch.MINERAL.addMemberSpecies(ExtraBeesSpecies.PYRITE);
|
||||
ExtraBeesBranch.MINERAL.addMemberSpecies(ExtraBeesSpecies.BAUXITE);
|
||||
ExtraBeesBranch.MINERAL.addMemberSpecies(ExtraBeesSpecies.CINNABAR);
|
||||
ExtraBeesBranch.MINERAL.addMemberSpecies(ExtraBeesSpecies.SPHALERITE);
|
||||
ExtraBeesBranch.MINERAL.register();
|
||||
ExtraBeesBranch.GEMSTONE.addMemberSpecies(ExtraBeesSpecies.EMERALD);
|
||||
ExtraBeesBranch.GEMSTONE.addMemberSpecies(ExtraBeesSpecies.RUBY);
|
||||
ExtraBeesBranch.GEMSTONE.addMemberSpecies(ExtraBeesSpecies.SAPPHIRE);
|
||||
ExtraBeesBranch.GEMSTONE.addMemberSpecies(ExtraBeesSpecies.OLIVINE);
|
||||
ExtraBeesBranch.GEMSTONE.addMemberSpecies(ExtraBeesSpecies.DIAMOND);
|
||||
ExtraBeesBranch.GEMSTONE.register();
|
||||
ExtraBeesBranch.NUCLEAR.addMemberSpecies(ExtraBeesSpecies.UNSTABLE);
|
||||
ExtraBeesBranch.NUCLEAR.addMemberSpecies(ExtraBeesSpecies.NUCLEAR);
|
||||
ExtraBeesBranch.NUCLEAR.addMemberSpecies(ExtraBeesSpecies.RADIOACTIVE);
|
||||
ExtraBeesBranch.NUCLEAR.addMemberSpecies(ExtraBeesSpecies.YELLORIUM);
|
||||
ExtraBeesBranch.NUCLEAR.addMemberSpecies(ExtraBeesSpecies.CYANITE);
|
||||
ExtraBeesBranch.NUCLEAR.addMemberSpecies(ExtraBeesSpecies.BLUTONIUM);
|
||||
ExtraBeesBranch.NUCLEAR.register();
|
||||
ExtraBeesBranch.HISTORIC.addMemberSpecies(ExtraBeesSpecies.ANCIENT);
|
||||
ExtraBeesBranch.HISTORIC.addMemberSpecies(ExtraBeesSpecies.PRIMEVAL);
|
||||
ExtraBeesBranch.HISTORIC.addMemberSpecies(ExtraBeesSpecies.PREHISTORIC);
|
||||
ExtraBeesBranch.HISTORIC.addMemberSpecies(ExtraBeesSpecies.RELIC);
|
||||
ExtraBeesBranch.HISTORIC.register();
|
||||
ExtraBeesBranch.FOSSILIZED.addMemberSpecies(ExtraBeesSpecies.COAL);
|
||||
ExtraBeesBranch.FOSSILIZED.addMemberSpecies(ExtraBeesSpecies.RESIN);
|
||||
ExtraBeesBranch.FOSSILIZED.addMemberSpecies(ExtraBeesSpecies.OIL);
|
||||
ExtraBeesBranch.FOSSILIZED.addMemberSpecies(ExtraBeesSpecies.PEAT);
|
||||
ExtraBeesBranch.FOSSILIZED.register();
|
||||
ExtraBeesBranch.REFINED.addMemberSpecies(ExtraBeesSpecies.DISTILLED);
|
||||
ExtraBeesBranch.REFINED.addMemberSpecies(ExtraBeesSpecies.FUEL);
|
||||
ExtraBeesBranch.REFINED.addMemberSpecies(ExtraBeesSpecies.CREOSOTE);
|
||||
ExtraBeesBranch.REFINED.addMemberSpecies(ExtraBeesSpecies.LATEX);
|
||||
ExtraBeesBranch.REFINED.register();
|
||||
ExtraBeesBranch.AQUATIC.addMemberSpecies(ExtraBeesSpecies.WATER);
|
||||
ExtraBeesBranch.AQUATIC.addMemberSpecies(ExtraBeesSpecies.RIVER);
|
||||
ExtraBeesBranch.AQUATIC.addMemberSpecies(ExtraBeesSpecies.OCEAN);
|
||||
ExtraBeesBranch.AQUATIC.addMemberSpecies(ExtraBeesSpecies.INK);
|
||||
ExtraBeesBranch.AQUATIC.register();
|
||||
ExtraBeesBranch.SACCHARINE.addMemberSpecies(ExtraBeesSpecies.SWEET);
|
||||
ExtraBeesBranch.SACCHARINE.addMemberSpecies(ExtraBeesSpecies.SUGAR);
|
||||
ExtraBeesBranch.SACCHARINE.addMemberSpecies(ExtraBeesSpecies.FRUIT);
|
||||
ExtraBeesBranch.SACCHARINE.addMemberSpecies(ExtraBeesSpecies.RIPENING);
|
||||
ExtraBeesBranch.SACCHARINE.register();
|
||||
ExtraBeesBranch.CLASSICAL.addMemberSpecies(ExtraBeesSpecies.MARBLE);
|
||||
ExtraBeesBranch.CLASSICAL.addMemberSpecies(ExtraBeesSpecies.ROMAN);
|
||||
ExtraBeesBranch.CLASSICAL.addMemberSpecies(ExtraBeesSpecies.GREEK);
|
||||
ExtraBeesBranch.CLASSICAL.addMemberSpecies(ExtraBeesSpecies.CLASSICAL);
|
||||
ExtraBeesBranch.CLASSICAL.register();
|
||||
ExtraBeesBranch.VOLCANIC.addMemberSpecies(ExtraBeesSpecies.BASALT);
|
||||
ExtraBeesBranch.VOLCANIC.addMemberSpecies(ExtraBeesSpecies.TEMPERED);
|
||||
ExtraBeesBranch.VOLCANIC.addMemberSpecies(ExtraBeesSpecies.ANGRY);
|
||||
ExtraBeesBranch.VOLCANIC.addMemberSpecies(ExtraBeesSpecies.VOLCANIC);
|
||||
ExtraBeesBranch.VOLCANIC.addMemberSpecies(ExtraBeesSpecies.GLOWSTONE);
|
||||
ExtraBeesBranch.VOLCANIC.register();
|
||||
ExtraBeesBranch.VISCOUS.addMemberSpecies(ExtraBeesSpecies.VISCOUS);
|
||||
ExtraBeesBranch.VISCOUS.addMemberSpecies(ExtraBeesSpecies.GLUTINOUS);
|
||||
ExtraBeesBranch.VISCOUS.addMemberSpecies(ExtraBeesSpecies.STICKY);
|
||||
ExtraBeesBranch.VISCOUS.register();
|
||||
ExtraBeesBranch.VIRULENT.addMemberSpecies(ExtraBeesSpecies.MALICIOUS);
|
||||
ExtraBeesBranch.VIRULENT.addMemberSpecies(ExtraBeesSpecies.INFECTIOUS);
|
||||
ExtraBeesBranch.VIRULENT.addMemberSpecies(ExtraBeesSpecies.VIRULENT);
|
||||
ExtraBeesBranch.VIRULENT.register();
|
||||
ExtraBeesBranch.CAUSTIC.addMemberSpecies(ExtraBeesSpecies.CORROSIVE);
|
||||
ExtraBeesBranch.CAUSTIC.addMemberSpecies(ExtraBeesSpecies.CAUSTIC);
|
||||
ExtraBeesBranch.CAUSTIC.addMemberSpecies(ExtraBeesSpecies.ACIDIC);
|
||||
ExtraBeesBranch.CAUSTIC.register();
|
||||
ExtraBeesBranch.ENERGETIC.addMemberSpecies(ExtraBeesSpecies.EXCITED);
|
||||
ExtraBeesBranch.ENERGETIC.addMemberSpecies(ExtraBeesSpecies.ENERGETIC);
|
||||
ExtraBeesBranch.ENERGETIC.addMemberSpecies(ExtraBeesSpecies.ECSTATIC);
|
||||
ExtraBeesBranch.ENERGETIC.register();
|
||||
ExtraBeesBranch.SHADOW.addMemberSpecies(ExtraBeesSpecies.SHADOW);
|
||||
ExtraBeesBranch.SHADOW.addMemberSpecies(ExtraBeesSpecies.DARKENED);
|
||||
ExtraBeesBranch.SHADOW.addMemberSpecies(ExtraBeesSpecies.ABYSS);
|
||||
ExtraBeesBranch.SHADOW.register();
|
||||
ExtraBeesBranch.PRIMARY.addMemberSpecies(ExtraBeesSpecies.RED);
|
||||
ExtraBeesBranch.PRIMARY.addMemberSpecies(ExtraBeesSpecies.YELLOW);
|
||||
ExtraBeesBranch.PRIMARY.addMemberSpecies(ExtraBeesSpecies.BLUE);
|
||||
ExtraBeesBranch.PRIMARY.addMemberSpecies(ExtraBeesSpecies.GREEN);
|
||||
ExtraBeesBranch.PRIMARY.addMemberSpecies(ExtraBeesSpecies.BLACK);
|
||||
ExtraBeesBranch.PRIMARY.addMemberSpecies(ExtraBeesSpecies.WHITE);
|
||||
ExtraBeesBranch.PRIMARY.addMemberSpecies(ExtraBeesSpecies.BROWN);
|
||||
ExtraBeesBranch.PRIMARY.register();
|
||||
ExtraBeesBranch.SECONDARY.addMemberSpecies(ExtraBeesSpecies.ORANGE);
|
||||
ExtraBeesBranch.SECONDARY.addMemberSpecies(ExtraBeesSpecies.CYAN);
|
||||
ExtraBeesBranch.SECONDARY.addMemberSpecies(ExtraBeesSpecies.PURPLE);
|
||||
ExtraBeesBranch.SECONDARY.addMemberSpecies(ExtraBeesSpecies.GRAY);
|
||||
ExtraBeesBranch.SECONDARY.addMemberSpecies(ExtraBeesSpecies.LIGHTBLUE);
|
||||
ExtraBeesBranch.SECONDARY.addMemberSpecies(ExtraBeesSpecies.PINK);
|
||||
ExtraBeesBranch.SECONDARY.addMemberSpecies(ExtraBeesSpecies.LIMEGREEN);
|
||||
ExtraBeesBranch.SECONDARY.register();
|
||||
ExtraBeesBranch.TERTIARY.addMemberSpecies(ExtraBeesSpecies.MAGENTA);
|
||||
ExtraBeesBranch.TERTIARY.addMemberSpecies(ExtraBeesSpecies.LIGHTGRAY);
|
||||
ExtraBeesBranch.TERTIARY.register();
|
||||
ExtraBeesBranch.FTB.addMemberSpecies(ExtraBeesSpecies.JADED);
|
||||
ExtraBeesBranch.FTB.register();
|
||||
ExtraBeesBranch.QUANTUM.addMemberSpecies(ExtraBeesSpecies.UNUSUAL);
|
||||
ExtraBeesBranch.QUANTUM.addMemberSpecies(ExtraBeesSpecies.SPATIAL);
|
||||
ExtraBeesBranch.QUANTUM.addMemberSpecies(ExtraBeesSpecies.QUANTUM);
|
||||
ExtraBeesBranch.QUANTUM.register();
|
||||
ExtraBeesBranch.BOTANIA.addMemberSpecies(ExtraBeesSpecies.MYSTICAL);
|
||||
ExtraBeesBranch.BOTANIA.register();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUID() {
|
||||
return "extrabees.genus." + this.uid;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return I18N.localise("extrabees.branch." + this.toString().toLowerCase() + ".name");
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getScientific() {
|
||||
return this.scientific;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDescription() {
|
||||
return I18N.localise("extrabees.branch." + this.toString().toLowerCase() + ".desc");
|
||||
}
|
||||
|
||||
public void register() {
|
||||
if (!this.speciesSet.isEmpty()) {
|
||||
AlleleManager.alleleRegistry.registerClassification(this);
|
||||
final IClassification parent = AlleleManager.alleleRegistry.getClassification("family.apidae");
|
||||
if (parent != null) {
|
||||
parent.addMemberGroup(this);
|
||||
this.setParent(parent);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public IClassification.EnumClassLevel getLevel() {
|
||||
return IClassification.EnumClassLevel.GENUS;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Nullable
|
||||
public IClassification[] getMemberGroups() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addMemberGroup(final IClassification group) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public IAlleleSpecies[] getMemberSpecies() {
|
||||
return this.speciesSet.toArray(new IAlleleSpecies[0]);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addMemberSpecies(final IAlleleSpecies species) {
|
||||
this.speciesSet.add((IAlleleBeeSpecies) species);
|
||||
if (species instanceof ExtraBeesSpecies) {
|
||||
((ExtraBeesSpecies) species).setBranch(this);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public IClassification getParent() {
|
||||
return this.parent;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setParent(final IClassification parent) {
|
||||
this.parent = parent;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -14,21 +14,19 @@ import net.minecraft.world.World;
|
||||
|
||||
import net.minecraftforge.common.EnumPlantType;
|
||||
|
||||
import forestry.api.apiculture.EnumBeeChromosome;
|
||||
import forestry.api.apiculture.FlowerManager;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import forestry.api.genetics.IAlleleFlowers;
|
||||
import forestry.api.genetics.ICheckPollinatable;
|
||||
import forestry.api.genetics.IChromosomeType;
|
||||
import forestry.api.genetics.IFlowerProvider;
|
||||
import forestry.api.genetics.IFruitBearer;
|
||||
import forestry.api.genetics.IIndividual;
|
||||
import forestry.api.genetics.ISpeciesRoot;
|
||||
|
||||
import binnie.core.util.I18N;
|
||||
import binnie.extrabees.utils.Utils;
|
||||
|
||||
public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromosomeType {
|
||||
public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers {
|
||||
WATER,
|
||||
SUGAR,
|
||||
ROCK,
|
||||
@@ -37,9 +35,9 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo
|
||||
REDSTONE,
|
||||
WOOD,
|
||||
LEAVES,
|
||||
Sapling,
|
||||
Fruit,
|
||||
Mystical;
|
||||
SAPLING,
|
||||
FRUIT,
|
||||
MYSTICAL;
|
||||
|
||||
boolean dominant;
|
||||
|
||||
@@ -80,7 +78,7 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo
|
||||
FlowerManager.flowerRegistry.registerAcceptableFlower(block, getUID());
|
||||
}
|
||||
|
||||
AlleleManager.alleleRegistry.registerAllele(this, this);
|
||||
AlleleManager.alleleRegistry.registerAllele(this, EnumBeeChromosome.FLOWER_PROVIDER);
|
||||
}
|
||||
|
||||
public List<Block> getAcceptableBlocks() {
|
||||
@@ -103,13 +101,13 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo
|
||||
case DEAD: {
|
||||
return Collections.singletonList(Blocks.DEADBUSH);
|
||||
}
|
||||
case Fruit: {
|
||||
case FRUIT: {
|
||||
return Collections.emptyList(); // TODO: what is this supposed to be? It was Items.APPLE before.
|
||||
}
|
||||
case LEAVES: {
|
||||
return Collections.singletonList(Blocks.LEAVES);
|
||||
}
|
||||
case Sapling: {
|
||||
case SAPLING: {
|
||||
return Collections.singletonList(Blocks.SAPLING);
|
||||
}
|
||||
case WOOD: {
|
||||
@@ -145,16 +143,16 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo
|
||||
case WOOD: {
|
||||
return block.isWood(world, pos);
|
||||
}
|
||||
case Fruit: {
|
||||
case FRUIT: {
|
||||
return world.getTileEntity(pos) instanceof IFruitBearer;
|
||||
}
|
||||
case LEAVES: {
|
||||
return block.isLeaves(world.getBlockState(pos), world, pos);
|
||||
}
|
||||
case Sapling: {
|
||||
case SAPLING: {
|
||||
return block.getClass().getName().toLowerCase().contains("sapling");
|
||||
}
|
||||
case Mystical: {
|
||||
case MYSTICAL: {
|
||||
return block == Utils.getBotaniaBlock("flower");
|
||||
}
|
||||
default: {
|
||||
@@ -198,16 +196,6 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo
|
||||
return new HashSet<IFlower>();
|
||||
}*/
|
||||
|
||||
@Override
|
||||
public Class<? extends IAllele> getAlleleClass() {
|
||||
return getClass();
|
||||
}
|
||||
|
||||
@Override
|
||||
public ISpeciesRoot getSpeciesRoot() {
|
||||
return AlleleManager.alleleRegistry.getSpeciesRoot(getUID());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAcceptedPollinatable(World world, ICheckPollinatable pollinatable) {
|
||||
return pollinatable.getPlantType() != EnumPlantType.Nether;
|
||||
@@ -215,7 +203,7 @@ public enum ExtraBeesFlowers implements IFlowerProvider, IAlleleFlowers, IChromo
|
||||
|
||||
@Override
|
||||
public NonNullList<ItemStack> affectProducts(World world, IIndividual individual, BlockPos pos, NonNullList<ItemStack> products) {
|
||||
if (this == ExtraBeesFlowers.Mystical) {
|
||||
if (this == ExtraBeesFlowers.MYSTICAL) {
|
||||
final NonNullList<ItemStack> prods = NonNullList.create();
|
||||
prods.addAll(products);
|
||||
for (int k = 0; k < 50; ++k) {
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -75,10 +75,10 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect {
|
||||
WITHER,
|
||||
WATER,
|
||||
SLOW,
|
||||
BonemealSapling,
|
||||
BonemealFruit,
|
||||
BonemealMushroom,
|
||||
Power;
|
||||
BONEMEAL_SAPLING,
|
||||
BONEMEAL_FRUIT,
|
||||
BONEMEAL_MUSHROOM,
|
||||
POWER;
|
||||
|
||||
private static final List<Birthday> birthdays = new ArrayList<>();
|
||||
|
||||
@@ -436,27 +436,27 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect {
|
||||
}
|
||||
break;
|
||||
}
|
||||
case BonemealSapling: {
|
||||
case BONEMEAL_SAPLING: {
|
||||
if (world.rand.nextInt(20) > 1) {
|
||||
return storedData;
|
||||
}
|
||||
if (ExtraBeesFlowers.Sapling.isAcceptedFlower(world, pos)) {
|
||||
if (ExtraBeesFlowers.SAPLING.isAcceptedFlower(world, pos)) {
|
||||
ItemDye.applyBonemeal(new ItemStack(Blocks.DIRT, 1), world, pos);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case BonemealFruit: {
|
||||
case BONEMEAL_FRUIT: {
|
||||
if (world.rand.nextInt(20) > 1) {
|
||||
return storedData;
|
||||
}
|
||||
if (ExtraBeesFlowers.Fruit.isAcceptedFlower(world, pos)) {
|
||||
if (ExtraBeesFlowers.FRUIT.isAcceptedFlower(world, pos)) {
|
||||
ItemDye.applyBonemeal(new ItemStack(Blocks.DIRT, 1), world, pos);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case BonemealMushroom: {
|
||||
case BONEMEAL_MUSHROOM: {
|
||||
if (world.rand.nextInt(20) > 1) {
|
||||
return storedData;
|
||||
}
|
||||
@@ -466,7 +466,7 @@ public enum ExtraBeesEffect implements IAlleleBeeEffect {
|
||||
}
|
||||
break;
|
||||
}
|
||||
case Power: {
|
||||
case POWER: {
|
||||
final TileEntity tile2 = world.getTileEntity(pos);
|
||||
if (tile2.hasCapability(CapabilityEnergy.ENERGY, EnumFacing.UP)) {
|
||||
IEnergyStorage storage = tile2.getCapability(CapabilityEnergy.ENERGY, EnumFacing.UP);
|
||||
|
||||
@@ -11,7 +11,7 @@ import binnie.extrabees.alveary.TileEntityExtraBeesAlvearyPart;
|
||||
import binnie.extrabees.blocks.BlockEctoplasm;
|
||||
import binnie.extrabees.blocks.BlockExtraBeeHive;
|
||||
import binnie.extrabees.blocks.type.EnumHiveType;
|
||||
import binnie.extrabees.genetics.ExtraBeesSpecies;
|
||||
import binnie.extrabees.genetics.ExtraBeeDefinition;
|
||||
import binnie.extrabees.utils.HiveDrop;
|
||||
import binnie.extrabees.utils.Utils;
|
||||
import binnie.extrabees.utils.config.ConfigurationMain;
|
||||
@@ -40,13 +40,13 @@ public final class BlockRegister {
|
||||
|
||||
private static void registerHiveDrops() {
|
||||
IAlleleBeeSpecies valiantSpecies = Utils.getSpecies(BeeDefinition.VALIANT);
|
||||
EnumHiveType.Water.drops.add(new HiveDrop(ExtraBeesSpecies.WATER, 80));
|
||||
EnumHiveType.Water.drops.add(new HiveDrop(ExtraBeeDefinition.WATER, 80));
|
||||
EnumHiveType.Water.drops.add(new HiveDrop(valiantSpecies, 3));
|
||||
EnumHiveType.Rock.drops.add(new HiveDrop(ExtraBeesSpecies.ROCK, 80));
|
||||
EnumHiveType.Rock.drops.add(new HiveDrop(ExtraBeeDefinition.ROCK, 80));
|
||||
EnumHiveType.Rock.drops.add(new HiveDrop(valiantSpecies, 3));
|
||||
EnumHiveType.Nether.drops.add(new HiveDrop(ExtraBeesSpecies.BASALT, 80));
|
||||
EnumHiveType.Nether.drops.add(new HiveDrop(ExtraBeeDefinition.BASALT, 80));
|
||||
EnumHiveType.Nether.drops.add(new HiveDrop(valiantSpecies, 3));
|
||||
EnumHiveType.Marble.drops.add(new HiveDrop(ExtraBeesSpecies.MARBLE, 80));
|
||||
EnumHiveType.Marble.drops.add(new HiveDrop(ExtraBeeDefinition.MARBLE, 80));
|
||||
EnumHiveType.Marble.drops.add(new HiveDrop(valiantSpecies, 3));
|
||||
|
||||
ExtraBees.hive.setHarvestLevel("scoop", 0, ExtraBees.hive.getDefaultState().withProperty(BlockExtraBeeHive.hiveType, EnumHiveType.Water));
|
||||
|
||||
@@ -6,11 +6,11 @@ import net.minecraft.util.text.translation.I18n;
|
||||
|
||||
import net.minecraftforge.fml.common.registry.GameRegistry;
|
||||
|
||||
import binnie.extrabees.genetics.ExtraBeesSpecies;
|
||||
import binnie.extrabees.genetics.ExtraBeeDefinition;
|
||||
|
||||
public class ExtraBeesCommonProxy {
|
||||
|
||||
public void registerBeeModel(ExtraBeesSpecies type) {
|
||||
public void registerBeeModel(ExtraBeeDefinition type) {
|
||||
}
|
||||
|
||||
public Block registerBlock(Block block) {
|
||||
|
||||
@@ -9,6 +9,7 @@ import forestry.api.apiculture.IAlleleBeeSpecies;
|
||||
import forestry.api.apiculture.IBee;
|
||||
import forestry.api.apiculture.IHiveDrop;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import forestry.apiculture.genetics.IBeeDefinition;
|
||||
|
||||
public class HiveDrop implements IHiveDrop {
|
||||
|
||||
@@ -16,6 +17,10 @@ public class HiveDrop implements IHiveDrop {
|
||||
private NonNullList<ItemStack> extra;
|
||||
private int chance;
|
||||
|
||||
public HiveDrop(IBeeDefinition species, final int chance) {
|
||||
this(species.getTemplate(), NonNullList.create(), chance);
|
||||
}
|
||||
|
||||
public HiveDrop(final IAlleleBeeSpecies species, final int chance) {
|
||||
this(Utils.getBeeRoot().getTemplate(species), NonNullList.create(), chance);
|
||||
}
|
||||
|
||||
@@ -60,6 +60,9 @@ public class AnalystPageMutations extends ControlAnalystPage {
|
||||
if (ind.getGenome().getPrimary() == ExtraBeesIntegration.basalt) {
|
||||
hive = new ItemStack(ExtraBeesIntegration.hive, 1, 2);
|
||||
}
|
||||
if (ind.getGenome().getPrimary() == ExtraBeesIntegration.marble) {
|
||||
hive = new ItemStack(ExtraBeesIntegration.hive, 1, 3);
|
||||
}
|
||||
}
|
||||
if (ind.getGenome().getPrimary() == ForestryAllele.BeeSpecies.Forest.getAllele()) {
|
||||
hive = new ItemStack(Mods.Forestry.block("beehives"), 1, 1);
|
||||
|
||||
Reference in new issue
Block a user