Skip to content

Commit dfa43d6

Browse files
TurkeyMcMacTurkeyMcMac
authored
Make modpack mostly independent from MTG (#607)
1 parent f4070d3 commit dfa43d6

File tree

67 files changed

+285
-187
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+285
-187
lines changed

‎LICENSE.txt

+6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
The LGPLv3 applies to all code in this project.
22
The CC-BY-SA-3.0 license applies to textures and any other content in this project which is not source code.
33

4+
The file mesecons_detector/textures/mesecons_detector_side.png is an unmodified copy of
5+
"default_steel_block.png" by Jean-Patrick Guerrero <https://github.com/kilbith>, which can be found at
6+
<https://github.com/minetest/minetest_game/blob/9528c0f8b93d6934930e99c3c116df275fb0e4bc/mods/default/textures/default_steel_block.png>.
7+
"default_steel_block.png" is licensed under a CC BY-SA 3.0 license. This license can be found later in this document, and can also be found at
8+
<https://creativecommons.org/licenses/by-sa/3.0/>. The artwork is reportedly copyright (C) 2010-2018 kilbith.
9+
410
=================================================================
511

612
GNU LESSER GENERAL PUBLIC LICENSE

‎mesecons_blinkyplant/init.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ mesecon.register_node("mesecons_blinkyplant:blinky_plant", {
2626
paramtype = "light",
2727
is_ground_content = false,
2828
walkable = false,
29-
sounds = default.node_sound_leaves_defaults(),
29+
sounds = mesecon.node_sound.leaves,
3030
selection_box = {
3131
type = "fixed",
3232
fixed = {-0.3, -0.5, -0.3, 0.3, -0.5+0.7, 0.3},

‎mesecons_blinkyplant/mod.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
name = mesecons_blinkyplant
2-
depends = default, mesecons
2+
depends = mesecons, mesecons_gamecompat

‎mesecons_button/init.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ minetest.register_node("mesecons_button:button_off", {
5252
minetest.sound_play("mesecons_button_push", { pos = pos }, true)
5353
minetest.get_node_timer(pos):start(1)
5454
end,
55-
sounds = default.node_sound_stone_defaults(),
55+
sounds = mesecon.node_sound.stone,
5656
mesecons = {receptor = {
5757
state = mesecon.state.off,
5858
rules = mesecon.rules.buttonlike_get
@@ -93,7 +93,7 @@ minetest.register_node("mesecons_button:button_on", {
9393
groups = {dig_immediate=2, not_in_creative_inventory=1, mesecon_needs_receiver = 1},
9494
drop = 'mesecons_button:button_off',
9595
description = "Button",
96-
sounds = default.node_sound_stone_defaults(),
96+
sounds = mesecon.node_sound.stone,
9797
mesecons = {receptor = {
9898
state = mesecon.state.on,
9999
rules = mesecon.rules.buttonlike_get
@@ -105,6 +105,6 @@ minetest.register_node("mesecons_button:button_on", {
105105
minetest.register_craft({
106106
output = "mesecons_button:button_off 2",
107107
recipe = {
108-
{"group:mesecon_conductor_craftable","default:stone"},
108+
{"group:mesecon_conductor_craftable","mesecons_gamecompat:stone"},
109109
}
110110
})

‎mesecons_button/mod.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
name = mesecons_button
2-
depends = default, mesecons, mesecons_receiver
2+
depends = mesecons, mesecons_gamecompat, mesecons_receiver

‎mesecons_commandblock/init.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ minetest.register_node("mesecons_commandblock:commandblock_off", {
189189
after_place_node = after_place,
190190
on_receive_fields = receive_fields,
191191
can_dig = can_dig,
192-
sounds = default.node_sound_stone_defaults(),
192+
sounds = mesecon.node_sound.stone,
193193
mesecons = {effector = {
194194
action_on = commandblock_action_on
195195
}},
@@ -206,7 +206,7 @@ minetest.register_node("mesecons_commandblock:commandblock_on", {
206206
after_place_node = after_place,
207207
on_receive_fields = receive_fields,
208208
can_dig = can_dig,
209-
sounds = default.node_sound_stone_defaults(),
209+
sounds = mesecon.node_sound.stone,
210210
mesecons = {effector = {
211211
action_off = commandblock_action_off
212212
}},

‎mesecons_commandblock/mod.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
name = mesecons_commandblock
2-
depends = default, mesecons
2+
depends = mesecons, mesecons_gamecompat

‎mesecons_delayer/init.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ local def = {
6969
sunlight_propagates = true,
7070
is_ground_content = false,
7171
delayer_time = delaytime[i],
72-
sounds = default.node_sound_stone_defaults(),
72+
sounds = mesecon.node_sound.stone,
7373
on_blast = mesecon.on_blastnode,
7474
drop = "mesecons_delayer:delayer_off_1",
7575
}
@@ -169,6 +169,6 @@ minetest.register_craft({
169169
output = "mesecons_delayer:delayer_off_1",
170170
recipe = {
171171
{"mesecons_torch:mesecon_torch_on", "group:mesecon_conductor_craftable", "mesecons_torch:mesecon_torch_on"},
172-
{"default:cobble","default:cobble", "default:cobble"},
172+
{"mesecons_gamecompat:cobble","mesecons_gamecompat:cobble", "mesecons_gamecompat:cobble"},
173173
}
174174
})

‎mesecons_delayer/mod.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
name = mesecons_delayer
2-
depends = default, mesecons
2+
depends = mesecons, mesecons_gamecompat

‎mesecons_detector/init.lua

+22-20
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
local side_texture = mesecon.texture.steel_block or "mesecons_detector_side.png"
2+
13
local GET_COMMAND = "GET"
24

35
-- Object detector
@@ -64,7 +66,7 @@ local object_detector_digiline = {
6466
}
6567

6668
minetest.register_node("mesecons_detector:object_detector_off", {
67-
tiles = {"default_steel_block.png", "default_steel_block.png", "jeija_object_detector_off.png", "jeija_object_detector_off.png", "jeija_object_detector_off.png", "jeija_object_detector_off.png"},
69+
tiles = {side_texture, side_texture, "jeija_object_detector_off.png", "jeija_object_detector_off.png", "jeija_object_detector_off.png", "jeija_object_detector_off.png"},
6870
paramtype = "light",
6971
is_ground_content = false,
7072
walkable = true,
@@ -76,13 +78,13 @@ minetest.register_node("mesecons_detector:object_detector_off", {
7678
}},
7779
on_construct = object_detector_make_formspec,
7880
on_receive_fields = object_detector_on_receive_fields,
79-
sounds = default.node_sound_stone_defaults(),
81+
sounds = mesecon.node_sound.stone,
8082
digiline = object_detector_digiline,
8183
on_blast = mesecon.on_blastnode,
8284
})
8385

8486
minetest.register_node("mesecons_detector:object_detector_on", {
85-
tiles = {"default_steel_block.png", "default_steel_block.png", "jeija_object_detector_on.png", "jeija_object_detector_on.png", "jeija_object_detector_on.png", "jeija_object_detector_on.png"},
87+
tiles = {side_texture, side_texture, "jeija_object_detector_on.png", "jeija_object_detector_on.png", "jeija_object_detector_on.png", "jeija_object_detector_on.png"},
8688
paramtype = "light",
8789
is_ground_content = false,
8890
walkable = true,
@@ -94,26 +96,26 @@ minetest.register_node("mesecons_detector:object_detector_on", {
9496
}},
9597
on_construct = object_detector_make_formspec,
9698
on_receive_fields = object_detector_on_receive_fields,
97-
sounds = default.node_sound_stone_defaults(),
99+
sounds = mesecon.node_sound.stone,
98100
digiline = object_detector_digiline,
99101
on_blast = mesecon.on_blastnode,
100102
})
101103

102104
minetest.register_craft({
103105
output = 'mesecons_detector:object_detector_off',
104106
recipe = {
105-
{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
106-
{"default:steel_ingot", "mesecons_luacontroller:luacontroller0000", "default:steel_ingot"},
107-
{"default:steel_ingot", "group:mesecon_conductor_craftable", "default:steel_ingot"},
107+
{"mesecons_gamecompat:steel_ingot", "mesecons_gamecompat:steel_ingot", "mesecons_gamecompat:steel_ingot"},
108+
{"mesecons_gamecompat:steel_ingot", "mesecons_luacontroller:luacontroller0000", "mesecons_gamecompat:steel_ingot"},
109+
{"mesecons_gamecompat:steel_ingot", "group:mesecon_conductor_craftable", "mesecons_gamecompat:steel_ingot"},
108110
}
109111
})
110112

111113
minetest.register_craft({
112114
output = 'mesecons_detector:object_detector_off',
113115
recipe = {
114-
{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
115-
{"default:steel_ingot", "mesecons_microcontroller:microcontroller0000", "default:steel_ingot"},
116-
{"default:steel_ingot", "group:mesecon_conductor_craftable", "default:steel_ingot"},
116+
{"mesecons_gamecompat:steel_ingot", "mesecons_gamecompat:steel_ingot", "mesecons_gamecompat:steel_ingot"},
117+
{"mesecons_gamecompat:steel_ingot", "mesecons_microcontroller:microcontroller0000", "mesecons_gamecompat:steel_ingot"},
118+
{"mesecons_gamecompat:steel_ingot", "group:mesecon_conductor_craftable", "mesecons_gamecompat:steel_ingot"},
117119
}
118120
})
119121

@@ -239,7 +241,7 @@ local node_detector_digiline = {
239241
}
240242

241243
minetest.register_node("mesecons_detector:node_detector_off", {
242-
tiles = {"default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "jeija_node_detector_off.png"},
244+
tiles = {side_texture, side_texture, side_texture, side_texture, side_texture, "jeija_node_detector_off.png"},
243245
paramtype = "light",
244246
paramtype2 = "facedir",
245247
is_ground_content = false,
@@ -251,13 +253,13 @@ minetest.register_node("mesecons_detector:node_detector_off", {
251253
}},
252254
on_construct = node_detector_make_formspec,
253255
on_receive_fields = node_detector_on_receive_fields,
254-
sounds = default.node_sound_stone_defaults(),
256+
sounds = mesecon.node_sound.stone,
255257
digiline = node_detector_digiline,
256258
on_blast = mesecon.on_blastnode,
257259
})
258260

259261
minetest.register_node("mesecons_detector:node_detector_on", {
260-
tiles = {"default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "jeija_node_detector_on.png"},
262+
tiles = {side_texture, side_texture, side_texture, side_texture, side_texture, "jeija_node_detector_on.png"},
261263
paramtype = "light",
262264
paramtype2 = "facedir",
263265
is_ground_content = false,
@@ -269,26 +271,26 @@ minetest.register_node("mesecons_detector:node_detector_on", {
269271
}},
270272
on_construct = node_detector_make_formspec,
271273
on_receive_fields = node_detector_on_receive_fields,
272-
sounds = default.node_sound_stone_defaults(),
274+
sounds = mesecon.node_sound.stone,
273275
digiline = node_detector_digiline,
274276
on_blast = mesecon.on_blastnode,
275277
})
276278

277279
minetest.register_craft({
278280
output = 'mesecons_detector:node_detector_off',
279281
recipe = {
280-
{"default:steel_ingot", "group:mesecon_conductor_craftable", "default:steel_ingot"},
281-
{"default:steel_ingot", "mesecons_luacontroller:luacontroller0000", "default:steel_ingot"},
282-
{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
282+
{"mesecons_gamecompat:steel_ingot", "group:mesecon_conductor_craftable", "mesecons_gamecompat:steel_ingot"},
283+
{"mesecons_gamecompat:steel_ingot", "mesecons_luacontroller:luacontroller0000", "mesecons_gamecompat:steel_ingot"},
284+
{"mesecons_gamecompat:steel_ingot", "mesecons_gamecompat:steel_ingot", "mesecons_gamecompat:steel_ingot"},
283285
}
284286
})
285287

286288
minetest.register_craft({
287289
output = 'mesecons_detector:node_detector_off',
288290
recipe = {
289-
{"default:steel_ingot", "group:mesecon_conductor_craftable", "default:steel_ingot"},
290-
{"default:steel_ingot", "mesecons_microcontroller:microcontroller0000", "default:steel_ingot"},
291-
{"default:steel_ingot", "default:steel_ingot", "default:steel_ingot"},
291+
{"mesecons_gamecompat:steel_ingot", "group:mesecon_conductor_craftable", "mesecons_gamecompat:steel_ingot"},
292+
{"mesecons_gamecompat:steel_ingot", "mesecons_microcontroller:microcontroller0000", "mesecons_gamecompat:steel_ingot"},
293+
{"mesecons_gamecompat:steel_ingot", "mesecons_gamecompat:steel_ingot", "mesecons_gamecompat:steel_ingot"},
292294
}
293295
})
294296

‎mesecons_detector/mod.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
name = mesecons_detector
2-
depends = default, mesecons, mesecons_materials
2+
depends = mesecons, mesecons_gamecompat, mesecons_materials

‎mesecons_detector/textures/mesecons_detector_side.png

350 Bytes
Loading

‎mesecons_extrawires/corner.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ minetest.register_node("mesecons_extrawires:corner_on", {
3232
selection_box = corner_selectionbox,
3333
groups = {dig_immediate = 3, not_in_creative_inventory = 1},
3434
drop = "mesecons_extrawires:corner_off",
35-
sounds = default.node_sound_defaults(),
35+
sounds = mesecon.node_sound.default,
3636
mesecons = {conductor =
3737
{
3838
state = mesecon.state.on,
@@ -58,7 +58,7 @@ minetest.register_node("mesecons_extrawires:corner_off", {
5858
sunlight_propagates = true,
5959
selection_box = corner_selectionbox,
6060
groups = {dig_immediate = 3},
61-
sounds = default.node_sound_defaults(),
61+
sounds = mesecon.node_sound.default,
6262
mesecons = {conductor =
6363
{
6464
state = mesecon.state.off,

‎mesecons_extrawires/crossover.lua

+4-4
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ minetest.register_node("mesecons_extrawires:crossover_off", {
3232
stack_max = 99,
3333
selection_box = {type="fixed", fixed={-16/32, -16/32, -16/32, 16/32, -5/32, 16/32}},
3434
groups = {dig_immediate=3, mesecon=3},
35-
sounds = default.node_sound_defaults(),
35+
sounds = mesecon.node_sound.default,
3636
mesecons = {
3737
conductor = {
3838
states = crossover_states,
@@ -59,7 +59,7 @@ minetest.register_node("mesecons_extrawires:crossover_01", {
5959
stack_max = 99,
6060
selection_box = {type="fixed", fixed={-16/32, -16/32, -16/32, 16/32, -5/32, 16/32}},
6161
groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1},
62-
sounds = default.node_sound_defaults(),
62+
sounds = mesecon.node_sound.default,
6363
mesecons = {
6464
conductor = {
6565
states = crossover_states,
@@ -86,7 +86,7 @@ minetest.register_node("mesecons_extrawires:crossover_10", {
8686
stack_max = 99,
8787
selection_box = {type="fixed", fixed={-16/32, -16/32, -16/32, 16/32, -5/32, 16/32}},
8888
groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1},
89-
sounds = default.node_sound_defaults(),
89+
sounds = mesecon.node_sound.default,
9090
mesecons = {
9191
conductor = {
9292
states = crossover_states,
@@ -113,7 +113,7 @@ minetest.register_node("mesecons_extrawires:crossover_on", {
113113
stack_max = 99,
114114
selection_box = {type="fixed", fixed={-16/32, -16/32, -16/32, 16/32, -5/32, 16/32}},
115115
groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1},
116-
sounds = default.node_sound_defaults(),
116+
sounds = mesecon.node_sound.default,
117117
mesecons = {
118118
conductor = {
119119
states = crossover_states,

‎mesecons_extrawires/doublecorner.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ for k, state in ipairs(doublecorner_states) do
6161
selection_box = doublecorner_selectionbox,
6262
groups = groups,
6363
drop = doublecorner_states[1],
64-
sounds = default.node_sound_defaults(),
64+
sounds = mesecon.node_sound.default,
6565
mesecons = {
6666
conductor = {
6767
states = doublecorner_states,

‎mesecons_extrawires/mesewire.lua

+25-6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
local mese_nodename = minetest.registered_aliases["mesecons_gamecompat:mese"]
2+
if mese_nodename then
3+
-- Convert placeholders.
4+
minetest.register_alias("mesecons_extrawires:mese", mese_nodename)
5+
else
6+
-- Register placeholder.
7+
mese_nodename = "mesecons_extrawires:mese"
8+
minetest.register_node("mesecons_extrawires:mese", {
9+
description = "Mese Wire",
10+
tiles = {"mesecons_wire_off.png"},
11+
paramtype = "light",
12+
light_source = 3,
13+
groups = {cracky = 1},
14+
sounds = mesecon.node_sound.stone,
15+
})
16+
end
17+
118
local mesewire_rules =
219
{
320
{x = 1, y = 0, z = 0},
@@ -8,7 +25,7 @@ local mesewire_rules =
825
{x = 0, y = 0, z =-1},
926
}
1027

11-
minetest.override_item("default:mese", {
28+
minetest.override_item(mese_nodename, {
1229
mesecons = {conductor = {
1330
state = mesecon.state.off,
1431
onstate = "mesecons_extrawires:mese_powered",
@@ -18,15 +35,17 @@ minetest.override_item("default:mese", {
1835

1936
-- Copy node definition of powered mese from normal mese
2037
-- and brighten texture tiles to indicate mese is powered
21-
local powered_def = mesecon.merge_tables(minetest.registered_nodes["default:mese"], {
22-
drop = "default:mese",
23-
light_source = 5,
38+
local unpowered_def = minetest.registered_nodes[mese_nodename]
39+
local powered_def = mesecon.merge_tables(unpowered_def, {
40+
drop = mese_nodename,
41+
paramtype = "light",
42+
light_source = math.min(unpowered_def.light_source + 2, minetest.LIGHT_MAX),
2443
mesecons = {conductor = {
2544
state = mesecon.state.on,
26-
offstate = "default:mese",
45+
offstate = mese_nodename,
2746
rules = mesewire_rules
2847
}},
29-
groups = {cracky = 1, not_in_creative_inventory = 1},
48+
groups = mesecon.merge_tables(unpowered_def.groups or {}, {not_in_creative_inventory = 1}),
3049
on_blast = mesecon.on_blastnode,
3150
})
3251

‎mesecons_extrawires/mod.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
name = mesecons_extrawires
2-
depends = default, mesecons
2+
depends = mesecons, mesecons_gamecompat
33
optional_depends = screwdriver

‎mesecons_extrawires/tjunction.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ minetest.register_node("mesecons_extrawires:tjunction_on", {
4444
node_box = tjunction_nodebox,
4545
groups = {dig_immediate = 3, not_in_creative_inventory = 1},
4646
drop = "mesecons_extrawires:tjunction_off",
47-
sounds = default.node_sound_defaults(),
47+
sounds = mesecon.node_sound.default,
4848
mesecons = {conductor =
4949
{
5050
state = mesecon.state.on,
@@ -74,7 +74,7 @@ minetest.register_node("mesecons_extrawires:tjunction_off", {
7474
selection_box = tjunction_selectionbox,
7575
node_box = tjunction_nodebox,
7676
groups = {dig_immediate = 3},
77-
sounds = default.node_sound_defaults(),
77+
sounds = mesecon.node_sound.default,
7878
mesecons = {conductor =
7979
{
8080
state = mesecon.state.off,

‎mesecons_extrawires/vertical.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ mesecon.register_node("mesecons_extrawires:vertical", {
8989
drop = "mesecons_extrawires:vertical_off",
9090
after_place_node = vertical_update,
9191
after_dig_node = vertical_update,
92-
sounds = default.node_sound_defaults(),
92+
sounds = mesecon.node_sound.default,
9393
},{
9494
tiles = {"mesecons_wire_off.png"},
9595
groups = {dig_immediate=3},
@@ -123,7 +123,7 @@ mesecon.register_node("mesecons_extrawires:vertical_top", {
123123
drop = "mesecons_extrawires:vertical_off",
124124
after_place_node = vertical_update,
125125
after_dig_node = vertical_update,
126-
sounds = default.node_sound_defaults(),
126+
sounds = mesecon.node_sound.default,
127127
},{
128128
tiles = {"mesecons_wire_off.png"},
129129
mesecons = {conductor = {
@@ -155,7 +155,7 @@ mesecon.register_node("mesecons_extrawires:vertical_bottom", {
155155
drop = "mesecons_extrawires:vertical_off",
156156
after_place_node = vertical_update,
157157
after_dig_node = vertical_update,
158-
sounds = default.node_sound_defaults(),
158+
sounds = mesecon.node_sound.default,
159159
},{
160160
tiles = {"mesecons_wire_off.png"},
161161
mesecons = {conductor = {

0 commit comments

Comments
 (0)