Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make homedecor game agnostic #28

Merged
merged 51 commits into from May 3, 2022
Merged
Show file tree
Hide file tree
Changes from 46 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
63439e1
initial progress
wsor4035 Apr 2, 2022
9cd3266
convert homedecor_fences
wsor4035 Apr 3, 2022
1ceb47c
add homedecor_foyer
wsor4035 Apr 3, 2022
7fb7756
take out the trash
wsor4035 Apr 3, 2022
10c80e0
add hd exterior
wsor4035 Apr 10, 2022
828cd4d
add hd electronics + hd exterior group fixes
wsor4035 Apr 11, 2022
2054a27
add hd electrical
wsor4035 Apr 11, 2022
72f1ba1
add hd doors and gates
wsor4035 Apr 11, 2022
8edce9a
add hd furniture medieval
wsor4035 Apr 11, 2022
3cbf8dc
add hd gastronomy
wsor4035 Apr 11, 2022
e3a6ed9
add hd inbox
wsor4035 Apr 11, 2022
f3d9fd1
add hd laundry
wsor4035 Apr 11, 2022
a2b5717
add hd office
wsor4035 Apr 11, 2022
4b39f40
add hd pictures and paintings
wsor4035 Apr 11, 2022
f49481d
add hd plasmascreen
wsor4035 Apr 11, 2022
ae429e9
add hd roofing
wsor4035 Apr 11, 2022
2c4d603
add hd wardrobe
wsor4035 Apr 12, 2022
7daf047
add fake fire
wsor4035 Apr 24, 2022
c62257c
add building blocks
wsor4035 Apr 24, 2022
de6ec69
fix fake fire
wsor4035 Apr 24, 2022
c843fca
add hd bathroom
wsor4035 Apr 24, 2022
8e4df16
add hd bedroom
wsor4035 Apr 24, 2022
5ef8f18
fix hd bathroom crafts
wsor4035 Apr 24, 2022
cab9df2
add hd furniture
wsor4035 Apr 24, 2022
0a1360e
add itemframe
wsor4035 Apr 24, 2022
a555532
add lavalamp
wsor4035 Apr 24, 2022
a8e4054
update hades revisted craft list
wsor4035 Apr 25, 2022
dd23d51
add hd lighting, as well as fix warnings
wsor4035 Apr 26, 2022
7c5b516
add hd kitchen
wsor4035 Apr 29, 2022
c546acb
add hd misc
wsor4035 Apr 29, 2022
6867564
bug fix
wsor4035 Apr 29, 2022
fdb7b55
handle multiple seats in sofas
wsor4035 May 1, 2022
78a5c57
add partial hd seating
wsor4035 May 1, 2022
6370ebe
add texture table
wsor4035 May 1, 2022
d8b9626
make code more readable per fluxionary
wsor4035 May 1, 2022
b423c62
finish adding hd seating
wsor4035 May 1, 2022
e128b43
add hd windows
wsor4035 May 1, 2022
7f1cf73
add github luacheck workflow and various luacheck fixes
wsor4035 May 1, 2022
2ee3969
fix folder name
wsor4035 May 1, 2022
6b10aca
fix luacheckrc issue
wsor4035 May 1, 2022
b327457
update mcl items
wsor4035 May 1, 2022
f589215
fix mcl wierdness
wsor4035 May 1, 2022
2f5effd
tweak
wsor4035 May 1, 2022
89f9037
add hd tables
wsor4035 May 1, 2022
10504fb
add update readme
wsor4035 May 1, 2022
c999979
nicify stuff per fluxionary
wsor4035 May 2, 2022
ee77cf7
add fluxionary scope creep
wsor4035 May 2, 2022
fc84785
add logging pr ssx suggestion
wsor4035 May 2, 2022
d5301e1
fix devtest breaking right to a name policy
wsor4035 May 2, 2022
2fb077e
fix potential crash
wsor4035 May 2, 2022
489998d
prevent malformed couches from crashing server
wsor4035 May 2, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions .github/workflows/luacheck.yml
@@ -0,0 +1,11 @@

name: luacheck
on: [push, pull_request]
jobs:
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: Roang-zero1/factorio-mod-luacheck@master
with:
luacheckrc_url: ""
42 changes: 42 additions & 0 deletions .luacheckrc
@@ -0,0 +1,42 @@
unused_args = false

globals = {
"homedecor",
"homedecor_lighting",
"homedecor_windows_and_treatments",
"homedecor_roofing",
"homedecor_misc",
"homedecor_exterior",
"homedecor_electrical",
"homedecor_cobweb",
"lavalamp",
"lrfurn",
"signs_lib",
"homedecor_doors_and_gates",

-- mod-deps
"armor"
}

read_globals = {
"minetest", "core",
"vector", "ItemStack",
"dump",

-- Stdlib
string = {fields = {"split", "trim"}},
table = {fields = {"copy", "getn"}},

-- mod-deps
"default",
"unifieddyes",
"player_api",
"screwdriver",
"hopper",
"mesecon",
"skins",
"stairsplus",
"creative",
"doors",
"i3",
}
8 changes: 0 additions & 8 deletions README

This file was deleted.

31 changes: 31 additions & 0 deletions README.md
@@ -0,0 +1,31 @@
# Minetest Homedecor Modpack

[![ContentDB](https://content.minetest.net/packages/VanessaE/homedecor_modpack/shields/downloads/)](https://content.minetest.net/packages/VanessaE/homedecor_modpack/)

A fairly feature-filled home decor modpack that is game agnostic.

## About

first class support for:

* Minetest Game
* Farlands Reloaded
* Hades
* Mineclone2, Mineclone5

## Links

* [Github](https://github.com/mt-mods/homedecor_modpack)
* [Contentdb](https://content.minetest.net/packages/VanessaE/homedecor_modpack/)
* [Forums](https://forum.minetest.net/viewtopic.php?f=11&t=2041)

# Setup

required:

* [Unifieddyes](https://github.com/mt-mods/unifieddyes)
* [Basic Materials](https://github.com/mt-mods/basic_materials)

optional:

* [Sound Api](https://github.com/mt-mods/sound_api) - note: needed for sound support
21 changes: 0 additions & 21 deletions building_blocks/.luacheckrc

This file was deleted.

6 changes: 4 additions & 2 deletions building_blocks/alias.lua
Expand Up @@ -40,8 +40,10 @@ if not minetest.get_modpath("technic") then
description = S("Granite"),
tiles = { "technic_granite.png" },
is_ground_content = true,
groups = {cracky=1},
sounds = default.node_sound_stone_defaults(),
groups = {cracky=1, dig_stone=2},
wsor4035 marked this conversation as resolved.
Show resolved Hide resolved
_sound_def = {
key = "node_sound_stone_defaults",
},
wsor4035 marked this conversation as resolved.
Show resolved Hide resolved
})
minetest.register_craft({
output = "technic:granite 9",
Expand Down
4 changes: 2 additions & 2 deletions building_blocks/mod.conf
@@ -1,3 +1,3 @@
name = building_blocks
depends = default
optional_depends = moreblocks, gloopblocks, stairs
depends = homedecor_common
optional_depends = moreblocks, gloopblocks, stairs, default
109 changes: 68 additions & 41 deletions building_blocks/node_stairs.lua
Expand Up @@ -21,8 +21,10 @@ building_blocks_stairs("building_blocks:grate", {
sunlight_propagates = true,
is_ground_content = true,
use_texture_alpha = "clip",
groups = {cracky=1},
sounds = default.node_sound_metal_defaults(),
groups = {cracky=1, dig_generic=3},
_sound_def = {
key = "node_sound_metal_defaults",
},
})
building_blocks_stairs("building_blocks:smoothglass", {
drawtype = "glasslike",
Expand All @@ -33,7 +35,9 @@ building_blocks_stairs("building_blocks:smoothglass", {
is_ground_content = true,
use_texture_alpha = "clip",
groups = {snappy=3,cracky=3,oddly_breakable_by_hand=3},
sounds = default.node_sound_glass_defaults(),
_sound_def = {
key = "node_sound_glass_defaults",
},
})
building_blocks_stairs("building_blocks:woodglass", {
drawtype = "glasslike",
Expand All @@ -44,52 +48,68 @@ building_blocks_stairs("building_blocks:woodglass", {
is_ground_content = true,
use_texture_alpha = "clip",
groups = {snappy=3,cracky=3,oddly_breakable_by_hand=3},
sounds = default.node_sound_glass_defaults(),
_sound_def = {
key = "node_sound_glass_defaults",
},
})

building_blocks_stairs("building_blocks:Adobe", {
tiles = {"building_blocks_Adobe.png"},
description = S("Adobe"),
is_ground_content = true,
groups = {crumbly=3},
sounds = default.node_sound_stone_defaults(),
groups = {crumbly=3, dig_stone=2},
_sound_def = {
key = "node_sound_stone_defaults",
},
})
local grasstex = {"[combine:16x16^[noalpha^[colorize:#006400"}
if minetest.get_modpath("default") then
grasstex = minetest.registered_nodes["default:dirt_with_grass"].tiles
end
building_blocks_stairs("building_blocks:fakegrass", {
tiles = {"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
tiles = grasstex,
description = S("Fake Grass"),
is_ground_content = true,
groups = {crumbly=3},
sounds = default.node_sound_dirt_defaults({
footstep = {name="default_grass_footstep", gain=0.4},
}),
groups = {crumbly=3, dig_sand=3},
_sound_def = {
key = "node_sound_dirt_defaults",
},
})
building_blocks_stairs("building_blocks:hardwood", {
tiles = {"building_blocks_hardwood.png"},
is_ground_content = true,
description = S("Hardwood"),
groups = {choppy=1,flammable=1},
sounds = default.node_sound_wood_defaults(),
groups = {choppy=1,flammable=1, dig_tree=1},
_sound_def = {
key = "node_sound_wood_defaults",
},
})
building_blocks_stairs("building_blocks:Roofing", {
tiles = {"building_blocks_Roofing.png"},
is_ground_content = true,
description = S("Roof block"),
groups = {snappy=3},
sounds = default.node_sound_stone_defaults(),
groups = {snappy=3, dig_generic=4},
_sound_def = {
key = "node_sound_stone_defaults",
},
})
building_blocks_stairs("building_blocks:Tar", {
description = S("Tar"),
tiles = {"building_blocks_tar.png"},
is_ground_content = true,
groups = {crumbly=1, tar_block = 1},
sounds = default.node_sound_stone_defaults(),
groups = {crumbly=1, tar_block = 1, dig_generic=4},
_sound_def = {
key = "node_sound_stone_defaults",
},
})
building_blocks_stairs("building_blocks:Marble", {
description = S("Marble"),
tiles = {"building_blocks_marble.png"},
is_ground_content = true,
groups = {cracky=3, marble = 1},
sounds = default.node_sound_stone_defaults(),
groups = {cracky=3, marble = 1, dig_stone=2},
_sound_def = {
key = "node_sound_stone_defaults",
},
})

minetest.register_node("building_blocks:brobble_spread", {
Expand All @@ -103,34 +123,37 @@ minetest.register_node("building_blocks:brobble_spread", {
walkable = false,
selection_box = {
type = "fixed",
-- but how to specify the dimensions for curved and sideways rails?
fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-- but how to specify the dimensions for curved and sideways rails?
fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
},
sunlight_propagates = true,
is_ground_content = true,
groups = {crumbly=3},
groups = {crumbly=3, dig_generic=4},
})

if not minetest.get_modpath("moreblocks") or not minetest.get_modpath("gloopblocks") then
local graveltex = "[combine:16x16^[noalpha^[colorize:#3a3b3c"
if minetest.get_modpath("default") then
graveltex = "default_gravel.png"
end
minetest.register_node("building_blocks:gravel_spread", {
drawtype = "raillike",
description = S("Gravel Spread"),
tiles = {"default_gravel.png"},
tiles = {graveltex},
inventory_image = "building_blocks_gravel_spread_inv.png",
paramtype = "light",
walkable = false,
selection_box = {
type = "fixed",
-- but how to specify the dimensions for curved and sideways rails?
fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-- but how to specify the dimensions for curved and sideways rails?
fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
},
sunlight_propagates = true,
is_ground_content = true,
groups = {crumbly=2},
sounds = default.node_sound_dirt_defaults({
footstep = {name="default_gravel_footstep", gain=0.5},
dug = {name="default_gravel_footstep", gain=1.0},
}),
groups = {crumbly=2, dig_generic=4},
_sound_def = {
key = "node_sound_dirt_defaults",
},
})
end

Expand All @@ -143,13 +166,15 @@ minetest.register_node("building_blocks:Tarmac_spread", {
walkable = false,
selection_box = {
type = "fixed",
-- but how to specify the dimensions for curved and sideways rails?
fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-- but how to specify the dimensions for curved and sideways rails?
fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
},
sunlight_propagates = true,
is_ground_content = true,
groups = {cracky=3},
sounds = default.node_sound_dirt_defaults(),
groups = {cracky=3, dig_generic=4},
_sound_def = {
key = "node_sound_dirt_defaults",
},
})
minetest.register_node("building_blocks:terrycloth_towel", {
drawtype = "raillike",
Expand All @@ -160,12 +185,12 @@ minetest.register_node("building_blocks:terrycloth_towel", {
walkable = false,
selection_box = {
type = "fixed",
-- but how to specify the dimensions for curved and sideways rails?
fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
-- but how to specify the dimensions for curved and sideways rails?
fixed = {-1/2, -1/2, -1/2, 1/2, -1/2+1/16, 1/2},
},
sunlight_propagates = true,
is_ground_content = true,
groups = {crumbly=3},
groups = {crumbly=3, dig_generic=4},
})

minetest.register_node("building_blocks:BWtile", {
Expand All @@ -188,7 +213,7 @@ minetest.register_node("building_blocks:BWtile", {
},
sunlight_propagates = true,
is_ground_content = true,
groups = {crumbly=3},
groups = {crumbly=3, dig_generic=4},
})

minetest.register_node("building_blocks:Fireplace", {
Expand All @@ -201,9 +226,11 @@ minetest.register_node("building_blocks:Fireplace", {
},
paramtype = "light",
paramtype2 = "facedir",
light_source = default.LIGHT_MAX,
light_source = minetest.LIGHT_MAX,
sunlight_propagates = true,
is_ground_content = true,
groups = {cracky=2},
sounds = default.node_sound_stone_defaults(),
groups = {cracky=2, dig_generic=4},
_sound_def = {
key = "node_sound_stone_defaults",
},
})