diff --git a/README.md b/README.md index 4225b41c1..fd6688583 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,6 @@ However, thanks to the wonderful folks who made Midas Gold, we have a work-aroun - Updated to the latest Forge - Changed various things to use IShearable - Changed default biome ids to be compatible with Mo Creatures - - Bamboo Thatching is now equivalent to wood planks (giving it a use, yay :D) - Made a proper fix for achievements and made them enabled by default (The config option is still there though for those that want it) - Added Better World Generation 4 support - Made shears instantly destroy Biomes O Plenty leaves @@ -63,7 +62,6 @@ However, thanks to the wonderful folks who made Midas Gold, we have a work-aroun - Fixed an issue causing sound files to be created on the desktop - Biomes O Plenty saplings now work in the Forestry fermenter - Biomes O Plenty flowers can now be used with bees - - Added a config option for generating vanilla ocean biomes - Gave the different types Autumn and Cherry Leaves their own names - Added Biome Dictionary support diff --git a/src/minecraft/biomesoplenty/api/Blocks.java b/src/minecraft/biomesoplenty/api/Blocks.java index 753246ff1..1164785fc 100644 --- a/src/minecraft/biomesoplenty/api/Blocks.java +++ b/src/minecraft/biomesoplenty/api/Blocks.java @@ -72,10 +72,10 @@ public class Blocks public static Optional amethystBlock = Optional.absent(); public static Optional amethystOre = Optional.absent(); - public static Optional bambooThatching = Optional.absent(); +// public static Optional bambooThatching = Optional.absent(); public static Optional mudBrick = Optional.absent(); public static Optional smolderingGrass = Optional.absent(); - public static Optional quicksand = Optional.absent(); +// public static Optional quicksand = Optional.absent(); public static Optional promisedPortal = Optional.absent(); diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPPlank.java b/src/minecraft/biomesoplenty/blocks/BlockBOPPlank.java index ebedd516a..bc58b615a 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPPlank.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPPlank.java @@ -2,20 +2,17 @@ package biomesoplenty.blocks; import java.util.List; -import biomesoplenty.BiomesOPlenty; - 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.item.ItemStack; import net.minecraft.util.Icon; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import biomesoplenty.BiomesOPlenty; public class BlockBOPPlank extends Block { - private static final String[] woodTypes = new String[] {"acacia", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow"}; + private static final String[] woodTypes = new String[] {"acaciaPlank", "cherryPlank", "darkPlank", "firPlank", "holyPlank", "magicPlank", "mangrovePlank", "palmPlank", "redwoodPlank", "willowPlank", "bambooThatching"}; private Icon[] textures; public BlockBOPPlank(int blockID) @@ -32,7 +29,7 @@ public class BlockBOPPlank extends Block textures = new Icon[woodTypes.length]; for (int i = 0; i < woodTypes.length; ++i) - textures[i] = iconRegister.registerIcon("BiomesOPlenty:"+woodTypes[i]+"plank"); + textures[i] = iconRegister.registerIcon("BiomesOPlenty:"+woodTypes[i]); } @Override diff --git a/src/minecraft/biomesoplenty/blocks/BlockBamboo.java b/src/minecraft/biomesoplenty/blocks/BlockBamboo.java index 2a0f7b59e..da39c1e25 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBamboo.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBamboo.java @@ -2,6 +2,8 @@ package biomesoplenty.blocks; import java.util.Random; +import biomesoplenty.BiomesOPlenty; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; @@ -16,6 +18,7 @@ public class BlockBamboo extends Block setBurnProperties(this.blockID, 5, 5); this.setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, 1.0F, 0.5F + var3); this.setTickRandomly(true); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); } @Override diff --git a/src/minecraft/biomesoplenty/blocks/BlockMud.java b/src/minecraft/biomesoplenty/blocks/BlockMud.java index dcb49e371..02a2be1b7 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockMud.java +++ b/src/minecraft/biomesoplenty/blocks/BlockMud.java @@ -1,18 +1,27 @@ package biomesoplenty.blocks; +import java.util.List; import java.util.Random; 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.AxisAlignedBB; +import net.minecraft.util.Icon; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import biomesoplenty.BiomesOPlenty; import biomesoplenty.api.Items; public class BlockMud extends Block { + private static final String[] types = new String[] {"mud", "quicksand"}; + + private Icon[] textures; + public BlockMud(int par1) { super(par1, Material.sand); @@ -20,36 +29,79 @@ public class BlockMud extends Block } @Override - public void registerIcons(IconRegister par1IconRegister) + public void registerIcons(IconRegister iconRegister) { - this.blockIcon = par1IconRegister.registerIcon("BiomesOPlenty:mud"); + textures = new Icon[types.length]; + + for (int i = 0; i < types.length; ++i) + textures[i] = iconRegister.registerIcon("BiomesOPlenty:"+types[i]); } - - public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) + + @Override + public Icon getIcon(int side, int meta) { - float var5 = 0.35F; - return AxisAlignedBB.getAABBPool().getAABB((double)par2, (double)par3, (double)par4, (double)(par2 + 1), (double)((float)(par3 + 1) - var5), (double)(par4 + 1)); + if (meta < 0 || meta >= textures.length) + meta = 0; + + return textures[meta]; + } + + @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)); + } + + public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) + { + if (par1IBlockAccess.getBlockMetadata(par2, par3, par4) == 0) + return par5 == 0 && this.minY > 0.0D ? true : (par5 == 1 && this.maxY < 1.0D ? true : (par5 == 2 && this.minZ > 0.0D ? true : (par5 == 3 && this.maxZ < 1.0D ? true : (par5 == 4 && this.minX > 0.0D ? true : (par5 == 5 && this.maxX < 1.0D ? true : !par1IBlockAccess.isBlockOpaqueCube(par2, par3, par4)))))); + else + return true; } - public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { - par5Entity.motionX *= 0.1D; - par5Entity.motionZ *= 0.1D; + if (world.getBlockMetadata(x, y, z) == 0) + { + float var5 = 0.35F; + return AxisAlignedBB.getAABBPool().getAABB((double)x, (double)y, (double)z, (double)(x + 1), (double)((float)(y + 1) - var5), (double)(z + 1)); + } + else + return null; + } + + public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity entity) + { + if (world.getBlockMetadata(x, y, z) == 0) + { + entity.motionX *= 0.1D; + entity.motionZ *= 0.1D; + } + else + entity.setInWeb(); } public int idDropped(int par1, Random par2Random, int par3) { - return Items.miscItems.get().itemID; + if (par1 == 0) + return Items.miscItems.get().itemID; + else + return this.blockID; } @Override public int damageDropped(int meta) { - return 0; + return meta; } - public int quantityDropped(Random par1Random) + public int quantityDropped(int meta, int fortune, Random random) { - return 4; + if (meta == 0) + return 4; + else + return 1; } } \ No newline at end of file diff --git a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java index 20a589d09..b55ded886 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPBlocks.java +++ b/src/minecraft/biomesoplenty/configuration/BOPBlocks.java @@ -46,6 +46,7 @@ import biomesoplenty.items.ItemBOPFoliage; import biomesoplenty.items.ItemBOPLeaves; import biomesoplenty.items.ItemBOPLog; import biomesoplenty.items.ItemBOPMoss; +import biomesoplenty.items.ItemBOPMud; import biomesoplenty.items.ItemBOPPetals; import biomesoplenty.items.ItemBOPPlank; import biomesoplenty.items.ItemBOPPlant; @@ -77,7 +78,7 @@ public class BOPBlocks { MinecraftForge.setBlockHarvestLevel(Blocks.originGrass.get(), "shovel", 0); MinecraftForge.setBlockHarvestLevel(Blocks.hardSand.get(), "shovel", 0); MinecraftForge.setBlockHarvestLevel(Blocks.holyGrass.get(), "pickaxe", 0); - MinecraftForge.setBlockHarvestLevel(Blocks.quicksand.get(), "shovel", 0); +// MinecraftForge.setBlockHarvestLevel(Blocks.quicksand.get(), "shovel", 0); MinecraftForge.setBlockHarvestLevel(Blocks.driedDirt.get(), "pickaxe", 0); MinecraftForge.setBlockHarvestLevel(Blocks.amethystOre.get(), "pickaxe", 3); @@ -124,11 +125,11 @@ public class BOPBlocks { 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)); Blocks.amethystBlock = Optional.of(new BlockBOPGeneric(BOPConfiguration.amethystBlockID, Material.iron, BlockType.AMETHYST_BLOCK)); - Blocks.bambooThatching = Optional.of(new BlockBOPGeneric(BOPConfiguration.bambooThatchingID, Material.wood, BlockType.BAMBOO_THATCHING)); +// Blocks.bambooThatching = Optional.of(new BlockBOPGeneric(BOPConfiguration.bambooThatchingID, Material.wood, BlockType.BAMBOO_THATCHING)); Blocks.moss = Optional.of((new BlockMoss(BOPConfiguration.mossID)).setHardness(0.2F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("moss")); Blocks.smolderingGrass = Optional.of((BlockSmolderingGrass)(new BlockSmolderingGrass(BOPConfiguration.smolderingGrassID)).setHardness(0.6F).setLightValue(0.25F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("smolderingGrass")); Blocks.cragRock = Optional.of(new BlockBOPGeneric(BOPConfiguration.cragRockID, Material.rock, BlockType.CRAG_ROCK)); - Blocks.quicksand = Optional.of((new BlockQuicksand(BOPConfiguration.quicksandID)).setHardness(0.3F).setStepSound(Block.soundSandFootstep).setUnlocalizedName("quicksand")); +// Blocks.quicksand = Optional.of((new BlockQuicksand(BOPConfiguration.quicksandID)).setHardness(0.3F).setStepSound(Block.soundSandFootstep).setUnlocalizedName("quicksand")); Blocks.planks = Optional.of((new BlockBOPPlank(BOPConfiguration.planksID)).setResistance(5.0F).setStepSound(Block.soundWoodFootstep).setUnlocalizedName("planks")); @@ -153,7 +154,7 @@ public class BOPBlocks { private static void registerBlocks() { // Add block registration - GameRegistry.registerBlock(Blocks.mud.get(), "mud"); + GameRegistry.registerBlock(Blocks.mud.get(), ItemBOPMud.class, "mud"); GameRegistry.registerBlock(Blocks.driedDirt.get(), "driedDirt"); GameRegistry.registerBlock(Blocks.redRock.get(), ItemBOPRedRock.class, "redRock"); GameRegistry.registerBlock(Blocks.ash.get(), "ash"); @@ -186,11 +187,11 @@ public class BOPBlocks { GameRegistry.registerBlock(Blocks.promisedPortal.get(), "promisedPortal"); GameRegistry.registerBlock(Blocks.amethystOre.get(), "amethystOre"); GameRegistry.registerBlock(Blocks.amethystBlock.get(), "amethystBlock"); - GameRegistry.registerBlock(Blocks.bambooThatching.get(), "bambooThatching"); +// GameRegistry.registerBlock(Blocks.bambooThatching.get(), "bambooThatching"); GameRegistry.registerBlock(Blocks.moss.get(), ItemBOPMoss.class, "moss"); GameRegistry.registerBlock(Blocks.smolderingGrass.get(), "smolderingGrass"); GameRegistry.registerBlock(Blocks.cragRock.get(), "cragRock"); - GameRegistry.registerBlock(Blocks.quicksand.get(), "quicksand"); +// GameRegistry.registerBlock(Blocks.quicksand.get(), "quicksand"); ItemBOPSlab.setSlabs(Blocks.stoneSingleSlab.get(), Blocks.stoneDoubleSlab.get()); GameRegistry.registerBlock(Blocks.stoneDoubleSlab.get(), ItemBOPSlab.class, "stoneDoubleSlab"); @@ -221,7 +222,7 @@ public class BOPBlocks { private static void registerNames() { // Add block names - LanguageRegistry.addName(Blocks.mud.get(), "Mud"); + LanguageRegistry.addName(new ItemStack(Blocks.mud.get(), 1, 0), "Mud"); LanguageRegistry.addName(Blocks.driedDirt.get(), "Dried Dirt"); LanguageRegistry.addName(new ItemStack(Blocks.redRock.get(),1,0), "Red Rock"); LanguageRegistry.addName(Blocks.ash.get(), "Ash Block"); @@ -305,12 +306,13 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.saplings.get(),1,7), "Holy Sapling"); LanguageRegistry.addName(Blocks.amethystOre.get(), "Amethyst Ore"); LanguageRegistry.addName(Blocks.amethystBlock.get(), "Block of Amethyst"); - LanguageRegistry.addName(Blocks.bambooThatching.get(), "Bamboo Thatching"); +// LanguageRegistry.addName(Blocks.bambooThatching.get(), "Bamboo Thatching"); LanguageRegistry.addName(Blocks.moss.get(), "Moss"); LanguageRegistry.addName(new ItemStack(Blocks.foliage.get(),1,0), "Algae"); LanguageRegistry.addName(Blocks.smolderingGrass.get(), "Smoldering Grass"); LanguageRegistry.addName(Blocks.cragRock.get(), "Crag Rock"); - LanguageRegistry.addName(Blocks.quicksand.get(), "Quicksand"); +// LanguageRegistry.addName(Blocks.quicksand.get(), "Quicksand"); + LanguageRegistry.addName(new ItemStack(Blocks.mud.get(), 1, 1), "Quicksand"); LanguageRegistry.addName(new ItemStack(Blocks.saplings.get(),1,2), "Bamboo Sapling"); LanguageRegistry.addName(new ItemStack(Blocks.planks.get(), 1, 0), "Acacia Wood Planks"); @@ -323,6 +325,7 @@ public class BOPBlocks { LanguageRegistry.addName(new ItemStack(Blocks.planks.get(), 1, 7), "Palm Wood Planks"); LanguageRegistry.addName(new ItemStack(Blocks.planks.get(), 1, 8), "Redwood Wood Planks"); LanguageRegistry.addName(new ItemStack(Blocks.planks.get(), 1, 9), "Willow Wood Planks"); + LanguageRegistry.addName(new ItemStack(Blocks.planks.get(), 1, 10), "Bamboo Thatching"); LanguageRegistry.addName(new ItemStack(Blocks.logs1.get(),1,0), "Acacia Wood"); LanguageRegistry.addName(new ItemStack(Blocks.logs1.get(),1,1), "Cherry Wood"); diff --git a/src/minecraft/biomesoplenty/configuration/BOPCrafting.java b/src/minecraft/biomesoplenty/configuration/BOPCrafting.java index ffac37557..7cd96bb3b 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPCrafting.java +++ b/src/minecraft/biomesoplenty/configuration/BOPCrafting.java @@ -111,7 +111,7 @@ public class BOPCrafting GameRegistry.addRecipe(new ItemStack(Blocks.amethystBlock.get(), 1), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(Items.miscItems.get(), 1, 2)}); GameRegistry.addRecipe(new ItemStack(Blocks.ash.get(), 1), new Object[] {"AA", "AA", 'A', new ItemStack(Items.miscItems.get(), 1, 1)}); GameRegistry.addRecipe(new ItemStack(Blocks.mudBrick.get(), 1), new Object[] {"MM", "MM", 'M', new ItemStack(Items.miscItems.get(), 1, 3)}); - GameRegistry.addRecipe(new ItemStack(Blocks.bambooThatching.get(), 1), new Object[] {"###", "###", "###", '#', Blocks.bamboo.get()}); + GameRegistry.addRecipe(new ItemStack(Blocks.planks.get(), 1, 10), new Object[] {"###", "###", "###", '#', Blocks.bamboo.get()}); GameRegistry.addRecipe(new ItemStack(Block.cobblestoneMossy, 1, 0), new Object[] {"MMM", "MCM", "MMM", 'M', Blocks.moss.get(), 'C', Block.cobblestone}); GameRegistry.addRecipe(new ItemStack(Block.stoneBrick, 1, 1), new Object[] {"MMM", "MSM", "MMM", 'M', Blocks.moss.get(), 'S', Block.stoneBrick}); @@ -146,7 +146,7 @@ public class BOPCrafting GameRegistry.addRecipe(new ItemStack(Items.enderporter.get(), 1, 0), new Object[] {"IOI", "OAO", "IOI", 'I', Item.eyeOfEnder, 'O', Block.obsidian, 'A', Blocks.amethystBlock.get()}); GameRegistry.addRecipe(new ItemStack(Items.bopDiscMud.get(), 1), new Object[] {" M ", "MDM", " M ", 'M', new ItemStack(Items.miscItems.get(), 1, 0), 'D', Items.bopDisc.get()}); - GameRegistry.addShapelessRecipe(new ItemStack(Blocks.bamboo.get(), 9), new Object[] {Blocks.bambooThatching.get()}); + GameRegistry.addShapelessRecipe(new ItemStack(Blocks.bamboo.get(), 9), new Object[] {new ItemStack(Blocks.planks.get(), 1, 10)}); GameRegistry.addShapelessRecipe(new ItemStack(Items.miscItems.get(), 9, 2), new Object[] {Blocks.amethystBlock.get()}); //Plants @@ -166,8 +166,9 @@ public class BOPCrafting private static void addOreRegistration() { //Ore Registration - OreDictionary.registerOre("plankWood", new ItemStack(Blocks.planks.get(), 1, OreDictionary.WILDCARD_VALUE)); - OreDictionary.registerOre("plankWood", new ItemStack(Blocks.bambooThatching.get())); + for (int i = 0; i < 10; ++i) + OreDictionary.registerOre("plankWood", new ItemStack(Blocks.planks.get(), 1, i)); +// OreDictionary.registerOre("plankWood", new ItemStack(Blocks.bambooThatching.get())); OreDictionary.registerOre("treeSapling", new ItemStack(Blocks.saplings.get(), 1, OreDictionary.WILDCARD_VALUE)); OreDictionary.registerOre("treeSapling", new ItemStack(Blocks.colorizedSaplings.get(), 1, OreDictionary.WILDCARD_VALUE)); diff --git a/src/minecraft/biomesoplenty/items/ItemBOPMud.java b/src/minecraft/biomesoplenty/items/ItemBOPMud.java new file mode 100644 index 000000000..ab541569f --- /dev/null +++ b/src/minecraft/biomesoplenty/items/ItemBOPMud.java @@ -0,0 +1,28 @@ +package biomesoplenty.items; + +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; + +public class ItemBOPMud extends ItemBlock +{ + private static final String[] types = new String[] {"mud", "quicksand"}; + + public ItemBOPMud(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()]; + } +} diff --git a/src/minecraft/biomesoplenty/items/ItemBOPPlank.java b/src/minecraft/biomesoplenty/items/ItemBOPPlank.java index ee117b9ed..7582a7af2 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPPlank.java +++ b/src/minecraft/biomesoplenty/items/ItemBOPPlank.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; public class ItemBOPPlank extends ItemBlock { - private static final String[] woodTypes = new String[] {"acacia", "cherry", "dark", "fir", "holy", "magic", "mangrove", "palm", "redwood", "willow"}; + private static final String[] woodTypes = new String[] {"acaciaPlank", "cherryPlank", "darkPlank", "firPlank", "holyPlank", "magicPlank", "mangrovePlank", "palmPlank", "redwoodPlank", "willowPlank", "bambooThatching"}; public ItemBOPPlank(int par1) { @@ -23,6 +23,6 @@ public class ItemBOPPlank extends ItemBlock @Override public String getUnlocalizedName(ItemStack itemStack) { - return (new StringBuilder()).append(woodTypes[itemStack.getItemDamage()]).append("Planks").toString(); + return woodTypes[itemStack.getItemDamage()]; } } diff --git a/src/minecraft/biomesoplenty/worldgen/WorldGenQuicksand.java b/src/minecraft/biomesoplenty/worldgen/WorldGenQuicksand.java index 9a82205d6..e81430926 100644 --- a/src/minecraft/biomesoplenty/worldgen/WorldGenQuicksand.java +++ b/src/minecraft/biomesoplenty/worldgen/WorldGenQuicksand.java @@ -2,12 +2,10 @@ package biomesoplenty.worldgen; import java.util.Random; -import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPBlocks; - import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; +import biomesoplenty.api.Blocks; public class WorldGenQuicksand extends WorldGenerator { @@ -41,19 +39,19 @@ public class WorldGenQuicksand extends WorldGenerator } } - var1.setBlock(var3, var4 - 3, var5, Blocks.quicksand.get().blockID); - var1.setBlock(var3, var4 - 2, var5, Blocks.quicksand.get().blockID); - var1.setBlock(var3, var4 - 1, var5, Blocks.quicksand.get().blockID); + var1.setBlock(var3, var4 - 3, var5, Blocks.mud.get().blockID, 1, 2); + var1.setBlock(var3, var4 - 2, var5, Blocks.mud.get().blockID, 1, 2); + var1.setBlock(var3, var4 - 1, var5, Blocks.mud.get().blockID, 1, 2); var1.setBlock(var3, var4, var5, 0); - var1.setBlock(var3 - 1, var4 - 2, var5, Blocks.quicksand.get().blockID); - var1.setBlock(var3 + 1, var4 - 2, var5, Blocks.quicksand.get().blockID); - var1.setBlock(var3, var4 - 2, var5 - 1, Blocks.quicksand.get().blockID); - var1.setBlock(var3, var4 - 2, var5 + 1, Blocks.quicksand.get().blockID); - var1.setBlock(var3 - 1, var4 - 1, var5, Blocks.quicksand.get().blockID); - var1.setBlock(var3 + 1, var4 - 1, var5, Blocks.quicksand.get().blockID); - var1.setBlock(var3, var4 - 1, var5 - 1, Blocks.quicksand.get().blockID); - var1.setBlock(var3, var4 - 1, var5 + 1, Blocks.quicksand.get().blockID); + var1.setBlock(var3 - 1, var4 - 2, var5, Blocks.mud.get().blockID, 1, 2); + var1.setBlock(var3 + 1, var4 - 2, var5, Blocks.mud.get().blockID, 1, 2); + var1.setBlock(var3, var4 - 2, var5 - 1, Blocks.mud.get().blockID, 1, 2); + var1.setBlock(var3, var4 - 2, var5 + 1, Blocks.mud.get().blockID, 1, 2); + var1.setBlock(var3 - 1, var4 - 1, var5, Blocks.mud.get().blockID, 1, 2); + var1.setBlock(var3 + 1, var4 - 1, var5, Blocks.mud.get().blockID, 1, 2); + var1.setBlock(var3, var4 - 1, var5 - 1, Blocks.mud.get().blockID, 1, 2); + var1.setBlock(var3, var4 - 1, var5 + 1, Blocks.mud.get().blockID, 1, 2); var1.setBlock(var3 - 1, var4, var5, 0); var1.setBlock(var3 + 1, var4, var5, 0); var1.setBlock(var3, var4, var5 - 1, 0); diff --git a/src/minecraft/biomesoplenty/worldgen/WorldGenQuicksand2.java b/src/minecraft/biomesoplenty/worldgen/WorldGenQuicksand2.java index f16e5e296..53913396a 100644 --- a/src/minecraft/biomesoplenty/worldgen/WorldGenQuicksand2.java +++ b/src/minecraft/biomesoplenty/worldgen/WorldGenQuicksand2.java @@ -2,12 +2,10 @@ package biomesoplenty.worldgen; import java.util.Random; -import biomesoplenty.api.Blocks; -import biomesoplenty.configuration.BOPBlocks; - import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; +import biomesoplenty.api.Blocks; public class WorldGenQuicksand2 extends WorldGenerator { @@ -41,18 +39,18 @@ public class WorldGenQuicksand2 extends WorldGenerator } } - var1.setBlock(var3, var4 - 2, var5, Blocks.quicksand.get().blockID); - var1.setBlock(var3, var4 - 1, var5, Blocks.quicksand.get().blockID); - var1.setBlock(var3, var4, var5, Blocks.quicksand.get().blockID); + var1.setBlock(var3, var4 - 2, var5, Blocks.mud.get().blockID, 1, 2); + var1.setBlock(var3, var4 - 1, var5, Blocks.mud.get().blockID, 1, 2); + var1.setBlock(var3, var4, var5, Blocks.mud.get().blockID, 1, 2); - var1.setBlock(var3 - 1, var4 - 1, var5, Blocks.quicksand.get().blockID); - var1.setBlock(var3 + 1, var4 - 1, var5, Blocks.quicksand.get().blockID); - var1.setBlock(var3, var4 - 1, var5 - 1, Blocks.quicksand.get().blockID); - var1.setBlock(var3, var4 - 1, var5 + 1, Blocks.quicksand.get().blockID); - var1.setBlock(var3 - 1, var4, var5, Blocks.quicksand.get().blockID); - var1.setBlock(var3 + 1, var4, var5, Blocks.quicksand.get().blockID); - var1.setBlock(var3, var4, var5 - 1, Blocks.quicksand.get().blockID); - var1.setBlock(var3, var4, var5 + 1, Blocks.quicksand.get().blockID); + var1.setBlock(var3 - 1, var4 - 1, var5, Blocks.mud.get().blockID, 1, 2); + var1.setBlock(var3 + 1, var4 - 1, var5, Blocks.mud.get().blockID, 1, 2); + var1.setBlock(var3, var4 - 1, var5 - 1, Blocks.mud.get().blockID, 1, 2); + var1.setBlock(var3, var4 - 1, var5 + 1, Blocks.mud.get().blockID, 1, 2); + var1.setBlock(var3 - 1, var4, var5, Blocks.mud.get().blockID, 1, 2); + var1.setBlock(var3 + 1, var4, var5, Blocks.mud.get().blockID, 1, 2); + var1.setBlock(var3, var4, var5 - 1, Blocks.mud.get().blockID, 1, 2); + var1.setBlock(var3, var4, var5 + 1, Blocks.mud.get().blockID, 1, 2); return true; } }