From 0fa9a6ed23768cc9f5c228f98a00ecdc595fcf19 Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Fri, 22 Feb 2013 16:14:17 -0800 Subject: [PATCH] New capsule, more refactoring. More research. More config options for capsule stack size --- thaumicbees_res/changelog.txt | 8 ++++ .../gfx/thaumicbees/items/liquids.png | Bin 2537 -> 54061 bytes thaumicbees_res/lang/thaumicbees/en_US.xml | 1 + .../research/thaumicbees/research.xml | 12 ++++- thaumicbees_src/thaumicbees/bees/Allele.java | 2 +- .../bees/AlleleEffectSpawnWisp.java | 2 +- .../thaumicbees/bees/BeeSpecies.java | 4 +- .../bees/FlowerProviderThaumcraftFlower.java | 16 +++++-- .../thaumicbees/item/ItemCapsule.java | 3 +- .../thaumicbees/item/ItemMagicHiveFrame.java | 44 ++++++++++++++---- .../thaumicbees/item/types/CapsuleType.java | 1 + .../thaumicbees/item/types/HiveFrameType.java | 20 ++++---- thaumicbees_src/thaumicbees/main/Config.java | 14 ++++-- .../main/utils/CompatabilityManager.java | 44 +++++++++--------- .../main/utils/CraftingManager.java | 15 +++++- .../utils/compat/ForestryHelper.java | 2 +- .../ShapelessBeeInfusionCraftingRecipe.java | 2 +- .../utils/compat/ThaumcraftHelper.java | 4 +- 18 files changed, 135 insertions(+), 59 deletions(-) rename thaumicbees_src/thaumicbees/{ => main}/utils/compat/ForestryHelper.java (96%) rename thaumicbees_src/thaumicbees/{ => main}/utils/compat/ShapelessBeeInfusionCraftingRecipe.java (99%) rename thaumicbees_src/thaumicbees/{ => main}/utils/compat/ThaumcraftHelper.java (98%) diff --git a/thaumicbees_res/changelog.txt b/thaumicbees_res/changelog.txt index 5866418..22e5f56 100644 --- a/thaumicbees_res/changelog.txt +++ b/thaumicbees_res/changelog.txt @@ -1,3 +1,11 @@ +1.4.2 +Added Void Capsules - hold up to 8 buckets of liquid with one! It's a waterproof bag of holding! +Fix: Added Greatwood & Silverwood slabs to the ore dictionary so they should work as normal. + +1.4.1 +Added Greatwood and Silverwood planks. Since Greatwood and Silverwood are tougher than other trees, you'll need some extra machinery. To obtain these, jam a log of the appropriate tree into a Forestry carpenter and provide a half bucket of water. +Added slabs for the new planks also. + 1.4.0a Fixed some issues with the Node bee's effect. diff --git a/thaumicbees_res/gfx/thaumicbees/items/liquids.png b/thaumicbees_res/gfx/thaumicbees/items/liquids.png index 96735a0348873a186c0f98d33acb7144f26c814c..83f3118fc467c96d16d2e0876748bb26436ec872 100644 GIT binary patch literal 54061 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�!-ZjT26 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 diff --git a/thaumicbees_res/lang/thaumicbees/en_US.xml b/thaumicbees_res/lang/thaumicbees/en_US.xml index a3ae51c..74eb1b7 100644 --- a/thaumicbees_res/lang/thaumicbees/en_US.xml +++ b/thaumicbees_res/lang/thaumicbees/en_US.xml @@ -58,6 +58,7 @@ Magic Capsule + Void Capsule Empty diff --git a/thaumicbees_res/research/thaumicbees/research.xml b/thaumicbees_res/research/thaumicbees/research.xml index d3692ca..7ff6d57 100644 --- a/thaumicbees_res/research/thaumicbees/research.xml +++ b/thaumicbees_res/research/thaumicbees/research.xml @@ -99,8 +99,18 @@ Like the Magic Frame, this frame consumes aura to maintain its enchantments. Thi You have been seeking a way to significantly extend bee life. It should be possible by adding a frame enchanted with the essence of time to the hive. Keeping bees has been frustrating, as the insects' short lives requires you to manually intervene far too often. -A new variation of your frame design, this version involving some Time magic, should help extend their lives significantly. +A new variation of your frame design, this version involving some Time magic, should help extend their lives significantly. Like the Magic frame, this one too requires aura to run, and will produce flux now and again. FRAMETIME + +Void Capsule +Another Dimension of Liquid Storage +It seems reasonable that if you can shift blocks and other matter into an alternate dimension temporarily, you should be able to do something similar with liquids. +These new capsules can hold the equivalent of 8 buckets' worth of liquid by syphoning off a large quantity into a pocket dimension temporarily. + +Like other capsules, they are fragile and are typically single-use. They have proven popular for long-term storage. +VOIDCAPSULE + + \ No newline at end of file diff --git a/thaumicbees_src/thaumicbees/bees/Allele.java b/thaumicbees_src/thaumicbees/bees/Allele.java index c185b9c..61fb3f5 100644 --- a/thaumicbees_src/thaumicbees/bees/Allele.java +++ b/thaumicbees_src/thaumicbees/bees/Allele.java @@ -1,7 +1,7 @@ package thaumicbees.bees; import net.minecraft.potion.Potion; -import thaumicbees.utils.compat.ThaumcraftHelper; +import thaumicbees.main.utils.compat.ThaumcraftHelper; import forestry.api.apiculture.IAlleleBeeSpecies; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; diff --git a/thaumicbees_src/thaumicbees/bees/AlleleEffectSpawnWisp.java b/thaumicbees_src/thaumicbees/bees/AlleleEffectSpawnWisp.java index e61e087..bc8efb0 100644 --- a/thaumicbees_src/thaumicbees/bees/AlleleEffectSpawnWisp.java +++ b/thaumicbees_src/thaumicbees/bees/AlleleEffectSpawnWisp.java @@ -4,7 +4,7 @@ import java.lang.reflect.Field; import cpw.mods.fml.common.FMLLog; import thaumicbees.item.ItemArmorApiarist; -import thaumicbees.utils.compat.ThaumcraftHelper; +import thaumicbees.main.utils.compat.ThaumcraftHelper; import forestry.api.apiculture.IBeeGenome; import forestry.api.apiculture.IBeeHousing; import net.minecraft.entity.EntityList; diff --git a/thaumicbees_src/thaumicbees/bees/BeeSpecies.java b/thaumicbees_src/thaumicbees/bees/BeeSpecies.java index 44cb5a7..7b71522 100644 --- a/thaumicbees_src/thaumicbees/bees/BeeSpecies.java +++ b/thaumicbees_src/thaumicbees/bees/BeeSpecies.java @@ -17,8 +17,8 @@ import thaumicbees.item.types.PollenType; import thaumicbees.item.types.ResourceType; import thaumicbees.main.Config; import thaumicbees.main.utils.LocalizationManager; -import thaumicbees.utils.compat.ForestryHelper; -import thaumicbees.utils.compat.ThaumcraftHelper; +import thaumicbees.main.utils.compat.ForestryHelper; +import thaumicbees.main.utils.compat.ThaumcraftHelper; import net.minecraft.block.Block; import net.minecraft.item.Item; diff --git a/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java b/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java index 2b3ac42..65e7dc9 100644 --- a/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java +++ b/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java @@ -3,6 +3,7 @@ package thaumicbees.bees; import cpw.mods.fml.common.registry.LanguageRegistry; import thaumicbees.main.Config; import thaumicbees.main.utils.LocalizationManager; +import thaumicbees.main.utils.compat.ThaumcraftHelper; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -34,11 +35,18 @@ public class FlowerProviderThaumcraftFlower implements IFlowerProvider { boolean flag = false; int blockDown = world.getBlockId(x, y - 1, z); - if (world.isAirBlock(x, y, z) && (blockDown == Block.dirt.blockID || blockDown == Block.grass.blockID)) + if (world.isAirBlock(x, y, z)) { - int rand = world.rand.nextInt(10); - world.setBlockAndMetadataWithNotify(x, y, z, Config.tcPlant.blockID, (rand >= 5) ? 2 : 3); - flag = true; + if (blockDown == Block.dirt.blockID || blockDown == Block.grass.blockID) + { + world.setBlockAndMetadataWithNotify(x, y, z, Config.tcPlant.blockID, ThaumcraftHelper.BlockPlant.SHIMMERLEAF.ordinal()); + flag = true; + } + else if (blockDown == Block.sand.blockID) + { + world.setBlockAndMetadataWithNotify(x, y, z, Config.tcPlant.blockID, ThaumcraftHelper.BlockPlant.CINDERPEARL.ordinal()); + flag = true; + } } return flag; } diff --git a/thaumicbees_src/thaumicbees/item/ItemCapsule.java b/thaumicbees_src/thaumicbees/item/ItemCapsule.java index f9df9ee..66bc725 100644 --- a/thaumicbees_src/thaumicbees/item/ItemCapsule.java +++ b/thaumicbees_src/thaumicbees/item/ItemCapsule.java @@ -26,13 +26,14 @@ public class ItemCapsule extends Item { private CapsuleType capsuleType; - public ItemCapsule(CapsuleType type, int itemId) + public ItemCapsule(CapsuleType type, int itemId, int maxStackSize) { super(itemId); this.capsuleType = type; this.setTextureFile(CommonProxy.TCBEES_LIQUIDS_IMAGE); this.setCreativeTab(Tabs.tabApiculture); this.setHasSubtypes(true); + this.setMaxStackSize(maxStackSize); } public CapsuleType getType() diff --git a/thaumicbees_src/thaumicbees/item/ItemMagicHiveFrame.java b/thaumicbees_src/thaumicbees/item/ItemMagicHiveFrame.java index c76c2ce..83c2971 100644 --- a/thaumicbees_src/thaumicbees/item/ItemMagicHiveFrame.java +++ b/thaumicbees_src/thaumicbees/item/ItemMagicHiveFrame.java @@ -12,6 +12,7 @@ import thaumicbees.main.CommonProxy; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import forestry.api.apiculture.IBee; import forestry.api.apiculture.IBeeGenome; @@ -43,10 +44,7 @@ public class ItemMagicHiveFrame extends Item implements IHiveFrame @Override public ItemStack frameUsed(IBeeHousing housing, ItemStack frame, IBee queen, int wear) { - this.doFluxEffect(housing.getWorld(), housing.getXCoord(), housing.getYCoord(), housing.getZCoord()); - frame = this.doWear(housing.getWorld(), housing.getXCoord(), housing.getYCoord(), housing.getZCoord(), frame, wear); - - return frame; + return this.doWear(housing.getWorld(), housing.getXCoord(), housing.getYCoord(), housing.getZCoord(), frame, wear); } private void doFluxEffect(World w, int x, int y, int z) @@ -60,22 +58,50 @@ public class ItemMagicHiveFrame extends Item implements IHiveFrame private ItemStack doWear(World w, int x, int y, int z, ItemStack frame, int wear) { int damage = wear; + int fluxMod = 1; + // This throttles back the amount of aura consumed by the frame by storing a smidge of data on the item stack. if (this.type.auraPerUse > 0) { - // Attempt to use aura for the frame. - if (!ThaumcraftApi.decreaseClosestAura(w, x, y, z, this.type.auraPerUse, true)) + NBTTagCompound tag; + if (frame.hasTagCompound()) { - // Insufficient aura, or no nearby node. - damage = wear + this.type.auraPerUse; + tag = frame.getTagCompound(); } + else + { + tag = new NBTTagCompound(); + tag.setByte("wearTicks", (byte)0); + frame.setTagCompound(tag); + } + + int wearTicks = tag.getByte("wearTicks") + 1; + + if (wearTicks == this.type.wearTicksPerAura) + { + // Attempt to use aura for the frame. + if (!ThaumcraftApi.decreaseClosestAura(w, x, y, z, this.type.auraPerUse, true)) + { + // Insufficient aura, or no nearby node. + damage = wear + this.type.auraPerUse * this.type.wearTicksPerAura; + fluxMod = 1 + w.rand.nextInt(this.type.wearTicksPerAura); + } + wearTicks = 0; + } + + tag.setByte("wearTicks", (byte)wearTicks); } frame.setItemDamage(frame.getItemDamage() + damage); + for (int i = 0; i < fluxMod; ++i) + { + this.doFluxEffect(w, x, y, z); + } + if (frame.getItemDamage() >= frame.getMaxDamage()) { - // Break! + // Break the frame. frame = null; } diff --git a/thaumicbees_src/thaumicbees/item/types/CapsuleType.java b/thaumicbees_src/thaumicbees/item/types/CapsuleType.java index 12b1796..de73441 100644 --- a/thaumicbees_src/thaumicbees/item/types/CapsuleType.java +++ b/thaumicbees_src/thaumicbees/item/types/CapsuleType.java @@ -6,6 +6,7 @@ import cpw.mods.fml.common.registry.LanguageRegistry; public enum CapsuleType { MAGIC("magic", 2000, 0), + VOID("void", 8000, 1), ; private String name; public int capacity; diff --git a/thaumicbees_src/thaumicbees/item/types/HiveFrameType.java b/thaumicbees_src/thaumicbees/item/types/HiveFrameType.java index 7e0abe1..be1a3d6 100644 --- a/thaumicbees_src/thaumicbees/item/types/HiveFrameType.java +++ b/thaumicbees_src/thaumicbees/item/types/HiveFrameType.java @@ -7,31 +7,31 @@ import thaumicbees.main.utils.LocalizationManager; public enum HiveFrameType { - MAGIC("magic", 32, 240, 1f, 1f, 1f, 2f, 2, + MAGIC("magic", 32, 240, 1f, 1f, 1f, 2f, 2, 5, null), - RESILIENT("resillient", 33, 840, 1f, 1f, 1f, 2f, 2, + RESILIENT("resillient", 33, 840, 1f, 1f, 1f, 2f, 2, 5, new ObjectTags().add(EnumTag.ARMOR, 1)), - GENTLE("gentle", 34, 200, 1f, 0.7f, 1.5f, 1.4f, 1, + GENTLE("gentle", 34, 200, 1f, 0.7f, 1.5f, 1.4f, 1, 5, new ObjectTags().add(EnumTag.HEAL, 1).add(EnumTag.LIFE, 1)), - METABOLIC("metabolic", 35, 120, 1f, 1.8f, 1f, 1.2f, 5, + METABOLIC("metabolic", 35, 120, 1f, 1.8f, 1f, 1.2f, 5, 5, new ObjectTags().add(EnumTag.EXCHANGE, 1).add(EnumTag.MOTION, 1)), - NECROTIC("necrotic", 36, 290, 1f, 1f, 0.3f, 0.75f, 1, + NECROTIC("necrotic", 36, 290, 1f, 1f, 0.3f, 0.75f, 1, 5, new ObjectTags().add(EnumTag.DEATH, 3).add(EnumTag.POISON, 2)), - TEMPORAL("temporal", 37, 300, 1f, 1f, 2.5f, 1f, 1, + TEMPORAL("temporal", 37, 300, 1f, 1f, 2.5f, 1f, 1, 5, new ObjectTags().add(EnumTag.TIME, 5)), ; private HiveFrameType(String name, int icon, int damage, float territory, float mutation, float lifespan, float production, - int auraUse, ObjectTags fluxTags) + int auraUse, int wearTicks, ObjectTags fluxTags) { - this(name, icon, damage, territory, mutation, lifespan, production, 1f, false, false, false, false, auraUse, fluxTags); + this(name, icon, damage, territory, mutation, lifespan, production, 1f, false, false, false, false, auraUse, wearTicks, fluxTags); } private HiveFrameType(String name, int icon, int damage, float territory, float mutation, float lifespan, float production, float flowering, boolean sealed, boolean lit, boolean sunlit, boolean hellish, - int auraUse, ObjectTags fluxTags) + int auraUse, int wearTicks, ObjectTags fluxTags) { this.frameName = name; this.iconIdx = icon; @@ -49,6 +49,7 @@ public enum HiveFrameType this.auraPerUse = auraUse; this.flux = fluxTags; + this.wearTicksPerAura = wearTicks; } private String frameName; @@ -67,6 +68,7 @@ public enum HiveFrameType public ObjectTags flux; public int auraPerUse; + public int wearTicksPerAura; public String getName() { diff --git a/thaumicbees_src/thaumicbees/main/Config.java b/thaumicbees_src/thaumicbees/main/Config.java index 8b9f048..05faa44 100644 --- a/thaumicbees_src/thaumicbees/main/Config.java +++ b/thaumicbees_src/thaumicbees/main/Config.java @@ -19,9 +19,9 @@ import thaumicbees.item.types.HiveFrameType; import thaumicbees.item.types.PlankType; import thaumicbees.main.utils.CompatabilityManager; import thaumicbees.main.utils.LocalizationManager; +import thaumicbees.main.utils.compat.ForestryHelper; +import thaumicbees.main.utils.compat.ThaumcraftHelper; import thaumicbees.storage.BackpackDefinition; -import thaumicbees.utils.compat.ForestryHelper; -import thaumicbees.utils.compat.ThaumcraftHelper; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.registry.GameRegistry; @@ -52,6 +52,7 @@ public class Config public boolean ExtraBeesInstalled; public boolean AddThaumcraftItemsToBackpacks; public String ThaumaturgeExtraItems; + public int capsuleStackSizeMax; public static BlockPlanks planksWood; public static BlockWoodSlab slabWoodHalf; @@ -69,6 +70,7 @@ public class Config //----- Liquid Capsules -------------------- public static ItemCapsule magicCapsule; + public static ItemCapsule voidCapsule; //----- Apiary Frames ---------------------- public static ItemMagicHiveFrame hiveFrameMagic; @@ -198,7 +200,7 @@ public class Config } - magicCapsule = new ItemCapsule(CapsuleType.MAGIC, tbConfig.getItem("magicCapsule", itemIDBase++).getInt()); + magicCapsule = new ItemCapsule(CapsuleType.MAGIC, tbConfig.getItem("magicCapsule", itemIDBase++).getInt(), this.capsuleStackSizeMax); pollen = new ItemPollen(tbConfig.getItem("pollen", itemIDBase++).getInt()); solidFlux = new ItemSolidFlux(tbConfig.getItem("fluxCrystal", itemIDBase++).getInt()); @@ -225,6 +227,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); } private void doMiscConfig() @@ -240,6 +243,11 @@ public class Config p.comment = "Set to true if you want ThaumicBees to add several Thaumcraft blocks & items to Forestry backpacks." + "\n Set to false to disable."; this.AddThaumcraftItemsToBackpacks = p.getBoolean(true); + + 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(); } } diff --git a/thaumicbees_src/thaumicbees/main/utils/CompatabilityManager.java b/thaumicbees_src/thaumicbees/main/utils/CompatabilityManager.java index 280fef6..8915515 100644 --- a/thaumicbees_src/thaumicbees/main/utils/CompatabilityManager.java +++ b/thaumicbees_src/thaumicbees/main/utils/CompatabilityManager.java @@ -24,16 +24,16 @@ import thaumicbees.item.types.WaxType; import thaumicbees.main.CommonProxy; import thaumicbees.main.Config; import thaumicbees.main.ThaumicBees; +import thaumicbees.main.utils.compat.ForestryHelper; +import thaumicbees.main.utils.compat.ThaumcraftHelper; +import thaumicbees.main.utils.compat.ForestryHelper.CircuitBoard; +import thaumicbees.main.utils.compat.ForestryHelper.Comb; +import thaumicbees.main.utils.compat.ForestryHelper.CraftingMaterial; +import thaumicbees.main.utils.compat.ForestryHelper.Pollen; +import thaumicbees.main.utils.compat.ForestryHelper.Propolis; +import thaumicbees.main.utils.compat.ForestryHelper.Tube; +import thaumicbees.main.utils.compat.ThaumcraftHelper.MiscResource; import thaumicbees.storage.BackpackDefinition; -import thaumicbees.utils.compat.ForestryHelper; -import thaumicbees.utils.compat.ThaumcraftHelper; -import thaumicbees.utils.compat.ForestryHelper.CircuitBoard; -import thaumicbees.utils.compat.ForestryHelper.Comb; -import thaumicbees.utils.compat.ForestryHelper.CraftingMaterial; -import thaumicbees.utils.compat.ForestryHelper.Pollen; -import thaumicbees.utils.compat.ForestryHelper.Propolis; -import thaumicbees.utils.compat.ForestryHelper.Tube; -import thaumicbees.utils.compat.ThaumcraftHelper.MiscResource; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.event.FMLInterModComms; @@ -65,11 +65,7 @@ public class CompatabilityManager Item i = (Item) f.get(null); value = new ItemStack(i); } - catch (Exception e) - { - FMLLog.warning("Could not get Extra Bees item: " + field + ". If you notice this, please report this on the Thaumic Bees thread with the following trace:"); - e.printStackTrace(); - } + catch (Exception e) { } return value; } @@ -378,11 +374,11 @@ public class CompatabilityManager itemStack = ItemInterface.getItem("tubes"); tags = new ObjectTags(ItemInterface.getItem("ingotCopper").itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.COPPER.ordinal(), tags); + //ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.COPPER.ordinal(), tags); tags = new ObjectTags(ItemInterface.getItem("ingotTin").itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.TIN.ordinal(), tags); + //ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.TIN.ordinal(), tags); tags = new ObjectTags(ItemInterface.getItem("ingotBronze").itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); - ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.BRONZE.ordinal(), tags); + //ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.BRONZE.ordinal(), tags); tags = new ObjectTags(Item.ingotIron.itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); ThaumcraftApi.registerObjectTag(itemStack.itemID, ForestryHelper.Tube.IRON.ordinal(), tags); tags = new ObjectTags(Item.ingotGold.itemID, 0).add(EnumTag.MECHANISM, 1).add(EnumTag.POWER, 1); @@ -407,12 +403,11 @@ public class CompatabilityManager { ItemStack itemStack; ObjectTags tags; + } + + private static void setupItemAspectsOreDict() + { - if ((itemStack = getExtraBeeItem("comb")) != null) - { - tags = new ObjectTags().add(EnumTag.INSECT, 2).add(EnumTag.TRAP, 2); - ThaumcraftApi.registerObjectTag(itemStack.itemID, -1, tags); - } } public static void setupResearch() @@ -474,6 +469,11 @@ public class CompatabilityManager ResearchItem temporalFrame = new ResearchItem("HIVEFRAMETIME", tags, 9, -5, Config.hiveFrameTemporal) .setParents(magicFrame).setHidden() .registerResearchItem(); + + tags = new ObjectTags().add(EnumTag.VOID, 15).add(EnumTag.CRYSTAL, 8).add(EnumTag.ELDRITCH, 8).add(EnumTag.EXCHANGE, 15); + ResearchItem voidCapsule = new ResearchItem("VOIDCAPSULE", tags, 10, 9, Config.voidCapsule) + .setParents(startNode, ResearchList.getResearch("PORTABLEHOLE")).setHidden() + .registerResearchItem(); } public static void registerResearch() diff --git a/thaumicbees_src/thaumicbees/main/utils/CraftingManager.java b/thaumicbees_src/thaumicbees/main/utils/CraftingManager.java index e5be449..235dd42 100644 --- a/thaumicbees_src/thaumicbees/main/utils/CraftingManager.java +++ b/thaumicbees_src/thaumicbees/main/utils/CraftingManager.java @@ -16,8 +16,8 @@ import thaumicbees.item.types.PropolisType; import thaumicbees.item.types.ResourceType; import thaumicbees.item.types.WaxType; import thaumicbees.main.Config; -import thaumicbees.utils.compat.ShapelessBeeInfusionCraftingRecipe; -import thaumicbees.utils.compat.ThaumcraftHelper; +import thaumicbees.main.utils.compat.ShapelessBeeInfusionCraftingRecipe; +import thaumicbees.main.utils.compat.ThaumcraftHelper; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeChromosome; @@ -313,6 +313,16 @@ public class CraftingManager 'S', Block.sand, 'F', inputA }); + + output = Config.voidCapsule.getCapsuleForLiquid(LiquidType.EMPTY); + output.stackSize = 4; + tags = new ObjectTags().add(EnumTag.VOID, 16).add(EnumTag.ELDRITCH, 4).add(EnumTag.EXCHANGE, 8); + ThaumcraftApi.addInfusionCraftingRecipe("VOIDCAPSULE", "VOIDCAPSULE", 10, tags, output, new Object[] { + " G ", "GPG", "TGT", + 'G', Block.thinGlass, + 'P', Item.enderPearl, + 'T', Item.ingotIron + }); ItemStack drone = BeeGenomeManager.getBeeNBTForSpecies(BeeSpecies.STARK, EnumBeeType.DRONE); ItemStack princess = BeeGenomeManager.getBeeNBTForSpecies(BeeSpecies.STARK, EnumBeeType.PRINCESS); @@ -360,6 +370,7 @@ public class CraftingManager 100, tags, BeeSpecies.STARK, EnumBeeChromosome.SPECIES); registerLiquidContainer(Config.magicCapsule); + registerLiquidContainer(Config.voidCapsule); } private static void registerLiquidContainer(ItemCapsule baseCapsule) diff --git a/thaumicbees_src/thaumicbees/utils/compat/ForestryHelper.java b/thaumicbees_src/thaumicbees/main/utils/compat/ForestryHelper.java similarity index 96% rename from thaumicbees_src/thaumicbees/utils/compat/ForestryHelper.java rename to thaumicbees_src/thaumicbees/main/utils/compat/ForestryHelper.java index 9a5ea86..ad885bd 100644 --- a/thaumicbees_src/thaumicbees/utils/compat/ForestryHelper.java +++ b/thaumicbees_src/thaumicbees/main/utils/compat/ForestryHelper.java @@ -1,4 +1,4 @@ -package thaumicbees.utils.compat; +package thaumicbees.main.utils.compat; import net.minecraft.item.Item; import forestry.api.core.ItemInterface; diff --git a/thaumicbees_src/thaumicbees/utils/compat/ShapelessBeeInfusionCraftingRecipe.java b/thaumicbees_src/thaumicbees/main/utils/compat/ShapelessBeeInfusionCraftingRecipe.java similarity index 99% rename from thaumicbees_src/thaumicbees/utils/compat/ShapelessBeeInfusionCraftingRecipe.java rename to thaumicbees_src/thaumicbees/main/utils/compat/ShapelessBeeInfusionCraftingRecipe.java index 84942a2..dd484aa 100644 --- a/thaumicbees_src/thaumicbees/utils/compat/ShapelessBeeInfusionCraftingRecipe.java +++ b/thaumicbees_src/thaumicbees/main/utils/compat/ShapelessBeeInfusionCraftingRecipe.java @@ -1,4 +1,4 @@ -package thaumicbees.utils.compat; +package thaumicbees.main.utils.compat; import java.util.ArrayList; import java.util.Arrays; diff --git a/thaumicbees_src/thaumicbees/utils/compat/ThaumcraftHelper.java b/thaumicbees_src/thaumicbees/main/utils/compat/ThaumcraftHelper.java similarity index 98% rename from thaumicbees_src/thaumicbees/utils/compat/ThaumcraftHelper.java rename to thaumicbees_src/thaumicbees/main/utils/compat/ThaumcraftHelper.java index e88af5c..b309be9 100644 --- a/thaumicbees_src/thaumicbees/utils/compat/ThaumcraftHelper.java +++ b/thaumicbees_src/thaumicbees/main/utils/compat/ThaumcraftHelper.java @@ -1,4 +1,4 @@ -package thaumicbees.utils.compat; +package thaumicbees.main.utils.compat; import net.minecraft.block.Block; import net.minecraft.item.Item; @@ -104,7 +104,7 @@ public class ThaumcraftHelper { GREATWOOD_SAPLING, SILVERWOOD_SAPLING, - SILVERLEAF, + SHIMMERLEAF, CINDERPEARL; } }