From c96b41702ba4e2329970ac12ae7af7d3430a2d2b Mon Sep 17 00:00:00 2001 From: Forstride Date: Sun, 11 Mar 2018 12:35:16 -0400 Subject: [PATCH] Tweaked the Tundra biome and temperatures for a few biomes. Improved cattail texture --- .../common/biome/overworld/BiomeGenAlps.java | 2 +- .../common/biome/overworld/BiomeGenBayou.java | 2 +- .../biome/overworld/BiomeGenColdDesert.java | 2 +- .../overworld/BiomeGenEucalyptusForest.java | 2 +- .../biome/overworld/BiomeGenFlowerIsland.java | 2 +- .../common/biome/overworld/BiomeGenMeadow.java | 2 +- .../biome/overworld/BiomeGenMysticGrove.java | 2 +- .../common/biome/overworld/BiomeGenOutback.java | 2 +- .../common/biome/overworld/BiomeGenShield.java | 2 +- .../biome/overworld/BiomeGenTropicalIsland.java | 2 +- .../overworld/BiomeGenTropicalRainforest.java | 2 +- .../common/biome/overworld/BiomeGenTundra.java | 11 ++--------- .../biome/overworld/BiomeGenWhiteBeach.java | 2 +- .../biome/overworld/BiomeGenXericShrubland.java | 2 +- .../biomesoplenty/textures/blocks/cattail.png | Bin 449 -> 448 bytes .../textures/blocks/tall_cattail_lower.png | Bin 502 -> 426 bytes .../textures/blocks/tall_cattail_upper.png | Bin 454 -> 446 bytes 17 files changed, 15 insertions(+), 22 deletions(-) diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java index 9eaa4f997..70cd9942a 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenAlps.java @@ -42,7 +42,7 @@ public class BiomeGenAlps extends BOPOverworldBiome public BiomeGenAlps(AlpsType type) { - super(type.name().toLowerCase(), new PropsBuilder(CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, type.toString())).withGuiColour(13421772).withSnowEnabled().withTemperature(-0.5F).withRainfall(0.3F)); + super(type.name().toLowerCase(), new PropsBuilder(CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, type.toString())).withGuiColour(13421772).withSnowEnabled().withTemperature(-0.25F).withRainfall(0.3F)); this.type = type; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java index b23211bc6..e6ca864e3 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenBayou.java @@ -45,7 +45,7 @@ public class BiomeGenBayou extends BOPOverworldBiome public BiomeGenBayou() { - super("bayou", new PropsBuilder("Bayou").withGuiColour(0x7DAD51).withTemperature(0.85F).withRainfall(0.9F).withWaterColor(0xFFD932)); + super("bayou", new PropsBuilder("Bayou").withGuiColour(0x7DAD51).withTemperature(0.95F).withRainfall(0.9F).withWaterColor(0xFFD932)); // terrain this.terrainSettings.avgHeight(62).heightVariation(6, 3).octaves(1, 1, 1, 1, 0, 0).sidewaysNoise(0.0F); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdDesert.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdDesert.java index 51cdc243f..fee0da2f2 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdDesert.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenColdDesert.java @@ -39,7 +39,7 @@ public class BiomeGenColdDesert extends BOPOverworldBiome public BiomeGenColdDesert() { - super("cold_desert", new PropsBuilder("Cold Desert").withGuiColour(0xB3AF9B).withTemperature(0.25F).withRainfall(0.0F).withRainDisabled()); + super("cold_desert", new PropsBuilder("Cold Desert").withGuiColour(0xB3AF9B).withTemperature(0.2F).withRainfall(0.0F).withRainDisabled()); this.canSpawnInBiome = false; this.canGenerateVillages = false; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java index a2d1e30a6..75d02abc9 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenEucalyptusForest.java @@ -35,7 +35,7 @@ public class BiomeGenEucalyptusForest extends BOPOverworldBiome public BiomeGenEucalyptusForest() { - super("eucalyptus_forest", new PropsBuilder("Eucalyptus Forest").withGuiColour(0x9DCC70).withTemperature(0.85F).withRainfall(0.9F)); + super("eucalyptus_forest", new PropsBuilder("Eucalyptus Forest").withGuiColour(0x9DCC70).withTemperature(0.95F).withRainfall(0.9F)); // terrain this.terrainSettings.avgHeight(64).heightVariation(10, 20); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerIsland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerIsland.java index a829230f2..fe9d66950 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerIsland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenFlowerIsland.java @@ -39,7 +39,7 @@ public class BiomeGenFlowerIsland extends BOPOverworldBiome public BiomeGenFlowerIsland() { - super("flower_island", new PropsBuilder("Flower Island").withGuiColour(0x74D374).withTemperature(0.85F).withRainfall(0.8F)); + super("flower_island", new PropsBuilder("Flower Island").withGuiColour(0x74D374).withTemperature(0.8F).withRainfall(0.8F)); // terrain this.terrainSettings.avgHeight(70).heightVariation(10, 15).octaves(0, 0, 1, 1, 2, 2); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java index 3f4c1def2..301a89260 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMeadow.java @@ -32,7 +32,7 @@ public class BiomeGenMeadow extends BOPOverworldBiome { public BiomeGenMeadow() { - super("meadow", new PropsBuilder("Meadow").withGuiColour(0x63B26D).withTemperature(0.45F).withRainfall(0.7F)); + super("meadow", new PropsBuilder("Meadow").withGuiColour(0x63B26D).withTemperature(0.4F).withRainfall(0.7F)); // terrain this.terrainSettings.avgHeight(64).heightVariation(5, 5).octaves(0, 1, 2, 2, 1, 0).sidewaysNoise(0.1D); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java index 87cff2a82..9b15fa07f 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenMysticGrove.java @@ -50,7 +50,7 @@ public class BiomeGenMysticGrove extends BOPOverworldBiome public BiomeGenMysticGrove() { - super("mystic_grove", new PropsBuilder("Mystic Grove").withGuiColour(0x69CFDB).withTemperature(0.6F).withRainfall(0.8F).withWaterColor(0xFF107A)); + super("mystic_grove", new PropsBuilder("Mystic Grove").withGuiColour(0x69CFDB).withTemperature(0.7F).withRainfall(0.8F).withWaterColor(0xFF107A)); // terrain this.terrainSettings.avgHeight(63).heightVariation(5, 20); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java index da5da7c49..dfd730de4 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOutback.java @@ -35,7 +35,7 @@ public class BiomeGenOutback extends BOPOverworldBiome { public BiomeGenOutback() { - super("outback", new PropsBuilder("Outback").withGuiColour(0xA57644).withTemperature(1.5F).withRainfall(0.05F).withRainDisabled()); + super("outback", new PropsBuilder("Outback").withGuiColour(0xA57644).withTemperature(2.0F).withRainfall(0.05F).withRainDisabled()); // terrain this.terrainSettings.avgHeight(72).heightVariation(8, 10).octaves(0, 1, 2, 1, 0, 2); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java index fa48355c7..b6793bf84 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenShield.java @@ -49,7 +49,7 @@ public class BiomeGenShield extends BOPOverworldBiome public BiomeGenShield() { - super("shield", new PropsBuilder("Shield").withGuiColour(0x647F38).withTemperature(0.3F).withRainfall(0.8F)); + super("shield", new PropsBuilder("Shield").withGuiColour(0x647F38).withTemperature(0.4F).withRainfall(0.8F)); // terrain this.terrainSettings.avgHeight(63).heightVariation(10, 10).sidewaysNoise(0.1D).octaves(1, 4, 3, 1, 1, 0); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalIsland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalIsland.java index b4aa927c6..df571fe13 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalIsland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalIsland.java @@ -39,7 +39,7 @@ public class BiomeGenTropicalIsland extends BOPOverworldBiome { public BiomeGenTropicalIsland() { - super("tropical_island", new PropsBuilder("Tropical Island").withTemperature(1.0F).withRainfall(1.0F).withGuiColour(2211330)); + super("tropical_island", new PropsBuilder("Tropical Island").withTemperature(0.95F).withRainfall(1.0F).withGuiColour(2211330)); // terrain this.terrainSettings.avgHeight(64).heightVariation(5, 40).octaves(0, 1, 2, 2, 1, 0).sidewaysNoise(0.2D); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java index 8d6d18562..a0581399d 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTropicalRainforest.java @@ -37,7 +37,7 @@ public class BiomeGenTropicalRainforest extends BOPOverworldBiome public BiomeGenTropicalRainforest() { - super("tropical_rainforest", new PropsBuilder("Tropical Rainforest").withGuiColour(0x88E140).withTemperature(1.2F).withRainfall(1.0F).withWaterColor(0x5DFF00)); + super("tropical_rainforest", new PropsBuilder("Tropical Rainforest").withGuiColour(0x88E140).withTemperature(1.0F).withRainfall(1.0F).withWaterColor(0x5DFF00)); // terrain this.terrainSettings.avgHeight(67).heightVariation(10, 25); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java index cc16be207..960b8524b 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenTundra.java @@ -37,10 +37,10 @@ public class BiomeGenTundra extends BOPOverworldBiome { public BiomeGenTundra() { - super("tundra", new PropsBuilder("Tundra").withGuiColour(0xA09456).withTemperature(0.2F).withRainfall(0.5F)); + super("tundra", new PropsBuilder("Tundra").withGuiColour(0xA09456).withTemperature(0.25F).withRainfall(0.5F)); // terrain - this.terrainSettings.avgHeight(64).heightVariation(5, 10).minHeight(59).octaves(2, 2, 1, 0, 1, 1); + this.terrainSettings.avgHeight(64).heightVariation(5, 10).minHeight(59); this.topBlock = BOPBlocks.grass.getDefaultState().withProperty(BlockBOPGrass.VARIANT, BlockBOPGrass.BOPGrassType.SILTY); this.fillerBlock = BOPBlocks.dirt.getDefaultState().withProperty(BlockBOPDirt.VARIANT, BlockBOPDirt.BOPDirtType.SILTY); @@ -77,11 +77,6 @@ public class BiomeGenTundra extends BOPOverworldBiome // water plants this.addGenerator("water_reeds", GeneratorStage.LILYPAD, (new GeneratorFlora.Builder()).amountPerChunk(0.2F).with(BOPPlants.REED).generationAttempts(32).create()); - - // flowers - GeneratorWeighted flowerGenerator = new GeneratorWeighted(0.1F); - this.addGenerator("flowers", GeneratorStage.FLOWERS, flowerGenerator); - flowerGenerator.add("violet", 1, (new GeneratorFlora.Builder().with(BOPFlowers.VIOLET).create())); // grasses GeneratorWeighted grassGenerator = new GeneratorWeighted(1.3F); @@ -114,8 +109,6 @@ public class BiomeGenTundra extends BOPOverworldBiome if (!settings.isEnabled(GeneratorType.WATER_PLANTS)) {this.removeGenerator("algae"); this.removeGenerator("water_reeds"); this.removeGenerator("medium_lily"); this.removeGenerator("small_lily"); this.removeGenerator("tiny_lily");} - if (!settings.isEnabled(GeneratorType.FLOWERS)) {this.removeGenerator("flowers");} - GeneratorWeighted grassGen = (GeneratorWeighted)this.getGenerator("grass"); if (!settings.isEnabled(GeneratorType.GRASSES)) {grassGen.removeGenerator("shortgrass"); grassGen.removeGenerator("mediumgrass"); grassGen.removeGenerator("wheatgrass"); grassGen.removeGenerator("dampgrass");} } diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWhiteBeach.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWhiteBeach.java index 52327100b..20beee01f 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWhiteBeach.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenWhiteBeach.java @@ -18,7 +18,7 @@ public class BiomeGenWhiteBeach extends BOPOverworldBiome { public BiomeGenWhiteBeach() { - super("white_beach", new PropsBuilder("White Beach").withTemperature(1.0F).withRainfall(1.0F).withGuiColour(0xF3F1E4)); + super("white_beach", new PropsBuilder("White Beach").withTemperature(1.0F).withRainfall(0.95F).withGuiColour(0xF3F1E4)); // terrain this.terrainSettings.avgHeight(64).heightVariation(1, 1); diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java index 50cf3b131..a325c71e5 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenXericShrubland.java @@ -43,7 +43,7 @@ public class BiomeGenXericShrubland extends BOPOverworldBiome public BiomeGenXericShrubland() { - super("xeric_shrubland", new PropsBuilder("Xeric Shrubland").withGuiColour(0xE2CDA5).withTemperature(1.5F).withRainfall(0.1F).withRainDisabled()); + super("xeric_shrubland", new PropsBuilder("Xeric Shrubland").withGuiColour(0xE2CDA5).withTemperature(1.75F).withRainfall(0.1F).withRainDisabled()); // terrain this.terrainSettings.avgHeight(64).heightVariation(1, 5); diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/cattail.png b/src/main/resources/assets/biomesoplenty/textures/blocks/cattail.png index 21d36ca182dbed27b3473a1f479138c9ef13ea8f..3b7589125d6a85df39f08fc2675b29242fc22c1a 100644 GIT binary patch delta 374 zcmV-+0g3*>1Hc22JPx-201meS9FJQ;0000PkxCnXGBNQWX_Wu~0X<1XK~y+Tl~UPG z0znYm&oCl~AbSc#B?<&YK@?Y`@d_H{Tu6wI{(~5O^@CfxVTS2t*2H?6ny#(t?j7U5 z7&W$GanvJd<{}0Cx&vP?HMlNj^qOwXBEju}sTGV*^6(ur;A$_eH^2lG+?6aT=pEYf zJUsS)sD58w-Z7vU1)Zu#0-SgDScc1;6mhI0R|6PO@ZKrG&3={yq9ZXga;!&IZ6l1!&-ob8^O{pJqD=??{V{vm_IQ7q;GtE8H-C06ky7 UUbUO2tpET307*qoM6N<$g3qv~R{#J2 delta 375 zcmV--0f_#<1Hl83JPx@401mkUxCR%$0000OkxCnXIczh2P5=M_KS@MER5(wSQrS)d zK@gnJFd{eXDG-$?5byv|T#3djXq0myF+TbaYV_3)ZtaE{W|kQf>uGwrwyUal*ncr; zZo=ZIN7yPD3Bv;yzMdLzSpe?Lm>w75J8Z(mPDVcf6_9XKu?1nU?}+pG z$fy2)ZFPC40Le(`)qNsh-uL?|bhlDeV;^f-KmiiodKI|Z%@ct;;+e6=z9}M`wM#_c z8Apd64Y;ehR6lpNX-9wV;Nzht6fwf*V_k9d8kEd`Axd}&%A_b~j(6t!h@B+#LpT9} zZvq|21M))$5@%`i$8NZMX*$c!#0Obq1-XG<4Zm1asv}gE1r(&t=PKF0MFY4^YvjUu zJ1#!*XGPdJO`3<;V^1{KS~05A-JH0S`zyc!-n1YxCWDM(Il3b)qV}Q-ljAVP*bhA! VxqTg)v+Do=002ovPDHLkV1mCJrI`Q# diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/tall_cattail_lower.png b/src/main/resources/assets/biomesoplenty/textures/blocks/tall_cattail_lower.png index ddd68bb7dadcf242b965503f6dc2de1b740df9e2..81e63b2f6b42cfaed434f12fa24ed6e29628d14d 100644 GIT binary patch delta 352 zcmV-m0iXW%1F8d%JPy7901mzZ>O!%=0000PkxCnXGBNQWX_Wu~0VhdBK~y+Tg_G+} z0x=MUc?uNRYr8Dbknjwms1S|HMMI*A{_*|aVCdQ9OfUZM$Co*$?M$cL?m$E$+V3kD zyr2IrBA?EyAhVxq7rZaGCi3QU8hI52I~42M$=;hopTIHu)pn7nAnh@3(Z2hH;mt@w z4^)tU;?3_4nva=!duS!}Kn3BM^T(=-X~Mq+(BkMWbJF{I*Ql>{R?OaCq$Uz9K&$li z-Y0|ftEeDpi{b7ddnqHYf`q$+a7VPx&q`E){IwDgj#XP5dw0aps~|ixAI_fwXJ0?{ z>!M^3UK&1SdIy-lSdMi}C&+k}yU=TNad|sO={!3^o|Lxm*Ui(1GIBY8BcyJ?lS@40V;$x+}x)-VJQASd<9_6i8nEqGc%19r5}1LG(c+ zsGc?af(~?7Licgtak|&en>K!*x-XOzkf0$-g%m*w@OduyL%?8$FJnWE-Z=f7`%E}P zjL)#~K_t*rSsPR4jFl2?;olhu+B2Y7-2q#FVFsIPEfEl;YnElc0oJGIa7Q5ul@Ce; zTSpZGdLu;)mO^bwPtc|!L7Jv+B^we7Ay9XofKMJD6SkxP*_%TX87td9u6mr<&PmPB zphTdK@&TVPF-b<5nt({4q4DP-l|+1skqbFwC?Z#iA^|cfqCi6=Q5`umNGamp%)&1e X=ZsDCTGTs*00000NkvXXu0mjf4mi4< diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/tall_cattail_upper.png b/src/main/resources/assets/biomesoplenty/textures/blocks/tall_cattail_upper.png index c2cd1cbc447734fbedcc838756fe38af5ad29365..13f28b547ba4430bbbf328ae682998ef3ec13cbc 100644 GIT binary patch delta 359 zcmV-t0hs>A1HJ>0NdXy=N*jMNG4UX2l>h(%J4r-AR5(walIu>wKoEuZF^oiF(@H7I z&3HpFC>0bm@tPP!kx~_Y`x1gN(ZmNHJuN%wu5G-Wr0MML%r|GJ6+daPo1ALkl2ml{`gU&XVeh=tYOiqS<0M0ivyyxvLC&TXQ4!wB|x~hMLNxqw>*M6NH zj1I~)?bYbAl8uMx9kHHVSCzHyNYO*H7$nG{jSp7?fOLR$^!%G(`Q>JZJK#!Bog$sA zg>wM_S4;%JA`)Z)WE@-cr69%tF@r?FW2;2Z-EAeo>e~!}Lo~S9vf}}|WpuZ_90T<8 zSfOYZ3KV7rj*=Wbj}==i%On7>Mm*nK2;TBa(iKYj*lpFKcc)I56_0=9+BtgbSA~O7 zt3)ro3SE>l!6N>Sh@Y>vmDuk{!F{8^2z+Vd_6if=4iL-tQ-I~y>mAVnBRzHsbiC^A z1p*i`Q~(x1;01twI3Z(!*g>ekL$gRv-7SS+_S51FhiGuVIms#TTSoV^lcjhk$zuO~ zAY{uZObslBEZ+wLmStlSA7Q=`WnaX}qkxymi;NrZ4-k1Ay=PLS8DqgrZI1He(sVIL zY+omNX$!45L2%ZNuw3H6Aj@427XTqQDpIta5Twjdef!u6A4k(P?F;6Vw246Ib6)@e N002ovPDHLkV1k{WuGatn