diff --git a/docs/changelog.txt b/docs/changelog.txt index 7d4868e..3062b0f 100644 --- a/docs/changelog.txt +++ b/docs/changelog.txt @@ -3,6 +3,14 @@ ## CHANGELOG ## ############### +2022-01-21 +* disabled windspeed affecting player speed +* removed screenshots in folder structure +* compressed nether music to 80kbps + +2022-01-20 +* fancyvend quick patch + 2022-01-20 * remove ethereal, can be added in incrementally but dev focus on less biomes is helpful. * dfcaverns closer to surface. mobs will need to be adjusted too. diff --git a/docs/dev/modeling/io_scene_b3d.zip b/docs/dev/modeling/io_scene_b3d.zip new file mode 100644 index 0000000..05bac08 Binary files /dev/null and b/docs/dev/modeling/io_scene_b3d.zip differ diff --git a/docs/dev/modeling/modeling-notes.txt b/docs/dev/modeling/modeling-notes.txt new file mode 100644 index 0000000..c5aceb3 --- /dev/null +++ b/docs/dev/modeling/modeling-notes.txt @@ -0,0 +1,14 @@ +Install into Blender: +* io_scene_b3d.zip in Blender to import/export models. +* Edit --> Prefernces --> Addons --> Install +* Only export in object mode. + +Steps to modelings: +1. Shape in edit mode and assign vertex groups. +2. UV editing, unwrapping. +3. Make the texture. (Gimp, import color pallette) +4. Make the armature (skeleton/bones). +5. Animate the armature. + + +Bones should be named same as the vertex groups. diff --git a/docs/dev/texturing/Zughy32-GIMP-color-palette.gpl b/docs/dev/texturing/Zughy32-GIMP-color-palette.gpl new file mode 100644 index 0000000..393e817 --- /dev/null +++ b/docs/dev/texturing/Zughy32-GIMP-color-palette.gpl @@ -0,0 +1,36 @@ +GIMP Palette +#Palette Name: Zughy 32 +#Description: Created by Zughy for his game A Piggy's Story. +#Colors: 32 +71 45 60 472d3c +94 54 67 5e3643 +122 68 74 7a444a +160 91 83 a05b53 +191 121 88 bf7958 +238 161 96 eea160 +244 204 161 f4cca1 +182 213 60 b6d53c +113 170 52 71aa34 +57 123 68 397b44 +60 89 86 3c5956 +48 44 46 302c2e +90 83 83 5a5353 +125 112 113 7d7071 +160 147 142 a0938e +207 198 184 cfc6b8 +223 246 245 dff6f5 +138 235 241 8aebf1 +40 204 223 28ccdf +57 120 168 3978a8 +57 71 120 394778 +57 49 75 39314b +86 64 100 564064 +142 71 140 8e478c +205 96 147 cd6093 +255 174 182 ffaeb6 +244 180 27 f4b41b +244 126 27 f47e1b +230 72 46 e6482e +169 59 59 a93b3b +130 112 148 827094 +79 84 107 4f546b diff --git a/docs/dev/texturing/Zughy32-palette-analysis.png b/docs/dev/texturing/Zughy32-palette-analysis.png new file mode 100644 index 0000000..392e93d Binary files /dev/null and b/docs/dev/texturing/Zughy32-palette-analysis.png differ diff --git a/docs/dev/texturing/Zughy32-palette.png b/docs/dev/texturing/Zughy32-palette.png new file mode 100644 index 0000000..848630a Binary files /dev/null and b/docs/dev/texturing/Zughy32-palette.png differ diff --git a/docs/todo.txt b/docs/dev/todo.txt similarity index 100% rename from docs/todo.txt rename to docs/dev/todo.txt diff --git a/mods/MTG/binoculars/README.txt b/mods/COREMTG/mesecraft_binoculars/README.txt similarity index 91% rename from mods/MTG/binoculars/README.txt rename to mods/COREMTG/mesecraft_binoculars/README.txt index 0c65f6e..9ee72de 100644 --- a/mods/MTG/binoculars/README.txt +++ b/mods/COREMTG/mesecraft_binoculars/README.txt @@ -8,12 +8,12 @@ paramat (MIT) Authors of media (textures) --------------------------- -paramat (CC BY-SA 3.0): - binoculars_binoculars.png +Komodo (CC BY-SA 3.0): + mesecraft_binoculars.png Crafting -------- -binoculars:binoculars +mesecraft_binoculars:binoculars default:obsidian_glass O default:bronze_ingot B diff --git a/mods/MTG/binoculars/init.lua b/mods/COREMTG/mesecraft_binoculars/init.lua similarity index 68% rename from mods/MTG/binoculars/init.lua rename to mods/COREMTG/mesecraft_binoculars/init.lua index 7685897..3c5b0ad 100644 --- a/mods/MTG/binoculars/init.lua +++ b/mods/COREMTG/mesecraft_binoculars/init.lua @@ -1,15 +1,17 @@ --- binoculars/init.lua +-- MeseCraft Game module: mesecraft_binoculars +-- This version is forked from the Minetest Game mod "binoculars". +-- See README.txt for licensing and other information. --- Mod global namespace -binoculars = {} +mesecraft_binoculars = {} -- Load support for MT game translation. -local S = minetest.get_translator("binoculars") +local S = minetest.get_translator("mesecraft_binoculars") -- Detect creative mod local creative_mod = minetest.get_modpath("creative") + -- Cache creative mode setting as fallback if creative mod not present local creative_mode_cache = minetest.settings:get_bool("creative_mode") @@ -17,14 +19,14 @@ local creative_mode_cache = minetest.settings:get_bool("creative_mode") -- Update player property -- Global to allow overriding -function binoculars.update_player_property(player) +function mesecraft_binoculars.update_player_property(player) local creative_enabled = (creative_mod and creative.is_enabled_for(player:get_player_name())) or creative_mode_cache local new_zoom_fov = 0 if player:get_inventory():contains_item( - "main", "binoculars:binoculars") then + "main", "mesecraft_binoculars:binoculars") then new_zoom_fov = 10 elseif creative_enabled then new_zoom_fov = 15 @@ -40,7 +42,7 @@ end -- Set player property 'on joinplayer' minetest.register_on_joinplayer(function(player) - binoculars.update_player_property(player) + mesecraft_binoculars.update_player_property(player) end) @@ -48,7 +50,7 @@ end) local function cyclic_update() for _, player in ipairs(minetest.get_connected_players()) do - binoculars.update_player_property(player) + mesecraft_binoculars.update_player_property(player) end minetest.after(4.7, cyclic_update) end @@ -58,13 +60,13 @@ minetest.after(4.7, cyclic_update) -- Binoculars item -minetest.register_craftitem("binoculars:binoculars", { +minetest.register_craftitem("mesecraft_binoculars:binoculars", { description = S("Binoculars") .. "\n" .. S("Use with 'Zoom' key"), - inventory_image = "binoculars_binoculars.png", + inventory_image = "mesecraft_binoculars.png", stack_max = 1, on_use = function(itemstack, user, pointed_thing) - binoculars.update_player_property(user) + mesecraft_binoculars.update_player_property(user) end, }) @@ -72,7 +74,7 @@ minetest.register_craftitem("binoculars:binoculars", { -- Crafting minetest.register_craft({ - output = "binoculars:binoculars", + output = "mesecraft_binoculars:binoculars", recipe = { {"default:obsidian_glass", "", "default:obsidian_glass"}, {"default:bronze_ingot", "default:bronze_ingot", "default:bronze_ingot"}, diff --git a/mods/MTG/binoculars/license.txt b/mods/COREMTG/mesecraft_binoculars/license.txt similarity index 98% rename from mods/MTG/binoculars/license.txt rename to mods/COREMTG/mesecraft_binoculars/license.txt index f3aefda..77a6fe2 100644 --- a/mods/MTG/binoculars/license.txt +++ b/mods/COREMTG/mesecraft_binoculars/license.txt @@ -28,7 +28,7 @@ Licenses of media (textures) ---------------------------- Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) -Copyright (C) 2017 paramat +Copyright (C) 2022 MeseCraft You are free to: Share — copy and redistribute the material in any medium or format. diff --git a/mods/MTG/binoculars/locale/binoculars.de.tr b/mods/COREMTG/mesecraft_binoculars/locale/binoculars.de.tr similarity index 100% rename from mods/MTG/binoculars/locale/binoculars.de.tr rename to mods/COREMTG/mesecraft_binoculars/locale/binoculars.de.tr diff --git a/mods/MTG/binoculars/locale/binoculars.es.tr b/mods/COREMTG/mesecraft_binoculars/locale/binoculars.es.tr similarity index 100% rename from mods/MTG/binoculars/locale/binoculars.es.tr rename to mods/COREMTG/mesecraft_binoculars/locale/binoculars.es.tr diff --git a/mods/MTG/binoculars/locale/binoculars.fr.tr b/mods/COREMTG/mesecraft_binoculars/locale/binoculars.fr.tr similarity index 100% rename from mods/MTG/binoculars/locale/binoculars.fr.tr rename to mods/COREMTG/mesecraft_binoculars/locale/binoculars.fr.tr diff --git a/mods/MTG/binoculars/locale/binoculars.id.tr b/mods/COREMTG/mesecraft_binoculars/locale/binoculars.id.tr similarity index 100% rename from mods/MTG/binoculars/locale/binoculars.id.tr rename to mods/COREMTG/mesecraft_binoculars/locale/binoculars.id.tr diff --git a/mods/MTG/binoculars/locale/binoculars.it.tr b/mods/COREMTG/mesecraft_binoculars/locale/binoculars.it.tr similarity index 100% rename from mods/MTG/binoculars/locale/binoculars.it.tr rename to mods/COREMTG/mesecraft_binoculars/locale/binoculars.it.tr diff --git a/mods/MTG/binoculars/locale/binoculars.ms.tr b/mods/COREMTG/mesecraft_binoculars/locale/binoculars.ms.tr similarity index 100% rename from mods/MTG/binoculars/locale/binoculars.ms.tr rename to mods/COREMTG/mesecraft_binoculars/locale/binoculars.ms.tr diff --git a/mods/MTG/binoculars/locale/binoculars.ru.tr b/mods/COREMTG/mesecraft_binoculars/locale/binoculars.ru.tr similarity index 100% rename from mods/MTG/binoculars/locale/binoculars.ru.tr rename to mods/COREMTG/mesecraft_binoculars/locale/binoculars.ru.tr diff --git a/mods/MTG/binoculars/locale/binoculars.se.tr b/mods/COREMTG/mesecraft_binoculars/locale/binoculars.se.tr similarity index 100% rename from mods/MTG/binoculars/locale/binoculars.se.tr rename to mods/COREMTG/mesecraft_binoculars/locale/binoculars.se.tr diff --git a/mods/MTG/binoculars/locale/binoculars.zh_CN.tr b/mods/COREMTG/mesecraft_binoculars/locale/binoculars.zh_CN.tr similarity index 100% rename from mods/MTG/binoculars/locale/binoculars.zh_CN.tr rename to mods/COREMTG/mesecraft_binoculars/locale/binoculars.zh_CN.tr diff --git a/mods/MTG/binoculars/locale/binoculars.zh_TW.tr b/mods/COREMTG/mesecraft_binoculars/locale/binoculars.zh_TW.tr similarity index 100% rename from mods/MTG/binoculars/locale/binoculars.zh_TW.tr rename to mods/COREMTG/mesecraft_binoculars/locale/binoculars.zh_TW.tr diff --git a/mods/MTG/binoculars/locale/template.txt b/mods/COREMTG/mesecraft_binoculars/locale/template.txt similarity index 100% rename from mods/MTG/binoculars/locale/template.txt rename to mods/COREMTG/mesecraft_binoculars/locale/template.txt diff --git a/mods/COREMTG/mesecraft_binoculars/mod.conf b/mods/COREMTG/mesecraft_binoculars/mod.conf new file mode 100644 index 0000000..7f8a78c --- /dev/null +++ b/mods/COREMTG/mesecraft_binoculars/mod.conf @@ -0,0 +1,4 @@ +name = mesecraft_binoculars +description = MeseCraft Game mod: binoculars +depends = default +optional_depends = creative diff --git a/mods/COREMTG/mesecraft_binoculars/textures/mesecraft_binoculars.png b/mods/COREMTG/mesecraft_binoculars/textures/mesecraft_binoculars.png new file mode 100644 index 0000000..f410e47 Binary files /dev/null and b/mods/COREMTG/mesecraft_binoculars/textures/mesecraft_binoculars.png differ diff --git a/mods/MTG/bones/README.txt b/mods/COREMTG/mesecraft_bones/README.txt similarity index 59% rename from mods/MTG/bones/README.txt rename to mods/COREMTG/mesecraft_bones/README.txt index 91bcd10..c28b271 100644 --- a/mods/MTG/bones/README.txt +++ b/mods/COREMTG/mesecraft_bones/README.txt @@ -1,12 +1,17 @@ -Minetest Game mod: bones +MeseCraft Game mod: mesecraft_bones +forked from Minetest Game mod: bones ======================== See license.txt for license information. + Authors of source code ---------------------- Originally by PilzAdam (MIT) Various Minetest developers and contributors (MIT) +MeseCraft + Authors of media (textures) --------------------------- -All textures: paramat (CC BY-SA 3.0) +Former textures: paramat (CC BY-SA 3.0) +MeseCraft textures: Komodo (CC BY-SA 3.0) diff --git a/mods/MTG/bones/init.lua b/mods/COREMTG/mesecraft_bones/init.lua similarity index 89% rename from mods/MTG/bones/init.lua rename to mods/COREMTG/mesecraft_bones/init.lua index 5e54259..bd5c186 100644 --- a/mods/MTG/bones/init.lua +++ b/mods/COREMTG/mesecraft_bones/init.lua @@ -1,12 +1,10 @@ --- bones/init.lua - --- Minetest 0.4 mod: bones +-- mesecraft_bones/init.lua -- See README.txt for licensing and other information. +-- Load support for MeseCraft translation. --- Load support for MT game translation. -local S = minetest.get_translator("bones") +local S = minetest.get_translator("mesecraft_bones") -bones = {} +mesecraft_bones = {} local function is_owner(pos, name) local owner = minetest.get_meta(pos):get_string("owner") @@ -28,15 +26,15 @@ local bones_formspec = local share_bones_time = tonumber(minetest.settings:get("share_bones_time")) or 1200 local share_bones_time_early = tonumber(minetest.settings:get("share_bones_time_early")) or share_bones_time / 4 -minetest.register_node("bones:bones", { +minetest.register_node("mesecraft_bones:bones", { description = S("Bones"), tiles = { - "bones_top.png^[transform2", - "bones_bottom.png", - "bones_side.png", - "bones_side.png", - "bones_rear.png", - "bones_front.png" + "mesecraft_bones_top.png^[transform2", + "mesecraft_bones_bottom.png", + "mesecraft_bones_side.png", + "mesecraft_bones_side.png", + "mesecraft_bones_rear.png", + "mesecraft_bones_front.png" }, paramtype2 = "facedir", groups = {dig_immediate = 2}, @@ -73,10 +71,10 @@ minetest.register_node("bones:bones", { local meta = minetest.get_meta(pos) if meta:get_inventory():is_empty("main") then local inv = player:get_inventory() - if inv:room_for_item("main", {name = "bones:bones"}) then - inv:add_item("main", {name = "bones:bones"}) + if inv:room_for_item("main", {name = "mesecraft_bones:bones"}) then + inv:add_item("main", {name = "mesecraft_bones:bones"}) else - minetest.add_item(pos, "bones:bones") + minetest.add_item(pos, "mesecraft_bones:bones") end minetest.remove_node(pos) end @@ -108,10 +106,10 @@ minetest.register_node("bones:bones", { -- remove bones if player emptied them if has_space then - if player_inv:room_for_item("main", {name = "bones:bones"}) then - player_inv:add_item("main", {name = "bones:bones"}) + if player_inv:room_for_item("main", {name = "mesecraft_bones:bones"}) then + player_inv:add_item("main", {name = "mesecraft_bones:bones"}) else - minetest.add_item(pos,"bones:bones") + minetest.add_item(pos,"mesecraft_bones:bones") end minetest.remove_node(pos) end @@ -170,7 +168,7 @@ local drop = function(pos, itemstack) end local player_inventory_lists = { "main", "craft" } -bones.player_inventory_lists = player_inventory_lists +mesecraft_bones.player_inventory_lists = player_inventory_lists local function is_all_empty(player_inv) for _, list_name in ipairs(player_inventory_lists) do @@ -241,7 +239,7 @@ minetest.register_on_dieplayer(function(player) end local param2 = minetest.dir_to_facedir(player:get_look_dir()) - minetest.set_node(pos, {name = "bones:bones", param2 = param2}) + minetest.set_node(pos, {name = "mesecraft_bones:bones", param2 = param2}) minetest.log("action", player_name .. " dies at " .. pos_string .. ". Bones placed") diff --git a/mods/MTG/bones/license.txt b/mods/COREMTG/mesecraft_bones/license.txt similarity index 100% rename from mods/MTG/bones/license.txt rename to mods/COREMTG/mesecraft_bones/license.txt diff --git a/mods/MTG/bones/locale/bones.de.tr b/mods/COREMTG/mesecraft_bones/locale/bones.de.tr similarity index 100% rename from mods/MTG/bones/locale/bones.de.tr rename to mods/COREMTG/mesecraft_bones/locale/bones.de.tr diff --git a/mods/MTG/bones/locale/bones.es.tr b/mods/COREMTG/mesecraft_bones/locale/bones.es.tr similarity index 100% rename from mods/MTG/bones/locale/bones.es.tr rename to mods/COREMTG/mesecraft_bones/locale/bones.es.tr diff --git a/mods/MTG/bones/locale/bones.fr.tr b/mods/COREMTG/mesecraft_bones/locale/bones.fr.tr similarity index 100% rename from mods/MTG/bones/locale/bones.fr.tr rename to mods/COREMTG/mesecraft_bones/locale/bones.fr.tr diff --git a/mods/MTG/bones/locale/bones.id.tr b/mods/COREMTG/mesecraft_bones/locale/bones.id.tr similarity index 100% rename from mods/MTG/bones/locale/bones.id.tr rename to mods/COREMTG/mesecraft_bones/locale/bones.id.tr diff --git a/mods/MTG/bones/locale/bones.it.tr b/mods/COREMTG/mesecraft_bones/locale/bones.it.tr similarity index 100% rename from mods/MTG/bones/locale/bones.it.tr rename to mods/COREMTG/mesecraft_bones/locale/bones.it.tr diff --git a/mods/MTG/bones/locale/bones.ms.tr b/mods/COREMTG/mesecraft_bones/locale/bones.ms.tr similarity index 100% rename from mods/MTG/bones/locale/bones.ms.tr rename to mods/COREMTG/mesecraft_bones/locale/bones.ms.tr diff --git a/mods/MTG/bones/locale/bones.ru.tr b/mods/COREMTG/mesecraft_bones/locale/bones.ru.tr similarity index 100% rename from mods/MTG/bones/locale/bones.ru.tr rename to mods/COREMTG/mesecraft_bones/locale/bones.ru.tr diff --git a/mods/MTG/bones/locale/bones.se.tr b/mods/COREMTG/mesecraft_bones/locale/bones.se.tr similarity index 100% rename from mods/MTG/bones/locale/bones.se.tr rename to mods/COREMTG/mesecraft_bones/locale/bones.se.tr diff --git a/mods/MTG/bones/locale/bones.zh_CN.tr b/mods/COREMTG/mesecraft_bones/locale/bones.zh_CN.tr similarity index 100% rename from mods/MTG/bones/locale/bones.zh_CN.tr rename to mods/COREMTG/mesecraft_bones/locale/bones.zh_CN.tr diff --git a/mods/MTG/bones/locale/bones.zh_TW.tr b/mods/COREMTG/mesecraft_bones/locale/bones.zh_TW.tr similarity index 100% rename from mods/MTG/bones/locale/bones.zh_TW.tr rename to mods/COREMTG/mesecraft_bones/locale/bones.zh_TW.tr diff --git a/mods/MTG/bones/locale/template.txt b/mods/COREMTG/mesecraft_bones/locale/template.txt similarity index 100% rename from mods/MTG/bones/locale/template.txt rename to mods/COREMTG/mesecraft_bones/locale/template.txt diff --git a/mods/COREMTG/mesecraft_bones/mod.conf b/mods/COREMTG/mesecraft_bones/mod.conf new file mode 100644 index 0000000..24302ed --- /dev/null +++ b/mods/COREMTG/mesecraft_bones/mod.conf @@ -0,0 +1,3 @@ +name = mesecraft_bones +description = MeseCraft Game mod: mesecraft_bones +depends = default diff --git a/mods/COREMTG/mesecraft_bones/textures/mesecraft_bones_bottom.png b/mods/COREMTG/mesecraft_bones/textures/mesecraft_bones_bottom.png new file mode 100644 index 0000000..6d1e336 Binary files /dev/null and b/mods/COREMTG/mesecraft_bones/textures/mesecraft_bones_bottom.png differ diff --git a/mods/COREMTG/mesecraft_bones/textures/mesecraft_bones_front.png b/mods/COREMTG/mesecraft_bones/textures/mesecraft_bones_front.png new file mode 100644 index 0000000..094a0bc Binary files /dev/null and b/mods/COREMTG/mesecraft_bones/textures/mesecraft_bones_front.png differ diff --git a/mods/COREMTG/mesecraft_bones/textures/mesecraft_bones_rear.png b/mods/COREMTG/mesecraft_bones/textures/mesecraft_bones_rear.png new file mode 100644 index 0000000..7d6872d Binary files /dev/null and b/mods/COREMTG/mesecraft_bones/textures/mesecraft_bones_rear.png differ diff --git a/mods/COREMTG/mesecraft_bones/textures/mesecraft_bones_side.png b/mods/COREMTG/mesecraft_bones/textures/mesecraft_bones_side.png new file mode 100644 index 0000000..7d873ef Binary files /dev/null and b/mods/COREMTG/mesecraft_bones/textures/mesecraft_bones_side.png differ diff --git a/mods/COREMTG/mesecraft_bones/textures/mesecraft_bones_top.png b/mods/COREMTG/mesecraft_bones/textures/mesecraft_bones_top.png new file mode 100644 index 0000000..a0fab1c Binary files /dev/null and b/mods/COREMTG/mesecraft_bones/textures/mesecraft_bones_top.png differ diff --git a/mods/MTG/bucket/README.txt b/mods/COREMTG/mesecraft_bucket/README.txt similarity index 93% rename from mods/MTG/bucket/README.txt rename to mods/COREMTG/mesecraft_bucket/README.txt index 58997b2..9e8b0b6 100644 --- a/mods/MTG/bucket/README.txt +++ b/mods/COREMTG/mesecraft_bucket/README.txt @@ -10,4 +10,4 @@ Various Minetest developers and contributors (LGPLv2.1+) Authors of media (textures) --------------------------- -ElementW (CC BY-SA 3.0) +Komodo (CC BY-SA 3.0) diff --git a/mods/MTG/bucket/init.lua b/mods/COREMTG/mesecraft_bucket/init.lua similarity index 78% rename from mods/MTG/bucket/init.lua rename to mods/COREMTG/mesecraft_bucket/init.lua index ebdf2e7..7a108fc 100644 --- a/mods/MTG/bucket/init.lua +++ b/mods/COREMTG/mesecraft_bucket/init.lua @@ -1,25 +1,25 @@ --- Minetest 0.4 mod: bucket +-- MeseCraft Game module: mesecraft_bucket +-- This version is forked from the Minetest Game mod "bucket". -- See README.txt for licensing and other information. --- Load support for MT game translation. -local S = minetest.get_translator("bucket") +-- Load support for game translation. +local S = minetest.get_translator("mesecraft_bucket") -minetest.register_alias("bucket", "bucket:bucket_empty") -minetest.register_alias("bucket_water", "bucket:bucket_water") -minetest.register_alias("bucket_lava", "bucket:bucket_lava") - +-- Register the bucket craft item. minetest.register_craft({ - output = "bucket:bucket_empty 1", + output = "mesecraft_bucket:bucket_empty 1", recipe = { {"default:steel_ingot", "", "default:steel_ingot"}, {"", "default:steel_ingot", ""}, } }) -bucket = {} -bucket.liquids = {} +-- Initialize +mesecraft_bucket = {} +mesecraft_bucket.liquids = {} +-- Protection compatibility local function check_protection(pos, name, text) if minetest.is_protected(pos, name) then minetest.log("action", (name ~= "" and name or "A mod") @@ -44,15 +44,15 @@ end -- source neighbour, even if defined as 'liquid_renewable = false'. -- Needed to avoid creating holes in sloping rivers. -- This function can be called from any mod (that depends on bucket). -function bucket.register_liquid(source, flowing, itemname, inventory_image, name, +function mesecraft_bucket.register_liquid(source, flowing, itemname, inventory_image, name, groups, force_renew) - bucket.liquids[source] = { + mesecraft_bucket.liquids[source] = { source = source, flowing = flowing, itemname = itemname, force_renew = force_renew, } - bucket.liquids[flowing] = bucket.liquids[source] + mesecraft_bucket.liquids[flowing] = mesecraft_bucket.liquids[source] if itemname ~= nil then minetest.register_craftitem(itemname, { @@ -108,15 +108,15 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name end minetest.set_node(lpos, {name = source}) - return ItemStack("bucket:bucket_empty") + return ItemStack("mesecraft_bucket:bucket_empty") end }) end end -minetest.register_craftitem("bucket:bucket_empty", { +minetest.register_craftitem("mesecraft_bucket:bucket_empty", { description = S("Empty Bucket"), - inventory_image = "bucket.png", + inventory_image = "mesecraft_bucket.png", groups = {tool = 1}, liquids_pointable = true, on_use = function(itemstack, user, pointed_thing) @@ -129,7 +129,7 @@ minetest.register_craftitem("bucket:bucket_empty", { end -- Check if pointing to a liquid source local node = minetest.get_node(pointed_thing.under) - local liquiddef = bucket.liquids[node.name] + local liquiddef = mesecraft_bucket.liquids[node.name] local item_count = user:get_wielded_item():get_count() if liquiddef ~= nil @@ -158,7 +158,7 @@ minetest.register_craftitem("bucket:bucket_empty", { end -- set to return empty buckets minus 1 - giving_back = "bucket:bucket_empty "..tostring(item_count-1) + giving_back = "mesecraft_bucket:bucket_empty "..tostring(item_count-1) end @@ -184,11 +184,11 @@ minetest.register_craftitem("bucket:bucket_empty", { end, }) -bucket.register_liquid( +mesecraft_bucket.register_liquid( "default:water_source", "default:water_flowing", - "bucket:bucket_water", - "bucket_water.png", + "mesecraft_bucket:bucket_water", + "mesecraft_bucket_water.png", S("Water Bucket"), {tool = 1, water_bucket = 1} ) @@ -199,42 +199,42 @@ bucket.register_liquid( -- River water source is instead made renewable by the 'force renew' option -- used here. -bucket.register_liquid( +mesecraft_bucket.register_liquid( "default:river_water_source", "default:river_water_flowing", - "bucket:bucket_river_water", - "bucket_river_water.png", + "mesecraft_bucket:bucket_river_water", + "mesecraft_bucket_river_water.png", S("River Water Bucket"), {tool = 1, water_bucket = 1}, true ) -bucket.register_liquid( +mesecraft_bucket.register_liquid( "default:lava_source", "default:lava_flowing", - "bucket:bucket_lava", - "bucket_lava.png", + "mesecraft_bucket:bucket_lava", + "mesecraft_bucket_lava.png", S("Lava Bucket"), {tool = 1} ) minetest.register_craft({ type = "fuel", - recipe = "bucket:bucket_lava", + recipe = "mesecraft_bucket:bucket_lava", burntime = 60, - replacements = {{"bucket:bucket_lava", "bucket:bucket_empty"}}, + replacements = {{"mesecraft_bucket:bucket_lava", "mesecraft_bucket:bucket_empty"}}, }) -- Register buckets as dungeon loot if minetest.global_exists("dungeon_loot") then dungeon_loot.register({ - {name = "bucket:bucket_empty", chance = 0.55}, + {name = "mesecraft_bucket:bucket_empty", chance = 0.55}, -- water in deserts/ice or above ground, lava otherwise - {name = "bucket:bucket_water", chance = 0.45, + {name = "mesecraft_bucket:bucket_water", chance = 0.45, types = {"sandstone", "desert", "ice"}}, - {name = "bucket:bucket_water", chance = 0.45, y = {0, 32768}, + {name = "mesecraft_bucket:bucket_water", chance = 0.45, y = {0, 32768}, types = {"normal"}}, - {name = "bucket:bucket_lava", chance = 0.45, y = {-32768, -1}, + {name = "mesecraft_bucket:bucket_lava", chance = 0.45, y = {-32768, -1}, types = {"normal"}}, }) end diff --git a/mods/MTG/bucket/license.txt b/mods/COREMTG/mesecraft_bucket/license.txt similarity index 100% rename from mods/MTG/bucket/license.txt rename to mods/COREMTG/mesecraft_bucket/license.txt diff --git a/mods/MTG/bucket/locale/bucket.de.tr b/mods/COREMTG/mesecraft_bucket/locale/bucket.de.tr similarity index 100% rename from mods/MTG/bucket/locale/bucket.de.tr rename to mods/COREMTG/mesecraft_bucket/locale/bucket.de.tr diff --git a/mods/MTG/bucket/locale/bucket.es.tr b/mods/COREMTG/mesecraft_bucket/locale/bucket.es.tr similarity index 100% rename from mods/MTG/bucket/locale/bucket.es.tr rename to mods/COREMTG/mesecraft_bucket/locale/bucket.es.tr diff --git a/mods/MTG/bucket/locale/bucket.fr.tr b/mods/COREMTG/mesecraft_bucket/locale/bucket.fr.tr similarity index 100% rename from mods/MTG/bucket/locale/bucket.fr.tr rename to mods/COREMTG/mesecraft_bucket/locale/bucket.fr.tr diff --git a/mods/MTG/bucket/locale/bucket.id.tr b/mods/COREMTG/mesecraft_bucket/locale/bucket.id.tr similarity index 100% rename from mods/MTG/bucket/locale/bucket.id.tr rename to mods/COREMTG/mesecraft_bucket/locale/bucket.id.tr diff --git a/mods/MTG/bucket/locale/bucket.it.tr b/mods/COREMTG/mesecraft_bucket/locale/bucket.it.tr similarity index 100% rename from mods/MTG/bucket/locale/bucket.it.tr rename to mods/COREMTG/mesecraft_bucket/locale/bucket.it.tr diff --git a/mods/MTG/bucket/locale/bucket.ms.tr b/mods/COREMTG/mesecraft_bucket/locale/bucket.ms.tr similarity index 100% rename from mods/MTG/bucket/locale/bucket.ms.tr rename to mods/COREMTG/mesecraft_bucket/locale/bucket.ms.tr diff --git a/mods/MTG/bucket/locale/bucket.ru.tr b/mods/COREMTG/mesecraft_bucket/locale/bucket.ru.tr similarity index 100% rename from mods/MTG/bucket/locale/bucket.ru.tr rename to mods/COREMTG/mesecraft_bucket/locale/bucket.ru.tr diff --git a/mods/MTG/bucket/locale/bucket.se.tr b/mods/COREMTG/mesecraft_bucket/locale/bucket.se.tr similarity index 100% rename from mods/MTG/bucket/locale/bucket.se.tr rename to mods/COREMTG/mesecraft_bucket/locale/bucket.se.tr diff --git a/mods/MTG/bucket/locale/bucket.zh_CN.tr b/mods/COREMTG/mesecraft_bucket/locale/bucket.zh_CN.tr similarity index 100% rename from mods/MTG/bucket/locale/bucket.zh_CN.tr rename to mods/COREMTG/mesecraft_bucket/locale/bucket.zh_CN.tr diff --git a/mods/MTG/bucket/locale/bucket.zh_TW.tr b/mods/COREMTG/mesecraft_bucket/locale/bucket.zh_TW.tr similarity index 100% rename from mods/MTG/bucket/locale/bucket.zh_TW.tr rename to mods/COREMTG/mesecraft_bucket/locale/bucket.zh_TW.tr diff --git a/mods/MTG/bucket/locale/template.txt b/mods/COREMTG/mesecraft_bucket/locale/template.txt similarity index 100% rename from mods/MTG/bucket/locale/template.txt rename to mods/COREMTG/mesecraft_bucket/locale/template.txt diff --git a/mods/COREMTG/mesecraft_bucket/mod.conf b/mods/COREMTG/mesecraft_bucket/mod.conf new file mode 100644 index 0000000..1521cb6 --- /dev/null +++ b/mods/COREMTG/mesecraft_bucket/mod.conf @@ -0,0 +1,4 @@ +name = mesecraft_bucket +description = MeseCraft Game mod: mesecraft_bucket +depends = default +optional_depends = dungeon_loot diff --git a/mods/COREMTG/mesecraft_bucket/textures/mesecraft_bucket.png b/mods/COREMTG/mesecraft_bucket/textures/mesecraft_bucket.png new file mode 100644 index 0000000..6e238cd Binary files /dev/null and b/mods/COREMTG/mesecraft_bucket/textures/mesecraft_bucket.png differ diff --git a/mods/COREMTG/mesecraft_bucket/textures/mesecraft_bucket_lava.png b/mods/COREMTG/mesecraft_bucket/textures/mesecraft_bucket_lava.png new file mode 100644 index 0000000..8779daf Binary files /dev/null and b/mods/COREMTG/mesecraft_bucket/textures/mesecraft_bucket_lava.png differ diff --git a/mods/COREMTG/mesecraft_bucket/textures/mesecraft_bucket_river_water.png b/mods/COREMTG/mesecraft_bucket/textures/mesecraft_bucket_river_water.png new file mode 100644 index 0000000..c617127 Binary files /dev/null and b/mods/COREMTG/mesecraft_bucket/textures/mesecraft_bucket_river_water.png differ diff --git a/mods/COREMTG/mesecraft_bucket/textures/mesecraft_bucket_water.png b/mods/COREMTG/mesecraft_bucket/textures/mesecraft_bucket_water.png new file mode 100644 index 0000000..2b03d05 Binary files /dev/null and b/mods/COREMTG/mesecraft_bucket/textures/mesecraft_bucket_water.png differ diff --git a/mods/MTG/butterflies/README.txt b/mods/COREMTG/mesecraft_butterflies/README.txt similarity index 100% rename from mods/MTG/butterflies/README.txt rename to mods/COREMTG/mesecraft_butterflies/README.txt diff --git a/mods/MTG/butterflies/init.lua b/mods/COREMTG/mesecraft_butterflies/init.lua similarity index 70% rename from mods/MTG/butterflies/init.lua rename to mods/COREMTG/mesecraft_butterflies/init.lua index 650e7da..165fc69 100644 --- a/mods/MTG/butterflies/init.lua +++ b/mods/COREMTG/mesecraft_butterflies/init.lua @@ -1,7 +1,9 @@ --- butterflies/init.lua +-- MeseCraft game module: butterflies/init.lua +-- This version is forked from the Minetest Game mod "butterflies". +-- See README.txt for licensing and other information. --- Load support for MT game translation. -local S = minetest.get_translator("butterflies") +-- Load support for MeseCraft game translation. +local S = minetest.get_translator("mesecraft_butterflies") -- register butterflies local butter_list = { @@ -14,11 +16,11 @@ for i in ipairs (butter_list) do local name = butter_list[i][1] local desc = butter_list[i][2] - minetest.register_node("butterflies:butterfly_"..name, { + minetest.register_node("mesecraft_butterflies:butterfly_"..name, { description = desc, drawtype = "plantlike", tiles = {{ - name = "butterflies_butterfly_"..name.."_animated.png", + name = "mesecraft_butterflies_butterfly_"..name.."_animated.png", animation = { type = "vertical_frames", aspect_w = 16, @@ -26,8 +28,8 @@ for i in ipairs (butter_list) do length = 3 }, }}, - inventory_image = "butterflies_butterfly_"..name..".png", - wield_image = "butterflies_butterfly_"..name..".png", + inventory_image = "mesecraft_butterflies_butterfly_"..name..".png", + wield_image = "mesecraft_butterflies_butterfly_"..name..".png", waving = 1, paramtype = "light", sunlight_propagates = true, @@ -46,7 +48,7 @@ for i in ipairs (butter_list) do if not minetest.is_protected(pos, player_name) and not minetest.is_protected(pointed_thing.under, player_name) and minetest.get_node(pos).name == "air" then - minetest.set_node(pos, {name = "butterflies:butterfly_"..name}) + minetest.set_node(pos, {name = "mesecraft_butterflies:butterfly_"..name}) minetest.get_node_timer(pos):start(1) itemstack:take_item() end @@ -60,10 +62,10 @@ for i in ipairs (butter_list) do end }) - minetest.register_node("butterflies:hidden_butterfly_"..name, { + minetest.register_node("mesecraft_butterflies:hidden_butterfly_"..name, { drawtype = "airlike", - inventory_image = "butterflies_butterfly_"..name..".png", - wield_image = "butterflies_butterfly_"..name..".png", + inventory_image = "mesecraft_butterflies_butterfly_"..name..".png", + wield_image = "mesecraft_butterflies_butterfly_"..name..".png", paramtype = "light", sunlight_propagates = true, walkable = false, @@ -79,7 +81,7 @@ for i in ipairs (butter_list) do if not minetest.is_protected(pos, player_name) and not minetest.is_protected(pointed_thing.under, player_name) and minetest.get_node(pos).name == "air" then - minetest.set_node(pos, {name = "butterflies:hidden_butterfly_"..name}) + minetest.set_node(pos, {name = "mesecraft_butterflies:hidden_butterfly_"..name}) minetest.get_node_timer(pos):start(1) itemstack:take_item() end @@ -87,7 +89,7 @@ for i in ipairs (butter_list) do end, on_timer = function(pos, elapsed) if minetest.get_node_light(pos) >= 11 then - minetest.set_node(pos, {name = "butterflies:butterfly_"..name}) + minetest.set_node(pos, {name = "mesecraft_butterflies:butterfly_"..name}) end minetest.get_node_timer(pos):start(30) end @@ -96,7 +98,7 @@ end -- register decoration minetest.register_decoration({ - name = "butterflies:butterfly", + name = "mesecraft_butterflies:butterfly", deco_type = "simple", place_on = {"default:dirt_with_grass"}, place_offset_y = 2, @@ -106,16 +108,16 @@ minetest.register_decoration({ y_max = 31000, y_min = 1, decoration = { - "butterflies:butterfly_white", - "butterflies:butterfly_red", - "butterflies:butterfly_violet" + "mesecraft_butterflies:butterfly_white", + "mesecraft_butterflies:butterfly_red", + "mesecraft_butterflies:butterfly_violet" }, spawn_by = "group:flower", num_spawn_by = 1 }) -- get decoration ID -local butterflies = minetest.get_decoration_id("butterflies:butterfly") +local butterflies = minetest.get_decoration_id("mesecraft_butterflies:butterfly") minetest.set_gen_notify({decoration = true}, {butterflies}) -- start nodetimers diff --git a/mods/MTG/butterflies/license.txt b/mods/COREMTG/mesecraft_butterflies/license.txt similarity index 100% rename from mods/MTG/butterflies/license.txt rename to mods/COREMTG/mesecraft_butterflies/license.txt diff --git a/mods/MTG/butterflies/locale/butterflies.de.tr b/mods/COREMTG/mesecraft_butterflies/locale/butterflies.de.tr similarity index 100% rename from mods/MTG/butterflies/locale/butterflies.de.tr rename to mods/COREMTG/mesecraft_butterflies/locale/butterflies.de.tr diff --git a/mods/MTG/butterflies/locale/butterflies.es.tr b/mods/COREMTG/mesecraft_butterflies/locale/butterflies.es.tr similarity index 100% rename from mods/MTG/butterflies/locale/butterflies.es.tr rename to mods/COREMTG/mesecraft_butterflies/locale/butterflies.es.tr diff --git a/mods/MTG/butterflies/locale/butterflies.fr.tr b/mods/COREMTG/mesecraft_butterflies/locale/butterflies.fr.tr similarity index 100% rename from mods/MTG/butterflies/locale/butterflies.fr.tr rename to mods/COREMTG/mesecraft_butterflies/locale/butterflies.fr.tr diff --git a/mods/MTG/butterflies/locale/butterflies.id.tr b/mods/COREMTG/mesecraft_butterflies/locale/butterflies.id.tr similarity index 100% rename from mods/MTG/butterflies/locale/butterflies.id.tr rename to mods/COREMTG/mesecraft_butterflies/locale/butterflies.id.tr diff --git a/mods/MTG/butterflies/locale/butterflies.it.tr b/mods/COREMTG/mesecraft_butterflies/locale/butterflies.it.tr similarity index 100% rename from mods/MTG/butterflies/locale/butterflies.it.tr rename to mods/COREMTG/mesecraft_butterflies/locale/butterflies.it.tr diff --git a/mods/MTG/butterflies/locale/butterflies.ms.tr b/mods/COREMTG/mesecraft_butterflies/locale/butterflies.ms.tr similarity index 100% rename from mods/MTG/butterflies/locale/butterflies.ms.tr rename to mods/COREMTG/mesecraft_butterflies/locale/butterflies.ms.tr diff --git a/mods/MTG/butterflies/locale/butterflies.ru.tr b/mods/COREMTG/mesecraft_butterflies/locale/butterflies.ru.tr similarity index 100% rename from mods/MTG/butterflies/locale/butterflies.ru.tr rename to mods/COREMTG/mesecraft_butterflies/locale/butterflies.ru.tr diff --git a/mods/MTG/butterflies/locale/butterflies.se.tr b/mods/COREMTG/mesecraft_butterflies/locale/butterflies.se.tr similarity index 100% rename from mods/MTG/butterflies/locale/butterflies.se.tr rename to mods/COREMTG/mesecraft_butterflies/locale/butterflies.se.tr diff --git a/mods/MTG/butterflies/locale/butterflies.zh_CN.tr b/mods/COREMTG/mesecraft_butterflies/locale/butterflies.zh_CN.tr similarity index 100% rename from mods/MTG/butterflies/locale/butterflies.zh_CN.tr rename to mods/COREMTG/mesecraft_butterflies/locale/butterflies.zh_CN.tr diff --git a/mods/MTG/butterflies/locale/butterflies.zh_TW.tr b/mods/COREMTG/mesecraft_butterflies/locale/butterflies.zh_TW.tr similarity index 100% rename from mods/MTG/butterflies/locale/butterflies.zh_TW.tr rename to mods/COREMTG/mesecraft_butterflies/locale/butterflies.zh_TW.tr diff --git a/mods/MTG/butterflies/locale/template.txt b/mods/COREMTG/mesecraft_butterflies/locale/template.txt similarity index 100% rename from mods/MTG/butterflies/locale/template.txt rename to mods/COREMTG/mesecraft_butterflies/locale/template.txt diff --git a/mods/COREMTG/mesecraft_butterflies/mod.conf b/mods/COREMTG/mesecraft_butterflies/mod.conf new file mode 100644 index 0000000..2b06a1e --- /dev/null +++ b/mods/COREMTG/mesecraft_butterflies/mod.conf @@ -0,0 +1,3 @@ +name = mesecraft_butterflies +description = MeseCraft game module: MeseCraft Butterflies +depends = default, flowers diff --git a/mods/COREMTG/mesecraft_butterflies/textures/mesecraft_butterflies_butterfly_red.png b/mods/COREMTG/mesecraft_butterflies/textures/mesecraft_butterflies_butterfly_red.png new file mode 100644 index 0000000..9f4436e Binary files /dev/null and b/mods/COREMTG/mesecraft_butterflies/textures/mesecraft_butterflies_butterfly_red.png differ diff --git a/mods/COREMTG/mesecraft_butterflies/textures/mesecraft_butterflies_butterfly_red_animated.png b/mods/COREMTG/mesecraft_butterflies/textures/mesecraft_butterflies_butterfly_red_animated.png new file mode 100644 index 0000000..0e21353 Binary files /dev/null and b/mods/COREMTG/mesecraft_butterflies/textures/mesecraft_butterflies_butterfly_red_animated.png differ diff --git a/mods/COREMTG/mesecraft_butterflies/textures/mesecraft_butterflies_butterfly_violet.png b/mods/COREMTG/mesecraft_butterflies/textures/mesecraft_butterflies_butterfly_violet.png new file mode 100644 index 0000000..1b738d1 Binary files /dev/null and b/mods/COREMTG/mesecraft_butterflies/textures/mesecraft_butterflies_butterfly_violet.png differ diff --git a/mods/COREMTG/mesecraft_butterflies/textures/mesecraft_butterflies_butterfly_violet_animated.png b/mods/COREMTG/mesecraft_butterflies/textures/mesecraft_butterflies_butterfly_violet_animated.png new file mode 100644 index 0000000..20ff857 Binary files /dev/null and b/mods/COREMTG/mesecraft_butterflies/textures/mesecraft_butterflies_butterfly_violet_animated.png differ diff --git a/mods/COREMTG/mesecraft_butterflies/textures/mesecraft_butterflies_butterfly_white.png b/mods/COREMTG/mesecraft_butterflies/textures/mesecraft_butterflies_butterfly_white.png new file mode 100644 index 0000000..fa46b14 Binary files /dev/null and b/mods/COREMTG/mesecraft_butterflies/textures/mesecraft_butterflies_butterfly_white.png differ diff --git a/mods/COREMTG/mesecraft_butterflies/textures/mesecraft_butterflies_butterfly_white_animated.png b/mods/COREMTG/mesecraft_butterflies/textures/mesecraft_butterflies_butterfly_white_animated.png new file mode 100644 index 0000000..fff7456 Binary files /dev/null and b/mods/COREMTG/mesecraft_butterflies/textures/mesecraft_butterflies_butterfly_white_animated.png differ diff --git a/mods/COREMTG/modpack.txt b/mods/COREMTG/modpack.txt new file mode 100644 index 0000000..a7fbe3a --- /dev/null +++ b/mods/COREMTG/modpack.txt @@ -0,0 +1,2 @@ +name = ENTITIES +description = Meta-modpack containing entity-related mods for MeseCraft. diff --git a/mods/ITEMS/drinks/depends.txt b/mods/ITEMS/drinks/depends.txt index f28d1a6..c713b59 100644 --- a/mods/ITEMS/drinks/depends.txt +++ b/mods/ITEMS/drinks/depends.txt @@ -1,4 +1,4 @@ -bucket +mesecraft_bucket default vessels stairs diff --git a/mods/ITEMS/drinks/drinks.lua b/mods/ITEMS/drinks/drinks.lua index 7de692f..8fbb631 100644 --- a/mods/ITEMS/drinks/drinks.lua +++ b/mods/ITEMS/drinks/drinks.lua @@ -11,9 +11,9 @@ for i in ipairs (drinks.drink_table) do minetest.register_node('drinks:jbu_'..desc..'', { description = 'Bucket of '..craft..' Juice', drawtype = "plantlike", - tiles = {'bucket.png^(drinks_bucket_contents.png^[colorize:'..color..':200)'}, - inventory_image = 'bucket.png^(drinks_bucket_contents.png^[colorize:'..color..':200)', - wield_image = 'bucket.png^(drinks_bucket_contents.png^[colorize:'..color..':200)', + tiles = {'mesecraft_bucket.png^(drinks_bucket_contents.png^[colorize:'..color..':200)'}, + inventory_image = 'mesecraft_bucket.png^(drinks_bucket_contents.png^[colorize:'..color..':200)', + wield_image = 'mesecraft_bucket.png^(drinks_bucket_contents.png^[colorize:'..color..':200)', paramtype = "light", juice_type = craft, is_ground_content = false, diff --git a/mods/ITEMS/drinks/drinks2.lua b/mods/ITEMS/drinks/drinks2.lua index a59444d..0ef62fb 100644 --- a/mods/ITEMS/drinks/drinks2.lua +++ b/mods/ITEMS/drinks/drinks2.lua @@ -11,9 +11,9 @@ for i in ipairs (drinks.drink_table) do minetest.register_node('drinks:jbu_'..desc..'', { description = 'Bucket of '..craft..' Juice', drawtype = "plantlike", - tiles = {'bucket.png^(drinks_bucket_contents.png^[colorize:'..color..':200)'}, - inventory_image = 'bucket.png^(drinks_bucket_contents.png^[colorize:'..color..':200)', - wield_image = 'bucket.png^(drinks_bucket_contents.png^[colorize:'..color..':200)', + tiles = {'mesecraft_bucket.png^(drinks_bucket_contents.png^[colorize:'..color..':200)'}, + inventory_image = 'mesecraft_bucket.png^(drinks_bucket_contents.png^[colorize:'..color..':200)', + wield_image = 'mesecraft_bucket.png^(drinks_bucket_contents.png^[colorize:'..color..':200)', paramtype = "light", juice_type = craft, is_ground_content = false, diff --git a/mods/ITEMS/drinks/init.lua b/mods/ITEMS/drinks/init.lua index f8ae747..f7949f9 100644 --- a/mods/ITEMS/drinks/init.lua +++ b/mods/ITEMS/drinks/init.lua @@ -33,7 +33,7 @@ minetest.register_craft({ output = 'drinks:juice_press', recipe = { {'default:stick', 'default:steel_ingot', 'default:stick'}, - {'default:stick', 'bucket:bucket_empty', 'default:stick'}, + {'default:stick', 'mesecraft_bucket:bucket_empty', 'default:stick'}, {slab_str, slab_str, 'vessels:drinking_glass'}, } }) @@ -55,13 +55,13 @@ shortname = { ['jcu'] = {size = 2, name = 'vessels:drinking_glass'}, ['jbo'] = {size = 4, name = 'vessels:glass_bottle'}, ['jsb'] = {size = 4, name = 'vessels:steel_bottle'}, - ['jbu'] = {size = 16, name = 'bucket:bucket_empty'} + ['jbu'] = {size = 16, name = 'mesecraft_bucket:bucket_empty'} }, longname = { ['vessels:drinking_glass'] = {size = 2, name = 'jcu'}, ['vessels:glass_bottle'] = {size = 4, name = 'jbo'}, ['vessels:steel_bottle'] = {size = 4, name = 'jsb'}, - ['bucket:bucket_empty'] = {size = 16, name = 'jbu'}, + ['mesecraft_bucket:bucket_empty'] = {size = 16, name = 'jbu'}, ['thirsty:steel_canteen'] = {size = 20, name = 'thirsty:steel_canteen'}, ['thirsty:bronze_canteen'] = {size = 30, name = 'thirsty:bronze_canteen'}, }, diff --git a/mods/ITEMS/drinks/mod.conf b/mods/ITEMS/drinks/mod.conf index d0c47df..01b0994 100644 --- a/mods/ITEMS/drinks/mod.conf +++ b/mods/ITEMS/drinks/mod.conf @@ -1,5 +1,5 @@ name = drinks -depends= bucket,default,vessels,stairs +depends= mesecraft_bucket,default,vessels,stairs description = Adds a juice press and two juice storage containers. Most fruits and several veggies can be juiced. The resulting drinks can be 'ate' to gain health, or if you are using the thirsty mod, to regain hydration. author = Nathan, Napiophelios optional_depends = hunger,thirsty,plantlife,farming_plus,crops,farming,minetest_doc_modpack,fruits,ethereal diff --git a/mods/ITEMS/fruit_tools/depends.txt b/mods/ITEMS/fruit_tools/depends.txt index 06893b3..6a642bc 100644 --- a/mods/ITEMS/fruit_tools/depends.txt +++ b/mods/ITEMS/fruit_tools/depends.txt @@ -1,6 +1,6 @@ farming default -bucket +mesecraft_bucket vessels mobs? -3d_armor? \ No newline at end of file +3d_armor? diff --git a/mods/ITEMS/fruit_tools/init.lua b/mods/ITEMS/fruit_tools/init.lua index faa57cf..7bbcb15 100644 --- a/mods/ITEMS/fruit_tools/init.lua +++ b/mods/ITEMS/fruit_tools/init.lua @@ -177,7 +177,7 @@ minetest.register_craft({ recipe = { {"default:diamond", "default:gold_ingot", "default:diamond"}, {"default:mese_crystal", "vessels:glass_bottle", "default:mese_crystal"}, - {"default:diamond", "bucket:bucket_water", "default:diamond"} + {"default:diamond", "mesecraft_bucket:bucket_water", "default:diamond"} }, }) diff --git a/mods/ITEMS/gadgets_modpack/gadgets_consumables/depends.txt b/mods/ITEMS/gadgets_modpack/gadgets_consumables/depends.txt index 3721abf..95347c0 100644 --- a/mods/ITEMS/gadgets_modpack/gadgets_consumables/depends.txt +++ b/mods/ITEMS/gadgets_modpack/gadgets_consumables/depends.txt @@ -1,9 +1,9 @@ default vessels farming -bucket +mesecraft_bucket flowers gadgets_api gadgets_default_effects mana? -sprint_lite? \ No newline at end of file +sprint_lite? diff --git a/mods/ITEMS/gadgets_modpack/gadgets_consumables/potions.lua b/mods/ITEMS/gadgets_modpack/gadgets_consumables/potions.lua index f7dfdb5..a8feba4 100644 --- a/mods/ITEMS/gadgets_modpack/gadgets_consumables/potions.lua +++ b/mods/ITEMS/gadgets_modpack/gadgets_consumables/potions.lua @@ -51,12 +51,12 @@ local regen_potions = { name = "fire_shield", recipe = { { - {"default:obsidian_shard", "bucket:bucket_lava", "default:mese_crystal_fragment"}, + {"default:obsidian_shard", "mesecraft_bucket:bucket_lava", "default:mese_crystal_fragment"}, {"", "magic_materials:magic_root", ""}, {"", "gadgets_consumables:water_bottle", ""}, } }, - replacements = {{"bucket:bucket_lava", "bucket:bucket_empty"}}, + replacements = {{"mesecraft_bucket:bucket_lava", "mesecraft_bucket:bucket_empty"}}, }, { desc = "Health Regeneration", @@ -296,4 +296,4 @@ gadgets.register_gadget({ {"", "gadgets_consumables:water_bottle", ""}, } }, -}) \ No newline at end of file +}) diff --git a/mods/ITEMS/lootchests_modpack/lootchests_default/depends.txt b/mods/ITEMS/lootchests_modpack/lootchests_default/depends.txt index b68addc..f286278 100644 --- a/mods/ITEMS/lootchests_modpack/lootchests_default/depends.txt +++ b/mods/ITEMS/lootchests_modpack/lootchests_default/depends.txt @@ -8,9 +8,9 @@ fire dye wool carts -bucket +mesecraft_bucket boats -binoculars +mesecraft_binoculars farming flowers 3d_armor? diff --git a/mods/ITEMS/lootchests_modpack/lootchests_default/item_tables.lua b/mods/ITEMS/lootchests_modpack/lootchests_default/item_tables.lua index 4e8f606..64e8551 100644 --- a/mods/ITEMS/lootchests_modpack/lootchests_default/item_tables.lua +++ b/mods/ITEMS/lootchests_modpack/lootchests_default/item_tables.lua @@ -57,9 +57,9 @@ lootchests.loot_table["lootchests_default:ocean_chest"] = { {"carts:powerrail", 16}, {"carts:brakerail", 16}, {"carts:cart", 1}, - {"bucket:bucket_empty", 4}, + {"mesecraft_bucket:bucket_empty", 4}, {"boats:boat", 1}, - {"binoculars:binoculars", 1}, + {"mesecraft_binoculars:binoculars", 1}, } lootchests.loot_table["lootchests_default:basket"] = { @@ -160,6 +160,6 @@ lootchests.loot_table["lootchests_default:stone_chest"] = { {"carts:powerrail", 32}, {"carts:brakerail", 32}, {"carts:cart", 2}, - {"bucket:bucket_empty", 8}, + {"mesecraft_bucket:bucket_empty", 8}, {"boats:boat", 2}, } diff --git a/mods/ITEMS/magic_materials/crafts.lua b/mods/ITEMS/magic_materials/crafts.lua index ba004a4..85259fd 100644 --- a/mods/ITEMS/magic_materials/crafts.lua +++ b/mods/ITEMS/magic_materials/crafts.lua @@ -158,11 +158,11 @@ minetest.register_craft({ minetest.register_craft({ output = "magic_materials:fire_rune", recipe = { - {"default:mese_crystal", "bucket:bucket_lava", "default:mese_crystal"}, - {"bucket:bucket_lava", "magic_materials:enchanted_rune", "bucket:bucket_lava"}, - {"default:mese_crystal", "bucket:bucket_lava", "default:mese_crystal"}, + {"default:mese_crystal", "mesecraft_bucket:bucket_lava", "default:mese_crystal"}, + {"mesecraft_bucket:bucket_lava", "magic_materials:enchanted_rune", "mesecraft_bucket:bucket_lava"}, + {"default:mese_crystal", "mesecraft_bucket:bucket_lava", "default:mese_crystal"}, }, - replacements = {{ "bucket:bucket_lava", "bucket:bucket_empty"}} + replacements = {{ "mesecraft_bucket:bucket_lava", "mesecraft_bucket:bucket_empty"}} }) minetest.register_craft({ @@ -217,4 +217,4 @@ minetest.register_craft({ {"default:clay_lump", "magic_materials:enchanted_rune", "default:iron_lump"}, {"default:gold_lump", "default:mese_crystal", "default:diamond"}, }, -}) \ No newline at end of file +}) diff --git a/mods/ITEMS/magic_materials/depends.txt b/mods/ITEMS/magic_materials/depends.txt index f3d2267..ab00df9 100644 --- a/mods/ITEMS/magic_materials/depends.txt +++ b/mods/ITEMS/magic_materials/depends.txt @@ -1,5 +1,5 @@ default -bucket +mesecraft_bucket farming technic? -stairs? \ No newline at end of file +stairs? diff --git a/mods/ITEMS/xdecor/depends.txt b/mods/ITEMS/xdecor/depends.txt index 5ea4cb6..391e2da 100644 --- a/mods/ITEMS/xdecor/depends.txt +++ b/mods/ITEMS/xdecor/depends.txt @@ -1,5 +1,5 @@ default -bucket +mesecraft_bucket doors stairs xpanes diff --git a/mods/MTG/binoculars/mod.conf b/mods/MTG/binoculars/mod.conf deleted file mode 100644 index 7d73741..0000000 --- a/mods/MTG/binoculars/mod.conf +++ /dev/null @@ -1,4 +0,0 @@ -name = binoculars -description = Minetest Game mod: binoculars -depends = default -optional_depends = creative diff --git a/mods/MTG/binoculars/textures/binoculars_binoculars.png b/mods/MTG/binoculars/textures/binoculars_binoculars.png deleted file mode 100644 index 5803d48..0000000 Binary files a/mods/MTG/binoculars/textures/binoculars_binoculars.png and /dev/null differ diff --git a/mods/MTG/bones/mod.conf b/mods/MTG/bones/mod.conf deleted file mode 100644 index 371997b..0000000 --- a/mods/MTG/bones/mod.conf +++ /dev/null @@ -1,3 +0,0 @@ -name = bones -description = Minetest Game mod: bones -depends = default diff --git a/mods/MTG/bones/textures/bones_bottom.png b/mods/MTG/bones/textures/bones_bottom.png deleted file mode 100644 index 859c6bb..0000000 Binary files a/mods/MTG/bones/textures/bones_bottom.png and /dev/null differ diff --git a/mods/MTG/bones/textures/bones_front.png b/mods/MTG/bones/textures/bones_front.png deleted file mode 100644 index 1e52437..0000000 Binary files a/mods/MTG/bones/textures/bones_front.png and /dev/null differ diff --git a/mods/MTG/bones/textures/bones_rear.png b/mods/MTG/bones/textures/bones_rear.png deleted file mode 100644 index 4cfe236..0000000 Binary files a/mods/MTG/bones/textures/bones_rear.png and /dev/null differ diff --git a/mods/MTG/bones/textures/bones_side.png b/mods/MTG/bones/textures/bones_side.png deleted file mode 100644 index a07595f..0000000 Binary files a/mods/MTG/bones/textures/bones_side.png and /dev/null differ diff --git a/mods/MTG/bones/textures/bones_top.png b/mods/MTG/bones/textures/bones_top.png deleted file mode 100644 index 198a8a2..0000000 Binary files a/mods/MTG/bones/textures/bones_top.png and /dev/null differ diff --git a/mods/MTG/bucket/mod.conf b/mods/MTG/bucket/mod.conf deleted file mode 100644 index fef4687..0000000 --- a/mods/MTG/bucket/mod.conf +++ /dev/null @@ -1,4 +0,0 @@ -name = bucket -description = Minetest Game mod: bucket -depends = default -optional_depends = dungeon_loot diff --git a/mods/MTG/bucket/textures/bucket.png b/mods/MTG/bucket/textures/bucket.png deleted file mode 100644 index 17b0c49..0000000 Binary files a/mods/MTG/bucket/textures/bucket.png and /dev/null differ diff --git a/mods/MTG/bucket/textures/bucket_lava.png b/mods/MTG/bucket/textures/bucket_lava.png deleted file mode 100644 index ac6108d..0000000 Binary files a/mods/MTG/bucket/textures/bucket_lava.png and /dev/null differ diff --git a/mods/MTG/bucket/textures/bucket_river_water.png b/mods/MTG/bucket/textures/bucket_river_water.png deleted file mode 100644 index d4648bb..0000000 Binary files a/mods/MTG/bucket/textures/bucket_river_water.png and /dev/null differ diff --git a/mods/MTG/bucket/textures/bucket_water.png b/mods/MTG/bucket/textures/bucket_water.png deleted file mode 100644 index 5af836b..0000000 Binary files a/mods/MTG/bucket/textures/bucket_water.png and /dev/null differ diff --git a/mods/MTG/butterflies/mod.conf b/mods/MTG/butterflies/mod.conf deleted file mode 100644 index 1c66497..0000000 --- a/mods/MTG/butterflies/mod.conf +++ /dev/null @@ -1,3 +0,0 @@ -name = butterflies -description = Minetest Game mod: Butterflies -depends = default, flowers diff --git a/mods/MTG/butterflies/textures/butterflies_butterfly_red.png b/mods/MTG/butterflies/textures/butterflies_butterfly_red.png deleted file mode 100644 index 8edfc36..0000000 Binary files a/mods/MTG/butterflies/textures/butterflies_butterfly_red.png and /dev/null differ diff --git a/mods/MTG/butterflies/textures/butterflies_butterfly_red_animated.png b/mods/MTG/butterflies/textures/butterflies_butterfly_red_animated.png deleted file mode 100644 index 4a2097b..0000000 Binary files a/mods/MTG/butterflies/textures/butterflies_butterfly_red_animated.png and /dev/null differ diff --git a/mods/MTG/butterflies/textures/butterflies_butterfly_violet.png b/mods/MTG/butterflies/textures/butterflies_butterfly_violet.png deleted file mode 100644 index 8b8c29d..0000000 Binary files a/mods/MTG/butterflies/textures/butterflies_butterfly_violet.png and /dev/null differ diff --git a/mods/MTG/butterflies/textures/butterflies_butterfly_violet_animated.png b/mods/MTG/butterflies/textures/butterflies_butterfly_violet_animated.png deleted file mode 100644 index 3f9d72e..0000000 Binary files a/mods/MTG/butterflies/textures/butterflies_butterfly_violet_animated.png and /dev/null differ diff --git a/mods/MTG/butterflies/textures/butterflies_butterfly_white.png b/mods/MTG/butterflies/textures/butterflies_butterfly_white.png deleted file mode 100644 index db4eaec..0000000 Binary files a/mods/MTG/butterflies/textures/butterflies_butterfly_white.png and /dev/null differ diff --git a/mods/MTG/butterflies/textures/butterflies_butterfly_white_animated.png b/mods/MTG/butterflies/textures/butterflies_butterfly_white_animated.png deleted file mode 100644 index e7cada3..0000000 Binary files a/mods/MTG/butterflies/textures/butterflies_butterfly_white_animated.png and /dev/null differ diff --git a/mods/WORLD/dfcaverns/bones_loot/init.lua b/mods/WORLD/dfcaverns/bones_loot/init.lua index 55b5975..d2a6276 100644 --- a/mods/WORLD/dfcaverns/bones_loot/init.lua +++ b/mods/WORLD/dfcaverns/bones_loot/init.lua @@ -116,7 +116,7 @@ if minetest.get_modpath("default") then end bones_loot.place_bones = function(pos, loot_type, max_stacks, infotext, exclusive_loot_type) - minetest.set_node(pos, {name="bones:bones", param2 = math.random(1,4)-1}) + minetest.set_node(pos, {name="mesecraft_bones:bones", param2 = math.random(1,4)-1}) local meta = minetest.get_meta(pos) if infotext == nil then infotext = S("Someone's old bones") @@ -137,7 +137,7 @@ end minetest.register_lbm({ label = "Repair underworld bones formspec", name = "bones_loot:repair_underworld_bones_formspec", - nodenames = {"bones:bones"}, + nodenames = {"mesecraft_bones:bones"}, action = function(pos, node) local meta = minetest.get_meta(pos) if not meta:get("formspec") then diff --git a/mods/WORLD/dfcaverns/bones_loot/mod.conf b/mods/WORLD/dfcaverns/bones_loot/mod.conf index 06368e3..ba08031 100644 --- a/mods/WORLD/dfcaverns/bones_loot/mod.conf +++ b/mods/WORLD/dfcaverns/bones_loot/mod.conf @@ -1,4 +1,4 @@ name = bones_loot description = An API that allows bones to be placed procedurally with randomly generated loot -depends = bones -optional_depends = dungeon_loot, default \ No newline at end of file +depends = mesecraft_bones +optional_depends = dungeon_loot, default