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 96735a0..83f3118 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/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; } }