Thatch and fiber migration

README.md

@@ -15,7 +15,7 @@ so backup your world first, and test before committing.
   - Replacements:
     - Tall Grass -> Sedges
     - Flowers (N.B some colors were changed to maintain balance)
-    - Reeds -> Rushes
+    - Reeds -> Rushes (added dormant state)
   - Existing nodes covered by aliases.
   - New mapgen areas will follow Vanilla generation logic.
 - Bug fixes
@@ -25,8 +25,8 @@ so backup your world first, and test before committing.
 
 ## Known Bugs, Issues, TODO
 
-- Need to be able to get fibers/thatch from vanilla plants
 - Merge spreading, decaying ABMs
 - Review bamboo ABMs
 - More code formatting cleanup
-- Reorg code, group by feature/theme
+- Reorg code, group by feature/theme
+- Restore biome decorations for all but flowers

init.lua

@@ -6,7 +6,6 @@ local include
 include("biomes")
 include("bamboo")
 include("nodes")
-include("thatch")
 include("schematic")
 include("bigdecor")
 include("plants")
@@ -14,5 +13,6 @@ include("fungi")
 include("decor")
 include("cultivate")
 
+include("thatch")
 include("migrate")
 include("mossy")

thatch.lua

@@ -5,10 +5,48 @@ local minetest, nodecore
 
 local modname = minetest.get_current_modname()
 
------------------------------------------
-------------------Thatch-----------------
+------------------------------------------------------------------------
+-- PLANT FIBERS
+
+minetest.register_craftitem(modname .. ":plant_fibers", {
+		description = ("Plant Fibers"),
+		inventory_image = modname .. "_plant_fibers.png",
+		wield_image = modname .. "_plant_fibers.png",
+		groups = {snappy = 1, flammable = 1},
+		sounds = nodecore.sounds("nc_terrain_swishy"),
+	})
+
+nodecore.register_craft({
+		label = "grind plants into fibers",
+		action = "pummel",
+		toolgroups = {crumbly = 2},
+		nodes = {
+			{
+				match = {stacked = true, groups = {flora_dry = true}, count = false}
+			}
+		},
+		after = function(pos)
+			local stack = nodecore.stack_get(pos)
+			stack:set_name(modname .. ":plant_fibers")
+			nodecore.stack_set(pos, stack)
+		end
+	})
+
+nodecore.register_craft({
+		label = "grind plant fibers to peat",
+		action = "pummel",
+		toolgroups = {crumbly = 2},
+		nodes = {
+			{
+				match = {name = modname .. ":plant_fibers", count = 8},
+				replace = "nc_tree:peat"
+			}
+		}
+	})
+
+------------------------------------------------------------------------
+-- THATCH
 
------Thatch Node-----
 minetest.register_node("nc_nature:thatch", {
 		description = "Thatch",
 		tiles = {"nc_nature_thatch.png"},
@@ -20,10 +58,10 @@ minetest.register_node("nc_nature:thatch", {
 		sounds = nodecore.sounds("nc_terrain_swishy")
 	})
 
------Crafting Thatch-----
 nodecore.register_craft({
 		label = "weave plant fibers into thatch",
 		action = "pummel",
+		toolgroups = {thumpy = 1},
 		duration = 3,
 		nodes = {
 			{
@@ -33,7 +71,6 @@ nodecore.register_craft({
 		},
 	})
 
------Recycling Thatch-----
 nodecore.register_craft({
 		label = "break thatch into fibers",
 		action = "pummel",
@@ -43,31 +80,7 @@ nodecore.register_craft({
 			{match = "nc_nature:thatch", replace = "air"}
 		},
 		items = {
-			{name = "nc_nature:plant_fibers", count = 8, scatter = 3}
+			{name = "nc_nature:plant_fibers 2", count = 4, scatter = 3}
 		},
 		itemscatter = 3
 	})
-
-----------------------------------------
---------------Plant Fibers--------------
-minetest.register_craftitem("nc_nature:plant_fibers", {
-		description = ("Plant Fibers"),
-		inventory_image = "nc_nature_plant_fibers.png",
-		wield_image = "nc_nature_plant_fibers.png",
-		groups = {snappy = 1, flammable = 1},
-		sounds = nodecore.sounds("nc_terrain_swishy"),
-	})
-
------Fibers To Peat-----
-nodecore.register_craft({
-		label = "grind plant fibers to peat",
-		action = "pummel",
-		-- priority = -1,
-		toolgroups = {crumbly = 2},
-		nodes = {
-			{
-				match = {name = modname .. ":plant_fibers", count = 8},
-				replace = "nc_tree:peat"
-			}
-		}
-	})