diff --git a/thaumicbees_res/build.number b/thaumicbees_res/build.number index 9e8551f..bc60f6b 100644 --- a/thaumicbees_res/build.number +++ b/thaumicbees_res/build.number @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Sat Dec 29 17:49:37 PST 2012 -build.number=23 +#Sat Dec 29 20:28:23 PST 2012 +build.number=34 diff --git a/thaumicbees_res/build.xml b/thaumicbees_res/build.xml index 9a4d8ff..4938a05 100644 --- a/thaumicbees_res/build.xml +++ b/thaumicbees_res/build.xml @@ -9,7 +9,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -80,13 +80,14 @@ - + + diff --git a/thaumicbees_src/thaumicbees/bees/FlowerProviderBookshelf.java b/thaumicbees_src/thaumicbees/bees/FlowerProviderBookshelf.java index 73ba588..3734104 100644 --- a/thaumicbees_src/thaumicbees/bees/FlowerProviderBookshelf.java +++ b/thaumicbees_src/thaumicbees/bees/FlowerProviderBookshelf.java @@ -37,7 +37,7 @@ public class FlowerProviderBookshelf implements IFlowerProvider return new ItemStack[] { new ItemStack(Block.bookShelf) }; } - @Override + //@Override public boolean isAcceptedPollinatable(World world, IPollinatable pollinatable) { // No idea what this is supposed to do. diff --git a/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java b/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java index 2ed8021..f759033 100644 --- a/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java +++ b/thaumicbees_src/thaumicbees/bees/FlowerProviderThaumcraftFlower.java @@ -27,12 +27,6 @@ public class FlowerProviderThaumcraftFlower implements IFlowerProvider return flag; } - @Override - public boolean isAcceptedPollinatable(World world, IPollinatable pollinatable) - { - return false; - } - @Override public boolean growFlower(World world, IBeeGenome genome, int x, int y, int z) { @@ -66,4 +60,10 @@ public class FlowerProviderThaumcraftFlower implements IFlowerProvider return this.flowers; } + //@Override + public boolean isAcceptedPollinatable(World world, IPollinatable pollinatable) + { + return false; + } + } diff --git a/thaumicbees_src/thaumicbees/bees/genetics/Allele.java b/thaumicbees_src/thaumicbees/bees/genetics/Allele.java index a965867..499243d 100644 --- a/thaumicbees_src/thaumicbees/bees/genetics/Allele.java +++ b/thaumicbees_src/thaumicbees/bees/genetics/Allele.java @@ -38,7 +38,7 @@ public class Allele implements IAllele public static IAllele getBaseAllele(String name) { - return AlleleManager.alleleRegistry.getAllele("forestry." + name); + return AlleleManager.getAllele(name); } public Allele(String id, boolean isDominant) diff --git a/thaumicbees_src/thaumicbees/bees/genetics/BeeMutation.java b/thaumicbees_src/thaumicbees/bees/genetics/BeeMutation.java index 4478673..ed55468 100644 --- a/thaumicbees_src/thaumicbees/bees/genetics/BeeMutation.java +++ b/thaumicbees_src/thaumicbees/bees/genetics/BeeMutation.java @@ -36,7 +36,7 @@ public class BeeMutation implements IBeeMutation baseChance = percentChance; isSecret = hide; - BeeManager.breedingManager.registerBeeMutation(this); + BeeManager.beeMutations.add(this); } public int getChance(IBeeHousing housing, IAllele allele0, IAllele allele1, IGenome genome0, IGenome genome1) diff --git a/thaumicbees_src/thaumicbees/item/ItemManager.java b/thaumicbees_src/thaumicbees/item/ItemManager.java index 0d68f25..7f1adc0 100644 --- a/thaumicbees_src/thaumicbees/item/ItemManager.java +++ b/thaumicbees_src/thaumicbees/item/ItemManager.java @@ -54,10 +54,12 @@ public class ItemManager output.stackSize = 8; GameRegistry.addRecipe(output, new Object[] { - " C ", "G G", " G ", - Character.valueOf('G'), ItemManager.wax, - Character.valueOf('C'), Item.clay + " C ", "GPG", "PGP", + 'G', ItemManager.wax, + 'C', Item.clay, + 'P', Block.thinGlass }); + output = ItemManager.essentiaBottle.copy(); output.stackSize = 4; GameRegistry.addRecipe(output, new Object[] { diff --git a/thaumicbees_src/thaumicbees/main/ClientProxy.java b/thaumicbees_src/thaumicbees/main/ClientProxy.java index 67dd0c1..f505e54 100644 --- a/thaumicbees_src/thaumicbees/main/ClientProxy.java +++ b/thaumicbees_src/thaumicbees/main/ClientProxy.java @@ -5,8 +5,6 @@ import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import forestry.apiculture.render.EntityBeeFX; -import forestry.core.proxy.Proxies; @SideOnly(Side.CLIENT) public class ClientProxy extends CommonProxy diff --git a/thaumicbees_src/thaumicbees/main/CommonProxy.java b/thaumicbees_src/thaumicbees/main/CommonProxy.java index 2a66cf9..49d6d31 100644 --- a/thaumicbees_src/thaumicbees/main/CommonProxy.java +++ b/thaumicbees_src/thaumicbees/main/CommonProxy.java @@ -6,14 +6,14 @@ import net.minecraft.world.World; public class CommonProxy { - public static String TCBEES_GFX = "/gfx/thaumicbees/"; - public static String TCBEES_RESEARCH = "/research/thaumicbees/"; - public static String TCBEES_ITEMS = TCBEES_GFX + "items/"; + public static final String TCBEES_GFX = "/gfx/thaumicbees/"; + public static final String TCBEES_RESEARCH = "/research/thaumicbees/"; + public static final String TCBEES_ITEMS = TCBEES_GFX + "items/"; public static String FORESTRY_GFX_ITEMS; public static String FORESTRY_GFX_BEEEFFECTS; - public static String TCBEES_ITEMSPNG = TCBEES_ITEMS + "items.png"; + public static final String TCBEES_ITEMSPNG = TCBEES_ITEMS + "items.png"; public CommonProxy() { } diff --git a/thaumicbees_src/thaumicbees/main/ThaumicBees.java b/thaumicbees_src/thaumicbees/main/ThaumicBees.java index 6d2f688..d9f9b1c 100644 --- a/thaumicbees_src/thaumicbees/main/ThaumicBees.java +++ b/thaumicbees_src/thaumicbees/main/ThaumicBees.java @@ -28,9 +28,9 @@ import thaumicbees.item.ItemManager; @Mod( modid="ThaumicBees", useMetadata=true, - acceptedMinecraftVersions="1.4.6", - version="@VERSION@-@BUILD_NUMBER@", - dependencies="required-after:Forestry@[1.6.4.2,);required-after:Thaumcraft@[3.0.1c,)" + acceptedMinecraftVersions=VersionInfo.MCVersion, + version=VersionInfo.Version, + dependencies=VersionInfo.Depends ) public class ThaumicBees { diff --git a/thaumicbees_src/thaumicbees/main/VersionInfo.java b/thaumicbees_src/thaumicbees/main/VersionInfo.java new file mode 100644 index 0000000..7f19859 --- /dev/null +++ b/thaumicbees_src/thaumicbees/main/VersionInfo.java @@ -0,0 +1,12 @@ +package thaumicbees.main; + +public class VersionInfo +{ + + public static final String Version = "@VERSION@"; + public static final String MCVersion = "@MCVERSION@"; + public static final String Build = "@BUILD_NUMBER@"; + + public static final String Depends = "required-after:Forestry@[1.6.4.2,);required-after:Thaumcraft@[3.0.1c,)"; + +}