From 8630c5fcb58afc64c1e00a400d9e691d2041c094 Mon Sep 17 00:00:00 2001 From: ROllerozxa Date: Fri, 26 Nov 2021 15:45:10 +0100 Subject: [PATCH] More refactoring. --- fetchassets.py | 3 +- mods/headanim/LICENSE | 21 ----- mods/headanim/README.md | 7 -- mods/headanim/init.lua | 5 -- mods/headanim/mod.conf | 5 -- mods/inventory/mod.conf | 1 - mods/{minecraft => mcnt_core}/blocks.lua | 72 +++++++-------- mods/{minecraft => mcnt_core}/helpers.lua | 0 mods/{minecraft => mcnt_core}/init.lua | 22 +++-- mods/{minecraft => mcnt_core}/items.lua | 52 ++++++----- mods/mcnt_core/mod.conf | 1 + mods/{minecraft => mcnt_core}/recipes.lua | 85 ------------------ mods/{minecraft => mcnt_core}/sounds.lua | 0 mods/{minecraft => mcnt_core}/sounds/.gitkeep | 0 .../textures/bubble.png | Bin .../textures/crack_anylength.png | Bin .../textures/glass.png | Bin .../textures/gui_hotbar.png | Bin .../textures/gui_hotbar_selected.png | Bin .../textures/hand.png | Bin .../textures/heart.png | Bin .../textures/heart_gone.png | Bin .../textures/items.png | Bin .../textures/moon.png | Bin .../{minecraft => mcnt_core}/textures/sun.png | Bin .../textures/terrain.png | Bin .../textures/unknown_item.png | Bin .../textures/unknown_node.png | Bin .../textures/unknown_object.png | Bin mods/mcnt_door/mod.conf | 3 +- mods/mcnt_farming/mod.conf | 3 +- mods/mcnt_furnace/mod.conf | 3 +- mods/{inventory => mcnt_inventory}/init.lua | 0 mods/mcnt_inventory/mod.conf | 1 + .../textures/crafting.png | Bin .../textures/inventory.png | Bin mods/mcnt_ladder/mod.conf | 2 + .../mapgen => mcnt_mapgen}/bedrock.lua | 0 .../mapgen.lua => mcnt_mapgen/init.lua} | 12 +-- mods/mcnt_mapgen/mod.conf | 2 + .../mapgen => mcnt_mapgen}/ores.lua | 0 mods/mcnt_sponge/mod.conf | 2 +- .../items/tools.lua => mcnt_tools/init.lua} | 35 ++++---- mods/mcnt_tools/mod.conf | 1 + mods/mcnt_tools/recipes.lua | 85 ++++++++++++++++++ mods/mcnt_torch/mod.conf | 3 +- mods/mcnt_trees/mod.conf | 3 +- mods/{wield3d => mcnt_wield}/init.lua | 13 ++- mods/mcnt_wield/mod.conf | 1 + mods/minecraft/mod.conf | 1 - mods/wield3d/LICENSE.md | 4 - mods/wield3d/README.md | 17 ---- mods/wield3d/location.lua | 36 -------- mods/wield3d/mod.conf | 5 -- 54 files changed, 212 insertions(+), 294 deletions(-) delete mode 100644 mods/headanim/LICENSE delete mode 100644 mods/headanim/README.md delete mode 100644 mods/headanim/init.lua delete mode 100644 mods/headanim/mod.conf delete mode 100644 mods/inventory/mod.conf rename mods/{minecraft => mcnt_core}/blocks.lua (83%) rename mods/{minecraft => mcnt_core}/helpers.lua (100%) rename mods/{minecraft => mcnt_core}/init.lua (61%) rename mods/{minecraft => mcnt_core}/items.lua (73%) create mode 100644 mods/mcnt_core/mod.conf rename mods/{minecraft => mcnt_core}/recipes.lua (72%) rename mods/{minecraft => mcnt_core}/sounds.lua (100%) rename mods/{minecraft => mcnt_core}/sounds/.gitkeep (100%) rename mods/{minecraft => mcnt_core}/textures/bubble.png (100%) rename mods/{minecraft => mcnt_core}/textures/crack_anylength.png (100%) rename mods/{minecraft => mcnt_core}/textures/glass.png (100%) rename mods/{minecraft => mcnt_core}/textures/gui_hotbar.png (100%) rename mods/{minecraft => mcnt_core}/textures/gui_hotbar_selected.png (100%) rename mods/{minecraft => mcnt_core}/textures/hand.png (100%) rename mods/{minecraft => mcnt_core}/textures/heart.png (100%) rename mods/{minecraft => mcnt_core}/textures/heart_gone.png (100%) rename mods/{minecraft => mcnt_core}/textures/items.png (100%) rename mods/{minecraft => mcnt_core}/textures/moon.png (100%) rename mods/{minecraft => mcnt_core}/textures/sun.png (100%) rename mods/{minecraft => mcnt_core}/textures/terrain.png (100%) rename mods/{minecraft => mcnt_core}/textures/unknown_item.png (100%) rename mods/{minecraft => mcnt_core}/textures/unknown_node.png (100%) rename mods/{minecraft => mcnt_core}/textures/unknown_object.png (100%) rename mods/{inventory => mcnt_inventory}/init.lua (100%) create mode 100644 mods/mcnt_inventory/mod.conf rename mods/{inventory => mcnt_inventory}/textures/crafting.png (100%) rename mods/{inventory => mcnt_inventory}/textures/inventory.png (100%) rename mods/{minecraft/mapgen => mcnt_mapgen}/bedrock.lua (100%) rename mods/{minecraft/mapgen.lua => mcnt_mapgen/init.lua} (72%) create mode 100644 mods/mcnt_mapgen/mod.conf rename mods/{minecraft/mapgen => mcnt_mapgen}/ores.lua (100%) rename mods/{minecraft/items/tools.lua => mcnt_tools/init.lua} (84%) create mode 100644 mods/mcnt_tools/mod.conf create mode 100644 mods/mcnt_tools/recipes.lua rename mods/{wield3d => mcnt_wield}/init.lua (92%) create mode 100644 mods/mcnt_wield/mod.conf delete mode 100644 mods/minecraft/mod.conf delete mode 100644 mods/wield3d/LICENSE.md delete mode 100644 mods/wield3d/README.md delete mode 100644 mods/wield3d/location.lua delete mode 100644 mods/wield3d/mod.conf diff --git a/fetchassets.py b/fetchassets.py index 63ae339..72d0ca6 100644 --- a/fetchassets.py +++ b/fetchassets.py @@ -28,11 +28,10 @@ def main(): step_sounds = [ 'cloth', 'grass', 'gravel', 'sand', 'snow', 'stone', 'wood' ] for step_sound in step_sounds: for i in range(1,5): - check_sound_and_download("https://betacraft.pl/MinecraftResources/newsound/step/%s%s.ogg" % (step_sound, i), Path("mods/minecraft/sounds/%s.%s.ogg" % (step_sound, i))) + check_sound_and_download("https://betacraft.pl/MinecraftResources/newsound/step/%s%s.ogg" % (step_sound, i), Path("mods/mcnt_core/sounds/%s.%s.ogg" % (step_sound, i))) # item pickup sound check_sound_and_download("https://betacraft.pl/MinecraftResources/newsound/random/pop.ogg", Path("mods/mcnt_itemdrop/sounds/pop.ogg")) if __name__ == "__main__": main() - diff --git a/mods/headanim/LICENSE b/mods/headanim/LICENSE deleted file mode 100644 index 472f553..0000000 --- a/mods/headanim/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2020 LoneWolfHT - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/mods/headanim/README.md b/mods/headanim/README.md deleted file mode 100644 index 1326210..0000000 --- a/mods/headanim/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Headanim -[![ContentDB](https://content.minetest.net/packages/Lone_Wolf/headanim/shields/downloads/)](https://content.minetest.net/packages/Lone_Wolf/headanim/) - -Makes player heads follow their look dir in Minetest. Requires version 5.3+ - -## Similar mods -* https://github.com/minetest-mods/playeranim: A lot more complex (and possibly slower?) than Headanim but looks nicer as a result diff --git a/mods/headanim/init.lua b/mods/headanim/init.lua deleted file mode 100644 index 3f108a9..0000000 --- a/mods/headanim/init.lua +++ /dev/null @@ -1,5 +0,0 @@ -minetest.register_globalstep(function(dtime) - for _, player in pairs(minetest.get_connected_players()) do - player:set_bone_position("Head", vector.new(0, 6.35, 0), vector.new(-math.deg(player:get_look_vertical()), 0, 0)) - end -end) diff --git a/mods/headanim/mod.conf b/mods/headanim/mod.conf deleted file mode 100644 index bc1be14..0000000 --- a/mods/headanim/mod.conf +++ /dev/null @@ -1,5 +0,0 @@ -name = headanim -description = Makes player heads follow their look direction -release = 6116 -author = Lone_Wolf -title = Headanim diff --git a/mods/inventory/mod.conf b/mods/inventory/mod.conf deleted file mode 100644 index 709d3f8..0000000 --- a/mods/inventory/mod.conf +++ /dev/null @@ -1 +0,0 @@ -name = inventory diff --git a/mods/minecraft/blocks.lua b/mods/mcnt_core/blocks.lua similarity index 83% rename from mods/minecraft/blocks.lua rename to mods/mcnt_core/blocks.lua index 35b91e7..70ab245 100644 --- a/mods/minecraft/blocks.lua +++ b/mods/mcnt_core/blocks.lua @@ -1,4 +1,4 @@ -minetest.register_node("minecraft:stone", { +minetest.register_node(":minecraft:stone", { description = "Stone", tiles = { terrain(1) }, groups = { cracky = 3 }, @@ -6,7 +6,7 @@ minetest.register_node("minecraft:stone", { sounds = block_sound('stone'), }) -minetest.register_node("minecraft:grass", { +minetest.register_node(":minecraft:grass", { description = "Grass", drop = "minecraft:dirt", tiles = { @@ -18,14 +18,14 @@ minetest.register_node("minecraft:grass", { sounds = block_sound('grass'), }) -minetest.register_node("minecraft:dirt", { +minetest.register_node(":minecraft:dirt", { description = "Dirt", tiles = { terrain(2) }, groups = { crumbly = 3, soil = 1, cultivatable = 1 }, sounds = block_sound('gravel'), }) -minetest.register_node("minecraft:oak", { +minetest.register_node(":minecraft:oak", { description = "Wood", tiles = { terrain(21), @@ -37,7 +37,7 @@ minetest.register_node("minecraft:oak", { sounds = block_sound('wood'), }) -minetest.register_node("minecraft:leaves", { +minetest.register_node(":minecraft:leaves", { description = "Leaves", drawtype = "allfaces_optional", tiles = { terrain(52) }, @@ -57,7 +57,7 @@ minetest.register_node("minecraft:leaves", { sounds = block_sound('grass'), }) -minetest.register_node("minecraft:plank", { +minetest.register_node(":minecraft:plank", { description = "Wooden Planks", tiles = { terrain(4) }, is_ground_content = false, @@ -65,7 +65,7 @@ minetest.register_node("minecraft:plank", { sounds = block_sound('wood'), }) -minetest.register_node("minecraft:glass", { +minetest.register_node(":minecraft:glass", { description = "Glass", drawtype = "glasslike_framed_optional", drop = "", @@ -77,21 +77,21 @@ minetest.register_node("minecraft:glass", { sounds = block_sound('glass'), }) -minetest.register_node("minecraft:sand", { +minetest.register_node(":minecraft:sand", { description = "Sand", tiles = { terrain(18) }, groups = { falling_node = 1, crumbly = 3 }, sounds = block_sound('sand'), }) -minetest.register_node("minecraft:gravel", { +minetest.register_node(":minecraft:gravel", { description = "Gravel", tiles = { terrain(19) }, groups = {falling_node=1,crumbly=3}, sounds = block_sound('gravel'), }) -minetest.register_node("minecraft:cobble", { +minetest.register_node(":minecraft:cobble", { description = "Cobblestone", tiles = { terrain(16) }, is_ground_content = false, @@ -99,7 +99,7 @@ minetest.register_node("minecraft:cobble", { sounds = block_sound('stone'), }) -minetest.register_node("minecraft:mossycobble", { +minetest.register_node(":minecraft:mossycobble", { description = "Moss Stone", tiles = { terrain(36) }, is_ground_content = false, @@ -107,7 +107,7 @@ minetest.register_node("minecraft:mossycobble", { sounds = block_sound('stone'), }) -minetest.register_node("minecraft:bedrock", { +minetest.register_node(":minecraft:bedrock", { description = "Bedrock", tiles = { terrain(17) }, is_ground_content = false, @@ -115,7 +115,7 @@ minetest.register_node("minecraft:bedrock", { sounds = block_sound('stone'), }) -minetest.register_node("minecraft:bricks", { +minetest.register_node(":minecraft:bricks", { description = "Bricks", tiles = { terrain(7) }, is_ground_content = false, @@ -123,7 +123,7 @@ minetest.register_node("minecraft:bricks", { sounds = block_sound('stone'), }) -minetest.register_node("minecraft:bookshelf", { +minetest.register_node(":minecraft:bookshelf", { description = "Bookshelf", tiles = { terrain(4), @@ -135,7 +135,7 @@ minetest.register_node("minecraft:bookshelf", { sounds = block_sound('wood'), }) -minetest.register_node("minecraft:coal_ore", { +minetest.register_node(":minecraft:coal_ore", { description = "Coal Ore", drop = "minecraft:coal", tiles = { terrain(34) }, @@ -143,21 +143,21 @@ minetest.register_node("minecraft:coal_ore", { sounds = block_sound('stone'), }) -minetest.register_node("minecraft:iron_ore", { +minetest.register_node(":minecraft:iron_ore", { description = "Iron Ore", tiles = { terrain(33) }, groups = { cracky = 2, level = 1 }, sounds = block_sound('stone'), }) -minetest.register_node("minecraft:gold_ore", { +minetest.register_node(":minecraft:gold_ore", { description = "Gold Ore", tiles = { terrain(32) }, groups = { cracky = 2, level = 1 }, sounds = block_sound('stone'), }) -minetest.register_node("minecraft:diamond_ore", { +minetest.register_node(":minecraft:diamond_ore", { description = "Diamond Ore", drop = "minecraft:diamond", tiles = { terrain(50) }, @@ -165,7 +165,7 @@ minetest.register_node("minecraft:diamond_ore", { sounds = block_sound('stone'), }) -minetest.register_node("minecraft:plank_stairs", { +minetest.register_node(":minecraft:plank_stairs", { description = "Wooden Stairs", tiles = { terrain(4) }, is_ground_content = false, @@ -183,7 +183,7 @@ minetest.register_node("minecraft:plank_stairs", { sounds = block_sound('wood'), }) -minetest.register_node("minecraft:cobble_stairs", { +minetest.register_node(":minecraft:cobble_stairs", { description = "Stone Stairs", tiles = { terrain(16) }, is_ground_content = false, @@ -201,7 +201,7 @@ minetest.register_node("minecraft:cobble_stairs", { sounds = block_sound('stone'), }) -minetest.register_node("minecraft:plank_slab", { +minetest.register_node(":minecraft:plank_slab", { description = "Wooden Slab", tiles = { terrain(4) }, is_ground_content = false, @@ -217,7 +217,7 @@ minetest.register_node("minecraft:plank_slab", { sounds = block_sound('wood'), }) -minetest.register_node("minecraft:cobble_slab", { +minetest.register_node(":minecraft:cobble_slab", { description = "Stone Slab", tiles = { terrain(16) }, is_ground_content = false, @@ -233,7 +233,7 @@ minetest.register_node("minecraft:cobble_slab", { sounds = block_sound('stone'), }) -minetest.register_node("minecraft:stone_slab", { +minetest.register_node(":minecraft:stone_slab", { description = "Stone Slab", tiles = { terrain(6), @@ -256,7 +256,7 @@ minetest.register_node("minecraft:stone_slab", { sounds = block_sound('stone'), }) -minetest.register_node("minecraft:stone_slab_block", { +minetest.register_node(":minecraft:stone_slab_block", { description = "tile.stoneSlab", drop = "minecraft:stone_slab", tiles = { @@ -272,7 +272,7 @@ minetest.register_node("minecraft:stone_slab_block", { sounds = block_sound('stone'), }) -minetest.register_node("minecraft:iron_block", { +minetest.register_node(":minecraft:iron_block", { description = "Block of Iron", tiles = { terrain(22), @@ -286,7 +286,7 @@ minetest.register_node("minecraft:iron_block", { sounds = block_sound('metal'), }) -minetest.register_node("minecraft:gold_block", { +minetest.register_node(":minecraft:gold_block", { description = "Block of Gold", tiles = { terrain(23), @@ -300,7 +300,7 @@ minetest.register_node("minecraft:gold_block", { sounds = block_sound('metal'), }) -minetest.register_node("minecraft:diamond_block", { +minetest.register_node(":minecraft:diamond_block", { description = "Block of Diamond", tiles = { terrain(24), @@ -314,7 +314,7 @@ minetest.register_node("minecraft:diamond_block", { sounds = block_sound('metal'), }) -minetest.register_node("minecraft:crafting_table", { +minetest.register_node(":minecraft:crafting_table", { description = "Crafting Table", tiles = { terrain(43), @@ -349,14 +349,14 @@ minetest.register_node("minecraft:crafting_table", { sounds = block_sound('wood'), }) -minetest.register_node("minecraft:obsidian", { +minetest.register_node(":minecraft:obsidian", { description = "Obsidian", tiles = { terrain(37) }, groups = { cracky = 1, level = 3 }, sounds = block_sound('stone'), }) -minetest.register_node("minecraft:tnt", { +minetest.register_node(":minecraft:tnt", { description = "TNT", tiles = { terrain(9), @@ -368,7 +368,7 @@ minetest.register_node("minecraft:tnt", { sounds = block_sound('grass'), }) -minetest.register_node("minecraft:flower", { +minetest.register_node(":minecraft:flower", { description = "Flower", drawtype = "plantlike", paramtype = "light", @@ -381,7 +381,7 @@ minetest.register_node("minecraft:flower", { sounds = block_sound('grass'), }) -minetest.register_node("minecraft:rose", { +minetest.register_node(":minecraft:rose", { description = "Rose", drawtype = "plantlike", paramtype = "light", @@ -394,7 +394,7 @@ minetest.register_node("minecraft:rose", { sounds = block_sound('grass'), }) -minetest.register_node("minecraft:mushroom", { +minetest.register_node(":minecraft:mushroom", { description = "Mushroom", drawtype = "plantlike", paramtype = "light", @@ -407,7 +407,7 @@ minetest.register_node("minecraft:mushroom", { sounds = block_sound('grass'), }) -minetest.register_node("minecraft:mushroom2", { +minetest.register_node(":minecraft:mushroom2", { description = "Mushroom", drawtype = "plantlike", paramtype = "light", @@ -420,14 +420,14 @@ minetest.register_node("minecraft:mushroom2", { sounds = block_sound('grass'), }) -minetest.register_node("minecraft:wool", { +minetest.register_node(":minecraft:wool", { description = "Wool", tiles = { terrain(64) }, groups = { snappy = 1, choppy = 2, oddly_breakable_by_hand = 3 }, sounds = block_sound('cloth'), }) -minetest.register_node("minecraft:spawner", { +minetest.register_node(":minecraft:spawner", { description = "Mob Spawner", drawtype = "allfaces", tiles = { terrain(65) }, diff --git a/mods/minecraft/helpers.lua b/mods/mcnt_core/helpers.lua similarity index 100% rename from mods/minecraft/helpers.lua rename to mods/mcnt_core/helpers.lua diff --git a/mods/minecraft/init.lua b/mods/mcnt_core/init.lua similarity index 61% rename from mods/minecraft/init.lua rename to mods/mcnt_core/init.lua index ae574a0..a34a150 100644 --- a/mods/minecraft/init.lua +++ b/mods/mcnt_core/init.lua @@ -1,12 +1,14 @@ -dofile(minetest.get_modpath("minecraft") .. "/sounds.lua") -dofile(minetest.get_modpath("minecraft") .. "/helpers.lua") +dofile(minetest.get_modpath("mcnt_core") .. "/sounds.lua") +dofile(minetest.get_modpath("mcnt_core") .. "/helpers.lua") -dofile(minetest.get_modpath("minecraft") .. "/blocks.lua") +dofile(minetest.get_modpath("mcnt_core") .. "/blocks.lua") -dofile(minetest.get_modpath("minecraft") .. "/items.lua") -dofile(minetest.get_modpath("minecraft") .. "/mapgen.lua") -dofile(minetest.get_modpath("minecraft") .. "/recipes.lua") +dofile(minetest.get_modpath("mcnt_core") .. "/items.lua") +dofile(minetest.get_modpath("mcnt_core") .. "/recipes.lua") +minetest.register_alias("mapgen_stone", "minecraft:stone") +minetest.register_alias("mapgen_water_source", "minecraft:water_source") +minetest.register_alias("mapgen_river_water_source", "minecraft:water_source") -- devs drop apples on death! minetest.register_on_dieplayer(function(entity, reason) @@ -29,7 +31,6 @@ minetest.register_on_placenode(function(pos, newnode, placer, oldnode, itemstack end) -- Hotbar texture - minetest.register_on_joinplayer(function(player) player:hud_set_hotbar_image("gui_hotbar.png") player:hud_set_hotbar_selected_image("gui_hotbar_selected.png") @@ -46,3 +47,10 @@ minetest.item_drop = function(itemstack, dropper, pos) old_drop(itemstack:take_item(1), dropper, pos) return itemstack end + +-- Head animation cool +minetest.register_globalstep(function(dtime) + for _, player in pairs(minetest.get_connected_players()) do + player:set_bone_position("Head", vector.new(0, 6.35, 0), vector.new(-math.deg(player:get_look_vertical()), 0, 0)) + end +end) diff --git a/mods/minecraft/items.lua b/mods/mcnt_core/items.lua similarity index 73% rename from mods/minecraft/items.lua rename to mods/mcnt_core/items.lua index 2469d2e..e461e0b 100644 --- a/mods/minecraft/items.lua +++ b/mods/mcnt_core/items.lua @@ -42,27 +42,27 @@ else }) end -minetest.register_craftitem("minecraft:flint_and_steel", { +minetest.register_craftitem(":minecraft:flint_and_steel", { description = "Flint and Steel", inventory_image = "items.png^[sheet:16x16:5,0" }) -minetest.register_craftitem("minecraft:flint", { +minetest.register_craftitem(":minecraft:flint", { description = "Flint", inventory_image = "items.png^[sheet:16x16:6,0" }) -minetest.register_craftitem("minecraft:coal", { +minetest.register_craftitem(":minecraft:coal", { description = "Coal", inventory_image = "items.png^[sheet:16x16:7,0" }) -minetest.register_craftitem("minecraft:string", { +minetest.register_craftitem(":minecraft:string", { description = "String", inventory_image = "items.png^[sheet:16x16:8,0" }) -minetest.register_craftitem("minecraft:seeds", { +minetest.register_craftitem(":minecraft:seeds", { description = "Seeds", inventory_image = "items.png^[sheet:16x16:9,0", on_place = function(itemstack, placer, pointed_thing) @@ -70,119 +70,117 @@ minetest.register_craftitem("minecraft:seeds", { end }) -minetest.register_craftitem("minecraft:apple", { +minetest.register_craftitem(":minecraft:apple", { description = "Apple", stack_max = 1, inventory_image = "items.png^[sheet:16x16:10,0", on_use = minetest.item_eat(4), }) -minetest.register_craftitem("minecraft:golden_apple", { +minetest.register_craftitem(":minecraft:golden_apple", { description = "Golden Apple", stack_max = 1, inventory_image = "items.png^[sheet:16x16:11,0", on_use = minetest.item_eat(20), }) -minetest.register_craftitem("minecraft:bow", { +minetest.register_craftitem(":minecraft:bow", { description = "Bow", stack_max = 1, inventory_image = "items.png^[sheet:16x16:5,1" }) -minetest.register_craftitem("minecraft:iron_ingot", { +minetest.register_craftitem(":minecraft:iron_ingot", { description = "Iron Ingot", inventory_image = "items.png^[sheet:16x16:7,1" }) -minetest.register_craftitem("minecraft:feather", { +minetest.register_craftitem(":minecraft:feather", { description = "Feather", inventory_image = "items.png^[sheet:16x16:8,1" }) -minetest.register_craftitem("minecraft:wheat", { +minetest.register_craftitem(":minecraft:wheat", { description = "Wheat", inventory_image = "items.png^[sheet:16x16:9,1" }) -minetest.register_craftitem("minecraft:painting", { +minetest.register_craftitem(":minecraft:painting", { description = "Painting", inventory_image = "items.png^[sheet:16x16:10,1" }) -minetest.register_craftitem("minecraft:arrow", { +minetest.register_craftitem(":minecraft:arrow", { description = "Arrow", inventory_image = "items.png^[sheet:16x16:5,2" }) -minetest.register_craftitem("minecraft:gold_ingot", { +minetest.register_craftitem(":minecraft:gold_ingot", { description = "Gold Ingot", inventory_image = "items.png^[sheet:16x16:7,2" }) -minetest.register_craftitem("minecraft:gunpowder", { +minetest.register_craftitem(":minecraft:gunpowder", { description = "Gunpowder", inventory_image = "items.png^[sheet:16x16:8,2" }) -minetest.register_craftitem("minecraft:bread", { +minetest.register_craftitem(":minecraft:bread", { description = "Bread", stack_max = 1, inventory_image = "items.png^[sheet:16x16:9,2", on_use = minetest.item_eat(5), }) -minetest.register_craftitem("minecraft:sign", { +minetest.register_craftitem(":minecraft:sign", { description = "Sign", stack_max = 16, inventory_image = "items.png^[sheet:16x16:10,2" }) -minetest.register_craftitem("minecraft:stick", { +minetest.register_craftitem(":minecraft:stick", { description = "Stick", inventory_image = "items.png^[sheet:16x16:5,3" }) -minetest.register_craftitem("minecraft:diamond", { +minetest.register_craftitem(":minecraft:diamond", { description = "Diamond", inventory_image = "items.png^[sheet:16x16:7,3", }) -minetest.register_craftitem("minecraft:bowl", { +minetest.register_craftitem(":minecraft:bowl", { description = "Bowl", inventory_image = "items.png^[sheet:16x16:7,4" }) -minetest.register_craftitem("minecraft:mushroom_stew", { +minetest.register_craftitem(":minecraft:mushroom_stew", { description = "Mushroom Stew", stack_max = 1, inventory_image = "items.png^[sheet:16x16:8,4", on_use = minetest.item_eat(10, "minecraft:bowl"), }) -minetest.register_craftitem("minecraft:raw_porkchop", { +minetest.register_craftitem(":minecraft:raw_porkchop", { description = "Raw Porkchop", stack_max = 1, inventory_image = "items.png^[sheet:16x16:7,5", on_use = minetest.item_eat(3), }) -minetest.register_craftitem("minecraft:cooked_porkchop", { +minetest.register_craftitem(":minecraft:cooked_porkchop", { description = "Cooked Porkchop", stack_max = 1, inventory_image = "items.png^[sheet:16x16:8,5", on_use = minetest.item_eat(8), }) -minetest.register_craftitem("minecraft:saddle", { +minetest.register_craftitem(":minecraft:saddle", { description = "Saddle", stack_max = 1, inventory_image = "items.png^[sheet:16x16:8,6" }) -minetest.register_craftitem("minecraft:minecart", { +minetest.register_craftitem(":minecraft:minecart", { description = "Minecart", inventory_image = "items.png^[sheet:16x16:7,8" }) - -dofile(minetest.get_modpath("minecraft") .. "/items/tools.lua") diff --git a/mods/mcnt_core/mod.conf b/mods/mcnt_core/mod.conf new file mode 100644 index 0000000..b5de48d --- /dev/null +++ b/mods/mcnt_core/mod.conf @@ -0,0 +1 @@ +name = mcnt_core \ No newline at end of file diff --git a/mods/minecraft/recipes.lua b/mods/mcnt_core/recipes.lua similarity index 72% rename from mods/minecraft/recipes.lua rename to mods/mcnt_core/recipes.lua index f4d702b..401580b 100644 --- a/mods/minecraft/recipes.lua +++ b/mods/mcnt_core/recipes.lua @@ -52,91 +52,6 @@ minetest.register_craft({ } }) --- --- Tool recipes. --- - -tool_data = { - { - material = "minecraft:plank", - output = "minecraft:wooden_", - }, { - material = "minecraft:cobble", - output = "minecraft:stone_", - }, { - material = "minecraft:iron_ingot", - output = "minecraft:iron_", - }, { - material = "minecraft:gold_ingot", - output = "minecraft:golden_", - }, { - material = "minecraft:diamond", - output = "minecraft:diamond_", - } -} - -for k, v in pairs(tool_data) do - -- Pickaxes - minetest.register_craft({ - output = v['output'].."pickaxe", - recipe = { - {v['material'], v['material'], v['material']}, - {"", "minecraft:stick", ""}, - {"", "minecraft:stick", ""}, - } - }) - - -- Shovels - minetest.register_craft({ - output = v['output'].."shovel", - recipe = { - {v['material']}, - {"minecraft:stick"}, - {"minecraft:stick"}, - } - }) - - -- Axes - minetest.register_craft({ - output = v['output'].."axe", - recipe = { - {v['material'], v['material']}, - {"minecraft:stick", v['material']}, - {"minecraft:stick", ""}, - } - }) - - -- Axes (Mirrored) - minetest.register_craft({ - output = v['output'].."axe", - recipe = { - {v['material'], v['material']}, - {v['material'], "minecraft:stick"}, - {"", "minecraft:stick"}, - } - }) - - -- Hoes - minetest.register_craft({ - output = v['output'].."hoe", - recipe = { - {v['material'], v['material']}, - {"minecraft:stick", ""}, - {"minecraft:stick", ""}, - } - }) - - -- Hoes (Mirrored) - minetest.register_craft({ - output = v['output'].."hoe", - recipe = { - {v['material'], v['material']}, - {"", "minecraft:stick"}, - {"", "minecraft:stick"}, - } - }) -end - minetest.register_craft({ output = "minecraft:bow", recipe = { diff --git a/mods/minecraft/sounds.lua b/mods/mcnt_core/sounds.lua similarity index 100% rename from mods/minecraft/sounds.lua rename to mods/mcnt_core/sounds.lua diff --git a/mods/minecraft/sounds/.gitkeep b/mods/mcnt_core/sounds/.gitkeep similarity index 100% rename from mods/minecraft/sounds/.gitkeep rename to mods/mcnt_core/sounds/.gitkeep diff --git a/mods/minecraft/textures/bubble.png b/mods/mcnt_core/textures/bubble.png similarity index 100% rename from mods/minecraft/textures/bubble.png rename to mods/mcnt_core/textures/bubble.png diff --git a/mods/minecraft/textures/crack_anylength.png b/mods/mcnt_core/textures/crack_anylength.png similarity index 100% rename from mods/minecraft/textures/crack_anylength.png rename to mods/mcnt_core/textures/crack_anylength.png diff --git a/mods/minecraft/textures/glass.png b/mods/mcnt_core/textures/glass.png similarity index 100% rename from mods/minecraft/textures/glass.png rename to mods/mcnt_core/textures/glass.png diff --git a/mods/minecraft/textures/gui_hotbar.png b/mods/mcnt_core/textures/gui_hotbar.png similarity index 100% rename from mods/minecraft/textures/gui_hotbar.png rename to mods/mcnt_core/textures/gui_hotbar.png diff --git a/mods/minecraft/textures/gui_hotbar_selected.png b/mods/mcnt_core/textures/gui_hotbar_selected.png similarity index 100% rename from mods/minecraft/textures/gui_hotbar_selected.png rename to mods/mcnt_core/textures/gui_hotbar_selected.png diff --git a/mods/minecraft/textures/hand.png b/mods/mcnt_core/textures/hand.png similarity index 100% rename from mods/minecraft/textures/hand.png rename to mods/mcnt_core/textures/hand.png diff --git a/mods/minecraft/textures/heart.png b/mods/mcnt_core/textures/heart.png similarity index 100% rename from mods/minecraft/textures/heart.png rename to mods/mcnt_core/textures/heart.png diff --git a/mods/minecraft/textures/heart_gone.png b/mods/mcnt_core/textures/heart_gone.png similarity index 100% rename from mods/minecraft/textures/heart_gone.png rename to mods/mcnt_core/textures/heart_gone.png diff --git a/mods/minecraft/textures/items.png b/mods/mcnt_core/textures/items.png similarity index 100% rename from mods/minecraft/textures/items.png rename to mods/mcnt_core/textures/items.png diff --git a/mods/minecraft/textures/moon.png b/mods/mcnt_core/textures/moon.png similarity index 100% rename from mods/minecraft/textures/moon.png rename to mods/mcnt_core/textures/moon.png diff --git a/mods/minecraft/textures/sun.png b/mods/mcnt_core/textures/sun.png similarity index 100% rename from mods/minecraft/textures/sun.png rename to mods/mcnt_core/textures/sun.png diff --git a/mods/minecraft/textures/terrain.png b/mods/mcnt_core/textures/terrain.png similarity index 100% rename from mods/minecraft/textures/terrain.png rename to mods/mcnt_core/textures/terrain.png diff --git a/mods/minecraft/textures/unknown_item.png b/mods/mcnt_core/textures/unknown_item.png similarity index 100% rename from mods/minecraft/textures/unknown_item.png rename to mods/mcnt_core/textures/unknown_item.png diff --git a/mods/minecraft/textures/unknown_node.png b/mods/mcnt_core/textures/unknown_node.png similarity index 100% rename from mods/minecraft/textures/unknown_node.png rename to mods/mcnt_core/textures/unknown_node.png diff --git a/mods/minecraft/textures/unknown_object.png b/mods/mcnt_core/textures/unknown_object.png similarity index 100% rename from mods/minecraft/textures/unknown_object.png rename to mods/mcnt_core/textures/unknown_object.png diff --git a/mods/mcnt_door/mod.conf b/mods/mcnt_door/mod.conf index 6391e6b..6f2b7ec 100644 --- a/mods/mcnt_door/mod.conf +++ b/mods/mcnt_door/mod.conf @@ -1 +1,2 @@ -name = mcnt_door \ No newline at end of file +name = mcnt_door +depends = mcnt_core diff --git a/mods/mcnt_farming/mod.conf b/mods/mcnt_farming/mod.conf index 79a3788..5613af3 100644 --- a/mods/mcnt_farming/mod.conf +++ b/mods/mcnt_farming/mod.conf @@ -1 +1,2 @@ -name = mcnt_farming \ No newline at end of file +name = mcnt_farming +depends = mcnt_core diff --git a/mods/mcnt_furnace/mod.conf b/mods/mcnt_furnace/mod.conf index 00b318a..9cfe4eb 100644 --- a/mods/mcnt_furnace/mod.conf +++ b/mods/mcnt_furnace/mod.conf @@ -1 +1,2 @@ -name = mcnt_furnace \ No newline at end of file +name = mcnt_furnace +depends = mcnt_core diff --git a/mods/inventory/init.lua b/mods/mcnt_inventory/init.lua similarity index 100% rename from mods/inventory/init.lua rename to mods/mcnt_inventory/init.lua diff --git a/mods/mcnt_inventory/mod.conf b/mods/mcnt_inventory/mod.conf new file mode 100644 index 0000000..6dde10a --- /dev/null +++ b/mods/mcnt_inventory/mod.conf @@ -0,0 +1 @@ +name = mcnt_inventory diff --git a/mods/inventory/textures/crafting.png b/mods/mcnt_inventory/textures/crafting.png similarity index 100% rename from mods/inventory/textures/crafting.png rename to mods/mcnt_inventory/textures/crafting.png diff --git a/mods/inventory/textures/inventory.png b/mods/mcnt_inventory/textures/inventory.png similarity index 100% rename from mods/inventory/textures/inventory.png rename to mods/mcnt_inventory/textures/inventory.png diff --git a/mods/mcnt_ladder/mod.conf b/mods/mcnt_ladder/mod.conf index e69de29..8ac23f2 100644 --- a/mods/mcnt_ladder/mod.conf +++ b/mods/mcnt_ladder/mod.conf @@ -0,0 +1,2 @@ +name = mcnt_ladder +depends = mcnt_core diff --git a/mods/minecraft/mapgen/bedrock.lua b/mods/mcnt_mapgen/bedrock.lua similarity index 100% rename from mods/minecraft/mapgen/bedrock.lua rename to mods/mcnt_mapgen/bedrock.lua diff --git a/mods/minecraft/mapgen.lua b/mods/mcnt_mapgen/init.lua similarity index 72% rename from mods/minecraft/mapgen.lua rename to mods/mcnt_mapgen/init.lua index 0e1cf04..2e04eb3 100644 --- a/mods/minecraft/mapgen.lua +++ b/mods/mcnt_mapgen/init.lua @@ -1,11 +1,3 @@ -minetest.register_alias("mapgen_stone", "minecraft:stone") -minetest.register_alias("mapgen_water_source", "minecraft:water_source") -minetest.register_alias("mapgen_river_water_source", "minecraft:water_source") - -minetest.clear_registered_biomes() -minetest.clear_registered_ores() -minetest.clear_registered_decorations() - minetest.register_biome({ name = "grasslands", node_top = "minecraft:grass", @@ -69,5 +61,5 @@ minetest.register_decoration({ decoration = "minecraft:flower", }) -dofile(minetest.get_modpath("minecraft") .. "/mapgen/bedrock.lua") -dofile(minetest.get_modpath("minecraft") .. "/mapgen/ores.lua") +dofile(minetest.get_modpath("mcnt_mapgen") .. "/bedrock.lua") +dofile(minetest.get_modpath("mcnt_mapgen") .. "/ores.lua") diff --git a/mods/mcnt_mapgen/mod.conf b/mods/mcnt_mapgen/mod.conf new file mode 100644 index 0000000..c13035f --- /dev/null +++ b/mods/mcnt_mapgen/mod.conf @@ -0,0 +1,2 @@ +name = mcnt_mapgen +depends = mcnt_core diff --git a/mods/minecraft/mapgen/ores.lua b/mods/mcnt_mapgen/ores.lua similarity index 100% rename from mods/minecraft/mapgen/ores.lua rename to mods/mcnt_mapgen/ores.lua diff --git a/mods/mcnt_sponge/mod.conf b/mods/mcnt_sponge/mod.conf index d4c98e8..91e2dea 100644 --- a/mods/mcnt_sponge/mod.conf +++ b/mods/mcnt_sponge/mod.conf @@ -1,2 +1,2 @@ name = mcnt_sponge -depends = minecraft \ No newline at end of file +depends = mcnt_core \ No newline at end of file diff --git a/mods/minecraft/items/tools.lua b/mods/mcnt_tools/init.lua similarity index 84% rename from mods/minecraft/items/tools.lua rename to mods/mcnt_tools/init.lua index f0bd819..cae4533 100644 --- a/mods/minecraft/items/tools.lua +++ b/mods/mcnt_tools/init.lua @@ -1,4 +1,7 @@ -minetest.register_tool("minecraft:wooden_pickaxe", { + +dofile(minetest.get_modpath('mcnt_tools')..'/recipes.lua') + +minetest.register_tool(":minecraft:wooden_pickaxe", { description = "Wooden Pickaxe", inventory_image = "items.png^[sheet:16x16:0,6", tool_capabilities = { @@ -14,7 +17,7 @@ minetest.register_tool("minecraft:wooden_pickaxe", { punch_attack_uses = 30, }, }) -minetest.register_tool("minecraft:stone_pickaxe", { +minetest.register_tool(":minecraft:stone_pickaxe", { description = "Stone Pickaxe", inventory_image = "items.png^[sheet:16x16:1,6", tool_capabilities = { @@ -30,7 +33,7 @@ minetest.register_tool("minecraft:stone_pickaxe", { punch_attack_uses = 66, }, }) -minetest.register_tool("minecraft:iron_pickaxe", { +minetest.register_tool(":minecraft:iron_pickaxe", { description = "Iron Pickaxe", inventory_image = "items.png^[sheet:16x16:2,6", tool_capabilities = { @@ -46,7 +49,7 @@ minetest.register_tool("minecraft:iron_pickaxe", { punch_attack_uses = 126, }, }) -minetest.register_tool("minecraft:golden_pickaxe", { +minetest.register_tool(":minecraft:golden_pickaxe", { description = "Golden Pickaxe", inventory_image = "items.png^[sheet:16x16:4,6", tool_capabilities = { @@ -62,7 +65,7 @@ minetest.register_tool("minecraft:golden_pickaxe", { punch_attack_uses = 17, }, }) -minetest.register_tool("minecraft:diamond_pickaxe", { +minetest.register_tool(":minecraft:diamond_pickaxe", { description = "Diamond Pickaxe", inventory_image = "items.png^[sheet:16x16:3,6", tool_capabilities = { @@ -81,7 +84,7 @@ minetest.register_tool("minecraft:diamond_pickaxe", { -- Shovels! -minetest.register_tool("minecraft:wooden_shovel", { +minetest.register_tool(":minecraft:wooden_shovel", { description = "Wooden Shovel", inventory_image = "items.png^[sheet:16x16:0,5", tool_capabilities = { @@ -97,7 +100,7 @@ minetest.register_tool("minecraft:wooden_shovel", { punch_attack_uses = 30, }, }) -minetest.register_tool("minecraft:stone_shovel", { +minetest.register_tool(":minecraft:stone_shovel", { description = "Stone Shovel", inventory_image = "items.png^[sheet:16x16:1,5", tool_capabilities = { @@ -113,7 +116,7 @@ minetest.register_tool("minecraft:stone_shovel", { punch_attack_uses = 66, }, }) -minetest.register_tool("minecraft:iron_shovel", { +minetest.register_tool(":minecraft:iron_shovel", { description = "Iron Shovel", inventory_image = "items.png^[sheet:16x16:2,5", tool_capabilities = { @@ -129,7 +132,7 @@ minetest.register_tool("minecraft:iron_shovel", { punch_attack_uses = 126, }, }) -minetest.register_tool("minecraft:golden_shovel", { +minetest.register_tool(":minecraft:golden_shovel", { description = "Golden Shovel", inventory_image = "items.png^[sheet:16x16:4,5", tool_capabilities = { @@ -145,7 +148,7 @@ minetest.register_tool("minecraft:golden_shovel", { punch_attack_uses = 17, }, }) -minetest.register_tool("minecraft:diamond_shovel", { +minetest.register_tool(":minecraft:diamond_shovel", { description = "Diamond Shovel", inventory_image = "items.png^[sheet:16x16:3,5", tool_capabilities = { @@ -164,7 +167,7 @@ minetest.register_tool("minecraft:diamond_shovel", { -- Axes -minetest.register_tool("minecraft:wooden_axe", { +minetest.register_tool(":minecraft:wooden_axe", { description = "Wooden Axe", inventory_image = "items.png^[sheet:16x16:0,7", tool_capabilities = { @@ -180,7 +183,7 @@ minetest.register_tool("minecraft:wooden_axe", { punch_attack_uses = 30, }, }) -minetest.register_tool("minecraft:stone_axe", { +minetest.register_tool(":minecraft:stone_axe", { description = "Stone Axe", inventory_image = "items.png^[sheet:16x16:1,7", tool_capabilities = { @@ -196,7 +199,7 @@ minetest.register_tool("minecraft:stone_axe", { punch_attack_uses = 66, }, }) -minetest.register_tool("minecraft:iron_axe", { +minetest.register_tool(":minecraft:iron_axe", { description = "Iron Axe", inventory_image = "items.png^[sheet:16x16:2,7", tool_capabilities = { @@ -212,7 +215,7 @@ minetest.register_tool("minecraft:iron_axe", { punch_attack_uses = 126, }, }) -minetest.register_tool("minecraft:golden_axe", { +minetest.register_tool(":minecraft:golden_axe", { description = "Golden Axe", inventory_image = "items.png^[sheet:16x16:4,7", tool_capabilities = { @@ -228,7 +231,7 @@ minetest.register_tool("minecraft:golden_axe", { punch_attack_uses = 17, }, }) -minetest.register_tool("minecraft:diamond_axe", { +minetest.register_tool(":minecraft:diamond_axe", { description = "Diamond Axe", inventory_image = "items.png^[sheet:16x16:3,7", tool_capabilities = { @@ -243,4 +246,4 @@ minetest.register_tool("minecraft:diamond_axe", { damage_groups = {fleshy=9}, punch_attack_uses = 781, }, -}) \ No newline at end of file +}) diff --git a/mods/mcnt_tools/mod.conf b/mods/mcnt_tools/mod.conf new file mode 100644 index 0000000..3ef9718 --- /dev/null +++ b/mods/mcnt_tools/mod.conf @@ -0,0 +1 @@ +name = mcnt_tools \ No newline at end of file diff --git a/mods/mcnt_tools/recipes.lua b/mods/mcnt_tools/recipes.lua new file mode 100644 index 0000000..b3b52b3 --- /dev/null +++ b/mods/mcnt_tools/recipes.lua @@ -0,0 +1,85 @@ + +-- +-- Tool recipes. +-- + +tool_data = { + { + material = "minecraft:plank", + output = "minecraft:wooden_", + }, { + material = "minecraft:cobble", + output = "minecraft:stone_", + }, { + material = "minecraft:iron_ingot", + output = "minecraft:iron_", + }, { + material = "minecraft:gold_ingot", + output = "minecraft:golden_", + }, { + material = "minecraft:diamond", + output = "minecraft:diamond_", + } +} + +for k, v in pairs(tool_data) do + -- Pickaxes + minetest.register_craft({ + output = v['output'].."pickaxe", + recipe = { + {v['material'], v['material'], v['material']}, + {"", "minecraft:stick", ""}, + {"", "minecraft:stick", ""}, + } + }) + + -- Shovels + minetest.register_craft({ + output = v['output'].."shovel", + recipe = { + {v['material']}, + {"minecraft:stick"}, + {"minecraft:stick"}, + } + }) + + -- Axes + minetest.register_craft({ + output = v['output'].."axe", + recipe = { + {v['material'], v['material']}, + {"minecraft:stick", v['material']}, + {"minecraft:stick", ""}, + } + }) + + -- Axes (Mirrored) + minetest.register_craft({ + output = v['output'].."axe", + recipe = { + {v['material'], v['material']}, + {v['material'], "minecraft:stick"}, + {"", "minecraft:stick"}, + } + }) + + -- Hoes + minetest.register_craft({ + output = v['output'].."hoe", + recipe = { + {v['material'], v['material']}, + {"minecraft:stick", ""}, + {"minecraft:stick", ""}, + } + }) + + -- Hoes (Mirrored) + minetest.register_craft({ + output = v['output'].."hoe", + recipe = { + {v['material'], v['material']}, + {"", "minecraft:stick"}, + {"", "minecraft:stick"}, + } + }) +end diff --git a/mods/mcnt_torch/mod.conf b/mods/mcnt_torch/mod.conf index cc975f1..5cd8d27 100644 --- a/mods/mcnt_torch/mod.conf +++ b/mods/mcnt_torch/mod.conf @@ -1 +1,2 @@ -name = mcnt_torch \ No newline at end of file +name = mcnt_torch +depends = mcnt_core \ No newline at end of file diff --git a/mods/mcnt_trees/mod.conf b/mods/mcnt_trees/mod.conf index dd14538..5c6bb61 100644 --- a/mods/mcnt_trees/mod.conf +++ b/mods/mcnt_trees/mod.conf @@ -1 +1,2 @@ -name = mcnt_trees \ No newline at end of file +name = mcnt_trees +depends = mcnt_core \ No newline at end of file diff --git a/mods/wield3d/init.lua b/mods/mcnt_wield/init.lua similarity index 92% rename from mods/wield3d/init.lua rename to mods/mcnt_wield/init.lua index 9ac01a8..bfb28c9 100644 --- a/mods/wield3d/init.lua +++ b/mods/mcnt_wield/init.lua @@ -1,6 +1,13 @@ wield3d = {} -dofile(minetest.get_modpath(minetest.get_current_modname()).."/location.lua") +-- /location.lua +local bone = "Arm_Right" +local pos = {x=0, y=5.5, z=3} +local scale = {x=0.15, y=0.15} +local rx = -90 +local rz = 90 + +wield3d.location = { } local has_wieldview = minetest.get_modpath("wieldview") local update_time_conf = minetest.setting_get("wield3d_update_time") or 1 @@ -34,12 +41,12 @@ local function add_wield_entity(player) end end -minetest.register_item("wield3d:hand", { +minetest.register_item(":wield3d:hand", { type = "none", wield_image = "blank.png", }) -minetest.register_entity("wield3d:wield_entity", { +minetest.register_entity(":wield3d:wield_entity", { physical = false, collisionbox = {-0.125,-0.125,-0.125, 0.125,0.125,0.125}, visual = "wielditem", diff --git a/mods/mcnt_wield/mod.conf b/mods/mcnt_wield/mod.conf new file mode 100644 index 0000000..0761e02 --- /dev/null +++ b/mods/mcnt_wield/mod.conf @@ -0,0 +1 @@ +name = mcnt_wield \ No newline at end of file diff --git a/mods/minecraft/mod.conf b/mods/minecraft/mod.conf deleted file mode 100644 index 0089ac5..0000000 --- a/mods/minecraft/mod.conf +++ /dev/null @@ -1 +0,0 @@ -name = minecraft \ No newline at end of file diff --git a/mods/wield3d/LICENSE.md b/mods/wield3d/LICENSE.md deleted file mode 100644 index d7f31ff..0000000 --- a/mods/wield3d/LICENSE.md +++ /dev/null @@ -1,4 +0,0 @@ -[mod] 3d wielded items [wield3d] -================================ - -Copyright (C) 2013 Stuart Jones - WTFPL diff --git a/mods/wield3d/README.md b/mods/wield3d/README.md deleted file mode 100644 index 7a3fdba..0000000 --- a/mods/wield3d/README.md +++ /dev/null @@ -1,17 +0,0 @@ -[mod] 3d wielded items [wield3d] -================================ - -Mod Version: 0.4.0 - -Minetest Version: 0.4.12 or later - -Decription: Visible 3d wielded items for Minetest - -Depends: default - -Makes hand wielded items visible to other players. - -By default the wielded object is updated at one second intervals, -you can override this by adding wield3d_update_time = 1 (seconds) -to your minetest.conf - diff --git a/mods/wield3d/location.lua b/mods/wield3d/location.lua deleted file mode 100644 index a536100..0000000 --- a/mods/wield3d/location.lua +++ /dev/null @@ -1,36 +0,0 @@ --- Wielded Item Location Overrides - [item_name] = {bone, position, rotation} - -local bone = "Arm_Right" -local pos = {x=0, y=5.5, z=3} -local scale = {x=0.15, y=0.15} -local rx = -90 -local rz = 90 - -wield3d.location = { - ["default:torch"] = {bone, pos, {x=rx, y=180, z=rz}, scale}, - ["default:sapling"] = {bone, pos, {x=rx, y=180, z=rz}, scale}, - ["flowers:dandelion_white"] = {bone, pos, {x=rx, y=180, z=rz}, scale}, - ["flowers:dandelion_yellow"] = {bone, pos, {x=rx, y=180, z=rz}, scale}, - ["flowers:geranium"] = {bone, pos, {x=rx, y=180, z=rz}, scale}, - ["flowers:rose"] = {bone, pos, {x=rx, y=180, z=rz}, scale}, - ["flowers:tulip"] = {bone, pos, {x=rx, y=180, z=rz}, scale}, - ["flowers:viola"] = {bone, pos, {x=rx, y=180, z=rz}, scale}, - ["default:shovel_wood"] = {bone, pos, {x=rx, y=135, z=rz}, scale}, - ["default:shovel_stone"] = {bone, pos, {x=rx, y=135, z=rz}, scale}, - ["default:shovel_steel"] = {bone, pos, {x=rx, y=135, z=rz}, scale}, - ["default:shovel_bronze"] = {bone, pos, {x=rx, y=135, z=rz}, scale}, - ["default:shovel_mese"] = {bone, pos, {x=rx, y=135, z=rz}, scale}, - ["default:shovel_diamond"] = {bone, pos, {x=rx, y=135, z=rz}, scale}, - ["bucket:bucket_empty"] = {bone, pos, {x=rx, y=135, z=rz}, scale}, - ["bucket:bucket_water"] = {bone, pos, {x=rx, y=135, z=rz}, scale}, - ["bucket:bucket_lava"] = {bone, pos, {x=rx, y=135, z=rz}, scale}, - ["screwdriver:screwdriver"] = {bone, pos, {x=rx, y=135, z=rz}, scale}, - ["screwdriver:screwdriver1"] = {bone, pos, {x=rx, y=135, z=rz}, scale}, - ["screwdriver:screwdriver2"] = {bone, pos, {x=rx, y=135, z=rz}, scale}, - ["screwdriver:screwdriver3"] = {bone, pos, {x=rx, y=135, z=rz}, scale}, - ["screwdriver:screwdriver4"] = {bone, pos, {x=rx, y=135, z=rz}, scale}, - ["vessels:glass_bottle"] = {bone, pos, {x=rx, y=135, z=rz}, scale}, - ["vessels:drinking_glass"] = {bone, pos, {x=rx, y=135, z=rz}, scale}, - ["vessels:steel_bottle"] = {bone, pos, {x=rx, y=135, z=rz}, scale}, -} - diff --git a/mods/wield3d/mod.conf b/mods/wield3d/mod.conf deleted file mode 100644 index d5c60d6..0000000 --- a/mods/wield3d/mod.conf +++ /dev/null @@ -1,5 +0,0 @@ -name = wield3d -description = See the items other players are holding -release = 842 -author = stu -title = Wield3D