diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_cat.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_cat.b3d index 9ab4fc10c..1a6ecbbe8 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_cat.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_cat.b3d differ diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_cow.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_cow.b3d index 2f13ba9c4..c00983919 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_cow.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_cow.b3d differ diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_creeper.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_creeper.b3d index 54341579c..e04ffc7b0 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_creeper.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_creeper.b3d differ diff --git a/mods/ENTITIES/mobs_mc/models/mobs_mc_mooshroom.b3d b/mods/ENTITIES/mobs_mc/models/mobs_mc_mooshroom.b3d index 725268ea9..c00983919 100644 Binary files a/mods/ENTITIES/mobs_mc/models/mobs_mc_mooshroom.b3d and b/mods/ENTITIES/mobs_mc/models/mobs_mc_mooshroom.b3d differ diff --git a/mods/ITEMS/mcl_armor/models/mcl_armor_character.b3d b/mods/ITEMS/mcl_armor/models/mcl_armor_character.b3d index c8dce36a8..95f763eab 100644 Binary files a/mods/ITEMS/mcl_armor/models/mcl_armor_character.b3d and b/mods/ITEMS/mcl_armor/models/mcl_armor_character.b3d differ diff --git a/mods/ITEMS/mcl_armor/models/mcl_armor_character.blend b/mods/ITEMS/mcl_armor/models/mcl_armor_character.blend index c2b330c6c..a5626aacc 100644 Binary files a/mods/ITEMS/mcl_armor/models/mcl_armor_character.blend and b/mods/ITEMS/mcl_armor/models/mcl_armor_character.blend differ diff --git a/mods/ITEMS/mcl_armor/models/mcl_armor_character_female.b3d b/mods/ITEMS/mcl_armor/models/mcl_armor_character_female.b3d index 59b867574..1b4205344 100644 Binary files a/mods/ITEMS/mcl_armor/models/mcl_armor_character_female.b3d and b/mods/ITEMS/mcl_armor/models/mcl_armor_character_female.b3d differ diff --git a/mods/ITEMS/mcl_armor/models/mcl_armor_character_female.blend b/mods/ITEMS/mcl_armor/models/mcl_armor_character_female.blend index 0c13aea2a..828cd942c 100644 Binary files a/mods/ITEMS/mcl_armor/models/mcl_armor_character_female.blend and b/mods/ITEMS/mcl_armor/models/mcl_armor_character_female.blend differ diff --git a/mods/ITEMS/mcl_core/nodes_trees.lua b/mods/ITEMS/mcl_core/nodes_trees.lua index d2c5443d3..801810dbd 100644 --- a/mods/ITEMS/mcl_core/nodes_trees.lua +++ b/mods/ITEMS/mcl_core/nodes_trees.lua @@ -8,7 +8,7 @@ if mod_screwdriver then end -- Register tree trunk (wood) and bark -local register_tree_trunk = function(subname, description_trunk, description_bark, longdesc, tile_inner, tile_bark) +local register_tree_trunk = function(subname, description_trunk, description_bark, longdesc, tile_inner, tile_bark, stripped_varient) minetest.register_node("mcl_core:"..subname, { description = description_trunk, _doc_items_longdesc = longdesc, @@ -22,6 +22,7 @@ local register_tree_trunk = function(subname, description_trunk, description_bar on_rotate = on_rotate, _mcl_blast_resistance = 2, _mcl_hardness = 2, + _mcl_stripped_varient = stripped_varient, }) minetest.register_node("mcl_core:"..subname.."_bark", { @@ -37,6 +38,7 @@ local register_tree_trunk = function(subname, description_trunk, description_bar on_rotate = on_rotate, _mcl_blast_resistance = 2, _mcl_hardness = 2, + _mcl_stripped_varient = stripped_varient.."_bark", }) minetest.register_craft({ @@ -214,12 +216,12 @@ end --------------------- -register_tree_trunk("tree", S("Oak Wood"), S("Oak Bark"), S("The trunk of an oak tree."), "default_tree_top.png", "default_tree.png") -register_tree_trunk("darktree", S("Dark Oak Wood"), S("Dark Oak Bark"), S("The trunk of a dark oak tree."), "mcl_core_log_big_oak_top.png", "mcl_core_log_big_oak.png") -register_tree_trunk("acaciatree", S("Acacia Wood"), S("Acacia Bark"), S("The trunk of an acacia."), "default_acacia_tree_top.png", "default_acacia_tree.png") -register_tree_trunk("sprucetree", S("Spruce Wood"), S("Spruce Bark"), S("The trunk of a spruce tree."), "mcl_core_log_spruce_top.png", "mcl_core_log_spruce.png") -register_tree_trunk("birchtree", S("Birch Wood"), S("Birch Bark"), S("The trunk of a birch tree."), "mcl_core_log_birch_top.png", "mcl_core_log_birch.png") -register_tree_trunk("jungletree", S("Jungle Wood"), S("Jungle Bark"), S("The trunk of a jungle tree."), "default_jungletree_top.png", "default_jungletree.png") +register_tree_trunk("tree", S("Oak Wood"), S("Oak Bark"), S("The trunk of an oak tree."), "default_tree_top.png", "default_tree.png", "mcl_core:stripped_oak") +register_tree_trunk("darktree", S("Dark Oak Wood"), S("Dark Oak Bark"), S("The trunk of a dark oak tree."), "mcl_core_log_big_oak_top.png", "mcl_core_log_big_oak.png", "mcl_core:stripped_dark_oak") +register_tree_trunk("acaciatree", S("Acacia Wood"), S("Acacia Bark"), S("The trunk of an acacia."), "default_acacia_tree_top.png", "default_acacia_tree.png", "mcl_core:stripped_acacia") +register_tree_trunk("sprucetree", S("Spruce Wood"), S("Spruce Bark"), S("The trunk of a spruce tree."), "mcl_core_log_spruce_top.png", "mcl_core_log_spruce.png", "mcl_core:stripped_spruce") +register_tree_trunk("birchtree", S("Birch Wood"), S("Birch Bark"), S("The trunk of a birch tree."), "mcl_core_log_birch_top.png", "mcl_core_log_birch.png", "mcl_core:stripped_birch") +register_tree_trunk("jungletree", S("Jungle Wood"), S("Jungle Bark"), S("The trunk of a jungle tree."), "default_jungletree_top.png", "default_jungletree.png", "mcl_core:stripped_jungle") register_stripped_trunk("stripped_oak", S("Stripped Oak Log"), S("Stripped Oak Wood"), S("The stripped trunk of an oak tree."), "mcl_core_stripped_oak_top.png", "mcl_core_stripped_oak_side.png") register_stripped_trunk("stripped_acacia", S("Stripped Acacia Log"), S("Stripped Acacia Wood"), S("The stripped trunk of an acacia tree."), "mcl_core_stripped_acacia_top.png", "mcl_core_stripped_acacia_side.png") diff --git a/mods/ITEMS/mcl_sweet_berry/init.lua b/mods/ITEMS/mcl_sweet_berry/init.lua new file mode 100644 index 000000000..d1967c68c --- /dev/null +++ b/mods/ITEMS/mcl_sweet_berry/init.lua @@ -0,0 +1,89 @@ +minetest.register_craftitem("mcl_sweet_berry:sweet_berry", { + description = "Sweet Berry", + inventory_image = "sweet_berry.png", + on_use = minetest.item_eat(2) +}) +minetest.register_node("mcl_sweet_berry:sweet_berry_bush_0", { + drawtype = "plantlike", + tiles = {"sweet_berry_bush_0.png"}, + damage_per_second = 1, + selection_box = { + type = "fixed", + fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, 0.5, 6 / 16}, + }, + drop = "" +}) +minetest.register_node("mcl_sweet_berry:sweet_berry_bush_1", { + drawtype = "plantlike", + tiles = {"sweet_berry_bush_1.png"}, + damage_per_second = 1, + selection_box = { + type = "fixed", + fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, 0.5, 6 / 16}, + }, + drop = "" +}) +minetest.register_node("mcl_sweet_berry:sweet_berry_bush_2", { + drawtype = "plantlike", + tiles = {"sweet_berry_bush_2.png"}, + damage_per_second = 2, + selection_box = { + type = "fixed", + fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, 0.5, 6 / 16}, + }, + drop = "mc:sweet_berry 2" +}) +minetest.register_node("mcl_sweet_berry:sweet_berry_bush_3", { + drawtype = "plantlike", + tiles = {"sweet_berry_bush_3.png"}, + damage_per_second = 2, + selection_box = { + type = "fixed", + fixed = {-6 / 16, -0.5, -6 / 16, 6 / 16, 0.5, 6 / 16}, + }, + drop = "mc:sweet_berry 3" +}) +minetest.register_decoration({ + deco_type = "simple", + place_on = {"mcl_core:dirt_with_grass"}, + sidelen = 16, + fill_ratio = 0.1, + biomes = {"Taiga","Forest"}, + y_max = mcl_vars.mg_overworld_max, + y_min = mcl_vars.mg_overworld_min, + decoration = "mcl_sweet_berry:sweet_berry_bush_2" +}) +minetest.register_abm({ + nodenames = {"mcl_sweet_berry:sweet_berry_bush_0"}, + interval = 10.0, + chance = 16, + action = function(pos, node, active_object_count, active_object_count_wider) + minetest.set_node(pos, {name = "mcl_sweet_berry:sweet_berry_bush_1"}) + end +}) +minetest.register_abm({ + nodenames = {"mcl_sweet_berry:sweet_berry_bush_1"}, + interval = 10.0, + chance = 16, + action = function(pos, node, active_object_count, active_object_count_wider) + minetest.set_node(pos, {name = "mcl_sweet_berry:sweet_berry_bush_2"}) + end +}) +minetest.register_abm({ + nodenames = {"mcl_sweet_berry:sweet_berry_bush_2"}, + interval = 10.0, + chance = 16, + action = function(pos, node, active_object_count, active_object_count_wider) + minetest.set_node(pos, {name = "mcl_sweet_berry:sweet_berry_bush_3"}) + end +}) + +--taken from mc modpack by TechDude/TechDudie + + + + + + + + diff --git a/mods/ITEMS/mcl_sweet_berry/mod.conf b/mods/ITEMS/mcl_sweet_berry/mod.conf new file mode 100644 index 000000000..0642018e9 --- /dev/null +++ b/mods/ITEMS/mcl_sweet_berry/mod.conf @@ -0,0 +1,2 @@ +name=mcl_sweet_berry +depends=mcl_vars \ No newline at end of file diff --git a/mods/ITEMS/mcl_sweet_berry/textures/sweet_berry.png b/mods/ITEMS/mcl_sweet_berry/textures/sweet_berry.png new file mode 100644 index 000000000..907293284 Binary files /dev/null and b/mods/ITEMS/mcl_sweet_berry/textures/sweet_berry.png differ diff --git a/mods/ITEMS/mcl_sweet_berry/textures/sweet_berry_bush_0.png b/mods/ITEMS/mcl_sweet_berry/textures/sweet_berry_bush_0.png new file mode 100644 index 000000000..bbf2879dd Binary files /dev/null and b/mods/ITEMS/mcl_sweet_berry/textures/sweet_berry_bush_0.png differ diff --git a/mods/ITEMS/mcl_sweet_berry/textures/sweet_berry_bush_1.png b/mods/ITEMS/mcl_sweet_berry/textures/sweet_berry_bush_1.png new file mode 100644 index 000000000..661672caa Binary files /dev/null and b/mods/ITEMS/mcl_sweet_berry/textures/sweet_berry_bush_1.png differ diff --git a/mods/ITEMS/mcl_sweet_berry/textures/sweet_berry_bush_2.png b/mods/ITEMS/mcl_sweet_berry/textures/sweet_berry_bush_2.png new file mode 100644 index 000000000..61ac69bfe Binary files /dev/null and b/mods/ITEMS/mcl_sweet_berry/textures/sweet_berry_bush_2.png differ diff --git a/mods/ITEMS/mcl_sweet_berry/textures/sweet_berry_bush_3.png b/mods/ITEMS/mcl_sweet_berry/textures/sweet_berry_bush_3.png new file mode 100644 index 000000000..f1a0aff1a Binary files /dev/null and b/mods/ITEMS/mcl_sweet_berry/textures/sweet_berry_bush_3.png differ diff --git a/mods/ITEMS/mcl_tools/init.lua b/mods/ITEMS/mcl_tools/init.lua index bb9a4873c..809a49279 100644 --- a/mods/ITEMS/mcl_tools/init.lua +++ b/mods/ITEMS/mcl_tools/init.lua @@ -352,30 +352,6 @@ minetest.register_tool("mcl_tools:shovel_diamond", { }) -- Axes -local make_stripped_trunk_add_wear = function(itemstack, placer) - if not minetest.is_creative_enabled(placer:get_player_name()) then - -- Add wear (as if digging a axey node) - local toolname = itemstack:get_name() - local wear = mcl_autogroup.get_wear(toolname, "axey") - itemstack:add_wear(wear) - end -end - -local stripped_table = { - {"mcl_core:tree", "mcl_core:stripped_oak"}, - {"mcl_core:darktree", "mcl_core:stripped_dark_oak"}, - {"mcl_core:acaciatree", "mcl_core:stripped_acacia"}, - {"mcl_core:birchtree", "mcl_core:stripped_birch"}, - {"mcl_core:sprucetree", "mcl_core:stripped_spruce"}, - {"mcl_core:jungletree", "mcl_core:stripped_jungle"}, - {"mcl_core:tree_bark", "mcl_core:stripped_oak_bark"}, - {"mcl_core:darktree_bark", "mcl_core:stripped_dark_oak_bark"}, - {"mcl_core:acaciatree_bark", "mcl_core:stripped_acacia_bark"}, - {"mcl_core:birchtree_bark", "mcl_core:stripped_birch_bark"}, - {"mcl_core:sprucetree_bark", "mcl_core:stripped_spruce_bark"}, - {"mcl_core:jungletree_bark", "mcl_core:stripped_jungle_bark"}, -} - local make_stripped_trunk = function(itemstack, placer, pointed_thing) if pointed_thing.type ~= "node" then return end @@ -390,12 +366,17 @@ local make_stripped_trunk = function(itemstack, placer, pointed_thing) return itemstack end - for _, st in pairs(stripped_table) do - if noddef.name == st[1] then - minetest.swap_node(pointed_thing.under, {name=st[2], param2=node.param2}) - make_stripped_trunk_add_wear(itemstack, placer) - end - end + if noddef._mcl_stripped_varient == nil then + return itemstack + else + minetest.swap_node(pointed_thing.under, {name=noddef._mcl_stripped_varient, param2=node.param2}) + if not minetest.is_creative_enabled(placer:get_player_name()) then + -- Add wear (as if digging a axey node) + local toolname = itemstack:get_name() + local wear = mcl_autogroup.get_wear(toolname, "axey") + itemstack:add_wear(wear) + end + end return itemstack end diff --git a/mods/PLAYER/mcl_playerplus/init.lua b/mods/PLAYER/mcl_playerplus/init.lua index f7c430509..43f636498 100644 --- a/mods/PLAYER/mcl_playerplus/init.lua +++ b/mods/PLAYER/mcl_playerplus/init.lua @@ -242,7 +242,7 @@ minetest.register_globalstep(function(dtime) if elytra.active then -- set head pitch and yaw when flying - player:set_bone_position("Head", vector.new(0,6.3,0), vector.new(pitch+90-degrees(dir_to_pitch(player_velocity)),player_vel_yaw - yaw,0)) + player:set_bone_position("Head_Control", vector.new(0,6.3,0), vector.new(pitch-degrees(dir_to_pitch(player_velocity)),player_vel_yaw - yaw,0)) -- sets eye height, and nametag color accordingly player:set_properties({collisionbox = {-0.35,0,-0.35,0.35,0.8,0.35}, eye_height = 0.5, nametag_color = { r = 225, b = 225, a = 225, g = 225 }}) -- control body bone when flying @@ -250,18 +250,18 @@ minetest.register_globalstep(function(dtime) elseif parent then local parent_yaw = degrees(parent:get_yaw()) player:set_properties({collisionbox = {-0.312,0,-0.312,0.312,1.8,0.312}, eye_height = 1.5, nametag_color = { r = 225, b = 225, a = 225, g = 225 }}) - player:set_bone_position("Head", vector.new(0,6.3,0), vector.new(pitch, -limit_vel_yaw(yaw, parent_yaw) + parent_yaw, 0)) + player:set_bone_position("Head_Control", vector.new(0,6.3,0), vector.new(pitch, -limit_vel_yaw(yaw, parent_yaw) + parent_yaw, 0)) player:set_bone_position("Body_Control", vector.new(0,6.3,0), vector.new(0,0,0)) elseif control.sneak then -- controls head pitch when sneaking - player:set_bone_position("Head", vector.new(0,6.3,0), vector.new(pitch+36,0,0)) + player:set_bone_position("Head_Control", vector.new(0,6.3,0), vector.new(pitch, player_vel_yaw - yaw, player_vel_yaw - yaw)) -- sets eye height, and nametag color accordingly player:set_properties({collisionbox = {-0.312,0,-0.312,0.312,1.8,0.312}, eye_height = 1.35, nametag_color = { r = 225, b = 225, a = 0, g = 225 }}) -- sneaking body conrols - player:set_bone_position("Body_Control", vector.new(0,6.3,0), vector.new(0,0,0)) + player:set_bone_position("Body_Control", vector.new(0,6.3,0), vector.new(0, -player_vel_yaw + yaw, 0)) elseif get_item_group(mcl_playerinfo[name].node_head, "water") ~= 0 and is_sprinting(name) == true then -- set head pitch and yaw when swimming - player:set_bone_position("Head", vector.new(0,6.3,0), vector.new(pitch+90-degrees(dir_to_pitch(player_velocity)),player_vel_yaw - yaw,0)) + player:set_bone_position("Head_Control", vector.new(0,6.3,0), vector.new(pitch-degrees(dir_to_pitch(player_velocity)),player_vel_yaw - yaw,0)) -- sets eye height, and nametag color accordingly player:set_properties({collisionbox = {-0.312,0,-0.312,0.312,0.8,0.312}, eye_height = 0.5, nametag_color = { r = 225, b = 225, a = 225, g = 225 }}) -- control body bone when swimming @@ -270,7 +270,7 @@ minetest.register_globalstep(function(dtime) -- sets eye height, and nametag color accordingly player:set_properties({collisionbox = {-0.312,0,-0.312,0.312,1.8,0.312}, eye_height = 1.5, nametag_color = { r = 225, b = 225, a = 225, g = 225 }}) - player:set_bone_position("Head", vector.new(0,6.3,0), vector.new(pitch, player_vel_yaw - yaw, 0)) + player:set_bone_position("Head_Control", vector.new(0,6.3,0), vector.new(pitch, player_vel_yaw - yaw, 0)) player:set_bone_position("Body_Control", vector.new(0,6.3,0), vector.new(0, -player_vel_yaw + yaw, 0)) end