More tweaking
This commit is contained in:
parent
d38944800d
commit
c1fd267fbd
|
@ -86,7 +86,7 @@ public class BlockBOPSapling extends BlockSapling
|
||||||
switch (meta)
|
switch (meta)
|
||||||
{
|
{
|
||||||
case 7: // Loftwood
|
case 7: // Loftwood
|
||||||
return id == Blocks.holyGrass.get().blockID || id == Block.grass.blockID;
|
return id == Blocks.holyGrass.get().blockID || id == Blocks.holyDirt.get().blockID;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID || blocksList[id].canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, this);
|
return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID || blocksList[id].canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, this);
|
||||||
|
@ -98,7 +98,7 @@ public class BlockBOPSapling extends BlockSapling
|
||||||
protected boolean canThisPlantGrowOnThisBlockID(int blockID, int metadata)
|
protected boolean canThisPlantGrowOnThisBlockID(int blockID, int metadata)
|
||||||
{
|
{
|
||||||
if (metadata == 7) //Loftwood
|
if (metadata == 7) //Loftwood
|
||||||
return blockID == Blocks.holyGrass.get().blockID || blockID == Block.grass.blockID;
|
return blockID == Blocks.holyGrass.get().blockID || blockID == Blocks.holyDirt.get().blockID;
|
||||||
else
|
else
|
||||||
return blockID == Block.grass.blockID || blockID == Block.dirt.blockID || blockID == Block.tilledField.blockID;
|
return blockID == Block.grass.blockID || blockID == Block.dirt.blockID || blockID == Block.tilledField.blockID;
|
||||||
}
|
}
|
||||||
|
|
|
@ -62,7 +62,7 @@ public class BOPAchievements
|
||||||
achHoney = (new Achievement(3089, "bop.achHoney", -1, 2, new ItemStack(Items.food.get(), 1, 9), achFlower)).registerAchievement();
|
achHoney = (new Achievement(3089, "bop.achHoney", -1, 2, new ItemStack(Items.food.get(), 1, 9), achFlower)).registerAchievement();
|
||||||
achWitherWart = (new Achievement(3090, "bop.achWitherWart", 1, 3, new ItemStack(Blocks.plants.get(), 1, 13), achHoney)).registerAchievement();
|
achWitherWart = (new Achievement(3090, "bop.achWitherWart", 1, 3, new ItemStack(Blocks.plants.get(), 1, 13), achHoney)).registerAchievement();
|
||||||
achGrave = (new Achievement(3091, "bop.achGrave", -2, 4, new ItemStack(Blocks.grave.get(), 1, 0), achWitherWart)).registerAchievement();
|
achGrave = (new Achievement(3091, "bop.achGrave", -2, 4, new ItemStack(Blocks.grave.get(), 1, 0), achWitherWart)).registerAchievement();
|
||||||
achPhantom = (new Achievement(3092, "bop.achPhantom", 0, 6, new ItemStack(Items.miscItems.get(), 1, 16), achGrave)).registerAchievement().setSpecial();
|
achPhantom = (new Achievement(3092, "bop.achPhantom", 0, 6, new ItemStack(Items.miscItems.get(), 1, 10), achGrave)).registerAchievement().setSpecial();
|
||||||
|
|
||||||
achPromised = (new Achievement(3093, "bop.achPromised", 1, -3, new ItemStack(Blocks.holyGrass.get(), 1, 0), achFlower)).registerAchievement().setSpecial();
|
achPromised = (new Achievement(3093, "bop.achPromised", 1, -3, new ItemStack(Blocks.holyGrass.get(), 1, 0), achFlower)).registerAchievement().setSpecial();
|
||||||
achCelestial = (new Achievement(3094, "bop.achCelestial", -1, -4, new ItemStack(Items.miscItems.get(), 1, 4), achPromised)).registerAchievement();
|
achCelestial = (new Achievement(3094, "bop.achCelestial", -1, -4, new ItemStack(Items.miscItems.get(), 1, 4), achPromised)).registerAchievement();
|
||||||
|
|
|
@ -3,8 +3,8 @@ package biomesoplenty.handlers;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.entity.item.EntityItem;
|
import net.minecraft.entity.item.EntityItem;
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
import net.minecraft.entity.player.EntityPlayer;
|
||||||
|
import net.minecraft.stats.AchievementList;
|
||||||
import biomesoplenty.api.Blocks;
|
import biomesoplenty.api.Blocks;
|
||||||
import biomesoplenty.api.Fluids;
|
|
||||||
import biomesoplenty.api.Items;
|
import biomesoplenty.api.Items;
|
||||||
import biomesoplenty.configuration.BOPAchievements;
|
import biomesoplenty.configuration.BOPAchievements;
|
||||||
import cpw.mods.fml.common.IPickupNotifier;
|
import cpw.mods.fml.common.IPickupNotifier;
|
||||||
|
@ -15,6 +15,12 @@ public class BOPPickupHandler implements IPickupNotifier
|
||||||
@Override
|
@Override
|
||||||
public void notifyPickup(EntityItem item, EntityPlayer player)
|
public void notifyPickup(EntityItem item, EntityPlayer player)
|
||||||
{
|
{
|
||||||
|
//Getting Wood (Vanilla
|
||||||
|
if (item.getEntityItem().itemID == Blocks.logs1.get().blockID || item.getEntityItem().itemID == Blocks.logs2.get().blockID || item.getEntityItem().itemID == Blocks.logs3.get().blockID || item.getEntityItem().itemID == Blocks.logs4.get().blockID)
|
||||||
|
{
|
||||||
|
player.addStat(AchievementList.mineWood, 1);
|
||||||
|
}
|
||||||
|
|
||||||
//Flower Child
|
//Flower Child
|
||||||
if (item.getEntityItem().itemID == Blocks.flowers.get().blockID || item.getEntityItem().itemID == Blocks.flowers2.get().blockID || item.getEntityItem().itemID == Block.plantRed.blockID || item.getEntityItem().itemID == Block.plantYellow.blockID)
|
if (item.getEntityItem().itemID == Blocks.flowers.get().blockID || item.getEntityItem().itemID == Blocks.flowers2.get().blockID || item.getEntityItem().itemID == Block.plantRed.blockID || item.getEntityItem().itemID == Block.plantYellow.blockID)
|
||||||
{
|
{
|
||||||
|
|
|
@ -70,7 +70,7 @@ public class WorldGenPromisedTree extends WorldGenerator
|
||||||
{
|
{
|
||||||
var11 = par1World.getBlockId(par3, par4 - 1, par5);
|
var11 = par1World.getBlockId(par3, par4 - 1, par5);
|
||||||
|
|
||||||
if ((var11 == Blocks.holyGrass.get().blockID) && par4 < 256 - var6 - 1)
|
if ((var11 == Blocks.holyGrass.get().blockID || var11 == Blocks.holyDirt.get().blockID) && par4 < 256 - var6 - 1)
|
||||||
{
|
{
|
||||||
this.setBlockAndMetadata(par1World, par3, par4 - 1, par5, Blocks.holyDirt.get().blockID, 0);
|
this.setBlockAndMetadata(par1World, par3, par4 - 1, par5, Blocks.holyDirt.get().blockID, 0);
|
||||||
var21 = par2Random.nextInt(2);
|
var21 = par2Random.nextInt(2);
|
||||||
|
|
|
@ -68,7 +68,7 @@ public class WorldGenPromisedTree2 extends WorldGenerator
|
||||||
{
|
{
|
||||||
var8 = par1World.getBlockId(par3, par4 - 1, par5);
|
var8 = par1World.getBlockId(par3, par4 - 1, par5);
|
||||||
|
|
||||||
if ((var8 == Blocks.holyGrass.get().blockID) && par4 < 256 - var6 - 1)
|
if ((var8 == Blocks.holyGrass.get().blockID || var8 == Blocks.holyDirt.get().blockID) && par4 < 256 - var6 - 1)
|
||||||
{
|
{
|
||||||
this.setBlockAndMetadata(par1World, par3, par4 - 1, par5, Blocks.holyDirt.get().blockID, 0);
|
this.setBlockAndMetadata(par1World, par3, par4 - 1, par5, Blocks.holyDirt.get().blockID, 0);
|
||||||
int var16;
|
int var16;
|
||||||
|
|
|
@ -74,13 +74,13 @@ public class WorldGenPromisedTree3 extends WorldGenerator
|
||||||
var13 = var1.getBlockId(var3, var4 - 1, var5 - 1);
|
var13 = var1.getBlockId(var3, var4 - 1, var5 - 1);
|
||||||
var14 = var1.getBlockId(var3 - 1, var4 - 1, var5 - 1);
|
var14 = var1.getBlockId(var3 - 1, var4 - 1, var5 - 1);
|
||||||
|
|
||||||
if ((var11 == Blocks.holyGrass.get().blockID) && var4 < 256 - var6 - 1)
|
if ((var11 == Blocks.holyGrass.get().blockID || var11 == Blocks.holyDirt.get().blockID) && var4 < 256 - var6 - 1)
|
||||||
{
|
{
|
||||||
if ((var24 == Blocks.holyGrass.get().blockID) && var4 < 256 - var6 - 1)
|
if ((var24 == Blocks.holyGrass.get().blockID || var24 == Blocks.holyDirt.get().blockID) && var4 < 256 - var6 - 1)
|
||||||
{
|
{
|
||||||
if ((var13 == Blocks.holyGrass.get().blockID) && var4 < 256 - var6 - 1)
|
if ((var13 == Blocks.holyGrass.get().blockID || var13 == Blocks.holyDirt.get().blockID) && var4 < 256 - var6 - 1)
|
||||||
{
|
{
|
||||||
if ((var14 == Blocks.holyGrass.get().blockID) && var4 < 256 - var6 - 1)
|
if ((var14 == Blocks.holyGrass.get().blockID | var14 == Blocks.holyDirt.get().blockID) && var4 < 256 - var6 - 1)
|
||||||
{
|
{
|
||||||
var1.setBlock(var3, var4 - 1, var5, Blocks.holyDirt.get().blockID, 0, 2);
|
var1.setBlock(var3, var4 - 1, var5, Blocks.holyDirt.get().blockID, 0, 2);
|
||||||
var1.setBlock(var3 - 1, var4 - 1, var5, Blocks.holyDirt.get().blockID, 0, 2);
|
var1.setBlock(var3 - 1, var4 - 1, var5, Blocks.holyDirt.get().blockID, 0, 2);
|
||||||
|
|
Loading…
Reference in New Issue