Improve code readability in binnie.extrabees package and other packages

* Improve code readability in binnie.extrabees package and other packages
* Fix compile error after refactoring
This commit is contained in:
Alexander Kornilov authored and marcin212 committed 2017-04-29 13:43:35 +02:00
1 parent b609d6688f
commit c09ad04284
95 files changed
+3916 -3900

No files matched your search

@@ -1,36 +1,48 @@
//
// Decompiled by Procyon v0.5.30
//
package binnie.extrabees.genetics;
import net.minecraft.block.Block;
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.IIndividual;
import forestry.api.apiculture.EnumBeeType;
import binnie.core.BinnieCore;
import forestry.api.genetics.IGenome;
import forestry.api.apiculture.IAlleleBeeSpecies;
import net.minecraft.init.Items;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import binnie.Binnie;
import forestry.api.recipes.RecipeManagers;
import binnie.extrabees.genetics.effect.ExtraBeesEffect;
import cpw.mods.fml.common.registry.GameRegistry;
import binnie.extrabees.genetics.effect.BlockEctoplasm;
import binnie.extrabees.ExtraBees;
import binnie.extrabees.genetics.items.ItemDictionary;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.AlleleManager;
import binnie.core.IInitializable;
import forestry.api.genetics.IAllele;
import forestry.api.genetics.IGenome;
import forestry.api.recipes.RecipeManagers;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
public class ModuleGenetics implements IInitializable {
public static IGenome getGenome(IAlleleBeeSpecies allele0) {
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;
}
public class ModuleGenetics implements IInitializable
{
@Override
public void preInit() {
for (final ExtraBeesSpecies species : ExtraBeesSpecies.values()) {
for (ExtraBeesSpecies species : ExtraBeesSpecies.values()) {
AlleleManager.alleleRegistry.registerAllele(species);
}
ExtraBees.dictionary = new ItemDictionary();
@@ -48,32 +60,15 @@ public class ModuleGenetics implements IInitializable
@Override
public void postInit() {
int ebSpeciesCount = 0;
// unused code?
/*int ebSpeciesCount = 0;
int ebTotalSpeciesCount = 0;
for (final ExtraBeesSpecies species : ExtraBeesSpecies.values()) {
for (ExtraBeesSpecies species : ExtraBeesSpecies.values()) {
++ebTotalSpeciesCount;
if (!AlleleManager.alleleRegistry.isBlacklisted(species.getUID())) {
++ebSpeciesCount;
}
}
RecipeManagers.carpenterManager.addRecipe(100, Binnie.Liquid.getLiquidStack("water", 2000), (ItemStack) null, new ItemStack(ExtraBees.dictionary), new Object[] { "X#X", "YEY", "RDR", '#', Blocks.glass_pane, 'X', Items.gold_ingot, 'Y', "ingotTin", 'R', Items.redstone, 'D', Items.diamond, 'E', Items.emerald });
}
public static IGenome getGenome(final IAlleleBeeSpecies allele0) {
return Binnie.Genetics.getBeeRoot().templateAsGenome(Binnie.Genetics.getBeeRoot().getTemplate(allele0.getUID()));
}
public static ItemStack getBeeIcon(final IAlleleBeeSpecies species) {
if (species == null) {
return null;
}
final IAllele[] template = Binnie.Genetics.getBeeRoot().getTemplate(species.getUID());
if (template == null) {
return null;
}
final IBeeGenome genome = Binnie.Genetics.getBeeRoot().templateAsGenome(template);
final IBee bee = Binnie.Genetics.getBeeRoot().getBee(BinnieCore.proxy.getWorld(), genome);
final ItemStack item = Binnie.Genetics.getBeeRoot().getMemberStack(bee, EnumBeeType.PRINCESS.ordinal());
return item;
}*/
RecipeManagers.carpenterManager.addRecipe(100, Binnie.Liquid.getLiquidStack("water", 2000), null, new ItemStack(ExtraBees.dictionary), "X#X", "YEY", "RDR", '#', Blocks.glass_pane, 'X', Items.gold_ingot, 'Y', "ingotTin", 'R', Items.redstone, 'D', Items.diamond, 'E', Items.emerald);
}
}