diff --git a/mods/caverealms_lite/abms.lua b/mods/caverealms_lite/abms.lua index 625677f..f9fa38b 100644 --- a/mods/caverealms_lite/abms.lua +++ b/mods/caverealms_lite/abms.lua @@ -37,9 +37,11 @@ minetest.register_abm({ else local above_pos = {x=pos.x, y=pos.y+1, z=pos.z} local above_node = minetest.get_node(above_pos).name - while above_node == 'caverealms:fire_vine' do + local node_count = 0 + while above_node == 'caverealms:fire_vine' and node_count < 25 do above_pos.y = above_pos.y + 1 above_node = minetest.get_node(above_pos).name + local node_count = node_count + 1 end if minetest.get_item_group(above_node, 'flammable') > 0 or above_node == 'air' then minetest.set_node(above_pos, {name = 'caverealms:fire_vine'}) diff --git a/mods/farming/crops/cocoa.lua b/mods/farming/crops/cocoa.lua index 243814b..032c4b0 100644 --- a/mods/farming/crops/cocoa.lua +++ b/mods/farming/crops/cocoa.lua @@ -115,6 +115,7 @@ minetest.register_node("farming:chocolate_block", { is_ground_content = false, groups = {cracky = 2, oddly_breakable_by_hand = 2}, sounds = default.node_sound_stone_defaults(), + on_use = minetest.item_eat(27), }) minetest.register_craft({ diff --git a/mods/hbhunger/hunger.lua b/mods/hbhunger/hunger.lua index 01cb27f..d2a29a6 100644 --- a/mods/hbhunger/hunger.lua +++ b/mods/hbhunger/hunger.lua @@ -371,6 +371,7 @@ if minetest.get_modpath("farming") and farming.mod == "redo" then hbhunger.register_food("farming:coffee_cup_hot", 3, "farming:drinking_cup", nil, 2) hbhunger.register_food("farming:cookie", 2) hbhunger.register_food("farming:chocolate_dark", 3) + hbhunger.register_food("farming:chocolate_block", 27) hbhunger.register_food("farming:donut", 4) hbhunger.register_food("farming:donut_chocolate", 6) hbhunger.register_food("farming:donut_apple", 6) diff --git a/mods/minetest-3d_armor/3d_armor_ui/init.lua b/mods/minetest-3d_armor/3d_armor_ui/init.lua index da9a27a..ddd940b 100644 --- a/mods/minetest-3d_armor/3d_armor_ui/init.lua +++ b/mods/minetest-3d_armor/3d_armor_ui/init.lua @@ -4,45 +4,48 @@ local F = minetest.formspec_escape local has_technic = minetest.get_modpath("technic") ~= nil if not minetest.global_exists("unified_inventory") then - minetest.log("warning", S("3d_armor_ui: Mod loaded but unused.")) - return + minetest.log("warning", S("3d_armor_ui: Mod loaded but unused.")) + return end if unified_inventory.sfinv_compat_layer then - return + return end armor:register_on_update(function(player) - local name = player:get_player_name() - if unified_inventory.current_page[name] == "armor" then - unified_inventory.set_inventory_formspec(player, "armor") - end + local name = player:get_player_name() + if unified_inventory.current_page[name] == "armor" then + unified_inventory.set_inventory_formspec(player, "armor") + end end) unified_inventory.register_button("armor", { - type = "image", - image = "inventory_plus_armor.png", - tooltip = S("3d Armor") + type = "image", + image = "inventory_plus_armor.png", + tooltip = S("3d Armor") }) unified_inventory.register_page("armor", { - get_formspec = function(player, perplayer_formspec) - local fy = perplayer_formspec.formspec_y - local name = player:get_player_name() - if armor.def[name].init_time == 0 then - return {formspec="label[0,0;"..F(S("Armor not initialized!")).."]"} - end - local formspec = "background[0.06,"..fy..";7.92,7.52;3d_armor_ui_form.png]".. - "label[0,0;"..F(S("Armor")).."]".. - "list[detached:"..name.."_armor;armor;0,"..fy..";2,3;]".. - "image[2.5,"..(fy - 0.25)..";2,4;"..armor.textures[name].preview.."]".. - "label[5.0,"..(fy + 0.0)..";"..F(S("Level"))..": "..armor.def[name].level.."]".. - "label[5.0,"..(fy + 0.5)..";"..F(S("Heal"))..": "..armor.def[name].heal.."]".. - "label[5.0,"..(fy + 1.0)..";"..F(S("Block Chance"))..": "..armor.def[name].block.."%]".. - "label[5.0,"..(fy + 1.5)..";"..F(S("Fire"))..": "..armor.def[name].fire.."]".. - "label[5.0,"..(fy + 2.0)..";"..F(S("Oxygen Regen"))..": "..armor.def[name].water.."]".. - "listring[current_player;main]".. - "listring[detached:"..name.."_armor;armor]" - return {formspec=formspec} - end, + get_formspec = function(player, perplayer_formspec) + local fy = perplayer_formspec.formspec_y + local name = player:get_player_name() + if armor.def[name].init_time == 0 then + return {formspec="label[0,0;"..F(S("Armor not initialized!")).."]"} + end + local formspec = "background[0.06,"..fy..";7.92,7.52;3d_armor_ui_form.png]".. + "label[0,0;"..F(S("Armor")).."]".. + "list[detached:"..name.."_armor;armor;0,"..fy..";2,3;]".. + "image[2.5,"..(fy - 0.25)..";2,4;"..armor.textures[name].preview.."]".. + "label[5.0,"..(fy + 0.00)..";"..F(S("Level"))..": "..armor.def[name].level.."]".. + "label[5.0,"..(fy + 0.25)..";"..F(S("Heal"))..": "..armor.def[name].heal.."]".. + "label[5.0,"..(fy + 0.50)..";"..F(S("Block Chance"))..": "..armor.def[name].block.."%]".. + "label[5.0,"..(fy + 0.75)..";"..F(S("Fire"))..": "..armor.def[name].fire.."]".. + "label[5.0,"..(fy + 1.00)..";"..F(S("Oxygen Regen"))..": "..armor.def[name].water.."]".. + "label[5.0,"..(fy + 1.25)..";"..F(S("Speed Boost"))..": "..armor.def[name].speed.."]".. + "label[5.0,"..(fy + 1.50)..";"..F(S("Jump Boost"))..": "..armor.def[name].jump.."]".. + "label[5.0,"..(fy + 1.75)..";"..F(S("Gravity Boost"))..": "..armor.def[name].gravity.."]".. + "listring[current_player;main]".. + "listring[detached:"..name.."_armor;armor]" + return {formspec=formspec} + end, }) diff --git a/mods/stations/recipes_anvil.lua b/mods/stations/recipes_anvil.lua index 05e908f..ae2a9be 100644 --- a/mods/stations/recipes_anvil.lua +++ b/mods/stations/recipes_anvil.lua @@ -435,7 +435,7 @@ for name, mat in pairs(armor_material) do [mat] = 5, ['epic:burlap'] = 1, }, - output = '3d_armor:helmet_'..name, + output = 'epic:helmet_'..name, }) stations.dual_register_recipe('anvil', { @@ -443,7 +443,7 @@ for name, mat in pairs(armor_material) do [mat] = 8, ['epic:burlap'] = 1, }, - output = '3d_armor:chestplate_'..name, + output = 'epic:chestplate_'..name, }) stations.dual_register_recipe('anvil', { @@ -451,7 +451,7 @@ for name, mat in pairs(armor_material) do [mat] = 7, ['epic:burlap'] = 1, }, - output = '3d_armor:leggings_'..name, + output = 'epic:leggings_'..name, }) stations.dual_register_recipe('anvil', { @@ -459,7 +459,7 @@ for name, mat in pairs(armor_material) do [mat] = 4, ['epic:burlap'] = 1, }, - output = '3d_armor:boots_'..name, + output = 'epic:boots_'..name, }) stations.dual_register_recipe('anvil', {