From 639025c398447259c261cbc2d1562acf4f9a4be0 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Fri, 1 Aug 2014 01:16:58 -0400 Subject: [PATCH] Changed the Hedge block to Flax, an uncommon plant used to craft string --- .../client/render/blocks/FoliageRenderer.java | 18 +++++------ .../decoration/OverworldBiomeFeatures.java | 1 + .../overridden/BiomeGenBOPBirchForest.java | 1 + .../biome/overridden/BiomeGenBOPForest.java | 1 + .../biome/overridden/BiomeGenBOPPlains.java | 1 + .../biome/overworld/BiomeGenBorealForest.java | 1 + .../overworld/BiomeGenCherryBlossomGrove.java | 1 + .../overworld/BiomeGenConiferousForest.java | 1 + .../overworld/BiomeGenDeciduousForest.java | 1 + .../biome/overworld/BiomeGenGrassland.java | 1 + .../biome/overworld/BiomeGenMeadow.java | 1 + .../common/biome/overworld/BiomeGenMoor.java | 1 + .../biome/overworld/BiomeGenMountain.java | 1 + .../biome/overworld/BiomeGenPrairie.java | 1 + .../overworld/BiomeGenSeasonalForest.java | 1 + .../biome/overworld/BiomeGenShield.java | 1 + .../biome/overworld/BiomeGenShrubland.java | 1 + .../BiomeGenTemperateRainforest.java | 1 + .../biome/overworld/BiomeGenWetland.java | 1 + .../biome/overworld/BiomeGenWoodland.java | 1 + .../overworld/sub/BiomeGenMeadowForest.java | 1 + .../biome/overworld/sub/BiomeGenOrchard.java | 1 + .../overworld/sub/BiomeGenSpruceWoods.java | 1 + .../common/blocks/BlockBOPFoliage.java | 29 +++++++++--------- .../common/core/BOPCrafting.java | 1 + .../common/itemblocks/ItemBlockFoliage.java | 12 ++++---- .../generation/WorldGenFieldAssociation.java | 1 + .../assets/biomesoplenty/lang/en_US.lang | 4 +-- .../textures/blocks/flax_flowers.png | Bin 0 -> 567 bytes .../textures/blocks/flaxbottom.png | Bin 0 -> 596 bytes .../biomesoplenty/textures/blocks/flaxtop.png | Bin 0 -> 524 bytes .../textures/blocks/hedge_trunk.png | Bin 584 -> 0 bytes .../textures/blocks/hedgebottom.png | Bin 442 -> 0 bytes .../textures/blocks/hedgetop.png | Bin 457 -> 0 bytes .../textures/blocks/item_flax.png | Bin 0 -> 592 bytes 35 files changed, 56 insertions(+), 31 deletions(-) create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/flax_flowers.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/flaxbottom.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/flaxtop.png delete mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/hedge_trunk.png delete mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/hedgebottom.png delete mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/hedgetop.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/item_flax.png diff --git a/src/main/java/biomesoplenty/client/render/blocks/FoliageRenderer.java b/src/main/java/biomesoplenty/client/render/blocks/FoliageRenderer.java index dcf22f394..c65237ff0 100644 --- a/src/main/java/biomesoplenty/client/render/blocks/FoliageRenderer.java +++ b/src/main/java/biomesoplenty/client/render/blocks/FoliageRenderer.java @@ -13,7 +13,7 @@ import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; public class FoliageRenderer implements ISimpleBlockRenderingHandler { - private final int HEDGETOP = 6; + private final int FLAXTOP = 6; @Override public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer) @@ -335,7 +335,7 @@ public class FoliageRenderer implements ISimpleBlockRenderingHandler if (par1Block == BOPCBlocks.foliage) { long i1; - if (world.getBlockMetadata(par2, par3, par4) == HEDGETOP) { + if (world.getBlockMetadata(par2, par3, par4) == FLAXTOP) { i1 = par2 * 3129871 ^ par4 * 116129781L ^ par3 - 1; } else { i1 = par2 * 3129871 ^ par4 * 116129781L ^ par3; @@ -353,9 +353,9 @@ public class FoliageRenderer implements ISimpleBlockRenderingHandler renderer.drawCrossedSquares(par1Block.getIcon(0, world.getBlockMetadata(par2, par3, par4)), d0, d1 - 1, d2, 1.0F); } - else if (world.getBlockMetadata(par2, par3, par4) == 3 && world.getBlock(par2, par3, par4) == BOPCBlocks.foliage) + else if (world.getBlockMetadata(par2, par3, par4) == 6 && world.getBlock(par2, par3, par4) == BOPCBlocks.foliage) { - renderHedge(d0, d1, d2, 1.0F, f1, f2, f3, renderer); + renderFlax(d0, d1, d2, 1.0F, f1, f2, f3, renderer); } else if (world.getBlockMetadata(par2, par3, par4) == 8 && world.getBlock(par2, par3, par4) == BOPCBlocks.foliage) @@ -406,18 +406,18 @@ public class FoliageRenderer implements ISimpleBlockRenderingHandler renderer.drawCrossedSquares(shrubBranch, par1, par2, par3, par4); } - private static void renderHedge(double par1, double par2, double par3, float par4, float par5, float par6, float par7, RenderBlocks renderer) + private static void renderFlax(double par1, double par2, double par3, float par4, float par5, float par6, float par7, RenderBlocks renderer) { Tessellator tessellator = Tessellator.instance; - IIcon hedgeLeaf = renderer.getBlockIconFromSideAndMetadata(BOPCBlocks.foliage, 0, 3); - IIcon hedgeTrunk = ((BlockBOPFoliage)BOPCBlocks.foliage).hedgeTrunk; + IIcon flaxStem = renderer.getBlockIconFromSideAndMetadata(BOPCBlocks.foliage, 0, 6); + IIcon flaxFlowers = ((BlockBOPFoliage)BOPCBlocks.foliage).flaxFlowers; tessellator.setColorOpaque_F(par4 * par5, par4 * par6, par4 * par7); - renderer.drawCrossedSquares(hedgeLeaf, par1, par2, par3, par4); + renderer.drawCrossedSquares(flaxStem, par1, par2, par3, par4); tessellator.setColorOpaque_F(par4, par4, par4); - renderer.drawCrossedSquares(hedgeTrunk, par1, par2, par3, par4); + renderer.drawCrossedSquares(flaxFlowers, par1, par2, par3, par4); } } diff --git a/src/main/java/biomesoplenty/common/biome/decoration/OverworldBiomeFeatures.java b/src/main/java/biomesoplenty/common/biome/decoration/OverworldBiomeFeatures.java index a41f5d1d6..ce1c5d64c 100644 --- a/src/main/java/biomesoplenty/common/biome/decoration/OverworldBiomeFeatures.java +++ b/src/main/java/biomesoplenty/common/biome/decoration/OverworldBiomeFeatures.java @@ -70,6 +70,7 @@ public class OverworldBiomeFeatures extends BiomeFeaturesBase @BiomeFeature public int redSandSplatterPerChunk = 0; @BiomeFeature public int dirtSplatterPerChunk = 0; @BiomeFeature public int sandstoneSpikesPerChunk = 0; + @BiomeFeature public int flaxPerChunk = 0; //Ocean Features @BiomeFeature public int seaweedPerChunk = 0; diff --git a/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPBirchForest.java b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPBirchForest.java index 2638d85f4..47da9d0d4 100644 --- a/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPBirchForest.java +++ b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPBirchForest.java @@ -26,6 +26,7 @@ public class BiomeGenBOPBirchForest extends BOPInheritedOverworldBiome this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 15; this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 4; this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 2; + this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1; this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5; diff --git a/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPForest.java b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPForest.java index cd31c5bf1..2fafd0488 100644 --- a/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPForest.java +++ b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPForest.java @@ -24,6 +24,7 @@ public class BiomeGenBOPForest extends BOPInheritedOverworldBiome this.theBiomeDecorator.bopFeatures.sproutsPerChunk = 1; this.theBiomeDecorator.bopFeatures.berryBushesPerChunk = 1; this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1; this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5; this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 2; diff --git a/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPPlains.java b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPPlains.java index 3fe745f55..471f9c06a 100644 --- a/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPPlains.java +++ b/src/main/java/biomesoplenty/common/biome/overridden/BiomeGenBOPPlains.java @@ -15,6 +15,7 @@ public class BiomeGenBOPPlains extends BOPInheritedOverworldBiome this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 8; this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5; + this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1; this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 0), 10); this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(BOPCBlocks.flowers, 9), 5); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java index 6cfa04ba2..4f9d7bb58 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBorealForest.java @@ -39,6 +39,7 @@ public class BiomeGenBorealForest extends BOPOverworldBiome this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4; this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 10; this.theBiomeDecorator.bopFeatures.algaePerChunk = 2; + this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1; this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 50; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java index d66707718..6b5dbedd5 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenCherryBlossomGrove.java @@ -38,6 +38,7 @@ public class BiomeGenCherryBlossomGrove extends BOPOverworldBiome this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 15; this.theBiomeDecorator.bopFeatures.generatePumpkins = false; this.theBiomeDecorator.bopFeatures.algaePerChunk = 2; + this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1; this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 15; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java index 1c39fe9e6..9703a0c2a 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenConiferousForest.java @@ -51,6 +51,7 @@ public class BiomeGenConiferousForest extends BOPOverworldBiome this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 8; this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5; this.theBiomeDecorator.bopFeatures.algaePerChunk = 2; + this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1; this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 10; this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 25; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeciduousForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeciduousForest.java index ffac027af..0015f6c14 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeciduousForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenDeciduousForest.java @@ -39,6 +39,7 @@ public class BiomeGenDeciduousForest extends BOPOverworldBiome this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10; this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 10; this.theBiomeDecorator.bopFeatures.algaePerChunk = 3; + this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1; this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 10; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java index 9106d185b..d36c98ac8 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenGrassland.java @@ -47,6 +47,7 @@ public class BiomeGenGrassland extends BOPOverworldBiome this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 5; this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 2; this.theBiomeDecorator.bopFeatures.generatePumpkins = false; + this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1; this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 2; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java index cf9719914..62ffc9d8f 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java @@ -42,6 +42,7 @@ public class BiomeGenMeadow extends BOPOverworldBiome this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5; this.theBiomeDecorator.bopFeatures.generatePumpkins = false; this.theBiomeDecorator.bopFeatures.algaePerChunk = 2; + this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1; this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 10; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java index 46e3e7377..8be095374 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMoor.java @@ -44,6 +44,7 @@ public class BiomeGenMoor extends BOPOverworldBiome this.theBiomeDecorator.bopFeatures.koruPerChunk = 6; this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5; this.theBiomeDecorator.bopFeatures.generatePumpkins = false; + this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1; this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 15; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java index 841377d98..dcd454979 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMountain.java @@ -35,6 +35,7 @@ public class BiomeGenMountain extends BOPOverworldBiome this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 10; this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 10; this.theBiomeDecorator.bopFeatures.algaePerChunk = 2; + this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1; this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 8; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java index fab317d4b..b9588d9c1 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenPrairie.java @@ -38,6 +38,7 @@ public class BiomeGenPrairie extends BOPOverworldBiome this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 3; this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4; this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 15; + this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1; this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 999; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java index 05814361f..879d85962 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenSeasonalForest.java @@ -39,6 +39,7 @@ public class BiomeGenSeasonalForest extends BOPOverworldBiome this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 8; this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 15; this.theBiomeDecorator.bopFeatures.algaePerChunk = 3; + this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1; this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 8; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java index a69a8a659..9abe896a3 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java @@ -40,6 +40,7 @@ public class BiomeGenShield extends BOPOverworldBiome this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5; this.theBiomeDecorator.bopFeatures.algaePerChunk = 4; this.theBiomeDecorator.bopFeatures.generateStoneInGrass2 = true; + this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1; this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 12; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java index e5aae6a59..3231c56aa 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShrubland.java @@ -40,6 +40,7 @@ public class BiomeGenShrubland extends BOPOverworldBiome this.theBiomeDecorator.bopFeatures.generatePumpkins = false; this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 1; + this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1; this.theBiomeDecorator.bopFeatures.weightedFlowerGen.put(new WorldGenBOPFlora(Blocks.red_flower, 2), 4); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java index 2f15eef8a..6ee7d4b4e 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTemperateRainforest.java @@ -45,6 +45,7 @@ public class BiomeGenTemperateRainforest extends BOPOverworldBiome this.theBiomeDecorator.bopFeatures.leafPilesPerChunk = 15; this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 15; this.theBiomeDecorator.bopFeatures.algaePerChunk = 5; + this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1; this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 25; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java index 840c96309..e4b7494a6 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWetland.java @@ -45,6 +45,7 @@ public class BiomeGenWetland extends BOPOverworldBiome this.theBiomeDecorator.sandPerChunk = -999; this.theBiomeDecorator.sandPerChunk2 = -999; this.theBiomeDecorator.waterlilyPerChunk = 4; + this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1; this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 1; this.theBiomeDecorator.bopFeatures.riverCanePerChunk = 15; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java index f512bc8b6..9ae41f17f 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWoodland.java @@ -37,6 +37,7 @@ public class BiomeGenWoodland extends BOPOverworldBiome this.theBiomeDecorator.bopFeatures.deadLeafPilesPerChunk = 10; this.theBiomeDecorator.bopFeatures.logsPerChunk = 10; this.theBiomeDecorator.bopFeatures.algaePerChunk = 3; + this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1; this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 7; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenMeadowForest.java b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenMeadowForest.java index 7c37cc7ad..a8c8bfe0d 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenMeadowForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenMeadowForest.java @@ -42,6 +42,7 @@ public class BiomeGenMeadowForest extends BOPSubBiome this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 5; this.theBiomeDecorator.bopFeatures.generatePumpkins = false; this.theBiomeDecorator.bopFeatures.algaePerChunk = 2; + this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1; this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 5; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenOrchard.java b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenOrchard.java index 431bd4d62..c09ccab00 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenOrchard.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenOrchard.java @@ -40,6 +40,7 @@ public class BiomeGenOrchard extends BOPSubBiome this.theBiomeDecorator.bopFeatures.shrubsPerChunk = 10; this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 4; this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 15; + this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1; this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 20; this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 15; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenSpruceWoods.java b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenSpruceWoods.java index 9a1feac90..05e68cf66 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenSpruceWoods.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenSpruceWoods.java @@ -44,6 +44,7 @@ public class BiomeGenSpruceWoods extends BOPSubBiome this.theBiomeDecorator.bopFeatures.cloverPatchesPerChunk = 5; this.theBiomeDecorator.bopFeatures.algaePerChunk = 2; this.theBiomeDecorator.bopFeatures.toadstoolsPerChunk = 2; + this.theBiomeDecorator.bopFeatures.flaxPerChunk = 1; this.theBiomeDecorator.bopFeatures.bopGrassPerChunk = 2; this.theBiomeDecorator.bopFeatures.bopFlowersPerChunk = 5; diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPFoliage.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPFoliage.java index 13fed48ec..5500c870e 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPFoliage.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPFoliage.java @@ -36,15 +36,15 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockBOPFoliage extends BOPBlockWorldDecor implements IShearable { - private static final String[] foliageTypes = new String[] {"duckweed", "shortgrass", "mediumgrass", "hedgebottom", "bush", "sprout", "hedgetop", "poisonivy", "berrybush", "shrub", "wheatgrass", "dampgrass", "koru", "cloverpatch", "leafpile", "deadleafpile"}; + private static final String[] foliageTypes = new String[] {"duckweed", "shortgrass", "mediumgrass", "flaxbottom", "bush", "sprout", "flaxtop", "poisonivy", "berrybush", "shrub", "wheatgrass", "dampgrass", "koru", "cloverpatch", "leafpile", "deadleafpile"}; private IIcon[] textures; - public IIcon hedgeTrunk; + public IIcon flaxFlowers; public IIcon shrubBranch; public IIcon berryBushBerry; - private static final int HEDGETOP = 6; - private static final int HEDGEBOTTOM = 3; + private static final int FLAXTOP = 6; + private static final int FLAXBOTTOM = 3; public BlockBOPFoliage() { @@ -66,7 +66,7 @@ public class BlockBOPFoliage extends BOPBlockWorldDecor implements IShearable textures[i] = iconRegister.registerIcon("biomesoplenty:"+foliageTypes[i]); } - hedgeTrunk = iconRegister.registerIcon("biomesoplenty:" + "hedge_trunk"); + flaxFlowers = iconRegister.registerIcon("biomesoplenty:" + "flax_flowers"); shrubBranch = iconRegister.registerIcon("biomesoplenty:" + "shrub_branch"); berryBushBerry = iconRegister.registerIcon("biomesoplenty:" + "berrybush_berry"); } @@ -86,7 +86,7 @@ public class BlockBOPFoliage extends BOPBlockWorldDecor implements IShearable { for (int i = 0; i < foliageTypes.length; ++i) { - if (i != HEDGETOP) + if (i != FLAXTOP) { list.add(new ItemStack(block, 1, i)); } @@ -152,7 +152,7 @@ public class BlockBOPFoliage extends BOPBlockWorldDecor implements IShearable switch (metadata) { - case HEDGETOP: + case FLAXTOP: return block == this; case 0: //Duckweed @@ -197,11 +197,12 @@ public class BlockBOPFoliage extends BOPBlockWorldDecor implements IShearable int metadata = world.getBlockMetadata(x, y, z); - if (world.getBlockMetadata(x, y, z) == HEDGEBOTTOM) + if (world.getBlockMetadata(x, y, z) == FLAXBOTTOM) { if (world.getBlock(x, y + 1, z) != this) { - world.setBlock(x, y, z, Blocks.tallgrass, 1, 2); + this.dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0); + world.setBlockToAir(x, y, z); } else if (!this.isValidPosition(world, x, y, z, metadata)) { @@ -262,7 +263,7 @@ public class BlockBOPFoliage extends BOPBlockWorldDecor implements IShearable @Override public int colorMultiplier(IBlockAccess world, int x, int y, int z) { - if (world.getBlockMetadata(x, y, z) == 3 || world.getBlockMetadata(x, y, z) == 6 || world.getBlockMetadata(x, y, z) == 9 || world.getBlockMetadata(x, y, z) == 14) + if (world.getBlockMetadata(x, y, z) == 9 || world.getBlockMetadata(x, y, z) == 14) { return world.getBiomeGenForCoords(x, z).getBiomeFoliageColor(x, y, z); } @@ -279,9 +280,9 @@ public class BlockBOPFoliage extends BOPBlockWorldDecor implements IShearable public int getDamageValue(World world, int x, int y, int z) { int meta = world.getBlockMetadata(x, y, z); - if (meta == HEDGETOP) + if (meta == FLAXTOP) { - meta = HEDGEBOTTOM; + meta = FLAXBOTTOM; } return meta; } @@ -366,9 +367,9 @@ public class BlockBOPFoliage extends BOPBlockWorldDecor implements IShearable { ArrayList ret = new ArrayList(); - if (world.getBlockMetadata(x, y, z) == HEDGETOP) + if (world.getBlockMetadata(x, y, z) == FLAXTOP) { - ret.add(new ItemStack(Blocks.tallgrass, 1, 1)); + ret.add(new ItemStack(BOPCBlocks.foliage, 1, 3)); } else if (world.getBlockMetadata(x, y, z) == 8) { diff --git a/src/main/java/biomesoplenty/common/core/BOPCrafting.java b/src/main/java/biomesoplenty/common/core/BOPCrafting.java index 35ad27cdf..3aad55d14 100644 --- a/src/main/java/biomesoplenty/common/core/BOPCrafting.java +++ b/src/main/java/biomesoplenty/common/core/BOPCrafting.java @@ -154,6 +154,7 @@ public class BOPCrafting addRecipeToFront(new ItemStack(BOPCBlocks.mahoganyStairs, 4), new Object[] {" R", " RR", "RRR", 'R', new ItemStack(BOPCBlocks.planks, 1, 14)}); addRecipeToFront(new ItemStack(BOPCBlocks.mahoganyStairs, 4), new Object[] {"R ", "RR ", "RRR", 'R', new ItemStack(BOPCBlocks.planks, 1, 14)}); + GameRegistry.addRecipe(new ItemStack(Items.string, 1, 0), new Object[] {"F", "F", "F", 'F', new ItemStack(BOPCBlocks.foliage, 1, 3)}); GameRegistry.addRecipe(new ItemStack(BOPCBlocks.overgrownNetherrack, 1, 0), new Object[] {"SSS", "SNS", "SSS", 'S', Items.wheat_seeds, 'N', Blocks.netherrack}); GameRegistry.addRecipe(new ItemStack(Blocks.wool, 1, 0), new Object[] {"CCC", "CCC", "CCC", 'C', new ItemStack(BOPCBlocks.plants, 1, 7)}); GameRegistry.addRecipe(new ItemStack(Items.coal, 1), new Object[] {"AAA", "AAA", "AAA", 'A', new ItemStack(BOPCItems.misc, 1, 1)}); diff --git a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockFoliage.java b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockFoliage.java index 910c54501..5c30b7e66 100644 --- a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockFoliage.java +++ b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockFoliage.java @@ -16,10 +16,10 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemBlockFoliage extends ItemColored { - private static final String[] foliageTypes = new String[] {"duckweed", "shortgrass", "mediumgrass", "hedgebottom", "bush", "sprout", "hedgetop", "poisonivy", "berrybush", "shrub", "wheatgrass", "dampgrass", "koru", "cloverpatch", "leafpile", "deadleafpile"}; + private static final String[] foliageTypes = new String[] {"duckweed", "shortgrass", "mediumgrass", "flaxbottom", "bush", "sprout", "flaxtop", "poisonivy", "berrybush", "shrub", "wheatgrass", "dampgrass", "koru", "cloverpatch", "leafpile", "deadleafpile"}; @SideOnly(Side.CLIENT) private IIcon[] textures; - private static final int HEDGETOP = 6; + private static final int FLAXTOP = 6; public ItemBlockFoliage(Block block) { @@ -39,7 +39,7 @@ public class ItemBlockFoliage extends ItemColored textures[i] = iconRegister.registerIcon("biomesoplenty:" + foliageTypes[i]); } - textures[3] = iconRegister.registerIcon("biomesoplenty:hedgetop"); + textures[3] = iconRegister.registerIcon("biomesoplenty:item_flax"); textures[8] = iconRegister.registerIcon("biomesoplenty:item_berrybush"); textures[9] = iconRegister.registerIcon("biomesoplenty:item_shrub"); textures[15] = iconRegister.registerIcon("biomesoplenty:deadleafpile"); @@ -49,7 +49,7 @@ public class ItemBlockFoliage extends ItemColored @SideOnly(Side.CLIENT) public int getColorFromItemStack(ItemStack itemStack, int par2) { - if (itemStack.getItemDamage() == 8 || itemStack.getItemDamage() == 9 || itemStack.getItemDamage() == 15) + if (itemStack.getItemDamage() == 3 || itemStack.getItemDamage() == 8 || itemStack.getItemDamage() == 9 || itemStack.getItemDamage() == 15) return 16777215; else //TODO: getRenderColor() @@ -76,7 +76,7 @@ public class ItemBlockFoliage extends ItemColored @Override public IIcon getIconFromDamage(int meta) { - if (meta == HEDGETOP) { + if (meta == FLAXTOP) { meta = 3; } @@ -129,7 +129,7 @@ public class ItemBlockFoliage extends ItemColored { if (metadata == 3) { - if (!placeBlockAt(stack, player, world, x, y + 1, z, side, hitX, hitY + 1, hitZ, HEDGETOP)) return false; + if (!placeBlockAt(stack, player, world, x, y + 1, z, side, hitX, hitY + 1, hitZ, FLAXTOP)) return false; } return super.placeBlockAt(stack, player, world, x, y, z, side, hitX, hitY, hitZ, metadata); diff --git a/src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java b/src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java index 182b88a4d..0e5f16785 100644 --- a/src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java +++ b/src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java @@ -87,6 +87,7 @@ public class WorldGenFieldAssociation associateFeature("blueMilksPerChunk", new WorldGenBOPFlora(BOPCBlocks.mushrooms, 2)); associateFeature("cattailsPerChunk", new WorldGenBOPFlora(BOPCBlocks.plants, 7)); associateFeature("highCattailsPerChunk", new WorldGenBOPDoubleFlora(BOPCBlocks.plants, BOPCBlocks.plants, 10, 9)); + associateFeature("flaxPerChunk", new WorldGenBOPDoubleFlora(BOPCBlocks.foliage, BOPCBlocks.foliage, 3, 6, 24)); associateFeature("algaePerChunk", new WorldGenBOPFlora(BOPCBlocks.foliage, 0, 256)); associateFeature("sproutsPerChunk", new WorldGenBOPFlora(BOPCBlocks.foliage, 5)); associateFeature("tinyCactiPerChunk", new WorldGenBOPFlora(BOPCBlocks.plants, 12)); diff --git a/src/main/resources/assets/biomesoplenty/lang/en_US.lang b/src/main/resources/assets/biomesoplenty/lang/en_US.lang index fe166324c..a131d5e36 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_US.lang +++ b/src/main/resources/assets/biomesoplenty/lang/en_US.lang @@ -70,10 +70,10 @@ tile.stoneFormations.stalactite.name=Stalactite tile.foliage.duckweed.name=Duckweed tile.foliage.shortgrass.name=Short Grass tile.foliage.mediumgrass.name=Medium Grass -tile.foliage.hedgebottom.name=Hedge +tile.foliage.flaxbottom.name=Flax tile.foliage.bush.name=Bush tile.foliage.sprout.name=Sprout -tile.foliage.hedgetop.name=Hedge +tile.foliage.flaxtop.name=Flax tile.foliage.poisonivy.name=Poison Ivy tile.foliage.berrybush.name=Berry Bush tile.foliage.shrub.name=Shrub diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/flax_flowers.png b/src/main/resources/assets/biomesoplenty/textures/blocks/flax_flowers.png new file mode 100644 index 0000000000000000000000000000000000000000..f136990328c59774a21d34d94d2b2ec9e1d4a690 GIT binary patch literal 567 zcmV-70?7S|P)N2bZe?^J zG%heMGmPe!Pyhe{wMj%lR5(w4l1Xn9K@f%e4|6~WK`bGJL}Z*`Cnka*C1hbcz=b<^ zlzXJyxLL8hFEif8%VWMW)tLy1!|U!URlR=ox`QM`qtOV{>D11P#UiZN>#$m_4CFSO zO{^{AUO;1(W!BX1_hY`->xJcVX`sf*sEb98{d0-J!C(+(vso;DT>I1GoM zr8G^WPmo6fW@L9FP^t~3-v@fQ+swl|l@M?dYKcRq(+RbY+qp?#3`TN(`93oRoPm#Y z@JYJ;`9SPpr#g^sUI`MMM<$Z-pw(*GyiQR6BJtduPk-cVzT1t=N5BXuDZaV?gXc#R zGx*7V&uSgE(BM+J`Q0~((TYUm_s%3Ibl5T)jbh?iJ<;ZRSFbPf=x@%6*m1s?j{$Ha zd2i2kyItEc3>BVt{F88}0k>gd z$Pxrd<$Dst%u{;9|6p_boB+x0g~LBqyWNgCE=bcf`~e;E_^>?(v_1d;002ovPDHLk FV1k^s{*3?t literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/flaxbottom.png b/src/main/resources/assets/biomesoplenty/textures/blocks/flaxbottom.png new file mode 100644 index 0000000000000000000000000000000000000000..c7417022ec3c8de2bd56c5657fe8a43551969492 GIT binary patch literal 596 zcmV-a0;~OrP)N2bZe?^J zG%heMGmPe!Pyhe{(n&-?R5(vnQ)i2^K@5C63zkpf@3SBluotjk?+q*V@?$xc>FQLEMDV-oB2n!eBHqdyvrOuX4_()M^f^od+9C(Gs19C|*Vv=@to z*zI;}yWL8=-6jVcd$-#aQvnzbhcX_I85|4-(&=y^T2`&vO~ua74l zj|;Ab-RX3G3kVd8MIJx`ybTBnwZY+P`~BXC_NVf0w-cAkWtB=LL!!d(JK_T!BT%o` z1)_6OXajRcc03Nh-%sxGc<^b%#)1aeF(rtsycGxp*hMOpB8kTYwILE-A~=jp<5&<^ zZT@7lSt@=$pQTVJNGKE%a9*#Mu}CB$+5yhRVlj@@B*2PBqo!s2wIL#Gx7$s9!r?Hd i6buH*qoYhFBmV&4jZOV^#Wy1W0000N2bZe?^J zG%heMGmPe!Pyhe{ib+I4R5(w4Q^~3VF%XRV?#aKJU+|)+AmXkAinv_VgNh5H;?b-B z*pDiw;{@Rq45{=|>F#8VBAreL%tbUB4cHfI%jI%h9mHa>fEg2y$89ipCX*poWV6{1 z(V#>kVIq+TxdJwzSS&J5{Z1^@!+`U0xrkPyBL5Ohnt7&1OtoEEYea4lv>Mdd(o;_odV6*b^(2icF_d z?w`-6wf~^o?b3HXA2tKA(%;9IvNVt1)0W9CCfX-)1}>lcVI-YUNba zXf(cp`T|Fzk)Q=6>(}e`7>EfqTWPgga=+gxg0j&&eBd~!TrSJ;c%<$1 zdPzQ?H)gln(V+cne>(lg<3T}vwiqU2Q>oPVJ)l2L03cGWR_$JW{eE9iMYGwoKB8W) z%k6ff5vO~eC*jFM5Lc@$fw$Xj;hR7iAj{>FPW=PJg9G;ay(9Qx#{2=d=(Y2n*@lh) O0000<{98gxZibW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE-^7j^FlWO00G2FL_t(IPj!;nFGE2T#&7rDwl8f$B=*>sQoC4c-zufLP)aPR z2hoLuq=W}gLh&L*;vbOsBR|fGGr1Lh$?ciW%=ykYXGSxd%^G2~S~Z`~$78$Q&e3MG zaWrDFSbj$T;PH4kIvfrbbvm8=(OBk7Fqupxkv2+Ya!2#Ju5)FnE_>Oj96@Xo#<5hC zWS7gukq{wPI2fgXcm7hmiob z=9-|I_5=T?A6cLmCtRn4c)!`gSu%k2sd{dvIFyDf$09)X=qUO19^B@ZP|VFDHd=wV z>jXEFH+}QliRSfsOWs2!=Euc$FYYqae1vqk4fH0cnY`&6quUaW*E*3)1n^Q=!RJ$& zukrOVii5BpyP!lvI6;>1s;*b z3=Dh+K$tP>S|=w^P^!c=q9iy!t)x7$D3u`~F*C13&(AePq0Cs%RL{`R{j-xf0|TR( zr;B5Vh5ytE{@qOhB1iuo(>3xoTrAeqHNoZ8u_G=_nSw4#H=J6`YF8Q;zkhPZ=Gnz$ zKACs5=kNdhe8uDXYf%x|;|JfC9sd0DNYcgwb^DLMEO81AJ+X-=H8M$pE$#KLXD2*m zjxX48`>jM-thn#xgv~b~2y*qq-f zIXBbzR@1xN+fwJf)7<29`APq_+{Lf0B-$E(*7O~I*zo!1ndiU%p7Xzzw|&ljFVkK% z*T9yqRcFt8Ok(Lj-n?9Yx_923Wt#a8XJ2H7xc_%qJl~Z)s@`bkf$y~}jt4H=FAYq- z)m0RG-7;$0SL46ik11_>UU}b=SF$+jf9wCN9Dk2Dr8JzvjSo~i|7O^BAn4J<4b8Q{ PaAxpy^>bP0l+XkKP1DJn diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/hedgetop.png b/src/main/resources/assets/biomesoplenty/textures/blocks/hedgetop.png deleted file mode 100644 index 873f75f7443f57ab11fe36f51743cf84aa1e3358..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 457 zcmV;)0XF`LP)N2bPDNB8 zb~7$DE-^7j^FlWO00BiwL_t(IPn}ZHs)A4u^o#Sw2r{fRB9JtxR4R(fpeOpH^yoza>7>!1l z&*z_aLAT{{DFXkU*@+O|q1){WX}{l#`)aiU!(>N7_ykP8R;x*X+wB&4o`ZtE@0W`V zheK$ZhTU!l!!YD3+=t8MQeGT}p^zBjdc77$X25C0aV-B9i^Y2(y3*bAJedZcX0wS# zqamVq+H2J7bqodrDK3fvbmKlSeU6d2aJ3(uK7nEJ`+U>Tq%-N5}V+ql59QpoOCSFGh6h-+1y9yIoA93@y00000NkvXXu0mjfBl*Si diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/item_flax.png b/src/main/resources/assets/biomesoplenty/textures/blocks/item_flax.png new file mode 100644 index 0000000000000000000000000000000000000000..1775bd35354d8baa9d06646f12e1811ac10a33d9 GIT binary patch literal 592 zcmV-W0N2bZe?^J zG%heMGmPe!Pyhe{&PhZ;R5(wik;yMZQ5424`&WpBg?X%+TT=%#rqozX6WXU#inKKc zRYj2~F(p_L2@a7gS5H0;Ba1{nI|E+fqS}P+}H; z9^n)!QzGO|iD+FYVkXQ$?0n49z~Heee?ga~rfRJFvNKX+erQ3>}Ue=$yI2 z1~P3l3k-Um=*YyZ(JiNX{jii*_znFOaml=3o;Crl<)2Z@IwgX|gdjoZ;*XfGkNvfn eASnJFQOF1A4g-38FXc%90000