Merged in jadedcat/magic-bees-jc (pull request #3)

Thermal Expansion and Redstone Arsenal Bees
This commit is contained in:
MysteriousAges committed 2014-01-16 12:35:07 -08:00
commit a4ebd6d859
16 files changed
+919 -5

No files matched your search

@@ -50,6 +50,11 @@
<entry key="comb.essence">Essence Comb</entry>
<entry key="comb.potent">Potent Comb</entry>
<entry key="comb.TEcarbon">Carbon Comb</entry>
<entry key="comb.TEelectric">Electric Comb</entry>
<entry key="comb.TElux">Lux Comb</entry>
<entry key="comb.TEendearing">Endearing Comb</entry>
<!-- Wax names -->
<entry key="wax.magic">Magic Wax</entry>
@@ -59,6 +64,11 @@
<!-- Drop names -->
<entry key="drop.enchanting">Enchanting Drop</entry>
<entry key="drop.intellect">Intellect Drop</entry>
<entry key="drop.destabilized">Destabilized Drop</entry>
<entry key="drop.carbon">Carbon Drop</entry>
<entry key="drop.lux">Lux Drop</entry>
<entry key="drop.endearing">Endearing Drop</entry>
<!-- Pollen names -->
<entry key="pollen.unusual">Unusual Pollen</entry>
@@ -368,6 +378,40 @@
<entry key="magicbees.speciesAMVortex.description">Ravenous for mana, they may be dangerous for any caster.|Apinomicon</entry>
<entry key="magicbees.speciesAMWight">Wight</entry>
<entry key="magicbees.speciesAMWight.description">"They attract magical spirits; not always docile."|Mithion, Adept</entry>
<entry key="magicbees.speciesTEBlizzy">Blizzy</entry>
<entry key="magicbees.speciesTEBlizzy.description">Frigid and cold like miniature snowmen|Apinomicon</entry>
<entry key="magicbees.speciesTEGelid">Gelid</entry>
<entry key="magicbees.speciesTEGelid.description">Liquid coolant producers|Apinomicon</entry>
<entry key="magicbees.speciesTEDante">Dante</entry>
<entry key="magicbees.speciesTEDante.description">Mixing bees in an inferno produces surprising results|Apinomicon</entry>
<entry key="magicbees.speciesTEPyro">Pyro</entry>
<entry key="magicbees.speciesTEPyro.description">"You Monster"|Apinomicon</entry>
<entry key="magicbees.speciesTEDante">Dante</entry>
<entry key="magicbees.speciesTEDante.description">Mixing bees in an inferno produces surprising results|Apinomicon</entry>
<entry key="magicbees.speciesTEElectrum">Electrum</entry>
<entry key="magicbees.speciesTEElectrum.description">...|Apinomicon</entry>
<entry key="magicbees.speciesTEPlatinum">Platinum</entry>
<entry key="magicbees.speciesTEPlatinum.description">...|Apinomicon</entry>
<entry key="magicbees.speciesTENickel">Nickel</entry>
<entry key="magicbees.speciesTENickel.description">...|Apinomicon</entry>
<entry key="magicbees.speciesTEInvar">Invar</entry>
<entry key="magicbees.speciesTEInvar.description">...|Apinomicon</entry>
<entry key="magicbees.speciesTEBronze">Tinker</entry>
<entry key="magicbees.speciesTEBronze.description">...|Apinomicon</entry>
<entry key="magicbees.speciesTECoal">Carbon</entry>
<entry key="magicbees.speciesTECoal.description">...|Apinomicon</entry>
<entry key="magicbees.speciesTEDestabilized">Destabilized</entry>
<entry key="magicbees.speciesTEDestabilized.description">These bees started out unstable, they didn't get better with time|Apinomicon</entry>
<entry key="magicbees.speciesTELux">Lux</entry>
<entry key="magicbees.speciesTELux.description">Let there be light..|Apinomicon</entry>
<entry key="magicbees.speciesTEWinsome">Winsome</entry>
<entry key="magicbees.speciesTEWinsome.description">....|Apinomicon</entry>
<entry key="magicbees.speciesTEEndearing">Endearing</entry>
<entry key="magicbees.speciesTEEndearing.description">....|Apinomicon</entry>
<entry key="magicbees.speciesRSAFluxed">Fluxed</entry>
<entry key="magicbees.speciesRSAFluxed.description">....|Apinomicon</entry>
<!-- Blank species entries
<entry key="magicbees.species"></entry>
+3
View File
@@ -0,0 +1,3 @@
#Build Number for ANT. Do not edit!
#Thu Jan 16 14:17:04 CST 2014
build.number=21
+1 -1
View File
@@ -4,7 +4,7 @@
<property name="resource.dir" value="${build.dir}/mc.dev" />
<property name="jar.dir" value="build/jar" />
<property name="src.dir" value="Sources/MagicBees" />
<property name="src.dir" value="Sources/Minecraft" />
<property name="forge.dir" value="${build.dir}/forge" />
<property name="mcp.dir" value="${forge.dir}/mcp" />
@@ -35,6 +35,9 @@ public enum BeeClassification implements IClassification
ALCHEMICAL("Alchemical", "Alchimiapis"),
ESSENTIAL("Essential", "Essentiapis"),
THERMAL ("Thermal", "Thermametallic"),
ADORABLE ("Adorable", "Amabilis"),
;
private String uID;
@@ -1187,7 +1187,211 @@ public class BeeGenomeManager
return genome;
}
public static IAllele[] getTemplateTEBase()
{
IAllele[] genome = getTemplateModBase();
genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth2");
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth2");
genome[EnumBeeChromosome.TOLERANT_FLYER.ordinal()] = Allele.getBaseAllele("boolTrue");
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedFast");
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityHigh");
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanLonger");
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.getBaseAllele("flowersVanilla");
return genome;
}
public static IAllele[] getTemplateTEBaseMetal()
{
IAllele[] genome = getTemplateTEBase();
genome[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.getBaseAllele("boolTrue");
genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue");
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedSlowest");
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityLow");
return genome;
}
public static IAllele[] getTemplateTEBaseNether()
{
IAllele[] genome = getTemplateTEBase();
genome[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.getBaseAllele("boolTrue");
genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue");
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedSlow");
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityHigh");
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.getBaseAllele("effectIgnition");
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.getBaseAllele("flowersNether");
return genome;
}
public static IAllele[] getTemplateTEEnd()
{
IAllele[] genome = getTemplateTEBase();
genome[EnumBeeChromosome.NOCTURNAL.ordinal()] = Allele.getBaseAllele("boolTrue");
genome[EnumBeeChromosome.CAVE_DWELLING.ordinal()] = Allele.getBaseAllele("boolTrue");
genome[EnumBeeChromosome.SPEED.ordinal()] = Allele.getBaseAllele("speedFastest");
genome[EnumBeeChromosome.FERTILITY.ordinal()] = Allele.getBaseAllele("fertilityHigh");
genome[EnumBeeChromosome.TEMPERATURE_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth2");
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceBoth2");
genome[EnumBeeChromosome.LIFESPAN.ordinal()] = Allele.getBaseAllele("lifespanLongest");
return genome;
}
public static IAllele[] getTemplateTEElectrum()
{
IAllele[] genome = getTemplateTEBaseMetal();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TE_ELECTRUM;
return genome;
}
public static IAllele[] getTemplateTEPlatinum()
{
IAllele[] genome = getTemplateTEBaseNether();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TE_PLATINUM;
return genome;
}
public static IAllele[] getTemplateTENickel()
{
IAllele[] genome = getTemplateTEBaseMetal();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TE_NICKEL;
return genome;
}
public static IAllele[] getTemplateTEInvar()
{
IAllele[] genome = getTemplateTEBaseNether();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TE_INVAR;
return genome;
}
public static IAllele[] getTemplateTEBronze()
{
IAllele[] genome = getTemplateTEBaseMetal();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TE_BRONZE;
return genome;
}
public static IAllele[] getTemplateRSAFluxed()
{
IAllele[] genome = getTemplateTEBaseNether();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.RSA_FLUXED;
return genome;
}
public static IAllele[] getTemplateTEDante()
{
IAllele[] genome = getTemplateTEBaseNether();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TE_DANTE;
return genome;
}
public static IAllele[] getTemplateTEPyro()
{
IAllele[] genome = getTemplateTEEnd();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TE_PYRO;
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.getBaseAllele("effectIgnition");
return genome;
}
public static IAllele[] getTemplateTEDestabilized()
{
IAllele[] genome = getTemplateTEBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TE_DESTABILIZED;
return genome;
}
public static IAllele[] getTemplateTELux()
{
IAllele[] genome = getTemplateTEBaseNether();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TE_LUX;
return genome;
}
public static IAllele[] getTemplateTEWinsome()
{
IAllele[] genome = getTemplateTEBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TE_WINSOME;
return genome;
}
public static IAllele[] getTemplateTEEndearing()
{
IAllele[] genome = getTemplateTEEnd();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TE_ENDEARING;
return genome;
}
public static IAllele[] getTemplateTEGelid()
{
IAllele[] genome = getTemplateTEEnd();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TE_GELID;
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.getBaseAllele("flowersSnow");
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.getBaseAllele("effectGlacial");
return genome;
}
public static IAllele[] getTemplateTEBlizzy()
{
IAllele[] genome = getTemplateTEEnd();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TE_BLIZZY;
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.getBaseAllele("flowersSnow");
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.getBaseAllele("effectGlacial");
return genome;
}
public static IAllele[] getTemplateTECoal()
{
IAllele[] genome = getTemplateTEBase();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.TE_COAL;
return genome;
}
public static ItemStack getBeeNBTForSpecies(BeeSpecies species, EnumBeeType beeType)
{
ItemStack taggedBee;
@@ -11,6 +11,8 @@ import magicbees.main.utils.compat.EquivalentExchangeHelper;
import magicbees.main.utils.compat.ExtraBeesHelper;
import magicbees.main.utils.compat.ForestryHelper;
import magicbees.main.utils.compat.ThaumcraftHelper;
import magicbees.main.utils.compat.ThermalExpansionHelper;
import magicbees.main.utils.compat.RedstoneArsenalHelper;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
import net.minecraftforge.common.BiomeDictionary;
@@ -233,6 +235,63 @@ public class BeeMutation implements IBeeMutation
{
new BeeMutation(Allele.getBaseSpecies("Frugal"), BeeSpecies.MUTABLE, BeeSpecies.EE_MINIUM, 8);
}
if (RedstoneArsenalHelper.isActive())
{
new BeeMutation(BeeSpecies.TE_ELECTRUM, BeeSpecies.TE_DESTABILIZED, BeeSpecies.RSA_FLUXED, 10)
.setBlockRequired("blockElectrumFlux");
}
if (ThermalExpansionHelper.isActive())
{
new BeeMutation(BeeSpecies.TIN, BeeSpecies.COPPER, BeeSpecies.TE_BRONZE, 12)
.setBlockRequired("blockBronze");
new BeeMutation(BeeSpecies.GOLD, BeeSpecies.SILVER, BeeSpecies.TE_ELECTRUM, 10)
.setBlockRequired("blockElectrum");
new BeeMutation(BeeSpecies.IRON, BeeSpecies.ESOTERIC, BeeSpecies.TE_NICKEL, 14)
.setBlockRequired("blockNickel");
new BeeMutation(BeeSpecies.IRON, BeeSpecies.TE_NICKEL, BeeSpecies.TE_INVAR, 14)
.setBlockRequired("blockInvar");
new BeeMutation(BeeSpecies.TE_NICKEL, BeeSpecies.TE_INVAR, BeeSpecies.TE_PLATINUM, 10)
.setBlockRequired("blockPlatinum");
new BeeMutation(BeeSpecies.TIN, BeeSpecies.COPPER, BeeSpecies.TE_BRONZE, 12)
.setBlockRequired("blockBronze");
new BeeMutation(BeeSpecies.SPITEFUL, BeeSpecies.TIN, BeeSpecies.TE_COAL, 12)
.setBlockRequired(Block.oreCoal);
new BeeMutation(BeeSpecies.SPITEFUL, Allele.getBaseSpecies("Industrious"), BeeSpecies.TE_DESTABILIZED, 12)
.setBlockRequired(Block.oreRedstone);
new BeeMutation(BeeSpecies.SMOULDERING, BeeSpecies.INFERNAL, BeeSpecies.TE_LUX, 12)
.setBlockRequired(Block.glowStone);
new BeeMutation(BeeSpecies.SMOULDERING, Allele.getBaseSpecies("Austere"), BeeSpecies.TE_DANTE, 12)
.setBiomeRequired(BiomeDictionary.Type.NETHER);
new BeeMutation(BeeSpecies.TE_DANTE, BeeSpecies.TE_COAL, BeeSpecies.TE_PYRO, 8)
.setBiomeRequired(BiomeDictionary.Type.NETHER);
new BeeMutation(BeeSpecies.SKULKING, Allele.getBaseSpecies("Wintry"), BeeSpecies.TE_BLIZZY, 12);
new BeeMutation(BeeSpecies.TE_BLIZZY, Allele.getBaseSpecies("Icy"), BeeSpecies.TE_GELID, 8);
new BeeMutation(BeeSpecies.TE_PLATINUM, BeeSpecies.OBLIVION, BeeSpecies.TE_WINSOME, 12);
new BeeMutation(BeeSpecies.TE_WINSOME, BeeSpecies.TE_COAL, BeeSpecies.TE_ENDEARING, 8)
.setBlockRequired("blockEnderium");
}
}
private IAllele parent1;
@@ -18,6 +18,8 @@ import magicbees.main.utils.compat.ArsMagicaHelper;
import magicbees.main.utils.compat.EquivalentExchangeHelper;
import magicbees.main.utils.compat.ForestryHelper;
import magicbees.main.utils.compat.ThaumcraftHelper;
import magicbees.main.utils.compat.ThermalExpansionHelper;
import magicbees.main.utils.compat.RedstoneArsenalHelper;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.Item;
@@ -25,6 +27,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import net.minecraftforge.oredict.OreDictionary;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import forestry.api.apiculture.EnumBeeChromosome;
@@ -242,6 +245,43 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
BeeClassification.ESSENTIAL, 0x71BBE2, 0x0B35A8, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
AM_WIGHT("AMWight", "vectem",
BeeClassification.ESSENTIAL, 0xB50000, 0x4C4837, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
//---------------------Thermal Expansion Bees---------------------------
TE_BLIZZY("TEBlizzy", "Detestabilapis blizzard",
BeeClassification.ABOMINABLE, 0x0073C4, EnumTemperature.COLD, EnumHumidity.NORMAL, false, false),
TE_GELID("TEGelid", "Detestabilapis cyro",
BeeClassification.ABOMINABLE, 0x4AAFF7, EnumTemperature.COLD, EnumHumidity.NORMAL, true, true),
TE_DANTE("TEDante", "Detestabilapis inferno",
BeeClassification.ABOMINABLE, 0xF7AC4A, EnumTemperature.HELLISH, EnumHumidity.ARID, false, false),
TE_PYRO("TEPyro", "Detestabilapis pyromaniac",
BeeClassification.ABOMINABLE, 0xFA930C, EnumTemperature.HELLISH, EnumHumidity.ARID, true, true),
TE_ELECTRUM("TEElectrum", "Thermametallic electrum",
BeeClassification.THERMAL, 0xEAF79E, EnumTemperature.HOT, EnumHumidity.ARID, false, false),
TE_PLATINUM("TEPlatinum", "Thermametallic platina",
BeeClassification.THERMAL, 0x9EE7F7, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
TE_NICKEL("TENickel", "Thermametallic nickel",
BeeClassification.THERMAL, 0xB4C989, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
TE_INVAR("TEInvar", "Thermametallic invar",
BeeClassification.THERMAL, 0xCDE3A1, EnumTemperature.HOT, EnumHumidity.ARID, false, false),
TE_BRONZE("TEBronze", "Thermametallic pyropus",
BeeClassification.THERMAL, 0xB56D07, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
TE_COAL("TECoal", "Thermametallic carbonis",
BeeClassification.THERMAL, 0x2E2D2D, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
TE_DESTABILIZED("TEDestabilized", "Thermametallic electric",
BeeClassification.THERMAL, 0x5E0203, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
TE_LUX("TELux", "Thermametallic lux",
BeeClassification.THERMAL, 0xF1FA89, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
TE_WINSOME("TEWinsome", "Amabilis cuniculus",
BeeClassification.ADORABLE, 0x096B67, EnumTemperature.COLD, EnumHumidity.NORMAL, false, false),
TE_ENDEARING("TEEndearing", "Amabilis cognito",
BeeClassification.ADORABLE, 0x069E97, EnumTemperature.COLD, EnumHumidity.NORMAL, true, true),
//--------------------Redstone Arsenal Bees-----------------------------
RSA_FLUXED("RSAFluxed", "Thermametallic electroflux",
BeeClassification.THERMAL, 0x9E060D, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, false),
;
public static void setupBeeSpecies()
@@ -328,6 +368,51 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
AM_VORTEX.setInactive();
AM_WIGHT.setInactive();
}
//Thermal Expansion Bees
if (ThermalExpansionHelper.isActive())
{
TE_BLIZZY.addSpecialty(Config.teDustBlizz, 9);
TE_GELID.addSpecialty(Config.teDustCryotheum, 9);
TE_DANTE.addSpecialty(Config.teDustSulfur, 9);
TE_PYRO.addSpecialty(Config.teDustPyrotheum, 9);
TE_WINSOME.addSpecialty(Config.teDustPlatinum, 9);
TE_ENDEARING.addSpecialty(Config.teEnderiumNugget, 9);
}
else
{
TE_BLIZZY.setInactive();
TE_GELID.setInactive();
TE_DANTE.setInactive();
TE_PYRO.setInactive();
TE_DESTABILIZED.setInactive();
TE_COAL.setInactive();
TE_LUX.setInactive();
TE_WINSOME.setInactive();
TE_ENDEARING.setInactive();
}
//Redstone Arsenal Bees
if (RedstoneArsenalHelper.isActive())
{
RSA_FLUXED.addSpecialty(Config.rsaFluxNugget, 9);
}
else
{
RSA_FLUXED.setInactive();
}
AlleleManager.alleleRegistry.registerDeprecatedAlleleReplacement("thaumicbees.speciesBlitz", AM_LIGHTNING);
// Oredict bees
@@ -364,6 +449,8 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
MANYULLYN.setInactive();
}
MYSTICAL.addProduct(Config.combs.getStackForType(CombType.MUNDANE), 15)
.setGenome(BeeGenomeManager.getTemplateMystical())
.register();
@@ -708,7 +795,158 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 10)
.setGenome(BeeGenomeManager.getTemplateAMWight())
.register();
if (OreDictionary.getOres("ingotBronze").size() <= 0)
{
TE_BRONZE.setInactive();
}
if (OreDictionary.getOres("ingotElectrum").size() <= 0)
{
TE_ELECTRUM.setInactive();
}
if (OreDictionary.getOres("ingotPlatinum").size() <= 0)
{
TE_PLATINUM.setInactive();
}
if (OreDictionary.getOres("ingotNickel").size() <= 0)
{
TE_NICKEL.setInactive();
}
if (OreDictionary.getOres("ingotInvar").size() <= 0)
{
TE_INVAR.setInactive();
}
TE_ELECTRUM.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
.setGenome(BeeGenomeManager.getTemplateTEElectrum());
if (OreDictionary.getOres("nuggetElectrum").size() > 0)
{
TE_ELECTRUM.addSpecialty(OreDictionary.getOres("nuggetElectrum").get(0), 18);
}
else
{
TE_ELECTRUM.setInactive();
}
TE_ELECTRUM.register();
TE_PLATINUM.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
.setGenome(BeeGenomeManager.getTemplateTEPlatinum());
if (OreDictionary.getOres("nuggetPlatinum").size() > 0)
{
TE_PLATINUM.addSpecialty(OreDictionary.getOres("nuggetPlatinum").get(0), 18);
}
else
{
TE_PLATINUM.setInactive();
}
TE_PLATINUM.register();
TE_NICKEL.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
.setGenome(BeeGenomeManager.getTemplateTENickel());
if (OreDictionary.getOres("nuggetNickel").size() > 0)
{
TE_NICKEL.addSpecialty(OreDictionary.getOres("nuggetNickel").get(0), 18);
}
else
{
TE_NICKEL.setInactive();
}
TE_NICKEL.register();
TE_INVAR.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
.setGenome(BeeGenomeManager.getTemplateTEInvar());
if (OreDictionary.getOres("nuggetInvar").size() > 0)
{
TE_INVAR.addSpecialty(OreDictionary.getOres("nuggetInvar").get(0), 18);
}
else
{
TE_INVAR.setInactive();
}
TE_INVAR.register();
TE_BRONZE.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
.setGenome(BeeGenomeManager.getTemplateTEBronze());
if (OreDictionary.getOres("nuggetBronze").size() > 0)
{
TE_BRONZE.addSpecialty(OreDictionary.getOres("nuggetBronze").get(0), 18);
}
else
{
TE_BRONZE.setInactive();
}
TE_BRONZE.register();
RSA_FLUXED.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
.setGenome(BeeGenomeManager.getTemplateRSAFluxed());
if (OreDictionary.getOres("nuggetElectrumFlux").size() > 0)
{
RSA_FLUXED.addSpecialty(OreDictionary.getOres("nuggetElectrumFlux").get(0), 18);
}
else
{
RSA_FLUXED.setInactive();
}
RSA_FLUXED.register();
TE_DANTE.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 10)
.addProduct(Config.combs.getStackForType(CombType.MOLTEN), 10)
.addSpecialty(new ItemStack(Item.blazePowder), 5)
.setGenome(BeeGenomeManager.getTemplateTEDante())
.register();
TE_PYRO.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 10)
.addProduct(Config.combs.getStackForType(CombType.MOLTEN), 10)
.addSpecialty(new ItemStack(Item.blazePowder), 5)
.setGenome(BeeGenomeManager.getTemplateTEPyro())
.register();
TE_DESTABILIZED.addProduct(Config.combs.getStackForType(CombType.TE_DESTABILIZED), 10)
.addProduct(Config.combs.getStackForType(CombType.OCCULT), 10)
.addSpecialty(new ItemStack(Item.redstone), 5)
.setGenome(BeeGenomeManager.getTemplateTEDestabilized())
.register();
TE_LUX.addProduct(Config.combs.getStackForType(CombType.TE_LUX), 10)
.addProduct(Config.combs.getStackForType(CombType.OCCULT), 10)
.addSpecialty(new ItemStack(Item.glowstone), 5)
.setGenome(BeeGenomeManager.getTemplateTELux())
.register();
TE_WINSOME.addProduct(Config.combs.getStackForType(CombType.FURTIVE), 10)
.addProduct(Config.combs.getStackForType(CombType.TE_ENDEARING), 5)
.addSpecialty(new ItemStack(Item.enderPearl), 5)
.setGenome(BeeGenomeManager.getTemplateTEWinsome())
.register();
TE_ENDEARING.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.MYSTERIOUS.ordinal()), 10)
.addProduct(Config.combs.getStackForType(CombType.TE_ENDEARING), 5)
.setGenome(BeeGenomeManager.getTemplateTEEndearing())
.register();
TE_COAL.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.HONEY.ordinal()), 10)
.addProduct(Config.combs.getStackForType(CombType.TE_CARBON), 5)
.addSpecialty(new ItemStack(Item.coal), 5)
.setGenome(BeeGenomeManager.getTemplateTECoal())
.register();
TE_BLIZZY.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.FROZEN.ordinal()), 10)
.setGenome(BeeGenomeManager.getTemplateTEBlizzy())
.register();
TE_GELID.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.FROZEN.ordinal()), 10)
.setGenome(BeeGenomeManager.getTemplateTEBlizzy())
.register();
}
private String binomial;
private String authority;
@@ -31,7 +31,12 @@ public enum CombType
TC_CHAOS("TCchaos", false),
AM_ESSENCE("essence", false),
AM_POTENT("potent", false),
AM_POTENT("potent", false),
TE_DESTABILIZED("TEelectric", false),
TE_CARBON("TEcarbon", false),
TE_LUX("TElux", false),
TE_ENDEARING("TEendearing", false),
;
private static int[][] colours = new int[][] {
@@ -62,6 +67,11 @@ public enum CombType
{0xCC8604, 0x41046F},
{0xCCCC04, 0x41046F},
{0xCC002C, 0x6B0118},
{0x454545, 0x0F0F0F},
{0xF5F3A4, 0xC9C87D},
{0x12E3D9, 0x069E97},
};
private CombType(String pName, boolean show)
@@ -7,6 +7,11 @@ public enum DropType
{
ENCHANTED("enchanting", 0x6e1c6d, 0xff8fff),
INTELLECT("intellect", 0x25914D, 0x18E072),
DESTABILIZED("destabilized", 0xCC002C, 0x6B0118),
CARBON("carbon", 0x454545, 0x0F0F0F),
LUX("lux", 0xF5F3A4, 0xC9C87D),
ENDEARING("endearing", 0x12E3D9, 0x069E97),
;
private DropType(String pName, int colourA, int colourB)
@@ -12,7 +12,13 @@ public enum NuggetType
LEAD,
DIAMOND,
EMERALD,
APATITE,
APATITE,
ELECTRUM,
PLATINUM,
NICKEL,
INVAR,
BRONZE,
ENDERIUM,
;
private Item targetIngot;
+28
View File
@@ -41,6 +41,8 @@ import net.minecraftforge.common.ChestGenHooks;
import net.minecraftforge.common.Configuration;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.Property;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.event.FMLInterModComms;
@@ -155,6 +157,32 @@ public class Config
//----- Ars Magica Items -----------------------------------
public static Item amItemResource;
public static Item amEssence;
//----Redstone Arsenal Items---
public static ItemStack rsaFluxBlock;
public static ItemStack rsaFluxNugget;
//---ThermalExpansion Items ---
public static ItemStack teEnderiumBlock;
public static ItemStack teElectrumBlock;
public static ItemStack teInvarBlock;
public static ItemStack teNickelBlock;
public static ItemStack tePlatinumBlock;
public static ItemStack teBronzeBlock;
public static ItemStack teEnderiumNugget;
public static ItemStack teInvarNugget;
public static ItemStack teElectrumNugget;
public static ItemStack teNickelNugget;
public static ItemStack tePlatinumNugget;
public static ItemStack teDustCryotheum;
public static ItemStack teDustBlizz;
public static ItemStack teDustPyrotheum;
public static ItemStack teDustSulfur;
public static ItemStack teDustPlatinum;
public static FluidStack teFluidGlowstone;
public static FluidStack teFluidCoal;
public static FluidStack teFluidRedstone;
public static FluidStack teFluidEnder;
//----- Config State info ----------------------------------
+9 -1
View File
@@ -11,7 +11,9 @@ import magicbees.main.utils.compat.ArsMagicaHelper;
import magicbees.main.utils.compat.EquivalentExchangeHelper;
import magicbees.main.utils.compat.ExtraBeesHelper;
import magicbees.main.utils.compat.ForestryHelper;
import magicbees.main.utils.compat.RedstoneArsenalHelper;
import magicbees.main.utils.compat.ThaumcraftHelper;
import magicbees.main.utils.compat.ThermalExpansionHelper;
import magicbees.world.WorldGeneratorHandler;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.SidedProxy;
@@ -58,7 +60,9 @@ public class MagicBees
ThaumcraftHelper.preInit();
EquivalentExchangeHelper.preInit();
ArsMagicaHelper.preInit();
ThermalExpansionHelper.preInit();
RedstoneArsenalHelper.preInit();
this.modConfig.setupBlocks();
this.modConfig.setupItems();
@@ -75,6 +79,8 @@ public class MagicBees
ThaumcraftHelper.init();
EquivalentExchangeHelper.init();
ArsMagicaHelper.init();
ThermalExpansionHelper.init();
RedstoneArsenalHelper.init();
GameRegistry.registerWorldGenerator(worldHandler = new WorldGeneratorHandler());
}
@@ -87,6 +93,8 @@ public class MagicBees
ThaumcraftHelper.postInit();
EquivalentExchangeHelper.postInit();
ArsMagicaHelper.postInit();
ThermalExpansionHelper.postInit();
RedstoneArsenalHelper.postInit();
this.guiHandler = new GUIHandler();
NetworkRegistry.instance().registerGuiHandler(this, this.guiHandler);
@@ -14,6 +14,7 @@ import magicbees.main.Config;
import magicbees.main.utils.compat.ArsMagicaHelper;
import magicbees.main.utils.compat.ForestryHelper;
import magicbees.main.utils.compat.ThaumcraftHelper;
import magicbees.main.utils.compat.ThermalExpansionHelper;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -535,6 +536,24 @@ public class CraftingManager
new ItemStack[] {ItemInterface.getItem("beeswax"), ItemInterface.getItem("refractoryWax"), ItemInterface.getItem("honeydew") },
new int[] { 50, 50, 65 } );
}
if (ThermalExpansionHelper.isActive())
{
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TE_DESTABILIZED),
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.drops.getStackForType(DropType.DESTABILIZED)},
new int[] {50, 22});
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TE_CARBON),
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.drops.getStackForType(DropType.CARBON)},
new int[] {50, 22});
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TE_LUX),
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.drops.getStackForType(DropType.LUX)},
new int[] {50, 22});
RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.TE_ENDEARING),
new ItemStack[] {Config.wax.getStackForType(WaxType.MAGIC), Config.drops.getStackForType(DropType.ENDEARING)},
new int[] {50, 22});
}
}
private static void setupCarpenterRecipes()
@@ -30,7 +30,7 @@ public class VersionInfo
public static final String Logo = "/gfx/magicbees/logo.png";
public static final String Depends = "required-after:Forestry;after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica;after:TConstruct;after:Railcraft";
public static final String Depends = "required-after:Forestry;after:Thaumcraft;after:ExtraBees;after:EE3;after:ArsMagica;after:TConstruct;after:Railcraft;after:ThermalExpansion";
boolean criticalUpdate;
boolean newVersion;
@@ -0,0 +1,100 @@
package magicbees.main.utils.compat;
import java.util.ArrayList;
import magicbees.item.types.PollenType;
import magicbees.item.types.PropolisType;
import magicbees.item.types.ResourceType;
import magicbees.item.types.WaxType;
import magicbees.main.CommonProxy;
import magicbees.main.Config;
import magicbees.main.MagicBees;
import magicbees.main.utils.LocalizationManager;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.ShapelessRecipes;
import net.minecraft.util.ResourceLocation;
import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.registry.GameRegistry;
import forestry.api.core.ItemInterface;
public class RedstoneArsenalHelper
{
public enum MiscResource
{
FLUXED_ELECTRUMBLOCK,
;
}
public enum NuggetType
{
ELECTRUMFLUX,
;
}
public static final String Name = "RedstoneArsenal";
private static boolean isRedstoneArsenalPresent = false;
public static boolean isActive()
{
return isRedstoneArsenalPresent;
}
public static void preInit()
{
if (cpw.mods.fml.common.Loader.isModLoaded(Name))
{
isRedstoneArsenalPresent = true;
}
else
{
// Switch off RSA-dependant items.
}
}
public static void init()
{
//if (isActive()) { }
}
public static void postInit()
{
if (isActive())
{
// Apparently the Game Registry isn't populated until now. ):
getBlocks();
getItems();
//addItemsToBackpack();
setupCrafting();
}
}
private static void getBlocks()
{
Config.rsaFluxBlock = GameRegistry.findItemStack("RedstoneArsenal", "blockElectrumFlux", 1);
}
private static void getItems()
{
Config.rsaFluxNugget = GameRegistry.findItemStack("RedstoneArsenal", "nuggetElectrumFlux", 1);
}
private static void setupCrafting()
{
ItemStack input, output;
};
}
@@ -0,0 +1,187 @@
package magicbees.main.utils.compat;
import java.util.ArrayList;
import magicbees.item.types.PollenType;
import magicbees.item.types.PropolisType;
import magicbees.item.types.ResourceType;
import magicbees.item.types.WaxType;
import magicbees.item.types.DropType;
import magicbees.main.CommonProxy;
import magicbees.main.Config;
import magicbees.main.MagicBees;
import magicbees.main.utils.LocalizationManager;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.ShapelessRecipes;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;
import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.registry.GameRegistry;
import forestry.api.core.ItemInterface;
import net.minecraftforge.fluids.*;
public class ThermalExpansionHelper
{
public enum MiscResource
{
EnderiumBlock,
ElectrumBlock,
BronzeBlock,
FluidCoal,
FluidRedstone,
FluidGlowstone,
FluidEnder,
;
}
public enum NuggetType
{
ENDERIUM,
ELECTRUM,
BRONZE,
INVAR,
NICKEL,
PLATINUM,
;
}
public static final String Name = "ThermalExpansion";
private static boolean isThermalExpansionPresent = false;
public static boolean isActive()
{
return isThermalExpansionPresent;
}
public static void preInit()
{
if (cpw.mods.fml.common.Loader.isModLoaded(Name))
{
isThermalExpansionPresent = true;
}
}
public static void init()
{
if (isActive()) {
getFluids();
setupCrafting();
}
}
private static void getFluids() {
Config.teFluidGlowstone = FluidRegistry.getFluidStack("glowstone", 50);
Config.teFluidCoal = FluidRegistry.getFluidStack("coal", 50);
Config.teFluidRedstone = FluidRegistry.getFluidStack("redstone", 50);
Config.teFluidEnder = FluidRegistry.getFluidStack("ender", 50);
}
private static void setupCrafting()
{
//crucible recipes
// carbon to liquid coal
ItemStack carbonDrop = Config.drops.getStackForType(DropType.CARBON);
NBTTagCompound toSend = new NBTTagCompound();
toSend.setInteger("energy", 4000);
toSend.setCompoundTag("input", new NBTTagCompound());
toSend.setCompoundTag("output", new NBTTagCompound());
carbonDrop.writeToNBT(toSend.getCompoundTag("input"));
Config.teFluidCoal.writeToNBT(toSend.getCompoundTag("output"));
FMLInterModComms.sendMessage("ThermalExpansion", "CrucibleRecipe", toSend);
//redstone drop to molten redstone
ItemStack destabilizedDrop = Config.drops.getStackForType(DropType.DESTABILIZED);
toSend = new NBTTagCompound();
toSend.setInteger("energy", 4000);
toSend.setCompoundTag("input", new NBTTagCompound());
toSend.setCompoundTag("output", new NBTTagCompound());
destabilizedDrop.writeToNBT(toSend.getCompoundTag("input"));
Config.teFluidRedstone.writeToNBT(toSend.getCompoundTag("output"));
FMLInterModComms.sendMessage("ThermalExpansion", "CrucibleRecipe", toSend);
//endearing drop to molten ender
ItemStack endearingDrop = Config.drops.getStackForType(DropType.ENDEARING);
toSend = new NBTTagCompound();
toSend.setInteger("energy", 4000);
toSend.setCompoundTag("input", new NBTTagCompound());
toSend.setCompoundTag("output", new NBTTagCompound());
endearingDrop.writeToNBT(toSend.getCompoundTag("input"));
Config.teFluidEnder.writeToNBT(toSend.getCompoundTag("output"));
FMLInterModComms.sendMessage("ThermalExpansion", "CrucibleRecipe", toSend);
//lux drop to molten glowstone
ItemStack luxDrop = Config.drops.getStackForType(DropType.LUX);
toSend = new NBTTagCompound();
toSend.setInteger("energy", 4000);
toSend.setCompoundTag("input", new NBTTagCompound());
toSend.setCompoundTag("output", new NBTTagCompound());
luxDrop.writeToNBT(toSend.getCompoundTag("input"));
Config.teFluidGlowstone.writeToNBT(toSend.getCompoundTag("output"));
FMLInterModComms.sendMessage("ThermalExpansion", "CrucibleRecipe", toSend);
}
public static void postInit()
{
if (isActive())
{
// Apparently the Game Registry isn't populated until now. ):
getBlocks();
getItems();
}
}
private static void getBlocks()
{
Config.teEnderiumBlock = GameRegistry.findItemStack("ThermalExpansion", "blockEnderium", 1);
Config.teElectrumBlock = GameRegistry.findItemStack("ThermalExpansion", "blockElectrum", 1);
Config.teInvarBlock = GameRegistry.findItemStack("ThermalExpansion", "blockInvar", 1);
Config.teNickelBlock = GameRegistry.findItemStack("ThermalExpansion", "blockNickel", 1);
Config.tePlatinumBlock = GameRegistry.findItemStack("ThermalExpansion", "blockPlatinum", 1);
Config.teBronzeBlock = GameRegistry.findItemStack("ThermalExpansion", "blockBronze", 1);
}
private static void getItems()
{
Config.teEnderiumNugget = GameRegistry.findItemStack("ThermalExpansion", "nuggetEnderium", 1);
Config.teInvarNugget = GameRegistry.findItemStack("ThermalExpansion", "nuggetInvar", 1);
Config.teElectrumNugget = GameRegistry.findItemStack("ThermalExpansion", "nuggetElectrum", 1);
Config.teNickelNugget = GameRegistry.findItemStack("ThermalExpansion", "nuggetNickel", 1);
Config.tePlatinumNugget = GameRegistry.findItemStack("ThermalExpansion", "nuggetPlatinum", 1);
Config.teDustCryotheum = GameRegistry.findItemStack("ThermalExpansion", "dustCryotheum", 1);
Config.teDustBlizz = GameRegistry.findItemStack("ThermalExpansion", "dustBlizz", 1);
Config.teDustPyrotheum = GameRegistry.findItemStack("ThermalExpansion", "dustPyrotheum", 1);
Config.teDustSulfur = GameRegistry.findItemStack("ThermalExpansion", "dustSulfur", 1);
Config.teDustPlatinum = GameRegistry.findItemStack("ThermalExpansion", "dustPlatinum", 1);
}
}