diff --git a/mesecons_gates/textures/jeija_gate_off.png b/mesecons/textures/jeija_gate_off.png similarity index 100% rename from mesecons_gates/textures/jeija_gate_off.png rename to mesecons/textures/jeija_gate_off.png diff --git a/mesecons_gates/textures/jeija_gate_on.png b/mesecons/textures/jeija_gate_on.png similarity index 100% rename from mesecons_gates/textures/jeija_gate_on.png rename to mesecons/textures/jeija_gate_on.png diff --git a/mesecons_gates/textures/jeija_gate_side.png b/mesecons/textures/jeija_gate_side.png similarity index 100% rename from mesecons_gates/textures/jeija_gate_side.png rename to mesecons/textures/jeija_gate_side.png diff --git a/mesecons/textures/jeija_microcontroller_LED_A.png b/mesecons/textures/jeija_luacontroller_LED_A.png similarity index 100% rename from mesecons/textures/jeija_microcontroller_LED_A.png rename to mesecons/textures/jeija_luacontroller_LED_A.png diff --git a/mesecons/textures/jeija_microcontroller_LED_B.png b/mesecons/textures/jeija_luacontroller_LED_B.png similarity index 100% rename from mesecons/textures/jeija_microcontroller_LED_B.png rename to mesecons/textures/jeija_luacontroller_LED_B.png diff --git a/mesecons/textures/jeija_microcontroller_LED_C.png b/mesecons/textures/jeija_luacontroller_LED_C.png similarity index 100% rename from mesecons/textures/jeija_microcontroller_LED_C.png rename to mesecons/textures/jeija_luacontroller_LED_C.png diff --git a/mesecons/textures/jeija_microcontroller_LED_D.png b/mesecons/textures/jeija_luacontroller_LED_D.png similarity index 100% rename from mesecons/textures/jeija_microcontroller_LED_D.png rename to mesecons/textures/jeija_luacontroller_LED_D.png diff --git a/mesecons_delayer/init.lua b/mesecons_delayer/init.lua index c4f4b87..98ec48f 100644 --- a/mesecons_delayer/init.lua +++ b/mesecons_delayer/init.lua @@ -27,20 +27,6 @@ local delaytime = { 0.1, 0.3, 0.5, 1.0 } for i = 1, 4 do -local boxes = { - { -6/16, -8/16, -6/16, 6/16, -7/16, 6/16 }, -- the main slab - - { -2/16, -7/16, -4/16, 2/16, -26/64, -3/16 }, -- the jeweled "on" indicator - { -3/16, -7/16, -3/16, 3/16, -26/64, -2/16 }, - { -4/16, -7/16, -2/16, 4/16, -26/64, 2/16 }, - { -3/16, -7/16, 2/16, 3/16, -26/64, 3/16 }, - { -2/16, -7/16, 3/16, 2/16, -26/64, 4/16 }, - - { -6/16, -7/16, -6/16, -4/16, -27/64, -4/16 }, -- the timer indicator - { -8/16, -8/16, -1/16, -6/16, -7/16, 1/16 }, -- the two wire stubs - { 6/16, -8/16, -1/16, 8/16, -7/16, 1/16 } -} - -- Delayer definition defaults local def = { drawtype = "nodebox", @@ -48,11 +34,14 @@ local def = { walkable = true, selection_box = { type = "fixed", - fixed = { -8/16, -8/16, -8/16, 8/16, -6/16, 8/16 }, + fixed = { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }, }, node_box = { type = "fixed", - fixed = boxes + fixed = { + { -8/16, -8/16, -8/16, 8/16, -7/16, 8/16 }, -- bottom slab + { -6/16, -7/16, -6/16, 6/16, -6/16, 6/16 } + }, }, paramtype = "light", paramtype2 = "facedir", @@ -74,16 +63,16 @@ end local off_state = { description = S("Delayer"), + inventory_image = "jeija_gate_off.png^jeija_delayer.png", + wield_image = "jeija_gate_off.png^jeija_delayer.png", tiles = { - "mesecons_delayer_off_"..tostring(i)..".png", - "mesecons_delayer_bottom.png", - "mesecons_delayer_ends_off.png", - "mesecons_delayer_ends_off.png", - "mesecons_delayer_sides_off.png", - "mesecons_delayer_sides_off.png" + "jeija_microcontroller_bottom.png^jeija_gate_off.png^jeija_delayer.png^mesecons_delayer_"..tostring(i)..".png", + "jeija_microcontroller_bottom.png", + "jeija_gate_side.png", + "jeija_gate_side.png", + "jeija_gate_side.png", + "jeija_gate_side.png", }, - inventory_image = "mesecons_delayer_off_1.png", - wield_image = "mesecons_delayer_off_1.png", groups = off_groups, on_punch = function(pos, node, puncher) if minetest.is_protected(pos, puncher and puncher:get_player_name() or "") then @@ -117,13 +106,15 @@ minetest.register_node("mesecons_delayer:delayer_off_"..tostring(i), off_state) -- Activated delayer definition defaults local on_state = { description = S("You hacker you"), + inventory_image = "jeija_gate_on.png^jeija_delayer.png", + wield_image = "jeija_gate_on.png^jeija_delayer.png", tiles = { - "mesecons_delayer_on_"..tostring(i)..".png", - "mesecons_delayer_bottom.png", - "mesecons_delayer_ends_on.png", - "mesecons_delayer_ends_on.png", - "mesecons_delayer_sides_on.png", - "mesecons_delayer_sides_on.png" + "jeija_microcontroller_bottom.png^jeija_gate_on.png^jeija_delayer.png^mesecons_delayer_"..tostring(i)..".png", + "jeija_microcontroller_bottom.png", + "jeija_gate_side.png", + "jeija_gate_side.png", + "jeija_gate_side.png", + "jeija_gate_side.png", }, groups = {bendy = 2, snappy = 1, dig_immediate = 2, not_in_creative_inventory = 1}, on_punch = function(pos, node, puncher) diff --git a/mesecons_delayer/textures/jeija_delayer.png b/mesecons_delayer/textures/jeija_delayer.png new file mode 100644 index 0000000..451f1c4 Binary files /dev/null and b/mesecons_delayer/textures/jeija_delayer.png differ diff --git a/mesecons_delayer/textures/mesecons_delayer_1.png b/mesecons_delayer/textures/mesecons_delayer_1.png new file mode 100644 index 0000000..973d684 Binary files /dev/null and b/mesecons_delayer/textures/mesecons_delayer_1.png differ diff --git a/mesecons_delayer/textures/mesecons_delayer_2.png b/mesecons_delayer/textures/mesecons_delayer_2.png new file mode 100644 index 0000000..a5f0b9f Binary files /dev/null and b/mesecons_delayer/textures/mesecons_delayer_2.png differ diff --git a/mesecons_delayer/textures/mesecons_delayer_3.png b/mesecons_delayer/textures/mesecons_delayer_3.png new file mode 100644 index 0000000..c8bf24e Binary files /dev/null and b/mesecons_delayer/textures/mesecons_delayer_3.png differ diff --git a/mesecons_delayer/textures/mesecons_delayer_4.png b/mesecons_delayer/textures/mesecons_delayer_4.png new file mode 100644 index 0000000..74a5912 Binary files /dev/null and b/mesecons_delayer/textures/mesecons_delayer_4.png differ diff --git a/mesecons_delayer/textures/mesecons_delayer_bottom.png b/mesecons_delayer/textures/mesecons_delayer_bottom.png deleted file mode 100644 index 2307b39..0000000 Binary files a/mesecons_delayer/textures/mesecons_delayer_bottom.png and /dev/null differ diff --git a/mesecons_delayer/textures/mesecons_delayer_ends_off.png b/mesecons_delayer/textures/mesecons_delayer_ends_off.png deleted file mode 100644 index 9cbeb39..0000000 Binary files a/mesecons_delayer/textures/mesecons_delayer_ends_off.png and /dev/null differ diff --git a/mesecons_delayer/textures/mesecons_delayer_ends_on.png b/mesecons_delayer/textures/mesecons_delayer_ends_on.png deleted file mode 100644 index 446ef48..0000000 Binary files a/mesecons_delayer/textures/mesecons_delayer_ends_on.png and /dev/null differ diff --git a/mesecons_delayer/textures/mesecons_delayer_off_1.png b/mesecons_delayer/textures/mesecons_delayer_off_1.png deleted file mode 100644 index 20d9efc..0000000 Binary files a/mesecons_delayer/textures/mesecons_delayer_off_1.png and /dev/null differ diff --git a/mesecons_delayer/textures/mesecons_delayer_off_2.png b/mesecons_delayer/textures/mesecons_delayer_off_2.png deleted file mode 100644 index 590d62f..0000000 Binary files a/mesecons_delayer/textures/mesecons_delayer_off_2.png and /dev/null differ diff --git a/mesecons_delayer/textures/mesecons_delayer_off_3.png b/mesecons_delayer/textures/mesecons_delayer_off_3.png deleted file mode 100644 index 57ac4c4..0000000 Binary files a/mesecons_delayer/textures/mesecons_delayer_off_3.png and /dev/null differ diff --git a/mesecons_delayer/textures/mesecons_delayer_off_4.png b/mesecons_delayer/textures/mesecons_delayer_off_4.png deleted file mode 100644 index 94fc00c..0000000 Binary files a/mesecons_delayer/textures/mesecons_delayer_off_4.png and /dev/null differ diff --git a/mesecons_delayer/textures/mesecons_delayer_on_1.png b/mesecons_delayer/textures/mesecons_delayer_on_1.png deleted file mode 100644 index 9369a4e..0000000 Binary files a/mesecons_delayer/textures/mesecons_delayer_on_1.png and /dev/null differ diff --git a/mesecons_delayer/textures/mesecons_delayer_on_2.png b/mesecons_delayer/textures/mesecons_delayer_on_2.png deleted file mode 100644 index 7984ef4..0000000 Binary files a/mesecons_delayer/textures/mesecons_delayer_on_2.png and /dev/null differ diff --git a/mesecons_delayer/textures/mesecons_delayer_on_3.png b/mesecons_delayer/textures/mesecons_delayer_on_3.png deleted file mode 100644 index 1799cad..0000000 Binary files a/mesecons_delayer/textures/mesecons_delayer_on_3.png and /dev/null differ diff --git a/mesecons_delayer/textures/mesecons_delayer_on_4.png b/mesecons_delayer/textures/mesecons_delayer_on_4.png deleted file mode 100644 index 0386112..0000000 Binary files a/mesecons_delayer/textures/mesecons_delayer_on_4.png and /dev/null differ diff --git a/mesecons_delayer/textures/mesecons_delayer_sides_off.png b/mesecons_delayer/textures/mesecons_delayer_sides_off.png deleted file mode 100644 index 2c60cbb..0000000 Binary files a/mesecons_delayer/textures/mesecons_delayer_sides_off.png and /dev/null differ diff --git a/mesecons_delayer/textures/mesecons_delayer_sides_on.png b/mesecons_delayer/textures/mesecons_delayer_sides_on.png deleted file mode 100644 index 4927557..0000000 Binary files a/mesecons_delayer/textures/mesecons_delayer_sides_on.png and /dev/null differ diff --git a/mesecons_fpga/init.lua b/mesecons_fpga/init.lua index fe86ad4..0af9d1b 100644 --- a/mesecons_fpga/init.lua +++ b/mesecons_fpga/init.lua @@ -20,10 +20,10 @@ plg.register_nodes = function(template) -- build top texture string local texture = "jeija_fpga_top.png" - if a == 1 then texture = texture .. "^jeija_microcontroller_LED_A.png" end - if b == 1 then texture = texture .. "^jeija_microcontroller_LED_B.png" end - if c == 1 then texture = texture .. "^jeija_microcontroller_LED_C.png" end - if d == 1 then texture = texture .. "^jeija_microcontroller_LED_D.png" end + if a == 1 then texture = texture .. "^jeija_luacontroller_LED_A.png" end + if b == 1 then texture = texture .. "^jeija_luacontroller_LED_B.png" end + if c == 1 then texture = texture .. "^jeija_luacontroller_LED_C.png" end + if d == 1 then texture = texture .. "^jeija_luacontroller_LED_D.png" end ndef.tiles[1] = texture ndef.inventory_image = texture diff --git a/mesecons_gates/mod.conf b/mesecons_gates/mod.conf index f89c884..4b6db70 100644 --- a/mesecons_gates/mod.conf +++ b/mesecons_gates/mod.conf @@ -1,2 +1,2 @@ name = mesecons_gates -depends = mesecons, mesecons_gamecompat, mesecons_microcontroller, mesecons_delayer, mesecons_torch, mesecons_materials +depends = mesecons, mesecons_gamecompat, mesecons_microcontroller, mesecons_torch, mesecons_materials diff --git a/mesecons_luacontroller/textures/jeija_luacontroller_LED_A.png b/mesecons_luacontroller/textures/jeija_luacontroller_LED_A.png deleted file mode 100644 index c6182cc..0000000 Binary files a/mesecons_luacontroller/textures/jeija_luacontroller_LED_A.png and /dev/null differ diff --git a/mesecons_luacontroller/textures/jeija_luacontroller_LED_B.png b/mesecons_luacontroller/textures/jeija_luacontroller_LED_B.png deleted file mode 100644 index 04c2da0..0000000 Binary files a/mesecons_luacontroller/textures/jeija_luacontroller_LED_B.png and /dev/null differ diff --git a/mesecons_luacontroller/textures/jeija_luacontroller_LED_C.png b/mesecons_luacontroller/textures/jeija_luacontroller_LED_C.png deleted file mode 100644 index 01f6ae4..0000000 Binary files a/mesecons_luacontroller/textures/jeija_luacontroller_LED_C.png and /dev/null differ diff --git a/mesecons_luacontroller/textures/jeija_luacontroller_LED_D.png b/mesecons_luacontroller/textures/jeija_luacontroller_LED_D.png deleted file mode 100644 index 6c8a26f..0000000 Binary files a/mesecons_luacontroller/textures/jeija_luacontroller_LED_D.png and /dev/null differ diff --git a/mesecons_microcontroller/init.lua b/mesecons_microcontroller/init.lua index d28df2b..3334f68 100644 --- a/mesecons_microcontroller/init.lua +++ b/mesecons_microcontroller/init.lua @@ -12,16 +12,16 @@ for d = 0, 1 do local nodename = "mesecons_microcontroller:microcontroller"..tostring(d)..tostring(c)..tostring(b)..tostring(a) local top = "jeija_microcontroller_top.png" if tostring(a) == "1" then - top = top.."^jeija_microcontroller_LED_A.png" + top = top.."^jeija_luacontroller_LED_A.png" end if tostring(b) == "1" then - top = top.."^jeija_microcontroller_LED_B.png" + top = top.."^jeija_luacontroller_LED_B.png" end if tostring(c) == "1" then - top = top.."^jeija_microcontroller_LED_C.png" + top = top.."^jeija_luacontroller_LED_C.png" end if tostring(d) == "1" then - top = top.."^jeija_microcontroller_LED_D.png" + top = top.."^jeija_luacontroller_LED_D.png" end local groups if tostring(d)..tostring(c)..tostring(b)..tostring(a) ~= "0000" then diff --git a/mesecons_pistons/init.lua b/mesecons_pistons/init.lua index 3d75b35..274258e 100644 --- a/mesecons_pistons/init.lua +++ b/mesecons_pistons/init.lua @@ -270,9 +270,9 @@ minetest.register_node("mesecons_pistons:piston_normal_off", { description = S("Piston"), tiles = { "mesecons_piston_top.png", - "mesecons_piston_bottom.png", - "mesecons_piston_left.png", - "mesecons_piston_right.png", + "mesecons_piston_top.png^[transform2", + "mesecons_piston_top.png^[transform3", + "mesecons_piston_top.png^[transform1", "mesecons_piston_back.png", "mesecons_piston_pusher_front.png" }, @@ -296,9 +296,9 @@ minetest.register_node("mesecons_pistons:piston_normal_on", { drawtype = "nodebox", tiles = { "mesecons_piston_top.png", - "mesecons_piston_bottom.png", - "mesecons_piston_left.png", - "mesecons_piston_right.png", + "mesecons_piston_top.png^[transform2", + "mesecons_piston_top.png^[transform3", + "mesecons_piston_top.png^[transform1", "mesecons_piston_back.png", "mesecons_piston_on_front.png" }, @@ -325,9 +325,9 @@ minetest.register_node("mesecons_pistons:piston_pusher_normal", { drawtype = "nodebox", tiles = { "mesecons_piston_pusher_top.png", - "mesecons_piston_pusher_bottom.png", - "mesecons_piston_pusher_left.png", - "mesecons_piston_pusher_right.png", + "mesecons_piston_pusher_top.png^[transform2", + "mesecons_piston_pusher_top.png^[transform3", + "mesecons_piston_pusher_top.png^[transform1", "mesecons_piston_pusher_back.png", "mesecons_piston_pusher_front.png" }, @@ -349,9 +349,9 @@ minetest.register_node("mesecons_pistons:piston_sticky_off", { description = S("Sticky Piston"), tiles = { "mesecons_piston_top.png", - "mesecons_piston_bottom.png", - "mesecons_piston_left.png", - "mesecons_piston_right.png", + "mesecons_piston_top.png^[transform2", + "mesecons_piston_top.png^[transform3", + "mesecons_piston_top.png^[transform1", "mesecons_piston_back.png", "mesecons_piston_pusher_front_sticky.png" }, @@ -375,9 +375,9 @@ minetest.register_node("mesecons_pistons:piston_sticky_on", { drawtype = "nodebox", tiles = { "mesecons_piston_top.png", - "mesecons_piston_bottom.png", - "mesecons_piston_left.png", - "mesecons_piston_right.png", + "mesecons_piston_top.png^[transform2", + "mesecons_piston_top.png^[transform3", + "mesecons_piston_top.png^[transform1", "mesecons_piston_back.png", "mesecons_piston_on_front.png" }, @@ -404,9 +404,9 @@ minetest.register_node("mesecons_pistons:piston_pusher_sticky", { drawtype = "nodebox", tiles = { "mesecons_piston_pusher_top.png", - "mesecons_piston_pusher_bottom.png", - "mesecons_piston_pusher_left.png", - "mesecons_piston_pusher_right.png", + "mesecons_piston_pusher_top.png^[transform2", + "mesecons_piston_pusher_top.png^[transform3", + "mesecons_piston_pusher_top.png^[transform1", "mesecons_piston_pusher_back.png", "mesecons_piston_pusher_front_sticky.png" }, diff --git a/mesecons_pistons/textures/mesecons_piston_bottom.png b/mesecons_pistons/textures/mesecons_piston_bottom.png deleted file mode 100644 index d4b2fbf..0000000 Binary files a/mesecons_pistons/textures/mesecons_piston_bottom.png and /dev/null differ diff --git a/mesecons_pistons/textures/mesecons_piston_left.png b/mesecons_pistons/textures/mesecons_piston_left.png deleted file mode 100644 index a560a7d..0000000 Binary files a/mesecons_pistons/textures/mesecons_piston_left.png and /dev/null differ diff --git a/mesecons_pistons/textures/mesecons_piston_pusher_bottom.png b/mesecons_pistons/textures/mesecons_piston_pusher_bottom.png deleted file mode 100644 index cc6420e..0000000 Binary files a/mesecons_pistons/textures/mesecons_piston_pusher_bottom.png and /dev/null differ diff --git a/mesecons_pistons/textures/mesecons_piston_pusher_left.png b/mesecons_pistons/textures/mesecons_piston_pusher_left.png deleted file mode 100644 index 43d0327..0000000 Binary files a/mesecons_pistons/textures/mesecons_piston_pusher_left.png and /dev/null differ diff --git a/mesecons_pistons/textures/mesecons_piston_pusher_right.png b/mesecons_pistons/textures/mesecons_piston_pusher_right.png deleted file mode 100644 index af86c0f..0000000 Binary files a/mesecons_pistons/textures/mesecons_piston_pusher_right.png and /dev/null differ diff --git a/mesecons_pistons/textures/mesecons_piston_right.png b/mesecons_pistons/textures/mesecons_piston_right.png deleted file mode 100644 index 02fa023..0000000 Binary files a/mesecons_pistons/textures/mesecons_piston_right.png and /dev/null differ diff --git a/mesecons_torch/init.lua b/mesecons_torch/init.lua index ab2df98..6469d7b 100644 --- a/mesecons_torch/init.lua +++ b/mesecons_torch/init.lua @@ -56,8 +56,8 @@ local torch_selectionbox = } minetest.register_node("mesecons_torch:mesecon_torch_off", { - drawtype = "torchlike", - tiles = {"jeija_torches_off.png", "jeija_torches_off_ceiling.png", "jeija_torches_off_side.png"}, + drawtype = "plantlike", + tiles = {"jeija_torches_off.png"}, inventory_image = "jeija_torches_off.png", paramtype = "light", is_ground_content = false, @@ -75,8 +75,8 @@ minetest.register_node("mesecons_torch:mesecon_torch_off", { }) minetest.register_node("mesecons_torch:mesecon_torch_on", { - drawtype = "torchlike", - tiles = {"jeija_torches_on.png", "jeija_torches_on_ceiling.png", "jeija_torches_on_side.png"}, + drawtype = "plantlike", + tiles = {"jeija_torches_on.png"}, inventory_image = "jeija_torches_on.png", wield_image = "jeija_torches_on.png", paramtype = "light", diff --git a/mesecons_torch/textures/jeija_torches_off_ceiling.png b/mesecons_torch/textures/jeija_torches_off_ceiling.png deleted file mode 100644 index 033d2b4..0000000 Binary files a/mesecons_torch/textures/jeija_torches_off_ceiling.png and /dev/null differ diff --git a/mesecons_torch/textures/jeija_torches_off_side.png b/mesecons_torch/textures/jeija_torches_off_side.png deleted file mode 100644 index cf703e5..0000000 Binary files a/mesecons_torch/textures/jeija_torches_off_side.png and /dev/null differ diff --git a/mesecons_torch/textures/jeija_torches_on_ceiling.png b/mesecons_torch/textures/jeija_torches_on_ceiling.png deleted file mode 100644 index 81e7867..0000000 Binary files a/mesecons_torch/textures/jeija_torches_on_ceiling.png and /dev/null differ diff --git a/mesecons_torch/textures/jeija_torches_on_side.png b/mesecons_torch/textures/jeija_torches_on_side.png deleted file mode 100644 index 895a4e3..0000000 Binary files a/mesecons_torch/textures/jeija_torches_on_side.png and /dev/null differ