From 9cddc3ecd6a4e4ae56ebcfe299060f1a2d913e73 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Fri, 27 Mar 2020 01:30:44 +0100 Subject: [PATCH] Move 3D papyrus to default --- mods/3dforniture/nodes.lua | 84 --------------------- mods/default/plants.lua | 41 ++++++++-- .../textures/default_papyrus_3d.png} | Bin .../textures/default_papyrus_3d_s1.png} | Bin .../textures/default_papyrus_3d_s2.png} | Bin 5 files changed, 35 insertions(+), 90 deletions(-) rename mods/{3dforniture/textures/forniture_papyrus.png => default/textures/default_papyrus_3d.png} (100%) rename mods/{3dforniture/textures/forniture_papyrus_s1.png => default/textures/default_papyrus_3d_s1.png} (100%) rename mods/{3dforniture/textures/forniture_papyrus_s2.png => default/textures/default_papyrus_3d_s2.png} (100%) diff --git a/mods/3dforniture/nodes.lua b/mods/3dforniture/nodes.lua index f4db73c..43fda04 100644 --- a/mods/3dforniture/nodes.lua +++ b/mods/3dforniture/nodes.lua @@ -32,90 +32,6 @@ ]]-- --- replacement - - --Papyrus - minetest.register_node(":default:papyrus", - {description = "Papyrus", - drawtype = "nodebox", - tiles ={ - "forniture_papyrus.png", - "forniture_papyrus.png", - "forniture_papyrus_s1.png", - "forniture_papyrus_s1.png", - "forniture_papyrus_s2.png", - "forniture_papyrus_s2.png", - }, - inventory_image = "default_papyrus.png", - wield_image ="default_papyrus.png", - paramtype = "light", - is_ground_content = true, - walkable = false, - selection_box = { - type = "fixed", - fixed = {-0.4375, -0.5, -0.4375, 0.4375, 0.5, 0.4375} - }, - node_box = { - type = "fixed", - fixed = { - --papyrus 1 - {-0.03-0.1,-0.5,-0.03-0.1, 0.03-0.1,0.5,0.03-0.1}, - {-0.06-0.1,-0.02-0.1,-0.06-0.1, 0.06-0.1,0.02-0.1,0.06-0.1}, - --papyrus 2 - {-0.03-0.4,-0.5,-0.03-0.3, 0.03-0.4,0.5,0.03-0.3}, - {-0.06-0.4,-0.02-0.2,-0.06-0.3, 0.06-0.4,0.02-0.2,0.06-0.3}, - --papyrus 3 - {-0.03+0.4,-0.5,-0.03-0.3,0.03+0.4,0.5,0.03-0.3}, - {-0.06+0.4,-0.02+0.2,-0.06-0.3, 0.06+0.4,0.02+0.2,0.06-0.3}, - --papyrus 4 - {-0.03-0.4,-0.5,-0.03+0.4, 0.03-0.4,0.5,0.03+0.4}, - {-0.06-0.4,0.02+0.4,-0.06+0.4, 0.06-0.4,0.02+0.4,0.06+0.4}, - --papyrus 5 - {-0.03-0.2,-0.5,-0.03+0.2, 0.03-0.2,0.5,0.03+0.2}, - {-0.06-0.2,0.02-0.4,-0.06+0.2, 0.06-0.2,0.02-0.4,0.06+0.2}, - --papyrus 6 - {-0.03+0.1,-0.5,-0.03+0.2, 0.03+0.1,0.5,0.03+0.2}, - {-0.06+0.1,0.02+0.3,-0.06+0.2, 0.06+0.1,0.02+0.3,0.06+0.2}, - }, - }, - groups = {snappy = 3,flammable = 2}, - sounds = default.node_sound_leaves_defaults(), - - after_dig_node = function(pos, node, metadata, digger) - default.dig_up(pos, node, digger) - end, - }) - - --Tree - minetest.register_node(":default:tree", - {description = "Common Tree Trunk", - paramtype = "light", - tiles = {"default_tree_top.png", "default_tree_top.png", "default_tree.png"}, - is_ground_content = true, - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-0.35,-0.5,-0.4,0.35,0.5,0.4}, - {-0.4,-0.5,-0.35, 0.4,0.5,0.35}, - {-0.25,-0.5,-0.45,0.25,0.5,0.45}, - {-0.45,-0.5,-0.25, 0.45,0.5,0.25}, - {-0.15,-0.5,-0.5,0.15,0.5,0.5}, - {-0.5,-0.5,-0.15, 0.5,0.5,0.15}, - }, - }, - groups = { - tree = 1, - snappy = 1, - choppy = 2, - oddly_breakable_by_hand = 1, - flammable = 2 - }, - sounds = default.node_sound_wood_defaults(), - }) - - --nodes - -- Deco Home --Table diff --git a/mods/default/plants.lua b/mods/default/plants.lua index 30c01b1..451728c 100644 --- a/mods/default/plants.lua +++ b/mods/default/plants.lua @@ -173,21 +173,50 @@ minetest.register_node("default:glowing_cactus_block", { sounds = default.node_sound_wood_defaults(), }) - minetest.register_node("default:papyrus", { description = "Papyrus", - drawtype = "plantlike", - tiles = {"default_papyrus.png"}, + drawtype = "nodebox", + tiles = { + "default_papyrus_3d.png", + "default_papyrus_3d.png", + "default_papyrus_3d_s1.png", + "default_papyrus_3d_s1.png", + "default_papyrus_3d_s2.png", + "default_papyrus_3d_s2.png", + }, inventory_image = "default_papyrus.png", wield_image = "default_papyrus.png", paramtype = "light", - walkable = false, is_ground_content = true, + walkable = false, selection_box = { + type = "fixed", + fixed = {-0.4375, -0.5, -0.4375, 0.4375, 0.5, 0.4375} + }, + node_box = { type = "fixed", - fixed = {-0.3, -0.5, -0.3, 0.3, 0.5, 0.3} + fixed = { + --papyrus 1 + {-0.03-0.1,-0.5,-0.03-0.1, 0.03-0.1,0.5,0.03-0.1}, + {-0.06-0.1,-0.02-0.1,-0.06-0.1, 0.06-0.1,0.02-0.1,0.06-0.1}, + --papyrus 2 + {-0.03-0.4,-0.5,-0.03-0.3, 0.03-0.4,0.5,0.03-0.3}, + {-0.06-0.4,-0.02-0.2,-0.06-0.3, 0.06-0.4,0.02-0.2,0.06-0.3}, + --papyrus 3 + {-0.03+0.4,-0.5,-0.03-0.3,0.03+0.4,0.5,0.03-0.3}, + {-0.06+0.4,-0.02+0.2,-0.06-0.3, 0.06+0.4,0.02+0.2,0.06-0.3}, + --papyrus 4 + {-0.03-0.4,-0.5,-0.03+0.4, 0.03-0.4,0.5,0.03+0.4}, + {-0.06-0.4,0.02+0.4,-0.06+0.4, 0.06-0.4,0.02+0.4,0.06+0.4}, + --papyrus 5 + {-0.03-0.2,-0.5,-0.03+0.2, 0.03-0.2,0.5,0.03+0.2}, + {-0.06-0.2,0.02-0.4,-0.06+0.2, 0.06-0.2,0.02-0.4,0.06+0.2}, + --papyrus 6 + {-0.03+0.1,-0.5,-0.03+0.2, 0.03+0.1,0.5,0.03+0.2}, + {-0.06+0.1,0.02+0.3,-0.06+0.2, 0.06+0.1,0.02+0.3,0.06+0.2}, + }, }, - groups = {snappy=3,flammable=2}, + groups = {snappy = 3,flammable = 2}, sounds = default.node_sound_leaves_defaults(), after_dig_node = function(pos, node, metadata, digger) diff --git a/mods/3dforniture/textures/forniture_papyrus.png b/mods/default/textures/default_papyrus_3d.png similarity index 100% rename from mods/3dforniture/textures/forniture_papyrus.png rename to mods/default/textures/default_papyrus_3d.png diff --git a/mods/3dforniture/textures/forniture_papyrus_s1.png b/mods/default/textures/default_papyrus_3d_s1.png similarity index 100% rename from mods/3dforniture/textures/forniture_papyrus_s1.png rename to mods/default/textures/default_papyrus_3d_s1.png diff --git a/mods/3dforniture/textures/forniture_papyrus_s2.png b/mods/default/textures/default_papyrus_3d_s2.png similarity index 100% rename from mods/3dforniture/textures/forniture_papyrus_s2.png rename to mods/default/textures/default_papyrus_3d_s2.png -- 2.11.4.GIT