diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/techbiomes/BiomeGenDryRiver.java b/src/main/java/biomesoplenty/common/biomes/overworld/techbiomes/BiomeGenDryRiver.java index 7735e6afe..5498333c1 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/techbiomes/BiomeGenDryRiver.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/techbiomes/BiomeGenDryRiver.java @@ -13,7 +13,7 @@ import biomesoplenty.common.world.features.trees.WorldGenMiniShrub; public class BiomeGenDryRiver extends BOPBiome { - private static final Height biomeHeight = new Height(-0.5F, 0.0F); + private static final Height biomeHeight = new Height(-0.2F, 0.0F); public BiomeGenDryRiver(int par1) { @@ -26,6 +26,6 @@ public class BiomeGenDryRiver extends BOPBiome this.topBlock = Blocks.sand; this.fillerBlock = Blocks.sand; - this.bopWorldFeatures.setFeature("sandstoneSpikesPerChunk", 5); + //this.bopWorldFeatures.setFeature("sandstoneSpikesPerChunk", 5); } } \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPFlower.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPFlower.java index 64c77d6aa..0f9d8af85 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPFlower.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPFlower.java @@ -217,13 +217,13 @@ public class BlockBOPFlower extends BOPBlockWorldDecor switch (metadata) { case 6: // Tulip - return block == Blocks.grass || block == Blocks.dirt || block == Blocks.farmland || block == BOPBlockHelper.get("grass") || block == BOPBlockHelper.get("longGrass") || block == BOPBlockHelper.get("overgrownNetherrack"); + return block == Blocks.grass || block == Blocks.dirt || block == Blocks.farmland || block == BOPBlockHelper.get("longGrass") || block == BOPBlockHelper.get("overgrownNetherrack"); case 10: // Lily Flower return block == Blocks.waterlily; case 11: // Rainbow Flower - return block == BOPBlockHelper.get("grass") || block == Blocks.grass || block == Blocks.dirt; + return block == Blocks.grass || block == Blocks.dirt; case 12: // Bromeliad return block == BOPBlockHelper.get("hardDirt") || block == Blocks.hardened_clay || block == Blocks.sand; diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPGrass.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPGrass.java index 15918d55f..60df38289 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPGrass.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPGrass.java @@ -21,6 +21,7 @@ import biomesoplenty.api.BOPBlockHelper; public class BlockBOPGrass extends Block { + public static final String[] types = new String[] {"spectralmoss", "smolderinggrass"}; private IIcon[][] icon = new IIcon[2][6]; public BlockBOPGrass() @@ -47,8 +48,7 @@ public class BlockBOPGrass extends Block //TODO: registerIcons() public void registerBlockIcons(IIconRegister iconRegister) { - this.icon[0][0] = iconRegister.registerIcon("biomesoplenty:spectralsoil"); - + this.icon[0][0] = iconRegister.registerIcon("biomesoplenty:spectralmoss_bottom"); this.icon[0][1] = iconRegister.registerIcon("biomesoplenty:spectralmoss_top"); this.icon[0][2] = iconRegister.registerIcon("biomesoplenty:spectralmoss_side"); this.icon[0][3] = iconRegister.registerIcon("biomesoplenty:spectralmoss_side"); @@ -77,7 +77,7 @@ public class BlockBOPGrass extends Block //TODO: getSubBlocks() public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list) { - for (int i = 0; i < 2; ++i) { + for (int i = 0; i < types.length; ++i) { list.add(new ItemStack(block, 1, i)); } } @@ -181,7 +181,7 @@ public class BlockBOPGrass extends Block if (world.getBlock(rX, rY, rZ) == BOPBlockHelper.get("spectralSoil") && world.getBlockLightValue(rX, rY + 1, rZ) >= 4 && world.getBlockLightOpacity(rX, rY + 1, rZ) <= 2) { //TODO: setBlock() - world.setBlock(rX, rY, rZ, BOPBlockHelper.get("grass"), 0, 2); + world.setBlock(rX, rY, rZ, BOPBlockHelper.get("bopGrass"), 0, 2); } } } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPMushroom.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPMushroom.java index 8dbab7b59..8d0949495 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPMushroom.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPMushroom.java @@ -20,7 +20,7 @@ import biomesoplenty.common.configuration.BOPConfigurationMisc; public class BlockBOPMushroom extends BlockBush { - private static final String[] plants = new String[] {"toadstool", "portobello", "bluemilk", "glowshroom", "flatmushroom"}; + private static final String[] plants = new String[] {"toadstool", "portobello", "bluemilk", "glowshroom", "flatmushroom", "shadowshroom"}; private IIcon[] textures; public BlockBOPMushroom() @@ -113,19 +113,22 @@ public class BlockBOPMushroom extends BlockBush switch (metadata) { case 0: // Toadstool - return block == Blocks.grass || block == Blocks.dirt || block == Blocks.mycelium || block == Blocks.netherrack || block == BOPBlockHelper.get("grass") || block == BOPBlockHelper.get("overgrownNetherrack"); + return block == Blocks.grass || block == Blocks.dirt || block == Blocks.mycelium || block == Blocks.netherrack || block == BOPBlockHelper.get("overgrownNetherrack"); case 1: // Portobello - return block == Blocks.grass || block == Blocks.dirt || block == Blocks.mycelium || block == BOPBlockHelper.get("grass"); + return block == Blocks.grass || block == Blocks.dirt || block == Blocks.mycelium; case 2: // Blue Milk Cap - return block == Blocks.grass || block == Blocks.dirt || block == Blocks.mycelium || block == BOPBlockHelper.get("grass"); + return block == Blocks.grass || block == Blocks.dirt || block == Blocks.mycelium; case 3: // Glowshroom return block == Blocks.grass || block == Blocks.dirt || block == Blocks.mycelium || block == Blocks.stone || block == Blocks.netherrack || block == BOPBlockHelper.get("overgrownNetherrack"); + case 5: // Shadow Shroom + return block == Blocks.grass || block == Blocks.dirt || block == Blocks.mycelium || block == Blocks.end_stone || block == BOPBlockHelper.get("bopGrass"); + default: - return block == Blocks.grass || block == Blocks.dirt || block == Blocks.mycelium || block == BOPBlockHelper.get("overgrownNetherrack"); + return block == Blocks.grass || block == Blocks.dirt || block == Blocks.mycelium || block == BOPBlockHelper.get("overgrownNetherrack") || block == BOPBlockHelper.get("bopGrass"); } } diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPPlant.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPPlant.java index 4afd206a1..525bf9c2b 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPPlant.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPPlant.java @@ -142,7 +142,7 @@ public class BlockBOPPlant extends BOPBlockWorldDecor implements IShearable return block == Blocks.sand; case 4: // Spectral Fern - return block == BOPBlockHelper.get("grass"); + return block == BOPBlockHelper.get("bopGrass"); case 5: // Thorns return block == Blocks.grass|| block == Blocks.dirt || block == Blocks.soul_sand; @@ -172,7 +172,7 @@ public class BlockBOPPlant extends BOPBlockWorldDecor implements IShearable return block == Blocks.water && reedwater != Blocks.water; case 15: // Root - return root != Blocks.air && (root == Blocks.grass || root == Blocks.dirt || root == Blocks.farmland || root == BOPBlockHelper.get("longGrass") || root == BOPBlockHelper.get("grass") || root == BOPBlockHelper.get("spectralSoil")); + return root != Blocks.air && (root == Blocks.grass || root == Blocks.dirt || root == Blocks.farmland || root == BOPBlockHelper.get("longGrass") || root == BOPBlockHelper.get("spectralSoil")); default: return block == Blocks.grass || block == Blocks.dirt || block == Blocks.farmland || block == BOPBlockHelper.get("overgrownNetherrack"); diff --git a/src/main/java/biomesoplenty/common/blocks/BlockCloud.java b/src/main/java/biomesoplenty/common/blocks/BlockCloud.java deleted file mode 100644 index 93b2633d1..000000000 --- a/src/main/java/biomesoplenty/common/blocks/BlockCloud.java +++ /dev/null @@ -1,96 +0,0 @@ -package biomesoplenty.common.blocks; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.init.Items; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import biomesoplenty.BiomesOPlenty; -import biomesoplenty.api.BOPItemHelper; - -public class BlockCloud extends Block -{ - public BlockCloud() - { - //TODO: Material.cloth - super(Material.cloth); - - //TODO: this.setHardness - this.setHardness(0.1F); - - //TODO setStepSound(Block.soundClothFootstep) - this.setStepSound(Block.soundTypeCloth); - - //TODO: setLightOpacity() - this.setLightOpacity(3); - - //TODO: this.setCreativeTab() - this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); - } - - @Override - //TODO: registerIcons() - public void registerBlockIcons(IIconRegister iconRegister) - { - //TODO: blockIcon - this.blockIcon = iconRegister.registerIcon("biomesoplenty:cloud"); - } - - - @Override - //TODO: getCollisionBoundingBoxFromPool - public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) - { - float yOffset = 0.25F; - return AxisAlignedBB.getAABBPool().getAABB(x, y, z, x + 1, y + 1 - yOffset, z + 1); - } - - @Override - //TODO: onEntityCollidedWithBlock() - public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) - { - entity.fallDistance = 0.0F; - - if (entity instanceof EntityPlayer) - { - InventoryPlayer inventory = ((EntityPlayer)entity).inventory; - - if (inventory.armorInventory[0] != null && inventory.armorInventory[0].getItem() == BOPItemHelper.get("wadingBoots")) - { - return; - } - } - - entity.motionX *= 0.8D; - entity.motionZ *= 0.8D; - } - - @Override - //TODO: getRenderBlockPass() - public int getRenderBlockPass() - { - return 1; - } - - @Override - //TODO: isOpaqueCube() - public boolean isOpaqueCube() - { - return false; - } - - @Override - //TODO shouldSideBeRendered - public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) - { - //TODO: getBlock() - Block block = world.getBlock(x, y, z); - //TODO: shouldSideBeRendered - return block == this ? false : super.shouldSideBeRendered(world, x, y, z, side); - } -} \ No newline at end of file diff --git a/src/main/java/biomesoplenty/common/core/BOPBiomes.java b/src/main/java/biomesoplenty/common/core/BOPBiomes.java index d0af72774..90a7bdb25 100644 --- a/src/main/java/biomesoplenty/common/core/BOPBiomes.java +++ b/src/main/java/biomesoplenty/common/core/BOPBiomes.java @@ -138,22 +138,22 @@ public class BOPBiomes arctic = registerOverworldBiome(BiomeGenArctic.class, "Arctic", TemperatureType.ICY, 10); bambooForest = registerOverworldBiome(BiomeGenBambooForest.class, "Bamboo Forest", TemperatureType.HOT, 5); bayou = registerOverworldBiome(BiomeGenBayou.class, "Bayou", TemperatureType.WARM, 10); - bog = registerOverworldBiome(BiomeGenBog.class, "Bog", TemperatureType.WARM, 10); + bog = registerOverworldBiome(BiomeGenBog.class, "Bog", TemperatureType.WARM, 7); borealForest = registerOverworldBiome(BiomeGenBorealForest.class, "Boreal Forest", TemperatureType.WARM, 10); brushland = registerOverworldBiome(BiomeGenBrushland.class, "Brushland", TemperatureType.HOT, 10); - canyon = registerOverworldBiome(BiomeGenCanyon.class, "Canyon", TemperatureType.HOT, 10); + canyon = registerOverworldBiome(BiomeGenCanyon.class, "Canyon", TemperatureType.HOT, 7); chaparral = registerOverworldBiome(BiomeGenChaparral.class, "Chaparral", TemperatureType.WARM, 10); cherryBlossomGrove = registerOverworldBiome(BiomeGenCherryBlossomGrove.class, "Cherry Blossom Grove", TemperatureType.COOL, 3); coniferousForest = registerOverworldBiome(BiomeGenConiferousForest.class, "Coniferous Forest", TemperatureType.WARM, 10); snowyConiferousForest = registerOverworldBiome(BiomeGenConiferousForestSnow.class, "Snowy Coniferous Forest", TemperatureType.ICY, 10); crag = registerOverworldBiome(BiomeGenCrag.class, "Crag", TemperatureType.COOL, 3); - deadForest = registerOverworldBiome(BiomeGenDeadForest.class, "Dead Forest", TemperatureType.COOL, 10); - deadSwamp = registerOverworldBiome(BiomeGenDeadSwamp.class, "Dead Swamp", TemperatureType.WARM, 10); + deadForest = registerOverworldBiome(BiomeGenDeadForest.class, "Dead Forest", TemperatureType.COOL, 7); + deadSwamp = registerOverworldBiome(BiomeGenDeadSwamp.class, "Dead Swamp", TemperatureType.WARM, 7); deciduousForest = registerOverworldBiome(BiomeGenDeciduousForest.class, "Deciduous Forest", TemperatureType.WARM, 10); dunes = registerOverworldBiome(BiomeGenDunes.class, "Dunes", TemperatureType.HOT, 10); fen = registerOverworldBiome(BiomeGenFen.class, "Fen", TemperatureType.WARM, 10); flowerField = registerOverworldBiome(BiomeGenFlowerField.class, "Flower Field", TemperatureType.WARM, 3); - frostForest = registerOverworldBiome(BiomeGenFrostForest.class, "Frost Forest", TemperatureType.ICY, 10); + frostForest = registerOverworldBiome(BiomeGenFrostForest.class, "Frost Forest", TemperatureType.ICY, 7); fungiForest = registerOverworldBiome(BiomeGenFungiForest.class, "Fungi Forest", TemperatureType.COOL, 3); grassland = registerOverworldBiome(BiomeGenGrassland.class, "Grassland", TemperatureType.COOL, 10); grove = registerOverworldBiome(BiomeGenGrove.class, "Grove", TemperatureType.COOL, 5); @@ -164,31 +164,31 @@ public class BOPBiomes lushDesert = registerOverworldBiome(BiomeGenLushDesert.class, "Lush Desert", TemperatureType.HOT, 5); lushSwamp = registerOverworldBiome(BiomeGenLushSwamp.class, "Lush Swamp", TemperatureType.WARM, 10); mapleWoods = registerOverworldBiome(BiomeGenMapleWoods.class, "Maple Woods", TemperatureType.COOL, 10); - marsh = registerOverworldBiome(BiomeGenMarsh.class, "Marsh", TemperatureType.WARM, 10); + marsh = registerOverworldBiome(BiomeGenMarsh.class, "Marsh", TemperatureType.WARM, 7); meadow = registerOverworldBiome(BiomeGenMeadow.class, "Meadow", TemperatureType.COOL, 10); moor = registerOverworldBiome(BiomeGenMoor.class, "Moor", TemperatureType.COOL, 10); mountain = registerOverworldBiome(BiomeGenMountain.class, "Mountain", TemperatureType.WARM, 10); mysticGrove = registerOverworldBiome(BiomeGenMysticGrove.class, "Mystic Grove", TemperatureType.WARM, 3); ominousWoods = registerOverworldBiome(BiomeGenOminousWoods.class, "Ominous Woods", TemperatureType.COOL, 3); originValley = registerOverworldBiome(BiomeGenOriginValley.class, "Origin Valley", TemperatureType.WARM, 1); - outback = registerOverworldBiome(BiomeGenOutback.class, "Outback", TemperatureType.HOT, 10); + outback = registerOverworldBiome(BiomeGenOutback.class, "Outback", TemperatureType.HOT, 7); prairie = registerOverworldBiome(BiomeGenPrairie.class, "Prairie", TemperatureType.WARM, 10); rainforest = registerOverworldBiome(BiomeGenRainforest.class, "Rainforest", TemperatureType.WARM, 5); - redwoodForest = registerOverworldBiome(BiomeGenRedwoodForest.class, "Redwood Forest", TemperatureType.WARM, 10); + redwoodForest = registerOverworldBiome(BiomeGenRedwoodForest.class, "Redwood Forest", TemperatureType.WARM, 7); sacredSprings = registerOverworldBiome(BiomeGenSacredSprings.class, "Sacred Springs", TemperatureType.WARM, 3); seasonalForest = registerOverworldBiome(BiomeGenSeasonalForest.class, "Seasonal Forest", TemperatureType.COOL, 10); - shield = registerOverworldBiome(BiomeGenShield.class, "Shield", TemperatureType.COOL, 10); + shield = registerOverworldBiome(BiomeGenShield.class, "Shield", TemperatureType.COOL, 7); shrubland = registerOverworldBiome(BiomeGenShrubland.class, "Shrubland", TemperatureType.COOL, 10); - sludgepit = registerOverworldBiome(BiomeGenSludgepit.class, "Sludgepit", TemperatureType.WARM, 10); + sludgepit = registerOverworldBiome(BiomeGenSludgepit.class, "Sludgepit", TemperatureType.WARM, 5); spruceWoods = registerOverworldBiome(BiomeGenSpruceWoods.class, "Spruce Woods", TemperatureType.WARM, 10); - steppe = registerOverworldBiome(BiomeGenSteppe.class, "Steppe", TemperatureType.HOT, 10); + steppe = registerOverworldBiome(BiomeGenSteppe.class, "Steppe", TemperatureType.HOT, 7); temperateRainforest = registerOverworldBiome(BiomeGenTemperateRainforest.class, "Temperate Rainforest", TemperatureType.WARM, 10); thicket = registerOverworldBiome(BiomeGenThicket.class, "Thicket", TemperatureType.COOL, 5); timber = registerOverworldBiome(BiomeGenTimber.class, "Timber", TemperatureType.COOL, 5); tropicalRainforest = registerOverworldBiome(BiomeGenTropicalRainforest.class, "Tropical Rainforest", TemperatureType.HOT, 5); - tundra = registerOverworldBiome(BiomeGenTundra.class, "Tundra", TemperatureType.ICY, 10); + tundra = registerOverworldBiome(BiomeGenTundra.class, "Tundra", TemperatureType.ICY, 7); wasteland = registerOverworldBiome(BiomeGenWasteland.class, "Wasteland", TemperatureType.HOT, 3); - wetland = registerOverworldBiome(BiomeGenWetland.class, "Wetland", TemperatureType.WARM, 10); + wetland = registerOverworldBiome(BiomeGenWetland.class, "Wetland", TemperatureType.WARM, 7); woodland = registerOverworldBiome(BiomeGenWoodland.class, "Woodland", TemperatureType.WARM, 10); //Sub Biomes @@ -202,8 +202,8 @@ public class BOPBiomes canyonRavine = registerOverworldSubBiome(BiomeGenCanyonRavine.class, "Canyon Ravine", 10, canyon.biomeID); //Ocean Biomes - volcano = registerOverworldSubBiome(BiomeGenVolcano.class, "Volcano", 10, BiomeGenBase.ocean.biomeID, BiomeGenBase.deepOcean.biomeID); - tropics = registerOverworldSubBiome(BiomeGenTropics.class, "Tropics", 10, BiomeGenBase.ocean.biomeID, BiomeGenBase.deepOcean.biomeID); + volcano = registerOverworldSubBiome(BiomeGenVolcano.class, "Volcano", 10, BiomeGenBase.deepOcean.biomeID); + tropics = registerOverworldSubBiome(BiomeGenTropics.class, "Tropics", 10, BiomeGenBase.deepOcean.biomeID); //Nether Biomes corruptedSands = registerNetherBiome(BiomeGenCorruptedSands.class, "Corrupted Sands", 10); diff --git a/src/main/java/biomesoplenty/common/core/BOPBlocks.java b/src/main/java/biomesoplenty/common/core/BOPBlocks.java index 79843f9ff..f3ece558d 100644 --- a/src/main/java/biomesoplenty/common/core/BOPBlocks.java +++ b/src/main/java/biomesoplenty/common/core/BOPBlocks.java @@ -35,7 +35,6 @@ import biomesoplenty.common.blocks.BlockBOPStairs; import biomesoplenty.common.blocks.BlockBOPStairs.Category; import biomesoplenty.common.blocks.BlockBamboo; import biomesoplenty.common.blocks.BlockBones; -import biomesoplenty.common.blocks.BlockCloud; import biomesoplenty.common.blocks.BlockFlesh; import biomesoplenty.common.blocks.BlockFlowerVine; import biomesoplenty.common.blocks.BlockGrave; @@ -61,6 +60,7 @@ import biomesoplenty.common.itemblocks.ItemBlockFlower; import biomesoplenty.common.itemblocks.ItemBlockFlower2; import biomesoplenty.common.itemblocks.ItemBlockFoliage; import biomesoplenty.common.itemblocks.ItemBlockGems; +import biomesoplenty.common.itemblocks.ItemBlockGrass; import biomesoplenty.common.itemblocks.ItemBlockGrave; import biomesoplenty.common.itemblocks.ItemBlockHive; import biomesoplenty.common.itemblocks.ItemBlockIvy; @@ -127,7 +127,7 @@ public class BOPBlocks registerBlock(new BlockOriginGrass().setBlockName("originGrass")); registerBlock(new BlockLongGrass().setBlockName("longGrass")); registerBlock(new BlockOvergrownNetherrack().setBlockName("overgrownNetherrack")); - registerBlock(new BlockBOPGrass().setBlockName("grass")); + registerBlock(new BlockBOPGrass().setBlockName("bopGrass"), ItemBlockGrass.class); registerBlock(new BlockBOPLog(LogCategory.CAT1).setBlockName("logs1"), ItemBlockLog.class); registerBlock(new BlockBOPLog(LogCategory.CAT2).setBlockName("logs2"), ItemBlockLog.class); @@ -150,8 +150,6 @@ public class BOPBlocks registerBlock(new BlockBOPGeneric(Material.rock, BlockType.CRAG_ROCK).setBlockName("cragRock")); - registerBlock(new BlockCloud().setBlockName("cloud")); - registerBlock(new BlockHive().setBlockName("hive"), ItemBlockHive.class); registerBlock(new BlockHoney().setBlockName("honeyBlock")); diff --git a/src/main/java/biomesoplenty/common/eventhandler/misc/BonemealEventHandler.java b/src/main/java/biomesoplenty/common/eventhandler/misc/BonemealEventHandler.java index e3cbe3bd7..4672c5f8a 100644 --- a/src/main/java/biomesoplenty/common/eventhandler/misc/BonemealEventHandler.java +++ b/src/main/java/biomesoplenty/common/eventhandler/misc/BonemealEventHandler.java @@ -149,7 +149,7 @@ public class BonemealEventHandler } } } - else if (block == BOPBlockHelper.get("grass") && event.world.getBlockMetadata(x, y, z) == 0) + else if (block == BOPBlockHelper.get("bopGrass") && event.world.getBlockMetadata(x, y, z) == 0) { int var14 = y + 1; diff --git a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockMushroom.java b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockMushroom.java index cabbcd293..0cb71cb5c 100644 --- a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockMushroom.java +++ b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockMushroom.java @@ -7,7 +7,7 @@ import net.minecraft.util.IIcon; public class ItemBlockMushroom extends ItemBlock { - private static final String[] plants = new String[] {"toadstool", "portobello", "bluemilk", "glowshroom", "flatmushroom"}; + private static final String[] plants = new String[] {"toadstool", "portobello", "bluemilk", "glowshroom", "flatmushroom", "shadowshroom"}; public ItemBlockMushroom(Block block) { diff --git a/src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java b/src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java index 2c5ebe656..a07026113 100644 --- a/src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java +++ b/src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java @@ -53,7 +53,7 @@ public class WorldGenFieldAssociation { associateFeature("generateQuicksand", new WorldGenSplotches(BOPBlockHelper.get("mud"), 1, 24, Blocks.grass, Blocks.dirt, Blocks.sand)); associateFeature("generateCanyon", new WorldGenSplotches(BOPBlockHelper.get("rocks"), 0, 48, Blocks.stone)); - associateFeature("generateStoneInGrass", new WorldGenSplotches(Blocks.stone, 0, 32, Blocks.grass, BOPBlockHelper.get("grass"))); + associateFeature("generateStoneInGrass", new WorldGenSplotches(Blocks.stone, 0, 32, Blocks.grass)); associateFeature("generateStoneInGrass2", new WorldGenSplotches(Blocks.stone, 0, 48, Blocks.grass, Blocks.dirt)); associateFeature("generateGrass", new WorldGenSplotches(Blocks.grass, 0, 48, BOPBlockHelper.get("rocks"))); associateFeature("generateSand", new WorldGenSplotches(Blocks.sand, 0, 32, BOPBlockHelper.get("rocks"))); @@ -102,7 +102,7 @@ public class WorldGenFieldAssociation associateFeature("wasteland2PerChunk", new WorldGenWasteland2()); associateFeature("wasteland3PerChunk", new WorldGenWasteland3()); associateFeature("wasteland4PerChunk", new WorldGenWasteland4()); - associateFeature("smolderingGrassPerChunk", new WorldGenSplatter(BOPBlockHelper.get("grass"), 1, BOPBlockHelper.get("ash"), Blocks.netherrack)); + associateFeature("smolderingGrassPerChunk", new WorldGenSplatter(BOPBlockHelper.get("bopGrass"), 1, BOPBlockHelper.get("ash"), Blocks.netherrack)); associateFeature("sandSplatterPerChunk", new WorldGenSplatter(Blocks.sand, Blocks.grass)); associateFeature("gravelSplatterPerChunk", new WorldGenSplatter(Blocks.gravel, Blocks.grass)); associateFeature("redSandSplatterPerChunk", new WorldGenSplatter(Blocks.sand, 1, BOPBlockHelper.get("hardSand"))); diff --git a/src/main/resources/assets/biomesoplenty/lang/en_US.lang b/src/main/resources/assets/biomesoplenty/lang/en_US.lang index bafa3b72d..d207d4c9e 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_US.lang +++ b/src/main/resources/assets/biomesoplenty/lang/en_US.lang @@ -92,6 +92,7 @@ tile.mushrooms.portobello.name=Portobello tile.mushrooms.bluemilk.name=Blue Milk Cap tile.mushrooms.glowshroom.name=Glowshroom tile.mushrooms.flatmushroom.name=Flat Mushroom +tile.mushrooms.shadowshroom.name=Shadow Shroom tile.saplings.appleSapling.name=Apple Sapling tile.saplings.yellowautumnSapling.name=Yellow Autumn Sapling @@ -135,8 +136,8 @@ tile.coral.bluecoral.name=Blue Coral tile.coral.glowcoral.name=Glowing Coral tile.coral.algae.name=Algae -tile.holyGrass.spectralmoss.name=Spectral Moss Block -tile.holyGrass.smolderinggrass.name=Smoldering Grass Block +tile.bopGrass.spectralmoss.name=Spectral Moss +tile.bopGrass.smolderinggrass.name=Smoldering Grass Block tile.gemOre.amethystore.name=Ender Amethyst Ore tile.gemOre.amethystblock.name=Block of Amethyst @@ -155,8 +156,6 @@ tile.gemOre.sapphireblock.name=Block of Sapphire tile.moss.name=Moss -tile.cloud.name=Cloud Block - tile.hive.honeycomb.name=Honeycomb Block tile.hive.hive.name=Hive Block tile.hive.honeycombempty.name=Empty Honeycomb Block diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/alphaore.png b/src/main/resources/assets/biomesoplenty/textures/blocks/alphaore.png deleted file mode 100644 index 79fbfa338..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/alphaore.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/christmaslightsoff.png b/src/main/resources/assets/biomesoplenty/textures/blocks/christmaslightsoff.png deleted file mode 100644 index b275ec59d..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/christmaslightsoff.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/cloud.png b/src/main/resources/assets/biomesoplenty/textures/blocks/cloud.png deleted file mode 100644 index e1502f5ed..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/cloud.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/limestone.png b/src/main/resources/assets/biomesoplenty/textures/blocks/limestone.png index 6dd7156b4..eefc82599 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/limestone.png and b/src/main/resources/assets/biomesoplenty/textures/blocks/limestone.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/limestonesmooth.png b/src/main/resources/assets/biomesoplenty/textures/blocks/limestonesmooth.png index 3efd6044a..adb033955 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/limestonesmooth.png and b/src/main/resources/assets/biomesoplenty/textures/blocks/limestonesmooth.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/omegaore.png b/src/main/resources/assets/biomesoplenty/textures/blocks/omegaore.png deleted file mode 100644 index 72c3c2123..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/omegaore.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/originbricks.png b/src/main/resources/assets/biomesoplenty/textures/blocks/originbricks.png deleted file mode 100644 index 8507036a0..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/originbricks.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/origincobble.png b/src/main/resources/assets/biomesoplenty/textures/blocks/origincobble.png deleted file mode 100644 index 2876b635c..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/origincobble.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/origingravel.png b/src/main/resources/assets/biomesoplenty/textures/blocks/origingravel.png deleted file mode 100644 index c2ad500bf..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/origingravel.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/originlappis.png b/src/main/resources/assets/biomesoplenty/textures/blocks/originlappis.png deleted file mode 100644 index 682f68176..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/originlappis.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/originmossycobble.png b/src/main/resources/assets/biomesoplenty/textures/blocks/originmossycobble.png deleted file mode 100644 index 21d4f0e58..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/originmossycobble.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/originplanks.png b/src/main/resources/assets/biomesoplenty/textures/blocks/originplanks.png deleted file mode 100644 index f562db79c..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/originplanks.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/portal.png b/src/main/resources/assets/biomesoplenty/textures/blocks/portal.png deleted file mode 100644 index cc6dad18a..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/portal.png and /dev/null differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/shadowshroom.png b/src/main/resources/assets/biomesoplenty/textures/blocks/shadowshroom.png new file mode 100644 index 000000000..c9b2dead4 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/blocks/shadowshroom.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/siltstone.png b/src/main/resources/assets/biomesoplenty/textures/blocks/siltstone.png index 8b383bfff..93328ddbf 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/siltstone.png and b/src/main/resources/assets/biomesoplenty/textures/blocks/siltstone.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/siltstonesmooth.png b/src/main/resources/assets/biomesoplenty/textures/blocks/siltstonesmooth.png index 9fffa8252..29b80500b 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/siltstonesmooth.png and b/src/main/resources/assets/biomesoplenty/textures/blocks/siltstonesmooth.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/spectralmoss_bottom.png b/src/main/resources/assets/biomesoplenty/textures/blocks/spectralmoss_bottom.png new file mode 100644 index 000000000..c2a91e3c6 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/blocks/spectralmoss_bottom.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/spectralmoss_side.png b/src/main/resources/assets/biomesoplenty/textures/blocks/spectralmoss_side.png index d90c0b73f..bd43c13e0 100644 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/spectralmoss_side.png and b/src/main/resources/assets/biomesoplenty/textures/blocks/spectralmoss_side.png differ