This commit is contained in:
Adubbz 2013-09-20 16:34:22 +10:00
commit 5ca033f33c
77 changed files with 4944 additions and 2870 deletions

View File

@ -1,5 +1,3 @@
[![Build Status](https://drone.io/github.com/Glitchfiend/BiomesOPlenty/status.png)](https://drone.io/github.com/Glitchfiend/BiomesOPlenty/latest)
## Authors
- **Adubbz** - "Madman" - General, Technical, Mod Compatibility

View File

@ -51,6 +51,7 @@ public class Biomes
public static Optional<? extends BiomeGenBase> hotSprings = Optional.absent();
public static Optional<? extends BiomeGenBase> icyHills = Optional.absent();
public static Optional<? extends BiomeGenBase> jadeCliffs = Optional.absent();
public static Optional<? extends BiomeGenBase> lavenderFields = Optional.absent();
public static Optional<? extends BiomeGenBase> lushDesert = Optional.absent();
public static Optional<? extends BiomeGenBase> lushSwamp = Optional.absent();
public static Optional<? extends BiomeGenBase> mangrove = Optional.absent();
@ -113,7 +114,10 @@ public class Biomes
public static Optional<? extends BiomeGenBase> timber = Optional.absent();
public static Optional<? extends BiomeGenBase> timberThin = Optional.absent();
public static Optional<? extends BiomeGenBase> tropicalRainforest = Optional.absent();
public static Optional<? extends BiomeGenBase> tropics = Optional.absent();
public static Optional<? extends BiomeGenBase> tropicsMountain = Optional.absent();
public static Optional<? extends BiomeGenBase> tundra = Optional.absent();
public static Optional<? extends BiomeGenBase> volcano = Optional.absent();
public static Optional<? extends BiomeGenBase> wasteland = Optional.absent();

View File

@ -178,9 +178,16 @@ public class BlockReferences {
anenome (Blocks.flowers, 9),
lilyflower (Blocks.flowers, 10),
rainbowflower (Blocks.flowers, 11),
aloe (Blocks.flowers, 12),
bromeliad (Blocks.flowers, 12),
sunflower (Blocks.flowers, 13),
dandelion (Blocks.flowers, 15),
hibiscus (Blocks.flowers2, 0),
lilyofthevalley (Blocks.flowers2, 1),
burningblossom (Blocks.flowers2, 2),
lavender (Blocks.flowers2, 3),
goldenrod (Blocks.flowers2, 4),
bluebells (Blocks.flowers2, 5),
;
public Optional<? extends Block> block;

View File

@ -64,6 +64,7 @@ public class Blocks
// Plants
public static Optional<? extends Block> flowers = Optional.absent();
public static Optional<? extends Block> flowers2 = Optional.absent();
public static Optional<? extends Block> mushrooms = Optional.absent();
public static Optional<? extends Block> coral = Optional.absent();
public static Optional<? extends Block> leaves1 = Optional.absent();

View File

@ -219,6 +219,12 @@ public class BiomeDecoratorBOP extends BiomeDecorator
public WorldGenerator graveGen;
public WorldGenerator pumpkinAltGen;
public WorldGenerator coralGen;
public WorldGenerator hibiscusGen;
public WorldGenerator lilyOfTheValleyGen;
public WorldGenerator burningBlossomGen;
public WorldGenerator lavenderGen;
public WorldGenerator goldenrodGen;
public WorldGenerator bluebellGen;
public WorldGenerator boneSpineGen;
public WorldGenerator boneSpine2Gen;
@ -304,6 +310,12 @@ public class BiomeDecoratorBOP extends BiomeDecorator
public int gravesPerChunk;
public int pumpkinsPerChunk;
public int coralPerChunk;
public int hibiscusPerChunk;
public int lilyOfTheValleysPerChunk;
public int burningBlossomsPerChunk;
public int lavenderPerChunk;
public int goldenrodsPerChunk;
public int bluebellsPerChunk;
public int boneSpinesPerChunk;
public int boneSpines2PerChunk;
@ -453,6 +465,12 @@ public class BiomeDecoratorBOP extends BiomeDecorator
tinyCactusGen = new WorldGenBOPFlowers(Blocks.plants.get().blockID, 12);
aloeGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 12);
coralGen = new WorldGenCoral(Blocks.coral.get().blockID, 4);
hibiscusGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 0);
lilyOfTheValleyGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 1);
burningBlossomGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 2);
lavenderGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 3);
goldenrodGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 4);
bluebellGen = new WorldGenBOPFlowers(Blocks.flowers2.get().blockID, 5);
lilyflowerGen = new WorldGenLilyflower();
deathbloomGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 2);
hydrangeaGen = new WorldGenBOPFlowers(Blocks.flowers.get().blockID, 4);
@ -578,6 +596,12 @@ public class BiomeDecoratorBOP extends BiomeDecorator
gravesPerChunk = 0;
pumpkinsPerChunk = 0;
coralPerChunk = 0;
hibiscusPerChunk = 0;
lilyOfTheValleysPerChunk = 0;
burningBlossomsPerChunk = 0;
lavenderPerChunk = 0;
goldenrodsPerChunk = 0;
bluebellsPerChunk = 0;
generateLakes = true;
generateAsh = false;
generateMycelium = false;
@ -1099,6 +1123,54 @@ public class BiomeDecoratorBOP extends BiomeDecorator
plantBlueGen.generate(currentWorld, randomGenerator, var3, var4, var5);
}
for (var2 = 0; var2 < hibiscusPerChunk; ++var2)
{
var3 = chunk_X + randomGenerator.nextInt(16) + 8;
var4 = randomGenerator.nextInt(256);
var5 = chunk_Z + randomGenerator.nextInt(16) + 8;
hibiscusGen.generate(currentWorld, randomGenerator, var3, var4, var5);
}
for (var2 = 0; var2 < lilyOfTheValleysPerChunk; ++var2)
{
var3 = chunk_X + randomGenerator.nextInt(16) + 8;
var4 = randomGenerator.nextInt(256);
var5 = chunk_Z + randomGenerator.nextInt(16) + 8;
lilyOfTheValleyGen.generate(currentWorld, randomGenerator, var3, var4, var5);
}
for (var2 = 0; var2 < burningBlossomsPerChunk; ++var2)
{
var3 = chunk_X + randomGenerator.nextInt(16) + 8;
var4 = randomGenerator.nextInt(256);
var5 = chunk_Z + randomGenerator.nextInt(16) + 8;
burningBlossomGen.generate(currentWorld, randomGenerator, var3, var4, var5);
}
for (var2 = 0; var2 < lavenderPerChunk; ++var2)
{
var3 = chunk_X + randomGenerator.nextInt(16) + 8;
var4 = randomGenerator.nextInt(256);
var5 = chunk_Z + randomGenerator.nextInt(16) + 8;
lavenderGen.generate(currentWorld, randomGenerator, var3, var4, var5);
}
for (var2 = 0; var2 < goldenrodsPerChunk; ++var2)
{
var3 = chunk_X + randomGenerator.nextInt(16) + 8;
var4 = randomGenerator.nextInt(256);
var5 = chunk_Z + randomGenerator.nextInt(16) + 8;
goldenrodGen.generate(currentWorld, randomGenerator, var3, var4, var5);
}
for (var2 = 0; var2 < bluebellsPerChunk; ++var2)
{
var3 = chunk_X + randomGenerator.nextInt(16) + 8;
var4 = randomGenerator.nextInt(256);
var5 = chunk_Z + randomGenerator.nextInt(16) + 8;
bluebellGen.generate(currentWorld, randomGenerator, var3, var4, var5);
}
for (var2 = 0; var2 < hydrangeasPerChunk; ++var2)
{
var3 = chunk_X + randomGenerator.nextInt(16) + 8;

View File

@ -23,6 +23,7 @@ public class BiomeGenBirchForest extends BiomeGenBase
customBiomeDecorator.flowersPerChunk = -999;
customBiomeDecorator.tinyFlowersPerChunk = 6;
customBiomeDecorator.poisonIvyPerChunk = 3;
customBiomeDecorator.lilyOfTheValleysPerChunk = 15;
}
/**

View File

@ -0,0 +1,73 @@
package biomesoplenty.biomes;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.entity.passive.EntityHorse;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.SpawnListEntry;
import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks;
import biomesoplenty.worldgen.tree.WorldGenJacaranda;
public class BiomeGenLavenderFields extends BiomeGenBase
{
private BiomeDecoratorBOP customBiomeDecorator;
public BiomeGenLavenderFields(int par1)
{
super(par1);
theBiomeDecorator = new BiomeDecoratorBOP(this);
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 1;
customBiomeDecorator.flowersPerChunk = -999;
customBiomeDecorator.grassPerChunk = 20;
customBiomeDecorator.lavenderPerChunk = 999;
customBiomeDecorator.generatePumpkins = true;
}
/**
* Gets a WorldGen appropriate for this biome.
*/
@Override
public WorldGenerator getRandomWorldGenForTrees(Random par1Random)
{
return par1Random.nextInt(3) == 0 ? this.worldGeneratorBigTree : new WorldGenJacaranda(false);
}
/**
* Provides the basic grass color based on the biome temperature and rainfall
*/
@Override
public int getBiomeGrassColor()
{
return 10601325;
}
@Override
public int getBiomeFoliageColor()
{
return 10601325;
}
@Override
public void decorate(World par1World, Random par2Random, int par3, int par4)
{
super.decorate(par1World, par2Random, par3, par4);
int var5 = 12 + par2Random.nextInt(6);
for (int var6 = 0; var6 < var5; ++var6)
{
int var7 = par3 + par2Random.nextInt(16);
int var8 = par2Random.nextInt(28) + 4;
int var9 = par4 + par2Random.nextInt(16);
int var10 = par1World.getBlockId(var7, var8, var9);
if (var10 == Block.stone.blockID)
{
par1World.setBlock(var7, var8, var9, Blocks.amethystOre.get().blockID, 4, 2);
}
}
}
}

View File

@ -31,7 +31,6 @@ public class BiomeGenLushDesert extends BiomeGenBase
customBiomeDecorator.deadBushPerChunk = 2;
customBiomeDecorator.purpleFlowersPerChunk = 5;
customBiomeDecorator.desertGrassPerChunk = 10;
customBiomeDecorator.desertCactiPerChunk = 10;
customBiomeDecorator.cactiPerChunk = 20;
customBiomeDecorator.tinyCactiPerChunk = 5;
customBiomeDecorator.waterLakesPerChunk = 5;

View File

@ -27,6 +27,7 @@ public class BiomeGenOutback extends BiomeGenBase
customBiomeDecorator.outbackPerChunk = 10;
customBiomeDecorator.deadBushPerChunk = 7;
customBiomeDecorator.tinyCactiPerChunk = 2;
customBiomeDecorator.cactiPerChunk = 4;
customBiomeDecorator.bushesPerChunk = 5;
customBiomeDecorator.generatePumpkins = false;
}

View File

@ -23,7 +23,8 @@ public class BiomeGenPrairie extends BiomeGenBase
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 1;
customBiomeDecorator.grassPerChunk = 999;
customBiomeDecorator.whiteFlowersPerChunk = 45;
customBiomeDecorator.whiteFlowersPerChunk = 20;
customBiomeDecorator.goldenrodsPerChunk = 40;
customBiomeDecorator.portobellosPerChunk = 2;
customBiomeDecorator.berryBushesPerChunk = 2;
customBiomeDecorator.carrotsPerChunk = 1;

View File

@ -28,6 +28,7 @@ public class BiomeGenSpruceWoods extends BiomeGenBase
customBiomeDecorator.poisonIvyPerChunk = 1;
customBiomeDecorator.berryBushesPerChunk = 3;
customBiomeDecorator.carrotsPerChunk = 1;
customBiomeDecorator.bluebellsPerChunk = 100;
}
/**

View File

@ -24,7 +24,7 @@ public class BiomeGenTropics extends BiomeGenBase
super(par1);
theBiomeDecorator = new BiomeDecoratorBOP(this);
customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
customBiomeDecorator.treesPerChunk = 8;
customBiomeDecorator.treesPerChunk = 4;
customBiomeDecorator.grassPerChunk = 7;
customBiomeDecorator.flowersPerChunk = 10;
customBiomeDecorator.sandPerChunk = 50;
@ -32,6 +32,7 @@ public class BiomeGenTropics extends BiomeGenBase
customBiomeDecorator.orangeFlowersPerChunk = 10;
customBiomeDecorator.whiteFlowersPerChunk = 4;
customBiomeDecorator.sunflowersPerChunk = 2;
customBiomeDecorator.hibiscusPerChunk = 45;
customBiomeDecorator.generatePumpkins = false;
spawnableMonsterList.add(new SpawnListEntry(EntityJungleSpider.class, 12, 6, 6));
spawnableCreatureList.clear();

View File

@ -20,6 +20,7 @@ public class BiomeGenNetherBase extends BiomeGenBase
topBlock = (byte)Block.netherrack.blockID;
fillerBlock = (byte)Block.netherrack.blockID;
customBiomeDecorator.gravesPerChunk = 1;
customBiomeDecorator.burningBlossomsPerChunk = 1;
spawnableMonsterList.clear();
spawnableCreatureList.clear();
spawnableWaterCreatureList.clear();

View File

@ -32,6 +32,7 @@ public class BiomeGenNetherGarden extends BiomeGenBase
customBiomeDecorator.glowshroomsPerChunk = 3;
customBiomeDecorator.toadstoolsPerChunk = 5;
customBiomeDecorator.gravesPerChunk = 1;
customBiomeDecorator.burningBlossomsPerChunk = 8;
spawnableMonsterList.clear();
spawnableCreatureList.clear();
spawnableWaterCreatureList.clear();

View File

@ -30,6 +30,7 @@ public class BiomeGenNetherLava extends BiomeGenBase
customBiomeDecorator.netherLavaPerChunk = 20;
customBiomeDecorator.smolderingGrassPerChunk = 2;
customBiomeDecorator.gravesPerChunk = 1;
customBiomeDecorator.burningBlossomsPerChunk = 4;
customBiomeDecorator.generateAsh = true;
spawnableMonsterList.clear();
spawnableCreatureList.clear();

View File

@ -10,6 +10,8 @@ import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
@ -24,7 +26,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockBOPFlower extends BlockFlower
{
private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "aloe", "sunflowerbottom", "sunflowertop", "dandelion"};
private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "bromeliad", "sunflowerbottom", "sunflowertop", "dandelion"};
private Icon[] textures;
private static final int SUNFLOWERTOP = 14;
@ -285,6 +287,38 @@ public class BlockBOPFlower extends BlockFlower
}
}
@Override
public void harvestBlock(World world, EntityPlayer player, int x, int y, int z, int meta)
{
super.harvestBlock(world, player, x, y, z, meta);
ItemStack equippedItem = player.getCurrentEquippedItem();
if (equippedItem != null)
{
if (equippedItem.itemID != Item.shears.itemID)
{
if (meta == 2)
{
if (!world.isRemote)
{
player.addPotionEffect(new PotionEffect(Potion.wither.id, 300));
}
}
}
}
else
{
if (meta == 2)
{
if (!world.isRemote)
{
player.addPotionEffect(new PotionEffect(Potion.wither.id, 300));
}
}
}
}
@Override
public boolean isBlockReplaceable(World world, int x, int y, int z)
{

View File

@ -0,0 +1,243 @@
package biomesoplenty.blocks;
import java.util.List;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.BlockFlower;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.Blocks;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockBOPFlower2 extends BlockFlower
{
private static final String[] plants2 = new String[] {"hibiscus", "lilyofthevalley", "burningblossom", "lavender", "goldenrod", "bluebells"};
private Icon[] textures;
protected BlockBOPFlower2(int blockID, Material material)
{
super(blockID, material);
this.setTickRandomly(true);
float var4 = 0.2F;
this.setBlockBounds(0.5F - var4, 0.0F, 0.5F - var4, 0.5F + var4, var4 * 3.0F, 0.5F + var4);
this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
}
public BlockBOPFlower2(int blockID)
{
this(blockID, Material.plants);
}
@Override
public void registerIcons(IconRegister iconRegister)
{
textures = new Icon[plants2.length];
for (int i = 0; i < plants2.length; ++i) {
textures[i] = iconRegister.registerIcon("biomesoplenty:" + plants2[i]);
}
}
@Override
public Icon getIcon(int side, int meta)
{
if (meta < 0 || meta >= textures.length) {
meta = 0;
}
return textures[meta];
}
@Override
public int getRenderType()
{
return 1;
}
@Override
public int getLightValue(IBlockAccess world, int x, int y, int z)
{
int meta = world.getBlockMetadata(x, y, z);
if (meta == 2)
return 9;
else
return 0;
}
@Override
public void setBlockBoundsBasedOnState(IBlockAccess world, int par2, int par3, int par4)
{
int meta = world.getBlockMetadata(par2, par3, par4);
switch (meta)
{
default:
this.setBlockBounds(0.1F, 0.0F, 0.1F, 0.9F, 0.8F, 0.9F);
break;
}
}
@Override
public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity)
{
if (world.getBlockMetadata(x, y, z) == 2) {
entity.setFire(1);
}
}
@Override
public void harvestBlock(World world, EntityPlayer player, int x, int y, int z, int meta)
{
super.harvestBlock(world, player, x, y, z, meta);
ItemStack equippedItem = player.getCurrentEquippedItem();
if (equippedItem != null)
{
if (equippedItem.itemID != Item.shears.itemID)
{
if (meta == 2)
{
player.setFire(5);
}
}
}
else
{
if (meta == 2)
{
player.setFire(5);
}
}
}
/**
* A randomly called display update to be able to add particles or other items for display
*/
@Override
public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random)
{
super.randomDisplayTick(par1World, par2, par3, par4, par5Random);
int meta = par1World.getBlockMetadata(par2, par3, par4);
if (meta == 2)
{
if (par5Random.nextInt(2) == 0)
{
par1World.spawnParticle("smoke", par2 + par5Random.nextFloat(), par3 + par5Random.nextFloat(), par4 + par5Random.nextFloat(), 0.0D, 0.0D, 0.0D);
}
if (par5Random.nextInt(4) == 0)
{
par1World.spawnParticle("flame", par2 + par5Random.nextFloat(), par3 + par5Random.nextFloat(), par4 + par5Random.nextFloat(), 0.0D, 0.0D, 0.0D);
}
}
}
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
for (int i = 0; i < plants2.length; ++i)
{
list.add(new ItemStack(blockID, 1, i));
}
}
@Override
protected boolean canThisPlantGrowOnThisBlockID(int id)
{
return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID || id == Block.netherrack.blockID || id == Blocks.longGrass.get().blockID;
}
protected boolean canThisPlantGrowOnThisBlockID(int id, int metadata)
{
if (metadata == 2) // Burning Blossom
return id == Block.netherrack.blockID;
else
return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID || id == Blocks.longGrass.get().blockID;
}
@Override
public boolean canPlaceBlockOnSide(World world, int x, int y, int z, int side, ItemStack itemStack)
{
int id = world.getBlockId(x, y - 1, z);
int meta = itemStack.getItemDamage();
//boolean sky = world.getFullBlockLightValue(x, y, z) >= 8 || world.canBlockSeeTheSky(x, y, z);
if (itemStack.itemID == blockID) {
switch (meta)
{
case 2: // Burning Blossom
return id == Block.netherrack.blockID;
default:
return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID || id == Blocks.longGrass.get().blockID;
}
} else
return this.canPlaceBlockOnSide(world, x, y, z, side);
}
@Override
public void onNeighborBlockChange(World world, int x, int y, int z, int neighborID)
{
//super.onNeighborBlockChange(world, x, y, z, neighborID);
this.checkFlowerChange(world, x, y, z);
}
@Override
public int getDamageValue(World world, int x, int y, int z)
{
int meta = world.getBlockMetadata(x, y, z);
return meta;
}
@Override
public int damageDropped(int meta)
{
return meta & 15;
}
@Override
public boolean canBlockStay(World world, int x, int y, int z)
{
int meta = world.getBlockMetadata(x, y, z);
if (world.getBlockId(x, y, z) != blockID)
{
if (meta == 2)
return this.canThisPlantGrowOnThisBlockID(world.getBlockId(x, y - 1, z));
else
return (world.getFullBlockLightValue(x, y, z) >= 8 || world.canBlockSeeTheSky(x, y, z)) && this.canThisPlantGrowOnThisBlockID(world.getBlockId(x, y - 1, z));
}
else
{
if (meta == 2)
return this.canThisPlantGrowOnThisBlockID(world.getBlockId(x, y - 1, z), world.getBlockMetadata(x, y, z));
else
return (world.getFullBlockLightValue(x, y, z) >= 8 || world.canBlockSeeTheSky(x, y, z)) && this.canThisPlantGrowOnThisBlockID(world.getBlockId(x, y - 1, z), world.getBlockMetadata(x, y, z));
}
}
@Override
public boolean isBlockReplaceable(World world, int x, int y, int z)
{
//ItemStack itemstack = new ItemStack(Blocks.flowers.get(), 1, 10);
if (world.getBlockMetadata(x, y, z) == 10)
//if (!world.isRemote)
//world.spawnEntityInWorld(new EntityItem(world, x, y, z, itemstack));
return true;
return false;
}
}

View File

@ -12,6 +12,7 @@ import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
@ -348,6 +349,26 @@ public class BlockBOPPlant extends BlockFlower implements IShearable
{
player.addPotionEffect(new PotionEffect(Potion.wither.id, 250, 1));
}
ItemStack equippedItem = player.getCurrentEquippedItem();
if (equippedItem != null)
{
if (equippedItem.itemID != Item.shears.itemID)
{
if (meta == 5)
{
player.attackEntityFrom(DamageSource.cactus, 2);
}
}
}
else
{
if (meta == 5)
{
player.attackEntityFrom(DamageSource.cactus, 2);
}
}
}
@Override

View File

@ -49,6 +49,7 @@ import biomesoplenty.biomes.BiomeGenHighland;
import biomesoplenty.biomes.BiomeGenHotSprings;
import biomesoplenty.biomes.BiomeGenIcyHills;
import biomesoplenty.biomes.BiomeGenJadeCliffs;
import biomesoplenty.biomes.BiomeGenLavenderFields;
import biomesoplenty.biomes.BiomeGenLushDesert;
import biomesoplenty.biomes.BiomeGenLushSwamp;
import biomesoplenty.biomes.BiomeGenMangrove;
@ -206,7 +207,7 @@ public class BOPBiomes {
Biomes.deadlands = Optional.of((new BiomeGenDeadlands(BOPConfigurationIDs.deadlandsID)).setColor(522674).setBiomeName("Deadlands").setDisableRain().func_76733_a(9154376).setMinMaxHeight(0.1F, 0.5F).setTemperatureRainfall(2.0F, 0.05F));
Biomes.deciduousForest = Optional.of((new BiomeGenDeciduousForest(BOPConfigurationIDs.deciduousForestID)).setColor(353825).setBiomeName("Deciduous Forest").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F));
Biomes.dunes = Optional.of((new BiomeGenDunes(BOPConfigurationIDs.dunesID)).setColor(13786898).setBiomeName("Dunes").setDisableRain().setTemperatureRainfall(2.0F, 0.05F).setMinMaxHeight(0.5F, 1.3F));
Biomes.fen = Optional.of((new BiomeGenFen(BOPConfigurationIDs.fenID)).setColor(9286496).setBiomeName("Fen").setTemperatureRainfall(0.4F, 0.05F).setMinMaxHeight(0.2F, 0.4F));
Biomes.fen = Optional.of((new BiomeGenFen(BOPConfigurationIDs.fenID)).setColor(9286496).setBiomeName("Fen").setTemperatureRainfall(0.4F, 0.4F).setMinMaxHeight(0.2F, 0.4F));
Biomes.field = Optional.of((new BiomeGenField(BOPConfigurationIDs.fieldID)).setColor(9286496).setBiomeName("Field").setTemperatureRainfall(0.6F, 0.7F).setMinMaxHeight(0.3F, 0.3F));
Biomes.fieldForest = Optional.of((new BiomeGenFieldForest(BOPConfigurationIDs.fieldForestID)).setColor(9286496).setBiomeName("Forested Field").setTemperatureRainfall(0.6F, 0.7F).setMinMaxHeight(0.3F, 0.3F));
Biomes.frostForest = Optional.of((new BiomeGenFrostForest(BOPConfigurationIDs.frostForestID)).setColor(14090235).setBiomeName("Frost Forest").setEnableSnow().setTemperatureRainfall(0.0F, 0.5F).setMinMaxHeight(0.3F, 0.4F));
@ -220,6 +221,7 @@ public class BOPBiomes {
Biomes.hotSprings = Optional.of((new BiomeGenHotSprings(BOPConfigurationIDs.hotSpringsID)).setColor(10486015).setBiomeName("Hot Springs").setMinMaxHeight(0.2F, 0.5F).setTemperatureRainfall(0.5F, 0.7F));
Biomes.icyHills = Optional.of((new BiomeGenIcyHills(BOPConfigurationIDs.icyHillsID)).setColor(14090235).setBiomeName("Icy Hills").setEnableSnow().setTemperatureRainfall(0.0F, 0.5F).setMinMaxHeight(0.3F, 0.8F));
Biomes.jadeCliffs = Optional.of((new BiomeGenJadeCliffs(BOPConfigurationIDs.jadeCliffsID)).setColor(14090235).setBiomeName("Jade Cliffs").setTemperatureRainfall(0.5F, 0.1F).setMinMaxHeight(0.5F, 1.5F));
Biomes.lavenderFields = Optional.of((new BiomeGenLavenderFields(BOPConfigurationIDs.lavenderFieldsID)).setColor(9286496).setBiomeName("Lavender Fields").setTemperatureRainfall(0.6F, 0.7F).setMinMaxHeight(0.3F, 0.3F));
Biomes.lushDesert = Optional.of((new BiomeGenLushDesert(BOPConfigurationIDs.lushDesertID)).setColor(16421912).setBiomeName("Lush Desert").setTemperatureRainfall(0.8F, 0.2F).setMinMaxHeight(0.2F, 0.9F));
Biomes.lushSwamp = Optional.of((new BiomeGenLushSwamp(BOPConfigurationIDs.lushSwampID)).setColor(522674).setBiomeName("Lush Swamp").func_76733_a(9154376).setMinMaxHeight(0.2F, 0.3F).setTemperatureRainfall(0.7F, 1.0F));
Biomes.mangrove = Optional.of((new BiomeGenMangrove(BOPConfigurationIDs.mangroveID)).setColor(16440917).setBiomeName("Mangrove").setMinMaxHeight(0.1F, 0.3F).setTemperatureRainfall(0.8F, 0.9F));
@ -282,7 +284,10 @@ public class BOPBiomes {
Biomes.timber = Optional.of((new BiomeGenTimber(BOPConfigurationIDs.timberID)).setColor(353825).setBiomeName("Timber").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.3F, 0.4F));
Biomes.timberThin = Optional.of((new BiomeGenTimberThin(BOPConfigurationIDs.timberThinID)).setColor(353825).setBiomeName("Thinned Timber").func_76733_a(5159473).setTemperatureRainfall(0.7F, 0.8F).setMinMaxHeight(0.3F, 0.4F));
Biomes.tropicalRainforest = Optional.of((new BiomeGenTropicalRainforest(BOPConfigurationIDs.tropicalRainforestID)).setColor(9286496).setBiomeName("Tropical Rainforest").setTemperatureRainfall(1.2F, 0.9F).setMinMaxHeight(0.3F, 0.7F));
Biomes.tropics = Optional.of((new BiomeGenTropics(BOPConfigurationIDs.tropicsID)).setColor(9286496).setBiomeName("Tropics").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 1.5F));
Biomes.tropics = Optional.of((new BiomeGenTropics(BOPConfigurationIDs.tropicsID)).setColor(9286496).setBiomeName("Tropics").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.1F, 0.5F));
Biomes.tropicsMountain = Optional.of((new BiomeGenTropics(BOPConfigurationIDs.tropicsMountainID)).setColor(9286496).setBiomeName("Tropics Mountain").setTemperatureRainfall(2.0F, 2.0F).setMinMaxHeight(0.5F, 1.1F));
Biomes.tundra = Optional.of((new BiomeGenTundra(BOPConfigurationIDs.tundraID)).setColor(14090235).setBiomeName("Tundra").setTemperatureRainfall(0.2F, 0.8F).setMinMaxHeight(0.1F, 0.3F));
Biomes.volcano = Optional.of((new BiomeGenVolcano(BOPConfigurationIDs.volcanoID)).setColor(9286496).setBiomeName("Volcano").setDisableRain().setMinMaxHeight(0.6F, 0.9F).setTemperatureRainfall(2.0F, 0.05F));
Biomes.wasteland = Optional.of((new BiomeGenWasteland(BOPConfigurationIDs.wastelandID)).setColor(16421912).setBiomeName("Wasteland").setDisableRain().setTemperatureRainfall(2.0F, 0.05F).setMinMaxHeight(0.3F, 0.4F));
@ -355,6 +360,7 @@ public class BOPBiomes {
BiomeDictionary.registerBiomeType(Biomes.hotSprings.get(), Type.HILLS, Type.FOREST, Type.WATER);
BiomeDictionary.registerBiomeType(Biomes.icyHills.get(), Type.FROZEN, Type.HILLS);
BiomeDictionary.registerBiomeType(Biomes.jadeCliffs.get(), Type.FOREST, Type.MOUNTAIN);
BiomeDictionary.registerBiomeType(Biomes.lavenderFields.get(), Type.PLAINS);
BiomeDictionary.registerBiomeType(Biomes.lushDesert.get(), Type.DESERT, Type.FOREST);
BiomeDictionary.registerBiomeType(Biomes.lushSwamp.get(), Type.SWAMP, Type.WATER);
BiomeDictionary.registerBiomeType(Biomes.mangrove.get(), Type.WATER, Type.FOREST);
@ -426,7 +432,10 @@ public class BOPBiomes {
BiomeDictionary.registerBiomeType(Biomes.timberThin.get(), Type.FOREST);
BiomeDictionary.registerBiomeType(Biomes.tropicalRainforest.get(), Type.JUNGLE);
BiomeDictionary.registerBiomeType(Biomes.tropics.get(), Type.JUNGLE, Type.WATER);
BiomeDictionary.registerBiomeType(Biomes.tropicsMountain.get(), Type.JUNGLE, Type.WATER);
BiomeDictionary.registerBiomeType(Biomes.tundra.get(), Type.FROZEN, Type.WASTELAND);
BiomeDictionary.registerBiomeType(Biomes.volcano.get(), Type.WASTELAND, Type.MOUNTAIN);
BiomeDictionary.registerBiomeType(Biomes.wasteland.get(), Type.WASTELAND);
@ -476,6 +485,7 @@ public class BOPBiomes {
addSpawnBiome(Biomes.heathland);
addSpawnBiome(Biomes.highland);
addSpawnBiome(Biomes.jadeCliffs);
addSpawnBiome(Biomes.lavenderFields);
addSpawnBiome(Biomes.lushDesert);
addSpawnBiome(Biomes.lushSwamp);
addSpawnBiome(Biomes.mangrove);
@ -521,79 +531,40 @@ public class BOPBiomes {
private static void addVillageBiomes()
{
addVillageBiome(Biomes.alps, BOPConfigurationTerrainGen.alpsVillage);
addVillageBiome(Biomes.arctic, BOPConfigurationTerrainGen.arcticVillage);
addVillageBiome(Biomes.autumnHills, BOPConfigurationTerrainGen.autumnHillsVillage);
addVillageBiome(Biomes.badlands, BOPConfigurationTerrainGen.badlandsVillage);
addVillageBiome(Biomes.bambooForest, BOPConfigurationTerrainGen.bambooForestVillage);
addVillageBiome(Biomes.bayou, BOPConfigurationTerrainGen.bayouVillage);
addVillageBiome(Biomes.birchForest, BOPConfigurationTerrainGen.birchForestVillage);
addVillageBiome(Biomes.bog, BOPConfigurationTerrainGen.bogVillage);
addVillageBiome(Biomes.borealForest, BOPConfigurationTerrainGen.borealForestVillage);
addVillageBiome(Biomes.brushland, BOPConfigurationTerrainGen.brushlandVillage);
addVillageBiome(Biomes.canyon, BOPConfigurationTerrainGen.canyonVillage);
addVillageBiome(Biomes.chaparral, BOPConfigurationTerrainGen.chaparralVillage);
addVillageBiome(Biomes.cherryBlossomGrove, BOPConfigurationTerrainGen.cherryBlossomGroveVillage);
addVillageBiome(Biomes.coniferousForest, BOPConfigurationTerrainGen.coniferousForestVillage);
addVillageBiome(Biomes.coniferousForestSnow, BOPConfigurationTerrainGen.coniferousForestSnowVillage);
addVillageBiome(Biomes.deadForest, BOPConfigurationTerrainGen.deadForestVillage);
addVillageBiome(Biomes.deadForestSnow, BOPConfigurationTerrainGen.deadForestSnowVillage);
addVillageBiome(Biomes.deadSwamp, BOPConfigurationTerrainGen.deadSwampVillage);
addVillageBiome(Biomes.deciduousForest, BOPConfigurationTerrainGen.deciduousForestVillage);
addVillageBiome(Biomes.dunes, BOPConfigurationTerrainGen.dunesVillage);
addVillageBiome(Biomes.fen, BOPConfigurationTerrainGen.fenVillage);
addVillageBiome(Biomes.field, BOPConfigurationTerrainGen.fieldVillage);
addVillageBiome(Biomes.frostForest, BOPConfigurationTerrainGen.frostForestVillage);
addVillageBiome(Biomes.glacier, BOPConfigurationTerrainGen.glacierVillage);
addVillageBiome(Biomes.field, BOPConfigurationTerrainGen.fieldVillage);
addVillageBiome(Biomes.grassland, BOPConfigurationTerrainGen.grasslandVillage);
addVillageBiome(Biomes.grove, BOPConfigurationTerrainGen.groveVillage);
addVillageBiome(Biomes.heathland, BOPConfigurationTerrainGen.heathlandVillage);
addVillageBiome(Biomes.highland, BOPConfigurationTerrainGen.highlandVillage);
addVillageBiome(Biomes.hotSprings, BOPConfigurationTerrainGen.hotSpringsVillage);
addVillageBiome(Biomes.jadeCliffs, BOPConfigurationTerrainGen.jadeCliffsVillage);
addVillageBiome(Biomes.lushDesert, BOPConfigurationTerrainGen.lushDesertVillage);
addVillageBiome(Biomes.lushSwamp, BOPConfigurationTerrainGen.lushSwampVillage);
addVillageBiome(Biomes.mangrove, BOPConfigurationTerrainGen.mangroveVillage);
addVillageBiome(Biomes.mapleWoods, BOPConfigurationTerrainGen.mapleWoodsVillage);
addVillageBiome(Biomes.marsh, BOPConfigurationTerrainGen.marshVillage);
addVillageBiome(Biomes.meadow, BOPConfigurationTerrainGen.meadowVillage);
addVillageBiome(Biomes.mesa, BOPConfigurationTerrainGen.mesaVillage);
addVillageBiome(Biomes.moor, BOPConfigurationTerrainGen.moorVillage);
addVillageBiome(Biomes.mountain, BOPConfigurationTerrainGen.mountainVillage);
addVillageBiome(Biomes.oasis, BOPConfigurationTerrainGen.oasisVillage);
addVillageBiome(Biomes.orchard, BOPConfigurationTerrainGen.orchardVillage);
addVillageBiome(Biomes.meadowForest, BOPConfigurationTerrainGen.meadowVillage);
addVillageBiome(Biomes.outback, BOPConfigurationTerrainGen.outbackVillage);
addVillageBiome(Biomes.overgrownGreens, BOPConfigurationTerrainGen.overgrownGreensVillage);
addVillageBiome(Biomes.pasture, BOPConfigurationTerrainGen.pastureVillage);
addVillageBiome(Biomes.polar, BOPConfigurationTerrainGen.polarVillage);
addVillageBiome(Biomes.prairie, BOPConfigurationTerrainGen.prairieVillage);
addVillageBiome(Biomes.quagmire, BOPConfigurationTerrainGen.quagmireVillage);
addVillageBiome(Biomes.rainforest, BOPConfigurationTerrainGen.rainforestVillage);
addVillageBiome(Biomes.redwoodForest, BOPConfigurationTerrainGen.redwoodForestVillage);
addVillageBiome(Biomes.savanna, BOPConfigurationTerrainGen.savannaVillage);
addVillageBiome(Biomes.scrubland, BOPConfigurationTerrainGen.scrublandVillage);
addVillageBiome(Biomes.seasonalForest, BOPConfigurationTerrainGen.seasonalForestVillage);
addVillageBiome(Biomes.shield, BOPConfigurationTerrainGen.shieldVillage);
addVillageBiome(Biomes.shrubland, BOPConfigurationTerrainGen.shrublandVillage);
addVillageBiome(Biomes.sludgepit, BOPConfigurationTerrainGen.sludgepitVillage);
addVillageBiome(Biomes.spruceWoods, BOPConfigurationTerrainGen.spruceWoodsVillage);
addVillageBiome(Biomes.temperateRainforest, BOPConfigurationTerrainGen.temperateRainforestVillage);
addVillageBiome(Biomes.thicket, BOPConfigurationTerrainGen.thicketVillage);
addVillageBiome(Biomes.steppe, BOPConfigurationTerrainGen.steppeVillage);
addVillageBiome(Biomes.timber, BOPConfigurationTerrainGen.timberVillage);
addVillageBiome(Biomes.tropicalRainforest, BOPConfigurationTerrainGen.tropicalRainforestVillage);
addVillageBiome(Biomes.tropics, BOPConfigurationTerrainGen.tropicsVillage);
addVillageBiome(Biomes.tundra, BOPConfigurationTerrainGen.tundraVillage);
addVillageBiome(Biomes.volcano, BOPConfigurationTerrainGen.volcanoVillage);
addVillageBiome(Biomes.wetland, BOPConfigurationTerrainGen.wetlandVillage);
addVillageBiome(Biomes.woodland, BOPConfigurationTerrainGen.woodlandVillage);
addVillageBiome(Biomes.plainsNew, BOPConfigurationTerrainGen.plainsVillage);
addVillageBiome(Biomes.desertNew, BOPConfigurationTerrainGen.desertVillage);
addVillageBiome(Biomes.forestNew, BOPConfigurationTerrainGen.forestVillage);
addVillageBiome(Biomes.extremeHillsNew, BOPConfigurationTerrainGen.extremeHillsVillage);
addVillageBiome(Biomes.taigaNew, BOPConfigurationTerrainGen.taigaVillage);
addVillageBiome(Biomes.swamplandNew, BOPConfigurationTerrainGen.swamplandVillage);
addVillageBiome(Biomes.jungleNew, BOPConfigurationTerrainGen.jungleVillage);
}
private static void addStrongholdBiomes()
@ -633,6 +604,7 @@ public class BOPBiomes {
addStrongholdBiome(Biomes.hotSprings);
addStrongholdBiome(Biomes.icyHills);
addStrongholdBiome(Biomes.jadeCliffs);
addStrongholdBiome(Biomes.lavenderFields);
addStrongholdBiome(Biomes.lushDesert);
addStrongholdBiome(Biomes.lushSwamp);
addStrongholdBiome(Biomes.mangrove);
@ -828,6 +800,10 @@ public class BOPBiomes {
registerBiome(Biomes.jadeCliffs);
}
if (BOPConfigurationBiomeGen.lavenderFieldsGen) {
registerBiome(Biomes.lavenderFields);
}
if (BOPConfigurationBiomeGen.lushDesertGen) {
registerBiome(Biomes.lushDesert);
}
@ -1221,6 +1197,10 @@ public class BOPBiomes {
addBiomeToWorldTypes(getWorldTypes(), Biomes.jadeCliffs);
}
if (BOPConfigurationBiomeGen.lavenderFieldsGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.lavenderFields);
}
if (BOPConfigurationBiomeGen.lushDesertGen) {
addBiomeToWorldTypes(getWorldTypes(), Biomes.lushDesert);
}

View File

@ -13,6 +13,7 @@ import biomesoplenty.blocks.BlockBOPColorizedLeaves;
import biomesoplenty.blocks.BlockBOPColorizedSapling;
import biomesoplenty.blocks.BlockBOPCoral;
import biomesoplenty.blocks.BlockBOPFlower;
import biomesoplenty.blocks.BlockBOPFlower2;
import biomesoplenty.blocks.BlockBOPFoliage;
import biomesoplenty.blocks.BlockBOPGeneric;
import biomesoplenty.blocks.BlockBOPGeneric.BlockType;
@ -56,6 +57,7 @@ import biomesoplenty.itemblocks.ItemBlockColorizedLeaves;
import biomesoplenty.itemblocks.ItemBlockColorizedSapling;
import biomesoplenty.itemblocks.ItemBlockCoral;
import biomesoplenty.itemblocks.ItemBlockFlower;
import biomesoplenty.itemblocks.ItemBlockFlower2;
import biomesoplenty.itemblocks.ItemBlockFoliage;
import biomesoplenty.itemblocks.ItemBlockGlass;
import biomesoplenty.itemblocks.ItemBlockGrass;
@ -128,6 +130,7 @@ public class BOPBlocks
Blocks.ash = Optional.of((new BlockAsh(BOPConfigurationIDs.ashID)).setHardness(0.4F).setStepSound(Block.soundSandFootstep).setUnlocalizedName("bop.ash"));
Blocks.plants = Optional.of((new BlockBOPPlant(BOPConfigurationIDs.plantsID)).setUnlocalizedName("bop.plants"));
Blocks.flowers = Optional.of((new BlockBOPFlower(BOPConfigurationIDs.flowersID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.flowers"));
Blocks.flowers2 = Optional.of((new BlockBOPFlower2(BOPConfigurationIDs.flowers2ID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.flowers2"));
Blocks.mushrooms = Optional.of((new BlockBOPMushroom(BOPConfigurationIDs.mushroomsID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.mushrooms"));
Blocks.coral = Optional.of((new BlockBOPCoral(BOPConfigurationIDs.coralID)).setHardness(0.0F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.coral"));
Blocks.willow = Optional.of((new BlockWillow(BOPConfigurationIDs.willowID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.willow"));
@ -215,6 +218,7 @@ public class BOPBlocks
GameRegistry.registerBlock(Blocks.ash.get(), "bop.ash");
GameRegistry.registerBlock(Blocks.plants.get(), ItemBlockPlant.class, "bop.plants");
GameRegistry.registerBlock(Blocks.flowers.get(), ItemBlockFlower.class, "bop.flowers");
GameRegistry.registerBlock(Blocks.flowers2.get(), ItemBlockFlower2.class, "bop.flowers2");
GameRegistry.registerBlock(Blocks.mushrooms.get(), ItemBlockMushroom.class, "bop.mushrooms");
GameRegistry.registerBlock(Blocks.coral.get(), ItemBlockCoral.class, "bop.coral");
GameRegistry.registerBlock(Blocks.willow.get(), ItemBOPWillow.class, "bop.willow");

View File

@ -36,6 +36,13 @@ public class BOPCrafting
GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 10), new Object[] {new ItemStack(Blocks.mushrooms.get(),1,3)});
GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 8), new Object[] {new ItemStack(Items.miscItems.get(), 1, 1)});
GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 9), new Object[] {new ItemStack(Blocks.flowers2.get(),1,0)});
GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 2, 8), new Object[] {new ItemStack(Blocks.flowers2.get(),1,1)});
GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 14), new Object[] {new ItemStack(Blocks.flowers2.get(),1,2)});
GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 5), new Object[] {new ItemStack(Blocks.flowers2.get(),1,3)});
GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 11), new Object[] {new ItemStack(Blocks.flowers2.get(),1,4)});
GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 2, 5), new Object[] {new ItemStack(Blocks.flowers2.get(),1,5)});
GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 2, 5), new Object[] {new ItemStack(Blocks.mushrooms.get(),1,2)});
GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 2, 6), new Object[] {new ItemStack(Blocks.plants.get(),1,7)});
GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 2, 7), new Object[] {new ItemStack(Blocks.moss.get(),1,0)});

View File

@ -46,6 +46,7 @@ public class BOPConfigurationBiomeGen
public static boolean hotSpringsGen;
public static boolean icyHillsGen;
public static boolean jadeCliffsGen;
public static boolean lavenderFieldsGen;
public static boolean lushDesertGen;
public static boolean lushSwampGen;
public static boolean mangroveGen;
@ -156,6 +157,7 @@ public class BOPConfigurationBiomeGen
hotSpringsGen = config.get("Biomes To Generate", "HotSprings", true).getBoolean(false);
icyHillsGen = config.get("Biomes To Generate", "IcyHills", true).getBoolean(false);
jadeCliffsGen = config.get("Biomes To Generate", "JadeCliffs", true).getBoolean(false);
lavenderFieldsGen = config.get("Biomes To Generate", "LavenderFields", true).getBoolean(false);
lushDesertGen = config.get("Biomes To Generate", "LushDesert", true).getBoolean(false);
lushSwampGen = config.get("Biomes To Generate", "LushSwamp", true).getBoolean(false);
mangroveGen = config.get("Biomes To Generate", "Mangrove", true).getBoolean(false);

View File

@ -31,6 +31,7 @@ public class BOPConfigurationIDs
public static int plantsID;
public static int flowersID;
public static int flowers2ID;
public static int mushroomsID;
public static int coralID;
public static int willowID;
@ -197,6 +198,7 @@ public class BOPConfigurationIDs
public static int hotSpringsID;
public static int icyHillsID;
public static int jadeCliffsID;
public static int lavenderFieldsID;
public static int lushDesertID;
public static int lushSwampID;
public static int mangroveID;
@ -261,6 +263,7 @@ public class BOPConfigurationIDs
public static int timberThinID;
public static int tropicalRainforestID;
public static int tropicsID;
public static int tropicsMountainID;
public static int tundraID;
public static int volcanoID;
public static int wastelandID;
@ -397,6 +400,8 @@ public class BOPConfigurationIDs
leavesFruit2ID = config.getBlock("Fruit Leaf Block 2 ID", 1982, null).getInt();
flowers2ID = config.getBlock("Flower 2 ID", 1983, null).getInt();
// Get Item ID's
foodID = config.getItem("Food ID", 21003, null).getInt();
@ -467,6 +472,8 @@ public class BOPConfigurationIDs
//23-79 ExtraBiomesXL
lavenderFieldsID = config.get("Biome IDs", "Lavender Fields ID", 31).getInt();
tropicsMountainID = config.get("Biome IDs", "Tropics Mountain (Sub-Biome) ID", 32).getInt();
autumnHillsID = config.get("Biome IDs", "Autumn Hills ID", 33).getInt();
overgrownGreensID = config.get("Biome IDs", "Overgrown Greens ID", 34).getInt();
forestHillsNewID = config.get("Biome IDs", "Forest Hills (Sub-Biome) ID", 35).getInt();

View File

@ -26,91 +26,38 @@ public class BOPConfigurationTerrainGen
public static int villageDistance;
// Village biomes
public static boolean alpsVillage;
public static boolean arcticVillage;
public static boolean autumnHillsVillage;
public static boolean badlandsVillage;
public static boolean bambooForestVillage;
public static boolean bayouVillage;
public static boolean birchForestVillage;
public static boolean bogVillage;
public static boolean borealForestVillage;
public static boolean brushlandVillage;
public static boolean canyonVillage;
public static boolean chaparralVillage;
public static boolean cherryBlossomGroveVillage;
public static boolean coniferousForestVillage;
public static boolean coniferousForestSnowVillage;
public static boolean cragVillage;
public static boolean deadForestVillage;
public static boolean deadForestSnowVillage;
public static boolean deadSwampVillage;
public static boolean deadlandsVillage;
public static boolean deciduousForestVillage;
public static boolean dunesVillage;
public static boolean fenVillage;
public static boolean fieldVillage;
public static boolean frostForestVillage;
public static boolean fungiForestVillage;
public static boolean gardenVillage;
public static boolean glacierVillage;
public static boolean fieldVillage;
public static boolean grasslandVillage;
public static boolean groveVillage;
public static boolean heathlandVillage;
public static boolean highlandVillage;
public static boolean hotSpringsVillage;
public static boolean icyHillsVillage;
public static boolean jadeCliffsVillage;
public static boolean lushDesertVillage;
public static boolean lushSwampVillage;
public static boolean mangroveVillage;
public static boolean mapleWoodsVillage;
public static boolean marshVillage;
public static boolean meadowVillage;
public static boolean mesaVillage;
public static boolean moorVillage;
public static boolean mountainVillage;
// public static boolean mushroomIslandVillage;
public static boolean mysticGroveVillage;
public static boolean oasisVillage;
public static boolean ominousWoodsVillage;
public static boolean orchardVillage;
public static boolean originValleyVillage;
public static boolean outbackVillage;
public static boolean overgrownGreensVillage;
public static boolean pastureVillage;
public static boolean polarVillage;
public static boolean prairieVillage;
public static boolean quagmireVillage;
public static boolean rainforestVillage;
public static boolean redwoodForestVillage;
public static boolean sacredSpringsVillage;
public static boolean savannaVillage;
public static boolean scrublandVillage;
public static boolean seasonalForestVillage;
public static boolean shieldVillage;
public static boolean shrublandVillage;
public static boolean silkgladesVillage;
public static boolean sludgepitVillage;
public static boolean spruceWoodsVillage;
public static boolean steppeVillage;
public static boolean temperateRainforestVillage;
public static boolean thicketVillage;
public static boolean timberVillage;
public static boolean tropicalRainforestVillage;
public static boolean tropicsVillage;
public static boolean tundraVillage;
public static boolean volcanoVillage;
public static boolean wastelandVillage;
public static boolean wetlandVillage;
public static boolean woodlandVillage;
public static boolean plainsVillage;
public static boolean desertVillage;
public static boolean extremeHillsVillage;
public static boolean forestVillage;
public static boolean taigaVillage;
public static boolean swamplandVillage;
public static boolean jungleVillage;
public static void init(File configFile)
{
@ -139,93 +86,40 @@ public class BOPConfigurationTerrainGen
}
// Biomes with villages
alpsVillage = config.get("Allow Villages", "Alps", false).getBoolean(false);
arcticVillage = config.get("Allow Villages", "Arctic", true).getBoolean(false);
autumnHillsVillage = config.get("Allow Villages", "AutumnHills", false).getBoolean(false);
badlandsVillage = config.get("Allow Villages", "Badlands", false).getBoolean(false);
bambooForestVillage = config.get("Allow Villages", "BambooForest", false).getBoolean(false);
bayouVillage = config.get("Allow Villages", "Bayou", false).getBoolean(false);
birchForestVillage = config.get("Allow Villages", "BirchForest", false).getBoolean(false);
bogVillage = config.get("Allow Villages", "Bog", false).getBoolean(false);
borealForestVillage = config.get("Allow Villages", "BorealForest", false).getBoolean(false);
birchForestVillage = config.get("Allow Villages", "BirchForest", true).getBoolean(false);
brushlandVillage = config.get("Allow Villages", "Brushland", true).getBoolean(false);
canyonVillage = config.get("Allow Villages", "Canyon", false).getBoolean(false);
chaparralVillage = config.get("Allow Villages", "Chaparral", true).getBoolean(false);
cherryBlossomGroveVillage = config.get("Allow Villages", "CherryBlossomGrove", false).getBoolean(false);
coniferousForestVillage = config.get("Allow Villages", "ConiferousForest", false).getBoolean(false);
coniferousForestSnowVillage = config.get("Allow Villages", "ConiferousForestSnow", false).getBoolean(false);
cragVillage = config.get("Allow Villages", "Crag", false).getBoolean(false);
deadForestVillage = config.get("Allow Villages", "DeadForest", false).getBoolean(false);
deadForestSnowVillage = config.get("Allow Villages", "DeadForestSnow", false).getBoolean(false);
deadSwampVillage = config.get("Allow Villages", "DeadSwamp", false).getBoolean(false);
deadlandsVillage = config.get("Allow Villages", "Deadlands", false).getBoolean(false);
deciduousForestVillage = config.get("Allow Villages", "DeciduousForest", false).getBoolean(false);
dunesVillage = config.get("Allow Villages", "Dunes", false).getBoolean(false);
fenVillage = config.get("Allow Villages", "Fen", false).getBoolean(false);
coniferousForestVillage = config.get("Allow Villages", "ConiferousForest", true).getBoolean(false);
coniferousForestSnowVillage = config.get("Allow Villages", "SnowyConiferousForest", true).getBoolean(false);
deciduousForestVillage = config.get("Allow Villages", "DeciduousForest", true).getBoolean(false);
frostForestVillage = config.get("Allow Villages", "FrostForest", true).getBoolean(false);
fieldVillage = config.get("Allow Villages", "Field", true).getBoolean(false);
frostForestVillage = config.get("Allow Villages", "FrostForest", false).getBoolean(false);
fungiForestVillage = config.get("Allow Villages", "FungiForest", false).getBoolean(false);
gardenVillage = config.get("Allow Villages", "Garden", false).getBoolean(false);
glacierVillage = config.get("Allow Villages", "Glacier", false).getBoolean(false);
grasslandVillage = config.get("Allow Villages", "Grassland", true).getBoolean(false);
groveVillage = config.get("Allow Villages", "Grove", true).getBoolean(false);
heathlandVillage = config.get("Allow Villages", "Heathland", true).getBoolean(false);
highlandVillage = config.get("Allow Villages", "Highland", false).getBoolean(false);
hotSpringsVillage = config.get("Allow Villages", "HotSprings", false).getBoolean(false);
icyHillsVillage = config.get("Allow Villages", "IcyHills", false).getBoolean(false);
jadeCliffsVillage = config.get("Allow Villages", "JadeCliffs", false).getBoolean(false);
lushDesertVillage = config.get("Allow Villages", "LushDesert", true).getBoolean(false);
lushSwampVillage = config.get("Allow Villages", "LushSwamp", true).getBoolean(false);
mangroveVillage = config.get("Allow Villages", "Mangrove", false).getBoolean(false);
mapleWoodsVillage = config.get("Allow Villages", "MapleWoods", false).getBoolean(false);
marshVillage = config.get("Allow Villages", "Marsh", false).getBoolean(false);
mapleWoodsVillage = config.get("Allow Villages", "MapleWoods", true).getBoolean(false);
meadowVillage = config.get("Allow Villages", "Meadow", true).getBoolean(false);
mesaVillage = config.get("Allow Villages", "Mesa", false).getBoolean(false);
moorVillage = config.get("Allow Villages", "Moor", false).getBoolean(false);
mountainVillage = config.get("Allow Villages", "Mountain", false).getBoolean(false);
// mushroomIslandVillage = config.get("Allow Villages", "MushroomIsland", false).getBoolean(false);
mysticGroveVillage = config.get("Allow Villages", "MysticGrove", false).getBoolean(false);
oasisVillage = config.get("Allow Villages", "Oasis", false).getBoolean(false);
ominousWoodsVillage = config.get("Allow Villages", "OminousWoods", false).getBoolean(false);
orchardVillage = config.get("Allow Villages", "Orchard", false).getBoolean(false);
originValleyVillage = config.get("Allow Villages", "OriginValley", false).getBoolean(false);
outbackVillage = config.get("Allow Villages", "Outback", true).getBoolean(false);
overgrownGreensVillage = config.get("Allow Villages", "OvergrownGreens", true).getBoolean(false);
pastureVillage = config.get("Allow Villages", "Pasture", false).getBoolean(false);
polarVillage = config.get("Allow Villages", "Polar", false).getBoolean(false);
prairieVillage = config.get("Allow Villages", "Prairie", true).getBoolean(false);
quagmireVillage = config.get("Allow Villages", "Quagmire", false).getBoolean(false);
rainforestVillage = config.get("Allow Villages", "Rainforest", false).getBoolean(false);
redwoodForestVillage = config.get("Allow Villages", "RedwoodForest", false).getBoolean(false);
sacredSpringsVillage = config.get("Allow Villages", "SacredSprings", false).getBoolean(false);
savannaVillage = config.get("Allow Villages", "Savanna", true).getBoolean(false);
scrublandVillage = config.get("Allow Villages", "Scrubland", true).getBoolean(false);
seasonalForestVillage = config.get("Allow Villages", "SeasonalForest", false).getBoolean(false);
shieldVillage = config.get("Allow Villages", "Shield", false).getBoolean(false);
shrublandVillage = config.get("Allow Villages", "Shrubland", true).getBoolean(false);
silkgladesVillage = config.get("Allow Villages", "Silkgladess", false).getBoolean(false);
sludgepitVillage = config.get("Allow Villages", "Sludgepit", false).getBoolean(false);
spruceWoodsVillage = config.get("Allow Villages", "SpruceWoods", true).getBoolean(false);
steppeVillage = config.get("Allow Villages", "Steppe", true).getBoolean(false);
temperateRainforestVillage = config.get("Allow Villages", "TemperateRainforest", false).getBoolean(false);
thicketVillage = config.get("Allow Villages", "Thicket", false).getBoolean(false);
timberVillage = config.get("Allow Villages", "Timber", true).getBoolean(false);
tropicalRainforestVillage = config.get("Allow Villages", "TropicalRainforest", true).getBoolean(false);
tropicsVillage = config.get("Allow Villages", "Tropics", false).getBoolean(false);
tundraVillage = config.get("Allow Villages", "Tundra", true).getBoolean(false);
volcanoVillage = config.get("Allow Villages", "Volcano", false).getBoolean(false);
wastelandVillage = config.get("Allow Villages", "Wasteland", false).getBoolean(false);
wetlandVillage = config.get("Allow Villages", "Wetland", false).getBoolean(false);
woodlandVillage = config.get("Allow Villages", "Woodland", false).getBoolean(false);
wetlandVillage = config.get("Allow Villages", "Wetland", true).getBoolean(false);
woodlandVillage = config.get("Allow Villages", "Woodland", true).getBoolean(false);
// Vanilla biomes
desertVillage = config.get("Allow Villages", "Desert", true).getBoolean(true);
extremeHillsVillage = config.get("Allow Villages", "ExtremeHills", false).getBoolean(false);
forestVillage = config.get("Allow Villages", "Forest", false).getBoolean(false);
jungleVillage = config.get("Allow Villages", "Jungle", false).getBoolean(false);
forestVillage = config.get("Allow Villages", "Forest", true).getBoolean(true);
plainsVillage = config.get("Allow Villages", "Plains", true).getBoolean(true);
swamplandVillage = config.get("Allow Villages", "Swampland", false).getBoolean(false);
taigaVillage = config.get("Allow Villages", "Taiga", false).getBoolean(false);
FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Generated Terrain Gen Config!");
}

View File

@ -7,8 +7,10 @@ import net.minecraftforge.event.entity.player.BonemealEvent;
import biomesoplenty.api.Blocks;
import biomesoplenty.blocks.BlockBOPColorizedSapling;
import biomesoplenty.blocks.BlockBOPSapling;
import biomesoplenty.worldgen.WorldGenDesertCactus;
import biomesoplenty.worldgen.WorldGenGiantFlowerRed;
import biomesoplenty.worldgen.WorldGenGiantFlowerYellow;
import biomesoplenty.worldgen.WorldGenCattailBonemeal;
import biomesoplenty.worldgen.WorldGenKelp;
public class BonemealHandler
@ -79,6 +81,32 @@ public class BonemealHandler
}
}
}
else if (event.ID == Blocks.plants.get().blockID && event.world.getBlockMetadata(event.X, event.Y, event.Z) == 12)
{
event.setResult(Result.ALLOW);
if (!event.world.isRemote)
{
if (event.world.rand.nextFloat() < 0.45D)
{
WorldGenDesertCactus worldgendesertcactus = new WorldGenDesertCactus();
worldgendesertcactus.generate(event.world, event.world.rand, event.X, event.Y, event.Z);
}
}
}
else if (event.ID == Blocks.plants.get().blockID && event.world.getBlockMetadata(event.X, event.Y, event.Z) == 7)
{
event.setResult(Result.ALLOW);
if (!event.world.isRemote)
{
if (event.world.rand.nextFloat() < 0.45D)
{
WorldGenCattailBonemeal worldgencattailbonemeal = new WorldGenCattailBonemeal(Blocks.plants.get().blockID, 9);
worldgencattailbonemeal.generate(event.world, event.world.rand, event.X, event.Y, event.Z);
}
}
}
else if (event.ID == Block.plantRed.blockID)
{
event.setResult(Result.ALLOW);

File diff suppressed because it is too large Load Diff

View File

@ -12,8 +12,8 @@ public class Localizations
public static ResourceLocation[] localeFiles = { new ResourceLocation(localizationLocation + "en_US.xml"), new ResourceLocation(localizationLocation + "de_DE.xml"),
new ResourceLocation(localizationLocation + "nl_NL.xml"), new ResourceLocation(localizationLocation + "ru_RU.xml"), new ResourceLocation(localizationLocation + "zh_CN.xml"),
new ResourceLocation(localizationLocation + "pl_PL.xml"), new ResourceLocation(localizationLocation + "fr_FR.xml"), new ResourceLocation(localizationLocation + "fr_CA.xml")//,
/*new ResourceLocation(localizationLocation + "ja_JP.xml")*/ };
new ResourceLocation(localizationLocation + "pl_PL.xml"), new ResourceLocation(localizationLocation + "fr_FR.xml"), new ResourceLocation(localizationLocation + "fr_CA.xml"),
new ResourceLocation(localizationLocation + "it_IT.xml")};
public static boolean isXMLLanguageFile(ResourceLocation fileName)
{

View File

@ -85,6 +85,7 @@ public class ForestryIntegration
EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.oasisID);
EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.rainforestID);
EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.tropicsID);
EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.tropicsMountainID);
EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.woodlandID);
EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.jungleNewID);
EnumTemperature.warmBiomeIds.add(BOPConfigurationIDs.jungleHillsNewID);
@ -98,6 +99,7 @@ public class ForestryIntegration
EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.oasisID);
EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.rainforestID);
EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.tropicsID);
EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.tropicsMountainID);
EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.woodlandID);
EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.jungleNewID);
EnumHumidity.dampBiomeIds.add(BOPConfigurationIDs.jungleHillsNewID);

View File

@ -217,12 +217,19 @@ public class ThaumcraftIntegration {
ThaumcraftApi.registerObjectTag(getBID("cosmos"), getBMeta("cosmos"), (new AspectList()).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("dandelion"), getBMeta("dandelion"), (new AspectList()).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("daffodil"), getBMeta("daffodil"), (new AspectList()).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("aloe"), getBMeta("aloe"), (new AspectList()).add(Aspect.PLANT, 4).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("bromeliad"), getBMeta("bromeliad"), (new AspectList()).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("clover"), getBMeta("clover"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1));
ThaumcraftApi.registerObjectTag(getBID("lilyflower"), getBMeta("lilyflower"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1).add(Aspect.WATER, 1));
ThaumcraftApi.registerObjectTag(getBID("rainbowflower"), getBMeta("rainbowflower"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1).add(Aspect.LIGHT, 1).add(Aspect.MAGIC, 1));
ThaumcraftApi.registerObjectTag(getBID("sunflower"), getBMeta("sunflower"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.PLANT, 1).add(Aspect.LIGHT, 1));
ThaumcraftApi.registerObjectTag(getBID("hibiscus"), getBMeta("hibiscus"), (new AspectList()).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("lilyofthevalley"), getBMeta("lilyofthevalley"), (new AspectList()).add(Aspect.PLANT, 4).add(Aspect.POISON, 1));
ThaumcraftApi.registerObjectTag(getBID("burningblossom"), getBMeta("burningblossom"), (new AspectList()).add(Aspect.PLANT, 4).add(Aspect.FIRE, 2));
ThaumcraftApi.registerObjectTag(getBID("lavender"), getBMeta("lavender"), (new AspectList()).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("goldenrod"), getBMeta("goldenrod"), (new AspectList()).add(Aspect.PLANT, 4));
ThaumcraftApi.registerObjectTag(getBID("bluebells"), getBMeta("bluebells"), (new AspectList()).add(Aspect.PLANT, 4));
}
private static int getBID(String name) {

View File

@ -18,7 +18,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class ItemBlockFlower extends ItemBlock
{
private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "aloe", "sunflowerbottom", "sunflowertop", "dandelion"};
private static final String[] plants = new String[] {"clover", "swampflower", "deadbloom", "glowflower", "hydrangea", "cosmos", "daffodil", "wildflower", "violet", "anemone", "lilyflower", "rainbowflower", "bromeliad", "sunflowerbottom", "sunflowertop", "dandelion"};
@SideOnly(Side.CLIENT)
private Icon[] textures;
private static final int SUNFLOWERTOP = 14;

View File

@ -0,0 +1,118 @@
package biomesoplenty.itemblocks;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import biomesoplenty.BiomesOPlenty;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class ItemBlockFlower2 extends ItemBlock
{
private static final String[] plants = new String[] {"hibiscus", "lilyofthevalley", "burningblossom", "lavender", "goldenrod", "bluebells"};
@SideOnly(Side.CLIENT)
private Icon[] textures;
public ItemBlockFlower2(int par1)
{
super(par1);
setMaxDamage(0);
setHasSubtypes(true);
}
@Override
public String getUnlocalizedName(ItemStack itemStack)
{
int meta = itemStack.getItemDamage();
if (meta < 0 || meta >= plants.length) {
meta = 0;
}
return super.getUnlocalizedName() + "." + plants[meta];
}
@Override
public Icon getIconFromDamage(int meta)
{
return Block.blocksList[itemID].getIcon(0, meta);
}
@Override
@SideOnly(Side.CLIENT)
public boolean isFull3D()
{
return true;
}
@Override
public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)
{
int id = world.getBlockId(x, y, z);
if (id == Block.snow.blockID && (world.getBlockMetadata(x, y, z) & 7) < 1) {
side = 1;
} else if (!Block.blocksList[id].isBlockReplaceable(world, x, y, z))
{
if (side == 0) {
--y;
}
if (side == 1) {
++y;
}
if (side == 2) {
--z;
}
if (side == 3) {
++z;
}
if (side == 4) {
--x;
}
if (side == 5) {
++x;
}
}
if (!player.canPlayerEdit(x, y, z, side, itemStack))
return false;
else if (itemStack.stackSize == 0)
return false;
else
{
if (world.canPlaceEntityOnSide(this.getBlockID(), x, y, z, false, side, (Entity)null, itemStack))
{
Block block = Block.blocksList[this.getBlockID()];
int j1 = block.onBlockPlaced(world, x, y, z, side, hitX, hitY, hitZ, 0);
if (world.setBlock(x, y, z, this.getBlockID(), itemStack.getItemDamage(), 3))
{
if (world.getBlockId(x, y, z) == this.getBlockID())
{
Block.blocksList[this.getBlockID()].onBlockPlacedBy(world, x, y, z, player, itemStack);
Block.blocksList[this.getBlockID()].onPostBlockPlaced(world, x, y, z, j1);
}
world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, block.stepSound.getPlaceSound(), (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F);
--itemStack.stackSize;
}
}
return true;
}
}
}

View File

@ -158,6 +158,10 @@ public class WorldTypeBOP extends WorldType
{
addNewBiome(Biomes.jadeCliffs);
}
if (BOPConfigurationBiomeGen.lavenderFieldsGen == true)
{
addNewBiome(Biomes.lavenderFields);
}
if (BOPConfigurationBiomeGen.lushDesertGen == true)
{
addNewBiome(Biomes.lushDesert);

View File

@ -40,6 +40,7 @@ public class BiomeLayerSub extends BiomeLayer
if (k1 == Biomes.seasonalForest.get().biomeID && nextInt(2) == 0) { l1 = Biomes.seasonalSpruceForest.get().biomeID; }
if (k1 == Biomes.field.get().biomeID && nextInt(2) == 0) { l1 = Biomes.fieldForest.get().biomeID; }
if (k1 == Biomes.savanna.get().biomeID && nextInt(4) == 0) { l1 = Biomes.savannaPlateau.get().biomeID; }
if (k1 == Biomes.tropics.get().biomeID && nextInt(3) == 0) { l1 = Biomes.tropicsMountain.get().biomeID; }
if (k1 == Biomes.forestNew.get().biomeID && nextInt(3) == 0) { l1 = Biomes.forestHillsNew.get().biomeID; }
if (k1 == Biomes.taigaNew.get().biomeID && nextInt(3) == 0) { l1 = Biomes.taigaHillsNew.get().biomeID; }

View File

@ -0,0 +1,54 @@
package biomesoplenty.worldgen;
import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks;
public class WorldGenCattailBonemeal extends WorldGenerator
{
/** Stores ID for WorldGenHighCattail */
private int highCattailID;
private int highCattailMetadata;
public WorldGenCattailBonemeal(int par1, int par2)
{
highCattailID = par1;
highCattailMetadata = par2;
}
@Override
public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5)
{
int var11;
for (boolean var6 = false; ((var11 = par1World.getBlockId(par3, par4, par5)) == 0 || var11 == Block.leaves.blockID) && par4 > 0; --par4)
{
;
}
for (int var7 = 0; var7 < 128; ++var7)
{
int var8 = par3;
int var9 = par4;
int var10 = par5;
int var999 = par1World.getBlockId(par3, par4, par5);
int var998 = par1World.getBlockMetadata(par3, par4, par5);
if (var999 == Blocks.plants.get().blockID && var998 == 7 && Block.blocksList[highCattailID].canBlockStay(par1World, var8, var9, var10))
{
if (par1World.getBlockMaterial(var8 - 1, var9 - 1, var10) == Material.water ? true : (par1World.getBlockMaterial(var8 + 1, var9 - 1, var10) == Material.water ? true : (par1World.getBlockMaterial(var8, var9 - 1, var10 - 1) == Material.water ? true : par1World.getBlockMaterial(var8, var9 - 1, var10 + 1) == Material.water)))
{
par1World.setBlock(var8, var9, var10, Blocks.plants.get().blockID, 10, 2);
par1World.setBlock(var8, var9 + 1, var10, Blocks.plants.get().blockID, 9, 2);
}
}
}
return true;
}
}

View File

@ -2,45 +2,27 @@ package biomesoplenty.worldgen;
import java.util.Random;
import biomesoplenty.api.Blocks;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.WorldGenerator;
import biomesoplenty.api.Blocks;
public class WorldGenDesertCactus extends WorldGenerator
{
@Override
public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5)
{
for (int var6 = 0; var6 < 10; ++var6)
{
int var7 = par3 + par2Random.nextInt(8) - par2Random.nextInt(8);
int var8 = par4 + par2Random.nextInt(4) - par2Random.nextInt(4);
int var9 = par5 + par2Random.nextInt(8) - par2Random.nextInt(8);
int var999 = par1World.getBlockId(par3, par4, par5);
int var998 = par1World.getBlockMetadata(par3, par4, par5);
if (par1World.isAirBlock(var7, var8, var9))
if (var999 == Blocks.plants.get().blockID && var998 == 12)
{
if (!par1World.isAirBlock(var7 - 1, var8 - 1, var9))
{
if (!par1World.isAirBlock(var7 + 1, var8 - 1, var9))
{
if (!par1World.isAirBlock(var7, var8 - 1, var9 - 1))
{
if (!par1World.isAirBlock(var7, var8 - 1, var9 + 1))
{
int var10 = 2 + par2Random.nextInt(par2Random.nextInt(2) + 2);
int l1 = 1 + par2Random.nextInt(par2Random.nextInt(3) + 1);
for (int var11 = 0; var11 < var10; ++var11)
for (int i2 = 0; i2 < l1; ++i2)
{
if (Blocks.plants.get().canBlockStay(par1World, var7, var8 + var11, var9))
if (Block.cactus.canBlockStay(par1World, par3, par4 + i2, par5))
{
par1World.setBlock(var7, var8 - 1, var9, Block.sand.blockID);
par1World.setBlock(var7, var8 + var11, var9, Block.cactus.blockID);
}
}
}
}
}
par1World.setBlock(par3, par4 + i2, par5, Block.cactus.blockID, 0, 2);
}
}
}

View File

@ -63,7 +63,7 @@ public class WorldGenMesa extends WorldGenerator
{
double var45 = (var44 + 0.5D - var24) / (var28 / 2.0D);
if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && par1World.getBlockId(var38, var41, var44) == Blocks.redRock.get().blockID)
if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && par1World.getBlockId(var38, var41, var44) == Blocks.redRock.get().blockID && par1World.getBlockMetadata(var38, var41, var44) == 0)
{
par1World.setBlock(var38, var41, var44, minableBlockId);
}

View File

@ -20,7 +20,7 @@ public class WorldGenTaiga3 extends WorldGenerator
int var6 = var2.nextInt(10) + 35;
int var7 = var2.nextInt(5) + 10;
int var8 = var6 - var7;
int var9 = 4;
int var9 = 3;
boolean var10 = true;
if (var4 >= 1 && var4 + var6 + 1 <= 256)

View File

@ -20,7 +20,7 @@ public class WorldGenTaiga4 extends WorldGenerator
int var6 = var2.nextInt(15) + 20;
int var7 = var2.nextInt(3) + 5;
int var8 = var6 - var7;
int var9 = 2 + var2.nextInt(3);
int var9 = 2 + var2.nextInt(2);
boolean var10 = true;
if (var4 >= 1 && var4 + var6 + 1 <= 256)

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties version="1.0">
<comment>Deutsche (de_DE) Sprachdatei vom 09.06.2013 erstellt von Baalith.</comment>
<comment>Deutsche (de_DE) Sprachdatei vom 09.06.2013 erstellt von Baalith, bearbeitet von Vexatos.</comment>
<!--Blocks -->
<entry key="tile.bop.mud.mud.name">Matsch</entry>
@ -49,7 +49,7 @@
<entry key="tile.bop.flowers.anemone.name">Weißes Windröschen</entry>
<entry key="tile.bop.flowers.lilyflower.name">Wasserlilie</entry>
<entry key="tile.bop.flowers.rainbowflower.name">Chromablume</entry>
<entry key="tile.bop.flowers.aloe.name">Aloe</entry>
<entry key="tile.bop.flowers.bromeliad.name">Aloe</entry>
<entry key="tile.bop.flowers.sunflowerbottom.name">Sonnenblume</entry>
<entry key="tile.bop.flowers.sunflowertop.name">Sonnenblume</entry>
<entry key="tile.bop.flowers.dandelion.name">Weißer Löwenzahn</entry>
@ -355,6 +355,9 @@
<entry key="item.bop.flowerBand.lushflowerband.name">Üppiges Blumenband</entry>
<entry key="item.bop.flowerBand.exoticflowerband.name">Exotisches Blumenband</entry>
<entry key="item.bop.wadingBoots.name">Watstiefel</entry>
<entry key="item.bop.flippers.name">Schwimmflossen</entry>
<!--Fluids -->
<entry key="item.bop.bopBucket.amethyst_empty.name">Amethyst-Eimer</entry>
<entry key="item.bop.bopBucket.amethyst_spring_water.name">Amethyst-Eimer mit Quellwasser</entry>

View File

@ -49,11 +49,18 @@
<entry key="tile.bop.flowers.anemone.name">White Anemone</entry>
<entry key="tile.bop.flowers.lilyflower.name">Waterlily</entry>
<entry key="tile.bop.flowers.rainbowflower.name">Chromaflora</entry>
<entry key="tile.bop.flowers.aloe.name">Aloe</entry>
<entry key="tile.bop.flowers.bromeliad.name">Bromeliad</entry>
<entry key="tile.bop.flowers.sunflowerbottom.name">Sunflower</entry>
<entry key="tile.bop.flowers.sunflowertop.name">Sunflower</entry>
<entry key="tile.bop.flowers.dandelion.name">White Dandelion</entry>
<entry key="tile.bop.flowers2.hibiscus.name">Pink Hibiscus</entry>
<entry key="tile.bop.flowers2.lilyofthevalley.name">Lily of the Valley</entry>
<entry key="tile.bop.flowers2.burningblossom.name">Burning Blossom</entry>
<entry key="tile.bop.flowers2.lavender.name">Lavender</entry>
<entry key="tile.bop.flowers2.goldenrod.name">Goldenrod</entry>
<entry key="tile.bop.flowers2.bluebells.name">Bluebells</entry>
<entry key="tile.bop.foliage.algae.name">Algae</entry>
<entry key="tile.bop.foliage.shortgrass.name">Short Grass</entry>
<entry key="tile.bop.foliage.mediumgrass.name">Medium Grass</entry>

View File

@ -34,20 +34,18 @@
<entry key="tile.bop.plants.cattailtop.name">Massettes</entry>
<entry key="tile.bop.plants.cattailbottom.name">Massettes</entry>
<entry key="tile.bop.plants.reed.name">Roseau</entry>
<entry key="tile.bop.plants.cactus.name">Petit Cactus</entry>
<entry key="tile.bop.flowers.clover.name">Trèfles</entry>
<entry key="tile.bop.flowers.swampflower.name">Fleur des Marais</entry>
<entry key="tile.bop.flowers.deadbloom.name">Clochettes de la Mort</entry>
<entry key="tile.bop.flowers.glowflower.name">Fleur Luisante</entry>
<entry key="tile.bop.flowers.hydrangea.name">Hydrangéa</entry>
<entry key="tile.bop.flowers.daisy.name">Marguerite</entry>
<entry key="tile.bop.flowers.tulip.name">Tulipe</entry>
<entry key="tile.bop.flowers.wildflower.name">Fleur Sauvage</entry>
<entry key="tile.bop.flowers.violet.name">Violette</entry>
<entry key="tile.bop.flowers.anemone.name">Anémone</entry>
<entry key="tile.bop.flowers.lilyflower.name">Fleur de Nénuphar</entry>
<entry key="tile.bop.flowers.cactus.name">Petit Cactus</entry>
<entry key="tile.bop.flowers.aloe.name">Aloé</entry>
<entry key="tile.bop.flowers.bromeliad.name">Aloé</entry>
<entry key="tile.bop.flowers.sunflowerbottom.name">Tornesol</entry>
<entry key="tile.bop.flowers.sunflowertop.name">Tornesol</entry>
<entry key="tile.bop.flowers.dandelion.name">Pissenlit</entry>
@ -98,10 +96,11 @@
<entry key="tile.bop.leavesFruit.name">Feuilles de Pomier</entry>
<entry key="tile.bop.bamboo.name">Bambou</entry>
<entry key="tile.bop.mudBricksStairs.name">Escaliers en Briques de Boue</entry>
<entry key="tile.bop.originGrass.name">Herbe Originelle</entry> <entry key="tile.bop.longGrass.name">Bloc d'Herbe Longue</entry>
<entry key="tile.bop.originGrass.name">Herbe Originelle</entry>
<entry key="tile.bop.longGrass.name">Bloc d'Herbe Longue</entry>
<entry key="tile.bop.treeMoss.name">Mousse d'Arbre</entry>
<entry key="tile.bop.coral.kelp.name">Algue Brune</entry>
<entry key="tile.bop.coral.kelpsingle.name">Algue Brune</entry>
<entry key="tile.bop.redCobbleStairs.name">Escaliers en Pierre Rouge</entry>
<entry key="tile.bop.redBricksStairs.name">Escaliers en Briques de Pierre Rouge</entry>
@ -265,12 +264,8 @@
<entry key="tile.bop.leavesColorized.pine.name">Feuilles de Pin</entry>
<!--Items -->
<entry key="item.bop.shroomPowder.name">Poudre de champignon</entry>
<entry key="item.bop.sunflowerSeeds.name">Graines de tournesol</entry>
<entry key="item.bop.food.berries.name">Baie</entry>
<entry key="item.bop.food.shroomPowder.name">Poudre de champignon</entry>
<entry key="item.bop.food.shroompowder.name">Poudre de champignon</entry>
<entry key="item.bop.food.wildcarrots.name">Carottes Sauvages</entry>
<entry key="item.bop.food.sunflowerseeds.name">Graines de tournesol</entry>
<entry key="item.bop.food.saladfruit.name">Salade de fruits</entry>

View File

@ -34,20 +34,18 @@
<entry key="tile.bop.plants.cattailtop.name">Massettes</entry>
<entry key="tile.bop.plants.cattailbottom.name">Massettes</entry>
<entry key="tile.bop.plants.reed.name">Roseau</entry>
<entry key="tile.bop.plants.cactus.name">Petit Cactus</entry>
<entry key="tile.bop.flowers.clover.name">Trèfles</entry>
<entry key="tile.bop.flowers.swampflower.name">Fleur des Marais</entry>
<entry key="tile.bop.flowers.deadbloom.name">Clochettes de la Mort</entry>
<entry key="tile.bop.flowers.glowflower.name">Fleur Luisante</entry>
<entry key="tile.bop.flowers.hydrangea.name">Hydrangéa</entry>
<entry key="tile.bop.flowers.daisy.name">Marguerite</entry>
<entry key="tile.bop.flowers.tulip.name">Tulipe</entry>
<entry key="tile.bop.flowers.wildflower.name">Fleur Sauvage</entry>
<entry key="tile.bop.flowers.violet.name">Violette</entry>
<entry key="tile.bop.flowers.anemone.name">Anémone</entry>
<entry key="tile.bop.flowers.lilyflower.name">Fleur de Nénuphar</entry>
<entry key="tile.bop.flowers.cactus.name">Petit Cactus</entry>
<entry key="tile.bop.flowers.aloe.name">Aloé</entry>
<entry key="tile.bop.flowers.bromeliad.name">Aloé</entry>
<entry key="tile.bop.flowers.sunflowerbottom.name">Tornesol</entry>
<entry key="tile.bop.flowers.sunflowertop.name">Tornesol</entry>
<entry key="tile.bop.flowers.dandelion.name">Pissenlit</entry>
@ -98,7 +96,8 @@
<entry key="tile.bop.leavesFruit.name">Feuilles de Pomier</entry>
<entry key="tile.bop.bamboo.name">Bambou</entry>
<entry key="tile.bop.mudBricksStairs.name">Escaliers en Briques de Boue</entry>
<entry key="tile.bop.originGrass.name">Herbe Originelle</entry> <entry key="tile.bop.longGrass.name">Bloc d'Herbe Longue</entry>
<entry key="tile.bop.originGrass.name">Herbe Originelle</entry>
<entry key="tile.bop.longGrass.name">Bloc d'Herbe Longue</entry>
<entry key="tile.bop.treeMoss.name">Mousse d'Arbre</entry>
<entry key="tile.bop.coral.kelp.name">Algue Brune</entry>
@ -265,12 +264,8 @@
<entry key="tile.bop.leavesColorized.pine.name">Feuilles de Pin</entry>
<!--Items -->
<entry key="item.bop.shroomPowder.name">Poudre de champignon</entry>
<entry key="item.bop.sunflowerSeeds.name">Graines de tournesol</entry>
<entry key="item.bop.food.berries.name">Baie</entry>
<entry key="item.bop.food.shroomPowder.name">Poudre de champignon</entry>
<entry key="item.bop.food.shroompowder.name">Poudre de champignon</entry>
<entry key="item.bop.food.wildcarrots.name">Carottes Sauvages</entry>
<entry key="item.bop.food.sunflowerseeds.name">Graines de tournesol</entry>
<entry key="item.bop.food.saladfruit.name">Salade de fruits</entry>

View File

@ -0,0 +1,382 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties version="1.0">
<comment>Italian (it_IT) Localization File</comment>
<!--Blocks -->
<entry key="tile.bop.mud.mud.name">Fango</entry>
<entry key="tile.bop.mud.quicksand.name">Sabbie Mobili</entry>
<entry key="tile.bop.generic.ash_stone.name">Pietra-Cenere</entry>
<entry key="tile.bop.generic.hard_sand.name">Sabbia Indurita</entry>
<entry key="tile.bop.generic.hard_dirt.name">Terra Indurita</entry>
<entry key="tile.bop.generic.hard_ice.name">Ghiaccio Cristallino</entry>
<entry key="tile.bop.generic.dried_dirt.name">Terra Arida</entry>
<entry key="tile.bop.generic.crag_rock.name">Roccia di Falesia</entry>
<entry key="tile.bop.generic.mud_brick.name">Mattoni di Fango</entry>
<entry key="tile.bop.generic.holy_dirt.name">Terra Sacra</entry>
<entry key="tile.bop.generic.crystal.name">Cristallo Celestiale</entry>
<entry key="tile.bop.redRocks.redrock.name">Roccia Rossa</entry>
<entry key="tile.bop.redRocks.redcobble.name">Pietrisco di Roccia Rossa</entry>
<entry key="tile.bop.redRocks.redbrick.name">Mattoni di Roccia Rossa</entry>
<entry key="tile.bop.ash.name">Blocco di Cenere</entry>
<entry key="tile.bop.plants.deadgrass.name">Erba Secca</entry>
<entry key="tile.bop.plants.desertgrass.name">Erba Desertica</entry>
<entry key="tile.bop.plants.desertsprouts.name">Germogli Desertici</entry>
<entry key="tile.bop.plants.dunegrass.name">Erba delle Dune</entry>
<entry key="tile.bop.plants.holytallgrass.name">Erba Alta Sacra</entry>
<entry key="tile.bop.plants.thorn.name">Rovi</entry>
<entry key="tile.bop.plants.barley.name">Orzo</entry>
<entry key="tile.bop.plants.cattail.name">Tifa</entry>
<entry key="tile.bop.plants.cattailtop.name">Tifa</entry>
<entry key="tile.bop.plants.cattailbottom.name">Tifa</entry>
<entry key="tile.bop.plants.reed.name">Canna</entry>
<entry key="tile.bop.plants.cactus.name">Piantina Grassa</entry>
<entry key="tile.bop.plants.witherwart.name">Verruca Wither</entry>
<entry key="tile.bop.flowers.clover.name">Trifoglio</entry>
<entry key="tile.bop.flowers.swampflower.name">Fiore di Palude</entry>
<entry key="tile.bop.flowers.deadbloom.name">Fior di Morte</entry>
<entry key="tile.bop.flowers.glowflower.name">Fior di Luce</entry>
<entry key="tile.bop.flowers.hydrangea.name">Ortensia Blu</entry>
<entry key="tile.bop.flowers.cosmos.name">Cosmea Sulfurea</entry>
<entry key="tile.bop.flowers.daffodil.name">Giunchiglia Rosa</entry>
<entry key="tile.bop.flowers.wildflower.name">Fiore di Campo</entry>
<entry key="tile.bop.flowers.violet.name">Violetta</entry>
<entry key="tile.bop.flowers.anemone.name">Anemone Bianca</entry>
<entry key="tile.bop.flowers.lilyflower.name">Ninfea</entry>
<entry key="tile.bop.flowers.rainbowflower.name">Chromaflora</entry>
<entry key="tile.bop.flowers.bromeliad.name">Aloe</entry>
<entry key="tile.bop.flowers.sunflowerbottom.name">Girasole</entry>
<entry key="tile.bop.flowers.sunflowertop.name">Girasole</entry>
<entry key="tile.bop.flowers.dandelion.name">Dente di Leone Bianco</entry>
<entry key="tile.bop.foliage.algae.name">Alga</entry>
<entry key="tile.bop.foliage.shortgrass.name">Erba Bassa</entry>
<entry key="tile.bop.foliage.mediumgrass.name">Erba Media</entry>
<entry key="tile.bop.foliage.highgrassbottom.name">Erba Alta</entry>
<entry key="tile.bop.foliage.bush.name">Cespuglio</entry>
<entry key="tile.bop.foliage.sprout.name">Germoglio</entry>
<entry key="tile.bop.foliage.highgrasstop.name">Erba Alta</entry>
<entry key="tile.bop.foliage.poisonivy.name">Edera Velenosa</entry>
<entry key="tile.bop.foliage.berrybush.name">Cespuglio di Bacche</entry>
<entry key="tile.bop.petals.bigflowerred.name">Fiore Rosso Gigante</entry>
<entry key="tile.bop.petals.bigfloweryellow.name">Fiore Giallo Gigante</entry>
<entry key="tile.bop.mushrooms.toadstool.name">Fungo a Ombrello</entry>
<entry key="tile.bop.mushrooms.portobello.name">Champignon</entry>
<entry key="tile.bop.mushrooms.bluemilk.name">Lactarius Indigo</entry>
<entry key="tile.bop.mushrooms.glowshroom.name">Fungo Luminoso</entry>
<entry key="tile.bop.saplings.appleSapling.name">Arboscello di Melo</entry>
<entry key="tile.bop.saplings.yellowautumnSapling.name">Arboscello Giallo Autunnale</entry>
<entry key="tile.bop.saplings.bambooSapling.name">Arboscello di Bamboo</entry>
<entry key="tile.bop.saplings.magicSapling.name">Arboscello Magico</entry>
<entry key="tile.bop.saplings.darkSapling.name">Arboscello Oscuro</entry>
<entry key="tile.bop.saplings.deadSapling.name">Arboscello Morente</entry>
<entry key="tile.bop.saplings.firSapling.name">Arboscello d'Abete</entry>
<entry key="tile.bop.saplings.holySapling.name">Arboscello della Terra Promessa</entry>
<entry key="tile.bop.saplings.orangeautumnSapling.name">Arboscello Arancione Autunnale</entry>
<entry key="tile.bop.saplings.originSapling.name">Arboscello della Valle dell'Origine</entry>
<entry key="tile.bop.saplings.pinkcherrySapling.name">Arboscello di Ciliegio Rosa</entry>
<entry key="tile.bop.saplings.mapleSapling.name">Arboscello d'Acero</entry>
<entry key="tile.bop.saplings.whitecherrySapling.name">Arboscello di Ciliegio Bianco</entry>
<entry key="tile.bop.saplings.hellbarkSapling.name">Arboscello della Corteccia Infernale</entry>
<entry key="tile.bop.saplings.jacarandaSapling.name">Arboscello di Jacaranda</entry>
<entry key="tile.bop.saplings.persimmonSapling.name">Arboscello di Cachi</entry>
<entry key="tile.bop.colorizedSaplings.acaciaSapling.name">Arboscello d'Acacia</entry>
<entry key="tile.bop.colorizedSaplings.mangroveSapling.name">Arboscello di Mangrovia</entry>
<entry key="tile.bop.colorizedSaplings.palmSapling.name">Arboscello di Palma</entry>
<entry key="tile.bop.colorizedSaplings.redwoodSapling.name">Arboscello di Sequoia</entry>
<entry key="tile.bop.colorizedSaplings.willowSapling.name">Arboscello di Salice</entry>
<entry key="tile.bop.colorizedSaplings.pineSapling.name">Arboscello di Pino</entry>
<entry key="tile.bop.willow.name">Salice</entry>
<entry key="tile.bop.ivy.name">Edera</entry>
<entry key="tile.bop.leavesFruit.name">Foglie di Melo</entry>
<entry key="tile.bop.leavesFruit2.name">Foglie di Cachi</entry>
<entry key="tile.bop.bamboo.name">Bamboo</entry>
<entry key="tile.bop.mudBricksStairs.name">Scalini in Mattoni di Fango</entry>
<entry key="tile.bop.originGrass.name">Blocco di Erba della Valle dell'Origine</entry>
<entry key="tile.bop.longGrass.name">Blocco di Erba Copiosa</entry>
<entry key="tile.bop.treeMoss.name">Muschio Parassita</entry>
<entry key="tile.bop.coral.kelpsingle.name">Alga Kelp</entry>
<entry key="tile.bop.coral.pinkcoral.name">Corallo Rosa</entry>
<entry key="tile.bop.coral.orangecoral.name">Corallo Arancione</entry>
<entry key="tile.bop.coral.bluecoral.name">Corallo Blu</entry>
<entry key="tile.bop.coral.glowcoral.name">Corallo Luminescente</entry>
<entry key="tile.bop.redCobbleStairs.name">Scalini in Pietrisco di Roccia Rossa</entry>
<entry key="tile.bop.redBricksStairs.name">Scalini in Mattoni di Roccia Rossa</entry>
<entry key="tile.bop.holyGrass.holygrass.name">Blocco di Erba Sacra</entry>
<entry key="tile.bop.holyGrass.smolderinggrass.name">Blocco di Erba Ardente</entry>
<entry key="tile.bop.holyStone.holystone.name">Pietra del Cielo</entry>
<entry key="tile.bop.holyStone.holycobble.name">Pietrisco del Cielo</entry>
<entry key="tile.bop.holyStone.holybrick.name">Mattoni del Cielo</entry>
<entry key="tile.bop.holyCobbleStairs.name">Scalini in Pietrisco del Cielo</entry>
<entry key="tile.bop.holyBricksStairs.name">Scalini in Mattoni del Cielo</entry>
<entry key="tile.bop.promisedPortal.name">Portale della Terra Promessa</entry>
<entry key="tile.bop.amethystOre.amethystore.name">Ametista Grezza</entry>
<entry key="tile.bop.amethystOre.amethystblock.name">Blocco di Ametista</entry>
<entry key="tile.bop.amethystOre.rubyore.name">Rubino Grezzo</entry>
<entry key="tile.bop.amethystOre.rubyblock.name">Blocco di Rubino</entry>
<entry key="tile.bop.amethystOre.peridotore.name">Peridoto Grezzo</entry>
<entry key="tile.bop.amethystOre.peridotblock.name">Blocco di Peridoto</entry>
<entry key="tile.bop.amethystOre.topazore.name">Topazio Grezzo</entry>
<entry key="tile.bop.amethystOre.topazblock.name">Blocco di Topazio</entry>
<entry key="tile.bop.amethystOre.tanzaniteore.name">Tanzanite Grezza</entry>
<entry key="tile.bop.amethystOre.tanzaniteblock.name">Blocco di Tanzanite</entry>
<entry key="tile.bop.amethystOre.apatiteore.name">Apatite Grezza</entry>
<entry key="tile.bop.amethystOre.apatiteblock.name">Blocco di Apatite</entry>
<entry key="tile.bop.amethystOre.sapphireore.name">Zaffiro Grezzo</entry>
<entry key="tile.bop.amethystOre.sapphireblock.name">Blocco di Zaffiro</entry>
<entry key="tile.bop.moss.name">Muschio</entry>
<entry key="tile.bop.cloud.name">Blocco di Nuvola</entry>
<entry key="tile.bop.bones.bones_small.name">Segmento Piccolo d'Ossa</entry>
<entry key="tile.bop.bones.bones_medium.name">Segmento Medio d'Ossa</entry>
<entry key="tile.bop.bones.bones_large.name">Segmento Grande d'Ossa</entry>
<entry key="tile.bop.glass.celestialLens.name">Lenti Celestiali</entry>
<entry key="tile.bop.glass.sacrificialfocus_empty.name">Centro Sacrificale</entry>
<entry key="tile.bop.glass.sacrificialfocus_active.name">Centro Sacrificale</entry>
<entry key="tile.bop.glass.sacrificialfocus_villager.name">Centro Sacrificale</entry>
<entry key="tile.bop.altar.altarframe.name">Struttura dell'Altare</entry>
<entry key="tile.bop.puddle.name">Pozzanghera</entry>
<entry key="tile.bop.grave.name">Lapide</entry>
<entry key="tile.bop.stoneDoubleSlab.redcobbleSlab.name">Lastra di Pietrisco di Roccia Rossa</entry>
<entry key="tile.bop.stoneDoubleSlab.redbrickSlab.name">Lastra di Mattoni di Roccia Rossa</entry>
<entry key="tile.bop.stoneDoubleSlab.mudbrickSlab.name">Lastra di Mattoni di Fango</entry>
<entry key="tile.bop.stoneDoubleSlab.holycobbleSlab.name">Lastra di Pietrisco del Cielo</entry>
<entry key="tile.bop.stoneDoubleSlab.holybrickSlab.name">Lastra di Mattoni del Cielo</entry>
<entry key="tile.bop.stoneSingleSlab.redcobbleSlab.name">Lastra di Pietrisco di Roccia Rossa</entry>
<entry key="tile.bop.stoneSingleSlab.redbrickSlab.name">Lastra di Mattoni di Roccia Rossa</entry>
<entry key="tile.bop.stoneSingleSlab.mudbrickSlab.name">Lastra di Mattoni di Fango</entry>
<entry key="tile.bop.stoneSingleSlab.holycobbleSlab.name">Lastra di Pietrisco del Cielo</entry>
<entry key="tile.bop.stoneSingleSlab.holybrickSlab.name">Lastra di Mattoni del Cielo</entry>
<entry key="tile.bop.planks.acaciaPlank.name">Assi in Legno di Acacia</entry>
<entry key="tile.bop.planks.cherryPlank.name">Assi in Legno di Ciliegio</entry>
<entry key="tile.bop.planks.darkPlank.name">Assi in Legno Oscuro</entry>
<entry key="tile.bop.planks.firPlank.name">Assi in Legno d'Abete</entry>
<entry key="tile.bop.planks.holyPlank.name">Assi in Legno Sacro</entry>
<entry key="tile.bop.planks.magicPlank.name">Assi in Legno Magico</entry>
<entry key="tile.bop.planks.mangrovePlank.name">Assi in Legno di Mangrovia</entry>
<entry key="tile.bop.planks.palmPlank.name">Assi in Legno di Palma</entry>
<entry key="tile.bop.planks.redwoodPlank.name">Assi in Legno di Sequoia</entry>
<entry key="tile.bop.planks.willowPlank.name">Assi in Legno di Salice</entry>
<entry key="tile.bop.planks.bambooThatching.name">Fascio di Bamboo</entry>
<entry key="tile.bop.planks.pinePlank.name">Assi in Legno di Pino</entry>
<entry key="tile.bop.planks.hellBarkPlank.name">Assi in Corteccia dell'inferno</entry>
<entry key="tile.bop.planks.jacarandaPlank.name">Assi in Legno di Jacaranda</entry>
<entry key="tile.bop.wood1.acaciaWood.name">Legno di Acacia</entry>
<entry key="tile.bop.wood1.cherryWood.name">Legno di Ciliegio</entry>
<entry key="tile.bop.wood1.darkWood.name">Legno Oscuro</entry>
<entry key="tile.bop.wood1.firWood.name">Legno d'Abete</entry>
<entry key="tile.bop.wood2.holyWood.name">Legno Sacro</entry>
<entry key="tile.bop.wood2.magicWood.name">Legno Magico</entry>
<entry key="tile.bop.wood2.mangroveWood.name">Legno di Mangrovia</entry>
<entry key="tile.bop.wood2.palmWood.name">Legno di Palma</entry>
<entry key="tile.bop.wood3.redwoodWood.name">Legno di Sequoia</entry>
<entry key="tile.bop.wood3.willowWood.name">Legno di Salice</entry>
<entry key="tile.bop.wood3.deadWood.name">Legno Morto</entry>
<entry key="tile.bop.wood3.bigflowerstemWood.name">Stelo di Fiore Gigante</entry>
<entry key="tile.bop.wood4.pineWood.name">Legno di Pino</entry>
<entry key="tile.bop.wood4.hellbarkWood.name">Legno di Corteccia Infernale</entry>
<entry key="tile.bop.wood4.jacarandaWood.name">Legno di Jacaranda</entry>
<entry key="tile.bop.leaves1.yellowautumn.name">Foglie Gialle Autunnali</entry>
<entry key="tile.bop.leaves1.bamboo.name">Foglie di Bamboo</entry>
<entry key="tile.bop.leaves1.magic.name">Foglie Magiche</entry>
<entry key="tile.bop.leaves1.dark.name">Foglie Oscure</entry>
<entry key="tile.bop.leaves1.dead.name">Foglie Morenti</entry>
<entry key="tile.bop.leaves1.fir.name">Foglie d'Abete</entry>
<entry key="tile.bop.leaves1.holy.name">Foglie Sacre</entry>
<entry key="tile.bop.leaves1.orangeautumn.name">Foglie Arancioni Autunnali</entry>
<entry key="tile.bop.leaves2.origin.name">Foglie della Valle dell'Origine</entry>
<entry key="tile.bop.leaves2.pinkcherry.name">Foglie di Ciliegio Rosa</entry>
<entry key="tile.bop.leaves2.maple.name">Foglie di Acero</entry>
<entry key="tile.bop.leaves2.whitecherry.name">Foglie di Ciliegio Bianco</entry>
<entry key="tile.bop.leaves2.hellbark.name">Foglie di Corteccia Infernale</entry>
<entry key="tile.bop.leaves2.jacaranda.name">Foglie di Jacaranda</entry>
<entry key="tile.bop.woodenDoubleSlab1.acaciaSlab.name">Lastra in Legno di Acacia</entry>
<entry key="tile.bop.woodenDoubleSlab1.cherrySlab.name">Lastra in Legno di Ciliegio</entry>
<entry key="tile.bop.woodenDoubleSlab1.darkSlab.name">Lastra in Legno Oscuro</entry>
<entry key="tile.bop.woodenDoubleSlab1.firSlab.name">Lastra in Legno d'Abete</entry>
<entry key="tile.bop.woodenDoubleSlab1.holySlab.name">Lastra in Legno Sacro</entry>
<entry key="tile.bop.woodenDoubleSlab1.magicSlab.name">Lastra in Legno Magico</entry>
<entry key="tile.bop.woodenDoubleSlab1.mangroveSlab.name">Lastra in Legno di Mangrovia</entry>
<entry key="tile.bop.woodenDoubleSlab1.palmSlab.name">Lastra in Legno di Palma</entry>
<entry key="tile.bop.woodenDoubleSlab2.redwoodSlab.name">Lastra in Legno di Sequoia</entry>
<entry key="tile.bop.woodenDoubleSlab2.willowSlab.name">Lastra in Legno di Salice</entry>
<entry key="tile.bop.woodenDoubleSlab2.pineSlab.name">Lastra in Legno di Pino</entry>
<entry key="tile.bop.woodenDoubleSlab2.hell_barkSlab.name">Lastra in Corteccia dell'Inferno</entry>
<entry key="tile.bop.woodenDoubleSlab2.jacarandaSlab.name">Lastra in Legno di Jacaranda</entry>
<entry key="tile.bop.woodenSingleSlab1.acaciaSlab.name">Lastra in Legno di Acacia</entry>
<entry key="tile.bop.woodenSingleSlab1.cherrySlab.name">Lastra in Legno di Ciliegio</entry>
<entry key="tile.bop.woodenSingleSlab1.darkSlab.name">Lastra in Legno Oscuro</entry>
<entry key="tile.bop.woodenSingleSlab1.firSlab.name">Lastra in Legno d'Abete</entry>
<entry key="tile.bop.woodenSingleSlab1.holySlab.name">Lastra in Legno Sacro</entry>
<entry key="tile.bop.woodenSingleSlab1.magicSlab.name">Lastra in Legno Magico</entry>
<entry key="tile.bop.woodenSingleSlab1.mangroveSlab.name">Lastra in Legno di Mangrovia</entry>
<entry key="tile.bop.woodenSingleSlab1.palmSlab.name">Lastra in Legno di Palma</entry>
<entry key="tile.bop.woodenSingleSlab2.redwoodSlab.name">Lastra in Legno di Sequoia</entry>
<entry key="tile.bop.woodenSingleSlab2.willowSlab.name">Lastra in Legno di Salice</entry>
<entry key="tile.bop.woodenSingleSlab2.pineSlab.name">Lastra in Legno di Pino</entry>
<entry key="tile.bop.woodenSingleSlab2.hell_barkSlab.name">Lastra in Corteccia dell'Inferno</entry>
<entry key="tile.bop.woodenSingleSlab2.jacarandaSlab.name">Lastra in Legno di Jacaranda</entry>
<entry key="tile.bop.acaciaStairs.name">Scalini in Legno di Acacia</entry>
<entry key="tile.bop.cherryStairs.name">Scalini in Legno di Ciliegio</entry>
<entry key="tile.bop.darkStairs.name">Scalini in Legno Oscuro</entry>
<entry key="tile.bop.firStairs.name">Scalini in Legno d'Abete</entry>
<entry key="tile.bop.holyStairs.name">Scalini in Legno Sacro</entry>
<entry key="tile.bop.magicStairs.name">Scalini in Legno Magico</entry>
<entry key="tile.bop.mangroveStairs.name">Scalini in Legno di Mangrovia</entry>
<entry key="tile.bop.palmStairs.name">Scalini in Legno di Palma</entry>
<entry key="tile.bop.redwoodStairs.name">Scalini in Legno di Sequoia</entry>
<entry key="tile.bop.willowStairs.name">Scalini in Legno di Salice</entry>
<entry key="tile.bop.pineStairs.name">Scalini in Legno di Pino</entry>
<entry key="tile.bop.hellBarkStairs.name">Scalini in Corteccia dell'Inferno</entry>
<entry key="tile.bop.jacarandaStairs.name">Scalini in Legno di Jacaranda</entry>
<entry key="tile.bop.leavesColorized.acacia.name">Foglie di Acacia</entry>
<entry key="tile.bop.leavesColorized.mangrove.name">Foglie di Mangrovia</entry>
<entry key="tile.bop.leavesColorized.palm.name">Foglie di Palma</entry>
<entry key="tile.bop.leavesColorized.redwood.name">Foglie di Sequoia</entry>
<entry key="tile.bop.leavesColorized.willow.name">Foglie di Salice</entry>
<entry key="tile.bop.leavesColorized.pine.name">Foglie di Pino</entry>
<!--Items -->
<entry key="item.bop.food.berries.name">Bacca</entry>
<entry key="item.bop.food.shroompowder.name">Polvere di Fungo</entry>
<entry key="item.bop.food.wildcarrots.name">Carote Selvagge</entry>
<entry key="item.bop.food.sunflowerseeds.name">Semi di Girasole</entry>
<entry key="item.bop.food.saladfruit.name">Macedonia</entry>
<entry key="item.bop.food.saladveggie.name">Insalata di Verdure</entry>
<entry key="item.bop.food.saladshroom.name">Insalata di Funghi</entry>
<entry key="item.bop.food.persimmon.name">Cachi</entry>
<entry key="item.bop.dartblower.name">Cerbottana</entry>
<entry key="item.bop.dart.dart.name">Dardo</entry>
<entry key="item.bop.dart.poisondart.name">Dardo Avvelenato</entry>
<entry key="item.bop.mudball.name">Palla di Fango</entry>
<entry key="item.bop.miscItems.mudbrick.name">Mattone di Fango</entry>
<entry key="item.bop.miscItems.ash.name">Cumulo di Cenere</entry>
<entry key="item.bop.miscItems.amethyst.name">Ametista</entry>
<entry key="item.bop.miscItems.poison.name">Veleno</entry>
<entry key="item.bop.miscItems.crystalshard.name">Scheggia di Cristallo Celestiale</entry>
<entry key="item.bop.miscItems.bluedye.name">Tintura Blu</entry>
<entry key="item.bop.miscItems.browndye.name">Tintura Marrone</entry>
<entry key="item.bop.miscItems.greendye.name">Tintura Verde</entry>
<entry key="item.bop.miscItems.whitedye.name">Tintura Bianca</entry>
<entry key="item.bop.miscItems.blackdye.name">Tintura Nera</entry>
<entry key="item.bop.miscItems.ruby.name">Rubino</entry>
<entry key="item.bop.miscItems.peridot.name">Peridoto</entry>
<entry key="item.bop.miscItems.topaz.name">Topazio</entry>
<entry key="item.bop.miscItems.tanzanite.name">Tanzanite</entry>
<entry key="item.bop.miscItems.apatite.name">Apatite</entry>
<entry key="item.bop.miscItems.sapphire.name">Zaffiro</entry>
<entry key="item.bop.miscItems.ghastlysoul.name">Anima Dannata</entry>
<entry key="item.bop.pickaxeMud.name">Piccone di Fango</entry>
<entry key="item.bop.hatchetMud.name">Ascia di Fango</entry>
<entry key="item.bop.shovelMud.name">Pala di Fango</entry>
<entry key="item.bop.swordMud.name">Spada di Fango</entry>
<entry key="item.bop.hoeMud.name">Zappa di Fango</entry>
<entry key="item.bop.helmetMud.name">Elmo di Fango</entry>
<entry key="item.bop.chestplateMud.name">Corazza di Fango</entry>
<entry key="item.bop.leggingsMud.name">Gambali di Fango</entry>
<entry key="item.bop.bootsMud.name">Stivali di Fango</entry>
<entry key="item.bop.pickaxeAmethyst.name">Piccone di Ametista</entry>
<entry key="item.bop.hatchetAmethyst.name">Ascia di Ametista</entry>
<entry key="item.bop.shovelAmethyst.name">Pala di Ametista</entry>
<entry key="item.bop.swordAmethyst.name">Spada di Ametista</entry>
<entry key="item.bop.hoeAmethyst.name">Zappa di Ametista</entry>
<entry key="item.bop.helmetAmethyst.name">Elmo di Ametista</entry>
<entry key="item.bop.chestplateAmethyst.name">Corazza di Ametista</entry>
<entry key="item.bop.leggingsAmethyst.name">Gambali di Ametista</entry>
<entry key="item.bop.bootsAmethyst.name">Stivali di Ametista</entry>
<entry key="item.bop.scytheWood.name">Falce di Legno</entry>
<entry key="item.bop.scytheStone.name">Falce di Pietra</entry>
<entry key="item.bop.scytheIron.name">Falce di Ferro</entry>
<entry key="item.bop.scytheGold.name">Falce d'Oro</entry>
<entry key="item.bop.scytheDiamond.name">Falce di Diamante</entry>
<entry key="item.bop.scytheMud.name">Falce di Fango</entry>
<entry key="item.bop.scytheAmethyst.name">Falce di Ametista</entry>
<entry key="item.bop.ancientStaff.ancientstaff.name">Verga Venerabile</entry>
<entry key="item.bop.ancientStaff.staffhandle.name">Manico della Verga Venerabile</entry>
<entry key="item.bop.ancientStaff.staffpole.name">Corpo della Verga Venerabile</entry>
<entry key="item.bop.ancientStaff.stafftopper.name">Sommit<EFBFBD> della Verga Venerabile</entry>
<entry key="item.bop.ancientStaff.ancientstaffbroken.name">Verga Venerabile Esaurita</entry>
<entry key="item.bop.soulManipulator.soulmanipulator_empty.name">Manipolatore d'Anima</entry>
<entry key="item.bop.soulManipulator.soulmanipulator_ghastlysoul.name">Manipolatore d'Anima - Anima Dannata</entry>
<entry key="item.bop.soulManipulator.soulmanipulator_villager.name">Manipolatore d'Anima - Anima di Villico</entry>
<entry key="item.bop.enderporter.name">Traslatore Ender</entry>
<entry key="item.bop.bopDisc.name">Disco Musicale</entry>
<entry key="item.bop.bopDiscMud.name">Disco Musicale</entry>
<entry key="item.bop.flowerBand.dullflowerband.name">Corona di Fiori Comune</entry>
<entry key="item.bop.flowerBand.plainflowerband.name">Corona di Fiori di Pianura</entry>
<entry key="item.bop.flowerBand.lushflowerband.name">Corona di Fiori Lussureggiante</entry>
<entry key="item.bop.flowerBand.exoticflowerband.name">Corona di Fiori Esotici</entry>
<entry key="item.bop.wadingBoots.name">Stivali da Guado</entry>
<entry key="item.bop.flippers.name">Pinne</entry>
<!--Fluids -->
<entry key="item.bop.bopBucket.amethyst_empty.name">Secchio di Ametista</entry>
<entry key="item.bop.bopBucket.amethyst_spring_water.name">Secchio di Ametista con Acqua Primaverile</entry>
<entry key="item.bop.bopBucket.liquid_poison.name">Secchio di Liquido Velenoso</entry>
<entry key="tile.bop.liquidPoison.name">Liquido Velenoso</entry>
<entry key="tile.bop.springWater.name">Acqua Primaverile</entry>
<entry key="fluid.bop.liquidPoison">Liquido Velenoso</entry>
<entry key="fluid.bop.springWater">Acqua Primaverile</entry>
<!--Phrases -->
<entry key="phrase.bop.promisedPortalOverworld">Un portale per la Terra Promessa <20> apparto nel cielo, sopra di te.</entry>
<entry key="phrase.bop.promisedPortalOther">Un portale per l'Overworld <20> apparto nel cielo, sopra di te.</entry>
<!--Creative Tab -->
<entry key="itemGroup.tabBiomesOPlenty">Biomes O' Plenty</entry>
<!--World Type -->
<entry key="generator.BIOMESOP">Biomes O' Plenty</entry>
</properties>

View File

@ -34,19 +34,17 @@
<entry key="tile.bop.plants.cattailtop.name">ガマ</entry>
<entry key="tile.bop.plants.cattailbottom.name">ガマ</entry>
<entry key="tile.bop.plants.reed.name">ヨシ</entry>
<entry key="tile.bop.plants.cactus.name">小さなサボテン</entry>
<entry key="tile.bop.flowers.clover.name">クローバー</entry>
<entry key="tile.bop.flowers.swampflower.name">沼の花</entry>
<entry key="tile.bop.flowers.deadbloom.name">死の新芽</entry>
<entry key="tile.bop.flowers.glowflower.name">光る花</entry>
<entry key="tile.bop.flowers.hydrangea.name">アジサイ</entry>
<entry key="tile.bop.flowers.daisy.name">ヒナギク</entry>
<entry key="tile.bop.flowers.tulip.name">チューリップ</entry>
<entry key="tile.bop.flowers.wildflower.name">野草</entry>
<entry key="tile.bop.flowers.violet.name">スミレ</entry>
<entry key="tile.bop.flowers.anemone.name">アネモネ</entry>
<entry key="tile.bop.flowers.lilyflower.name">スイレン</entry>
<entry key="tile.bop.flowers.cactus.name">小さなサボテン</entry>
<entry key="tile.bop.flowers.aloe.name">アロエ</entry>
<entry key="tile.bop.flowers.sunflowerbottom.name">ひまわり</entry>
<entry key="tile.bop.flowers.sunflowertop.name">ひまわり</entry>
@ -266,12 +264,8 @@
<entry key="tile.bop.leavesColorized.pine.name">松の葉</entry>
<!--Items -->
<entry key="item.bop.shroomPowder.name">マッシュルームパウダー</entry>
<entry key="item.bop.sunflowerSeeds.name">ひまわりの種</entry>
<entry key="item.bop.food.berries.name">果実</entry>
<entry key="item.bop.food.shroomPowder.name">マッシュルームパウダー</entry>
<entry key="item.bop.food.shroompowder.name">マッシュルームパウダー</entry>
<entry key="item.bop.food.wildcarrots.name">野生のニンジン</entry>
<entry key="item.bop.food.sunflowerseeds.name">ひまわりの種</entry>
<entry key="item.bop.food.saladfruit.name">フルーツサラダ</entry>

View File

@ -34,20 +34,18 @@
<entry key="tile.bop.plants.cattailtop.name">Riet</entry>
<entry key="tile.bop.plants.cattailbottom.name">Riet</entry>
<entry key="tile.bop.plants.reed.name">Riet</entry>
<entry key="tile.bop.flowers.cactus.name">Kleine Cactus</entry>
<entry key="tile.bop.flowers.clover.name">klaver</entry>
<entry key="tile.bop.flowers.swampflower.name">Moerasbloem</entry>
<entry key="tile.bop.flowers.deadbloom.name">Doodbloem</entry>
<entry key="tile.bop.flowers.glowflower.name">Gloeiendebloem</entry>
<entry key="tile.bop.flowers.hydrangea.name">Hortensia</entry>
<entry key="tile.bop.flowers.daisy.name">Madeliefje</entry>
<entry key="tile.bop.flowers.tulip.name">Tulp</entry>
<entry key="tile.bop.flowers.wildflower.name">Wildebloem</entry>
<entry key="tile.bop.flowers.violet.name">Violet</entry>
<entry key="tile.bop.flowers.anemone.name">Anemoon</entry>
<entry key="tile.bop.flowers.lilyflower.name">Waterlely</entry>
<entry key="tile.bop.flowers.cactus.name">Kleine Cactus</entry>
<entry key="tile.bop.flowers.aloe.name">Aloë</entry>
<entry key="tile.bop.flowers.bromeliad.name">Aloë</entry>
<entry key="tile.bop.flowers.sunflowerbottom.name">Zonnebloem</entry>
<entry key="tile.bop.flowers.sunflowertop.name">Zonnebloem</entry>
<entry key="tile.bop.flowers.dandelion.name">Paardebloem</entry>
@ -258,11 +256,9 @@
<entry key="tile.bop.leavesColorized.pine.name">Naald Bladeren</entry>
<!--Items -->
<entry key="item.bop.shroomPowder.name">Shroom Powder</entry>
<entry key="item.bop.sunflowerSeeds.name">ZonneBloemen zaaden</entry>
<entry key="item.bop.berries.name">Bes</entry>
<entry key="item.bop.food.shroompowder.name">Shroom Powder</entry>
<entry key="item.bop.food.sunflowerseeds.name">ZonneBloemen zaaden</entry>
<entry key="item.bop.food.berries.name">Bes</entry>
<entry key="item.bop.dartblower.name">Dart Schieter</entry>
<entry key="item.bop.dart.dart.name">Dart</entry>
@ -326,15 +322,24 @@
<entry key="item.bop.flowerBand.lushflowerband.name">Lush Flower Band</entry>
<entry key="item.bop.flowerBand.exoticflowerband.name">Exotic Flower Band</entry>
<!--Liquids -->
<!--Fluids -->
<entry key="item.bop.bopBucket.spring_water.name">Spring Water Bucket</entry>
<entry key="item.bop.bopBucket.liquid_poison.name">Liquid Poison Bucket</entry>
<entry key="tile.bop.liquidPoison.name">Liquid Poison</entry>
<entry key="tile.bop.springWater.name">Spring Water</entry>
<entry key="fluid.bop.liquidPoison">Liquid Poison</entry>
<entry key="fluid.bop.springWater">Spring Water</entry>
<!--Phrases -->
<entry key="phrase.bop.promisedPortalOverworld">Een portal naar de beloofde wereld is verschenen in de lucht.</entry>
<entry key="phrase.bop.promisedPortalOther">Een portal is verschenen in de lucht.</entry>
<!--Creative Tab -->
<entry key="itemGroup.tabBiomesOPlenty">Biomes O' Plenty</entry>
<!--World Type -->
<entry key="generator.BIOMESOP">Biomes O' Plenty</entry>
</properties>

View File

@ -50,7 +50,7 @@
<entry key="tile.bop.flowers.anemone.name">Zawilec</entry>
<entry key="tile.bop.flowers.lilyflower.name">Lilia wodna</entry>
<entry key="tile.bop.flowers.rainbowflower.name">Chromaflora</entry>
<entry key="tile.bop.flowers.aloe.name">Aloes</entry>
<entry key="tile.bop.flowers.bromeliad.name">Aloes</entry>
<entry key="tile.bop.flowers.sunflowerbottom.name">Słonecznik</entry>
<entry key="tile.bop.flowers.sunflowertop.name">Słonecznik</entry>
<entry key="tile.bop.flowers.dandelion.name">Dmuchawiec</entry>
@ -105,7 +105,7 @@
<entry key="tile.bop.longGrass.name">Blok długiej trawy</entry>
<entry key="tile.bop.treeMoss.name">Mech</entry>
<entry key="tile.bop.coral.kelp.name">Listownicowce</entry>
<entry key="tile.bop.coral.kelpsingle.name">Listownicowce</entry>
<entry key="tile.bop.redCobbleStairs.name">Schody z czerwonego bruku</entry>
<entry key="tile.bop.redBricksStairs.name">Schody z czerwonej skały</entry>

View File

@ -49,7 +49,7 @@
<entry key="tile.bop.flowers.anemone.name">Белый анемон</entry>
<entry key="tile.bop.flowers.lilyflower.name">Кувшинка</entry>
<entry key="tile.bop.flowers.rainbowflower.name">Радужный цветок</entry>
<entry key="tile.bop.flowers.aloe.name">Алоэ</entry>
<entry key="tile.bop.flowers.bromeliad.name">Алоэ</entry>
<entry key="tile.bop.flowers.sunflowerbottom.name">Подсолнечник</entry>
<entry key="tile.bop.flowers.sunflowertop.name">Подсолнечник</entry>
<entry key="tile.bop.flowers.dandelion.name">Белый одуванчик</entry>
@ -355,15 +355,18 @@
<entry key="item.bop.flowerBand.lushflowerband.name">Пышный венок</entry>
<entry key="item.bop.flowerBand.exoticflowerband.name">Экзотический венок</entry>
<entry key="item.bop.wadingBoots.name">Болотные сапоги</entry>
<entry key="item.bop.flippers.name">Ласты</entry>
<!--Fluids -->
<entry key="item.bop.bopBucket.amethyst_empty.name">Аметистовое ведро</entry>
<entry key="item.bop.bopBucket.amethyst_spring_water.name">Аметистовое ведро с родниковой водой</entry>
<entry key="item.bop.bopBucket.liquid_poison.name">Ведро с ядом</entry>
<entry key="item.bop.bopBucket.amethyst_spring_water.name">Аметистовое ведро родниковой воды</entry>
<entry key="item.bop.bopBucket.liquid_poison.name">Ведро яда</entry>
<entry key="tile.bop.liquidPoison.name">Яд</entry>
<entry key="tile.bop.liquidPoison.name">Жидкий яд</entry>
<entry key="tile.bop.springWater.name">Родниковая вода</entry>
<entry key="fluid.bop.liquidPoison">Яд</entry>
<entry key="fluid.bop.liquidPoison">Жидкий яд</entry>
<entry key="fluid.bop.springWater">Родниковая вода</entry>
<!--Phrases -->

View File

@ -34,19 +34,17 @@
<entry key="tile.bop.plants.cattailtop.name">香蒲</entry>
<entry key="tile.bop.plants.cattailbottom.name">香蒲</entry>
<entry key="tile.bop.plants.reed.name">芦苇</entry>
<entry key="tile.bop.plants.cactus.name">仙人球</entry>
<entry key="tile.bop.flowers.clover.name">苜蓿</entry>
<entry key="tile.bop.flowers.swampflower.name">沼泽花</entry>
<entry key="tile.bop.flowers.deadbloom.name">死亡花</entry>
<entry key="tile.bop.flowers.glowflower.name">闪光花</entry>
<entry key="tile.bop.flowers.hydrangea.name">绣球花</entry>
<entry key="tile.bop.flowers.daisy.name">雏菊</entry>
<entry key="tile.bop.flowers.tulip.name">郁金香</entry>
<entry key="tile.bop.flowers.wildflower.name">野花</entry>
<entry key="tile.bop.flowers.violet.name">紫罗兰</entry>
<entry key="tile.bop.flowers.anemone.name">银莲花</entry>
<entry key="tile.bop.flowers.lilyflower.name">水百合</entry>
<entry key="tile.bop.flowers.cactus.name">仙人球</entry>
<entry key="tile.bop.flowers.aloe.name">龙舌兰</entry>
<entry key="tile.bop.flowers.sunflowerbottom.name">向日葵</entry>
<entry key="tile.bop.flowers.sunflowertop.name">向日葵</entry>
@ -101,7 +99,7 @@
<entry key="tile.bop.originGrass.name">源草</entry>
<entry key="tile.bop.treeMoss.name">树藓</entry>
<entry key="tile.bop.coral.kelp.name">巨藻</entry>
<entry key="tile.bop.coral.kelpsingle.name">巨藻</entry>
<entry key="tile.bop.redCobbleStairs.name">红岩圆石楼梯</entry>
<entry key="tile.bop.redBricksStairs.name">红岩砖块楼梯</entry>
@ -265,11 +263,9 @@
<entry key="tile.bop.leavesColorized.pine.name">松树叶</entry>
<!--Items -->
<entry key="item.bop.shroomPowder.name">蘑菇粉</entry>
<entry key="item.bop.sunflowerSeeds.name">葵花籽</entry>
<entry key="item.bop.berries.name">浆果</entry>
<entry key="item.bop.food.berries.name">浆果</entry>
<entry key="item.bop.food.shroompowder.name">蘑菇粉</entry>
<entry key="item.bop.food.sunflowerseeds.name">葵花籽</entry>
<entry key="item.bop.dartblower.name">飞镖吹筒</entry>
<entry key="item.bop.dart.dart.name">飞镖</entry>
@ -343,7 +339,7 @@
<entry key="item.bop.flowerBand.lushflowerband.name">丰饶之花环</entry>
<entry key="item.bop.flowerBand.exoticflowerband.name">异域之花环</entry>
<!--Liquids -->
<!--Fluids -->
<entry key="item.bop.bopBucket.amethyst_empty.name">紫晶桶</entry>
<entry key="item.bop.bopBucket.amethyst_spring_water.name">泉水桶</entry>
<entry key="item.bop.bopBucket.liquid_poison.name">毒液桶</entry>
@ -351,6 +347,9 @@
<entry key="tile.bop.liquidPoison.name">毒液</entry>
<entry key="tile.bop.springWater.name">泉水</entry>
<entry key="fluid.bop.liquidPoison.name">毒液</entry>
<entry key="fluid.bop.springWater.name">泉水</entry>
<!--Phrases -->
<entry key="phrase.bop.promisedPortalOverworld">通往应许之地的神迹之门降临于苍穹之上.</entry>
<entry key="phrase.bop.promisedPortalOther">神迹之门降临于苍穹之上.</entry>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 844 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 473 B

View File

Before

Width:  |  Height:  |  Size: 545 B

After

Width:  |  Height:  |  Size: 545 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 372 B

After

Width:  |  Height:  |  Size: 590 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 315 B

After

Width:  |  Height:  |  Size: 593 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 297 B

After

Width:  |  Height:  |  Size: 528 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 329 B

After

Width:  |  Height:  |  Size: 649 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 320 B

After

Width:  |  Height:  |  Size: 582 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 316 B

After

Width:  |  Height:  |  Size: 603 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 248 B

After

Width:  |  Height:  |  Size: 507 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 326 B

After

Width:  |  Height:  |  Size: 583 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 303 B

After

Width:  |  Height:  |  Size: 582 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 646 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 768 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 307 B

After

Width:  |  Height:  |  Size: 718 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 325 B

After

Width:  |  Height:  |  Size: 597 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 340 B

After

Width:  |  Height:  |  Size: 702 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 671 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 291 B

After

Width:  |  Height:  |  Size: 665 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 496 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 398 B

After

Width:  |  Height:  |  Size: 579 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 290 B

After

Width:  |  Height:  |  Size: 580 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 360 B

After

Width:  |  Height:  |  Size: 804 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 385 B

After

Width:  |  Height:  |  Size: 651 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 281 B

After

Width:  |  Height:  |  Size: 584 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 491 B

After

Width:  |  Height:  |  Size: 519 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 304 B

After

Width:  |  Height:  |  Size: 404 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 365 B

After

Width:  |  Height:  |  Size: 351 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 465 B

After

Width:  |  Height:  |  Size: 470 B