Skip to content

Commit 56164fb

Browse files
author
rn-d
committed
bugfixes, charcoal copyright, semantic version numbers
1 parent a41eb84 commit 56164fb

10 files changed

+19
-22
lines changed

ball.lua

-1
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,6 @@ minetest.register_node("basic_machines:ball_spawner", {
345345
paramtype = "light",
346346
param1=1,
347347
walkable = false,
348-
alpha = 150,
349348
sounds = default.node_sound_wood_defaults(),
350349
after_place_node = function(pos, placer)
351350
local meta = minetest.env:get_meta(pos)

constructor.lua

-6
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ basic_machines.craft_recipe_order = { -- order in which nodes appear
4040
"keypad","light","grinder","mover", "battery","generator","detector", "distributor", "clock_generator","recycler","autocrafter","ball_spawner", "enviroment", "power_block", "power_cell", "coal_lump",
4141
}
4242

43-
if mesecon then -- add mesecon adapter
44-
basic_machines.craft_recipes["mesecon_adapter"] = {item = "basic_machines:mesecon_adapter", description = "interface between machines and mesecons", craft = {"default:mese_crystal_fragment"}, tex = "jeija_luacontroller_top"}
45-
basic_machines.craft_recipe_order[1+#basic_machines.craft_recipe_order] = "mesecon_adapter"
46-
end
47-
48-
4943

5044
local constructor_process = function(pos)
5145

enviro.lua

+7-9
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55

66
local enviro = {};
77
enviro.skyboxes = {
8-
["default"]={type = "regular", tex = {}},
9-
--["space"]={type="skybox", tex={"sky_pos_y.jpg","sky_neg_y.jpg","sky_pos_z.jpg","sky_neg_z.jpg","sky_neg_x.jpg","sky_pos_x.jpg",}}, -- need textures installed!
10-
["space"]={type="skybox", tex={"basic_machines_stars.png","basic_machines_stars.png","basic_machines_stars.png","basic_machines_stars.png","basic_machines_stars.png","basic_machines_stars.png",}}, -- need textures installed!
11-
["caves"]={type = "cavebox", tex = {"black.png","black.png","black.png","black.png","black.png","black.png",}},
8+
["default"]={type = "regular", textures = {}},
9+
["space"]={type="skybox", clouds = false,textures={"basic_machines_stars.png","basic_machines_stars.png","basic_machines_stars.png","basic_machines_stars.png","basic_machines_stars.png","basic_machines_stars.png",}}, -- need textures installed!
10+
["caves"]={type = "cavebox", textures = {"black.png","black.png","black.png","black.png","black.png","black.png",}},
1211
};
1312

1413
local space_start = 1100;
@@ -123,7 +122,7 @@ minetest.register_node("basic_machines:enviro", {
123122

124123
if admin == 1 then -- only admin can change skybox
125124
local sky = enviro.skyboxes[skybox];
126-
player:set_sky(0,sky["type"],sky["tex"]);
125+
player:set_sky(sky);
127126
end
128127
end
129128
end
@@ -224,7 +223,7 @@ local reset_player_physics = function(player)
224223
if player then
225224
player:set_physics_override({speed=1,jump=1,gravity=1}) -- value set for extreme test space spawn
226225
local skybox = enviro.skyboxes["default"]; -- default skybox is "default"
227-
player:set_sky(0,skybox["type"],skybox["tex"]);
226+
player:set_sky(skybox);
228227
end
229228
end
230229

@@ -236,11 +235,11 @@ enviro_adjust_physics = function(player) -- adjust players physics/skybox 1 seco
236235
if pos.y > space_start then -- is player in space or not?
237236
player:set_physics_override({speed=1,jump=0.5,gravity=0.1}) -- value set for extreme test space spawn
238237
local skybox = enviro.skyboxes["space"];
239-
player:set_sky(0,skybox["type"],skybox["tex"]);
238+
player:set_sky(skybox);
240239
else
241240
player:set_physics_override({speed=1,jump=1,gravity=1}) -- value set for extreme test space spawn
242241
local skybox = enviro.skyboxes["default"];
243-
player:set_sky(0,skybox["type"],skybox["tex"]);
242+
player:set_sky(skybox);
244243
end
245244
end
246245
end)
@@ -344,7 +343,6 @@ end)
344343

345344
-- drawtype = "glasslike",
346345
-- paramtype = "light",
347-
-- alpha = 150,
348346
-- sunlight_propagates = true, -- Sunlight shines through
349347
-- walkable = false, -- Would make the player collide with the air node
350348
-- pointable = false, -- You can't select the node

init.lua

+3-1
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,10 @@ dofile(minetest.get_modpath("basic_machines").."/constructor.lua") -- enable cra
3131
dofile(minetest.get_modpath("basic_machines").."/protect.lua") -- enable interaction with players, adds local on protect/chat event handling
3232

3333
-- MESECON functionality
34-
if mesecon then
34+
if mesecon then -- DO NOT REMOVE THIS CHECK or it wont work with mesecons
3535
dofile(minetest.get_modpath("basic_machines").."/mesecon_adapter.lua")
36+
basic_machines.craft_recipes["mesecon_adapter"] = {item = "basic_machines:mesecon_adapter", description = "interface between machines and mesecons", craft = {"default:mese_crystal_fragment"}, tex = "jeija_luacontroller_top"}
37+
basic_machines.craft_recipe_order[1+#basic_machines.craft_recipe_order] = "mesecon_adapter"
3638
end
3739
-- OPTIONAL ADDITIONAL STUFF ( comment to disable )
3840

mesecons_lamp.zip

-42 KB
Binary file not shown.

mod.conf

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
name = basic_machines
2+
depends = default
3+
optional_depends = protector,doors,areas,boneworld,moreores,mesecons
4+
description = automate gameplay with machines. build logic mechanisms.

mover.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ basic_machines.max_range = 10 -- machines normal range of operation
1313
basic_machines.machines_operations = 10 -- 1 coal will provide 10 mover basic operations ( moving dirt 1 block distance)
1414
basic_machines.machines_TTL = 16 -- time to live for signals, how many hops before signal dissipates
1515

16-
basic_machines.version = "10/02/2021a";
16+
basic_machines.version = "2025.02.17"
1717
basic_machines.clockgen = 1; -- if 0 all background continuously running activity (clockgen/keypad) repeating is disabled
1818

1919
-- how hard it is to move blocks, default factor 1, note fuel cost is this multiplied by distance and divided by machine_operations..
@@ -328,7 +328,7 @@ minetest.register_node("basic_machines:mover", {
328328
end,
329329

330330
allow_metadata_inventory_put = function(pos, listname, index, stack, player)
331-
if minetest.is_protected(pos,player:get_player_name()) then return end
331+
if minetest.is_protected(pos,player:get_player_name()) then return 0 end
332332
if listname == "filter" then
333333
local meta = minetest.get_meta(pos);
334334
local itemname = stack:to_string() or "";
@@ -365,7 +365,7 @@ minetest.register_node("basic_machines:mover", {
365365
end,
366366

367367
allow_metadata_inventory_take = function(pos, listname, index, stack, player)
368-
if minetest.is_protected(pos,player:get_player_name()) then return end
368+
if minetest.is_protected(pos,player:get_player_name()) then return 0 end
369369
local meta = minetest.get_meta(pos);
370370
meta:set_float("upgrade",1); -- reset upgrade
371371
local form = get_mover_form(pos,player)

protect.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function minetest.is_protected(pos, digger)
1818
if meta:get_int("x1") ~= 0 then -- trigger protection event
1919
meta:set_string("infotext",digger); -- record diggers name onto distributor
2020
local table = minetest.registered_nodes["basic_machines:distributor"];
21-
local effector=table.mesecons.effector;
21+
local effector=table.effector;
2222
local node = nil;
2323
effector.action_on(p,node,machines_TTL);
2424
end

recycler.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ local no_recycle_list = {
99
["dye:white"]=1,["dye:grey"]=1,["dye:dark_grey"]=1,["dye:black"]=1,
1010
["dye:violet"]=1,["dye:blue"]=1,["dye:cyan"]=1,["dye:dark_green"]=1,
1111
["dye:green"]=1,["dye:yellow"]=1,["dye:brown"]=1,["dye:orange"]=1,
12-
["dye:red"]=1,["dye:magenta"]=1,["dye:pink"]=1,
12+
["dye:red"]=1,["dye:magenta"]=1,["dye:pink"]=1,["default:mossycobble"]=1,
1313
}
1414

1515

textures/charcoal.png

90 Bytes
Loading

0 commit comments

Comments
 (0)