From bf9e560d296529276be2176786a8f435cc8bb312 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sun, 20 Dec 2020 17:25:52 +0300 Subject: [PATCH] Structures for gardens, fixed worldgen issue --- .../integration/byg/OldBulbisGardens.java | 4 ++-- .../java/ru/betterend/registry/EndBiomes.java | 5 ++++- .../biome/old_bulbis_gardens/fallen_tree_1.nbt | Bin 0 -> 361 bytes .../biome/old_bulbis_gardens/fallen_tree_2.nbt | Bin 0 -> 602 bytes .../biome/old_bulbis_gardens/fallen_tree_3.nbt | Bin 0 -> 996 bytes .../biome/old_bulbis_gardens/structures.json | 10 ++++++++++ .../biome/old_bulbis_gardens/tree_stump_1.nbt | Bin 0 -> 269 bytes .../biome/old_bulbis_gardens/tree_stump_2.nbt | Bin 0 -> 427 bytes .../biome/old_bulbis_gardens/tree_stump_3.nbt | Bin 0 -> 452 bytes 9 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/fallen_tree_1.nbt create mode 100644 src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/fallen_tree_2.nbt create mode 100644 src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/fallen_tree_3.nbt create mode 100644 src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/structures.json create mode 100644 src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/tree_stump_1.nbt create mode 100644 src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/tree_stump_2.nbt create mode 100644 src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/tree_stump_3.nbt diff --git a/src/main/java/ru/betterend/integration/byg/OldBulbisGardens.java b/src/main/java/ru/betterend/integration/byg/OldBulbisGardens.java index dc31dd78..bbc32dca 100644 --- a/src/main/java/ru/betterend/integration/byg/OldBulbisGardens.java +++ b/src/main/java/ru/betterend/integration/byg/OldBulbisGardens.java @@ -26,8 +26,8 @@ public class OldBulbisGardens extends EndBiome { SoundEvent mood = biome.getMoodSound().get().getSound(); BiomeDefinition def = new BiomeDefinition("old_bulbis_gardens") - .setFogColor(132, 0, 202) - .setFogDensity(2F) + .setFogColor(215, 132, 182) + .setFogDensity(1.8F) .setWaterAndFogColor(40, 0, 56) .setFoliageColor(122, 17, 155) .setParticles(ParticleTypes.REVERSE_PORTAL, 0.002F) diff --git a/src/main/java/ru/betterend/registry/EndBiomes.java b/src/main/java/ru/betterend/registry/EndBiomes.java index b8686d2e..28af2e9d 100644 --- a/src/main/java/ru/betterend/registry/EndBiomes.java +++ b/src/main/java/ru/betterend/registry/EndBiomes.java @@ -50,6 +50,7 @@ public class EndBiomes { private static final HashMap ID_MAP = Maps.newHashMap(); private static final HashMap CLIENT = Maps.newHashMap(); public static final Set FABRIC_VOID = Sets.newHashSet(); + private static final Set SUBBIOMES_UNMUTABLES = Sets.newHashSet(); public static final BiomePicker LAND_BIOMES = new BiomePicker(); public static final BiomePicker VOID_BIOMES = new BiomePicker(); @@ -103,7 +104,7 @@ public class EndBiomes { if (biome.getCategory() == Category.THEEND) { Identifier id = biomeRegistry.getId(biome); if (Configs.BIOME_CONFIG.getBoolean(id, "enabled", true)) { - if (!LAND_BIOMES.containsImmutable(id) && !VOID_BIOMES.containsImmutable(id)) { + if (!LAND_BIOMES.containsImmutable(id) && !VOID_BIOMES.containsImmutable(id) && !SUBBIOMES_UNMUTABLES.contains(id)) { JsonObject config = configs.get(id.getNamespace()); if (config == null) { config = loadJsonConfig(id.getNamespace()); @@ -252,6 +253,7 @@ public class EndBiomes { if (Configs.BIOME_CONFIG.getBoolean(endBiome.getID(), "enabled", true)) { parent.addSubBiome(endBiome); SUBBIOMES.add(endBiome); + SUBBIOMES_UNMUTABLES.add(endBiome.getID()); ID_MAP.put(endBiome.getID(), endBiome); } return endBiome; @@ -268,6 +270,7 @@ public class EndBiomes { if (Configs.BIOME_CONFIG.getBoolean(biome.getID(), "enabled", true)) { parent.addSubBiome(biome); SUBBIOMES.add(biome); + SUBBIOMES_UNMUTABLES.add(biome.getID()); ID_MAP.put(biome.getID(), biome); addLandBiomeToFabricApi(biome); } diff --git a/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/fallen_tree_1.nbt b/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/fallen_tree_1.nbt new file mode 100644 index 0000000000000000000000000000000000000000..96425c4ae28c7a6cecccce2e8f45ec26ccd40b82 GIT binary patch literal 361 zcmV-v0hazBiwFP!000000F{-`QiCuMhnM_;f(H*?^c{SHo;^FBymms3HB(A5NpM=9 zUg(G-1N7I-?CslcH_1W@qMSr9Uz!t97eyPa4UyAI*U?0y19dB>w5;rQA3EYOC+=+M zllql#k|C<7e=>$las|T{7zTJ4;NgIW10Df*1mKZ?M*^M{@T7nz1DF-S5=aPp39u9ao;1PgF03Hc=B;ZK_CIj#5yar4%^Ih-(!)9iF=;1T-JoJc}8A}#C zJ+tKLXJe@!HsKlXi%)pQ=fi=11kjHJ`swd|>3p&YX54c&Q!8_-(lP4p`H%$_FWx%s zyXR#^LLE(@$kOQ zysPxa+3Mu1*Rz6Pn}Oi&PhdXV+6Nl~So^Bf|5X>-=5+IN+RFm}mZ!3ssIn8|Jd~{8f9YP;^>uGsv(%s1&fB8l6 zvnDY*zXq*ODMWHLI3>Ul07n2E32-F9Q2<8)91Uxq)0UQNzG{DgS#{e7ya4JAk1Dax;>(1O!&EDPE;|PEw z0gePX3g9S!qXCWvI0n!ZYoB&zas34}dpmrOBLI#BI1=C}fTIA81~?kv7=S~!nQb*i zVn1)a%Ea!?aY}}h(x{C_B=$3HG%}$n0glLUB;%zLnq2LY@k()WwJXL;Cp5V}Yo@Na zcFlOjbJvVl%rOin&c^^buNsx9y#hED!-@M$x4W3jdDY~+3WgJV6%5BD-e0+Sm5f*1 zpOW#4@8PP+^;s~SxOTyC;@TyXb4rujKN9d--<7!@Dkh(}F2&@N;^ca$8LxQmn(>O~ zr5Ufdb_3L97%%QV$M2MsM(*6ht9EA}q8hm~_n5=&Ixc53wkI2cT|RrOhMN1yjdof- ziz|}tYwxLeofnF{YtNQGb#G6H?sDpS|KNi?|NZ0RxgYFtY9GU)?I(&j%0IWGoj=ez~zC<16Kg909*mMB5+0EiolhCD*@LYaCYkjYHa1RT;nu=qX9<) zjsYA4I2Ld$;5fi>fa3wj15N;(05}nFBH$#zNr1BlHO+b!K~3$f);Jn)4B!~Rv4CR% z#{rH591l1ia01{2z=?np0Ve@Y0-QbI?AD*4rgr9QoCa_-;Ap@xfMWp10*(b72RIIJ zJm7f134jv-Cjw3coCG)taQ2`^-S)n8kF>kh)b4F+oCa{#n%c8W&82}$1D6Ia16&5U z3~*WCvcP45%K?`IE(cs5xIA!q;0nMMfGYr31g;2N5x5fIB*57N&h@p+YIYmXG7YF9 z98;)ifU5zn2Dr4~YBp+0F8zSZ-PP!gXDfAAV>W8;Guw@tQf31(TfwzeQ*v3smCwt8 zc{$*6f-B!s59Z~8%L}f&CJ3%PPXMm)fU9)I*5}I78H+;Zd@mx%9EHsJ+>_wSISIJd z8du1y)a`z~(xaM6p4|hSTCZ!ey>J^fwSJiA$=A7gAW!N1Xd#c^sHyeLJWqZOwU9^Z zb+t7#Lgp<_t!L($bC(rd`5IcmmG74oTvA`Ht4F=X)AJ<{)Iw*C&9?LCBn+!zj3aBbC?LY}pz)>rd9`5JnV#|wG#b@m|7`dwUUzk-lCpL+nA zgOFM3&$Tlag*?)IZ!J$0^5pYMf=lW@|3AxB`Ub7B1(yRgX`{xE?Xg>y?)rXAD!reE zv74^{f)SKyzxK1*eZ4GzdDosg_50!5r>Dc~@zBp7=A}FRc;mNIf9{^A_T%!@_LIsu zcK+OsopOg^S%#m3{y1F4Q+IxO>c3owUoMP%sQcJH_vcR+#PGU&{xS5gpF_vjX*_lx z#^LyF9Hwo+d6@11x%)KCGju;R^j9m7y)N0Qe|b4}4=veks9uJ#JWi|q+jeRH?xwjP S&X*(dr}__8MgdWsBLD!1%kXIc literal 0 HcmV?d00001 diff --git a/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/structures.json b/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/structures.json new file mode 100644 index 00000000..3265de94 --- /dev/null +++ b/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/structures.json @@ -0,0 +1,10 @@ +{ + "structures": [ + { "nbt": "fallen_tree_1", "offsetY": 0, "terrainMerge": "none" }, + { "nbt": "fallen_tree_2", "offsetY": 0, "terrainMerge": "none" }, + { "nbt": "fallen_tree_3", "offsetY": 0, "terrainMerge": "none" }, + { "nbt": "tree_stump_1", "offsetY": 0, "terrainMerge": "surface" }, + { "nbt": "tree_stump_2", "offsetY": 0, "terrainMerge": "surface" }, + { "nbt": "tree_stump_3", "offsetY": 0, "terrainMerge": "surface" } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/tree_stump_1.nbt b/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/tree_stump_1.nbt new file mode 100644 index 0000000000000000000000000000000000000000..888b48550aa6b18be17081bc63ecaa51c86383ea GIT binary patch literal 269 zcmV+o0rLJIiwFP!000000G*P{PQx$|MXzJ0G(my|8~By3StC|#E2j*_B8e@J1B9<9 zkzxo{^AMIswxx3)i^+iuip>{E0R5?-RCNUbe5wio>tYGGRk`+G53Li1dQkGcJIa%<*nJh8UN6av>4@OLKChN41oaiiOd?F)9 zjOv&Rr%MWf`ZY*%bOQhY7Vv$0 literal 0 HcmV?d00001 diff --git a/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/tree_stump_2.nbt b/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/tree_stump_2.nbt new file mode 100644 index 0000000000000000000000000000000000000000..c9d9c4507d0abed3745cce2cf91b0d1ebfb5febe GIT binary patch literal 427 zcmV;c0aX4UiwFP!000000G*XTPs1<}#m|46gn@wtz6EnC78yOG>Gtd3z}`{D*_hV}?Hy&D4V1C3OLb^Q9hNZ{%b1G? z>V)1eoRJUCm7M*CMwQ~HNRTWfkz3yZ`e(nmO;;0Ou z(-0(m6*~#{^=Z4T_f4(L>Y()ot`Qh3cM-uc+ktY5zH8*F)6J>Vy^Iy0QW$%aH9bgAd4uzr{wn9Qo)gXl?p}ly V@3J>ax5IIIgkR|iMz&cA004f&%me@c literal 0 HcmV?d00001 diff --git a/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/tree_stump_3.nbt b/src/main/resources/data/betterend/structures/biome/old_bulbis_gardens/tree_stump_3.nbt new file mode 100644 index 0000000000000000000000000000000000000000..a344b126f0a0401537dc8d451211214b17a2ad9b GIT binary patch literal 452 zcmV;#0XzO5iwFP!000000Hu~qPlG@Zh6nb84-X!^=wGQ<&&HG22HLd}DNER`wf*(B zhN*-s!&FHKAw2KQJ0B2ofDELojz$2$`ONT|L24Rb`N}wep9i|E?drqjr<=zNL~9+2 z@Q4K{=L>Io#gK`vU=+c`n2f)}j z#Un;Baw$eGWKyC(n$bgKsJSCU%^ewP?#O7uPZH?Q6eAf7wPPtGPSl^2pSWk{-koTs zKO&H8ikaI(E<^Q4G5jb-F3so!pg+nVnD>yd&izA6XN;RMR(Vr$^GJZu)_t}ZLL+*`Yb zYXr`l?S$aS&Y<6lRn=@j?v3*o)m?cmp)<{TQGK42TkG7EQZ=^o?|+jzyBkO!ex>cM uYiqM?ZGC8MXP5#0Vf*^r(iC$Y6L9lX_~O-cuCfh4eh=Ru^hNWg3IG5?*V@?t literal 0 HcmV?d00001