etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ted80/BiomesOPlenty

This commit is contained in:
Matt Caughey 2013-05-04 20:06:44 -04:00
parent 16eb2a2ea6 0057913fdd
commit 32a2940081
6 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/minecraft/biomesoplenty/blocks/BlockAsh.java
View File

@ -1,5 +1,7 @@
package biomesoplenty.blocks;
import static net.minecraftforge.common.ForgeDirection.UP;
import java.util.Random;
import net.minecraft.block.Block;
@ -8,7 +10,10 @@ import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World;
import net.minecraft.world.WorldProviderEnd;
import net.minecraftforge.common.ForgeDirection;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.Blocks;
import biomesoplenty.api.Items;
public class BlockAsh extends Block
@ -48,6 +53,14 @@ public class BlockAsh extends Block
}
}
@Override
public boolean isFireSource(World world, int x, int y, int z, int metadata, ForgeDirection side)
{
if (blockID == Blocks.ash.get().blockID && side == UP)
return true;
return false;
}
/**
* Triggered whenever an entity collides with this block (enters into the block). Args: world, x, y, z, entity
*/

13
src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java
View File

@ -191,8 +191,8 @@ public class BlockBOPPlant extends BlockFlower implements IShearable
public int getDamageValue(World world, int x, int y, int z)
{
int meta = world.getBlockMetadata(x, y, z);
if (meta == CATTAILTOP)
meta = CATTAILBOTTOM;
if (meta == CATTAILTOP || meta == CATTAILBOTTOM)
meta = 7;
return meta;
}
@ -243,7 +243,10 @@ public class BlockBOPPlant extends BlockFlower implements IShearable
@Override
public boolean isShearable(ItemStack item, World world, int x, int y, int z)
{
return true;
if (world.getBlockMetadata(x, y, z) == 7 || world.getBlockMetadata(x, y, z) == 8 || world.getBlockMetadata(x, y, z) == 9)
return false;
else
return true;
}
@Override
@ -251,9 +254,7 @@ public class BlockBOPPlant extends BlockFlower implements IShearable
{
ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
if (world.getBlockMetadata(x, y, z) != 8 && world.getBlockMetadata(x, y, z) != 9)
ret.add(new ItemStack(this, 1, world.getBlockMetadata(x, y, z)));
ret.add(new ItemStack(this, 1, world.getBlockMetadata(x, y, z)));
return ret;
}

3
src/minecraft/biomesoplenty/blocks/BlockWillow.java
View File

@ -233,9 +233,10 @@ public class BlockWillow extends Block implements IShearable
/**
* Returns the color this block should be rendered. Used by leaves.
*/
@Override
public int getRenderColor(int par1)
{
return ColorizerFoliage.getFoliageColorBirch();
return ColorizerFoliage.getFoliageColorBasic();
}
/**

8
src/minecraft/biomesoplenty/integration/ForestryIntegration.java
View File

@ -97,6 +97,7 @@ public class ForestryIntegration
EnumTemperature.normalBiomeIds.add(BOPConfiguration.quagmireID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.swampwoodsID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.wetlandID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.fenID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.bayouID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.bogID);
@ -111,6 +112,7 @@ public class ForestryIntegration
EnumHumidity.dampBiomeIds.add(BOPConfiguration.quagmireID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.swampwoodsID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.wetlandID);
EnumHumidity.dampBiomeIds.add(BOPConfiguration.fenID);
//Normal
EnumTemperature.normalBiomeIds.add(BOPConfiguration.birchForestID);
@ -138,6 +140,7 @@ public class ForestryIntegration
EnumTemperature.normalBiomeIds.add(BOPConfiguration.shoreID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.spruceWoodsID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.temperateRainforestID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.heathlandID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.birchForestID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.borealForestID);
@ -164,11 +167,10 @@ public class ForestryIntegration
EnumHumidity.normalBiomeIds.add(BOPConfiguration.shoreID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.spruceWoodsID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.temperateRainforestID);
EnumHumidity.normalBiomeIds.add(BOPConfiguration.heathlandID);
//Normal - Arid
EnumTemperature.normalBiomeIds.add(BOPConfiguration.cragID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.fenID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.heathlandID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.jadeCliffsID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.mountainID);
EnumTemperature.normalBiomeIds.add(BOPConfiguration.outbackID);
@ -176,8 +178,6 @@ public class ForestryIntegration
EnumTemperature.normalBiomeIds.add(BOPConfiguration.thicketID);
EnumHumidity.aridBiomeIds.add(BOPConfiguration.cragID);
EnumHumidity.aridBiomeIds.add(BOPConfiguration.fenID);
EnumHumidity.aridBiomeIds.add(BOPConfiguration.heathlandID);
EnumHumidity.aridBiomeIds.add(BOPConfiguration.jadeCliffsID);
EnumHumidity.aridBiomeIds.add(BOPConfiguration.mountainID);
EnumHumidity.aridBiomeIds.add(BOPConfiguration.outbackID);

4
src/minecraft/forestry/api/apiculture/IBeeModifier.java
View File

@ -26,14 +26,14 @@ public interface IBeeModifier {
/**
* @param genome
* @param mate
* @return Fload modifying the production speed of queens.
* @return Float modifying the production speed of queens.
*/
float getProductionModifier(IBeeGenome genome, float currentModifier);
/**
* @param genome
* @param mate
* @return Fload modifying the flowering of queens.
* @return Float modifying the flowering of queens.
*/
float getFloweringModifier(IBeeGenome genome, float currentModifier);

4
src/minecraft/forestry/api/recipes/IBottlerManager.java
View File

@ -17,7 +17,8 @@ import net.minecraftforge.liquids.LiquidStack;
*/
public interface IBottlerManager extends ICraftingProvider {
/**
* Add a recipe to the bottler
* Add a recipe to the bottler.
* The bottler will populate its recipe list dynamically from the LiquidContainerRegistry. Recipes added explicitely will take precedence.
*
* @param cyclesPerUnit
* Amount of work cycles required to run through the conversion once.
@ -30,5 +31,6 @@ public interface IBottlerManager extends ICraftingProvider {
* @param bottled
* ItemStack representing the finished product
*/
@Deprecated
public void addRecipe(int cyclesPerUnit, LiquidStack input, ItemStack can, ItemStack bottled);
}