From d411cc2841c153d4854ff9bf714d3e5ef94e8380 Mon Sep 17 00:00:00 2001 From: Treer Date: Sat, 10 Sep 2022 13:38:26 +1000 Subject: [PATCH] Remove unnecessary compatibility code Implement PR feedback. KISS + YAGNI. 'default' is already a hard dependency of nether. If work is even done to decoupled it from 'default' then reimplementing is easy and it could all be in the same place with a shim or abstraction. --- README.md | 2 +- nodes.lua | 63 +++++++++++++++++++------------------------------------ 2 files changed, 22 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index f938389..3f20e49 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ the nether first, or basalt might be a crafting ingredient required to reach a particular branch of the tech-tree. Netherbrick tools are provided (pick, shovel, axe, & sword), see tools.lua -The Nether pickaxe has a 10x bonus again wear when mining netherrack. +The Nether pickaxe has a 10x bonus against wear when mining netherrack. ## License of source code: diff --git a/nodes.lua b/nodes.lua index 190eefe..ebef598 100644 --- a/nodes.lua +++ b/nodes.lua @@ -266,49 +266,28 @@ minetest.register_node("nether:brick_deep", { local fence_texture = "default_fence_overlay.png^nether_brick.png^default_fence_overlay.png^[makealpha:255,126,126" -if minetest.get_modpath("default") and minetest.global_exists("default") and default.register_fence ~= nil then - -- The Minetest_Game fences API is available, - -- using it adds interop between different fences, and the "Tall fences and walls" option. - default.register_fence("nether:fence_nether_brick", { - description = S("Nether Brick Fence"), - texture = "nether_brick.png", - inventory_image = fence_texture, - wield_image = fence_texture, - material = "nether:brick", - groups = {cracky = 2, level = 2}, - sounds = default.node_sound_stone_defaults() - }) +local rail_texture = + "default_fence_rail_overlay.png^nether_brick.png^default_fence_rail_overlay.png^[makealpha:255,126,126" - default.register_fence_rail("nether:fence_rail_nether_brick", { - description = S("Nether Brick Fence Rail"), - texture = "nether_brick.png", - inventory_image = "default_fence_rail_overlay.png^nether_brick.png^" .. - "default_fence_rail_overlay.png^[makealpha:255,126,126", - wield_image = "default_fence_rail_overlay.png^nether_brick.png^" .. - "default_fence_rail_overlay.png^[makealpha:255,126,126", - material = "nether:brick", - groups = {cracky = 2, level = 2}, - sounds = default.node_sound_stone_defaults() - }) -else - -- Original nether fence code, preserved to avoid deeper coupling with MTG - minetest.register_node("nether:fence_nether_brick", { - description = S("Nether Brick Fence"), - drawtype = "fencelike", - tiles = {"nether_brick.png"}, - inventory_image = fence_texture, - wield_image = fence_texture, - paramtype = "light", - 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 = {cracky = 2, level = 2}, - sounds = default.node_sound_stone_defaults(), - }) -end +default.register_fence("nether:fence_nether_brick", { + description = S("Nether Brick Fence"), + texture = "nether_brick.png", + inventory_image = fence_texture, + wield_image = fence_texture, + material = "nether:brick", + groups = {cracky = 2, level = 2}, + sounds = default.node_sound_stone_defaults() +}) + +default.register_fence_rail("nether:fence_rail_nether_brick", { + description = S("Nether Brick Fence Rail"), + texture = "nether_brick.png", + inventory_image = rail_texture, + wield_image = rail_texture, + material = "nether:brick", + groups = {cracky = 2, level = 2}, + sounds = default.node_sound_stone_defaults() +}) -- Register stair and slab