mirror of
https://github.com/GTNewHorizons/MagicBees.git
synced 2026-11-21 04:32:34 +00:00
Merge branch '1.4.7_ForestryUpdate'
Conflicts: thaumicbees_src/thaumicbees/bees/Allele.java
This commit is contained in:
commit
f3ceac50cd
11 files changed
+57
-80
No files matched your search
+10
-19
@@ -1,23 +1,22 @@
|
||||
<project name="ThaumicBees" basedir="../../" default="main">
|
||||
<project name="ThaumicBees" basedir="../../../" default="main">
|
||||
<property name="build.dir" value="build" />
|
||||
<property name="classes.dir" value="${build.dir}/classes" />
|
||||
<property name="resource.dir" value="${build.dir}/mc.devel" />
|
||||
<property name="resource.dir" value="${build.dir}/mc.dev" />
|
||||
<property name="jar.dir" value="${build.dir}/jar" />
|
||||
|
||||
<property name="src.dir" value="ThaumicBees" />
|
||||
<property name="lang.dir" value="ThaumicBees/thaumicbees_res/lang" />
|
||||
<property name="src.dir" value="Sources/ThaumicBees" />
|
||||
<property name="lang.dir" value="Sources/ThaumicBees/thaumicbees_res/lang" />
|
||||
|
||||
<property name="forge.dir" value="${build.dir}/forge" />
|
||||
<property name="mcp.dir" value="${forge.dir}/mcp" />
|
||||
<property name="forestry.dir" value="Forestry/forestry_common/core" />
|
||||
<property name="thaumcraft.dir" value="Thaumcraft" />
|
||||
<property name="extrabiomes.dir" value="ExtraBiomes" />
|
||||
<property name="forestry.dir" value="Sources/Forestry/forestry_common/core" />
|
||||
<property name="thaumcraft.dir" value="Sources/Thaumcraft" />
|
||||
|
||||
<property name="clientsrc.dir" value="${mcp.dir}/src/minecraft" />
|
||||
|
||||
<property name="mc.version" value="1.5.1"/>
|
||||
<property name="forge.version" value="7.7.1.661"/>
|
||||
<property name="thaumicbees.version" value="1.4.7"/>
|
||||
<property name="mc.version" value="1.5.2"/>
|
||||
<property name="forge.version" value="7.8.0.700"/>
|
||||
<property name="thaumicbees.version" value="1.4.7a"/>
|
||||
|
||||
<!-- for local deployment only, not used by main -->
|
||||
<property name="deploy.type" value="previews" />
|
||||
@@ -28,7 +27,6 @@
|
||||
|
||||
<!-- TARGETS -->
|
||||
<target name="clean">
|
||||
<delete dir="${clientsrc.dir}/extrabiomes" />
|
||||
<delete dir="${clientsrc.dir}/forestry" />
|
||||
<delete dir="${clientsrc.dir}/thaumcraft" />
|
||||
<delete dir="${clientsrc.dir}/thaumicbees" />
|
||||
@@ -64,9 +62,6 @@
|
||||
<!-- Copy source -->
|
||||
<echo message="Copying Source" />
|
||||
<copy todir="${clientsrc.dir}">
|
||||
<fileset dir="${extrabiomes.dir}">
|
||||
<include name="**/api/**" />
|
||||
</fileset>
|
||||
<fileset dir="${forestry.dir}">
|
||||
<include name="forestry/api/**" />
|
||||
</fileset>
|
||||
@@ -122,10 +117,6 @@
|
||||
|
||||
<include name="**/thaumicbees/**" />
|
||||
<include name="**/net/mysteriousages/**" />
|
||||
|
||||
<!--<include name="**/thaumcraft/api/IVisRepairable.class" />
|
||||
<include name="**/thaumcraft/api/EnumTag.class" />
|
||||
<include name="**/thaumcraft/api/ObjectTags.class" /> -->
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
@@ -142,7 +133,7 @@
|
||||
<include name="**/mcmod.info" />
|
||||
</fileset>
|
||||
<filterset>
|
||||
<filter token="MODVERSION" value="${thaumicbees.version} - ${build.number}" />
|
||||
<filter token="MODVERSION" value="${thaumicbees.version}" />
|
||||
</filterset>
|
||||
</copy>
|
||||
</target>
|
||||
|
||||
@@ -1,3 +1,7 @@
|
||||
1.4.7a
|
||||
Update for Forestry Beta.
|
||||
|
||||
1.4.7
|
||||
Added the Bee Collector's Jar.
|
||||
Created an alternate recipe for the Temporal Frame that is always active.
|
||||
Adjusted TC3 alternate recipe for the Temporal Frame.
|
||||
|
||||
@@ -4,11 +4,11 @@ import net.minecraft.potion.Potion;
|
||||
import thaumicbees.main.utils.compat.ArsMagicaHelper;
|
||||
import thaumicbees.main.utils.compat.ThaumcraftHelper;
|
||||
import forestry.api.apiculture.IAlleleBeeSpecies;
|
||||
import forestry.api.apiculture.IAlleleFlowers;
|
||||
import forestry.api.apiculture.IBeeRoot;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import forestry.api.genetics.IAlleleEffect;
|
||||
import forestry.api.genetics.IAlleleFlowers;
|
||||
|
||||
public class Allele implements IAllele
|
||||
{
|
||||
|
||||
@@ -55,18 +55,6 @@ public abstract class AlleleEffect extends Allele implements IAlleleBeeEffect
|
||||
genome.getPrimary().getIconColour(0), area[0], area[1], area[2]);
|
||||
return storedData;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getIconTextureFile()
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getIconIndex()
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
protected List<Entity> getEntitiesWithinRange(IBeeGenome genome, IBeeHousing housing)
|
||||
{
|
||||
|
||||
@@ -61,17 +61,4 @@ public class AlleleEffectPotion extends AlleleEffect
|
||||
|
||||
return storedData;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getIconTextureFile()
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getIconIndex()
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
package thaumicbees.bees;
|
||||
|
||||
import forestry.api.apiculture.IAlleleFlowers;
|
||||
import forestry.api.apiculture.IFlowerProvider;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.IAlleleFlowers;
|
||||
import forestry.api.genetics.IFlowerProvider;
|
||||
|
||||
public class AlleleFlower extends Allele implements IAlleleFlowers
|
||||
{
|
||||
|
||||
@@ -24,10 +24,12 @@ import thaumicbees.main.utils.compat.ThaumcraftHelper;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import forestry.api.apiculture.BeeManager;
|
||||
import forestry.api.apiculture.EnumBeeChromosome;
|
||||
import forestry.api.apiculture.EnumBeeType;
|
||||
import forestry.api.apiculture.IAlleleBeeSpecies;
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
import forestry.api.apiculture.IBeeHousing;
|
||||
import forestry.api.apiculture.IBeeRoot;
|
||||
import forestry.api.core.EnumHumidity;
|
||||
import forestry.api.core.EnumTemperature;
|
||||
import forestry.api.core.IIconProvider;
|
||||
@@ -692,6 +694,18 @@ public enum BeeSpecies implements IAlleleBeeSpecies, IIconProvider
|
||||
return this.dominant;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IBeeRoot getRoot()
|
||||
{
|
||||
return Allele.beeRoot;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isNocturnal()
|
||||
{
|
||||
return this.genomeTemplate[EnumBeeChromosome.NOCTURNAL.ordinal()].equals(Allele.getBaseAllele("boolTrue"));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isJubilant(IBeeGenome genome, IBeeHousing housing)
|
||||
{
|
||||
|
||||
@@ -1,13 +1,12 @@
|
||||
package thaumicbees.bees;
|
||||
|
||||
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;
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
import forestry.api.apiculture.IFlowerProvider;
|
||||
import thaumicbees.main.Config;
|
||||
import thaumicbees.main.utils.LocalizationManager;
|
||||
import forestry.api.genetics.IFlowerProvider;
|
||||
import forestry.api.genetics.IIndividual;
|
||||
import forestry.api.genetics.IPollinatable;
|
||||
|
||||
public class FlowerProviderArsMagicaFlower implements IFlowerProvider
|
||||
@@ -15,7 +14,7 @@ public class FlowerProviderArsMagicaFlower implements IFlowerProvider
|
||||
private ItemStack[] flowers = {new ItemStack(Config.amBlackOrchid), new ItemStack(Config.amDesertNova) };
|
||||
|
||||
@Override
|
||||
public boolean isAcceptedFlower(World world, IBeeGenome genome, int x, int y, int z)
|
||||
public boolean isAcceptedFlower(World world, IIndividual genome, int x, int y, int z)
|
||||
{
|
||||
boolean flag = false;
|
||||
int id = world.getBlockId(x, y, z);
|
||||
@@ -27,7 +26,7 @@ public class FlowerProviderArsMagicaFlower implements IFlowerProvider
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean growFlower(World world, IBeeGenome genome, int x, int y, int z)
|
||||
public boolean growFlower(World world, IIndividual genome, int x, int y, int z)
|
||||
{
|
||||
boolean flag = false;
|
||||
int blockDown = world.getBlockId(x, y - 1, z);
|
||||
@@ -54,7 +53,7 @@ public class FlowerProviderArsMagicaFlower implements IFlowerProvider
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack[] affectProducts(World world, IBeeGenome genome, int x, int y, int z, ItemStack[] products)
|
||||
public ItemStack[] affectProducts(World world, IIndividual genome, int x, int y, int z, ItemStack[] products)
|
||||
{
|
||||
return products;
|
||||
}
|
||||
|
||||
@@ -1,14 +1,12 @@
|
||||
package thaumicbees.bees;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import thaumcraft.api.ThaumcraftApi;
|
||||
import thaumcraft.api.aura.AuraNode;
|
||||
import thaumicbees.main.Config;
|
||||
import thaumicbees.main.utils.LocalizationManager;
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
import forestry.api.apiculture.IFlowerProvider;
|
||||
import forestry.api.genetics.IFlowerProvider;
|
||||
import forestry.api.genetics.IIndividual;
|
||||
import forestry.api.genetics.IPollinatable;
|
||||
|
||||
public class FlowerProviderAuraNode implements IFlowerProvider
|
||||
@@ -16,7 +14,7 @@ public class FlowerProviderAuraNode implements IFlowerProvider
|
||||
protected int nodeRange = 70;
|
||||
|
||||
@Override
|
||||
public boolean isAcceptedFlower(World world, IBeeGenome genome, int x, int y, int z)
|
||||
public boolean isAcceptedFlower(World world, IIndividual genome, int x, int y, int z)
|
||||
{
|
||||
return this.isNodeWithinRange(world, x, y, z);
|
||||
}
|
||||
@@ -28,7 +26,7 @@ public class FlowerProviderAuraNode implements IFlowerProvider
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean growFlower(World world, IBeeGenome genome, int x, int y, int z)
|
||||
public boolean growFlower(World world, IIndividual genome, int x, int y, int z)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
@@ -40,7 +38,7 @@ public class FlowerProviderAuraNode implements IFlowerProvider
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack[] affectProducts(World world, IBeeGenome genome, int x, int y, int z, ItemStack[] products)
|
||||
public ItemStack[] affectProducts(World world, IIndividual genome, int x, int y, int z, ItemStack[] products)
|
||||
{
|
||||
return products;
|
||||
}
|
||||
|
||||
@@ -2,20 +2,20 @@ package thaumicbees.bees;
|
||||
|
||||
import java.util.EnumSet;
|
||||
|
||||
import thaumicbees.main.utils.LocalizationManager;
|
||||
import cpw.mods.fml.common.registry.LanguageRegistry;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.EnumPlantType;
|
||||
import thaumicbees.main.utils.LocalizationManager;
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
import forestry.api.apiculture.IFlowerProvider;
|
||||
import forestry.api.genetics.IFlowerProvider;
|
||||
import forestry.api.genetics.IIndividual;
|
||||
import forestry.api.genetics.IPollinatable;
|
||||
|
||||
public class FlowerProviderBookshelf implements IFlowerProvider
|
||||
{
|
||||
|
||||
public boolean isAcceptedFlower(World world, IBeeGenome genome, int x, int i, int j)
|
||||
public boolean isAcceptedFlower(World world, IIndividual genome, int x, int i, int j)
|
||||
{
|
||||
boolean flag = false;
|
||||
if (world.getBlockId(x, i, j) == Block.bookShelf.blockID)
|
||||
@@ -25,14 +25,14 @@ public class FlowerProviderBookshelf implements IFlowerProvider
|
||||
return flag;
|
||||
}
|
||||
|
||||
public boolean growFlower(World world, IBeeGenome genome, int x, int i, int j)
|
||||
public boolean growFlower(World world, IIndividual genome, int x, int i, int j)
|
||||
{
|
||||
// Always return true so the system thinks we grew a flower.
|
||||
// Bees can't grow bookshelves! Are you crazy?!
|
||||
return true;
|
||||
}
|
||||
|
||||
public ItemStack[] affectProducts(World world, IBeeGenome genome, int x, int i, int j, ItemStack products[])
|
||||
public ItemStack[] affectProducts(World world, IIndividual genome, int x, int i, int j, ItemStack products[])
|
||||
{
|
||||
return products;
|
||||
}
|
||||
|
||||
@@ -1,17 +1,13 @@
|
||||
package thaumicbees.bees;
|
||||
|
||||
import java.util.EnumSet;
|
||||
|
||||
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;
|
||||
import net.minecraftforge.common.EnumPlantType;
|
||||
import forestry.api.apiculture.IBeeGenome;
|
||||
import forestry.api.apiculture.IFlowerProvider;
|
||||
import thaumicbees.main.Config;
|
||||
import thaumicbees.main.utils.LocalizationManager;
|
||||
import thaumicbees.main.utils.compat.ThaumcraftHelper;
|
||||
import forestry.api.genetics.IFlowerProvider;
|
||||
import forestry.api.genetics.IIndividual;
|
||||
import forestry.api.genetics.IPollinatable;
|
||||
|
||||
public class FlowerProviderThaumcraftFlower implements IFlowerProvider
|
||||
@@ -19,7 +15,7 @@ public class FlowerProviderThaumcraftFlower implements IFlowerProvider
|
||||
private ItemStack[] flowers = {new ItemStack(Config.tcPlant, 1, 2), new ItemStack(Config.tcPlant, 1, 3) };
|
||||
|
||||
@Override
|
||||
public boolean isAcceptedFlower(World world, IBeeGenome genome, int x, int y, int z)
|
||||
public boolean isAcceptedFlower(World world, IIndividual genome, int x, int y, int z)
|
||||
{
|
||||
boolean flag = false;
|
||||
if (world.getBlockId(x, y, z) == Config.tcPlant.blockID)
|
||||
@@ -34,7 +30,7 @@ public class FlowerProviderThaumcraftFlower implements IFlowerProvider
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean growFlower(World world, IBeeGenome genome, int x, int y, int z)
|
||||
public boolean growFlower(World world, IIndividual genome, int x, int y, int z)
|
||||
{
|
||||
boolean flag = false;
|
||||
int blockDown = world.getBlockId(x, y - 1, z);
|
||||
@@ -61,7 +57,7 @@ public class FlowerProviderThaumcraftFlower implements IFlowerProvider
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack[] affectProducts(World world, IBeeGenome genome, int x, int y, int z, ItemStack[] products)
|
||||
public ItemStack[] affectProducts(World world, IIndividual genome, int x, int y, int z, ItemStack[] products)
|
||||
{
|
||||
return products;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user