From 17c21794a98d23308ce927da5602cdc784cba978 Mon Sep 17 00:00:00 2001 From: Juraj Vajda Date: Thu, 30 Mar 2023 16:46:14 -0400 Subject: [PATCH] Remove hard dependency on default --- LICENSE.txt | 3 ++ api.lua | 1 + bamboo.lua | 1 + crafting.lua | 40 ++++++++++++---- nodes.lua | 54 +++++++++++++--------- stairs.lua | 11 +++++ textures/everness_glass.png | Bin 0 -> 233 bytes textures/everness_glass_detail.png | Bin 0 -> 144 bytes textures/everness_tinted_glass_detail.png | Bin 0 -> 107 bytes 9 files changed, 81 insertions(+), 29 deletions(-) create mode 100644 textures/everness_glass.png create mode 100644 textures/everness_glass_detail.png create mode 100644 textures/everness_tinted_glass_detail.png diff --git a/LICENSE.txt b/LICENSE.txt index 62faf89..f572fc0 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -825,6 +825,9 @@ GNU Lesser General Public License v2.1 or later (see included LICENSE file) - everness_crystal_forest_sun.png - everness_frosted_icesheet_sun_tonemap.png - everness_frosted_icesheet_sun.png +- everness_glass.png +- everness_glass_detail.png +- everness_tinted_glass_detail.png **CC-BY-SA-4.0, Pixel Perfection by XSSheep**, https://minecraft.curseforge.com/projects/pixel-perfection-freshly-updated diff --git a/api.lua b/api.lua index ed5013d..4d43a35 100644 --- a/api.lua +++ b/api.lua @@ -548,6 +548,7 @@ function Everness.grow_cactus(self, pos, node, params) if minetest.get_item_group(minetest.get_node(pos).name, 'mold_soil') == 0 or minetest.get_item_group(minetest.get_node(pos).name, 'sand') == 0 + or minetest.get_item_group(minetest.get_node(pos).name, 'everness_sand') == 0 then return end diff --git a/bamboo.lua b/bamboo.lua index ea5fac1..08d8e2f 100644 --- a/bamboo.lua +++ b/bamboo.lua @@ -91,6 +91,7 @@ function Everness.grow_bamboo(self, pos, elapsed) if minetest.get_item_group(node_below.name, 'soil') == 0 and minetest.get_item_group(node_below.name, 'sand') == 0 + and minetest.get_item_group(node_below.name, 'everness_sand') == 0 then if minetest.get_item_group(node_below.name, 'bamboo') > 0 then diff --git a/crafting.lua b/crafting.lua index f1b98a3..4806892 100644 --- a/crafting.lua +++ b/crafting.lua @@ -124,7 +124,7 @@ minetest.register_craft({ minetest.register_craft({ output = 'everness:pyrite_glass', recipe = { - { 'default:glass' }, + { 'group:glass' }, { 'everness:pyrite_ingot' }, } }) @@ -137,6 +137,24 @@ minetest.register_craft({ } }) +minetest.register_craft({ + output = 'everness:tinted_glass_red 8', + recipe = { + { 'everness:glass', 'everness:glass', 'everness:glass' }, + { 'everness:glass', 'everness:bloodspore_plant', 'everness:glass' }, + { 'everness:glass', 'everness:glass', 'everness:glass' }, + } +}) + +minetest.register_craft({ + output = 'everness:tinted_glass_red 8', + recipe = { + { 'everness:glass', 'everness:glass', 'everness:glass' }, + { 'everness:glass', 'everness:bloodspore_plant_small', 'everness:glass' }, + { 'everness:glass', 'everness:glass', 'everness:glass' }, + } +}) + minetest.register_craft({ output = 'everness:pyriteblock_brick 4', recipe = { @@ -488,9 +506,9 @@ minetest.register_craft({ minetest.register_craft({ output = 'everness:coral_forest_deep_ocean_lantern 1', recipe = { - { 'everness:coral_deep_ocean_sandstone_block', 'default:glass', 'everness:coral_deep_ocean_sandstone_block' }, - { 'default:glass', 'default:torch', 'default:glass' }, - { 'everness:coral_deep_ocean_sandstone_block', 'default:glass', 'everness:coral_deep_ocean_sandstone_block' }, + { 'everness:coral_deep_ocean_sandstone_block', 'group:glass', 'everness:coral_deep_ocean_sandstone_block' }, + { 'group:glass', 'group:torch', 'group:glass' }, + { 'everness:coral_deep_ocean_sandstone_block', 'group:glass', 'everness:coral_deep_ocean_sandstone_block' }, } }) @@ -542,8 +560,8 @@ minetest.register_craft({ minetest.register_craft({ output = 'everness:vine_shears', recipe = { - { '', 'default:steel_ingot', '' }, - { 'group:stick', 'group:wood', 'default:steel_ingot' }, + { '', 'everness:pyrite_ingot', '' }, + { 'group:stick', 'group:wood', 'everness:pyrite_ingot' }, { '', '', 'group:stick' } } }) @@ -652,6 +670,12 @@ minetest.register_craft({ -- Cooking recipes -- +minetest.register_craft({ + type = 'cooking', + output = 'everness:glass', + recipe = 'group:everness_sand', +}) + minetest.register_craft({ type = 'cooking', output = 'everness:coral_desert_stone', @@ -701,7 +725,7 @@ minetest.register_craft({ minetest.register_craft({ output = 'everness:coral_tree_bioluminescent_sapling', recipe = { - { 'default:meselamp' }, + { 'group:lantern' }, { 'everness:coral_tree_sapling' }, } }) @@ -709,7 +733,7 @@ minetest.register_craft({ minetest.register_craft({ output = 'everness:cursed_dream_tree_sapling', recipe = { - { 'default:meselamp' }, + { 'group:lantern' }, { 'everness:dry_tree_sapling' }, } }) diff --git a/nodes.lua b/nodes.lua index f5bc381..7fb1df5 100644 --- a/nodes.lua +++ b/nodes.lua @@ -1100,7 +1100,7 @@ Everness:register_node('everness:coral_sand', { groups = { -- MTG crumbly = 3, - sand = 1, + everness_sand = 1, falling_node = 1, }, sounds = Everness.node_sound_sand_defaults() @@ -1110,7 +1110,7 @@ Everness:register_node('everness:coral_white_sand', { description = S('Coral White Sand'), short_description = S('Coral White Sand'), tiles = { 'everness_coral_white_sand.png' }, - groups = { crumbly = 3, falling_node = 1, sand = 1 }, + groups = { crumbly = 3, falling_node = 1, everness_sand = 1 }, sounds = Everness.node_sound_sand_defaults(), }) @@ -1118,7 +1118,7 @@ Everness:register_node('everness:cursed_sand', { description = S('Cursed Sand'), short_description = S('Cursed Sand'), tiles = { 'everness_cursed_sand.png' }, - groups = { crumbly = 3, falling_node = 1, sand = 1 }, + groups = { crumbly = 3, falling_node = 1, everness_sand = 1 }, sounds = Everness.node_sound_sand_defaults(), }) @@ -1126,7 +1126,7 @@ Everness:register_node('everness:crystal_sand', { description = S('Crystal Sand'), short_description = S('Crystal Sand'), tiles = { 'everness_crystal_sand.png' }, - groups = { crumbly = 3, falling_node = 1, sand = 1 }, + groups = { crumbly = 3, falling_node = 1, everness_sand = 1 }, sounds = Everness.node_sound_sand_defaults(), }) @@ -1134,7 +1134,7 @@ Everness:register_node('everness:crystal_forest_deep_ocean_sand_with_crack', { description = S('Crystal Forest Deep Ocean Sand with Crack'), short_description = S('Crystal Forest Deep Ocean Sand with Crack'), tiles = { 'everness_crystal_forest_deep_ocean_sand_with_crack.png' }, - groups = { crumbly = 3, falling_node = 1, sand = 1, rising_crystals = 1 }, + groups = { crumbly = 3, falling_node = 1, everness_sand = 1, rising_crystals = 1 }, sounds = Everness.node_sound_sand_defaults(), }) @@ -1142,7 +1142,7 @@ Everness:register_node('everness:forsaken_tundra_beach_sand', { description = S('Forsaken Tundra Beach Sand'), short_description = S('Forsaken Tundra Beach Sand'), tiles = { 'everness_forsaken_tundra_beach_sand.png' }, - groups = { crumbly = 3, falling_node = 1, sand = 1, mold_soil = 1 }, + groups = { crumbly = 3, falling_node = 1, everness_sand = 1, mold_soil = 1 }, sounds = Everness.node_sound_sand_defaults(), }) @@ -1150,7 +1150,7 @@ Everness:register_node('everness:forsaken_tundra_beach_sand_with_shells', { description = S('Forsaken Tundra Beach Sand with Shells'), short_description = S('Forsaken Tundra Beach Sand'), tiles = { 'everness_forsaken_tundra_beach_sand_with_shells.png' }, - groups = { crumbly = 3, falling_node = 1, sand = 1 }, + groups = { crumbly = 3, falling_node = 1, everness_sand = 1 }, sounds = Everness.node_sound_sand_defaults(), }) @@ -1158,7 +1158,7 @@ Everness:register_node('everness:forsaken_desert_sand', { description = S('Forsaken Desert Sand'), short_description = S('Forsaken Desert Sand'), tiles = { 'everness_forsaken_desert_sand.png' }, - groups = { crumbly = 3, falling_node = 1, sand = 1 }, + groups = { crumbly = 3, falling_node = 1, everness_sand = 1 }, sounds = Everness.node_sound_sand_defaults(), }) @@ -1166,7 +1166,7 @@ Everness:register_node('everness:coral_forest_deep_ocean_sand', { description = S('Coral Forest Deep Ocean Sand'), short_description = S('Coral Forest Deep Ocean Sand'), tiles = { 'everness_deep_ocean_sand.png' }, - groups = { crumbly = 3, falling_node = 1, sand = 1 }, + groups = { crumbly = 3, falling_node = 1, everness_sand = 1 }, sounds = Everness.node_sound_sand_defaults(), }) @@ -1174,7 +1174,7 @@ Everness:register_node('everness:cursed_lands_deep_ocean_sand', { description = S('Cursed Lands Deep Ocean Sand'), short_description = S('Cursed Lands Deep Ocean Sand'), tiles = { 'everness_cursed_lands_deep_ocean_sand.png' }, - groups = { crumbly = 3, falling_node = 1, sand = 1 }, + groups = { crumbly = 3, falling_node = 1, everness_sand = 1 }, sounds = Everness.node_sound_sand_defaults(), }) @@ -1182,7 +1182,7 @@ Everness:register_node('everness:cursed_lands_deep_ocean_sand_with_crack', { description = S('Cursed Lands Deep Ocean Sand with Crack'), short_description = S('Cursed Lands Deep Ocean Sand with Crack'), tiles = { 'everness_cursed_lands_deep_ocean_sand_with_crack.png' }, - groups = { crumbly = 3, falling_node = 1, sand = 1, rising_souls = 1 }, + groups = { crumbly = 3, falling_node = 1, everness_sand = 1, rising_souls = 1 }, sounds = Everness.node_sound_sand_defaults(), }) @@ -1190,7 +1190,7 @@ Everness:register_node('everness:crystal_forest_deep_ocean_sand', { description = S('Crystal Forest Deep Ocean Sand'), short_description = S('Crystal Forest Deep Ocean Sand'), tiles = { 'everness_crystal_forest_deep_ocean_sand.png' }, - groups = { crumbly = 3, falling_node = 1, sand = 1 }, + groups = { crumbly = 3, falling_node = 1, everness_sand = 1 }, sounds = Everness.node_sound_sand_defaults(), }) @@ -1320,7 +1320,7 @@ Everness:register_node('everness:cursed_mud', { walkable = false, climbable = false, post_effect_color = { r = 49, g = 51, b = 57, a = 245 }, - groups = { crumbly = 3, sand = 1, liquid = 3, disable_jump = 1 }, + groups = { crumbly = 3, everness_sand = 1, liquid = 3, disable_jump = 1 }, sounds = Everness.node_sound_sand_defaults() }) @@ -4621,7 +4621,7 @@ Everness:register_node('everness:blue_vine_lantern', { inventory_image = 'everness_blue_vine_lantern_item.png', wield_image = 'everness_blue_vine_lantern_item.png', paramtype = 'light', - groups = { snappy = 3, flammable = 2, flora = 1, attached_node = 1, bamboo_grass_under = 1 }, + groups = { snappy = 3, flammable = 2, flora = 1, attached_node = 1, bamboo_grass_under = 1, lantern = 1 }, selection_box = { type = 'fixed', fixed = { -0.63, -0.5, -0.63, 0.63, 3.23, 0.63 } @@ -4651,7 +4651,7 @@ Everness:register_node('everness:amaranita_lantern', { inventory_image = 'everness_amaranita_lantern_item.png', wield_image = 'everness_amaranita_lantern_item.png', paramtype = 'light', - groups = { snappy = 3, flammable = 2, attached_node = 1, frosted_grass_under = 1 }, + groups = { snappy = 3, flammable = 2, attached_node = 1, frosted_grass_under = 1, lantern = 1 }, selection_box = { type = 'fixed', fixed = { -0.63, -0.5, -0.63, 0.63, 3.23, 0.63 } @@ -4704,10 +4704,22 @@ Everness:register_node('everness:lumecorn', { -- Tools / 'Advanced' crafting / Non-'natural' -- +Everness:register_node('everness:glass', { + description = S('Everness Glass'), + drawtype = 'glasslike_framed_optional', + tiles = { 'everness_glass.png', 'everness_glass_detail.png' }, + use_texture_alpha = 'clip', -- only needed for stairs API + paramtype = 'light', + sunlight_propagates = true, + is_ground_content = false, + groups = { cracky = 3, oddly_breakable_by_hand = 3, glass = 1 }, + sounds = Everness.node_sound_glass_defaults(), +}) + Everness:register_node('everness:tinted_glass_red', { description = S('Tinted Glass Red'), drawtype = 'glasslike_framed_optional', - tiles = { 'everness_tinted_glass_base.png^[colorize:#3A0907:122' }, + tiles = { 'everness_tinted_glass_base.png^[colorize:#3A0907:122', 'everness_tinted_glass_detail.png^[colorize:#3A0907:122' }, use_texture_alpha = 'blend', -- 'clip' needed for stairs API -- paramtype = 'light', is_ground_content = false, @@ -4742,7 +4754,7 @@ Everness:register_node('everness:pyrite_lantern', { paramtype = 'light', sunlight_propagates = true, is_ground_content = false, - groups = { cracky = 3, oddly_breakable_by_hand = 3 }, + groups = { cracky = 3, oddly_breakable_by_hand = 3, lantern = 1 }, sounds = Everness.node_sound_glass_defaults(), light_source = 12, }) @@ -4774,7 +4786,7 @@ Everness:register_node('everness:lumabus_vine_lantern', { paramtype = 'light', -- wield_image = 'everness_lumabus_vine_end_bottom.png', -- inventory_image = 'everness_lumabus_vine_end_bottom.png', - groups = { cracky = 3, oddly_breakable_by_hand = 3 }, + groups = { cracky = 3, oddly_breakable_by_hand = 3, lantern = 1 }, sounds = Everness.node_sound_glass_defaults(), light_source = 7, paramtype2 = 'wallmounted', @@ -4795,7 +4807,7 @@ Everness:register_node('everness:eye_vine_lantern', { wield_image = 'everness_eye_vine_end_bottom.png', inventory_image = 'everness_eye_vine_end_bottom.png', drawtype = 'normal', - groups = { snappy = 3, flammable = 2 }, + groups = { snappy = 3, flammable = 2, lantern = 1 }, sounds = Everness.node_sound_leaves_defaults(), light_source = 7, paramtype2 = 'facedir', @@ -4818,7 +4830,7 @@ Everness:register_node('everness:cursed_pumpkin_lantern', { sounds = Everness.node_sound_wood_defaults(), is_ground_content = false, light_source = 12, - groups = { snappy = 3, flammable = 4, fall_damage_add_percent = -30 } + groups = { snappy = 3, flammable = 4, fall_damage_add_percent = -30, lantern = 1 } }) Everness:register_node('everness:floating_crystal', { @@ -4944,7 +4956,7 @@ Everness:register_node('everness:coral_forest_deep_ocean_lantern', { sunlight_propagates = true, is_ground_content = false, sounds = Everness.node_sound_glass_defaults(), - groups = { cracky = 3, oddly_breakable_by_hand = 3 }, + groups = { cracky = 3, oddly_breakable_by_hand = 3, lantern = 1 }, paramtype = 'light', light_source = 12, }) diff --git a/stairs.lua b/stairs.lua index ea5fe36..f5eda08 100644 --- a/stairs.lua +++ b/stairs.lua @@ -514,3 +514,14 @@ stairs.register_stair_and_slab( Everness.node_sound_stone_defaults(), true ) + +stairs.register_stair_and_slab( + 'everness_glass', + 'everness:glass', + { cracky = 3, oddly_breakable_by_hand = 3 }, + { 'everness_glass.png' }, + S('Everness Glass Stair'), + S('Everness Glass Slab'), + Everness.node_sound_glass_defaults(), + true +) diff --git a/textures/everness_glass.png b/textures/everness_glass.png new file mode 100644 index 0000000000000000000000000000000000000000..296a076af467c0637f74674d09fbfd6b309d97e3 GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDUbuaL_`Q+2pTkpV!Z literal 0 HcmV?d00001 diff --git a/textures/everness_glass_detail.png b/textures/everness_glass_detail.png new file mode 100644 index 0000000000000000000000000000000000000000..2f71c56d1b4ec935088032c3244edab0bef433c6 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPGa4)6(abuaL_bocf7+pjKMdwKTi z^Bea*Uby+{>aBNYFFreR=CA=!8DmM1UoeBivm0qZj|_hO=k?+ qn5U$ z#WBR9H~G*1|NEJlSsOZq&Ms!_kuu0SkYL2XkhYRJ_QmDn?|=#!JYD@<);T3K0RW+4 B8?^uc literal 0 HcmV?d00001