From ee51fd5a0503572697669c6d1ff8083237147d0b Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Thu, 22 May 2014 16:37:55 -0400 Subject: [PATCH] Tweaks to the Coral Reef and Kelp Forest, and coral textures --- .../overworld/ocean/BiomeGenCoralReef.java | 9 +++++---- .../overworld/ocean/BiomeGenKelpForest.java | 7 ++++--- .../common/world/features/WorldGenKelp.java | 11 +++++++++++ .../generation/WorldGenFieldAssociation.java | 2 +- .../biomesoplenty/textures/blocks/bluecoral.png | Bin 643 -> 690 bytes .../biomesoplenty/textures/blocks/glowcoral.png | Bin 663 -> 657 bytes .../textures/blocks/orangecoral.png | Bin 620 -> 717 bytes .../biomesoplenty/textures/blocks/pinkcoral.png | Bin 628 -> 500 bytes 8 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/ocean/BiomeGenCoralReef.java b/src/main/java/biomesoplenty/common/biomes/overworld/ocean/BiomeGenCoralReef.java index 1f712e4de..b04a832b2 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/ocean/BiomeGenCoralReef.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/ocean/BiomeGenCoralReef.java @@ -11,22 +11,23 @@ import biomesoplenty.common.biomes.BOPOceanBiome; public class BiomeGenCoralReef extends BOPOceanBiome { - private static final Height biomeHeight = new Height(-0.7F, 0.1F); + private static final Height biomeHeight = new Height(-0.6F, 0.1F); public BiomeGenCoralReef(int biomeID) { super(biomeID); - this.zoom = 0.5D; - this.threshold = 0D; + this.zoom = 0.25D; + this.threshold = 0.25D; this.setHeight(biomeHeight); this.setColor(18285); this.setTemperatureRainfall(0.5F, 0.9F); this.bopWorldFeatures.setFeature("coralPerChunk", 300); - this.bopWorldFeatures.setFeature("shortKelpPerChunk", 99); + this.bopWorldFeatures.setFeature("shortKelpPerChunk", 100); this.bopWorldFeatures.setFeature("generateSponge", true); + this.bopWorldFeatures.setFeature("seaweedPerChunk", 20); } @Override diff --git a/src/main/java/biomesoplenty/common/biomes/overworld/ocean/BiomeGenKelpForest.java b/src/main/java/biomesoplenty/common/biomes/overworld/ocean/BiomeGenKelpForest.java index 90c189337..a13977202 100644 --- a/src/main/java/biomesoplenty/common/biomes/overworld/ocean/BiomeGenKelpForest.java +++ b/src/main/java/biomesoplenty/common/biomes/overworld/ocean/BiomeGenKelpForest.java @@ -10,14 +10,14 @@ import biomesoplenty.common.biomes.BOPOceanBiome; public class BiomeGenKelpForest extends BOPOceanBiome { - private static final Height biomeHeight = new Height(-0.9F, 0.1F); + private static final Height biomeHeight = new Height(-1.2F, 0.1F); public BiomeGenKelpForest(int biomeID) { super(biomeID); - this.zoom = 0.5D; - this.threshold = 0D; + this.zoom = 0.25D; + this.threshold = 0.25D; this.setHeight(biomeHeight); this.setColor(27468); @@ -26,6 +26,7 @@ public class BiomeGenKelpForest extends BOPOceanBiome this.bopWorldFeatures.setFeature("kelpPerChunk", 999); this.bopWorldFeatures.setFeature("kelpThickPerChunk", 999); this.bopWorldFeatures.setFeature("shortKelpPerChunk", 200); + this.bopWorldFeatures.setFeature("seaweedPerChunk", 20); } @Override diff --git a/src/main/java/biomesoplenty/common/world/features/WorldGenKelp.java b/src/main/java/biomesoplenty/common/world/features/WorldGenKelp.java index 16a8aaaf8..5c2c8f59e 100644 --- a/src/main/java/biomesoplenty/common/world/features/WorldGenKelp.java +++ b/src/main/java/biomesoplenty/common/world/features/WorldGenKelp.java @@ -85,6 +85,17 @@ public class WorldGenKelp extends WorldGeneratorBOP int randZ = z + random.nextInt(8); int randY = random.nextInt(64); + this.generate(world, random, randX, randY, randZ); + } + } + else if (featureName == "shortKelpPerChunk") + { + for (int i = 0; i < (Integer)BOPDecorationManager.getBiomeFeatures(biome.biomeID).getFeature(featureName); i++) + { + int randX = x + random.nextInt(16); + int randZ = z + random.nextInt(16); + int randY = random.nextInt(64); + this.generate(world, random, randX, randY, randZ); } } diff --git a/src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java b/src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java index bc7f0924d..b15db3eb8 100644 --- a/src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java +++ b/src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java @@ -117,7 +117,7 @@ public class WorldGenFieldAssociation associateFeature("coralPerChunk", new WorldGenBOPCoral(BOPBlockHelper.get("coral1"), -1)); associateFeature("kelpPerChunk", new WorldGenKelp(4, 8)); associateFeature("kelpThickPerChunk", new WorldGenKelp(4, 8)); - associateFeature("shortKelpPerChunk", new WorldGenKelp(2, 3)); + associateFeature("shortKelpPerChunk", new WorldGenKelp(2, 4)); //Nether Features associateFeature("waspHivesPerChunk", new WorldGenWaspHive()); diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/bluecoral.png b/src/main/resources/assets/biomesoplenty/textures/blocks/bluecoral.png index 08e3e416902087f64357cd01e11ab264923227b9..7f2a5795a3259b5eb4f3e3b7897df60d91c630c4 100644 GIT binary patch delta 605 zcmV-j0;2tc1+oQ@JPN=701m(bYSxJfkwz$g0xn5JK~y+TWm4Ho)KL^ZvoFjr!@Lc% z!Tbrs{APWQ_Ka5g3!<>aGBdLxhI9kw}D~;c%EXSiy$;$Hq`LKyJ6&Mz0Iv@b$i2(AtD5_IgMp8jW&C zg6V*+u~>{}0HNFU_o@v|cXdbm6J5Lame$5~5d_6RhSPwcaOu?mfE{t>3sH+Gl|FJQYaK;&7PaudTEMUEEZYI1$yH07d<`jov7)5becm$ zS2L4LCL^g-N{;t_)=ka#v{WidKA&F%Shagt5nSCkLIz+1|IoB5h6(9@{);(R->6=B z_1hjIx*@S#F7uwC3&pD-4rUlurBV@eK6rkd%y3oIv3T>L`}_mV7bf`2Ko?1vHj0n~ zU9odek9K{eZCMt5T&mTo;CG=&+sa)xn1E}vch9Iv#QnhxFV^vNj#mY1Qrq74n4Qei rK*0d7V{Ck5_|A>YDgFe2Ez6QWtw<-Alov@Y00000NkvXXu0mjf2@)^L delta 558 zcmV+}0@3}l1%m~UJPN@801m+cxRGn^kwz$g0sl!vK~y+TWm8#CQ&A8;?d_g6E!D^- z5irL8W-x9@08s%&42jVPA9yzy5p17;G28TrPWDp z=FFKn-+Z%NrN!-bTc_f)7N^sx48yQ2Q+z(3Qh`7~42Q!Z0sI(D@p`?YgTbKO`Tc%> zv9$<*cK$2ja9BV?p^(^QMVs;;8%yt zqft2%h}lMSz~S>T9B&;#*_rzo$zmUbkBQ7n4Z??or4fLde#Q@d-+@l9;wyR7G$(Pi z!QR#kqbt7j~KBtgL^48?Vy>a_z+jVQaaSs=Y9PiM;73Kig+J`af^l zJz+Ver+d*hxgejNUCZ@XpK$X{#?H>BF{|zg0oc^emmhJY@ex>h(f%Afc^7nl9y)bT z9*_<7*iV3uDY5h~i5Xb`i^S?5lc}bn>l9;8I2CF#V+_a2%q^p{!mO}VRo#@39k`g9 zlPx1X2C>_GWQD1c6L)a+**md|R+;nVb}`$5x*q#M$Mg60NOc*USl@C^N|m3D)Q(*m wl1zo8Ap=gwG8NaDcir<@a3=^EY#4^x1!2z#w{%0FCIA2c07*qoM6N<$f-Lq1UH||9 diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/glowcoral.png b/src/main/resources/assets/biomesoplenty/textures/blocks/glowcoral.png index 3096c129fd50e307485bb73e00d255ed9fedb4dc..6d253b9d172ed2b5c29869e9a4f834be2e86b059 100644 GIT binary patch delta 571 zcmV-B0>u571(5}iJPN=701m(bYSxJfkwz(h4M{{nR5(vrNSFr`i^W_zowj&M<3g|iBst)0Hfx@L zWfxihSHl7uES!g`i|;K-rTbVal}ffR6bhE?*Gq{ww7i(51wWokp%Qjv)r6+*deGqN zSp~q)7g9c-x4o-WD(+N$+N!bGe}3o_g*cqgJ(UhFZ>!O0xN5a(%M#RTHFvi4wV&in zv#a(ksa!4_igWv9a=H2 z!z({%Y?DONfU!@g-nl31nG2fl7~PQpX@BvZowr&oce2(|v)MEp-p0e65%Am^i6l37 zdC>HIX;1N$^mo!2piMj;H|_cpu*cA|tJ^)z>pMJ{UQah>dQ7_7TYRlAk9^{Pi8~VF z9a#2W=;s(my`K`h$R{H$p(x=})8Fs1>g2%9NeK5Kj?U7&wfDF<##453g+V zmoIJcG3WG+rxnk=XQ;`~zyuH`^r%RTHhA6(1$bP<;BvW~`v)yDd8E`^NUQ(=002ov JPDHLkV1gOH6p;V` delta 577 zcmV-H0>1r`1(yYoJPN@801m+cxRGn^kwz(h6G=otR5(vR3y!?5=@>+W~^N}2xz>?}<@9v9il$o84Fyj!I<%R_+8#5nHn!bBo1(7Eh4 zuz>HwKr|ZFTENq>J|`R3vmdq`BJR&*y#y6}8wBz_9iU>b*Q+4{7OC{$TZg3NKmucZ zYa%HObYtfICXSfLxLr91TDxEW6HZcpf^D%*MqZ#e)Pwc(s^%M)Cb2L8T)#Mh0`F5C z^L3)RVivR}0E6K3hx&Ce)xR#!%nJOL+@|tr*CRMP2jTgRv zBoD5x2sHg}1BXp3u$hzs)<(WF;dDTsArtp%m-VQ%?gw&Bo4lTlzse~2gBaKuFQZ%-t&>T;pbTT42UMGNXLTp#DY;iTSd9-Jv%_zH!n}&MEJSxsE{+0I4W#g*v7ln z3%YEnSyVUfRLyJ8d-~=~E1VT9R*F?ZGM+Ib_pA+D#!fMT{h@pliA2mluTDJYBzSNK P00000NkvXXu0mjfFkBb8 diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/orangecoral.png b/src/main/resources/assets/biomesoplenty/textures/blocks/orangecoral.png index bb2f5e7da3d959af05f44c6c46c204f9480acad6..7db5d6dbd29ce68b50cae9e5188843932e496793 100644 GIT binary patch delta 632 zcmV-;0*C$V1kDAIJPN=701m(bYSxJfkwz$g0!c|kK~y+TMN?-_6j2nt3W{Qj`o*88 z(MT_XfCYnH6BB=ev3HFn5k#d)7cq#v#`1v}6=9g&*`3`zzH{D|4{zVho%hZ?<*orR z%ylD~O#0{iN+c2%1c9YqUqm{cHhj9_%BAmIQ52cs>uvube}ET??_X{KbuTQ#w>!vle5R-@6~VwIdd?-|HtxBok0 z{;)&;bI_3NtJlu@-$QxGM6kPYdMHLnFGIuM_(#Nx4K z0$F-ggIq3WO2tVve7x=>`hHg+G>950W9dYhKz?_b018c_R~JC@`RwVt%j`&hCUlpF z({C;zI#r<>0a;t<*{O46NoHaYyf{miC+cqyQzqytZdCKyXz26yO=2?JxkX(FOfP!3`-Hl; zn)l2l#a$PR08TFliBtz_R%qvAqHfLzCzZ31eSg&*ccbp&6b-rR(jZL^3A3K=*o?v2 zm0C=Kok^c#Pl-IwIF)A@hDM#Fj+rh+NIxc9H>lG@%X*nh8I(2uV2A&U1NI*wj_3+r Syk2ks0000 z;=MO$&4jwU>eoQW_U>yrkx}ni0r>k7tcb>%>;w*%;F2U$D3wa0dGXkXql$0$(fK?K z9DM+u-vWM4g2AU#KGI_s+_(ri|El7DlGKl7MfVSORJFmb3)TO)sE-91%7wc&J zegP_t`J(6_jTr@YpGLsOr~;@B7Rs_IkoYH34)JWH%pmoxG2r+UPM2@1je0E$YE-Wo zv0x!-z<#he0QU~!wL7AER`r1I577B?7ZUXAIIwxoo-I481>-bQW}*f(uzKr%NhlWQ zwr|pH+k10$NSd%Zr*&2}Xxi_|+o7?!{n9GzsjuGp2s(4N?;jJu$qJ4q47!#Hzd5E% z^4~NloOU}d2JlR^DINuD%>-yX^7Jm)JD2;h1paYkLPy^DSYpehUh`3@ROI7u^^ihy Z38E|^sK<7e$p8QV07*qoM6N;tV1nA+2#x>% diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/pinkcoral.png b/src/main/resources/assets/biomesoplenty/textures/blocks/pinkcoral.png index b1d0cdadcb5c7d5a0d209b13406564c57deab22e..fe4b03846c576d310e14028b6248607423e04e74 100644 GIT binary patch delta 413 zcmV;O0b>621oQ)tJPN@801m+cxRGn^kwz(ha7jc#R5(vJUapNw*zzFcrcEmU$Wrz;Q-l3kyRr`$h^Mv`#%bQ z9J^ck8mRuUZvc40XBc{=(Pr);Juk(QV zM4%m6G*21N^a(Up3HS{71GD2Re=iAAvA!K0u5Mik32$ELJpTv?FemDf;rIan^T3We zC@vkH=!O157>j4=ZmL~@4U@4_jhaRfo-i9|3$*};5Q=ZCkT$UfnH!=200008NkvXX Hu0mjf6BoT} delta 542 zcmV+(0^$Ai1M~!tJPN`901m|?)7X!2gP=b@ItWGtJ_T0Wn*VzFpZ6j>OC&D#d(BZ45%sU!vyOk@Fq{v=6c?+?F+j5>Iq%jK+p zP$(!~9a_71WnDIb`OUNdf!C{GoU^fVx!f?Cz}z~>fH)feh}{df5XZ5;|BQXWUa9wA zL3U3o)q$C1Y*>c^$l~nL1Xk=KNSipiKZ6G0$u(|>Vr$o2uHdI#N zlz${QRs3XN3~6_V3$|*P@cZ5fNS$oRpj8iI+1gS)&cU4Q4^j%wy(F6{VycQhN9^;>dWH- gIv7j6qA0SzOi>-hVM0f(0000907*qoM6N<$f(5+=vH$=8