New bees, EE3 "integration". Nuggets, Frames.

This commit is contained in:
MysteriousAges committed 2013-04-11 23:08:17 -07:00
1 parent b8d12b1f9a
commit e8421f40fe
9 files changed
+121 -23

No files matched your search

@@ -16,7 +16,7 @@ public enum BeeClassification implements IClassification
SUPERNATURAL("Supernatural", "Occultus"),
SCHOLARLY("Scholarly", "Docto"),
THAUMIC("Thaumic", "Thaumis"),
SKULKING("Skulking", ""),
SKULKING("Skulking", "Malevolens"),
VIS("Vis", "Vis"),
TIME("Time", "Tempestivus"),
SOUL("Soul", "Animus"),
@@ -333,11 +333,11 @@ public class BeeGenomeManager
return genome;
}
public static IAllele[] getTemplateAura()
public static IAllele[] getTemplateRejuvinating()
{
IAllele[] genome = getTemplateBaseVis();
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.AURA;
genome[EnumBeeChromosome.SPECIES.ordinal()] = BeeSpecies.REJUVENATING;
genome[EnumBeeChromosome.EFFECT.ordinal()] = Allele.effectNodeCharge;
genome[EnumBeeChromosome.FLOWER_PROVIDER.ordinal()] = Allele.flowerAuraNode;
genome[EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal()] = Allele.getBaseAllele("toleranceNone");
@@ -174,27 +174,28 @@ public class BeeMutation implements IBeeMutation
.setAuraNodeRequired(4).setMoonPhaseRestricted(MoonPhase.WANING_HALF, MoonPhase.WANING_HALF);
BeeMutation.Node1 = new BeeMutation(BeeSpecies.PURE, BeeSpecies.FLUX, BeeSpecies.NODE, 2)
.setAuraNodeRequired(4).setMoonPhaseRestricted(MoonPhase.WAXING_HALF, MoonPhase.WAXING_HALF);
BeeMutation.Aura = new BeeMutation(BeeSpecies.VIS, Allele.getBaseSpecies("Industrious"), BeeSpecies.AURA, 3)
.setMoonPhaseRestricted(MoonPhase.WANING_CRESCENT, MoonPhase.WANING_CRESCENT);
BeeMutation.Aura1 = new BeeMutation(BeeSpecies.VIS, Allele.getBaseSpecies("Industrious"), BeeSpecies.AURA, 3)
.setMoonPhaseRestricted(MoonPhase.WAXING_CRESCENT, MoonPhase.WAXING_CRESCENT);
if (ExtraBeesHelper.isActive())
{
BeeMutation.Brainy = new BeeMutation(BeeSpecies.SKULKING, Allele.getExtraSpecies("rotten"), BeeSpecies.BRAINY, 12);
BeeMutation.Gossamer = new BeeMutation(BeeSpecies.SKULKING, Allele.getExtraSpecies("ancient"), BeeSpecies.GOSSAMER, 10);
BeeMutation.Batty = new BeeMutation(BeeSpecies.SKULKING, Allele.getExtraSpecies("rock"), BeeSpecies.BATTY, 14);
BeeMutation.Aura = new BeeMutation(BeeSpecies.VIS, Allele.getExtraSpecies("energetic"), BeeSpecies.REJUVENATING, 3);
BeeMutation.Aura1 = new BeeMutation(BeeSpecies.VIS, Allele.getExtraSpecies("energetic"), BeeSpecies.REJUVENATING, 3);
}
else
{
BeeMutation.Brainy = new BeeMutation(BeeSpecies.SKULKING, Allele.getBaseSpecies("Sinister"), BeeSpecies.BRAINY, 10);
BeeMutation.Gossamer = new BeeMutation(BeeSpecies.SKULKING, BeeSpecies.SUPERNATURAL, BeeSpecies.GOSSAMER, 10);
BeeMutation.Batty = new BeeMutation(BeeSpecies.SKULKING, Allele.getBaseSpecies("Frugal"), BeeSpecies.BATTY, 11);
BeeMutation.Aura = new BeeMutation(BeeSpecies.VIS, Allele.getBaseSpecies("Industrious"), BeeSpecies.REJUVENATING, 3);
BeeMutation.Aura1 = new BeeMutation(BeeSpecies.VIS, Allele.getBaseSpecies("Industrious"), BeeSpecies.REJUVENATING, 3);
}
BeeMutation.Gossamer.setMoonPhaseRestricted(MoonPhase.FULL, MoonPhase.WANING_CRESCENT);
BeeMutation.Wispy = new BeeMutation(BeeSpecies.GOSSAMER, Allele.getBaseSpecies("Cultivated"), BeeSpecies.WISPY, 8);
BeeMutation.Aura.setMoonPhaseRestricted(MoonPhase.WANING_CRESCENT, MoonPhase.WANING_CRESCENT);
BeeMutation.Aura1.setMoonPhaseRestricted(MoonPhase.WAXING_CRESCENT, MoonPhase.WAXING_CRESCENT);
}
else
{
@@ -71,7 +71,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies
BeeClassification.VIS, 0x004c99, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
NODE("Node", "conficiens",
BeeClassification.VIS, 0xFFF266, 0xFF8CE9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
AURA("Aura", "arcanus vitae",
REJUVENATING("Rejuvenating", "arcanus vitae",
BeeClassification.VIS, 0x91D0D9, EnumTemperature.NORMAL, EnumHumidity.NORMAL, true, false),
SKULKING("Skulking", "malevolens",
BeeClassification.SKULKING, 0x524827, 0xe15236, EnumTemperature.NORMAL, EnumHumidity.NORMAL, false, true),
@@ -143,7 +143,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies
PURE.setInactive();
FLUX.setInactive();
NODE.setInactive();
AURA.setInactive();
REJUVENATING.setInactive();
BRAINY.setInactive();
GOSSAMER.setInactive();
WISPY.setInactive();
@@ -247,8 +247,8 @@ public enum BeeSpecies implements IAlleleBeeSpecies
NODE.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20)
.setGenome(BeeGenomeManager.getTemplateNode())
.register();
AURA.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20)
.setGenome(BeeGenomeManager.getTemplateNode())
REJUVENATING.addProduct(Config.combs.getStackForType(CombType.INTELLECT), 20)
.setGenome(BeeGenomeManager.getTemplateRejuvinating())
.register();
SKULKING.addProduct(Config.combs.getStackForType(CombType.SKULKING), 10)
.setGenome(BeeGenomeManager.getTemplateSkulking())
@@ -357,7 +357,7 @@ public enum BeeSpecies implements IAlleleBeeSpecies
private String uid;
private boolean dominant;
private final static boolean defaultSecretSetting = false;
private final static boolean defaultSecretSetting = true;
private BeeSpecies(String speciesName, String genusName, IClassification classification, int firstColour, EnumTemperature preferredTemp, EnumHumidity preferredHumidity, boolean hasGlowEffect, boolean isSpeciesDominant)
{
@@ -39,7 +39,10 @@ public class ItemNugget extends Item
{
for (NuggetType type : NuggetType.values())
{
list.add(new ItemStack(this.itemID, 1, type.ordinal()));
if (type.isActive())
{
list.add(new ItemStack(this.itemID, 1, type.ordinal()));
}
}
}
@@ -1,5 +1,6 @@
package thaumicbees.item.types;
import net.minecraft.item.Item;
import thaumicbees.main.utils.LocalizationManager;
public enum NuggetType
@@ -13,12 +14,35 @@ public enum NuggetType
EMERALD(11),
;
private Item targetIngot;
public int iconIdx;
private boolean active;
private NuggetType(int idx)
{
this.iconIdx = idx;
}
this.active = true;
}
public void setIngotItem(Item target)
{
this.targetIngot = target;
}
public Item getIngotItem()
{
return this.targetIngot;
}
public void setActive(boolean b)
{
this.active = b;
}
public boolean isActive()
{
return this.active;
}
public String getName()
{
+5 -4
View File
@@ -49,6 +49,7 @@ import net.minecraftforge.common.Configuration;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.Property;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.oredict.ShapedOreRecipe;
/**
* A class to hold some data related to mod state & functions.
@@ -64,7 +65,7 @@ public class Config
public boolean AreMagicPlanksFlammable;
public boolean UseImpregnatedStickInTools;
public String ThaumaturgeExtraItems;
public int capsuleStackSizeMax;
public int CapsuleStackSizeMax;
public static BlockPlanks planksWood;
public static BlockWoodSlab slabWoodHalf;
@@ -240,7 +241,7 @@ public class Config
}
}
magicCapsule = new ItemCapsule(CapsuleType.MAGIC, tbConfig.getItem("magicCapsule", itemIDBase++).getInt(), this.capsuleStackSizeMax);
magicCapsule = new ItemCapsule(CapsuleType.MAGIC, tbConfig.getItem("magicCapsule", itemIDBase++).getInt(), this.CapsuleStackSizeMax);
pollen = new ItemPollen(tbConfig.getItem("pollen", itemIDBase++).getInt());
@@ -276,7 +277,7 @@ public class Config
.setPotionEffect(Potion.moveSpeed.id, 5, 1, 1f);
jellyBaby.setTextureFile(CommonProxy.TCBEES_ITEMS_IMAGE).setIconIndex(19).setItemName("jellyBabies");
voidCapsule = new ItemCapsule(CapsuleType.VOID, tbConfig.getItem("voidCapsule", itemIDBase++).getInt(), this.capsuleStackSizeMax);
voidCapsule = new ItemCapsule(CapsuleType.VOID, tbConfig.getItem("voidCapsule", itemIDBase++).getInt(), this.CapsuleStackSizeMax);
{
int scoopID = tbConfig.getItem("thaumiumScoop", itemIDBase++).getInt();
@@ -323,7 +324,7 @@ public class Config
p = tbConfig.get("general", "capsuleStackSize", 64);
p.comment = "Allows you to edit the stack size of the capsules in ThaumicBees if using GregTech, \n" +
"or the reduced capsule size in Forestry & Railcraft. Default: 64";
this.capsuleStackSizeMax = p.getInt();
this.CapsuleStackSizeMax = p.getInt();
p = tbConfig.get("general", "disableVersionCheck", false);
p.comment = "Set to true to stop ThaumicBees from checking for updates.";
@@ -1,5 +1,7 @@
package thaumicbees.main.utils;
import java.util.ArrayList;
import thaumcraft.api.EnumTag;
import thaumcraft.api.ObjectTags;
import thaumcraft.api.ThaumcraftApi;
@@ -12,11 +14,13 @@ import thaumicbees.item.types.CombType;
import thaumicbees.item.types.DropType;
import thaumicbees.item.types.HiveFrameType;
import thaumicbees.item.types.LiquidType;
import thaumicbees.item.types.NuggetType;
import thaumicbees.item.types.PlankType;
import thaumicbees.item.types.PropolisType;
import thaumicbees.item.types.ResourceType;
import thaumicbees.item.types.WaxType;
import thaumicbees.main.Config;
import thaumicbees.main.ThaumicBees;
import thaumicbees.main.utils.compat.ForestryHelper;
import thaumicbees.main.utils.compat.ShapelessBeeInfusionCraftingRecipe;
import thaumicbees.main.utils.compat.ThaumcraftHelper;
@@ -35,6 +39,9 @@ import net.minecraftforge.liquids.LiquidContainerData;
import net.minecraftforge.liquids.LiquidContainerRegistry;
import net.minecraftforge.liquids.LiquidDictionary;
import net.minecraftforge.liquids.LiquidStack;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
public class CraftingManager
{
@@ -113,7 +120,68 @@ public class CraftingManager
'D', Block.dirt,
'w', Config.wax.getStackForType(WaxType.SOUL)
});
if (OreDictionary.getOres("ingotCopper").size() <= 0)
{
NuggetType.COPPER.setActive(false);
}
if (OreDictionary.getOres("ingotTin").size() <= 0)
{
NuggetType.TIN.setActive(false);
}
if (OreDictionary.getOres("ingotSilver").size() <= 0)
{
NuggetType.SILVER.setActive(false);
}
if (OreDictionary.getOres("ingotLead").size() <= 0)
{
NuggetType.LEAD.setActive(false);
}
if (NuggetType.COPPER.isActive())
{
GameRegistry.addRecipe(new ShapedOreRecipe(OreDictionary.getOres("ingotCopper").get(0), new Object[] {
"xxx", "xxx", "xxx",
'x', "nuggetCopper"
}));
}
if (NuggetType.TIN.isActive())
{
GameRegistry.addRecipe(new ShapedOreRecipe(OreDictionary.getOres("ingotTin").get(0), new Object[] {
"xxx", "xxx", "xxx",
'x', "nuggetTin"
}));
}
if (NuggetType.SILVER.isActive())
{
GameRegistry.addRecipe(new ShapedOreRecipe(OreDictionary.getOres("ingotSilver").get(0), new Object[] {
"xxx", "xxx", "xxx",
'x', "nuggetSilver"
}));
}
if (NuggetType.LEAD.isActive())
{
GameRegistry.addRecipe(new ShapedOreRecipe(OreDictionary.getOres("ingotLead").get(0), new Object[] {
"xxx", "xxx", "xxx",
'x', "nuggetLead"
}));
}
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.ingotIron), new Object[] {
"xxx", "xxx", "xxx",
'x', "nuggetIron"
}));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.diamond), new Object[] {
"xxx", "xxx", "xxx",
'x', "shardDiamond"
}));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.emerald), new Object[] {
"xxx", "xxx", "xxx",
'x', "shardEmerald"
}));
if (ThaumcraftHelper.isActive())
{
// Slabs
@@ -1,8 +1,9 @@
package thaumicbees.main.utils.compat;
import net.minecraft.item.Item;
import cpw.mods.fml.common.FMLLog;
import thaumicbees.main.Config;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.Loader;
public class EquivalentExchangeHelper
{
@@ -15,7 +16,7 @@ public class EquivalentExchangeHelper
public static void init()
{
if (cpw.mods.fml.common.Loader.isModLoaded("Thaumcraft"))
if (Loader.isModLoaded("EE3"))
{
isEquivalentExchangePresent = true;
}