diff --git a/mods/CORE/mcl_core/craftitems.lua b/mods/CORE/mcl_core/craftitems.lua index 5483e8b1b..7f00997a8 100644 --- a/mods/CORE/mcl_core/craftitems.lua +++ b/mods/CORE/mcl_core/craftitems.lua @@ -97,14 +97,6 @@ minetest.register_craftitem("mcl_core:flint", { groups = { craftitem=1 }, }) -minetest.register_craftitem("mcl_core:gunpowder", { - description = "Gunpowder", - inventory_image = "default_gunpowder.png", - stack_max = 64, - groups = { craftitem=1 }, -}) - - minetest.register_craftitem("mcl_core:sugar", { description = "Sugar", inventory_image = "default_sugar.png", diff --git a/mods/ENTITIES/mobs_mc/creeper.lua b/mods/ENTITIES/mobs_mc/creeper.lua index 760faf5c3..cb019c3d9 100644 --- a/mods/ENTITIES/mobs_mc/creeper.lua +++ b/mods/ENTITIES/mobs_mc/creeper.lua @@ -36,7 +36,7 @@ mobs:register_mob("mobs_mc:creeper", { armor = 100, maxdrops = 3, drops = { - {name = "mcl_core:gunpowder", + {name = "mcl_mobitems:gunpowder", chance = 1, min = 0, max = 2,}, diff --git a/mods/ENTITIES/mobs_mc/ghast.lua b/mods/ENTITIES/mobs_mc/ghast.lua index 0df3ca98c..cacc674d6 100644 --- a/mods/ENTITIES/mobs_mc/ghast.lua +++ b/mods/ENTITIES/mobs_mc/ghast.lua @@ -37,7 +37,7 @@ mobs:register_mob("mobs_mc:ghast", { chance = 1, min = 0, max = 1,}, - {name = "mcl_core:gunpowder", + {name = "mcl_mobitems:gunpowder", chance = 1, min = 0, max = 2,}, diff --git a/mods/ITEMS/mcl_fire/fire_charge.lua b/mods/ITEMS/mcl_fire/fire_charge.lua index 0343a8820..8b26c10c9 100644 --- a/mods/ITEMS/mcl_fire/fire_charge.lua +++ b/mods/ITEMS/mcl_fire/fire_charge.lua @@ -25,5 +25,5 @@ minetest.register_craftitem("mcl_fire:fire_charge", { minetest.register_craft({ type = 'shapeless', output = 'mcl_fire:fire_charge 3', - recipe = { 'mcl_mobitems:blaze_powder', 'group:coal', 'mcl_core:gunpowder' }, + recipe = { 'mcl_mobitems:blaze_powder', 'group:coal', 'mcl_mobitems:gunpowder' }, }) diff --git a/mods/ITEMS/mcl_mobitems/init.lua b/mods/ITEMS/mcl_mobitems/init.lua index 2def7a09a..55ddd988d 100644 --- a/mods/ITEMS/mcl_mobitems/init.lua +++ b/mods/ITEMS/mcl_mobitems/init.lua @@ -247,6 +247,13 @@ minetest.register_craftitem("mcl_mobitems:slimeball", { groups = { craftitem = 1 }, }) +minetest.register_craftitem("mcl_mobitems:gunpowder", { + description = "Gunpowder", + inventory_image = "default_gunpowder.png", + stack_max = 64, + groups = { craftitem=1 }, +}) + minetest.register_tool("mcl_mobitems:carrot_on_a_stick", { description = "Carrot on a Stick", wield_image = "mcl_mobitems_carrot_on_a_stick.png", diff --git a/mods/CORE/mcl_core/textures/default_gunpowder.png b/mods/ITEMS/mcl_mobitems/textures/default_gunpowder.png similarity index 100% rename from mods/CORE/mcl_core/textures/default_gunpowder.png rename to mods/ITEMS/mcl_mobitems/textures/default_gunpowder.png diff --git a/mods/ITEMS/mcl_tnt/init.lua b/mods/ITEMS/mcl_tnt/init.lua index 723b01876..2f6435eac 100644 --- a/mods/ITEMS/mcl_tnt/init.lua +++ b/mods/ITEMS/mcl_tnt/init.lua @@ -144,8 +144,8 @@ minetest.register_entity("mcl_tnt:tnt", TNT) minetest.register_craft({ output = "mcl_tnt:tnt", recipe = { - {'mcl_core:gunpowder','group:sand','mcl_core:gunpowder'}, - {'group:sand','mcl_core:gunpowder','group:sand'}, - {'mcl_core:gunpowder','group:sand','mcl_core:gunpowder'} + {'mcl_mobitems:gunpowder','group:sand','mcl_mobitems:gunpowder'}, + {'group:sand','mcl_mobitems:gunpowder','group:sand'}, + {'mcl_mobitems:gunpowder','group:sand','mcl_mobitems:gunpowder'} } }) diff --git a/mods/MISC/mcl_temp_helper_recipes/init.lua b/mods/MISC/mcl_temp_helper_recipes/init.lua index 6b3f8631b..eb2446427 100644 --- a/mods/MISC/mcl_temp_helper_recipes/init.lua +++ b/mods/MISC/mcl_temp_helper_recipes/init.lua @@ -4,7 +4,7 @@ minetest.register_craft({ type = "shapeless", - output = "mcl_core:gunpowder", + output = "mcl_mobitems:gunpowder", recipe = { 'group:sand', 'mcl_core:gravel',