Refactoring bee species (#73)

* Added *Definition for bee branches and bees

* Some refactoring for ExtraBeesSpecies

* More refactoring Bees

* Added effect to bees
Some refactoring
Added bee branch parent

* Fix Barren branch

* Fix Hostile branch

* Fix other bees

* Added person mutation condition

* Added person requirement mutation condition

* Fix change  for Jaded bee

* Drop some unused methods

* Revert Binnie logic in BreedingSystem
This commit is contained in:
Alexander Kornilov authored and mezz committed 2017-05-20 10:50:14 -07:00
1 parent a12ad2eae3
commit 4ef41b6f62
19 files changed
+2369 -2121

No files matched your search

@@ -1,19 +1,13 @@
package binnie.extrabees.genetics;
import binnie.Binnie;
import binnie.core.BinnieCore;
import binnie.core.IInitializable;
import binnie.extrabees.ExtraBees;
import binnie.extrabees.genetics.effect.BlockEctoplasm;
import binnie.extrabees.genetics.effect.ExtraBeesEffect;
import binnie.extrabees.genetics.items.ItemDictionary;
import cpw.mods.fml.common.registry.GameRegistry;
import forestry.api.apiculture.EnumBeeType;
import forestry.api.apiculture.IAlleleBeeSpecies;
import forestry.api.apiculture.IBee;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IGenome;
import forestry.api.recipes.RecipeManagers;
import net.minecraft.init.Blocks;
@@ -25,50 +19,23 @@ public class ModuleGenetics implements IInitializable {
return Binnie.Genetics.getBeeRoot().templateAsGenome(Binnie.Genetics.getBeeRoot().getTemplate(allele0.getUID()));
}
// TODO unsused method?
public static ItemStack getBeeIcon(IAlleleBeeSpecies species) {
if (species == null) {
return null;
}
IAllele[] template = Binnie.Genetics.getBeeRoot().getTemplate(species.getUID());
if (template == null) {
return null;
}
IBeeGenome genome = Binnie.Genetics.getBeeRoot().templateAsGenome(template);
IBee bee = Binnie.Genetics.getBeeRoot().getBee(BinnieCore.proxy.getWorld(), genome);
ItemStack item = Binnie.Genetics.getBeeRoot().getMemberStack(bee, EnumBeeType.PRINCESS.ordinal());
return item;
}
@Override
public void preInit() {
for (ExtraBeesSpecies species : ExtraBeesSpecies.values()) {
AlleleManager.alleleRegistry.registerAllele(species);
}
ExtraBees.dictionary = new ItemDictionary();
GameRegistry.registerBlock(ExtraBees.ectoplasm = new BlockEctoplasm(), "ectoplasm");
ExtraBees.ectoplasm = new BlockEctoplasm();
GameRegistry.registerBlock(ExtraBees.ectoplasm, "ectoplasm");
}
@Override
public void init() {
ExtraBeesEffect.doInit();
ExtraBeesFlowers.doInit();
ExtraBeesSpecies.doInit();
ExtraBeeMutation.doInit();
ExtraBeesBranch.doInit();
ExtraBeeDefinition.initBees();
}
@Override
public void postInit() {
// unused code?
/*int ebSpeciesCount = 0;
int ebTotalSpeciesCount = 0;
for (ExtraBeesSpecies species : ExtraBeesSpecies.values()) {
++ebTotalSpeciesCount;
if (!AlleleManager.alleleRegistry.isBlacklisted(species.getUID())) {
++ebSpeciesCount;
}
}*/
RecipeManagers.carpenterManager.addRecipe(
100,
Binnie.Liquid.getLiquidStack("water", 2000),