From 523a0c54d6ca9cc069d8ca767adf19596b4655f1 Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Mon, 12 Apr 2021 14:54:14 +0200 Subject: [PATCH 1/5] Localize c_x and c_y in mcl_playerplus --- mods/PLAYER/mcl_playerplus/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mods/PLAYER/mcl_playerplus/init.lua b/mods/PLAYER/mcl_playerplus/init.lua index de346256f..8c8b784b2 100644 --- a/mods/PLAYER/mcl_playerplus/init.lua +++ b/mods/PLAYER/mcl_playerplus/init.lua @@ -156,7 +156,7 @@ minetest.register_globalstep(function(dtime) for _,player in pairs(get_connected_players()) do - c_x, c_y = unpack(player_collision(player)) + local c_x, c_y = unpack(player_collision(player)) if player:get_velocity().x + player:get_velocity().y < .5 and c_x + c_y > 0 then --minetest.chat_send_player(player:get_player_name(), "pushed at " .. c_x + c_y .. " parsecs.") From db5626fcb480a7ec3fcb1b2dd064cf8b14d2a260 Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Mon, 12 Apr 2021 15:05:01 +0200 Subject: [PATCH 2/5] Revert "Make hoe dig some blocks faster" This reverts commit c1e295de5fbe09c2fa6973f14b48dd73b2405eb3. --- mods/ITEMS/mcl_core/init.lua | 1 - mods/ITEMS/mcl_core/nodes_trees.lua | 14 +------------- mods/ITEMS/mcl_farming/hoes.lua | 15 --------------- mods/ITEMS/mcl_farming/wheat.lua | 2 +- mods/ITEMS/mcl_nether/init.lua | 2 +- mods/ITEMS/mcl_ocean/kelp.lua | 2 +- mods/ITEMS/mcl_sponges/init.lua | 4 ++-- 7 files changed, 6 insertions(+), 34 deletions(-) diff --git a/mods/ITEMS/mcl_core/init.lua b/mods/ITEMS/mcl_core/init.lua index 897382e01..b1b2b9d35 100644 --- a/mods/ITEMS/mcl_core/init.lua +++ b/mods/ITEMS/mcl_core/init.lua @@ -14,7 +14,6 @@ mcl_autogroup.register_diggroup("shearsy_wool") mcl_autogroup.register_diggroup("shearsy_cobweb") mcl_autogroup.register_diggroup("swordy") mcl_autogroup.register_diggroup("swordy_cobweb") -mcl_autogroup.register_diggroup("hoey") -- Load files local modpath = minetest.get_modpath("mcl_core") diff --git a/mods/ITEMS/mcl_core/nodes_trees.lua b/mods/ITEMS/mcl_core/nodes_trees.lua index 4af3eef34..fd6641552 100644 --- a/mods/ITEMS/mcl_core/nodes_trees.lua +++ b/mods/ITEMS/mcl_core/nodes_trees.lua @@ -268,19 +268,7 @@ local register_leaves = function(subname, description, longdesc, tiles, sapling, tiles = tiles, paramtype = "light", stack_max = 64, - groups = { - handy=1, - hoey=1, - shearsy=1, - swordy=1, - leafdecay=leafdecay_distance, - flammable=2, - leaves=1, - deco_block=1, - dig_by_piston=1, - fire_encouragement=30, - fire_flammability=60 - }, + groups = {handy=1,shearsy=1,swordy=1, leafdecay=leafdecay_distance, flammable=2, leaves=1, deco_block=1, dig_by_piston=1, fire_encouragement=30, fire_flammability=60}, drop = get_drops(0), _mcl_shears_drop = true, sounds = mcl_sounds.node_sound_leaves_defaults(), diff --git a/mods/ITEMS/mcl_farming/hoes.lua b/mods/ITEMS/mcl_farming/hoes.lua index db470b999..e2e8342d7 100644 --- a/mods/ITEMS/mcl_farming/hoes.lua +++ b/mods/ITEMS/mcl_farming/hoes.lua @@ -78,9 +78,6 @@ minetest.register_tool("mcl_farming:hoe_wood", { }, _repair_material = "group:wood", _mcl_toollike_wield = true, - _mcl_diggroups = { - hoey = { speed = 2, level = 1, uses = 60 } - }, }) minetest.register_craft({ @@ -121,9 +118,6 @@ minetest.register_tool("mcl_farming:hoe_stone", { }, _repair_material = "mcl_core:cobble", _mcl_toollike_wield = true, - _mcl_diggroups = { - hoey = { speed = 4, level = 3, uses = 132 } - }, }) minetest.register_craft({ @@ -160,9 +154,6 @@ minetest.register_tool("mcl_farming:hoe_iron", { }, _repair_material = "mcl_core:iron_ingot", _mcl_toollike_wield = true, - _mcl_diggroups = { - hoey = { speed = 6, level = 4, uses = 251 } - }, }) minetest.register_craft({ @@ -205,9 +196,6 @@ minetest.register_tool("mcl_farming:hoe_gold", { }, _repair_material = "mcl_core:gold_ingot", _mcl_toollike_wield = true, - _mcl_diggroups = { - hoey = { speed = 12, level = 2, uses = 33 } - }, }) minetest.register_craft({ @@ -252,9 +240,6 @@ minetest.register_tool("mcl_farming:hoe_diamond", { }, _repair_material = "mcl_core:diamond", _mcl_toollike_wield = true, - _mcl_diggroups = { - hoey = { speed = 8, level = 5, uses = 1562 } - }, }) minetest.register_craft({ diff --git a/mods/ITEMS/mcl_farming/wheat.lua b/mods/ITEMS/mcl_farming/wheat.lua index e3ee79ead..9a8a9f65e 100644 --- a/mods/ITEMS/mcl_farming/wheat.lua +++ b/mods/ITEMS/mcl_farming/wheat.lua @@ -146,7 +146,7 @@ minetest.register_node("mcl_farming:hay_block", { paramtype2 = "facedir", is_ground_content = false, on_place = mcl_util.rotate_axis, - groups = {handy=1, hoey=1, flammable=2, fire_encouragement=60, fire_flammability=20, building_block=1, fall_damage_add_percent=-80}, + groups = {handy=1, flammable=2, fire_encouragement=60, fire_flammability=20, building_block=1, fall_damage_add_percent=-80}, sounds = mcl_sounds.node_sound_leaves_defaults(), on_rotate = on_rotate, _mcl_blast_resistance = 0.5, diff --git a/mods/ITEMS/mcl_nether/init.lua b/mods/ITEMS/mcl_nether/init.lua index 467054767..f4b203acc 100644 --- a/mods/ITEMS/mcl_nether/init.lua +++ b/mods/ITEMS/mcl_nether/init.lua @@ -176,7 +176,7 @@ minetest.register_node("mcl_nether:nether_wart_block", { stack_max = 64, tiles = {"mcl_nether_nether_wart_block.png"}, is_ground_content = false, - groups = {handy=1, hoey=1, building_block=1}, + groups = {handy=1, building_block=1}, sounds = mcl_sounds.node_sound_leaves_defaults( { footstep={name="default_dirt_footstep", gain=0.7}, diff --git a/mods/ITEMS/mcl_ocean/kelp.lua b/mods/ITEMS/mcl_ocean/kelp.lua index 9670943da..15d155fc8 100644 --- a/mods/ITEMS/mcl_ocean/kelp.lua +++ b/mods/ITEMS/mcl_ocean/kelp.lua @@ -779,7 +779,7 @@ minetest.register_node("mcl_ocean:dried_kelp_block", { description = S("Dried Kelp Block"), _doc_items_longdesc = S("A decorative block that serves as a great furnace fuel."), tiles = { "mcl_ocean_dried_kelp_top.png", "mcl_ocean_dried_kelp_bottom.png", "mcl_ocean_dried_kelp_side.png" }, - groups = { handy = 1, hoey = 1, building_block = 1, flammable = 2, fire_encouragement = 30, fire_flammability = 60 }, + groups = { handy = 1, building_block = 1, flammable = 2, fire_encouragement = 30, fire_flammability = 60 }, sounds = mcl_sounds.node_sound_leaves_defaults(), paramtype2 = "facedir", on_place = mcl_util.rotate_axis, diff --git a/mods/ITEMS/mcl_sponges/init.lua b/mods/ITEMS/mcl_sponges/init.lua index 75a99b0f1..aeacecd6f 100644 --- a/mods/ITEMS/mcl_sponges/init.lua +++ b/mods/ITEMS/mcl_sponges/init.lua @@ -48,7 +48,7 @@ minetest.register_node("mcl_sponges:sponge", { buildable_to = false, stack_max = 64, sounds = mcl_sounds.node_sound_dirt_defaults(), - groups = {handy=1, hoey=1, building_block=1}, + groups = {handy=1, building_block=1}, on_place = function(itemstack, placer, pointed_thing) local pn = placer:get_player_name() if pointed_thing.type ~= "node" then @@ -136,7 +136,7 @@ minetest.register_node("mcl_sponges:sponge_wet", { buildable_to = false, stack_max = 64, sounds = mcl_sounds.node_sound_dirt_defaults(), - groups = {handy=1, hoey=1, building_block=1}, + groups = {handy=1, building_block=1}, on_place = place_wet_sponge, _mcl_blast_resistance = 0.6, _mcl_hardness = 0.6, From ed7099fefc3f0091426cc2b61c9bb19ed8b96846 Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Mon, 12 Apr 2021 15:18:19 +0200 Subject: [PATCH 3/5] Fix crash with removed hoey diggroup --- mods/ITEMS/mcl_tools/init.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/mods/ITEMS/mcl_tools/init.lua b/mods/ITEMS/mcl_tools/init.lua index 2d804b9bc..ea695129d 100644 --- a/mods/ITEMS/mcl_tools/init.lua +++ b/mods/ITEMS/mcl_tools/init.lua @@ -51,7 +51,6 @@ minetest.register_tool(":", { handy = { speed = 1, level = 1, uses = 0 }, axey = { speed = 1, level = 1, uses = 0 }, shovely = { speed = 1, level = 1, uses = 0 }, - hoey = { speed = 1, level = 1, uses = 0 }, pickaxey = { speed = 1, level = 0, uses = 0 }, swordy = { speed = 1, level = 0, uses = 0 }, swordy_cobweb = { speed = 1, level = 0, uses = 0 }, From 615b15f1331d34c1b5c8e339cc025309b13eecca Mon Sep 17 00:00:00 2001 From: Elias Fleckenstein Date: Mon, 12 Apr 2021 15:25:31 +0200 Subject: [PATCH 4/5] Revert "Merge pull request 'Add #490' (#1515) from NO11/MineClone2:master into master" This reverts commit 7a8079bb64e02691352001927514bdeed40ce12b, reversing changes made to 849823af1f4d381f85fe8fed4faa96171c92284a. --- mods/ITEMS/mcl_core/crafting.lua | 50 ------ mods/ITEMS/mcl_core/nodes_trees.lua | 164 +----------------- .../mcl_core_stripped_acacia_side.png | Bin 361 -> 0 bytes .../textures/mcl_core_stripped_acacia_top.png | Bin 426 -> 0 bytes .../textures/mcl_core_stripped_birch_side.png | Bin 531 -> 0 bytes .../textures/mcl_core_stripped_birch_top.png | Bin 439 -> 0 bytes .../mcl_core_stripped_dark_oak_side.png | Bin 382 -> 0 bytes .../mcl_core_stripped_dark_oak_top.png | Bin 438 -> 0 bytes .../mcl_core_stripped_jungle_side.png | Bin 415 -> 0 bytes .../textures/mcl_core_stripped_jungle_top.png | Bin 480 -> 0 bytes .../textures/mcl_core_stripped_oak_side.png | Bin 551 -> 0 bytes .../textures/mcl_core_stripped_oak_top.png | Bin 523 -> 0 bytes .../mcl_core_stripped_spruce_side.png | Bin 447 -> 0 bytes .../textures/mcl_core_stripped_spruce_top.png | Bin 556 -> 0 bytes mods/ITEMS/mcl_tools/init.lua | 55 ------ 15 files changed, 2 insertions(+), 267 deletions(-) delete mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_stripped_acacia_side.png delete mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_stripped_acacia_top.png delete mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_stripped_birch_side.png delete mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_stripped_birch_top.png delete mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_stripped_dark_oak_side.png delete mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_stripped_dark_oak_top.png delete mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_stripped_jungle_side.png delete mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_stripped_jungle_top.png delete mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_stripped_oak_side.png delete mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_stripped_oak_top.png delete mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_stripped_spruce_side.png delete mode 100644 mods/ITEMS/mcl_core/textures/mcl_core_stripped_spruce_top.png diff --git a/mods/ITEMS/mcl_core/crafting.lua b/mods/ITEMS/mcl_core/crafting.lua index 7a2b6a5c8..a0ad38a77 100644 --- a/mods/ITEMS/mcl_core/crafting.lua +++ b/mods/ITEMS/mcl_core/crafting.lua @@ -46,56 +46,6 @@ minetest.register_craft({ } }) --- Stripped Bark -minetest.register_craft({ - output = "mcl_core:stripped_oak_bark 3", - recipe = { - { "mcl_core:stripped_oak", "mcl_core:stripped_oak" }, - { "mcl_core:stripped_oak", "mcl_core:stripped_oak" }, - } -}) - -minetest.register_craft({ - output = "mcl_core:stripped_acacia_bark 3", - recipe = { - { "mcl_core:stripped_acacia", "mcl_core:stripped_acacia" }, - { "mcl_core:stripped_acacia", "mcl_core:stripped_acacia" }, - } -}) - -minetest.register_craft({ - output = "mcl_core:stripped_dark_oak_bark 3", - recipe = { - { "mcl_core:stripped_dark_oak", "mcl_core:stripped_dark_oak" }, - { "mcl_core:stripped_dark_oak", "mcl_core:stripped_dark_oak" }, - } -}) - -minetest.register_craft({ - output = "mcl_core:stripped_birch_bark 3", - recipe = { - { "mcl_core:stripped_birch", "mcl_core:stripped_birch" }, - { "mcl_core:stripped_birch", "mcl_core:stripped_birch" }, - } -}) - -minetest.register_craft({ - output = "mcl_core:stripped_spruce_bark 3", - recipe = { - { "mcl_core:stripped_spruce", "mcl_core:stripped_spruce" }, - { "mcl_core:stripped_spruce", "mcl_core:stripped_spruce" }, - } -}) - -minetest.register_craft({ - output = "mcl_core:stripped_jungle_bark 3", - recipe = { - { "mcl_core:stripped_jungle", "mcl_core:stripped_jungle" }, - { "mcl_core:stripped_jungle", "mcl_core:stripped_jungle" }, - } -}) - - minetest.register_craft({ type = 'shapeless', output = 'mcl_core:mossycobble', diff --git a/mods/ITEMS/mcl_core/nodes_trees.lua b/mods/ITEMS/mcl_core/nodes_trees.lua index fd6641552..3a8aef8d0 100644 --- a/mods/ITEMS/mcl_core/nodes_trees.lua +++ b/mods/ITEMS/mcl_core/nodes_trees.lua @@ -1,4 +1,4 @@ --- Tree nodes: Wood, Wooden Planks, Sapling, Leaves, Stripped Wood +-- Tree nodes: Wood, Wooden Planks, Sapling, Leaves local S = minetest.get_translator("mcl_core") local mod_screwdriver = minetest.get_modpath("screwdriver") ~= nil @@ -48,166 +48,6 @@ local register_tree_trunk = function(subname, description_trunk, description_bar }) end --- Register stripped trunk -minetest.register_node("mcl_core:stripped_oak", { - description = "Stripped Oak Log", - _doc_items_longdesc = "Stripped Oak Log is a log that has been stripped of it's bark.", - tiles = {"mcl_core_stripped_oak_top.png", "mcl_core_stripped_oak_top.png", "mcl_core_stripped_oak_side.png"}, - is_ground_content = false, - paramtype2 = "facedir", - on_place = mcl_util.rotate_axis, - groups = {handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5, tree=1}, - sounds = mcl_sounds.node_sound_wood_defaults(), - _mcl_blast_resistance = 10, - _mcl_hardness = 2, -}) - -minetest.register_node("mcl_core:stripped_acacia", { - description = "Stripped Acacia Log", - _doc_items_longdesc = "Stripped Acacia Log is a log that has been stripped of it's bark.", - tiles = {"mcl_core_stripped_acacia_top.png", "mcl_core_stripped_acacia_top.png", "mcl_core_stripped_acacia_side.png"}, - is_ground_content = false, - paramtype2 = "facedir", - on_place = mcl_util.rotate_axis, - groups = {handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5, tree=1}, - sounds = mcl_sounds.node_sound_wood_defaults(), - _mcl_blast_resistance = 10, - _mcl_hardness = 2, -}) - -minetest.register_node("mcl_core:stripped_dark_oak", { - description = "Stripped Dark Oak Log", - _doc_items_longdesc = "Stripped Dark Oak Log is a log that has been stripped of it's bark.", - tiles = {"mcl_core_stripped_dark_oak_top.png", "mcl_core_stripped_dark_oak_top.png", "mcl_core_stripped_dark_oak_side.png"}, - is_ground_content = false, - paramtype2 = "facedir", - on_place = mcl_util.rotate_axis, - groups = {handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5, tree=1}, - sounds = mcl_sounds.node_sound_wood_defaults(), - _mcl_blast_resistance = 10, - _mcl_hardness = 2, -}) - -minetest.register_node("mcl_core:stripped_birch", { - description = "Stripped Birch Log", - _doc_items_longdesc = "Stripped Birch Log is a log that has been stripped of it's bark.", - tiles = {"mcl_core_stripped_birch_top.png", "mcl_core_stripped_birch_top.png", "mcl_core_stripped_birch_side.png"}, - is_ground_content = false, - paramtype2 = "facedir", - on_place = mcl_util.rotate_axis, - groups = {handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5, tree=1}, - sounds = mcl_sounds.node_sound_wood_defaults(), - _mcl_blast_resistance = 10, - _mcl_hardness = 2, -}) - -minetest.register_node("mcl_core:stripped_spruce", { - description = "Stripped Spruce Log", - _doc_items_longdesc = "Stripped Spruce Log is a log that has been stripped of it's bark.", - tiles = {"mcl_core_stripped_spruce_top.png", "mcl_core_stripped_spruce_top.png", "mcl_core_stripped_spruce_side.png"}, - is_ground_content = false, - paramtype2 = "facedir", - on_place = mcl_util.rotate_axis, - groups = {handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5, tree=1}, - sounds = mcl_sounds.node_sound_wood_defaults(), - _mcl_blast_resistance = 10, - _mcl_hardness = 2, -}) - -minetest.register_node("mcl_core:stripped_jungle", { - description = "Stripped Jungle Log", - _doc_items_longdesc = "Stripped Jungle Log is a log that has been stripped of it's bark.", - tiles = {"mcl_core_stripped_jungle_top.png", "mcl_core_stripped_jungle_top.png", "mcl_core_stripped_jungle_side.png"}, - is_ground_content = false, - paramtype2 = "facedir", - on_place = mcl_util.rotate_axis, - groups = {handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5, tree=1}, - sounds = mcl_sounds.node_sound_wood_defaults(), - _mcl_blast_resistance = 10, - _mcl_hardness = 2, -}) - - --- Register stripped bark -minetest.register_node("mcl_core:stripped_oak_bark", { - description = "Stripped Oak Bark", - _doc_items_longdesc = "Stripped Oak Bark is a bark that has been stripped.", - tiles = {"mcl_core_stripped_oak_side.png"}, - is_ground_content = false, - paramtype2 = "facedir", - on_place = mcl_util.rotate_axis, - groups = {handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, - sounds = mcl_sounds.node_sound_wood_defaults(), - _mcl_blast_resistance = 10, - _mcl_hardness = 2, -}) - -minetest.register_node("mcl_core:stripped_acacia_bark", { - description = "Stripped Acacia Bark", - _doc_items_longdesc = "Stripped Acacia Bark is a bark that has been stripped.", - tiles = {"mcl_core_stripped_acacia_side.png"}, - is_ground_content = false, - paramtype2 = "facedir", - on_place = mcl_util.rotate_axis, - groups = {handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, - sounds = mcl_sounds.node_sound_wood_defaults(), - _mcl_blast_resistance = 10, - _mcl_hardness = 2, -}) - -minetest.register_node("mcl_core:stripped_dark_oak_bark", { - description = "Stripped Dark Oak Bark", - _doc_items_longdesc = "Stripped Dark Oak Bark is a bark that has been stripped.", - tiles = {"mcl_core_stripped_dark_oak_side.png"}, - is_ground_content = false, - paramtype2 = "facedir", - on_place = mcl_util.rotate_axis, - groups = {handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, - sounds = mcl_sounds.node_sound_wood_defaults(), - _mcl_blast_resistance = 10, - _mcl_hardness = 2, -}) - -minetest.register_node("mcl_core:stripped_birch_bark", { - description = "Stripped Birch Bark", - _doc_items_longdesc = "Stripped Birch Bark is a bark that has been stripped.", - tiles = {"mcl_core_stripped_birch_side.png"}, - is_ground_content = false, - paramtype2 = "facedir", - on_place = mcl_util.rotate_axis, - groups = {handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, - sounds = mcl_sounds.node_sound_wood_defaults(), - _mcl_blast_resistance = 10, - _mcl_hardness = 2, -}) - -minetest.register_node("mcl_core:stripped_spruce_bark", { - description = "Stripped Spruce Bark", - _doc_items_longdesc = "Stripped Spruce Bark is a bark that has been stripped.", - tiles = {"mcl_core_stripped_spruce_side.png"}, - is_ground_content = false, - paramtype2 = "facedir", - on_place = mcl_util.rotate_axis, - groups = {handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, - sounds = mcl_sounds.node_sound_wood_defaults(), - _mcl_blast_resistance = 10, - _mcl_hardness = 2, -}) - -minetest.register_node("mcl_core:stripped_jungle_bark", { - description = "Stripped Jungle Bark", - _doc_items_longdesc = "Stripped Jungles Bark is a bark that has been stripped.", - tiles = {"mcl_core_stripped_jungle_side.png"}, - is_ground_content = false, - paramtype2 = "facedir", - on_place = mcl_util.rotate_axis, - groups = {handy=1,axey=1, flammable=2, building_block=1, material_wood=1, fire_encouragement=5, fire_flammability=5}, - sounds = mcl_sounds.node_sound_wood_defaults(), - _mcl_blast_resistance = 10, - _mcl_hardness = 2, -}) - - local register_wooden_planks = function(subname, description, tiles) minetest.register_node("mcl_core:"..subname, { description = description, @@ -374,4 +214,4 @@ register_leaves("birchleaves", S("Birch Leaves"), S("Birch leaves are grown from -- Node aliases minetest.register_alias("default:acacia_tree", "mcl_core:acaciatree") -minetest.register_alias("default:acacia_leaves", "mcl_core:acacialeaves") \ No newline at end of file +minetest.register_alias("default:acacia_leaves", "mcl_core:acacialeaves") diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_acacia_side.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_acacia_side.png deleted file mode 100644 index 2e2de8dbeb40446e193bc91c921dcd549cb8f5ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 361 zcmV-v0ha!WP)5FB}_c+UEcO0QN~l zK~y-)g;F~XgD?zzjaUr=2{FJ-@6fCCWIbA$VTh0tQ6HckDyMER?OPJtdH%fkbh}=j z0N?|oYY0_aVp|^ofT}G40NeUN)s~=|z>zWC7YJNV7U(+wP)#YBplb-u2gVVorbL*h z1sp$b$8(RWE#Dn<4Vh$(VeEH404OwBx5tscZ1G7!i8%@8qfkv4#(qckfs;Ny@F#(^ zsY&y+n1X7b(~5HBREZ;-#2ikyrB$~eG5w~H9nf?BgAbfEbJmP{1Lc%^{^f<$VlM2F zm_9I^wM15u{F}utj;f2Tb(!wVZiK@{vew$_*8QrUZ=r=34Em8zDYJ9400000NkvXX Hu0mjfGklU~ diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_acacia_top.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_acacia_top.png deleted file mode 100644 index 0746884de9e39cbf129e4291b660df94adc9676c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 426 zcmV;b0agBqP)61q=2N`9A;v0XIoR zK~y-)rBh97gFp~{4MHGccTre`7!Y#MQz3t&f2+T)mqL$?hk~F&5E68&)Lz;{JJa1& zN}-;1XPz_fLvQZyZa?skC$KMZB=~&37_KQT(Y5`o2LLNNWO)LmC6t!VFaj_2cmNed zC?G;H15&*yTMXmmNLcxrs-lJn1@>9OL#m<%0OZF5^5el7&K`(Rz+4TKmZ*x_(HTcy zJ;Kcx5M=@kmnr5at^qbh3FskGz-nzCh#!@!PA zX^DN7@W$d)GXtACy%X3b@mKb}Nok4m#o+Pbnf>tn3YLBz0@}>{`(li~oWImR0jNEf Ua`%pJIsgCw07*qoM6N<$g8!XP)67zmJc#F+p90ia1l zK~y-)b(6i0(?Ar3zeExKDb|Tbifvg!#LWua5UQ12ZMzS_JMbht4YX7ss$Cj_XdJW> zvJ+_(Pl|Y4K@nzlW`SE-cjlgR&za-N+c&R&0X#2L0HQEp(4+k}HRzFdpEdy0RY5B? z05gDGgt+ys+0k^8IF7lwy0n0C9Ftu{-rZ?;9K6P$N19FouwE@}KMDiZtA$6_bdsry z_~FYBqA;MY3hJt0o+O@>d6L+kA)cDyUMb7yUNq~wKzG~2g9Lz9YHtW22%Zpy0liY( zZtl6=+nTfNBrs3)`=w`^3_x|&D4`kLI2XYZw19MUQWttl<_h~&3-1Q!N;wEyQB=kzr z9S5?D$j<>lyW7+5_WuQQtLfx VuEYPSXp;Z{002ovPDHLkV1i8Z>W%;a diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_birch_top.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_birch_top.png deleted file mode 100644 index e5290422d4f7f826064a1bff7baf1cea5a2b46c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 439 zcmV;o0Z9IdP)67!-tbnAQLQ0Yphe zK~y-)rIWvkgFq0*e-~0{BZ#1G6R;A}nJUlVGu@lqdt86rRj~`C5^Pol5p1-(D`eK) zM7ZLn+gZOq^UeD9_3{40Kk5kZ`TcO3Y2X9UPP22idjRD%UkRRp04nlmrRr2@m{0kHryVH;}4XpqG002ovPDHLkV1jcoxsLz< diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_dark_oak_side.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_dark_oak_side.png deleted file mode 100644 index 9345a14dc22824b02974199546cd9a357df98c15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 382 zcmV-^0fGLBP)6HY+(5yvG0l0Sie) zK~y-)jgzrz!$1s%zaBme*-YRt?Gyq{hrU7AK0seTL&zFTQ)e<9g0w@bLza)Gnk>n` zr2m)h;p6@7JH`k=&J%6BLapXM_D`IKffyq>PXq<4?Y0|s+s!Pt?z-}Q9!CH~1c0D` zoF@Q2zb-S71=svW0oL}1(~2`Q9@T;WP}0Ncq1Ul0PV2lY%rB zW1Mfnk7|>BO7toHd8y4kzFtIK>Fq7ZO#`p2idx%_j|X4bZbZ))n2BsBZhTc0tacYU c%i=Zu0DJ|cn!xaR_W%F@07*qoM6N<$f)T-*=l}o! diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_dark_oak_top.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_dark_oak_top.png deleted file mode 100644 index fbc45938f39a4c70c4f1b506a630a606676ebb15..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 438 zcmV;n0ZIOeP)6HXd)Lc;o;80Ygbd zK~zY`#Z|is!axu_Lm*(~sYTFAEb<3_fFIz;3koU3%8wiq8>*L7_hUa%Zm=gv9jy>nI7 zG))uwi4-75uwE~hi$xeIpJRnX*lOjy_dle76=BD0aP)lE_3JgPS+?Krb|Dc-09F)b z`FIS!&*$s)av6Z98i=SsBP+LffJmSSfT0ve%7hUZ*MKZSmYy9z8Gc_?pIeF;0t2C# zrBTJA6oLaNGLC$VQxs*{wqc5+Uvmj!d49Xy?_nyG;hvf!vDGHZK!o416D3|;pIK0!~>>+~KyL~hV^ARrenyomw^iGcB@ z-BjvWY0|&(AdUX~nLoaJdwu!ZEaw314o3jCMUJtKx+-b=fqm2Q^!NaP%pJWa3kTt$ zMB5Jl%(R}Iuk<3uDox%j=NRi^EDHpj{P~w4uo>$})vWYlQq5S$?r@wa%VhQNO{=A*IS0ZHqj{N+vz8?6D-2_EWv~DM0c}Y{ zK~zY`#Z^110znWQMMRJhMBPMCbU`rQ8yFcHc?7THJv_li-e6)uSVh6a4}yarCcdax zsd~y-_!UJ*KYSn7_y4$VSE0uhmrp{%V zG3Bzg)`sU*eVi*Pz$EE(8VzI4XYcR#u;6mJULTJ+@Mts`MA7FPGm(G*12>!2R;$K1 zx8GkbTAAJMdVM@XAe@78OrXdF6flV47lqV512aKMfQj&0?JpM2ZMUJ40Or{VTEIO- zqM8NV5VOGf+%na=B2P04DkVS+Qa_*GdmrX0*Kid09l(uQQUm}I%6`grtJP+6I2bb= z_WSMjFYf>+vb1UH+&cjtHf1{i%Nbz*a}Oc$c$_40tnJ6~et{?oTP1DCQ~d42!o$n^ zatOH)W&r!sX_EAMc_F@ua?RH^RFXnMR)&eOf(*=r<+p&9;6xCD86Br&{$HEsX^0kla( zK~zY`V@!DCf5(3R|Njg)fY~b58KP4W{8M4KGhSyS#Ldi9R76A=7^Wy}cex(Uz#!Dd zQ_t3hQ2(y#OXII92AqHe#>jc#xkqy)LIP&sojcE;fBcBsfK#XL+tE`ORGukr zQphntqLK++BaB9OIeHYq(gKVo7r-3=i)-{a&tB-cT5}g}1JE6Y%N!UuJ@t0w>nJP^ zz!lW6s6me+bc+cAbc-?40I6~Q`t`?;U%xUi+`s?&_4n_HxW=Xb|3QZL41#!~0GE$& zr46{n1OTjDfR`I+ro=y8r-0HO2I)e~I~z=94vwUe6qaV1KE8{%49d8RXp9g*FS%eK+|a6AKAM3cqQI&{-U~BIh)uLGb?E8|hQKbd zOW&W{Ffh2f>gh>HFfja|0F4p`>`?$O0bzhZ9f462;sU#OU%K?-1@2msP)HEW1%zrn pbO$OO6aB!o6%jRr5*@Ch8vr(5L|EFRL-_yz002ovPDHLkV1kGx<`@6~ diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_oak_top.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_oak_top.png deleted file mode 100644 index b07c726135d63653bd14fac277ed3f4f66cfd957..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 523 zcmV+m0`&cfP)6B>{s$G=l&D0hmcd zK~y-)rIRsF+fWpRzgQ;1wGll-+YT{u~2S_lyjc=tPz%QczHp zgh-DJ&yooWRq254l?~arizPqb<8!`yU+p40f8`V91Jr%5^77=c$@BJw$ucMF#f%p@ z`}I9;@7I;@wtxS<2}otV7yuK6SXZ!L-veO2e&WaJHxd&tvl{>v^L8~~Uf(fZ(I&}}PZ>k5tNm8lCP8JWZpR}$Amp)Q$M-YOy8Pg|HM)M*SyD{iKb>cYB0 zdukWi`D@+x`2Mw_cHh$$Hd4Z@au+7coXIl(Fw)z5KJ0(FYM;H%{{im@)*MZ?;pYGV N002ovPDHLkV1mUX;dB51 diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_spruce_side.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_spruce_side.png deleted file mode 100644 index 11ea15bebbad35c0a09c692a42104d22382c31b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 447 zcmV;w0YLtVP)6F$+yP3djHe0Zd6m zK~y-)eN!=ugD@Cn(DFHykQT21UpXyqtJH67Hpx32J5l;A~zOv8BD705oJRN6ie6y7&50XsDSzB@j)! zs-}Y!8dZMmGlv^fsB1!Ruy`}ybu%1E$J8m7fL^?p8@ zbb$?4GecRVh(o>^sx3nUDYO^m>*=r=DqFkpfHad2pWnac-d&KJ7b%{M`7kZsHLd@N p-J|ZkH{p1&^$y63M23!;RDYjnz-)+rfsX(H002ovPDHLkV1l;oxO4yj diff --git a/mods/ITEMS/mcl_core/textures/mcl_core_stripped_spruce_top.png b/mods/ITEMS/mcl_core/textures/mcl_core_stripped_spruce_top.png deleted file mode 100644 index 7699612b6bf2721104c69d9318710f7723554e40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 556 zcmV+{0@MA8P)6F%~X7W)T1Y0l7&; zK~zY`#Z^6P!e9_SYeEu2tOnCMC~+6GgHVueb#Ulk@LzUtNH>>)LoK)~W@-JXABcu3 zb|{YtmmIozOY$b~-92~DbMKpKw_B}7<9MVinSz(Y(?0v#k~ii)&8^`Pxvp(nR`~tn zcD((5BzjnujJtQD(P%zjufzX8)s3-j#^a^C%0lf#07!{?z2R^&A#&?>*>b{tNR%U! z43CIhGRTSpbeA?+5nvq94F|vj@PyoIwNfdcKi_I8u5!-NaWWZQmx1*Ah*HjapDCi=URlsmr}xk zNO5BTc&jACf8{xSe|!l$2Y-lGq7MF=rfG^25g}J60-yp=!2?U0K_UQ>G<5=iIR;k} z6#%k-JA9>H!!>~7$rAyPIEI{4u3||Oe9bk`Y*s48Vp!No?3a!qDwM{Jb1qE}fQeHe zshkJo=6QpG?-Oa7s;VkcpU8Sb*YO{5$$m7v_+GvM0000 Date: Mon, 12 Apr 2021 15:45:00 +0200 Subject: [PATCH 5/5] Remove debug printin mcl_mobs --- mods/ENTITIES/mcl_mobs/spawning.lua | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/mods/ENTITIES/mcl_mobs/spawning.lua b/mods/ENTITIES/mcl_mobs/spawning.lua index ff52128df..210c6b9c6 100644 --- a/mods/ENTITIES/mcl_mobs/spawning.lua +++ b/mods/ENTITIES/mcl_mobs/spawning.lua @@ -12,7 +12,7 @@ local vector_distance = vector.distance -- range for mob count local aoc_range = 32 ---[[ +--[[ THIS IS THE BIG LIST OF ALL BIOMES - used for programming/updating mobs @@ -158,7 +158,6 @@ local mobs_spawn = minetest.settings:get_bool("mobs_spawn", true) ~= false -- count how many mobs of one type are inside an area local count_mobs = function(pos,mobtype) - print(mobtype) local num = 0 local objs = get_objects_inside_radius(pos, aoc_range) for n = 1, #objs do @@ -170,12 +169,12 @@ local count_mobs = function(pos,mobtype) num = num + 1 end -- count passive mobs only - else + else num = num + 1 end end end - + return num end @@ -194,7 +193,7 @@ end name: the mobs name -dimension: +dimension: "overworld" "nether" "end" @@ -531,7 +530,7 @@ local function biome_check(biome_list, biome_goal) return false end - + --todo mob limiting --MAIN LOOP @@ -552,11 +551,11 @@ if mobs_spawn then if dimension == "void" or dimension == "default" then break -- ignore void and unloaded area end - + local min,max = decypher_limits(player_pos.y) local goal_pos = position_calculation(player_pos) - + local spawning_position_list = find_nodes_in_area_under_air(new_vector(goal_pos.x,min,goal_pos.z), vector.new(goal_pos.x,max,goal_pos.z), {"group:solid", "group:water", "group:lava"}) --couldn't find node