*Vis, Purify & Flux flower provider finalizing

*Solid Flux -> Essentia bottle crafting
*Reseach adjustments
*Apiary Frame adjustments
*Putting try/catch around Backpack init to provide a more useful error message
*Spelling corrections in research.xml, fixed overflow on Metabolic Frame description.
This commit is contained in:
MysteriousAges committed 2013-01-27 15:05:15 -08:00
1 parent eafc34cb54
commit efc2309222
13 files changed
+138 -168

No files matched your search

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

@@ -75,11 +75,12 @@ Like the Magic Frame, the Gentle Frame also consumes small amounts of aura to ma
<project id="HIVEFRAMEMETA">
<name>Metabolic Frame</name>
<popupText>And One! And Two!</popupText>
<longText>Additional bee research has yelded additional insight into their body structure, metabolism and life cycle. It is possible that you could create a frame to enhance their body processes.</longText>
<longText>Additional bee research has yielded insight into their body structure, metabolism, and life cycle. It is possible that you could create a frame to enhance their body processes.</longText>
<page type="text">The Metabolic Frame enhances the rate at which bees metabolize food, resulting in a higher work speed. However, this makes their genetic structure somewhat unstable and prone to mutations. While this can be frustrating for some apiarists, other, more prepared beekeepers have been known to use the Metabolic Frames in their apiaries to encourage mutations in bee species.
Like the Magic Frame, this frame consumes aura to maintain its enchantments, and has the negative side-effect of producing some flux in the surrounding aura now and again as the enchanted bees go about their work. The Metabolic Frame consumes significantly more aura, as its enchantments are much more complex, and is not quite as durable as the Magic Frame is known to be.</page>
Like the Magic Frame, this frame consumes aura to maintain its enchantments, and has the negative side-effect of producing some flux in the surrounding aura now and again as the enchanted bees go about their work. The Metabolic Frame consumes significantly more aura, as its</page>
<page type="infusioncrafting">FRAMEMETABOLIC</page>
<page type="text">enchantments are much more complex, and is not quite as durable as the Magic Frame is known to be.</page>
</project>
<project id="HIVEFRAMENECRO">
@@ -1,110 +0,0 @@
package forestry.plugins;
import java.util.Random;
import net.minecraft.command.ICommand;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.IGuiHandler;
import forestry.api.core.IOreDictionaryHandler;
import forestry.api.core.IPacketHandler;
import forestry.api.core.IPickupHandler;
import forestry.api.core.IPlugin;
import forestry.api.core.IResupplyHandler;
import forestry.api.core.ISaveEventHandler;
import thaumicbees.bees.ThaumicBeesPlugin;
public class PluginThaumicBees implements IPlugin
{
@Override
public boolean isAvailable()
{
// TODO Auto-generated method stub
return false;
}
@Override
public void preInit()
{
// TODO Auto-generated method stub
}
@Override
public void doInit()
{
// TODO Auto-generated method stub
}
@Override
public void postInit()
{
// TODO Auto-generated method stub
}
@Override
public String getDescription()
{
// TODO Auto-generated method stub
return null;
}
@Override
public void generateSurface(World world, Random rand, int chunkX, int chunkZ)
{
// TODO Auto-generated method stub
}
@Override
public IGuiHandler getGuiHandler()
{
// TODO Auto-generated method stub
return null;
}
@Override
public IPacketHandler getPacketHandler()
{
// TODO Auto-generated method stub
return null;
}
@Override
public IPickupHandler getPickupHandler()
{
// TODO Auto-generated method stub
return null;
}
@Override
public IResupplyHandler getResupplyHandler()
{
// TODO Auto-generated method stub
return null;
}
@Override
public ISaveEventHandler getSaveEventHandler()
{
// TODO Auto-generated method stub
return null;
}
@Override
public IOreDictionaryHandler getDictionaryHandler()
{
// TODO Auto-generated method stub
return null;
}
@Override
public ICommand[] getConsoleCommands()
{
// TODO Auto-generated method stub
return null;
}
}
@@ -82,4 +82,32 @@ public class FlowerProviderAuraNode implements IFlowerProvider
return node;
}
protected ItemStack[] addItemToProducts(ItemStack[] products, ItemStack itemStack)
{
for (ItemStack stack : products)
{
if (stack.itemID == itemStack.itemID && stack.getItemDamage() == itemStack.getItemDamage())
{
if (stack.stackSize < stack.getItem().getItemStackLimit())
{
stack.stackSize += itemStack.stackSize;
itemStack.stackSize = Math.max(stack.stackSize - stack.getItem().getItemStackLimit(), 0);
}
}
}
if (itemStack.stackSize > 0)
{
ItemStack[] newProducts = new ItemStack[products.length + 1];
for (int i = 0; i < products.length; ++i)
{
newProducts[i] = products[i];
}
newProducts[products.length] = itemStack;
products = newProducts;
}
return products;
}
}
@@ -0,0 +1,39 @@
package thaumicbees.bees;
import thaumcraft.api.EnumTag;
import thaumcraft.api.ObjectTags;
import thaumcraft.api.ThaumcraftApi;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import forestry.api.apiculture.IBeeGenome;
import forestry.api.apiculture.IFlowerProvider;
import forestry.api.genetics.IPollinatable;
public class FlowerProviderAuraNodeFlux extends FlowerProviderAuraNode
{
@Override
public ItemStack[] affectProducts(World world, IBeeGenome genome, int x, int y, int z, ItemStack[] products)
{
EnumTag tag;
do
{
tag = EnumTag.values()[world.rand.nextInt(EnumTag.values().length)];
}
while (tag == EnumTag.UNKNOWN);
int nodeId = ThaumcraftApi.getClosestAuraWithinRange(world, x, y, z, this.nodeRange);
if (nodeId != -1)
{
int quantity = world.rand.nextInt(2) + 1;
ThaumcraftApi.queueNodeChanges(nodeId, 0, 0, false, new ObjectTags().add(tag, quantity), 0f, 0f, 0f);
}
return products;
}
@Override
public String getDescription()
{
return "Node Flux";
}
}
@@ -35,39 +35,14 @@ public class FlowerProviderAuraNodePurify extends FlowerProviderAuraNode
if (aspectCount > 0)
{
EnumTag selectedTag = node.flux.getAspectsSorted()[world.rand.nextInt(node.flux.tags.size())];
node.flux.remove(selectedTag, 1);
ThaumcraftApi.queueNodeChanges(node.key, 0, 0, false, new ObjectTags().add(selectedTag, -1), 0, 0, 0);
products = addItemToProducts(products, new ItemStack(ItemManager.solidFlux, 1, selectedTag.id));
}
}
return products;
}
private ItemStack[] addItemToProducts(ItemStack[] products, ItemStack itemStack)
{
for (ItemStack stack : products)
{
if (stack.itemID == itemStack.itemID && stack.getItemDamage() == itemStack.getItemDamage())
{
if (stack.stackSize < stack.getItem().getItemStackLimit())
if (selectedTag != null)
{
stack.stackSize += itemStack.stackSize;
itemStack.stackSize = Math.max(stack.stackSize - stack.getItem().getItemStackLimit(), 0);
node.flux.remove(selectedTag, 1);
ThaumcraftApi.queueNodeChanges(node.key, 0, 0, false, new ObjectTags().add(selectedTag, -1), 0, 0, 0);
products = addItemToProducts(products, new ItemStack(ItemManager.solidFlux, 1, selectedTag.id));
}
}
}
if (itemStack.stackSize > 0)
{
ItemStack[] newProducts = new ItemStack[products.length + 1];
for (int i = 0; i < products.length; ++i)
{
newProducts[i] = products[i];
}
newProducts[products.length] = itemStack;
products = newProducts;
}
return products;
}
}
@@ -89,8 +89,7 @@ public class ThaumicBeesPlugin
Allele.flowerThaumcraft = new AlleleFlower("flowerThaumcraftPlant", new FlowerProviderThaumcraftFlower(), false);
Allele.flowerAuraNode = new AlleleFlower("flowerAuraNode", new FlowerProviderAuraNode(), true);
Allele.flowerNodePurify = new AlleleFlower("flowerAuraNodePurify", new FlowerProviderAuraNodePurify(), false);
// TODO: Once TC API is out, write provider to flux up node
Allele.flowerNodeFluxify = Allele.flowerThaumcraft;
Allele.flowerNodeFluxify = new AlleleFlower("flowerAuraNodeFlux", new FlowerProviderAuraNodeFlux(), false);
Allele.cleansingEffect = new AlleleEffectCure("effectCurative", false);
Allele.digSpeed = new AlleleEffectPotion("effectDigSpeed", "Mining", Potion.digSpeed, 7, false);
@@ -281,7 +280,7 @@ public class ThaumicBeesPlugin
Allele.Aware.setGenome(BeeGenomeManager.getTemplateAware());
breedingMgr.registerBeeTemplate(Allele.Aware.getGenome());
/*Allele.Vis = new BeeSpecies("Vis", "\"They can feel changes in the aura, but are not yet able to affect it...\"|Azanor, research notes",
Allele.Vis = new BeeSpecies("Vis", "\"They can feel changes in the aura, but are not yet able to affect it...\"|Azanor, research notes",
"arcanus saecula", aware, 0,
0x004c99, defaultBodyColour, EnumTemperature.NORMAL, EnumHumidity.NORMAL,
false, hideSpecies, true, false);
@@ -303,7 +302,7 @@ public class ThaumicBeesPlugin
true, hideSpecies, true, false);
Allele.Flux.addProduct(ItemManager.combs.getStackForType(CombType.INTELLECT), 20);
Allele.Flux.setGenome(BeeGenomeManager.getTemplateFlux());
breedingMgr.registerBeeTemplate(Allele.Flux.getGenome());*/
breedingMgr.registerBeeTemplate(Allele.Flux.getGenome());
IClassification malevolent = AlleleManager.alleleRegistry.createAndRegisterClassification(EnumClassLevel.GENUS, "malevolens", "Malevolens");
malevolent.setParent(familyBee);
@@ -4,6 +4,7 @@ import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
import thaumcraft.api.EnumTag;
import thaumicbees.item.types.CapsuleType;
import thaumicbees.item.types.CombType;
import thaumicbees.item.types.DropType;
@@ -79,19 +80,27 @@ public class ItemManager
ItemManager.drops = new ItemDrop(configFile.getItem("drop", itemIDBase++).getInt());
ItemManager.miscResources = new ItemMiscResources(configFile.getItem("miscResources", itemIDBase++).getInt());
// 0x8700C6 = purpleish.
BackpackDefinition def = new BackpackDefinition("thaumaturge", "Thaumaturge's Backpack", 0x8700C6);
ItemManager.thaumaturgeBackpackT1 =
BackpackManager.backpackInterface.addBackpack(configFile.getItem("thaumaturgePack1", itemIDBase++).getInt(),
def, EnumBackpackType.T1);
ItemManager.thaumaturgeBackpackT2 =
BackpackManager.backpackInterface.addBackpack(configFile.getItem("thaumaturgePack2", itemIDBase++).getInt(),
def, EnumBackpackType.T2);
// Add additional items from configs to backpack.
if (ThaumicBees.getInstanceConfig().ThaumaturgeExtraItems.length() > 0)
try
{
FMLLog.info("Attempting to add extra items to Thaumaturge's backpack! If you get an error, check your ThaumicBees.conf.");
FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "thaumaturge@" + ThaumicBees.getInstanceConfig().ThaumaturgeExtraItems);
// 0x8700C6 = purpleish.
BackpackDefinition def = new BackpackDefinition("thaumaturge", "Thaumaturge's Backpack", 0x8700C6);
ItemManager.thaumaturgeBackpackT1 =
BackpackManager.backpackInterface.addBackpack(configFile.getItem("thaumaturgePack1", itemIDBase++).getInt(),
def, EnumBackpackType.T1);
ItemManager.thaumaturgeBackpackT2 =
BackpackManager.backpackInterface.addBackpack(configFile.getItem("thaumaturgePack2", itemIDBase++).getInt(),
def, EnumBackpackType.T2);
// Add additional items from configs to backpack.
if (ThaumicBees.getInstanceConfig().ThaumaturgeExtraItems.length() > 0)
{
FMLLog.info("Attempting to add extra items to Thaumaturge's backpack! If you get an error, check your ThaumicBees.conf.");
FMLInterModComms.sendMessage("Forestry", "add-backpack-items", "thaumaturge@" + ThaumicBees.getInstanceConfig().ThaumaturgeExtraItems);
}
}
catch (Exception e)
{
FMLLog.severe("ThaumicBees encountered an error during loading! Please ensure that Forestry did not fail to load.");
e.printStackTrace();
}
@@ -105,6 +114,19 @@ public class ItemManager
ItemManager.hiveFrameGentle = new ItemMagicHiveFrame(configFile.getItem("frameGentle", itemIDBase++).getInt(), HiveFrameType.GENTLE);
ItemManager.hiveFrameMetabolic = new ItemMagicHiveFrame(configFile.getItem("frameMetabolic", itemIDBase++).getInt(), HiveFrameType.METABOLIC);
ItemManager.hiveFrameNecrotic = new ItemMagicHiveFrame(configFile.getItem("frameNecrotic", itemIDBase++).getInt(), HiveFrameType.NECROTIC);
// Future frames, so they all are clumped together.
itemIDBase++;
itemIDBase++;
itemIDBase++;
itemIDBase++;
itemIDBase++;
itemIDBase++;
itemIDBase++;
itemIDBase++;
itemIDBase++;
// New items here.
}
public static void setupCrafting()
@@ -181,6 +203,20 @@ public class ItemManager
'B', Item.glassBottle
});
// "bottling" Crystal aspects.
for (EnumTag tag : EnumTag.values())
{
if (tag != EnumTag.UNKNOWN)
{
output = new ItemStack(ItemManager.tcEssentiaBottle, 1, tag.id + 1);
GameRegistry.addRecipe(output, new Object[] {
"ccc", "cxc", "ccc",
'c', new ItemStack(ItemManager.solidFlux, 1, tag.id),
'x', ItemManager.tcEssentiaBottle
});
}
}
// 20 is the 'average' time to centrifuge a comb.
RecipeManagers.centrifugeManager.addRecipe(20, ItemManager.combs.getStackForType(CombType.OCCULT),
new ItemStack[] {ItemManager.wax.getStackForType(WaxType.MAGIC), ItemInterface.getItem("honeyDrop") },
@@ -19,6 +19,7 @@ public class ItemSolidFlux extends Item
this.setTextureFile(CommonProxy.TCBEES_ITEMS_IMAGE);
this.setIconIndex(18);
this.setCreativeTab(Tabs.tabApiculture);
this.setHasSubtypes(true);
}
@Override
@@ -39,7 +40,7 @@ public class ItemSolidFlux extends Item
@Override
public String getItemDisplayName(ItemStack stack)
{
return "Crystalized " + EnumTag.get(stack.getItemDamage()).name;
return "Crystalized " + EnumTag.get(stack.getItemDamage()).name + " Aspect";
}
@Override
@@ -8,13 +8,13 @@ public enum HiveFrameType
MAGIC("Magic Frame", 32, 240, 1f, 1f, 1f, 2f, 2,
null),
RESILIENT("Resilient Frame", 33, 840, 1f, 1f, 1f, 2f, 2,
new ObjectTags().add(EnumTag.ARMOR, 2)),
new ObjectTags().add(EnumTag.ARMOR, 1)),
GENTLE("Gentle Frame", 34, 200, 1f, 0.7f, 1.5f, 1.4f, 1,
new ObjectTags().add(EnumTag.HEAL, 1).add(EnumTag.LIFE, 1)),
METABOLIC("Metabolic Frame", 35, 120, 1f, 1.8f, 1f, 1.2f, 5,
new ObjectTags().add(EnumTag.EXCHANGE, 2).add(EnumTag.MOTION, 1).add(EnumTag.FLUX, 1)),
new ObjectTags().add(EnumTag.EXCHANGE, 1).add(EnumTag.MOTION, 1)),
NECROTIC("Necrotic Frame", 36, 270, 1f, 1f, 0.4f, 0.75f, 1,
new ObjectTags().add(EnumTag.DEATH, 6).add(EnumTag.POISON, 4)),
new ObjectTags().add(EnumTag.DEATH, 3).add(EnumTag.POISON, 2)),
;
private HiveFrameType(String name, int icon, int damage,
@@ -7,6 +7,7 @@ public enum ResourceType
EXTENDED_FERTILIZER("Concentrated Compound", 4, true),
// Dummy items for Thaumanomicon research icons.
RESEARCH_StartNode("Start Node", 241, false),
RESEARCH_BeeInfusion("Bee Infusion", 240, false),
;
@@ -9,6 +9,6 @@ public class VersionInfo
public static final String Logo = "/gfx/thaumicbees/logo.png";
public static final String Depends = "required-after:Forestry@[2.0.0.0,);required-after:Thaumcraft@[3.0.2b,);after:ExtraBees";
public static final String Depends = "required-after:Forestry;required-after:Thaumcraft@[3.0.2b,);after:ExtraBees";
}
@@ -288,7 +288,7 @@ public class ThaumcraftCompat
public static void setupResearch()
{
ObjectTags tags = new ObjectTags().add(EnumTag.WOOD, 2).add(EnumTag.INSECT, 2);
ResearchItem startNode = new ResearchItem("TBSTARTNODE", tags, 10, 0, Block.sapling)
ResearchItem startNode = new ResearchItem("TBSTARTNODE", tags, 10, 0, ItemManager.miscResources.getStackForType(ResourceType.RESEARCH_StartNode))
.registerResearchItem();
tags = new ObjectTags().add(EnumTag.INSECT, 9).add(EnumTag.MAGIC, 2).add(EnumTag.FLUX, 2);
@@ -307,7 +307,7 @@ public class ThaumcraftCompat
.setParents(startNode)
.registerResearchItem();
tags = new ObjectTags().add(EnumTag.WOOD, 10).add(EnumTag.TOOL, 5).add(EnumTag.INSECT, 15).add(EnumTag.BEAST, 2)
tags = new ObjectTags().add(EnumTag.WOOD, 10).add(EnumTag.TOOL, 6).add(EnumTag.INSECT, 15).add(EnumTag.BEAST, 2)
.add(EnumTag.MAGIC, 5);
ResearchItem magicFrame = new ResearchItem("HIVEFRAME", tags, 10, -2, ItemManager.hiveFrameMagic)
.setParents(startNode)
@@ -319,14 +319,14 @@ public class ThaumcraftCompat
.setParents(magicFrame).setHidden()
.registerResearchItem();
tags = new ObjectTags().add(EnumTag.TOOL, 5).add(EnumTag.INSECT, 15).add(EnumTag.LIFE, 5).add(EnumTag.EXCHANGE, 6)
tags = new ObjectTags().add(EnumTag.TOOL, 4).add(EnumTag.INSECT, 15).add(EnumTag.LIFE, 5).add(EnumTag.EXCHANGE, 6)
.add(EnumTag.HEAL, 2).add(EnumTag.FLOWER, 6);
ResearchItem gentleFrame = new ResearchItem("HIVEFRAMEGENTLE", tags, 12, -2, ItemManager.hiveFrameGentle)
.setParents(magicFrame).setHidden()
.registerResearchItem();
tags = new ObjectTags().add(EnumTag.TOOL, 5).add(EnumTag.INSECT, 15).add(EnumTag.LIFE, 12).add(EnumTag.EXCHANGE, 6)
.add(EnumTag.MAGIC, 8).add(EnumTag.MOTION, 5);
tags = new ObjectTags().add(EnumTag.TOOL, 4).add(EnumTag.INSECT, 15).add(EnumTag.LIFE, 12).add(EnumTag.EXCHANGE, 6)
.add(EnumTag.MAGIC, 8).add(EnumTag.MOTION, 5).add(EnumTag.FLESH, 3);
ResearchItem metabolicFrame = new ResearchItem("HIVEFRAMEMETA", tags, 9, -3, ItemManager.hiveFrameMetabolic)
.setParents(magicFrame).setHidden()
.registerResearchItem();
@@ -386,7 +386,7 @@ public class ThaumcraftCompat
});
output = new ItemStack(ItemManager.hiveFrameMetabolic);
tags = new ObjectTags().add(EnumTag.WOOD, 4).add(EnumTag.INSECT, 8).add(EnumTag.LIFE, 8).add(EnumTag.FLESH, 8)
tags = new ObjectTags().add(EnumTag.WOOD, 4).add(EnumTag.INSECT, 8).add(EnumTag.LIFE, 8).add(EnumTag.MOTION, 8)
.add(EnumTag.EXCHANGE, 8);
ThaumcraftApi.addShapelessInfusionCraftingRecipe("HIVEFRAMEMETA", "FRAMEMETABOLIC", 50, tags, output, new Object[] {
Item.magmaCream,