From b1de30e5b9c63fd45d43dbf556a4f418ee0556fd Mon Sep 17 00:00:00 2001
From: Forstride <forstride@gmail.com>
Date: Mon, 26 Nov 2018 00:41:59 -0500
Subject: [PATCH] Changed redwood leaves to be evergreen, tweaked redwood
 forest height variation

---
 .../biome/overworld/BiomeGenRedwoodForest.java  |   6 ++++--
 .../common/block/BlockBOPLeaves.java            |   4 ++--
 .../textures/blocks/leaves_redwood.png          | Bin 462 -> 459 bytes
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRedwoodForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRedwoodForest.java
index db36f80c9..6337b203a 100644
--- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRedwoodForest.java
+++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenRedwoodForest.java
@@ -42,7 +42,7 @@ public class BiomeGenRedwoodForest extends BOPOverworldBiome
         this.type = type;
         
         // terrain
-        this.terrainSettings.avgHeight(70).heightVariation(2, 4);
+        this.terrainSettings.avgHeight(70).heightVariation(4, 10);
         
         this.topBlock = Blocks.DIRT.getDefaultState().withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.PODZOL);
         this.usualTopBlock = this.topBlock;
@@ -84,6 +84,7 @@ public class BiomeGenRedwoodForest extends BOPOverworldBiome
         //this.addGenerator("shrubs", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.1F).with(BOPPlants.SHRUB).create());
         this.addGenerator("dead_leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.1F).placeOn(BlockQueries.fertile).with(BOPPlants.DEADLEAFPILE).create());
         this.addGenerator("leaf_piles", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.2F).placeOn(BlockQueries.fertile).with(BOPPlants.LEAFPILE).generationAttempts(64).create());
+        this.addGenerator("sprouts", GeneratorStage.FLOWERS,(new GeneratorFlora.Builder()).amountPerChunk(0.25F).with(BOPPlants.SPROUT).create());
         
         // shrooms
         this.addGenerator("brown_mushrooms", GeneratorStage.SHROOM,(new GeneratorFlora.Builder()).amountPerChunk(0.2F).generationAttempts(16).with(Blocks.BROWN_MUSHROOM.getDefaultState()).create());
@@ -92,7 +93,8 @@ public class BiomeGenRedwoodForest extends BOPOverworldBiome
         // grasses
         GeneratorWeighted grassGenerator = new GeneratorWeighted(4.0F);
         this.addGenerator("grass", GeneratorStage.GRASS, grassGenerator);
-        grassGenerator.add("fern", 1, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.FERN).create());
+        grassGenerator.add("fern", 8, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.FERN).create());
+        grassGenerator.add("tallgrass", 2, (new GeneratorGrass.Builder()).with(BlockTallGrass.EnumType.GRASS).generationAttempts(128).create());
         
         // gem
         this.addGenerator("amber", GeneratorStage.SAND, (new GeneratorOreSingle.Builder()).amountPerChunk(12).with(BOPGems.AMBER).create());
diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java b/src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java
index d30a69fad..6abea7a5e 100644
--- a/src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java
+++ b/src/main/java/biomesoplenty/common/block/BlockBOPLeaves.java
@@ -114,11 +114,11 @@ public class BlockBOPLeaves extends BlockLeaves implements IBOPBlock
     {
         switch (tree)
         {
-            case BAMBOO: case UMBRAN: case DEAD: case ETHEREAL: case FIR: case HELLBARK: case JACARANDA: case MAGIC: case MAPLE: case ORANGE_AUTUMN: case ORIGIN: case PINK_CHERRY: case WHITE_CHERRY: case YELLOW_AUTUMN: case RED_BIG_FLOWER: case YELLOW_BIG_FLOWER:
+            case BAMBOO: case UMBRAN: case DEAD: case ETHEREAL: case FIR: case HELLBARK: case JACARANDA: case MAGIC: case MAPLE: case ORANGE_AUTUMN: case ORIGIN: case PINK_CHERRY: case REDWOOD: case WHITE_CHERRY: case YELLOW_AUTUMN: case RED_BIG_FLOWER: case YELLOW_BIG_FLOWER:
             return ColoringType.PLAIN;
             case FLOWERING:
                 return ColoringType.OVERLAY;
-            case MAHOGANY: case MANGROVE: case PALM: case PINE: case REDWOOD: case SACRED_OAK: case WILLOW: case EBONY: case EUCALYPTUS: default:
+            case MAHOGANY: case MANGROVE: case PALM: case PINE: case SACRED_OAK: case WILLOW: case EBONY: case EUCALYPTUS: default:
             return ColoringType.TINTED;
         }
     }
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_redwood.png b/src/main/resources/assets/biomesoplenty/textures/blocks/leaves_redwood.png
index 8e988aa6af251916a528b285224e25f73ec52864..ef866c1c7c2f88a98cd2ce0c05d550401ad56579 100644
GIT binary patch
delta 409
zcmV;K0cQTr1Iq)DJb%Cd01m(bYSxJf0000ObVXQnQ*UN;cVTj60B~VxZgehgWpp4k
zE-@}N6F_Lh0003=Nkl<ZI8R-ZTUr7!424;UqP_wu!!xL#w_$Jt%4G>&MpohHb;ou7
zq^Go;m$d0gdXlug<>xH)It;H5&7R&LnH3iA6ZhZs&7RMXi+^)-G;LLo1O*FcwI^SG
z&BExmAL^H}pX=c9V;WE}f31w5v(@*7?eR-t(@qj6!ANgaK-K2&(heyRWqB|htbrgT
zv96z862Z!jRVle&stsg@#Lep;mm7~vYFt_}Y#H3iqlx<sgoGme^Z*}CBMJNAjZdwB
zoT^n;V6TaRLVpRMQE{0-5I2g9EqFL+j!IC6*S|gmU_sIU)QuWTIi@h5xoTC{X(%=a
zFP7x$U3Bj{EGwB18FQ{e&p9<-^?BCa+h1&bO;Y*AO~9dt#I1v?gG3OSoAa?roqa?-
zS;<qfJQxM~K==Ulr~Uq~8$X=bKEG9DtUg!MR^cD-?-KR8=FD`{00000NkvXXu0mjf
Dd0)JV

delta 412
zcmV;N0b~Bl1I`1GJb%Fe01m+cxRGn^0000PbVXQnQ*UN;cVTj60B~VxZgehgWpp4k
zE-)@KG4UX2l>h(%OG!jQR5(v%lWUHHFbssbV^!MnkhoA=0vrUyyO+!E=VhYMoj;Q}
zwlkhUGLEB9esR5Cjk7E>7TUJ8{p0a4F3a+CZUN`qDM?VVP=6GK?Wbw-x7*FXUa!A%
z9rS(gQSg4h{r!HoSf1y8Sr#iGE`?3gSd4W5MRi?!RDC`lJ7h$Z#l_^n28xix`uThs
z@B1DUz#4_7u`<{|XOg&iUDuN|q#jFa25V#k@-Xq+K$1{I91n<L8co=zX?n^xD5zP*
z0(-p}IE?`?>VH@UP&Ci8S2BFcLn@|e1UbBITS%fv@nIN@8OIdHZ_Z7yT*pv2245`A
z<=qiZ5;?DCl1U=Zj8du4=NydJd<67tth=tWHBA-&XB?gNA#v;FatR4~Z*GpCP3r7N
z#6UKZr)F_63W#ew!2IEZ`~K^ys<M52tCC^NrkQij{}liX<xxn!ABs%?0000<MNUMn
GLSTZr<h>XG