From 34e92a361b6b3c876b12fe038beeb1221c4f1f45 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Thu, 31 May 2018 18:32:26 +0200 Subject: [PATCH] Rename mobs mod to mcl_mobs --- API.md | 4 ++-- mods/ENTITIES/{mobs => mcl_mobs}/api.lua | 2 +- mods/ENTITIES/{mobs => mcl_mobs}/api.txt | 0 mods/ENTITIES/{mobs => mcl_mobs}/crafts.lua | 2 +- mods/ENTITIES/{mobs => mcl_mobs}/depends.txt | 0 mods/ENTITIES/mcl_mobs/description.txt | 1 + mods/ENTITIES/mcl_mobs/init.lua | 13 +++++++++++++ mods/ENTITIES/{mobs => mcl_mobs}/intllib.lua | 0 mods/ENTITIES/{mobs => mcl_mobs}/license.txt | 0 mods/ENTITIES/{mobs => mcl_mobs}/locale/de_DE.po | 0 mods/ENTITIES/{mobs => mcl_mobs}/locale/es.po | 0 mods/ENTITIES/{mobs => mcl_mobs}/locale/fr.po | 0 mods/ENTITIES/{mobs => mcl_mobs}/locale/it.po | 0 mods/ENTITIES/{mobs => mcl_mobs}/locale/ms.po | 0 mods/ENTITIES/{mobs => mcl_mobs}/locale/pt.po | 0 mods/ENTITIES/{mobs => mcl_mobs}/locale/ru.po | 0 .../{mobs => mcl_mobs}/locale/template.pot | 0 mods/ENTITIES/{mobs => mcl_mobs}/locale/tr.po | 0 mods/ENTITIES/mcl_mobs/lucky_block.lua | 8 ++++++++ mods/ENTITIES/mcl_mobs/mod.conf | 1 + mods/ENTITIES/{mobs => mcl_mobs}/mount.lua | 0 mods/ENTITIES/{mobs => mcl_mobs}/readme.MD | 2 +- .../{mobs => mcl_mobs}/sounds/default_punch.ogg | Bin .../{mobs => mcl_mobs}/textures/mobs_blood.png | Bin .../{mobs => mcl_mobs}/textures/mobs_nametag.png | Bin mods/ENTITIES/mobs/description.txt | 1 - mods/ENTITIES/mobs/init.lua | 13 ------------- mods/ENTITIES/mobs/lucky_block.lua | 15 --------------- mods/ENTITIES/mobs/mod.conf | 1 - mods/ENTITIES/mobs_mc/depends.txt | 6 +++--- mods/ENTITIES/mobs_mc/description.txt | 2 +- mods/ENTITIES/mobs_mc/init.lua | 2 +- mods/ITEMS/mcl_fishing/depends.txt | 1 + mods/ITEMS/mcl_fishing/init.lua | 2 +- mods/ITEMS/mcl_mobspawners/depends.txt | 2 +- mods/MAPGEN/mcl_dungeons/depends.txt | 1 + mods/MAPGEN/mcl_dungeons/init.lua | 2 +- mods/MAPGEN/tsm_railcorridors/gameconfig.lua | 2 +- 38 files changed, 39 insertions(+), 44 deletions(-) rename mods/ENTITIES/{mobs => mcl_mobs}/api.lua (99%) rename mods/ENTITIES/{mobs => mcl_mobs}/api.txt (100%) rename mods/ENTITIES/{mobs => mcl_mobs}/crafts.lua (89%) rename mods/ENTITIES/{mobs => mcl_mobs}/depends.txt (100%) create mode 100644 mods/ENTITIES/mcl_mobs/description.txt create mode 100644 mods/ENTITIES/mcl_mobs/init.lua rename mods/ENTITIES/{mobs => mcl_mobs}/intllib.lua (100%) rename mods/ENTITIES/{mobs => mcl_mobs}/license.txt (100%) rename mods/ENTITIES/{mobs => mcl_mobs}/locale/de_DE.po (100%) rename mods/ENTITIES/{mobs => mcl_mobs}/locale/es.po (100%) rename mods/ENTITIES/{mobs => mcl_mobs}/locale/fr.po (100%) rename mods/ENTITIES/{mobs => mcl_mobs}/locale/it.po (100%) rename mods/ENTITIES/{mobs => mcl_mobs}/locale/ms.po (100%) rename mods/ENTITIES/{mobs => mcl_mobs}/locale/pt.po (100%) rename mods/ENTITIES/{mobs => mcl_mobs}/locale/ru.po (100%) rename mods/ENTITIES/{mobs => mcl_mobs}/locale/template.pot (100%) rename mods/ENTITIES/{mobs => mcl_mobs}/locale/tr.po (100%) create mode 100644 mods/ENTITIES/mcl_mobs/lucky_block.lua create mode 100644 mods/ENTITIES/mcl_mobs/mod.conf rename mods/ENTITIES/{mobs => mcl_mobs}/mount.lua (100%) rename mods/ENTITIES/{mobs => mcl_mobs}/readme.MD (98%) rename mods/ENTITIES/{mobs => mcl_mobs}/sounds/default_punch.ogg (100%) rename mods/ENTITIES/{mobs => mcl_mobs}/textures/mobs_blood.png (100%) rename mods/ENTITIES/{mobs => mcl_mobs}/textures/mobs_nametag.png (100%) delete mode 100644 mods/ENTITIES/mobs/description.txt delete mode 100644 mods/ENTITIES/mobs/init.lua delete mode 100644 mods/ENTITIES/mobs/lucky_block.lua delete mode 100644 mods/ENTITIES/mobs/mod.conf diff --git a/API.md b/API.md index 0a06eb8023..354a99f60a 100644 --- a/API.md +++ b/API.md @@ -38,13 +38,13 @@ A lot of things are possible by using one of the APIs in the mods. Note that not * Dispenser support: `ITEMS/REDSTONE/mcl_dispensers` ## Mobs -* Mobs: `ENTITIES/mods` +* Mobs: `ENTITIES/mcl_mods` MineClone 2 uses its own mobs framework, called “Mobs Redo: MineClone 2 Edition” or “MRM” for short. This is a fork of Mobs Redo [`mobs`] by TenPlus1. You can add your own mobs, spawn eggs and spawning rules with this mod. -API documnetation is included in `ENTITIES/mobs/api.txt`. +API documnetation is included in `ENTITIES/mcl_mobs/api.txt`. This mod includes modificiations from the original Mobs Redo. Some items have been removed or moved to other mods. The API is mostly identical, but a few features have been added. Compability is not really a goal, diff --git a/mods/ENTITIES/mobs/api.lua b/mods/ENTITIES/mcl_mobs/api.lua similarity index 99% rename from mods/ENTITIES/mobs/api.lua rename to mods/ENTITIES/mcl_mobs/api.lua index ec2dfb1f5b..d4fd8924c5 100644 --- a/mods/ENTITIES/mobs/api.lua +++ b/mods/ENTITIES/mcl_mobs/api.lua @@ -2944,7 +2944,7 @@ local on_rightclick_prefix = function(self, clicker) local item = clicker:get_wielded_item() -- Name mob with nametag - if not self.ignores_nametag and item:get_name() == "mobs:nametag" then + if not self.ignores_nametag and item:get_name() == "mcl_mobs:nametag" then local tag = item:get_meta():get_string("name") if tag ~= "" then diff --git a/mods/ENTITIES/mobs/api.txt b/mods/ENTITIES/mcl_mobs/api.txt similarity index 100% rename from mods/ENTITIES/mobs/api.txt rename to mods/ENTITIES/mcl_mobs/api.txt diff --git a/mods/ENTITIES/mobs/crafts.lua b/mods/ENTITIES/mcl_mobs/crafts.lua similarity index 89% rename from mods/ENTITIES/mobs/crafts.lua rename to mods/ENTITIES/mcl_mobs/crafts.lua index cb0c9da649..3422f3825c 100644 --- a/mods/ENTITIES/mobs/crafts.lua +++ b/mods/ENTITIES/mcl_mobs/crafts.lua @@ -2,7 +2,7 @@ local S = mobs.intllib -- name tag -minetest.register_craftitem("mobs:nametag", { +minetest.register_craftitem("mcl_mobs:nametag", { description = S("Name Tag"), _doc_items_longdesc = S("A name tag is an item to name a mob."), _doc_items_usagehelp = S("Before you use the name tag, you need to set a name at an anvil. Now you can use the name tag to name a mob with a rightclick. This uses up the name tag."), diff --git a/mods/ENTITIES/mobs/depends.txt b/mods/ENTITIES/mcl_mobs/depends.txt similarity index 100% rename from mods/ENTITIES/mobs/depends.txt rename to mods/ENTITIES/mcl_mobs/depends.txt diff --git a/mods/ENTITIES/mcl_mobs/description.txt b/mods/ENTITIES/mcl_mobs/description.txt new file mode 100644 index 0000000000..a426a1006e --- /dev/null +++ b/mods/ENTITIES/mcl_mobs/description.txt @@ -0,0 +1 @@ +Adds a mob API for mods to add animals or monsters, etc. diff --git a/mods/ENTITIES/mcl_mobs/init.lua b/mods/ENTITIES/mcl_mobs/init.lua new file mode 100644 index 0000000000..87e7c19bb4 --- /dev/null +++ b/mods/ENTITIES/mcl_mobs/init.lua @@ -0,0 +1,13 @@ + +local path = minetest.get_modpath(minetest.get_current_modname()) + +-- Mob API +dofile(path .. "/api.lua") + +-- Rideable Mobs +dofile(path .. "/mount.lua") + +-- Mob Items +dofile(path .. "/crafts.lua") + +minetest.log("action", "[MOD] Mobs Redo: MineClone 2 Edition loaded") diff --git a/mods/ENTITIES/mobs/intllib.lua b/mods/ENTITIES/mcl_mobs/intllib.lua similarity index 100% rename from mods/ENTITIES/mobs/intllib.lua rename to mods/ENTITIES/mcl_mobs/intllib.lua diff --git a/mods/ENTITIES/mobs/license.txt b/mods/ENTITIES/mcl_mobs/license.txt similarity index 100% rename from mods/ENTITIES/mobs/license.txt rename to mods/ENTITIES/mcl_mobs/license.txt diff --git a/mods/ENTITIES/mobs/locale/de_DE.po b/mods/ENTITIES/mcl_mobs/locale/de_DE.po similarity index 100% rename from mods/ENTITIES/mobs/locale/de_DE.po rename to mods/ENTITIES/mcl_mobs/locale/de_DE.po diff --git a/mods/ENTITIES/mobs/locale/es.po b/mods/ENTITIES/mcl_mobs/locale/es.po similarity index 100% rename from mods/ENTITIES/mobs/locale/es.po rename to mods/ENTITIES/mcl_mobs/locale/es.po diff --git a/mods/ENTITIES/mobs/locale/fr.po b/mods/ENTITIES/mcl_mobs/locale/fr.po similarity index 100% rename from mods/ENTITIES/mobs/locale/fr.po rename to mods/ENTITIES/mcl_mobs/locale/fr.po diff --git a/mods/ENTITIES/mobs/locale/it.po b/mods/ENTITIES/mcl_mobs/locale/it.po similarity index 100% rename from mods/ENTITIES/mobs/locale/it.po rename to mods/ENTITIES/mcl_mobs/locale/it.po diff --git a/mods/ENTITIES/mobs/locale/ms.po b/mods/ENTITIES/mcl_mobs/locale/ms.po similarity index 100% rename from mods/ENTITIES/mobs/locale/ms.po rename to mods/ENTITIES/mcl_mobs/locale/ms.po diff --git a/mods/ENTITIES/mobs/locale/pt.po b/mods/ENTITIES/mcl_mobs/locale/pt.po similarity index 100% rename from mods/ENTITIES/mobs/locale/pt.po rename to mods/ENTITIES/mcl_mobs/locale/pt.po diff --git a/mods/ENTITIES/mobs/locale/ru.po b/mods/ENTITIES/mcl_mobs/locale/ru.po similarity index 100% rename from mods/ENTITIES/mobs/locale/ru.po rename to mods/ENTITIES/mcl_mobs/locale/ru.po diff --git a/mods/ENTITIES/mobs/locale/template.pot b/mods/ENTITIES/mcl_mobs/locale/template.pot similarity index 100% rename from mods/ENTITIES/mobs/locale/template.pot rename to mods/ENTITIES/mcl_mobs/locale/template.pot diff --git a/mods/ENTITIES/mobs/locale/tr.po b/mods/ENTITIES/mcl_mobs/locale/tr.po similarity index 100% rename from mods/ENTITIES/mobs/locale/tr.po rename to mods/ENTITIES/mcl_mobs/locale/tr.po diff --git a/mods/ENTITIES/mcl_mobs/lucky_block.lua b/mods/ENTITIES/mcl_mobs/lucky_block.lua new file mode 100644 index 0000000000..ea90de74ac --- /dev/null +++ b/mods/ENTITIES/mcl_mobs/lucky_block.lua @@ -0,0 +1,8 @@ + +if minetest.get_modpath("lucky_block") then + + lucky_block:add_blocks({ + {"dro", {"mcl_mobs:nametag"}, 1}, + {"lig"}, + }) +end diff --git a/mods/ENTITIES/mcl_mobs/mod.conf b/mods/ENTITIES/mcl_mobs/mod.conf new file mode 100644 index 0000000000..bfad55509d --- /dev/null +++ b/mods/ENTITIES/mcl_mobs/mod.conf @@ -0,0 +1 @@ +name = mcl_mobs diff --git a/mods/ENTITIES/mobs/mount.lua b/mods/ENTITIES/mcl_mobs/mount.lua similarity index 100% rename from mods/ENTITIES/mobs/mount.lua rename to mods/ENTITIES/mcl_mobs/mount.lua diff --git a/mods/ENTITIES/mobs/readme.MD b/mods/ENTITIES/mcl_mobs/readme.MD similarity index 98% rename from mods/ENTITIES/mobs/readme.MD rename to mods/ENTITIES/mcl_mobs/readme.MD index 5296f4c142..0d332f85c8 100644 --- a/mods/ENTITIES/mobs/readme.MD +++ b/mods/ENTITIES/mcl_mobs/readme.MD @@ -15,7 +15,7 @@ Items: - Nametag (paper, black dye, string) can be used right-click on a tamed mob to give them a name. -Lucky Blocks: 9 +Lucky Block items: 1 Changelog from original Mobs Redo mod: diff --git a/mods/ENTITIES/mobs/sounds/default_punch.ogg b/mods/ENTITIES/mcl_mobs/sounds/default_punch.ogg similarity index 100% rename from mods/ENTITIES/mobs/sounds/default_punch.ogg rename to mods/ENTITIES/mcl_mobs/sounds/default_punch.ogg diff --git a/mods/ENTITIES/mobs/textures/mobs_blood.png b/mods/ENTITIES/mcl_mobs/textures/mobs_blood.png similarity index 100% rename from mods/ENTITIES/mobs/textures/mobs_blood.png rename to mods/ENTITIES/mcl_mobs/textures/mobs_blood.png diff --git a/mods/ENTITIES/mobs/textures/mobs_nametag.png b/mods/ENTITIES/mcl_mobs/textures/mobs_nametag.png similarity index 100% rename from mods/ENTITIES/mobs/textures/mobs_nametag.png rename to mods/ENTITIES/mcl_mobs/textures/mobs_nametag.png diff --git a/mods/ENTITIES/mobs/description.txt b/mods/ENTITIES/mobs/description.txt deleted file mode 100644 index 919852a13c..0000000000 --- a/mods/ENTITIES/mobs/description.txt +++ /dev/null @@ -1 +0,0 @@ -Adds a mob api for mods to add animals or monsters etc. \ No newline at end of file diff --git a/mods/ENTITIES/mobs/init.lua b/mods/ENTITIES/mobs/init.lua deleted file mode 100644 index 0e3620ab43..0000000000 --- a/mods/ENTITIES/mobs/init.lua +++ /dev/null @@ -1,13 +0,0 @@ - -local path = minetest.get_modpath("mobs") - --- Mob API -dofile(path .. "/api.lua") - --- Rideable Mobs -dofile(path .. "/mount.lua") - --- Mob Items -dofile(path .. "/crafts.lua") - -minetest.log("action", "[MOD] Mobs Redo loaded") diff --git a/mods/ENTITIES/mobs/lucky_block.lua b/mods/ENTITIES/mobs/lucky_block.lua deleted file mode 100644 index 7da0040f0f..0000000000 --- a/mods/ENTITIES/mobs/lucky_block.lua +++ /dev/null @@ -1,15 +0,0 @@ - -if minetest.get_modpath("lucky_block") then - - lucky_block:add_blocks({ - {"dro", {"mobs:meat_raw"}, 5}, - {"dro", {"mobs:meat"}, 5}, - {"dro", {"mobs:nametag"}, 1}, - {"dro", {"mobs:leather"}, 5}, - {"dro", {"mobs:net"}, 1}, - {"dro", {"mobs:lasso"}, 1}, - {"dro", {"mobs:shears"}, 1}, - {"dro", {"mobs:protector"}, 1}, - {"lig"}, - }) -end diff --git a/mods/ENTITIES/mobs/mod.conf b/mods/ENTITIES/mobs/mod.conf deleted file mode 100644 index f3a3ad743c..0000000000 --- a/mods/ENTITIES/mobs/mod.conf +++ /dev/null @@ -1 +0,0 @@ -name = mobs diff --git a/mods/ENTITIES/mobs_mc/depends.txt b/mods/ENTITIES/mobs_mc/depends.txt index ea2df6db9d..da8ac70d87 100644 --- a/mods/ENTITIES/mobs_mc/depends.txt +++ b/mods/ENTITIES/mobs_mc/depends.txt @@ -1,9 +1,9 @@ default? -mobs -tnt? +mcl_mobs +mcl_tnt? mcl_bows? mcl_throwing? -fishing? +mcl_fishing? bones? mesecons_materials? mobs_mc_gameconfig? diff --git a/mods/ENTITIES/mobs_mc/description.txt b/mods/ENTITIES/mobs_mc/description.txt index ac5a64066e..c57195fea9 100644 --- a/mods/ENTITIES/mobs_mc/description.txt +++ b/mods/ENTITIES/mobs_mc/description.txt @@ -1 +1 @@ -Adds MC like monsters and animals. \ No newline at end of file +Adds Minecraft-like monsters and animals. diff --git a/mods/ENTITIES/mobs_mc/init.lua b/mods/ENTITIES/mobs_mc/init.lua index 094fd39919..e2ec34008e 100644 --- a/mods/ENTITIES/mobs_mc/init.lua +++ b/mods/ENTITIES/mobs_mc/init.lua @@ -98,5 +98,5 @@ COLISIONBOX in minetest press f5 to see where you are looking at then put these -- if minetest.settings:get_bool("log_mods") then - minetest.log("action", "[MOD] Mobs Redo 'MC' loaded") + minetest.log("action", "[MOD] mobs_mc loaded") end diff --git a/mods/ITEMS/mcl_fishing/depends.txt b/mods/ITEMS/mcl_fishing/depends.txt index f910e230b0..93ef0bf523 100644 --- a/mods/ITEMS/mcl_fishing/depends.txt +++ b/mods/ITEMS/mcl_fishing/depends.txt @@ -1,3 +1,4 @@ mcl_core mcl_sounds mcl_loot +mcl_mobs diff --git a/mods/ITEMS/mcl_fishing/init.lua b/mods/ITEMS/mcl_fishing/init.lua index ed6aadccf0..ab2519b9fd 100644 --- a/mods/ITEMS/mcl_fishing/init.lua +++ b/mods/ITEMS/mcl_fishing/init.lua @@ -52,7 +52,7 @@ local go_fishing = function(itemstack, user, pointed_thing) { itemstring = "mcl_books:book" }, -- TODO: Enchanted Fishing Rod { itemstring = "mcl_fishing:fishing_rod", wear_min = 49144, wear_max = 65535 }, -- 75%-100% damage - { itemstring = "mobs:nametag", }, + { itemstring = "mcl_mobs:nametag", }, { itemstring = "mcl_mobitems:saddle", }, { itemstring = "mcl_flowers:waterlily", }, } diff --git a/mods/ITEMS/mcl_mobspawners/depends.txt b/mods/ITEMS/mcl_mobspawners/depends.txt index 72e19e8624..dc1a03b827 100644 --- a/mods/ITEMS/mcl_mobspawners/depends.txt +++ b/mods/ITEMS/mcl_mobspawners/depends.txt @@ -1,2 +1,2 @@ mcl_sounds -mobs +mcl_mobs diff --git a/mods/MAPGEN/mcl_dungeons/depends.txt b/mods/MAPGEN/mcl_dungeons/depends.txt index 9f3c4e9f16..2c8ce78beb 100644 --- a/mods/MAPGEN/mcl_dungeons/depends.txt +++ b/mods/MAPGEN/mcl_dungeons/depends.txt @@ -1,5 +1,6 @@ mcl_init mcl_core mcl_chests +mcl_mobs mcl_mobspawners mobs_mc diff --git a/mods/MAPGEN/mcl_dungeons/init.lua b/mods/MAPGEN/mcl_dungeons/init.lua index 7bd2af285b..f23c33bfb8 100644 --- a/mods/MAPGEN/mcl_dungeons/init.lua +++ b/mods/MAPGEN/mcl_dungeons/init.lua @@ -10,7 +10,7 @@ local get_loot = function() stacks_min = 1, stacks_max = 3, items = { - { itemstring = "mobs:nametag", weight = 20 }, + { itemstring = "mcl_mobs:nametag", weight = 20 }, { itemstring = "mcl_mobitems:saddle", weight = 20 }, { itemstring = "mcl_jukebox:record_1", weight = 15 }, { itemstring = "mcl_jukebox:record_4", weight = 15 }, diff --git a/mods/MAPGEN/tsm_railcorridors/gameconfig.lua b/mods/MAPGEN/tsm_railcorridors/gameconfig.lua index aa6aba4da6..df86f58782 100644 --- a/mods/MAPGEN/tsm_railcorridors/gameconfig.lua +++ b/mods/MAPGEN/tsm_railcorridors/gameconfig.lua @@ -64,7 +64,7 @@ function tsm_railcorridors.get_treasures(pr) stacks_min = 1, stacks_max = 1, items = { - { itemstring = "mobs:nametag", weight = 30 }, + { itemstring = "mcl_mobs:nametag", weight = 30 }, { itemstring = "mcl_core:apple_gold", weight = 20 }, { itemstring = "mcl_books:book", weight = 10 }, -- TODO: Enchanted Book { itemstring = "", weight = 5},