diff --git a/mods/default/furnace.lua b/mods/default/furnace.lua index f4e0a14..9c38694 100644 --- a/mods/default/furnace.lua +++ b/mods/default/furnace.lua @@ -87,13 +87,13 @@ minetest.register_node( minetest.register_node( "default:furnace_active", { - description = "Furnace", + description = "Furnace (active)", tiles ={"default_furnace_top.png", "default_furnace_top.png", "default_furnace_sides.png", "default_furnace_sides.png", "default_furnace_sides.png", "default_furnace_front.png^default_furnace_flame.png"}, paramtype2 = "facedir", light_source = 8, drop = "default:furnace", - groups = {cracky = 2}, + groups = {cracky = 2, not_in_creative_inventory=1}, is_ground_content = false, sounds = default.node_sound_stone_defaults(), on_construct = function(pos) diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 91c0157..281285b 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -597,13 +597,13 @@ minetest.register_node( minetest.register_node( -- looks just like default oak leaves, except they decay much farther "default:leaves_oak_huge", { - description = "Oak Leaves(Huge)", + description = "Oak Leaves (Huge)", drawtype = "allfaces_optional", visual_scale = 1.3, tiles = {"default_leaves_oak.png"}, paramtype = "light", waving = 1, - groups = {snappy = 3, leafdecay = 10, fall_damage_add_percent = -5, leaves = 1}, + groups = {snappy = 3, leafdecay = 10, fall_damage_add_percent = -5, leaves = 1, not_in_creative_inventory = 1}, drop = { max_items = 1, items = { @@ -942,7 +942,7 @@ minetest.register_node( minetest.register_node( "default:water_flowing", { - description = "Water (flowing)", + description = "Flowing Water", drawtype = "flowingliquid", tiles = {"default_water.png"}, special_tiles = { @@ -970,7 +970,7 @@ minetest.register_node( liquid_alternative_source = "default:water_source", liquid_viscosity = default.WATER_VISC, post_effect_color = {a = 90, r = 40, g = 40, b = 100}, - groups = {water = 1, flowing_water = 1, liquid = 1}, + groups = {water = 1, flowing_water = 1, liquid = 1, not_in_creative_inventory=1,}, sounds = default.node_sound_liquid_defaults(), is_ground_content = false, }) @@ -978,7 +978,7 @@ minetest.register_node( minetest.register_node( "default:water_source", { - description = "Water", + description = "Water Source", drawtype = "liquid", tiles = {"default_water.png"}, special_tiles = { @@ -1008,7 +1008,7 @@ minetest.register_node( minetest.register_node( "default:river_water_flowing", { - description = "River Water (flowing)", + description = "Flowing River Water", drawtype = "flowingliquid", tiles = {"default_water.png"}, special_tiles = { @@ -1038,7 +1038,7 @@ minetest.register_node( liquid_renewable = false, liquid_range = 1, post_effect_color = {a=40, r=40, g=70, b=100}, - groups = {water=1, flowing_water = 1, river_water = 1, liquid=1}, + groups = {water=1, flowing_water = 1, river_water = 1, liquid=1, not_in_creative_inventory=1,}, sounds = default.node_sound_liquid_defaults(), is_ground_content = false, }) @@ -1046,7 +1046,7 @@ minetest.register_node( minetest.register_node( "default:river_water_source", { - description = "River Water", + description = "River Water Source", drawtype = "liquid", tiles = {"default_water.png"}, special_tiles = { @@ -1078,7 +1078,7 @@ minetest.register_node( minetest.register_node( "default:swamp_water_flowing", { - description = "Swamp Water (flowing)", + description = "Flowing Swamp Water", drawtype = "flowingliquid", tiles = {"default_swamp_water.png"}, special_tiles = { @@ -1108,7 +1108,7 @@ minetest.register_node( liquid_renewable = false, liquid_range = 2, post_effect_color = {a=220, r=50, g=40, b=70}, - groups = {water=1, flowing_water = 1, swamp_water = 1, liquid=1}, + groups = {water=1, flowing_water = 1, swamp_water = 1, liquid=1, not_in_creative_inventory=1,}, sounds = default.node_sound_liquid_defaults(), is_ground_content = false, }) @@ -1116,7 +1116,7 @@ minetest.register_node( minetest.register_node( "default:swamp_water_source", { - description = "Swamp Water", + description = "Swamp Water Source", drawtype = "liquid", tiles = {"default_swamp_water.png"}, special_tiles = { diff --git a/mods/farming/nodes.lua b/mods/farming/nodes.lua index 7e3799f..78d374f 100644 --- a/mods/farming/nodes.lua +++ b/mods/farming/nodes.lua @@ -33,7 +33,7 @@ minetest.register_node( minetest.register_node( "farming:wheat_2", { - description = "Wheat", + description = "Wheat Plant (stage 1)", drawtype = "plantlike", tiles = {"farming_wheat_2.png"}, paramtype = "light", @@ -50,7 +50,7 @@ minetest.register_node( type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -0.5+(4/16), 0.5} }, - groups = {dig_immediate=2, not_in_craftingguide = 1}, + groups = {dig_immediate=2, not_in_craftingguide = 1, not_in_creative_inventory = 1}, sounds=default.node_sound_leaves_defaults() } ) @@ -58,7 +58,7 @@ minetest.register_node( minetest.register_node( "farming:wheat_3", { - description = "Wheat", + description = "Wheat Plant (stage 2)", drawtype = "plantlike", tiles = {"farming_wheat_3.png"}, paramtype = "light", @@ -75,7 +75,7 @@ minetest.register_node( type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -0.5+(4/16), 0.5} }, - groups = {dig_immediate=2, not_in_craftingguide = 1}, + groups = {dig_immediate=2, not_in_craftingguide = 1, not_in_creative_inventory = 1}, sounds=default.node_sound_leaves_defaults() } ) @@ -83,7 +83,7 @@ minetest.register_node( minetest.register_node( "farming:wheat_4", { - description = "Wheat", + description = "Wheat Plant (stage 3)", drawtype = "plantlike", tiles = {"farming_wheat_4.png"}, paramtype = "light", @@ -103,7 +103,7 @@ minetest.register_node( type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -0.5+(4/16), 0.5} }, - groups = {dig_immediate=2, not_in_craftingguide = 1}, + groups = {dig_immediate=2, not_in_craftingguide = 1, not_in_creative_inventory = 1}, sounds=default.node_sound_leaves_defaults() } ) @@ -138,7 +138,7 @@ minetest.register_node( minetest.register_node( "farming:cotton_2", { - description = "Cotton", + description = "Cotton Plant (stage 1)", drawtype = "plantlike", tiles = {"farming_cotton_2.png"}, paramtype = "light", @@ -155,7 +155,7 @@ minetest.register_node( type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -0.5+(4/16), 0.5} }, - groups = {dig_immediate=2, not_in_craftingguide = 1}, + groups = {dig_immediate=2, not_in_craftingguide = 1, not_in_creative_inventory = 1}, sounds=default.node_sound_leaves_defaults() } ) @@ -163,7 +163,7 @@ minetest.register_node( minetest.register_node( "farming:cotton_3", { - description = "Cotton", + description = "Cotton Plant (stage 2)", drawtype = "plantlike", tiles = {"farming_cotton_3.png"}, paramtype = "light", @@ -180,7 +180,7 @@ minetest.register_node( type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -0.5+(4/16), 0.5} }, - groups = {dig_immediate=2, not_in_craftingguide = 1}, + groups = {dig_immediate=2, not_in_craftingguide = 1, not_in_creative_inventory = 1}, sounds=default.node_sound_leaves_defaults() } ) @@ -188,7 +188,7 @@ minetest.register_node( minetest.register_node( "farming:cotton_4", { - description = "Cotton", + description = "Cotton Plant (stage 3)", drawtype = "plantlike", tiles = {"farming_cotton_4.png"}, paramtype = "light", @@ -208,7 +208,7 @@ minetest.register_node( type = "fixed", fixed = {-0.5, -0.5, -0.5, 0.5, -0.5+(4/16), 0.5} }, - groups = {dig_immediate=2, not_in_craftingguide = 1}, + groups = {dig_immediate=2, not_in_craftingguide = 1, not_in_creative_inventory = 1}, sounds=default.node_sound_leaves_defaults(), on_punch = function(pos, node, player) local name = player:get_wielded_item():get_name() diff --git a/mods/jewels/init.lua b/mods/jewels/init.lua index b66cf12..b14d64b 100644 --- a/mods/jewels/init.lua +++ b/mods/jewels/init.lua @@ -139,6 +139,11 @@ function jewels.register_jewel(toolname, new_toolname, def) new_tooldef.description = desc + if not new_tooldef.groups then + new_tooldef.groups = {} + end + new_tooldef.groups.not_in_creative_inventory = 1 + minetest.register_tool(new_toolname, new_tooldef) end @@ -175,7 +180,7 @@ minetest.register_craftitem( minetest.register_node( "jewels:bench", { - description = "Jewelers Workbench", + description = "Jeweler's Workbench", tiles ={"jewels_bench_top.png", "jewels_bench_bottom.png", "jewels_bench_sides.png"}, paramtype2 = "facedir", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, @@ -186,7 +191,7 @@ minetest.register_node( on_construct = function(pos) local meta = minetest.get_meta(pos) meta:set_string("formspec", default.ui.get_page("jewels_bench")) - meta:set_string("infotext", "Jewelers Workbench") + meta:set_string("infotext", "Jeweler's Workbench") local inv = meta:get_inventory() inv:set_size("main", 1) diff --git a/mods/lumien/init.lua b/mods/lumien/init.lua index c411dde..f45ad3f 100644 --- a/mods/lumien/init.lua +++ b/mods/lumien/init.lua @@ -59,7 +59,7 @@ minetest.register_globalstep(on_globalstep) minetest.register_node( "lumien:crystal_on", { - description = "Lumien Crystal", + description = "Glowing Lumien Crystal", inventory_image = "lumien_crystal.png", tiles = {"lumien_block.png"}, paramtype = "light", @@ -72,7 +72,7 @@ minetest.register_node( wall_bottom = {-4/16, -0.5, -4/16, 4/16, -0.5+(4/16), 4/16} }, - groups = {crumbly = 3}, + groups = {crumbly = 3, not_in_creative_inventory = 1}, light_source = 12, drop = "lumien:crystal_off", sounds = default.node_sound_glass_defaults(), diff --git a/mods/mobs/mob_npc.lua b/mods/mobs/mob_npc.lua index 6dfae03..1cc0f9b 100644 --- a/mods/mobs/mob_npc.lua +++ b/mods/mobs/mob_npc.lua @@ -3,13 +3,15 @@ -- Modded by KaadmY local npc_types = { - "farmer", - "tavernkeeper", - "blacksmith", - "butcher", + { "farmer", "Farmer" }, + { "tavernkeeper", "Tavern Keeper" }, + { "blacksmith", "Blacksmith" }, + { "butcher", "Butcher" }, } -for _, npc_type in pairs(npc_types) do +for _, npc_type_table in pairs(npc_types) do + local npc_type = npc_type_table[1] + local npc_name = npc_type_table[2] mobs:register_mob( "mobs:npc_" .. npc_type, { @@ -117,5 +119,5 @@ for _, npc_type in pairs(npc_types) do end, }) - mobs:register_egg("mobs:npc_" .. npc_type, "NPC", "default_brick.png^mobs_egg.png") + mobs:register_egg("mobs:npc_" .. npc_type, npc_name, "default_brick.png^mobs_egg.png") end diff --git a/mods/music/init.lua b/mods/music/init.lua index d331178..1f013f0 100644 --- a/mods/music/init.lua +++ b/mods/music/init.lua @@ -19,7 +19,7 @@ if minetest.settings:get_bool("music_enable") then local dp = minetest.hash_node_position(pos) local meta = minetest.get_meta(pos) - meta:set_string("infotext", "Music player (Off)") + meta:set_string("infotext", "Music Player (off)") meta:set_int("music_player_enabled", 0) if music.players[dp] ~= nil then @@ -32,7 +32,7 @@ if minetest.settings:get_bool("music_enable") then local dp = minetest.hash_node_position(pos) local meta = minetest.get_meta(pos) - meta:set_string("infotext", "Music player (On)") + meta:set_string("infotext", "Music Player (on)") meta:set_int("music_player_enabled", 1) if music.players[dp] == nil then @@ -89,7 +89,7 @@ if minetest.settings:get_bool("music_enable") then minetest.register_node( "music:player", { - description = "Music player", + description = "Music Player", tiles = {"music_top.png", "music_bottom.png", "music_side.png"}, @@ -131,7 +131,7 @@ if minetest.settings:get_bool("music_enable") then minetest.register_abm( { - label = "Music player", + label = "Music Player", nodenames = {"music:player"}, chance = 1, interval = 1, @@ -148,7 +148,7 @@ else minetest.register_node( "music:player", { - description = "Music player", + description = "Music Player", tiles = {"music_top.png", "music_bottom.png", "music_side.png"}, @@ -166,7 +166,7 @@ else on_construct = function(pos) local meta = minetest.get_meta(pos) - meta:set_string("infotext", "Music player(Disabled by server)") + meta:set_string("infotext", "Music Player (disabled by server)") end, groups = {oddly_breakable_by_hand = 3} diff --git a/mods/nav/compass.lua b/mods/nav/compass.lua index 9c89bd2..0eb4141 100644 --- a/mods/nav/compass.lua +++ b/mods/nav/compass.lua @@ -58,7 +58,7 @@ minetest.register_craftitem( inventory_image = "nav_compass_inventory_1.png", wield_image = wield_image_1, - groups = {nav_compass = 1}, + groups = {nav_compass = 1, not_in_creative_inventory = 1}, stack_max = 1, }) @@ -70,7 +70,7 @@ minetest.register_craftitem( inventory_image = "nav_compass_inventory_0.png^[transformR270", wield_image = wield_image_0 .. "^[transformR270", - groups = {nav_compass = 1}, + groups = {nav_compass = 1, not_in_creative_inventory = 1}, stack_max = 1, }) @@ -82,7 +82,7 @@ minetest.register_craftitem( inventory_image = "nav_compass_inventory_1.png^[transformR270", wield_image = wield_image_1 .. "^[transformR270", - groups = {nav_compass = 1}, + groups = {nav_compass = 1, not_in_creative_inventory = 1}, stack_max = 1, }) @@ -95,7 +95,7 @@ minetest.register_craftitem( inventory_image = "nav_compass_inventory_0.png^[transformR180", wield_image = wield_image_0 .. "^[transformR180", - groups = {nav_compass = 1}, + groups = {nav_compass = 1, not_in_creative_inventory = 1}, stack_max = 1, }) @@ -107,7 +107,7 @@ minetest.register_craftitem( inventory_image = "nav_compass_inventory_1.png^[transformR180", wield_image = wield_image_1 .. "^[transformR180", - groups = {nav_compass = 1}, + groups = {nav_compass = 1, not_in_creative_inventory = 1}, stack_max = 1, }) @@ -119,7 +119,7 @@ minetest.register_craftitem( inventory_image = "nav_compass_inventory_0.png^[transformR90", wield_image = wield_image_0 .. "^[transformR90", - groups = {nav_compass = 1}, + groups = {nav_compass = 1, not_in_creative_inventory = 1}, stack_max = 1, }) @@ -131,7 +131,7 @@ minetest.register_craftitem( inventory_image = "nav_compass_inventory_1.png^[transformR90", wield_image = wield_image_1 .. "^[transformR90", - groups = {nav_compass = 1}, + groups = {nav_compass = 1, not_in_creative_inventory = 1}, stack_max = 1, })