From 6638a07512fd307a366e035fd1342954bef15863 Mon Sep 17 00:00:00 2001
From: Juraj Vajda <juraj.vajda@gmail.com>
Date: Mon, 20 Feb 2023 20:30:45 -0500
Subject: [PATCH] Add bamboo forest farming soil and small biome adjustments

---
 crafting.lua                   |  5 +--
 mapgen_bamboo_forest_under.lua |  3 +-
 nodes.lua                      | 15 ++++---
 nodes_farming.lua              | 73 ++++++++++++++++++++++++++++++++++
 4 files changed, 87 insertions(+), 9 deletions(-)

diff --git a/crafting.lua b/crafting.lua
index ed40b37..e5116fa 100644
--- a/crafting.lua
+++ b/crafting.lua
@@ -98,9 +98,8 @@ minetest.register_craft({
 minetest.register_craft({
     output = 'everness:bamboo_mosaic_wood',
     recipe = {
-        { 'stairs:slab_bamboo_wood', '', '' },
-        { 'stairs:slab_bamboo_wood', '', '' },
-        { '', '', '' },
+        { 'everness:bamboo_wood', 'everness:bamboo_wood' },
+        { 'everness:bamboo_wood', 'everness:bamboo_wood' },
     }
 })
 
diff --git a/mapgen_bamboo_forest_under.lua b/mapgen_bamboo_forest_under.lua
index e759274..05fcc37 100644
--- a/mapgen_bamboo_forest_under.lua
+++ b/mapgen_bamboo_forest_under.lua
@@ -50,7 +50,8 @@ minetest.register_decoration({
     biomes = { 'everness_bamboo_forest_under' },
     y_max = y_max,
     y_min = y_min,
-    flags = 'all_floors',
+    place_offset_y = -1,
+    flags = 'all_floors,force_placement',
     decoration = {
         'everness:moss_block',
         'default:clay'
diff --git a/nodes.lua b/nodes.lua
index 6ecc480..78656bc 100644
--- a/nodes.lua
+++ b/nodes.lua
@@ -3170,7 +3170,8 @@ minetest.register_node('everness:bamboo_1', {
         flammable = 2,
         bamboo = 1,
         bamboo_small = 1,
-        bamboo_grass = 1
+        bamboo_grass = 1,
+        not_in_creative_inventory = 1
     },
     selection_box = {
         type = 'fixed',
@@ -3236,7 +3237,8 @@ minetest.register_node('everness:bamboo_2', {
         flammable = 2,
         bamboo = 1,
         bamboo_small = 1,
-        bamboo_grass = 1
+        bamboo_grass = 1,
+        not_in_creative_inventory = 1
     },
     selection_box = {
         type = 'fixed',
@@ -3304,7 +3306,8 @@ minetest.register_node('everness:bamboo_3', {
         flammable = 2,
         bamboo = 1,
         bamboo_large = 1,
-        bamboo_grass = 1
+        bamboo_grass = 1,
+        not_in_creative_inventory = 1
     },
     selection_box = {
         type = 'fixed',
@@ -3366,7 +3369,8 @@ minetest.register_node('everness:bamboo_4', {
         flammable = 2,
         bamboo = 1,
         bamboo_large = 1,
-        bamboo_grass = 1
+        bamboo_grass = 1,
+        not_in_creative_inventory = 1
     },
     selection_box = {
         type = 'fixed',
@@ -3428,7 +3432,8 @@ minetest.register_node('everness:bamboo_5', {
         flammable = 2,
         bamboo = 1,
         bamboo_large = 1,
-        bamboo_grass = 1
+        bamboo_grass = 1,
+        not_in_creative_inventory = 1
     },
     selection_box = {
         type = 'fixed',
diff --git a/nodes_farming.lua b/nodes_farming.lua
index 5c11264..4d48623 100644
--- a/nodes_farming.lua
+++ b/nodes_farming.lua
@@ -34,6 +34,47 @@ minetest.override_item('everness:dirt_with_coral_grass', {
     }
 })
 
+minetest.override_item('everness:dirt_1', {
+    soil = {
+        base = 'everness:dirt_1',
+        dry = 'everness:dirt_1_soil',
+        wet = 'everness:dirt_1_soil_wet'
+    }
+})
+
+minetest.override_item('everness:dirt_with_grass_1', {
+    soil = {
+        base = 'everness:dirt_with_grass_1',
+        dry = 'everness:dirt_1_soil',
+        wet = 'everness:dirt_1_soil_wet'
+    }
+})
+
+minetest.override_item('everness:dirt_with_grass_2', {
+    soil = {
+        base = 'everness:dirt_with_grass_2',
+        dry = 'everness:dirt_1_soil',
+        wet = 'everness:dirt_1_soil_wet'
+    }
+})
+
+minetest.override_item('everness:dirt_with_grass_extras_1', {
+    soil = {
+        base = 'everness:dirt_with_grass_extras_1',
+        dry = 'everness:dirt_1_soil',
+        wet = 'everness:dirt_1_soil_wet'
+    }
+})
+
+minetest.override_item('everness:dirt_with_grass_extras_2', {
+    soil = {
+        base = 'everness:dirt_with_grass_extras_2',
+        dry = 'everness:dirt_1_soil',
+        wet = 'everness:dirt_1_soil_wet'
+    }
+})
+
+
 -- normal soil
 minetest.register_node('everness:coral_dirt_soil', {
     description = S('Coral Dirt Soil'),
@@ -51,6 +92,22 @@ minetest.register_node('everness:coral_dirt_soil', {
     }
 })
 
+minetest.register_node('everness:dirt_1_soil', {
+    description = S('Dirt Soil'),
+    tiles = {
+        'everness_dirt_1.png^(everness_dirt_1.png^[mask:everness_farming_soil_overlay.png^[multiply:#51341E80)',
+        'everness_dirt_1.png'
+    },
+    drop = 'everness:dirt_1',
+    groups = { crumbly = 3, not_in_creative_inventory = 1, soil = 2, grassland = 1, field = 1 },
+    sounds = default.node_sound_dirt_defaults(),
+    soil = {
+        base = 'everness:dirt_1',
+        dry = 'everness:dirt_1_soil',
+        wet = 'everness:dirt_1_soil_wet'
+    }
+})
+
 -- wet soil
 minetest.register_node('everness:coral_dirt_soil_wet', {
     description = S('Coral Dirt Wet Soil'),
@@ -67,3 +124,19 @@ minetest.register_node('everness:coral_dirt_soil_wet', {
         wet = 'everness:coral_dirt_soil_wet'
     }
 })
+
+minetest.register_node('everness:dirt_1_soil_wet', {
+    description = S('Coral Dirt Wet Soil'),
+    tiles = {
+        'everness_dirt_1.png^(everness_dirt_1.png^[mask:everness_farming_soil_wet_overlay.png^[multiply:#51341E80)',
+        'everness_dirt_1.png^(everness_dirt_1.png^[mask:everness_farming_soil_wet_side_overlay.png^[multiply:#51341E80)',
+    },
+    drop = 'everness:dirt_1',
+    groups = { crumbly = 3, not_in_creative_inventory = 1, soil = 3, wet = 1, grassland = 1, field = 1 },
+    sounds = default.node_sound_dirt_defaults(),
+    soil = {
+        base = 'everness:dirt_1',
+        dry = 'everness:dirt_1_soil',
+        wet = 'everness:dirt_1_soil_wet'
+    }
+})