From b411b6f36f98d5b317d0dbfe09df045e224b1624 Mon Sep 17 00:00:00 2001 From: paramat Date: Mon, 13 Jul 2015 20:25:22 +0100 Subject: [PATCH] Minimal: Remove recently added unnecessary nodes Fix 'is ground content' for some nodes --- games/minimal/mods/default/init.lua | 112 +++--------------- games/minimal/mods/default/mapgen.lua | 9 +- .../mods/default/textures/default_ice.png | Bin 254 -> 0 bytes .../default/textures/default_jungleleaves.png | Bin 184 -> 0 bytes .../default/textures/default_jungletree.png | Bin 210 -> 0 bytes .../textures/default_jungletree_top.png | Bin 205 -> 0 bytes .../default/textures/default_pine_needles.png | Bin 203 -> 0 bytes .../default/textures/default_pinetree.png | Bin 280 -> 0 bytes .../default/textures/default_pinetree_top.png | Bin 574 -> 0 bytes .../mods/default/textures/default_snow.png | Bin 164 -> 0 bytes .../default/textures/default_snow_side.png | Bin 360 -> 0 bytes .../default/textures/default_snowball.png | Bin 183 -> 0 bytes 12 files changed, 15 insertions(+), 106 deletions(-) delete mode 100644 games/minimal/mods/default/textures/default_ice.png delete mode 100644 games/minimal/mods/default/textures/default_jungleleaves.png delete mode 100644 games/minimal/mods/default/textures/default_jungletree.png delete mode 100644 games/minimal/mods/default/textures/default_jungletree_top.png delete mode 100644 games/minimal/mods/default/textures/default_pine_needles.png delete mode 100644 games/minimal/mods/default/textures/default_pinetree.png delete mode 100644 games/minimal/mods/default/textures/default_pinetree_top.png delete mode 100644 games/minimal/mods/default/textures/default_snow.png delete mode 100644 games/minimal/mods/default/textures/default_snow_side.png delete mode 100644 games/minimal/mods/default/textures/default_snowball.png diff --git a/games/minimal/mods/default/init.lua b/games/minimal/mods/default/init.lua index 1adc8f457..dd3d7bbf6 100644 --- a/games/minimal/mods/default/init.lua +++ b/games/minimal/mods/default/init.lua @@ -474,12 +474,6 @@ minetest.register_craft({ recipe = "default:tree", }) -minetest.register_craft({ - type = "cooking", - output = "default:coal_lump", - recipe = "default:jungletree", -}) - minetest.register_craft({ type = "cooking", output = "default:stone", @@ -508,12 +502,6 @@ minetest.register_craft({ burntime = 30, }) -minetest.register_craft({ - type = "fuel", - recipe = "default:jungletree", - burntime = 30, -}) - minetest.register_craft({ type = "fuel", recipe = "default:junglegrass", @@ -796,6 +784,7 @@ minetest.register_node("default:clay", { minetest.register_node("default:brick", { description = "Brick", tiles ={"default_brick.png"}, + is_ground_content = false, groups = {cracky=3}, drop = 'default:clay_brick 4', sounds = default.node_sound_stone_defaults(), @@ -804,13 +793,7 @@ minetest.register_node("default:brick", { minetest.register_node("default:tree", { description = "Tree", tiles ={"default_tree_top.png", "default_tree_top.png", "default_tree.png"}, - groups = {snappy=2,choppy=2,oddly_breakable_by_hand=1}, - sounds = default.node_sound_wood_defaults(), -}) - -minetest.register_node("default:jungletree", { - description = "Jungle Tree", - tiles ={"default_jungletree_top.png", "default_jungletree_top.png", "default_jungletree.png"}, + is_ground_content = false, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=1}, sounds = default.node_sound_wood_defaults(), }) @@ -834,6 +817,7 @@ minetest.register_node("default:leaves", { visual_scale = 1.3, tiles ={"default_leaves.png"}, paramtype = "light", + is_ground_content = false, groups = {snappy=3}, drop = { max_items = 1, @@ -853,17 +837,6 @@ minetest.register_node("default:leaves", { sounds = default.node_sound_leaves_defaults(), }) -minetest.register_node("default:jungleleaves", { - description = "Jungle Leaves", - drawtype = "allfaces_optional", - waving = 1, - visual_scale = 1.3, - tiles = {"default_jungleleaves.png"}, - paramtype = "light", - groups = {snappy=3, leafdecay=3, flammable=2, leaves=1}, - sounds = default.node_sound_leaves_defaults(), -}) - minetest.register_node("default:cactus", { description = "Cactus", tiles ={"default_cactus_top.png", "default_cactus_top.png", "default_cactus_side.png"}, @@ -886,6 +859,7 @@ minetest.register_node("default:papyrus", { minetest.register_node("default:bookshelf", { description = "Bookshelf", tiles ={"default_wood.png", "default_wood.png", "default_bookshelf.png"}, + is_ground_content = false, groups = {snappy=2,choppy=3,oddly_breakable_by_hand=2}, sounds = default.node_sound_wood_defaults(), }) @@ -895,6 +869,7 @@ minetest.register_node("default:glass", { drawtype = "glasslike", tiles ={"default_glass.png"}, paramtype = "light", + is_ground_content = false, sunlight_propagates = true, groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3}, sounds = default.node_sound_glass_defaults(), @@ -907,6 +882,7 @@ minetest.register_node("default:fence_wood", { inventory_image = "default_fence.png", wield_image = "default_fence.png", paramtype = "light", + is_ground_content = false, selection_box = { type = "fixed", fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}, @@ -922,6 +898,7 @@ minetest.register_node("default:rail", { inventory_image = "default_rail.png", wield_image = "default_rail.png", paramtype = "light", + is_ground_content = false, walkable = false, selection_box = { type = "fixed", @@ -938,6 +915,7 @@ minetest.register_node("default:ladder", { wield_image = "default_ladder.png", paramtype = "light", paramtype2 = "wallmounted", + is_ground_content = false, walkable = false, climbable = true, selection_box = { @@ -954,6 +932,7 @@ minetest.register_node("default:ladder", { minetest.register_node("default:wood", { description = "Wood", tiles ={"default_wood.png"}, + is_ground_content = false, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2}, sounds = default.node_sound_wood_defaults(), }) @@ -968,6 +947,7 @@ minetest.register_node("default:mese", { minetest.register_node("default:cloud", { description = "Cloud", tiles ={"default_cloud.png"}, + is_ground_content = false, sounds = default.node_sound_defaults(), }) @@ -1452,6 +1432,7 @@ minetest.register_abm({ minetest.register_node("default:cobble", { description = "Cobble", tiles ={"default_cobble.png"}, + is_ground_content = false, groups = {cracky=3}, sounds = default.node_sound_stone_defaults(), }) @@ -1459,6 +1440,7 @@ minetest.register_node("default:cobble", { minetest.register_node("default:mossycobble", { description = "Mossy Cobble", tiles ={"default_mossycobble.png"}, + is_ground_content = false, groups = {cracky=3}, sounds = default.node_sound_stone_defaults(), }) @@ -1466,6 +1448,7 @@ minetest.register_node("default:mossycobble", { minetest.register_node("default:steelblock", { description = "Steel Block", tiles ={"default_steel_block.png"}, + is_ground_content = false, groups = {snappy=1,bendy=2}, sounds = default.node_sound_stone_defaults(), }) @@ -1511,6 +1494,7 @@ minetest.register_node("default:apple", { tiles ={"default_apple.png"}, inventory_image = "default_apple.png", paramtype = "light", + is_ground_content = false, sunlight_propagates = true, walkable = false, groups = {fleshy=3,dig_immediate=3}, @@ -1518,74 +1502,6 @@ minetest.register_node("default:apple", { sounds = default.node_sound_defaults(), }) -minetest.register_node("default:dirt_with_snow", { - description = "Dirt with Snow", - tiles = {"default_snow.png", "default_dirt.png", "default_dirt.png^default_snow_side.png"}, - groups = {crumbly=3,soil=1}, - drop = 'default:dirt', - sounds = default.node_sound_dirt_defaults(), -}) - -minetest.register_node("default:snow", { - description = "Snow", - tiles = {"default_snow.png"}, - inventory_image = "default_snowball.png", - wield_image = "default_snowball.png", - paramtype = "light", - buildable_to = true, - drawtype = "nodebox", - node_box = { - type = "fixed", - fixed = { - {-0.5, -0.5, -0.5, 0.5, -0.5+2/16, 0.5}, - }, - }, - groups = {crumbly=3,falling_node=1}, - sounds = default.node_sound_dirt_defaults(), - - on_construct = function(pos) - pos.y = pos.y - 1 - if minetest.get_node(pos).name == "default:dirt_with_grass" then - minetest.set_node(pos, {name="default:dirt_with_snow"}) - end - end, -}) - -minetest.register_node("default:snowblock", { - description = "Snow Block", - tiles = {"default_snow.png"}, - groups = {crumbly=3}, - sounds = default.node_sound_dirt_defaults(), -}) - -minetest.register_node("default:ice", { - description = "Ice", - tiles = {"default_ice.png"}, - is_ground_content = false, - paramtype = "light", - groups = {cracky=3}, - sounds = default.node_sound_glass_defaults(), -}) - -minetest.register_node("default:pinetree", { - description = "Pine Tree", - tiles = {"default_pinetree_top.png", "default_pinetree_top.png", "default_pinetree.png"}, - paramtype2 = "facedir", - groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2}, - sounds = default.node_sound_wood_defaults(), -}) - -minetest.register_node("default:pine_needles",{ - description = "Pine Needles", - drawtype = "allfaces_optional", - visual_scale = 1.3, - tiles = {"default_pine_needles.png"}, - waving = 1, - paramtype = "light", - groups = {snappy=3, leafdecay=3, flammable=2, leaves=1}, - sounds = default.node_sound_leaves_defaults(), -}) - -- -- Grow tree function -- diff --git a/games/minimal/mods/default/mapgen.lua b/games/minimal/mods/default/mapgen.lua index 7b0c7f467..2082d5983 100644 --- a/games/minimal/mods/default/mapgen.lua +++ b/games/minimal/mods/default/mapgen.lua @@ -10,19 +10,11 @@ minetest.register_alias("mapgen_sand", "default:sand") minetest.register_alias("mapgen_water_source", "default:water_source") minetest.register_alias("mapgen_lava_source", "default:lava_source") minetest.register_alias("mapgen_gravel", "default:gravel") -minetest.register_alias("mapgen_dirt_with_snow", "default:dirt_with_snow") -minetest.register_alias("mapgen_snowblock", "default:snowblock") -minetest.register_alias("mapgen_snow", "default:snow") -minetest.register_alias("mapgen_ice", "default:ice") minetest.register_alias("mapgen_tree", "default:tree") minetest.register_alias("mapgen_leaves", "default:leaves") minetest.register_alias("mapgen_apple", "default:apple") -minetest.register_alias("mapgen_jungletree", "default:jungletree") -minetest.register_alias("mapgen_jungleleaves", "default:jungleleaves") minetest.register_alias("mapgen_junglegrass", "default:junglegrass") -minetest.register_alias("mapgen_pinetree", "default:pinetree") -minetest.register_alias("mapgen_pine_needles", "default:pine_needles") minetest.register_alias("mapgen_cobble", "default:cobble") minetest.register_alias("mapgen_stair_cobble", "stairs:stair_cobble") @@ -106,6 +98,7 @@ minetest.register_ore({ minetest.clear_registered_biomes() +minetest.clear_registered_decorations() minetest.register_biome({ name = "default:grassland", diff --git a/games/minimal/mods/default/textures/default_ice.png b/games/minimal/mods/default/textures/default_ice.png deleted file mode 100644 index 2046eac6faf03dc0cf49e5af5919b3b6cc38c47e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 254 zcmV4DMB6 znH*{m``t{)7A{wfeS{mR(d#pd3R6>}8$B6_T_j^=u>JBLZMuTylhj5VSoM4Rx*P+d z7nxv>|)d8WH9MfLGw!qWWy4Yf8$RT4~nv0U;qFB07*qoM6N<$ Eg5#fXJpcdz diff --git a/games/minimal/mods/default/textures/default_jungleleaves.png b/games/minimal/mods/default/textures/default_jungleleaves.png deleted file mode 100644 index 870b4bb27e9debc742a57ecda1fa9857cbc56499..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 184 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!93?!50ihlx9JOMr-u0WbkkXuAfK+!q)500lxjSe4~&GV0EuRF^fi91s7HW+R&U7MJakP>s~fWr9+291g9c7EV( eoB6Cqo54Xs(tpMM)1p9I7(8A5T-G@yGywptnLhFW diff --git a/games/minimal/mods/default/textures/default_jungletree.png b/games/minimal/mods/default/textures/default_jungletree.png deleted file mode 100644 index a1fd36a51069c1a0a746d29a89fc36f8df6ab269..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!M1W6-E0ES#5!BZZkMz(eNw#Y) zaN9aN>FmDBzcop-fpVpuE{-7;w@lAF@*OeYaSF6yEc!2fe*3MomdKI;Vst E0Dv${2LJ#7 diff --git a/games/minimal/mods/default/textures/default_jungletree_top.png b/games/minimal/mods/default/textures/default_jungletree_top.png deleted file mode 100644 index a13fdae4abe96a586ad8ad3e3d69ddf4395c28c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Xn;?ME0ES#5!BZZFG;p*E^ymA zJL&Ac$~|{;tbr26o-U3d6}L?L8Tl9#IS#j3{QLjpwTgSwu3fHE&c}E@UARu?Y?Huu znU{+gW6Qqx?2tfHzanLk0)I6*WJfxBNVp zEaiBqhi%=eGSd?IGdsP{1^m2f!1;56h5YFcLL2sU*E&DXpKemHD(t7ri)y=;<1!by w&OBk~Fun4w{?J@ycIoSCPplZsE8@N}l|1G?_26RB9-yrZp00i_>zopr04>W$9{>OV diff --git a/games/minimal/mods/default/textures/default_pinetree.png b/games/minimal/mods/default/textures/default_pinetree.png deleted file mode 100644 index 4a5328ff385ebe307f299a8aeb7866da0713aa8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!aez;VtB;eVuZxw3t*Mi_UWliI ztEEA7pnIr~W1yR@qp41WpG$J2UqYx?Ot7cDv6h#Ed4Pv)?nWj%p!NlxE{-7*mt{|T zim@niuv}!B=@Rh1{+3?#?|7DFN}F;Pu8(Xn-B6lC~-{7CUZ0?hkzhXCjFmNxm`?5dh?T-ZyKQ|h`pEi5foD7>AhSILZ zHw)_)oIRTTT1djq!bLA)joJ>o4e3Uf*Qa_g)^2c)+!5o)YA?ZlJRs!75oTM(X`-If b9DgylSg_5@k7{TKx|PAx)z4*}Q$iB}eJx~| diff --git a/games/minimal/mods/default/textures/default_pinetree_top.png b/games/minimal/mods/default/textures/default_pinetree_top.png deleted file mode 100644 index 8705710ed825fcf7cbbf6edf0de6b5b5ddb8b4f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 574 zcmV-E0>S->P)DQSwTtT2tLMz6=gy+x#+={6nb@+5^5)F#+qv%B zvhUlk?Aov6%A(`Pn%=*d-Mf&~se!P7VDaS1@ZrSk*t6-=vgp#T>({I2(5vFepy9-u z;KG*Nyq4g>l-|9O)~C_+`^pY!IRjylGU}3+p~||xsKho zjL)r$)~$%erG?9BtagZNU$m zooDc#TuBKj7V@^OxwoLa`;s+^TDep$Xzm>-b2W*MN!}(k!n_oesUFj2IVx362UiB5 z%*<x5Jc_WaU3WZ z=IP=X!XcaN5t^8ia>6Ha#{|VAt`jCU9&~o-PLyJwurbGV6^C<&yOuO_^JHde=M}*> zOxXOEx3RJH3b=`}>9#QlvgrwSGO+PAibgr8_9*hmMJeepj>FVdQ I&MBb@0QoR5y#N3J diff --git a/games/minimal/mods/default/textures/default_snow_side.png b/games/minimal/mods/default/textures/default_snow_side.png deleted file mode 100644 index 3e98915131310783a3632d7622c61bdc0ca107b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 360 zcmV-u0hj)XP)M|AjkO|Lev+((u1ckg~msv8W%AZ_5A#t}!bA85tRS zLF_b;sX)vG#Eejy4GF6Ou>b@k0F*DnKn#EzfCG$zQ2+p#UIIeZnL}6r0000peCA)iIU?`2{mLJiCzwoU z!m4Ppc~TqWjKn2Zj3ix*wK6O8L>UZCV$xb0C3QDDT|UTjere`a1-9nUh@WX4-@arq d?`W)GWDx$!UF&1y7zH$p!PC{xWt~$(699CwN&^4@ -- 2.25.1