diff --git a/thaumicbees_res/build.number b/thaumicbees_res/build.number
index 95872d5..dfb7e5a 100644
--- a/thaumicbees_res/build.number
+++ b/thaumicbees_res/build.number
@@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit!
-#Thu Jan 10 21:53:25 PST 2013
-build.number=60
+#Fri Jan 11 02:54:19 PST 2013
+build.number=68
diff --git a/thaumicbees_res/build.xml b/thaumicbees_res/build.xml
index 7e74925..da92131 100644
--- a/thaumicbees_res/build.xml
+++ b/thaumicbees_res/build.xml
@@ -32,6 +32,7 @@
+
diff --git a/thaumicbees_res/changelog.txt b/thaumicbees_res/changelog.txt
index cc8f932..983ff4c 100644
--- a/thaumicbees_res/changelog.txt
+++ b/thaumicbees_res/changelog.txt
@@ -1,9 +1,31 @@
-1.0.0-36 - Version for Forestry 1.6.5.x beta! Wooo!
-*Retooling some bee genome stuff to take advantage of new genes
-*Adding extra thaumcraft tags to some forestry items
-*Bees now all show up correctly in the Beealyzer Slot V
+1.1.702-67 - Replaced 1.1.702-62
+Additional Magic Capsules, featuring ExtraBees liquids, and RailCraft Creosote & Steam. (Yes, steam capsules. It's magic. That's how. :P)
+Tagged additional Forestry items with Thaumcraft aspects.
-0.9.0-35
-*Fixed problem with relative paths when reading Thaumcraft configs.
+1.1.702-62
+Added Magic Capsules!
+Compatible with BuildCraft and Forestry liquids, they function almost the same way as refactory capsules, except that they can store 2 buckets' worth of liquid. As such, you cannot right-click with them to scoop up water or lava, but you can use them in bottlers, carpenters, Railcraft's Iron Tanks, Thermal Expansion's liquid transposers, and other things that support the Forge Liquid Dictionary. They can be useful for storing larger amounts of liquids in chests and things. I am also able to add other liquids to them in the future, and liquids from mods that are not present will not appear in the Creative inventory or the NEI listings.
-0.9.0-34 : Initial Release.
\ No newline at end of file
+1.0.701-56
+Update to Forestry 1.7.0.1/1.7.0.2
+
+Added all kinds of backpack integration for Thaumcraft, including a new Thaumaturge's Backpack and Woven variety. These will suck up shards, Thaumcraft resources such as quicksilver, amber, zombie brains, research fragments and other goodies. Other TC items such as marker blocks, warded stone, candles, logs, leaves and plants also can fall into Forestry's default backpacks as appropriate. (I may have missed some other obvious items.)
+
+1.0.70-53
+Update to Forestry 1.7.0.0
+
+1.0.0-50
+-Added Thaumcraft aspects to some Forestry items, notably combs and bees. (Finally, something to use those extra drones for!)
+-Added another Swarmer inducer item - craftable via carpenter using liquid honey, Royal Jelly, Pollen and Enchanting Drops from Arcane bees. 8 times more effective than Royal Jelly alone!
+-Added carpenter recipe for candles using magic wax. Same patterns as with beeswax.
+
+1.0.0-48
+-Support for Forestry 1.6.5.5+
+-Extra alles for bee mutations!
+-Thaumcraft aspects associated with some Forestry items!
+
+1.0.0-35
+-Bugfix version to account for launcher jars located outside of expected folder. Replaced 1.0.0-34
+
+1.0.0-34
+-Initial Release
\ No newline at end of file
diff --git a/thaumicbees_res/gfx/thaumicbees/items/liquids.png b/thaumicbees_res/gfx/thaumicbees/items/liquids.png
index 8c68556..96735a0 100644
Binary files a/thaumicbees_res/gfx/thaumicbees/items/liquids.png and b/thaumicbees_res/gfx/thaumicbees/items/liquids.png differ
diff --git a/thaumicbees_res/mcmod.info b/thaumicbees_res/mcmod.info
index 86060e0..47d7379 100644
--- a/thaumicbees_res/mcmod.info
+++ b/thaumicbees_res/mcmod.info
@@ -5,7 +5,7 @@
"url": "http://www.minecraftforum.net/topic/1623692-thaumicbees-beekeeping-is-magic/",
"description": "Crossover mod for Forestry and Thaumcraft. Magic bees & more.",
"authors": [ "MysteriousAges" ],
- "credits": "Thanks to Sengir for the Forestry help!",
+ "credits": "Thanks to Sengir and Azanor for awesome mods! Also thanks to Binnie and Florastar. (:",
"logoFile": "/gfx/thaumicbees/logo.png"
}
]
\ No newline at end of file
diff --git a/thaumicbees_src/thaumicbees/item/ItemCapsule.java b/thaumicbees_src/thaumicbees/item/ItemCapsule.java
index 8a73d91..afec2a9 100644
--- a/thaumicbees_src/thaumicbees/item/ItemCapsule.java
+++ b/thaumicbees_src/thaumicbees/item/ItemCapsule.java
@@ -40,22 +40,34 @@ public class ItemCapsule extends Item
public enum Liquid
{ // Incidentally, Item meta is the liquid ID.
EMPTY("", "Empty", 16),
+ // Vanilla
WATER("water", "Water", 17),
LAVA("lava", "Lava", 18),
+ // Forestry
BIOMASS("biomass", "Biomass", 19),
BIOFUEL("biofuel", "Biofuel", 20),
+ // Buildcraft
OIL("Oil", "Oil", 21),
FUEL("Fuel", "Fuel", 22),
+ // More Forestry
SEEDOIL("seedoil", "Seed Oil", 23),
HONEY("honey", "Honey", 24),
JUICE("juice", "Juice", 25),
- CRUSHEDICE("", "Crushed Ice", 26),
+ CRUSHEDICE("ice", "Crushed Ice", 26),
MILK("milk", "Milk", 27),
+ // ExtraBees liquids
+ ACID("acid", "Acid", 28),
+ POISON("poison", "Poison", 29),
+ LIQUIDNITROGEN("liquidNitrogen", "Liquid Nitrogen", 30),
+ DNA("liquidDNA", "Liquid DNA", 31),
+ // Railcraft
+ CREOSOTEOIL("Creosote Oil", "Creosote Oil", 32),
+ STEAM("Steam", "Steam", 33),
;
public String liquidID;
public String displayName;
public int iconIdx;
- public boolean available = true;
+ public boolean available = false;
private Liquid(String l, String display, int idx)
{
@@ -110,7 +122,7 @@ public class ItemCapsule extends Item
liquid = LiquidDictionary.getLiquid(l.liquidID, this.capsuleType.capacity);
break;
}
-
+
if (liquid != null)
{
filled = new ItemStack(this, 1, l.ordinal());
@@ -120,12 +132,11 @@ public class ItemCapsule extends Item
RecipeManagers.bottlerManager.addRecipe(5, liquid, empty, filled);
RecipeManagers.squeezerManager.addRecipe(10, new ItemStack[] {filled} , liquid,
ItemManager.wax.getStackForType(ItemWax.WaxType.MAGIC), 20);
- }
- else
- {
- l.available = false;
+ l.available = true;
}
}
+ // Empty will be set to unavailable. Obviously, it always is.
+ Liquid.EMPTY.available = true;
}
@Override
diff --git a/thaumicbees_src/thaumicbees/item/ItemWax.java b/thaumicbees_src/thaumicbees/item/ItemWax.java
index 0c2c118..fc21b9c 100644
--- a/thaumicbees_src/thaumicbees/item/ItemWax.java
+++ b/thaumicbees_src/thaumicbees/item/ItemWax.java
@@ -66,7 +66,6 @@ public class ItemWax extends Item
@SideOnly(Side.CLIENT)
public void getSubItems(int id, CreativeTabs tabs, List list)
{
- super.getSubItems(id, tabs, list);
for (WaxType type : WaxType.values())
{
list.add(this.getStackForType(type));
diff --git a/thaumicbees_src/thaumicbees/main/ThaumcraftCompat.java b/thaumicbees_src/thaumicbees/main/ThaumcraftCompat.java
index a5c5e94..a9f80fb 100644
--- a/thaumicbees_src/thaumicbees/main/ThaumcraftCompat.java
+++ b/thaumicbees_src/thaumicbees/main/ThaumcraftCompat.java
@@ -16,6 +16,7 @@ import thaumicbees.storage.BackpackDefinition;
import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.registry.GameRegistry;
+import forestry.api.core.BlockInterface;
import forestry.api.core.ItemInterface;
import forestry.api.storage.BackpackManager;
@@ -142,6 +143,13 @@ public class ThaumcraftCompat
ThaumcraftApi.registerObjectTag(ItemManager.combs.itemID, ItemComb.CombType.WATERY.ordinal(), tags);
ThaumcraftApi.registerObjectTag(ItemManager.combs.itemID, ItemComb.CombType.EARTHY.ordinal(), tags);
+ // Tagging capsules.
+ tags = new ObjectTags().add(EnumTag.MAGIC, 2);
+ ThaumcraftApi.registerComplexObjectTag(ItemManager.magicCapsule.itemID, -1, tags);
+
+ tags = new ObjectTags().add(EnumTag.MAGIC, 2).add(EnumTag.VOID, 2);
+ ThaumcraftApi.registerObjectTag(ItemManager.magicCapsule.itemID, 0, tags);
+
// Tag some Forestry stuff.
ItemStack itemStack = ItemInterface.getItem("craftingMaterial");
tags = new ObjectTags().add(EnumTag.ELDRITCH, 1).add(EnumTag.DESTRUCTION, 1);
@@ -182,7 +190,40 @@ public class ThaumcraftCompat
ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags);
itemStack = ItemInterface.getItem("beeswax");
- tags = new ObjectTags().add(EnumTag.INSECT, 1).add(EnumTag.CONTROL, 1);
+ tags = new ObjectTags().add(EnumTag.INSECT, 1).add(EnumTag.CONTROL, 2);
+ ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags);
+ itemStack = ItemInterface.getItem("refractoryWax");
+ tags = new ObjectTags().add(EnumTag.FIRE, 3);
+ ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags);
+ itemStack = ItemInterface.getItem("phosphor");
+ tags = new ObjectTags().add(EnumTag.FIRE, 2).add(EnumTag.DESTRUCTION, 1);
+ ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags);
+
+ itemStack = ItemInterface.getItem("waxCapsule");
+ tags = new ObjectTags().add(EnumTag.CONTROL, 1).add(EnumTag.VOID, 1);
+ ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags);
+ itemStack = ItemInterface.getItem("waxCapsuleWater");
+ tags = new ObjectTags().add(EnumTag.CONTROL, 1).add(EnumTag.VOID, 1).add(EnumTag.WATER, 4);
+ ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags);
+
+ itemStack = ItemInterface.getItem("refractoryEmpty");
+ tags = new ObjectTags().add(EnumTag.FIRE, 1).add(EnumTag.CONTROL, 1).add(EnumTag.VOID, 1);
+ ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags);
+ itemStack = ItemInterface.getItem("refractoryWater");
+ tags = new ObjectTags().add(EnumTag.FIRE, 1).add(EnumTag.VOID, 1).add(EnumTag.WATER, 4);
+ ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags);
+ itemStack = ItemInterface.getItem("refractoryLava");
+ tags = new ObjectTags().add(EnumTag.VOID, 1).add(EnumTag.FIRE, 7).add(EnumTag.WATER, 1).add(EnumTag.ROCK, 2);
+ ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags);
+
+ itemStack = ItemInterface.getItem("canEmpty");
+ tags = new ObjectTags().add(EnumTag.METAL, 1).add(EnumTag.VOID, 1);
+ ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags);
+ itemStack = ItemInterface.getItem("canWater");
+ tags = new ObjectTags().add(EnumTag.METAL, 1).add(EnumTag.VOID, 1).add(EnumTag.WATER, 4);
+ ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags);
+ itemStack = ItemInterface.getItem("canLava");
+ tags = new ObjectTags().add(EnumTag.METAL, 1).add(EnumTag.VOID, 1).add(EnumTag.FIRE, 6).add(EnumTag.WATER, 1).add(EnumTag.ROCK, 2);
ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags);
itemStack = ItemInterface.getItem("beeComb");
@@ -196,6 +237,21 @@ public class ThaumcraftCompat
itemStack = ItemManager.combs.getStackForType(CombType.STARK);
ThaumcraftApi.registerObjectTag(itemStack.itemID, itemStack.getItemDamage(), tags);
+ // Forestry's wood
+ itemStack = BlockInterface.getBlock("log1");
+ tags = new ObjectTags().add(EnumTag.WOOD, 8);
+ ThaumcraftApi.registerComplexObjectTag(itemStack.itemID, -1, tags);
+ itemStack = BlockInterface.getBlock("log2"); // Same tags
+ ThaumcraftApi.registerComplexObjectTag(itemStack.itemID, -1, tags);
+ itemStack = BlockInterface.getBlock("log3"); // Same tags.
+ ThaumcraftApi.registerComplexObjectTag(itemStack.itemID, -1, tags);
+ itemStack = BlockInterface.getBlock("log4"); // Still same tags.
+ ThaumcraftApi.registerComplexObjectTag(itemStack.itemID, -1, tags);
+
+ itemStack = ItemInterface.getItem("sapling");
+ tags = new ObjectTags().add(EnumTag.PLANT, 4).add(EnumTag.WOOD, 2);
+ ThaumcraftApi.registerComplexObjectTag(itemStack.itemID, -1, tags);
+
// BEES!
itemStack = ItemInterface.getItem("beeDroneGE");
tags = new ObjectTags().add(EnumTag.INSECT, 1).add(EnumTag.FLIGHT, 2);