diff --git a/README.md b/README.md index 29b08934d..0c20c3ee3 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/common/biomesoplenty/api/Biomes.java b/common/biomesoplenty/api/Biomes.java index 48321ab51..f0a7259d9 100644 --- a/common/biomesoplenty/api/Biomes.java +++ b/common/biomesoplenty/api/Biomes.java @@ -51,6 +51,7 @@ public class Biomes public static Optional hotSprings = Optional.absent(); public static Optional icyHills = Optional.absent(); public static Optional jadeCliffs = Optional.absent(); + public static Optional lavenderFields = Optional.absent(); public static Optional lushDesert = Optional.absent(); public static Optional lushSwamp = Optional.absent(); public static Optional mangrove = Optional.absent(); @@ -113,7 +114,10 @@ public class Biomes public static Optional timber = Optional.absent(); public static Optional timberThin = Optional.absent(); public static Optional tropicalRainforest = Optional.absent(); + public static Optional tropics = Optional.absent(); + public static Optional tropicsMountain = Optional.absent(); + public static Optional tundra = Optional.absent(); public static Optional volcano = Optional.absent(); public static Optional wasteland = Optional.absent(); diff --git a/common/biomesoplenty/api/BlockReferences.java b/common/biomesoplenty/api/BlockReferences.java index dc4ad9a5c..ac119eacb 100644 --- a/common/biomesoplenty/api/BlockReferences.java +++ b/common/biomesoplenty/api/BlockReferences.java @@ -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 block; diff --git a/common/biomesoplenty/api/Blocks.java b/common/biomesoplenty/api/Blocks.java index b32483a0c..b4e8c5a76 100644 --- a/common/biomesoplenty/api/Blocks.java +++ b/common/biomesoplenty/api/Blocks.java @@ -64,6 +64,7 @@ public class Blocks // Plants public static Optional flowers = Optional.absent(); + public static Optional flowers2 = Optional.absent(); public static Optional mushrooms = Optional.absent(); public static Optional coral = Optional.absent(); public static Optional leaves1 = Optional.absent(); diff --git a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java index 5fa6ffa31..e0c9b09eb 100644 --- a/common/biomesoplenty/biomes/BiomeDecoratorBOP.java +++ b/common/biomesoplenty/biomes/BiomeDecoratorBOP.java @@ -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; @@ -1098,6 +1122,54 @@ public class BiomeDecoratorBOP extends BiomeDecorator var5 = chunk_Z + randomGenerator.nextInt(16) + 8; 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) { diff --git a/common/biomesoplenty/biomes/BiomeGenBirchForest.java b/common/biomesoplenty/biomes/BiomeGenBirchForest.java index edda9e5c3..2ae9418ff 100644 --- a/common/biomesoplenty/biomes/BiomeGenBirchForest.java +++ b/common/biomesoplenty/biomes/BiomeGenBirchForest.java @@ -23,6 +23,7 @@ public class BiomeGenBirchForest extends BiomeGenBase customBiomeDecorator.flowersPerChunk = -999; customBiomeDecorator.tinyFlowersPerChunk = 6; customBiomeDecorator.poisonIvyPerChunk = 3; + customBiomeDecorator.lilyOfTheValleysPerChunk = 15; } /** diff --git a/common/biomesoplenty/biomes/BiomeGenLavenderFields.java b/common/biomesoplenty/biomes/BiomeGenLavenderFields.java new file mode 100644 index 000000000..cedb91a67 --- /dev/null +++ b/common/biomesoplenty/biomes/BiomeGenLavenderFields.java @@ -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); + } + } + } +} diff --git a/common/biomesoplenty/biomes/BiomeGenLushDesert.java b/common/biomesoplenty/biomes/BiomeGenLushDesert.java index e340c36f6..2a5afeae6 100644 --- a/common/biomesoplenty/biomes/BiomeGenLushDesert.java +++ b/common/biomesoplenty/biomes/BiomeGenLushDesert.java @@ -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; diff --git a/common/biomesoplenty/biomes/BiomeGenOutback.java b/common/biomesoplenty/biomes/BiomeGenOutback.java index 652f473b9..474568ec0 100644 --- a/common/biomesoplenty/biomes/BiomeGenOutback.java +++ b/common/biomesoplenty/biomes/BiomeGenOutback.java @@ -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; } diff --git a/common/biomesoplenty/biomes/BiomeGenPrairie.java b/common/biomesoplenty/biomes/BiomeGenPrairie.java index 64b895caf..3ae8439ca 100644 --- a/common/biomesoplenty/biomes/BiomeGenPrairie.java +++ b/common/biomesoplenty/biomes/BiomeGenPrairie.java @@ -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; diff --git a/common/biomesoplenty/biomes/BiomeGenSpruceWoods.java b/common/biomesoplenty/biomes/BiomeGenSpruceWoods.java index 749cd857a..5b8328e4f 100644 --- a/common/biomesoplenty/biomes/BiomeGenSpruceWoods.java +++ b/common/biomesoplenty/biomes/BiomeGenSpruceWoods.java @@ -28,6 +28,7 @@ public class BiomeGenSpruceWoods extends BiomeGenBase customBiomeDecorator.poisonIvyPerChunk = 1; customBiomeDecorator.berryBushesPerChunk = 3; customBiomeDecorator.carrotsPerChunk = 1; + customBiomeDecorator.bluebellsPerChunk = 100; } /** diff --git a/common/biomesoplenty/biomes/BiomeGenTropics.java b/common/biomesoplenty/biomes/BiomeGenTropics.java index 324be4b06..5d0ead9e4 100644 --- a/common/biomesoplenty/biomes/BiomeGenTropics.java +++ b/common/biomesoplenty/biomes/BiomeGenTropics.java @@ -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(); diff --git a/common/biomesoplenty/biomes/nether/BiomeGenNetherBase.java b/common/biomesoplenty/biomes/nether/BiomeGenNetherBase.java index 87bcf7d3f..421995690 100644 --- a/common/biomesoplenty/biomes/nether/BiomeGenNetherBase.java +++ b/common/biomesoplenty/biomes/nether/BiomeGenNetherBase.java @@ -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(); diff --git a/common/biomesoplenty/biomes/nether/BiomeGenNetherGarden.java b/common/biomesoplenty/biomes/nether/BiomeGenNetherGarden.java index 43894089d..ff7e0b1e6 100644 --- a/common/biomesoplenty/biomes/nether/BiomeGenNetherGarden.java +++ b/common/biomesoplenty/biomes/nether/BiomeGenNetherGarden.java @@ -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(); diff --git a/common/biomesoplenty/biomes/nether/BiomeGenNetherLava.java b/common/biomesoplenty/biomes/nether/BiomeGenNetherLava.java index d0010b874..72cb9b212 100644 --- a/common/biomesoplenty/biomes/nether/BiomeGenNetherLava.java +++ b/common/biomesoplenty/biomes/nether/BiomeGenNetherLava.java @@ -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(); diff --git a/common/biomesoplenty/blocks/BlockBOPFlower.java b/common/biomesoplenty/blocks/BlockBOPFlower.java index 189c79999..6db746edd 100644 --- a/common/biomesoplenty/blocks/BlockBOPFlower.java +++ b/common/biomesoplenty/blocks/BlockBOPFlower.java @@ -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; @@ -284,6 +286,38 @@ public class BlockBOPFlower extends BlockFlower 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 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) diff --git a/common/biomesoplenty/blocks/BlockBOPFlower2.java b/common/biomesoplenty/blocks/BlockBOPFlower2.java new file mode 100644 index 000000000..08a392975 --- /dev/null +++ b/common/biomesoplenty/blocks/BlockBOPFlower2.java @@ -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; + } +} diff --git a/common/biomesoplenty/blocks/BlockBOPPlant.java b/common/biomesoplenty/blocks/BlockBOPPlant.java index 38defdcf7..90f819436 100644 --- a/common/biomesoplenty/blocks/BlockBOPPlant.java +++ b/common/biomesoplenty/blocks/BlockBOPPlant.java @@ -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 diff --git a/common/biomesoplenty/configuration/BOPBiomes.java b/common/biomesoplenty/configuration/BOPBiomes.java index fb667a336..3016e9bc9 100644 --- a/common/biomesoplenty/configuration/BOPBiomes.java +++ b/common/biomesoplenty/configuration/BOPBiomes.java @@ -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); @@ -827,6 +799,10 @@ public class BOPBiomes { if (BOPConfigurationBiomeGen.jadeCliffsGen) { registerBiome(Biomes.jadeCliffs); } + + if (BOPConfigurationBiomeGen.lavenderFieldsGen) { + registerBiome(Biomes.lavenderFields); + } if (BOPConfigurationBiomeGen.lushDesertGen) { registerBiome(Biomes.lushDesert); @@ -1220,6 +1196,10 @@ public class BOPBiomes { if (BOPConfigurationBiomeGen.jadeCliffsGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.jadeCliffs); } + + if (BOPConfigurationBiomeGen.lavenderFieldsGen) { + addBiomeToWorldTypes(getWorldTypes(), Biomes.lavenderFields); + } if (BOPConfigurationBiomeGen.lushDesertGen) { addBiomeToWorldTypes(getWorldTypes(), Biomes.lushDesert); diff --git a/common/biomesoplenty/configuration/BOPBlocks.java b/common/biomesoplenty/configuration/BOPBlocks.java index 3cbd58fb6..53802d431 100644 --- a/common/biomesoplenty/configuration/BOPBlocks.java +++ b/common/biomesoplenty/configuration/BOPBlocks.java @@ -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"); diff --git a/common/biomesoplenty/configuration/BOPCrafting.java b/common/biomesoplenty/configuration/BOPCrafting.java index c125f54be..f1777200c 100644 --- a/common/biomesoplenty/configuration/BOPCrafting.java +++ b/common/biomesoplenty/configuration/BOPCrafting.java @@ -35,6 +35,13 @@ public class BOPCrafting GameRegistry.addShapelessRecipe(new ItemStack(Item.dyePowder, 2, 5), new Object[] {new ItemStack(Blocks.flowers.get(),1,8)}); 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)}); diff --git a/common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java b/common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java index c3ca1accb..7a0e39c84 100644 --- a/common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java +++ b/common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java @@ -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); diff --git a/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java b/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java index 64ddf686a..42dd36d2f 100644 --- a/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java +++ b/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java @@ -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; @@ -396,6 +399,8 @@ public class BOPConfigurationIDs graveID = config.getBlock("Grave ID", 1981, null).getInt(); 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(); diff --git a/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java b/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java index 4f4bfdb0d..16d2f6c21 100644 --- a/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java +++ b/common/biomesoplenty/configuration/configfile/BOPConfigurationTerrainGen.java @@ -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!"); } diff --git a/common/biomesoplenty/handlers/BonemealHandler.java b/common/biomesoplenty/handlers/BonemealHandler.java index 0e837e493..c3357cc55 100644 --- a/common/biomesoplenty/handlers/BonemealHandler.java +++ b/common/biomesoplenty/handlers/BonemealHandler.java @@ -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); diff --git a/common/biomesoplenty/handlers/VillageMaterialEventHandler.java b/common/biomesoplenty/handlers/VillageMaterialEventHandler.java index 676062ecc..6e1a2e624 100644 --- a/common/biomesoplenty/handlers/VillageMaterialEventHandler.java +++ b/common/biomesoplenty/handlers/VillageMaterialEventHandler.java @@ -60,7 +60,7 @@ public class VillageMaterialEventHandler //Glass Panes if (event.original == Block.thinGlass.blockID) { - event.replacement = Block.blockSnow.blockID; + event.replacement = Block.ice.blockID; event.setResult(Result.DENY); } @@ -71,13 +71,6 @@ public class VillageMaterialEventHandler event.setResult(Result.DENY); } - //Fences - if (event.original == Block.fence.blockID) - { - event.replacement = Block.cobblestoneWall.blockID; - event.setResult(Result.DENY); - } - //Double Stone Slabs if (event.original == Block.stoneDoubleSlab.blockID) { @@ -132,11 +125,512 @@ public class VillageMaterialEventHandler event.replacement = Block.dirt.blockID; event.setResult(Result.DENY); } - - //Pressure Plate - if (event.original == Block.pressurePlatePlanks.blockID) + } + + //Birch Forest + if (event.biome == Biomes.birchForest.get()) + { + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) { - event.replacement = 0; + event.replacement = Block.stairsWoodBirch.blockID; + event.setResult(Result.DENY); + } + } + + //Brushland + if (event.biome == Biomes.brushland.get()) + { + //Gravel + if (event.original == Block.gravel.blockID) + { + event.replacement = Block.sand.blockID; + event.setResult(Result.DENY); + } + } + + //Coniferous Forest + if (event.biome == Biomes.coniferousForest.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Blocks.logs1.get().blockID; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = Blocks.logs1.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = Blocks.planks.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Blocks.firStairs.get().blockID; + event.setResult(Result.DENY); + } + + //Cobblestone Stairs + if (event.original == Block.stairsCobblestone.blockID) + { + event.replacement = Blocks.firStairs.get().blockID; + event.setResult(Result.DENY); + } + + //Stone Slabs + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = Blocks.woodenSingleSlab1.get().blockID; + event.setResult(Result.DENY); + } + + //Lava + if (event.original == Block.lavaStill.blockID) + { + event.replacement = Block.waterStill.blockID; + event.setResult(Result.DENY); + } + if (event.original == Block.lavaMoving.blockID) + { + event.replacement = Block.waterMoving.blockID; + event.setResult(Result.DENY); + } + + //Glass Panes + if (event.original == Block.thinGlass.blockID) + { + event.replacement = Block.fenceIron.blockID; + event.setResult(Result.DENY); + } + } + + //Desert + if (event.biome == Biomes.desertNew.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Block.sandStone.blockID; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = Block.sandStone.blockID; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = Block.sandStone.blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Block.stairsSandStone.blockID; + event.setResult(Result.DENY); + } + + //Cobblestone Stairs + if (event.original == Block.stairsCobblestone.blockID) + { + event.replacement = Block.stairsSandStone.blockID; + event.setResult(Result.DENY); + } + + //Gravel + if (event.original == Block.gravel.blockID) + { + event.replacement = Block.sandStone.blockID; + event.setResult(Result.DENY); + } + } + + //Grove + if (event.biome == Biomes.grove.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Block.wood.blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Block.leaves.blockID; + event.setResult(Result.DENY); + } + + //Cobblestone Stairs + if (event.original == Block.stairsCobblestone.blockID) + { + event.replacement = Block.stairsWoodSpruce.blockID; + event.setResult(Result.DENY); + } + + //Stone Slabs + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = Block.woodSingleSlab.blockID; + event.setResult(Result.DENY); + } + + //Lava + if (event.original == Block.lavaStill.blockID) + { + event.replacement = Block.waterStill.blockID; + event.setResult(Result.DENY); + } + if (event.original == Block.lavaMoving.blockID) + { + event.replacement = Block.waterMoving.blockID; + event.setResult(Result.DENY); + } + + //Glass Panes + if (event.original == Block.thinGlass.blockID) + { + event.replacement = Block.fenceIron.blockID; + event.setResult(Result.DENY); + } + } + + //Heathland + if (event.biome == Biomes.heathland.get()) + { + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = Blocks.logs4.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = Blocks.planks.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Blocks.jacarandaStairs.get().blockID; + event.setResult(Result.DENY); + } + + //Gravel + if (event.original == Block.gravel.blockID) + { + event.replacement = Block.sand.blockID; + event.setResult(Result.DENY); + } + } + + //Lush Desert + if (event.biome == Biomes.lushDesert.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Blocks.redRock.get().blockID; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = Blocks.logs1.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = Blocks.planks.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Blocks.acaciaStairs.get().blockID; + event.setResult(Result.DENY); + } + + //Cobblestone Stairs + if (event.original == Block.stairsCobblestone.blockID) + { + event.replacement = Blocks.redCobbleStairs.get().blockID; + event.setResult(Result.DENY); + } + + //Stone Slabs + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = Blocks.stoneSingleSlab.get().blockID; + event.setResult(Result.DENY); + } + + //Gravel + if (event.original == Block.gravel.blockID) + { + event.replacement = Block.sand.blockID; + event.setResult(Result.DENY); + } + + //Glass Panes + if (event.original == Block.thinGlass.blockID) + { + event.replacement = Block.fenceIron.blockID; + event.setResult(Result.DENY); + } + } + + //Lush Swamp + if (event.biome == Biomes.lushSwamp.get()) + { + //Gravel + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Block.cobblestoneMossy.blockID; + event.setResult(Result.DENY); + } + } + + //Maple Woods + if (event.biome == Biomes.mapleWoods.get()) + { + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Block.stairsWoodSpruce.blockID; + event.setResult(Result.DENY); + } + } + + //Meadow + if (event.biome == Biomes.meadow.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Block.wood.blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Block.stairsWoodSpruce.blockID; + event.setResult(Result.DENY); + } + + //Cobblestone Stairs + if (event.original == Block.stairsCobblestone.blockID) + { + event.replacement = Block.stairsWoodSpruce.blockID; + event.setResult(Result.DENY); + } + + //Stone Slabs + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = Block.woodSingleSlab.blockID; + event.setResult(Result.DENY); + } + + //Lava + if (event.original == Block.lavaStill.blockID) + { + event.replacement = Block.waterStill.blockID; + event.setResult(Result.DENY); + } + if (event.original == Block.lavaMoving.blockID) + { + event.replacement = Block.waterMoving.blockID; + event.setResult(Result.DENY); + } + + //Glass Panes + if (event.original == Block.thinGlass.blockID) + { + event.replacement = Block.fenceIron.blockID; + event.setResult(Result.DENY); + } + } + + //Meadow Forest + if (event.biome == Biomes.meadowForest.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Block.wood.blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Block.stairsWoodSpruce.blockID; + event.setResult(Result.DENY); + } + + //Cobblestone Stairs + if (event.original == Block.stairsCobblestone.blockID) + { + event.replacement = Block.stairsWoodSpruce.blockID; + event.setResult(Result.DENY); + } + + //Stone Slabs + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = Block.woodSingleSlab.blockID; + event.setResult(Result.DENY); + } + + //Lava + if (event.original == Block.lavaStill.blockID) + { + event.replacement = Block.waterStill.blockID; + event.setResult(Result.DENY); + } + if (event.original == Block.lavaMoving.blockID) + { + event.replacement = Block.waterMoving.blockID; + event.setResult(Result.DENY); + } + + //Glass Panes + if (event.original == Block.thinGlass.blockID) + { + event.replacement = Block.fenceIron.blockID; + event.setResult(Result.DENY); + } + } + + //Outback + if (event.biome == Biomes.outback.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Blocks.logs1.get().blockID; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = Blocks.logs1.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = Blocks.planks.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Block.leaves.blockID; + event.setResult(Result.DENY); + } + + //Cobblestone Stairs + if (event.original == Block.stairsCobblestone.blockID) + { + event.replacement = Blocks.acaciaStairs.get().blockID; + event.setResult(Result.DENY); + } + + //Stone Slabs + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = Blocks.woodenSingleSlab1.get().blockID; + event.setResult(Result.DENY); + } + + //Lava + if (event.original == Block.lavaStill.blockID) + { + event.replacement = Block.waterStill.blockID; + event.setResult(Result.DENY); + } + if (event.original == Block.lavaMoving.blockID) + { + event.replacement = Block.waterMoving.blockID; + event.setResult(Result.DENY); + } + + //Gravel + if (event.original == Block.gravel.blockID) + { + event.replacement = Block.sand.blockID; + event.setResult(Result.DENY); + } + + //Glass Panes + if (event.original == Block.thinGlass.blockID) + { + event.replacement = Block.fenceIron.blockID; + event.setResult(Result.DENY); + } + } + + //Overgrown Greens + if (event.biome == Biomes.overgrownGreens.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Block.cobblestoneMossy.blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Block.leaves.blockID; + event.setResult(Result.DENY); + } + + //Gravel + if (event.original == Block.gravel.blockID) + { + event.replacement = Block.grass.blockID; + event.setResult(Result.DENY); + } + } + + //Prairie + if (event.biome == Biomes.prairie.get()) + { + //Gravel + if (event.original == Block.gravel.blockID) + { + event.replacement = Block.sand.blockID; event.setResult(Result.DENY); } } @@ -204,6 +698,653 @@ public class VillageMaterialEventHandler event.replacement = Block.sand.blockID; event.setResult(Result.DENY); } + + //Glass Panes + if (event.original == Block.thinGlass.blockID) + { + event.replacement = Block.fenceIron.blockID; + event.setResult(Result.DENY); + } + } + + //Scrubland + if (event.biome == Biomes.scrubland.get()) + { + //Gravel + if (event.original == Block.gravel.blockID) + { + event.replacement = Block.sand.blockID; + event.setResult(Result.DENY); + } + } + + //Snowy Coniferous Forest + if (event.biome == Biomes.coniferousForestSnow.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Blocks.logs1.get().blockID; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = Blocks.logs1.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = Blocks.planks.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Blocks.firStairs.get().blockID; + event.setResult(Result.DENY); + } + + //Cobblestone Stairs + if (event.original == Block.stairsCobblestone.blockID) + { + event.replacement = Blocks.firStairs.get().blockID; + event.setResult(Result.DENY); + } + + //Stone Slabs + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = Blocks.woodenSingleSlab1.get().blockID; + event.setResult(Result.DENY); + } + + //Lava + if (event.original == Block.lavaStill.blockID) + { + event.replacement = Block.waterStill.blockID; + event.setResult(Result.DENY); + } + if (event.original == Block.lavaMoving.blockID) + { + event.replacement = Block.waterMoving.blockID; + event.setResult(Result.DENY); + } + + //Glass Panes + if (event.original == Block.thinGlass.blockID) + { + event.replacement = Block.fenceIron.blockID; + event.setResult(Result.DENY); + } + } + + //Spruce Woods + if (event.biome == Biomes.spruceWoods.get()) + { + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Block.stairsWoodSpruce.blockID; + event.setResult(Result.DENY); + } + } + + //Steppe + if (event.biome == Biomes.steppe.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Blocks.logs1.get().blockID; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = Blocks.logs1.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = Blocks.planks.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Blocks.acaciaStairs.get().blockID; + event.setResult(Result.DENY); + } + + //Cobblestone Stairs + if (event.original == Block.stairsCobblestone.blockID) + { + event.replacement = Blocks.acaciaStairs.get().blockID; + event.setResult(Result.DENY); + } + + //Stone Slabs + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = Blocks.woodenSingleSlab1.get().blockID; + event.setResult(Result.DENY); + } + + //Lava + if (event.original == Block.lavaStill.blockID) + { + event.replacement = Block.waterStill.blockID; + event.setResult(Result.DENY); + } + if (event.original == Block.lavaMoving.blockID) + { + event.replacement = Block.waterMoving.blockID; + event.setResult(Result.DENY); + } + + //Gravel + if (event.original == Block.gravel.blockID) + { + event.replacement = Block.sand.blockID; + event.setResult(Result.DENY); + } + + //Glass Panes + if (event.original == Block.thinGlass.blockID) + { + event.replacement = Block.fenceIron.blockID; + event.setResult(Result.DENY); + } + } + + //Tropical Rainforest + if (event.biome == Biomes.tropicalRainforest.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Block.wood.blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Block.stairsWoodJungle.blockID; + event.setResult(Result.DENY); + } + + //Cobblestone Stairs + if (event.original == Block.stairsCobblestone.blockID) + { + event.replacement = Block.stairsWoodJungle.blockID; + event.setResult(Result.DENY); + } + + //Stone Slabs + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = Block.woodSingleSlab.blockID; + event.setResult(Result.DENY); + } + + //Lava + if (event.original == Block.lavaStill.blockID) + { + event.replacement = Block.waterStill.blockID; + event.setResult(Result.DENY); + } + if (event.original == Block.lavaMoving.blockID) + { + event.replacement = Block.waterMoving.blockID; + event.setResult(Result.DENY); + } + + //Gravel + if (event.original == Block.gravel.blockID) + { + event.replacement = Block.sand.blockID; + event.setResult(Result.DENY); + } + + //Glass Panes + if (event.original == Block.thinGlass.blockID) + { + event.replacement = Block.fenceIron.blockID; + event.setResult(Result.DENY); + } + } + + //Wetland + if (event.biome == Biomes.wetland.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = Blocks.logs3.get().blockID; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = Blocks.logs3.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = Blocks.planks.get().blockID; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = Blocks.willowStairs.get().blockID; + event.setResult(Result.DENY); + } + + //Cobblestone Stairs + if (event.original == Block.stairsCobblestone.blockID) + { + event.replacement = Blocks.willowStairs.get().blockID; + event.setResult(Result.DENY); + } + + //Stone Slabs + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = Blocks.woodenSingleSlab2.get().blockID; + event.setResult(Result.DENY); + } + + //Lava + if (event.original == Block.lavaStill.blockID) + { + event.replacement = Block.waterStill.blockID; + event.setResult(Result.DENY); + } + if (event.original == Block.lavaMoving.blockID) + { + event.replacement = Block.waterMoving.blockID; + event.setResult(Result.DENY); + } + + //Glass Panes + if (event.original == Block.thinGlass.blockID) + { + event.replacement = Block.fenceIron.blockID; + event.setResult(Result.DENY); + } + } + } + + @ForgeSubscribe + public void getVillageBlockMeta(BiomeEvent.GetVillageBlockMeta event) + { + //Birch Forest + if (event.biome == Biomes.birchForest.get()) + { + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = 2; + event.setResult(Result.DENY); + } + } + + //Coniferous Forest + if (event.biome == Biomes.coniferousForest.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = 3; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = 3; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = 3; + event.setResult(Result.DENY); + } + + //Single Stone Slab + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = 3; + event.setResult(Result.DENY); + } + } + + //Desert + if (event.biome == Biomes.desertNew.get()) + { + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = 0; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = 2; + event.setResult(Result.DENY); + } + } + + //Grove + if (event.biome == Biomes.grove.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = 5; + event.setResult(Result.DENY); + } + + //Single Stone Slab + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + } + + //Heathland + if (event.biome == Biomes.heathland.get()) + { + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = 2; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = 13; + event.setResult(Result.DENY); + } + } + + //Lush Desert + if (event.biome == Biomes.lushDesert.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Single Stone Slab + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = 0; + event.setResult(Result.DENY); + } + } + + //Maple Woods + if (event.biome == Biomes.mapleWoods.get()) + { + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + } + + //Meadow + if (event.biome == Biomes.meadow.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Single Stone Slab + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + } + + //Meadow Forest + if (event.biome == Biomes.meadowForest.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Single Stone Slab + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + } + + //Outback + if (event.biome == Biomes.outback.get()) + { + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = 4; + event.setResult(Result.DENY); + } + } + + //Overgrown Greens + if (event.biome == Biomes.overgrownGreens.get()) + { + //Wooden Stairs + if (event.original == Block.stairsWoodOak.blockID) + { + event.replacement = 4; + event.setResult(Result.DENY); + } + } + + //Snowy Coniferous Forest + if (event.biome == Biomes.coniferousForestSnow.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = 3; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = 3; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = 3; + event.setResult(Result.DENY); + } + + //Single Stone Slab + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = 3; + event.setResult(Result.DENY); + } + } + + //Spruce Woods + if (event.biome == Biomes.spruceWoods.get()) + { + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + } + + //Tropical Rainforest + if (event.biome == Biomes.tropicalRainforest.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = 3; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = 3; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = 3; + event.setResult(Result.DENY); + } + + //Single Stone Slab + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = 3; + event.setResult(Result.DENY); + } + } + + //Wetland + if (event.biome == Biomes.wetland.get()) + { + //Cobblestone + if (event.original == Block.cobblestone.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Logs + if (event.original == Block.wood.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } + + //Wooden Planks + if (event.original == Block.planks.blockID) + { + event.replacement = 9; + event.setResult(Result.DENY); + } + + //Single Stone Slab + if (event.original == Block.stoneSingleSlab.blockID) + { + event.replacement = 1; + event.setResult(Result.DENY); + } } } } \ No newline at end of file diff --git a/common/biomesoplenty/helpers/Localizations.java b/common/biomesoplenty/helpers/Localizations.java index eec13400b..eb264ff67 100644 --- a/common/biomesoplenty/helpers/Localizations.java +++ b/common/biomesoplenty/helpers/Localizations.java @@ -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) { diff --git a/common/biomesoplenty/integration/ForestryIntegration.java b/common/biomesoplenty/integration/ForestryIntegration.java index 89f36b5ff..bed8a4e42 100644 --- a/common/biomesoplenty/integration/ForestryIntegration.java +++ b/common/biomesoplenty/integration/ForestryIntegration.java @@ -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); diff --git a/common/biomesoplenty/integration/ThaumcraftIntegration.java b/common/biomesoplenty/integration/ThaumcraftIntegration.java index e8d67c389..9ac620f3f 100644 --- a/common/biomesoplenty/integration/ThaumcraftIntegration.java +++ b/common/biomesoplenty/integration/ThaumcraftIntegration.java @@ -217,11 +217,18 @@ 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)); } diff --git a/common/biomesoplenty/itemblocks/ItemBlockFlower.java b/common/biomesoplenty/itemblocks/ItemBlockFlower.java index 8aafd9cf6..3810b866e 100644 --- a/common/biomesoplenty/itemblocks/ItemBlockFlower.java +++ b/common/biomesoplenty/itemblocks/ItemBlockFlower.java @@ -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; diff --git a/common/biomesoplenty/itemblocks/ItemBlockFlower2.java b/common/biomesoplenty/itemblocks/ItemBlockFlower2.java new file mode 100644 index 000000000..9bf57957b --- /dev/null +++ b/common/biomesoplenty/itemblocks/ItemBlockFlower2.java @@ -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; + } + } +} diff --git a/common/biomesoplenty/world/WorldTypeBOP.java b/common/biomesoplenty/world/WorldTypeBOP.java index 00ff49ea9..d078c354b 100644 --- a/common/biomesoplenty/world/WorldTypeBOP.java +++ b/common/biomesoplenty/world/WorldTypeBOP.java @@ -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); diff --git a/common/biomesoplenty/world/layer/BiomeLayerSub.java b/common/biomesoplenty/world/layer/BiomeLayerSub.java index 245a74190..10f1b550a 100644 --- a/common/biomesoplenty/world/layer/BiomeLayerSub.java +++ b/common/biomesoplenty/world/layer/BiomeLayerSub.java @@ -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; } diff --git a/common/biomesoplenty/worldgen/WorldGenCattailBonemeal.java b/common/biomesoplenty/worldgen/WorldGenCattailBonemeal.java new file mode 100644 index 000000000..e7a7b1916 --- /dev/null +++ b/common/biomesoplenty/worldgen/WorldGenCattailBonemeal.java @@ -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; + } +} diff --git a/common/biomesoplenty/worldgen/WorldGenDesertCactus.java b/common/biomesoplenty/worldgen/WorldGenDesertCactus.java index 344d616eb..c4ed86d09 100644 --- a/common/biomesoplenty/worldgen/WorldGenDesertCactus.java +++ b/common/biomesoplenty/worldgen/WorldGenDesertCactus.java @@ -2,49 +2,31 @@ 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); + public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + { + int var999 = par1World.getBlockId(par3, par4, par5); + int var998 = par1World.getBlockMetadata(par3, par4, par5); - if (par1World.isAirBlock(var7, var8, var9)) - { - 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); + if (var999 == Blocks.plants.get().blockID && var998 == 12) + { + int l1 = 1 + par2Random.nextInt(par2Random.nextInt(3) + 1); - for (int var11 = 0; var11 < var10; ++var11) - { - if (Blocks.plants.get().canBlockStay(par1World, var7, var8 + var11, var9)) - { - par1World.setBlock(var7, var8 - 1, var9, Block.sand.blockID); - par1World.setBlock(var7, var8 + var11, var9, Block.cactus.blockID); - } - } - } - } - } - } - } - } + for (int i2 = 0; i2 < l1; ++i2) + { + if (Block.cactus.canBlockStay(par1World, par3, par4 + i2, par5)) + { + par1World.setBlock(par3, par4 + i2, par5, Block.cactus.blockID, 0, 2); + } + } + } - return true; - } + return true; + } } diff --git a/common/biomesoplenty/worldgen/WorldGenMesa.java b/common/biomesoplenty/worldgen/WorldGenMesa.java index cf7f0117b..c48227c96 100644 --- a/common/biomesoplenty/worldgen/WorldGenMesa.java +++ b/common/biomesoplenty/worldgen/WorldGenMesa.java @@ -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); } diff --git a/common/biomesoplenty/worldgen/tree/WorldGenTaiga3.java b/common/biomesoplenty/worldgen/tree/WorldGenTaiga3.java index 5b158728f..e27446de7 100644 --- a/common/biomesoplenty/worldgen/tree/WorldGenTaiga3.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenTaiga3.java @@ -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) diff --git a/common/biomesoplenty/worldgen/tree/WorldGenTaiga4.java b/common/biomesoplenty/worldgen/tree/WorldGenTaiga4.java index d75b17484..0d148768b 100644 --- a/common/biomesoplenty/worldgen/tree/WorldGenTaiga4.java +++ b/common/biomesoplenty/worldgen/tree/WorldGenTaiga4.java @@ -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) diff --git a/resources/assets/biomesoplenty/lang/de_DE.xml b/resources/assets/biomesoplenty/lang/de_DE.xml index 11bdb36d0..b482a2b00 100644 --- a/resources/assets/biomesoplenty/lang/de_DE.xml +++ b/resources/assets/biomesoplenty/lang/de_DE.xml @@ -1,7 +1,7 @@ - Deutsche (de_DE) Sprachdatei vom 09.06.2013 erstellt von Baalith. + Deutsche (de_DE) Sprachdatei vom 09.06.2013 erstellt von Baalith, bearbeitet von Vexatos. Matsch @@ -20,7 +20,7 @@ Rotfels Rotfelssteinpflaster Rotfelsziegel - + Ascheblock Totes Gras @@ -49,7 +49,7 @@ Weißes Windröschen Wasserlilie Chromablume - Aloe + Aloe Sonnenblume Sonnenblume Weißer Löwenzahn @@ -63,15 +63,15 @@ Hohes Gras Gift-Efeu Beerenbusch - + Riesige Rote Blume Riesige Gelbe Blume - + Fliegenpilz Champignon Indigo-Reizker Glimmerling - + Apfelsetzling Gelber Herbstsetzling Bambussetzling @@ -95,7 +95,7 @@ Mammutbaumsetzling Weidensetzling Piniensetzling - + Weide Efeu Apfelbaumblätter @@ -107,21 +107,21 @@ Baummoos Seetang - Pinke Koralle - Orange Koralle - Blaue Koralle - Leuchtende Koralle - + Pinke Koralle + Orange Koralle + Blaue Koralle + Leuchtende Koralle + Rotfelssteinpflastertreppe Rotfelsziegeltreppe - + Heiliges Gras Verkohltes Gras - + Heiliger Stein Heiliges Kopfsteinpflaster Heilige Ziegel - + Heilige Kopfsteinpflastertreppe Heilige Ziegeltreppe @@ -141,9 +141,9 @@ Apatitblock Saphirerz Saphirblock - + Moos - + Wolkenblock Kleines Knochensegment @@ -151,15 +151,15 @@ Großes Knochensegment Himmlische Linse - + Opfer-Fokus Opfer-Fokus Opfer-Fokus - + Altarrahmen - + Pfütze - + Grabstein Rotfelssteinpflasterstufe @@ -272,7 +272,7 @@ Mammutbaumlaub Weidenlaub Pinienlaub - + Beere Pilzpulver @@ -286,7 +286,7 @@ Blasrohr Dart Vergifteter Dart - + Matschball Matschziegel @@ -316,7 +316,7 @@ Matschiger Harnisch Matschige Hose Matschige Stiefel - + Amethystspitzhacke Amethystaxt Amethystschaufel @@ -326,7 +326,7 @@ Amethystharnisch Amethystbeinschutz Amethyststiefel - + Holzsense Steinsense Eisensense @@ -355,24 +355,27 @@ Üppiges Blumenband Exotisches Blumenband + Watstiefel + Schwimmflossen + Amethyst-Eimer Amethyst-Eimer mit Quellwasser Eimer mit Gift - + Gift Quellwasser - + Gift Quellwasser - + Ein Portal zum gelobten Land ist im Himmel entstanden. Ein Portal ist im Himmel entstanden. - + Biomes O' Plenty - + Biomes O' Plenty diff --git a/resources/assets/biomesoplenty/lang/en_US.xml b/resources/assets/biomesoplenty/lang/en_US.xml index bb1602e02..487823e5f 100644 --- a/resources/assets/biomesoplenty/lang/en_US.xml +++ b/resources/assets/biomesoplenty/lang/en_US.xml @@ -1,382 +1,389 @@ - English (en_US) Localization File + English (en_US) Localization File - - Mud - Quicksand + + Mud + Quicksand - Ash Stone - Hardened Sand - Hardened Dirt - Hardened Ice - Dried Dirt - Crag Rock - Mud Bricks - Purified Dirt - Celestial Crystal + Ash Stone + Hardened Sand + Hardened Dirt + Hardened Ice + Dried Dirt + Crag Rock + Mud Bricks + Purified Dirt + Celestial Crystal - Red Rock - Red Rock Cobblestone - Red Rock Bricks - - Ash Block + Red Rock + Red Rock Cobblestone + Red Rock Bricks - Dead Grass - Desert Grass - Desert Sprouts - Dune Grass - Purified Tall Grass - Thorns - Barley - Cattail - Cattail - Cattail - Reed - Tiny Cactus - Wither Wart + Ash Block - Clover - Swampflower - Deathbloom - Glowflower - Blue Hydrangea - Orange Cosmos - Pink Daffodil - Wildflower - Violet - White Anemone - Waterlily - Chromaflora - Aloe - Sunflower - Sunflower - White Dandelion + Dead Grass + Desert Grass + Desert Sprouts + Dune Grass + Purified Tall Grass + Thorns + Barley + Cattail + Cattail + Cattail + Reed + Tiny Cactus + Wither Wart - Algae - Short Grass - Medium Grass - High Grass - Bush - Sprout - High Grass - Poison Ivy - Berry Bush - - Giant Red Flower - Giant Yellow Flower - - Toadstool - Portobello - Blue Milk Cap - Glowshroom - - Apple Sapling - Yellow Autumn Sapling - Bamboo Sapling - Magic Sapling - Dark Sapling - Dying Sapling - Fir Sapling - Loftwood Sapling - Orange Autumn Sapling - Origin Sapling - Pink Cherry Sapling - Maple Sapling - White Cherry Sapling - Hellbark Sapling - Jacaranda Sapling - Persimmon Sapling + Clover + Swampflower + Deathbloom + Glowflower + Blue Hydrangea + Orange Cosmos + Pink Daffodil + Wildflower + Violet + White Anemone + Waterlily + Chromaflora + Bromeliad + Sunflower + Sunflower + White Dandelion + + Pink Hibiscus + Lily of the Valley + Burning Blossom + Lavender + Goldenrod + Bluebells - Acacia Sapling - Mangrove Sapling - Palm Sapling - Redwood Sapling - Willow Sapling - Pine Sapling - - Willow - Ivy - Apple Leaves - Persimmon Leaves - Bamboo - Mud Bricks Stairs - Origin Grass Block - Long Grass Block - Tree Moss + Algae + Short Grass + Medium Grass + High Grass + Bush + Sprout + High Grass + Poison Ivy + Berry Bush - Kelp - Pink Coral - Orange Coral - Blue Coral - Glowing Coral - - Red Rock Cobblestone Stairs - Red Rock Bricks Stairs - - Purified Grass Block - Smoldering Grass Block - - Skystone - Skystone Cobblestone - Skystone Bricks - - Skystone Cobblestone Stairs - Skystone Bricks Stairs + Giant Red Flower + Giant Yellow Flower - Promised Land Portal + Toadstool + Portobello + Blue Milk Cap + Glowshroom - Amethyst Ore - Block of Amethyst - Ruby Ore - Block of Ruby - Peridot Ore - Block of Peridot - Topaz Ore - Block of Topaz - Tanzanite Ore - Block of Tanzanite - Apatite Ore - Block of Apatite - Sapphire Ore - Block of Sapphire - - Moss - - Cloud Block + Apple Sapling + Yellow Autumn Sapling + Bamboo Sapling + Magic Sapling + Dark Sapling + Dying Sapling + Fir Sapling + Loftwood Sapling + Orange Autumn Sapling + Origin Sapling + Pink Cherry Sapling + Maple Sapling + White Cherry Sapling + Hellbark Sapling + Jacaranda Sapling + Persimmon Sapling - Small Bone Segment - Medium Bone Segment - Large Bone Segment + Acacia Sapling + Mangrove Sapling + Palm Sapling + Redwood Sapling + Willow Sapling + Pine Sapling + + Willow + Ivy + Apple Leaves + Persimmon Leaves + Bamboo + Mud Bricks Stairs + Origin Grass Block + Long Grass Block + Tree Moss + + Kelp + Pink Coral + Orange Coral + Blue Coral + Glowing Coral + + Red Rock Cobblestone Stairs + Red Rock Bricks Stairs + + Purified Grass Block + Smoldering Grass Block + + Skystone + Skystone Cobblestone + Skystone Bricks + + Skystone Cobblestone Stairs + Skystone Bricks Stairs + + Promised Land Portal + + Amethyst Ore + Block of Amethyst + Ruby Ore + Block of Ruby + Peridot Ore + Block of Peridot + Topaz Ore + Block of Topaz + Tanzanite Ore + Block of Tanzanite + Apatite Ore + Block of Apatite + Sapphire Ore + Block of Sapphire + + Moss + + Cloud Block + + Small Bone Segment + Medium Bone Segment + Large Bone Segment + + Celestial Lens + + Sacrificial Focus + Sacrificial Focus + Sacrificial Focus + + Altar Frame + + Puddle - Celestial Lens - - Sacrificial Focus - Sacrificial Focus - Sacrificial Focus - - Altar Frame - - Puddle - Gravestone - Red Rock Cobblestone Slab - Red Rock Bricks Slab - Mud Bricks Slab - Skystone Cobblestone Slab - Skystone Bricks Slab + Red Rock Cobblestone Slab + Red Rock Bricks Slab + Mud Bricks Slab + Skystone Cobblestone Slab + Skystone Bricks Slab - Red Rock Cobblestone Slab - Red Rock Bricks Slab - Mud Bricks Slab - Skystone Cobblestone Slab - Skystone Bricks Slab + Red Rock Cobblestone Slab + Red Rock Bricks Slab + Mud Bricks Slab + Skystone Cobblestone Slab + Skystone Bricks Slab - Acacia Wood Planks - Cherry Wood Planks - Dark Wood Planks - Fir Wood Planks - Loftwood Wood Planks - Magic Wood Planks - Mangrove Wood Planks - Palm Wood Planks - Redwood Wood Planks - Willow Wood Planks - Bamboo Thatching - Pine Wood Planks - Hellbark Wood Planks - Jacaranda Wood Planks + Acacia Wood Planks + Cherry Wood Planks + Dark Wood Planks + Fir Wood Planks + Loftwood Wood Planks + Magic Wood Planks + Mangrove Wood Planks + Palm Wood Planks + Redwood Wood Planks + Willow Wood Planks + Bamboo Thatching + Pine Wood Planks + Hellbark Wood Planks + Jacaranda Wood Planks - Acacia Wood - Cherry Wood - Dark Wood - Fir Wood + Acacia Wood + Cherry Wood + Dark Wood + Fir Wood - Loftwood Wood - Magic Wood - Mangrove Wood - Palm Wood + Loftwood Wood + Magic Wood + Mangrove Wood + Palm Wood - Redwood Wood - Willow Wood - Dead Wood - Giant Flower Stem + Redwood Wood + Willow Wood + Dead Wood + Giant Flower Stem - Pine Wood - Hellbark Wood - Jacaranda Wood + Pine Wood + Hellbark Wood + Jacaranda Wood - Yellow Autumn Leaves - Bamboo Leaves - Magic Leaves - Dark Leaves - Dying Leaves - Fir Leaves - Loftwood Leaves - Orange Autumn Leaves + Yellow Autumn Leaves + Bamboo Leaves + Magic Leaves + Dark Leaves + Dying Leaves + Fir Leaves + Loftwood Leaves + Orange Autumn Leaves - Origin Leaves - Pink Cherry Leaves - Maple Leaves - White Cherry Leaves - Hellbark Leaves - Jacaranda Leaves + Origin Leaves + Pink Cherry Leaves + Maple Leaves + White Cherry Leaves + Hellbark Leaves + Jacaranda Leaves - Acacia Wood Slab - Cherry Wood Slab - Dark Wood Slab - Fir Wood Slab - Loftwood Wood Slab - Magic Wood Slab - Mangrove Wood Slab - Palm Wood Slab - Redwood Wood Slab - Willow Wood Slab - Pine Wood Slab - Hellbark Wood Slab - Jacaranda Wood Slab + Acacia Wood Slab + Cherry Wood Slab + Dark Wood Slab + Fir Wood Slab + Loftwood Wood Slab + Magic Wood Slab + Mangrove Wood Slab + Palm Wood Slab + Redwood Wood Slab + Willow Wood Slab + Pine Wood Slab + Hellbark Wood Slab + Jacaranda Wood Slab - Acacia Wood Slab - Cherry Wood Slab - Dark Wood Slab - Fir Wood Slab - Loftwood Wood Slab - Magic Wood Slab - Mangrove Wood Slab - Palm Wood Slab - Redwood Wood Slab - Willow Wood Slab - Pine Wood Slab - Hellbark Wood Slab - Jacaranda Wood Slab + Acacia Wood Slab + Cherry Wood Slab + Dark Wood Slab + Fir Wood Slab + Loftwood Wood Slab + Magic Wood Slab + Mangrove Wood Slab + Palm Wood Slab + Redwood Wood Slab + Willow Wood Slab + Pine Wood Slab + Hellbark Wood Slab + Jacaranda Wood Slab - Acacia Wood Stairs - Cherry Wood Stairs - Dark Wood Stairs - Fir Wood Stairs - Loftwood Wood Stairs - Magic Wood Stairs - Mangrove Wood Stairs - Palm Wood Stairs - Redwood Wood Stairs - Willow Wood Stairs - Pine Wood Stairs - Hellbark Wood Stairs - Jacaranda Wood Stairs + Acacia Wood Stairs + Cherry Wood Stairs + Dark Wood Stairs + Fir Wood Stairs + Loftwood Wood Stairs + Magic Wood Stairs + Mangrove Wood Stairs + Palm Wood Stairs + Redwood Wood Stairs + Willow Wood Stairs + Pine Wood Stairs + Hellbark Wood Stairs + Jacaranda Wood Stairs - Acacia Leaves - Mangrove Leaves - Palm Leaves - Redwood Leaves - Willow Leaves - Pine Leaves - - - Berry - Shroom Powder - Wild Carrots - Sunflower Seeds - Fruit Salad - Veggie Salad - Shroom Salad - Persimmon + Acacia Leaves + Mangrove Leaves + Palm Leaves + Redwood Leaves + Willow Leaves + Pine Leaves - Dart Blower - Dart - Poison Dart - - Mud Ball + + Berry + Shroom Powder + Wild Carrots + Sunflower Seeds + Fruit Salad + Veggie Salad + Shroom Salad + Persimmon - Mud Brick - Pile of Ashes - Amethyst - Poison - Celestial Crystal Shard - Blue Dye - Brown Dye - Green Dye - White Dye - Black Dye - Ruby - Peridot - Topaz - Tanzanite - Apatite - Sapphire - Ghastly Soul + Dart Blower + Dart + Poison Dart - Muddy Pickaxe - Muddy Axe - Muddy Shovel - Muddy Sword - Muddy Hoe - Muddy Helmet - Muddy Chestplate - Muddy Leggings - Muddy Boots - - Amethyst Pickaxe - Amethyst Axe - Amethyst Shovel - Amethyst Sword - Amethyst Hoe - Amethyst Helmet - Amethyst Chestplate - Amethyst Leggings - Amethyst Boots - - Wooden Scythe - Stone Scythe - Iron Scythe - Gold Scythe - Diamond Scythe - Mud Scythe - Amethyst Scythe + Mud Ball - Ancient Staff - Ancient Staff Handle - Ancient Staff Pole - Ancient Staff Topper - Depleted Ancient Staff + Mud Brick + Pile of Ashes + Amethyst + Poison + Celestial Crystal Shard + Blue Dye + Brown Dye + Green Dye + White Dye + Black Dye + Ruby + Peridot + Topaz + Tanzanite + Apatite + Sapphire + Ghastly Soul - Soul Manipulator - Ghastly Soul Manipulator - Villager Soul Manipulator + Muddy Pickaxe + Muddy Axe + Muddy Shovel + Muddy Sword + Muddy Hoe + Muddy Helmet + Muddy Chestplate + Muddy Leggings + Muddy Boots - Enderporter + Amethyst Pickaxe + Amethyst Axe + Amethyst Shovel + Amethyst Sword + Amethyst Hoe + Amethyst Helmet + Amethyst Chestplate + Amethyst Leggings + Amethyst Boots - Music Disc - Music Disc + Wooden Scythe + Stone Scythe + Iron Scythe + Gold Scythe + Diamond Scythe + Mud Scythe + Amethyst Scythe - Dull Flower Band - Plain Flower Band - Lush Flower Band - Exotic Flower Band - - Wading Boots - Flippers - - - Amethyst Bucket - Spring Water Amethyst Bucket - Liquid Poison Bucket - - Liquid Poison - Spring Water - - Liquid Poison + Ancient Staff + Ancient Staff Handle + Ancient Staff Pole + Ancient Staff Topper + Depleted Ancient Staff + + Soul Manipulator + Ghastly Soul Manipulator + Villager Soul Manipulator + + Enderporter + + Music Disc + Music Disc + + Dull Flower Band + Plain Flower Band + Lush Flower Band + Exotic Flower Band + + Wading Boots + Flippers + + + Amethyst Bucket + Spring Water Amethyst Bucket + Liquid Poison Bucket + + Liquid Poison + Spring Water + + Liquid Poison Spring Water - - - A gateway to the Promised Land has appeared in the sky above. - A gateway to the Overworld has appeared in the sky above. - - - Biomes O' Plenty - - - Biomes O' Plenty + + + A gateway to the Promised Land has appeared in the sky above. + A gateway to the Overworld has appeared in the sky above. + + + Biomes O' Plenty + + + Biomes O' Plenty diff --git a/resources/assets/biomesoplenty/lang/fr_CA.xml b/resources/assets/biomesoplenty/lang/fr_CA.xml index efb9a6378..39ba24ab0 100644 --- a/resources/assets/biomesoplenty/lang/fr_CA.xml +++ b/resources/assets/biomesoplenty/lang/fr_CA.xml @@ -1,373 +1,368 @@ - French (fr_CA) Localization File + French (fr_CA) Localization File - - Boue - Sable Mouvant + + Boue + Sable Mouvant - Pierre de Cendre - Sable Dur - Terre Dure - Glace Dure - Terre Déséchée - Pierre des Crags - Briques de Boue - Terre Purifiée - Crystal Céleste + Pierre de Cendre + Sable Dur + Terre Dure + Glace Dure + Terre Déséchée + Pierre des Crags + Briques de Boue + Terre Purifiée + Crystal Céleste - Roche Rouge - Roche Rouge - Briques de Pierre Rouge - - Ash Block + Roche Rouge + Roche Rouge + Briques de Pierre Rouge - Herbe Morte - Herbe du Déset - Pousses du Désert - Herbe des Dunes - Herbe Haute Purifiée - Ronces - Orge - Massettes - Massettes - Massettes - Roseau + Ash Block - Trèfles - Fleur des Marais - Clochettes de la Mort - Fleur Luisante - Hydrangéa - Marguerite - Tulipe - Fleur Sauvage - Violette - Anémone - Fleur de Nénuphar - Petit Cactus - Aloé - Tornesol - Tornesol - Pissenlit + Herbe Morte + Herbe du Déset + Pousses du Désert + Herbe des Dunes + Herbe Haute Purifiée + Ronces + Orge + Massettes + Massettes + Massettes + Roseau + Petit Cactus - Algues - Herbe Coute - Herbe Moyenne - Herbe Haute - Buisson - Pousses - Herbe Haute - Sumac Vénéneux - Buisson à Baies - - Fleur Rouge Géante - Fleur Jaune Géante - - Psylocybes - Champignon de Paris - Lactaire Indigo - Champignol Luisant - - Pousse de Pomier - Pousse d'arbe d'automne jaune - Pousse de Bambou - Pousse d'Arbre Magique - Pousse d'Arbre Sombre - Pousse d'Arbre Mourrant - Pousse de Grand Sapin - Pousse d'Abre Sacré - Pousse d'abre d'automne orange - Pousse d'Arbre Originel - Pousse de Cerisier Rose - Pousse d'Érable - Pousse de Cerisier Blanc - Pousse de Buisson du Nether - Pousse de Jacaranda + Trèfles + Fleur des Marais + Clochettes de la Mort + Fleur Luisante + Hydrangéa + Fleur Sauvage + Violette + Anémone + Fleur de Nénuphar + Aloé + Tornesol + Tornesol + Pissenlit - Pousse d'Acacia - Pousse de Palétuvier - Pousse de Palmier - Pousse de Séquoia - Pousse de Saule - Pousse de Pin - - Lianes de Saule - Sumac - Feuilles de Pomier - Bambou - Escaliers en Briques de Boue - Herbe Originelle Bloc d'Herbe Longue - Mousse d'Arbre + Algues + Herbe Coute + Herbe Moyenne + Herbe Haute + Buisson + Pousses + Herbe Haute + Sumac Vénéneux + Buisson à Baies - Algue Brune - - Escaliers en Pierre Rouge - Escaliers en Briques de Pierre Rouge - - Herbe Purifiée - Herbe en Fusion - - Roche Céleste - Pierre Céleste - Briques de Pierre Céleste - - Escaliers en Pierre Céleste - Escaliers en Roche Céleste + Fleur Rouge Géante + Fleur Jaune Géante - Portail de la Terre Promise + Psylocybes + Champignon de Paris + Lactaire Indigo + Champignol Luisant - Minerai d'améthyste - Bloc d'améthyste - Minerai de rubis - Bloque de rubis - Minerai de péridotite - Bloc de péridotite - Minerai de topaze - Bloc de topaze - Minerai de tanzanite - Bloc de tanzanitz - Minerai d'apatite - Bloc d'apatite - Minerai de saphir - Bloc de saphir - - Mousse - - Bloc de Nuage + Pousse de Pomier + Pousse d'arbe d'automne jaune + Pousse de Bambou + Pousse d'Arbre Magique + Pousse d'Arbre Sombre + Pousse d'Arbre Mourrant + Pousse de Grand Sapin + Pousse d'Abre Sacré + Pousse d'abre d'automne orange + Pousse d'Arbre Originel + Pousse de Cerisier Rose + Pousse d'Érable + Pousse de Cerisier Blanc + Pousse de Buisson du Nether + Pousse de Jacaranda - Petit Morceau d'Os - Morceau d'Os Moyen - Gros Morceau d'Os + Pousse d'Acacia + Pousse de Palétuvier + Pousse de Palmier + Pousse de Séquoia + Pousse de Saule + Pousse de Pin + + Lianes de Saule + Sumac + Feuilles de Pomier + Bambou + Escaliers en Briques de Boue + Herbe Originelle + Bloc d'Herbe Longue + Mousse d'Arbre + + Algue Brune + + Escaliers en Pierre Rouge + Escaliers en Briques de Pierre Rouge + + Herbe Purifiée + Herbe en Fusion + + Roche Céleste + Pierre Céleste + Briques de Pierre Céleste + + Escaliers en Pierre Céleste + Escaliers en Roche Céleste + + Portail de la Terre Promise + + Minerai d'améthyste + Bloc d'améthyste + Minerai de rubis + Bloque de rubis + Minerai de péridotite + Bloc de péridotite + Minerai de topaze + Bloc de topaze + Minerai de tanzanite + Bloc de tanzanitz + Minerai d'apatite + Bloc d'apatite + Minerai de saphir + Bloc de saphir + + Mousse + + Bloc de Nuage + + Petit Morceau d'Os + Morceau d'Os Moyen + Gros Morceau d'Os + + Lentille Céleste + + Foyer de Sacrifice + Foyer de Sacrifice + Foyer de Sacrifice + + Autel + + Flaque - Lentille Céleste - - Foyer de Sacrifice - Foyer de Sacrifice - Foyer de Sacrifice - - Autel - - Flaque - Tombe - Dalle en Pierre Rouge - Dalle en Briques de Pierre Rouge - Dalle en Briques de boue - Dalle en Pierre Céleste - Dalle en Briques de Pierre Céleste + Dalle en Pierre Rouge + Dalle en Briques de Pierre Rouge + Dalle en Briques de boue + Dalle en Pierre Céleste + Dalle en Briques de Pierre Céleste - Dalle en Pierre Rouge - Dalle en Briques de Pierre Rouge - Dalle en Briques de Boue - Dalle en Pierre Célesta - Dalle en Briques de Pierre Céleste + Dalle en Pierre Rouge + Dalle en Briques de Pierre Rouge + Dalle en Briques de Boue + Dalle en Pierre Célesta + Dalle en Briques de Pierre Céleste - Planche d'Acacia - Planche de Cerisier - Planche d'Arbre Sombre - Planche de Grand Sapin - Planche d'Arbre Sacré - Planche d'Arbre Magique - Planche de Palétuvier - Planche de Palmier - Planche de Séquoia - Planche de Saule - Chaume de Bambou - Planche de Pin - Planche de Buisson du Nether - Planche de Jacaranda + Planche d'Acacia + Planche de Cerisier + Planche d'Arbre Sombre + Planche de Grand Sapin + Planche d'Arbre Sacré + Planche d'Arbre Magique + Planche de Palétuvier + Planche de Palmier + Planche de Séquoia + Planche de Saule + Chaume de Bambou + Planche de Pin + Planche de Buisson du Nether + Planche de Jacaranda - Bois d'Acacia - Bois de Cerisier - Bois d'Arbre Sombre - Bois de Grand Sapin + Bois d'Acacia + Bois de Cerisier + Bois d'Arbre Sombre + Bois de Grand Sapin - Bois d'Arbre Sacré - Bois d'Arbre Sombre - Bois de Palétuvier - Bois de Palmier + Bois d'Arbre Sacré + Bois d'Arbre Sombre + Bois de Palétuvier + Bois de Palmier - Bois de Séquoia - Bois de Saule - Bois Mort - Tige de Fleur Géante + Bois de Séquoia + Bois de Saule + Bois Mort + Tige de Fleur Géante - Bois de Pin - Bois de Buisson du Nether - Bois de Jacaranda + Bois de Pin + Bois de Buisson du Nether + Bois de Jacaranda - Feuilles d'Automne Jaunes - Feuilles de Bambou - Feuilles Magiques - Feuilles Sombres - Feuilles Mourantes - Feuilles de Grand Sapin - Feuilles Sacrées - Feuilles d'Automne Oranges + Feuilles d'Automne Jaunes + Feuilles de Bambou + Feuilles Magiques + Feuilles Sombres + Feuilles Mourantes + Feuilles de Grand Sapin + Feuilles Sacrées + Feuilles d'Automne Oranges - Feuilles Originels - Feuilles de Cerisier Roses - Feuilles d'Érable - Feuilles de Cerisier Blanches - Feuilles du Nether - Feuilles de Jacaranda + Feuilles Originels + Feuilles de Cerisier Roses + Feuilles d'Érable + Feuilles de Cerisier Blanches + Feuilles du Nether + Feuilles de Jacaranda - Dalle en Bois d'Acacia - Dalle en Bois de Cerisier - Dalle en Bois Sombre - Dalle en Bois de Grand Sapin - Dalle en Bois Sacré - dalle en Bois Magique - Dalle en Bois de Palétuvier - Dalle en Bois de Palmier - Dalle en Bois de Séquoia - Dalle en Bois de Saule - Dalle en Bois de Pin - Dalle en Bois de Buisson du Nether - Dalle en Bois de Jacaranda + Dalle en Bois d'Acacia + Dalle en Bois de Cerisier + Dalle en Bois Sombre + Dalle en Bois de Grand Sapin + Dalle en Bois Sacré + dalle en Bois Magique + Dalle en Bois de Palétuvier + Dalle en Bois de Palmier + Dalle en Bois de Séquoia + Dalle en Bois de Saule + Dalle en Bois de Pin + Dalle en Bois de Buisson du Nether + Dalle en Bois de Jacaranda - Dalle en bois d'Acacia - Dalle en bois de Cerisier - Dalle en Bois Sombre - Dalle en Bois de Grand Sapin - Dalle en Bois Sacré - Dalle en Bois Magique - Dalle en bois de Palétuvier - Dalle en bois de Palmier - Dalle en bois de Séquoia - Dalle en bois de Saule - Dalle en bois de Pin - Dalle en bois de buisson du Nether - Dalle en bois de Jaracanda + Dalle en bois d'Acacia + Dalle en bois de Cerisier + Dalle en Bois Sombre + Dalle en Bois de Grand Sapin + Dalle en Bois Sacré + Dalle en Bois Magique + Dalle en bois de Palétuvier + Dalle en bois de Palmier + Dalle en bois de Séquoia + Dalle en bois de Saule + Dalle en bois de Pin + Dalle en bois de buisson du Nether + Dalle en bois de Jaracanda - Escaliers en bois d'Acacia - Escaliers en bois de Cerisier - Escaliers en Bois Sombre - Escaliers en bois de Grand Sapin - Escaliers en Bois Sacré - Escaliers en Bois Magique - Escaliers en bois de Palétuvier - Escaliers en bois de Palmier - Escaliers en bois de séquoia - Escaliers en bois de Saule - Escaliers en bois de Pin - Escaliers en bois de buisson du Nether - Escaliers en bois de Jacaranda + Escaliers en bois d'Acacia + Escaliers en bois de Cerisier + Escaliers en Bois Sombre + Escaliers en bois de Grand Sapin + Escaliers en Bois Sacré + Escaliers en Bois Magique + Escaliers en bois de Palétuvier + Escaliers en bois de Palmier + Escaliers en bois de séquoia + Escaliers en bois de Saule + Escaliers en bois de Pin + Escaliers en bois de buisson du Nether + Escaliers en bois de Jacaranda - Feuilles d'Acacia - Feuilles de Palétuvier - Feuilles de Palmier - Feuilles de Séquoia - Feuilles de Saule - Feuilles de Pin - - - Poudre de champignon + Feuilles d'Acacia + Feuilles de Palétuvier + Feuilles de Palmier + Feuilles de Séquoia + Feuilles de Saule + Feuilles de Pin - Graines de tournesol - - Baie - Poudre de champignon - Carottes Sauvages - Graines de tournesol - Salade de fruits - Salade végétarienne - Salade de champignons + + Baie + Poudre de champignon + Carottes Sauvages + Graines de tournesol + Salade de fruits + Salade végétarienne + Salade de champignons - Sarbacanne - Fléchettes - Fléchettes Empoisonnées - - Boule de boue + Sarbacanne + Fléchettes + Fléchettes Empoisonnées - Brique de boue - Cendres - Améthyste - Poison - Éclat de crystal céleste - Teinture bleue - Teinture marron - Teinture verte - Teinture blanche - Teinture noire - Rubis - Péridotite - Topaze - Tanzanite - Apatite - Saphir - Âme d'Effroi + Boule de boue - Pioche en boue - Hache en boue - Pelle en boue - Épée en boue - Houe en boue - Casque en boue - Plastron en boue - Jambières en boue - Bottes en boue - - Pioche en améthyste - Hache en améthyste - Pelle en améthyste - Épée en améthyste - Houe en améthyste - Casque en améthyste - Plastron en améthyste - Jambières en améthyste - Bottes en améthyste - - Faux en bois - Faux en pierre - Faux en fer - Faux en or - Faux en diamand - Faux en boue - Faux en améthyste + Brique de boue + Cendres + Améthyste + Poison + Éclat de crystal céleste + Teinture bleue + Teinture marron + Teinture verte + Teinture blanche + Teinture noire + Rubis + Péridotite + Topaze + Tanzanite + Apatite + Saphir + Âme d'Effroi - Bâton ancien - Manche de bâton ancien - Centre de bâton ancien - Haut de bâton ancien - Bâton ancien brisé + Pioche en boue + Hache en boue + Pelle en boue + Épée en boue + Houe en boue + Casque en boue + Plastron en boue + Jambières en boue + Bottes en boue - Manipulateur d'âmes - Manipulateur d'âmes d'effroi - Manipulateur d'âmes de villageois + Pioche en améthyste + Hache en améthyste + Pelle en améthyste + Épée en améthyste + Houe en améthyste + Casque en améthyste + Plastron en améthyste + Jambières en améthyste + Bottes en améthyste - Enderporter + Faux en bois + Faux en pierre + Faux en fer + Faux en or + Faux en diamand + Faux en boue + Faux en améthyste - Disque - Disque + Bâton ancien + Manche de bâton ancien + Centre de bâton ancien + Haut de bâton ancien + Bâton ancien brisé - Couronne de fleurs banale - Couronne de fleurs simple - Couronne de fleurs luxuriante - Couronne de fleurs exotique - - - Seau en améthyste - Seau d'eau chaude en améthyste - Seau de poison liquide - - Poison liquide - Eau chaude - - Poison liquide + Manipulateur d'âmes + Manipulateur d'âmes d'effroi + Manipulateur d'âmes de villageois + + Enderporter + + Disque + Disque + + Couronne de fleurs banale + Couronne de fleurs simple + Couronne de fleurs luxuriante + Couronne de fleurs exotique + + + Seau en améthyste + Seau d'eau chaude en améthyste + Seau de poison liquide + + Poison liquide + Eau chaude + + Poison liquide Eau chaude - - - Un passage vers la Terre Promise est apparu haut dans le ciel. - Un passage vers la terre est apparu haut dans le ciel. - - - Biomes O' Plenty - - - Biomes O' Plenty + + + Un passage vers la Terre Promise est apparu haut dans le ciel. + Un passage vers la terre est apparu haut dans le ciel. + + + Biomes O' Plenty + + + Biomes O' Plenty diff --git a/resources/assets/biomesoplenty/lang/fr_FR.xml b/resources/assets/biomesoplenty/lang/fr_FR.xml index 048e18bf1..755ae6724 100644 --- a/resources/assets/biomesoplenty/lang/fr_FR.xml +++ b/resources/assets/biomesoplenty/lang/fr_FR.xml @@ -1,373 +1,368 @@ - French (fr_FR) Localization File + French (fr_FR) Localization File - - Boue - Sable Mouvant + + Boue + Sable Mouvant - Pierre de Cendre - Sable Dur - Terre Dure - Glace Dure - Terre Déséchée - Pierre des Crags - Briques de Boue - Terre Purifiée - Crystal Céleste + Pierre de Cendre + Sable Dur + Terre Dure + Glace Dure + Terre Déséchée + Pierre des Crags + Briques de Boue + Terre Purifiée + Crystal Céleste - Roche Rouge - Roche Rouge - Briques de Pierre Rouge - - Ash Block + Roche Rouge + Roche Rouge + Briques de Pierre Rouge - Herbe Morte - Herbe du Déset - Pousses du Désert - Herbe des Dunes - Herbe Haute Purifiée - Ronces - Orge - Massettes - Massettes - Massettes - Roseau + Ash Block - Trèfles - Fleur des Marais - Clochettes de la Mort - Fleur Luisante - Hydrangéa - Marguerite - Tulipe - Fleur Sauvage - Violette - Anémone - Fleur de Nénuphar - Petit Cactus - Aloé - Tornesol - Tornesol - Pissenlit + Herbe Morte + Herbe du Déset + Pousses du Désert + Herbe des Dunes + Herbe Haute Purifiée + Ronces + Orge + Massettes + Massettes + Massettes + Roseau + Petit Cactus - Algues - Herbe Coute - Herbe Moyenne - Herbe Haute - Buisson - Pousses - Herbe Haute - Sumac Vénéneux - Buisson à Baies - - Fleur Rouge Géante - Fleur Jaune Géante - - Psylocybes - Champignon de Paris - Lactaire Indigo - Champignol Luisant - - Pousse de Pomier - Pousse d'arbe d'automne jaune - Pousse de Bambou - Pousse d'Arbre Magique - Pousse d'Arbre Sombre - Pousse d'Arbre Mourrant - Pousse de Grand Sapin - Pousse d'Abre Sacré - Pousse d'abre d'automne orange - Pousse d'Arbre Originel - Pousse de Cerisier Rose - Pousse d'Érable - Pousse de Cerisier Blanc - Pousse de Buisson du Nether - Pousse de Jacaranda + Trèfles + Fleur des Marais + Clochettes de la Mort + Fleur Luisante + Hydrangéa + Fleur Sauvage + Violette + Anémone + Fleur de Nénuphar + Aloé + Tornesol + Tornesol + Pissenlit - Pousse d'Acacia - Pousse de Palétuvier - Pousse de Palmier - Pousse de Séquoia - Pousse de Saule - Pousse de Pin - - Lianes de Saule - Sumac - Feuilles de Pomier - Bambou - Escaliers en Briques de Boue - Herbe Originelle Bloc d'Herbe Longue - Mousse d'Arbre + Algues + Herbe Coute + Herbe Moyenne + Herbe Haute + Buisson + Pousses + Herbe Haute + Sumac Vénéneux + Buisson à Baies - Algue Brune - - Escaliers en Pierre Rouge - Escaliers en Briques de Pierre Rouge - - Herbe Purifiée - Herbe en Fusion - - Roche Céleste - Pierre Céleste - Briques de Pierre Céleste - - Escaliers en Pierre Céleste - Escaliers en Roche Céleste + Fleur Rouge Géante + Fleur Jaune Géante - Portail de la Terre Promise + Psylocybes + Champignon de Paris + Lactaire Indigo + Champignol Luisant - Minerai d'améthyste - Bloc d'améthyste - Minerai de rubis - Bloque de rubis - Minerai de péridotite - Bloc de péridotite - Minerai de topaze - Bloc de topaze - Minerai de tanzanite - Bloc de tanzanitz - Minerai d'apatite - Bloc d'apatite - Minerai de saphir - Bloc de saphir - - Mousse - - Bloc de Nuage + Pousse de Pomier + Pousse d'arbe d'automne jaune + Pousse de Bambou + Pousse d'Arbre Magique + Pousse d'Arbre Sombre + Pousse d'Arbre Mourrant + Pousse de Grand Sapin + Pousse d'Abre Sacré + Pousse d'abre d'automne orange + Pousse d'Arbre Originel + Pousse de Cerisier Rose + Pousse d'Érable + Pousse de Cerisier Blanc + Pousse de Buisson du Nether + Pousse de Jacaranda - Petit Morceau d'Os - Morceau d'Os Moyen - Gros Morceau d'Os + Pousse d'Acacia + Pousse de Palétuvier + Pousse de Palmier + Pousse de Séquoia + Pousse de Saule + Pousse de Pin + + Lianes de Saule + Sumac + Feuilles de Pomier + Bambou + Escaliers en Briques de Boue + Herbe Originelle + Bloc d'Herbe Longue + Mousse d'Arbre + + Algue Brune + + Escaliers en Pierre Rouge + Escaliers en Briques de Pierre Rouge + + Herbe Purifiée + Herbe en Fusion + + Roche Céleste + Pierre Céleste + Briques de Pierre Céleste + + Escaliers en Pierre Céleste + Escaliers en Roche Céleste + + Portail de la Terre Promise + + Minerai d'améthyste + Bloc d'améthyste + Minerai de rubis + Bloque de rubis + Minerai de péridotite + Bloc de péridotite + Minerai de topaze + Bloc de topaze + Minerai de tanzanite + Bloc de tanzanitz + Minerai d'apatite + Bloc d'apatite + Minerai de saphir + Bloc de saphir + + Mousse + + Bloc de Nuage + + Petit Morceau d'Os + Morceau d'Os Moyen + Gros Morceau d'Os + + Lentille Céleste + + Foyer de Sacrifice + Foyer de Sacrifice + Foyer de Sacrifice + + Autel + + Flaque - Lentille Céleste - - Foyer de Sacrifice - Foyer de Sacrifice - Foyer de Sacrifice - - Autel - - Flaque - Tombe - Dalle en Pierre Rouge - Dalle en Briques de Pierre Rouge - Dalle en Briques de boue - Dalle en Pierre Céleste - Dalle en Briques de Pierre Céleste + Dalle en Pierre Rouge + Dalle en Briques de Pierre Rouge + Dalle en Briques de boue + Dalle en Pierre Céleste + Dalle en Briques de Pierre Céleste - Dalle en Pierre Rouge - Dalle en Briques de Pierre Rouge - Dalle en Briques de Boue - Dalle en Pierre Célesta - Dalle en Briques de Pierre Céleste + Dalle en Pierre Rouge + Dalle en Briques de Pierre Rouge + Dalle en Briques de Boue + Dalle en Pierre Célesta + Dalle en Briques de Pierre Céleste - Planche d'Acacia - Planche de Cerisier - Planche d'Arbre Sombre - Planche de Grand Sapin - Planche d'Arbre Sacré - Planche d'Arbre Magique - Planche de Palétuvier - Planche de Palmier - Planche de Séquoia - Planche de Saule - Chaume de Bambou - Planche de Pin - Planche de Buisson du Nether - Planche de Jacaranda + Planche d'Acacia + Planche de Cerisier + Planche d'Arbre Sombre + Planche de Grand Sapin + Planche d'Arbre Sacré + Planche d'Arbre Magique + Planche de Palétuvier + Planche de Palmier + Planche de Séquoia + Planche de Saule + Chaume de Bambou + Planche de Pin + Planche de Buisson du Nether + Planche de Jacaranda - Bois d'Acacia - Bois de Cerisier - Bois d'Arbre Sombre - Bois de Grand Sapin + Bois d'Acacia + Bois de Cerisier + Bois d'Arbre Sombre + Bois de Grand Sapin - Bois d'Arbre Sacré - Bois d'Arbre Sombre - Bois de Palétuvier - Bois de Palmier + Bois d'Arbre Sacré + Bois d'Arbre Sombre + Bois de Palétuvier + Bois de Palmier - Bois de Séquoia - Bois de Saule - Bois Mort - Tige de Fleur Géante + Bois de Séquoia + Bois de Saule + Bois Mort + Tige de Fleur Géante - Bois de Pin - Bois de Buisson du Nether - Bois de Jacaranda + Bois de Pin + Bois de Buisson du Nether + Bois de Jacaranda - Feuilles d'Automne Jaunes - Feuilles de Bambou - Feuilles Magiques - Feuilles Sombres - Feuilles Mourantes - Feuilles de Grand Sapin - Feuilles Sacrées - Feuilles d'Automne Oranges + Feuilles d'Automne Jaunes + Feuilles de Bambou + Feuilles Magiques + Feuilles Sombres + Feuilles Mourantes + Feuilles de Grand Sapin + Feuilles Sacrées + Feuilles d'Automne Oranges - Feuilles Originels - Feuilles de Cerisier Roses - Feuilles d'Érable - Feuilles de Cerisier Blanches - Feuilles du Nether - Feuilles de Jacaranda + Feuilles Originels + Feuilles de Cerisier Roses + Feuilles d'Érable + Feuilles de Cerisier Blanches + Feuilles du Nether + Feuilles de Jacaranda - Dalle en Bois d'Acacia - Dalle en Bois de Cerisier - Dalle en Bois Sombre - Dalle en Bois de Grand Sapin - Dalle en Bois Sacré - dalle en Bois Magique - Dalle en Bois de Palétuvier - Dalle en Bois de Palmier - Dalle en Bois de Séquoia - Dalle en Bois de Saule - Dalle en Bois de Pin - Dalle en Bois de Buisson du Nether - Dalle en Bois de Jacaranda + Dalle en Bois d'Acacia + Dalle en Bois de Cerisier + Dalle en Bois Sombre + Dalle en Bois de Grand Sapin + Dalle en Bois Sacré + dalle en Bois Magique + Dalle en Bois de Palétuvier + Dalle en Bois de Palmier + Dalle en Bois de Séquoia + Dalle en Bois de Saule + Dalle en Bois de Pin + Dalle en Bois de Buisson du Nether + Dalle en Bois de Jacaranda - Dalle en bois d'Acacia - Dalle en bois de Cerisier - Dalle en Bois Sombre - Dalle en Bois de Grand Sapin - Dalle en Bois Sacré - Dalle en Bois Magique - Dalle en bois de Palétuvier - Dalle en bois de Palmier - Dalle en bois de Séquoia - Dalle en bois de Saule - Dalle en bois de Pin - Dalle en bois de buisson du Nether - Dalle en bois de Jaracanda + Dalle en bois d'Acacia + Dalle en bois de Cerisier + Dalle en Bois Sombre + Dalle en Bois de Grand Sapin + Dalle en Bois Sacré + Dalle en Bois Magique + Dalle en bois de Palétuvier + Dalle en bois de Palmier + Dalle en bois de Séquoia + Dalle en bois de Saule + Dalle en bois de Pin + Dalle en bois de buisson du Nether + Dalle en bois de Jaracanda - Escaliers en bois d'Acacia - Escaliers en bois de Cerisier - Escaliers en Bois Sombre - Escaliers en bois de Grand Sapin - Escaliers en Bois Sacré - Escaliers en Bois Magique - Escaliers en bois de Palétuvier - Escaliers en bois de Palmier - Escaliers en bois de séquoia - Escaliers en bois de Saule - Escaliers en bois de Pin - Escaliers en bois de buisson du Nether - Escaliers en bois de Jacaranda + Escaliers en bois d'Acacia + Escaliers en bois de Cerisier + Escaliers en Bois Sombre + Escaliers en bois de Grand Sapin + Escaliers en Bois Sacré + Escaliers en Bois Magique + Escaliers en bois de Palétuvier + Escaliers en bois de Palmier + Escaliers en bois de séquoia + Escaliers en bois de Saule + Escaliers en bois de Pin + Escaliers en bois de buisson du Nether + Escaliers en bois de Jacaranda - Feuilles d'Acacia - Feuilles de Palétuvier - Feuilles de Palmier - Feuilles de Séquoia - Feuilles de Saule - Feuilles de Pin - - - Poudre de champignon + Feuilles d'Acacia + Feuilles de Palétuvier + Feuilles de Palmier + Feuilles de Séquoia + Feuilles de Saule + Feuilles de Pin - Graines de tournesol - - Baie - Poudre de champignon - Carottes Sauvages - Graines de tournesol - Salade de fruits - Salade végétarienne - Salade de champignons + + Baie + Poudre de champignon + Carottes Sauvages + Graines de tournesol + Salade de fruits + Salade végétarienne + Salade de champignons - Sarbacanne - Fléchettes - Fléchettes Empoisonnées - - Boule de boue + Sarbacanne + Fléchettes + Fléchettes Empoisonnées - Brique de boue - Cendres - Améthyste - Poison - Éclat de crystal céleste - Teinture bleue - Teinture marron - Teinture verte - Teinture blanche - Teinture noire - Rubis - Péridotite - Topaze - Tanzanite - Apatite - Saphir - Âme d'Effroi + Boule de boue - Pioche en boue - Hache en boue - Pelle en boue - Épée en boue - Houe en boue - Casque en boue - Plastron en boue - Jambières en boue - Bottes en boue - - Pioche en améthyste - Hache en améthyste - Pelle en améthyste - Épée en améthyste - Houe en améthyste - Casque en améthyste - Plastron en améthyste - Jambières en améthyste - Bottes en améthyste - - Faux en bois - Faux en pierre - Faux en fer - Faux en or - Faux en diamand - Faux en boue - Faux en améthyste + Brique de boue + Cendres + Améthyste + Poison + Éclat de crystal céleste + Teinture bleue + Teinture marron + Teinture verte + Teinture blanche + Teinture noire + Rubis + Péridotite + Topaze + Tanzanite + Apatite + Saphir + Âme d'Effroi - Bâton ancien - Manche de bâton ancien - Centre de bâton ancien - Haut de bâton ancien - Bâton ancien brisé + Pioche en boue + Hache en boue + Pelle en boue + Épée en boue + Houe en boue + Casque en boue + Plastron en boue + Jambières en boue + Bottes en boue - Manipulateur d'âmes - Manipulateur d'âmes d'effroi - Manipulateur d'âmes de villageois + Pioche en améthyste + Hache en améthyste + Pelle en améthyste + Épée en améthyste + Houe en améthyste + Casque en améthyste + Plastron en améthyste + Jambières en améthyste + Bottes en améthyste - Enderporter + Faux en bois + Faux en pierre + Faux en fer + Faux en or + Faux en diamand + Faux en boue + Faux en améthyste - Disque - Disque + Bâton ancien + Manche de bâton ancien + Centre de bâton ancien + Haut de bâton ancien + Bâton ancien brisé - Couronne de fleurs banale - Couronne de fleurs simple - Couronne de fleurs luxuriante - Couronne de fleurs exotique - - - Seau en améthyste - Seau d'eau chaude en améthyste - Seau de poison liquide - - Poison liquide - Eau chaude - - Poison liquide + Manipulateur d'âmes + Manipulateur d'âmes d'effroi + Manipulateur d'âmes de villageois + + Enderporter + + Disque + Disque + + Couronne de fleurs banale + Couronne de fleurs simple + Couronne de fleurs luxuriante + Couronne de fleurs exotique + + + Seau en améthyste + Seau d'eau chaude en améthyste + Seau de poison liquide + + Poison liquide + Eau chaude + + Poison liquide Eau chaude - - - Un passage vers la Terre Promise est apparu haut dans le ciel. - Un passage vers la terre est apparu haut dans le ciel. - - - Biomes O' Plenty - - - Biomes O' Plenty + + + Un passage vers la Terre Promise est apparu haut dans le ciel. + Un passage vers la terre est apparu haut dans le ciel. + + + Biomes O' Plenty + + + Biomes O' Plenty diff --git a/resources/assets/biomesoplenty/lang/it_IT.xml b/resources/assets/biomesoplenty/lang/it_IT.xml new file mode 100644 index 000000000..e00e22e65 --- /dev/null +++ b/resources/assets/biomesoplenty/lang/it_IT.xml @@ -0,0 +1,382 @@ + + + + Italian (it_IT) Localization File + + + Fango + Sabbie Mobili + + Pietra-Cenere + Sabbia Indurita + Terra Indurita + Ghiaccio Cristallino + Terra Arida + Roccia di Falesia + Mattoni di Fango + Terra Sacra + Cristallo Celestiale + + Roccia Rossa + Pietrisco di Roccia Rossa + Mattoni di Roccia Rossa + + Blocco di Cenere + + Erba Secca + Erba Desertica + Germogli Desertici + Erba delle Dune + Erba Alta Sacra + Rovi + Orzo + Tifa + Tifa + Tifa + Canna + Piantina Grassa + Verruca Wither + + Trifoglio + Fiore di Palude + Fior di Morte + Fior di Luce + Ortensia Blu + Cosmea Sulfurea + Giunchiglia Rosa + Fiore di Campo + Violetta + Anemone Bianca + Ninfea + Chromaflora + Aloe + Girasole + Girasole + Dente di Leone Bianco + + Alga + Erba Bassa + Erba Media + Erba Alta + Cespuglio + Germoglio + Erba Alta + Edera Velenosa + Cespuglio di Bacche + + Fiore Rosso Gigante + Fiore Giallo Gigante + + Fungo a Ombrello + Champignon + Lactarius Indigo + Fungo Luminoso + + Arboscello di Melo + Arboscello Giallo Autunnale + Arboscello di Bamboo + Arboscello Magico + Arboscello Oscuro + Arboscello Morente + Arboscello d'Abete + Arboscello della Terra Promessa + Arboscello Arancione Autunnale + Arboscello della Valle dell'Origine + Arboscello di Ciliegio Rosa + Arboscello d'Acero + Arboscello di Ciliegio Bianco + Arboscello della Corteccia Infernale + Arboscello di Jacaranda + Arboscello di Cachi + + Arboscello d'Acacia + Arboscello di Mangrovia + Arboscello di Palma + Arboscello di Sequoia + Arboscello di Salice + Arboscello di Pino + + Salice + Edera + Foglie di Melo + Foglie di Cachi + Bamboo + Scalini in Mattoni di Fango + Blocco di Erba della Valle dell'Origine + Blocco di Erba Copiosa + Muschio Parassita + + Alga Kelp + Corallo Rosa + Corallo Arancione + Corallo Blu + Corallo Luminescente + + Scalini in Pietrisco di Roccia Rossa + Scalini in Mattoni di Roccia Rossa + + Blocco di Erba Sacra + Blocco di Erba Ardente + + Pietra del Cielo + Pietrisco del Cielo + Mattoni del Cielo + + Scalini in Pietrisco del Cielo + Scalini in Mattoni del Cielo + + Portale della Terra Promessa + + Ametista Grezza + Blocco di Ametista + Rubino Grezzo + Blocco di Rubino + Peridoto Grezzo + Blocco di Peridoto + Topazio Grezzo + Blocco di Topazio + Tanzanite Grezza + Blocco di Tanzanite + Apatite Grezza + Blocco di Apatite + Zaffiro Grezzo + Blocco di Zaffiro + + Muschio + + Blocco di Nuvola + + Segmento Piccolo d'Ossa + Segmento Medio d'Ossa + Segmento Grande d'Ossa + + Lenti Celestiali + + Centro Sacrificale + Centro Sacrificale + Centro Sacrificale + + Struttura dell'Altare + + Pozzanghera + + Lapide + + Lastra di Pietrisco di Roccia Rossa + Lastra di Mattoni di Roccia Rossa + Lastra di Mattoni di Fango + Lastra di Pietrisco del Cielo + Lastra di Mattoni del Cielo + + Lastra di Pietrisco di Roccia Rossa + Lastra di Mattoni di Roccia Rossa + Lastra di Mattoni di Fango + Lastra di Pietrisco del Cielo + Lastra di Mattoni del Cielo + + Assi in Legno di Acacia + Assi in Legno di Ciliegio + Assi in Legno Oscuro + Assi in Legno d'Abete + Assi in Legno Sacro + Assi in Legno Magico + Assi in Legno di Mangrovia + Assi in Legno di Palma + Assi in Legno di Sequoia + Assi in Legno di Salice + Fascio di Bamboo + Assi in Legno di Pino + Assi in Corteccia dell'inferno + Assi in Legno di Jacaranda + + Legno di Acacia + Legno di Ciliegio + Legno Oscuro + Legno d'Abete + + Legno Sacro + Legno Magico + Legno di Mangrovia + Legno di Palma + + Legno di Sequoia + Legno di Salice + Legno Morto + Stelo di Fiore Gigante + + Legno di Pino + Legno di Corteccia Infernale + Legno di Jacaranda + + Foglie Gialle Autunnali + Foglie di Bamboo + Foglie Magiche + Foglie Oscure + Foglie Morenti + Foglie d'Abete + Foglie Sacre + Foglie Arancioni Autunnali + + Foglie della Valle dell'Origine + Foglie di Ciliegio Rosa + Foglie di Acero + Foglie di Ciliegio Bianco + Foglie di Corteccia Infernale + Foglie di Jacaranda + + Lastra in Legno di Acacia + Lastra in Legno di Ciliegio + Lastra in Legno Oscuro + Lastra in Legno d'Abete + Lastra in Legno Sacro + Lastra in Legno Magico + Lastra in Legno di Mangrovia + Lastra in Legno di Palma + Lastra in Legno di Sequoia + Lastra in Legno di Salice + Lastra in Legno di Pino + Lastra in Corteccia dell'Inferno + Lastra in Legno di Jacaranda + + Lastra in Legno di Acacia + Lastra in Legno di Ciliegio + Lastra in Legno Oscuro + Lastra in Legno d'Abete + Lastra in Legno Sacro + Lastra in Legno Magico + Lastra in Legno di Mangrovia + Lastra in Legno di Palma + Lastra in Legno di Sequoia + Lastra in Legno di Salice + Lastra in Legno di Pino + Lastra in Corteccia dell'Inferno + Lastra in Legno di Jacaranda + + Scalini in Legno di Acacia + Scalini in Legno di Ciliegio + Scalini in Legno Oscuro + Scalini in Legno d'Abete + Scalini in Legno Sacro + Scalini in Legno Magico + Scalini in Legno di Mangrovia + Scalini in Legno di Palma + Scalini in Legno di Sequoia + Scalini in Legno di Salice + Scalini in Legno di Pino + Scalini in Corteccia dell'Inferno + Scalini in Legno di Jacaranda + + Foglie di Acacia + Foglie di Mangrovia + Foglie di Palma + Foglie di Sequoia + Foglie di Salice + Foglie di Pino + + + Bacca + Polvere di Fungo + Carote Selvagge + Semi di Girasole + Macedonia + Insalata di Verdure + Insalata di Funghi + Cachi + + Cerbottana + Dardo + Dardo Avvelenato + + Palla di Fango + + Mattone di Fango + Cumulo di Cenere + Ametista + Veleno + Scheggia di Cristallo Celestiale + Tintura Blu + Tintura Marrone + Tintura Verde + Tintura Bianca + Tintura Nera + Rubino + Peridoto + Topazio + Tanzanite + Apatite + Zaffiro + Anima Dannata + + Piccone di Fango + Ascia di Fango + Pala di Fango + Spada di Fango + Zappa di Fango + Elmo di Fango + Corazza di Fango + Gambali di Fango + Stivali di Fango + + Piccone di Ametista + Ascia di Ametista + Pala di Ametista + Spada di Ametista + Zappa di Ametista + Elmo di Ametista + Corazza di Ametista + Gambali di Ametista + Stivali di Ametista + + Falce di Legno + Falce di Pietra + Falce di Ferro + Falce d'Oro + Falce di Diamante + Falce di Fango + Falce di Ametista + + Verga Venerabile + Manico della Verga Venerabile + Corpo della Verga Venerabile + Sommit� della Verga Venerabile + Verga Venerabile Esaurita + + Manipolatore d'Anima + Manipolatore d'Anima - Anima Dannata + Manipolatore d'Anima - Anima di Villico + + Traslatore Ender + + Disco Musicale + Disco Musicale + + Corona di Fiori Comune + Corona di Fiori di Pianura + Corona di Fiori Lussureggiante + Corona di Fiori Esotici + + Stivali da Guado + Pinne + + + Secchio di Ametista + Secchio di Ametista con Acqua Primaverile + Secchio di Liquido Velenoso + + Liquido Velenoso + Acqua Primaverile + + Liquido Velenoso + Acqua Primaverile + + + Un portale per la Terra Promessa � apparto nel cielo, sopra di te. + Un portale per l'Overworld � apparto nel cielo, sopra di te. + + + Biomes O' Plenty + + + Biomes O' Plenty + + \ No newline at end of file diff --git a/resources/assets/biomesoplenty/lang/ja_JP.xml b/resources/assets/biomesoplenty/lang/ja_JP.xml index d7284075d..ec10469cb 100644 --- a/resources/assets/biomesoplenty/lang/ja_JP.xml +++ b/resources/assets/biomesoplenty/lang/ja_JP.xml @@ -1,374 +1,368 @@ - Japanese (ja_JP) Localization File + Japanese (ja_JP) Localization File - - 泥 - 流砂 + + 泥 + 流砂 - 灰石 - 固い砂 - 固い土 - 固い氷 - 乾燥した土 - 岩山の岩 - 泥レンガ - 浄化された土 - 天界のクリスタル + 灰石 + 固い砂 + 固い土 + 固い氷 + 乾燥した土 + 岩山の岩 + 泥レンガ + 浄化された土 + 天界のクリスタル - 赤岩 - 赤岩の丸石 - 赤岩レンガ - - 火山灰ブロック + 赤岩 + 赤岩の丸石 + 赤岩レンガ - 古草 - 砂漠の草 - 砂漠の芽 - 砂丘の草 - 浄化された草 - いばら - 大麦 - ガマ - ガマ - ガマ - ヨシ + 火山灰ブロック - クローバー - 沼の花 - 死の新芽 - 光る花 - アジサイ - ヒナギク - チューリップ - 野草 - スミレ - アネモネ - スイレン - 小さなサボテン - アロエ - ひまわり - ひまわり - タンポポ + 古草 + 砂漠の草 + 砂漠の芽 + 砂丘の草 + 浄化された草 + いばら + 大麦 + ガマ + ガマ + ガマ + ヨシ + 小さなサボテン - 藻 - 短い草 - やや短い草 - 背丈が高い草 - 茂み - 新芽 - 背丈が高い草 - ツタウルシ - 果実がなった茂み - - 巨大な花(赤) - 巨大な花(黄) - - 毒キノコ - ポートベロー - ブルーミルクキャップ - 光るキノコ - - リンゴの木の苗木 - 紅葉樹(黄)の苗木 - 竹の苗木 - 魔法の苗木 - 闇の苗木 - 枯れそうな木の苗木 - モミの苗木 - ロフトウッドの苗木 - 紅葉樹(橙)の苗木 - アルファの木の苗木 - サクラの木(淡紅)の苗木 - 楓の苗木 - サクラの木(白)の苗木 - 地獄の樹皮の苗木 - ジャカランダの苗木 + クローバー + 沼の花 + 死の新芽 + 光る花 + アジサイ + 野草 + スミレ + アネモネ + スイレン + アロエ + ひまわり + ひまわり + タンポポ - アカシアの苗木 - マングローブの苗木 - ヤシの苗木 - セコイアの苗木 - 柳の苗木 - 松の苗木 - - 柳の葉 - ツタ - リンゴの葉 - 竹 - 泥レンガの階段 - アルファの草ブロック - 長い草ブロック - 木の苔 + 藻 + 短い草 + やや短い草 + 背丈が高い草 + 茂み + 新芽 + 背丈が高い草 + ツタウルシ + 果実がなった茂み - 昆布 - - 赤岩の丸石の階段 - 赤岩レンガの階段 - - 浄化された草ブロック - 燻っている草ブロック - - 天空の石 - 天空の丸石 - 天空の石レンガ - - 天空の丸石の階段 - 天空の石レンガの階段 + 巨大な花(赤) + 巨大な花(黄) - Promised Land Portal + 毒キノコ + ポートベロー + ブルーミルクキャップ + 光るキノコ - アメジスト鉱石 - アメジストブロック - ルビー鉱石 - ルビーブロック - ペリドット鉱石 - ペリドットブロック - トパーズ鉱石 - トパーズブロック - タンザナイト鉱石 - タンザナイトブロック - アパタイト鉱石 - アパタイトブロック - サファイア鉱石 - サファイアブロック - - 苔 - - 雲ブロック + リンゴの木の苗木 + 紅葉樹(黄)の苗木 + 竹の苗木 + 魔法の苗木 + 闇の苗木 + 枯れそうな木の苗木 + モミの苗木 + ロフトウッドの苗木 + 紅葉樹(橙)の苗木 + アルファの木の苗木 + サクラの木(淡紅)の苗木 + 楓の苗木 + サクラの木(白)の苗木 + 地獄の樹皮の苗木 + ジャカランダの苗木 - 骨ブロック(小) - 骨ブロック(中) - 骨ブロック(大) + アカシアの苗木 + マングローブの苗木 + ヤシの苗木 + セコイアの苗木 + 柳の苗木 + 松の苗木 + + 柳の葉 + ツタ + リンゴの葉 + 竹 + 泥レンガの階段 + アルファの草ブロック + 長い草ブロック + 木の苔 + + 昆布 + + 赤岩の丸石の階段 + 赤岩レンガの階段 + + 浄化された草ブロック + 燻っている草ブロック + + 天空の石 + 天空の丸石 + 天空の石レンガ + + 天空の丸石の階段 + 天空の石レンガの階段 + + Promised Land Portal + + アメジスト鉱石 + アメジストブロック + ルビー鉱石 + ルビーブロック + ペリドット鉱石 + ペリドットブロック + トパーズ鉱石 + トパーズブロック + タンザナイト鉱石 + タンザナイトブロック + アパタイト鉱石 + アパタイトブロック + サファイア鉱石 + サファイアブロック + + 苔 + + 雲ブロック + + 骨ブロック(小) + 骨ブロック(中) + 骨ブロック(大) + + 天界の水晶体 + + 生贄の炉 + 生贄の炉 + 生贄の炉 + + 祭壇の骨組み + + 水たまり - 天界の水晶体 - - 生贄の炉 - 生贄の炉 - 生贄の炉 - - 祭壇の骨組み - - 水たまり - 墓 - 赤岩の丸石ハーフブロック - 赤岩レンガハーフブロック - 泥レンガハーフブロック - 天空の丸石ハーフブロック - 天空の石レンガハーフブロック + 赤岩の丸石ハーフブロック + 赤岩レンガハーフブロック + 泥レンガハーフブロック + 天空の丸石ハーフブロック + 天空の石レンガハーフブロック - 赤岩の丸石ハーフブロック - 赤岩レンガハーフブロック - 泥レンガハーフブロック - 天空の丸石ハーフブロック - 天空の石レンガハーフブロック + 赤岩の丸石ハーフブロック + 赤岩レンガハーフブロック + 泥レンガハーフブロック + 天空の丸石ハーフブロック + 天空の石レンガハーフブロック - アカシアの木材 - サクラの木材 - 闇の木材 - モミの木材 - ロフトウッドの木材 - 魔法の木材 - マングローブの木材 - ヤシの木材 - セコイアの木材 - 柳の木材 - 竹葺き - 松の木材 - 地獄の樹皮の木材 - ジャカランダの木材 + アカシアの木材 + サクラの木材 + 闇の木材 + モミの木材 + ロフトウッドの木材 + 魔法の木材 + マングローブの木材 + ヤシの木材 + セコイアの木材 + 柳の木材 + 竹葺き + 松の木材 + 地獄の樹皮の木材 + ジャカランダの木材 - アカシアの原木 - サクラの原木 - 闇の原木 - モミの原木 + アカシアの原木 + サクラの原木 + 闇の原木 + モミの原木 - ロフトウッドの原木 - 魔法の原木 - マングローブの原木 - ヤシの原木 + ロフトウッドの原木 + 魔法の原木 + マングローブの原木 + ヤシの原木 - セコイアの原木 - 柳の原木 - 枯れた木の原木 - 巨大な花の幹 + セコイアの原木 + 柳の原木 + 枯れた木の原木 + 巨大な花の幹 - 松の原木 - 地獄の樹皮の原木 - ジャカランダの原木 + 松の原木 + 地獄の樹皮の原木 + ジャカランダの原木 - 紅葉樹(黄)の葉 - 竹の葉 - 魔法の葉 - 闇の葉 - 枯れそうな木の葉 - モミの葉 - ロフトウッドの葉 - 紅葉樹(橙)の葉 + 紅葉樹(黄)の葉 + 竹の葉 + 魔法の葉 + 闇の葉 + 枯れそうな木の葉 + モミの葉 + ロフトウッドの葉 + 紅葉樹(橙)の葉 - アルファの木の葉 - サクラの木(淡紅)の葉 - 楓の葉 - サクラの木(白)の葉 - 地獄の樹皮の葉 - ジャカランダの葉 + アルファの木の葉 + サクラの木(淡紅)の葉 + 楓の葉 + サクラの木(白)の葉 + 地獄の樹皮の葉 + ジャカランダの葉 - アカシアの木材ハーフブロック - サクラの木材ハーフブロック - 闇の木材ハーフブロック - モミの木材ハーフブロック - ロフトウッドの木材ハーフブロック - 魔法の木材ハーフブロック - マングローブの木材ハーフブロック - ヤシの木材ハーフブロック - セコイアの木材ハーフブロック - 柳の木材ハーフブロック - 松の木材ハーフブロック - 地獄の樹皮の木材ハーフブロック - ジャカランダの木材ハーフブロック + アカシアの木材ハーフブロック + サクラの木材ハーフブロック + 闇の木材ハーフブロック + モミの木材ハーフブロック + ロフトウッドの木材ハーフブロック + 魔法の木材ハーフブロック + マングローブの木材ハーフブロック + ヤシの木材ハーフブロック + セコイアの木材ハーフブロック + 柳の木材ハーフブロック + 松の木材ハーフブロック + 地獄の樹皮の木材ハーフブロック + ジャカランダの木材ハーフブロック - アカシアの木材ハーフブロック - サクラの木材ハーフブロック - 闇の木材ハーフブロック - モミの木材ハーフブロック - ロフトウッドの木材ハーフブロック - 魔法の木材ハーフブロック - マングローブの木材ハーフブロック - ヤシの木材ハーフブロック - セコイアの木材ハーフブロック - 柳の木材ハーフブロック - 松の木材ハーフブロック - 地獄の樹皮の木材ハーフブロック - ジャカランダの木材ハーフブロック + アカシアの木材ハーフブロック + サクラの木材ハーフブロック + 闇の木材ハーフブロック + モミの木材ハーフブロック + ロフトウッドの木材ハーフブロック + 魔法の木材ハーフブロック + マングローブの木材ハーフブロック + ヤシの木材ハーフブロック + セコイアの木材ハーフブロック + 柳の木材ハーフブロック + 松の木材ハーフブロック + 地獄の樹皮の木材ハーフブロック + ジャカランダの木材ハーフブロック - アカシアの木材の階段 - サクラの木材の階段 - 闇の木材の階段 - モミの木材の階段 - ロフトウッドの木材の階段 - 魔法の木材の階段 - マングローブの木材の階段 - ヤシの木材の階段 - セコイアの木材の階段 - 柳の木材の階段 - 松の木材の階段 - 地獄の樹皮の木材の階段 - ジャカランダの木材の階段 + アカシアの木材の階段 + サクラの木材の階段 + 闇の木材の階段 + モミの木材の階段 + ロフトウッドの木材の階段 + 魔法の木材の階段 + マングローブの木材の階段 + ヤシの木材の階段 + セコイアの木材の階段 + 柳の木材の階段 + 松の木材の階段 + 地獄の樹皮の木材の階段 + ジャカランダの木材の階段 - アカシアの葉 - マングローブの葉 - ヤシの葉 - セコイアの葉 - 柳の葉 - 松の葉 - - - マッシュルームパウダー + アカシアの葉 + マングローブの葉 + ヤシの葉 + セコイアの葉 + 柳の葉 + 松の葉 - ひまわりの種 - - 果実 - マッシュルームパウダー - 野生のニンジン - ひまわりの種 - フルーツサラダ - 野菜のサラダ - マッシュルームサラダ + + 果実 + マッシュルームパウダー + 野生のニンジン + ひまわりの種 + フルーツサラダ + 野菜のサラダ + マッシュルームサラダ - 吹き筒 - 矢 - 毒矢 - - 泥だんご + 吹き筒 + 矢 + 毒矢 - 泥レンガ - 火山灰の塵 - アメジスト - 毒薬 - 天界のクリスタルの欠片 - 青の染料 - ブラウンの染料 - 緑の染料 - 白の染料 - 黒の染料 - ルビー - ペリドット - トパーズ - タンザナイト - アパタイト - サファイア - 恐ろしい魂 + 泥だんご - 泥状のツルハシ - 泥状の斧 - 泥状のシャベル - 泥状の剣 - 泥状のクワ - 泥状のヘルメット - 泥状のチェストプレート - 泥状のレギンス - 泥状のブーツ - - アメジストのツルハシ - アメジストの斧 - アメジストのシャベル - アメジストの剣 - アメジストのクワ - アメジストのヘルメット - アメジストのチェストプレート - アメジストのレギンス - アメジストのブーツ - - 木の鎌 - 石の鎌 - 鉄の鎌 - 金の鎌 - ダイヤの鎌 - 泥状の鎌 - アメジストの鎌 + 泥レンガ + 火山灰の塵 + アメジスト + 毒薬 + 天界のクリスタルの欠片 + 青の染料 + ブラウンの染料 + 緑の染料 + 白の染料 + 黒の染料 + ルビー + ペリドット + トパーズ + タンザナイト + アパタイト + サファイア + 恐ろしい魂 - 古代の杖 - 古代の杖の持ち手 - 古代の杖のポール - 古代の杖の上部分 - 枯渇した古代の杖 + 泥状のツルハシ + 泥状の斧 + 泥状のシャベル + 泥状の剣 + 泥状のクワ + 泥状のヘルメット + 泥状のチェストプレート + 泥状のレギンス + 泥状のブーツ - 霊魂の操縦者 - 恐ろしい霊魂の操縦者 - 村人の霊魂の操縦者 + アメジストのツルハシ + アメジストの斧 + アメジストのシャベル + アメジストの剣 + アメジストのクワ + アメジストのヘルメット + アメジストのチェストプレート + アメジストのレギンス + アメジストのブーツ - エンダーポーター + 木の鎌 + 石の鎌 + 鉄の鎌 + 金の鎌 + ダイヤの鎌 + 泥状の鎌 + アメジストの鎌 - 音楽ディスク - 音楽ディスク + 古代の杖 + 古代の杖の持ち手 + 古代の杖のポール + 古代の杖の上部分 + 枯渇した古代の杖 - 単調な花の冠 - 質素な花の冠 - 緑豊かな花の冠 - エキゾチックな花の冠 - - - アメジストバケツ - 温泉入りアメジストバケツ - 毒液入りバケツ - - 毒液 - 温泉 - - 毒液 + 霊魂の操縦者 + 恐ろしい霊魂の操縦者 + 村人の霊魂の操縦者 + + エンダーポーター + + 音楽ディスク + 音楽ディスク + + 単調な花の冠 + 質素な花の冠 + 緑豊かな花の冠 + エキゾチックな花の冠 + + + アメジストバケツ + 温泉入りアメジストバケツ + 毒液入りバケツ + + 毒液 + 温泉 + + 毒液 温泉 - - - Promised Landへのゲートは上空に現れた。 - 地上へのゲートは上空に現れた。 - - - Biomes O' Plenty - - - Biomes O' Plenty + + + Promised Landへのゲートは上空に現れた。 + 地上へのゲートは上空に現れた。 + + + Biomes O' Plenty + + + Biomes O' Plenty diff --git a/resources/assets/biomesoplenty/lang/nl_NL.xml b/resources/assets/biomesoplenty/lang/nl_NL.xml index 4db302f86..30cd49d79 100644 --- a/resources/assets/biomesoplenty/lang/nl_NL.xml +++ b/resources/assets/biomesoplenty/lang/nl_NL.xml @@ -1,340 +1,345 @@ - Nederlands (nl_NL) Localization File + Nederlands (nl_NL) Localization File - - Modder - Drijfzand + + Modder + Drijfzand - As steen - Versteend zand - Versteend Dirt - Hardened Ice - Dried Dirt - Crag Rock - Mud Bricks - Purified Dirt - Celestial Crystal + As steen + Versteend zand + Versteend Dirt + Hardened Ice + Dried Dirt + Crag Rock + Mud Bricks + Purified Dirt + Celestial Crystal - Rode steen - Red Rock Cobblestone - Rode baksteen - - As Blok + Rode steen + Red Rock Cobblestone + Rode baksteen - Dood gras - Woestijn gras - Woestijn plant - Duin gras - Lang gras - Doorns - Barley - Riet - Riet - Riet - Riet + As Blok - klaver - Moerasbloem - Doodbloem - Gloeiendebloem - Hortensia - Madeliefje - Tulp - Wildebloem - Violet - Anemoon - Waterlely - Kleine Cactus - Aloë - Zonnebloem - Zonnebloem - Paardebloem + Dood gras + Woestijn gras + Woestijn plant + Duin gras + Lang gras + Doorns + Barley + Riet + Riet + Riet + Riet + Kleine Cactus - Zeewier - Gras - Gras - Gras - Bosje - Spruit - Hoog Gras - Brandnetel - Besjes bosje - - Grote rode bloem - Grote gele bloem - - Vergiftige paddestoel - Portobello - Blauwe paddestoel - Gloeiende paddestoel - - Apple Sapling - Yellow Autumn Sapling - Bamboo Sapling - Magic Sapling - Dark Sapling - Dying Sapling - Fir Sapling - Loftwood Sapling - Orange Autumn Sapling - Origin Sapling - Pink Cherry Sapling - Maple Sapling - White Cherry Sapling - Hellbark Sapling - Jacaranda Sapling + klaver + Moerasbloem + Doodbloem + Gloeiendebloem + Hortensia + Wildebloem + Violet + Anemoon + Waterlely + Aloë + Zonnebloem + Zonnebloem + Paardebloem - Acacia Sapling - Mangrove Sapling - Palm Sapling - Redwood Sapling - Willow Sapling - Pine Sapling - - Wilg - Ivy - Appel Bladeren - Bambo - Modder Bricks Stairs - Origin Grass - Tree Moss + Zeewier + Gras + Gras + Gras + Bosje + Spruit + Hoog Gras + Brandnetel + Besjes bosje - Kelp - - Red Rock Cobblestone Stairs - Red Rock Bricks Stairs - - Purified Grass - Smoldering Grass - - Luchtsteen - Luchtsteen Cobblestone - Luchtsteen Bricks - - Luchtsteen Cobblestone Stairs - Luchtsteen Bricks Stairs + Grote rode bloem + Grote gele bloem - Beloofde Land Portal + Vergiftige paddestoel + Portobello + Blauwe paddestoel + Gloeiende paddestoel - Amethyst Ore - Block of Amethyst - Ruby Ore - Block of Ruby - Peridot Ore - Block of Peridot - Topaz Ore - Block of Topaz - Tanzanite Ore - Block of Tanzanite - Apatite Ore - Block of Apatite - Sapphire Ore - Block of Sapphire - - Mos - - Wolk Blok + Apple Sapling + Yellow Autumn Sapling + Bamboo Sapling + Magic Sapling + Dark Sapling + Dying Sapling + Fir Sapling + Loftwood Sapling + Orange Autumn Sapling + Origin Sapling + Pink Cherry Sapling + Maple Sapling + White Cherry Sapling + Hellbark Sapling + Jacaranda Sapling - Small Bone Segment - Medium Bone Segment - Large Bone Segment + Acacia Sapling + Mangrove Sapling + Palm Sapling + Redwood Sapling + Willow Sapling + Pine Sapling - Celestial Lens - Sacrificial Focus - - Altar Frame + Wilg + Ivy + Appel Bladeren + Bambo + Modder Bricks Stairs + Origin Grass + Tree Moss - Red Rock Cobblestone Slab - Red Rock Bricks Slab - Mud Bricks Slab - Skystone Cobblestone Slab - Skystone Bricks Slab + Kelp - Red Rock Cobblestone Slab - Red Rock Bricks Slab - Mud Bricks Slab - Skystone Cobblestone Slab - Skystone Bricks Slab + Red Rock Cobblestone Stairs + Red Rock Bricks Stairs - Acacia Wood Planks - Cherry Wood Planks - Dark Wood Planks - Fir Wood Planks - Loftwood Wood Planks - Magic Wood Planks - Mangrove Wood Planks - Palm Wood Planks - Redwood Wood Planks - Willow Wood Planks - Bamboo Thatching - Pine Wood Planks - Hellbark Wood Planks - Jacaranda Wood Planks + Purified Grass + Smoldering Grass - Acacia Wood - Cherry Wood - Dark Wood - Fir Wood + Luchtsteen + Luchtsteen Cobblestone + Luchtsteen Bricks - Loftwood Wood - Magic Wood - Mangrove Wood - Palm Wood + Luchtsteen Cobblestone Stairs + Luchtsteen Bricks Stairs - Redwood Wood - Willow Wood - Dead Wood - Giant Flower Stem + Beloofde Land Portal - Pine Wood - Hellbark Wood - Jacaranda Wood + Amethyst Ore + Block of Amethyst + Ruby Ore + Block of Ruby + Peridot Ore + Block of Peridot + Topaz Ore + Block of Topaz + Tanzanite Ore + Block of Tanzanite + Apatite Ore + Block of Apatite + Sapphire Ore + Block of Sapphire + + Mos - Yellow Autumn Leaves - Bamboo Leaves - Magic Leaves - Dark Leaves - Dying Leaves - Fir Leaves - Loftwood Leaves - Orange Autumn Leaves + Wolk Blok - Origin Leaves - Pink Cherry Leaves - Maple Leaves - White Cherry Leaves - Hellbark Leaves - Jacaranda Leaves + Small Bone Segment + Medium Bone Segment + Large Bone Segment - Acacia Wood Slab - Cherry Wood Slab - Dark Wood Slab - Fir Wood Slab - Loftwood Wood Slab - Magic Wood Slab - Mangrove Wood Slab - Palm Wood Slab - Redwood Wood Slab - Willow Wood Slab - Pine Wood Slab - Hellbark Wood Slab - Jacaranda Wood Slab + Celestial Lens + Sacrificial Focus - Acacia Wood Slab - Cherry Wood Slab - Dark Wood Slab - Fir Wood Slab - Loftwood Wood Slab - Magic Wood Slab - Mangrove Wood Slab - Palm Wood Slab - Redwood Wood Slab - Willow Wood Slab - Pine Wood Slab - Hellbark Wood Slab - Jacaranda Wood Slab + Altar Frame - Acacia Wood Stairs - Cherry Wood Stairs - Dark Wood Stairs - Fir Wood Stairs - Loftwood Wood Stairs - Magic Wood Stairs - Mangrove Wood Stairs - Palm Wood Stairs - Redwood Wood Stairs - Willow Wood Stairs - Pine Wood Stairs - Hellbark Wood Stairs - Jacaranda Wood Stairs + Red Rock Cobblestone Slab + Red Rock Bricks Slab + Mud Bricks Slab + Skystone Cobblestone Slab + Skystone Bricks Slab - Acacia Bladeren - Wortelboom Bladeren - Palm Bladeren - Roodhout Bladeren - Wilge Bladeren - Naald Bladeren - - - Shroom Powder + Red Rock Cobblestone Slab + Red Rock Bricks Slab + Mud Bricks Slab + Skystone Cobblestone Slab + Skystone Bricks Slab - ZonneBloemen zaaden - - Bes + Acacia Wood Planks + Cherry Wood Planks + Dark Wood Planks + Fir Wood Planks + Loftwood Wood Planks + Magic Wood Planks + Mangrove Wood Planks + Palm Wood Planks + Redwood Wood Planks + Willow Wood Planks + Bamboo Thatching + Pine Wood Planks + Hellbark Wood Planks + Jacaranda Wood Planks - Dart Schieter - Dart - Gif Dart - - Modder Bal + Acacia Wood + Cherry Wood + Dark Wood + Fir Wood - Mud Brick - Amethyst - Pile of Ashes - Poison - Celestial Crystal Shard - Blauwe Kleurstof - Buine Kleurstof - Groene Kleurstof - Witte Kleurstof - Zwarte Kleurstof - Ruby - Peridot - Topaz - Tanzanite - Apatite - Sapphire - Ghastly Soul + Loftwood Wood + Magic Wood + Mangrove Wood + Palm Wood - Modderige Houweel - Modderige Bijl - Modderige Shep - Modderige Zwaard - Modderige Schoffel - Modderige Helm - Modderige Kuras - Modderige Beenstukken - Modderige Schoenen - - Amethyst Houweel - Amethyst Bijl - Amethyst Shep - Amethyst Zwaard - Amethyst Schoffel - Amethyst Helm - Amethyst Kuras - Amethyst Beenstukken - Amethyst Schoenen + Redwood Wood + Willow Wood + Dead Wood + Giant Flower Stem - Oude Staf - Oude Staf Onderkant - Oude Staf Middenstuk - Oude Staf Bovenkant - Kapote Oude Staf + Pine Wood + Hellbark Wood + Jacaranda Wood - Soul Manipulator + Yellow Autumn Leaves + Bamboo Leaves + Magic Leaves + Dark Leaves + Dying Leaves + Fir Leaves + Loftwood Leaves + Orange Autumn Leaves - Enderporter + Origin Leaves + Pink Cherry Leaves + Maple Leaves + White Cherry Leaves + Hellbark Leaves + Jacaranda Leaves - Muziekplaat - Muziekplaat + Acacia Wood Slab + Cherry Wood Slab + Dark Wood Slab + Fir Wood Slab + Loftwood Wood Slab + Magic Wood Slab + Mangrove Wood Slab + Palm Wood Slab + Redwood Wood Slab + Willow Wood Slab + Pine Wood Slab + Hellbark Wood Slab + Jacaranda Wood Slab - Dull Flower Band - Plain Flower Band - Lush Flower Band - Exotic Flower Band - - - Spring Water Bucket - Liquid Poison Bucket - - Liquid Poison - Spring Water - - - Een portal naar de beloofde wereld is verschenen in de lucht. - Een portal is verschenen in de lucht. + Acacia Wood Slab + Cherry Wood Slab + Dark Wood Slab + Fir Wood Slab + Loftwood Wood Slab + Magic Wood Slab + Mangrove Wood Slab + Palm Wood Slab + Redwood Wood Slab + Willow Wood Slab + Pine Wood Slab + Hellbark Wood Slab + Jacaranda Wood Slab + + Acacia Wood Stairs + Cherry Wood Stairs + Dark Wood Stairs + Fir Wood Stairs + Loftwood Wood Stairs + Magic Wood Stairs + Mangrove Wood Stairs + Palm Wood Stairs + Redwood Wood Stairs + Willow Wood Stairs + Pine Wood Stairs + Hellbark Wood Stairs + Jacaranda Wood Stairs + + Acacia Bladeren + Wortelboom Bladeren + Palm Bladeren + Roodhout Bladeren + Wilge Bladeren + Naald Bladeren + + + Shroom Powder + ZonneBloemen zaaden + Bes + + Dart Schieter + Dart + Gif Dart + + Modder Bal + + Mud Brick + Amethyst + Pile of Ashes + Poison + Celestial Crystal Shard + Blauwe Kleurstof + Buine Kleurstof + Groene Kleurstof + Witte Kleurstof + Zwarte Kleurstof + Ruby + Peridot + Topaz + Tanzanite + Apatite + Sapphire + Ghastly Soul + + Modderige Houweel + Modderige Bijl + Modderige Shep + Modderige Zwaard + Modderige Schoffel + Modderige Helm + Modderige Kuras + Modderige Beenstukken + Modderige Schoenen + + Amethyst Houweel + Amethyst Bijl + Amethyst Shep + Amethyst Zwaard + Amethyst Schoffel + Amethyst Helm + Amethyst Kuras + Amethyst Beenstukken + Amethyst Schoenen + + Oude Staf + Oude Staf Onderkant + Oude Staf Middenstuk + Oude Staf Bovenkant + Kapote Oude Staf + + Soul Manipulator + + Enderporter + + Muziekplaat + Muziekplaat + + Dull Flower Band + Plain Flower Band + Lush Flower Band + Exotic Flower Band + + + Spring Water Bucket + Liquid Poison Bucket + + Liquid Poison + Spring Water + + Liquid Poison + Spring Water + + + Een portal naar de beloofde wereld is verschenen in de lucht. + Een portal is verschenen in de lucht. + + + Biomes O' Plenty + + + Biomes O' Plenty diff --git a/resources/assets/biomesoplenty/lang/pl_PL.xml b/resources/assets/biomesoplenty/lang/pl_PL.xml index 9298b0ad8..7d52aa26a 100644 --- a/resources/assets/biomesoplenty/lang/pl_PL.xml +++ b/resources/assets/biomesoplenty/lang/pl_PL.xml @@ -1,373 +1,373 @@ - Polski (pl_PL) Localization File - - - - - Błoto - Ruchome piaski + Polski (pl_PL) Localization File - Popiołowa skała - Utwardzony piasek - Utwardzona ziemia - Utwardzony lód - Wysuszona ziemia - Skała - Cegły z błota - Oczyszczona ziemia - Kryształ Celestii + - Czerwona skała - Czerwony bruk - Cegły z czerwonej skały - - Blok popiołu + + Błoto + Ruchome piaski - Martwa trawa - Pustynna trawa - Pustynne pędy - Trawa z wydm - Oczyszczona wysoka trawa - Ciernie - Jęczmień - Pałka - Pałka - Pałka - Trzcina - Tyci kaktus + Popiołowa skała + Utwardzony piasek + Utwardzona ziemia + Utwardzony lód + Wysuszona ziemia + Skała + Cegły z błota + Oczyszczona ziemia + Kryształ Celestii - Koniczyna - Bagienny kwiat - Martwy kwiat - Błyszczący kwiat - Hortensja - Stokrotka - Tulipan - Dziki kwiat - Fiołek - Zawilec - Lilia wodna - Chromaflora - Aloes - Słonecznik - Słonecznik - Dmuchawiec + Czerwona skała + Czerwony bruk + Cegły z czerwonej skały - Wodorosty - Krótka trawa - Średnia trawa - Wysoka trawa - Krzak - Pęd - Wysoka trawa - Trujący bluszcz - Krzak jagodowy - - Wielki czerwony kwiat - Wielki żółty kwiat - - Muchomor - Portobello - Lactarius indigo - Świecący grzyb - - Sadzonka jabłoni - Sadzonka jesiennego żółtego drzewa - Sadzonka bambusa - Magiczna sadzonka - Sadzonka ciemnego drzewa - Sadzonka umierającego drzewa - Sadzonka jodły - Podniebna sadzonka - Sadzonka jesiennego pomarańczowego drzewa - Pierwotna sadzonka - Sadzonka różowej wiśni - Sadzonka klonu - Sadzonka białej wiśni - Sadzonka piekielnego drzewa - Sadzonka jakarandy + Blok popiołu - Sadzonka akacji - Sadzonka namorzyna - Sadzonka palmy - Sadzonka sekwoji - Sadzonka wierzby - Sadzonka sosny - - Wierzba - Bluszcz - Liście jabłoni - Bambus - Schody z błota - Pierwotna trawa - Blok długiej trawy - Mech + Martwa trawa + Pustynna trawa + Pustynne pędy + Trawa z wydm + Oczyszczona wysoka trawa + Ciernie + Jęczmień + Pałka + Pałka + Pałka + Trzcina + Tyci kaktus - Listownicowce - - Schody z czerwonego bruku - Schody z czerwonej skały - - Blok oczyszczonej trawy - Blok tlącej się trawy - - Niebiańska skała - Niebiański bruk - Niebiańskie cegły - - Schody z niebiańskiego bruku - Schody z niebiańskiej cegły + Koniczyna + Bagienny kwiat + Martwy kwiat + Błyszczący kwiat + Hortensja + Stokrotka + Tulipan + Dziki kwiat + Fiołek + Zawilec + Lilia wodna + Chromaflora + Aloes + Słonecznik + Słonecznik + Dmuchawiec - Portal do Ziemi Obiecanej + Wodorosty + Krótka trawa + Średnia trawa + Wysoka trawa + Krzak + Pęd + Wysoka trawa + Trujący bluszcz + Krzak jagodowy - Ruda ametystu - Blok ametystu - Ruda rubinu - Blok rubinu - Ruda perydotu - Blok perydotu - Ruda topazu - Blok topazu - Ruda tanzanitu - Blok tanzanitu - Ruda apatytu - Blok apatytu - Ruda szafiru - Blok szafiru - - Mech - - Chmura + Wielki czerwony kwiat + Wielki żółty kwiat - Mała segment kośći - Średni segment kośći - Duży segment kośći + Muchomor + Portobello + Lactarius indigo + Świecący grzyb + + Sadzonka jabłoni + Sadzonka jesiennego żółtego drzewa + Sadzonka bambusa + Magiczna sadzonka + Sadzonka ciemnego drzewa + Sadzonka umierającego drzewa + Sadzonka jodły + Podniebna sadzonka + Sadzonka jesiennego pomarańczowego drzewa + Pierwotna sadzonka + Sadzonka różowej wiśni + Sadzonka klonu + Sadzonka białej wiśni + Sadzonka piekielnego drzewa + Sadzonka jakarandy + + Sadzonka akacji + Sadzonka namorzyna + Sadzonka palmy + Sadzonka sekwoji + Sadzonka wierzby + Sadzonka sosny + + Wierzba + Bluszcz + Liście jabłoni + Bambus + Schody z błota + Pierwotna trawa + Blok długiej trawy + Mech + + Listownicowce + + Schody z czerwonego bruku + Schody z czerwonej skały + + Blok oczyszczonej trawy + Blok tlącej się trawy + + Niebiańska skała + Niebiański bruk + Niebiańskie cegły + + Schody z niebiańskiego bruku + Schody z niebiańskiej cegły + + Portal do Ziemi Obiecanej + + Ruda ametystu + Blok ametystu + Ruda rubinu + Blok rubinu + Ruda perydotu + Blok perydotu + Ruda topazu + Blok topazu + Ruda tanzanitu + Blok tanzanitu + Ruda apatytu + Blok apatytu + Ruda szafiru + Blok szafiru + + Mech + + Chmura + + Mała segment kośći + Średni segment kośći + Duży segment kośći + + Soczewka Celestii + + Ołtarz ofiarny + Ołtarz ofiarny + Ołtarz ofiarny + + Rama ołtarza + + Kałuża - Soczewka Celestii - - Ołtarz ofiarny - Ołtarz ofiarny - Ołtarz ofiarny - - Rama ołtarza - - Kałuża - Grób - Płytka z czerwonego bruku - Płytka z czerwonej skały - Płytka z błota - Płytka z niebiańskiego bruku - Płytka z niebiańskiej cegły + Płytka z czerwonego bruku + Płytka z czerwonej skały + Płytka z błota + Płytka z niebiańskiego bruku + Płytka z niebiańskiej cegły - Płytka z czerwonego bruku - Płytka z czerwonej skały - Płytka z błota - Płytka z niebiańskiego bruku - Płytka z niebiańskiej cegły + Płytka z czerwonego bruku + Płytka z czerwonej skały + Płytka z błota + Płytka z niebiańskiego bruku + Płytka z niebiańskiej cegły - Akacjowe deski - Deski z wiśni - Ciemne deski - Jodłowe deski - Podniebne deski - Magiczne deski - Namorzynowe deski - Palmowe deski - Sekwojowe deski - Wierzbowe deski - Bambusowa strzecha - Sosnowe deski - Piekielne deski - Jakarandowe deski + Akacjowe deski + Deski z wiśni + Ciemne deski + Jodłowe deski + Podniebne deski + Magiczne deski + Namorzynowe deski + Palmowe deski + Sekwojowe deski + Wierzbowe deski + Bambusowa strzecha + Sosnowe deski + Piekielne deski + Jakarandowe deski - Drewno akacji - Drewno wiśni - Ciemne drewno - Jodłowe drewno + Drewno akacji + Drewno wiśni + Ciemne drewno + Jodłowe drewno - Podniebne drewno - Magiczne drewno - Namorzynowe drewno - Palmowe drewno + Podniebne drewno + Magiczne drewno + Namorzynowe drewno + Palmowe drewno - Sekwojowe drewno - Wierzbowe drewno - Martwe drewno - Łodyga wielkiego kwiatu + Sekwojowe drewno + Wierzbowe drewno + Martwe drewno + Łodyga wielkiego kwiatu - Sosnowe drewno - Piekielna kora - Jakarandowe drewno + Sosnowe drewno + Piekielna kora + Jakarandowe drewno - Żółte liście - Bambusowe liście - Magiczne liście - Ciemne liście - Umierające liście - Jodłowe igły - Podniebne liście - Pomarańczowe liście + Żółte liście + Bambusowe liście + Magiczne liście + Ciemne liście + Umierające liście + Jodłowe igły + Podniebne liście + Pomarańczowe liście - Pierwotne liście - Różowe liście - Klonowe liście - Białe liście - Piekielne liście - Jakarandowe liście + Pierwotne liście + Różowe liście + Klonowe liście + Białe liście + Piekielne liście + Jakarandowe liście - Płytka z akacjowych desek - Płytka z wiśniowych desek - Płytka z ciemnych desek - Płytka z jodłowych desek - Płytka z podniebnych desek - Płytka z magicznych desek - Płytka z namorzynowych desek - Płytka z palmowych desek - Płytka z sekwojowych desek - Płytka z wierzbowych desek - Płytka z sosnowych desek - Płytka z piekielnych desek - Płytka z jakarandowych desek + Płytka z akacjowych desek + Płytka z wiśniowych desek + Płytka z ciemnych desek + Płytka z jodłowych desek + Płytka z podniebnych desek + Płytka z magicznych desek + Płytka z namorzynowych desek + Płytka z palmowych desek + Płytka z sekwojowych desek + Płytka z wierzbowych desek + Płytka z sosnowych desek + Płytka z piekielnych desek + Płytka z jakarandowych desek - Płytka z akacjowych desek - Płytka z wiśniowych desek - Płytka z ciemnych desek - Płytka z jodłowych desek - Płytka z podniebnych desek - Płytka z magicznych desek - Płytka z namorzynowych desek - Płytka z palmowych desek - Płytka z sekwojowych desek - Płytka z wierzbowych desek - Płytka z sosnowych desek - Płytka z piekielnych desek - Płytka z jakarandowych desek + Płytka z akacjowych desek + Płytka z wiśniowych desek + Płytka z ciemnych desek + Płytka z jodłowych desek + Płytka z podniebnych desek + Płytka z magicznych desek + Płytka z namorzynowych desek + Płytka z palmowych desek + Płytka z sekwojowych desek + Płytka z wierzbowych desek + Płytka z sosnowych desek + Płytka z piekielnych desek + Płytka z jakarandowych desek - Schody z akacjowych desek - Schody z wiśniowych desek - Schody z ciemnych desek - Schody z jodłowych desek - Schody z podniebnych desek - Schody z magicznych desek - Schody z namorzynowych desek - Schody z palmowych desek - Schody z sekwojowych desek - Schody z wierzbowych desek - Schody z sosnowych desek - Schody z piekielnych desek - Schody z jakarandowych desek + Schody z akacjowych desek + Schody z wiśniowych desek + Schody z ciemnych desek + Schody z jodłowych desek + Schody z podniebnych desek + Schody z magicznych desek + Schody z namorzynowych desek + Schody z palmowych desek + Schody z sekwojowych desek + Schody z wierzbowych desek + Schody z sosnowych desek + Schody z piekielnych desek + Schody z jakarandowych desek - Liście akacji - Liście namorzyna - Liście palmowe - Liście sekwoji - Liście wierzbowe - Sosnowe igły - - - Jagoda - Proszek halucynogenny - Dzikie marchewki - Nasiona słonecznika - Sałatka owocowa - Sałatka warzywna - Sałatka grzybowa + Liście akacji + Liście namorzyna + Liście palmowe + Liście sekwoji + Liście wierzbowe + Sosnowe igły - Dmuchawka - Rzutka - Trująca rzutka - - Błotna kulka + + Jagoda + Proszek halucynogenny + Dzikie marchewki + Nasiona słonecznika + Sałatka owocowa + Sałatka warzywna + Sałatka grzybowa - Cegła z błota - Popiół - Ametyst - Trucizna - Odłamek kryształu Celestii - Niebieski barwnik - Brązowy barwnik - Zielony barwnik - Biały barwnik - Czarny barwnik - Rubin - Peridot - Topaz - Tanzanit - Apatyt - Szafir - Upiorna dusza + Dmuchawka + Rzutka + Trująca rzutka - Błotny kilof - Błotna siekiera - Błotna łopata - Błotny miecz - Błotna motyka - Błotny hełm - Błotny napierśnik - Błotne nagolenniki - Błotne bóty - - Ametystowy kilof - Ametystowe topór - Ametystowa łopata - Ametystowy miecz - Ametystowa motyka - Ametystowy hełm - Ametystowy napierśnik - Ametystowe nagolenniki - Ametystowe buty - - Drewniana kosa - Kamienna kosa - Żelazna kosa - Złota kosa - Diamentowa kosa - Błotna kosa - Ametystowa kosa + Błotna kulka - Starożytna laska - Rączka starożytnej laski - Tyczka starożytnej laski - Czubek starożytnej laski - Zużyta starożytna laska + Cegła z błota + Popiół + Ametyst + Trucizna + Odłamek kryształu Celestii + Niebieski barwnik + Brązowy barwnik + Zielony barwnik + Biały barwnik + Czarny barwnik + Rubin + Peridot + Topaz + Tanzanit + Apatyt + Szafir + Upiorna dusza - Ster dusz - Ster upiornych dusz - Ster wieśniackich dusz + Błotny kilof + Błotna siekiera + Błotna łopata + Błotny miecz + Błotna motyka + Błotny hełm + Błotny napierśnik + Błotne nagolenniki + Błotne bóty - Enderporter + Ametystowy kilof + Ametystowe topór + Ametystowa łopata + Ametystowy miecz + Ametystowa motyka + Ametystowy hełm + Ametystowy napierśnik + Ametystowe nagolenniki + Ametystowe buty - Płyta muzyczna - Płyta muzyczna + Drewniana kosa + Kamienna kosa + Żelazna kosa + Złota kosa + Diamentowa kosa + Błotna kosa + Ametystowa kosa - Zespół Mdły Kwiat - Zespół Gładki Kwiat - Zespół Bujny Kwiat - Zespół Egzotyczny Kwiat - - - Ametystowe wiaderko - Ametystowe wiaderko ze zdrowotną wodą źródlaną - Wiaderko z trucizną - - Trucizna - Zdrowotna woda źródlana - - Trucizna + Starożytna laska + Rączka starożytnej laski + Tyczka starożytnej laski + Czubek starożytnej laski + Zużyta starożytna laska + + Ster dusz + Ster upiornych dusz + Ster wieśniackich dusz + + Enderporter + + Płyta muzyczna + Płyta muzyczna + + Zespół Mdły Kwiat + Zespół Gładki Kwiat + Zespół Bujny Kwiat + Zespół Egzotyczny Kwiat + + + Ametystowe wiaderko + Ametystowe wiaderko ze zdrowotną wodą źródlaną + Wiaderko z trucizną + + Trucizna + Zdrowotna woda źródlana + + Trucizna Zdrowotna woda źródlana - - - Brama niebios pojawiła się w górze - Brama świata pojawiła się w górze - - - Biomes O' Plenty - - - Biomes O' Plenty + + + Brama niebios pojawiła się w górze + Brama świata pojawiła się w górze + + + Biomes O' Plenty + + + Biomes O' Plenty diff --git a/resources/assets/biomesoplenty/lang/ru_RU.xml b/resources/assets/biomesoplenty/lang/ru_RU.xml index 951ea44cb..4a6663876 100644 --- a/resources/assets/biomesoplenty/lang/ru_RU.xml +++ b/resources/assets/biomesoplenty/lang/ru_RU.xml @@ -1,379 +1,382 @@ - Russian (ru_RU) Localization File + Russian (ru_RU) Localization File - - Грязь - Зыбучий песок + + Грязь + Зыбучий песок - Окаменевший пепел - Затвердевший песок - Затвердевшая земля - Крепкий лёд - Осушенная земля - Горная порода - Кирпичи из грязи - Очищенный грунт - Небесный кристалл + Окаменевший пепел + Затвердевший песок + Затвердевшая земля + Крепкий лёд + Осушенная земля + Горная порода + Кирпичи из грязи + Очищенный грунт + Небесный кристалл - Красный камень - Красный булыжник - Кирпичи из красного камня + Красный камень + Красный булыжник + Кирпичи из красного камня - Блок пепла + Блок пепла - Мёртвая трава - Пустынная трава - Пустынные ростки - Дюнная трава - Очищенная высокая трава - Колючки - Ячмень - Рогоз - Рогоз - Рогоз - Камыш - Крохотный кактус - Иссушающий нарост + Мёртвая трава + Пустынная трава + Пустынные ростки + Дюнная трава + Очищенная высокая трава + Колючки + Ячмень + Рогоз + Рогоз + Рогоз + Камыш + Крохотный кактус + Иссушающий нарост - Клевер - Болотный цветок - Смертельный цветок - Светоцвет - Синяя гортензия - Оранжевая космея - Розовый нарцисс - Колокольчик - Фиалка - Белый анемон - Кувшинка - Радужный цветок - Алоэ - Подсолнечник - Подсолнечник - Белый одуванчик + Клевер + Болотный цветок + Смертельный цветок + Светоцвет + Синяя гортензия + Оранжевая космея + Розовый нарцисс + Колокольчик + Фиалка + Белый анемон + Кувшинка + Радужный цветок + Алоэ + Подсолнечник + Подсолнечник + Белый одуванчик - Водоросли - Низкая трава - Средняя трава - Высокая трава - Куст - Росток - Высокая трава - Ядовитый плющ - Ягодный куст + Водоросли + Низкая трава + Средняя трава + Высокая трава + Куст + Росток + Высокая трава + Ядовитый плющ + Ягодный куст - Гигантский красный цветок - Гигантский жёлтый цветок + Гигантский красный цветок + Гигантский жёлтый цветок - Гриб - Портобелло - Млечник голубой - Светогриб + Гриб + Портобелло + Млечник голубой + Светогриб - Саженец яблони - Саженец жёлтого осеннего дерева - Саженец бамбука - Магический саженец - Тёмный саженец - Погибающий саженец - Саженец пихты - Саженец лофтвуда - Саженец оранжевого осеннего дерева - Оригинальный саженец - Саженец розовой вишни - Саженец клёна - Саженец белой вишни - Саженец адского дерева - Саженец жакаранды + Саженец яблони + Саженец жёлтого осеннего дерева + Саженец бамбука + Магический саженец + Тёмный саженец + Погибающий саженец + Саженец пихты + Саженец лофтвуда + Саженец оранжевого осеннего дерева + Оригинальный саженец + Саженец розовой вишни + Саженец клёна + Саженец белой вишни + Саженец адского дерева + Саженец жакаранды - Саженец акации - Мангровый саженец - Саженец пальмы - Саженец красного дерева - Саженец ивы - Саженец сосны - Саженец хурмы + Саженец акации + Мангровый саженец + Саженец пальмы + Саженец красного дерева + Саженец ивы + Саженец сосны + Саженец хурмы - Ива - Плющ - Листва яблони - Листва хурмы - Бамбук - Кирпичные ступеньки из грязи - Оригинальная трава - Блок высокой травы - Древесный мох + Ива + Плющ + Листва яблони + Листва хурмы + Бамбук + Кирпичные ступеньки из грязи + Оригинальная трава + Блок высокой травы + Древесный мох - Ламинария - Розовый коралл - Оранжевый коралл - Синий коралл - Светящийся коралл + Ламинария + Розовый коралл + Оранжевый коралл + Синий коралл + Светящийся коралл - Ступеньки из красного булыжника - Кирпичные ступеньки из красного камня - - Очищенная трава - Тлеющая трава - - Небесный камень - Небесный булыжник - Небесные кирпичи - - Ступеньки из небесного булыжника - Ступеньки из небесных кирпичей + Ступеньки из красного булыжника + Кирпичные ступеньки из красного камня - Портал в "Землю Обетованную" + Очищенная трава + Тлеющая трава - Аметистовая руда - Аметистовый блок - Рубиновая руда - Рубиновый блок - Оливиновая руда - Оливиновый блок - Топазовая руда - Блок топаза - Танзанитовая руда - Танзанитовый блок - Апатитовая руда - Апатитовый блок - Сапфировая руда - Сапфировый блок + Небесный камень + Небесный булыжник + Небесные кирпичи - Мох + Ступеньки из небесного булыжника + Ступеньки из небесных кирпичей - Блок облака + Портал в "Землю Обетованную" - Малый сегмент кости - Средний сегмент кости - Большой сегмент кости + Аметистовая руда + Аметистовый блок + Рубиновая руда + Рубиновый блок + Оливиновая руда + Оливиновый блок + Топазовая руда + Блок топаза + Танзанитовая руда + Танзанитовый блок + Апатитовая руда + Апатитовый блок + Сапфировая руда + Сапфировый блок - Небесные линзы + Мох - Жертвенный фокус - Жертвенный фокус - Жертвенный фокус + Блок облака - Каркас алтаря + Малый сегмент кости + Средний сегмент кости + Большой сегмент кости - Лужица + Небесные линзы - Могильная плита + Жертвенный фокус + Жертвенный фокус + Жертвенный фокус - Плита из красного булыжника - Кирпичная плита из красного камня - Кирпичная плита из грязи - Плита из небесного булыжника - Плита из небесных кирпичей + Каркас алтаря - Плита из красного булыжника - Кирпичная плита из красного камня - Кирпичная плита из грязи - Плита из небесного булыжника - Плита из небесных кирпичей + Лужица - Доски из древесины акации - Доски из древесины вишнёвого дерева - Доски из древесины тёмного дерева - Доски из древесины пихты - Доски из древесины лофтвуда - Доски из древесины магического дерева - Доски из древесины мангрового дерева - Доски из древесины пальмы - Доски из древесины красного дерева - Доски из древесины ивы - Бамбук - Доски из древесины сосны - Доски из древесины адского дерева - Доски из древесины жакаранды + Могильная плита - Древесина акации - Древесина вишнёвого дерева - Древесина тёмного дерева - Древесина пихты + Плита из красного булыжника + Кирпичная плита из красного камня + Кирпичная плита из грязи + Плита из небесного булыжника + Плита из небесных кирпичей - Древесина лофтвуда - Древесина магического дерева - Древесина мангрового дерева - Древесина пальмы + Плита из красного булыжника + Кирпичная плита из красного камня + Кирпичная плита из грязи + Плита из небесного булыжника + Плита из небесных кирпичей - Древесина красного дерева - Древесина ивы - Древесина погибшего дерева - Ствол гигантского цветка + Доски из древесины акации + Доски из древесины вишнёвого дерева + Доски из древесины тёмного дерева + Доски из древесины пихты + Доски из древесины лофтвуда + Доски из древесины магического дерева + Доски из древесины мангрового дерева + Доски из древесины пальмы + Доски из древесины красного дерева + Доски из древесины ивы + Бамбук + Доски из древесины сосны + Доски из древесины адского дерева + Доски из древесины жакаранды - Древесина сосны - Древесина адского дерева - Древесина жакаранды + Древесина акации + Древесина вишнёвого дерева + Древесина тёмного дерева + Древесина пихты - Жёлтая осенняя листва - Листва бамбука - Магическая листва - Тёмная листва - Погибающая листва - Листва пихты - Листва лофтвуда - Оранжевая осенняя листва + Древесина лофтвуда + Древесина магического дерева + Древесина мангрового дерева + Древесина пальмы - Оригинальная листва - Листва розовой вишни - Листва клёна - Листва белой вишни - Адская листва - Листва жакаранды + Древесина красного дерева + Древесина ивы + Древесина погибшего дерева + Ствол гигантского цветка - Плита из древесины акации - Плита из древесины вишнёвого дерева - Плита из древесины тёмного дерева - Плита из древесины пихты - Плита из древесины лофтвуда - Плита из древесины магического дерева - Плита из древесины мангрового дерева - Плита из древесины пальмы - Плита из древесины красного дерева - Плита из древесины ивы - Плита из древесины сосны - Плита из древесины адского дерева - Плита из древесины жакаранды + Древесина сосны + Древесина адского дерева + Древесина жакаранды - Плита из древесины акации - Плита из древесины вишнёвого дерева - Плита из древесины тёмного дерева - Плита из древесины пихты - Плита из древесины лофтвуда - Плита из древесины магического дерева - Плита из древесины мангрового дерева - Плита из древесины пальмы - Плита из древесины красного дерева - Плита из древесины ивы - Плита из древесины сосны - Плита из древесины адского дерева - Плита из древесины жакаранды + Жёлтая осенняя листва + Листва бамбука + Магическая листва + Тёмная листва + Погибающая листва + Листва пихты + Листва лофтвуда + Оранжевая осенняя листва - Ступеньки из древесины акации - Ступеньки из древесины вишнёвого дерева - Ступеньки из древесины тёмного дерева - Ступеньки из древесины пихты - Ступеньки из древесины лофтвуда - Ступеньки из древесины магического дерева - Ступеньки из древесины мангрового дерева - Ступеньки из древесины пальмы - Ступеньки из древесины красного дерева - Ступеньки из древесины ивы - Ступеньки из древесины сосны - Ступеньки из древесины адского дерева - Ступеньки из древесины жакаранды + Оригинальная листва + Листва розовой вишни + Листва клёна + Листва белой вишни + Адская листва + Листва жакаранды - Листва акации - Листва мангрового дерева - Листва пальмы - Листва красного дерева - Листва ивы - Листва сосны + Плита из древесины акации + Плита из древесины вишнёвого дерева + Плита из древесины тёмного дерева + Плита из древесины пихты + Плита из древесины лофтвуда + Плита из древесины магического дерева + Плита из древесины мангрового дерева + Плита из древесины пальмы + Плита из древесины красного дерева + Плита из древесины ивы + Плита из древесины сосны + Плита из древесины адского дерева + Плита из древесины жакаранды - - Ягода - Молотый гриб - Дикая морковь - Семечки подсолнуха - Фруктовый салат - Овощной салат - Грибной салат - Хурма + Плита из древесины акации + Плита из древесины вишнёвого дерева + Плита из древесины тёмного дерева + Плита из древесины пихты + Плита из древесины лофтвуда + Плита из древесины магического дерева + Плита из древесины мангрового дерева + Плита из древесины пальмы + Плита из древесины красного дерева + Плита из древесины ивы + Плита из древесины сосны + Плита из древесины адского дерева + Плита из древесины жакаранды - Духовая трубка - Дротик - Отравленный дротик + Ступеньки из древесины акации + Ступеньки из древесины вишнёвого дерева + Ступеньки из древесины тёмного дерева + Ступеньки из древесины пихты + Ступеньки из древесины лофтвуда + Ступеньки из древесины магического дерева + Ступеньки из древесины мангрового дерева + Ступеньки из древесины пальмы + Ступеньки из древесины красного дерева + Ступеньки из древесины ивы + Ступеньки из древесины сосны + Ступеньки из древесины адского дерева + Ступеньки из древесины жакаранды - Комок грязи + Листва акации + Листва мангрового дерева + Листва пальмы + Листва красного дерева + Листва ивы + Листва сосны - Кирпичи из грязи - Кучка пепла - Аметист - Яд - Осколок небесного кристалла - Синий краситель - Коричневый краситель - Зелёный краситель - Белый краситель - Чёрный краситель - Рубин - Оливин - Топаз - Танзанит - Апатит - Сапфир - Жуткий дух + + Ягода + Молотый гриб + Дикая морковь + Семечки подсолнуха + Фруктовый салат + Овощной салат + Грибной салат + Хурма - Кирка из грязи - Топор из грязи - Лопата из грязи - Меч из грязи - Мотыга из грязи - Шлем из грязи - Кираса из грязи - Поножи из грязи - Ботинки из грязи + Духовая трубка + Дротик + Отравленный дротик - Аметистовая кирка - Аметистовый топор - Аметистовая лопата - Апетистовый меч - Аметистовая мотыга - Аметистовый шлем - Аметистовая кираса - Аметистовые поножи - Аметистовые ботинки + Комок грязи - Деревянная коса - Каменная коса - Железная коса - Золотая коса - Алмазная коса - Коса из грязи - Аметистовая коса + Кирпичи из грязи + Кучка пепла + Аметист + Яд + Осколок небесного кристалла + Синий краситель + Коричневый краситель + Зелёный краситель + Белый краситель + Чёрный краситель + Рубин + Оливин + Топаз + Танзанит + Апатит + Сапфир + Жуткий дух - Древний посох - Рукоять древнего посоха - Древко древнего посоха - Верхушка древнего посоха - Истощённый древний посох + Кирка из грязи + Топор из грязи + Лопата из грязи + Меч из грязи + Мотыга из грязи + Шлем из грязи + Кираса из грязи + Поножи из грязи + Ботинки из грязи - Манипулятор духа - Манипулятор жуткого духа - Манипулятор духа жителей + Аметистовая кирка + Аметистовый топор + Аметистовая лопата + Апетистовый меч + Аметистовая мотыга + Аметистовый шлем + Аметистовая кираса + Аметистовые поножи + Аметистовые ботинки - Телепортер края + Деревянная коса + Каменная коса + Железная коса + Золотая коса + Алмазная коса + Коса из грязи + Аметистовая коса - Музыкальная пластинка - Музыкальная пластинка + Древний посох + Рукоять древнего посоха + Древко древнего посоха + Верхушка древнего посоха + Истощённый древний посох - Скучный венок - Обычный венок - Пышный венок - Экзотический венок + Манипулятор духа + Манипулятор жуткого духа + Манипулятор духа жителей - - Аметистовое ведро - Аметистовое ведро с родниковой водой - Ведро с ядом + Телепортер края - Яд - Родниковая вода + Музыкальная пластинка + Музыкальная пластинка - Яд - Родниковая вода + Скучный венок + Обычный венок + Пышный венок + Экзотический венок - - Врата в Землю Обетованную открылись выше. - Врата в обычный мир открылись выше. + Болотные сапоги + Ласты - - Biomes O' Plenty + + Аметистовое ведро + Аметистовое ведро родниковой воды + Ведро яда - - Biomes O' Plenty + Жидкий яд + Родниковая вода + + Жидкий яд + Родниковая вода + + + Врата в Землю Обетованную открылись выше. + Врата в обычный мир открылись выше. + + + Biomes O' Plenty + + + Biomes O' Plenty diff --git a/resources/assets/biomesoplenty/lang/zh_CN.xml b/resources/assets/biomesoplenty/lang/zh_CN.xml index 89052f2fa..c00fc987e 100644 --- a/resources/assets/biomesoplenty/lang/zh_CN.xml +++ b/resources/assets/biomesoplenty/lang/zh_CN.xml @@ -1,364 +1,363 @@ - Simplified Chinese (zh_CN) Localization File + Simplified Chinese (zh_CN) Localization File - - 泥巴 - 流沙 + + 泥巴 + 流沙 - 火山灰岩 - 硬化沙子 - 硬化泥土 - 硬化冰块 - 干燥泥土 - 崖壁岩石 - 泥巴砖块 - 纯净泥土 - 仙域水晶 + 火山灰岩 + 硬化沙子 + 硬化泥土 + 硬化冰块 + 干燥泥土 + 崖壁岩石 + 泥巴砖块 + 纯净泥土 + 仙域水晶 - 红岩 - 红岩圆石 - 红岩砖块 - - 灰烬块 + 红岩 + 红岩圆石 + 红岩砖块 - 枯萎草 - 沙漠草 - 沙漠野菜 - 沙丘草 - 纯净高草 - 荆棘 - 大麦 - 香蒲 - 香蒲 - 香蒲 - 芦苇 + 灰烬块 - 苜蓿 - 沼泽花 - 死亡花 - 闪光花 - 绣球花 - 雏菊 - 郁金香 - 野花 - 紫罗兰 - 银莲花 - 水百合 - 仙人球 - 龙舌兰 - 向日葵 - 向日葵 - 蒲公英 + 枯萎草 + 沙漠草 + 沙漠野菜 + 沙丘草 + 纯净高草 + 荆棘 + 大麦 + 香蒲 + 香蒲 + 香蒲 + 芦苇 + 仙人球 - 海藻 - 小草 - 矮草 - 高草 - 灌木 - 野菜 - 高草 - 毒藤 - 浆果灌木 - - 巨大红色花 - 巨大黄色花 - - 毒菌 - 双孢蘑菇 - 蓝牛奶伞菌 - 夜光菇 - - 苹果树苗 - 黄色秋天树苗 - 竹笋 - 魔法树苗 - 黑暗树苗 - 垂死树苗 - 杉树树苗 - 阁楼木树苗 - 橙色秋天树苗 - 起源树苗 - 粉色樱桃树苗 - 枫树树苗 - 白色樱桃树树苗 - 地狱皮树苗 - 蓝花楹木树苗 + 苜蓿 + 沼泽花 + 死亡花 + 闪光花 + 绣球花 + 野花 + 紫罗兰 + 银莲花 + 水百合 + 龙舌兰 + 向日葵 + 向日葵 + 蒲公英 - 刺槐树树苗 - 红树树苗 - 棕榈树苗 - 红木树苗 - 柳树树苗 - 松树树苗 - - 柳树 - 藤蔓 - 苹果树叶 - 竹子 - 泥巴砖块楼梯 - 源草 - 树藓 + 海藻 + 小草 + 矮草 + 高草 + 灌木 + 野菜 + 高草 + 毒藤 + 浆果灌木 - 巨藻 - - 红岩圆石楼梯 - 红岩砖块楼梯 - - 纯净草 - 阴燃草 - - 苍空石 - 苍空圆石 - 苍空砖块 - - 苍空圆石楼梯 - 苍空砖块楼梯 + 巨大红色花 + 巨大黄色花 - 应许之地传送门 + 毒菌 + 双孢蘑菇 + 蓝牛奶伞菌 + 夜光菇 - 紫晶矿石 - 紫晶块 - 红宝石矿石 - 红宝石块 - 橄榄石矿石 - 橄榄石块 - 黄玉矿石 - 黄玉块 - 坦桑矿石 - 坦桑石块 - 磷灰石矿石 - 磷灰石块 - 蓝宝石矿石 - 蓝宝石块 - - 苔藓 - - 云块 + 苹果树苗 + 黄色秋天树苗 + 竹笋 + 魔法树苗 + 黑暗树苗 + 垂死树苗 + 杉树树苗 + 阁楼木树苗 + 橙色秋天树苗 + 起源树苗 + 粉色樱桃树苗 + 枫树树苗 + 白色樱桃树树苗 + 地狱皮树苗 + 蓝花楹木树苗 - 一小截骨头 - 一截骨头 - 一大截骨头 + 刺槐树树苗 + 红树树苗 + 棕榈树苗 + 红木树苗 + 柳树树苗 + 松树树苗 - 仙域透镜 - - 献祭之核 - 献祭之核 - 献祭之核 - - 祭坛框架 - - 胶土 - - 坟墓 + 柳树 + 藤蔓 + 苹果树叶 + 竹子 + 泥巴砖块楼梯 + 源草 + 树藓 - 红岩圆石台阶 - 红岩砖块台阶 - 泥巴砖块台阶 - 苍空石圆石台阶 - 苍空石砖块台阶 + 巨藻 - 红岩圆石台阶 - 红岩砖块台阶 - 泥巴砖块台阶 - 苍空石圆石台阶 - 苍空石砖块台阶 + 红岩圆石楼梯 + 红岩砖块楼梯 - 刺槐树木板 - 樱桃树木板 - 黑暗树木板 - 杉树木板 - 阁楼树木板 - 魔法树木板 - 红树木板 - 棕榈树木板 - 红木树木板 - 柳树木板 - 竹板 - 松树木板 - 地狱皮树木板 - 蓝花楹树木板 + 纯净草 + 阴燃草 - 刺槐树原木 - 樱桃树原木 - 黑暗树原木 - 杉树原木 + 苍空石 + 苍空圆石 + 苍空砖块 - 阁楼树原木 - 魔法树原木 - 红树原木 - 棕榈树原木 + 苍空圆石楼梯 + 苍空砖块楼梯 - 红木原木 - 柳树原木 - 垂死树原木 - 巨大花茎 + 应许之地传送门 - 松树原木 - 地狱皮树原木 - 蓝花楹树原木 + 紫晶矿石 + 紫晶块 + 红宝石矿石 + 红宝石块 + 橄榄石矿石 + 橄榄石块 + 黄玉矿石 + 黄玉块 + 坦桑矿石 + 坦桑石块 + 磷灰石矿石 + 磷灰石块 + 蓝宝石矿石 + 蓝宝石块 - 黄色秋天树叶 - 竹叶 - 魔法树叶 - 黑暗树叶 - 垂死树叶 - 杉树树叶 - 阁楼树树叶 - 橙色秋天树叶 + 苔藓 - Origin树叶 - 粉樱桃树叶 - 枫树叶 - 白樱桃树叶 - 地狱皮树叶 - 蓝花楹树叶 + 云块 - 刺槐树木板 - 樱桃树木板 - 黑暗树木板 - 杉树木板 - 阁楼树木板 - 魔法树木板 - 红树木板 - 棕榈树木板 - 红木木板 - 柳树木板 - 松树木板 - 地狱皮树木板 - 蓝花楹树木板 + 一小截骨头 + 一截骨头 + 一大截骨头 - 刺槐树台阶 - 樱桃树台阶 - 黑暗树台阶 - 杉树台阶 - 阁楼树台阶 - 魔法树台阶 - 红树台阶 - 棕榈树台阶 - 红木台阶 - 柳树台阶 - 松树台阶 - 地狱皮树台阶 - 蓝花楹树台阶 + 仙域透镜 - 刺槐木楼梯 - 樱桃木楼梯 - 黑暗木楼梯 - 冷杉木楼梯 - 阁楼木楼梯 - 魔法木楼梯 - 红树木楼梯 - 棕榈木楼梯 - 红杉木楼梯 - 柳树木楼梯 - 松树木楼梯 - 地狱皮木楼梯 - 蓝花楹树楼梯 + 献祭之核 + 献祭之核 + 献祭之核 - 刺槐树叶 - 红树叶 - 棕榈叶 - 红杉叶 - 柳树叶 - 松树叶 - - - 蘑菇粉 + 祭坛框架 - 葵花籽 - - 浆果 + 胶土 - 飞镖吹筒 - 飞镖 - 毒飞镖 - - 泥球 + 坟墓 - 泥砖 - 一小堆灰烬 - 紫晶 - 毒药 - 仙域水晶碎片 - 蓝色染料 - 棕色染料 - 绿色染料 - 白色染料 - 黑色染料 - 红宝石 - 橄榄石 - 黄玉 - 坦桑石 - 磷灰石 - 蓝宝石 - 幽魂灵魂 + 红岩圆石台阶 + 红岩砖块台阶 + 泥巴砖块台阶 + 苍空石圆石台阶 + 苍空石砖块台阶 - 泥巴镐 - 泥巴斧 - 泥巴铲 - 泥巴剑 - 泥巴锄 - 泥巴头盔 - 泥巴胸甲 - 泥巴护腿 - 泥巴鞋子 - - 紫晶镐 - 紫晶斧 - 紫晶铲 - 紫晶剑 - 紫晶锄 - 紫晶头盔 - 紫晶胸甲 - 紫晶护腿 - 紫晶鞋子 - - 木头镰刀 - 石头镰刀 - 铁镰刀 - 金镰刀 - 钻石镰刀 - 泥土镰刀 - 紫晶镰刀 + 红岩圆石台阶 + 红岩砖块台阶 + 泥巴砖块台阶 + 苍空石圆石台阶 + 苍空石砖块台阶 - 上古手杖 - 上古手杖手柄 - 上古手杖杆 - 上古手杖龙头 - 废弃的上古手杖 + 刺槐树木板 + 樱桃树木板 + 黑暗树木板 + 杉树木板 + 阁楼树木板 + 魔法树木板 + 红树木板 + 棕榈树木板 + 红木树木板 + 柳树木板 + 竹板 + 松树木板 + 地狱皮树木板 + 蓝花楹树木板 - 灵魂操纵器 - 幽魂灵魂操纵器 - 村民灵魂操纵器 + 刺槐树原木 + 樱桃树原木 + 黑暗树原木 + 杉树原木 - 末地逃逸护符 + 阁楼树原木 + 魔法树原木 + 红树原木 + 棕榈树原木 - 音乐唱片 - 音乐唱片 + 红木原木 + 柳树原木 + 垂死树原木 + 巨大花茎 - 黯淡之花环 - 平凡之花环 - 丰饶之花环 - 异域之花环 - - - 紫晶桶 - 泉水桶 - 毒液桶 - - 毒液 - 泉水 - - - 通往应许之地的神迹之门降临于苍穹之上. - 神迹之门降临于苍穹之上. - - - 超多生态群落 - - - 超多生态群落 + 松树原木 + 地狱皮树原木 + 蓝花楹树原木 + + 黄色秋天树叶 + 竹叶 + 魔法树叶 + 黑暗树叶 + 垂死树叶 + 杉树树叶 + 阁楼树树叶 + 橙色秋天树叶 + + Origin树叶 + 粉樱桃树叶 + 枫树叶 + 白樱桃树叶 + 地狱皮树叶 + 蓝花楹树叶 + + 刺槐树木板 + 樱桃树木板 + 黑暗树木板 + 杉树木板 + 阁楼树木板 + 魔法树木板 + 红树木板 + 棕榈树木板 + 红木木板 + 柳树木板 + 松树木板 + 地狱皮树木板 + 蓝花楹树木板 + + 刺槐树台阶 + 樱桃树台阶 + 黑暗树台阶 + 杉树台阶 + 阁楼树台阶 + 魔法树台阶 + 红树台阶 + 棕榈树台阶 + 红木台阶 + 柳树台阶 + 松树台阶 + 地狱皮树台阶 + 蓝花楹树台阶 + + 刺槐木楼梯 + 樱桃木楼梯 + 黑暗木楼梯 + 冷杉木楼梯 + 阁楼木楼梯 + 魔法木楼梯 + 红树木楼梯 + 棕榈木楼梯 + 红杉木楼梯 + 柳树木楼梯 + 松树木楼梯 + 地狱皮木楼梯 + 蓝花楹树楼梯 + + 刺槐树叶 + 红树叶 + 棕榈叶 + 红杉叶 + 柳树叶 + 松树叶 + + + 浆果 + 蘑菇粉 + 葵花籽 + + 飞镖吹筒 + 飞镖 + 毒飞镖 + + 泥球 + + 泥砖 + 一小堆灰烬 + 紫晶 + 毒药 + 仙域水晶碎片 + 蓝色染料 + 棕色染料 + 绿色染料 + 白色染料 + 黑色染料 + 红宝石 + 橄榄石 + 黄玉 + 坦桑石 + 磷灰石 + 蓝宝石 + 幽魂灵魂 + + 泥巴镐 + 泥巴斧 + 泥巴铲 + 泥巴剑 + 泥巴锄 + 泥巴头盔 + 泥巴胸甲 + 泥巴护腿 + 泥巴鞋子 + + 紫晶镐 + 紫晶斧 + 紫晶铲 + 紫晶剑 + 紫晶锄 + 紫晶头盔 + 紫晶胸甲 + 紫晶护腿 + 紫晶鞋子 + + 木头镰刀 + 石头镰刀 + 铁镰刀 + 金镰刀 + 钻石镰刀 + 泥土镰刀 + 紫晶镰刀 + + 上古手杖 + 上古手杖手柄 + 上古手杖杆 + 上古手杖龙头 + 废弃的上古手杖 + + 灵魂操纵器 + 幽魂灵魂操纵器 + 村民灵魂操纵器 + + 末地逃逸护符 + + 音乐唱片 + 音乐唱片 + + 黯淡之花环 + 平凡之花环 + 丰饶之花环 + 异域之花环 + + + 紫晶桶 + 泉水桶 + 毒液桶 + + 毒液 + 泉水 + + 毒液 + 泉水 + + + 通往应许之地的神迹之门降临于苍穹之上. + 神迹之门降临于苍穹之上. + + + 超多生态群落 + + + 超多生态群落 diff --git a/resources/assets/biomesoplenty/textures/blocks/algae.png b/resources/assets/biomesoplenty/textures/blocks/algae.png index 84d1590f0..85f1f9c9e 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/algae.png and b/resources/assets/biomesoplenty/textures/blocks/algae.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/bluebells.png b/resources/assets/biomesoplenty/textures/blocks/bluebells.png new file mode 100644 index 000000000..66cbf117f Binary files /dev/null and b/resources/assets/biomesoplenty/textures/blocks/bluebells.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/aloe.png b/resources/assets/biomesoplenty/textures/blocks/bromeliad.png similarity index 100% rename from resources/assets/biomesoplenty/textures/blocks/aloe.png rename to resources/assets/biomesoplenty/textures/blocks/bromeliad.png diff --git a/resources/assets/biomesoplenty/textures/blocks/cactus.png b/resources/assets/biomesoplenty/textures/blocks/cactus.png index a4d2b0ace..6194f38e4 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/cactus.png and b/resources/assets/biomesoplenty/textures/blocks/cactus.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/cattail.png b/resources/assets/biomesoplenty/textures/blocks/cattail.png index 87a63339b..71c12071d 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/cattail.png and b/resources/assets/biomesoplenty/textures/blocks/cattail.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/cattailbottom.png b/resources/assets/biomesoplenty/textures/blocks/cattailbottom.png index 29dbc56c5..a18d10e3b 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/cattailbottom.png and b/resources/assets/biomesoplenty/textures/blocks/cattailbottom.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/cattailtop.png b/resources/assets/biomesoplenty/textures/blocks/cattailtop.png index 66c21c616..464e67a29 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/cattailtop.png and b/resources/assets/biomesoplenty/textures/blocks/cattailtop.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/cosmos.png b/resources/assets/biomesoplenty/textures/blocks/cosmos.png index 94f28d246..1ceb74dbc 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/cosmos.png and b/resources/assets/biomesoplenty/textures/blocks/cosmos.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/daffodil.png b/resources/assets/biomesoplenty/textures/blocks/daffodil.png index c249b401d..661f91b63 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/daffodil.png and b/resources/assets/biomesoplenty/textures/blocks/daffodil.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/dandelion.png b/resources/assets/biomesoplenty/textures/blocks/dandelion.png index 38427efd7..bc6063a4c 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/dandelion.png and b/resources/assets/biomesoplenty/textures/blocks/dandelion.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/deadbloom.png b/resources/assets/biomesoplenty/textures/blocks/deadbloom.png index c83b7ce1e..ad41cb483 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/deadbloom.png and b/resources/assets/biomesoplenty/textures/blocks/deadbloom.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/glowflower.png b/resources/assets/biomesoplenty/textures/blocks/glowflower.png index 390629741..e3abcf3df 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/glowflower.png and b/resources/assets/biomesoplenty/textures/blocks/glowflower.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/goldenrod.png b/resources/assets/biomesoplenty/textures/blocks/goldenrod.png new file mode 100644 index 000000000..e70aff367 Binary files /dev/null and b/resources/assets/biomesoplenty/textures/blocks/goldenrod.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/hibiscus.png b/resources/assets/biomesoplenty/textures/blocks/hibiscus.png new file mode 100644 index 000000000..50b795935 Binary files /dev/null and b/resources/assets/biomesoplenty/textures/blocks/hibiscus.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/hydrangea.png b/resources/assets/biomesoplenty/textures/blocks/hydrangea.png index 7a4b1e9f0..ac32cf5c3 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/hydrangea.png and b/resources/assets/biomesoplenty/textures/blocks/hydrangea.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/item_cattail.png b/resources/assets/biomesoplenty/textures/blocks/item_cattail.png index 9969871e7..4e593bdf5 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/item_cattail.png and b/resources/assets/biomesoplenty/textures/blocks/item_cattail.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/item_sunflower.png b/resources/assets/biomesoplenty/textures/blocks/item_sunflower.png index 4e2a98e36..8e2b6d2ca 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/item_sunflower.png and b/resources/assets/biomesoplenty/textures/blocks/item_sunflower.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/lavender.png b/resources/assets/biomesoplenty/textures/blocks/lavender.png new file mode 100644 index 000000000..080fce0f2 Binary files /dev/null and b/resources/assets/biomesoplenty/textures/blocks/lavender.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/lilyflower.png b/resources/assets/biomesoplenty/textures/blocks/lilyflower.png index 07eec7ac4..0306097a9 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/lilyflower.png and b/resources/assets/biomesoplenty/textures/blocks/lilyflower.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/lilyofthevalley.png b/resources/assets/biomesoplenty/textures/blocks/lilyofthevalley.png new file mode 100644 index 000000000..e9a22ae09 Binary files /dev/null and b/resources/assets/biomesoplenty/textures/blocks/lilyofthevalley.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/poisonivy.png b/resources/assets/biomesoplenty/textures/blocks/poisonivy.png index 385ab819c..901950be6 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/poisonivy.png and b/resources/assets/biomesoplenty/textures/blocks/poisonivy.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/sunflowerbottom.png b/resources/assets/biomesoplenty/textures/blocks/sunflowerbottom.png index 93282efa0..12ad15c74 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/sunflowerbottom.png and b/resources/assets/biomesoplenty/textures/blocks/sunflowerbottom.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/sunflowertop.png b/resources/assets/biomesoplenty/textures/blocks/sunflowertop.png index 4ca81799b..6a5f9c98a 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/sunflowertop.png and b/resources/assets/biomesoplenty/textures/blocks/sunflowertop.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/swampflower.png b/resources/assets/biomesoplenty/textures/blocks/swampflower.png index 722d14056..dea98a029 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/swampflower.png and b/resources/assets/biomesoplenty/textures/blocks/swampflower.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/violet.png b/resources/assets/biomesoplenty/textures/blocks/violet.png index 0daff8df9..8f3020514 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/violet.png and b/resources/assets/biomesoplenty/textures/blocks/violet.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/wildcarrot.png b/resources/assets/biomesoplenty/textures/blocks/wildcarrot.png index b26bb0e6c..8618c7428 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/wildcarrot.png and b/resources/assets/biomesoplenty/textures/blocks/wildcarrot.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/wildflower.png b/resources/assets/biomesoplenty/textures/blocks/wildflower.png index 1141af3d9..15b2a83df 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/wildflower.png and b/resources/assets/biomesoplenty/textures/blocks/wildflower.png differ diff --git a/resources/assets/biomesoplenty/textures/items/saladveggie.png b/resources/assets/biomesoplenty/textures/items/saladveggie.png index 9f4342d13..9b98094bb 100644 Binary files a/resources/assets/biomesoplenty/textures/items/saladveggie.png and b/resources/assets/biomesoplenty/textures/items/saladveggie.png differ diff --git a/resources/assets/biomesoplenty/textures/items/wildcarrots.png b/resources/assets/biomesoplenty/textures/items/wildcarrots.png index 6f4437103..ef4227ce5 100644 Binary files a/resources/assets/biomesoplenty/textures/items/wildcarrots.png and b/resources/assets/biomesoplenty/textures/items/wildcarrots.png differ