mirror of
https://github.com/GTNewHorizons/MagicBees.git
synced 2026-11-17 02:55:19 +00:00
Tcon Nugget Conversion
This commit is contained in:
1 parent
3d562d0052
commit
9724d519e8
8 files changed
+17
-88
No files matched your search
@@ -718,15 +718,6 @@ public class BeeGenomeManager {
|
||||
return genome;
|
||||
}
|
||||
|
||||
public static IAllele[] getTemplateOsmium() {
|
||||
IAllele[] genome = getTemplateBaseMetallic();
|
||||
|
||||
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.OSMIUM.getSpecies();
|
||||
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanLonger");
|
||||
|
||||
return genome;
|
||||
}
|
||||
|
||||
public static IAllele[] getTemplateDiamond() {
|
||||
IAllele[] genome = getTemplateBaseMetallic();
|
||||
|
||||
|
||||
@@ -417,15 +417,6 @@ public class BeeMutation {
|
||||
9).requireResource("blockManyullyn");
|
||||
}
|
||||
|
||||
if (BeeSpecies.OSMIUM.isActive()) {
|
||||
baseA = (BeeSpecies.SILVER.isActive()) ? BeeSpecies.SILVER.getSpecies() : Allele.getBaseSpecies("Imperial");
|
||||
baseB = (BeeSpecies.COBALT.isActive()) ? BeeSpecies.COBALT.getSpecies() : BeeSpecies.INFERNAL.getSpecies();
|
||||
mutation = beeMutationFactory.createMutation(baseA, baseB, BeeSpecies.OSMIUM.getGenome(), 11);
|
||||
if (OreDictionary.getOres("blockOsmium").size() > 0) {
|
||||
mutation.requireResource("blockOsmium");
|
||||
}
|
||||
}
|
||||
|
||||
beeMutationFactory.createMutation(
|
||||
Allele.getBaseSpecies("Austere"),
|
||||
BeeSpecies.GOLD.getSpecies(),
|
||||
|
||||
@@ -2,6 +2,8 @@ package magicbees.bees;
|
||||
|
||||
import static magicbees.bees.BeeSpecies.*;
|
||||
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import gregtech.api.enums.Materials;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -137,19 +139,12 @@ public class BeeProductHelper {
|
||||
|
||||
public static void initOreDictSProducts() {
|
||||
SILVER.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
|
||||
if (OreDictionary.getOres("ingotSilver").size() > 0) {
|
||||
SILVER.addSpecialty(Config.nuggets.getStackForType(NuggetType.SILVER), 0.16f);
|
||||
} else {
|
||||
SILVER.setInactive();
|
||||
}
|
||||
SILVER.addSpecialty(Loader.isModLoaded("gregtech") ? Materials.Silver.getNuggets(1) : OreDictionary.getOres("nuggetSilver").get(0), 0.16f);
|
||||
|
||||
LEAD.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
|
||||
if (OreDictionary.getOres("ingotLead").size() > 0) {
|
||||
LEAD.addSpecialty(Config.nuggets.getStackForType(NuggetType.LEAD), 0.17f);
|
||||
} else {
|
||||
LEAD.setInactive();
|
||||
}
|
||||
LEAD.addSpecialty(Loader.isModLoaded("gregtech") ? Materials.Lead.getNuggets(1) : OreDictionary.getOres("nuggetLead").get(0), 0.17f);
|
||||
|
||||
//Oil berry alu bee
|
||||
ALUMINUM.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
|
||||
if (OreDictionary.getOres("nuggetAluminum").size() > 0) {
|
||||
ALUMINUM.addSpecialty(OreDictionary.getOres("nuggetAluminum").get(0), 0.20f);
|
||||
@@ -158,71 +153,32 @@ public class BeeProductHelper {
|
||||
}
|
||||
|
||||
TE_PLATINUM.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
|
||||
if (OreDictionary.getOres("nuggetPlatinum").size() > 0 && OreDictionary.getOres("ingotPlatinum").size() > 0) {
|
||||
TE_PLATINUM.addSpecialty(OreDictionary.getOres("nuggetPlatinum").get(0), 0.18f);
|
||||
} else {
|
||||
TE_PLATINUM.setInactive();
|
||||
}
|
||||
TE_PLATINUM.addSpecialty(Loader.isModLoaded("gregtech") ? Materials.Platinum.getNuggets(1) : OreDictionary.getOres("nuggetPlatinum").get(0), 0.18f);
|
||||
|
||||
TE_NICKEL.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
|
||||
if (OreDictionary.getOres("nuggetNickel").size() > 0 && OreDictionary.getOres("ingotNickel").size() > 0) {
|
||||
TE_NICKEL.addSpecialty(OreDictionary.getOres("nuggetNickel").get(0), 0.18f);
|
||||
} else {
|
||||
TE_NICKEL.setInactive();
|
||||
}
|
||||
TE_NICKEL.addSpecialty(Loader.isModLoaded("gregtech") ? Materials.Nickel.getNuggets(1) : OreDictionary.getOres("nuggetNickel").get(0), 0.18f);
|
||||
|
||||
ARDITE.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
|
||||
if (OreDictionary.getOres("nuggetArdite").size() > 0) {
|
||||
ARDITE.addSpecialty(OreDictionary.getOres("nuggetArdite").get(0), 0.18f);
|
||||
} else {
|
||||
ARDITE.setInactive();
|
||||
}
|
||||
ARDITE.addSpecialty(Loader.isModLoaded("gregtech") ? Materials.Ardite.getNuggets(1) : OreDictionary.getOres("nuggetArdite").get(0), 0.18f);
|
||||
|
||||
COBALT.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
|
||||
if (OreDictionary.getOres("nuggetCobalt").size() > 0) {
|
||||
COBALT.addSpecialty(OreDictionary.getOres("nuggetCobalt").get(0), 0.18f);
|
||||
}
|
||||
if (OreDictionary.getOres("nuggetNaturalCobalt").size() > 0) {
|
||||
COBALT.addSpecialty(OreDictionary.getOres("nuggetNaturalCobalt").get(0), 0.24f);
|
||||
}
|
||||
COBALT.addSpecialty(Loader.isModLoaded("gregtech") ? Materials.Cobalt.getNuggets(1) : OreDictionary.getOres("nuggetCobalt").get(0), 0.18f);
|
||||
if (COBALT.getSpecies().getSpecialtyChances().size() <= 0) {
|
||||
COBALT.setInactive();
|
||||
}
|
||||
|
||||
TE_BRONZE.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
|
||||
if (OreDictionary.getOres("nuggetBronze").size() > 0 && OreDictionary.getOres("ingotBronze").size() > 0) {
|
||||
TE_BRONZE.addSpecialty(OreDictionary.getOres("nuggetBronze").get(0), 0.18f);
|
||||
} else {
|
||||
TE_BRONZE.setInactive();
|
||||
}
|
||||
TE_BRONZE.addSpecialty(Loader.isModLoaded("gregtech") ? Materials.Bronze.getNuggets(1) : OreDictionary.getOres("nuggetBronze").get(0), 0.18f);
|
||||
|
||||
TE_INVAR.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
|
||||
if (OreDictionary.getOres("nuggetInvar").size() > 0 && OreDictionary.getOres("ingotInvar").size() > 0) {
|
||||
TE_INVAR.addSpecialty(OreDictionary.getOres("nuggetInvar").get(0), 0.18f);
|
||||
} else {
|
||||
TE_INVAR.setInactive();
|
||||
}
|
||||
TE_INVAR.addSpecialty(Loader.isModLoaded("gregtech") ? Materials.Invar.getNuggets(1) : OreDictionary.getOres("nuggetInvar").get(0), 0.18f);
|
||||
|
||||
TE_ELECTRUM.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
|
||||
if (OreDictionary.getOres("nuggetElectrum").size() > 0 && OreDictionary.getOres("ingotElectrum").size() > 0) {
|
||||
TE_ELECTRUM.addSpecialty(OreDictionary.getOres("nuggetElectrum").get(0), 0.18f);
|
||||
} else {
|
||||
TE_ELECTRUM.setInactive();
|
||||
}
|
||||
TE_ELECTRUM.addSpecialty(Loader.isModLoaded("gregtech") ? Materials.Electrum.getNuggets(1) : OreDictionary.getOres("nuggetElectrum").get(0), 0.18f);
|
||||
|
||||
MANYULLYN.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
|
||||
if (OreDictionary.getOres("nuggetManyullyn").size() > 0) {
|
||||
MANYULLYN.addSpecialty(OreDictionary.getOres("nuggetManyullyn").get(0), 0.16f);
|
||||
} else {
|
||||
MANYULLYN.setInactive();
|
||||
}
|
||||
|
||||
OSMIUM.addProduct(ForestryHelper.itemHoneycomb, 0.15f);
|
||||
if (OreDictionary.getOres("nuggetOsmium").size() > 0) {
|
||||
OSMIUM.addSpecialty(OreDictionary.getOres("nuggetOsmium").get(0), 0.16f);
|
||||
} else {
|
||||
OSMIUM.setInactive();
|
||||
}
|
||||
MANYULLYN.addSpecialty(Loader.isModLoaded("gregtech") ? Materials.Manyullyn.getNuggets(1) : OreDictionary.getOres("nuggetManyullyn").get(0), 0.18f);
|
||||
|
||||
CERTUS.addProduct(ForestryHelper.itemHoneycomb, 0.10f);
|
||||
if (OreDictionary.getOres("crystalCertusQuartz").size() > 0) {
|
||||
|
||||
@@ -150,9 +150,6 @@ public enum BeeSpecies {
|
||||
false, false),
|
||||
MANYULLYN("Manyullyn", "manahmanah", BeeClassification.METALLIC, 0x481D6D, 0xBD92F1, EnumTemperature.HOT,
|
||||
EnumHumidity.ARID, true, false),
|
||||
OSMIUM("Osmium", "hyacintho", BeeClassification.METALLIC, 0x374B5B, 0x6C7B89, EnumTemperature.NORMAL,
|
||||
EnumHumidity.NORMAL, false, false),
|
||||
|
||||
DIAMOND("Diamond", "diamond", BeeClassification.GEM, 0x209581, 0x8DF5E3, EnumTemperature.NORMAL,
|
||||
EnumHumidity.NORMAL, true, false),
|
||||
EMERALD("Emerald", "prasinus", BeeClassification.GEM, 0x005300, 0x17DD62, EnumTemperature.NORMAL,
|
||||
@@ -385,7 +382,6 @@ public enum BeeSpecies {
|
||||
ARDITE.registerGenomeTemplate(BeeGenomeManager.getTemplateArdite());
|
||||
COBALT.registerGenomeTemplate(BeeGenomeManager.getTemplateCobalt());
|
||||
MANYULLYN.registerGenomeTemplate(BeeGenomeManager.getTemplateManyullyn());
|
||||
OSMIUM.registerGenomeTemplate(BeeGenomeManager.getTemplateOsmium());
|
||||
DIAMOND.registerGenomeTemplate(BeeGenomeManager.getTemplateDiamond());
|
||||
EMERALD.registerGenomeTemplate(BeeGenomeManager.getTemplateEmerald());
|
||||
APATITE.registerGenomeTemplate(BeeGenomeManager.getTemplateApatite());
|
||||
|
||||
Reference in new issue
Block a user