From e1d5a664fe377bf242356398f2cde27bdfdc98aa Mon Sep 17 00:00:00 2001 From: Migdyn Date: Thu, 24 Nov 2022 01:06:37 -0500 Subject: [PATCH] Namespacing pt. 4 --- mods/ip_elevator/elevator.lua | 2 +- mods/ip_elevator/init.lua | 2 +- mods/ip_elevator/mod.conf | 2 +- mods/ip_people/init.lua | 4 ++-- mods/ip_people/mod.conf | 2 +- mods/ip_soviet/init.lua | 28 +++++++++++----------- mods/ip_soviet/mod.conf | 2 +- mods/ip_story/mod.conf | 2 +- mods/ip_xdecor/src/workbench.lua | 41 +------------------------------- 9 files changed, 23 insertions(+), 62 deletions(-) diff --git a/mods/ip_elevator/elevator.lua b/mods/ip_elevator/elevator.lua index d98c87e..1fd84e8 100644 --- a/mods/ip_elevator/elevator.lua +++ b/mods/ip_elevator/elevator.lua @@ -73,7 +73,7 @@ function elevator.show_nearest_elevator(pos, owner_name, param2) end -minetest.register_node("elevator:elevator", { +minetest.register_node(":elevator:elevator", { description = S("Elevator"), drawtype = "mesh", mesh = "elevator_elevator.obj", diff --git a/mods/ip_elevator/init.lua b/mods/ip_elevator/init.lua index d6ae417..cf33f02 100644 --- a/mods/ip_elevator/init.lua +++ b/mods/ip_elevator/init.lua @@ -61,7 +61,7 @@ mod_dofile("add_target") mod_dofile("on_receive_fields") -- invisible node to place inside top of elevator: box and elevator -minetest.register_node("elevator:hidden_top", { +minetest.register_node(":elevator:hidden_top", { drawtype = "nodebox", paramtype = "light", sunlight_propagates = true, diff --git a/mods/ip_elevator/mod.conf b/mods/ip_elevator/mod.conf index 7b96081..8faa094 100644 --- a/mods/ip_elevator/mod.conf +++ b/mods/ip_elevator/mod.conf @@ -1,5 +1,5 @@ name = elevator optional_depends = mesecons, dye -description = Network of teleporter-boxes that allows easy travelling to other boxes on the same network. +description = Travelenet mod adapted for Insane Protestor author = mt-mods title = Elevator diff --git a/mods/ip_people/init.lua b/mods/ip_people/init.lua index d341ed3..cd2953c 100644 --- a/mods/ip_people/init.lua +++ b/mods/ip_people/init.lua @@ -23,7 +23,7 @@ minetest.register_abm({ -- People -- Currently only male and female. -- No non-binary erasure intended; there just aren't that many non-binary guys in Eastern Europe. -mobs:register_mob("people:female", { +mobs:register_mob(":people:female", { type = "npc", passive = true, attack_type = "dogfight", @@ -77,7 +77,7 @@ mobs:register_mob("people:female", { }, }) -mobs:register_mob("people:male", { +mobs:register_mob(":people:male", { type = "npc", passive = true, attack_type = "dogfight", diff --git a/mods/ip_people/mod.conf b/mods/ip_people/mod.conf index e3458e6..750e341 100644 --- a/mods/ip_people/mod.conf +++ b/mods/ip_people/mod.conf @@ -1,2 +1,2 @@ -name = people +name = ip_people depends = mobs \ No newline at end of file diff --git a/mods/ip_soviet/init.lua b/mods/ip_soviet/init.lua index 880379b..4a9be05 100644 --- a/mods/ip_soviet/init.lua +++ b/mods/ip_soviet/init.lua @@ -1,5 +1,5 @@ -- Solid nodes -minetest.register_node("soviet:autowasher", { +minetest.register_node(":soviet:autowasher", { description = "Soviet Auto Washer", tiles = { @@ -14,7 +14,7 @@ minetest.register_node("soviet:autowasher", { groups = {cracky = 3}, }) -minetest.register_node("soviet:stove", { +minetest.register_node(":soviet:stove", { description = "Soviet Gas Stove (DANGEROUS AS FUCK; CAN EXPLODE)", tiles = { @@ -29,7 +29,7 @@ minetest.register_node("soviet:stove", { groups = {cracky = 3}, }) -minetest.register_node("soviet:concrete", { +minetest.register_node(":soviet:concrete", { description = "Concrete", tiles = {"soviet_concrete.png"}, is_ground_content = false, @@ -48,7 +48,7 @@ stairs.register_stair_and_slab( true ) -minetest.register_node("soviet:concrete_window", { +minetest.register_node(":soviet:concrete_window", { description = "Chunk of Concrete with a Window in it", tiles = {"soviet_concrete_window.png"}, is_ground_content = false, @@ -56,7 +56,7 @@ minetest.register_node("soviet:concrete_window", { sounds = default.node_sound_stone_defaults(), }) -minetest.register_node("soviet:staircase_flooring", { +minetest.register_node(":soviet:staircase_flooring", { description = "Apt Building Staircase/Lobby Flooring", tiles = {"soviet_staircase_flooring.png"}, is_ground_content = false, @@ -75,7 +75,7 @@ stairs.register_stair_and_slab( true ) -minetest.register_node("soviet:glass", +minetest.register_node(":soviet:glass", { description = "Glass Mosaic", drawtype = "glasslike", @@ -90,7 +90,7 @@ minetest.register_node("soviet:glass", }) -- Plantlike nodes -minetest.register_node("soviet:laundry_detergent", { +minetest.register_node(":soviet:laundry_detergent", { description = "Laundry Detergent Powder", drawtype = "plantlike", tiles = {"soviet_laundry_detergent.png"}, @@ -108,7 +108,7 @@ minetest.register_node("soviet:laundry_detergent", { sounds = default.node_sound_sand_defaults(), }) -minetest.register_node("soviet:tea", { +minetest.register_node(":soviet:tea", { description = "Glass of Tea", drawtype = "plantlike", tiles = {"soviet_tea.png"}, @@ -126,7 +126,7 @@ minetest.register_node("soviet:tea", { sounds = default.node_sound_glass_defaults() }) -minetest.register_node("soviet:ceilling_light", { +minetest.register_node(":soviet:ceilling_light", { description = "Ceilling Light", drawtype = "plantlike", tiles = {"soviet_lamp.png"}, @@ -142,7 +142,7 @@ minetest.register_node("soviet:ceilling_light", { }) -- Nodeboxes -minetest.register_node("soviet:light_fixture", { +minetest.register_node(":soviet:light_fixture", { description = "Light Fixture", tiles = { "soviet_light.png", @@ -165,7 +165,7 @@ minetest.register_node("soviet:light_fixture", { } }) -minetest.register_node("soviet:transradio", { +minetest.register_node(":soviet:transradio", { description = "Transistor Radio Receiver", tiles = { "soviet_transradio_top.png", @@ -191,7 +191,7 @@ minetest.register_node("soviet:transradio", { } }) -minetest.register_node("soviet:concrete_thin", { +minetest.register_node(":soviet:concrete_thin", { description = "Thin Concrete Wall", tiles = {"soviet_concrete.png"}, is_ground_content = false, @@ -208,7 +208,7 @@ minetest.register_node("soviet:concrete_thin", { } }) -minetest.register_node("soviet:concrete_thin_lower", { +minetest.register_node(":soviet:concrete_thin_lower", { description = "Thin Concrete Wall", tiles = {"soviet_concrete.png"}, is_ground_content = false, @@ -225,7 +225,7 @@ minetest.register_node("soviet:concrete_thin_lower", { } }) -minetest.register_node("soviet:concrete_thin", { +minetest.register_node(":soviet:concrete_thin", { description = "Thin Concrete Wall", tiles = {"soviet_concrete.png"}, is_ground_content = false, diff --git a/mods/ip_soviet/mod.conf b/mods/ip_soviet/mod.conf index dae377c..734a3de 100644 --- a/mods/ip_soviet/mod.conf +++ b/mods/ip_soviet/mod.conf @@ -1,3 +1,3 @@ -name = soviet +name = ip_soviet description = A mod that adds decorational nodes inspired by objects common in Soviet/post-Soviet countries. depends = sounds, stairs diff --git a/mods/ip_story/mod.conf b/mods/ip_story/mod.conf index 52023b0..b183cc2 100644 --- a/mods/ip_story/mod.conf +++ b/mods/ip_story/mod.conf @@ -1,4 +1,4 @@ -name = story +name = ip_story description = Adds a story to Minetest/XtreemTest author = MCL title = Story diff --git a/mods/ip_xdecor/src/workbench.lua b/mods/ip_xdecor/src/workbench.lua index 4c87c3e..1011522 100644 --- a/mods/ip_xdecor/src/workbench.lua +++ b/mods/ip_xdecor/src/workbench.lua @@ -127,17 +127,7 @@ function workbench:set_formspec(meta, id) end function workbench.construct(pos) - local meta = minetest.get_meta(pos) - local inv = meta:get_inventory() - - inv:set_size("tool", 1) - inv:set_size("input", 1) - inv:set_size("hammer", 1) - inv:set_size("forms", 4*3) - inv:set_size("storage", 8*2) - - meta:set_string("infotext", S("Work Bench")) - workbench:set_formspec(meta, 1) + end function workbench.fields(pos, _, fields) @@ -330,32 +320,3 @@ for i = 1, #nodes do end end end - --- Craft items - -minetest.register_tool("xdecor:hammer", { - description = S("Hammer"), - inventory_image = "xdecor_hammer.png", - wield_image = "xdecor_hammer.png", - on_use = function() do - return end - end -}) - --- Recipes - -minetest.register_craft({ - output = "xdecor:hammer", - recipe = { - {"default:steel_ingot", "group:stick", "default:steel_ingot"}, - {"", "group:stick", ""} - } -}) - -minetest.register_craft({ - output = "xdecor:workbench", - recipe = { - {"group:wood", "group:wood"}, - {"group:wood", "group:wood"} - } -})