From 1147f017a30e6957da0435d8ceacfba5818dfe58 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Mon, 23 Sep 2013 20:20:50 -0400 Subject: [PATCH] Tweaked reed gen --- common/biomesoplenty/biomes/BiomeGenBayou.java | 2 +- common/biomesoplenty/biomes/BiomeGenBog.java | 2 +- .../biomesoplenty/biomes/BiomeGenDeadSwamp.java | 2 +- .../biomes/BiomeGenDeciduousForest.java | 2 +- common/biomesoplenty/biomes/BiomeGenDunes.java | 1 + common/biomesoplenty/biomes/BiomeGenFen.java | 2 +- .../biomesoplenty/biomes/BiomeGenLushSwamp.java | 2 +- .../biomesoplenty/biomes/BiomeGenMangrove.java | 2 +- .../biomesoplenty/biomes/BiomeGenQuagmire.java | 2 +- common/biomesoplenty/biomes/BiomeGenShield.java | 1 + .../biomes/BiomeGenSilkglades.java | 2 +- .../biomesoplenty/biomes/BiomeGenSludgepit.java | 2 +- common/biomesoplenty/biomes/BiomeGenTimber.java | 1 + .../biomesoplenty/biomes/BiomeGenWetland.java | 2 +- .../biomes/beach/BiomeGenBeachOvergrown.java | 2 +- .../biomes/vanilla/BiomeGenSwampNew.java | 2 +- .../worldgen/WorldGenWaterReeds.java | 6 +++--- .../biomesoplenty/textures/blocks/item_reed.png | Bin 456 -> 456 bytes .../biomesoplenty/textures/blocks/reed.png | Bin 610 -> 610 bytes .../textures/blocks/reedbottom.png | Bin 508 -> 511 bytes 20 files changed, 19 insertions(+), 16 deletions(-) diff --git a/common/biomesoplenty/biomes/BiomeGenBayou.java b/common/biomesoplenty/biomes/BiomeGenBayou.java index 82d385143..fc76813f9 100644 --- a/common/biomesoplenty/biomes/BiomeGenBayou.java +++ b/common/biomesoplenty/biomes/BiomeGenBayou.java @@ -42,7 +42,7 @@ public class BiomeGenBayou extends BiomeGenBase customBiomeDecorator.algaePerChunk = 1; customBiomeDecorator.shrubsPerChunk = 2; customBiomeDecorator.wheatGrassPerChunk = 7; - customBiomeDecorator.waterReedsPerChunk = 3; + customBiomeDecorator.waterReedsPerChunk = 4; customBiomeDecorator.generatePumpkins = false; waterColorMultiplier = 16767282; spawnableWaterCreatureList.clear(); diff --git a/common/biomesoplenty/biomes/BiomeGenBog.java b/common/biomesoplenty/biomes/BiomeGenBog.java index 5752231a6..38d4fb792 100644 --- a/common/biomesoplenty/biomes/BiomeGenBog.java +++ b/common/biomesoplenty/biomes/BiomeGenBog.java @@ -40,7 +40,7 @@ public class BiomeGenBog extends BiomeGenBase customBiomeDecorator.waterLakesPerChunk = 6; customBiomeDecorator.wheatGrassPerChunk = 3; customBiomeDecorator.poisonWaterPerChunk = 2; - customBiomeDecorator.waterReedsPerChunk = 5; + customBiomeDecorator.waterReedsPerChunk = 8; customBiomeDecorator.shrubsPerChunk = 10; customBiomeDecorator.generatePumpkins = false; } diff --git a/common/biomesoplenty/biomes/BiomeGenDeadSwamp.java b/common/biomesoplenty/biomes/BiomeGenDeadSwamp.java index 0028418a3..bd5ee8518 100644 --- a/common/biomesoplenty/biomes/BiomeGenDeadSwamp.java +++ b/common/biomesoplenty/biomes/BiomeGenDeadSwamp.java @@ -32,7 +32,7 @@ public class BiomeGenDeadSwamp extends BiomeGenBase customBiomeDecorator.sandPerChunk2 = -999; customBiomeDecorator.reedsBOPPerChunk = 2; customBiomeDecorator.wheatGrassPerChunk = 10; - customBiomeDecorator.waterReedsPerChunk = 3; + customBiomeDecorator.waterReedsPerChunk = 4; spawnableCreatureList.clear(); spawnableWaterCreatureList.clear(); waterColorMultiplier = 10661201; diff --git a/common/biomesoplenty/biomes/BiomeGenDeciduousForest.java b/common/biomesoplenty/biomes/BiomeGenDeciduousForest.java index 127158732..8df290224 100644 --- a/common/biomesoplenty/biomes/BiomeGenDeciduousForest.java +++ b/common/biomesoplenty/biomes/BiomeGenDeciduousForest.java @@ -30,7 +30,7 @@ public class BiomeGenDeciduousForest extends BiomeGenBase customBiomeDecorator.poisonIvyPerChunk = 1; customBiomeDecorator.wheatGrassPerChunk = 10; customBiomeDecorator.shrubsPerChunk = 10; - customBiomeDecorator.waterReedsPerChunk = 1; + customBiomeDecorator.waterReedsPerChunk = 2; } /** diff --git a/common/biomesoplenty/biomes/BiomeGenDunes.java b/common/biomesoplenty/biomes/BiomeGenDunes.java index 2709d8f6e..6d5012476 100644 --- a/common/biomesoplenty/biomes/BiomeGenDunes.java +++ b/common/biomesoplenty/biomes/BiomeGenDunes.java @@ -25,6 +25,7 @@ public class BiomeGenDunes extends BiomeGenBase customBiomeDecorator.desertSproutsPerChunk = 25; customBiomeDecorator.aloePerChunk = 5; customBiomeDecorator.reedsPerChunk = -999; + customBiomeDecorator.waterReedsPerChunk = 4; customBiomeDecorator.generateLakes = false; } diff --git a/common/biomesoplenty/biomes/BiomeGenFen.java b/common/biomesoplenty/biomes/BiomeGenFen.java index fe4c93bfe..d1261a3bb 100644 --- a/common/biomesoplenty/biomes/BiomeGenFen.java +++ b/common/biomesoplenty/biomes/BiomeGenFen.java @@ -41,7 +41,7 @@ public class BiomeGenFen extends BiomeGenBase customBiomeDecorator.algaePerChunk = 1; customBiomeDecorator.portobellosPerChunk = 1; customBiomeDecorator.wheatGrassPerChunk = 8; - customBiomeDecorator.waterReedsPerChunk = 6; + customBiomeDecorator.waterReedsPerChunk = 10; customBiomeDecorator.shrubsPerChunk = 7; spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3)); } diff --git a/common/biomesoplenty/biomes/BiomeGenLushSwamp.java b/common/biomesoplenty/biomes/BiomeGenLushSwamp.java index eb62c358e..0ab049e50 100644 --- a/common/biomesoplenty/biomes/BiomeGenLushSwamp.java +++ b/common/biomesoplenty/biomes/BiomeGenLushSwamp.java @@ -34,7 +34,7 @@ public class BiomeGenLushSwamp extends BiomeGenBase customBiomeDecorator.poisonWaterPerChunk = 2; customBiomeDecorator.carrotsPerChunk = 1; customBiomeDecorator.shrubsPerChunk = 5; - customBiomeDecorator.waterReedsPerChunk = 5; + customBiomeDecorator.waterReedsPerChunk = 6; spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 1, 1, 1)); } diff --git a/common/biomesoplenty/biomes/BiomeGenMangrove.java b/common/biomesoplenty/biomes/BiomeGenMangrove.java index 8d4f1e487..1062c124a 100644 --- a/common/biomesoplenty/biomes/BiomeGenMangrove.java +++ b/common/biomesoplenty/biomes/BiomeGenMangrove.java @@ -27,7 +27,7 @@ public class BiomeGenMangrove extends BiomeGenBase customBiomeDecorator.deadGrassPerChunk = 9; customBiomeDecorator.reedsPerChunk = -999; customBiomeDecorator.cactiPerChunk = -999; - customBiomeDecorator.waterReedsPerChunk = 4; + customBiomeDecorator.waterReedsPerChunk = 2; customBiomeDecorator.desertSproutsPerChunk = 1; customBiomeDecorator.waterLakesPerChunk = 10; } diff --git a/common/biomesoplenty/biomes/BiomeGenQuagmire.java b/common/biomesoplenty/biomes/BiomeGenQuagmire.java index 0ec82dc3c..328d39c8e 100644 --- a/common/biomesoplenty/biomes/BiomeGenQuagmire.java +++ b/common/biomesoplenty/biomes/BiomeGenQuagmire.java @@ -31,7 +31,7 @@ public class BiomeGenQuagmire extends BiomeGenBase customBiomeDecorator.sandPerChunk = -999; customBiomeDecorator.sandPerChunk2 = -999; customBiomeDecorator.wheatGrassPerChunk = 3; - customBiomeDecorator.waterReedsPerChunk = 1; + customBiomeDecorator.waterReedsPerChunk = 2; waterColorMultiplier = 13390080; customBiomeDecorator.generateQuagmire = true; } diff --git a/common/biomesoplenty/biomes/BiomeGenShield.java b/common/biomesoplenty/biomes/BiomeGenShield.java index d2a4639da..364cc9450 100644 --- a/common/biomesoplenty/biomes/BiomeGenShield.java +++ b/common/biomesoplenty/biomes/BiomeGenShield.java @@ -29,6 +29,7 @@ public class BiomeGenShield extends BiomeGenBase customBiomeDecorator.gravelPerChunk = 6; customBiomeDecorator.gravelPerChunk2 = 6; customBiomeDecorator.shrubsPerChunk = 4; + customBiomeDecorator.waterReedsPerChunk = 4; customBiomeDecorator.generateStoneInGrass2 = true; } diff --git a/common/biomesoplenty/biomes/BiomeGenSilkglades.java b/common/biomesoplenty/biomes/BiomeGenSilkglades.java index 1c6d4e314..551a417dd 100644 --- a/common/biomesoplenty/biomes/BiomeGenSilkglades.java +++ b/common/biomesoplenty/biomes/BiomeGenSilkglades.java @@ -39,7 +39,7 @@ public class BiomeGenSilkglades extends BiomeGenBase customBiomeDecorator.sproutsPerChunk = 2; customBiomeDecorator.poisonIvyPerChunk = 2; customBiomeDecorator.cobwebsPerChunk = 9; - customBiomeDecorator.waterReedsPerChunk = 3; + customBiomeDecorator.waterReedsPerChunk = 4; customBiomeDecorator.generatePumpkins = true; waterColorMultiplier = 16777079; spawnableWaterCreatureList.clear(); diff --git a/common/biomesoplenty/biomes/BiomeGenSludgepit.java b/common/biomesoplenty/biomes/BiomeGenSludgepit.java index 44852264b..29112003c 100644 --- a/common/biomesoplenty/biomes/BiomeGenSludgepit.java +++ b/common/biomesoplenty/biomes/BiomeGenSludgepit.java @@ -39,7 +39,7 @@ public class BiomeGenSludgepit extends BiomeGenBase customBiomeDecorator.deadBushPerChunk = 5; customBiomeDecorator.algaePerChunk = 2; customBiomeDecorator.poisonWaterPerChunk = 5; - customBiomeDecorator.waterReedsPerChunk = 4; + customBiomeDecorator.waterReedsPerChunk = 6; spawnableCreatureList.add(new SpawnListEntry(EntitySlime.class, 1, 1, 1)); waterColorMultiplier = 11506176; } diff --git a/common/biomesoplenty/biomes/BiomeGenTimber.java b/common/biomesoplenty/biomes/BiomeGenTimber.java index dca99a124..1c3dce9f7 100644 --- a/common/biomesoplenty/biomes/BiomeGenTimber.java +++ b/common/biomesoplenty/biomes/BiomeGenTimber.java @@ -27,6 +27,7 @@ public class BiomeGenTimber extends BiomeGenBase customBiomeDecorator.thornsPerChunk = 2; customBiomeDecorator.flowersPerChunk = -999; customBiomeDecorator.toadstoolsPerChunk = 2; + customBiomeDecorator.waterReedsPerChunk = 2; customBiomeDecorator.shrubsPerChunk = 10; } diff --git a/common/biomesoplenty/biomes/BiomeGenWetland.java b/common/biomesoplenty/biomes/BiomeGenWetland.java index ace1a0218..2954f9d28 100644 --- a/common/biomesoplenty/biomes/BiomeGenWetland.java +++ b/common/biomesoplenty/biomes/BiomeGenWetland.java @@ -45,7 +45,7 @@ public class BiomeGenWetland extends BiomeGenBase customBiomeDecorator.portobellosPerChunk = 1; customBiomeDecorator.berryBushesPerChunk = 1; customBiomeDecorator.shrubsPerChunk = 10; - customBiomeDecorator.waterReedsPerChunk = 7; + customBiomeDecorator.waterReedsPerChunk = 8; spawnableCreatureList.clear(); spawnableWaterCreatureList.clear(); spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3)); diff --git a/common/biomesoplenty/biomes/beach/BiomeGenBeachOvergrown.java b/common/biomesoplenty/biomes/beach/BiomeGenBeachOvergrown.java index 365028184..0ade26a50 100644 --- a/common/biomesoplenty/biomes/beach/BiomeGenBeachOvergrown.java +++ b/common/biomesoplenty/biomes/beach/BiomeGenBeachOvergrown.java @@ -26,7 +26,7 @@ public class BiomeGenBeachOvergrown extends BiomeGenBase customBiomeDecorator.duneGrassPerChunk = 25; customBiomeDecorator.cactiPerChunk = 5; customBiomeDecorator.outbackPerChunk = 7; - customBiomeDecorator.waterReedsPerChunk = 6; + customBiomeDecorator.waterReedsPerChunk = 4; } /** diff --git a/common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java b/common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java index cd2c1c930..5f5d74c5e 100644 --- a/common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java +++ b/common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java @@ -39,7 +39,7 @@ public class BiomeGenSwampNew extends BiomeGenBase customBiomeDecorator.mudPerChunk = 9; customBiomeDecorator.mudPerChunk2 = 9; customBiomeDecorator.portobellosPerChunk = 1; - customBiomeDecorator.waterReedsPerChunk = 5; + customBiomeDecorator.waterReedsPerChunk = 4; waterColorMultiplier = 14745456; spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 1, 1, 1)); } diff --git a/common/biomesoplenty/worldgen/WorldGenWaterReeds.java b/common/biomesoplenty/worldgen/WorldGenWaterReeds.java index a2e6f5e59..d0d091961 100644 --- a/common/biomesoplenty/worldgen/WorldGenWaterReeds.java +++ b/common/biomesoplenty/worldgen/WorldGenWaterReeds.java @@ -14,11 +14,11 @@ public class WorldGenWaterReeds extends WorldGenerator { for (int var6 = 0; var6 < 64; ++var6) { - int var7 = par3 + par2Random.nextInt(4) - par2Random.nextInt(4); + int var7 = par3 + par2Random.nextInt(8) - par2Random.nextInt(8); int var8 = par4 + par2Random.nextInt(4) - par2Random.nextInt(4); - int var9 = par5 + par2Random.nextInt(4) - par2Random.nextInt(4); + int var9 = par5 + par2Random.nextInt(8) - par2Random.nextInt(8); - if (par1World.isAirBlock(var7, var8, var9) && par1World.getBlockId(var7, var8 - 1, var9) == Block.waterStill.blockID) + if (par1World.isAirBlock(var7, var8, var9) && par1World.getBlockId(var7, var8 - 1, var9) == Block.waterStill.blockID && par1World.getBlockId(var7, var8 - 2, var9) != Block.waterStill.blockID) { par1World.setBlock(var7, var8, var9, Blocks.plants.get().blockID, 14, 2); } diff --git a/resources/assets/biomesoplenty/textures/blocks/item_reed.png b/resources/assets/biomesoplenty/textures/blocks/item_reed.png index 316de252c2fcc0892786b6eaedf60d292a4b7c3b..d60c1118877b014d5fdef828d2ad65e85ed824fa 100644 GIT binary patch delta 357 zcmV-r0h<2E1IPoAJPN=701m(bYSxJfkw!FsWvB0dD3f7Er45`-G%!#X`47^#dv^T) z^DAPAHvney(WROH&+Wi8Zo~S2-@K&%=QpQjmwW$jPPhKg&cN`0N{I{D zfSI*{|0frl|3AMW1stG8nqt^B=Lf6**Ai#=uO`Is-#~`pzo{I<|A{4@|I4EE{wqrX z!(cWo z_jlwFZvf2Zt6MAo-#b(Pe_@mB|AJ8Y|GsA2#2Esz`N96;|M4EO|3QZ31WNzEf3yN@ z2vi9s*g7Q@ED57$)dl^(w5jaBrGf1Kb^SqLdSRpM|NAGa|F7)}#5BmxRPBFPuH%1y z5Dn7Ym}>c7Mws<~xP#dLbRW_G=hhYdzkj$C93Ivt3fNt;xIOy+-ZbfDM2& zgZ!={!}ot#YuJA`TRp;>&;iI05N&O&OuVK61PlxSQ?sdn7_>yx00000NkvXXu0mjf DrEIT2sdpBaF_)78&q Iol`;+0LAPO)c^nh delta 53 zcmaFF@`z=E4c7q%2EGG~S=Tx_C%RcOKAza1&NN?UO!%=kwz(hdr3q=R5(w?QQJ! zphzi5X|YfR3WZWpl)D7c1Y`8UnE2?&@(E*R)-4iwF+O;b$vHds-4!^T+#VoL>Jhke zB+`htp-OsC3c#QmBkgED7+YaChwywO!^gBl&ZfQ((`MXFMt! zphzi5X|YfR3WZWZl)D7c1Y`8UnE2?&j+t4vNaTh1;7KOu?A&)(;BayWfIO{7;NFo) zBi=_U>0v1V!)lDQqxoQBh20#&%dHHbvl2O*`XS7kaW@(HZJ>Z9dq`K4>+|A?eL{zS zZZQO%GMn()XH(6z2(}g=!?Tgtf~$N8&W|_d4G?N%4S3Kz6T#6$xRAEN%Cc+SSy5s~ z4-(JXsRbs~R3F$mKRjG3r&UlFmhON*OH-8h(Ozv z0pm(+m;C9YO&B*-ifM6?H9*`{(&Ws4oq8b=^njTSK;O=iE@nc+7)PdjGXa_C&b-06 zl?R-P8jF$h(jHAmjmbC}HNsTc7vk2!^QcS*Bjtz3PQguT80;GnhU_KHoBWKq;OilD ziM{^Qph%3@Kt}L9z8!&YvG6e8C?uJWKjbd}z@KcXa}`_aT*dwyg75_+S62iOQ_f^S P00000NkvXXu0mjfm_EtI