diff --git a/mods/default/functions.lua b/mods/default/functions.lua index a85009bf..29506c40 100644 --- a/mods/default/functions.lua +++ b/mods/default/functions.lua @@ -213,27 +213,16 @@ function default.register_fence(name, def) -- Allow almost everything to be overridden local default_fields = { paramtype = "light", - drawtype = "nodebox", - node_box = { - type = "connected", - fixed = {{-1/8, -1/2, -1/8, 1/8, 1/2, 1/8}}, - -- connect_top = - -- connect_bottom = - connect_front = {{-1/16,3/16,-1/2,1/16,5/16,-1/8}, - {-1/16,-5/16,-1/2,1/16,-3/16,-1/8}}, - connect_left = {{-1/2,3/16,-1/16,-1/8,5/16,1/16}, - {-1/2,-5/16,-1/16,-1/8,-3/16,1/16}}, - connect_back = {{-1/16,3/16,1/8,1/16,5/16,1/2}, - {-1/16,-5/16,1/8,1/16,-3/16,1/2}}, - connect_right = {{1/8,3/16,-1/16,1/2,5/16,1/16}, - {1/8,-5/16,-1/16,1/2,-3/16,1/16}}, - }, - connects_to = {"group:fence", "group:wood", "group:tree"}, + drawtype = "fencelike", inventory_image = fence_texture, wield_image = fence_texture, - tiles = {def.texture}, + tiles = { def.texture }, sunlight_propagates = true, is_ground_content = false, + selection_box = { + type = "fixed", + fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}, + }, groups = {}, } for k, v in pairs(default_fields) do diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index a7fd43fa..50c33cd6 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -1716,7 +1716,7 @@ minetest.register_node("default:ladder_steel", { default.register_fence("default:fence_wood", { description = "Wooden Fence", - texture = "default_fence_wood.png", + texture = "default_wood.png", material = "default:wood", groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, sounds = default.node_sound_wood_defaults() @@ -1724,7 +1724,7 @@ default.register_fence("default:fence_wood", { default.register_fence("default:fence_acacia_wood", { description = "Acacia Fence", - texture = "default_fence_acacia_wood.png", + texture = "default_acacia_wood.png", material = "default:acacia_wood", groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, sounds = default.node_sound_wood_defaults() @@ -1732,7 +1732,7 @@ default.register_fence("default:fence_acacia_wood", { default.register_fence("default:fence_junglewood", { description = "Junglewood Fence", - texture = "default_fence_junglewood.png", + texture = "default_junglewood.png", material = "default:junglewood", groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, sounds = default.node_sound_wood_defaults() @@ -1740,7 +1740,7 @@ default.register_fence("default:fence_junglewood", { default.register_fence("default:fence_pine_wood", { description = "Pine Fence", - texture = "default_fence_pine_wood.png", + texture = "default_pine_wood.png", material = "default:pine_wood", groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, sounds = default.node_sound_wood_defaults() @@ -1748,7 +1748,7 @@ default.register_fence("default:fence_pine_wood", { default.register_fence("default:fence_aspen_wood", { description = "Aspen Fence", - texture = "default_fence_aspen_wood.png", + texture = "default_aspen_wood.png", material = "default:aspen_wood", groups = {choppy = 2, oddly_breakable_by_hand = 2, flammable = 2}, sounds = default.node_sound_wood_defaults() diff --git a/mods/default/textures/default_fence_acacia_wood.png b/mods/default/textures/default_fence_acacia_wood.png deleted file mode 100644 index 3b973f34..00000000 Binary files a/mods/default/textures/default_fence_acacia_wood.png and /dev/null differ diff --git a/mods/default/textures/default_fence_aspen_wood.png b/mods/default/textures/default_fence_aspen_wood.png deleted file mode 100644 index 7fb624dc..00000000 Binary files a/mods/default/textures/default_fence_aspen_wood.png and /dev/null differ diff --git a/mods/default/textures/default_fence_junglewood.png b/mods/default/textures/default_fence_junglewood.png deleted file mode 100644 index c390941c..00000000 Binary files a/mods/default/textures/default_fence_junglewood.png and /dev/null differ diff --git a/mods/default/textures/default_fence_pine_wood.png b/mods/default/textures/default_fence_pine_wood.png deleted file mode 100644 index 74609d99..00000000 Binary files a/mods/default/textures/default_fence_pine_wood.png and /dev/null differ diff --git a/mods/default/textures/default_fence_wood.png b/mods/default/textures/default_fence_wood.png deleted file mode 100644 index 1e76430d..00000000 Binary files a/mods/default/textures/default_fence_wood.png and /dev/null differ