Unnamed Minor Update

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 # [Jul 26th 2024] Unnamed Minor Update
 
+- Add large jungle trees
+- CamelCase all schematics
+- Rename tree* schematics to proper tree names
+
+# [Jul 26th 2024] Unnamed Minor Update
+
 - Grasslands now act as a "middle point" for all biomes
 - Trees now spawn in grasslands
 

mods/pyutest/pyutest_core/flowers.lua

@@ -1,26 +1,26 @@
 PyuTestCore.registered_flowers = {}
 PyuTestCore.make_flower = function (name, desc, texture, dye, add_to_registry, drawtype, econf)
   PyuTestCore.make_node(name, desc, {
-    block = PyuTestCore.BLOCK_BREAKABLE_INSTANT,
-    flammable = 1,
-    flower = 1,
-    attached_node = 3,
-    dig_immediate = 1
+      block = PyuTestCore.BLOCK_BREAKABLE_INSTANT,
+      flammable = 1,
+      flower = 1,
+      attached_node = 3,
+      dig_immediate = 1
   }, {texture}, PyuTestCore.util.tableconcat({
-    drawtype = drawtype or "plantlike",
-    walkable = false,
-    waving = 1,
-    buildable_to = true,
-    paramtype = "light",
-    sunlight_propagates = true,
-    inventory_image = texture
+        drawtype = drawtype or "plantlike",
+        walkable = false,
+        waving = 1,
+        buildable_to = true,
+        paramtype = "light",
+        sunlight_propagates = true,
+        inventory_image = texture
   }, econf or {}))
 
   if dye ~= nil then
     minetest.register_craft({
-      output = dye .. " 2",
-      recipe = {name},
-      type = "shapeless"
+        output = dye .. " 2",
+        recipe = {name},
+        type = "shapeless"
     })
   end
 
@@ -46,17 +46,17 @@ PyuTestCore.make_flower("pyutest_core:grass_plant", "Grass", "grass-plant.png",
 PyuTestCore.make_flower("pyutest_core:sugarcane", "Sugarcane", "sugarcane.png", "pyutest_core:green_dye", false, nil)
 
 PyuTestCore.make_node("pyutest_core:lilypad", "Lily Pad", {
-  block = PyuTestCore.BLOCK_BREAKABLE_INSTANT
+    block = PyuTestCore.BLOCK_BREAKABLE_INSTANT
 }, {"lilypad.png"}, {
-  drawtype = "nodebox",
-  paramtype = "light",
-  paramtype2 = "facedir",
-  buildable_to = true,
-  sunlight_propagates = true,
-  node_box = {
-    type = "fixed",
-    fixed = {-0.5, -31/64, -0.5, 0.5, -15/32, 0.5}
-  },
+    drawtype = "nodebox",
+    paramtype = "light",
+    paramtype2 = "facedir",
+    buildable_to = true,
+    sunlight_propagates = true,
+    node_box = {
+      type = "fixed",
+      fixed = {-0.5, -31/64, -0.5, 0.5, -15/32, 0.5}
+    },
 })
 
 -- Plants after the floral update
@@ -66,36 +66,37 @@ PyuTestCore.make_flower("pyutest_core:orange_tulip", "Orange Tulip", "orange-tul
 PyuTestCore.make_flower("pyutest_core:black_rose", "Black Rose", "black-rose.png", "pyutest_core:black_dye", true)
 
 PyuTestCore.make_node("pyutest_core:vines", "Vines", {
-  block = PyuTestCore.BLOCK_BREAKABLE_INSTANT
+    block = PyuTestCore.BLOCK_BREAKABLE_INSTANT,
+    attached_node = 1
 }, {"vines.png"}, {
-  drawtype = "signlike",
-  paramtype = "light",
-  walkable = false,
-  climbable = true,
-  buildable_to = true,
-  sunlight_propagates = true,
-  paramtype2 = "wallmounted",
-  selection_box = {
-    type = "wallmounted"
-  },
-  inventory_image = "vines.png"
+    drawtype = "signlike",
+    paramtype = "light",
+    walkable = false,
+    climbable = true,
+    buildable_to = true,
+    sunlight_propagates = true,
+    paramtype2 = "wallmounted",
+    selection_box = {
+      type = "wallmounted"
+    },
+    inventory_image = "vines.png"
 })
 
 PyuTestCore.make_flower("pyutest_core:kelp", "Kelp", "kelp.png", "pyutest_core:green_dye", false, "plantlike_rooted", {
-  paramtype2 = "leveled",
-  place_param2 = 128,
-  wield_image = "kelp.png",
-  special_tiles = {
-    {
-      image = "kelp.png",
-      tileable_vertical = true
+    paramtype2 = "leveled",
+    place_param2 = 128,
+    wield_image = "kelp.png",
+    special_tiles = {
+      {
+        image = "kelp.png",
+        tileable_vertical = true
+      },
+    },
+    tiles = {
+      "gravel.png"
     },
-  },
-  tiles = {
-    "gravel.png"
-  },
 
-  walkable = true
+    walkable = true
 })
 
 

mods/pyutest/pyutest_core/magic.lua

@@ -81,20 +81,19 @@ minetest.register_craft({
   }
 })
 
--- these tools are worth the hassle
 PyuTestCore.make_tool("pyutest_core:enchanted_pickaxe", "Enchanted Pickaxe", {}, "enchanted-pickaxe.png", {
   stack_max = 1,
   tool_capabilities = {
     groupcaps = {
       block = {
         times = {
-          [PyuTestCore.BLOCK_BREAKABLE_INSTANT] = 0.015,
-          [PyuTestCore.BLOCK_BREAKABLE_NORMAL] = 0.035,
-          [PyuTestCore.BLOCK_BREAKABLE_CHOPPY] = 0.075,
-          [PyuTestCore.BLOCK_BREAKABLE_MIDDLE] = 0.15,
+          [PyuTestCore.BLOCK_BREAKABLE_INSTANT] = 0.035,
+          [PyuTestCore.BLOCK_BREAKABLE_NORMAL] = 0.35,
+          [PyuTestCore.BLOCK_BREAKABLE_CHOPPY] = 0.45,
+          [PyuTestCore.BLOCK_BREAKABLE_MIDDLE] = 0.45,
           [PyuTestCore.BLOCK_BREAKABLE_LONG] = 0.8,
-          [PyuTestCore.BLOCK_BREAKABLE_VERYLONG] = 1.2,
-          [PyuTestCore.BLOCK_BREAKABLE_FOREVER] = 3
+          [PyuTestCore.BLOCK_BREAKABLE_VERYLONG] = 3,
+          [PyuTestCore.BLOCK_BREAKABLE_FOREVER] = 7
         },
         uses = 3600,
       }

mods/pyutest/pyutest_core/tools.lua

@@ -58,8 +58,8 @@ PyuTestCore.make_tool("pyutest_core:stone_pickaxe", "Stone Pickaxe", {}, "stone-
           [PyuTestCore.BLOCK_BREAKABLE_INSTANT] = 0.065,
           [PyuTestCore.BLOCK_BREAKABLE_NORMAL] = 0.55,
           [PyuTestCore.BLOCK_BREAKABLE_CHOPPY] = 0.9,
-          [PyuTestCore.BLOCK_BREAKABLE_MIDDLE] = 1.7,
-          [PyuTestCore.BLOCK_BREAKABLE_LONG] = 2.2,
+          [PyuTestCore.BLOCK_BREAKABLE_MIDDLE] = 1.1,
+          [PyuTestCore.BLOCK_BREAKABLE_LONG] = 2.1,
           [PyuTestCore.BLOCK_BREAKABLE_VERYLONG] = 9,
           [PyuTestCore.BLOCK_BREAKABLE_FOREVER] = 15
         },
@@ -79,11 +79,11 @@ PyuTestCore.make_tool("pyutest_core:iron_pickaxe", "Iron Pickaxe", {}, "iron-pic
         times = {
           [PyuTestCore.BLOCK_BREAKABLE_INSTANT] = 0.035,
           [PyuTestCore.BLOCK_BREAKABLE_NORMAL] = 0.35,
-          [PyuTestCore.BLOCK_BREAKABLE_CHOPPY] = 0.7,
-          [PyuTestCore.BLOCK_BREAKABLE_MIDDLE] = 0.7,
-          [PyuTestCore.BLOCK_BREAKABLE_LONG] = 1.9,
+          [PyuTestCore.BLOCK_BREAKABLE_CHOPPY] = 0.8,
+          [PyuTestCore.BLOCK_BREAKABLE_MIDDLE] = 0.8,
+          [PyuTestCore.BLOCK_BREAKABLE_LONG] = 1.7,
           [PyuTestCore.BLOCK_BREAKABLE_VERYLONG] = 7,
-          [PyuTestCore.BLOCK_BREAKABLE_FOREVER] = 13
+          [PyuTestCore.BLOCK_BREAKABLE_FOREVER] = 11
         },
         uses = 750,
       }
@@ -103,7 +103,7 @@ PyuTestCore.make_tool("pyutest_core:diamond_pickaxe", "Diamond Pickaxe", {}, "di
           [PyuTestCore.BLOCK_BREAKABLE_NORMAL] = 0.35,
           [PyuTestCore.BLOCK_BREAKABLE_CHOPPY] = 0.6,
           [PyuTestCore.BLOCK_BREAKABLE_MIDDLE] = 0.6,
-          [PyuTestCore.BLOCK_BREAKABLE_LONG] = 1.9,
+          [PyuTestCore.BLOCK_BREAKABLE_LONG] = 1.3,
           [PyuTestCore.BLOCK_BREAKABLE_VERYLONG] = 5,
           [PyuTestCore.BLOCK_BREAKABLE_FOREVER] = 8
         },

mods/pyutest/pyutest_mapgen/structures.lua

@@ -1,30 +1,8 @@
-PyuTestMapgen.register_structure("igloo", "igloo", {
-  place_on = {"pyutest_core:snow_block"},
-  fill_ratio = 0.00004,
-  biomes = {"frozen_plains"},
-  y_max = PyuTestCore_BiomeTops.frozen_plains,
-  y_min = 1,
-  schematic = PyuTestCore.get_schem_path("igloo"),
-  rotation = "random",
-  flags = "place_center_x, place_center_z",
-  place_offset_y = 1
-})
-
-PyuTestMapgen.register_structure("desertwell", "desertwell", {
-  place_on = {"pyutest_core:sand_block"},
-  fill_ratio = 0.00006,
-  biomes = {"desert"},
-  y_max = PyuTestCore_BiomeTops.desert,
-  y_min = 1,
-  rotation = "random"
-})
-
 minetest.register_decoration({
   deco_type = "simple",
   sidelen = 16,
   fill_ratio = 0.0003,
   place_on = {"group:ground"},
-  biomes = minetest.registered_biomes,
   y_max = PyuTestCore_BiomeTops.mountains,
   y_min = PyuTestCore_SurfaceBottom,
   decoration = {
@@ -36,7 +14,27 @@ minetest.register_decoration({
   }
 })
 
-PyuTestMapgen.register_structure("ice_spike", "icespike", {
+PyuTestMapgen.register_structure("igloo", "Igloo", {
+  place_on = {"pyutest_core:snow_block"},
+  fill_ratio = 0.00004,
+  biomes = {"frozen_plains"},
+  y_max = PyuTestCore_BiomeTops.frozen_plains,
+  y_min = 1,
+  rotation = "random",
+  flags = "place_center_x, place_center_z",
+  place_offset_y = 1
+})
+
+PyuTestMapgen.register_structure("desertwell", "DesertWell", {
+  place_on = {"pyutest_core:sand_block"},
+  fill_ratio = 0.00006,
+  biomes = {"desert"},
+  y_max = PyuTestCore_BiomeTops.desert,
+  y_min = 1,
+  rotation = "random"
+})
+
+PyuTestMapgen.register_structure("ice_spike", "IceSpike", {
   fill_ratio = 0.0008,
   place_on = {
     "pyutest_core:ice_block",
@@ -54,7 +52,7 @@ PyuTestMapgen.register_structure("ice_spike", "icespike", {
   num_spawn_by = 2
 })
 
-PyuTestMapgen.register_structure("obsidian_mound", "obsidian-mound", {
+PyuTestMapgen.register_structure("obsidian_mound", "ObsidianMound", {
   fill_ratio = 0.0001,
   place_on = {"pyutest_core:mycelium_block"},
   biomes = {
@@ -64,7 +62,7 @@ PyuTestMapgen.register_structure("obsidian_mound", "obsidian-mound", {
   y_min = PyuTestCore_SurfaceBottom,
 })
 
-PyuTestMapgen.register_structure("ocean_ruins", "ocean_ruins", {
+PyuTestMapgen.register_structure("ocean_ruins", "OceanRuins", {
   fill_ratio = 0.0002,
   place_on = {"pyutest_core:gravel_block"},
   biomes = PyuTestCore.get_biomes_from_type(PyuTestCore.BIOME_TYPES.OCEAN),
@@ -74,7 +72,7 @@ PyuTestMapgen.register_structure("ocean_ruins", "ocean_ruins", {
   num_spawn_by = 2
 })
 
-PyuTestMapgen.register_structure("snowman_tower", "snowman_tower", {
+PyuTestMapgen.register_structure("snowman_tower", "SnowmanTower", {
   fill_ratio = 0.00002,
   place_on = {
     "pyutest_core:ice_block",

mods/pyutest/pyutest_mapgen/trees.lua

@@ -89,7 +89,7 @@ minetest.register_decoration({
   biomes = {"forest", "old_growth_forest"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("tree"),
+  schematic = PyuTestCore.get_schem_path("Tree"),
   rotation = "random",
   flags = "place_center_x, place_center_z",
 })
@@ -102,7 +102,7 @@ minetest.register_decoration({
   biomes = {"grassland"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("tree"),
+  schematic = PyuTestCore.get_schem_path("Tree"),
   rotation = "random",
   flags = "place_center_x, place_center_z",
 })
@@ -115,7 +115,7 @@ minetest.register_decoration({
   biomes = {"forest", "old_growth_forest"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("tree2"),
+  schematic = PyuTestCore.get_schem_path("Tree2"),
   rotation = "random",
   flags = "place_center_x, place_center_z",
 })
@@ -128,7 +128,7 @@ minetest.register_decoration({
   biomes = {"savanna"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("tree4"),
+  schematic = PyuTestCore.get_schem_path("SavannaTree"),
   rotation = "random",
   flags = "place_center_x, place_center_z",
   place_offset_y = 1
@@ -142,7 +142,7 @@ minetest.register_decoration({
   biomes = {"mushroom_fields", "large_mushroom_forest"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("mushroom"),
+  schematic = PyuTestCore.get_schem_path("Mushroom"),
   rotation = "random",
   flags = "place_center_x, place_center_z"
 })
@@ -155,7 +155,7 @@ minetest.register_decoration({
   biomes = {"old_growth_forest"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("mushroom"),
+  schematic = PyuTestCore.get_schem_path("Mushroom"),
   rotation = "random",
   flags = "place_center_x, place_center_z"
 })
@@ -168,7 +168,7 @@ minetest.register_decoration({
   biomes = {"old_growth_forest"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("tree"),
+  schematic = PyuTestCore.get_schem_path("Tree"),
   rotation = "random",
   flags = "place_center_x, place_center_z"
 })
@@ -181,7 +181,7 @@ minetest.register_decoration({
   biomes = {"old_growth_forest"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("tree3"),
+  schematic = PyuTestCore.get_schem_path("OldGrowthTree"),
   rotation = "random",
   flags = "place_center_x, place_center_z",
 })
@@ -194,7 +194,7 @@ minetest.register_decoration({
   biomes = {"taiga"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("tree5"),
+  schematic = PyuTestCore.get_schem_path("TaigaTree"),
   rotation = "random",
   flags = "place_center_x, place_center_z",
 })
@@ -207,7 +207,7 @@ minetest.register_decoration({
   biomes = {"birch_forest"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("tree6"),
+  schematic = PyuTestCore.get_schem_path("BirchTree"),
   rotation = "random",
   flags = "place_center_x, place_center_z",
 })
@@ -220,7 +220,7 @@ minetest.register_decoration({
   biomes = {"birch_forest", "old_growth_birch_forest"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("tree7"),
+  schematic = PyuTestCore.get_schem_path("TallBirchTree"),
   rotation = "random",
   flags = "place_center_x, place_center_z",
 })
@@ -233,7 +233,7 @@ minetest.register_decoration({
   biomes = {"cherry_grove"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("tree8"),
+  schematic = PyuTestCore.get_schem_path("CherryTree"),
   rotation = "random",
   flags = "place_center_x, place_center_z",
 })
@@ -246,7 +246,7 @@ minetest.register_decoration({
   biomes = {"snowy_forest"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("stree"),
+  schematic = PyuTestCore.get_schem_path("SnowyTree1"),
   rotation = "random",
   flags = "place_center_x, place_center_z",
 })
@@ -259,7 +259,7 @@ minetest.register_decoration({
   biomes = {"snowy_forest"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("stree2"),
+  schematic = PyuTestCore.get_schem_path("SnowyTree2"),
   rotation = "random",
   flags = "place_center_x, place_center_z",
 })
@@ -272,7 +272,7 @@ minetest.register_decoration({
   biomes = {"swamp"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("tree9"),
+  schematic = PyuTestCore.get_schem_path("SwampTree"),
   rotation = "random",
   flags = "place_center_x, place_center_z",
 })
@@ -285,7 +285,7 @@ minetest.register_decoration({
   biomes = {"old_growth_birch_forest"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("tree10"),
+  schematic = PyuTestCore.get_schem_path("VeryTallBirchTree"),
   rotation = "random",
   flags = "place_center_x, place_center_z",
 })
@@ -298,7 +298,7 @@ minetest.register_decoration({
   biomes = {"aspen_forest"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("tree11"),
+  schematic = PyuTestCore.get_schem_path("AspenTree1"),
   rotation = "random",
   flags = "place_center_x, place_center_z",
 })
@@ -311,7 +311,7 @@ minetest.register_decoration({
   biomes = {"aspen_forest"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("tree12"),
+  schematic = PyuTestCore.get_schem_path("AspenTree2"),
   rotation = "random",
   flags = "place_center_x, place_center_z",
 })
@@ -324,7 +324,7 @@ minetest.register_decoration({
   biomes = {"redwood_forest"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("tree13"),
+  schematic = PyuTestCore.get_schem_path("RedwoodTree"),
   rotation = "random",
   flags = "place_center_x, place_center_z",
 })
@@ -337,7 +337,7 @@ minetest.register_decoration({
   biomes = {"jungle"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("tree14"),
+  schematic = PyuTestCore.get_schem_path("JungleTree"),
   rotation = "random",
   flags = "place_center_x, place_center_z",
 })
@@ -350,7 +350,20 @@ minetest.register_decoration({
   biomes = {"jungle"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("tree15"),
+  schematic = PyuTestCore.get_schem_path("SmallJungleTree"),
+  rotation = "random",
+  flags = "place_center_x, place_center_z",
+})
+
+minetest.register_decoration({
+  deco_type = "schematic",
+  place_on = {"group:grass"},
+  sidelen = 16,
+  fill_ratio = 0.013,
+  biomes = {"jungle"},
+  y_max = PyuTestCore_WorldTop,
+  y_min = 1,
+  schematic = PyuTestCore.get_schem_path("LargeJungleTree"),
   rotation = "random",
   flags = "place_center_x, place_center_z",
 })
@@ -363,7 +376,7 @@ minetest.register_decoration({
   biomes = {"jungle"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("jbush"),
+  schematic = PyuTestCore.get_schem_path("JungleBush"),
   rotation = "random",
   flags = "place_center_x, place_center_z",
 })
@@ -376,7 +389,7 @@ minetest.register_decoration({
   biomes = {"large_mushroom_forest"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("tall_mushroom"),
+  schematic = PyuTestCore.get_schem_path("TallMushroom"),
   rotation = "random",
   flags = "place_center_x, place_center_z"
 })
@@ -389,7 +402,7 @@ minetest.register_decoration({
   biomes = {"large_mushroom_forest"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("small_mushroom"),
+  schematic = PyuTestCore.get_schem_path("SmallMushroom"),
   rotation = "random",
   flags = "place_center_x, place_center_z",
   place_offset_y = 1
@@ -403,7 +416,7 @@ minetest.register_decoration({
   biomes = {"large_mushroom_forest"},
   y_max = PyuTestCore_WorldTop,
   y_min = 1,
-  schematic = PyuTestCore.get_schem_path("fallen_mushroom"),
+  schematic = PyuTestCore.get_schem_path("FallenMushroom"),
   rotation = "random",
   flags = "place_center_x, place_center_z",
   place_offset_y = 1