From 7751c01463e8dafddac39cadf73c502af3522c6f Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Fri, 2 Aug 2013 22:58:06 -0700 Subject: [PATCH] Bugs. --- magicbees_res/build.xml | 2 +- .../magicbees/bees/BeeClassification.java | 32 +++++++++---------- magicbees_src/magicbees/bees/BeeSpecies.java | 25 +++++++++++++-- 3 files changed, 39 insertions(+), 20 deletions(-) diff --git a/magicbees_res/build.xml b/magicbees_res/build.xml index 7ff2afa..9e116e8 100644 --- a/magicbees_res/build.xml +++ b/magicbees_res/build.xml @@ -16,7 +16,7 @@ - + diff --git a/magicbees_src/magicbees/bees/BeeClassification.java b/magicbees_src/magicbees/bees/BeeClassification.java index 1b683c6..fa4cf8a 100644 --- a/magicbees_src/magicbees/bees/BeeClassification.java +++ b/magicbees_src/magicbees/bees/BeeClassification.java @@ -13,27 +13,27 @@ import forestry.api.genetics.IClassification; public enum BeeClassification implements IClassification { - VEILED("Veiled", "velata"), - ARCANE("Arcane", "arcanus"), - SUPERNATURAL("Supernatural", "occultus"), - SCHOLARLY("Scholarly", "docto"), - SKULKING("Skulking", "malevolens"), - MAGICAL("Magic", "magica"), - TIME("Time", "tempestivus"), - SOUL("Soul", "animus"), + VEILED("Veiled", "Velatapis"), + ARCANE("Arcane", "Arcanapis"), + SUPERNATURAL("Supernatural", "Occultapis"), + SCHOLARLY("Scholarly", "Doctapis"), + SKULKING("Skulking", "Malevolenapis"), + MAGICAL("Magic", "Magicapis"), + TIME("Time", "Tempestivapis"), + SOUL("Soul", "Animapis"), - ABOMINABLE("Abominable", "detestabilis"), - EXTRINSIC("Extrinsic", "extrarius"), + ABOMINABLE("Abominable", "Detestabilapis"), + EXTRINSIC("Extrinsic", "Extrarapis"), - METALLIC("Metallic", "metallicis"), - GEM("Gem", "lapidi"), + METALLIC("Metallic", "Metalliapis"), + GEM("Gem", "Lapidapis"), - THAUMIC("Thaumic", "thaumis"), - FLESHY("Fleshy", "carnosa"), + THAUMIC("Thaumic", "Thaumiapis"), + FLESHY("Fleshy", "Carnosapis"), - ALCHEMICAL("Alchemical", "alchimia"), + ALCHEMICAL("Alchemical", "Alchimiapis"), - ESSENTIAL("Essential", "essentia"), + ESSENTIAL("Essential", "Essentiapis"), ; private String uID; diff --git a/magicbees_src/magicbees/bees/BeeSpecies.java b/magicbees_src/magicbees/bees/BeeSpecies.java index b2eeafa..41fc5e5 100644 --- a/magicbees_src/magicbees/bees/BeeSpecies.java +++ b/magicbees_src/magicbees/bees/BeeSpecies.java @@ -522,26 +522,45 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider { ALUMINUM.addSpecialty(OreDictionary.getOres("nuggetNaturalAluminum").get(0), 20); } + else + { + ALUMINUM.setInactive(); + } ALUMINUM.register(); + ARDITE.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) .setGenome(BeeGenomeManager.getTemplateArdite()); if (OreDictionary.getOres("nuggetArdite").size() > 0) { ARDITE.addSpecialty(OreDictionary.getOres("nuggetArdite").get(0), 18); } + else + { + ARDITE.setInactive(); + } ARDITE.register(); + COBALT.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) .setGenome(BeeGenomeManager.getTemplateCobalt()); - if (OreDictionary.getOres("ingotCobalt").size() > 0) + if (OreDictionary.getOres("nuggetCobalt").size() > 0) { - COBALT.addSpecialty(OreDictionary.getOres("ingotCobalt").get(0), 18); + COBALT.addSpecialty(OreDictionary.getOres("nuggetCobalt").get(0), 18); + } + else + { + COBALT.setInactive(); } COBALT.register(); + MANYULLYN.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10) .setGenome(BeeGenomeManager.getTemplateManyullyn()); if (OreDictionary.getOres("nuggetManyullyn").size() > 0) { - ALUMINUM.addSpecialty(OreDictionary.getOres("nuggetManyullyn").get(0), 16); + MANYULLYN.addSpecialty(OreDictionary.getOres("nuggetManyullyn").get(0), 16); + } + else + { + MANYULLYN.setInactive(); } MANYULLYN.register();