diff --git a/thaumicbees_res/build.number b/thaumicbees_res/build.number index 01d41b0..b9f6702 100644 --- a/thaumicbees_res/build.number +++ b/thaumicbees_res/build.number @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Fri Feb 15 12:43:48 PST 2013 -build.number=119 +#Sat Feb 16 15:49:23 PST 2013 +build.number=124 diff --git a/thaumicbees_res/build.xml b/thaumicbees_res/build.xml index 1e85d8e..e2860a1 100644 --- a/thaumicbees_res/build.xml +++ b/thaumicbees_res/build.xml @@ -17,7 +17,7 @@ - + diff --git a/thaumicbees_res/gfx/thaumicbees/items/items.png b/thaumicbees_res/gfx/thaumicbees/items/items.png index c46d974..9dda530 100644 Binary files a/thaumicbees_res/gfx/thaumicbees/items/items.png and b/thaumicbees_res/gfx/thaumicbees/items/items.png differ diff --git a/thaumicbees_res/lang/thaumicbees/en_US.xml b/thaumicbees_res/lang/thaumicbees/en_US.xml index 84c69fc..a3ae51c 100644 --- a/thaumicbees_res/lang/thaumicbees/en_US.xml +++ b/thaumicbees_res/lang/thaumicbees/en_US.xml @@ -5,6 +5,10 @@ Handful of Jelly Babies + Greatwood Planks + Greatwood Slab + Silverwood Planks + Silverwood Slab Occult Comb @@ -28,6 +32,7 @@ Unusual Pollen + Phased Pollen Dull Propolis diff --git a/thaumicbees_src/thaumicbees/bees/Allele.java b/thaumicbees_src/thaumicbees/bees/Allele.java index 6aef12f..c185b9c 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.compat.ThaumcraftHelper; +import thaumicbees.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 7e82831..e61e087 100644 --- a/thaumicbees_src/thaumicbees/bees/AlleleEffectSpawnWisp.java +++ b/thaumicbees_src/thaumicbees/bees/AlleleEffectSpawnWisp.java @@ -3,8 +3,8 @@ package thaumicbees.bees; import java.lang.reflect.Field; import cpw.mods.fml.common.FMLLog; -import thaumicbees.compat.ThaumcraftHelper; import thaumicbees.item.ItemArmorApiarist; +import thaumicbees.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 162a2cd..44cb5a7 100644 --- a/thaumicbees_src/thaumicbees/bees/BeeSpecies.java +++ b/thaumicbees_src/thaumicbees/bees/BeeSpecies.java @@ -11,14 +11,14 @@ import java.util.HashMap; import cpw.mods.fml.common.registry.LanguageRegistry; -import thaumicbees.compat.ForestryHelper; -import thaumicbees.compat.ThaumcraftHelper; import thaumicbees.item.types.CombType; import thaumicbees.item.types.DropType; 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 net.minecraft.block.Block; import net.minecraft.item.Item; @@ -183,15 +183,18 @@ public enum BeeSpecies implements IAlleleBeeSpecies .setGenome(BeeGenomeManager.getTemplateGhastly()) .register(); TIMELY.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.DRIPPING.ordinal()), 25) + .addProduct(Config.pollen.getStackForType(PollenType.PHASED), 10) .setGenome(BeeGenomeManager.getTemplateTimely()) .register(); LORDLY.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.MYSTERIOUS.ordinal()), 5) .addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.DRIPPING.ordinal()), 25) + .addProduct(Config.pollen.getStackForType(PollenType.PHASED), 15) .setGenome(BeeGenomeManager.getTemplateLordly()) .register(); DOCTORAL.addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.MYSTERIOUS.ordinal()), 10) - .addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.DRIPPING.ordinal()), 30) - .addSpecialty(new ItemStack(Config.jellyBaby), 4) + .addProduct(new ItemStack(Config.fBeeComb, 1, ForestryHelper.Comb.DRIPPING.ordinal()), 25) + .addProduct(Config.pollen.getStackForType(PollenType.PHASED), 19) + .addSpecialty(new ItemStack(Config.jellyBaby), 7) .setGenome(BeeGenomeManager.getTemplateDoctoral()) .register(); } diff --git a/thaumicbees_src/thaumicbees/block/BlockPlanks.java b/thaumicbees_src/thaumicbees/block/BlockPlanks.java new file mode 100644 index 0000000..11371f6 --- /dev/null +++ b/thaumicbees_src/thaumicbees/block/BlockPlanks.java @@ -0,0 +1,49 @@ +package thaumicbees.block; + +import java.util.List; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import thaumicbees.item.types.PlankType; +import thaumicbees.main.CommonProxy; +import net.minecraft.block.Block; +import net.minecraft.block.BlockWood; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; + +public class BlockPlanks extends Block +{ + public BlockPlanks(int id) + { + super(id, Material.wood); + this.setHardness(2.5f); + this.setResistance(6.0f); + this.setBlockName("tb.planks"); + this.setCreativeTab(CreativeTabs.tabBlock); + this.setTextureFile(CommonProxy.TCBEES_ITEMS_IMAGE); + Block.setBurnProperties(id, 5, 20); + } + + @Override + public int getBlockTextureFromSideAndMetadata(int side, int meta) + { + return PlankType.getType(meta).textureIdx; + } + + @Override + public int damageDropped(int meta) + { + return meta; + } + + @SideOnly(Side.CLIENT) + @Override + public void getSubBlocks(int id, CreativeTabs tab, List itemsList) + { + for (PlankType type : PlankType.values()) + { + itemsList.add(new ItemStack(this, 1, type.ordinal())); + } + } +} diff --git a/thaumicbees_src/thaumicbees/block/BlockWoodSlab.java b/thaumicbees_src/thaumicbees/block/BlockWoodSlab.java new file mode 100644 index 0000000..d730bd8 --- /dev/null +++ b/thaumicbees_src/thaumicbees/block/BlockWoodSlab.java @@ -0,0 +1,63 @@ +package thaumicbees.block; + +import java.util.List; +import java.util.Random; + +import thaumicbees.item.types.PlankType; +import thaumicbees.main.CommonProxy; +import thaumicbees.main.Config; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.block.BlockHalfSlab; +import net.minecraft.block.material.Material; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.ItemStack; + +public class BlockWoodSlab extends BlockHalfSlab +{ + + public BlockWoodSlab(int id, boolean doubleSlab) + { + super(id, doubleSlab, Material.wood); + this.setHardness(2.5f); + this.setResistance(6.0f); + this.setBlockName("tb.slab.wood"); + this.setCreativeTab(CreativeTabs.tabBlock); + this.setTextureFile(CommonProxy.TCBEES_ITEMS_IMAGE); + this.setLightOpacity(doubleSlab ? 255 : 0); + Block.setBurnProperties(id, 5, 20); + } + + @Override + public int getBlockTextureFromSideAndMetadata(int side, int meta) + { + return PlankType.getType(meta & 7).textureIdx; + } + + public int idDropped(int id, Random rand, int par3) + { + return Config.slabWoodHalf.blockID; + } + + protected ItemStack createStackedBlock(int meta) + { + return new ItemStack(Config.slabWoodHalf.blockID, 2, meta & 7); + } + + @Override + public String getFullSlabName(int meta) + { + return this.getBlockName() + "." + PlankType.getType(meta).name; + } + + @SideOnly(Side.CLIENT) + @Override + public void getSubBlocks(int id, CreativeTabs tab, List itemsList) + { + for (PlankType type : PlankType.values()) + { + itemsList.add(new ItemStack(this, 1, type.ordinal())); + } + } +} diff --git a/thaumicbees_src/thaumicbees/item/types/PlankType.java b/thaumicbees_src/thaumicbees/item/types/PlankType.java new file mode 100644 index 0000000..3a99904 --- /dev/null +++ b/thaumicbees_src/thaumicbees/item/types/PlankType.java @@ -0,0 +1,45 @@ +package thaumicbees.item.types; + +public enum PlankType +{ + GREATWOOD("greatwood", 48), + SILVERWOOD("silverwood", 49), + ; + + public String name; + public int textureIdx; + private static String[] nameList; + + private PlankType(String n, int idx) + { + this.name = n; + this.textureIdx = idx; + } + + public static PlankType getType(int meta) + { + PlankType type = null; + + if (meta >= 0 && meta <= values().length) + { + type = values()[meta]; + } + + return type; + } + + public static String[] getAllNames() + { + return (nameList == null) ? nameList = generateNames() : nameList; + } + + private static String[] generateNames() + { + String[] names = new String[values().length]; + for (int i = 0; i < names.length; ++i) + { + names[i] = values()[i].name; + } + return names; + } +} diff --git a/thaumicbees_src/thaumicbees/item/types/PollenType.java b/thaumicbees_src/thaumicbees/item/types/PollenType.java index 3873bdb..453b8a4 100644 --- a/thaumicbees_src/thaumicbees/item/types/PollenType.java +++ b/thaumicbees_src/thaumicbees/item/types/PollenType.java @@ -5,7 +5,8 @@ import cpw.mods.fml.common.registry.LanguageRegistry; public enum PollenType { - UNUSUAL("unusual", 0xA03059, 0xD8417B), + UNUSUAL("unusual", 0xA03059, 0xD8417B), + PHASED("phased", 0x456BA5, 0x4974B4), ; private PollenType(String pName, int colourA, int colourB) diff --git a/thaumicbees_src/thaumicbees/main/Config.java b/thaumicbees_src/thaumicbees/main/Config.java index ac7bc5d..8b9f048 100644 --- a/thaumicbees_src/thaumicbees/main/Config.java +++ b/thaumicbees_src/thaumicbees/main/Config.java @@ -3,9 +3,8 @@ package thaumicbees.main; import java.io.File; import thaumicbees.block.BlockMagicApiary; -import thaumicbees.compat.CompatabilityManager; -import thaumicbees.compat.ForestryHelper; -import thaumicbees.compat.ThaumcraftHelper; +import thaumicbees.block.BlockPlanks; +import thaumicbees.block.BlockWoodSlab; import thaumicbees.item.ItemCapsule; import thaumicbees.item.ItemComb; import thaumicbees.item.ItemDrop; @@ -17,8 +16,12 @@ import thaumicbees.item.ItemSolidFlux; import thaumicbees.item.ItemWax; import thaumicbees.item.types.CapsuleType; import thaumicbees.item.types.HiveFrameType; +import thaumicbees.item.types.PlankType; +import thaumicbees.main.utils.CompatabilityManager; import thaumicbees.main.utils.LocalizationManager; 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; @@ -26,8 +29,11 @@ import cpw.mods.fml.common.registry.LanguageRegistry; import forestry.api.storage.BackpackManager; import forestry.api.storage.EnumBackpackType; import net.minecraft.block.Block; +import net.minecraft.block.BlockLog; import net.minecraft.item.Item; import net.minecraft.item.ItemFood; +import net.minecraft.item.ItemMultiTextureTile; +import net.minecraft.item.ItemSlab; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraftforge.common.Configuration; @@ -47,7 +53,9 @@ public class Config public boolean AddThaumcraftItemsToBackpacks; public String ThaumaturgeExtraItems; - + public static BlockPlanks planksWood; + public static BlockWoodSlab slabWoodHalf; + public static BlockWoodSlab slabWoodFull; public static BlockMagicApiary magicApiary; public static ItemComb combs; @@ -122,6 +130,29 @@ public class Config int blockIdBase = 1750; + planksWood = new BlockPlanks(tbConfig.getBlock("planksTC", blockIdBase++).getInt()); + + Item item = new ItemMultiTextureTile(planksWood.blockID - 256, planksWood, PlankType.getAllNames()) + .setItemName(planksWood.getBlockName()).setTextureFile(CommonProxy.TCBEES_ITEMS_IMAGE); + Item.itemsList[planksWood.blockID] = item; + + OreDictionary.registerOre("plankWood", new ItemStack(planksWood, 1, -1)); + + slabWoodFull = new BlockWoodSlab(tbConfig.getBlock("slabFull", blockIdBase++).getInt(), true); + slabWoodHalf = new BlockWoodSlab(tbConfig.getBlock("slabHalf", blockIdBase++).getInt(), false); + + item = new ItemSlab(slabWoodHalf.blockID - 256, slabWoodHalf, slabWoodFull, false) + .setItemName(slabWoodHalf.getBlockName()).setTextureFile(CommonProxy.TCBEES_ITEMS_IMAGE); + Item.itemsList[slabWoodHalf.blockID] = item; + item = new ItemSlab(slabWoodFull.blockID - 256, slabWoodHalf, slabWoodFull, true) + .setItemName(slabWoodFull.getBlockName()).setTextureFile(CommonProxy.TCBEES_ITEMS_IMAGE); + Item.itemsList[slabWoodFull.blockID] = item; + + OreDictionary.registerOre("slabWood", new ItemStack(slabWoodHalf, 1, -1)); + + + blockIdBase++; // Stair + /*magicApiary = new BlockMagicApiary(tbConfig.getBlock("magicApiary", blockIdBase).getInt()); GameRegistry.registerBlock(magicApiary, "Magic Apiary");*/ } diff --git a/thaumicbees_src/thaumicbees/main/ThaumicBees.java b/thaumicbees_src/thaumicbees/main/ThaumicBees.java index ca9a188..79573ab 100644 --- a/thaumicbees_src/thaumicbees/main/ThaumicBees.java +++ b/thaumicbees_src/thaumicbees/main/ThaumicBees.java @@ -3,7 +3,7 @@ package thaumicbees.main; import net.minecraftforge.common.Configuration; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.ForgeSubscribe; -import thaumicbees.compat.CompatabilityManager; +import thaumicbees.main.utils.CompatabilityManager; import thaumicbees.main.utils.CraftingManager; import thaumicbees.main.utils.LocalizationManager; import thaumicbees.main.utils.VersionInfo; diff --git a/thaumicbees_src/thaumicbees/compat/CompatabilityManager.java b/thaumicbees_src/thaumicbees/main/utils/CompatabilityManager.java similarity index 96% rename from thaumicbees_src/thaumicbees/compat/CompatabilityManager.java rename to thaumicbees_src/thaumicbees/main/utils/CompatabilityManager.java index ae47659..280fef6 100644 --- a/thaumicbees_src/thaumicbees/compat/CompatabilityManager.java +++ b/thaumicbees_src/thaumicbees/main/utils/CompatabilityManager.java @@ -1,4 +1,4 @@ -package thaumicbees.compat; +package thaumicbees.main.utils; import java.io.File; import java.lang.reflect.Field; @@ -25,6 +25,15 @@ import thaumicbees.main.CommonProxy; import thaumicbees.main.Config; import thaumicbees.main.ThaumicBees; 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; @@ -117,6 +126,9 @@ public class CompatabilityManager ObjectTags tags; ItemStack itemStack; + tags = new ObjectTags().add(EnumTag.WOOD, 2); + ThaumcraftApi.registerObjectTag(Config.planksWood.blockID, -1, tags); + tags = new ObjectTags().add(EnumTag.MAGIC, 2); ThaumcraftApi.registerObjectTag(Config.wax.itemID, WaxType.MAGIC.ordinal(), tags); @@ -125,8 +137,10 @@ public class CompatabilityManager tags = new ObjectTags().add(EnumTag.KNOWLEDGE, 1); ThaumcraftApi.registerObjectTag(Config.drops.itemID, DropType.INTELLECT.ordinal(), tags); - tags = new ObjectTags().add(EnumTag.ELDRITCH, 1); + tags = new ObjectTags().add(EnumTag.ELDRITCH, 2); ThaumcraftApi.registerObjectTag(Config.pollen.itemID, PollenType.UNUSUAL.ordinal(), tags); + tags = new ObjectTags().add(EnumTag.TIME, 2); + ThaumcraftApi.registerObjectTag(Config.pollen.itemID, PollenType.PHASED.ordinal(), tags); tags = new ObjectTags().add(EnumTag.CONTROL, 1); ThaumcraftApi.registerObjectTag(Config.propolis.itemID, -1, tags); diff --git a/thaumicbees_src/thaumicbees/main/utils/CraftingManager.java b/thaumicbees_src/thaumicbees/main/utils/CraftingManager.java index 67489b8..e5be449 100644 --- a/thaumicbees_src/thaumicbees/main/utils/CraftingManager.java +++ b/thaumicbees_src/thaumicbees/main/utils/CraftingManager.java @@ -6,17 +6,18 @@ import thaumcraft.api.ThaumcraftApi; import thaumicbees.bees.Allele; import thaumicbees.bees.BeeGenomeManager; import thaumicbees.bees.BeeSpecies; -import thaumicbees.compat.ShapelessBeeInfusionCraftingRecipe; -import thaumicbees.compat.ThaumcraftHelper; import thaumicbees.item.ItemCapsule; import thaumicbees.item.types.CombType; import thaumicbees.item.types.DropType; import thaumicbees.item.types.HiveFrameType; import thaumicbees.item.types.LiquidType; +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.utils.compat.ShapelessBeeInfusionCraftingRecipe; +import thaumicbees.utils.compat.ThaumcraftHelper; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.apiculture.BeeManager; import forestry.api.apiculture.EnumBeeChromosome; @@ -37,10 +38,22 @@ public class CraftingManager { public static void setupCrafting() { - ItemStack inputStack; // Variable to hold forestry items + ItemStack input; + ItemStack output; + + // Slabs + for (int i = 0; i < PlankType.values().length; ++i) + { + input = new ItemStack(Config.planksWood, 1, i); + output = new ItemStack(Config.slabWoodHalf, 6, i); + GameRegistry.addRecipe(output, new Object[] { + "PPP", + 'P', input + }); + } // Essentia bottles - ItemStack output = new ItemStack(Config.tcEssentiaBottle); + output = new ItemStack(Config.tcEssentiaBottle); output.stackSize = 8; GameRegistry.addRecipe(output, new Object[] { " C ", "GPG", "PGP", @@ -79,17 +92,17 @@ public class CraftingManager }); // Concentrated Fertilizer -> Forestry fertilizer - inputStack = Config.miscResources.getStackForType(ResourceType.EXTENDED_FERTILIZER); + input = Config.miscResources.getStackForType(ResourceType.EXTENDED_FERTILIZER); output = ItemInterface.getItem("fertilizerCompound"); output.stackSize = 6; GameRegistry.addRecipe(output, new Object[] { " S ", " F ", " S ", - 'F', inputStack, + 'F', input, 'S', Block.sand }); GameRegistry.addRecipe(output, new Object[] { " ", "SFS", " ", - 'F', inputStack, + 'F', input, 'S', Block.sand }); @@ -97,7 +110,7 @@ public class CraftingManager output.stackSize = 12; GameRegistry.addRecipe(output, new Object[] { "aaa", "aFa", "aaa", - 'F', inputStack, + 'F', input, 'a', ItemInterface.getItem("ash") }); @@ -152,7 +165,7 @@ public class CraftingManager new int[] { 100, 50, 65 }); RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.INTELLECT), new ItemStack[] { Config.wax.getStackForType(WaxType.MAGIC), ItemInterface.getItem("honeydew"), Config.drops.getStackForType(DropType.INTELLECT) }, - new int[] { 90, 40, 2 }); + new int[] { 90, 40, 10 }); RecipeManagers.centrifugeManager.addRecipe(20, Config.combs.getStackForType(CombType.SKULKING), new ItemStack[] {ItemInterface.getItem("beeswax"), ItemInterface.getItem("propolis"), ItemInterface.getItem("honeydew") }, new int[] { 90, 20, 35 }); @@ -185,13 +198,13 @@ public class CraftingManager new ItemStack(Config.tcShard, 1, ThaumcraftHelper.ShardType.WATER.ordinal()), 18); // Carpenter recipes - inputStack = ItemInterface.getItem("craftingMaterial"); - inputStack.setItemDamage(3); // Set to Silk Mesh + input = ItemInterface.getItem("craftingMaterial"); + input.setItemDamage(3); // Set to Silk Mesh output = new ItemStack(Config.thaumaturgeBackpackT2); RecipeManagers.carpenterManager.addRecipe(200, new LiquidStack(Block.waterStill.blockID, 1000), null, output, new Object[] { "WXW", "WTW", "WWW", 'X', Item.diamond, - 'W', inputStack, + 'W', input, 'T', new ItemStack(Config.thaumaturgeBackpackT1) }); @@ -205,12 +218,12 @@ public class CraftingManager output = BlockInterface.getBlock("candle"); output.stackSize = 6; - inputStack = ItemInterface.getItem("craftingMaterial"); - inputStack.setItemDamage(2); // Set to Silk Wisp + input = ItemInterface.getItem("craftingMaterial"); + input.setItemDamage(2); // Set to Silk Wisp RecipeManagers.carpenterManager.addRecipe(30, new LiquidStack(Block.waterStill, 600), null, output, new Object[] { "WSW", 'W', Config.wax, - 'S', inputStack + 'S', input }); output = Config.miscResources.getStackForType(ResourceType.AROMATIC_LUMP, 2); @@ -227,6 +240,19 @@ public class CraftingManager 'J', ItemInterface.getItem("royalJelly"), 'D', Config.drops.getStackForType(DropType.ENCHANTED) }); + + output = new ItemStack(Config.planksWood, 6, 0); + RecipeManagers.carpenterManager.addRecipe(8, new LiquidStack(Block.waterStill, 500), null, output, new Object[] { + "B", + 'B', new ItemStack(Config.tcLog, 1, 0) + }); + + output = new ItemStack(Config.planksWood, 8, 1); + RecipeManagers.carpenterManager.addRecipe(8, new LiquidStack(Block.waterStill, 500), null, output, new Object[] { + "B", + 'B', new ItemStack(Config.tcLog, 1, 1) + }); + // Make Aromatic Lumps a swarmer inducer. Chance is /1000. BeeManager.inducers.put(output, 80); diff --git a/thaumicbees_src/thaumicbees/compat/ForestryHelper.java b/thaumicbees_src/thaumicbees/utils/compat/ForestryHelper.java similarity index 97% rename from thaumicbees_src/thaumicbees/compat/ForestryHelper.java rename to thaumicbees_src/thaumicbees/utils/compat/ForestryHelper.java index 16003f0..9a5ea86 100644 --- a/thaumicbees_src/thaumicbees/compat/ForestryHelper.java +++ b/thaumicbees_src/thaumicbees/utils/compat/ForestryHelper.java @@ -1,4 +1,4 @@ -package thaumicbees.compat; +package thaumicbees.utils.compat; import net.minecraft.item.Item; import forestry.api.core.ItemInterface; diff --git a/thaumicbees_src/thaumicbees/compat/ShapelessBeeInfusionCraftingRecipe.java b/thaumicbees_src/thaumicbees/utils/compat/ShapelessBeeInfusionCraftingRecipe.java similarity index 99% rename from thaumicbees_src/thaumicbees/compat/ShapelessBeeInfusionCraftingRecipe.java rename to thaumicbees_src/thaumicbees/utils/compat/ShapelessBeeInfusionCraftingRecipe.java index b5c98b9..84942a2 100644 --- a/thaumicbees_src/thaumicbees/compat/ShapelessBeeInfusionCraftingRecipe.java +++ b/thaumicbees_src/thaumicbees/utils/compat/ShapelessBeeInfusionCraftingRecipe.java @@ -1,4 +1,4 @@ -package thaumicbees.compat; +package thaumicbees.utils.compat; import java.util.ArrayList; import java.util.Arrays; diff --git a/thaumicbees_src/thaumicbees/compat/ThaumcraftHelper.java b/thaumicbees_src/thaumicbees/utils/compat/ThaumcraftHelper.java similarity index 98% rename from thaumicbees_src/thaumicbees/compat/ThaumcraftHelper.java rename to thaumicbees_src/thaumicbees/utils/compat/ThaumcraftHelper.java index f95564e..e88af5c 100644 --- a/thaumicbees_src/thaumicbees/compat/ThaumcraftHelper.java +++ b/thaumicbees_src/thaumicbees/utils/compat/ThaumcraftHelper.java @@ -1,4 +1,4 @@ -package thaumicbees.compat; +package thaumicbees.utils.compat; import net.minecraft.block.Block; import net.minecraft.item.Item;