From 2550b4782ea775a49119dc70915b0fa3ddbc9db0 Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Wed, 24 Feb 2021 00:48:16 -0500 Subject: [PATCH] Disable spawning default trees bearing apples and stop calling them apple trees. We already have REAL apple trees. --- README.md | 2 +- mods/default/README.txt | 6 ++--- mods/default/mapgen.lua | 4 ++-- mods/default/schematics/apple_tree.mts | Bin 209 -> 0 bytes .../schematics/apple_tree_from_sapling.mts | Bin 208 -> 0 bytes .../{apple_log.mts => default_log.mts} | Bin mods/default/schematics/default_tree.mts | Bin 0 -> 192 bytes .../schematics/default_tree_from_sapling.mts | Bin 0 -> 190 bytes mods/default/trees.lua | 4 ++-- .../customize-dreambuilder-game.sh | 22 ++++++++++++++++++ 10 files changed, 30 insertions(+), 8 deletions(-) delete mode 100644 mods/default/schematics/apple_tree.mts delete mode 100644 mods/default/schematics/apple_tree_from_sapling.mts rename mods/default/schematics/{apple_log.mts => default_log.mts} (100%) create mode 100644 mods/default/schematics/default_tree.mts create mode 100644 mods/default/schematics/default_tree_from_sapling.mts diff --git a/README.md b/README.md index 538e95a2..a61f6893 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ This game is in use on my Creative server and on my Survival server, which also * The default lavacooling code has been supplanted by better, safer code from my Gloopblocks mod. That mod also provides stone/cobble --> mossy stone/cobble transformation in the presence of water. * An extensive selection of administration tools for single-player and server use are included, such as areas, maptools, worldedit, xban, and more. * A few textures here and there are different. -* The mapgen won't spawn apples on default trees, nor will they appear on a sapling-grown default tree. Only the *real* apple trees supplied by the Moretrees mod will bear apples (both at mapgen time and sapling-grown). Or at least that's how it's supposed to work. :stuck_out_tongue: While on that subject, apples now use a 3d model instead of the plantlike version. +* The mapgen won't spawn apples on default trees, nor will they appear on a sapling-grown default tree. Only the *real* apple trees supplied by the Moretrees mod will bear apples (both at mapgen time and sapling-grown). While on that subject, apples now use a 3d model instead of the plantlike version. ##   diff --git a/mods/default/README.txt b/mods/default/README.txt index 06266be1..023b76ac 100644 --- a/mods/default/README.txt +++ b/mods/default/README.txt @@ -378,8 +378,8 @@ paramat (CC BY-SA 3.0): acacia_bush.mts acacia_tree.mts acacia_tree_from_sapling.mts - apple_tree.mts - apple_tree_from_sapling.mts + default_tree.mts + default_tree_from_sapling.mts aspen_tree.mts aspen_tree_from_sapling.mts bush.mts @@ -398,7 +398,7 @@ paramat (CC BY-SA 3.0): Shara RedCat (CC BY-SA 3.0): acacia_log.mts - apple_log.mts + default_log.mts aspen_log.mts jungle_log.mts pine_log.mts diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua index 8c161d1e..e1553a7b 100644 --- a/mods/default/mapgen.lua +++ b/mods/default/mapgen.lua @@ -1828,7 +1828,7 @@ function default.register_decorations() biomes = {"deciduous_forest"}, y_max = 31000, y_min = 1, - schematic = minetest.get_modpath("default") .. "/schematics/apple_tree.mts", + schematic = minetest.get_modpath("default") .. "/schematics/default_tree.mts", flags = "place_center_x, place_center_z", rotation = "random", }) @@ -1850,7 +1850,7 @@ function default.register_decorations() biomes = {"deciduous_forest"}, y_max = 31000, y_min = 1, - schematic = minetest.get_modpath("default") .. "/schematics/apple_log.mts", + schematic = minetest.get_modpath("default") .. "/schematics/default_log.mts", flags = "place_center_x", rotation = "random", spawn_by = "default:dirt_with_grass", diff --git a/mods/default/schematics/apple_tree.mts b/mods/default/schematics/apple_tree.mts deleted file mode 100644 index d56cd54b8efb295ccb5ab11b99cc914c8627dca1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 209 zcmeYb3HD`RVPI$AU|_GWx332QAfGugvxtE&B{eOvG^fNWCpEDwwU~hy#!oCL$Vp}3 zfpJTUQd2ADyq$QFx50peHIVIPN6!bh<3X(^QI|8W>Srn?70vPQWXsZ8KJUIx@!7;V zkG9-@$|-$(Zv4+9`_7-6u6}x(-)F_^(wTFg8x(xqGX4F!kGub0zh${6ULkvb8zZNI zRO@%$+SzGgMt)Hb^R91hn-bmBU?!9HKASgydCG+kw)5V9`~K(k<|u|ZPwndfaEDza diff --git a/mods/default/schematics/apple_tree_from_sapling.mts b/mods/default/schematics/apple_tree_from_sapling.mts deleted file mode 100644 index 232510034d7d858e36a8a9fcfdd96c76d988f07e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmeYb3HD`RVPI$AU|_GWx332QAfGugvxtE&B{eOvG^fNWCpEDwwU~hy#!oCL$Vp}3 zfpJTUQd2ADyq$QLw?ToYrIGJYM^C|G?bay^oH+LTPdl=>?e+1MLBdN9pZY!bsLtdL ztF@nE!!BsNec~zl%i6lMe2#9}v&q@+Q6Gbq0={jVnm?uD-T$d+e&@>z0)OW;u-@o> yFkLfumif=kaYef?2tKVU(b*8E6LVv;Y)*di%?7Ld%6$*t|Gd6&7o&!g`gH((_g#ko diff --git a/mods/default/schematics/apple_log.mts b/mods/default/schematics/default_log.mts similarity index 100% rename from mods/default/schematics/apple_log.mts rename to mods/default/schematics/default_log.mts diff --git a/mods/default/schematics/default_tree.mts b/mods/default/schematics/default_tree.mts new file mode 100644 index 0000000000000000000000000000000000000000..d28f388f68eefdb7817a15e68dbf63fcce100e23 GIT binary patch literal 192 zcmeYb3HD`RVPI$AU|_GWx332Q24)84#LOZFzLeCo#L}D+tDMxtveaS*9vHu*C^fZW z&fY29Tn7|59L{oAv-H2)a<(JXCBAu9^7-k!Oc5Od?(^pNOmLeywfbh_;V(~&&EEXK zS7`D1SHR2HF5Ax~8zp?(cK!aEkN5tsz8bU6-{-wm+s4+5GL`EuZSUN)#KNO(cWhL5 r?RsIunu;yox3YCGx=r8r_OI{!=QVToF3j4t`q+lM-xwy>>-qx#UeH=` literal 0 HcmV?d00001 diff --git a/mods/default/schematics/default_tree_from_sapling.mts b/mods/default/schematics/default_tree_from_sapling.mts new file mode 100644 index 0000000000000000000000000000000000000000..cf52c20d87b85eafb82b6514259f6098cc937db5 GIT binary patch literal 190 zcmeYb3HD`RVPI$AU|_GWx332Q24)84#LOZFzLeCo#L}D+tDMxtveaS*9vHu*C^fZW z&fY1!d<_a5trNM6S^DA{4oAM4v;VyAlCM9iwsLM*kf8nEUu#Kd+0)%`79`&KDJuP? zzD(v_ja^95T#wgvJ}hV6efxA)=>6aQx6VBMc|_#(jNZ^!X`g>jvGeu$v}VekcO`vK pf0pD}1hC(nH|O5*RgJgzy#2Xs|MNZP<^`DEs(lo;H&#v44****T>}6B literal 0 HcmV?d00001 diff --git a/mods/default/trees.lua b/mods/default/trees.lua index 569beee8..68babbe7 100644 --- a/mods/default/trees.lua +++ b/mods/default/trees.lua @@ -124,7 +124,7 @@ local function add_trunk_and_leaves(data, a, pos, tree_cid, leaves_cid, local x, y, z = pos.x, pos.y, pos.z local c_air = minetest.get_content_id("air") local c_ignore = minetest.get_content_id("ignore") - local c_apple = minetest.get_content_id("default:apple") + local c_apple = minetest.get_content_id("default:leaves") -- Trunk data[a:index(x, y, z)] = tree_cid -- Force-place lowest trunk node to replace sapling @@ -393,7 +393,7 @@ end function default.grow_new_apple_tree(pos) local path = minetest.get_modpath("default") .. - "/schematics/apple_tree_from_sapling.mts" + "/schematics/default_tree_from_sapling.mts" minetest.place_schematic({x = pos.x - 3, y = pos.y - 1, z = pos.z - 3}, path, "random", nil, false) end diff --git a/mods/dreambuilder_extras/customize-dreambuilder-game.sh b/mods/dreambuilder_extras/customize-dreambuilder-game.sh index ec760336..9ff23bb5 100755 --- a/mods/dreambuilder_extras/customize-dreambuilder-game.sh +++ b/mods/dreambuilder_extras/customize-dreambuilder-game.sh @@ -60,11 +60,33 @@ mv $workdir"/mods/dreambuilder_extras/dreambuilder_screenshot.png" $workdir"/ mv $workdir"/mods/dreambuilder_extras/dreambuilder_menu_icon.png" $workdir"/menu/icon.png" mv $workdir"/mods/dreambuilder_extras/dreambuilder_menu_overlay.png" $workdir"/menu/background.png" +# Convert fake "apple" trees back into just normal default trees, +# and don't let them spawn with apples. Ever. + +mv $workdir"/mods/dreambuilder_extras/default_tree.mts" $workdir"/mods/default/schematics/" +mv $workdir"/mods/dreambuilder_extras/default_tree_from_sapling.mts" $workdir"/mods/default/schematics/" + +mv $workdir"/mods/default/schematics/apple_log.mts" \ + $workdir"/mods/default/schematics/default_log.mts" + +rm $workdir"/mods/default/schematics/apple_tree.mts" +rm $workdir"/mods/default/schematics/apple_tree_from_sapling.mts" + +sed -i "s:/schematics/apple_tree_from_sapling.mts:/schematics/default_tree_from_sapling.mts:g" $workdir"/mods/default/trees.lua" +sed -i "s:/schematics/apple_tree.mts:/schematics/default_tree.mts:" $workdir"/mods/default/mapgen.lua" +sed -i "s:/schematics/apple_log.mts:/schematics/default_log.mts:" $workdir"/mods/default/mapgen.lua" + +sed -i 's/local c_apple = minetest.get_content_id("default:apple")/local c_apple = minetest.get_content_id("default:leaves")/' $workdir"/mods/default/trees.lua" + sed -i 's/Apple Wood Planks/Wood Planks/g' $workdir"/mods/default/nodes.lua" sed -i 's/Apple Tree Leaves/Leaves/' $workdir"/mods/default/nodes.lua" sed -i 's/Apple Tree Sapling/Sapling/' $workdir"/mods/default/nodes.lua" sed -i 's/Apple Tree/Tree/' $workdir"/mods/default/nodes.lua" +sed -i "s/apple_tree.mts/default_tree.mts/" $workdir"/mods/default/README.txt" +sed -i "s/apple_log.mts/default_log.mts/" $workdir"/mods/default/README.txt" +sed -i "s/apple_tree_from_sapling.mts/default_tree_from_sapling.mts/" $workdir"/mods/default/README.txt" + echo -e "\nBring all mods up-to-date from "$upstream_mods_path cd $upstream_mods_path