From 1cef707c6c853d9d62df599ca1dcb4b6ed0b5c6f Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Tue, 27 Oct 2020 18:19:49 +0100 Subject: [PATCH] /enchant working --- .../LICENSE | 0 .../README | 0 .../book.lua | 0 .../command.lua | 11 +-- .../core.lua | 76 ++++++++++-------- .../enchantments.lua | 32 ++++++-- .../features.lua | 4 + .../init.lua | 1 + .../mod.conf | 2 +- .../models/mcl_enchanting_book.b3d | Bin .../models/mcl_enchanting_book_entity.png | Bin .../roman_numerals.lua | 0 .../sounds/mcl_enchanting_enchant.ogg | Bin .../table.lua | 0 .../textures/mcl_enchanting_book_closed.png | Bin .../textures/mcl_enchanting_book_open.png | Bin .../textures/mcl_enchanting_button.png | Bin .../mcl_enchanting_button_background.png | Bin .../mcl_enchanting_button_hovered.png | Bin .../textures/mcl_enchanting_button_off.png | Bin .../textures/mcl_enchanting_glyph_1.png | Bin .../textures/mcl_enchanting_glyph_10.png | Bin .../textures/mcl_enchanting_glyph_11.png | Bin .../textures/mcl_enchanting_glyph_12.png | Bin .../textures/mcl_enchanting_glyph_13.png | Bin .../textures/mcl_enchanting_glyph_14.png | Bin .../textures/mcl_enchanting_glyph_15.png | Bin .../textures/mcl_enchanting_glyph_16.png | Bin .../textures/mcl_enchanting_glyph_17.png | Bin .../textures/mcl_enchanting_glyph_18.png | Bin .../textures/mcl_enchanting_glyph_2.png | Bin .../textures/mcl_enchanting_glyph_3.png | Bin .../textures/mcl_enchanting_glyph_4.png | Bin .../textures/mcl_enchanting_glyph_5.png | Bin .../textures/mcl_enchanting_glyph_6.png | Bin .../textures/mcl_enchanting_glyph_7.png | Bin .../textures/mcl_enchanting_glyph_8.png | Bin .../textures/mcl_enchanting_glyph_9.png | Bin .../mcl_enchanting_lapis_background.png | Bin .../textures/mcl_enchanting_number_1.png | Bin .../textures/mcl_enchanting_number_1_off.png | Bin .../textures/mcl_enchanting_number_2.png | Bin .../textures/mcl_enchanting_number_2_off.png | Bin .../textures/mcl_enchanting_number_3.png | Bin .../textures/mcl_enchanting_number_3_off.png | Bin .../textures/mcl_enchanting_table_bottom.png | Bin .../textures/mcl_enchanting_table_side.png | Bin .../textures/mcl_enchanting_table_top.png | Bin mods/ITEMS/mcl_bows/bow.lua | 2 +- 49 files changed, 81 insertions(+), 47 deletions(-) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/LICENSE (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/README (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/book.lua (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/command.lua (85%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/core.lua (71%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/enchantments.lua (93%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/features.lua (99%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/init.lua (94%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/mod.conf (75%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/models/mcl_enchanting_book.b3d (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/models/mcl_enchanting_book_entity.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/roman_numerals.lua (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/sounds/mcl_enchanting_enchant.ogg (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/table.lua (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_book_closed.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_book_open.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_button.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_button_background.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_button_hovered.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_button_off.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_glyph_1.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_glyph_10.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_glyph_11.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_glyph_12.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_glyph_13.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_glyph_14.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_glyph_15.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_glyph_16.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_glyph_17.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_glyph_18.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_glyph_2.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_glyph_3.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_glyph_4.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_glyph_5.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_glyph_6.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_glyph_7.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_glyph_8.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_glyph_9.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_lapis_background.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_number_1.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_number_1_off.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_number_2.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_number_2_off.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_number_3.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_number_3_off.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_table_bottom.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_table_side.png (100%) rename mods/CORE/{mcl_enchanting => _mcl_enchanting}/textures/mcl_enchanting_table_top.png (100%) diff --git a/mods/CORE/mcl_enchanting/LICENSE b/mods/CORE/_mcl_enchanting/LICENSE similarity index 100% rename from mods/CORE/mcl_enchanting/LICENSE rename to mods/CORE/_mcl_enchanting/LICENSE diff --git a/mods/CORE/mcl_enchanting/README b/mods/CORE/_mcl_enchanting/README similarity index 100% rename from mods/CORE/mcl_enchanting/README rename to mods/CORE/_mcl_enchanting/README diff --git a/mods/CORE/mcl_enchanting/book.lua b/mods/CORE/_mcl_enchanting/book.lua similarity index 100% rename from mods/CORE/mcl_enchanting/book.lua rename to mods/CORE/_mcl_enchanting/book.lua diff --git a/mods/CORE/mcl_enchanting/command.lua b/mods/CORE/_mcl_enchanting/command.lua similarity index 85% rename from mods/CORE/mcl_enchanting/command.lua rename to mods/CORE/_mcl_enchanting/command.lua index 28b0cadc..e93a3979 100644 --- a/mods/CORE/mcl_enchanting/command.lua +++ b/mods/CORE/_mcl_enchanting/command.lua @@ -1,5 +1,5 @@ minetest.register_chatcommand("enchant", { - description = "Enchant an item." + description = "Enchant an item.", params = " []", privs = {give = true}, func = function(_, param) @@ -8,10 +8,10 @@ minetest.register_chatcommand("enchant", { local enchantment = sparam[2] local level_str = sparam[3] local level = tonumber(level_str or "1") - if not name or not enchantment then + if not target_name or not enchantment then return false, "Usage: /enchant []" end - local target = minetest.get_player_by_name(name) + local target = minetest.get_player_by_name(target_name) if not target then return false, "Player '" .. target_name .. "' cannot be found" end @@ -26,15 +26,16 @@ minetest.register_chatcommand("enchant", { return false, "The selected enchantment can't be added to the target item" elseif errorstring == "level invalid" then return false, "'" .. level_str .. "' is not a valid number" - elseif errorstring == "level too high" + elseif errorstring == "level too high" then return false, "The number you have entered (" .. level_str .. ") is too big, it must be at most " .. extra_info - elseif errorstring == "level too small" + elseif errorstring == "level too small" then return false, "The number you have entered (" .. level_str .. ") is too small, it must be at least " .. extra_info elseif errorstring == "incompatible" then return false, mcl_enchanting.get_enchantment_description(enchantment, level) .. " can't be combined with " .. extra_info end else target:set_wielded_item(mcl_enchanting.enchant(itemstack, enchantment, level)) + return true, "Enchanting succeded" end end }) diff --git a/mods/CORE/mcl_enchanting/core.lua b/mods/CORE/_mcl_enchanting/core.lua similarity index 71% rename from mods/CORE/mcl_enchanting/core.lua rename to mods/CORE/_mcl_enchanting/core.lua index e9fa523f..52cbe53b 100644 --- a/mods/CORE/mcl_enchanting/core.lua +++ b/mods/CORE/_mcl_enchanting/core.lua @@ -42,38 +42,43 @@ end) --]] minetest.register_on_mods_loaded(function() + local register_list = {} for toolname, tooldef in pairs(minetest.registered_tools) do - -- quick test - local has_enchantment = false + if tooldef.groups.enchanted then + break + end + local quick_test = false for group, groupv in pairs(tooldef.groups) do - if groupv > 0 and mcl_enchanting.all_item_groups[group] then - has_enchantment = true + if groupv > 0 and mcl_enchanting.all_item_groups[group] then + quick_test = true break end end - if not has_enchantment then - break - end - -- expensive test - has_enchantment = false - for enchantment in pairs(mcl_enchanting.enchantments) do - if mcl_enchanting.item_supports_enchantment(itemname, enchantment) then - has_enchantment = true - break + if quick_test then + --print(toolname) + local expensive_test = false + for enchantment in pairs(mcl_enchanting.enchantments) do + if mcl_enchanting.item_supports_enchantment(toolname, enchantment, true) then + -- print("\tSupports " .. enchantment) + expensive_test = true + break + end + end + if expensive_test then + local new_name = toolname .. "_enchanted" + minetest.override_item(toolname, {_mcl_enchanting_enchanted_tool = new_name}) + local new_def = table.copy(tooldef) + new_def.inventory_image = tooldef.inventory_image .. "^[colorize:purple:50" + new_def.groups.not_in_creative_inventory = 1 + new_def.groups.enchanted = 1 + new_def.texture = tooldef.texture or toolname:gsub("%:", "_") + new_def._mcl_enchanting_enchanted_tool = new_name + register_list[":" .. new_name] = new_def end end - if not has_enchantment then - break - end - local new_name = toolname .. "_enchanted" - tooldef._mcl_enchanting_enchanted_tool = new_name - local new_def = table.copy(tooldef) - new_def.inventory_image = old_def.inventory_image .. "^[colorize:violet:50" - new_def.groups.not_in_creative_inventory = 1 - new_def.groups.enchanted = 1 - new_def.texture = old_def.texture or toolname:gsub("%:", "_") - new_def._mcl_enchanting_enchanted_tool = new_name - minetest.register_tool(":" .. new_name, new_def) + end + for new_name, new_def in pairs(register_list) do + minetest.register_tool(new_name, new_def) end end) @@ -91,15 +96,16 @@ end function mcl_enchanting.get_enchantment_description(enchantment, level) local enchantment_def = mcl_enchanting.enchantments[enchantment] - return enchantment_def.name .. " " .. (enchantment_def.max_level == 1 and "" or mcl_enchanting.roman_numerals.toRoman(level)) + return enchantment_def.name .. (enchantment_def.max_level == 1 and "" or " " .. mcl_enchanting.roman_numerals.toRoman(level)) end function mcl_enchanting.get_enchanted_itemstring(itemname) - return minetest.registered_items[itemname]._mcl_enchanting_enchanted_tool + local def = minetest.registered_items[itemname] + return def and def._mcl_enchanting_enchanted_tool end -function mcl_enchanting.item_supports_enchantment(itemname, enchantment) - if not mcl_enchanting.get_enchanted_itemstring(itemname) then +function mcl_enchanting.item_supports_enchantment(itemname, enchantment, early) + if not early and not mcl_enchanting.get_enchanted_itemstring(itemname) then return false end local enchantment_def = mcl_enchanting.enchantments[enchantment] @@ -109,7 +115,7 @@ function mcl_enchanting.item_supports_enchantment(itemname, enchantment) end end for group in pairs(enchantment_def.all) do - if minetest.get_item_group(itemname, group) then + if minetest.get_item_group(itemname, group) > 0 then return true end end @@ -124,7 +130,7 @@ function mcl_enchanting.can_enchant(itemstack, enchantment, level) if itemstack:get_name() == "" then return false, "item missing" end - if not mcl_enchanting.item_supports_enchantment(itemdef.name, enchantment) then + if not mcl_enchanting.item_supports_enchantment(itemstack:get_name(), enchantment) then return false, "item not supported" end if not level then @@ -146,19 +152,19 @@ function mcl_enchanting.can_enchant(itemstack, enchantment, level) return false, "incompatible", mcl_enchanting.get_enchantment_description(incompatible, incompatible_level) end end + return true end function mcl_enchanting.enchant(itemstack, enchantment, level) - local enchanted_itemstack = ItemStack(mcl_enchanting.get_enchanted_itemstring(itemstack:get_name())) - enchanted_itemstack:add_wear(itemstack:get_wear()) - enchanted_itemstack:set_meta(itemstack:get_meta()) + local enchanted_itemstack = ItemStack({name = mcl_enchanting.get_enchanted_itemstring(itemstack:get_name()), wear = itemstack:get_wear(), metadata = itemstack:get_metadata()}) local enchantments = mcl_enchanting.get_enchantments(enchanted_itemstack) enchantments[enchantment] = level mcl_enchanting.set_enchantments(enchanted_itemstack, enchantments) mcl_enchanting.reload_enchantments(enchanted_itemstack, enchantments) + return enchanted_itemstack end -function mcl_enchanting.reload_enchantments(itemstack, echantments) +function mcl_enchanting.reload_enchantments(itemstack, enchantments) local itemdef = itemstack:get_definition() for enchantment, level in pairs(enchantments) do local func = mcl_enchanting.features[enchantment] diff --git a/mods/CORE/mcl_enchanting/enchantments.lua b/mods/CORE/_mcl_enchanting/enchantments.lua similarity index 93% rename from mods/CORE/mcl_enchanting/enchantments.lua rename to mods/CORE/_mcl_enchanting/enchantments.lua index 04783a67..13e09928 100644 --- a/mods/CORE/mcl_enchanting/enchantments.lua +++ b/mods/CORE/_mcl_enchanting/enchantments.lua @@ -1,6 +1,6 @@ -- Taken from https://minecraft.gamepedia.com/Enchanting -mcl_enchantments.enchantments = { +mcl_enchanting.enchantments = { -- unimplemented aqua_affinity = { name = "Aqua Affinity", @@ -90,6 +90,17 @@ mcl_enchantments.enchantments = { description = "Reduces fall damage." }, -- unimplemented + fire_aspect = { + name = "Fire Aspect", + max_level = 2, + primary = {sword = true}, + secondary = {}, + disallow = {}, + incompatible = {}, + weight = 2, + description = "Sets target on fire." + }, + -- unimplemented fire_protection = { name = "Fire Protection", max_level = 4, @@ -101,6 +112,17 @@ mcl_enchantments.enchantments = { description = "Reduces fire damage." }, -- unimplemented + flame = { + name = "Flame", + max_level = 1, + primary = {bow = true}, + secondary = {}, + disallow = {}, + incompatible = {}, + weight = 2, + description = "Arrows set target on fire." + }, + -- unimplemented fortune = { name = "Fortune", max_level = 4, @@ -190,7 +212,7 @@ mcl_enchantments.enchantments = { }, -- unimplemented power = { - name = "Power", + name = "Power", max_level = 5, primary = {}, secondary = {bow = true}, @@ -267,12 +289,12 @@ mcl_enchantments.enchantments = { }, -- unimplemented smite = { - name = "Sharpness", + name = "Smite", max_level = 5, primary = {sword = true}, secondary = {axe = true}, disallow = {}, - incompatible = {sharpness = true, smite = true}, + incompatible = {bane_of_anthropods = true, sharpness = true}, weight = 5, description = "Increases damage to undead mobs." }, @@ -292,7 +314,7 @@ mcl_enchantments.enchantments = { name = "Sweeping Edge", max_level = 3, primary = {sword = true}, - secondary = {axe = true}, + secondary = {}, disallow = {}, incompatible = {}, weight = 2, diff --git a/mods/CORE/mcl_enchanting/features.lua b/mods/CORE/_mcl_enchanting/features.lua similarity index 99% rename from mods/CORE/mcl_enchanting/features.lua rename to mods/CORE/_mcl_enchanting/features.lua index 793ff85f..f12abe09 100644 --- a/mods/CORE/mcl_enchanting/features.lua +++ b/mods/CORE/_mcl_enchanting/features.lua @@ -1,3 +1,6 @@ +mcl_enchanting.features = {} + + --[[ local pickaxes = {"mcl_tools:pick_wood", "mcl_tools:pick_stone", "mcl_tools:pick_gold", "mcl_tools:pick_iron", "mcl_tools:pick_diamond"} local pickaxes_better_than_iron = {"mcl_tools:pick_iron", "mcl_tools:pick_diamond"} @@ -118,3 +121,4 @@ end) end }, },--]] + diff --git a/mods/CORE/mcl_enchanting/init.lua b/mods/CORE/_mcl_enchanting/init.lua similarity index 94% rename from mods/CORE/mcl_enchanting/init.lua rename to mods/CORE/_mcl_enchanting/init.lua index 8489ff2d..4d693f95 100644 --- a/mods/CORE/mcl_enchanting/init.lua +++ b/mods/CORE/_mcl_enchanting/init.lua @@ -9,6 +9,7 @@ mcl_enchanting = { dofile(modpath .. "/enchantments.lua") dofile(modpath .. "/features.lua") dofile(modpath .. "/core.lua") +dofile(modpath .. "/command.lua") -- dofile(modpath .. "/ui.lua") -- dofile(modpath .. "/fx.lua") -- dofile(modpath .. "/book.lua") diff --git a/mods/CORE/mcl_enchanting/mod.conf b/mods/CORE/_mcl_enchanting/mod.conf similarity index 75% rename from mods/CORE/mcl_enchanting/mod.conf rename to mods/CORE/_mcl_enchanting/mod.conf index 2ec29e52..237db411 100644 --- a/mods/CORE/mcl_enchanting/mod.conf +++ b/mods/CORE/_mcl_enchanting/mod.conf @@ -1,5 +1,5 @@ name = mcl_enchanting description = The rewrite of the Enchanting mod for MineClone2 -depends = mcl_sounds, mcl_formspec, mcl_dye +depends = mcl_formspec, _mcl_autogroup optional_depends = screwdriver author = Fleckenstein diff --git a/mods/CORE/mcl_enchanting/models/mcl_enchanting_book.b3d b/mods/CORE/_mcl_enchanting/models/mcl_enchanting_book.b3d similarity index 100% rename from mods/CORE/mcl_enchanting/models/mcl_enchanting_book.b3d rename to mods/CORE/_mcl_enchanting/models/mcl_enchanting_book.b3d diff --git a/mods/CORE/mcl_enchanting/models/mcl_enchanting_book_entity.png b/mods/CORE/_mcl_enchanting/models/mcl_enchanting_book_entity.png similarity index 100% rename from mods/CORE/mcl_enchanting/models/mcl_enchanting_book_entity.png rename to mods/CORE/_mcl_enchanting/models/mcl_enchanting_book_entity.png diff --git a/mods/CORE/mcl_enchanting/roman_numerals.lua b/mods/CORE/_mcl_enchanting/roman_numerals.lua similarity index 100% rename from mods/CORE/mcl_enchanting/roman_numerals.lua rename to mods/CORE/_mcl_enchanting/roman_numerals.lua diff --git a/mods/CORE/mcl_enchanting/sounds/mcl_enchanting_enchant.ogg b/mods/CORE/_mcl_enchanting/sounds/mcl_enchanting_enchant.ogg similarity index 100% rename from mods/CORE/mcl_enchanting/sounds/mcl_enchanting_enchant.ogg rename to mods/CORE/_mcl_enchanting/sounds/mcl_enchanting_enchant.ogg diff --git a/mods/CORE/mcl_enchanting/table.lua b/mods/CORE/_mcl_enchanting/table.lua similarity index 100% rename from mods/CORE/mcl_enchanting/table.lua rename to mods/CORE/_mcl_enchanting/table.lua diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_book_closed.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_book_closed.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_book_closed.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_book_closed.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_book_open.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_book_open.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_book_open.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_book_open.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_button.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_button.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_button.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_button.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_button_background.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_button_background.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_button_background.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_button_background.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_button_hovered.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_button_hovered.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_button_hovered.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_button_hovered.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_button_off.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_button_off.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_button_off.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_button_off.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_1.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_1.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_1.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_1.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_10.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_10.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_10.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_10.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_11.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_11.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_11.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_11.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_12.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_12.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_12.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_12.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_13.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_13.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_13.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_13.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_14.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_14.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_14.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_14.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_15.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_15.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_15.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_15.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_16.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_16.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_16.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_16.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_17.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_17.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_17.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_17.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_18.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_18.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_18.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_18.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_2.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_2.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_2.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_2.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_3.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_3.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_3.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_3.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_4.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_4.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_4.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_4.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_5.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_5.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_5.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_5.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_6.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_6.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_6.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_6.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_7.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_7.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_7.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_7.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_8.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_8.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_8.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_8.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_9.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_9.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_glyph_9.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_glyph_9.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_lapis_background.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_lapis_background.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_lapis_background.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_lapis_background.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_1.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_number_1.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_1.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_number_1.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_1_off.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_number_1_off.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_1_off.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_number_1_off.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_2.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_number_2.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_2.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_number_2.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_2_off.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_number_2_off.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_2_off.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_number_2_off.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_3.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_number_3.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_3.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_number_3.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_3_off.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_number_3_off.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_number_3_off.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_number_3_off.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_table_bottom.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_table_bottom.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_table_bottom.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_table_bottom.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_table_side.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_table_side.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_table_side.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_table_side.png diff --git a/mods/CORE/mcl_enchanting/textures/mcl_enchanting_table_top.png b/mods/CORE/_mcl_enchanting/textures/mcl_enchanting_table_top.png similarity index 100% rename from mods/CORE/mcl_enchanting/textures/mcl_enchanting_table_top.png rename to mods/CORE/_mcl_enchanting/textures/mcl_enchanting_table_top.png diff --git a/mods/ITEMS/mcl_bows/bow.lua b/mods/ITEMS/mcl_bows/bow.lua index 8231c8ed..0368a421 100644 --- a/mods/ITEMS/mcl_bows/bow.lua +++ b/mods/ITEMS/mcl_bows/bow.lua @@ -156,7 +156,7 @@ for level=0, 2 do wield_scale = { x = 1.8, y = 1.8, z = 1 }, stack_max = 1, range = 0, -- Pointing range to 0 to prevent punching with bow :D - groups = {not_in_creative_inventory=1, not_in_craft_guide=1}, + groups = {not_in_creative_inventory=1, not_in_craft_guide=1, bow=1}, on_drop = function(itemstack, dropper, pos) reset_bow_state(dropper) itemstack:set_name("mcl_bows:bow")