Commit for release of 0.9.0-33

This commit is contained in:
MysteriousAges committed 2012-12-29 20:37:15 -08:00
1 parent 15ffbadac1
commit c9a1681245
11 files changed
+39 -26

No files matched your search

+2 -2
View File
@@ -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
+4 -3
View File
@@ -9,7 +9,7 @@
<property name="forge.dir" value="${build.dir}/forge" />
<property name="mcp.dir" value="${forge.dir}/mcp" />
<property name="forestry.dir" value="Forestry" />
<property name="forestry.dir" value="ForestryApi-1.6.4" />
<property name="thaumcraft.dir" value="Thaumcraft" />
<property name="extrabiomes.dir" value="ExtraBiomes" />
@@ -65,7 +65,7 @@
<fileset dir="${extrabiomes.dir}">
<include name="**/api/**" />
</fileset>
<fileset dir="${forestry.dir}/forestry_common/core/">
<fileset dir="${forestry.dir}">
<include name="forestry/api/**" />
</fileset>
<fileset dir="${thaumcraft.dir}/">
@@ -80,13 +80,14 @@
<copy todir="${clientsrc.dir}" overwrite="true" failonerror="true">
<fileset dir="${src.dir}/thaumicbees_src">
<include name="**/Version.java" />
<include name="**/VersionInfo.java" />
</fileset>
<filterset>
<filter token="MCVERSION" value="${mc.version}" />
<filter token="VERSION" value="${thaumicbees.version}" />
<filter token="BUILD_NUMBER" value="${build.number}" />
<filter token="FINGERPRINT" value="${key.fingerprint}" />
<filter token="MODVERSION" value="${VERSION}-${BUILD_NUMBER}" />
</filterset>
</copy>
@@ -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.
@@ -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;
}
}
@@ -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)
@@ -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)
@@ -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[]
{
@@ -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
@@ -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() { }
@@ -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
{
@@ -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,)";
}