diff --git a/Planned Features.txt b/Planned Features.txt index 9a4bb2502..7695d5966 100644 --- a/Planned Features.txt +++ b/Planned Features.txt @@ -1,37 +1,51 @@ -ITEMS: - -Dart Blower: Used to shoot darts. Crafted from reeds. Allows for rapid firing of darts, but with half the uses of a bow. - -Dart: Similar to arrows, but dealing less damage. Poisons your hunger for 30 seconds. Crafted from poison, thorns, and reeds. - ---- - BLOCKS: Rock: Small rock that has a random size. Uses the vanilla stone texture. +Pinecone: Pinecone that grows under spruce and fir leaves. No use yet. + +Coconut: Grows on palm trees. Drops 2 coconut halves when broken with an axe. + +Berry Bush: Drops a berry when broken or right clicked. + +Glowshroom: Appears in the Mystic Grove and Fungi Forest, both above and below ground. + --- -PROMISED LAND BIOMES: +ITEMS: -Wonderous Woods: The current Promised Land biome, with lots of trees and shrubs. +Coconut Halves: Coconuts drop 2 when broken with an axe. Restores 2 hunger points each. -Blessed Bog: Tall willow trees over an area with lots of water ponds. +Berry: Dropped from berry bushes. Restores 1/2 a hunger point. -Purified Plain: Only tall grass and flowers. - -Majestic Mountain: No trees, minimal tall grass, and [hopefully] tall mountains. - -Divine Desert: Holy Sand, big/tiny cacti, yucca plants. +Cherry: Dropped from cherry tree leaves when broken or right clicked. --- NETHER BIOMES: -Undergarden: Ivy, nether wart, giant/small mushrooms, hellstem plant. +Undergarden: Bramble, nether wart, giant/small mushrooms, hellstem plant. Deathly Desert: Soulsand, thorns, dead bushes. Lethal Lavafalls: Lots of lavafalls and lava ponds. -Glowpines: A forest with pine trees made of glowstone. \ No newline at end of file +Glowpines: A forest with pine trees made of glowstone hanging from the ceiling, with some scattered on the surface. + +--- + +OCEAN BIOMES: + +Coral Reef: Different types of coral, with reef stone on the ocean floor. + +Kelp Forest: Lots and lots of kelp with varying heights. + +--- + +UNDERGROUND BIOMES (If possible): + +Crystal Caverns: Purple, translucent crystals growing around the cavern. + +Flooded Caverns: Lots of water springs and ponds. + +Overgrown Caverns: Vines hanging from the ceiling, small shrubs, and lots of mushrooms. \ No newline at end of file diff --git a/src/minecraft/biomesoplenty/api/BlockReferences.java b/src/minecraft/biomesoplenty/api/BlockReferences.java index 613806478..68e629d74 100644 --- a/src/minecraft/biomesoplenty/api/BlockReferences.java +++ b/src/minecraft/biomesoplenty/api/BlockReferences.java @@ -102,6 +102,7 @@ public class BlockReferences { holyGrass (Blocks.holyGrass, 0), holyDirt (Blocks.holyDirt, 0), holyStone (Blocks.holyStone, 0), + holyStoneCobble (Blocks.holyStone, 1), crystal (Blocks.crystal, 0), cragRock (Blocks.cragRock, 0), quicksand (Blocks.mud, 1), diff --git a/src/minecraft/biomesoplenty/api/Blocks.java b/src/minecraft/biomesoplenty/api/Blocks.java index f8c99f57a..09b0456b6 100644 --- a/src/minecraft/biomesoplenty/api/Blocks.java +++ b/src/minecraft/biomesoplenty/api/Blocks.java @@ -46,6 +46,8 @@ public class Blocks public static Optional redCobbleStairs = Optional.absent(); public static Optional redBricksStairs = Optional.absent(); public static Optional mudBricksStairs = Optional.absent(); + public static Optional holyCobbleStairs = Optional.absent(); + public static Optional holyBricksStairs = Optional.absent(); // Slabs public static Optional woodenSingleSlab1 = Optional.absent(); diff --git a/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java b/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java index 922b10e55..3c98d790e 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeDecoratorBOP.java @@ -1248,13 +1248,14 @@ public class BiomeDecoratorBOP extends BiomeDecorator { for (int var5 = 0; var5 < par1; ++var5) { - int var6 = this.chunk_X + this.randomGenerator.nextInt(16); + int var6 = this.chunk_X + this.randomGenerator.nextInt(8); int var7 = this.randomGenerator.nextInt(par4 - par3) + par3; - int var8 = this.chunk_Z + this.randomGenerator.nextInt(16); + int var8 = this.chunk_Z + this.randomGenerator.nextInt(8); int var999 = this.randomGenerator.nextInt(5); if (var999 == 0) { par2WorldGenerator.generate(this.currentWorld, this.randomGenerator, var6, var7, var8); + par2WorldGenerator.generate(this.currentWorld, this.randomGenerator, var6 + 8, var7, var8); par2WorldGenerator.generate(this.currentWorld, this.randomGenerator, var6, var7, var8 + 8); par2WorldGenerator.generate(this.currentWorld, this.randomGenerator, var6 + 8, var7, var8 + 8); } diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenBadlands.java b/src/minecraft/biomesoplenty/biomes/BiomeGenBadlands.java index d1fc3efa5..32dd067a1 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenBadlands.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenBadlands.java @@ -17,8 +17,8 @@ public class BiomeGenBadlands extends BiomeGenBase { super(par1); this.spawnableCreatureList.clear(); - this.topBlock = (byte)Block.sandStone.blockID; - this.fillerBlock = (byte)Blocks.hardSand.get().blockID; + this.topBlock = (byte)Blocks.hardSand.get().blockID; + this.fillerBlock = (byte)Block.blockClay.blockID; this.theBiomeDecorator = new BiomeDecoratorBOP(this); this.customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; this.customBiomeDecorator.treesPerChunk = -999; @@ -37,7 +37,7 @@ public class BiomeGenBadlands extends BiomeGenBase { if (BOPConfiguration.skyColors = true) { - return 13421723; + return 9814727; } else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenBayou.java b/src/minecraft/biomesoplenty/biomes/BiomeGenBayou.java index 9fac51e88..f55ef168c 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenBayou.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenBayou.java @@ -9,8 +9,10 @@ import biomesoplenty.worldgen.WorldGenBayou2; import biomesoplenty.worldgen.WorldGenBayou3; import biomesoplenty.worldgen.WorldGenMoss; +import net.minecraft.entity.monster.EntitySlime; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenerator; public class BiomeGenBayou extends BiomeGenBase @@ -39,6 +41,7 @@ public class BiomeGenBayou extends BiomeGenBase this.customBiomeDecorator.generatePumpkins = false; this.waterColorMultiplier = 16767282; this.spawnableWaterCreatureList.clear(); + this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3)); } /** diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenDeadSwamp.java b/src/minecraft/biomesoplenty/biomes/BiomeGenDeadSwamp.java index 83231ef51..769f923d5 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenDeadSwamp.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenDeadSwamp.java @@ -9,7 +9,9 @@ import biomesoplenty.configuration.BOPConfiguration; import biomesoplenty.worldgen.WorldGenDeadTree; import net.minecraft.block.Block; +import net.minecraft.entity.monster.EntitySlime; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; @@ -35,6 +37,7 @@ public class BiomeGenDeadSwamp extends BiomeGenBase this.spawnableCreatureList.clear(); this.spawnableWaterCreatureList.clear(); this.waterColorMultiplier = 10661201; + this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3)); } /** diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenFen.java b/src/minecraft/biomesoplenty/biomes/BiomeGenFen.java index dc58feb86..e6ccddce0 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenFen.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenFen.java @@ -10,9 +10,11 @@ import biomesoplenty.worldgen.WorldGenFen2; import biomesoplenty.worldgen.WorldGenMoss; import net.minecraft.block.Block; +import net.minecraft.entity.monster.EntitySlime; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; @@ -41,6 +43,7 @@ public class BiomeGenFen extends BiomeGenBase this.customBiomeDecorator.reedsBOPPerChunk = 5; this.customBiomeDecorator.algaePerChunk = 1; this.customBiomeDecorator.portobellosPerChunk = 1; + this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3)); } /** diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenMarsh.java b/src/minecraft/biomesoplenty/biomes/BiomeGenMarsh.java index 96dcfd93b..78e37ded2 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenMarsh.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenMarsh.java @@ -7,9 +7,11 @@ import biomesoplenty.configuration.BOPBlocks; import biomesoplenty.worldgen.WorldGenMarsh; import net.minecraft.block.Block; +import net.minecraft.entity.monster.EntitySlime; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; @@ -29,6 +31,7 @@ public class BiomeGenMarsh extends BiomeGenBase this.customBiomeDecorator.grassPerChunk = 65; this.customBiomeDecorator.highGrassPerChunk = 25; this.customBiomeDecorator.generatePumpkins = false; + this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3)); } public void decorate(World par1World, Random par2Random, int par3, int par4) diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandForest.java b/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandForest.java index 9408d7089..e39e6a53c 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandForest.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandForest.java @@ -109,7 +109,7 @@ public class BiomeGenPromisedLandForest extends BiomeGenBase { if (BOPConfiguration.skyColors = true) { - return BOPConfiguration.pLForestSkyColour; + return BOPConfiguration.promisedLandSkyColor; } else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandPlains.java b/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandPlains.java index 3a018ce81..03fb76844 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandPlains.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandPlains.java @@ -106,7 +106,7 @@ public class BiomeGenPromisedLandPlains extends BiomeGenBase { if (BOPConfiguration.skyColors = true) { - return BOPConfiguration.pLPlainsSkyColour; + return BOPConfiguration.promisedLandSkyColor; } else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandSwamp.java b/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandSwamp.java index 501dc08f2..d299d0793 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandSwamp.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandSwamp.java @@ -109,7 +109,7 @@ public class BiomeGenPromisedLandSwamp extends BiomeGenBase { if (BOPConfiguration.skyColors = true) { - return BOPConfiguration.pLSwampSkyColour; + return BOPConfiguration.promisedLandSkyColor; } else { diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenQuagmire.java b/src/minecraft/biomesoplenty/biomes/BiomeGenQuagmire.java index 6151a32d6..929d0864d 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenQuagmire.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenQuagmire.java @@ -3,7 +3,9 @@ package biomesoplenty.biomes; import java.awt.Color; import java.util.Random; +import net.minecraft.entity.monster.EntitySlime; 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.configuration.BOPConfiguration; @@ -29,6 +31,7 @@ public class BiomeGenQuagmire extends BiomeGenBase this.customBiomeDecorator.sandPerChunk2 = -999; this.waterColorMultiplier = 13390080; this.customBiomeDecorator.generateQuagmire = true; + this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3)); } /** diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenSwampwoods.java b/src/minecraft/biomesoplenty/biomes/BiomeGenSwampwoods.java index 7a845f82a..216c07800 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenSwampwoods.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenSwampwoods.java @@ -8,6 +8,7 @@ import biomesoplenty.worldgen.WorldGenCypress; import biomesoplenty.worldgen.WorldGenMarsh; import net.minecraft.block.Block; +import net.minecraft.entity.monster.EntitySlime; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.WorldGenShrub; diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenWetland.java b/src/minecraft/biomesoplenty/biomes/BiomeGenWetland.java index 5d64631df..ed63e94a3 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenWetland.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenWetland.java @@ -7,8 +7,10 @@ import biomesoplenty.worldgen.WorldGenTaiga5; import biomesoplenty.worldgen.WorldGenWillow; import net.minecraft.block.Block; +import net.minecraft.entity.monster.EntitySlime; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenTallGrass; import net.minecraft.world.gen.feature.WorldGenerator; @@ -41,6 +43,7 @@ public class BiomeGenWetland extends BiomeGenBase this.customBiomeDecorator.portobellosPerChunk = 1; this.spawnableCreatureList.clear(); this.spawnableWaterCreatureList.clear(); + this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3)); this.waterColorMultiplier = 6512772; } diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPSapling.java b/src/minecraft/biomesoplenty/blocks/BlockBOPSapling.java index 8ffa00b72..1e3c98ece 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPSapling.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPSapling.java @@ -78,7 +78,7 @@ public class BlockBOPSapling extends BlockSapling if (itemStack.itemID == this.blockID) switch (meta) { - case 7: // Holy + case 7: // Loftwood return id == Blocks.holyGrass.get().blockID; default: diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPSkystone.java b/src/minecraft/biomesoplenty/blocks/BlockBOPSkystone.java new file mode 100644 index 000000000..864a0a9f6 --- /dev/null +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPSkystone.java @@ -0,0 +1,108 @@ +package biomesoplenty.blocks; + +import java.util.List; + +import net.minecraft.block.Block; +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.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import biomesoplenty.BiomesOPlenty; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class BlockBOPSkystone extends Block +{ + private static final String[] types = new String[] {"holystone", "holycobble", "holybrick"}; + private Icon[] textures = {null, null, null}; + + public BlockBOPSkystone(int par1) + { + super(par1, Material.rock); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); + setStepSound(Block.soundStoneFootstep); + } + + @Override + public void registerIcons(IconRegister iconRegister) + { + textures = new Icon[types.length]; + + for (int i = 0; i < types.length; ++i) + textures[i] = iconRegister.registerIcon("BiomesOPlenty:"+types[i]); + } + + @Override + public Icon getIcon(int side, int meta) + { + if (meta < 0 || meta >= textures.length) + meta = 0; + + return textures[meta]; + } + + @Override + public int getDamageValue(World world, int x, int y, int z) { + return world.getBlockMetadata(x, y, z); + } + + @Override + @SuppressWarnings({ "rawtypes", "unchecked" }) + public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) { + for (int i = 0; i < types.length; ++i) + list.add(new ItemStack(blockID, 1, i)); + } + + @Override + public int damageDropped(int meta) + { + return meta == 0 ? 1 : meta; + } + + @Override + public float getBlockHardness(World world, int x, int y, int z) + { + int meta = world.getBlockMetadata(x, y, z); + float hardness = this.blockHardness; + + switch (meta) + { + case 0: + hardness = 1.0F; + break; + + case 1: + hardness = 1.6F; + break; + + case 2: + hardness = 1.1F; + break; + } + + return hardness; + } + + @Override + public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) + { + int meta = world.getBlockMetadata(x, y, z); + float resistance = this.blockResistance; + + switch (meta) + { + case 1: + resistance = 7.5F; + break; + + case 2: + resistance = 7.0F; + break; + } + + return resistance / 5.0F; + } +} diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPSlab.java b/src/minecraft/biomesoplenty/blocks/BlockBOPSlab.java index 22461df23..cca907bd0 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPSlab.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPSlab.java @@ -26,7 +26,7 @@ public class BlockBOPSlab extends BlockHalfSlab WOOD1, WOOD2, STONE; } private static final String[] woodTypes = new String[] {"acacia", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow"}; - private static final String[] rockTypes = new String[] {"redcobble", "redbrick", "mudbrick"}; + private static final String[] rockTypes = new String[] {"redcobble", "redbrick", "mudbrick", "holycobble", "holybrick"}; private Icon[] textures; protected final boolean isDoubleSlab; @@ -91,7 +91,7 @@ public class BlockBOPSlab extends BlockHalfSlab else if (category == SlabCategory.WOOD2) max = 2; else if (category == SlabCategory.STONE) - max = 3; + max = 5; for (int i = 0; i < max; ++i) list.add(new ItemStack(blockID, 1, i)); @@ -139,10 +139,12 @@ public class BlockBOPSlab extends BlockHalfSlab switch (getTypeFromMeta(meta)) { case 0: + case 3: hardness = 1.6F; break; case 1: + case 4: hardness = 1.1F; break; @@ -166,10 +168,12 @@ public class BlockBOPSlab extends BlockHalfSlab switch (getTypeFromMeta(meta)) { case 0: + case 3: resistance = 7.0F; break; case 1: + case 4: resistance = 7.5F; break; @@ -182,6 +186,11 @@ public class BlockBOPSlab extends BlockHalfSlab return resistance / 5.0F; } + public int idPicked(World par1World, int par2, int par3, int par4) + { + return !isDoubleSlab ? this.blockID : (this.blockID == Blocks.woodenDoubleSlab1.get().blockID ? Blocks.woodenSingleSlab1.get().blockID : (this.blockID == Blocks.woodenDoubleSlab2.get().blockID ? Blocks.woodenSingleSlab2.get().blockID : Blocks.stoneSingleSlab.get().blockID)); + } + protected ItemStack createStackedBlock(int par1) { return new ItemStack(this.blockID, 2, par1); diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPStairs.java b/src/minecraft/biomesoplenty/blocks/BlockBOPStairs.java index db86a4f54..6cc3fc44b 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPStairs.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPStairs.java @@ -13,10 +13,10 @@ public class BlockBOPStairs extends BlockStairs { public static enum Category { - ACACIA, CHERRY, DARK, FIR, HOLY, MAGIC, MANGROVE, PALM, REDWOOD, WILLOW, RED_COBBLE, RED_BRICKS, MUD_BRICKS; + ACACIA, CHERRY, DARK, FIR, HOLY, MAGIC, MANGROVE, PALM, REDWOOD, WILLOW, RED_COBBLE, RED_BRICKS, MUD_BRICKS, HOLY_COBBLE, HOLY_BRICKS; } - private static final String[] types = new String[] {"acacia", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow", "redcobble", "redbrick", "mudbrick"}; + private static final String[] types = new String[] {"acacia", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow", "redcobble", "redbrick", "mudbrick", "holycobble", "holybrick"}; private Icon[] textures; private final Category category; @@ -35,7 +35,7 @@ public class BlockBOPStairs extends BlockStairs textures = new Icon[types.length]; for (int i = 0; i < types.length; ++i) - if (i < types.length - 3) + if (i < types.length - 5) textures[i] = iconRegister.registerIcon("BiomesOPlenty:plank_"+types[i]); else textures[i] = iconRegister.registerIcon("BiomesOPlenty:"+types[i]); diff --git a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java index b2504e55e..fa1dc95bd 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java +++ b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java @@ -25,6 +25,7 @@ import biomesoplenty.blocks.BlockBOPPlank; import biomesoplenty.blocks.BlockBOPPlant; import biomesoplenty.blocks.BlockBOPRedRock; import biomesoplenty.blocks.BlockBOPSapling; +import biomesoplenty.blocks.BlockBOPSkystone; import biomesoplenty.blocks.BlockBOPSlab; import biomesoplenty.blocks.BlockBOPSlab.SlabCategory; import biomesoplenty.blocks.BlockBOPStairs; @@ -54,6 +55,7 @@ import biomesoplenty.items.ItemBOPPlank; import biomesoplenty.items.ItemBOPPlant; import biomesoplenty.items.ItemBOPRedRock; import biomesoplenty.items.ItemBOPSapling; +import biomesoplenty.items.ItemBOPSkystone; import biomesoplenty.items.ItemBOPSlab; import biomesoplenty.items.ItemBOPWillow; @@ -125,7 +127,9 @@ public class BOPBlocks { Blocks.hardDirt = Optional.of(new BlockBOPGeneric(BOPConfiguration.hardDirtID, Material.rock, BlockType.HARD_DIRT)); Blocks.holyGrass = Optional.of(new BlockBOPGrass(BOPConfiguration.holyGrassID).setUnlocalizedName("holyGrass")); Blocks.holyDirt = Optional.of(new BlockBOPGeneric(BOPConfiguration.holyDirtID, Material.sand, BlockType.HOLY_DIRT)); - Blocks.holyStone = Optional.of(new BlockBOPGeneric(BOPConfiguration.holyStoneID, Material.rock, BlockType.HOLY_STONE)); + Blocks.holyStone = Optional.of((new BlockBOPSkystone(BOPConfiguration.holyStoneID)).setUnlocalizedName("holyStone")); + Blocks.holyCobbleStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.holyCobbleStairsID, Blocks.holyStone.get(), Category.HOLY_COBBLE)).setUnlocalizedName("holyCobbleStairs")); + Blocks.holyBricksStairs = Optional.of((new BlockBOPStairs(BOPConfiguration.holyBrickStairsID, Blocks.holyStone.get(), Category.HOLY_BRICKS)).setUnlocalizedName("holyBricksStairs")); Blocks.crystal = Optional.of(new BlockBOPGeneric(BOPConfiguration.crystalID, Material.glass, BlockType.CRYSTAL)); Blocks.promisedPortal = Optional.of(new BlockPromisedPortal(BOPConfiguration.promisedLandPortalID).setUnlocalizedName("promisedPortal").setBlockUnbreakable().setResistance(6000000.0F).setLightValue(1.0F)); // Blocks.amethystOre = Optional.of(new BlockBOPGeneric(BOPConfiguration.amethystOreID, Material.rock, BlockType.AMETHYST_ORE)); @@ -194,7 +198,9 @@ public class BOPBlocks { // GameRegistry.registerBlock(Blocks.holyGrass.get(), "holyGrass"); GameRegistry.registerBlock(Blocks.holyGrass.get(), ItemBOPGrass.class, "holyGrass"); GameRegistry.registerBlock(Blocks.holyDirt.get(), "holyDirt"); - GameRegistry.registerBlock(Blocks.holyStone.get(), "holyStone"); + GameRegistry.registerBlock(Blocks.holyStone.get(), ItemBOPSkystone.class, "holyStone"); + GameRegistry.registerBlock(Blocks.holyCobbleStairs.get(), "holyCobbleStairs"); + GameRegistry.registerBlock(Blocks.holyBricksStairs.get(), "holyBricksStairs"); GameRegistry.registerBlock(Blocks.promisedPortal.get(), "promisedPortal"); GameRegistry.registerBlock(Blocks.amethystOre.get(), ItemBOPAmethyst.class, "amethystOre"); // GameRegistry.registerBlock(Blocks.amethystBlock.get(), "amethystBlock"); @@ -273,9 +279,13 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.stoneDoubleSlab.get(),1,0), "Red Rock Cobblestone Slab"); LanguageRegistry.addName(new ItemStack(Blocks.stoneDoubleSlab.get(),1,1), "Red Rock Bricks Slab"); LanguageRegistry.addName(new ItemStack(Blocks.stoneDoubleSlab.get(),1,2), "Mud Bricks Slab"); + LanguageRegistry.addName(new ItemStack(Blocks.stoneDoubleSlab.get(),1,3), "Skystone Cobblestone Slab"); + LanguageRegistry.addName(new ItemStack(Blocks.stoneDoubleSlab.get(),1,4), "Skystone Bricks Slab"); LanguageRegistry.addName(new ItemStack(Blocks.stoneSingleSlab.get(),1,0), "Red Rock Cobblestone Slab"); LanguageRegistry.addName(new ItemStack(Blocks.stoneSingleSlab.get(),1,1), "Red Rock Bricks Slab"); LanguageRegistry.addName(new ItemStack(Blocks.stoneSingleSlab.get(),1,2), "Mud Bricks Slab"); + LanguageRegistry.addName(new ItemStack(Blocks.stoneSingleSlab.get(),1,3), "Skystone Cobblestone Slab"); + LanguageRegistry.addName(new ItemStack(Blocks.stoneSingleSlab.get(),1,4), "Skystone Bricks Slab"); LanguageRegistry.addName(Blocks.mudBricksStairs.get(), "Mud Bricks Stairs"); LanguageRegistry.addName(Blocks.originGrass.get(), "Origin Grass"); LanguageRegistry.addName(new ItemStack(Blocks.leaves2.get(),1,0), "Origin Leaves"); @@ -319,14 +329,18 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.colorizedSaplings.get(),1,0), "Acacia Sapling"); LanguageRegistry.addName(Blocks.hardDirt.get(), "Hard Dirt"); // LanguageRegistry.addName(Blocks.holyGrass.get(), "Holy Grass"); - LanguageRegistry.addName(new ItemStack(Blocks.holyGrass.get(), 1, 0), "Holy Grass"); + LanguageRegistry.addName(new ItemStack(Blocks.holyGrass.get(), 1, 0), "Purified Grass"); LanguageRegistry.addName(new ItemStack(Blocks.holyGrass.get(), 1, 1), "Smoldering Grass"); - LanguageRegistry.addName(Blocks.holyDirt.get(), "Holy Dirt"); - LanguageRegistry.addName(Blocks.holyStone.get(), "Holy Stone"); + LanguageRegistry.addName(Blocks.holyDirt.get(), "Purified Dirt"); + LanguageRegistry.addName(new ItemStack(Blocks.holyStone.get(),1,0), "Skystone"); + LanguageRegistry.addName(new ItemStack(Blocks.holyStone.get(),1,1), "Skystone Cobblestone"); + LanguageRegistry.addName(Blocks.holyCobbleStairs.get(), "Skystone Cobblestone Stairs"); + LanguageRegistry.addName(new ItemStack(Blocks.holyStone.get(),1,2), "Skystone Bricks"); + LanguageRegistry.addName(Blocks.holyBricksStairs.get(), "Skystone Bricks Stairs"); LanguageRegistry.addName(Blocks.crystal.get(), "Celestial Crystal"); - LanguageRegistry.addName(new ItemStack(Blocks.plants.get(),1,4), "Holy Tall Grass"); + LanguageRegistry.addName(new ItemStack(Blocks.plants.get(),1,4), "Purified Tall Grass"); LanguageRegistry.addName(Blocks.promisedPortal.get(), "Promised Land Portal"); - LanguageRegistry.addName(new ItemStack(Blocks.saplings.get(),1,7), "Holy Sapling"); + LanguageRegistry.addName(new ItemStack(Blocks.saplings.get(),1,7), "Loftwood Sapling"); // LanguageRegistry.addName(Blocks.amethystOre.get(), "Amethyst Ore"); // LanguageRegistry.addName(Blocks.amethystBlock.get(), "Block of Amethyst"); LanguageRegistry.addName(new ItemStack(Blocks.amethystOre.get(),1,0), "Amethyst Ore"); @@ -345,7 +359,7 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.planks.get(), 1, 1), "Cherry Wood Planks"); LanguageRegistry.addName(new ItemStack(Blocks.planks.get(), 1, 2), "Dark Wood Planks"); LanguageRegistry.addName(new ItemStack(Blocks.planks.get(), 1, 3), "Fir Wood Planks"); - LanguageRegistry.addName(new ItemStack(Blocks.planks.get(), 1, 4), "Holy Wood Planks"); + LanguageRegistry.addName(new ItemStack(Blocks.planks.get(), 1, 4), "Loftwood Wood Planks"); LanguageRegistry.addName(new ItemStack(Blocks.planks.get(), 1, 5), "Magic Wood Planks"); LanguageRegistry.addName(new ItemStack(Blocks.planks.get(), 1, 6), "Mangrove Wood Planks"); LanguageRegistry.addName(new ItemStack(Blocks.planks.get(), 1, 7), "Palm Wood Planks"); @@ -358,7 +372,7 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.logs1.get(),1,2), "Dark Wood"); LanguageRegistry.addName(new ItemStack(Blocks.logs1.get(),1,3), "Fir Wood"); - LanguageRegistry.addName(new ItemStack(Blocks.logs2.get(),1,0), "Holy Wood"); + LanguageRegistry.addName(new ItemStack(Blocks.logs2.get(),1,0), "Loftwood Wood"); LanguageRegistry.addName(new ItemStack(Blocks.logs2.get(),1,1), "Magic Wood"); LanguageRegistry.addName(new ItemStack(Blocks.logs2.get(),1,2), "Mangrove Wood"); LanguageRegistry.addName(new ItemStack(Blocks.logs2.get(),1,3), "Palm Wood"); @@ -372,7 +386,7 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.woodenDoubleSlab1.get(),1,1), "Cherry Wood Slab"); LanguageRegistry.addName(new ItemStack(Blocks.woodenDoubleSlab1.get(),1,2), "Dark Wood Slab"); LanguageRegistry.addName(new ItemStack(Blocks.woodenDoubleSlab1.get(),1,3), "Fir Wood Slab"); - LanguageRegistry.addName(new ItemStack(Blocks.woodenDoubleSlab1.get(),1,4), "Holy Wood Slab"); + LanguageRegistry.addName(new ItemStack(Blocks.woodenDoubleSlab1.get(),1,4), "Loftwood Wood Slab"); LanguageRegistry.addName(new ItemStack(Blocks.woodenDoubleSlab1.get(),1,5), "Magic Wood Slab"); LanguageRegistry.addName(new ItemStack(Blocks.woodenDoubleSlab1.get(),1,6), "Mangrove Wood Slab"); LanguageRegistry.addName(new ItemStack(Blocks.woodenDoubleSlab1.get(),1,7), "Palm Wood Slab"); @@ -383,7 +397,7 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.woodenSingleSlab1.get(),1,1), "Cherry Wood Slab"); LanguageRegistry.addName(new ItemStack(Blocks.woodenSingleSlab1.get(),1,2), "Dark Wood Slab"); LanguageRegistry.addName(new ItemStack(Blocks.woodenSingleSlab1.get(),1,3), "Fir Wood Slab"); - LanguageRegistry.addName(new ItemStack(Blocks.woodenSingleSlab1.get(),1,4), "Holy Wood Slab"); + LanguageRegistry.addName(new ItemStack(Blocks.woodenSingleSlab1.get(),1,4), "Loftwood Wood Slab"); LanguageRegistry.addName(new ItemStack(Blocks.woodenSingleSlab1.get(),1,5), "Magic Wood Slab"); LanguageRegistry.addName(new ItemStack(Blocks.woodenSingleSlab1.get(),1,6), "Mangrove Wood Slab"); LanguageRegistry.addName(new ItemStack(Blocks.woodenSingleSlab1.get(),1,7), "Palm Wood Slab"); @@ -394,7 +408,7 @@ public class BOPBlocks { LanguageRegistry.addName(Blocks.cherryStairs.get(), "Cherry Wood Stairs"); LanguageRegistry.addName(Blocks.darkStairs.get(), "Dark Wood Stairs"); LanguageRegistry.addName(Blocks.firStairs.get(), "Fir Wood Stairs"); - LanguageRegistry.addName(Blocks.holyStairs.get(), "Holy Wood Stairs"); + LanguageRegistry.addName(Blocks.holyStairs.get(), "Loftwood Wood Stairs"); LanguageRegistry.addName(Blocks.magicStairs.get(), "Magic Wood Stairs"); LanguageRegistry.addName(Blocks.mangroveStairs.get(), "Mangrove Wood Stairs"); LanguageRegistry.addName(Blocks.palmStairs.get(), "Palm Wood Stairs"); @@ -408,7 +422,7 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.leaves1.get(),1,3), "Dark Leaves"); LanguageRegistry.addName(new ItemStack(Blocks.leavesColorized.get(),1,2), "Palm Leaves"); LanguageRegistry.addName(new ItemStack(Blocks.leavesColorized.get(),1,1), "Mangrove Leaves"); - LanguageRegistry.addName(new ItemStack(Blocks.leaves1.get(),1,6), "Holy Leaves"); + LanguageRegistry.addName(new ItemStack(Blocks.leaves1.get(),1,6), "Loftwood Leaves"); } private static void addGrassPlants() diff --git a/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java b/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java index 590b0bfca..7881618ca 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java +++ b/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java @@ -21,9 +21,7 @@ public class BOPConfiguration { public static int promisedLandDimID; - public static int pLSwampSkyColour; - public static int pLPlainsSkyColour; - public static int pLForestSkyColour; + public static int promisedLandSkyColor; public static boolean alpsGen; public static boolean arcticGen; @@ -147,6 +145,8 @@ public class BOPConfiguration { public static int colourizedSaplingsID; public static int redCobbleStairsID; public static int redBrickStairsID; + public static int holyCobbleStairsID; + public static int holyBrickStairsID; public static int promisedLandPortalID; public static int amethystOreID; @@ -422,12 +422,10 @@ public class BOPConfiguration { if (villageDistance < 8) villageDistance = 8; - //Sky colour - skyColors = config.get("Sky Colours", "Enable Sky Colours", true).getBoolean(false); + //Hard-Coded Colors + skyColors = config.get("Hard-Coded Colors", "Enable Sky Colors", true).getBoolean(false); - pLSwampSkyColour = config.get("Sky Colours", "Promised Land Swamp Sky Colour", 50175, null).getInt(); - pLPlainsSkyColour = config.get("Sky Colours", "Promised Land Plains Sky Colour", 50175, null).getInt(); - pLForestSkyColour = config.get("Sky Colours", "Promised Land Forest Sky Colour", 50175, null).getInt(); + promisedLandSkyColor = config.get("Hard-Coded Colors", "Promised Land Sky Color", 50175, null).getInt(); //Biome generation alpsGen = config.get("Biomes To Generate", "Alps", true).getBoolean(false); @@ -607,7 +605,7 @@ public class BOPConfiguration { hardDirtID = config.getTerrainBlock("Terrain Block IDs", "Hard Dirt ID", 168, null).getInt(); holyGrassID = config.getTerrainBlock("Terrain Block IDs", "Holy Grass ID", 169, null).getInt(); holyDirtID = config.getTerrainBlock("Terrain Block IDs", "Holy Dirt ID", 170, null).getInt(); - holyStoneID = config.getTerrainBlock("Terrain Block IDs", "Holy Stone ID", 171, null).getInt(); + holyStoneID = config.getTerrainBlock("Terrain Block IDs", "Skystone ID", 171, null).getInt(); cragRockID = config.getTerrainBlock("Terrain Block IDs", "Crag Rock ID", 172, null).getInt(); // Get Crafted Block ID's @@ -664,6 +662,9 @@ public class BOPConfiguration { crystalID = config.getBlock("Crystal ID", 1963, null).getInt(); cloudID = config.getBlock("Cloud ID", 1964, null).getInt(); + + holyCobbleStairsID = config.getBlock("Skystone Cobble Stairs ID", 1965, null).getInt(); + holyBrickStairsID = config.getBlock("Skystone Brick Stairs ID", 1966, null).getInt(); // Get Item ID's shroomPowderID = config.getItem("Shroom Powder ID", 21001, null).getInt(); @@ -812,7 +813,7 @@ public class BOPConfiguration { } finally { - config.save(); + if (config.hasChanged()) config.save(); } } } diff --git a/src/minecraft/biomesoplenty/configuration/BOPCrafting.java b/src/minecraft/biomesoplenty/configuration/BOPCrafting.java index ce14a791f..5297e877f 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPCrafting.java +++ b/src/minecraft/biomesoplenty/configuration/BOPCrafting.java @@ -43,6 +43,12 @@ public class BOPCrafting GameRegistry.addRecipe(new ItemStack(Blocks.stoneSingleSlab.get(), 6, 2), new Object[] {"RRR", 'R', Blocks.mudBrick.get()}); GameRegistry.addRecipe(new ItemStack(Blocks.mudBricksStairs.get(), 4), new Object[] {" R", " RR", "RRR", 'R', Blocks.mudBrick.get()}); GameRegistry.addRecipe(new ItemStack(Blocks.mudBricksStairs.get(), 4), new Object[] {"R ", "RR ", "RRR", 'R', Blocks.mudBrick.get()}); + GameRegistry.addRecipe(new ItemStack(Blocks.holyCobbleStairs.get(), 4), new Object[] {" R", " RR", "RRR", 'R', new ItemStack(Blocks.holyStone.get(),1,1)}); + GameRegistry.addRecipe(new ItemStack(Blocks.holyCobbleStairs.get(), 4), new Object[] {"R ", "RR ", "RRR", 'R', new ItemStack(Blocks.holyStone.get(),1,1)}); + GameRegistry.addRecipe(new ItemStack(Blocks.holyBricksStairs.get(), 4), new Object[] {" R", " RR", "RRR", 'R', new ItemStack(Blocks.holyStone.get(),1,2)}); + GameRegistry.addRecipe(new ItemStack(Blocks.holyBricksStairs.get(), 4), new Object[] {"R ", "RR ", "RRR", 'R', new ItemStack(Blocks.holyStone.get(),1,2)}); + GameRegistry.addRecipe(new ItemStack(Blocks.stoneSingleSlab.get(), 6, 3), new Object[] {"RRR", 'R', new ItemStack(Blocks.holyStone.get(),1,1)}); + GameRegistry.addRecipe(new ItemStack(Blocks.stoneSingleSlab.get(), 6, 4), new Object[] {"RRR", 'R', new ItemStack(Blocks.holyStone.get(),1,2)}); //Redwood GameRegistry.addShapelessRecipe(new ItemStack(Blocks.planks.get(), 4, 8), new Object[] {new ItemStack(Blocks.logs3.get(),1,0)}); @@ -105,6 +111,7 @@ public class BOPCrafting GameRegistry.addRecipe(new ItemStack(Blocks.holyStairs.get(), 4), new Object[] {"R ", "RR ", "RRR", 'R', new ItemStack(Blocks.woodenDoubleSlab1.get(),1,4)}); GameRegistry.addRecipe(new ItemStack(Blocks.redRock.get(), 4, 2), new Object[] {"RR", "RR", 'R', new ItemStack(Blocks.redRock.get(),1,0)}); + GameRegistry.addRecipe(new ItemStack(Blocks.holyStone.get(), 4, 2), new Object[] {"RR", "RR", 'R', new ItemStack(Blocks.holyStone.get(),1,0)}); GameRegistry.addRecipe(new ItemStack(Block.cloth, 1, 0), new Object[] {"CCC", "CCC", "CCC", 'C', new ItemStack(Blocks.plants.get(), 1, 7)}); GameRegistry.addRecipe(new ItemStack(Item.coal, 1), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(Items.miscItems.get(), 1, 1)}); @@ -156,9 +163,8 @@ public class BOPCrafting //Dart Blower GameRegistry.addRecipe(new ItemStack(Items.dartBlower.get(), 1), new Object[] {"R R", "R R", "R R", Character.valueOf('R'), new ItemStack(Blocks.plants.get(), 1, 8)}); - GameRegistry.addRecipe(new ItemStack(Items.dart.get(), 4, 0), new Object[] {"T", "R", Character.valueOf('T'), new ItemStack(Blocks.plants.get(), 1, 5), Character.valueOf('R'), new ItemStack(Blocks.plants.get(), 1, 7)}); - GameRegistry.addRecipe(new ItemStack(Items.dart.get(), 4, 1), new Object[] {"P", "T", "R", Character.valueOf('P'), new ItemStack(Items.miscItems.get(), 1, 3), Character.valueOf('T'), new ItemStack(Blocks.plants.get(), 1, 5), Character.valueOf('R'), new ItemStack(Blocks.plants.get(), 1, 7)}); - GameRegistry.addRecipe(new ItemStack(Items.dart.get(), 4, 1), new Object[] {" D ", "DPD", " D ", Character.valueOf('P'), new ItemStack(Items.miscItems.get(), 1, 3), Character.valueOf('D'), new ItemStack(Items.dart.get(), 1, 0)}); + GameRegistry.addRecipe(new ItemStack(Items.dart.get(), 4, 0), new Object[] {"T", "R", "F", Character.valueOf('T'), new ItemStack(Blocks.plants.get(), 1, 5), Character.valueOf('R'), new ItemStack(Blocks.plants.get(), 1, 8), Character.valueOf('F'), Item.feather}); + GameRegistry.addRecipe(new ItemStack(Items.dart.get(), 1, 1), new Object[] {"P", "D", Character.valueOf('P'), new ItemStack(Items.miscItems.get(), 1, 3), Character.valueOf('D'), new ItemStack(Items.dart.get(), 1, 0)}); GameRegistry.addRecipe(new ItemStack(Blocks.planks.get(), 1, 10), new Object[] {"##", "##", '#', Blocks.bamboo.get()}); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPSkystone.java b/src/minecraft/biomesoplenty/items/ItemBOPSkystone.java new file mode 100644 index 000000000..096f4f7df --- /dev/null +++ b/src/minecraft/biomesoplenty/items/ItemBOPSkystone.java @@ -0,0 +1,27 @@ +package biomesoplenty.items; + +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; + +public class ItemBOPSkystone extends ItemBlock +{ + private static final String[] types = new String[] {"holystone", "holycobble", "holybrick"}; + + public ItemBOPSkystone(int par1) + { + super(par1); + setMaxDamage(0); + setHasSubtypes(true); + } + + @Override + public int getMetadata(int meta) + { + return meta & 15; + } + + @Override + public String getUnlocalizedName(ItemStack itemstack) { + return types[itemstack.getItemDamage() & 15]; + } +} diff --git a/src/minecraft/biomesoplenty/worldgen/WorldGenGiantFlowerRed.java b/src/minecraft/biomesoplenty/worldgen/WorldGenGiantFlowerRed.java index 6c8505b30..5a9078346 100644 --- a/src/minecraft/biomesoplenty/worldgen/WorldGenGiantFlowerRed.java +++ b/src/minecraft/biomesoplenty/worldgen/WorldGenGiantFlowerRed.java @@ -55,27 +55,37 @@ public class WorldGenGiantFlowerRed extends WorldGenerator var1.setBlock(var3 + 1, var4 + 6, var5, Blocks.petals.get().blockID, 0, 2); var1.setBlock(var3, var4 + 6, var5 - 1, Blocks.petals.get().blockID, 0, 2); var1.setBlock(var3, var4 + 6, var5 + 1, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 - 2, var4 + 6, var5, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 + 2, var4 + 6, var5, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3, var4 + 6, var5 - 2, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3, var4 + 6, var5 + 2, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 - 1, var4 + 6, var5 - 1, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 - 1, var4 + 6, var5 + 1, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 + 1, var4 + 6, var5 - 1, Blocks.petals.get().blockID, 0, 2); var1.setBlock(var3 + 1, var4 + 6, var5 + 1, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 - 2, var4 + 6, var5 - 2, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 - 2, var4 + 6, var5 + 2, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 + 2, var4 + 6, var5 - 2, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 + 2, var4 + 6, var5 + 2, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 + 1, var4 + 6, var5 - 1, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 - 1, var4 + 6, var5 + 1, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 - 1, var4 + 6, var5 - 1, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 + 2, var4 + 6, var5, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 - 2, var4 + 6, var5, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 6, var5 + 2, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 6, var5 - 2, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 - 1, var4 + 7, var5 - 2, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 - 1, var4 + 7, var5 + 2, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 + 1, var4 + 7, var5 - 2, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 + 1, var4 + 7, var5 + 2, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 - 2, var4 + 7, var5 - 1, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 - 2, var4 + 7, var5 + 1, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 + 2, var4 + 7, var5 - 1, Blocks.petals.get().blockID, 0, 2); - var1.setBlock(var3 + 2, var4 + 7, var5 + 1, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 + 1, var4 + 7, var5 + 1, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 + 1, var4 + 7, var5 - 1, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 - 1, var4 + 7, var5 + 1, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 - 1, var4 + 7, var5 - 1, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 + 2, var4 + 7, var5, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 - 2, var4 + 7, var5, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 7, var5 + 2, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 7, var5 - 2, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 + 2, var4 + 7, var5 + 2, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 + 2, var4 + 7, var5 - 2, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 - 2, var4 + 7, var5 + 2, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 - 2, var4 + 7, var5 - 2, Blocks.petals.get().blockID, 0, 2); + + var1.setBlock(var3 + 2, var4 + 8, var5, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 - 2, var4 + 8, var5, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 8, var5 + 2, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 8, var5 - 2, Blocks.petals.get().blockID, 0, 2); + + var1.setBlock(var3 + 3, var4 + 9, var5, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3 - 3, var4 + 9, var5, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 9, var5 + 3, Blocks.petals.get().blockID, 0, 2); + var1.setBlock(var3, var4 + 9, var5 - 3, Blocks.petals.get().blockID, 0, 2); return true; } diff --git a/src/minecraft/biomesoplenty/worldgen/WorldGenGiantFlowerYellow.java b/src/minecraft/biomesoplenty/worldgen/WorldGenGiantFlowerYellow.java index df76c7a3a..dd8d15abe 100644 --- a/src/minecraft/biomesoplenty/worldgen/WorldGenGiantFlowerYellow.java +++ b/src/minecraft/biomesoplenty/worldgen/WorldGenGiantFlowerYellow.java @@ -40,26 +40,38 @@ public class WorldGenGiantFlowerYellow extends WorldGenerator var1.setBlock(var3, var4, var5, Block.dirt.blockID); var1.setBlock(var3, var4 + 1, var5, Blocks.logs3.get().blockID, 3, 2); var1.setBlock(var3, var4 + 2, var5, Blocks.logs3.get().blockID, 3, 2); - - var1.setBlock(var3, var4 + 3, var5, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 - 1, var4 + 3, var5, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 + 1, var4 + 3, var5, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3, var4 + 3, var5 - 1, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3, var4 + 3, var5 + 1, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 - 1, var4 + 3, var5 - 1, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 - 1, var4 + 3, var5 + 1, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 + 1, var4 + 3, var5 - 1, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 + 1, var4 + 3, var5 + 1, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3, var4 + 3, var5, Blocks.logs3.get().blockID, 3, 2); + var1.setBlock(var3, var4 + 4, var5, Blocks.logs3.get().blockID, 3, 2); + var1.setBlock(var3, var4 + 5, var5, Blocks.logs3.get().blockID, 3, 2); - var1.setBlock(var3 - 1, var4 + 3, var5 - 2, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 - 1, var4 + 3, var5 + 2, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 + 1, var4 + 3, var5 - 2, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 + 1, var4 + 3, var5 + 2, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 - 1, var4 + 5, var5, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 + 1, var4 + 5, var5, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3, var4 + 5, var5 - 1, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3, var4 + 5, var5 + 1, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 + 2, var4 + 5, var5 + 2, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 + 2, var4 + 5, var5 - 2, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 - 2, var4 + 5, var5 + 2, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 - 2, var4 + 5, var5 - 2, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 - 2, var4 + 3, var5 - 1, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 - 2, var4 + 3, var5 + 1, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 + 2, var4 + 3, var5 - 1, Blocks.petals.get().blockID, 1, 2); - var1.setBlock(var3 + 2, var4 + 3, var5 + 1, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3, var4 + 6, var5, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 - 1, var4 + 6, var5, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 + 1, var4 + 6, var5, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3, var4 + 6, var5 - 1, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3, var4 + 6, var5 + 1, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 + 1, var4 + 6, var5 + 1, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 + 1, var4 + 6, var5 - 1, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 - 1, var4 + 6, var5 + 1, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 - 1, var4 + 6, var5 - 1, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 + 2, var4 + 6, var5, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 - 2, var4 + 6, var5, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3, var4 + 6, var5 + 2, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3, var4 + 6, var5 - 2, Blocks.petals.get().blockID, 1, 2); + + var1.setBlock(var3, var4 + 7, var5, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 + 3, var4 + 7, var5, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3 - 3, var4 + 7, var5, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3, var4 + 7, var5 + 3, Blocks.petals.get().blockID, 1, 2); + var1.setBlock(var3, var4 + 7, var5 - 3, Blocks.petals.get().blockID, 1, 2); return true; } diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/amethystore.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/amethystore.png index a4e424e7d..ec9eca002 100644 Binary files a/src/minecraft/mods/BiomesOPlenty/textures/blocks/amethystore.png and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/amethystore.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/holybrick.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holybrick.png new file mode 100644 index 000000000..5cb0569ce Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holybrick.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/holycobble.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holycobble.png new file mode 100644 index 000000000..015681d96 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holycobble.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/holysand.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holysand.png deleted file mode 100644 index 3feb5c689..000000000 Binary files a/src/minecraft/mods/BiomesOPlenty/textures/blocks/holysand.png and /dev/null differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/holystone.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holystone.png index 73ea9d89a..caa4b71f9 100644 Binary files a/src/minecraft/mods/BiomesOPlenty/textures/blocks/holystone.png and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/holystone.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/item_moss.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/item_moss.png index 853a10e09..a373c4f2f 100644 Binary files a/src/minecraft/mods/BiomesOPlenty/textures/blocks/item_moss.png and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/item_moss.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/blocks/sapling_bamboo.png b/src/minecraft/mods/BiomesOPlenty/textures/blocks/sapling_bamboo.png index 6b446a588..e342ea25c 100644 Binary files a/src/minecraft/mods/BiomesOPlenty/textures/blocks/sapling_bamboo.png and b/src/minecraft/mods/BiomesOPlenty/textures/blocks/sapling_bamboo.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/items/crystalshard.png b/src/minecraft/mods/BiomesOPlenty/textures/items/crystalshard.png index 2094eda72..a9a4fb4dd 100644 Binary files a/src/minecraft/mods/BiomesOPlenty/textures/items/crystalshard.png and b/src/minecraft/mods/BiomesOPlenty/textures/items/crystalshard.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/items/poisondart.png b/src/minecraft/mods/BiomesOPlenty/textures/items/poisondart.png index 99bc3541e..a6de29464 100644 Binary files a/src/minecraft/mods/BiomesOPlenty/textures/items/poisondart.png and b/src/minecraft/mods/BiomesOPlenty/textures/items/poisondart.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/mobs/glob.png b/src/minecraft/mods/BiomesOPlenty/textures/mobs/glob.png new file mode 100644 index 000000000..4223e8376 Binary files /dev/null and b/src/minecraft/mods/BiomesOPlenty/textures/mobs/glob.png differ diff --git a/src/minecraft/mods/BiomesOPlenty/textures/projectiles/poisondart.png b/src/minecraft/mods/BiomesOPlenty/textures/projectiles/poisondart.png index 7851c1764..8d6b62717 100644 Binary files a/src/minecraft/mods/BiomesOPlenty/textures/projectiles/poisondart.png and b/src/minecraft/mods/BiomesOPlenty/textures/projectiles/poisondart.png differ