From 56e10f67849a0c9dc5d74393f31fcd4a5b073796 Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Mon, 12 Sep 2022 14:02:46 +0200
Subject: [PATCH] Add more variation to jungle schematics

---
 .../mcl_core_jungle_bush_oak_leaves_2.mts     | Bin 0 -> 150 bytes
 .../schematics/mcl_core_jungle_tree_2.mts     | Bin 0 -> 273 bytes
 .../schematics/mcl_core_jungle_tree_3.mts     | Bin 0 -> 281 bytes
 .../schematics/mcl_core_jungle_tree_4.mts     | Bin 0 -> 278 bytes
 .../mcl_core_jungle_tree_huge_3.mts           | Bin 0 -> 876 bytes
 .../mcl_core_jungle_tree_huge_4.mts           | Bin 0 -> 838 bytes
 mods/MAPGEN/mcl_biomes/init.lua               |  89 +++++++++++++++---
 7 files changed, 76 insertions(+), 13 deletions(-)
 create mode 100644 mods/ITEMS/mcl_core/schematics/mcl_core_jungle_bush_oak_leaves_2.mts
 create mode 100644 mods/ITEMS/mcl_core/schematics/mcl_core_jungle_tree_2.mts
 create mode 100644 mods/ITEMS/mcl_core/schematics/mcl_core_jungle_tree_3.mts
 create mode 100644 mods/ITEMS/mcl_core/schematics/mcl_core_jungle_tree_4.mts
 create mode 100644 mods/ITEMS/mcl_core/schematics/mcl_core_jungle_tree_huge_3.mts
 create mode 100644 mods/ITEMS/mcl_core/schematics/mcl_core_jungle_tree_huge_4.mts

diff --git a/mods/ITEMS/mcl_core/schematics/mcl_core_jungle_bush_oak_leaves_2.mts b/mods/ITEMS/mcl_core/schematics/mcl_core_jungle_bush_oak_leaves_2.mts
new file mode 100644
index 0000000000000000000000000000000000000000..55b8dca0f84a26334e4120db8509ecc20cdb0467
GIT binary patch
literal 150
zcmeYb3HD`RVPFN}`uh5M1{Mb9#LOZF-rVGz_~iVeRI9Sgyi^8$I5#IXu`IQiK^QKO
zRhpNclUh=gnp!buZI2@tg8~PO?(cGc^RrPdTvjGcFU>qyyk@*wGbdf^)OOzGCwb!H
o_WY@OpO*G3=hVE94-?x}rgf(2&EF%@wszsepC=g@ZwRab0E|aEk^lez

literal 0
HcmV?d00001

diff --git a/mods/ITEMS/mcl_core/schematics/mcl_core_jungle_tree_2.mts b/mods/ITEMS/mcl_core/schematics/mcl_core_jungle_tree_2.mts
new file mode 100644
index 0000000000000000000000000000000000000000..4564048d2455e5f9b9e5f8efff4357db41bfa6a9
GIT binary patch
literal 273
zcmeYb3HD`RVPIq6XJD&G1q^Hq%!!#r47|C?Iq}K)MX6S0nR%%UqHu0jX<m9xYEEim
zS!ywZ5JWgRKe5;<8AQb!VG%QA5JuBpQk0rnG3V~&NWKOI9@f)ke*KpgKMryUSi!YS
zh418MdposWrjUR|o9~_L>T6&A+^+cY*~G)fU(d`f{+%53fbIP1>E3f<FaA9F?P<mS
zbf<5>ZO=bhrgv^X%k82@A?aTh;;(ql3j2N3-Njj3tn_Q`P4?0on`f^wwz<tdIdikc
YE@kfsGxkotKiki`YaZp%PqDoQ0Md_huK)l5

literal 0
HcmV?d00001

diff --git a/mods/ITEMS/mcl_core/schematics/mcl_core_jungle_tree_3.mts b/mods/ITEMS/mcl_core/schematics/mcl_core_jungle_tree_3.mts
new file mode 100644
index 0000000000000000000000000000000000000000..c604a2d9ce32b7f9df25592cdef20716b213cd0c
GIT binary patch
literal 281
zcmeYb3HD`RVPIq6XJD&G1q`eV%!!#r47|C?Iq}K)MX6S0nR%%UqHu0jX<m9xYEEim
zS!ywZ5JWgRKe5;<8AQb!G6<t7Eh$P(t(bFkQX^lp0*_1f(f411f4$Ue@Y2lLEpms?
zR{!8OeT|FEQ8F_xcg=inn(g&^_3X`04rR{Ft_m}Kc+n@m_z9Q#+;gVJMZfk>wu^o<
zC%U&b(|_MTp3^q|U(cjg%~Pp-t@N^wf5DNM`BvJ3Z#UhKuAC&ZVshz3Wk>hrJog^$
yo|0*O<|*&`*XJZod$#O~=GhVW!ZM!k+nZ9k)&DkMOLX6wdOyItit!}7>m&dq!g}uj

literal 0
HcmV?d00001

diff --git a/mods/ITEMS/mcl_core/schematics/mcl_core_jungle_tree_4.mts b/mods/ITEMS/mcl_core/schematics/mcl_core_jungle_tree_4.mts
new file mode 100644
index 0000000000000000000000000000000000000000..7ce8af2fded614fca7fbd55f8289ee7e5c7e0ea7
GIT binary patch
literal 278
zcmeYb3HD`RVPIq6XJD&G1q`eV%!!#r45GQoIq}K)MX6R<rFrQ&sX3{MWvRssyl~;N
z%)C?vVK^6}s-!42l|cw1n4F(jY?Tb6;teb2oSn?b*Py`R%KLhbZ0q9Nn{;v#CS0k?
zwU=>=UnEd>Xu^79Ep5pc9bZpe^_yStF=n^?3FD8GC5}{l743X}qUu`7{r-<?{?)5r
ze|9@x^W}J|(U;GEbl?9q%n~p>UA0=+_i1*ZYKy_+nkC!J6E|rDx%%wPxwUqBu#Lr^
x(z$ny=G~N=F(vHVfiH=BBxj#uYI;?+RYYs5*6fWUoqn&5sAMEEx?Q)k0s#3JdD{R0

literal 0
HcmV?d00001

diff --git a/mods/ITEMS/mcl_core/schematics/mcl_core_jungle_tree_huge_3.mts b/mods/ITEMS/mcl_core/schematics/mcl_core_jungle_tree_huge_3.mts
new file mode 100644
index 0000000000000000000000000000000000000000..c22f493343fd9afc8b023777079bdc67502796ef
GIT binary patch
literal 876
zcmeYb3HD`RVc=tsV&JRC2^iQIm=iOL7<hA&bK;Zpi&Cx1GV@XyMB&`5(!BJX)ST4B
zveaS*VKm{AqSRCdA&6jdeqymzGKh*d!Xjo^G3V{9zh%t|JV!sSuKzl>a*OS()mwd-
zJdb2Ze0%czW@dh~#&qplx#uLeFRacjd1{^YH`}<!c7@2+@Yj=dj~nIR={31(aClnf
z<NX$!yOLMNZ7a36`<$o#@xE{L_n0n&$=AQcgfI0!SHk;jJ@a{m!`ar;UjN-1!}T|I
z!P;3<qHgkiZhC(`zG~094Pp1pO6wG|GXHHUzPtDLk)QLV?7qjG?aX?-yXiVx$^O!?
z!*`bbZnfO~%O?B!qc_Lqx1K+|ZRr;G+uvp`o3wVK>hgf>_feK{hmVV=o4;TC|MvRU
z8n5iH#kKjT-W^m9K3)CdUtFr`zZkV8V$WLk$yK~Mm-+4)n=RA7+441fo~ujeufM%O
z#W!O1?kh~yoeNj5oiKmt(_Ln7|Eyc`<h>NL<>uV;mecNhO6T=1)z0{Lv~ST{OZ(kw
z(aTb=#ME0Cu1)X1ZZ_@iwv5-APu@k8N$z1^)WmeF;<0In!Y`MaCbsVOwAr82A1J>|
zHhLbLRFf*Q?(uhp@6z1yHp>#ap3nSX<!#x1o~<-)<8k2?sXB5ZUf(`<IN9^6{}*2Q
z;C|rx$-7_Kyw>*DbYC5Q*yC*UThkEvubX(5Z}DFlb@#7KZl(SDJa+x&{V%(U4rGU~
z`I4?<b??=?WhQr??w#koH;ip(lkHlY#V6vXl_$vE2-aYG_l?=>!?W*^&N0vOVpki^
z-m@x-;hcK%-joL)S6!HJoqfU`$?~h!w(L<=RTB4@t1pKxj$GYeaN^DDV&2`)C*9d}
zdDEXNzn6U9!`>NX=xA}>xpJ3V!d>B&*5kt~*6}=6<8ivm;B~#w@p0TTwve3>wsNbB
zmN&fqXWC^OXL?mx>jvwU25s?`N$W5F?_0Hi&C4>X^n8Tv%xR@pj(y(wPbA=7kmaSy
z8C{|$Z><SjKh=@vb>plgQ^T&ePYaLkbUM}iEx=+|$DL)Kp}HY*)y8r14*$~<ISe-I
bFZlD#qVfCEQwkF#^=q0gJ{7lPY`X&hnp?F`

literal 0
HcmV?d00001

diff --git a/mods/ITEMS/mcl_core/schematics/mcl_core_jungle_tree_huge_4.mts b/mods/ITEMS/mcl_core/schematics/mcl_core_jungle_tree_huge_4.mts
new file mode 100644
index 0000000000000000000000000000000000000000..fa3d74567fb98c04bd5dcef0e21b4401a7f12404
GIT binary patch
literal 838
zcmeYb3HD`RVc=tsW8kaD3m8}!m=iOL7<hA&bK;Zpi&Cx1GV@XyMB&`5(!BJX)ST4B
zveaS*VKm{AqSVxiId5lPoYbtq;~JPV|JSSUpI*Mp+A753sG^Y7w|Vp4WhJcz&Q`0Z
zC>UIp>HE2OXVTmMsvL&`qn;nSugK9Pf8F(h@uQ8GTB;=C|5$CDHYeH2FgD?^$l;hP
z|I)mweOP7Gepuf7c>H))@kF&U?{~FFHg7A~?=1f^v(C_tYkp{Y&H3mwG2!6IB!4&I
zjfKmfe9@ctH}}k5_T;Kr%wo-Qnh%wI*Q9%$*<O9VD{<~At8+_N>a`WO-?&)2?0I(g
zThZV5it2ZUh5x9svzS&Cq$jVtqx!IX_M{|lncvmk%bSjW@H@JHy=s{I8a??|&7Zc4
z;X3u<^SxG_UNzNt^P626y}9MpkKew2(6P97ZUB3o{Kc8wCo_Gg>Xx60HU4;UbLR7T
zBIje*t=TpAvusGzdo{gXRyEHrUiP#tKH_{`&9-`LS^U!Eb>Z6{AJIOv)$-ls8~;=4
z_B!<nM;J~qau>bgR60ZQ^|4NWWd#Z5NhLRXc8VT*61I`MdAh@9XUW;V$EHl)uuFk^
ze|X{2j0SeM51ESA^R6|>@HVTvGln14d>ojy-)cJJiW_gDF8|kL4!wUnEAGb;8D8e4
zZ=U)FvK_1IKeRN&^XZyN8$<1R{z}c<^r_Z#pWMtKM(+E|J{^6UQDwi3XRX`bKI!hR
zrEA`DT>Hh>rRgr+H<#0}Ywxw4s@;>fXnx<jbWW1lb*rr>y$oE#S;VBD-*It&a=&9n
zQ|;}|MJdVQL0eBs*lxM8-l24NWmnm+7dcMnc9ynX>02`=_{9RQFL_MXDSkcflFFSA
z7cUMuzL3SSLNBlNW!Ea%jF8gZqTe*XI*Zk<&zcz`b>-CJSAX4-G&IxWo`e0heeq+R
z<+^)U^aXsFD`?r}*zBJY%&j{;NcF0t-Te3dd;zz&ZIPPq+H4rWYWMfjDfghhxSOKZ
zc_$yK%on_GDZkt5k$Utl1+TstGw$A-7SvRb`f2`-t8=a#;y2=6znAMFzeL0WZvbQo
BkJ<nL

literal 0
HcmV?d00001

diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua
index 460bd0e15..78b81690a 100644
--- a/mods/MAPGEN/mcl_biomes/init.lua
+++ b/mods/MAPGEN/mcl_biomes/init.lua
@@ -13,9 +13,6 @@ local mod_mcl_crimson = minetest.get_modpath("mcl_crimson")
 local mod_mcl_blackstone = minetest.get_modpath("mcl_blackstone")
 local mod_mcl_mangrove = minetest.get_modpath("mcl_mangrove")
 
--- Jungle bush schematic. In PC/Java Edition it's Jungle Wood + Oak Leaves
-local jungle_bush_schematic = mod_mcl_core.."/schematics/mcl_core_jungle_bush_oak_leaves.mts"
-
 local deco_id_chorus_plant
 
 --
@@ -3266,13 +3263,13 @@ local function register_decorations()
 
 	-- Jungle tree
 
-	-- Huge jungle tree (2 variants)
-	for i=1, 2 do
+	-- Huge jungle tree (4 variants)
+	for i=1, 4 do
 		minetest.register_decoration({
 			deco_type = "schematic",
 			place_on = {"group:grass_block_no_snow", "mcl_core:dirt"},
 			sidelen = 80,
-			fill_ratio = 0.00125,
+			fill_ratio = 0.0008,
 			biomes = {"Jungle"},
 			y_min = 4,
 			y_max = mcl_vars.mg_overworld_max,
@@ -3284,7 +3281,7 @@ local function register_decorations()
 			deco_type = "schematic",
 			place_on = {"group:grass_block_no_snow", "mcl_core:dirt"},
 			sidelen = 80,
-			fill_ratio = 0.004,
+			fill_ratio = 0.003,
 			biomes = {"JungleM"},
 			y_min = 4,
 			y_max = mcl_vars.mg_overworld_max,
@@ -3299,7 +3296,55 @@ local function register_decorations()
 		deco_type = "schematic",
 		place_on = {"group:grass_block_no_snow", "mcl_core:dirt"},
 		sidelen = 80,
-		fill_ratio = 0.045,
+		fill_ratio = 0.025,
+		biomes = {"Jungle"},
+		y_min = 1,
+		y_max = mcl_vars.mg_overworld_max,
+		schematic = mod_mcl_core.."/schematics/mcl_core_jungle_tree.mts",
+		flags = "place_center_x, place_center_z",
+		rotation = "random",
+	})
+	minetest.register_decoration({
+		deco_type = "schematic",
+		place_on = {"group:grass_block_no_snow", "mcl_core:dirt"},
+		sidelen = 80,
+		fill_ratio = 0.015,
+		biomes = {"Jungle"},
+		y_min = 1,
+		y_max = mcl_vars.mg_overworld_max,
+		schematic = mod_mcl_core.."/schematics/mcl_core_jungle_tree_2.mts",
+		flags = "place_center_x, place_center_z",
+		rotation = "random",
+	})
+	minetest.register_decoration({
+		deco_type = "schematic",
+		place_on = {"group:grass_block_no_snow", "mcl_core:dirt"},
+		sidelen = 80,
+		fill_ratio = 0.005,
+		biomes = {"Jungle"},
+		y_min = 1,
+		y_max = mcl_vars.mg_overworld_max,
+		schematic = mod_mcl_core.."/schematics/mcl_core_jungle_tree_3.mts",
+		flags = "place_center_x, place_center_z",
+		rotation = "random",
+	})
+	minetest.register_decoration({
+		deco_type = "schematic",
+		place_on = {"group:grass_block_no_snow", "mcl_core:dirt"},
+		sidelen = 80,
+		fill_ratio = 0.005,
+		biomes = {"Jungle"},
+		y_min = 1,
+		y_max = mcl_vars.mg_overworld_max,
+		schematic = mod_mcl_core.."/schematics/mcl_core_jungle_tree_4.mts",
+		flags = "place_center_x, place_center_z",
+		rotation = "random",
+	})
+	minetest.register_decoration({
+		deco_type = "schematic",
+		place_on = {"group:grass_block_no_snow", "mcl_core:dirt"},
+		sidelen = 80,
+		fill_ratio = 0.025,
 		biomes = {"Jungle"},
 		y_min = 1,
 		y_max = mcl_vars.mg_overworld_max,
@@ -3328,7 +3373,7 @@ local function register_decorations()
 		biomes = {"JungleM"},
 		y_min = 1,
 		y_max = mcl_vars.mg_overworld_max,
-		schematic = mod_mcl_core.."/schematics/mcl_core_jungle_tree.mts",
+		schematic = mod_mcl_core.."/schematics/mcl_core_jungle_tree_2.mts",
 		flags = "place_center_x, place_center_z",
 		rotation = "random",
 	})
@@ -3928,7 +3973,7 @@ local function register_decorations()
 		sidelen = 80,
 		noise_params = {
 			offset = 0.0196,
-			scale = 0.025,
+			scale = 0.015,
 			spread = {x = 250, y = 250, z = 250},
 			seed = 2930,
 			octaves = 4,
@@ -3937,7 +3982,25 @@ local function register_decorations()
 		biomes = {"Jungle"},
 		y_min = 3,
 		y_max = mcl_vars.mg_overworld_max,
-		schematic = jungle_bush_schematic,
+		schematic = mod_mcl_core.."/schematics/mcl_core_jungle_bush_oak_leaves.mts",
+		flags = "place_center_x, place_center_z",
+	})
+	minetest.register_decoration({
+		deco_type = "schematic",
+		place_on = {"group:grass_block_no_snow", "mcl_core:dirt"},
+		sidelen = 80,
+		noise_params = {
+			offset = 0.0196,
+			scale = 0.005,
+			spread = {x = 250, y = 250, z = 250},
+			seed = 2930,
+			octaves = 4,
+			persist = 0.6,
+		},
+		biomes = {"Jungle"},
+		y_min = 3,
+		y_max = mcl_vars.mg_overworld_max,
+		schematic = mod_mcl_core.."/schematics/mcl_core_jungle_bush_oak_leaves_2.mts",
 		flags = "place_center_x, place_center_z",
 	})
 	minetest.register_decoration({
@@ -3955,7 +4018,7 @@ local function register_decorations()
 		biomes = {"JungleM"},
 		y_min = 1,
 		y_max = mcl_vars.mg_overworld_max,
-		schematic = jungle_bush_schematic,
+		schematic = mod_mcl_core.."/schematics/mcl_core_jungle_bush_oak_leaves.mts",
 		flags = "place_center_x, place_center_z",
 	})
 	minetest.register_decoration({
@@ -3973,7 +4036,7 @@ local function register_decorations()
 		biomes = {"JungleEdge", "JungleEdgeM"},
 		y_min = 3,
 		y_max = mcl_vars.mg_overworld_max,
-		schematic = jungle_bush_schematic,
+		schematic = mod_mcl_core.."/schematics/mcl_core_jungle_bush_oak_leaves.mts",
 		flags = "place_center_x, place_center_z",
 	})