From 88baea8581f4fa58eaa29e118bd8c9cf6f777432 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Fri, 20 Sep 2013 19:16:51 -0400 Subject: [PATCH] Tweaked moss generation and texture --- .../biomesoplenty/biomes/BiomeGenGrassland.java | 2 +- .../biomes/BiomeGenMapleWoods.java | 2 +- .../biomes/BiomeGenOminousWoods.java | 2 +- .../biomesoplenty/biomes/BiomeGenThicket.java | 2 +- .../biomes/vanilla/BiomeGenHillsNew.java | 2 +- .../biomes/vanilla/BiomeGenSwampNew.java | 2 +- .../biomes/vanilla/BiomeGenTaigaNew.java | 2 +- .../configfile/BOPConfigurationBiomeGen.java | 2 +- common/biomesoplenty/worldgen/WorldGenMoss.java | 7 ++++++- .../biomesoplenty/textures/blocks/item_moss.png | Bin 402 -> 398 bytes .../biomesoplenty/textures/blocks/moss.png | Bin 432 -> 777 bytes 11 files changed, 14 insertions(+), 9 deletions(-) diff --git a/common/biomesoplenty/biomes/BiomeGenGrassland.java b/common/biomesoplenty/biomes/BiomeGenGrassland.java index d647cfb4f..d7e50c926 100644 --- a/common/biomesoplenty/biomes/BiomeGenGrassland.java +++ b/common/biomesoplenty/biomes/BiomeGenGrassland.java @@ -28,7 +28,7 @@ public class BiomeGenGrassland extends BiomeGenBase customBiomeDecorator.treesPerChunk = -999; customBiomeDecorator.flowersPerChunk = -999; customBiomeDecorator.grassPerChunk = 2; - customBiomeDecorator.wheatGrassPerChunk = 0; + customBiomeDecorator.wheatGrassPerChunk = 1; customBiomeDecorator.reedsPerChunk = 35; customBiomeDecorator.mushroomsPerChunk = 20; customBiomeDecorator.sandPerChunk = -999; diff --git a/common/biomesoplenty/biomes/BiomeGenMapleWoods.java b/common/biomesoplenty/biomes/BiomeGenMapleWoods.java index a6780f670..489f900a1 100644 --- a/common/biomesoplenty/biomes/BiomeGenMapleWoods.java +++ b/common/biomesoplenty/biomes/BiomeGenMapleWoods.java @@ -20,7 +20,7 @@ public class BiomeGenMapleWoods extends BiomeGenBase customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; customBiomeDecorator.treesPerChunk = 9; customBiomeDecorator.grassPerChunk = 1; - customBiomeDecorator.wheatGrassPerChunk = 0; + customBiomeDecorator.wheatGrassPerChunk = 1; customBiomeDecorator.violetsPerChunk = 1; customBiomeDecorator.poisonIvyPerChunk = 1; } diff --git a/common/biomesoplenty/biomes/BiomeGenOminousWoods.java b/common/biomesoplenty/biomes/BiomeGenOminousWoods.java index ece3a7cb9..baf51bc23 100644 --- a/common/biomesoplenty/biomes/BiomeGenOminousWoods.java +++ b/common/biomesoplenty/biomes/BiomeGenOminousWoods.java @@ -27,7 +27,7 @@ public class BiomeGenOminousWoods extends BiomeGenBase customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; customBiomeDecorator.treesPerChunk = 10; customBiomeDecorator.grassPerChunk = 1; - customBiomeDecorator.wheatGrassPerChunk = 0; + customBiomeDecorator.wheatGrassPerChunk = 1; customBiomeDecorator.flowersPerChunk = -999; customBiomeDecorator.deathbloomsPerChunk = 1; customBiomeDecorator.mushroomsPerChunk = 8; diff --git a/common/biomesoplenty/biomes/BiomeGenThicket.java b/common/biomesoplenty/biomes/BiomeGenThicket.java index 9a7f31d44..89be45db0 100644 --- a/common/biomesoplenty/biomes/BiomeGenThicket.java +++ b/common/biomesoplenty/biomes/BiomeGenThicket.java @@ -17,7 +17,7 @@ public class BiomeGenThicket extends BiomeGenBase customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; customBiomeDecorator.treesPerChunk = 17; customBiomeDecorator.grassPerChunk = 1; - customBiomeDecorator.wheatGrassPerChunk = 0; + customBiomeDecorator.wheatGrassPerChunk = 1; customBiomeDecorator.thornsPerChunk = 25; } diff --git a/common/biomesoplenty/biomes/vanilla/BiomeGenHillsNew.java b/common/biomesoplenty/biomes/vanilla/BiomeGenHillsNew.java index 429c82841..b2d50cc75 100644 --- a/common/biomesoplenty/biomes/vanilla/BiomeGenHillsNew.java +++ b/common/biomesoplenty/biomes/vanilla/BiomeGenHillsNew.java @@ -21,7 +21,7 @@ public class BiomeGenHillsNew extends BiomeGenBase theBiomeDecorator = new BiomeDecoratorBOP(this); customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; customBiomeDecorator.treesPerChunk = 1; - customBiomeDecorator.wheatGrassPerChunk = 0; + customBiomeDecorator.wheatGrassPerChunk = 1; customBiomeDecorator.violetsPerChunk = 5; theWorldGenerator = new WorldGenMinable(Block.silverfish.blockID, 8); } diff --git a/common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java b/common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java index 3d7740431..12e0c530b 100644 --- a/common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java +++ b/common/biomesoplenty/biomes/vanilla/BiomeGenSwampNew.java @@ -35,7 +35,7 @@ public class BiomeGenSwampNew extends BiomeGenBase customBiomeDecorator.reedsPerChunk = 10; customBiomeDecorator.clayPerChunk = 1; customBiomeDecorator.waterlilyPerChunk = 4; - customBiomeDecorator.wheatGrassPerChunk = 0; + customBiomeDecorator.wheatGrassPerChunk = 1; customBiomeDecorator.mudPerChunk = 9; customBiomeDecorator.mudPerChunk2 = 9; customBiomeDecorator.portobellosPerChunk = 1; diff --git a/common/biomesoplenty/biomes/vanilla/BiomeGenTaigaNew.java b/common/biomesoplenty/biomes/vanilla/BiomeGenTaigaNew.java index 9584ea47f..45fa2d22c 100644 --- a/common/biomesoplenty/biomes/vanilla/BiomeGenTaigaNew.java +++ b/common/biomesoplenty/biomes/vanilla/BiomeGenTaigaNew.java @@ -27,7 +27,7 @@ public class BiomeGenTaigaNew extends BiomeGenBase customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator; customBiomeDecorator.treesPerChunk = 10; customBiomeDecorator.grassPerChunk = 1; - customBiomeDecorator.wheatGrassPerChunk = 0; + customBiomeDecorator.wheatGrassPerChunk = 1; customBiomeDecorator.violetsPerChunk = 1; } diff --git a/common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java b/common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java index 7a0e39c84..b8be3352e 100644 --- a/common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java +++ b/common/biomesoplenty/configuration/configfile/BOPConfigurationBiomeGen.java @@ -157,7 +157,7 @@ public class BOPConfigurationBiomeGen hotSpringsGen = config.get("Biomes To Generate", "HotSprings", true).getBoolean(false); icyHillsGen = config.get("Biomes To Generate", "IcyHills", true).getBoolean(false); jadeCliffsGen = config.get("Biomes To Generate", "JadeCliffs", true).getBoolean(false); - lavenderFieldsGen = config.get("Biomes To Generate", "LavenderFields", true).getBoolean(false); + lavenderFieldsGen = config.get("Biomes To Generate", "LavenderFields", false).getBoolean(false); lushDesertGen = config.get("Biomes To Generate", "LushDesert", true).getBoolean(false); lushSwampGen = config.get("Biomes To Generate", "LushSwamp", true).getBoolean(false); mangroveGen = config.get("Biomes To Generate", "Mangrove", true).getBoolean(false); diff --git a/common/biomesoplenty/worldgen/WorldGenMoss.java b/common/biomesoplenty/worldgen/WorldGenMoss.java index 5733be530..a5061a254 100644 --- a/common/biomesoplenty/worldgen/WorldGenMoss.java +++ b/common/biomesoplenty/worldgen/WorldGenMoss.java @@ -23,7 +23,12 @@ public class WorldGenMoss extends WorldGenerator { if (Blocks.moss.get().canPlaceBlockOnSide(par1World, par3, par4, par5, var8)) { - par1World.setBlock(par3, par4, par5, Blocks.moss.get().blockID, 1 << Direction.facingToDirection[Facing.oppositeSide[var8]], 2); + int var999 = par2Random.nextInt(2); + + if (var999 == 0) + { + par1World.setBlock(par3, par4, par5, Blocks.moss.get().blockID, 1 << Direction.facingToDirection[Facing.oppositeSide[var8]], 2); + } break; } } diff --git a/resources/assets/biomesoplenty/textures/blocks/item_moss.png b/resources/assets/biomesoplenty/textures/blocks/item_moss.png index 6384ae421ca0912dfc40fd2a2e06473a53a794b6..8455c9d31ef1ae3945637ff503bdff79e51c7cc9 100644 GIT binary patch delta 318 zcmV-E0m1%~1C9fbJPNx201mqW$N1DXkwzhZF-P-4Hvj+u3Q0skR5(v#7y&@UO7K6F zNj!jQ0?|Q}tp6kPK{Q?fQWVnY0@f5zZ};E1!1%vkoh_JelBfzd3@ZRhdX$=jHHA-i z02}04ZSmi)&-}l8r5RWZrvV^|z-EX4!IN$N2Q@nW_o}h{?^tZ`-@U~Ae^86#e}`g! z{r|qTHve6Ujqw{2-01Y*F3aG*Z@tZb?+R;h7}#X${P(G|{vR>J5x-`?DhIIhL9TGj zh0yldhW}k#_5PcusQvY}! z-rXku-HOd{8vv7lu_I?Xp@=yEy$0hcV*q3cWKHPe$b6yzx&ct;paBdF01lv+;oJ)L Q!2kdN07*qoM6N<$f-6y<+W-In delta 322 zcmV-I0lof?1Cj%fJPN!301mtXmArCEkwzhZFfjCTp#T5@4oO5oR5(x7P|HrjKospS zxOd~ikRZy`p`9`<&=ynTH@Gq(8bFL#48AC7^uLe2V_Qek!dA~_&ONU*HU0+<vtuxK+e9gJ&?cZ{tGaSFWZQh U&1h%#cmMzZ07*qoM6N<$g8Sl?2mk;8 diff --git a/resources/assets/biomesoplenty/textures/blocks/moss.png b/resources/assets/biomesoplenty/textures/blocks/moss.png index 19df3c12d5979d7a5560cbc1e94f6d61e8a5042c..36c7d6f9b1ed36004af7af1789e425f4e4d56f13 100644 GIT binary patch delta 703 zcmV;w0zmz+1BnKZB#|)~3cvsW4!{9w)`UjSE(Z}c6O2&A0Jo4 z!^3X?h7pj!_A<=?*4KR>e8J!slu8jC92kGlv>*1Fe7IsfK95Qz3DXQxg(xmBOGIf| z0y$xA&5NTW1KZmnp~O@LU|?WCZEdYc#e6=Dv$GuOv4i{jV>B9hWHL*{c?MHcQzZ19 zoO5C(vj~sJ^VWfBhNLpvOy~8rh3DrcEGsVJa%Yy6#?4I?k;t6H@>HY){$#U${G;n@iLaSASuKURTP3HvyTz}Vq`LIzeMsaeoMH~Ypk`IT61_f_Z za11XmO#-Qd$K7n^vA>@tx={g<(9n=dCg-V(A|4;lDESYnRgKQp z5C}|@xc>JJ91e#p-Y|cjfYq{hN zfwT%^WMt&6gLr&F4ojuD2**jhr$;0cd3tJmxP8IkXZtb<0BgXGiHQlj&Gsi^Fn-o9 lmrM2c_e*@6_Tb>4`U|+jTBl1wiVFY$002ovPDHLkV1l`aRPO)) delta 353 zcmV-n0iOPe2CxH=Bnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wA%8G1^m3s900AFK zL_t(IPnDDFii0o^Mtw<9L@A0?rHCMke?*Gnb7wtMCyk`tWe1hKnx?S{K%7Li zC3xW4f)_X-_Iy4iK7Y@%Da+E+SP*wzX9aZKw$1wEI9i*DFL%-Ry&Qq@bzEM8HBFQF zXxPEE1u8P0cBB|Sdr=fu@d1TT^L5Jzv3UWiKOPS&(CP9#H(8c>#V&Bp%h?X}2-?I$ zZ}}VUdA%Y8Sj)2fT7-+$JJOu!U@`3A)YS)&00000NkvXXu0mjf+asm4